@codexhost/cli-linux-x64 0.2.6 → 0.3.0-test.1

package/app/renderer-extension.js

@@ -36,6 +36,7 @@
     #ownershipRequestGenerations = /* @__PURE__ */ new WeakMap();
     #states = /* @__PURE__ */ new WeakMap();
     #switching = /* @__PURE__ */ new Set();
+    #pendingSubmissions = /* @__PURE__ */ new Set();
     #composerSequence = 0;
     #modelRequestSequence = 0;
     #ownershipRequestSequence = 0;
@@ -95,6 +96,7 @@
     rebindConversation(composer, target) {
       if (!isConversationTarget(target)) return null;
       const previous = this.#state(composer);
+      this.#pendingSubmissions.delete(previous);
       this.#modelRequestGenerations.set(previous, ++this.#modelRequestSequence);
       this.#ownershipRequestGenerations.set(previous, ++this.#ownershipRequestSequence);
       let state = this.#conversationState(target);
@@ -114,6 +116,7 @@
     restore(composer, agent, model, thinkingOptionId, permissionModeId) {
       if (!this.#enabledAgents.has(agent)) return null;
       const state = this.#state(composer);
+      this.#pendingSubmissions.delete(state);
       state.agent = agent;
       state.phase = "locked";
       if (agent === "pi" && model) state.piModel = model;
@@ -204,9 +207,21 @@
     }
     lock(composer) {
       const state = this.#state(composer);
+      this.#pendingSubmissions.delete(state);
       state.phase = "locked";
       return state;
     }
+    markSubmissionPending(composer) {
+      const state = this.#state(composer);
+      if (state.phase === "draft") this.#pendingSubmissions.add(state);
+      return state;
+    }
+    isSubmissionPending(composer) {
+      return this.#pendingSubmissions.has(this.#state(composer));
+    }
+    clearPendingSubmission(composer) {
+      this.#pendingSubmissions.delete(this.#state(composer));
+    }
     recordSubmission(composer) {
       const state = this.#state(composer);
       this.#lastSubmittedAgent = state.agent;
@@ -224,6 +239,9 @@
       if (isConversationTarget(target) && !bound) {
         this.#conversationStates.push({ target, state });
       }
+      if (isConversationTarget(target) && this.#pendingSubmissions.delete(state)) {
+        state.phase = "locked";
+      }
       return true;
     }
     async switchAgent(composer, nextAgent, operations) {
@@ -231,6 +249,7 @@
       if (!this.#enabledAgents.has(nextAgent)) return false;
       if (state.phase !== "draft" || this.#switching.has(state)) return false;
       if (state.agent === nextAgent) return true;
+      this.#pendingSubmissions.delete(state);
       this.#switching.add(state);
       try {
         if (!operations.applyAgent(nextAgent)) return false;
@@ -15783,21 +15802,88 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return view;
   }
 
+  // src/renderer-model-picker-positioning.ts
+  var MENU_GAP = 4;
+  var MAIN_MENU_SIDE_OFFSET = 8;
+  var COLLISION_PADDING = 8;
+  var RENDERER_MODEL_PICKER_MAIN_MENU_WIDTH = 260;
+  var RENDERER_MODEL_PICKER_MODEL_MENU_WIDTH = 280;
+  var RENDERER_MODEL_PICKER_MODEL_MENU_MAX_HEIGHT = 360;
+  function clampPosition(value, minimum, maximum) {
+    return Math.min(Math.max(value, minimum), Math.max(minimum, maximum));
+  }
+  function fitWidth(preferredWidth, viewportWidth) {
+    return Math.max(
+      COLLISION_PADDING,
+      Math.min(preferredWidth, viewportWidth - COLLISION_PADDING * 2)
+    );
+  }
+  function fitHeight(viewport, top = COLLISION_PADDING) {
+    return Math.max(
+      COLLISION_PADDING,
+      Math.min(
+        RENDERER_MODEL_PICKER_MODEL_MENU_MAX_HEIGHT,
+        viewport.height * 0.6,
+        viewport.height - top - COLLISION_PADDING
+      )
+    );
+  }
+  function rendererModelPickerMainMenuPlacement(triggerRect, viewport, width = RENDERER_MODEL_PICKER_MAIN_MENU_WIDTH) {
+    const maxLeft = viewport.width - COLLISION_PADDING - width;
+    return {
+      left: clampPosition(triggerRect.right - width, COLLISION_PADDING, maxLeft),
+      width,
+      bottom: Math.max(COLLISION_PADDING, viewport.height - triggerRect.top + MAIN_MENU_SIDE_OFFSET)
+    };
+  }
+  function rendererModelPickerStandaloneModelMenuPlacement(triggerRect, viewport) {
+    const width = fitWidth(RENDERER_MODEL_PICKER_MODEL_MENU_WIDTH, viewport.width);
+    const maxLeft = viewport.width - COLLISION_PADDING - width;
+    return {
+      left: clampPosition(triggerRect.right - width, COLLISION_PADDING, maxLeft),
+      width,
+      maxHeight: fitHeight(viewport),
+      bottom: Math.max(COLLISION_PADDING, viewport.height - triggerRect.top + MAIN_MENU_SIDE_OFFSET)
+    };
+  }
+  function rendererModelPickerModelMenuPlacement(mainRect, viewport) {
+    const preferredWidth = fitWidth(RENDERER_MODEL_PICKER_MODEL_MENU_WIDTH, viewport.width);
+    const rightLeft = mainRect.right + MENU_GAP;
+    const leftLeft = mainRect.left - MENU_GAP - preferredWidth;
+    const rightAvailable = viewport.width - rightLeft - COLLISION_PADDING;
+    const leftAvailable = mainRect.left - MENU_GAP - COLLISION_PADDING;
+    let width;
+    let left;
+    if (rightAvailable >= preferredWidth) {
+      width = preferredWidth;
+      left = rightLeft;
+    } else if (leftAvailable >= preferredWidth) {
+      width = preferredWidth;
+      left = leftLeft;
+    } else if (rightAvailable >= leftAvailable) {
+      width = Math.max(COLLISION_PADDING, rightAvailable);
+      left = rightLeft;
+    } else {
+      width = Math.max(COLLISION_PADDING, leftAvailable);
+      left = mainRect.left - MENU_GAP - width;
+    }
+    const top = clampPosition(mainRect.top, COLLISION_PADDING, viewport.height - COLLISION_PADDING);
+    const maxHeight = fitHeight(viewport, top);
+    return {
+      left: clampPosition(left, COLLISION_PADDING, viewport.width - COLLISION_PADDING - width),
+      top,
+      width,
+      maxHeight
+    };
+  }
+
   // src/renderer-model-picker.ts
   var RENDERER_MODEL_TRIGGER_FALLBACK_CLASSES = "border-token-border no-drag cursor-interaction items-center gap-1 border whitespace-nowrap select-none focus:outline-none disabled:cursor-not-allowed disabled:opacity-40 flex rounded-full text-token-text-tertiary enabled:hover:bg-token-list-hover-background enabled:active:bg-token-foreground/15 data-[state=open]:bg-token-list-hover-background border-transparent h-token-button-composer px-2 py-0 text-sm leading-[18px] min-w-0";
   var MENU_CLASSES = "fixed z-50 overflow-hidden rounded-xl bg-token-dropdown-background/90 text-token-foreground shadow-lg backdrop-blur-xl";
   var SEARCH_INPUT_CLASSES = "mb-1 w-full shrink-0 rounded-lg border border-token-border bg-token-dropdown-background/95 px-2 py-1.5 text-sm text-token-foreground outline-none placeholder:text-token-text-tertiary disabled:cursor-not-allowed disabled:opacity-40";
   var OPTION_CLASSES = "flex w-full cursor-interaction items-center gap-2 rounded-lg px-2 py-2 text-left text-sm text-token-foreground outline-none enabled:hover:bg-token-list-hover-background enabled:active:bg-token-foreground/15 disabled:cursor-not-allowed disabled:opacity-40";
   var HEADING_CLASSES = "px-2 pb-1 pt-1.5 text-sm text-token-text-tertiary";
-  var MAIN_MENU_MIN_WIDTH = 160;
-  var MAIN_MENU_MAX_WIDTH = 180;
-  var MODEL_MENU_PREFERRED_WIDTH = 360;
-  var MODEL_MENU_MAX_WIDTH = 420;
-  var MODEL_MENU_MAX_HEIGHT = 360;
   var MODEL_TRIGGER_MAX_WIDTH = "min(200px, 26vw)";
-  var MAIN_MENU_LEFT_OFFSET = 96;
-  var MENU_GAP = 4;
-  var VIEWPORT_MARGIN = 8;
   var MODEL_SCROLLBAR_STYLE_ATTRIBUTE = "data-codexhost-model-picker-scrollbar";
   function popoverOpen2(menu) {
     return menu.matches(":popover-open");
@@ -15877,47 +15963,38 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   }
   function positionMainMenu(control) {
     const triggerRect = control.trigger.getBoundingClientRect();
-    const width = Math.min(MAIN_MENU_MAX_WIDTH, Math.max(MAIN_MENU_MIN_WIDTH, triggerRect.width));
-    const modelMenuWidth = Math.min(
-      MODEL_MENU_MAX_WIDTH,
-      Math.min(MODEL_MENU_PREFERRED_WIDTH, window.innerWidth - VIEWPORT_MARGIN * 2)
+    const placement = rendererModelPickerMainMenuPlacement(
+      triggerRect,
+      { width: window.innerWidth, height: window.innerHeight },
+      RENDERER_MODEL_PICKER_MAIN_MENU_WIDTH
     );
-    const preferredLeft = triggerRect.right - width - MAIN_MENU_LEFT_OFFSET;
-    const rightReservedLeft = window.innerWidth - VIEWPORT_MARGIN - modelMenuWidth - MENU_GAP - width;
-    const maxLeft = window.innerWidth - VIEWPORT_MARGIN - width;
-    const left = Math.max(
-      VIEWPORT_MARGIN,
-      Math.min(preferredLeft, Math.max(rightReservedLeft, VIEWPORT_MARGIN), maxLeft)
-    );
-    control.menu.style.setProperty("width", `${width}px`, "important");
-    control.menu.style.left = `${left}px`;
-    control.menu.style.maxWidth = `${width}px`;
+    control.menu.style.setProperty("width", `${placement.width}px`, "important");
+    control.menu.style.left = `${placement.left}px`;
+    control.menu.style.maxWidth = `${placement.width}px`;
     control.menu.style.right = "auto";
     control.menu.style.top = "auto";
-    control.menu.style.bottom = `${Math.max(
-      VIEWPORT_MARGIN,
-      window.innerHeight - triggerRect.top + 6
-    )}px`;
-  }
-  function positionModelMenu(control) {
-    const mainRect = control.menu.getBoundingClientRect();
-    const availableRight = window.innerWidth - mainRect.right - VIEWPORT_MARGIN;
-    const width = Math.min(MODEL_MENU_MAX_WIDTH, Math.max(VIEWPORT_MARGIN, availableRight));
-    const left = mainRect.right + MENU_GAP;
-    control.modelMenu.style.setProperty("width", `${width}px`, "important");
-    control.modelMenu.style.left = `${left}px`;
-    control.modelMenu.style.maxWidth = `${width}px`;
-    const maxHeight = Math.max(
-      VIEWPORT_MARGIN,
-      Math.min(MODEL_MENU_MAX_HEIGHT, window.innerHeight * 0.6, mainRect.bottom - VIEWPORT_MARGIN)
-    );
-    control.modelMenu.style.maxHeight = `${maxHeight}px`;
+    control.menu.style.bottom = `${placement.bottom}px`;
+  }
+  function positionAdvancedMenus(control) {
+    positionMainMenu(control);
+    positionModelMenu(control);
+  }
+  function positionModelMenu(control, standalone = false) {
+    const anchorRect = standalone ? control.trigger.getBoundingClientRect() : control.menu.getBoundingClientRect();
+    const placement = standalone ? rendererModelPickerStandaloneModelMenuPlacement(anchorRect, {
+      width: window.innerWidth,
+      height: window.innerHeight
+    }) : rendererModelPickerModelMenuPlacement(anchorRect, {
+      width: window.innerWidth,
+      height: window.innerHeight
+    });
+    control.modelMenu.style.setProperty("width", `${placement.width}px`, "important");
+    control.modelMenu.style.left = `${placement.left}px`;
+    control.modelMenu.style.maxWidth = `${placement.width}px`;
+    control.modelMenu.style.maxHeight = `${placement.maxHeight}px`;
     control.modelMenu.style.right = "auto";
-    control.modelMenu.style.top = "auto";
-    control.modelMenu.style.bottom = `${Math.max(
-      VIEWPORT_MARGIN,
-      window.innerHeight - mainRect.bottom
-    )}px`;
+    control.modelMenu.style.top = placement.top === void 0 ? "auto" : `${placement.top}px`;
+    control.modelMenu.style.bottom = placement.bottom === void 0 ? "auto" : `${placement.bottom}px`;
   }
   function syncRendererModelTriggerClass(control, nativeClassName) {
     control.trigger.className = nativeClassName?.trim() || RENDERER_MODEL_TRIGGER_FALLBACK_CLASSES;
@@ -16012,7 +16089,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     modelMenu.style.margin = "0";
     modelMenu.style.padding = "4px";
     modelMenu.style.border = "0";
-    modelMenu.style.maxHeight = "min(360px, 60vh)";
+    modelMenu.style.maxHeight = `min(${RENDERER_MODEL_PICKER_MODEL_MENU_MAX_HEIGHT}px, 60vh)`;
     modelMenu.style.overflowY = "auto";
     modelButton.setAttribute("aria-controls", modelMenu.id);
     const options = /* @__PURE__ */ new Map();
@@ -16073,33 +16150,41 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         applyModelSearchFilter(control);
       }
     };
+    const pickerOpen = () => popoverOpen2(menu) || popoverOpen2(modelMenu);
     const close = () => {
       closeModelMenu();
       if (popoverOpen2(menu)) menu.hidePopover();
     };
-    const openModelMenu = () => {
-      if (!popoverOpen2(menu) || popoverOpen2(modelMenu)) return;
+    const openModelMenu = (standalone = false) => {
+      if (!standalone && !popoverOpen2(menu) || popoverOpen2(modelMenu)) return;
       modelMenu.showPopover();
-      positionModelMenu(control);
+      positionModelMenu(control, standalone);
       modelButton.setAttribute("aria-expanded", "true");
     };
     const open = () => {
-      if (trigger.disabled || popoverOpen2(menu)) return;
+      if (trigger.disabled || pickerOpen()) return;
+      if (control.thinkingOptions.size === 0) {
+        openModelMenu(true);
+        return;
+      }
       menu.showPopover();
-      positionMainMenu(control);
+      positionAdvancedMenus(control);
     };
     const onTriggerClick = () => {
-      if (popoverOpen2(menu)) close();
+      if (pickerOpen()) close();
       else open();
     };
     const onToggle = () => {
       const openState = popoverOpen2(menu);
-      trigger.setAttribute("aria-expanded", String(openState));
+      trigger.setAttribute("aria-expanded", String(openState || popoverOpen2(modelMenu)));
       trigger.setAttribute("data-state", openState ? "open" : "closed");
       if (!openState) closeModelMenu();
     };
     const onModelToggle = () => {
-      modelButton.setAttribute("aria-expanded", String(popoverOpen2(modelMenu)));
+      const openState = popoverOpen2(modelMenu);
+      modelButton.setAttribute("aria-expanded", String(openState));
+      trigger.setAttribute("aria-expanded", String(openState || popoverOpen2(menu)));
+      trigger.setAttribute("data-state", openState || popoverOpen2(menu) ? "open" : "closed");
     };
     const onRootClick = (event) => {
       const target = event.target instanceof Element ? event.target.closest("button") : null;
@@ -16138,21 +16223,21 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       trigger.focus();
     };
     const onViewportChange = () => {
-      if (popoverOpen2(menu)) positionMainMenu(control);
-      if (popoverOpen2(modelMenu)) positionModelMenu(control);
+      if (popoverOpen2(menu)) positionAdvancedMenus(control);
+      else if (popoverOpen2(modelMenu)) positionModelMenu(control, true);
     };
     trigger.addEventListener("click", onTriggerClick);
     menu.addEventListener("toggle", onToggle);
     modelMenu.addEventListener("toggle", onModelToggle);
     modelButton.addEventListener("mouseenter", onModelHover);
-    root.addEventListener("click", onRootClick);
+    menu.addEventListener("click", onRootClick);
     modelMenu.addEventListener("click", onModelMenuClick);
     document.addEventListener("pointerdown", onDocumentPointerDown, true);
     document.addEventListener("keydown", onDocumentKeyDown, true);
     window.addEventListener("resize", onViewportChange);
     window.addEventListener("scroll", onViewportChange, true);
-    root.append(trigger, menu);
-    document.body.append(modelMenu);
+    root.append(trigger);
+    document.body.append(menu, modelMenu);
     searchHeader.append(searchInput);
     modelMenu.append(searchHeader, searchEmpty);
     const control = {
@@ -16175,7 +16260,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         menu.removeEventListener("toggle", onToggle);
         modelMenu.removeEventListener("toggle", onModelToggle);
         modelButton.removeEventListener("mouseenter", onModelHover);
-        root.removeEventListener("click", onRootClick);
+        menu.removeEventListener("click", onRootClick);
         modelMenu.removeEventListener("click", onModelMenuClick);
         searchInput.removeEventListener("input", onSearchInput);
         for (const type of silencedEventTypes) {
@@ -16186,6 +16271,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         document.removeEventListener("keydown", onDocumentKeyDown, true);
         window.removeEventListener("resize", onViewportChange);
         window.removeEventListener("scroll", onViewportChange, true);
+        menu.remove();
         modelMenu.remove();
         root.remove();
       }
@@ -17138,7 +17224,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   var CONTROL_ATTRIBUTE2 = "data-codexhost-harness-command-control";
   var MENU_ATTRIBUTE = "data-codexhost-harness-command-menu";
   var MENU_WIDTH = 320;
-  var VIEWPORT_MARGIN2 = 8;
+  var VIEWPORT_MARGIN = 8;
   var MENU_GAP2 = 8;
   var SVG_NS = "http://www.w3.org/2000/svg";
   var COMMAND_ICON_PATHS = [
@@ -17254,7 +17340,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     menu.style.inset = "auto";
     menu.style.zIndex = "2147483647";
     menu.style.width = `${MENU_WIDTH}px`;
-    menu.style.maxWidth = `calc(100vw - ${VIEWPORT_MARGIN2 * 2}px)`;
+    menu.style.maxWidth = `calc(100vw - ${VIEWPORT_MARGIN * 2}px)`;
     menu.style.maxHeight = "min(360px, calc(100vh - 16px))";
     menu.style.overflowY = "auto";
     menu.style.padding = "4px";
@@ -17275,14 +17361,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const positionMenu2 = () => {
       const rect = trigger.getBoundingClientRect();
       const menuHeight = menu.getBoundingClientRect().height;
-      const opensAbove = rect.top >= menuHeight + MENU_GAP2 + VIEWPORT_MARGIN2;
+      const opensAbove = rect.top >= menuHeight + MENU_GAP2 + VIEWPORT_MARGIN;
       const left = clamp(
         rect.left,
-        VIEWPORT_MARGIN2,
-        window.innerWidth - MENU_WIDTH - VIEWPORT_MARGIN2
+        VIEWPORT_MARGIN,
+        window.innerWidth - MENU_WIDTH - VIEWPORT_MARGIN
       );
       menu.style.left = `${left}px`;
-      menu.style.top = opensAbove ? `${Math.max(VIEWPORT_MARGIN2, rect.top - menuHeight - MENU_GAP2)}px` : `${Math.min(window.innerHeight - menuHeight - VIEWPORT_MARGIN2, rect.bottom + MENU_GAP2)}px`;
+      menu.style.top = opensAbove ? `${Math.max(VIEWPORT_MARGIN, rect.top - menuHeight - MENU_GAP2)}px` : `${Math.min(window.innerHeight - menuHeight - VIEWPORT_MARGIN, rect.bottom + MENU_GAP2)}px`;
     };
     const focusActive = () => {
       const item = items[activeIndex];
@@ -17457,23 +17543,86 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     if (target instanceof Element) return target;
     return target instanceof Node ? target.parentElement : null;
   }
+  function controlDescription(element) {
+    const typed = element;
+    const read = (name) => typeof element.getAttribute === "function" ? element.getAttribute(name) : null;
+    return [typed.type, read("aria-label"), read("title"), read("data-testid")].filter((value) => typeof value === "string").join(" ").toLowerCase();
+  }
   function buttonText(button) {
-    return [
-      button.type,
-      button.getAttribute("aria-label"),
-      button.getAttribute("title"),
-      button.getAttribute("data-testid")
-    ].filter((value) => typeof value === "string").join(" ").toLowerCase();
+    return controlDescription(button);
+  }
+  function isOwnedRendererControl(element) {
+    return element.hasAttribute(CONTROL_ATTRIBUTE) || element.hasAttribute("data-codexhost-model-control") || element.hasAttribute("data-codexhost-permission-mode-control") || element.hasAttribute("data-codexhost-usage-control") || element.hasAttribute("data-codexhost-credits-control") || element.hasAttribute("data-codexhost-harness-command-control");
   }
   function isComposerSubmitButton(button) {
     if (button.type === "submit") return true;
     return /(^|\s)(send|submit|发送|提交)(\s|$)/u.test(buttonText(button));
   }
+  var VOICE_CONTROL_PATTERN = /(dictat|microphone|speech(?:[-_\s]?to[-_\s]?text)?|voice[-_\s]?input|(^|\s)voice(\s|$)|composer[-_](?:speech|dictat|mic)|语音|听写|麦克风|pause|暂停|stop recording|stop dictation|停止录音|停止听写|(^|\s)stop(\s|$))/iu;
+  var CANCEL_CONTROL_PATTERN = /(cancel|discard|close|dismiss|取消|关闭|丢弃)/iu;
+  var ATTACH_CONTROL_PATTERN = /(add files|attach files|attach file|attachment|composer[-_]attach|添加文件|附件)/iu;
+  var TRAILING_ACTION_WALK_DEPTH = 3;
+  function isComposerCancelButton(element) {
+    if (isOwnedRendererControl(element)) return false;
+    return CANCEL_CONTROL_PATTERN.test(controlDescription(element));
+  }
+  function isComposerVoiceButton(element) {
+    if (isOwnedRendererControl(element) || isComposerCancelButton(element)) return false;
+    const description = controlDescription(element);
+    if (/(^|\s)(send|submit|发送|提交)(\s|$)/u.test(description)) return false;
+    return VOICE_CONTROL_PATTERN.test(description);
+  }
+  function isComposerAttachButton(element) {
+    if (isOwnedRendererControl(element)) return false;
+    return ATTACH_CONTROL_PATTERN.test(controlDescription(element));
+  }
+  function isComposerTrailingActionButton(element) {
+    return isComposerVoiceButton(element) || isComposerSubmitButton(element);
+  }
+  function isTrailingActionNode(element) {
+    if (isComposerCancelButton(element)) return false;
+    if (isComposerTrailingActionButton(element)) return true;
+    if (typeof element.querySelectorAll !== "function") return false;
+    const buttons = [...element.querySelectorAll("button")];
+    return buttons.length > 0 && buttons.every((button) => isComposerTrailingActionButton(button));
+  }
+  function attachControlWithin(root) {
+    if (isComposerAttachButton(root)) return root;
+    if (typeof root.querySelectorAll !== "function") return null;
+    const matches = [
+      ...root.querySelectorAll("button, [aria-label], [title], [data-testid]")
+    ].filter(isComposerAttachButton);
+    return matches.length === 1 ? matches[0] ?? null : null;
+  }
   function sendButtonWithin(root) {
     return [...root.querySelectorAll("button")].find(
       (button) => isComposerSubmitButton(button)
     ) ?? null;
   }
+  function leftmostTrailingSibling(container, before) {
+    for (const child of container.children) {
+      if (child === before) break;
+      if (typeof child.hasAttribute !== "function") continue;
+      const element = child;
+      if (isOwnedRendererControl(element) || isComposerCancelButton(element)) continue;
+      if (isTrailingActionNode(element)) return element;
+    }
+    return null;
+  }
+  function trailingActionAnchor(sendButton) {
+    let container = sendButton.parentElement;
+    let before = sendButton;
+    for (let depth = 0; container && depth < TRAILING_ACTION_WALK_DEPTH; depth += 1) {
+      if (typeof container.matches === "function" && container.matches(CODEX_COMPOSER_SELECTOR)) {
+        break;
+      }
+      const candidate = leftmostTrailingSibling(container, before);
+      if (candidate) return candidate;
+      before = container;
+      container = container.parentElement;
+    }
+    return sendButton;
+  }
   function editorForElement(element) {
     return element.matches(EDITOR_SELECTOR) ? element : element.closest(EDITOR_SELECTOR);
   }
@@ -17619,7 +17768,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     for (const child of parent.children) {
       if (typeof child.hasAttribute !== "function") continue;
       const element = child;
-      if (element.hasAttribute("data-codexhost-credits-control") || element.hasAttribute("data-codexhost-harness-command-control")) {
+      if (element.hasAttribute("data-codexhost-credits-control") || element.hasAttribute("data-codexhost-harness-command-control") || isTrailingActionNode(element)) {
         continue;
       }
       return element;
@@ -17632,12 +17781,28 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       const parent = current.parentElement;
       if (!parent) break;
       const first = firstMaterialChild(parent);
-      if (first && first !== current && !first.contains(usageRoot)) return first;
+      if (first && first !== current && !first.contains(usageRoot)) {
+        return attachControlWithin(first) ?? first;
+      }
       if (parent === composer) break;
       current = parent;
     }
     return null;
   }
+  function refreshTrailingClusterPlacement(control) {
+    const sendButton = control.sendButton;
+    const modelRoot = control.modelPicker?.root;
+    const agentRoot = control.root ?? control.picker?.root;
+    if (!sendButton || !modelRoot || !agentRoot) return;
+    const anchor = trailingActionAnchor(sendButton);
+    const parent = anchor.parentElement;
+    if (!parent || typeof parent.insertBefore !== "function") return;
+    if (modelRoot.parentElement === parent && agentRoot.parentElement === parent && modelRoot.nextElementSibling === agentRoot && agentRoot.nextElementSibling === anchor) {
+      return;
+    }
+    parent.insertBefore(modelRoot, anchor);
+    parent.insertBefore(agentRoot, anchor);
+  }
   function refreshUsagePlacement(control) {
     const anchor = usagePlacementAnchor(control);
     if (!anchor) {
@@ -17690,6 +17855,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   }
   function reconcileComposerNativeControls(control, hideModel, hidePermissionMode) {
     refreshNativeModelControl(control);
+    refreshTrailingClusterPlacement(control);
     refreshUsagePlacement(control);
     refreshNativePermissionModeControl(control);
     setNativeControlHidden(control.nativeModelControl, hideModel);
@@ -17717,7 +17883,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const toolbar = sendButton.parentElement;
     const harnessCommands = mountRendererHarnessCommandControl(
       toolbar ?? composer,
-      sendButton,
+      trailingActionAnchor(sendButton),
       onSelectCommand
     );
     const permissionParent = nativePermissionModeControl?.element.parentElement;
@@ -17726,12 +17892,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     } else {
       composer.append(permissionModePicker.root);
     }
-    if (toolbar) {
-      toolbar.insertBefore(modelPicker.root, sendButton);
-      toolbar.insertBefore(picker.root, sendButton);
-    } else {
-      composer.append(modelPicker.root, picker.root);
-    }
+    if (!toolbar) composer.append(modelPicker.root, picker.root);
     const control = {
       composer,
       root: picker.root,
@@ -17747,6 +17908,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       sendButton,
       sendDisabledBeforeSwitch: null
     };
+    refreshTrailingClusterPlacement(control);
     refreshUsagePlacement(control);
     return control;
   }
@@ -18467,28 +18629,38 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     }
     return `${CLAUDE_CODE_TRANSPORT_MODEL_PREFIX}${parsedModel.id}${parsedPermissionMode ? `@${parsedPermissionMode}` : ""}`;
   }
-  function grokTransportModelId(model, thinkingOptionId) {
+  function grokTransportModelId(model, permissionModeId, thinkingOptionId) {
     if (!model) {
-      if (thinkingOptionId) throw new Error("Grok transport Thinking requires a Model Ref");
+      if (permissionModeId || thinkingOptionId) {
+        throw new Error("Grok transport configuration requires a Model Ref");
+      }
       return GROK_TRANSPORT_MODEL_ID;
     }
     const parsedModel = harnessModelRefSchema.parse(model);
+    const parsedPermissionMode = permissionModeId ? harnessPermissionModeIdSchema.parse(permissionModeId) : void 0;
     const parsedThinking = thinkingOptionId ? harnessThinkingOptionIdSchema.parse(thinkingOptionId) : void 0;
-    return `${GROK_TRANSPORT_MODEL_PREFIX}${parsedModel.id}${parsedThinking ? `@@${parsedThinking}` : ""}`;
+    if (parsedThinking) {
+      return `${GROK_TRANSPORT_MODEL_PREFIX}${parsedModel.id}@${parsedPermissionMode ?? ""}@${parsedThinking}`;
+    }
+    return `${GROK_TRANSPORT_MODEL_PREFIX}${parsedModel.id}${parsedPermissionMode ? `@${parsedPermissionMode}` : ""}`;
   }
   function decodeGrokTransportModelId(value) {
     if (value === GROK_TRANSPORT_MODEL_ID) return {};
     if (typeof value !== "string" || !value.startsWith(GROK_TRANSPORT_MODEL_PREFIX)) return null;
     const components = value.slice(GROK_TRANSPORT_MODEL_PREFIX.length).split("@");
-    if (components.length !== 1 && components.length !== 3) return null;
-    const [modelId, emptyPermissionMode, thinkingOptionId] = components;
-    if (components.length === 3 && (emptyPermissionMode !== "" || !thinkingOptionId)) return null;
+    if (components.length < 1 || components.length > 3) return null;
+    const [modelId, permissionModeId, thinkingOptionId] = components;
+    if (components.length === 2 && !permissionModeId) return null;
+    if (components.length === 3 && !thinkingOptionId) return null;
     const model = harnessModelRefSchema.safeParse({ id: modelId });
     if (!model.success) return null;
+    const permissionMode = permissionModeId ? harnessPermissionModeIdSchema.safeParse(permissionModeId) : null;
+    if (permissionMode && !permissionMode.success) return null;
     const thinking = thinkingOptionId ? harnessThinkingOptionIdSchema.safeParse(thinkingOptionId) : null;
     if (thinking && !thinking.success) return null;
     return {
       model: model.data,
+      ...permissionMode?.success ? { permissionModeId: permissionMode.data } : {},
       ...thinking?.success ? { thinkingOptionId: thinking.data } : {}
     };
   }
@@ -18560,7 +18732,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   }
   function matchesCurrentPrewarmSignature(target) {
     const bridge = target.requestClient ?? target;
-    const stableApiShape = bridge.hostId === "local" && typeof bridge.sendRequest === "function" && typeof bridge.prewarmThreadStart === "function" && typeof bridge.enqueueRequest === "function";
+    const stableApiShape = typeof bridge.hostId === "string" && bridge.hostId.length > 0 && typeof bridge.sendRequest === "function" && typeof bridge.prewarmThreadStart === "function" && typeof bridge.enqueueRequest === "function";
     if (stableApiShape) return true;
     const prewarm = target.prewarmThreadStart ?? target.requestClient?.prewarmThreadStart;
     if (!prewarm) return false;
@@ -18651,10 +18823,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       return false;
     }
   }
-  function findComposerModelTarget(composer) {
-    const conversationThreadId = findComposerConversationThreadId(composer);
-    if (conversationThreadId === null) return null;
-    if (conversationThreadId !== void 0) return ["conversation", conversationThreadId];
+  function findComposerDomIdentity(composer) {
+    const children = Array.from(composer.children ?? []);
+    const portals = children.filter((child) => child.hasAttribute("data-above-composer-portal"));
+    if (portals.length === 0) return { kind: "unsupported" };
+    if (portals.length !== 1) return { kind: "ambiguous" };
+    const value = portals[0]?.getAttribute("data-above-composer-conversation-id");
+    if (value === null) return { kind: "draft" };
+    const candidate = hostThreadIdSchema.safeParse(value);
+    return candidate.success ? { kind: "conversation", threadId: candidate.data } : { kind: "ambiguous" };
+  }
+  function findComposerDraftIds(composer) {
     const draftIds = /* @__PURE__ */ new Set();
     let fiber = findComposerFiber(composer);
     for (let depth = 0; fiber && depth < 120; depth += 1) {
@@ -18669,6 +18848,21 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       const parent = fiber.return;
       fiber = (typeof parent === "object" || typeof parent === "function") && parent !== null ? parent : null;
     }
+    return draftIds;
+  }
+  function findComposerModelTarget(composer) {
+    const draftIds = findComposerDraftIds(composer);
+    const domIdentity = findComposerDomIdentity(composer);
+    if (domIdentity.kind === "ambiguous") return null;
+    if (domIdentity.kind === "conversation") {
+      return ["conversation", domIdentity.threadId];
+    }
+    if (domIdentity.kind === "draft") {
+      return draftIds.size === 1 ? ["default", draftIds.values().next().value] : null;
+    }
+    const conversationThreadId = findComposerConversationThreadId(composer);
+    if (conversationThreadId === null) return null;
+    if (conversationThreadId !== void 0) return ["conversation", conversationThreadId];
     if (draftIds.size !== 1) return null;
     return ["default", draftIds.values().next().value];
   }
@@ -18676,7 +18870,34 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return isRecord5(value) && value.state === "ready";
   }
   function isDraftPrewarmPolicyReady(value) {
-    return isRecord5(value) && value.state === "ready" && typeof value.select === "function" && typeof value.clear === "function";
+    return isRecord5(value) && value.state === "ready" && typeof value.hostId === "string" && value.hostId.length > 0 && typeof value.select === "function" && typeof value.clear === "function";
+  }
+  function activeRendererDraftPrewarmTargets(policy, targets) {
+    if (!isDraftPrewarmPolicyReady(policy)) return null;
+    const activeTargets = targets.filter((target) => {
+      const bridge = target.requestClient ?? target;
+      return (target.getHostId?.() ?? bridge.hostId) === policy.hostId;
+    });
+    return activeTargets.length === 1 ? activeTargets : null;
+  }
+  function resolveRendererRequestRoute(policy, discoveredTargets, previous) {
+    const activeTargets = activeRendererDraftPrewarmTargets(policy, discoveredTargets);
+    if (isDraftPrewarmPolicyReady(policy) && activeTargets) {
+      return { policy, targets: activeTargets };
+    }
+    return discoveredTargets.length === 0 && isDraftPrewarmPolicyReady(policy) && previous?.policy === policy ? previous : null;
+  }
+  function createRendererRequestRouteResolver(readPolicy, discoverTargets) {
+    let route = null;
+    return {
+      resolve() {
+        route = resolveRendererRequestRoute(readPolicy(), discoverTargets(), route);
+        return route;
+      },
+      clear() {
+        route = null;
+      }
+    };
   }
   async function waitForRendererDraftPrewarmPolicy(target) {
     const deadline = Date.now() + DRAFT_PREWARM_POLICY_WAIT_TIMEOUT_MS;
@@ -18691,7 +18912,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     }
   }
   function modelSelectionForAgent(officialSelection, reasoningEffort, agent, model, thinkingOptionId, permissionModeId) {
-    const transportModelId = agent === "pi" ? piTransportModelId(model, thinkingOptionId) : agent === "claude-code" ? claudeTransportModelId(model, permissionModeId, thinkingOptionId) : agent === "deepseek-harness" ? deepSeekHarnessTransportModelId(model) : agent === "grok" ? grokTransportModelId(model, thinkingOptionId) : transportModelIdForAgent(agent);
+    const transportModelId = agent === "pi" ? piTransportModelId(model, thinkingOptionId) : agent === "claude-code" ? claudeTransportModelId(model, permissionModeId, thinkingOptionId) : agent === "deepseek-harness" ? deepSeekHarnessTransportModelId(model) : agent === "grok" ? grokTransportModelId(model, permissionModeId, thinkingOptionId) : transportModelIdForAgent(agent);
     return transportModelId ? { model: transportModelId, reasoningEffort } : officialSelection;
   }
   function installCurrentRendererAdapter() {
@@ -18717,8 +18938,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       }
     });
     const usageSubscription = createThreadUsageSubscriptionRelay();
+    const requestRouteResolver = createRendererRequestRouteResolver(
+      () => window.__codexhostDraftPrewarmPolicyV1,
+      () => findActivePrewarmTargets(document)
+    );
+    const currentRequestRoute = () => requestRouteResolver.resolve();
     const currentModelClient = () => {
-      const client = createRendererModelClient(findActivePrewarmTargets(document));
+      const client = createRendererModelClient(currentRequestRoute()?.targets ?? []);
       if (!client) throw new Error("Renderer Model request manager is unavailable");
       usageSubscription.connect(client);
       return client;
@@ -18754,10 +18980,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     });
     let routingPolicy = null;
     let policyTimer = null;
+    let desiredCarrier = null;
     const captureRoutingPolicy = () => {
-      const discovered = window.__codexhostDraftPrewarmPolicyV1;
-      if (!isDraftPrewarmPolicyReady(discovered)) return false;
-      routingPolicy = discovered;
+      const route = currentRequestRoute();
+      if (!route) return false;
+      routingPolicy = route.policy;
+      routingPolicy.select(desiredCarrier);
       if (policyTimer !== null) {
         window.clearInterval(policyTimer);
         policyTimer = null;
@@ -18769,8 +18997,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       updateStatus("installing", "draft-routing-policy-unavailable", null);
       policyTimer = window.setInterval(captureRoutingPolicy, DRAFT_PREWARM_POLICY_POLL_INTERVAL_MS);
     }
+    const handleRoutingPolicyChange = () => {
+      captureRoutingPolicy();
+    };
+    window.addEventListener("codexhost:draft-prewarm-policy-changed", handleRoutingPolicyChange);
     const applyAgent = (agent, model, thinkingOptionId, permissionModeId) => {
-      if (disposed || routingPolicy === null) return false;
+      if (disposed) return false;
       const selection = modelSelectionForAgent(
         null,
         null,
@@ -18781,7 +19013,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       );
       const carrier = selection?.model;
       if (carrier !== null && carrier !== void 0 && typeof carrier !== "string") return false;
-      if (routingPolicy.select(carrier ?? null)) {
+      desiredCarrier = carrier ?? null;
+      const route = currentRequestRoute();
+      if (!route) return false;
+      routingPolicy = route.policy;
+      if (route.policy.select(desiredCarrier)) {
         modelUpdates += 1;
         liveStatus.modelUpdates = modelUpdates;
       }
@@ -18795,8 +19031,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         if (disposed) return;
         disposed = true;
         if (policyTimer !== null) window.clearInterval(policyTimer);
+        window.removeEventListener(
+          "codexhost:draft-prewarm-policy-changed",
+          handleRoutingPolicyChange
+        );
         routingPolicy?.select(null);
         routingPolicy = null;
+        requestRouteResolver.clear();
         forkControl.dispose();
         usageSubscription.dispose();
       }
@@ -18848,9 +19089,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const model = harnessModelRefSchema.safeParse(value.model);
     if (!model.success) return void 0;
     const thinkingOptionId = harnessThinkingOptionIdSchema.safeParse(value.thinkingOptionId);
+    const permissionModeId = harnessPermissionModeIdSchema.safeParse(value.permissionModeId);
     return {
       model: model.data,
-      ...thinkingOptionId.success ? { thinkingOptionId: thinkingOptionId.data } : {}
+      ...thinkingOptionId.success ? { thinkingOptionId: thinkingOptionId.data } : {},
+      ...permissionModeId.success ? { permissionModeId: permissionModeId.data } : {}
     };
   }
   function readPreference(storage) {
@@ -18890,15 +19133,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const agent = readPreference(storage)?.lastAgent;
     return agent && enabledAgents.has(agent) ? agent : void 0;
   }
-  function readNewThreadExternalConfigurationPreference(agent, catalog, storage = rendererStorage2()) {
+  function readNewThreadExternalConfigurationPreference(agent, catalog, permissionModes, storage = rendererStorage2()) {
     const preference = readPreference(storage)?.externalByAgent[agent];
     if (!preference) return void 0;
     const catalogModel = catalog.models.find(({ ref }) => ref.id === preference.model.id);
     if (!catalogModel) return void 0;
     const thinkingOptionId = preference.thinkingOptionId && catalogModel.supportedThinkingOptionIds?.includes(preference.thinkingOptionId) ? preference.thinkingOptionId : void 0;
+    const permissionModeId = preference.permissionModeId && permissionModes?.modes.some(({ id }) => id === preference.permissionModeId) ? preference.permissionModeId : void 0;
     return {
       model: catalogModel.ref,
-      ...thinkingOptionId ? { thinkingOptionId } : {}
+      ...thinkingOptionId ? { thinkingOptionId } : {},
+      ...permissionModeId ? { permissionModeId } : {}
     };
   }
   function writeNewThreadAgentPreference(agent, storage = rendererStorage2()) {
@@ -18912,7 +19157,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       storage
     );
   }
-  function writeNewThreadExternalConfigurationPreference(agent, model, thinkingOptionId, storage = rendererStorage2()) {
+  function writeNewThreadExternalConfigurationPreference(agent, model, thinkingOptionId, permissionModeId, storage = rendererStorage2()) {
     const current = readPreference(storage);
     writePreference(
       {
@@ -18922,7 +19167,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
           ...current?.externalByAgent,
           [agent]: {
             model: harnessModelRefSchema.parse(model),
-            ...thinkingOptionId ? { thinkingOptionId: harnessThinkingOptionIdSchema.parse(thinkingOptionId) } : {}
+            ...thinkingOptionId ? { thinkingOptionId: harnessThinkingOptionIdSchema.parse(thinkingOptionId) } : {},
+            ...permissionModeId ? { permissionModeId: harnessPermissionModeIdSchema.parse(permissionModeId) } : {}
           }
         }
       },
@@ -21034,6 +21280,9 @@ ${error51.stderrTail}`] : []
   function draftPermissionMode(catalog, requested) {
     return catalog.modes.find(({ id }) => id === requested)?.id ?? catalog.modes.find(({ id }) => id === catalog.defaultModeId)?.id ?? catalog.defaultModeId;
   }
+  function shouldPersistNewThreadConfigurationSelection(phase) {
+    return phase === "draft";
+  }
   function restoredThreadOwnership(inspection) {
     if (inspection.owner === "codex") return { agent: "codex" };
     if (inspection.harnessId === "pi") {
@@ -21057,10 +21306,12 @@ ${error51.stderrTail}`] : []
       }
       const model = inspection.effectiveModel ?? transportSelection.model;
       const thinkingOptionId = selectableThinkingOptionId(inspection) ?? transportSelection.thinkingOptionId;
+      const permissionModeId = inspection.effectivePermissionModeId ?? transportSelection.permissionModeId;
       return {
         agent: "grok",
         ...model ? { model } : {},
-        ...thinkingOptionId ? { thinkingOptionId } : {}
+        ...thinkingOptionId ? { thinkingOptionId } : {},
+        ...permissionModeId ? { permissionModeId } : {}
       };
     }
     if (inspection.harnessId === "claude-code") {
@@ -21091,10 +21342,10 @@ ${error51.stderrTail}`] : []
   function isOwnershipSubmissionBlocked(status) {
     return status === "loading" || status === "error";
   }
-  function shouldTransferComposerState(sourceTarget, replacementTarget, sourcePhase) {
+  function shouldTransferComposerState(sourceTarget, replacementTarget, sourcePhase, submissionPending = false) {
     if (!sourceTarget || !replacementTarget) return false;
     if (sourceTarget === replacementTarget) return true;
-    return sourcePhase === "locked" && sourceTarget[0] === "default" && replacementTarget[0] === "conversation";
+    return (sourcePhase === "locked" || submissionPending) && sourceTarget[0] === "default" && replacementTarget[0] === "conversation";
   }
   function isLateConversationTarget(mountedTarget, currentTarget) {
     if (currentTarget?.[0] !== "conversation") return false;
@@ -21103,13 +21354,16 @@ ${error51.stderrTail}`] : []
     if (mountedTarget?.[0] !== "conversation") return false;
     return mountedTarget.length !== currentTarget.length || mountedTarget.some((value, index) => value !== currentTarget[index]);
   }
