newmark-agent 0.5.14 → 0.5.15

package/dist/ui/index.html

@@ -22,39 +22,39 @@ try {
 
 /* --- Design Tokens --- */
 :root {
-  /* Deep space palette */
-  --bg: #0a0a1a;
+  /* Neutral charcoal surfaces; chroma belongs to functional accents. */
+  --bg: #101010;
   --app-bg: var(--bg);
-  --bg2: #11112a;
-  --bg3: #1a1a38;
-  --surface: #1e1e40;
-  --surface2: #252550;
-  --surface3: #2a2a58;
+  --bg2: #181818;
+  --bg3: #222222;
+  --surface: #292929;
+  --surface2: #303030;
+  --surface3: #383838;
 
   /* Text hierarchy */
-  --text: #c8d0e8;
-  --text-dim: #7880a0;
-  --text-bright: #e4ecff;
+  --text: #cecece;
+  --text-dim: #949494;
+  --text-bright: #f2f2f2;
   --text-accent: #a0b8ff;
 
   /* Native select popups need an opaque palette; Windows does not composite glass behind them. */
   --select-color-scheme: dark;
-  --select-popup-bg: #11162a;
-  --select-popup-text: #eef2ff;
-  --select-popup-group: #afc0ff;
+  --select-popup-bg: #181818;
+  --select-popup-text: #f2f2f2;
+  --select-popup-group: #cecece;
   --select-popup-selected-bg: #355fce;
   --select-popup-selected-text: #ffffff;
-  --select-popup-disabled: #8f99b5;
+  --select-popup-disabled: #949494;
   --control-hover-bg: rgba(255,255,255,0.08);
 
   /* Native editor palette */
-  --editor-bg: #0b0d14;
+  --editor-bg: #141414;
   --editor-gutter-bg: rgba(255,255,255,0.025);
-  --editor-ghost-text: rgba(205,211,222,0.48);
+  --editor-ghost-text: rgba(206,206,206,0.48);
   --editor-caret: #ffffff;
   --editor-selection: rgba(91,120,255,0.35);
-  --editor-completion-bg: rgba(12,14,22,0.97);
-  --editor-comment: #8b949e;
+  --editor-completion-bg: rgba(24,24,24,0.97);
+  --editor-comment: #949494;
   --editor-string: #9ecbff;
   --editor-number: #79b8ff;
   --editor-keyword: #f97583;
@@ -63,14 +63,14 @@ try {
   --editor-attr: #ffab70;
   --editor-heading: #79b8ff;
   --editor-code: #9ecbff;
-  --editor-punct: #a8b0bd;
-  --review-bg: rgba(18,20,28,.94);
+  --editor-punct: #b0b0b0;
+  --review-bg: rgba(24,24,24,.94);
   --review-row-hover: rgba(255,255,255,.035);
   --review-add-bg: rgba(56,212,160,.13);
   --review-add-text: #72e6b5;
   --review-del-bg: rgba(255,68,68,.13);
   --review-del-text: #ff9aa2;
-  --notice-bg: rgba(18,20,28,.96);
+  --notice-bg: rgba(24,24,24,.96);
   --notice-shadow: 0 10px 36px rgba(0,0,0,.32);
   --notice-error-border: rgba(255,105,120,.55);
   --notice-error-text: #ffb0b8;
@@ -80,13 +80,13 @@ try {
   --accent-glow: rgba(91,120,255,0.3);
   --accent2: #38d4a0;
   --accent2-glow: rgba(56,212,160,0.3);
-  --chat-canvas: color-mix(in srgb, var(--app-bg) 92%, var(--accent) 8%);
+  --chat-canvas: var(--app-bg);
 
   /* Glass layers */
   --glass-alpha: 0.85;
-  --glass-rgb-1: 10 10 26;
-  --glass-rgb-2: 17 17 42;
-  --glass-rgb-3: 26 26 56;
+  --glass-rgb-1: 16 16 16;
+  --glass-rgb-2: 24 24 24;
+  --glass-rgb-3: 34 34 34;
   --modal-surface: rgb(var(--glass-rgb-2) / max(var(--glass-alpha-2), 0.9));
   --glass-alpha-1: 0.6375;
   --glass-alpha-2: 0.68;
@@ -98,15 +98,14 @@ try {
   --glass-border-2: rgba(255,255,255,0.08);
   --glass-border-3: rgba(255,255,255,0.10);
 
-  /* Kyant AndroidLiquidGlass (backdrop) liquid-glass parity tokens.
-     CSS equivalent of the library lens edge refraction, top highlight,
-     inner shadow and saturation boost (saturate(140%) == vibrancy). */
+  /* Uniform frosted surfaces. Depth belongs to a narrow optical rim and the
+     real backdrop, never to a painted light/dark plane across the surface. */
   --liquid-edge-glow: rgba(255,255,255,0.10);
   --liquid-edge-glow-strong: rgba(255,255,255,0.16);
   --liquid-top-highlight: inset 0 1px 0 rgba(255,255,255,0.10);
   --liquid-inner-shadow: inset 0 -1px 0 rgba(0,0,0,0.22);
   --liquid-outer-shadow: 0 8px 32px rgba(0,0,0,0.45);
-  --liquid-refraction: linear-gradient(180deg, rgba(255,255,255,0.08), rgba(255,255,255,0) 18%, rgba(0,0,0,0) 82%, rgba(0,0,0,0.18));
+  --liquid-refraction: rgba(255,255,255,0.025);
 
   /* Borders & corners */
   --border: rgba(255,255,255,0.06);
@@ -117,6 +116,8 @@ try {
   --radius-lg: 16px;
   --radius-xl: 24px;
   --radius-full: 9999px;
+  /* List shells surround a 34px capsule with 7px padding and a 1px rim. */
+  --liquid-list-popup-radius: 25px;
 
   /* Marquee gradient */
   --g1: #000000;
@@ -150,6 +151,33 @@ try {
   --liquid-float-refraction-amount: 24px;
   --liquid-float-chromatic-aberration: 1;
   --liquid-float-optical-opacity: 1;
+  /* Popup tint is spatially uniform; the shared opacity/blur controls still
+     govern the material. Menu selection blocks keep their own flat fill. */
+  --liquid-popup-rgb: 28 28 28;
+  --liquid-popup-alpha: calc(var(--glass-alpha-2) * 0.82);
+  --liquid-popup-surface: rgb(var(--liquid-popup-rgb) / var(--liquid-popup-alpha));
+  --liquid-popup-blur: calc(var(--glass-blur-3) * 4);
+  --liquid-popup-saturation: 1.08;
+  --liquid-popup-rim: rgba(255,255,255,0.12);
+  --liquid-popup-inner-rim: rgba(255,255,255,0.045);
+  --liquid-popup-shadow: 0 12px 32px rgba(0,0,0,0.24), 0 2px 8px rgba(0,0,0,0.16);
+  --liquid-popup-refraction-height: 9px;
+  --liquid-popup-refraction-amount: 30px;
+  --liquid-popup-chromatic-aberration: 1.3;
+  --liquid-popup-light-opacity: 0;
+  --liquid-light-x: 50%;
+  --liquid-light-y: 50%;
+  /* Interaction glow is a physical-size light spot, independent of the
+     popup's dimensions.  Keep the same CSS radius for small menus and large
+     settings dialogs; the carrier surface clips it to the popup shape. */
+  --liquid-popup-glow-radius: 20px;
+  --liquid-popup-stretch: 0;
+  --liquid-popup-squash: 0;
+  /* Desktop glass keeps the optical pass readable while limiting the
+     expensive backdrop region and avoiding oversized bloom on large dialogs. */
+  --liquid-popup-edge-width: 1px;
+  --liquid-popup-bloom: 0.16;
+  --liquid-popup-chromatic-shift: 1px;
 
   /* Transitions */
   --ease-out-expo: cubic-bezier(0.16, 1, 0.3, 1);
@@ -232,7 +260,10 @@ try {
   --glass-rgb-2: 255 255 255;
   --glass-rgb-3: 255 255 255;
   --modal-surface: rgba(248,250,255,0.82);
-  --settings-modal-surface: rgba(255,255,255,0.94);
+  --liquid-popup-rgb: 248 250 253;
+  --liquid-popup-rim: rgba(70,82,105,0.13);
+  --liquid-popup-inner-rim: rgba(255,255,255,0.65);
+  --liquid-popup-shadow: 0 12px 32px rgba(35,45,65,0.10), 0 2px 8px rgba(35,45,65,0.06);
   --modal-shadow: 0 24px 70px rgba(41,55,92,0.20), inset 0 1px 0 rgba(255,255,255,0.62), inset 0 -1px 0 rgba(46,58,92,0.10);
   --glass-border-1: rgba(0,0,0,0.06);
   --glass-border-2: rgba(0,0,0,0.08);
@@ -298,8 +329,8 @@ html, body {
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  background: #0a0a1a;
-  color: #f8fafc;
+  background: #101010;
+  color: #f2f2f2;
   font-family: 'Segoe UI', Arial, sans-serif;
 }
 
@@ -326,9 +357,9 @@ html, body {
 
 .startup-cover-copy { min-width: 0; flex: 1; padding-top: 1px; }
 .startup-cover-title { font-size: 18px; font-weight: 700; }
-.startup-cover-status { margin-top: 7px; color: #c4ccda; font-size: 12px; line-height: 1.45; }
-.startup-cover-detail { margin-top: 4px; color: #768197; font-size: 11px; line-height: 1.4; }
-.startup-cover-bar { height: 3px; margin-top: 12px; border-radius: 99px; background: #1c2638; overflow: hidden; }
+.startup-cover-status { margin-top: 7px; color: #cecece; font-size: 12px; line-height: 1.45; }
+.startup-cover-detail { margin-top: 4px; color: #949494; font-size: 11px; line-height: 1.4; }
+.startup-cover-bar { height: 3px; margin-top: 12px; border-radius: 99px; background: #303030; overflow: hidden; }
 .startup-cover-bar > i { display: block; height: 100%; width: 38%; border-radius: inherit; background: linear-gradient(90deg, #36d399, #60a5fa); }
 
 @keyframes startup-cover-pulse {
@@ -1204,7 +1235,7 @@ button.left-ws-item {
   overflow: auto;
   padding: 6px;
   border: 1px solid var(--glass-border-2);
-  border-radius: var(--radius-xl);
+  border-radius: var(--liquid-list-popup-radius);
   background: var(--modal-surface);
   box-shadow: var(--shadow-lg), var(--liquid-top-highlight), var(--liquid-inner-shadow);
 }
@@ -2992,7 +3023,7 @@ button.todo-item { background: transparent; }
 .stack-card {
   width: calc(100% - 40px);
   margin: 0 20px;
-  background: rgba(18,20,34,0.92);
+  background: rgba(24,24,24,0.92);
   backdrop-filter: blur(var(--glass-blur-2)) saturate(125%);
   -webkit-backdrop-filter: blur(var(--glass-blur-2)) saturate(125%);
   border: 1px solid var(--glass-border-1);
@@ -3084,7 +3115,7 @@ button.todo-item { background: transparent; }
   border-bottom: none;
   border-radius: 8px 8px 0 0;
   border-color: rgba(91,120,255,0.24);
-  background: linear-gradient(90deg, rgba(91,120,255,0.10), rgba(18,20,34,0.94) 34%);
+  background: linear-gradient(90deg, rgba(91,120,255,0.10), rgba(24,24,24,0.94) 34%);
   box-shadow: none;
 }
 [data-theme="light"] #goal-bar {
@@ -3114,7 +3145,7 @@ button.todo-item { background: transparent; }
   border-bottom: none;
   border-radius: 8px 8px 0 0;
   border-color: rgba(76,196,160,0.26);
-  background: linear-gradient(90deg, rgba(76,196,160,0.12), rgba(18,20,34,0.94) 34%);
+  background: linear-gradient(90deg, rgba(76,196,160,0.12), rgba(24,24,24,0.94) 34%);
   box-shadow: none;
 }
 [data-theme="light"] #flow-prompt-bar {
@@ -3132,7 +3163,7 @@ button.todo-item { background: transparent; }
 }
 #flow-prompt-bar.paused {
   border-color: rgba(226,183,74,0.34);
-  background: linear-gradient(90deg, rgba(226,183,74,0.14), rgba(18,20,34,0.94) 34%);
+  background: linear-gradient(90deg, rgba(226,183,74,0.14), rgba(24,24,24,0.94) 34%);
 }
 #flow-prompt-bar.paused .stack-row::before {
   background:#e2b74a;
@@ -3569,7 +3600,7 @@ button.todo-item { background: transparent; }
   overflow: auto;
   padding: 7px;
   border: 1px solid var(--glass-border-2);
-  border-radius: var(--radius-xl);
+  border-radius: var(--liquid-list-popup-radius);
   background: var(--modal-surface);
   box-shadow: var(--shadow-lg), var(--liquid-top-highlight), var(--liquid-inner-shadow);
 }
@@ -3595,6 +3626,10 @@ button.todo-item { background: transparent; }
 .model-select-menu-option:hover,
 .model-select-menu-option:focus-visible { background: var(--control-hover-bg); color: var(--text-bright); outline: none; }
 .model-select-menu-option.selected { background: color-mix(in srgb, var(--accent) 16%, transparent); color: var(--text-bright); }
+.model-select-menu:has(> .liquid-menu-color-block) .model-select-menu-option.selected,
+.newmark-select-menu:has(> .liquid-menu-color-block) .newmark-select-option.selected {
+  background: transparent;
+}
 .liquid-selection-source { background: transparent !important; border-color: transparent !important; }
 .liquid-selection-source::after { display: none !important; opacity: 0 !important; }
 .conv-item.liquid-selection-covered { border-color: transparent !important; }
@@ -3670,7 +3705,7 @@ button.todo-item { background: transparent; }
   transition: top 240ms var(--ease-out-expo), left 240ms var(--ease-out-expo), width 240ms var(--ease-out-expo), height 240ms var(--ease-out-expo), opacity 80ms var(--ease-out-expo), transform 24ms linear, translate 110ms var(--ease-out-expo), scale 80ms linear;
   will-change: top, left, width, height, transform;
   translate: var(--liquid-boundary-x) var(--liquid-boundary-y);
-  scale: calc(1 + var(--liquid-boundary-pull) * .06) calc(1 - var(--liquid-boundary-pull) * .025);
+  scale: var(--liquid-boundary-scale-x, 1) var(--liquid-boundary-scale-y, 1);
 }
 .liquid-selection-float.visible { opacity: 1; --liquid-lift-scale: 1; }
 .liquid-selection-float.liquid-selection-landing {
@@ -3737,10 +3772,16 @@ button.todo-item { background: transparent; }
 .liquid-selection-canvas {
   position: absolute;
   inset: 0;
+  z-index: 0;
   width: 100%;
   height: 100%;
   border-radius: inherit;
   pointer-events: none;
+  mix-blend-mode: normal;
+}
+.liquid-selection-float > :not(.liquid-selection-canvas) {
+  position: relative;
+  z-index: 1;
 }
 @keyframes model-menu-in { from { opacity: 0; transform: translateY(5px) scale(.985); } to { opacity: 1; transform: none; } }
 
@@ -3778,7 +3819,7 @@ button.todo-item { background: transparent; }
   overflow: auto;
   padding: 7px;
   border: 1px solid var(--glass-border-2);
-  border-radius: var(--radius-lg);
+  border-radius: var(--liquid-list-popup-radius);
   background: var(--modal-surface);
   box-shadow: var(--shadow-lg), var(--liquid-top-highlight), var(--liquid-inner-shadow);
 }
@@ -4002,7 +4043,7 @@ button.todo-item { background: transparent; }
 #submit-btn:active { transform: none; scale: 1; }
 
 #submit-btn.working {
-  background: linear-gradient(135deg, #3a3a60 0%, #4a4a70 100%);
+  background: linear-gradient(135deg, #383838 0%, #484848 100%);
   border-color: var(--border);
   box-shadow: none;
   animation: btn-pulse 1.5s ease-in-out infinite;
@@ -4011,7 +4052,7 @@ button.todo-item { background: transparent; }
 #submit-btn.running-action {
   position: relative;
   overflow: visible;
-  background: rgba(14, 16, 24, 0.88);
+  background: rgba(20, 20, 20, 0.88);
   border-color: rgba(255,255,255,0.08);
   box-shadow: 0 0 0 1px rgba(255,255,255,0.04), 0 2px 16px var(--accent-glow);
   animation: none;
@@ -4846,7 +4887,7 @@ textarea.mcp-input { min-height:76px; resize:vertical; font-family:var(--font-mo
   box-shadow: var(--modal-shadow);
 }
 [data-theme="light"] .sub-win.liquid-glass-carrier {
-  background: var(--settings-modal-surface) !important;
+  background: var(--liquid-popup-surface) !important;
 }
 .memory-lab-search-results[hidden] {
   display: none;
@@ -5125,7 +5166,7 @@ textarea.mcp-input { min-height:76px; resize:vertical; font-family:var(--font-mo
   padding: 7px 9px;
   border-radius: var(--radius-md);
   border: 1px solid var(--glass-border-1);
-  background: rgba(15, 18, 32, 0.58);
+  background: rgba(24, 24, 24, 0.58);
   color: var(--text-dim);
   font-size: 11px;
   overflow: hidden;
@@ -5164,10 +5205,13 @@ textarea.mcp-input { min-height:76px; resize:vertical; font-family:var(--font-mo
 }
 .memory-lab-overview-link {
   fill: none;
-  stroke: rgba(150, 168, 210, 0.24);
+  stroke: rgba(168, 168, 168, 0.24);
   stroke-width: 1.05;
   stroke-linecap: round;
 }
+[data-theme="light"] .memory-lab-overview-link {
+  stroke: rgba(150, 168, 210, 0.24);
+}
 .memory-lab-overview-link.hot {
   stroke: rgba(126, 220, 255, 0.78);
   stroke-width: 1.45;
@@ -5204,7 +5248,7 @@ textarea.mcp-input { min-height:76px; resize:vertical; font-family:var(--font-mo
   padding: 0 9px 0 7px;
   border-radius: 999px;
   border: 1px solid var(--glass-border-2);
-  background: rgba(20, 24, 40, 0.72);
+  background: rgba(34, 34, 34, 0.72);
   color: var(--text);
   font: 11px var(--font-ui);
   transform: translate(-50%, -50%);
@@ -5275,7 +5319,7 @@ textarea.mcp-input { min-height:76px; resize:vertical; font-family:var(--font-mo
   padding: 8px 9px;
   border-radius: var(--radius-md);
   border: 1px solid var(--glass-border-1);
-  background: rgba(10, 13, 24, 0.84);
+  background: rgba(20, 20, 20, 0.84);
   color: var(--text);
   box-shadow: var(--shadow-lg);
   pointer-events: none;
@@ -5753,9 +5797,9 @@ html.newmark-memory-overview-viewer body {
 
 
 /* ============================================================
-   LIQUID GLASS (Kyant AndroidLiquidGlass backdrop parity)
-   CSS equivalent of the library lens/edge refraction, top
-   highlight, inner shadow, outer shadow and vibrancy boost.
+   FROSTED GLASS
+   Uniform translucency and real backdrop blur. The neutral rim stays narrow;
+   menu color-block motion never switches to a glass material.
    ============================================================ */
 .liquid-glass {
   position: relative;
@@ -5786,7 +5830,116 @@ html.newmark-memory-overview-viewer body {
   backdrop-filter: blur(calc(var(--glass-blur-3) * 1.5)) saturate(150%) brightness(1.04);
   -webkit-backdrop-filter: blur(calc(var(--glass-blur-3) * 1.5)) saturate(150%) brightness(1.04);
 }
-[data-theme='light'] .liquid-glass {
+@property --liquid-popup-outset {
+  syntax: '<length>';
+  inherits: true;
+  initial-value: 0px;
+}
+.liquid-glass-popup {
+  isolation: isolate;
+  overflow: hidden;
+  clip-path: inset(var(--liquid-popup-edge-y, 0px) var(--liquid-popup-edge-x, 0px) round var(--liquid-popup-radius, var(--radius-xl)));
+  background: var(--liquid-popup-surface);
+  border-color: var(--liquid-popup-rim);
+  backdrop-filter: blur(var(--liquid-popup-blur)) saturate(var(--liquid-popup-saturation));
+  -webkit-backdrop-filter: blur(var(--liquid-popup-blur)) saturate(var(--liquid-popup-saturation));
+  box-shadow: inset 0 0 0 0.5px var(--liquid-popup-inner-rim), var(--liquid-popup-shadow);
+  /* Only the optical boundary responds. Scaling this node also scales every
+     text-bearing descendant and changes pointer-track measurements. */
+  scale: 1;
+  transition: clip-path 120ms var(--ease-out-expo), transform 120ms var(--ease-out-expo), --liquid-popup-outset 120ms var(--ease-out-expo);
+}
+.liquid-popup-optical-canvas {
+  position: absolute;
+  inset: 0 !important;
+  z-index: 0;
+  width: 100%;
+  height: 100%;
+  border-radius: inherit;
+  pointer-events: none;
+  /* This is the carrier surface pass, not a top-level screen overlay. */
+  mix-blend-mode: normal;
+  opacity: 1;
+  transform: none !important;
+  translate: none !important;
+  scale: 1 !important;
+}
+.liquid-glass-popup > :not(.liquid-popup-optical-canvas) {
+  position: relative;
+  z-index: 1;
+}
+.liquid-glass-popup > .liquid-popup-optical-canvas {
+  pointer-events: none;
+}
+/* The selected-option block is another carrier-surface pass.  Keep it
+   absolute and beneath option content; the generic popup content rule above
+   must not promote it into the text layer or make it participate in layout. */
+.liquid-glass-popup > .liquid-menu-color-block {
+  position: absolute;
+  z-index: 0;
+}
+/* List popups are themselves the scroll surface.  The shared popup shell
+   clips optical passes, but its generic overflow:hidden must not shadow the
+   max-height/overflow:auto contract declared by the menu components above. */
+.conv-action-menu.liquid-glass-popup,
+.model-select-menu.liquid-glass-popup,
+.newmark-select-menu.liquid-glass-popup {
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+.model-select-menu.liquid-glass-popup,
+.conv-action-menu.liquid-glass-popup,
+.newmark-select-menu.liquid-glass-popup {
+  --liquid-popup-radius: var(--liquid-list-popup-radius);
+}
+.command-surface.liquid-glass-popup,
+.sub-win.liquid-glass-popup {
+  --liquid-popup-radius: var(--radius-xl);
+}
+#context-inspector.liquid-glass-popup {
+  --liquid-popup-radius: var(--radius-lg);
+}
+.liquid-glass-popup.liquid-popup-exit {
+  transform: scale(.78);
+  transform-origin: var(--liquid-popup-origin-x, 50%) var(--liquid-popup-origin-y, 50%);
+  opacity: 0;
+  transition: transform 190ms var(--ease-out-expo), opacity 170ms var(--ease-out-expo), scale 190ms var(--ease-out-expo);
+}
+.liquid-glass-popup::before {
+  /* The internal canvas owns touch light. No second CSS lamp or baked
+     illumination plane is composited over the frosted material. */
+  background: none;
+  opacity: 0;
+  mix-blend-mode: normal;
+}
+.liquid-glass-popup::after {
+  inset: var(--liquid-popup-edge-y, 0px) var(--liquid-popup-edge-x, 0px);
+  transition: inset 120ms var(--ease-out-expo);
+  border: var(--liquid-popup-edge-width) solid var(--liquid-popup-rim);
+  box-shadow: inset 0 0 0 0.5px var(--liquid-popup-inner-rim);
+}
+[data-theme='light'] .liquid-glass-popup {
+  backdrop-filter: blur(var(--liquid-popup-blur)) saturate(var(--liquid-popup-saturation));
+  -webkit-backdrop-filter: blur(var(--liquid-popup-blur)) saturate(var(--liquid-popup-saturation));
+  box-shadow: inset 0 0 0 0.5px var(--liquid-popup-inner-rim), var(--liquid-popup-shadow);
+}
+[data-theme='light'] .liquid-glass-popup::before {
+  opacity: 0;
+  mix-blend-mode: normal;
+}
+
+/* Keep motion and backdrop work bounded on reduced-motion / low-power PCs. */
+@media (prefers-reduced-motion: reduce) {
+  .liquid-glass-popup,
+  .liquid-glass-popup.liquid-popup-exit,
+  .liquid-menu-color-block,
+  .liquid-selection-float { transition-duration: 1ms !important; animation-duration: 1ms !important; }
+  .liquid-glass-popup::before { opacity: 0; }
+}
+@media (max-width: 900px), (max-height: 680px) {
+  .liquid-glass-popup { --liquid-popup-blur: calc(var(--glass-blur-3) * 3); }
+}
+[data-theme='light'] .liquid-glass:not(.liquid-glass-popup) {
   backdrop-filter: none;
   -webkit-backdrop-filter: none;
 }
@@ -5796,26 +5949,168 @@ html.newmark-memory-overview-viewer body {
 }
 .liquid-glass-carrier {
   background: rgb(var(--glass-rgb-2) / var(--carrier-glass-alpha)) !important;
-  backdrop-filter: blur(var(--carrier-glass-blur)) saturate(150%) brightness(1.02) !important;
-  -webkit-backdrop-filter: blur(var(--carrier-glass-blur)) saturate(150%) brightness(1.02) !important;
+  backdrop-filter: blur(var(--carrier-glass-blur)) saturate(108%) !important;
+  -webkit-backdrop-filter: blur(var(--carrier-glass-blur)) saturate(108%) !important;
+}
+.liquid-glass-popup.liquid-glass-carrier {
+  background: var(--liquid-popup-surface) !important;
+  backdrop-filter: blur(var(--liquid-popup-blur)) saturate(var(--liquid-popup-saturation)) !important;
+  -webkit-backdrop-filter: blur(var(--liquid-popup-blur)) saturate(var(--liquid-popup-saturation)) !important;
+}
+/* A list popup IS the scroll container. Absolute pseudo-elements/canvases
+   belong to its scrolling content and carry a second rounded shell away.
+   Paint its rim and touch light on the scrollport's own background instead;
+   native background-attachment:scroll pins this paint without scroll-event
+   compensation, wrappers, or any changes to option geometry/gesture logic. */
+:is(.conv-action-menu, .model-select-menu, .newmark-select-menu).liquid-glass-popup {
+  background-image: radial-gradient(circle var(--liquid-popup-glow-radius, 20px) at var(--liquid-light-x, 50%) var(--liquid-light-y, 50%), rgba(255,255,255,calc(.24 * var(--liquid-popup-light-opacity, 0))), rgba(255,255,255,0) 100%) !important;
+  background-attachment: scroll;
+  background-origin: padding-box;
+  background-clip: padding-box;
+  /* Clip-path owns inward click feedback within the 8px optical budget.
+     Extend each inset rim to that boundary so its visible edge stays thin. */
+  box-shadow:
+    inset calc(var(--liquid-popup-edge-x, 0px) + 1px) 0 0 var(--liquid-popup-inner-rim),
+    inset calc(-1 * (var(--liquid-popup-edge-x, 0px) + 1px)) 0 0 var(--liquid-popup-inner-rim),
+    inset 0 calc(var(--liquid-popup-edge-y, 0px) + 1px) 0 var(--liquid-popup-inner-rim),
+    inset 0 calc(-1 * (var(--liquid-popup-edge-y, 0px) + 1px)) 0 var(--liquid-popup-inner-rim),
+    var(--liquid-popup-shadow);
+}
+:is(.conv-action-menu, .model-select-menu, .newmark-select-menu).liquid-glass-popup::before,
+:is(.conv-action-menu, .model-select-menu, .newmark-select-menu).liquid-glass-popup::after {
+  content: none;
+}
+:is(.conv-action-menu, .model-select-menu, .newmark-select-menu).liquid-glass-popup > .liquid-popup-optical-canvas {
+  display: none;
+}
+/* A held outward pull expands the actual frosted material, never the text or
+   scroll container. Native backdrops stay below their own top-layer popover;
+   other popups use a decorative sibling inside their existing overlay. */
+.liquid-glass-popup[data-liquid-popup-feedback='outward']::backdrop,
+.liquid-popup-feedback-surface {
+  box-sizing: border-box;
+  inset: auto;
+  margin: 0;
+  padding: 0;
+  left: calc(var(--liquid-feedback-left) - var(--liquid-popup-outset) * var(--liquid-popup-pull-left, 0));
+  top: calc(var(--liquid-feedback-top) - var(--liquid-popup-outset) * var(--liquid-popup-pull-top, 0));
+  width: calc(var(--liquid-feedback-width) + var(--liquid-popup-outset) * (var(--liquid-popup-pull-left, 0) + var(--liquid-popup-pull-right, 0)));
+  height: calc(var(--liquid-feedback-height) + var(--liquid-popup-outset) * (var(--liquid-popup-pull-top, 0) + var(--liquid-popup-pull-bottom, 0)));
+  border: 1px solid var(--liquid-feedback-rim);
+  /* Each corner follows only its adjacent force-facing sides. The opposite
+     contour, including its corners, keeps the popup's original radius. */
+  border-radius:
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-left, 0))
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-right, 0))
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-right, 0))
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-left, 0)) /
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-top, 0))
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-top, 0))
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-bottom, 0))
+    calc(var(--liquid-feedback-radius) + var(--liquid-popup-outset) * var(--liquid-popup-pull-bottom, 0));
+  background: var(--liquid-feedback-color);
+  backdrop-filter: var(--liquid-feedback-filter);
+  -webkit-backdrop-filter: var(--liquid-feedback-filter);
+  box-shadow: inset 0 0 0 .5px var(--liquid-feedback-inner-rim);
+  pointer-events: none;
+}
+.liquid-popup-feedback-surface {
+  position: absolute;
+  transition: --liquid-popup-outset 120ms var(--ease-out-expo);
+}
+:root .liquid-glass-popup[data-liquid-popup-feedback='outward'] {
+  /* The feedback surface owns this material once. Keeping another background
+     or backdrop here would darken it and leave seams around the old outline. */
+  background-color: transparent !important;
+  border-color: transparent !important;
+  backdrop-filter: none !important;
+  -webkit-backdrop-filter: none !important;
+  box-shadow: none !important;
+}
+.liquid-glass-popup[data-liquid-popup-feedback='outward']::after { opacity: 0; }
+@media (prefers-reduced-motion: reduce) {
+  .liquid-popup-feedback-surface { transition-duration: 1ms !important; }
+}
+.model-select-menu-option,
+.newmark-select-option,
+.conv-action-menu-item,
+.command-option,
+.workspace-type-option {
+  --liquid-option-x: 0px;
+  --liquid-option-y: 0px;
+  --liquid-option-press: 0;
+  --liquid-option-origin-x: 50%;
+  --liquid-option-origin-y: 50%;
+  transform: translate(var(--liquid-option-x), var(--liquid-option-y)) scale(calc(1 + var(--liquid-option-press) * 0.035));
+  transform-origin: var(--liquid-option-origin-x) var(--liquid-option-origin-y);
+  transition: transform 110ms var(--ease-out-expo), background-color 110ms var(--ease-out-expo), filter 110ms var(--ease-out-expo);
+}
+.model-select-menu-option,
+.newmark-select-option {
+  position: relative;
+  z-index: 1;
+}
+/* Popup option content stays fixed; the carrier block owns movement and
+   elastic response so text/icons never translate or scale during a drag. */
+.model-select-menu[data-liquid-direct-options="true"] > .model-select-menu-option,
+.newmark-select-menu[data-liquid-direct-options="true"] > .newmark-select-option {
+  transform: none !important;
+  scale: 1 !important;
+  filter: none !important;
+}
+.liquid-glass-popup .conv-action-menu-item,
+.liquid-glass-popup .command-option,
+.liquid-glass-popup .workspace-type-option {
+  transform: none !important;
+  scale: 1 !important;
+}
+.liquid-menu-color-block {
+  position: absolute;
+  /* Inline left/top own the flight. An important inset shorthand overrides
+     both coordinates and strands the block after the last option. */
+  inset: auto;
+  z-index: 0;
+  pointer-events: none;
+  background: color-mix(in srgb, var(--accent) 16%, transparent);
+  /* Match the original selected capsule silhouette at every menu width. */
+  border-radius: var(--radius-full);
+  box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent) 18%, transparent);
+  transition: left 240ms var(--ease-out-expo), top 240ms var(--ease-out-expo), width 240ms var(--ease-out-expo), height 240ms var(--ease-out-expo), opacity 80ms var(--ease-out-expo);
+  transform: none !important;
+  translate: none !important;
+  scale: 1 !important;
+}
+.liquid-menu-color-block.liquid-block-lifted {
+  /* This class is an interaction-state marker, not a material switch. Keep
+     the base color, outline and content stacking for the entire journey. */
+  backdrop-filter: none;
+  -webkit-backdrop-filter: none;
+}
+.liquid-menu-color-block.liquid-block-lifted::after {
+  content: none;
+}
+.model-select-menu-option.liquid-option-dragging,
+.newmark-select-option.liquid-option-dragging {
+  filter: brightness(1.08) saturate(1.08);
+  box-shadow: var(--liquid-top-highlight), var(--liquid-inner-shadow), 0 5px 16px rgba(0,0,0,0.18);
 }
 /* List popups use the live carrier refraction only. The old static outer
    glow/shadow painted a second fixed background behind the popup. */
-.conv-action-menu.liquid-glass,
-.model-select-menu.liquid-glass,
-.newmark-select-menu.liquid-glass {
+.conv-action-menu.liquid-glass:not(.liquid-glass-popup),
+.model-select-menu.liquid-glass:not(.liquid-glass-popup),
+.newmark-select-menu.liquid-glass:not(.liquid-glass-popup) {
   box-shadow: none;
 }
-.conv-action-menu.liquid-glass::before,
-.model-select-menu.liquid-glass::before,
-.newmark-select-menu.liquid-glass::before {
+.conv-action-menu.liquid-glass:not(.liquid-glass-popup)::before,
+.model-select-menu.liquid-glass:not(.liquid-glass-popup)::before,
+.newmark-select-menu.liquid-glass:not(.liquid-glass-popup)::before {
   background: none;
   opacity: 0;
   mix-blend-mode: normal;
 }
-.conv-action-menu.liquid-glass::after,
-.model-select-menu.liquid-glass::after,
-.newmark-select-menu.liquid-glass::after {
+.conv-action-menu.liquid-glass:not(.liquid-glass-popup)::after,
+.model-select-menu.liquid-glass:not(.liquid-glass-popup)::after,
+.newmark-select-menu.liquid-glass:not(.liquid-glass-popup)::after {
   box-shadow: none;
 }
 .liquid-selection-canvas { opacity: var(--liquid-float-optical-opacity); }
@@ -5877,6 +6172,11 @@ button:disabled { opacity: 0.5; }
 .shell-btn::after,
 .option-btn::after,
 .stack-icon-btn::after { display: none !important; }
+.model-select-menu-option::after,
+.newmark-select-option::after,
+.conv-action-menu-item::after,
+.command-option::after,
+.workspace-type-option::after { display: none !important; }
 #left-ws-add::after { display: none !important; }
 #left-ws-add:active,
 .left-collapse-btn:active { transform: none !important; scale: 1 !important; }
@@ -6328,6 +6628,13 @@ input[type="checkbox"].liquid-switch-dragging::before {
       <path d="M17 21v-7a1 1 0 0 0-1-1H8a1 1 0 0 0-1 1v7" />
       <path d="M7 3v4a1 1 0 0 0 1 1h7" />
     </symbol>
+    <symbol id="scale" viewBox="0 0 24 24">
+      <path d="M12 3v18" />
+      <path d="m19 8 3 8a5 5 0 0 1-6 0zV7" />
+      <path d="M3 7h1a17 17 0 0 0 8-2 17 17 0 0 0 8 2h1" />
+      <path d="m5 8 3 8a5 5 0 0 1-6 0zV7" />
+      <path d="M7 21h10" />
+    </symbol>
     <symbol id="scroll" viewBox="0 0 24 24">
       <path d="M19 17V5a2 2 0 0 0-2-2H4" />
       <path d="M8 21h12a2 2 0 0 0 2-2v-1a1 1 0 0 0-1-1H11a1 1 0 0 0-1 1v1a2 2 0 1 1-4 0V5a2 2 0 1 0-4 0v2a1 1 0 0 0 1 1h3" />
@@ -6593,13 +6900,13 @@ input[type="checkbox"].liquid-switch-dragging::before {
             <div class="model-select-shell" id="model-select-shell">
               <select class="model-select-native" id="model-select" tabindex="-1" aria-hidden="true"></select>
               <button type="button" class="tool-select model-select-button" id="model-select-button" aria-haspopup="listbox" aria-expanded="false" onclick="window.toggleModelSelectMenu()" onkeydown="window.handleModelSelectButtonKey(event)"><span class="model-select-button-label" id="model-select-label"></span><svg class="nm-icon tiny" aria-hidden="true" focusable="false"><use href="#chevron-down"></use></svg></button>
-              <div class="model-select-menu liquid-glass liquid-glass-carrier" id="model-select-menu" role="listbox" aria-label="Model" popover="manual"></div>
+              <div class="model-select-menu liquid-glass liquid-glass-carrier liquid-glass-popup" id="model-select-menu" role="listbox" aria-label="Model" popover="manual"></div>
             </div>
-            <div class="conv-action-menu liquid-glass liquid-glass-carrier" id="conversation-action-menu" role="menu" aria-label="Conversation actions" popover="manual"></div>
+            <div class="conv-action-menu liquid-glass liquid-glass-carrier liquid-glass-popup" id="conversation-action-menu" role="menu" aria-label="Conversation actions" popover="manual"></div>
             <div class="context-token-wrap">
               <button type="button" id="context-token-ring" title="Context tokens" aria-haspopup="dialog" aria-expanded="false" onclick="window.toggleContextInspector()" onmouseenter="window.showContextWindowTooltip()" onmouseleave="window.hideContextWindowTooltip()" onfocus="window.showContextWindowTooltip()" onblur="window.hideContextWindowTooltip()"><span class="icon-only-label">Context tokens</span></button>
               <div id="context-token-tooltip"></div>
-              <div id="context-inspector" role="dialog" aria-label="Context management" aria-live="polite"></div>
+              <div id="context-inspector" class="liquid-glass liquid-glass-popup" role="dialog" aria-label="Context management" aria-live="polite"></div>
             </div>
             <select class="tool-select" id="intel-select">
               <option value="low">low</option>
@@ -6713,7 +7020,7 @@ input[type="checkbox"].liquid-switch-dragging::before {
 
   <!-- ========== SUB-WINDOW OVERLAY ========== -->
   <div class="sub-win-overlay" id="sub-win-overlay" onclick="if(event.target===this)window.closeSubWin()">
-    <div class="sub-win liquid-glass liquid-glass-carrier" id="sub-win" role="dialog" aria-modal="true" aria-labelledby="sub-win-title" tabindex="-1">
+    <div class="sub-win liquid-glass liquid-glass-carrier liquid-glass-popup" id="sub-win" role="dialog" aria-modal="true" aria-labelledby="sub-win-title" tabindex="-1">
       <div class="sub-win-header" id="sub-win-header">
         <span class="sub-win-title" id="sub-win-title">Window</span>
         <button class="sub-win-close" onclick="window.closeSubWin()" title="Close"><svg class="nm-icon small" aria-hidden="true" focusable="false"><use href="#x"></use></svg><span class="icon-only-label">Close</span></button>
@@ -6722,7 +7029,7 @@ input[type="checkbox"].liquid-switch-dragging::before {
     </div>
   </div>
   <div class="command-surface-overlay" id="command-surface-overlay" onclick="if(event.target===this)window.closeCommandSurface()">
-    <section class="command-surface" id="command-surface" role="dialog" aria-modal="true" aria-labelledby="command-surface-title" tabindex="-1">
+    <section class="command-surface liquid-glass liquid-glass-popup" id="command-surface" role="dialog" aria-modal="true" aria-labelledby="command-surface-title" tabindex="-1">
       <header class="command-surface-header">
         <div class="command-surface-heading">
           <div class="command-surface-title" id="command-surface-title"></div>
@@ -7625,9 +7932,17 @@ var NEWMARK_I18N = {
     'status.subagentRecords': 'active or retained agent record(s)',
     'status.contextCompressed': 'Context compressed',
     'status.contextCompression': 'Context compression',
-    'status.contextTokens': 'Context tokens',
-    'status.conversationTokens': 'Conversation tokens',
-    'status.cacheHitRate': 'Cache hit rate',
+    'status.contextTokens': 'Context tokens (estimated)',
+    'status.conversationTokens': 'Conversation usage (reported)',
+    'status.cacheHitRate': 'Conversation cache hit rate',
+    'status.usageUnavailable': 'Not reported',
+    'status.cacheReportedPortion': 'Reported portion',
+    'status.lastReportedInput': 'Latest main request input (reported)',
+    'status.requestOverhead': 'System / tools (estimated)',
+    'status.requestOverheadExcluded': 'Not included in history estimate',
+    'status.contextEstimateHistory': 'Current retained history estimate; not provider billing.',
+    'status.contextEstimateRequest': 'Submitted request estimate, including system and tool schemas; not provider billing.',
+    'status.contextEstimateImages': 'Image content is present; image token cost is not included in the text estimate.',
     'status.contextNearLimit': 'Context near limit',
     'status.contextOverLimit': 'Context over limit',
     'status.contextModeFallback': 'fallback',
@@ -7636,12 +7951,12 @@ var NEWMARK_I18N = {
     'status.noCompression': 'No compression event in this conversation',
     'status.contextInspector': 'Context management',
     'status.contextInspectorHint': 'Live context budget; visible chat history stays unchanged.',
-    'status.activeBuild': 'Active Build',
-    'status.longHistory': 'Long history',
+    'status.activeBuild': 'Build history (estimated)',
+    'status.longHistory': 'Long history (estimated)',
     'status.trigger': 'Trigger',
     'status.retention': 'Retention',
-    'status.hotCache': 'Hot cache',
-    'status.coldArchive': 'Cold archive',
+    'status.hotCache': 'Local history cache',
+    'status.coldArchive': 'Local history archive',
     'status.lastCompression': 'Last compression',
     'status.noCompressionShort': 'No compression yet',
     'status.compressNow': 'Compress now',
@@ -8358,9 +8673,17 @@ var NEWMARK_I18N = {
     'status.subagentRecords': '个活跃或保留的 agent 记录',
     'status.contextCompressed': '上下文已压缩',
     'status.contextCompression': '上下文压缩',
-    'status.contextTokens': '上下文 token',
-    'status.conversationTokens': '全对话 token',
-    'status.cacheHitRate': '缓存命中率',
+    'status.contextTokens': '上下文 token（估算）',
+    'status.conversationTokens': '对话累计用量（实测）',
+    'status.cacheHitRate': '对话总缓存命中率',
+    'status.usageUnavailable': '未上报',
+    'status.cacheReportedPortion': '已上报部分',
+    'status.lastReportedInput': '最近主请求输入（实测）',
+    'status.requestOverhead': '系统 / 工具（估算）',
+    'status.requestOverheadExcluded': '当前历史估算未计入',
+    'status.contextEstimateHistory': '当前保留历史的本地估算，不代表服务端计费用量。',
+    'status.contextEstimateRequest': '已提交请求的本地估算，含系统提示与工具 schema，不代表服务端计费用量。',
+    'status.contextEstimateImages': '请求包含图片；文本估算未计入图片 token 开销。',
     'status.contextNearLimit': '上下文接近上限',
     'status.contextOverLimit': '上下文已超限',
     'status.contextModeFallback': 'fallback',
@@ -8369,12 +8692,12 @@ var NEWMARK_I18N = {
     'status.noCompression': '当前对话暂无压缩事件',
     'status.contextInspector': '上下文管理',
     'status.contextInspectorHint': '实时上下文预算；可见对话历史不会被改写。',
-    'status.activeBuild': '当前 Build',
-    'status.longHistory': '长期历史',
+    'status.activeBuild': 'Build 内历史（估算）',
+    'status.longHistory': '长期历史（估算）',
     'status.trigger': '触发线',
     'status.retention': '保留量',
-    'status.hotCache': '热缓存',
-    'status.coldArchive': '冷归档',
+    'status.hotCache': '本地历史缓存',
+    'status.coldArchive': '本地历史归档',
     'status.lastCompression': '最近一次压缩',
     'status.noCompressionShort': '尚未压缩',
     'status.compressNow': '立即压缩',
@@ -9000,22 +9323,18 @@ function syncTerminalShellOptions() {
 
 // === API Bridge ===
 var api = window.api || {
-  queueAction: async function(action, input) {
+  queueAction: async function(action, input, requestedTarget) {
     try {
-      var target = normalizeQueuedConversationTarget(currentConversationTarget());
+      var target = normalizeQueuedConversationTarget(requestedTarget || currentConversationTarget());
       if (!target) return { ok: false, error: 'No active conversation target' };
       var body = {
         workspaceId: target.workspaceId,
         conversationId: target.conversationId,
-        action: action,
-        id: String(input && input.id || ''),
-        text: String(input && input.text || ''),
-        value: String(input && input.text || ''),
-        requestedMode: String(input && input.requestedMode || 'build'),
-        goalObjective: String(input && input.goalObjective || ''),
-        createdAt: String(input && input.createdAt || ''),
+        action: action
       };
-      if (Array.isArray(input && input.orderedIds)) body.orderedIds = input.orderedIds;
+      ['id', 'text', 'value', 'requestedMode', 'goalObjective', 'createdAt', 'images', 'paused', 'orderedIds'].forEach(function(field) {
+        if (input && Object.prototype.hasOwnProperty.call(input, field)) body[field] = input[field];
+      });
       var r = await fetch('/api/queue-action', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -9024,11 +9343,20 @@ var api = window.api || {
       return r.json();
     } catch(e) { return { ok: false, error: e.message }; }
   },
-  sendMessage: async function(msg, conversationId) {
+  sendMessage: async function(msg, requestedTarget, options) {
     try {
-      var body = {message: msg, mode: state.mode, model: state.model, intelligence: state.intelligence, inputMode: state.inputMode};
-      if (conversationId) body.conversation = conversationId;
-      if (state.mode === 'flow' && state.defaultFlow) body.defaultFlow = state.defaultFlow;
+      options = options || {};
+      var target = normalizeQueuedConversationTarget(typeof requestedTarget === 'object' ? requestedTarget : currentConversationTarget(requestedTarget));
+      var body = {message: msg, mode: options.requestedMode || state.mode, model: state.model, intelligence: state.intelligence, inputMode: options.inputMode || state.inputMode};
+      if (target) { body.conversation = target.conversationId; body.conversationId = target.conversationId; body.workspaceId = target.workspaceId; }
+      body.requestedMode = options.requestedMode || state.mode;
+      body.goalObjective = options.goalObjective || '';
+      body.clientMessageId = options.clientMessageId || '';
+      if (body.mode === 'flow') {
+        body.flowName = options.flowName || state.defaultFlow;
+        body.defaultFlow = body.flowName;
+      }
+      if (options.flowStart !== undefined) body.flowStart = options.flowStart;
       var r = await fetch('/api/send', {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
@@ -9037,8 +9365,13 @@ var api = window.api || {
       return r.json();
     } catch(e) { return {error: e.message}; }
   },
-  getState: async function() {
-    try { var r = await fetch('/api/state'); return r.json(); }
+  getState: async function(requestedTarget) {
+    try {
+      var target = normalizeQueuedConversationTarget(typeof requestedTarget === 'object' ? requestedTarget : currentConversationTarget(requestedTarget));
+      var query = target ? '?' + new URLSearchParams({ workspaceId: target.workspaceId, conversationId: target.conversationId }).toString() : '';
+      var r = await fetch('/api/state' + query);
+      return r.json();
+    }
     catch(e) { return {}; }
   },
   getConversationDraft: async function(conversationId) {
@@ -9048,8 +9381,19 @@ var api = window.api || {
   saveConversationDraft: async function(conversationId, draft) {
     try { await fetch('/api/conversation-draft', {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({conversationId:conversationId || '', draft:draft === null || draft === undefined ? '' : String(draft)})}); } catch(e) {}
   },
-  setMode: async function(m) {
-    try { await fetch('/api/mode', {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({mode:m})}); } catch(e) {}
+  setMode: async function(m, requestedTarget) {
+    try {
+      var target = normalizeQueuedConversationTarget(requestedTarget || currentConversationTarget());
+      var r = await fetch('/api/mode', {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(Object.assign({mode:m}, target || {}))});
+      return r.json();
+    } catch(e) { return { ok: false, error: e.message }; }
+  },
+  setInputMode: async function(mode, requestedTarget) {
+    try {
+      var target = normalizeQueuedConversationTarget(requestedTarget || currentConversationTarget());
+      var r = await fetch('/api/input-mode', {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(Object.assign({inputMode: mode}, target || {}))});
+      return r.json();
+    } catch(e) { return { ok: false, error: e.message }; }
   },
   setModel: async function(m) {
     try { await fetch('/api/model', {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({model:m})}); } catch(e) {}
@@ -10293,7 +10637,7 @@ function registerRuntimeKey(target, runtimeKey) {
   if (!state.runtimeKeyAliases) state.runtimeKeyAliases = {};
   state.runtimeKeyAliases[base] = runtimeKey;
   if (previous !== runtimeKey) {
-    ['runningConversations', 'conversationRuntimeStates', 'agentWorkEventsByConversation', 'agentWorkUiByConversation', 'workRunsByTarget', 'workRunsByBranch', 'runtimeBranchPathsByTarget', 'guideMessagesByTarget', 'trackedConversationUntil', 'backendQueuesByTarget', 'activeSendCallsByTarget', 'nextQueueSchedulesByTarget', 'nextQueueDrainsByTarget', 'queuePausedByTarget', 'conversationDrafts'].forEach(function(storeName) {
+    ['runningConversations', 'conversationRuntimeStates', 'conversationWorkRevisions', 'agentWorkEventsByConversation', 'agentWorkUiByConversation', 'workRunsByTarget', 'workRunsByBranch', 'runtimeBranchPathsByTarget', 'guideMessagesByTarget', 'trackedConversationUntil', 'backendQueuesByTarget', 'activeSendCallsByTarget', 'nextQueueSchedulesByTarget', 'nextQueueDrainsByTarget', 'queuePausedByTarget', 'conversationDrafts'].forEach(function(storeName) {
       var store = state[storeName];
       if (!store || store[previous] === undefined) return;
       if (store[runtimeKey] === undefined) store[runtimeKey] = store[previous];
@@ -10535,12 +10879,14 @@ function setConversationRuntimeState(target, status, runId, extra) {
   target = target || currentConversationTarget();
   var key = runtimeKeyFor(target.workspaceId, target.conversationId);
   if (!state.conversationRuntimeStates) state.conversationRuntimeStates = {};
+  var previousRuntime = state.conversationRuntimeStates[key];
   var next = Object.assign({}, state.conversationRuntimeStates[key] || {}, extra || {}, {
     target: { workspaceId: String(target.workspaceId || ''), conversationId: String(target.conversationId || 'default') },
     status: String(status || 'idle'),
     runId: String(runId || (state.conversationRuntimeStates[key] && state.conversationRuntimeStates[key].runId) || '')
   });
   state.conversationRuntimeStates[key] = next;
+  if (!previousRuntime || previousRuntime.runId !== next.runId || previousRuntime.status !== next.status) advanceConversationWorkRevision(target);
   if (!state.runningConversations) state.runningConversations = {};
   if (['running', 'stopping', 'force_restarting'].indexOf(next.status) >= 0) state.runningConversations[key] = next;
   else delete state.runningConversations[key];
@@ -10595,6 +10941,9 @@ function requestBackendStopForProvisionalStart(target, runId) {
     ? api.stopConversation({ target: target, runId: String(runId || ''), force: false })
     : (api.abortConversation ? api.abortConversation(target) : Promise.resolve({ action: 'not_running' }));
   Promise.resolve(stopPromise).then(function(result) {
+    if (!conversationRunStillOwnsTarget(target, runId)) return;
+    var currentStop = state.conversationRuntimeStates && state.conversationRuntimeStates[runtimeKeyFor(target.workspaceId, target.conversationId)];
+    if (currentStop && currentStop.status !== 'stopping') return;
     var action = String(result && result.action || '');
     if (action === 'not_running' || action === 'stale') {
       return refreshConversationRuntimeAfterStopRace(target, runId, result);
@@ -10611,6 +10960,9 @@ function requestBackendStopForProvisionalStart(target, runId) {
       setConversationRuntimeState(target, 'interrupted', runId, { provisional: false });
     }
   }).catch(function(error) {
+    if (!conversationRunStillOwnsTarget(target, runId)) return;
+    var currentStop = state.conversationRuntimeStates && state.conversationRuntimeStates[runtimeKeyFor(target.workspaceId, target.conversationId)];
+    if (currentStop && currentStop.status !== 'stopping') return;
     setConversationRuntimeState(target, 'running', runId, { provisional: false });
     showUiNotice(error && error.message ? error.message : String(error), 'error', 'stop-provisional-' + runtimeKeyFor(target.workspaceId, target.conversationId) + '-' + String(runId || ''));
   });
@@ -10728,6 +11080,7 @@ function publicWorkEventForUi(event) {
     model: String(event.model || ''),
     timestamp: String(event.timestamp || ''),
     toolName: toolName,
+    toolCallId: event.toolCallId,
     toolArgs: type === 'tool_call' ? String(event.toolArgs || '') : '',
     workspaceId: String(event.workspaceId || (event.target && event.target.workspaceId) || ''),
     workspaceKey: event.workspaceKey,
@@ -10916,9 +11269,10 @@ function syncWorkRunsSnapshot(runs, target, branchId) {
       if (liveOnlyEvents.length) {
          item.events = dedupeGuideWorkEvents(item.events.concat(liveOnlyEvents)).sort(compareConversationWorkEvents);
         item.sequence = Math.max(Number(item.sequence || 0), Number(previous.sequence || 0));
-        if (['running', 'stopping', 'force_restarting'].indexOf(String(previous.status || '')) >= 0) {
+        if (Number(previous.sequence || 0) > Number(run.sequence || 0)) {
           item.status = previous.status;
           item.endedAt = previous.endedAt;
+          item.expanded = previous.expanded;
         }
       }
     }
@@ -11473,6 +11827,31 @@ function renderWorkRunEvents(run, includeGuides) {
   }).join('') + '</div>';
 }
 
+// A length/ID key alone cannot detect an equal-length correction or the
+// transition from large live plain text to terminal Markdown. Keep the exact
+// render input on the DOM node, not in a large data-* attribute or global cache.
+function workRunEventRenderState(event, run, terminalInterrupted) {
+  var type = String(event && event.type || '').toLowerCase();
+  if (['public_text', 'partial_text', 'response', 'thought'].indexOf(type) < 0) return null;
+  var live = ['running', 'stopping', 'force_restarting'].indexOf(String(run && run.status || '').toLowerCase()) >= 0;
+  return currentLang() + ':' + (live ? 'live' : 'terminal') + ':' + (terminalInterrupted ? 'partial' : 'whole') + ':' + String(event && event.content || '');
+}
+
+function rememberWorkRunEventRenderStates(run, body, expanded) {
+  var container = body && body.querySelector('.conversation-work-run-events');
+  if (!container) return;
+  var presented = presentedWorkRunEvents(run, expanded);
+  Array.prototype.forEach.call(container.children, function(node, index) {
+    node._newmarkWorkEventRenderState = workRunEventRenderState(presented.events[index], run, presented.terminalInterrupted);
+  });
+}
+
+function setWorkRunStackHtml(stack, html) {
+  if (stack._newmarkWorkStackHtml === html) return;
+  stack.innerHTML = html;
+  stack._newmarkWorkStackHtml = html;
+}
+
 // 增量更新 run body 内的事件列表：保留与新呈现列表 key 一致的前缀节点，
 // 从第一个分歧节点起重建尾部。运行中通常只有最后一个文本/thought 节点
 // 增长或尾部追加，因此不会整块重绘整个进程渲染。
@@ -11481,6 +11860,7 @@ function updateWorkRunEventsContainer(run, body, expanded) {
   var container = body.querySelector ? body.querySelector('.conversation-work-run-events') : null;
   if (!container) {
     body.innerHTML = renderWorkRunEvents(run, expanded);
+    rememberWorkRunEventRenderStates(run, body, expanded);
     return;
   }
   if (!presented.events.length) {
@@ -11491,7 +11871,8 @@ function updateWorkRunEventsContainer(run, body, expanded) {
   var nodes = Array.prototype.slice.call(container.children);
   var keep = 0;
   while (keep < nodes.length && keep < presented.events.length) {
-    if (String(nodes[keep].getAttribute('data-work-event-key') || '') === workRunPresentedEventKey(presented.events[keep], keep)) keep++;
+    if (String(nodes[keep].getAttribute('data-work-event-key') || '') === workRunPresentedEventKey(presented.events[keep], keep)
+      && nodes[keep]._newmarkWorkEventRenderState === workRunEventRenderState(presented.events[keep], run, presented.terminalInterrupted)) keep++;
     else break;
   }
   while (container.children.length > keep) container.removeChild(container.lastChild);
@@ -11502,6 +11883,7 @@ function updateWorkRunEventsContainer(run, body, expanded) {
     while (holder.firstChild) {
       var node = holder.firstChild;
       node.setAttribute('data-work-event-key', key);
+      node._newmarkWorkEventRenderState = workRunEventRenderState(presented.events[i], run, presented.terminalInterrupted);
       container.appendChild(node);
     }
   }
@@ -11546,6 +11928,7 @@ function updateConversationWorkRunElement(run, element) {
       '<span class="conversation-work-run-status">' + esc(String(run.status || '')) + '</span>' +
       '<span class="conversation-work-run-chevron" aria-hidden="true"></span></button>' +
       '<div class="conversation-work-run-body">' + renderWorkRunEvents(run, expanded) + '</div>';
+    rememberWorkRunEventRenderStates(run, element.querySelector('.conversation-work-run-body'), expanded);
   } else {
     // 就地更新头部，不重建 head 按钮（保住聚焦/动画状态）。
     var titleEl = head.querySelector('.conversation-work-run-title');
@@ -11581,7 +11964,10 @@ function updateConversationWorkRunElement(run, element) {
     }
     var body = element.querySelector('.conversation-work-run-body');
     if (body) updateWorkRunEventsContainer(run, body, expanded);
-    else element.insertAdjacentHTML('beforeend', '<div class="conversation-work-run-body">' + renderWorkRunEvents(run, expanded) + '</div>');
+    else {
+      element.insertAdjacentHTML('beforeend', '<div class="conversation-work-run-body">' + renderWorkRunEvents(run, expanded) + '</div>');
+      rememberWorkRunEventRenderStates(run, element.querySelector('.conversation-work-run-body'), expanded);
+    }
   }
   renderPendingGuideMessages(run.target, {});
   var wrapper = element.closest ? element.closest('.work-run-message') : null;
@@ -11594,14 +11980,14 @@ function updateConversationWorkRunElement(run, element) {
       imageStack.className = 'work-run-collapsed-images';
     }
     if (imageStack.previousElementSibling !== element) wrapper.insertBefore(imageStack, element.nextSibling);
-    imageStack.innerHTML = expanded ? '' : displayImages.map(renderWorkDisplayImage).join('');
+    setWorkRunStackHtml(imageStack, expanded ? '' : displayImages.map(renderWorkDisplayImage).join(''));
     var guideStack = wrapper.querySelector(':scope > .work-run-collapsed-guides');
     if (!guideStack) {
       guideStack = document.createElement('div');
       guideStack.className = 'work-run-collapsed-guides';
       wrapper.appendChild(guideStack);
     }
-    guideStack.innerHTML = expanded ? '' : workRunGuideEvents(run).map(renderWorkRunGuideMessage).join('');
+    setWorkRunStackHtml(guideStack, expanded ? '' : workRunGuideEvents(run).map(renderWorkRunGuideMessage).join(''));
   }
   hydrateWorkDisplayImages(wrapper || element, (run.events || []).map(function(event) { return event && event.displayImage; }).filter(Boolean));
   hydrateWorkRunGuideMessages(wrapper || element, run);
@@ -12085,7 +12471,10 @@ function renderChatMessages(messages, target) {
   var liveArea = els['chat-area'];
   if (!liveArea) return;
   var previousRendered = Array.isArray(state.renderedChatMessages) ? state.renderedChatMessages.slice() : [];
-  var previousHtml = liveArea.innerHTML;
+  // Staging leaves the live transcript untouched until commit. Keep its nodes
+  // for rollback instead of serializing a potentially long HTML transcript;
+  // this also preserves listeners if rendering fails.
+  var previousNodes = Array.prototype.slice.call(liveArea.childNodes);
   var previousScrollTop = liveArea.scrollTop;
   var wasAtBottom = shouldAutoScroll(liveArea);
   var stagingArea = liveArea.cloneNode(false);
@@ -12097,7 +12486,7 @@ function renderChatMessages(messages, target) {
     else liveArea.scrollTop = previousScrollTop;
   } catch (error) {
     state.renderedChatMessages = previousRendered;
-    liveArea.innerHTML = previousHtml;
+    liveArea.replaceChildren.apply(liveArea, previousNodes);
     liveArea.scrollTop = previousScrollTop;
     console.error('[ui_chat_render_failed]', error);
     showUiNotice(currentLang() === 'zh' ? '对话渲染出现异常，已保留原内容。' : 'Chat rendering failed; the previous content was preserved.', 'error', 'chat-render-failed');
@@ -12278,20 +12667,25 @@ function renderLoadEarlierButton() {
   button.className = 'conversation-load-earlier';
   button.textContent = currentLang() === 'zh' ? ('加载更早的 ' + Number(before) + ' 条消息') : ('Load ' + Number(before) + ' earlier messages');
   button.addEventListener('click', function() {
-    var loadTarget = currentConversationTarget();
+    var loadTarget = target;
+    if (!isActiveConversationTarget(loadTarget) || button.disabled) return;
     var loadKey = runtimeKeyFor(loadTarget.workspaceId, loadTarget.conversationId);
     var loadBefore = state.conversationLoadedBefore && state.conversationLoadedBefore[loadKey];
     if (!Number.isFinite(Number(loadBefore)) || Number(loadBefore) <= 0) return;
+    var loadGeneration = state.conversationLoadGeneration;
+    var loadBranch = JSON.stringify([state.activeConversationBranchId || '', state.viewedConversationBranchNodePath || []]);
     button.disabled = true;
     api.loadEarlierConversationMessages({ workspaceId: loadTarget.workspaceId, conversationId: loadTarget.conversationId, window: 200, before: loadBefore }).then(function(result) {
       button.disabled = false;
+      if (!isActiveConversationTarget(loadTarget) || loadGeneration !== state.conversationLoadGeneration
+        || loadBranch !== JSON.stringify([state.activeConversationBranchId || '', state.viewedConversationBranchNodePath || []])
+        || Number(state.conversationLoadedBefore[loadKey]) !== Number(loadBefore)) return;
       if (!result || !Array.isArray(result.chatMessages) || !result.chatMessages.length) return;
       var newer = state.renderedChatMessages || [];
-      state.renderedChatMessages = (result.chatMessages || []).concat(newer);
+      var mergedMessages = result.chatMessages.concat(newer);
       state.conversationLoadedBefore[loadKey] = Math.max(0, Number(result.windowStart) || 0);
       var chatWasAtBottom = shouldAutoScroll(els['chat-area']);
-      els['chat-area'].innerHTML = '';
-      renderChatMessages(state.renderedChatMessages);
+      renderChatMessages(mergedMessages, loadTarget);
       if (!chatWasAtBottom && els['chat-area']) els['chat-area'].scrollTop = 0;
       renderLoadEarlierButton();
     }).catch(function() { button.disabled = false; });
@@ -12553,29 +12947,88 @@ function replayActiveAgentWorkEvents() {
 }
 
 var _conversationsRenderPending = false;
+function conversationWorkRevision(target) {
+  var key = runtimeKeyFor(target.workspaceId, target.conversationId);
+  return Number(state.conversationWorkRevisions && state.conversationWorkRevisions[key] || 0);
+}
+function advanceConversationWorkRevision(target) {
+  if (!state.conversationWorkRevisions) state.conversationWorkRevisions = {};
+  state.conversationWorkRevisions[runtimeKeyFor(target.workspaceId, target.conversationId)] = conversationWorkRevision(target) + 1;
+}
+function captureConversationWorkSnapshotRequest(target) {
+  return { target: { workspaceId: target.workspaceId, conversationId: target.conversationId },
+    loadGeneration: state.conversationLoadGeneration, revision: conversationWorkRevision(target) };
+}
+function isCurrentConversationWorkSnapshotRequest(request) {
+  return !!request && isActiveConversationTarget(request.target)
+    && request.loadGeneration === state.conversationLoadGeneration
+    && request.revision === conversationWorkRevision(request.target);
+}
+function conversationRunStillOwnsTarget(target, runId, alternateRunId) {
+  var latest = state.conversationRuntimeStates && state.conversationRuntimeStates[runtimeKeyFor(target.workspaceId, target.conversationId)];
+  return !latest || !latest.runId || String(latest.runId) === String(runId || '')
+    || (!!alternateRunId && String(latest.runId) === String(alternateRunId));
+}
 var _contextWindowRefreshTimer = null;
 var _contextWindowRefreshInFlight = false;
 var _contextWindowRefreshTargetKey = '';
+var _contextWindowRefreshPendingTarget = null;
+var _contextWindowRefreshRevision = 0;
+var _contextWindowSnapshotRequestId = 0;
+
+function captureContextWindowSnapshotRequest(target) {
+  return {
+    target: { workspaceId: target.workspaceId, conversationId: target.conversationId },
+    loadGeneration: state.conversationLoadGeneration,
+    revision: _contextWindowRefreshRevision,
+    requestId: isActiveConversationTarget(target) ? ++_contextWindowSnapshotRequestId : 0
+  };
+}
+
+function isCurrentContextWindowSnapshotRequest(request) {
+  return !!request && isActiveConversationTarget(request.target)
+    && request.loadGeneration === state.conversationLoadGeneration
+    && request.revision === _contextWindowRefreshRevision
+    && request.requestId === _contextWindowSnapshotRequestId;
+}
+
+function applyContextWindowSnapshot(snapshot, request) {
+  if (!snapshot || !isCurrentContextWindowSnapshotRequest(request)) return false;
+  if (snapshot.contextCompression !== undefined) state.contextCompression = snapshot.contextCompression;
+  if (snapshot.contextWindow !== undefined) state.contextWindow = snapshot.contextWindow;
+  if (snapshot.contextWindow !== undefined || snapshot.contextCompression !== undefined) window.renderContextWindow();
+  return true;
+}
 
 function scheduleActiveContextWindowRefresh(target) {
   if (!api.getState || !target || !isActiveConversationTarget(target)) return;
   var targetKey = runtimeKeyFor(target.workspaceId, target.conversationId);
   _contextWindowRefreshTargetKey = targetKey;
-  if (_contextWindowRefreshTimer !== null) return;
+  _contextWindowRefreshPendingTarget = { workspaceId: target.workspaceId, conversationId: target.conversationId };
+  _contextWindowRefreshRevision += 1;
+  if (_contextWindowRefreshTimer !== null || _contextWindowRefreshInFlight) return;
   _contextWindowRefreshTimer = window.setTimeout(function() {
     _contextWindowRefreshTimer = null;
-    if (_contextWindowRefreshInFlight || !isActiveConversationTarget(target)) return;
+    var requestTarget = _contextWindowRefreshPendingTarget;
+    _contextWindowRefreshPendingTarget = null;
+    if (!requestTarget || !isActiveConversationTarget(requestTarget)) return;
+    var requestKey = runtimeKeyFor(requestTarget.workspaceId, requestTarget.conversationId);
+    var requestRevision = _contextWindowRefreshRevision;
+    var loadGeneration = state.conversationLoadGeneration;
+    var contextRequest = captureContextWindowSnapshotRequest(requestTarget);
     _contextWindowRefreshInFlight = true;
-    api.getState(target).then(function(snapshot) {
-      if (!snapshot || !isActiveConversationTarget(target) || _contextWindowRefreshTargetKey !== targetKey) return;
-      if (snapshot.contextWindow !== undefined) {
-        state.contextWindow = snapshot.contextWindow;
-        window.renderContextWindow();
-      }
-      if (snapshot.contextCompression !== undefined) state.contextCompression = snapshot.contextCompression;
+    api.getState(requestTarget).then(function(snapshot) {
+      if (!snapshot || !isActiveConversationTarget(requestTarget) || _contextWindowRefreshTargetKey !== requestKey
+        || requestRevision !== _contextWindowRefreshRevision || loadGeneration !== state.conversationLoadGeneration) return;
+      applyContextWindowSnapshot(snapshot, contextRequest);
       if (state.rightTab === 'status') window.renderRightStatusPanel();
     }).catch(function(){}).then(function() {
       _contextWindowRefreshInFlight = false;
+      // A semantic event during IPC still requires one fresh snapshot. Keep
+      // only the latest target, with no polling once the event stream is quiet.
+      var pendingTarget = _contextWindowRefreshPendingTarget;
+      _contextWindowRefreshPendingTarget = null;
+      if (pendingTarget) scheduleActiveContextWindowRefresh(pendingTarget);
     });
   }, 120);
 }
@@ -12589,8 +13042,49 @@ function scheduleConversationsRender() {
   });
 }
 
+function applyWorkspaceConversationList(event) {
+  if (event.stateScope !== 'workspace' || !String(event.workspaceId || '').trim() || !Array.isArray(event.conversations)) return;
+  var workspaceId = String(event.workspaceId).trim();
+  var key = currentWorkspaceKey(workspaceId);
+  var foreground = key === currentWorkspaceKey();
+  var rows = (state.workspaceConversations && state.workspaceConversations[key]) || [];
+  var selectedIndex = state.workspaceActiveConversation && state.workspaceActiveConversation[key];
+  var selected = rows[selectedIndex] || rows.find(function(row) { return row.active; });
+  var selectedId = foreground ? activeConversationId() : String(selected && selected.id || '');
+  // A remote create/rename/delete changes this workspace's list, never the
+  // desktop user's selected conversation or the execution target.
+  applyBackendConversations(event.conversations, selectedId, workspaceId);
+  if (foreground) scheduleConversationsRender();
+}
+
+function expandedWorkEventDeltas(event) {
+  if (event && (event.type === 'text' || event.type === 'thought_delta') && Array.isArray(event.coalescedDeltas) && event.coalescedDeltas.length) {
+    return event.coalescedDeltas.map(function(delta) { return Object.assign({}, event, delta, { coalescedDeltas: undefined }); });
+  }
+  return [event];
+}
+
+function mergeConversationWorkEventSnapshots(existing, snapshot) {
+  var seen = {};
+  var result = [];
+  existing.concat(snapshot).forEach(function(event) {
+    expandedWorkEventDeltas(event).forEach(function(item) {
+      if (!item) return;
+      var id = String(item.id || [item.timestamp || '', item.type || '', item.content || '', item.toolName || '', item.toolArgs || ''].join('|'));
+      if (seen[id]) return;
+      seen[id] = true;
+      result.push(item);
+    });
+  });
+  return result;
+}
+
 function appendAgentWorkEvent(event) {
   if (!event) return;
+  if ((event.type === 'text' || event.type === 'thought_delta') && Array.isArray(event.coalescedDeltas) && event.coalescedDeltas.length) {
+    expandedWorkEventDeltas(event).forEach(appendAgentWorkEvent);
+    return;
+  }
   // Subagent (peer) work events are streamed to their own live history overlay
   // and never touch the main conversation's chat/runtime state.
   if (String(event.actorId || '')) {
@@ -12613,12 +13107,24 @@ function appendAgentWorkEvent(event) {
     }
     return;
   }
+  if (String(event.type || '') === 'conversation_list') {
+    applyWorkspaceConversationList(event);
+    return;
+  }
   event = publicWorkEventForUi(event);
   var id = String(event.conversationId || (event.target && event.target.conversationId) || 'default');
   var workspaceId = String(event.workspaceId || (event.target && event.target.workspaceId) || runtimeWorkspaceId(''));
   var target = { workspaceId: workspaceId, conversationId: id };
   eventRuntimeKey(event);
+  if (event.runId) advanceConversationWorkRevision(target);
   var active = isActiveConversationTarget(target);
+  if (event.type === 'queue_update') {
+    // Queue ownership is independent of a renderer send promise and of the
+    // history branch being viewed. Remote edits must refresh every target.
+    applyConversationCommandSnapshot(event, target);
+    if (active) window.renderInputStack();
+    return;
+  }
   var visibleRuntimeBranch = active && isViewingRuntimeConversationBranch(target);
   // 模型回退不是隐藏的参数回退：活跃对话发生回退时，把输入框下方的
   // 模型选择区同步为实际生效的模型。
@@ -12685,13 +13191,10 @@ function appendAgentWorkEvent(event) {
   }
   if (active && terminalEvent && api.getState) {
     var terminalWorkspaceKey = currentWorkspaceKey();
+    var terminalContextRequest = captureContextWindowSnapshotRequest(target);
     api.getState(target).then(function(snapshot) {
-      if (!isActiveConversationTarget(target) || terminalWorkspaceKey !== currentWorkspaceKey()) return;
-      if (snapshot && snapshot.contextWindow !== undefined) {
-        state.contextWindow = snapshot.contextWindow;
-        window.renderContextWindow();
-      }
-      if (snapshot && snapshot.contextCompression !== undefined) state.contextCompression = snapshot.contextCompression;
+      if (!isCurrentContextWindowSnapshotRequest(terminalContextRequest) || terminalWorkspaceKey !== currentWorkspaceKey()) return;
+      applyContextWindowSnapshot(snapshot, terminalContextRequest);
       if (state.rightTab === 'status') window.renderRightStatusPanel();
       // Backend-owned Goal continuations have no renderer send promise to
       // return the final snapshot. Refresh on the terminal work event so a
@@ -12779,6 +13282,7 @@ function applyConversationSnapshot(s, requestedConversationId, options) {
       && !snapshotHasReadableConversationHistory(s)
       && (!options.allowEmptyHistory || conversationHasReadableHistory(snapshotTarget)));
     if (s && s.runtimeKey) registerRuntimeKey(snapshotTarget, s.runtimeKey);
+    hydrateConversationDraftSnapshot(s, snapshotTarget);
     hydrateConversationBranchState(s);
     rebindQueueToRuntimeBranch(snapshotTarget);
     if (s && Array.isArray(s.workRuns) && !preserveReadableHistory) {
@@ -12788,6 +13292,18 @@ function applyConversationSnapshot(s, requestedConversationId, options) {
       syncWorkRunsSnapshot(s.workRuns, snapshotTarget, viewedBranchIdForSync || undefined);
     }
     applyAutoRouteRatingState(s);
+    if (s && Number.isFinite(Number(s.totalMessages))) {
+      if (!state.conversationLoadedBefore) state.conversationLoadedBefore = {};
+      var windowKey = runtimeKeyFor(snapshotTarget.workspaceId, s.conversationId || requestedConversationId || 'default');
+      state.conversationLoadedBefore[windowKey] = Math.max(0, Number(s.totalMessages) - (Array.isArray(s.chatMessages) ? s.chatMessages.length : 0));
+    }
+    if (s.contextCompression !== undefined) state.contextCompression = s.contextCompression;
+    if (s.contextWindow !== undefined || s.contextCompression !== undefined) {
+      _contextWindowRefreshRevision += 1;
+      if (s.contextWindow !== undefined) state.contextWindow = s.contextWindow;
+      window.renderContextWindow();
+    }
+    if (state.rightTab === 'status') window.renderRightStatusPanel();
     if (s && Array.isArray(s.chatMessages) && !preserveReadableHistory) {
       renderChatMessages(s.chatMessages, snapshotTarget);
       renderLoadEarlierButton();
@@ -12797,11 +13313,6 @@ function applyConversationSnapshot(s, requestedConversationId, options) {
       applyBackendConversations(s.conversations || [], s.conversationId || requestedConversationId);
     }
     markConversationTracked(s && s.conversationId ? s.conversationId : requestedConversationId, state.conversationTrackMs || 300000, snapshotTarget.workspaceId);
-    if (s && Number.isFinite(Number(s.totalMessages))) {
-      if (!state.conversationLoadedBefore) state.conversationLoadedBefore = {};
-      var windowKey = runtimeKeyFor(snapshotTarget.workspaceId, s.conversationId || requestedConversationId || 'default');
-      state.conversationLoadedBefore[windowKey] = Math.max(0, Number(s.totalMessages) - (Array.isArray(s.chatMessages) ? s.chatMessages.length : 0));
-    }
     if (s && s.queued) {
       state.backendQueue = setBackendQueueForTarget(s.queued, snapshotTarget);
       if (window.syncNextQueueFromBackend) window.syncNextQueueFromBackend(state.backendQueue, snapshotTarget);
@@ -12811,16 +13322,7 @@ function applyConversationSnapshot(s, requestedConversationId, options) {
       var eventConversationId = runtimeKeyFor(snapshotTarget.workspaceId, s.conversationId || requestedConversationId || 'default');
       if (!state.agentWorkEventsByConversation) state.agentWorkEventsByConversation = {};
       var existingEvents = state.agentWorkEventsByConversation[eventConversationId] || [];
-      var mergedEvents = existingEvents.concat(s.workEvents || []);
-      var seenEvents = {};
-      var dedupedEvents = [];
-      for (var wi = 0; wi < mergedEvents.length; wi++) {
-        var ev = mergedEvents[wi] || {};
-        var key = ev.id || [ev.timestamp || '', ev.type || '', ev.content || '', ev.toolName || '', ev.toolArgs || ''].join('|');
-        if (seenEvents[key]) continue;
-        seenEvents[key] = true;
-        dedupedEvents.push(ev);
-      }
+      var dedupedEvents = mergeConversationWorkEventSnapshots(existingEvents, s.workEvents || []);
       state.agentWorkEventsByConversation[eventConversationId] = dedupedEvents.slice(-Number(state.agentWorkEventLimit || 240));
     }
     if (s && s.conversationPlan) {
@@ -12940,7 +13442,7 @@ function setVisibleMode(mode) {
   }
   if (nextMode === 'flow') window.setInputMode('guide');
   if (api.setMode) {
-    return Promise.resolve(api.setMode(nextMode)).then(function(result) {
+    return Promise.resolve(api.setMode(nextMode, currentConversationTarget())).then(function(result) {
       if (result != null) state._syncedMode = nextMode;
     }).catch(function(){});
   }
@@ -13083,8 +13585,24 @@ function conversationDraftParts(key) {
   };
 }
 
-function saveActiveConversationDraft() {
+function hydrateConversationDraftSnapshot(snapshot, target) {
+  if (!snapshot || snapshot.draft === undefined) return;
+  var key = conversationDraftKey(target);
+  // A locally edited or explicitly cleared draft is newer than a returning
+  // snapshot. Only the first hydration may populate this conversation's slot.
+  if (Object.prototype.hasOwnProperty.call(state.conversationDrafts, key)) return;
+  state.conversationDrafts[key] = String(snapshot.draft || '');
+  if (isActiveConversationTarget(target) && (!state._promptBoundKey || state._promptBoundKey === key)) {
+    restoreConversationDraft(target);
+  }
+}
+
+function saveActiveConversationDraft(fromInput) {
   if (!els.prompt) return;
+  var key = state._promptBoundKey || conversationDraftKey();
+  // A blank, not-yet-hydrated composer is not an instruction to erase a stored
+  // draft. A real input event (including deleting all text) is authoritative.
+  if (!fromInput && !els.prompt.value && !Object.prototype.hasOwnProperty.call(state.conversationDrafts, key)) return;
   // The prompt content belongs to the conversation it was last restored for.
   // While a conversation switch is still resolving (sync not yet complete),
   // the bound key stays on the previous conversation so fast switching cannot
@@ -13097,17 +13615,21 @@ function saveActiveConversationDraft() {
 // window. The in-memory window is never dropped, so switching back stays instant.
 // Writes are debounced per key (100ms) so rapid conversation switching coalesces
 // into a single request per conversation.
-function persistConversationDraftForKey(key) {
+function persistConversationDraftForKey(key, delayMs) {
   if (!api.saveConversationDraft) return;
   var parts = conversationDraftParts(key);
   if (parts.workspaceId && parts.workspaceId !== String(state.currentWorkspaceId || '')) return;
+  if (!Object.prototype.hasOwnProperty.call(state.conversationDrafts, conversationDraftKey(parts))) return;
   if (!state._draftPersistTimers) state._draftPersistTimers = {};
   if (state._draftPersistTimers[key]) clearTimeout(state._draftPersistTimers[key]);
   state._draftPersistTimers[key] = setTimeout(function() {
     delete state._draftPersistTimers[key];
-    var draft = Object.prototype.hasOwnProperty.call(state.conversationDrafts, key) ? state.conversationDrafts[key] : '';
+    if (parts.workspaceId && parts.workspaceId !== String(state.currentWorkspaceId || '')) return;
+    var resolvedKey = conversationDraftKey(parts);
+    if (!Object.prototype.hasOwnProperty.call(state.conversationDrafts, resolvedKey)) return;
+    var draft = state.conversationDrafts[resolvedKey];
     api.saveConversationDraft(parts.conversationId, draft).catch(function(){});
-  }, 100);
+  }, delayMs === undefined ? 100 : delayMs);
 }
 
 function restoreConversationDraft(target) {
@@ -13128,13 +13650,15 @@ function flushPendingConversationDraftPersists() {
     delete state._draftPersistTimers[key];
     var parts = conversationDraftParts(key);
     if (parts.workspaceId && parts.workspaceId !== String(state.currentWorkspaceId || '')) return;
-    var draft = Object.prototype.hasOwnProperty.call(state.conversationDrafts, key) ? state.conversationDrafts[key] : '';
+    var resolvedKey = conversationDraftKey(parts);
+    if (!Object.prototype.hasOwnProperty.call(state.conversationDrafts, resolvedKey)) return;
+    var draft = state.conversationDrafts[resolvedKey];
     if (api.saveConversationDraft) api.saveConversationDraft(parts.conversationId, draft).catch(function(){});
   });
 }
 function clearActiveConversationDraft() {
   var key = conversationDraftKey();
-  delete state.conversationDrafts[key];
+  state.conversationDrafts[key] = '';
   if (state._draftPersistTimers && state._draftPersistTimers[key]) {
     clearTimeout(state._draftPersistTimers[key]);
     delete state._draftPersistTimers[key];
@@ -13242,10 +13766,12 @@ async function refreshConversationRuntimeAfterStopRace(target, expectedRunId, st
   target = target || currentConversationTarget();
   expectedRunId = String(expectedRunId || '');
   var action = String(stopResult && stopResult.action || '');
+  var stopRevision = conversationWorkRevision(target);
   var snapshot = null;
   if (api.getState) {
     try { snapshot = await api.getState(target); } catch (_) { snapshot = null; }
   }
+  if (!conversationRunStillOwnsTarget(target, expectedRunId) || stopRevision !== conversationWorkRevision(target)) return { stale: true, target: target };
   var resolvedTarget = target;
   var resolvedRunId = String((stopResult && stopResult.runId) || expectedRunId || '');
   var resolvedStatus = action === 'stale' ? 'running' : 'idle';
@@ -13327,6 +13853,7 @@ window.stopCurrentConversation = async function() {
     if (api.stopConversation) result = await api.stopConversation({ target: target, runId: runId, force: force });
     else if (api.abortConversation) result = await api.abortConversation(currentConversationTarget(conversationId));
     var resultAction = String(result && result.action || '');
+    if (!conversationRunStillOwnsTarget(target, runId)) return true;
     if (resultAction === 'not_running' || resultAction === 'stale') {
       // Natural completion or a newer run won while the first stop IPC was in
       // flight. Reconcile from the target snapshot instead of leaving the
@@ -13338,7 +13865,7 @@ window.stopCurrentConversation = async function() {
       delete state.pendingProvisionalStops[runtimeKeyFor(target.workspaceId, target.conversationId)];
     }
     var latestAfterStop = state.conversationRuntimeStates && state.conversationRuntimeStates[runtimeKeyFor(target.workspaceId, target.conversationId)];
-    if (!force && latestAfterStop && String(latestAfterStop.runId || '') === runId && String(latestAfterStop.status || '') !== 'stopping') {
+    if (latestAfterStop && String(latestAfterStop.runId || '') === runId && String(latestAfterStop.status || '') !== (force ? 'force_restarting' : 'stopping')) {
       // A second click or a terminal worker event won the race while the first
       // cooperative request was pending. Its older result must not downgrade
       // force_restarting/force_interrupted back to interrupted or running.
@@ -13348,8 +13875,9 @@ window.stopCurrentConversation = async function() {
       setConversationRuntimeState(target, force ? 'force_interrupted' : 'interrupted', runId);
     }
   } catch(e) {
+    if (!conversationRunStillOwnsTarget(target, runId)) return false;
     var latestAfterError = state.conversationRuntimeStates && state.conversationRuntimeStates[runtimeKeyFor(target.workspaceId, target.conversationId)];
-    if (!force && latestAfterError && String(latestAfterError.runId || '') === runId && String(latestAfterError.status || '') !== 'stopping') {
+    if (latestAfterError && String(latestAfterError.runId || '') === runId && String(latestAfterError.status || '') !== (force ? 'force_restarting' : 'stopping')) {
       return true;
     }
     setConversationRuntimeState(target, force ? 'stopping' : 'running', runId);
@@ -13366,6 +13894,7 @@ window.stopCurrentConversation = async function() {
 };
 
 window.submitCurrentAction = function(source) {
+  if (state.pendingInputEdit) return window.sendMessage();
   if (currentFlowRunning() && flowTakeoverMatchesCurrent()) {
     if (!promptHasText()) {
       window.stopFlowRun();
@@ -13379,16 +13908,18 @@ window.submitCurrentAction = function(source) {
       // exits the pause and starts a fresh process. The backend agent:send /
       // flow:run handlers clear the suspension (without restoring mode).
       window.exitPausedFlowForNewInstruction();
-      if (state.mode === 'flow') return window.submitSelectedFlow();
-      return window.sendMessage('guide', guideText, { requestedMode: state.mode || 'build' });
+      if (state.mode === 'flow') return window.submitSelectedFlow({ text: guideText, target: currentConversationTarget(), inputMode: state.inputMode });
+      return window.sendMessage(state.inputMode, guideText, { requestedMode: state.mode || 'build', target: currentConversationTarget() });
     }
     if (state.inputMode === 'next') {
-      window.queueFlowNextInput(guideText);
-      return;
+      return window.queueFlowNextInput(guideText);
     }
-    if (api.guideFlow) {
-      api.guideFlow(guideText).then(function(result) {
+    if (api.sendMessage) {
+      var flowGuideTarget = currentConversationTarget();
+      return api.sendMessage(guideText, flowGuideTarget, { requestedMode: state.mode || 'flow', inputMode: 'guide', clientMessageId: window.crypto.randomUUID() }).then(function(result) {
         if (!result || result.ok === false) throw new Error((result && result.error) || 'Flow Guide was rejected.');
+        applyConversationCommandSnapshot(result, flowGuideTarget);
+        return result;
       }).catch(function(error) {
         showUiNotice(error && error.message ? error.message : String(error), 'error', 'flow-guide');
       });
@@ -13451,8 +13982,26 @@ function contextInspectorValue(value) {
   return Number.isFinite(number) ? Math.max(0, Math.round(number)) : 0;
 }
 
-function contextInspectorCell(label, value) {
-  return '<div class="context-inspector-cell"><span class="context-inspector-label">' + esc(label) + '</span><span class="context-inspector-value">' + esc(value) + '</span></div>';
+function contextInspectorReportedValue(value) {
+  return typeof value === 'number' && Number.isFinite(value) && value >= 0 ? Math.round(value) : null;
+}
+
+function contextInspectorCell(label, value, title) {
+  return '<div class="context-inspector-cell"><span class="context-inspector-label">' + esc(label) + '</span><span class="context-inspector-value"' + (title ? ' title="' + esc(title) + '"' : '') + '>' + esc(value) + '</span></div>';
+}
+
+function positionContextInspector() {
+  if (!state.contextInspectorOpen) return;
+  var panel = document.getElementById('context-inspector');
+  var ring = els['context-token-ring'] || document.getElementById('context-token-ring');
+  if (!panel || !ring || !ring.getBoundingClientRect) return;
+  var topbar = document.getElementById('topbar');
+  var visibleTop = topbar && topbar.getBoundingClientRect ? Math.max(0, topbar.getBoundingClientRect().bottom || 0) : 0;
+  // Preserve the existing anchor and 10px gap while keeping the top visible.
+  // Scroll this inspector's contents when the terminal/window leaves less room.
+  panel.style.maxHeight = Math.max(0, Math.floor(ring.getBoundingClientRect().top - visibleTop - 20)) + 'px';
+  panel.style.overflowY = 'auto';
+  panel.style.overscrollBehavior = 'contain';
 }
 
 window.renderContextInspector = function() {
@@ -13478,8 +14027,39 @@ window.renderContextInspector = function() {
   var providerInputTokens = contextInspectorValue(c.providerInputTokens);
   var providerOutputTokens = contextInspectorValue(c.providerOutputTokens);
   var providerCacheReadTokens = contextInspectorValue(c.providerCacheReadTokens);
-  var providerCacheReadRatio = Math.max(0, Math.min(1, Number(c.providerCacheReadRatio) || 0));
-  var cacheHitPercent = Math.round(providerCacheReadRatio * 1000) / 10;
+  var usageRequests = contextInspectorValue(c.providerUsageRequests);
+  var inputReportedRequests = contextInspectorValue(c.providerUsageInputReportedRequests);
+  var outputReportedRequests = contextInspectorValue(c.providerUsageOutputReportedRequests);
+  var cacheReportedRequests = contextInspectorValue(c.providerUsageCacheReportedRequests);
+  var hasLegacyTotals = c.providerUsageHasLegacyTotals === true;
+  var inputAvailable = inputReportedRequests > 0 || hasLegacyTotals;
+  var outputAvailable = outputReportedRequests > 0 || hasLegacyTotals;
+  var usageComplete = usageRequests > 0 && inputReportedRequests === usageRequests && outputReportedRequests === usageRequests && !hasLegacyTotals;
+  var conversationUsageValue = inputAvailable || outputAvailable
+    ? (usageComplete ? '' : t('status.cacheReportedPortion') + ' ') + providerTotalTokens + ' · '
+      + (inputAvailable ? providerInputTokens : t('status.usageUnavailable')) + ' in / '
+      + (outputAvailable ? providerOutputTokens : t('status.usageUnavailable')) + ' out'
+    : t('status.usageUnavailable');
+  var providerCacheReadRatio = typeof c.providerCacheReadRatio === 'number' && Number.isFinite(c.providerCacheReadRatio) ? c.providerCacheReadRatio : null;
+  var knownCacheReadRatio = typeof c.providerKnownCacheReadRatio === 'number' && Number.isFinite(c.providerKnownCacheReadRatio) ? c.providerKnownCacheReadRatio : null;
+  var fullCacheCoverage = usageRequests > 0 && inputReportedRequests === usageRequests && cacheReportedRequests === usageRequests && !hasLegacyTotals;
+  var cacheHitValue = fullCacheCoverage && providerCacheReadRatio !== null
+    ? (Math.round(Math.max(0, Math.min(1, providerCacheReadRatio)) * 1000) / 10) + '% · ' + providerCacheReadTokens + ' cached'
+    : t('status.usageUnavailable');
+  if (!fullCacheCoverage && knownCacheReadRatio !== null) {
+    cacheHitValue += ' · ' + t('status.cacheReportedPortion') + ' ' + (Math.round(Math.max(0, Math.min(1, knownCacheReadRatio)) * 1000) / 10) + '%';
+  }
+  var lastReportedInput = contextInspectorReportedValue(c.requestContext && c.requestContext.inputTokens);
+  var lastRequestDetails = c.requestContext ? [c.requestContext.model, c.requestContext.at].filter(Boolean).join(' · ') : '';
+  var estimateHint = t(c.contextEstimateSource === 'active_request' ? 'status.contextEstimateRequest' : 'status.contextEstimateHistory');
+  if (c.contextEstimateHasImages) estimateHint += ' ' + t('status.contextEstimateImages');
+  var usageCoverageHint = currentLang() === 'zh'
+    ? '本次及已保存计量：' + usageRequests + ' 次请求；输入上报 ' + inputReportedRequests + ' 次，输出上报 ' + outputReportedRequests + ' 次，缓存明细上报 ' + cacheReportedRequests + ' 次。命中率按缓存读取 token / 输入 token 加权。'
+    : 'Recorded requests: ' + usageRequests + '; input reported: ' + inputReportedRequests + '; output reported: ' + outputReportedRequests + '; cache details reported: ' + cacheReportedRequests + '. Hit rate is weighted cached input / input tokens.';
+  if (hasLegacyTotals) usageCoverageHint += currentLang() === 'zh' ? ' 含旧累计用量，历史上报覆盖范围未知。' : ' Legacy totals are present; historical reporting coverage is unknown.';
+  if (!fullCacheCoverage && knownCacheReadRatio !== null) usageCoverageHint += currentLang() === 'zh'
+    ? ' 已上报部分的输入分母为 ' + contextInspectorValue(c.providerCacheEligibleInputTokens) + ' token。'
+    : ' The reported portion covers ' + contextInspectorValue(c.providerCacheEligibleInputTokens) + ' input tokens.';
   var percent = Math.min(100, Math.round((used / max) * 100));
   var fillColor = c.warning === 'over_limit' ? 'var(--nm-state-danger)' : (c.warning === 'near_limit' ? 'var(--nm-state-warning)' : 'var(--accent)');
   var compression = state.contextCompression || null;
@@ -13492,25 +14072,36 @@ window.renderContextInspector = function() {
     '<div class="context-inspector-meter"><div class="context-inspector-meter-fill" style="width:' + percent + '%;background:' + fillColor + '"></div></div>' +
     '<div class="context-inspector-grid">' +
       contextInspectorCell(t('status.contextTokens'), used + ' / ' + max) +
-      contextInspectorCell(t('status.conversationTokens'), providerTotalTokens + ' · ' + providerInputTokens + ' in / ' + providerOutputTokens + ' out') +
+      contextInspectorCell(t('status.conversationTokens'), conversationUsageValue) +
       contextInspectorCell(t('status.activeBuild'), active + ' / ' + activeTrigger) +
-      contextInspectorCell(t('status.cacheHitRate'), cacheHitPercent + '% · ' + providerCacheReadTokens + ' cached') +
+      contextInspectorCell(t('status.cacheHitRate'), cacheHitValue) +
       contextInspectorCell(t('status.longHistory'), history + ' / ' + historyTrigger) +
       contextInspectorCell(t('status.retention'), activeRetention + ' + ' + historyRetention) +
       contextInspectorCell(t('status.hotCache'), contextInspectorValue(c.cacheEntries) + ' entries') +
       contextInspectorCell(t('status.coldArchive'), contextInspectorValue(c.archiveEntries) + ' entries') +
+      contextInspectorCell(t('status.requestOverhead'), c.contextEstimateSource === 'active_request' ? contextInspectorValue(c.systemPromptTokens) + ' / ' + contextInspectorValue(c.toolSchemaTokens) : t('status.requestOverheadExcluded')) +
+      contextInspectorCell(t('status.lastReportedInput'), lastReportedInput === null ? t('status.usageUnavailable') : String(lastReportedInput), lastRequestDetails) +
     '</div>' +
+    '<div class="context-inspector-meta">' + esc(estimateHint) + '</div>' +
+    '<div class="context-inspector-meta">' + esc(usageCoverageHint) + '</div>' +
     '<div class="context-inspector-section"><div class="context-inspector-section-title">' + esc(t('status.lastCompression')) + '</div><div class="context-inspector-meta">' + esc(last) + '</div>' +
       (compression && compression.model ? '<div class="context-inspector-meta">' + esc(compression.model) + '</div>' : '') + '</div>' +
     '<div class="context-inspector-actions"><button type="button" class="sec-btn primary" onclick="window.compressContextNow()"' + (busy || running ? ' disabled' : '') + '>' + esc(busy ? t('status.compressing') : t('status.compressNow')) + '</button></div>';
+  positionContextInspector();
 };
 
 window.closeContextInspector = function() {
-  state.contextInspectorOpen = false;
-  window.renderContextInspector();
+  if (!state.contextInspectorOpen) return;
+  var panel = document.getElementById('context-inspector');
+  var ring = document.getElementById('context-token-ring');
+  window.animateLiquidPopupExit(panel, ring, function() {
+    state.contextInspectorOpen = false;
+    window.renderContextInspector();
+  });
 };
 
 (function() {
+  window.addEventListener('resize', positionContextInspector);
   document.addEventListener('click', function(event) {
     if (!state.contextInspectorOpen) return;
     var ring = document.getElementById('context-token-ring');
@@ -13525,6 +14116,7 @@ window.toggleContextInspector = function() {
   state.contextInspectorOpen = !state.contextInspectorOpen;
   window.hideContextWindowTooltip();
   window.renderContextInspector();
+  if (state.contextInspectorOpen) scheduleActiveContextWindowRefresh(currentConversationTarget());
 };
 
 window.compressContextNow = function() {
@@ -13539,15 +14131,22 @@ window.compressContextNow = function() {
   }
   state.contextMutationPending = true;
   window.renderContextInspector();
-  Promise.resolve(api.compressContext({ target: currentConversationTarget(), force: true })).then(function(result) {
+  var compressionTarget = currentConversationTarget();
+  var compressionContextRequest = captureContextWindowSnapshotRequest(compressionTarget);
+  return Promise.resolve(api.compressContext({ target: compressionTarget, force: true })).then(function(result) {
     if (!result || result.ok === false) throw new Error((result && result.error) || t('status.compressionFailed'));
-    if (result.contextWindow) state.contextWindow = result.contextWindow;
-    if (result.contextCompression !== undefined) state.contextCompression = result.contextCompression;
-    window.renderContextWindow();
+    if (!applyContextWindowSnapshot(result, compressionContextRequest)) {
+      // A concurrent read may have sampled the budget before compression
+      // completed. Query again after the mutation rather than publishing an
+      // old mutation response over newer usage/model state.
+      if (isActiveConversationTarget(compressionTarget)) scheduleActiveContextWindowRefresh(compressionTarget);
+      return result;
+    }
     window.renderRightStatusPanel();
     showUiNotice(t('status.compressedNow'), 'success', 'context-compress-success');
     return result;
   }).catch(function(error) {
+    if (!isCurrentContextWindowSnapshotRequest(compressionContextRequest)) return;
     showUiNotice(error && error.message ? error.message : t('status.compressionFailed'), 'error', 'context-compress-error');
   }).finally(function() {
     state.contextMutationPending = false;
@@ -13583,11 +14182,22 @@ window.closeModelSelectMenu = function(options) {
   var shell = document.getElementById('model-select-shell');
   var button = document.getElementById('model-select-button');
   var menu = document.getElementById('model-select-menu');
-  if (shell) shell.classList.remove('open');
-  if (menu && typeof menu.hidePopover === 'function' && menu.matches(':popover-open')) menu.hidePopover();
-  if (button) button.setAttribute('aria-expanded', 'false');
-  window.setLiquidSidebarGestureLock('popup:model-select', false);
-  if (options && options.focus && button) button.focus();
+  var wasOpen = shell && shell.classList.contains('open') ||
+    !!(menu && typeof menu.matches === 'function' && menu.matches(':popover-open'));
+  if (!wasOpen) {
+    if (shell) shell.classList.remove('open');
+    if (button) button.setAttribute('aria-expanded', 'false');
+    window.setLiquidSidebarGestureLock('popup:model-select', false);
+    if (options && options.focus && button) button.focus();
+    return;
+  }
+  window.animateLiquidPopupExit(menu, button, function() {
+    if (shell) shell.classList.remove('open');
+    if (menu && typeof menu.hidePopover === 'function' && menu.matches(':popover-open')) menu.hidePopover();
+    if (button) button.setAttribute('aria-expanded', 'false');
+    window.setLiquidSidebarGestureLock('popup:model-select', false);
+    if (options && options.focus && button) button.focus();
+  });
 };
 
 window.toggleModelSelectMenu = function(forceOpen) {
@@ -13628,11 +14238,21 @@ window.selectModelFromMenu = function(value) {
 window.closeConversationActionMenu = function(options) {
   var menu = document.getElementById('conversation-action-menu');
   var anchor = state.conversationActionAnchor;
-  if (menu && typeof menu.hidePopover === 'function' && menu.matches(':popover-open')) menu.hidePopover();
-  document.querySelectorAll('.conv-more-btn[aria-expanded="true"]').forEach(function(item) { item.setAttribute('aria-expanded', 'false'); });
-  state.conversationActionAnchor = null;
-  window.setLiquidSidebarGestureLock('popup:conversation-action', false);
-  if (options && options.focus && anchor && anchor.focus) anchor.focus();
+  var wasOpen = !!(menu && typeof menu.matches === 'function' && menu.matches(':popover-open'));
+  if (!wasOpen) {
+    document.querySelectorAll('.conv-more-btn[aria-expanded="true"]').forEach(function(item) { item.setAttribute('aria-expanded', 'false'); });
+    state.conversationActionAnchor = null;
+    window.setLiquidSidebarGestureLock('popup:conversation-action', false);
+    if (options && options.focus && anchor && anchor.focus) anchor.focus();
+    return;
+  }
+  window.animateLiquidPopupExit(menu, anchor, function() {
+    if (menu && typeof menu.hidePopover === 'function' && menu.matches(':popover-open')) menu.hidePopover();
+    document.querySelectorAll('.conv-more-btn[aria-expanded="true"]').forEach(function(item) { item.setAttribute('aria-expanded', 'false'); });
+    state.conversationActionAnchor = null;
+    window.setLiquidSidebarGestureLock('popup:conversation-action', false);
+    if (options && options.focus && anchor && anchor.focus) anchor.focus();
+  });
 };
 
 window.positionConversationActionMenu = function(anchor, menu, pos) {
@@ -13959,6 +14579,7 @@ function createKyantLiquidRenderer() {
     renderFrame: 0,
     frameId: '',
     lastGeometry: null,
+    lastSurfaceState: null,
     pendingGeometry: null,
     uniformState: Object.create(null),
     invalid: false
@@ -14002,6 +14623,7 @@ function acquireKyantLiquidRenderer(float) {
   renderer.displayCanvas = displayCanvas;
   renderer.displayContext = displayContext;
   renderer.lastGeometry = null;
+  renderer.lastSurfaceState = null;
   renderer.pendingGeometry = null;
   return renderer;
 }
@@ -14018,6 +14640,7 @@ function uploadKyantLiquidFrame(renderer, frame) {
   // float geometry has not changed. Otherwise the geometry cache skips the
   // draw and leaves the previously captured backdrop on screen.
   renderer.lastGeometry = null;
+  renderer.lastSurfaceState = null;
   return true;
 }
 
@@ -14077,8 +14700,13 @@ function attachKyantLiquidRenderer(float, frame) {
       var pixelWidth = Math.max(1, Math.round(width*renderScale));
       var pixelHeight = Math.max(1, Math.round(height*renderScale));
       var geometryKey = [left.toFixed(2),top.toFixed(2),width.toFixed(2),height.toFixed(2),pixelWidth,pixelHeight].join(':');
-      if (renderer.lastGeometry === geometryKey) return;
+      var glow = float._liquidGlow;
+      var surfaceStateKey = glow && glow.opacity > 0
+        ? [glow.x.toFixed(4),glow.y.toFixed(4),glow.opacity.toFixed(3)].join(':')
+        : 'no-glow';
+      if (renderer.lastGeometry === geometryKey && renderer.lastSurfaceState === surfaceStateKey) return;
       renderer.lastGeometry = geometryKey;
+      renderer.lastSurfaceState = surfaceStateKey;
       if (canvas.width !== pixelWidth) canvas.width = pixelWidth;
       if (canvas.height !== pixelHeight) canvas.height = pixelHeight;
       if (displayCanvas.width !== pixelWidth) displayCanvas.width = pixelWidth;
@@ -14108,10 +14736,48 @@ function attachKyantLiquidRenderer(float, frame) {
       uniformChanged('chromaticAberration',[configuredChromatic],function() { gl.uniform1f(uniforms.chromaticAberration,configuredChromatic); });
       gl.drawArrays(gl.TRIANGLES,0,6);
       displayContext.clearRect(0,0,pixelWidth,pixelHeight);
+      // The WebGL shader discards pixels outside the capsule, but the 2D
+      // interaction glow is painted after that pass. Clip both passes to the
+      // same rounded silhouette so a radial light can never bleed into the
+      // surrounding page or produce a square compositor halo.
+      var clipped = typeof displayContext.save === 'function' &&
+        typeof displayContext.beginPath === 'function' &&
+        typeof displayContext.clip === 'function' &&
+        (typeof displayContext.roundRect === 'function' || typeof displayContext.arcTo === 'function');
+      if (clipped) {
+        displayContext.save();
+        displayContext.beginPath();
+        var clipRadius = Math.min(pixelWidth, pixelHeight) * 0.5;
+        if (typeof displayContext.roundRect === 'function') {
+          displayContext.roundRect(0, 0, pixelWidth, pixelHeight, clipRadius);
+        } else {
+          displayContext.moveTo(clipRadius, 0);
+          displayContext.arcTo(pixelWidth, 0, pixelWidth, pixelHeight, clipRadius);
+          displayContext.arcTo(pixelWidth, pixelHeight, 0, pixelHeight, clipRadius);
+          displayContext.arcTo(0, pixelHeight, 0, 0, clipRadius);
+          displayContext.arcTo(0, 0, pixelWidth, 0, clipRadius);
+          displayContext.closePath();
+        }
+        displayContext.clip();
+      }
       displayContext.drawImage(canvas,0,0);
+      if (glow && glow.opacity > 0) {
+        var gx = Math.max(0, Math.min(pixelWidth, glow.x * pixelWidth));
+        var gy = Math.max(0, Math.min(pixelHeight, glow.y * pixelHeight));
+        var radius = Math.max(18, Math.min(pixelWidth, pixelHeight) * 0.72);
+        var gradient = displayContext.createRadialGradient(gx, gy, 0, gx, gy, radius);
+        gradient.addColorStop(0, 'rgba(255,255,255,' + (0.08 + glow.opacity * 0.18).toFixed(3) + ')');
+        gradient.addColorStop(1, 'rgba(255,255,255,0)');
+        displayContext.fillStyle = gradient;
+        displayContext.globalCompositeOperation = 'screen';
+        displayContext.fillRect(0, 0, pixelWidth, pixelHeight);
+      }
+      if (clipped) displayContext.restore();
       float._kyantDrawReady = true;
       float.dataset.kyantDrawReady = 'true';
-      if (displayCanvas.parentNode !== float) float.appendChild(displayCanvas);
+      if (displayCanvas.parentNode !== float || float.firstChild !== displayCanvas) {
+        float.insertBefore(displayCanvas, float.firstChild);
+      }
     };
     if (immediate) draw();
     else renderer.renderFrame = requestAnimationFrame(draw);
@@ -14123,6 +14789,7 @@ function attachKyantLiquidRenderer(float, frame) {
     if (renderer.renderFrame) cancelAnimationFrame(renderer.renderFrame);
     renderer.renderFrame = 0;
     renderer.lastGeometry = null;
+    renderer.lastSurfaceState = null;
     renderer.pendingGeometry = null;
     displayCanvas.remove();
     renderer.displayCanvas = null;
@@ -14165,6 +14832,175 @@ function liquidInteractionEdgePx() {
   return liquidGlassCssNumber('--liquid-interaction-edge', 6);
 }
 
+/*
+ * Popup deformation is deliberately expressed in physical CSS pixels.  The
+ * old implementation wrote a percentage scale directly (3.5% at full pull),
+ * which made a large dialog visibly wobble much farther than a compact menu.
+ * Convert a bounded edge travel back into a scale factor per axis so the
+ * visual envelope stays stable regardless of the popup's dimensions.  The
+ * full-pull response reaches the hard 4px edge budget without exceeding it.
+ */
+var LIQUID_POPUP_MAX_EDGE_JITTER_PX = 4;
+var LIQUID_HOLD_DRAG_ACTIVATION_MS = 80;
+var LIQUID_POPUP_DRAG_RESPONSE = 1;
+var LIQUID_POPUP_DRAG_DISTANCE_PX = 90;
+function clearLiquidPopupOutset(popup, immediate) {
+  var feedback = popup && popup._liquidPopupFeedback;
+  if (!feedback) return;
+  feedback.target = 0;
+  feedback.surface.style.setProperty('--liquid-popup-outset', '0px');
+  feedback.outset = '0.000px';
+  clearTimeout(feedback.clearTimer);
+  function dispose() {
+    if (popup._liquidPopupFeedback !== feedback) return;
+    cancelAnimationFrame(feedback.frame);
+    if (feedback.layer) feedback.layer.remove();
+    popup.removeAttribute('data-liquid-popup-feedback');
+    popup.style.removeProperty('--liquid-popup-outset');
+    ['left', 'right', 'top', 'bottom'].forEach(function(side) {
+      popup.style.removeProperty('--liquid-popup-pull-' + side);
+    });
+    if (immediate && !feedback.layer && popup.getAnimations) {
+      popup.getAnimations().forEach(function(animation) {
+        if (animation.transitionProperty === '--liquid-popup-outset') animation.cancel();
+      });
+    }
+    popup._liquidPopupFeedback = null;
+  }
+  if (immediate) dispose();
+  else feedback.clearTimer = setTimeout(dispose, 150);
+}
+
+function setLiquidPopupOutset(popup, amount, dx, dy) {
+  amount = Math.max(0, Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, amount));
+  var distance = Math.hypot(dx || 0, dy || 0);
+  if (!popup || !amount || !distance) { clearLiquidPopupOutset(popup, false); return; }
+  var feedback = popup._liquidPopupFeedback;
+  if (!feedback) {
+    var style = getComputedStyle(popup);
+    if (!popup.isConnected || style.display === 'none' || style.visibility === 'hidden') return;
+    var nativePopover = popup.matches(':popover-open');
+    var layer = null;
+    if (!nativePopover) {
+      layer = document.createElement('div');
+      layer.className = 'liquid-popup-feedback-surface';
+      layer.setAttribute('aria-hidden', 'true');
+      layer.style.zIndex = style.zIndex === 'auto' ? '0' : style.zIndex;
+      popup.parentNode.insertBefore(layer, popup);
+    }
+    var surface = layer || popup;
+    surface.style.setProperty('--liquid-popup-outset', '0px');
+    surface.style.setProperty('--liquid-feedback-color', style.getPropertyValue('--liquid-popup-surface'));
+    surface.style.setProperty('--liquid-feedback-filter', style.backdropFilter);
+    surface.style.setProperty('--liquid-feedback-rim', style.getPropertyValue('--liquid-popup-rim'));
+    surface.style.setProperty('--liquid-feedback-inner-rim', style.getPropertyValue('--liquid-popup-inner-rim'));
+    surface.style.setProperty('--liquid-feedback-radius', style.borderTopLeftRadius);
+    feedback = { surface: surface, layer: layer, nativePopover: nativePopover, target: 0, frame: 0, clearTimer: 0, geometry: '', outset: '' };
+    popup._liquidPopupFeedback = feedback;
+    function frame() {
+      if (popup._liquidPopupFeedback !== feedback) return;
+      var currentStyle = getComputedStyle(popup);
+      var rect = popup.getBoundingClientRect();
+      if (!popup.isConnected || currentStyle.display === 'none' || currentStyle.visibility === 'hidden' ||
+          popup.classList.contains('liquid-popup-exit') || !rect.width || !rect.height ||
+          (feedback.nativePopover && !popup.matches(':popover-open'))) {
+        clearLiquidPopupOutset(popup, true);
+        return;
+      }
+      var left = rect.left, top = rect.top, width = rect.width, height = rect.height, pixelScale = 1;
+      if (layer && layer.offsetParent) {
+        var parent = layer.offsetParent;
+        var parentRect = parent.getBoundingClientRect();
+        var scaleX = parent.offsetWidth ? parentRect.width / parent.offsetWidth : 1;
+        var scaleY = parent.offsetHeight ? parentRect.height / parent.offsetHeight : 1;
+        scaleX = scaleX || 1; scaleY = scaleY || 1;
+        left = (left - parentRect.left) / scaleX + parent.scrollLeft - parent.clientLeft;
+        top = (top - parentRect.top) / scaleY + parent.scrollTop - parent.clientTop;
+        width /= scaleX; height /= scaleY;
+        pixelScale = Math.max(scaleX, scaleY);
+      }
+      var geometry = [left, top, width, height, currentStyle.opacity].join(',');
+      if (feedback.geometry !== geometry) {
+        feedback.geometry = geometry;
+        surface.style.setProperty('--liquid-feedback-left', left + 'px');
+        surface.style.setProperty('--liquid-feedback-top', top + 'px');
+        surface.style.setProperty('--liquid-feedback-width', width + 'px');
+        surface.style.setProperty('--liquid-feedback-height', height + 'px');
+        if (layer) layer.style.opacity = currentStyle.opacity;
+      }
+      var outset = (feedback.target / pixelScale).toFixed(3) + 'px';
+      if (feedback.outset !== outset) {
+        feedback.outset = outset;
+        surface.style.setProperty('--liquid-popup-outset', outset);
+      }
+      feedback.frame = requestAnimationFrame(frame);
+    }
+    /* Resolve the zero-sized feedback boundary before its first transition. */
+    frame();
+    if (popup._liquidPopupFeedback !== feedback) return;
+    popup.setAttribute('data-liquid-popup-feedback', 'outward');
+    getComputedStyle(surface).getPropertyValue('--liquid-popup-outset');
+  }
+  clearTimeout(feedback.clearTimer);
+  /* Keep the response magnitude's existing transition. Direction changes are
+     immediate, so reversing a pull never stretches the old opposite side. */
+  var direction = [(dx || 0) / distance, (dy || 0) / distance];
+  var sides = { left: Math.max(0, -direction[0]), right: Math.max(0, direction[0]), top: Math.max(0, -direction[1]), bottom: Math.max(0, direction[1]) };
+  Object.keys(sides).forEach(function(side) {
+    feedback.surface.style.setProperty('--liquid-popup-pull-' + side, sides[side].toFixed(6));
+  });
+  feedback.target = amount;
+}
+
+function setLiquidPopupDeformation(popup, dx, dy, clear) {
+  if (!popup) return;
+  if (clear) {
+    clearLiquidPopupOutset(popup, false);
+    popup.style.setProperty('--liquid-popup-stretch', '0');
+    popup.style.setProperty('--liquid-popup-squash', '0');
+    popup.style.setProperty('scale', '1 1');
+    popup.style.setProperty('--liquid-popup-edge-x', '0px');
+    popup.style.setProperty('--liquid-popup-edge-y', '0px');
+    return;
+  }
+  var distance = Math.hypot(dx || 0, dy || 0);
+  if (!distance) return;
+  var amount = Math.min(1, distance / LIQUID_POPUP_DRAG_DISTANCE_PX) * LIQUID_POPUP_DRAG_RESPONSE;
+  var horizontal = Math.abs(dx || 0) >= Math.abs(dy || 0);
+  var axisSize = Math.max(1, horizontal ? (popup.clientWidth || 0) : (popup.clientHeight || 0));
+  var crossSize = Math.max(1, horizontal ? (popup.clientHeight || 0) : (popup.clientWidth || 0));
+  /* Outward held feedback grows the optical surface, not an inward clip. */
+  var edgeJitter = Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, amount * LIQUID_POPUP_MAX_EDGE_JITTER_PX);
+  var crossJitter = edgeJitter * 0.24;
+  var stretch = (edgeJitter * 2) / axisSize;
+  var squash = -((crossJitter * 2) / crossSize);
+  var stretchX = horizontal ? stretch : squash;
+  var squashY = horizontal ? squash : stretch;
+  popup.style.setProperty('--liquid-popup-stretch', stretchX.toFixed(6));
+  popup.style.setProperty('--liquid-popup-squash', squashY.toFixed(6));
+  popup.style.setProperty('scale', '1');
+  popup.style.setProperty('--liquid-popup-edge-x', '0px');
+  popup.style.setProperty('--liquid-popup-edge-y', '0px');
+  setLiquidPopupOutset(popup, edgeJitter, dx, dy);
+}
+
+function setLiquidPopupPressDeformation(popup) {
+  if (!popup) return;
+  clearLiquidPopupOutset(popup, true);
+  var width = Math.max(1, popup.clientWidth || 1);
+  var height = Math.max(1, popup.clientHeight || 1);
+  /* Keep click feedback fixed-size as well; it is intentionally smaller than
+     the drag budget so a tap never produces a large-dialog jump. */
+  var edgeJitter = Math.min(4, LIQUID_POPUP_MAX_EDGE_JITTER_PX * 0.4);
+  var stretch = (edgeJitter * 2) / width;
+  var squash = -((edgeJitter * 0.24 * 2) / height);
+  popup.style.setProperty('--liquid-popup-stretch', stretch.toFixed(6));
+  popup.style.setProperty('--liquid-popup-squash', squash.toFixed(6));
+  popup.style.setProperty('scale', '1');
+  popup.style.setProperty('--liquid-popup-edge-x', (edgeJitter * 0.24).toFixed(3) + 'px');
+  popup.style.setProperty('--liquid-popup-edge-y', edgeJitter.toFixed(3) + 'px');
+}
+
 function startLiquidMotionTracking(float) {
   if (!float || float._liquidMotionFrame) return;
   var lastTime = 0;
@@ -14199,9 +15035,23 @@ function startLiquidMotionTracking(float) {
     var speed = reducedMotion ? 0 : Math.hypot(velocityX, velocityY);
     var amount = Math.max(0, Math.min(1, (speed - 8) / 700));
     var angle = speed > 1 ? Math.atan2(velocityY, velocityX) : 0;
+    // Percentage-only velocity stretch exceeds 4px on wide capsules. Bound
+    // the combined motion + boundary scales by the untransformed half-diagonal,
+    // so the displacement of every corner fits the remaining pixel budget.
+    var halfDiagonal = Math.max(1, Math.hypot(float.offsetWidth, float.offsetHeight) * .5);
+    var boundaryX = parseFloat(float.style.getPropertyValue('--liquid-boundary-x')) || 0;
+    var boundaryY = parseFloat(float.style.getPropertyValue('--liquid-boundary-y')) || 0;
+    var boundaryPull = parseFloat(float.style.getPropertyValue('--liquid-boundary-pull')) || 0;
+    var available = Math.max(0, LIQUID_POPUP_MAX_EDGE_JITTER_PX - Math.hypot(boundaryX, boundaryY));
+    var motionStretch = amount * .075;
+    var boundaryStretch = boundaryPull * .06;
+    var requestedStretch = motionStretch + boundaryStretch + motionStretch * boundaryStretch;
+    var budgetRatio = requestedStretch > 0 ? Math.min(1, available / halfDiagonal / requestedStretch) : 1;
     float.style.setProperty('--liquid-motion-angle', angle + 'rad');
-    float.style.setProperty('--liquid-motion-stretch', String(1 + amount * .075));
-    float.style.setProperty('--liquid-motion-squash', String(1 - amount * .035));
+    float.style.setProperty('--liquid-motion-stretch', String(1 + motionStretch * budgetRatio));
+    float.style.setProperty('--liquid-motion-squash', String(1 - amount * .035 * budgetRatio));
+    float.style.setProperty('--liquid-boundary-scale-x', String(1 + boundaryStretch * budgetRatio));
+    float.style.setProperty('--liquid-boundary-scale-y', String(1 - boundaryPull * .025 * budgetRatio));
     if (window.__liquidPerfCounts) float.dataset.liquidMotionAmount = amount.toFixed(4);
     if (moved && float._renderKyantGlass) float._renderKyantGlass({ left:left, top:top, width:width, height:height }, true);
     float._liquidMotionFrame = requestAnimationFrame(frame);
@@ -14218,6 +15068,8 @@ function stopLiquidMotionTracking(float) {
   float.style.removeProperty('--liquid-motion-angle');
   float.style.removeProperty('--liquid-motion-stretch');
   float.style.removeProperty('--liquid-motion-squash');
+  float.style.removeProperty('--liquid-boundary-scale-x');
+  float.style.removeProperty('--liquid-boundary-scale-y');
 }
 
 function waitForLiquidSelectionArrival(float, onArrive) {
@@ -14277,6 +15129,11 @@ function beginLiquidSelectionLift(float) {
 
 function wireLiquidMenuInteractions(menu) {
   if (!menu || menu.dataset.liquidInteractions === 'true') return;
+  if (menu.dataset.liquidDirectOptions === 'true') return;
+  menu.dataset.liquidDirectOptions = 'true';
+  // Popup options now interact as their own color block. No top-layer glass
+  // float is created; the shell itself owns the liquid refraction and light.
+  return;
   menu.dataset.liquidInteractions = 'true';
   var pointer = null;
   var source = null;
@@ -14435,41 +15292,657 @@ function wireLiquidMenuInteractions(menu) {
   }, true);
 }
 
-// The same single floating capsule is used by the left workspace rail and
-// right sidebar tabs. Delegation keeps it valid while either rail rerenders.
-function wireLiquidRailInteractions(container, selector) {
-  if (!container || container.dataset.liquidRailInteractions === 'true') return;
-  container.dataset.liquidRailInteractions = 'true';
+function wireDirectLiquidMenuInteractions(menu) {
+  if (!menu || menu.dataset.liquidDirectOptions === 'true') return;
+  menu.dataset.liquidDirectOptions = 'true';
   var pointer = null;
   var source = null;
   var target = null;
-  var float = null;
-  var generation = 0;
-  var pressX = 0;
-  var pressY = 0;
-  var gestureMoved = false;
-  function itemAt(event) {
+  var holdTimer = 0;
+  var dragging = false;
+  var moved = false;
+  var startX = 0;
+  var startY = 0;
+  function optionAt(event) {
     var hit = event && document.elementFromPoint ? document.elementFromPoint(event.clientX, event.clientY) : event.target;
-    var node = hit && hit.closest ? hit.closest(selector) : null;
-    return node && container.contains(node) && !node.disabled ? node : null;
+    var node = hit && hit.closest ? hit.closest('button.model-select-menu-option, button.newmark-select-option') : null;
+    return node && menu.contains(node) && !node.disabled ? node : null;
   }
-  function position(item) {
-    if (!item || !float) return;
-    float.style.setProperty('--liquid-boundary-x', '0px');
-    float.style.setProperty('--liquid-boundary-y', '0px');
-    float.style.setProperty('--liquid-boundary-pull', '0');
-    if (float._liquidCovered && float._liquidCovered !== item) {
-      float._liquidCovered.classList.remove('liquid-selection-covered');
-    }
-    if (item !== source) {
-      item.classList.add('liquid-selection-covered');
-      float._liquidCovered = item;
+  function applyPress(option, event) {
+    if (!option) return;
+    var rect = option.getBoundingClientRect();
+    option.style.setProperty('--liquid-option-origin-x', ((event.clientX - rect.left) / Math.max(1, rect.width) * 100) + '%');
+    option.style.setProperty('--liquid-option-origin-y', ((event.clientY - rect.top) / Math.max(1, rect.height) * 100) + '%');
+    option.style.setProperty('--liquid-option-press', '1');
+    option.style.setProperty('--liquid-option-x', '0px');
+    option.style.setProperty('--liquid-option-y', '0px');
+  }
+  function clearOption(option) {
+    if (!option) return;
+    option.style.removeProperty('--liquid-option-press');
+    option.style.removeProperty('--liquid-option-x');
+    option.style.removeProperty('--liquid-option-y');
+    option.classList.remove('liquid-option-dragging');
+  }
+  function nearestOption(event) {
+    var options = Array.from(menu.querySelectorAll('button.model-select-menu-option, button.newmark-select-option'))
+      .filter(function(option) { return !option.disabled && option.getClientRects().length; });
+    if (!options.length) return source;
+    var nearest = options[0];
+    var nearestDistance = Infinity;
+    options.forEach(function(option) {
+      var rect = option.getBoundingClientRect();
+      var distance = Math.hypot(event.clientX - (rect.left + rect.width / 2), event.clientY - (rect.top + rect.height / 2));
+      if (distance < nearestDistance) { nearest = option; nearestDistance = distance; }
+    });
+    return nearest;
+  }
+  function onPointerMove(event) {
+    if (pointer === null || event.pointerId !== pointer) return;
+    event.preventDefault();
+    var dx = event.clientX - startX;
+    var dy = event.clientY - startY;
+    var distance = Math.hypot(dx, dy);
+    if (!dragging) {
+      if (distance < 4) return;
+      moved = true;
+      var resisted = Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, Math.sqrt(distance) * 1.25);
+      var ratio = resisted / Math.max(1, distance);
+      source.style.setProperty('--liquid-option-x', (dx * ratio) + 'px');
+      source.style.setProperty('--liquid-option-y', (dy * ratio) + 'px');
+      source.style.setProperty('--liquid-option-press', '0.2');
+      return;
     }
-    if (float.classList.contains('liquid-selection-viewport')) {
-      var rect = item.getBoundingClientRect();
-      var edge = liquidInteractionEdgePx();
-      keepLiquidFloatExpansionInsideViewport(float, rect);
-      float._liquidTargetRect = { left: rect.left - edge, top: rect.top - edge, width: rect.width + edge * 2, height: rect.height + edge * 2 };
+    target = nearestOption(event);
+    source.style.setProperty('--liquid-option-x', dx + 'px');
+    source.style.setProperty('--liquid-option-y', dy + 'px');
+  }
+  function onPointerUp(event) {
+    if (pointer === null || event.pointerId !== pointer) return;
+    clearTimeout(holdTimer);
+    holdTimer = 0;
+    window.removeEventListener('pointermove', onPointerMove, true);
+    window.removeEventListener('pointerup', onPointerUp, true);
+    window.removeEventListener('pointercancel', onPointerCancel, true);
+    try { menu.releasePointerCapture(pointer); } catch (_) {}
+    var commit = dragging ? (target || source) : source;
+    clearOption(source);
+    pointer = null;
+    source = null;
+    target = null;
+    dragging = false;
+    moved = false;
+    if (commit && commit.isConnected) commit.click();
+  }
+  function onPointerCancel(event) {
+    if (pointer === null || event.pointerId !== pointer) return;
+    clearTimeout(holdTimer);
+    holdTimer = 0;
+    window.removeEventListener('pointermove', onPointerMove, true);
+    window.removeEventListener('pointerup', onPointerUp, true);
+    window.removeEventListener('pointercancel', onPointerCancel, true);
+    try { menu.releasePointerCapture(pointer); } catch (_) {}
+    clearOption(source);
+    pointer = null;
+    source = null;
+    target = null;
+    dragging = false;
+    moved = false;
+  }
+  menu.addEventListener('pointerdown', function(event) {
+    var pressed = optionAt(event);
+    if (!pressed || event.button !== 0) return;
+    event.preventDefault();
+    // The block's source is always the current selected row; the row pressed
+    // by the user is the destination for the pickup flight.
+    source = menu.querySelector('button.model-select-menu-option.selected, button.newmark-select-option.selected') || pressed;
+    target = pressed;
+    pointer = event.pointerId;
+    startX = event.clientX;
+    startY = event.clientY;
+    moved = false;
+    dragging = false;
+    applyPress(source, event);
+    menu.setPointerCapture(pointer);
+    window.addEventListener('pointermove', onPointerMove, true);
+    window.addEventListener('pointerup', onPointerUp, true);
+    window.addEventListener('pointercancel', onPointerCancel, true);
+    holdTimer = setTimeout(function() {
+      holdTimer = 0;
+      if (source && !moved && !dragging) {
+        dragging = true;
+        source.classList.add('liquid-option-dragging');
+        source.style.setProperty('--liquid-option-press', '0.45');
+      }
+    }, LIQUID_HOLD_DRAG_ACTIVATION_MS);
+  }, true);
+}
+
+function wireDirectLiquidMenuInteractionsV2(menu) {
+  if (!menu) return;
+  var COLOR_BLOCK_FLIGHT_MS = 240;
+  function ensureBlock() {
+    var block = menu._liquidColorBlock;
+    if (block && block.isConnected && block.parentNode === menu) {
+      // During a source→target flight the selected state is intentionally
+      // still the old option.  Re-anchoring here would snap the block back to
+      // that source while a select rerender is being processed.
+      if (!menu.dataset.liquidPendingCommit) positionSelectedBlock();
+      return;
+    }
+    // `innerHTML` replacement detaches children, including the color block.
+    // Reuse the expando-backed node when available instead of creating a new
+    // block (which also loses its in-flight geometry and transition state).
+    if (!block) {
+      block = document.createElement('div');
+      block.className = 'liquid-menu-color-block';
+    }
+    menu.appendChild(block);
+    menu._liquidColorBlock = block;
+    if (!menu.dataset.liquidPendingCommit) positionSelectedBlock();
+  }
+  function positionBlock(option) {
+    var block = menu._liquidColorBlock;
+    if (!block || !option || !option.getClientRects().length) return;
+    block.style.left = option.offsetLeft + 'px';
+    block.style.top = option.offsetTop + 'px';
+    block.style.width = option.offsetWidth + 'px';
+    block.style.height = option.offsetHeight + 'px';
+    block.style.opacity = '1';
+  }
+  function setBlockLight(event) {
+    var block = menu._liquidColorBlock;
+    if (!block || !event) return;
+  // PC mouse interaction deliberately has no moving light source.  Keep this
+  // hook available for non-mouse pointers so the shared component remains
+  // touch-capable without changing any glass geometry or material.
+    block.style.setProperty('--liquid-block-light-opacity', event.pointerType === 'mouse' ? '0' : '1');
+    if (event.pointerType === 'mouse') return;
+    var rect = block.getBoundingClientRect();
+    if (!rect.width || !rect.height) return;
+    block.style.setProperty('--liquid-block-light-x', Math.max(0, Math.min(100, ((event.clientX - rect.left) / rect.width) * 100)) + '%');
+    block.style.setProperty('--liquid-block-light-y', Math.max(0, Math.min(100, ((event.clientY - rect.top) / rect.height) * 100)) + '%');
+  }
+  function setBlockLifted(lifted) {
+    var block = menu._liquidColorBlock;
+    if (!block) return;
+    block.classList.toggle('liquid-block-lifted', !!lifted);
+  }
+  function positionSelectedBlock() {
+    positionBlock(menu.querySelector('button.model-select-menu-option.selected, button.newmark-select-option.selected'));
+  }
+  function optionAt(event) {
+    var hit = event && document.elementFromPoint ? document.elementFromPoint(event.clientX, event.clientY) : event.target;
+    var node = hit && hit.closest ? hit.closest('button.model-select-menu-option, button.newmark-select-option') : null;
+    return node && menu.contains(node) && !node.disabled ? node : null;
+  }
+  function nearestOption(event) {
+    var options = Array.from(menu.querySelectorAll('button.model-select-menu-option, button.newmark-select-option'))
+      .filter(function(option) { return !option.disabled && option.getClientRects().length; });
+    if (!options.length) return source;
+    var nearest = options[0];
+    var nearestDistance = Infinity;
+    options.forEach(function(option) {
+      var rect = option.getBoundingClientRect();
+      var distance = Math.hypot(event.clientX - (rect.left + rect.width / 2), event.clientY - (rect.top + rect.height / 2));
+      if (distance < nearestDistance) { nearest = option; nearestDistance = distance; }
+    });
+    return nearest;
+  }
+  function trackBlock(dx, dy) {
+    var options = Array.from(menu.querySelectorAll('button.model-select-menu-option, button.newmark-select-option'))
+      .filter(function(option) { return !option.disabled && option.getClientRects().length; });
+    if (!options.length || !menu._liquidColorBlock) return;
+    var first = options[0];
+    var last = options[options.length - 1];
+    var vertical = options.length < 2 || Math.abs(options[1].offsetTop - first.offsetTop) >= Math.abs(options[1].offsetLeft - first.offsetLeft);
+    var minPos = vertical ? Math.min(first.offsetTop, last.offsetTop) : Math.min(first.offsetLeft, last.offsetLeft);
+    var maxPos = vertical ? Math.max(first.offsetTop, last.offsetTop) : Math.max(first.offsetLeft, last.offsetLeft);
+    var rawPos = vertical ? blockStartTop + dy : blockStartLeft + dx;
+    var clampedPos = Math.max(minPos, Math.min(maxPos, rawPos));
+    var boundaryDelta = rawPos - clampedPos;
+    var block = menu._liquidColorBlock;
+    block.style.transition = 'none';
+    block.style.left = (vertical ? blockStartLeft : clampedPos) + 'px';
+    block.style.top = (vertical ? clampedPos : blockStartTop) + 'px';
+    return { vertical: vertical, boundaryDelta: boundaryDelta };
+  }
+  function animateBlockTo(option, done) {
+    var block = menu._liquidColorBlock;
+    if (!block || !option || !block.isConnected) {
+      if (done) done();
+      return;
+    }
+    var targetLeft = option.offsetLeft + 'px';
+    var targetTop = option.offsetTop + 'px';
+    var targetWidth = option.offsetWidth + 'px';
+    var targetHeight = option.offsetHeight + 'px';
+    var flightId = String(Date.now()) + ':' + Math.random();
+    menu.dataset.liquidPendingCommit = flightId;
+    if (menu._liquidColorFlightTimer) clearTimeout(menu._liquidColorFlightTimer);
+    // Freeze the current (source or pointer-tracked) geometry, force a style
+    // flush, then use two animation frames: the first commits the no-transition
+    // source frame, the second starts the stylesheet transition.  One frame is
+    // not sufficient on Chromium when pointerup and the style write share the
+    // same rendering update.
+    freezeBlockGeometry(block);
+    block.getBoundingClientRect();
+    void block.offsetWidth;
+    requestAnimationFrame(function() {
+      if (menu.dataset.liquidPendingCommit !== flightId || !block.isConnected) return;
+      requestAnimationFrame(function() {
+        if (menu.dataset.liquidPendingCommit !== flightId || !block.isConnected) return;
+        block.style.transition = '';
+        block.style.left = targetLeft;
+        block.style.top = targetTop;
+        block.style.width = targetWidth;
+        block.style.height = targetHeight;
+        menu._liquidColorFlightTimer = setTimeout(function() {
+          menu._liquidColorFlightTimer = 0;
+          if (menu.dataset.liquidPendingCommit !== flightId) return;
+          if (done) done();
+        }, COLOR_BLOCK_FLIGHT_MS + 16);
+      });
+    });
+  }
+  function animateBlockToLongPressRow(option, done) {
+    var block = menu._liquidColorBlock;
+    if (!block || !option || !block.isConnected) {
+      if (done) done();
+      return;
+    }
+    var targetLeft = option.offsetLeft + 'px';
+    var targetTop = option.offsetTop + 'px';
+    var targetWidth = option.offsetWidth + 'px';
+    var targetHeight = option.offsetHeight + 'px';
+    var pickupId = ++pickupGeneration;
+    setBlockLifted(true);
+    freezeBlockGeometry(block);
+    block.getBoundingClientRect();
+    void block.offsetWidth;
+    requestAnimationFrame(function() {
+      if (pickupId !== pickupGeneration || !block.isConnected) return;
+      requestAnimationFrame(function() {
+        if (pickupId !== pickupGeneration || !block.isConnected) return;
+        block.style.transition = '';
+        block.style.left = targetLeft;
+        block.style.top = targetTop;
+        block.style.width = targetWidth;
+        block.style.height = targetHeight;
+        pickupTimer = setTimeout(function() {
+          pickupTimer = 0;
+          if (pickupId === pickupGeneration && done) done();
+        }, COLOR_BLOCK_FLIGHT_MS + 16);
+      });
+    });
+  }
+  function freezeBlockGeometry(block) {
+    var style = getComputedStyle(block);
+    var left = style.left;
+    var top = style.top;
+    var width = style.width;
+    var height = style.height;
+    block.style.transition = 'none';
+    block.style.left = left;
+    block.style.top = top;
+    block.style.width = width;
+    block.style.height = height;
+  }
+  function cancelPickup() {
+    pickupGeneration += 1;
+    clearTimeout(pickupTimer);
+    pickupTimer = 0;
+    blockLiftAnimating = false;
+  }
+  function applyPress(option, event) {
+    // Popup option content is inert. All visual feedback is carried by the
+    // moving capsule block and the popup shell; never write transform/press
+    // variables onto the text-bearing option itself.
+    void option;
+    void event;
+    setLiquidPopupPressDeformation(menu.closest('.liquid-glass-popup'));
+  }
+  function clearOption(option) {
+    if (!option) return;
+    option.style.removeProperty('--liquid-option-press');
+    option.style.removeProperty('--liquid-option-x');
+    option.style.removeProperty('--liquid-option-y');
+    option.classList.remove('liquid-option-dragging');
+  }
+  // `syncModelSelectSurface`/`syncNewmarkSelect` rebuild option markup with
+  // `innerHTML`, which detaches the old block while leaving the expando
+  // reference truthy.  Always reconcile the carrier before the dataset guard
+  // so a rerender gets a live block again (and an existing one is re-anchored
+  // to the current selection).
+  ensureBlock();
+  if (menu.dataset.liquidDirectOptions === 'true') return;
+  menu.dataset.liquidDirectOptions = 'true';
+  var pointer = null;
+  var source = null;
+  var target = null;
+  var holdTimer = 0;
+  var dragging = false;
+  var blockLiftAnimating = false;
+  var pickupGeneration = 0;
+  var pickupTimer = 0;
+  var latestPointerEvent = null;
+  var moved = false;
+  var startX = 0;
+  var startY = 0;
+  var blockStartLeft = 0;
+  var blockStartTop = 0;
+  // Hidden menus have no option geometry. Once the popover has its final
+  // visible width/position, establish the idle source without a fake flight
+  // from zero (or from the previous opening). Active gestures own their frame.
+  menu._liquidSyncSelectedBlock = function() {
+    if (pointer !== null || menu.dataset.liquidPendingCommit) return;
+    var block = menu._liquidColorBlock;
+    if (!block || !menu.getClientRects().length) return;
+    var transition = block.style.transition;
+    block.style.transition = 'none';
+    positionSelectedBlock();
+    void block.offsetWidth;
+    block.style.transition = transition;
+  };
+  function updatePopupShellDrag(dx, dy, clear) {
+    var popup = menu.closest('.liquid-glass-popup');
+    if (!popup) return;
+    setLiquidPopupDeformation(popup, dx, dy, clear);
+  }
+  function onPointerMove(event) {
+    if (pointer === null || event.pointerId !== pointer) return;
+    event.preventDefault();
+    latestPointerEvent = event;
+    var dx = event.clientX - startX;
+    var dy = event.clientY - startY;
+    var distance = Math.hypot(dx, dy);
+    if (!dragging) {
+      moved = distance >= 4;
+      return;
+    }
+    target = nearestOption(event);
+    if (blockLiftAnimating) {
+      setBlockLight(event);
+      return;
+    }
+    var track = trackBlock(dx, dy);
+    setBlockLight(event);
+    // A normal rail drag stays rigid and follows only its track. Deform the
+    // popup shell only when a held drag pushes beyond the rail endpoint.
+    if (track && Math.abs(track.boundaryDelta) > 0.01) {
+      updatePopupShellDrag(track.vertical ? 0 : track.boundaryDelta, track.vertical ? track.boundaryDelta : 0, false);
+    } else {
+      updatePopupShellDrag(0, 0, true);
+    }
+  }
+  function finishAndCommit(commit) {
+    clearTimeout(holdTimer);
+    holdTimer = 0;
+    // Release/cancel owns the flight state. Without clearing this flag here,
+    // a pointerup during the pickup animation leaves the next interaction in
+    // a permanently non-tracking state.
+    cancelPickup();
+    window.removeEventListener('pointermove', onPointerMove, true);
+    window.removeEventListener('pointerup', onPointerUp, true);
+    window.removeEventListener('pointercancel', onPointerCancel, true);
+    try { menu.releasePointerCapture(pointer); } catch (_) {}
+    var option = commit || source;
+    var popup = menu.closest('.liquid-glass-popup');
+    if (popup) {
+      if (dragging) {
+        setLiquidPopupDeformation(popup, 0, 0, true);
+      } else {
+        setLiquidPopupPressDeformation(popup);
+        setTimeout(function() {
+          if (popup.isConnected && pointer === null) {
+            setLiquidPopupDeformation(popup, 0, 0, true);
+          }
+        }, 120);
+      }
+    }
+    clearOption(source);
+    pointer = null;
+    source = null;
+    target = null;
+    dragging = false;
+    moved = false;
+    if (!option || !option.isConnected) return;
+    // Let the color block finish its full source→target flight before the
+    // change handler rerenders the menu.  Otherwise the selected-state rebuild
+    // snaps the block back to the old geometry halfway through the animation.
+    var selectedBefore = menu.querySelector('button.model-select-menu-option.selected, button.newmark-select-option.selected');
+    if (option && option.isConnected && selectedBefore && (selectedBefore !== option || menu._liquidColorBlock.classList.contains('liquid-block-lifted'))) {
+      animateBlockTo(option, function() {
+        if (!option.isConnected) {
+          setBlockLifted(false);
+          delete menu.dataset.liquidPendingCommit;
+          return;
+        }
+        setBlockLifted(false);
+        option.click();
+        delete menu.dataset.liquidPendingCommit;
+      });
+    } else if (option && option.isConnected) {
+      // Pointerup is followed by a trusted native click for the same gesture.
+      // Suppress only that one follow-up click; keyboard activation remains a
+      // normal trusted click because it does not set this pointer-owned flag.
+      menu.dataset.liquidSuppressTrustedClick = 'true';
+      setBlockLifted(false);
+      option.click();
+      setTimeout(function() { delete menu.dataset.liquidSuppressTrustedClick; }, 0);
+    }
+  }
+  function onPointerUp(event) {
+    if (pointer === null || event.pointerId !== pointer) return;
+    finishAndCommit(dragging ? target : target || source);
+  }
+  function onPointerCancel(event) {
+    if (pointer === null || event.pointerId !== pointer) return;
+    clearTimeout(holdTimer);
+    holdTimer = 0;
+    window.removeEventListener('pointermove', onPointerMove, true);
+    window.removeEventListener('pointerup', onPointerUp, true);
+    window.removeEventListener('pointercancel', onPointerCancel, true);
+    try { menu.releasePointerCapture(pointer); } catch (_) {}
+    cancelPickup();
+    if (menu._liquidColorBlock) freezeBlockGeometry(menu._liquidColorBlock);
+    positionSelectedBlock();
+    setBlockLifted(false);
+    updatePopupShellDrag(0, 0, true);
+    clearOption(source);
+    pointer = null;
+    source = null;
+    target = null;
+    dragging = false;
+    moved = false;
+  }
+  menu.addEventListener('pointerdown', function(event) {
+    var pressed = optionAt(event);
+    if (!pressed || event.button !== 0) return;
+    if (menu.dataset.liquidPendingCommit) return;
+    event.preventDefault();
+    // The capsule starts from the currently selected row and flies to the
+    // row where the pointer was pressed; option content remains stationary.
+    source = menu.querySelector('button.model-select-menu-option.selected, button.newmark-select-option.selected') || pressed;
+    target = pressed;
+    pointer = event.pointerId;
+    startX = event.clientX;
+    startY = event.clientY;
+    latestPointerEvent = event;
+    moved = false;
+    dragging = false;
+    applyPress(source, event);
+    var block = menu._liquidColorBlock;
+    if (block) {
+      blockStartLeft = parseFloat(block.style.left || '0') || source.offsetLeft || 0;
+      blockStartTop = parseFloat(block.style.top || '0') || source.offsetTop || 0;
+    }
+    menu.setPointerCapture(pointer);
+    window.addEventListener('pointermove', onPointerMove, true);
+    window.addEventListener('pointerup', onPointerUp, true);
+    window.addEventListener('pointercancel', onPointerCancel, true);
+    holdTimer = setTimeout(function() {
+      holdTimer = 0;
+      if (source && !moved && !dragging) {
+        dragging = true;
+        blockLiftAnimating = true;
+        // The held press ends exactly when the selected block begins pickup.
+        updatePopupShellDrag(0, 0, true);
+        setBlockLifted(true);
+        setBlockLight({ clientX: startX, clientY: startY, pointerType: event.pointerType });
+        // The carrier starts at the currently selected row and flies to the
+        // row where the long press began. Its drag baseline must then remain
+        // at that destination, otherwise the first pointermove snaps it back
+        // to the original selected row.
+        var pickupTarget = target || source;
+        animateBlockToLongPressRow(pickupTarget, function() {
+          blockLiftAnimating = false;
+          var landed = pickupTarget;
+          blockStartLeft = landed ? landed.offsetLeft : blockStartLeft;
+          blockStartTop = landed ? landed.offsetTop : blockStartTop;
+          if (latestPointerEvent && pointer !== null) onPointerMove(latestPointerEvent);
+        });
+      }
+    }, LIQUID_HOLD_DRAG_ACTIVATION_MS);
+  }, true);
+  // A physical mouse/touch activation produces a trusted native click after
+  // pointerup.  The pointer path above owns selection timing, so suppress that
+  // native click while the color block is in flight.  The delayed
+  // `option.click()` is synthetic (`isTrusted === false`) and is intentionally
+  // allowed through to the existing model/generic select commit handlers.
+  menu.addEventListener('click', function(event) {
+    var option = event.target && event.target.closest
+      ? event.target.closest('button.model-select-menu-option, button.newmark-select-option')
+      : null;
+    if (!option || !menu.contains(option) || !event.isTrusted) return;
+    if (!menu.dataset.liquidPendingCommit && !menu.dataset.liquidSuppressTrustedClick) return;
+    event.preventDefault();
+    event.stopImmediatePropagation();
+  }, true);
+  ensureBlock();
+}
+
+window.animateLiquidPopupExit = function(popup, anchor, done) {
+  if (!popup) { if (done) done(); return; }
+  clearLiquidPopupOutset(popup, true);
+  if (popup._liquidExitTimer) clearTimeout(popup._liquidExitTimer);
+  var rect = popup.getBoundingClientRect();
+  if (rect.width > 0 && rect.height > 0) {
+    if (anchor && anchor.getBoundingClientRect) {
+      var anchorRect = anchor.getBoundingClientRect();
+      popup.style.setProperty(
+        '--liquid-popup-origin-x',
+        ((anchorRect.left + anchorRect.width / 2 - rect.left) / rect.width * 100) + '%',
+      );
+      popup.style.setProperty(
+        '--liquid-popup-origin-y',
+        ((anchorRect.top + anchorRect.height / 2 - rect.top) / rect.height * 100) + '%',
+      );
+    } else {
+      popup.style.setProperty('--liquid-popup-origin-x', '50%');
+      popup.style.setProperty('--liquid-popup-origin-y', '50%');
+    }
+  }
+  popup.classList.add('liquid-popup-exit');
+  popup._liquidExitTimer = setTimeout(function() {
+    popup._liquidExitTimer = 0;
+    popup.classList.remove('liquid-popup-exit');
+    popup.style.removeProperty('--liquid-popup-origin-x');
+    popup.style.removeProperty('--liquid-popup-origin-y');
+    if (done) done();
+  }, 210);
+};
+
+function wireDirectPopupOptionPress() {
+  if (document.documentElement.dataset.directPopupOptionPress === 'true') return;
+  document.documentElement.dataset.directPopupOptionPress = 'true';
+  var optionSelector = '.conv-action-menu-item, .command-option, .workspace-type-option';
+  function optionAt(event) {
+    var hit = event && document.elementFromPoint ? document.elementFromPoint(event.clientX, event.clientY) : event.target;
+    return hit && hit.closest ? hit.closest(optionSelector) : null;
+  }
+  function applyPress(option, event) {
+    var rect = option.getBoundingClientRect();
+    option.style.setProperty('--liquid-option-origin-x', ((event.clientX - rect.left) / Math.max(1, rect.width) * 100) + '%');
+    option.style.setProperty('--liquid-option-origin-y', ((event.clientY - rect.top) / Math.max(1, rect.height) * 100) + '%');
+    option.style.setProperty('--liquid-option-press', '1');
+  }
+  function clearOption(option) {
+    if (!option) return;
+    option.style.removeProperty('--liquid-option-press');
+    option.style.removeProperty('--liquid-option-x');
+    option.style.removeProperty('--liquid-option-y');
+  }
+  document.addEventListener('pointerdown', function(event) {
+    var option = optionAt(event);
+    if (!option || option.disabled || event.button !== 0) return;
+    var menu = option.closest('.model-select-menu, .newmark-select-menu');
+    if (menu && menu.dataset.liquidDirectOptions === 'true') return;
+    applyPress(option, event);
+    // Content never follows the pointer inside a popup. The shell owns any
+    // boundary/light response; this handler only supplies click-center scale.
+    return;
+    var startX = event.clientX;
+    var startY = event.clientY;
+    function onMove(move) {
+      var dx = move.clientX - startX;
+      var dy = move.clientY - startY;
+      var distance = Math.hypot(dx, dy);
+      if (distance < 4) return;
+      move.preventDefault();
+      var resisted = Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, Math.sqrt(distance) * 1.25);
+      var ratio = resisted / Math.max(1, distance);
+      option.style.setProperty('--liquid-option-x', (dx * ratio) + 'px');
+      option.style.setProperty('--liquid-option-y', (dy * ratio) + 'px');
+      option.style.setProperty('--liquid-option-press', '0.2');
+    }
+    function clear() {
+      document.removeEventListener('pointermove', onMove, true);
+      document.removeEventListener('pointerup', clear, true);
+      document.removeEventListener('pointercancel', clear, true);
+      clearOption(option);
+    }
+    document.addEventListener('pointermove', onMove, true);
+    document.addEventListener('pointerup', clear, true);
+    document.addEventListener('pointercancel', clear, true);
+  }, true);
+}
+
+// The same single floating capsule is used by the left workspace rail and
+// right sidebar tabs. Delegation keeps it valid while either rail rerenders.
+function wireLiquidRailInteractions(container, selector) {
+  if (!container || container.dataset.liquidRailInteractions === 'true') return;
+  container.dataset.liquidRailInteractions = 'true';
+  var pointer = null;
+  var source = null;
+  var target = null;
+  var float = null;
+  var generation = 0;
+  var pressX = 0;
+  var pressY = 0;
+  var gestureMoved = false;
+  function itemAt(event) {
+    var hit = event && document.elementFromPoint ? document.elementFromPoint(event.clientX, event.clientY) : event.target;
+    var node = hit && hit.closest ? hit.closest(selector) : null;
+    return node && container.contains(node) && !node.disabled ? node : null;
+  }
+  function position(item) {
+    if (!item || !float) return;
+    float.style.setProperty('--liquid-boundary-x', '0px');
+    float.style.setProperty('--liquid-boundary-y', '0px');
+    float.style.setProperty('--liquid-boundary-pull', '0');
+    if (float._liquidCovered && float._liquidCovered !== item) {
+      float._liquidCovered.classList.remove('liquid-selection-covered');
+    }
+    if (item !== source) {
+      item.classList.add('liquid-selection-covered');
+      float._liquidCovered = item;
+    }
+    if (float.classList.contains('liquid-selection-viewport')) {
+      var rect = item.getBoundingClientRect();
+      var edge = liquidInteractionEdgePx();
+      keepLiquidFloatExpansionInsideViewport(float, rect);
+      float._liquidTargetRect = { left: rect.left - edge, top: rect.top - edge, width: rect.width + edge * 2, height: rect.height + edge * 2 };
       float.style.left = (rect.left - edge) + 'px';
       float.style.top = (rect.top - edge) + 'px';
       float.style.width = (rect.width + edge * 2) + 'px';
@@ -14510,7 +15983,7 @@ function wireLiquidRailInteractions(container, selector) {
     var maxCenter = Math.max.apply(null, centers);
     var projectedCenter = Math.max(minCenter, Math.min(maxCenter, pointerAxis));
     var blockedDelta = pointerAxis < minCenter ? pointerAxis - minCenter : pointerAxis > maxCenter ? pointerAxis - maxCenter : 0;
-    var resisted = Math.sign(blockedDelta) * Math.sqrt(Math.abs(blockedDelta)) * 0.6;
+    var resisted = Math.sign(blockedDelta) * Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, Math.sqrt(Math.abs(blockedDelta)) * 0.6);
     var edge = liquidInteractionEdgePx();
     var left = horizontal ? projectedCenter - rect.width / 2 - edge : rect.left - edge;
     var top = horizontal ? rect.top - edge : projectedCenter - rect.height / 2 - edge;
@@ -14697,7 +16170,7 @@ function wireLegacyLiquidButtons() {
       var distance = Math.hypot(dx, dy);
       if (distance < 2) return;
       move.preventDefault();
-      var resistedDistance = Math.min(4.5, Math.sqrt(distance) * 0.625);
+      var resistedDistance = Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, Math.sqrt(distance) * 1.25);
       var ratio = resistedDistance / Math.max(1, distance);
       float.style.setProperty('--liquid-boundary-x', (dx * ratio).toFixed(2) + 'px');
       float.style.setProperty('--liquid-boundary-y', (dy * ratio).toFixed(2) + 'px');
@@ -14749,7 +16222,9 @@ function wireFixedPrimaryLiquidButtons() {
     '.msg-action-btn', '.conv-more-btn', '.provider-icon-btn',
     '.work-review-toggle', '.conversation-work-run-head',
     '.shell-block-header', '.diff-block-header', '.work-review-head',
-    '.message-edit-submit', '.message-edit-cancel'
+    '.message-edit-submit', '.message-edit-cancel',
+    '.model-select-menu-option', '.newmark-select-option',
+    '.conv-action-menu-item', '.command-option', '.workspace-type-option'
   ].join(',');
   document.addEventListener('pointerdown', function(event) {
     var source = event.target && event.target.closest ? event.target.closest(selector) : null;
@@ -14788,7 +16263,7 @@ function wireFixedPrimaryLiquidButtons() {
       var distance = Math.hypot(dx, dy);
       if (distance < 2) return;
       value.preventDefault();
-      var resistedDistance = Math.min(4.5, Math.sqrt(distance) * .625);
+      var resistedDistance = Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, Math.sqrt(distance) * 1.25);
       var ratio = resistedDistance / Math.max(1, distance);
       float.style.setProperty('--liquid-boundary-x', (dx * ratio).toFixed(2) + 'px');
       float.style.setProperty('--liquid-boundary-y', (dy * ratio).toFixed(2) + 'px');
@@ -14844,6 +16319,267 @@ function wireFixedPrimaryLiquidButtons() {
   }, true);
 }
 
+function wireLiquidPopupShellInteractions() {
+  var active = null;
+  var clearTimer = 0;
+  function popupAt(target) {
+    return target && target.closest ? target.closest('.liquid-glass-popup') : null;
+  }
+  function ensureOpticalCanvas(popup) {
+    if (!popup) return null;
+    var canvas = popup._liquidPopupOpticalCanvas;
+    if (canvas && canvas.isConnected && canvas.parentNode === popup) return canvas;
+    canvas = document.createElement('canvas');
+    canvas.className = 'liquid-popup-optical-canvas';
+    popup.insertBefore(canvas, popup.firstChild);
+    popup._liquidPopupOpticalCanvas = canvas;
+    popup._liquidPopupLight = { x: 0.5, y: 0.5, opacity: 0 };
+    popup._liquidPopupLightPending = null;
+    popup._liquidPopupLightFrame = 0;
+    popup._liquidPopupDrawQueued = false;
+    function resize() {
+      if (!canvas.isConnected) return;
+      var width = Math.max(1, popup.clientWidth);
+      var height = Math.max(1, popup.clientHeight);
+      var dpr = Math.min(window.devicePixelRatio || 1, 1.5);
+      canvas.width = Math.max(1, Math.round(width * dpr));
+      canvas.height = Math.max(1, Math.round(height * dpr));
+      canvas.style.width = width + 'px';
+      canvas.style.height = height + 'px';
+      queuePopupOptics(popup);
+    }
+    if (window.ResizeObserver) {
+      popup._liquidPopupOpticalObserver = new ResizeObserver(resize);
+      popup._liquidPopupOpticalObserver.observe(popup);
+    }
+    resize();
+    return canvas;
+  }
+  function ensureAllPopupCanvases(root) {
+    (root || document).querySelectorAll('.liquid-glass-popup').forEach(function(popup) {
+      ensureOpticalCanvas(popup);
+    });
+  }
+  function drawPopupOptics(popup) {
+    var canvas = popup && popup._liquidPopupOpticalCanvas;
+    if (!canvas) return;
+    var context = canvas.getContext('2d');
+    if (!context) return;
+    var light = popup._liquidPopupLight || { x: 0.5, y: 0.5, opacity: 0 };
+    var width = canvas.width;
+    var height = canvas.height;
+    context.clearRect(0, 0, width, height);
+    if (!(light.opacity > 0)) return;
+    var popupCssWidth = Math.max(1, popup.clientWidth || canvas.clientWidth || 1);
+    var canvasScale = width / popupCssWidth;
+    var clipped = typeof context.save === 'function' &&
+      typeof context.beginPath === 'function' &&
+      typeof context.clip === 'function' &&
+      (typeof context.roundRect === 'function' || typeof context.arcTo === 'function');
+    if (clipped) {
+      context.save();
+      context.beginPath();
+      var popupStyle = getComputedStyle(popup);
+      var popupRadiusCss = parseFloat(popupStyle.borderTopLeftRadius) || liquidGlassCssNumber('--liquid-popup-radius', 24);
+      var radius = Math.min(Math.max(0, popupRadiusCss * canvasScale), Math.min(width, height) * 0.5);
+      if (typeof context.roundRect === 'function') {
+        context.roundRect(0, 0, width, height, radius);
+      } else {
+        context.moveTo(radius, 0);
+        context.arcTo(width, 0, width, height, radius);
+        context.arcTo(width, height, 0, height, radius);
+        context.arcTo(0, height, 0, 0, radius);
+        context.arcTo(0, 0, width, 0, radius);
+        context.closePath();
+      }
+      context.clip();
+    }
+    // Keep the interaction spot in physical CSS pixels.  The previous
+    // min(width,height) multiplier made a large dialog produce a huge light
+    // field while a compact menu barely showed one.  The backing canvas is
+    // DPR-scaled, so convert the fixed 20px CSS radius to canvas pixels.
+    var configuredRadius = liquidGlassCssNumber('--liquid-popup-glow-radius', 20);
+    var radius = Math.max(1, configuredRadius * canvasScale);
+    var gradient = context.createRadialGradient(light.x * width, light.y * height, 0, light.x * width, light.y * height, radius);
+    gradient.addColorStop(0, 'rgba(255,255,255,' + (0.08 + light.opacity * 0.16).toFixed(3) + ')');
+    gradient.addColorStop(1, 'rgba(255,255,255,0)');
+    context.fillStyle = gradient;
+    context.fillRect(0, 0, width, height);
+    if (clipped) context.restore();
+  }
+  function queuePopupOptics(popup) {
+    if (!popup || popup._liquidPopupDrawQueued) return;
+    popup._liquidPopupDrawQueued = true;
+    requestAnimationFrame(function() {
+      popup._liquidPopupDrawQueued = false;
+      if (popup.isConnected) drawPopupOptics(popup);
+    });
+  }
+  function updateLight(popup, event, opacity) {
+    if (!popup) return;
+    // PC mouse pointers do not paint an interaction bloom.  Keep the popup
+    // shell, refraction and deformation active; only clear the pointer light.
+    if (event && event.pointerType === 'mouse') {
+      popup._liquidPopupLightPending = null;
+      if (popup._liquidPopupLight) popup._liquidPopupLight.opacity = 0;
+      popup.style.setProperty('--liquid-popup-light-opacity', '0');
+      queuePopupOptics(popup);
+      return;
+    }
+    ensureOpticalCanvas(popup);
+    var rect = popup.getBoundingClientRect();
+    if (!rect.width || !rect.height) return;
+    var x = Math.max(0, Math.min(100, (event.clientX - rect.left) / rect.width * 100));
+    var y = Math.max(0, Math.min(100, (event.clientY - rect.top) / rect.height * 100));
+    popup._liquidPopupLightPending = { x: x / 100, y: y / 100, opacity: opacity };
+    if (popup._liquidPopupLightFrame) return;
+    popup._liquidPopupLightFrame = requestAnimationFrame(function() {
+      popup._liquidPopupLightFrame = 0;
+      if (!popup.isConnected) return;
+      var pending = popup._liquidPopupLightPending;
+      if (!pending) return;
+      popup._liquidPopupLightPending = null;
+      popup.style.setProperty('--liquid-light-x', (pending.x * 100).toFixed(2) + '%');
+      popup.style.setProperty('--liquid-light-y', (pending.y * 100).toFixed(2) + '%');
+      popup.style.setProperty('--liquid-popup-light-opacity', String(pending.opacity));
+      popup._liquidPopupLight = pending;
+      queuePopupOptics(popup);
+    });
+  }
+  function clearPopup(popup) {
+    if (!popup) return;
+    popup.style.setProperty('--liquid-popup-light-opacity', '0');
+    setLiquidPopupDeformation(popup, 0, 0, true);
+    if (popup._liquidPopupLight) popup._liquidPopupLight.opacity = 0;
+    popup._liquidPopupLightPending = null;
+    if (popup._liquidPopupLightFrame) {
+      cancelAnimationFrame(popup._liquidPopupLightFrame);
+      popup._liquidPopupLightFrame = 0;
+    }
+    queuePopupOptics(popup);
+  }
+  function scheduleClear(popup, delay) {
+    if (clearTimer) clearTimeout(clearTimer);
+    clearTimer = setTimeout(function() {
+      clearTimer = 0;
+      clearPopup(popup);
+    }, delay);
+  }
+  document.addEventListener('pointerover', function(event) {
+    var popup = popupAt(event.target);
+    if (popup) updateLight(popup, event, 0.35);
+  }, true);
+  document.addEventListener('toggle', function(event) {
+    var popup = popupAt(event.target);
+    if (popup && event.newState === 'closed') clearLiquidPopupOutset(popup, true);
+    if (popup && event.newState === 'open') ensureOpticalCanvas(popup);
+  }, true);
+  ensureAllPopupCanvases(document);
+  if (window.MutationObserver && document.body) {
+    var popupObserver = new MutationObserver(function(records) {
+      records.forEach(function(record) {
+        Array.from(record.addedNodes || []).forEach(function(node) {
+          if (node.nodeType !== 1) return;
+          if (node.matches && node.matches('.liquid-glass-popup')) ensureOpticalCanvas(node);
+          ensureAllPopupCanvases(node);
+        });
+      });
+    });
+    popupObserver.observe(document.body, { childList: true, subtree: true });
+  }
+  document.addEventListener('pointermove', function(event) {
+    var popup = popupAt(event.target);
+    if (popup && (!active || active.popup !== popup)) updateLight(popup, event, 0.35);
+  }, true);
+  document.addEventListener('pointerdown', function(event) {
+    var popup = popupAt(event.target);
+    if (!popup) return;
+    if (clearTimer) { clearTimeout(clearTimer); clearTimer = 0; }
+    active = { popup: popup, x: event.clientX, y: event.clientY, pointer: event.pointerId, startedAt: performance.now(), trackOwned: popup.dataset.liquidDirectOptions === 'true' };
+    updateLight(popup, event, 1);
+    // A click still gives the carrier shell a short, visible deformation even
+    // when the pointer does not travel far enough to enter hold-drag mode.
+    if (!active.trackOwned) setLiquidPopupPressDeformation(popup);
+  }, true);
+  window.addEventListener('pointermove', function(event) {
+    if (!active || event.pointerId !== active.pointer) return;
+    if (!active.popup || !active.popup.isConnected) {
+      clearPopup(active.popup);
+      active = null;
+      return;
+    }
+    var dx = event.clientX - active.x;
+    var dy = event.clientY - active.y;
+    // A menu owns its rail and endpoint resistance. The generic shell may
+    // respond only to a held gesture without a movement track.
+    if (!active.trackOwned && performance.now() - active.startedAt >= LIQUID_HOLD_DRAG_ACTIVATION_MS) {
+      setLiquidPopupDeformation(active.popup, dx, dy, false);
+    }
+    updateLight(active.popup, event, 1);
+  }, true);
+  window.addEventListener('pointerup', function() {
+    if (!active) return;
+    scheduleClear(active.popup, 120);
+    active = null;
+  }, true);
+  window.addEventListener('pointercancel', function() {
+    if (!active) return;
+    clearPopup(active.popup);
+    if (clearTimer) { clearTimeout(clearTimer); clearTimer = 0; }
+    active = null;
+  }, true);
+  function cancelPopupFeedback() {
+    if (active) {
+      clearLiquidPopupOutset(active.popup, true);
+      clearPopup(active.popup);
+      active = null;
+    }
+    if (clearTimer) { clearTimeout(clearTimer); clearTimer = 0; }
+  }
+  window.addEventListener('blur', cancelPopupFeedback, true);
+  window.addEventListener('pagehide', cancelPopupFeedback, true);
+}
+
+function wireLiquidFloatGlowInteractions() {
+  if (document.documentElement.dataset.liquidFloatGlowWired === 'true') return;
+  document.documentElement.dataset.liquidFloatGlowWired = 'true';
+  function activeFloats() {
+    return Array.from(document.querySelectorAll('.liquid-selection-float.visible, .liquid-selection-float.liquid-option-dragging'))
+      .filter(function(float) { return float.isConnected; });
+  }
+  function update(float, event, opacity) {
+    if (!float || !float.isConnected) return;
+    if (event && event.pointerType === 'mouse') {
+      if (float._liquidGlow && float._liquidGlow.opacity > 0) {
+        float._liquidGlow = { x: 0.5, y: 0.5, opacity: 0 };
+        if (float._renderKyantGlass) float._renderKyantGlass(null, true);
+      }
+      return;
+    }
+    var rect = float.getBoundingClientRect();
+    if (!rect.width || !rect.height) return;
+    float._liquidGlow = {
+      x: Math.max(0, Math.min(1, (event.clientX - rect.left) / rect.width)),
+      y: Math.max(0, Math.min(1, (event.clientY - rect.top) / rect.height)),
+      opacity: opacity,
+    };
+    if (float._renderKyantGlass) float._renderKyantGlass(null, true);
+  }
+  function clear(float) {
+    if (!float) return;
+    float._liquidGlow = { x: 0.5, y: 0.5, opacity: 0 };
+    if (float._renderKyantGlass) float._renderKyantGlass(null, true);
+  }
+  document.addEventListener('pointermove', function(event) {
+    activeFloats().forEach(function(float) { update(float, event, 0.5); });
+  }, true);
+  document.addEventListener('pointerdown', function(event) {
+    activeFloats().forEach(function(float) { update(float, event, 1); });
+  }, true);
+  document.addEventListener('pointerup', function() { activeFloats().forEach(clear); }, true);
+  document.addEventListener('pointercancel', function() { activeFloats().forEach(clear); }, true);
+}
+
 requestAnimationFrame(function() {
   document.querySelectorAll('.liquid-click-source').forEach(function(source) {
     source.classList.remove('liquid-click-source');
@@ -14860,6 +16596,9 @@ requestAnimationFrame(function() {
   wireLiquidRailInteractions(document.getElementById('right-tabs'), '.tab-btn[data-tab]');
   wireLegacyLiquidButtons();
   wireFixedPrimaryLiquidButtons();
+  wireLiquidPopupShellInteractions();
+  wireLiquidFloatGlowInteractions();
+  wireDirectPopupOptionPress();
 });
 
 // Checkbox switches use one pointer-captured glass thumb that follows the
@@ -15015,8 +16754,14 @@ window.syncModelSelectSurface = function() {
       html += '<button type="button" class="model-select-menu-option' + (child.value === sel.value ? ' selected' : '') + '" role="option" aria-selected="' + (child.value === sel.value ? 'true' : 'false') + '" data-value="' + escAttr(child.value) + '" onclick="window.selectModelFromMenu(this.getAttribute(\'data-value\'))">' + esc(child.textContent || child.value) + '</button>';
     }
   });
+  // Rebuilding the option list must not destroy the carrier block.  A pending
+  // source→target flight intentionally keeps the block's interpolated inline
+  // geometry while the selected state is updated only after the flight ends.
+  var colorBlock = menu._liquidColorBlock;
+  if (colorBlock && colorBlock.parentNode === menu) colorBlock.remove();
   menu.innerHTML = html;
-  wireLiquidMenuInteractions(menu);
+  if (colorBlock) menu.appendChild(colorBlock);
+  wireDirectLiquidMenuInteractionsV2(menu);
 };
 
 document.addEventListener('pointerdown', function(event) {
@@ -15027,13 +16772,23 @@ document.addEventListener('pointerdown', function(event) {
 window.closeNewmarkSelect = function(shell, options) {
   shell = shell || document.querySelector('.newmark-select-shell.open');
   if (!shell) return;
-  shell.classList.remove('open');
-  window.setLiquidSidebarGestureLock('popup:select:' + (shell.dataset.selectId || 'anonymous'), false);
   var menu = shell.querySelector('.newmark-select-menu');
-  if (menu && typeof menu.hidePopover === 'function' && menu.matches(':popover-open')) menu.hidePopover();
   var button = shell.querySelector('.newmark-select-button');
-  if (button) button.setAttribute('aria-expanded', 'false');
-  if (options && options.focus && button) button.focus();
+  var wasOpen = !!(menu && typeof menu.matches === 'function' && menu.matches(':popover-open'));
+  if (!wasOpen) {
+    shell.classList.remove('open');
+    window.setLiquidSidebarGestureLock('popup:select:' + (shell.dataset.selectId || 'anonymous'), false);
+    if (button) button.setAttribute('aria-expanded', 'false');
+    if (options && options.focus && button) button.focus();
+    return;
+  }
+  window.animateLiquidPopupExit(menu, button, function() {
+    shell.classList.remove('open');
+    window.setLiquidSidebarGestureLock('popup:select:' + (shell.dataset.selectId || 'anonymous'), false);
+    if (menu && typeof menu.hidePopover === 'function' && menu.matches(':popover-open')) menu.hidePopover();
+    if (button) button.setAttribute('aria-expanded', 'false');
+    if (options && options.focus && button) button.focus();
+  });
 };
 
 window.positionSelectPopup = function(button, menu) {
@@ -15054,6 +16809,7 @@ window.positionSelectPopup = function(button, menu) {
   menu.style.left = left + 'px';
   menu.style.top = (openAbove ? rect.top - visibleHeight - margin : rect.bottom + margin) + 'px';
   menu.dataset.popupDirection = openAbove ? 'up' : 'down';
+  if (menu._liquidSyncSelectedBlock) menu._liquidSyncSelectedBlock();
 };
 
 window.positionNewmarkSelectMenu = function(shell) {
@@ -15080,10 +16836,12 @@ window.syncNewmarkSelectWidth = function(select, shell) {
   if (!select || !shell || shell.dataset.autoReadableWidth !== 'true') return;
   var nativeWidth = Number(shell.dataset.nativeSelectWidth || 0);
   var width = Math.max(nativeWidth, window.selectReadableControlWidth(select));
-  shell.style.width = width + 'px';
-  shell.style.minWidth = width + 'px';
-  shell.style.maxWidth = 'none';
-  if (shell.dataset.toolbarSelect === 'true') shell.style.flex = '0 0 ' + width + 'px';
+  var widthCss = width + 'px';
+  if (shell.style.width !== widthCss) shell.style.width = widthCss;
+  if (shell.style.minWidth !== widthCss) shell.style.minWidth = widthCss;
+  if (shell.style.maxWidth !== 'none') shell.style.maxWidth = 'none';
+  var flexCss = '0 0 ' + widthCss;
+  if (shell.dataset.toolbarSelect === 'true' && shell.style.flex !== flexCss) shell.style.flex = flexCss;
 };
 
 window.syncNewmarkSelect = function(select) {
@@ -15093,9 +16851,11 @@ window.syncNewmarkSelect = function(select) {
   var menu = shell.querySelector('.newmark-select-menu');
   var button = shell.querySelector('.newmark-select-button');
   var selected = select.options[select.selectedIndex] || select.options[0];
-  shell.style.display = select.dataset.newmarkVisible === 'false' || select.style.display === 'none' ? 'none' : '';
-  if (label) label.textContent = selected ? selected.textContent : '';
-  if (button) button.disabled = !!select.disabled;
+  var display = select.dataset.newmarkVisible === 'false' || select.style.display === 'none' ? 'none' : '';
+  if (shell.style.display !== display) shell.style.display = display;
+  var selectedText = selected ? selected.textContent : '';
+  if (label && label.textContent !== selectedText) label.textContent = selectedText;
+  if (button && button.disabled !== !!select.disabled) button.disabled = !!select.disabled;
   window.syncNewmarkSelectWidth(select, shell);
   if (!menu) return;
   var html = '';
@@ -15111,8 +16871,18 @@ window.syncNewmarkSelect = function(select) {
       html += '<button type="button" class="model-select-menu-option newmark-select-option' + (child.value === select.value ? ' selected' : '') + '" role="option" aria-selected="' + (child.value === select.value ? 'true' : 'false') + '" data-value="' + escAttr(child.value) + '"' + (child.disabled ? ' disabled' : '') + '>' + esc(child.textContent || child.value) + '</button>';
     }
   });
+  // Snapshot refreshes commonly carry unchanged options. Rebuilding here
+  // invalidates layout and detaches the moving carrier without a visual change.
+  if (menu._newmarkSelectOptionsHtml === html) return;
+  // Preserve the moving carrier across option markup rebuilds.  Without this,
+  // dispatching the native change event detaches the block before the delayed
+  // color-block commit can finish, so users only see an instant snap.
+  var colorBlock = menu._liquidColorBlock;
+  if (colorBlock && colorBlock.parentNode === menu) colorBlock.remove();
   menu.innerHTML = html;
-  wireLiquidMenuInteractions(menu);
+  menu._newmarkSelectOptionsHtml = html;
+  if (colorBlock) menu.appendChild(colorBlock);
+  wireDirectLiquidMenuInteractionsV2(menu);
 };
 
 window.enhanceNewmarkSelect = function(select) {
@@ -15153,7 +16923,7 @@ window.enhanceNewmarkSelect = function(select) {
   button.setAttribute('aria-label', String(accessibleLabel).trim());
   button.innerHTML = '<span class="newmark-select-button-label"></span>' + iconSvg('chevron-down', '', 'tiny');
   var menu = document.createElement('div');
-  menu.className = 'model-select-menu newmark-select-menu liquid-glass liquid-glass-carrier';
+  menu.className = 'model-select-menu newmark-select-menu liquid-glass liquid-glass-carrier liquid-glass-popup';
   menu.setAttribute('role', 'listbox');
   menu.setAttribute('popover', 'manual');
   select.parentNode.insertBefore(shell, select);
@@ -15357,6 +17127,15 @@ function bindBackendQueuedRequestToTarget(text, target, occurrence) {
   request.backendManaged = true;
   request.provenance = 'backend-follow-up';
   request.backendOccurrence = Math.max(0, Number(occurrence || 0));
+  request.queueItemId = queueItemIdForText(text, target, request);
+  var queueItem = queueItemsForTarget(target).find(function(item) { return item.id === request.queueItemId; });
+  if (queueItem) {
+    request.requestedMode = queueItem.requestedMode;
+    request.goalObjective = queueItem.goalObjective;
+    request.createdAt = queueItem.createdAt;
+    request.runId = queueItem.runId;
+    request.images = (queueItem.images || []).map(function(image) { return Object.assign({}, image); });
+  }
   return request;
 }
 
@@ -15422,27 +17201,14 @@ function rebindQueueToRuntimeBranch(target) {
 }
 
 function pauseQueueForTarget(target) {
-  var key = queueRuntimeKey(target);
-  if (!key) return false;
-  if (!state.queuePausedByTarget) state.queuePausedByTarget = {};
-  state.queuePausedByTarget[key] = true;
-  if (state.nextQueueSchedulesByTarget) delete state.nextQueueSchedulesByTarget[key];
-  if (state.nextQueueDrainsByTarget) delete state.nextQueueDrainsByTarget[key];
-  return true;
+  return window.queueAction('queue_set_pause', { paused: true }, target);
 }
 
 window.toggleQueuePause = function() {
   var target = currentConversationTarget();
   var key = queueRuntimeKey(target);
   if (!key) return;
-  if (!state.queuePausedByTarget) state.queuePausedByTarget = {};
-  if (currentFlowRunning() && state.queuePausedByTarget[key]) {
-    window.stopFlowRun({ resumeQueue: true });
-    return;
-  }
-  state.queuePausedByTarget[key] = !state.queuePausedByTarget[key];
-  window.renderInputStack();
-  if (!state.queuePausedByTarget[key]) window.scheduleNextQueueDrain(target);
+  return window.queueAction('queue_set_pause', { paused: !(state.queuePausedByTarget && state.queuePausedByTarget[key]) }, target);
 };
 
 function refreshNextPromptForTarget(target) {
@@ -15493,13 +17259,22 @@ function setQueueItemsForTarget(items, target) {
       goalObjective: String(item && item.goalObjective || ''),
       runId: String(item && item.runId || ''),
       createdAt: String(item && item.createdAt || ''),
+      images: (Array.isArray(item && item.images) ? item.images : []).map(function(image) { return Object.assign({}, image); }),
     };
   });
 }
 
-function queueItemIdForText(text, target) {
-  var items = queueItemsForTarget(target);
+function queueItemIdForText(text, target, request) {
+  var items = queueItemsForTarget(target).filter(function(item) { return !item.queueMode || item.queueMode === 'followUp'; });
   var normalized = String(text || '');
+  // Never redirect a removed/edited row to another item with equal text.
+  if (request && request.queueItemId) {
+    return items.some(function(item) { return item.id === request.queueItemId; }) ? request.queueItemId : '';
+  }
+  if (request && Number.isFinite(request.backendOccurrence)) {
+    var occurrenceItem = items[request.backendOccurrence];
+    return occurrenceItem && String(occurrenceItem.text || '') === normalized ? occurrenceItem.id : '';
+  }
   for (var i = 0; i < items.length; i++) {
     if (String(items[i].text || '') === normalized) return items[i].id;
   }
@@ -15508,11 +17283,68 @@ function queueItemIdForText(text, target) {
 
 function syncQueueItemsFromSnapshot(snapshot, target) {
   if (snapshot && Array.isArray(snapshot.queueItems)) setQueueItemsForTarget(snapshot.queueItems, target);
+  applyConversationCommandSnapshot(snapshot, target);
 }
 
-window.queueAction = function(action, input) {
+function applyConversationCommandSnapshot(snapshot, target) {
+  if (!snapshot || typeof snapshot !== 'object') return;
+  target = normalizeQueuedConversationTarget(target || snapshot.target || currentConversationTarget());
+  if (!target) return;
+  var key = runtimeKeyFor(target.workspaceId, target.conversationId);
+  if (typeof snapshot.queuePaused === 'boolean') {
+    if (!state.queuePausedByTarget) state.queuePausedByTarget = {};
+    state.queuePausedByTarget[key] = snapshot.queuePaused;
+  }
+  if (Array.isArray(snapshot.queueItems)) setQueueItemsForTarget(snapshot.queueItems, target);
+  var queue = snapshot.queued && typeof snapshot.queued === 'object' ? snapshot.queued : snapshot.queue;
+  if (queue && typeof queue === 'object') {
+    setBackendQueueForTarget(queue, target);
+    window.syncNextQueueFromBackend(queue, target);
+  }
+  if (Object.prototype.hasOwnProperty.call(snapshot, 'flowSuspension') || Object.prototype.hasOwnProperty.call(snapshot, 'flowRunning')) {
+    var suspension = snapshot.flowSuspension;
+    var flow = snapshot.flowRunning;
+    var record = flowTakeoverRecordFor(target);
+    var pendingStart = record.pendingStart && !record.pendingStart.cancelled ? record.pendingStart : null;
+    record.running = !!(suspension || flow || pendingStart);
+    record.paused = !!(suspension && suspension.reason === 'interrupted');
+    record.name = String(suspension && suspension.workflowName || flow && flow.name || pendingStart && pendingStart.name || '');
+    if (suspension && suspension.input !== undefined) record.promptText = String(suspension.input || '');
+    if (isActiveConversationTarget(target) && window.renderFlowTakeover) window.renderFlowTakeover(record.running, record.name, { target: target, interrupted: record.paused, message: suspension && suspension.message });
+  }
+  if (!isActiveConversationTarget(target)) return;
+  if (['build', 'chat', 'plan', 'goal', 'flow'].indexOf(snapshot.mode) >= 0) {
+    state.mode = snapshot.mode;
+    state._syncedMode = snapshot.mode;
+    if (els['mode-select']) {
+      els['mode-select'].value = snapshot.mode;
+      window.syncNewmarkSelect(els['mode-select']);
+    }
+    var flowSelect = document.getElementById('flow-select');
+    if (flowSelect) {
+      flowSelect.dataset.newmarkVisible = snapshot.mode === 'flow' ? 'true' : 'false';
+      window.syncNewmarkSelect(flowSelect);
+    }
+  }
+  if (snapshot.inputMode === 'next' || snapshot.inputMode === 'guide') {
+    window.setInputMode(snapshot.inputMode, false);
+    state._syncedInputMode = snapshot.inputMode;
+  }
+}
+
+window.queueAction = function(action, input, target) {
   if (!api.queueAction) return Promise.resolve({ ok: false, error: 'queueAction unavailable' });
-  return api.queueAction(action, input, currentConversationTarget());
+  var owner = normalizeQueuedConversationTarget(target || currentConversationTarget());
+  return Promise.resolve(api.queueAction(action, input, owner)).then(function(result) {
+    applyConversationCommandSnapshot(result, owner);
+    if (isActiveConversationTarget(owner)) window.renderInputStack();
+    if (result && result.ok === false) showUiNotice(result.error || 'Queue action failed.', 'error', 'queue-' + action);
+    return result;
+  }).catch(function(error) {
+    var message = error && error.message ? error.message : String(error);
+    showUiNotice(message, 'error', 'queue-' + action);
+    return { ok: false, error: message };
+  });
 };
 function setBackendQueueForTarget(queue, target) {
   var owner = normalizeQueuedConversationTarget(target || currentConversationTarget());
@@ -15524,6 +17356,33 @@ function setBackendQueueForTarget(queue, target) {
   return normalized;
 }
 
+function queueRequestIndex(request) {
+  if (!request) return -1;
+  var requests = state.nextQueueRequests || [];
+  if (!request.queueItemId) return requests.indexOf(request);
+  return requests.findIndex(function(candidate) {
+    return candidate && candidate.queueItemId === request.queueItemId && queuedRequestMatchesTarget(candidate, request.target);
+  });
+}
+
+window.queueIndexFromElement = function(element) {
+  var row = element && element.closest('.queue-item');
+  if (!row) return -1;
+  var owner = { workspaceId: row.getAttribute('data-queue-workspace'), conversationId: row.getAttribute('data-queue-conversation') };
+  if (!queuedRequestMatchesTarget({ target: owner }, currentConversationTarget())) return -1;
+  var id = row.getAttribute('data-queue-id');
+  return id ? queueRequestIndex({ target: owner, queueItemId: id }) : -1;
+};
+
+window.refreshQueueRowIndexes = function() {
+  // Background targets can change global array positions without changing
+  // the visible rows. Retain their DOM/drag state and update only the index.
+  document.querySelectorAll('#queue-list .queue-item[data-queue-id]').forEach(function(row) {
+    var index = window.queueIndexFromElement(row);
+    if (row.getAttribute('data-queue-index') !== String(index)) row.setAttribute('data-queue-index', String(index));
+  });
+};
+
 window.syncNextQueueFromBackend = function(queue, target) {
   target = normalizeQueuedConversationTarget(target || currentConversationTarget());
   if (!target) return;
@@ -15534,7 +17393,7 @@ window.syncNextQueueFromBackend = function(queue, target) {
   var retainedRequests = [];
   for (var index = 0; index < state.nextQueue.length; index++) {
     var existingRequest = state.nextQueueRequests[index];
-    if (queuedRequestIsBackendManaged(existingRequest) && queuedRequestMatchesTarget(existingRequest, target)) continue;
+    if (queuedRequestMatchesTarget(existingRequest, target)) continue;
     retainedQueue.push(state.nextQueue[index]);
     retainedRequests.push(existingRequest || null);
   }
@@ -15548,6 +17407,11 @@ window.syncNextQueueFromBackend = function(queue, target) {
     state.nextQueueRequests.push(bindBackendQueuedRequestToTarget(text, target, occurrence));
   }
   refreshNextPromptForTarget(target);
+  if (state.pendingInputEdit && state.pendingInputEdit.kind === 'queue') {
+    state._editingQueueIndex = queueRequestIndex(state.pendingInputEdit.request);
+  }
+  if (state.queueDragRequest) state.queueDragIndex = queueRequestIndex(state.queueDragRequest);
+  window.refreshQueueRowIndexes();
 };
 
 window.renderQueuePanel = function() {
@@ -15596,20 +17460,22 @@ window.renderQueuePanel = function() {
     // dev-0.5.5: a backend-managed item is editable/deletable when the kernel
     // exposed its stable queueItem id (mobile-originated queue entries now
     // carry ids through queueItems). Items without an id stay locked.
-    var queueItemId = backendManaged ? queueItemIdForText(state.nextQueue[queueIndex] || '', currentConversationTarget()) : '';
+    var queueItemId = backendManaged ? queueItemIdForText(state.nextQueue[queueIndex] || '', currentConversationTarget(), request) : '';
+    var eventIndex = queueItemId ? 'window.queueIndexFromElement(this)' : String(queueIndex);
+    var identityAttributes = queueItemId ? ' data-queue-id="' + escAttr(queueItemId) + '" data-queue-workspace="' + escAttr(target.workspaceId) + '" data-queue-conversation="' + escAttr(target.conversationId) + '"' : '';
     var operable = !backendManaged || !!queueItemId;
     var dragAttributes = operable
-      ? ' draggable="true" ondragstart="window.startQueueDrag(event,' + queueIndex + ')" ondragover="window.overQueueDrag(event,' + queueIndex + ')" ondrop="window.dropQueueDrag(event,' + queueIndex + ')" ondragend="window.endQueueDrag(event)"'
+      ? ' draggable="true" ondragstart="window.startQueueDrag(event,' + eventIndex + ')" ondragover="window.overQueueDrag(event,' + eventIndex + ')" ondrop="window.dropQueueDrag(event,' + eventIndex + ')" ondragend="window.endQueueDrag(event)"'
       : ' draggable="false"';
     var dragHandle = operable
       ? '<button class="queue-drag" title="' + escAttr(t('queue.title')) + '">' + iconSvg('grip-vertical', t('queue.title'), 'tiny') + '</button>'
       : '<span class="queue-drag" aria-hidden="true">' + iconSvg('grip-vertical', t('queue.title'), 'tiny') + '</span>';
     var inputAttributes = ' readonly aria-readonly="true"';
     var actions = operable ?
-      '<button type="button" class="stack-icon-btn queue-guide-btn" onclick="window.guideQueueItem(' + queueIndex + ')" title="' + escAttr(t('queue.guideNow')) + '">' + iconSvg('corner-down-right', t('queue.guideNow'), 'tiny') + '<span>' + esc(t('queue.guideAction')) + '</span></button>' +
-      '<button class="stack-icon-btn" onclick="window.focusQueueItem(' + queueIndex + ')" title="' + escAttr(t('common.edit')) + '">' + iconSvg('square-pen', t('common.edit'), 'tiny') + '</button>' +
-      '<button class="stack-icon-btn danger" onclick="window.deleteQueueItem(' + queueIndex + ')" title="' + escAttr(t('common.delete')) + '">' + iconSvg('trash', t('common.delete'), 'tiny') + '</button>' : '';
-    html += '<div class="queue-item" data-queue-index="' + queueIndex + '"' + dragAttributes + '>' +
+      '<button type="button" class="stack-icon-btn queue-guide-btn" onclick="window.guideQueueItem(' + eventIndex + ')" title="' + escAttr(t('queue.guideNow')) + '">' + iconSvg('corner-down-right', t('queue.guideNow'), 'tiny') + '<span>' + esc(t('queue.guideAction')) + '</span></button>' +
+      '<button class="stack-icon-btn" onclick="window.focusQueueItem(' + eventIndex + ')" title="' + escAttr(t('common.edit')) + '">' + iconSvg('square-pen', t('common.edit'), 'tiny') + '</button>' +
+      '<button class="stack-icon-btn danger" onclick="window.deleteQueueItem(' + eventIndex + ')" title="' + escAttr(t('common.delete')) + '">' + iconSvg('trash', t('common.delete'), 'tiny') + '</button>' : '';
+    html += '<div class="queue-item" data-queue-index="' + queueIndex + '"' + identityAttributes + dragAttributes + '>' +
       dragHandle +
       '<input class="queue-edit" value="' + escAttr(state.nextQueue[queueIndex] || '') + '"' + inputAttributes + '>' +
       '<span class="stack-actions">' + actions + '</span>' +
@@ -15643,7 +17509,7 @@ window.focusQueueItem = function(idx) {
   var request = state.nextQueueRequests && state.nextQueueRequests[idx];
   if (!queuedRequestMatchesTarget(request, currentConversationTarget())) return;
   var backendManaged = queuedRequestIsBackendManaged(request);
-  if (backendManaged && !queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget())) return;
+  if (backendManaged && !queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget(), request)) return;
   state._editingQueueIndex = idx;
   state.pendingInputEdit = { kind: 'queue', index: idx, request: request, target: currentConversationTarget(), originalText: String(state.nextQueue[idx] || '') };
   els.prompt.value = String(state.nextQueue[idx] || '');
@@ -15661,7 +17527,7 @@ window.deleteQueueItem = function(idx) {
   var request = state.nextQueueRequests && state.nextQueueRequests[idx];
   if (!queuedRequestMatchesTarget(request, currentConversationTarget())) return;
   var backendManaged = queuedRequestIsBackendManaged(request);
-  var queueItemId = backendManaged ? queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget()) : '';
+  var queueItemId = backendManaged ? queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget(), request) : '';
   if (backendManaged && !queueItemId) return;
   if (!state.queueHiddenItems) state.queueHiddenItems = {};
   if (state.nextQueue[idx]) state.queueHiddenItems[queueHiddenItemKey(state.nextQueue[idx], currentConversationTarget())] = true;
@@ -15694,10 +17560,9 @@ window.guideQueueItem = function(idx) {
   var request = state.nextQueueRequests && state.nextQueueRequests[idx];
   if (!queuedRequestMatchesTarget(request, currentConversationTarget())) return;
   var backendManaged = queuedRequestIsBackendManaged(request);
-  var queueItemId = backendManaged ? queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget()) : '';
-  if (backendManaged && !queueItemId) return;
+  var queueItemId = backendManaged ? queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget(), request) : '';
+  if (!backendManaged || !queueItemId) return;
   var target = normalizeQueuedConversationTarget(request.target) || currentConversationTarget();
-  var deliverDuringRun = isCurrentConversationRunning();
   var next = state.nextQueue.splice(idx, 1)[0];
   var nextRequest = state.nextQueueRequests ? state.nextQueueRequests.splice(idx, 1)[0] : null;
   if (!state.queueHiddenItems) state.queueHiddenItems = {};
@@ -15707,7 +17572,7 @@ window.guideQueueItem = function(idx) {
   if (backendManaged) {
     // The kernel owns this entry; guide it there so the mobile side stays
     // in sync. On failure restore the local row.
-    return window.queueAction('queue_guide', { id: queueItemId }).then(function(outcome) {
+    return window.queueAction('queue_guide', { id: queueItemId }, target).then(function(outcome) {
       if (!outcome || outcome.ok === false) {
         restoreQueueItemAfterGuideFailure(idx, next, nextRequest, target, true);
         showUiNotice(outcome && outcome.error ? outcome.error : (currentLang() === 'zh' ? 'Guide 投递失败' : 'Guide delivery failed'), 'error', 'queue-guide-' + queueItemId);
@@ -15718,39 +17583,21 @@ window.guideQueueItem = function(idx) {
       return { ok: false, error: error && error.message ? error.message : String(error) };
     });
   }
-  if (next) {
-    var delivery = window.sendMessage('guide', next, {
-      fromQueue: true,
-      forceBuild: true,
-      deliverAsGuide: deliverDuringRun,
-      queuedRequest: nextRequest
-    });
-    if (deliverDuringRun && delivery && typeof delivery.then === 'function') {
-      return Promise.resolve(delivery).then(function(outcome) {
-        if (outcome && outcome.ok === false) {
-          restoreQueueItemAfterGuideFailure(idx, next, nextRequest, target, !outcome.guideReceipt);
-        }
-        return outcome;
-      }, function(error) {
-        restoreQueueItemAfterGuideFailure(idx, next, nextRequest, target, true);
-        return { ok: false, error: error && error.message ? error.message : String(error) };
-      });
-    }
-    return delivery;
-  }
 };
 
 window.startQueueDrag = function(event, idx) {
+  state.queueDragRequest = null;
   var request = state.nextQueueRequests && state.nextQueueRequests[idx];
   if (!queuedRequestMatchesTarget(request, currentConversationTarget())) {
     state.queueDragIndex = -1;
     return;
   }
-  if (queuedRequestIsBackendManaged(request) && !queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget())) {
+  if (queuedRequestIsBackendManaged(request) && !queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget(), request)) {
     state.queueDragIndex = -1;
     return;
   }
   state.queueDragIndex = idx;
+  state.queueDragRequest = request;
   state.queueDragTargetIndex = idx;
   if (event.dataTransfer) event.dataTransfer.effectAllowed = 'move';
   var row = event.currentTarget;
@@ -15784,12 +17631,14 @@ function previewQueueDrag(targetIndex) {
 
 window.overQueueDrag = function(event, idx) {
   event.preventDefault();
+  if (idx < 0) return;
   if (event.dataTransfer) event.dataTransfer.dropEffect = 'move';
   if (state.queueDragIndex >= 0) previewQueueDrag(queueDropTargetIndex(event, idx));
 };
 
 window.dropQueueDrag = function(event, idx) {
   event.preventDefault();
+  if (idx < 0) return;
   var from = state.queueDragIndex;
   idx = typeof queueDropTargetIndex === 'function' ? queueDropTargetIndex(event, idx) : idx;
   if (!state.nextQueue || from < 0 || from === idx || from >= state.nextQueue.length) return;
@@ -15799,30 +17648,35 @@ window.dropQueueDrag = function(event, idx) {
     || !queuedRequestMatchesTarget(destinationRequest, currentConversationTarget())) return;
   var sourceBackend = queuedRequestIsBackendManaged(sourceRequest);
   var destinationBackend = queuedRequestIsBackendManaged(destinationRequest);
-  if ((sourceBackend && !queueItemIdForText(state.nextQueue[from] || '', currentConversationTarget()))
-    || (destinationBackend && !queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget()))) return;
+  if ((sourceBackend && !queueItemIdForText(state.nextQueue[from] || '', currentConversationTarget(), sourceRequest))
+    || (destinationBackend && !queueItemIdForText(state.nextQueue[idx] || '', currentConversationTarget(), destinationRequest))) return;
   var item = state.nextQueue.splice(from, 1)[0];
   var requestItem = state.nextQueueRequests ? state.nextQueueRequests.splice(from, 1)[0] : null;
   state.nextQueue.splice(idx, 0, item);
   if (state.nextQueueRequests) state.nextQueueRequests.splice(idx, 0, requestItem || null);
   state.queueDragIndex = -1;
+  state.queueDragRequest = null;
   refreshNextPromptForTarget(currentConversationTarget());
-  window.renderInputStack();
   if (sourceBackend || destinationBackend) {
     // The kernel owns at least one affected entry: forward the complete
     // ordered id list so mobile and desktop stay in sync.
     var visibleIndexes = queueIndexesForTarget(currentConversationTarget());
     var orderedIds = visibleIndexes.map(function(vi) {
-      return queueItemIdForText(state.nextQueue[vi] || '', currentConversationTarget());
+      var queuedRequest = state.nextQueueRequests && state.nextQueueRequests[vi];
+      return queuedRequestIsBackendManaged(queuedRequest) ? queueItemIdForText(state.nextQueue[vi] || '', currentConversationTarget(), queuedRequest) : '';
     }).filter(function(id) { return !!id; });
     if (orderedIds.length) {
       window.queueAction('queue_reorder', { orderedIds: orderedIds });
     }
   }
+  // Rendering reloads the last backend snapshot. Submit dragged identities
+  // first so that reconciliation cannot undo the requested order.
+  window.renderInputStack();
 };
 
 window.endQueueDrag = function(event) {
   state.queueDragIndex = -1;
+  state.queueDragRequest = null;
   state.queueDragTargetIndex = -1;
   document.querySelectorAll('#queue-list .queue-item').forEach(function(row) {
     row.classList.remove('queue-drag-displaced', 'dragging');
@@ -15843,8 +17697,9 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
   opts = opts || {};
   var requestedMode = opts.requestedMode || state.mode || 'build';
   var effectiveInputMode = modeOverride || state.inputMode || 'guide';
-  if (effectiveInputMode === 'guide' && !isCurrentConversationRunning()) effectiveInputMode = 'next';
-  if (requestedMode === 'flow') {
+  // Preserve the selected delivery mode. The shared owner decides whether
+  // Guide steers a live run or starts a new instruction when the target is idle.
+  if (requestedMode === 'flow' && !state.pendingInputEdit) {
     effectiveInputMode = 'guide';
     if (!opts.fromQueue) {
       if (currentFlowRunning()) {
@@ -15855,9 +17710,13 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
           els.prompt.dispatchEvent(new Event('input', { bubbles: true }));
         }
         if (state.inputMode === 'next') return window.queueFlowNextInput(activeFlowGuide);
-        return api.guideFlow ? api.guideFlow(activeFlowGuide, currentConversationTarget()) : { ok: false, error: 'Flow Guide API unavailable' };
+        var activeFlowTarget = opts.target || currentConversationTarget();
+        return api.sendMessage(activeFlowGuide, activeFlowTarget, { requestedMode: requestedMode, inputMode: 'guide', clientMessageId: window.crypto.randomUUID() }).then(function(result) {
+          applyConversationCommandSnapshot(result, activeFlowTarget);
+          return result;
+        });
       }
-      return window.submitSelectedFlow();
+      return window.submitSelectedFlow({ text: typeof queuedText === 'string' ? queuedText : String(els.prompt.value || ''), target: opts.target || currentConversationTarget(), inputMode: modeOverride || state.inputMode });
     }
   }
   if (state.pendingInputEdit && typeof queuedText !== 'string' && !opts.fromQueue) {
@@ -15875,36 +17734,18 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       var editIndex = Number(pendingEdit.index);
       var editRequest = pendingEdit.request || (state.nextQueueRequests && state.nextQueueRequests[editIndex]);
       var editBackendManaged = queuedRequestIsBackendManaged(editRequest);
-      var editQueueItemId = editBackendManaged ? queueItemIdForText(String(state.nextQueue[editIndex] || pendingEdit.originalText || ''), pendingEdit.target) : '';
+      var editQueueItemId = editBackendManaged ? queueItemIdForText(String(pendingEdit.originalText || ''), pendingEdit.target, editRequest) : '';
       if (editBackendManaged && !editQueueItemId) {
         showUiNotice(currentLang() === 'zh' ? '无法编辑该队列项：缺少后端 id' : 'Cannot edit queue item: backend id missing', 'error', 'queue-edit-' + editIndex);
         return { ok: false, error: 'missing backend queue id' };
       }
-      if (effectiveInputMode === 'next') {
-        if (editBackendManaged) {
-          // The kernel owns this entry: forward the edit and let the next
-          // snapshot reconcile the local row.
-          window.queueAction('queue_update', { id: editQueueItemId, text: editedValue, requestedMode: String(editRequest && editRequest.requestedMode || 'build'), goalObjective: String(editRequest && editRequest.goalObjective || ''), createdAt: String(editRequest && editRequest.createdAt || '') });
-          state.nextQueue[editIndex] = editedValue;
-          if (state.nextQueueRequests[editIndex]) state.nextQueueRequests[editIndex].text = editedValue;
-          refreshNextPromptForTarget(pendingEdit.target);
-          window.renderInputStack();
-          return { ok: true, queued: true };
-        }
-        state.nextQueue[editIndex] = editedValue;
-        if (state.nextQueueRequests[editIndex]) {
-          state.nextQueueRequests[editIndex].text = editedValue;
-          state.nextQueueRequests[editIndex].images = editedImages;
-        }
-        refreshNextPromptForTarget(pendingEdit.target);
-        window.renderInputStack();
-        return { ok: true, queued: true };
-      }
-      state.nextQueue.splice(editIndex, 1);
-      var editedRequest = state.nextQueueRequests.splice(editIndex, 1)[0] || pendingEdit.request;
-      if (editedRequest) { editedRequest.text = editedValue; editedRequest.images = editedImages; }
-      window.renderInputStack();
-      return window.sendMessage('guide', editedValue, { fromQueue: true, forceBuild: true, deliverAsGuide: isCurrentConversationRunning(), queuedRequest: editedRequest });
+      if (!editBackendManaged) return { ok: false, error: 'Queue entry has no shared owner' };
+      return window.queueAction(effectiveInputMode === 'next' ? 'queue_update' : 'queue_guide', {
+        id: editQueueItemId, text: editedValue,
+        requestedMode: String(editRequest.requestedMode || 'build'),
+        goalObjective: String(editRequest.goalObjective || ''),
+        createdAt: String(editRequest.createdAt || ''), images: editedImages
+      }, pendingEdit.target);
     }
     if (pendingEdit.kind === 'goal') {
       var previousGoalEditMode = pendingEdit.previousMode || 'goal';
@@ -15926,19 +17767,11 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
           restoreModeAfterGoalEdit(previousGoalEditMode);
         });
       }
-      if (!state.nextQueue) state.nextQueue = [];
-      if (!state.nextQueueRequests) state.nextQueueRequests = [];
-      state.nextQueue.push(editedValue);
-      var goalRequest = bindQueuedRequestToTarget({ text: editedValue, images: editedImages }, editedValue, currentConversationTarget(), queueBranchPathForTarget(currentConversationTarget(), 'runtime'));
-      goalRequest.goalDeclaration = true;
-      goalRequest.goalObjective = editedValue;
-      goalRequest.requestedMode = 'goal';
-      state.nextQueueRequests.push(goalRequest);
       state.queueCollapsed = false;
-      refreshNextPromptForTarget(currentConversationTarget());
-      window.renderInputStack();
-      restoreModeAfterGoalEdit(previousGoalEditMode);
-      return { ok: true, queued: true, goal: editedValue };
+      return window.queueAction('queue_enqueue', {
+        id: window.crypto.randomUUID(), text: editedValue, images: editedImages,
+        requestedMode: 'goal', goalObjective: editedValue, createdAt: new Date().toISOString()
+      }, currentConversationTarget()).finally(function() { restoreModeAfterGoalEdit(previousGoalEditMode); });
     }
   }
   var queuedRequestRecord = opts.queuedRequest && typeof opts.queuedRequest === 'object' ? opts.queuedRequest : null;
@@ -15978,8 +17811,8 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
     displayText = continuePhrase;
   }
 
-  var lockedConversationId = activeConversationId();
-  var lockedTarget = currentConversationTarget(lockedConversationId);
+  var lockedTarget = normalizeQueuedConversationTarget(opts.target || currentConversationTarget());
+  var lockedConversationId = lockedTarget.conversationId;
   var lockedRuntimeKey = runtimeKeyFor(lockedTarget.workspaceId, lockedTarget.conversationId);
   var activeRuntime = runningConversationRecord(lockedConversationId, lockedTarget.workspaceId);
   var conversationRunning = !!activeRuntime;
@@ -15991,7 +17824,6 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
     if (reconciledLocalRuntime) {
       activeRuntime = runningConversationRecord(lockedConversationId, lockedTarget.workspaceId);
       conversationRunning = !!activeRuntime;
-      if (!conversationRunning && effectiveInputMode === 'guide') effectiveInputMode = 'next';
     }
   }
 
@@ -16015,13 +17847,11 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       queuedModeRequest.goalDeclaration = true;
       queuedModeRequest.goalObjective = rawText;
     }
-    var queueResult = await window.queueAction('queue_enqueue', {
-      id: queuedModeRequest.clientMessageId,
-      text: rawText,
+    var queueResult = await api.sendMessage({ text: rawText, images: queuedModeRequest.images }, lockedTarget, {
+      clientMessageId: queuedModeRequest.clientMessageId,
+      inputMode: 'next',
       requestedMode: requestedMode,
-      goalObjective: requestedMode === 'goal' ? rawText : '',
-      images: queuedModeRequest.images,
-      createdAt: queuedModeRequest.createdAt || new Date().toISOString()
+      goalObjective: requestedMode === 'goal' ? rawText : ''
     });
     if (!queueResult || queueResult.ok === false) {
       showUiNotice(queueResult && queueResult.error ? queueResult.error : (currentLang() === 'zh' ? '消息加入队列失败' : 'Failed to queue message'), 'error', 'queue-enqueue-' + queuedModeRequest.clientMessageId);
@@ -16029,6 +17859,7 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
     }
     if (queueResult.queued) setBackendQueueForTarget(queueResult.queued, lockedTarget);
     if (Array.isArray(queueResult.queueItems)) setQueueItemsForTarget(queueResult.queueItems, lockedTarget);
+    applyConversationCommandSnapshot(queueResult, lockedTarget);
     window.syncNextQueueFromBackend(queueResult.queued || backendQueueForTarget(lockedTarget), lockedTarget);
     els.prompt.value = '';
     clearActiveConversationDraft();
@@ -16086,8 +17917,19 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       allowStatusReset: retryingUnacknowledgedGuide
     }, lockedTarget);
     renderPendingGuideMessages(lockedTarget, {});
-    var enqueue = api.enqueueGuide ? api.enqueueGuide(envelope) : api.sendMessage(requestMessage, lockedConversationId);
-    return Promise.resolve(enqueue).then(function(receipt) {
+    var enqueue = api.sendMessage(Object.assign({}, envelope, { visibleMode: requestedMode }), lockedTarget, {
+      requestedMode: requestedMode, inputMode: 'guide', goalObjective: envelope.goalObjective,
+      clientMessageId: clientMessageId
+    });
+    return Promise.resolve(enqueue).then(function(result) {
+      applyConversationCommandSnapshot(result, lockedTarget);
+      var receipt = result && (result.receipt || result.guideReceipt) || result;
+      if (result && !result.receipt && !result.guideReceipt && ['completed', 'interrupted', 'idle', 'error'].indexOf(result.status) >= 0) {
+        // A stale renderer may have displayed a run which the shared owner
+        // already finalized. That same command now owns its fresh response.
+        if (isActiveConversationTarget(lockedTarget) && Array.isArray(result.chatMessages)) renderChatMessages(result.chatMessages, lockedTarget);
+        return result;
+      }
       if (!receipt || typeof receipt !== 'object' || !String(receipt.status || '').trim()) {
         throw new Error(currentLang() === 'zh' ? '未收到有效的 Guide 回执' : 'A valid Guide acknowledgement was not received');
       }
@@ -16202,7 +18044,12 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
   updateSubmitButtonState();
   var executionMode = opts.goalDeclaration || requestedMode === 'goal' ? 'build'
     : ((opts.forceBuild || idleBuildNextImmediate) && requestedMode === 'build' ? 'build' : requestedMode);
-  await syncConversationExecutionState(executionMode, effectiveInputMode);
+  // The command freezes its mode and delivery policy; selector persistence
+  // must not rewrite the mode of an already running target before acceptance.
+  if (api.setModel && state.model !== state._syncedModel) {
+    var selectedModelResult = await api.setModel(state.model);
+    if (selectedModelResult != null) state._syncedModel = state.model;
+  }
   if (consumeProvisionalStop(lockedTarget, localRunId)) {
     // Stop/Escape won before the backend accepted the prompt. Do not send the
     // provider request after the user has already cancelled it.
@@ -16242,14 +18089,21 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
   }
   var responseMsg = null;
   var sendFailure = '';
+  var sendLoadGeneration = state.conversationLoadGeneration;
   try {
     var activationBeforeSend = pendingConversationActivation(lockedTarget);
     if (activationBeforeSend) await activationBeforeSend;
-    var sendPromise = api.sendMessage(requestMessage, lockedTarget);
+    var sendPromise = api.sendMessage(requestMessage, lockedTarget, {
+      requestedMode: requestedMode, inputMode: effectiveInputMode,
+      goalObjective: opts.goalObjective || '',
+      clientMessageId: String(requestMessage && requestMessage.clientMessageId || localRunId)
+    });
     if (requestedMode === 'goal') activateSubmittedGoal(opts.goalObjective || rawText);
     var r = await sendPromise;
+    var sendResultOwnsRuntime = conversationRunStillOwnsTarget(lockedTarget, r && r.runId, localRunId);
+    if (sendResultOwnsRuntime) applyConversationCommandSnapshot(r, lockedTarget);
     if (r && r.error) sendFailure = String(r.error);
-    if (isActiveConversationTarget(lockedTarget)) applyReturnedGoalState(r);
+    if (sendResultOwnsRuntime && isActiveConversationTarget(lockedTarget)) applyReturnedGoalState(r);
     if (r && r.runId) {
       var anchorStore = workRunAnchorIndexStore(lockedTarget);
       if (anchorStore[localRunId] !== undefined) {
@@ -16258,8 +18112,13 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       }
     }
     if (r && r.runtimeKey) registerRuntimeKey(lockedTarget, r.runtimeKey);
-    if (r && r.runId) setConversationRuntimeState(lockedTarget, r.status || 'running', r.runId, { provisional: false, generation: r.generation || 0, runtimeKey: r.runtimeKey || '' });
-    var stillActive = isActiveConversationTarget(lockedTarget) && isViewingRuntimeConversationBranch(lockedTarget);
+    if (sendResultOwnsRuntime && r && r.runId) {
+      var observedSendRuntime = state.conversationRuntimeStates && state.conversationRuntimeStates[runtimeKeyFor(lockedTarget.workspaceId, lockedTarget.conversationId)];
+      var receivedSendStatus = observedSendRuntime && observedSendRuntime.runId === r.runId && ['interrupted', 'force_interrupted', 'error'].indexOf(observedSendRuntime.status) >= 0
+        ? observedSendRuntime.status : (r.status || 'running');
+      setConversationRuntimeState(lockedTarget, receivedSendStatus, r.runId, { provisional: false, generation: r.generation || 0, runtimeKey: r.runtimeKey || '' });
+    }
+    var stillActive = sendResultOwnsRuntime && sendLoadGeneration === state.conversationLoadGeneration && isActiveConversationTarget(lockedTarget) && isViewingRuntimeConversationBranch(lockedTarget);
     if (stillActive) applyAutoRouteRatingState(r);
     if (stillActive && r && Array.isArray(r.workRuns)) syncWorkRunsSnapshot(r.workRuns, lockedTarget);
     var responseOwnedByRun = !!(r && Array.isArray(r.workRuns) && r.workRuns.some(function(run) {
@@ -16273,7 +18132,7 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       };
       upsertWorkReviewRecord(lockedUi, reviewRecord.diffs, reviewRecord.runId, [localRunId]);
     }
-    if (stillActive && !responseOwnedByRun) {
+    if (stillActive && !responseOwnedByRun && !(r && (r.receipt || r.guideReceipt || (r.runtime && r.runtime.running)))) {
       responseMsg = lockedUi.activeWorkflowMsg;
       if (r && r.error) {
         if (!responseMsg) responseMsg = addMsg('assistant', '', state.mode, state.model);
@@ -16308,7 +18167,7 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
         addWorkReview(item.diffs || item, item.runId || '', [localRunId]);
       });
     }
-    if (r && r.conversations) {
+    if (sendResultOwnsRuntime && r && r.conversations) {
       applyBackendConversations(r.conversations || [], stillActive ? lockedConversationId : activeConversationId(), lockedTarget.workspaceId);
       if (stillActive) renderConversations();
     }
@@ -16324,7 +18183,7 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       state.subagents = r.subagents;
       if (state.rightTab === 'subagent') window.renderSubagentList();
     }
-    if (r && r.queued) {
+    if (sendResultOwnsRuntime && r && r.queued) {
       var responseQueue = setBackendQueueForTarget(r.queued, lockedTarget);
       window.syncNextQueueFromBackend(responseQueue, lockedTarget);
       syncQueueItemsFromSnapshot(r, lockedTarget);
@@ -16339,23 +18198,20 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
     }
   } catch(e) {
     sendFailure = e && e.message ? String(e.message) : String(e || 'Agent run failed.');
-    if (isActiveConversationTarget(lockedTarget)) {
+    if (conversationRunStillOwnsTarget(lockedTarget, localRunId) && sendLoadGeneration === state.conversationLoadGeneration && isActiveConversationTarget(lockedTarget)) {
       responseMsg = conversationWorkUiState(lockedConversationId, lockedTarget.workspaceId).activeWorkflowMsg || addMsg('assistant', '', state.mode, state.model);
       updateMsg(responseMsg, formatChatError(sendFailure, 'Agent run failed.'), 'error', state.mode, state.model);
     }
   }
   if (api.getState) {
+    var completedContextRequest = captureContextWindowSnapshotRequest(lockedTarget);
+    var completedWorkRequest = captureConversationWorkSnapshotRequest(lockedTarget);
     api.getState(lockedTarget).then(function(s) {
+      if (!isCurrentConversationWorkSnapshotRequest(completedWorkRequest)) return;
       if (s && s.runtimeKey) registerRuntimeKey(lockedTarget, s.runtimeKey);
       var stillActiveAfterRefresh = isActiveConversationTarget(lockedTarget) && isViewingRuntimeConversationBranch(lockedTarget);
       if (stillActiveAfterRefresh) applyReturnedGoalState(s);
-      if (stillActiveAfterRefresh && s && s.contextCompression !== undefined) {
-        state.contextCompression = s.contextCompression;
-      }
-      if (stillActiveAfterRefresh && s && s.contextWindow !== undefined) {
-        state.contextWindow = s.contextWindow;
-        window.renderContextWindow();
-      }
+      if (stillActiveAfterRefresh) applyContextWindowSnapshot(s, completedContextRequest);
       if (stillActiveAfterRefresh && s && s.subagents) state.subagents = s.subagents;
       if (stillActiveAfterRefresh && s && s.linkedPlan) state.linkedPlan = s.linkedPlan;
       if (stillActiveAfterRefresh && s && s.fileDiffs) state.fileDiffs = s.fileDiffs;
@@ -16388,10 +18244,6 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       }
     }).catch(function(){});
   }
-  if (api.setMode && executionMode !== state.mode) {
-    var resumedModeResult = await api.setMode(state.mode).catch(function() { return null; });
-    if (resumedModeResult != null) state._syncedMode = state.mode;
-  }
   var finalRuntime = state.conversationRuntimeStates && state.conversationRuntimeStates[lockedRuntimeKey];
   var finalRunMatches = !finalRuntime || !finalRuntime.runId || finalRuntime.runId === localRunId || (r && finalRuntime.runId === r.runId);
   if (sendFailure) {
@@ -16401,9 +18253,16 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
     if (finalRunMatches) {
       setConversationRuntimeState(lockedTarget, 'error', (r && r.runId) || (finalRuntime && finalRuntime.runId) || localRunId, { provisional: false });
     }
+  } else if (finalRunMatches && r && r.runtime && (r.runtime.running || r.runtime.stopRequested)) {
+    setConversationRuntimeState(lockedTarget, r.runtime.stopRequested ? 'stopping' : 'running', r.runtime.runId || r.runId || localRunId, { provisional: false });
   } else if (finalRunMatches) {
-    setConversationRuntimeState(lockedTarget, 'completed', (r && r.runId) || localRunId);
+    var settledStatus = finalRuntime && ['interrupted', 'force_interrupted', 'error'].indexOf(finalRuntime.status) >= 0
+      ? finalRuntime.status : ((r && ['interrupted', 'force_interrupted'].indexOf(r.status) >= 0) ? r.status : 'completed');
+    setConversationRuntimeState(lockedTarget, settledStatus, (r && r.runId) || localRunId);
   }
+  // The synchronous final status above belongs to this same send completion.
+  // A later IPC event still advances the revision and invalidates the read.
+  if (completedWorkRequest) completedWorkRequest.revision = conversationWorkRevision(lockedTarget);
   setWorking(!!runningConversationRecord(activeConversationId()));
   window.renderInputStack();
   var canonicalLockedRuntimeKey = runtimeKeyFor(lockedTarget.workspaceId, lockedTarget.conversationId);
@@ -16416,107 +18275,14 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
   window.drainNextQueue();
 };
 
-window.scheduleNextQueueDrain = function(target) {
-  var expectedTarget = normalizeQueuedConversationTarget(target || currentConversationTarget());
-  if (!expectedTarget) return;
-  if (state.queuePausedByTarget && state.queuePausedByTarget[runtimeKeyFor(expectedTarget.workspaceId, expectedTarget.conversationId)]) return;
-  var expectedKey = runtimeKeyFor(expectedTarget.workspaceId, expectedTarget.conversationId);
-  if (!state.nextQueueSchedulesByTarget) state.nextQueueSchedulesByTarget = {};
-  var existing = state.nextQueueSchedulesByTarget[expectedKey];
-  if (existing) return;
-  var schedule = { target: expectedTarget };
-  state.nextQueueSchedulesByTarget[expectedKey] = schedule;
-  queueMicrotask(function() {
-    if (state.nextQueueSchedulesByTarget[expectedKey] !== schedule) return;
-    var activeTarget = currentConversationTarget();
-    if (runtimeKeyFor(activeTarget.workspaceId, activeTarget.conversationId) !== expectedKey) {
-      delete state.nextQueueSchedulesByTarget[expectedKey];
-      return;
-    }
-    if (state.activeSendCallsByTarget && state.activeSendCallsByTarget[expectedKey]) {
-      delete state.nextQueueSchedulesByTarget[expectedKey];
-      return;
-    }
-    if (state.queuePausedByTarget && state.queuePausedByTarget[runtimeKeyFor(expectedTarget.workspaceId, expectedTarget.conversationId)]) {
-      delete state.nextQueueSchedulesByTarget[expectedKey];
-      return;
-    }
-    if (isCurrentConversationRunning()) {
-      delete state.nextQueueSchedulesByTarget[expectedKey];
-      return;
-    }
-    window.drainNextQueue();
-    if (state.nextQueueSchedulesByTarget[expectedKey] === schedule) {
-      delete state.nextQueueSchedulesByTarget[expectedKey];
-    }
-  });
+window.scheduleNextQueueDrain = function() {
+  // Queue consumption belongs to the shared conversation command owner.
+  // This compatibility hook is presentation-only; it cannot schedule a send.
 };
 
 window.drainNextQueue = function() {
-  if (isCurrentConversationRunning()) return;
-  if (!state.nextQueue || !state.nextQueue.length) return;
-  var target = currentConversationTarget();
-  if (state.queuePausedByTarget && state.queuePausedByTarget[runtimeKeyFor(target.workspaceId, target.conversationId)]) return;
-  var targetKey = runtimeKeyFor(target.workspaceId, target.conversationId);
-  if (state.activeSendCallsByTarget && state.activeSendCallsByTarget[targetKey]) return;
-  if (!state.nextQueueDrainsByTarget) state.nextQueueDrainsByTarget = {};
-  if (state.nextQueueDrainsByTarget[targetKey]) return;
-  var indexes = queueIndexesForRuntimeTarget(target).filter(function(index) {
-    return !queuedRequestIsBackendManaged(state.nextQueueRequests && state.nextQueueRequests[index]);
-  });
-  if (!indexes.length) return;
-  var index = indexes[0];
-  var nextRequest = state.nextQueueRequests ? state.nextQueueRequests[index] : null;
-  if (!queuedRequestMatchesTarget(nextRequest, target)) return;
-  var drainToken = { request: nextRequest, target: target };
-  state.nextQueueDrainsByTarget[targetKey] = drainToken;
-  queueMicrotask(function() {
-    if (state.nextQueueDrainsByTarget[targetKey] !== drainToken) return;
-    var activeTarget = currentConversationTarget();
-    if (runtimeKeyFor(activeTarget.workspaceId, activeTarget.conversationId) !== targetKey
-      || (state.activeSendCallsByTarget && state.activeSendCallsByTarget[targetKey])
-      || isCurrentConversationRunning()) {
-      delete state.nextQueueDrainsByTarget[targetKey];
-      return;
-    }
-    var currentIndex = state.nextQueueRequests ? state.nextQueueRequests.indexOf(nextRequest) : -1;
-    if (currentIndex < 0 || queuedRequestIsBackendManaged(nextRequest) || !queuedRequestMatchesTarget(nextRequest, activeTarget)) {
-      delete state.nextQueueDrainsByTarget[targetKey];
-      return;
-    }
-    var next = state.nextQueue[currentIndex];
-    state.nextQueue.splice(currentIndex, 1);
-    state.nextQueueRequests.splice(currentIndex, 1);
-    refreshNextPromptForTarget(activeTarget);
-    window.renderInputStack();
-    var started = false;
-    var sendAttempt = window.sendMessage('guide', next, {
-      fromQueue: true,
-      forceBuild: !nextRequest.goalDeclaration,
-      goalDeclaration: !!nextRequest.goalDeclaration,
-      goalObjective: next,
-      requestedMode: nextRequest.requestedMode || (nextRequest.goalDeclaration ? 'goal' : state.mode),
-      queuedRequest: nextRequest,
-      onStarted: function() { started = true; }
-    });
-    Promise.resolve(sendAttempt).then(function(result) {
-      if (started && !(result && result.ok === false)) return;
-      if ((state.nextQueueRequests || []).indexOf(nextRequest) >= 0) return;
-      var rollbackIndex = Math.max(0, Math.min(currentIndex, state.nextQueue.length));
-      state.nextQueue.splice(rollbackIndex, 0, next);
-      state.nextQueueRequests.splice(rollbackIndex, 0, nextRequest);
-    }).catch(function() {
-      if ((state.nextQueueRequests || []).indexOf(nextRequest) >= 0) return;
-      var rollbackIndex = Math.max(0, Math.min(currentIndex, state.nextQueue.length));
-      state.nextQueue.splice(rollbackIndex, 0, next);
-      state.nextQueueRequests.splice(rollbackIndex, 0, nextRequest);
-    }).finally(function() {
-      if (state.nextQueueDrainsByTarget[targetKey] === drainToken) delete state.nextQueueDrainsByTarget[targetKey];
-      refreshNextPromptForTarget(activeTarget);
-      window.renderInputStack();
-      window.scheduleNextQueueDrain(activeTarget);
-    });
-  });
+  // Backend snapshots contain the only executable queue. Rendering must never
+  // remove an item or re-submit its text as a second independent command.
 };
 
 // === Sidebar Controls ===
@@ -17044,10 +18810,13 @@ window.refreshRightStatus = function(options) {
     return Promise.resolve(null);
   }
   var statusTarget = currentConversationTarget();
+  var statusLoadGeneration = state.conversationLoadGeneration;
+  var statusContextRequest = captureContextWindowSnapshotRequest(statusTarget);
   return api.getState(statusTarget).then(function(s) {
+    if (!isActiveConversationTarget(statusTarget) || statusLoadGeneration !== state.conversationLoadGeneration) return null;
     applyAutoRouteRatingState(s);
     renderAutoRouteRatingControls();
-    if (s && s.mode) state.mode = s.mode;
+    applyConversationCommandSnapshot(s, statusTarget);
     if (s && s.model !== undefined) state.model = s.model;
     if (s && s.modelLabel) state.modelLabel = s.modelLabel;
     if (s && s.status) state.agentStatus = s.status;
@@ -17094,28 +18863,21 @@ window.refreshRightStatus = function(options) {
         statusFlowRecord.lastSubmission = { name: String(s.flowRunning.name || ''), input: '', components: [] };
       }
       renderFlowTakeover(true, String(s.flowRunning.name || statusFlowRecord.name || ''), { target: statusTarget });
-    } else if (flowTargetMatchesCurrent(statusTarget) && s && s.flowSuspension === null && !s.flowRunning) {
+    } else if (flowTargetMatchesCurrent(statusTarget) && s && s.flowSuspension === null && !s.flowRunning && !(statusFlowRecord.pendingStart && !statusFlowRecord.pendingStart.cancelled)) {
       // The backend authoritatively reports no Flow for this conversation.
       renderFlowTakeover(false, '', { target: statusTarget });
     }
     if (s && s.conversationPlan) state.conversationPlan = normalizeConversationPlan(s.conversationPlan);
-    if (s && s.draft !== undefined) {
-      var restoredDraftKey = conversationDraftKey();
-      if (!Object.prototype.hasOwnProperty.call(state.conversationDrafts, restoredDraftKey)) {
-        state.conversationDrafts[restoredDraftKey] = String(s.draft || '');
-      }
-    }
-    if (s && s.contextCompression !== undefined) {
-      state.contextCompression = s.contextCompression;
-    }
-    if (s && s.contextWindow !== undefined) {
-      state.contextWindow = s.contextWindow;
-      window.renderContextWindow();
-    }
+    hydrateConversationDraftSnapshot(s, statusTarget);
+    applyContextWindowSnapshot(s, statusContextRequest);
     window.renderSubagentList();
     if (state.rightTab === 'plan') window.renderConversationPlan();
     window.renderRightStatusPanel();
   }).catch(function(err) {
+    if (!isActiveConversationTarget(statusTarget) || statusLoadGeneration !== state.conversationLoadGeneration) {
+      if (options.required === true) throw err;
+      return null;
+    }
     var target = document.getElementById('right-status-content');
     if (target) target.innerHTML = '<div class="right-empty">' + esc(t('status.unavailable')) + ': ' + esc(err.message || String(err)) + '</div>';
     if (options.required === true) throw err;
@@ -18104,15 +19866,17 @@ window.closeSubWin = function() {
     });
     return;
   }
-  els['sub-win-overlay'].classList.remove('open');
-  state.activeSubWindowView = null;
   var win = els['sub-win'];
-  if (win) { win.classList.remove('memory-lab-window', 'settings-window'); win.style.left = ''; win.style.top = ''; win.style.margin = ''; }
-  var restoreFocus = subWindowOriginFocus;
-  subWindowOriginFocus = null;
-  updateApplicationInertState();
-  requestAnimationFrame(function() {
-    if (restoreFocus && restoreFocus.isConnected && typeof restoreFocus.focus === 'function') restoreFocus.focus({ preventScroll: true });
+  window.animateLiquidPopupExit(win, null, function() {
+    els['sub-win-overlay'].classList.remove('open');
+    state.activeSubWindowView = null;
+    if (win) { win.classList.remove('memory-lab-window', 'settings-window'); win.style.left = ''; win.style.top = ''; win.style.margin = ''; }
+    var restoreFocus = subWindowOriginFocus;
+    subWindowOriginFocus = null;
+    updateApplicationInertState();
+    requestAnimationFrame(function() {
+      if (restoreFocus && restoreFocus.isConnected && typeof restoreFocus.focus === 'function') restoreFocus.focus({ preventScroll: true });
+    });
   });
 };
 
@@ -18201,7 +19965,7 @@ function renderGeneralSettings() {
   }
   var backgroundColor = /^#[0-9a-f]{6}$/i.test(String(state.backgroundColor || ''))
     ? state.backgroundColor
-    : (state.theme === 'light' ? '#F0F2F8' : '#0A0A1A');
+    : (state.theme === 'light' ? '#F0F2F8' : '#101010');
   var fontFamily = String(state.fontFamily || '');
   var wslOptions = (state.wslDistros || []).map(function(name) { return '<option value="' + escAttr(name) + '"' + ((state.agentBackend && state.agentBackend.distro) === name ? ' selected' : '') + '>' + esc(name) + '</option>'; }).join('');
   var wslHtml = state.platform === 'win32' ? '<div class="setting-row">' +
@@ -20219,13 +21983,15 @@ window.resumeInterruptedFlow = async function() {
 };
 
 window.resumeFlowWith = async function(feedback, isInterruptedResume) {
+  var resumeTarget = currentConversationTarget();
   var resumeRecord = currentFlowTakeoverRecord();
   resumeRecord.lastRelayedError = null;
   try {
-    var result = await api.resumeFlow(feedback, currentConversationTarget());
-    if (result && Array.isArray(result.chatMessages)) {
-      if (Array.isArray(result.workRuns)) renderConversationWorkRuns(result.workRuns, currentConversationTarget());
-      renderChatMessages(result.chatMessages);
+    var result = await api.resumeFlow(feedback, resumeTarget);
+    applyConversationCommandSnapshot(result, resumeTarget);
+    if (result && Array.isArray(result.chatMessages) && isActiveConversationTarget(resumeTarget)) {
+      if (Array.isArray(result.workRuns)) renderConversationWorkRuns(result.workRuns, resumeTarget);
+      renderChatMessages(result.chatMessages, resumeTarget);
     }
     if (result && result.alreadyRunning) {
       // The backend reports the Flow is already running (a stale resume click
@@ -20234,83 +22000,60 @@ window.resumeFlowWith = async function(feedback, isInterruptedResume) {
       // sync.
       resumeRecord.running = true;
       resumeRecord.paused = false;
-      window.renderFlowTakeover(true, result.flow || resumeRecord.name || (resumeRecord.lastSubmission && resumeRecord.lastSubmission.name) || '', { target: currentConversationTarget() });
+      window.renderFlowTakeover(true, result.flow || resumeRecord.name || (resumeRecord.lastSubmission && resumeRecord.lastSubmission.name) || '', { target: resumeTarget });
       return result;
     }
     if (result && result.pending) {
       state.pendingOptions = result.options || [];
       renderPendingOptionsInChat(state.pendingOptions);
       if (result.interrupted) {
-        renderFlowTakeover(true, result.name || (resumeRecord.lastSubmission && resumeRecord.lastSubmission.name), { interrupted: true, message: result.error, target: currentConversationTarget() });
+        renderFlowTakeover(true, result.name || (resumeRecord.lastSubmission && resumeRecord.lastSubmission.name), { interrupted: true, message: result.error, target: resumeTarget });
       }
       return result;
     }
     var completed = !!(result && result.ok);
-    var resumeTarget = currentConversationTarget();
     if (!completed && !flowRelayedErrorWasShown(resumeTarget)) showUiNotice(formatChatError((result && result.error) || 'Flow resume failed'), 'error', 'flow-resume-error');
     else if (completed) addMsg('assistant', '[System] Flow complete.', 'flow', state.model);
-    var settlement = stopFlowRunInternal(completed ? {} : { keepPaused: true }, resumeTarget);
-    await setVisibleMode('build');
-    if (completed && settlement && settlement.shouldDrain) window.scheduleNextQueueDrain(settlement.target);
+    stopFlowRunInternal({}, resumeTarget);
+    if (api.getState) applyConversationCommandSnapshot(await api.getState(resumeTarget), resumeTarget);
     return result;
   } catch (error) {
-    var catchTarget = currentConversationTarget();
+    var catchTarget = resumeTarget;
     if (!flowRelayedErrorWasShown(catchTarget)) showUiNotice(formatChatError(error && error.message ? error.message : String(error), 'Flow resume failed.'), 'error', 'flow-resume-error');
     stopFlowRunInternal({ keepPaused: true }, catchTarget);
-    await setVisibleMode('build');
+    if (api.getState) applyConversationCommandSnapshot(await api.getState(catchTarget), catchTarget);
     return { ok: false, error: error && error.message ? error.message : String(error) };
   }
 };
 
-function removeFlowOwnedQueueRequest(lease) {
-  if (!lease || !lease.request) return;
-  var index = (state.nextQueueRequests || []).indexOf(lease.request);
-  if (index < 0) return;
-  state.nextQueue.splice(index, 1);
-  state.nextQueueRequests.splice(index, 1);
-  refreshNextPromptForTarget(lease.target);
+function removeFlowOwnedQueueRequest() {
+  // Flow queue leases are owned and settled by the shared backend.
 }
 
 function settleFlowQueueTakeover(options, target) {
-  options = options || {};
-  target = target || currentConversationTarget();
-  var record = flowTakeoverRecordFor(target);
-  var lease = record.queueLease || null;
+  var record = flowTakeoverRecordFor(target || currentConversationTarget());
   record.queueLease = null;
-  if (!lease) return null;
-  removeFlowOwnedQueueRequest(lease);
-  var key = queueRuntimeKey(lease.target);
-  if (!state.queuePausedByTarget) state.queuePausedByTarget = {};
-  state.queuePausedByTarget[key] = options.resumeQueue === true
-    ? false
-    : options.keepPaused === true
-      ? true
-      : !!lease.wasPaused;
-  return {
-    target: lease.target,
-    shouldDrain: !state.queuePausedByTarget[key]
-  };
+  return null;
 }
 
-window.queueFlowNextInput = function(text) {
+window.queueFlowNextInput = async function(text) {
   text = String(text || '').trim();
   if (!text) return false;
   var target = currentConversationTarget();
-  var request = bindQueuedRequestToTarget({ text: text, images: [] }, text, target, queueBranchPathForTarget(target, 'runtime'));
-  request.requestedMode = 'build';
-  request.flowQueuedDuringTakeover = true;
-  state.nextQueue.push(text);
-  state.nextQueueRequests.push(request);
-  pauseQueueForTarget(target);
+  var result = await api.sendMessage(text, target, {
+    requestedMode: 'build', inputMode: 'next', clientMessageId: window.crypto.randomUUID()
+  });
+  applyConversationCommandSnapshot(result, target);
   state.queueCollapsed = false;
-  refreshNextPromptForTarget(target);
   window.renderInputStack();
-  return true;
+  if (result && result.ok === false) showUiNotice(result.error || 'Failed to queue Flow input.', 'error', 'flow-next');
+  return result;
 };
 
 function stopFlowRunInternal(options, target) {
   target = target || currentConversationTarget();
   var record = flowTakeoverRecordFor(target);
+  if (record.pendingStart) record.pendingStart.cancelled = true;
   record.running = false;
   record.paused = false;
   record.promptText = '';
@@ -20341,9 +22084,14 @@ function stopFlowRunInternal(options, target) {
 window.stopFlowRun = async function(options) {
   options = options || {};
   if (!flowTakeoverMatchesCurrent()) return { ok: false, action: 'not_running', error: 'The active Flow belongs to another conversation.' };
+  var stopTarget = currentConversationTarget();
+  var stopRecord = flowTakeoverRecordFor(stopTarget);
+  if (stopRecord.pendingStart) stopRecord.pendingStart.cancelled = true;
+  if (options.resumeQueue === true) return window.queueAction('queue_set_pause', { paused: false }, stopTarget);
   if (options.resumeQueue !== true) options.keepPaused = true;
   if (api.stopFlow) {
-    var stopResult = await api.stopFlow(currentConversationTarget()).catch(function() { return null; });
+    var stopResult = await api.stopFlow(stopTarget).catch(function() { return null; });
+    applyConversationCommandSnapshot(stopResult, stopTarget);
     var action = String(stopResult && stopResult.action || '');
     // First Stop/Esc while a Flow is RUNNING: cooperative abort. The flow:run
     // handler turns this into an interrupted suspension (renders the paused
@@ -20351,9 +22099,8 @@ window.stopFlowRun = async function(options) {
     if (action === 'stopping') return stopResult;
   }
   // Paused flow (or already force-stopped): tear down immediately.
-  var settlement = stopFlowRunInternal(options);
-  await setVisibleMode('build');
-  if (settlement && settlement.shouldDrain) window.scheduleNextQueueDrain(settlement.target);
+  stopFlowRunInternal({}, stopTarget);
+  if (api.getState) applyConversationCommandSnapshot(await api.getState(stopTarget), stopTarget);
   addMsg('assistant', '[System] Flow stopped manually.', 'flow', '');
 };
 
@@ -20412,7 +22159,8 @@ window.saveFlowToDisk = async function(workIdx) {
   window.closeSubWin();
 };
 
-window.runFlowWork = async function(workIdx) {
+window.runFlowWork = async function(workIdx, command) {
+  command = command || {};
   var work = state.flowWorks[workIdx];
   if (!work || !work.components || work.components.length === 0) {
     addMsg('assistant', '[System] ' + t('flow.emptyRun'), 'error', '');
@@ -20420,19 +22168,17 @@ window.runFlowWork = async function(workIdx) {
     return;
   }
   var normalized = window.normalizeFlowWork({ name: work.name, components: work.components || [] });
-  var flowInput = (els.prompt && els.prompt.value.trim()) || '';
-  var flowTarget = currentConversationTarget();
-  var flowWasPaused = window.isQueuePausedForTarget(flowTarget);
-  var flowQueueCount = queueIndexesForTarget(flowTarget).length;
-  var flowDeliveryMode = state.inputMode === 'next' ? 'next' : 'guide';
-  if (flowDeliveryMode === 'guide' && isCurrentConversationRunning()) {
-    showUiNotice(currentLang() === 'zh' ? '正在运行 Build 时，Flow 必须以 Next 提交。' : 'While a Build is running, Flow must be submitted as Next.', 'error', 'flow-guide-running');
-    return;
-  }
-  pauseQueueForTarget(flowTarget);
+  var flowInput = typeof command.text === 'string' ? command.text : ((els.prompt && els.prompt.value.trim()) || '');
+  var flowTarget = normalizeQueuedConversationTarget(command.target || currentConversationTarget());
+  var flowDeliveryMode = (command.inputMode || state.inputMode) === 'next' ? 'next' : 'guide';
   state.queueCollapsed = false;
   refreshNextPromptForTarget(flowTarget);
   var flowRecord = flowTakeoverRecordFor(flowTarget);
+  if (flowRecord.pendingStart) flowRecord.pendingStart.cancelled = true;
+  // Saving and the shared command are asynchronous. Backend idle snapshots
+  // cannot cancel an unsent command; only explicit stop/supersession can.
+  var pendingStart = { name: normalized.name, cancelled: false };
+  flowRecord.pendingStart = pendingStart;
   flowRecord.promptText = flowInput;
   flowRecord.lastSubmission = {
     name: normalized.name,
@@ -20443,11 +22189,6 @@ window.runFlowWork = async function(workIdx) {
       });
     })
   };
-  flowRecord.queueLease = {
-    target: flowTarget,
-    wasPaused: flowWasPaused,
-    request: null
-  };
   if (els.prompt) {
     els.prompt.value = '';
     els.prompt.placeholder = t('flow.runningPlaceholder');
@@ -20475,24 +22216,14 @@ window.runFlowWork = async function(workIdx) {
     if (api.saveFlow) {
       await api.saveFlow(normalized);
     }
-    while (flowRecord.running && flowWaitingForPriorBuild && isCurrentConversationRunning()) {
-      await new Promise(function(resolve) { setTimeout(resolve, 100); });
-    }
-    if (!flowRecord.running) return;
-    if (!flowRecord.runtimeLease) {
-      var resumedFlowRunId = 'flow-' + Date.now() + '-' + Math.random().toString(16).slice(2);
-      flowRecord.runtimeLease = { target: flowTarget, runId: resumedFlowRunId };
-      setConversationRuntimeState(flowTarget, 'running', resumedFlowRunId, { provisional: true, flow: true });
-      updateSubmitButtonState();
-      renderConversations();
-    }
-    if (api.setMode) {
-      await api.setMode('flow');
-      state._syncedMode = 'flow';
-    }
-    state.mode = 'flow';
-    var r = await api.runFlow(normalized.name, flowInput, 0);
-    if (r && r.chatMessages) {
+    if (flowRecord.pendingStart !== pendingStart || pendingStart.cancelled) return;
+    var r = await api.sendMessage(flowInput, flowTarget, {
+      requestedMode: 'flow', inputMode: flowDeliveryMode, flowName: normalized.name,
+      flowStart: 0, clientMessageId: window.crypto.randomUUID()
+    });
+    if (flowRecord.pendingStart !== pendingStart) return r;
+    applyConversationCommandSnapshot(r, flowTarget);
+    if (r && r.chatMessages && isActiveConversationTarget(flowTarget)) {
       if (Array.isArray(r.workRuns)) renderConversationWorkRuns(r.workRuns, flowTarget);
       renderChatMessages(r.chatMessages);
       if (r.conversations) {
@@ -20524,10 +22255,13 @@ window.runFlowWork = async function(workIdx) {
       showUiNotice(formatChatError(err && err.message ? err.message : String(err), 'Flow failed.'), 'error', 'flow-run-error');
     }
   } finally {
-    if (flowSuspended) return;
-    var settlement = stopFlowRunInternal(flowCompletedNormally ? {} : { keepPaused: true }, flowTarget);
-    await setVisibleMode('build');
-    if (flowCompletedNormally && settlement && settlement.shouldDrain) window.scheduleNextQueueDrain(settlement.target);
+    if (flowRecord.pendingStart === pendingStart) {
+      flowRecord.pendingStart = null;
+      if (!flowSuspended) {
+        stopFlowRunInternal({}, flowTarget);
+        if (api.getState) applyConversationCommandSnapshot(await api.getState(flowTarget), flowTarget);
+      }
+    }
   }
 };
 
@@ -20612,9 +22346,10 @@ window.loadFileTree = async function(options) {
   }
 };
 
-window.submitSelectedFlow = function() {
+window.submitSelectedFlow = function(command) {
+  command = command || { text: String(els.prompt && els.prompt.value || ''), target: currentConversationTarget(), inputMode: state.inputMode };
   if (!state._flowsLoaded && window.ensureFlowsLoaded) {
-    return window.ensureFlowsLoaded().then(function() { return window.submitSelectedFlow(); });
+    return window.ensureFlowsLoaded().then(function() { return window.submitSelectedFlow(command); });
   }
   var selected = String(state.defaultFlow || (document.getElementById('flow-select') && document.getElementById('flow-select').value) || '');
   var workIdx = state.flowWorks.findIndex(function(work) { return String(work && work.name || '') === selected; });
@@ -20625,7 +22360,7 @@ window.submitSelectedFlow = function() {
     showUiNotice(message, 'error', 'flow-select-required');
     return { ok: false, error: message };
   }
-  return window.runFlowWork(workIdx);
+  return window.runFlowWork(workIdx, command);
 };
 
 function renderTreeNodes(nodes, parent, depth) {
@@ -21437,9 +23172,18 @@ function updateSubagentHistoryMeta(record) {
 
 window.closeSubagentHistory = function() {
   var overlay = document.getElementById('subagent-history-overlay');
-  if (overlay) overlay.remove();
-  state.subagentHistoryActorId = '';
-  _subagentLive = null;
+  if (!overlay) {
+    state.subagentHistoryActorId = '';
+    _subagentLive = null;
+    return;
+  }
+  var popup = overlay.querySelector('.liquid-glass-popup');
+  function finish() {
+    overlay.remove();
+    state.subagentHistoryActorId = '';
+    _subagentLive = null;
+  }
+  if (popup) window.animateLiquidPopupExit(popup, null, finish); else finish();
 };
 
 window.openSubagentHistory = function(id) {
@@ -21451,7 +23195,7 @@ window.openSubagentHistory = function(id) {
   }
   state.subagentHistoryActorId = agent.id;
   var existing = document.getElementById('subagent-history-overlay');
-  if (existing) existing.remove();
+  if (existing) window.closeSubagentHistory();
   var lines = [];
   lines.push('<div style="font-size:13px;color:var(--text);font-weight:600;margin-bottom:4px;">' + esc(agent.name || agent.displayName || t('subagent.historyTitle')) + '</div>');
   lines.push('<div style="font-size:10px;color:var(--text-dim);word-break:break-all;margin-bottom:8px;">' + esc(agent.qualifiedName || agent.id || '') + '</div>');
@@ -21468,7 +23212,7 @@ window.openSubagentHistory = function(id) {
   var overlay = document.createElement('div');
   overlay.id = 'subagent-history-overlay';
   overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,.45);z-index:9999;display:flex;align-items:center;justify-content:center;padding:24px;';
-  overlay.innerHTML = '<div style="width:min(680px, calc(100vw - 48px));max-height:80vh;display:flex;flex-direction:column;background:var(--bg);border:1px solid var(--glass-border-2);border-radius:12px;padding:16px;box-shadow:0 20px 60px rgba(0,0,0,.35);">' +
+  overlay.innerHTML = '<div class="liquid-glass liquid-glass-carrier liquid-glass-popup" style="width:min(680px, calc(100vw - 48px));max-height:80vh;display:flex;flex-direction:column;background:var(--bg);border:1px solid var(--glass-border-2);border-radius:12px;padding:16px;box-shadow:0 20px 60px rgba(0,0,0,.35);">' +
     '<div style="display:flex;align-items:center;gap:10px;margin-bottom:8px;flex:0 0 auto;"><div style="flex:1;font-size:12px;color:var(--text-dim);">' + esc(t('subagent.liveHistory')) + '</div><button type="button" style="border:1px solid var(--glass-border-1);border-radius:8px;background:var(--glass-bg-1);color:var(--text);padding:6px 10px;cursor:pointer;">' + esc(t('common.close')) + '</button></div>' +
     '<div style="flex:0 0 auto;">' + lines.join('') + '</div>' +
     '<div id="subagent-history-body" style="flex:1 1 auto;overflow:auto;margin-top:8px;min-height:80px;"></div>' +
@@ -22048,14 +23792,16 @@ function syncBackendConversation() {
   var conv = convs[state.activeConversation] || convs[0];
   var requestedConversationId = String((conv && conv.id) || '');
   var requestedWorkspaceKey = currentWorkspaceKey();
+  var requestedLoadGeneration = state.conversationLoadGeneration;
   function requestIsCurrent() {
-    return requestedWorkspaceKey === currentWorkspaceKey() &&
+    return requestedLoadGeneration === state.conversationLoadGeneration && requestedWorkspaceKey === currentWorkspaceKey() &&
       requestedConversationId === String(activeConversationId() || 'default');
   }
   if (conv && api.ensureConversation) {
     var requestedTarget = currentConversationTarget(conv.id);
     state.activeBackendConversationId = conv.id;
     var historyPromise = loadActiveConversationMessages(conv.id);
+    requestedLoadGeneration = state.conversationLoadGeneration;
     var activate = api.activateConversation ? api.activateConversation(requestedTarget) : api.ensureConversation(requestedTarget);
     var activationPromise = activate.then(function(s) {
       var id = (s && s.conversationId) || conv.id;
@@ -22178,7 +23924,7 @@ function followConversationDragPointer() {
   // Keep the reorder anchor fixed at the edge, but give a held glass float a
   // damped visual pull so blocked dragging still feels elastic and alive.
   var blockedDelta = projectedTop < minTop ? projectedTop - minTop : projectedTop > maxTop ? projectedTop - maxTop : 0;
-  var resisted = Math.sign(blockedDelta) * Math.sqrt(Math.abs(blockedDelta)) * 0.6;
+  var resisted = Math.sign(blockedDelta) * Math.min(LIQUID_POPUP_MAX_EDGE_JITTER_PX, Math.sqrt(Math.abs(blockedDelta)) * 0.6);
   var edge = liquidInteractionEdgePx();
   drag.float.style.left = (rowRect.left - edge) + 'px';
   drag.float.style.top = (trackTop - edge) + 'px';
@@ -22399,13 +24145,7 @@ function renderConversations() {
       displaySummary += ' · ' + String(conv.id || '').slice(-8);
     }
     var running = !!(runtimeState && ['running', 'stopping', 'force_restarting'].indexOf(String(runtimeState.status || '')) >= 0);
-    var runtimeBadge = runtimeState && runtimeState.status && runtimeState.status !== 'idle'
-      ? '<span class="conv-runtime-badge ' + escAttr(String(runtimeState.status)) + '">' + esc(String(runtimeState.status)) + '</span>' : '';
-    var branchCommIcon = conv.branchCommunication
-      ? '<span class="conv-branch-comm-icon" title="' + escAttr(t('conversation.branchCommunicationBadge')) + '" aria-label="' + escAttr(t('conversation.branchCommunicationBadge')) + '">' + iconSvg('git-branch', t('conversation.branchCommunicationBadge')) + '</span>' : '';
-    var innerKey = [String(displaySummary), String(conv.messageCount || ''), String(runtimeState && runtimeState.status || ''), conv.branchCommunication ? '1' : '0'].join('|');
-    var nextInner = '<span class="conv-summary" title="' + escAttr(String(conv.id || '')) + '">' + esc(displaySummary) + (conv.messageCount ? ' (' + esc(String(conv.messageCount)) + ')' : '') + '</span>' + branchCommIcon + runtimeBadge +
-      '<button class="conv-more-btn" aria-haspopup="menu" aria-expanded="false" onclick="event.stopPropagation();window.openConversationActionMenu(this, this.closest(&quot;.conv-item&quot;).getAttribute(&quot;data-conversation-id&quot;))" title="' + escAttr(t('conversation.more')) + '">' + iconOnly('ellipsis', t('conversation.more')) + '</button>';
+    var innerKey = [currentLang(), String(displaySummary), String(conv.messageCount || ''), String(runtimeState && runtimeState.status || ''), conv.branchCommunication ? '1' : '0'].join('|');
     var div = existingRows[String(conv.id || '')];
     if (div) {
       keepRows[String(conv.id || '')] = true;
@@ -22485,11 +24225,19 @@ function renderConversations() {
       });
       existingRows[String(conv.id || '')] = div;
     }
-    div.className = 'conv-item' + (conv.active ? ' active' : '');
-    if (running) div.classList.add('marquee-border');
-    div.setAttribute('tabindex', conv.active ? '0' : '-1');
-    div.setAttribute('aria-current', conv.active ? 'true' : 'false');
+    var nextClassName = 'conv-item' + (conv.active ? ' active' : '') + (running ? ' marquee-border' : '');
+    if (div.className !== nextClassName) div.className = nextClassName;
+    var nextTabIndex = conv.active ? '0' : '-1';
+    if (div.getAttribute('tabindex') !== nextTabIndex) div.setAttribute('tabindex', nextTabIndex);
+    var nextCurrent = conv.active ? 'true' : 'false';
+    if (div.getAttribute('aria-current') !== nextCurrent) div.setAttribute('aria-current', nextCurrent);
     if (div.getAttribute('data-inner-key') !== innerKey) {
+      var runtimeBadge = runtimeState && runtimeState.status && runtimeState.status !== 'idle'
+        ? '<span class="conv-runtime-badge ' + escAttr(String(runtimeState.status)) + '">' + esc(String(runtimeState.status)) + '</span>' : '';
+      var branchCommIcon = conv.branchCommunication
+        ? '<span class="conv-branch-comm-icon" title="' + escAttr(t('conversation.branchCommunicationBadge')) + '" aria-label="' + escAttr(t('conversation.branchCommunicationBadge')) + '">' + iconSvg('git-branch', t('conversation.branchCommunicationBadge')) + '</span>' : '';
+      var nextInner = '<span class="conv-summary" title="' + escAttr(String(conv.id || '')) + '">' + esc(displaySummary) + (conv.messageCount ? ' (' + esc(String(conv.messageCount)) + ')' : '') + '</span>' + branchCommIcon + runtimeBadge +
+        '<button class="conv-more-btn" aria-haspopup="menu" aria-expanded="false" onclick="event.stopPropagation();window.openConversationActionMenu(this, this.closest(&quot;.conv-item&quot;).getAttribute(&quot;data-conversation-id&quot;))" title="' + escAttr(t('conversation.more')) + '">' + iconOnly('ellipsis', t('conversation.more')) + '</button>';
       div.setAttribute('data-inner-key', innerKey);
       div.innerHTML = nextInner;
     }
@@ -25702,11 +27450,14 @@ window.closeCommandSurface = function(options) {
   options = options || {};
   var overlay = document.getElementById('command-surface-overlay');
   if (!overlay || !overlay.classList.contains('open')) return;
-  overlay.classList.remove('open');
-  updateApplicationInertState();
+  var panel = document.getElementById('command-surface');
   var restore = guiCommandSurfaceOriginFocus;
-  guiCommandSurfaceOriginFocus = null;
-  if (options.restoreFocus !== false) requestAnimationFrame(function(){ if (restore && restore.isConnected && typeof restore.focus === 'function') restore.focus({ preventScroll:true }); });
+  window.animateLiquidPopupExit(panel, null, function() {
+    overlay.classList.remove('open');
+    updateApplicationInertState();
+    guiCommandSurfaceOriginFocus = null;
+    if (options.restoreFocus !== false) requestAnimationFrame(function(){ if (restore && restore.isConnected && typeof restore.focus === 'function') restore.focus({ preventScroll:true }); });
+  });
   return restore;
 };
 
@@ -26197,6 +27948,7 @@ function schedulePostStartupUiRendering() {
             conversationId: String(s.conversationId || state.activeBackendConversationId || 'default')
           };
           if (s.runtimeKey) registerRuntimeKey(initialSnapshotTarget, s.runtimeKey);
+          hydrateConversationDraftSnapshot(s, initialSnapshotTarget);
           if (Array.isArray(s.workRuns)) syncWorkRunsSnapshot(s.workRuns, initialSnapshotTarget);
           if (s.chatMessages) {
             hydrateConversationBranchState(s);
@@ -26318,7 +28070,8 @@ function schedulePostStartupUiRendering() {
       }
     });
     els.prompt.addEventListener('input', function() {
-      saveActiveConversationDraft();
+      saveActiveConversationDraft(true);
+      persistConversationDraftForKey(state._promptBoundKey || conversationDraftKey(), 700);
       schedulePromptInputRefresh();
     });
     els.prompt.addEventListener('paste', function(e) {
@@ -26357,6 +28110,12 @@ function schedulePostStartupUiRendering() {
   if (els['mode-select']) {
     els['mode-select'].addEventListener('change', async function() {
       state.mode = this.value;
+      var selectedMode = state.mode;
+      var selectedTarget = currentConversationTarget();
+      // Submit before asynchronous Flow-list loading so an older selector
+      // event cannot overwrite a newer user selection after loading finishes.
+      var modeSelection = selectedMode !== state._syncedMode
+        ? Promise.resolve(api.setMode(selectedMode, selectedTarget)) : Promise.resolve(selectedMode);
       if (window.renderInputStack) window.renderInputStack();
       // Flow mode: show flow selector
       var flowSel = document.getElementById('flow-select');
@@ -26369,33 +28128,30 @@ function schedulePostStartupUiRendering() {
           window.renderFlowSelector();
         }
       }
-      // Goal becomes active only when a Goal instruction is actually sent.
-      if (state.mode !== 'goal' && state.mode !== state._syncedMode) {
-        var modeResult = await api.setMode(state.mode);
-        if (modeResult != null) state._syncedMode = state.mode;
-      }
+      // Shared selection persists the visible mode without creating a Goal
+      // or replacing the mode of an already running Flow component.
+      var modeResult = await modeSelection;
+      if (modeResult != null && isActiveConversationTarget(selectedTarget) && state.mode === selectedMode) state._syncedMode = selectedMode;
     });
   }
 
   if (els['model-select']) {
     els['model-select'].addEventListener('change', async function() {
-      state.model = this.value;
+      var selectedContextTarget = currentConversationTarget();
+      var selectedContextGeneration = state.conversationLoadGeneration;
+      var selectedContextModel = this.value;
+      state.model = selectedContextModel;
       window.syncModelSelectSurface();
       if (state.model !== state._syncedModel) {
-        var modelResult = await api.setModel(state.model);
-        if (modelResult != null) state._syncedModel = state.model;
+        var modelResult = await api.setModel(selectedContextModel);
+        if (modelResult != null && isActiveConversationTarget(selectedContextTarget)
+          && selectedContextGeneration === state.conversationLoadGeneration && state.model === selectedContextModel) state._syncedModel = selectedContextModel;
       }
       // The context ring/inspector must immediately reflect the newly selected
       // model's configured context window rather than waiting for the next send.
-      if (api.getState) {
-        var ctxTarget = currentConversationTarget();
-        api.getState(ctxTarget).then(function(s) {
-          if (s && s.contextWindow !== undefined && isActiveConversationTarget(ctxTarget) && isViewingRuntimeConversationBranch(ctxTarget)) {
-            state.contextWindow = s.contextWindow;
-            window.renderContextWindow();
-          }
-        }).catch(function(){});
-      }
+      if (api.getState && isActiveConversationTarget(selectedContextTarget)
+        && selectedContextGeneration === state.conversationLoadGeneration && state.model === selectedContextModel
+        && isViewingRuntimeConversationBranch(selectedContextTarget)) scheduleActiveContextWindowRefresh(selectedContextTarget);
     });
   }
 
@@ -26492,3 +28248,5 @@ function schedulePostStartupUiRendering() {
 </script>
 </body>
 </html>
+
+