-  function lateConversationTargetResolution(mountedTarget, currentTarget, sourcePhase) {
+  function lateConversationTargetResolution(mountedTarget, currentTarget, sourcePhase, submissionPending = false) {
     if (!isLateConversationTarget(mountedTarget, currentTarget)) return "none";
-    return mountedTarget?.[0] === "default" && sourcePhase === "locked" ? "transfer" : "inspect";
+    return mountedTarget?.[0] === "default" && (sourcePhase === "locked" || submissionPending) ? "transfer" : "inspect";
   }
   function isComposerModelWriteAllowed(target) {
     return target?.[0] === "default";
   }
+  function shouldApplyDraftAgentCarrier(agent, model) {
+    return agent === "codex" || model !== void 0;
+  }
   function applyComposerModelWrite(target, write) {
     if (target?.[0] === "conversation") return true;
     if (!isComposerModelWriteAllowed(target)) return false;
@@ -21217,7 +21471,8 @@ ${error51.stderrTail}`] : []
           writeNewThreadExternalConfigurationPreference(
             state.agent,
             model,
-            controller.thinkingOptionForAgent(composer, state.agent)
+            controller.thinkingOptionForAgent(composer, state.agent),
+            controller.permissionModeForAgent(composer, state.agent)
           );
         }
       }
@@ -21426,7 +21681,8 @@ ${error51.stderrTail}`] : []
       const resolution = lateConversationTargetResolution(
         mounted.modelTarget,
         currentTarget,
-        controller.get(mounted.composer).phase
+        controller.get(mounted.composer).phase,
+        controller.isSubmissionPending(mounted.composer)
       );
       if (resolution === "none") return false;
       const previousTarget = mounted.modelTarget;
@@ -21493,6 +21749,16 @@ ${error51.stderrTail}`] : []
         }
         if (inspection.status !== "ready") throw new Error(inspection.error.message);
         const current = controller.get(mounted.composer);
+        const previousModel = controller.modelForAgent(mounted.composer, agent);
+        const previousModelAvailable = previousModel !== void 0 && inspection.catalog.models.some((model) => model.ref.id === previousModel.id);
+        if (current.phase === "locked" && previousModel && !previousModelAvailable) {
+          throw new Error("Existing Thread Model is absent from the current Catalog");
+        }
+        const preferredConfiguration = current.phase === "draft" && !previousModelAvailable ? readNewThreadExternalConfigurationPreference(
+          agent,
+          inspection.catalog,
+          inspection.permissionModes
+        ) : void 0;
         const previousPermissionModeId = controller.permissionModeForAgent(mounted.composer, agent);
         let selectedPermissionModeId;
         if (inspection.capabilities.configuration.selectPermissionMode) {
@@ -21502,7 +21768,7 @@ ${error51.stderrTail}`] : []
           }
           mounted.permissionModeView = { status: "loading", catalog: permissionModes };
           const effectivePermissionModeId = current.phase === "locked" ? mounted.threadConfiguration?.effectivePermissionModeId : void 0;
-          const preferredPermissionModeId = agent === "claude-code" ? readClaudePermissionModePreference(permissionModes) : void 0;
+          const preferredPermissionModeId = preferredConfiguration?.permissionModeId ?? (agent === "claude-code" ? readClaudePermissionModePreference(permissionModes) : void 0);
           selectedPermissionModeId = draftPermissionMode(
             permissionModes,
             effectivePermissionModeId ?? previousPermissionModeId ?? preferredPermissionModeId
@@ -21531,12 +21797,6 @@ ${error51.stderrTail}`] : []
           }
           return;
         }
-        const previousModel = controller.modelForAgent(mounted.composer, agent);
-        const previousModelAvailable = previousModel !== void 0 && inspection.catalog.models.some((model) => model.ref.id === previousModel.id);
-        if (current.phase === "locked" && previousModel && !previousModelAvailable) {
-          throw new Error("Existing Thread Model is absent from the current Catalog");
-        }
-        const preferredConfiguration = current.phase === "draft" && !previousModelAvailable ? readNewThreadExternalConfigurationPreference(agent, inspection.catalog) : void 0;
         const selected = previousModelAvailable ? previousModel : preferredConfiguration?.model ?? inspection.catalog.defaultModel;
         if (!selected) throw new Error("External Harness did not report its default Model");
         const effectiveCatalog = current.phase === "locked" && mounted.threadConfiguration ? catalogWithConfigurationState(inspection.catalog, selected, mounted.threadConfiguration) : inspection.catalog;
@@ -21616,6 +21876,7 @@ ${error51.stderrTail}`] : []
       }
     };
     const selectExternalModel = async (mounted, modelId) => {
+      controller.clearPendingSubmission(mounted.composer);
       const current = controller.get(mounted.composer);
       if (current.agent === "codex") return;
       const agent = current.agent;
@@ -21687,13 +21948,13 @@ ${error51.stderrTail}`] : []
           effectiveThinkingOptionId = supportsThinkingSelection ? selectableThinkingOptionId(state) : void 0;
           effectiveCatalog = supportsThinkingSelection ? catalogWithConfigurationState(catalog, effectiveModel, state) : catalog;
           resolvedModelLabel = state.resolvedModelLabel;
-          const effectivePermissionModeId = state.effectivePermissionModeId ?? previousPermissionModeId;
+          const effectivePermissionModeId2 = state.effectivePermissionModeId ?? previousPermissionModeId;
           if (!applyExternalConfiguration(
             mounted,
             agent,
             effectiveModel,
             effectiveThinkingOptionId,
-            effectivePermissionModeId
+            effectivePermissionModeId2
           )) {
             throw new Error("Confirmed external Model could not be applied to the Composer");
           }
@@ -21702,11 +21963,18 @@ ${error51.stderrTail}`] : []
         if (!isCurrentModelRequest(mounted, generation)) return;
         controller.setExternalModel(mounted.composer, agent, effectiveModel);
         controller.setExternalThinkingOption(mounted.composer, agent, effectiveThinkingOptionId);
-        writeNewThreadExternalConfigurationPreference(
-          agent,
-          effectiveModel,
-          effectiveThinkingOptionId
-        );
+        const effectivePermissionModeId = mounted.threadConfiguration?.effectivePermissionModeId ?? previousPermissionModeId;
+        if (effectivePermissionModeId) {
+          controller.setExternalPermissionMode(mounted.composer, agent, effectivePermissionModeId);
+        }
+        if (shouldPersistNewThreadConfigurationSelection(current.phase)) {
+          writeNewThreadExternalConfigurationPreference(
+            agent,
+            effectiveModel,
+            effectiveThinkingOptionId,
+            effectivePermissionModeId
+          );
+        }
         mounted.modelView = {
           status: "ready",
           catalog: effectiveCatalog,
@@ -21739,6 +22007,7 @@ ${error51.stderrTail}`] : []
       }
     };
     const selectPermissionMode = async (mounted, permissionModeId) => {
+      controller.clearPendingSubmission(mounted.composer);
       const current = controller.get(mounted.composer);
       if (current.agent === "codex") return;
       const agent = current.agent;
@@ -21747,9 +22016,6 @@ ${error51.stderrTail}`] : []
       const model = controller.modelForAgent(mounted.composer, agent);
       if (!catalog || !selectedPermissionModeId || !model || !modelControl) return;
       const previousPermissionModeId = controller.permissionModeForAgent(mounted.composer, agent);
-      if (agent === "claude-code") {
-        writeClaudePermissionModePreference(selectedPermissionModeId);
-      }
       const thinkingOptionId = controller.thinkingOptionForAgent(mounted.composer, agent);
       const generation = controller.beginModelRequest(mounted.composer);
       mounted.permissionModeView = {
@@ -21814,6 +22080,17 @@ ${error51.stderrTail}`] : []
         }
         if (!isCurrentModelRequest(mounted, generation)) return;
         controller.setExternalPermissionMode(mounted.composer, agent, effectivePermissionModeId);
+        if (shouldPersistNewThreadConfigurationSelection(current.phase)) {
+          writeNewThreadExternalConfigurationPreference(
+            agent,
+            model,
+            thinkingOptionId,
+            effectivePermissionModeId
+          );
+          if (agent === "claude-code") {
+            writeClaudePermissionModePreference(effectivePermissionModeId);
+          }
+        }
         mounted.permissionModeView = {
           status: "ready",
           catalog,
@@ -21841,6 +22118,7 @@ ${error51.stderrTail}`] : []
       }
     };
     const selectExternalThinking = async (mounted, thinkingOptionId) => {
+      controller.clearPendingSubmission(mounted.composer);
       const current = controller.get(mounted.composer);
       if (current.agent === "codex") return;
       const agent = current.agent;
@@ -21919,7 +22197,18 @@ ${error51.stderrTail}`] : []
         }
         if (!isCurrentModelRequest(mounted, generation)) return;
         controller.setExternalThinkingOption(mounted.composer, agent, effectiveThinkingOptionId);
-        writeNewThreadExternalConfigurationPreference(agent, model, effectiveThinkingOptionId);
+        const effectivePermissionModeId = mounted.threadConfiguration?.effectivePermissionModeId ?? permissionModeId;
+        if (effectivePermissionModeId) {
+          controller.setExternalPermissionMode(mounted.composer, agent, effectivePermissionModeId);
+        }
+        if (shouldPersistNewThreadConfigurationSelection(current.phase)) {
+          writeNewThreadExternalConfigurationPreference(
+            agent,
+            model,
+            effectiveThinkingOptionId,
+            effectivePermissionModeId
+          );
+        }
         mounted.modelView = {
           status: "ready",
           catalog: effectiveCatalog,
@@ -21944,13 +22233,16 @@ ${error51.stderrTail}`] : []
     };
     const switchComposerAgent = async (mounted, agent) => {
       if (agent !== "codex" && harnessAvailability[agent] !== "ready") return false;
+      controller.clearPendingSubmission(mounted.composer);
       const composerId = controller.get(mounted.composer).composerId;
       controller.invalidateModelRequests(mounted.composer);
       const switching = controller.switchAgent(mounted.composer, agent, {
         applyAgent(nextAgent) {
+          const model = controller.modelForAgent(mounted.composer, nextAgent);
+          if (!shouldApplyDraftAgentCarrier(nextAgent, model)) return true;
           return applyAdapterAgent?.(
             nextAgent,
-            controller.modelForAgent(mounted.composer, nextAgent),
+            model,
             nextAgent !== "codex" ? controller.thinkingOptionForAgent(mounted.composer, nextAgent) : void 0,
             nextAgent !== "codex" ? controller.permissionModeForAgent(mounted.composer, nextAgent) : void 0,
             mounted.composer
@@ -22169,13 +22461,16 @@ ${error51.stderrTail}`] : []
       };
       mountedByComposer.set(composer, mounted);
       if (isComposerModelWriteAllowed(modelTarget)) {
-        applyAdapterAgent?.(
-          state.agent,
-          controller.modelForAgent(composer, state.agent),
-          state.agent !== "codex" ? controller.thinkingOptionForAgent(composer, state.agent) : void 0,
-          state.agent !== "codex" ? controller.permissionModeForAgent(composer, state.agent) : void 0,
-          composer
-        );
+        const model = controller.modelForAgent(composer, state.agent);
+        if (shouldApplyDraftAgentCarrier(state.agent, model)) {
+          applyAdapterAgent?.(
+            state.agent,
+            model,
+            state.agent !== "codex" ? controller.thinkingOptionForAgent(composer, state.agent) : void 0,
+            state.agent !== "codex" ? controller.permissionModeForAgent(composer, state.agent) : void 0,
+            composer
+          );
+        }
       }
       renderMounted(mounted);
       sidebarAgentIcons.refresh();
@@ -22200,7 +22495,8 @@ ${error51.stderrTail}`] : []
         if (!shouldTransferComposerState(
           replacement.sourceModelTarget,
           replacementTarget,
-          sourceState.phase
+          sourceState.phase,
+          controller.isSubmissionPending(replacement.source.composer)
         ) || !controller.transfer(replacement.source.composer, target, replacementTarget)) {
           pendingReplacements.delete(target);
         }
@@ -22282,11 +22578,13 @@ ${error51.stderrTail}`] : []
         return state.phase === "locked" && mounted.ownershipStatus === "ready";
       }
       if (!mounted || !isComposerModelWriteAllowed(mounted.modelTarget)) return false;
+      const model = controller.modelForAgent(composer, state.agent);
+      if (!shouldApplyDraftAgentCarrier(state.agent, model)) return false;
       return applyComposerModelWrite(
         mounted.modelTarget,
         () => applyAdapterAgent?.(
           state.agent,
-          controller.modelForAgent(composer, state.agent),
+          model,
           state.agent !== "codex" ? controller.thinkingOptionForAgent(composer, state.agent) : void 0,
           state.agent !== "codex" ? controller.permissionModeForAgent(composer, state.agent) : void 0,
           composer
@@ -22308,7 +22606,7 @@ ${error51.stderrTail}`] : []
       if (!isExternalConfigurationReady(mounted)) return false;
       if (current.phase === "locked") return true;
       if (!applyComposerAgent(composer)) return false;
-      controller.lock(composer);
+      controller.markSubmissionPending(composer);
       renderMounted(mounted);
       return true;
     };
@@ -22321,6 +22619,7 @@ ${error51.stderrTail}`] : []
     const onBeforeInput = (event) => {
       const composer = composerForTarget(event.target);
       if (!composer) return;
+      controller.clearPendingSubmission(composer);
       const mounted = mountedByComposer.get(composer);
       if (mounted && isOwnershipSubmissionBlocked(mounted.ownershipStatus)) return;
       if (controller.isSwitching(composer) || !applyComposerAgent(composer)) blockEvent(event);