@spotpatch/runtime 1.15.2 → 1.15.4

package/dist/external-handoff-panel.cjs

@@ -488,6 +488,9 @@ function parseStatusResult(value) {
     dispatch
   });
 }
+function isExternalHandoffFramework(value) {
+  return import_external_handoff_browser2.EXTERNAL_HANDOFF_FRAMEWORKS.some((framework) => framework === value);
+}
 function parseSummary(value) {
   if (!record(value)) throw new ExternalHandoffApiError();
   const expectedKeys = [
@@ -503,7 +506,7 @@ function parseSummary(value) {
     "targetCount",
     ...value.pickedUpAt === void 0 ? [] : ["pickedUpAt"]
   ];
-  if (!exactKeys(value, expectedKeys) || typeof value.sessionId !== "string" || !OPAQUE_ID_PATTERN.test(value.sessionId) || value.framework !== "vite" && value.framework !== "next" || !Number.isSafeInteger(value.revision) || value.revision <= 0 || typeof value.cursor !== "string" || !OPAQUE_ID_PATTERN.test(value.cursor) || !Number.isSafeInteger(value.targetCount) || value.targetCount <= 0 || !record(value.page) || !exactKeys(value.page, ["origin", "pathname"]) || typeof value.page.origin !== "string" || typeof value.page.pathname !== "string" || !validTimestamp(value.publishedAt) || !validTimestamp(value.expiresAt) || value.state !== "available" && value.state !== "expired" && value.state !== "superseded" || !Number.isSafeInteger(value.pickupCount) || value.pickupCount < 0 || value.pickupCount > import_external_handoff_browser2.EXTERNAL_HANDOFF_LIMITS.maximumConnectorReceipts || value.pickedUpAt !== void 0 && !validTimestamp(value.pickedUpAt)) {
+  if (!exactKeys(value, expectedKeys) || typeof value.sessionId !== "string" || !OPAQUE_ID_PATTERN.test(value.sessionId) || !isExternalHandoffFramework(value.framework) || !Number.isSafeInteger(value.revision) || value.revision <= 0 || typeof value.cursor !== "string" || !OPAQUE_ID_PATTERN.test(value.cursor) || !Number.isSafeInteger(value.targetCount) || value.targetCount <= 0 || !record(value.page) || !exactKeys(value.page, ["origin", "pathname"]) || typeof value.page.origin !== "string" || typeof value.page.pathname !== "string" || !validTimestamp(value.publishedAt) || !validTimestamp(value.expiresAt) || value.state !== "available" && value.state !== "expired" && value.state !== "superseded" || !Number.isSafeInteger(value.pickupCount) || value.pickupCount < 0 || value.pickupCount > import_external_handoff_browser2.EXTERNAL_HANDOFF_LIMITS.maximumConnectorReceipts || value.pickedUpAt !== void 0 && !validTimestamp(value.pickedUpAt)) {
     throw new ExternalHandoffApiError();
   }
   return Object.freeze({
@@ -1030,6 +1033,179 @@ function createButton(document, label, className = "") {
   return button;
 }
 
+// src/ui/ask-picker.ts
+var SELECT_PICKER_STYLES = `
+  .spotpatch-select-picker { position: relative; display: grid; gap: 5px; min-width: 0; }
+  .spotpatch-select-trigger { box-sizing: border-box; display: flex; width: 100%; min-height: 38px; align-items: center; justify-content: space-between; gap: 10px; border: 1px solid var(--spotpatch-border); border-radius: 9px; padding: 0 11px; overflow: hidden; color: var(--spotpatch-text); background: var(--spotpatch-bg-input); cursor: pointer; font: inherit; outline: none; text-align: left; }
+  .spotpatch-select-trigger > span { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+  .spotpatch-select-trigger[data-expandable="true"]::after { width: 7px; height: 7px; flex: 0 0 auto; border-right: 1.5px solid #8f96a3; border-bottom: 1.5px solid #8f96a3; content: ""; transform: translateY(-2px) rotate(45deg); }
+  .spotpatch-select-trigger[aria-expanded="true"]::after { transform: translateY(2px) rotate(225deg); }
+  .spotpatch-select-trigger:focus-visible { border-color: rgb(139 123 255 / 68%); box-shadow: 0 0 0 3px rgb(139 123 255 / 12%); }
+  .spotpatch-select-trigger:disabled { color: var(--spotpatch-text); background: rgb(255 255 255 / 3%); cursor: default; opacity: 1; }
+  .spotpatch-select-trigger[data-empty="true"]:disabled { color: var(--spotpatch-text-muted); }
+  .spotpatch-select-menu { position: relative; z-index: 1; display: grid; gap: 3px; max-height: 224px; overflow-y: auto; overscroll-behavior: contain; border: 1px solid var(--spotpatch-border); border-radius: 9px; padding: 4px; background: var(--spotpatch-bg-input); box-shadow: 0 10px 28px rgb(0 0 0 / 28%); scrollbar-width: thin; }
+  .spotpatch-select-menu[hidden] { display: none; }
+  .spotpatch-select-option { box-sizing: border-box; min-height: 34px; border: 0; border-radius: 6px; padding: 7px 9px; overflow-wrap: anywhere; color: var(--spotpatch-text-secondary); background: transparent; cursor: pointer; font: inherit; text-align: left; }
+  .spotpatch-select-option[data-active="true"], .spotpatch-select-option:hover { color: #fff; background: rgb(139 123 255 / 13%); outline: none; }
+  .spotpatch-select-option[aria-selected="true"] { color: #f4f1ff; background: rgb(139 123 255 / 20%); }
+  .spotpatch-select-native { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; border: 0; clip: rect(0 0 0 0); clip-path: inset(50%); white-space: nowrap; }
+`;
+function createSelectPicker(document, onViewChange) {
+  const root = createMarkedElement(document, "div");
+  root.className = "spotpatch-select-picker";
+  const trigger = createButton(document, "", "spotpatch-select-trigger");
+  trigger.id = `spotpatch-select-picker-${Math.random().toString(36).slice(2)}`;
+  trigger.setAttribute("role", "combobox");
+  trigger.setAttribute("aria-haspopup", "listbox");
+  trigger.setAttribute("aria-expanded", "false");
+  const text = createMarkedElement(document, "span");
+  trigger.append(text);
+  const menu = createMarkedElement(document, "div");
+  menu.id = `${trigger.id}-menu`;
+  menu.className = "spotpatch-select-menu";
+  menu.setAttribute("role", "listbox");
+  menu.hidden = true;
+  trigger.setAttribute("aria-controls", menu.id);
+  const select = createMarkedElement(document, "select");
+  select.className = "spotpatch-select-native";
+  select.tabIndex = -1;
+  select.setAttribute("aria-hidden", "true");
+  root.append(trigger, menu, select);
+  function close(focus = false) {
+    if (menu.hidden) return;
+    menu.hidden = true;
+    trigger.setAttribute("aria-expanded", "false");
+    trigger.removeAttribute("aria-activedescendant");
+    if (focus) trigger.focus({ preventScroll: true });
+    onViewChange();
+  }
+  function activate(index) {
+    const options = [...menu.children];
+    const active = options[index];
+    if (active === void 0) return;
+    for (const option of options) option.dataset.active = String(option === active);
+    trigger.setAttribute("aria-activedescendant", active.id);
+    const itemRect = active.getBoundingClientRect();
+    const menuRect = menu.getBoundingClientRect();
+    if (itemRect.top < menuRect.top) menu.scrollTop -= menuRect.top - itemRect.top;
+    else if (itemRect.bottom > menuRect.bottom)
+      menu.scrollTop += itemRect.bottom - menuRect.bottom;
+  }
+  function open() {
+    if (trigger.disabled || !menu.hidden) return;
+    menu.hidden = false;
+    trigger.setAttribute("aria-expanded", "true");
+    activate(Math.max(0, select.selectedIndex));
+    onViewChange();
+  }
+  function sync() {
+    text.textContent = select.selectedOptions[0]?.textContent ?? "";
+    trigger.title = text.textContent;
+    trigger.dataset.empty = String(select.value.length === 0);
+    for (const option of [...menu.children]) {
+      option.setAttribute(
+        "aria-selected",
+        String(option.dataset.value === select.value)
+      );
+    }
+  }
+  function choose(value) {
+    if (trigger.disabled) return;
+    select.value = value;
+    sync();
+    close(true);
+    select.dispatchEvent(new Event("change", { bubbles: true }));
+  }
+  function rebuild() {
+    const expanded = !menu.hidden;
+    const nativeOptions = [...select.options];
+    menu.replaceChildren();
+    for (const [index, option] of nativeOptions.entries()) {
+      const item = createMarkedElement(document, "div");
+      item.id = `${menu.id}-${String(index)}`;
+      item.className = "spotpatch-select-option";
+      item.setAttribute("role", "option");
+      item.dataset.value = option.value;
+      item.textContent = option.textContent;
+      item.title = option.textContent;
+      item.addEventListener("pointerdown", (event) => {
+        event.preventDefault();
+      });
+      item.addEventListener("click", () => {
+        choose(option.value);
+      });
+      menu.append(item);
+    }
+    sync();
+    if (expanded) {
+      activate(Math.max(0, select.selectedIndex));
+      onViewChange();
+    }
+  }
+  trigger.addEventListener("click", () => {
+    if (menu.hidden) open();
+    else close();
+  });
+  trigger.addEventListener("keydown", (event) => {
+    if (event.key === "Escape" && !menu.hidden) {
+      event.preventDefault();
+      event.stopPropagation();
+      close();
+      return;
+    }
+    if (event.key === "Tab") {
+      close();
+      return;
+    }
+    if (["Enter", " "].includes(event.key) && !menu.hidden) {
+      event.preventDefault();
+      const active = [...menu.children].find(
+        (item) => item.id === trigger.getAttribute("aria-activedescendant")
+      );
+      if (active?.dataset.value !== void 0) choose(active.dataset.value);
+      return;
+    }
+    if (!["ArrowDown", "ArrowUp", "Home", "End"].includes(event.key)) return;
+    event.preventDefault();
+    if (menu.hidden) {
+      open();
+      return;
+    }
+    const options = [...menu.children];
+    const index = options.findIndex(
+      (item) => item.id === trigger.getAttribute("aria-activedescendant")
+    );
+    activate(
+      event.key === "Home" ? 0 : event.key === "End" ? options.length - 1 : (index + (event.key === "ArrowDown" ? 1 : -1) + options.length) % options.length
+    );
+  });
+  root.addEventListener("focusout", (event) => {
+    if (!(event.relatedTarget instanceof Node) || !root.contains(event.relatedTarget))
+      close();
+  });
+  const outside = (event) => {
+    if (!event.composedPath().includes(root)) close();
+  };
+  document.addEventListener("pointerdown", outside);
+  select.addEventListener("change", sync);
+  return {
+    root,
+    trigger,
+    select,
+    rebuild,
+    close,
+    setDisabled(disabled) {
+      select.disabled = disabled;
+      trigger.disabled = disabled || select.options.length < 2;
+      trigger.dataset.expandable = String(!trigger.disabled);
+      if (trigger.disabled) close();
+    },
+    dispose() {
+      document.removeEventListener("pointerdown", outside);
+    }
+  };
+}
+
 // src/ui/external-handoff-panel.ts
 var MESSAGES = Object.freeze({
   "en-US": Object.freeze({
@@ -1039,19 +1215,19 @@ var MESSAGES = Object.freeze({
     modelLoading: "Connect to load available models",
     modelHint: "Applies only to this managed connection, not API Key settings. Apply changes before publishing; switching reconnects Codex.",
     applyModel: "Apply model",
-    codexManaged: "Codex \xB7 managed (experimental)",
+    codexManaged: "Codex · managed (experimental)",
     connectManaged: "Connect Codex",
     disconnectManaged: "Disconnect",
     revokeManaged: "Revoke grant",
     cancelManaged: "Cancel managed task",
     resultTitle: "Managed result",
-    controlConnection: (state, mode) => `Connection: ${state} \xB7 Mode: ${mode}`,
-    controlAuth: (auth, grant) => `Auth: ${auth} \xB7 Grant: ${grant}`,
+    controlConnection: (state, mode) => `Connection: ${state} · Mode: ${mode}`,
+    controlAuth: (auth, grant) => `Auth: ${auth} · Grant: ${grant}`,
     controlConsentRequired: (command) => `Initialize project access once: run \`${command}\` from this project, then connect again. No dev-terminal confirmation is required. The grant allows isolated snapshot writes and validated application; revoke it here at any time.`,
     controlModel: (model) => `Model: ${model}`,
     controlRevision: (task) => `Revision ${String(task.revision)}: ${task.deliveryStatus} / ${task.executionStatus} / ${task.managedPhase}`,
     controlValidation: (outcome) => `Validation: ${outcome}`,
-    controlFailure: (error, action) => `Error: ${error} \xB7 Next: ${action}`,
+    controlFailure: (error, action) => `Error: ${error} · Next: ${action}`,
     controlUnavailable: "Page connection management is unavailable; external handoffs still fall back honestly to the Agent inbox.",
     controlErrorText: Object.freeze({
       AGENT_BINARY_NOT_FOUND: "Codex is not installed or is not on PATH.",
@@ -1085,17 +1261,17 @@ var MESSAGES = Object.freeze({
       retry: "Retry the managed connection.",
       "inspect-cleanup-warning": "Inspect cleanup status before reconnecting."
     }),
-    resultHeader: (revision, outcome) => `Revision ${String(revision)} \xB7 Validation ${outcome}`,
+    resultHeader: (revision, outcome) => `Revision ${String(revision)} · Validation ${outcome}`,
     resultDisposition: (outcome) => outcome === "passed" ? "Applied to the project after validation passed." : `Candidate only; it was not applied because validation is ${outcome}.`,
     resultTiming: (stage, durationMs) => `Timing ${stage}: ${String(durationMs)} ms`,
     description: "Send through a ready active adapter, or publish to the project Agent inbox when no active adapter is connected.",
     ready: "Local Broker ready. No Agent connection is assumed until a connector reads or waits.",
     readyWaiting: (count) => `${String(count)} active connector wait request(s); publishing can wake them immediately.`,
     activeReady: (agent) => `${agent} is connected and idle. The next send will dispatch immediately.`,
-    publishing: "Authorizing current source and publishing the handoff\u2026",
+    publishing: "Authorizing current source and publishing the handoff…",
     published: (revision, expiresAt) => `Revision ${String(revision)} is available until ${expiresAt}. It has not been claimed as edited.`,
     queued: (agent, revision) => `Revision ${String(revision)} is reserved for ${agent}.`,
-    dispatching: (agent, revision) => `Dispatching revision ${String(revision)} to ${agent}\u2026`,
+    dispatching: (agent, revision) => `Dispatching revision ${String(revision)} to ${agent}…`,
     dispatched: (agent, revision) => agent === "Claude Code" ? `Revision ${String(revision)} was written to the Claude Channel transport; there is no model ACK yet.` : `Codex App Server accepted revision ${String(revision)}; waiting for the matching turn to start.`,
     working: (agent, revision) => `${agent} is working on revision ${String(revision)}.`,
     completed: (agent, revision) => `${agent} ended revision ${String(revision)} normally. Review the diff and checks; this does not prove the requested change is correct.`,
@@ -1109,7 +1285,7 @@ var MESSAGES = Object.freeze({
     inboxSend: "Publish to Agent inbox",
     retry: "Retry same send",
     refresh: "Refresh pickup status",
-    resolveUnknown: "Workspace reviewed \u2014 allow a new task",
+    resolveUnknown: "Workspace reviewed — allow a new task",
     settingsTitle: "Project connection setup",
     settingsHelp: "Codex managed mode is owned by the current development server. The browser never receives vendor credentials or arbitrary command access. Generic and attached adapters remain honest Inbox fallbacks.",
     disclosureTitle: "Confirm external Agent handoff",
@@ -1124,100 +1300,101 @@ var MESSAGES = Object.freeze({
     error: (code) => code === "EXTERNAL_AGENT_BUSY" ? "The active Agent is still busy or blocked by an uncertain delivery." : code === "ACTIVE_DISPATCH_INVALID" ? "The active delivery state changed. Refresh before continuing." : code === "HANDOFF_SOURCE_STALE" ? "The selected source changed. Select the current component again." : code === "HANDOFF_RESPONSE_TOO_LARGE" ? "The handoff is too large. Reduce the selected context." : code === "EXTERNAL_HANDOFF_DISABLED" ? "External Agent handoff is disabled in trusted project configuration." : code === "EXTERNAL_HANDOFF_UNAVAILABLE" || code === "SESSION_CLOSED" ? "The local external Agent Broker is unavailable. Restart the development server." : "The external Agent handoff request failed without publishing a partial revision."
   }),
   "zh-CN": Object.freeze({
-    title: "\u5916\u90E8 Agent \u8FDE\u63A5",
+    title: "外部 Agent 连接",
     agentLabel: "Agent",
-    modelLabel: "\u53D7\u7BA1 Codex \u6A21\u578B",
-    modelLoading: "\u8FDE\u63A5\u540E\u52A0\u8F7D\u53EF\u7528\u6A21\u578B",
-    modelHint: "\u4EC5\u4F5C\u7528\u4E8E\u6B64\u53D7\u7BA1\u8FDE\u63A5\uFF0C\u4E0D\u4FEE\u6539 API Key \u914D\u7F6E\u3002\u66F4\u6362\u540E\u8BF7\u5148\u5E94\u7528\u6A21\u578B\uFF0C\u518D\u53D1\u5E03\u4EFB\u52A1\uFF1B\u5E94\u7528\u65F6\u4F1A\u91CD\u65B0\u8FDE\u63A5 Codex\u3002",
-    applyModel: "\u5E94\u7528\u6A21\u578B",
-    codexManaged: "Codex \xB7 \u53D7\u7BA1\u6A21\u5F0F\uFF08\u5B9E\u9A8C\u6027\uFF09",
-    connectManaged: "\u8FDE\u63A5 Codex",
-    disconnectManaged: "\u65AD\u5F00\u8FDE\u63A5",
-    revokeManaged: "\u64A4\u9500\u6388\u6743",
-    cancelManaged: "\u53D6\u6D88\u53D7\u7BA1\u4EFB\u52A1",
-    resultTitle: "\u53D7\u7BA1\u6267\u884C\u7ED3\u679C",
-    controlConnection: (state, mode) => `\u8FDE\u63A5\uFF1A${state} \xB7 \u6A21\u5F0F\uFF1A${mode}`,
-    controlAuth: (auth, grant) => `\u8BA4\u8BC1\uFF1A${auth} \xB7 \u6388\u6743\uFF1A${grant}`,
-    controlConsentRequired: (command) => `\u8BF7\u5728\u5F53\u524D\u9879\u76EE\u6267\u884C\u4E00\u6B21\u521D\u59CB\u5316\uFF1A\`${command}\`\uFF0C\u7136\u540E\u91CD\u65B0\u8FDE\u63A5\uFF0C\u65E0\u9700\u5728\u5F00\u53D1\u7EC8\u7AEF\u8F93\u5165 yes\u3002\u6388\u6743\u5141\u8BB8\u9694\u79BB\u5FEB\u7167\u4FEE\u6539\u53CA\u6821\u9A8C\u540E\u7684\u5E94\u7528\uFF0C\u53EF\u968F\u65F6\u5728\u6B64\u64A4\u9500\u3002`,
-    controlModel: (model) => `\u6A21\u578B\uFF1A${model}`,
-    controlRevision: (task) => `revision ${String(task.revision)}\uFF1A${task.deliveryStatus} / ${task.executionStatus} / ${task.managedPhase}`,
-    controlValidation: (outcome) => `\u9A8C\u8BC1\uFF1A${outcome}`,
-    controlFailure: (error, action) => `\u9519\u8BEF\uFF1A${error} \xB7 \u4E0B\u4E00\u6B65\uFF1A${action}`,
-    controlUnavailable: "\u9875\u9762\u8FDE\u63A5\u7BA1\u7406\u4E0D\u53EF\u7528\uFF1B\u5916\u90E8\u4EA4\u63A5\u4ECD\u4F1A\u6309\u771F\u5B9E\u80FD\u529B\u964D\u7EA7\u4E3A Agent \u6536\u4EF6\u7BB1\u3002",
+    modelLabel: "受管 Codex 模型",
+    modelLoading: "连接后加载可用模型",
+    modelHint: "仅作用于此受管连接，不修改 API Key 配置。更换后请先应用模型，再发布任务；应用时会重新连接 Codex。",
+    applyModel: "应用模型",
+    codexManaged: "Codex · 受管模式（实验性）",
+    connectManaged: "连接 Codex",
+    disconnectManaged: "断开连接",
+    revokeManaged: "撤销授权",
+    cancelManaged: "取消受管任务",
+    resultTitle: "受管执行结果",
+    controlConnection: (state, mode) => `连接：${state} · 模式：${mode}`,
+    controlAuth: (auth, grant) => `认证：${auth} · 授权：${grant}`,
+    controlConsentRequired: (command) => `请在当前项目执行一次初始化：\`${command}\`，然后重新连接，无需在开发终端输入 yes。授权允许隔离快照修改及校验后的应用，可随时在此撤销。`,
+    controlModel: (model) => `模型：${model}`,
+    controlRevision: (task) => `revision ${String(task.revision)}：${task.deliveryStatus} / ${task.executionStatus} / ${task.managedPhase}`,
+    controlValidation: (outcome) => `验证：${outcome}`,
+    controlFailure: (error, action) => `错误：${error} · 下一步：${action}`,
+    controlUnavailable: "页面连接管理不可用；外部交接仍会按真实能力降级为 Agent 收件箱。",
     controlErrorText: Object.freeze({
-      AGENT_BINARY_NOT_FOUND: "\u672A\u5B89\u88C5 Codex\uFF0C\u6216 Codex \u4E0D\u5728 PATH \u4E2D\u3002",
-      AGENT_BINARY_UNTRUSTED: "\u89E3\u6790\u5230\u7684 Codex \u53EF\u6267\u884C\u6587\u4EF6\u4E0D\u53EF\u4FE1\u3002",
-      AGENT_VERSION_UNSUPPORTED: "\u5DF2\u5B89\u88C5\u7684 Codex \u7248\u672C\u4F4E\u4E8E SpotPatch \u517C\u5BB9\u57FA\u7EBF\u3002",
-      APP_SERVER_HANDSHAKE_FAILED: "Codex App Server \u672A\u5B8C\u6210\u542F\u52A8\u63E1\u624B\u3002",
-      AGENT_AUTH_REQUIRED: "Codex \u9700\u8981\u5DF2\u767B\u5F55\u7684\u8D26\u6237\u3002",
-      AGENT_MODEL_UNAVAILABLE: "Codex \u914D\u7F6E\u7684\u6A21\u578B\u5F53\u524D\u4E0D\u53EF\u7528\u3002",
-      AGENT_PROTOCOL_INCOMPATIBLE: "Codex \u751F\u6210\u7684 App Server Schema \u4E0D\u6EE1\u8DB3 SpotPatch \u6240\u9700\u534F\u8BAE\u5B50\u96C6\u3002",
-      CODEX_CONFIG_ISOLATION_UNSUPPORTED: "\u5F53\u524D Codex \u7248\u672C\u65E0\u6CD5\u8BC1\u660E\u53D7\u7BA1\u914D\u7F6E\u9694\u79BB\u3002",
-      MANAGED_GRANT_INVALID: "\u4FDD\u5B58\u7684\u9879\u76EE\u6388\u6743\u672A\u901A\u8FC7\u6821\u9A8C\u3002",
-      MANAGED_PLATFORM_UNSUPPORTED: "\u5F53\u524D\u5E73\u53F0\u5C1A\u672A\u8BC1\u660E\u53EF\u5B89\u5168\u8FD0\u884C\u53D7\u7BA1\u6267\u884C\u3002",
-      MANAGED_GIT_REQUIRED: "\u53D7\u7BA1\u6267\u884C\u8981\u6C42\u9879\u76EE\u4F4D\u4E8E Git \u4ED3\u5E93\u4E2D\u3002",
-      MANAGED_SNAPSHOT_FAILED: "\u65E0\u6CD5\u521B\u5EFA\u72EC\u7ACB\u5DE5\u4F5C\u533A\u5FEB\u7167\u3002",
-      MANAGED_SCOPE_VIOLATION: "\u5019\u9009\u4FEE\u6539\u8D85\u51FA\u6388\u6743\u8DEF\u5F84\u3002",
-      MANAGED_CHANGE_LIMIT_EXCEEDED: "\u5019\u9009\u4FEE\u6539\u8D85\u8FC7\u5B89\u5168\u4E0A\u9650\u3002",
-      MANAGED_VALIDATION_FAILED: "\u5019\u9009\u4FEE\u6539\u672A\u901A\u8FC7\u5BA1\u8BA1\u6216\u9A8C\u8BC1\u3002",
-      MANAGED_WORKSPACE_CONFLICT: "\u6267\u884C\u671F\u95F4\u6388\u6743\u6E90\u7801\u53D1\u751F\u4E86\u53D8\u5316\u3002",
-      MANAGED_APPLY_FAILED: "\u5DF2\u5BA1\u8BA1\u4FEE\u6539\u65E0\u6CD5\u5B89\u5168\u5199\u5165\u3002",
-      MANAGED_CLEANUP_INCOMPLETE: "\u53D7\u7BA1 thread \u6216\u5DE5\u4F5C\u533A\u6E05\u7406\u4E0D\u5B8C\u6574\u3002"
+      AGENT_BINARY_NOT_FOUND: "未安装 Codex，或 Codex 不在 PATH 中。",
+      AGENT_BINARY_UNTRUSTED: "解析到的 Codex 可执行文件不可信。",
+      AGENT_VERSION_UNSUPPORTED: "已安装的 Codex 版本低于 SpotPatch 兼容基线。",
+      APP_SERVER_HANDSHAKE_FAILED: "Codex App Server 未完成启动握手。",
+      AGENT_AUTH_REQUIRED: "Codex 需要已登录的账户。",
+      AGENT_MODEL_UNAVAILABLE: "Codex 配置的模型当前不可用。",
+      AGENT_PROTOCOL_INCOMPATIBLE: "Codex 生成的 App Server Schema 不满足 SpotPatch 所需协议子集。",
+      CODEX_CONFIG_ISOLATION_UNSUPPORTED: "当前 Codex 版本无法证明受管配置隔离。",
+      MANAGED_GRANT_INVALID: "保存的项目授权未通过校验。",
+      MANAGED_PLATFORM_UNSUPPORTED: "当前平台尚未证明可安全运行受管执行。",
+      MANAGED_GIT_REQUIRED: "受管执行要求项目位于 Git 仓库中。",
+      MANAGED_SNAPSHOT_FAILED: "无法创建独立工作区快照。",
+      MANAGED_SCOPE_VIOLATION: "候选修改超出授权路径。",
+      MANAGED_CHANGE_LIMIT_EXCEEDED: "候选修改超过安全上限。",
+      MANAGED_VALIDATION_FAILED: "候选修改未通过审计或验证。",
+      MANAGED_WORKSPACE_CONFLICT: "执行期间授权源码发生了变化。",
+      MANAGED_APPLY_FAILED: "已审计修改无法安全写入。",
+      MANAGED_CLEANUP_INCOMPLETE: "受管 thread 或工作区清理不完整。"
     }),
     controlActionText: Object.freeze({
-      "install-agent": "\u5B89\u88C5 Codex \u540E\u91CD\u8BD5\u3002",
-      "use-supported-version": "\u6539\u7528 Schema \u517C\u5BB9\u7684 Codex \u7248\u672C\u3002",
-      "sign-in": "\u767B\u5F55 Codex \u540E\u91CD\u8BD5\u3002",
-      "choose-available-model": "\u9009\u62E9\u53EF\u7528\u6A21\u578B\u540E\u91CD\u65B0\u8FDE\u63A5 Codex\u3002",
-      "use-inbox": "\u7EE7\u7EED\u4F7F\u7528 Agent \u6536\u4EF6\u7BB1\u964D\u7EA7\u8DEF\u5F84\u3002",
-      "confirm-managed-access": "\u64A4\u9500\u65E0\u6548\u6388\u6743\u5E76\u91CD\u65B0\u786E\u8BA4\u3002",
-      "review-candidate-diff": "\u68C0\u67E5\u5019\u9009 diff \u548C\u9A8C\u8BC1\u8F93\u51FA\u3002",
-      "review-workspace-conflict": "\u68C0\u67E5\u5DE5\u4F5C\u533A\u53D8\u5316\u540E\u518D\u91CD\u8BD5\u3002",
-      retry: "\u91CD\u8BD5\u53D7\u7BA1\u8FDE\u63A5\u3002",
-      "inspect-cleanup-warning": "\u786E\u8BA4\u6E05\u7406\u72B6\u6001\u540E\u518D\u8FDE\u63A5\u3002"
+      "install-agent": "安装 Codex 后重试。",
+      "use-supported-version": "改用 Schema 兼容的 Codex 版本。",
+      "sign-in": "登录 Codex 后重试。",
+      "choose-available-model": "选择可用模型后重新连接 Codex。",
+      "use-inbox": "继续使用 Agent 收件箱降级路径。",
+      "confirm-managed-access": "撤销无效授权并重新确认。",
+      "review-candidate-diff": "检查候选 diff 和验证输出。",
+      "review-workspace-conflict": "检查工作区变化后再重试。",
+      retry: "重试受管连接。",
+      "inspect-cleanup-warning": "确认清理状态后再连接。"
     }),
-    resultHeader: (revision, outcome) => `revision ${String(revision)} \xB7 \u9A8C\u8BC1 ${outcome}`,
-    resultDisposition: (outcome) => outcome === "passed" ? "\u9A8C\u8BC1\u901A\u8FC7\uFF0C\u4FEE\u6539\u5DF2\u5199\u5165\u9879\u76EE\u3002" : `\u8FD9\u53EA\u662F\u5019\u9009 diff\uFF1B\u9A8C\u8BC1\u72B6\u6001\u4E3A ${outcome}\uFF0C\u56E0\u6B64\u6CA1\u6709\u5199\u5165\u9879\u76EE\u3002`,
-    resultTiming: (stage, durationMs) => `\u8017\u65F6 ${stage}: ${String(durationMs)} ms`,
-    description: "\u6709\u4E3B\u52A8\u9002\u914D\u5668\u5C31\u7ACB\u5373\u6D3E\u53D1\uFF1B\u672A\u8FDE\u63A5\u4E3B\u52A8\u9002\u914D\u5668\u65F6\uFF0C\u8BDA\u5B9E\u964D\u7EA7\u4E3A\u9879\u76EE Agent \u6536\u4EF6\u7BB1\u3002",
-    ready: "\u672C\u5730 Broker \u5DF2\u5C31\u7EEA\u3002\u53EA\u6709\u8FDE\u63A5\u5668\u8BFB\u53D6\u6216\u7B49\u5F85\u540E\uFF0C\u624D\u80FD\u8BC1\u660E\u53D1\u751F\u8FC7\u8FDE\u63A5\u3002",
-    readyWaiting: (count) => `\u5F53\u524D\u6709 ${String(count)} \u4E2A\u8FDE\u63A5\u5668\u7B49\u5F85\u8BF7\u6C42\uFF0C\u53D1\u5E03\u540E\u53EF\u7ACB\u5373\u5524\u9192\u3002`,
-    activeReady: (agent) => `${agent} \u5DF2\u8FDE\u63A5\u5E76\u5904\u4E8E\u7A7A\u95F2\u72B6\u6001\uFF0C\u4E0B\u6B21\u53D1\u9001\u4F1A\u7ACB\u5373\u6D3E\u53D1\u3002`,
-    publishing: "\u6B63\u5728\u91CD\u65B0\u6388\u6743\u5F53\u524D\u6E90\u7801\u5E76\u53D1\u5E03\u4EA4\u63A5\u2026\u2026",
-    published: (revision, expiresAt) => `\u4EA4\u63A5 revision ${String(revision)} \u53EF\u8BFB\u53D6\u81F3 ${expiresAt}\uFF1B\u8FD9\u4E0D\u8868\u793A\u4EE3\u7801\u5DF2\u88AB\u4FEE\u6539\u3002`,
-    queued: (agent, revision) => `\u4EA4\u63A5 revision ${String(revision)} \u5DF2\u4E3A ${agent} \u9884\u7559\u3002`,
-    dispatching: (agent, revision) => `\u6B63\u5728\u628A revision ${String(revision)} \u6D3E\u53D1\u7ED9 ${agent}\u2026\u2026`,
-    dispatched: (agent, revision) => agent === "Claude Code" ? `revision ${String(revision)} \u5DF2\u5199\u5165 Claude Channel transport\uFF1B\u5F53\u524D\u6CA1\u6709\u6A21\u578B ACK\u3002` : `Codex App Server \u5DF2\u63A5\u53D7 revision ${String(revision)}\uFF0C\u6B63\u5728\u7B49\u5F85\u5339\u914D turn \u542F\u52A8\u3002`,
-    working: (agent, revision) => `${agent} \u6B63\u5728\u5904\u7406 revision ${String(revision)}\u3002`,
-    completed: (agent, revision) => `${agent} \u5DF2\u6B63\u5E38\u7ED3\u675F revision ${String(revision)}\u3002\u8BF7\u6838\u5BF9 diff \u548C\u68C0\u67E5\u7ED3\u679C\uFF1B\u8FD9\u4E0D\u8BC1\u660E\u4FEE\u6539\u8981\u6C42\u5DF2\u7ECF\u6B63\u786E\u5B8C\u6210\u3002`,
-    failed: (agent, revision) => `${agent} \u5DF2\u5C06 revision ${String(revision)} \u62A5\u544A\u4E3A\u5931\u8D25\uFF0C\u8FDE\u63A5\u5668\u5DF2\u6062\u590D\u7A7A\u95F2\u3002`,
-    unknown: (agent, revision) => `revision ${String(revision)} \u5411 ${agent} \u7684\u6295\u9012\u7ED3\u679C\u4E0D\u786E\u5B9A\u3002\u53D7\u7BA1 writer \u5DF2\u505C\u6B62\uFF0C\u8BF7\u5148\u6838\u5BF9\u5DE5\u4F5C\u533A\u518D\u5141\u8BB8\u65B0\u4EFB\u52A1\u3002`,
-    unknownResolved: (agent, revision) => `${agent} \u7684 revision ${String(revision)} \u4ECD\u8BB0\u4E3A\u6295\u9012\u672A\u77E5\uFF0C\u4F46\u5DE5\u4F5C\u533A\u6838\u5BF9\u5DF2\u7ECF\u786E\u8BA4\uFF1B\u73B0\u5728\u53EF\u4EE5\u91CD\u65B0\u8FDE\u63A5\u6216\u53D1\u5E03\u65B0\u7684\u6536\u4EF6\u7BB1\u4EFB\u52A1\u3002`,
-    pickedUp: (revision, count, time) => `\u4EA4\u63A5 revision ${String(revision)} \u5DF2\u88AB ${String(count)} \u4E2A\u8FDE\u63A5\u5668\u5B9E\u4F8B\u53D6\u8D70${time === void 0 ? "\u3002" : `\uFF0C\u6700\u8FD1\u53D6\u4EF6\u4E8E ${time}\u3002`}\u8FD9\u4E0D\u80FD\u8BC1\u660E\u4EE3\u7801\u5DF2\u7ECF\u4FEE\u6539\u3002`,
-    expired: (revision) => `\u4EA4\u63A5 revision ${String(revision)} \u5DF2\u8FC7\u671F\uFF0C\u8BF7\u6838\u5BF9\u5F53\u524D\u9009\u62E9\u540E\u91CD\u65B0\u53D1\u5E03\u3002`,
-    superseded: (revision) => `\u4EA4\u63A5 revision ${String(revision)} \u5DF2\u88AB\u66F4\u65B0\u7248\u672C\u53D6\u4EE3\u3002`,
-    send: "\u53D1\u9001\u7ED9 Agent",
-    inboxSend: "\u53D1\u5E03\u5230 Agent \u6536\u4EF6\u7BB1",
-    retry: "\u91CD\u8BD5\u540C\u4E00\u6B21\u53D1\u9001",
-    refresh: "\u5237\u65B0\u53D6\u4EF6\u72B6\u6001",
-    resolveUnknown: "\u5DF2\u6838\u5BF9\u5DE5\u4F5C\u533A\uFF0C\u5141\u8BB8\u65B0\u4EFB\u52A1",
-    settingsTitle: "\u9879\u76EE\u8FDE\u63A5\u8BBE\u7F6E",
-    settingsHelp: "Codex \u53D7\u7BA1\u6A21\u5F0F\u7531\u5F53\u524D\u5F00\u53D1\u670D\u52A1\u6258\u7BA1\uFF0C\u6D4F\u89C8\u5668\u4E0D\u4F1A\u83B7\u5F97\u5382\u5546\u51ED\u8BC1\u6216\u4EFB\u610F\u547D\u4EE4\u6743\u9650\uFF1B\u901A\u7528\u4E0E attached adapter \u4ECD\u6309\u771F\u5B9E\u80FD\u529B\u964D\u7EA7\u4E3A\u6536\u4EF6\u7BB1\u3002",
-    disclosureTitle: "\u786E\u8BA4\u53D1\u5E03\u5230\u5916\u90E8 Agent",
-    disclosureIntro: (targets, files) => `\u5C06\u53D1\u5E03 ${String(targets)} \u4E2A\u76EE\u6807\uFF0C\u6D89\u53CA ${String(files)} \u4E2A\u9879\u76EE\u76F8\u5BF9\u6587\u4EF6\u3002`,
-    disclosureData: "\u4EA4\u63A5\u5305\u542B\u4FEE\u6539\u8BF4\u660E\u3001\u7EC4\u4EF6\u4E0E\u9875\u9762\u4E0A\u4E0B\u6587\u3001\u5DF2\u6E05\u6D17\u7684 DOM/CSS\uFF0C\u4EE5\u53CA\u672C\u5730 Node \u670D\u52A1\u91CD\u65B0\u8BFB\u53D6\u7684\u6709\u754C\u6E90\u7801\u3002",
-    disclosureInbox: "15 \u5206\u949F\u6709\u6548\u671F\u5185\uFF0C\u672C\u9879\u76EE\u4E2D\u4EFB\u4F55\u5DF2\u914D\u7F6E\u7684 SpotPatch Connector \u90FD\u53EF\u80FD\u8BFB\u53D6\u3002",
-    disclosureProvider: "Agent \u5BBF\u4E3B\u53EF\u80FD\u4F9D\u636E\u5176\u4EA7\u54C1\u6570\u636E\u7B56\u7565\uFF0C\u5C06\u5185\u5BB9\u53D1\u9001\u7ED9\u4E91\u7AEF\u6A21\u578B\u670D\u52A1\u3002",
-    disclosureNoGuarantee: "\u5916\u90E8\u4FEE\u6539\u4E0D\u5177\u5907 SpotPatch \u5185\u5EFA Agent \u7684 worktree\u3001Apply \u6216 Revert \u4FDD\u8BC1\u3002",
-    disclosureManagedGuarantee: "\u53D7\u7BA1 Codex \u53EA\u5199\u72EC\u7ACB\u4E34\u65F6\u5FEB\u7167\u3002SpotPatch \u4F1A\u5BA1\u8BA1 diff\uFF0C\u4E14\u4EC5\u5728\u6240\u6709\u53EF\u4FE1 required checks \u901A\u8FC7\u540E\u624D\u5199\u5165\u4E1A\u52A1\u4ED3\u5E93\u3002",
-    cancel: "\u53D6\u6D88",
-    confirm: "\u786E\u8BA4\u5E76\u53D1\u9001",
-    error: (code) => code === "EXTERNAL_AGENT_BUSY" ? "\u4E3B\u52A8 Agent \u4ECD\u5728\u5DE5\u4F5C\uFF0C\u6216\u5B58\u5728\u5C1A\u672A\u6838\u5BF9\u7684\u6295\u9012\u672A\u77E5\u72B6\u6001\u3002" : code === "ACTIVE_DISPATCH_INVALID" ? "\u4E3B\u52A8\u6295\u9012\u72B6\u6001\u5DF2\u7ECF\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u540E\u518D\u7EE7\u7EED\u3002" : code === "HANDOFF_SOURCE_STALE" ? "\u9009\u4E2D\u6E90\u7801\u5DF2\u7ECF\u53D8\u5316\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9\u5F53\u524D\u7EC4\u4EF6\u3002" : code === "HANDOFF_RESPONSE_TOO_LARGE" ? "\u4EA4\u63A5\u5185\u5BB9\u8D85\u8FC7\u4E0A\u9650\uFF0C\u8BF7\u51CF\u5C11\u6240\u9009\u4E0A\u4E0B\u6587\u3002" : code === "EXTERNAL_HANDOFF_DISABLED" ? "\u53EF\u4FE1\u9879\u76EE\u914D\u7F6E\u6CA1\u6709\u542F\u7528\u5916\u90E8 Agent \u4EA4\u63A5\u3002" : code === "EXTERNAL_HANDOFF_UNAVAILABLE" || code === "SESSION_CLOSED" ? "\u672C\u5730\u5916\u90E8 Agent Broker \u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CD\u542F\u5F00\u53D1\u670D\u52A1\u3002" : "\u5916\u90E8 Agent \u4EA4\u63A5\u8BF7\u6C42\u5931\u8D25\uFF0C\u672A\u53D1\u5E03\u4EFB\u4F55\u90E8\u5206 revision\u3002"
+    resultHeader: (revision, outcome) => `revision ${String(revision)} · 验证 ${outcome}`,
+    resultDisposition: (outcome) => outcome === "passed" ? "验证通过，修改已写入项目。" : `这只是候选 diff；验证状态为 ${outcome}，因此没有写入项目。`,
+    resultTiming: (stage, durationMs) => `耗时 ${stage}: ${String(durationMs)} ms`,
+    description: "有主动适配器就立即派发；未连接主动适配器时，诚实降级为项目 Agent 收件箱。",
+    ready: "本地 Broker 已就绪。只有连接器读取或等待后，才能证明发生过连接。",
+    readyWaiting: (count) => `当前有 ${String(count)} 个连接器等待请求，发布后可立即唤醒。`,
+    activeReady: (agent) => `${agent} 已连接并处于空闲状态，下次发送会立即派发。`,
+    publishing: "正在重新授权当前源码并发布交接……",
+    published: (revision, expiresAt) => `交接 revision ${String(revision)} 可读取至 ${expiresAt}；这不表示代码已被修改。`,
+    queued: (agent, revision) => `交接 revision ${String(revision)} 已为 ${agent} 预留。`,
+    dispatching: (agent, revision) => `正在把 revision ${String(revision)} 派发给 ${agent}……`,
+    dispatched: (agent, revision) => agent === "Claude Code" ? `revision ${String(revision)} 已写入 Claude Channel transport；当前没有模型 ACK。` : `Codex App Server 已接受 revision ${String(revision)}，正在等待匹配 turn 启动。`,
+    working: (agent, revision) => `${agent} 正在处理 revision ${String(revision)}。`,
+    completed: (agent, revision) => `${agent} 已正常结束 revision ${String(revision)}。请核对 diff 和检查结果；这不证明修改要求已经正确完成。`,
+    failed: (agent, revision) => `${agent} 已将 revision ${String(revision)} 报告为失败，连接器已恢复空闲。`,
+    unknown: (agent, revision) => `revision ${String(revision)} 向 ${agent} 的投递结果不确定。受管 writer 已停止，请先核对工作区再允许新任务。`,
+    unknownResolved: (agent, revision) => `${agent} 的 revision ${String(revision)} 仍记为投递未知，但工作区核对已经确认；现在可以重新连接或发布新的收件箱任务。`,
+    pickedUp: (revision, count, time) => `交接 revision ${String(revision)} 已被 ${String(count)} 个连接器实例取走${time === void 0 ? "。" : `，最近取件于 ${time}。`}这不能证明代码已经修改。`,
+    expired: (revision) => `交接 revision ${String(revision)} 已过期，请核对当前选择后重新发布。`,
+    superseded: (revision) => `交接 revision ${String(revision)} 已被更新版本取代。`,
+    send: "发送给 Agent",
+    inboxSend: "发布到 Agent 收件箱",
+    retry: "重试同一次发送",
+    refresh: "刷新取件状态",
+    resolveUnknown: "已核对工作区，允许新任务",
+    settingsTitle: "项目连接设置",
+    settingsHelp: "Codex 受管模式由当前开发服务托管，浏览器不会获得厂商凭证或任意命令权限；通用与 attached adapter 仍按真实能力降级为收件箱。",
+    disclosureTitle: "确认发布到外部 Agent",
+    disclosureIntro: (targets, files) => `将发布 ${String(targets)} 个目标，涉及 ${String(files)} 个项目相对文件。`,
+    disclosureData: "交接包含修改说明、组件与页面上下文、已清洗的 DOM/CSS，以及本地 Node 服务重新读取的有界源码。",
+    disclosureInbox: "15 分钟有效期内，本项目中任何已配置的 SpotPatch Connector 都可能读取。",
+    disclosureProvider: "Agent 宿主可能依据其产品数据策略，将内容发送给云端模型服务。",
+    disclosureNoGuarantee: "外部修改不具备 SpotPatch 内建 Agent 的 worktree、Apply 或 Revert 保证。",
+    disclosureManagedGuarantee: "受管 Codex 只写独立临时快照。SpotPatch 会审计 diff，且仅在所有可信 required checks 通过后才写入业务仓库。",
+    cancel: "取消",
+    confirm: "确认并发送",
+    error: (code) => code === "EXTERNAL_AGENT_BUSY" ? "主动 Agent 仍在工作，或存在尚未核对的投递未知状态。" : code === "ACTIVE_DISPATCH_INVALID" ? "主动投递状态已经变化，请刷新后再继续。" : code === "HANDOFF_SOURCE_STALE" ? "选中源码已经变化，请重新选择当前组件。" : code === "HANDOFF_RESPONSE_TOO_LARGE" ? "交接内容超过上限，请减少所选上下文。" : code === "EXTERNAL_HANDOFF_DISABLED" ? "可信项目配置没有启用外部 Agent 交接。" : code === "EXTERNAL_HANDOFF_UNAVAILABLE" || code === "SESSION_CLOSED" ? "本地外部 Agent Broker 不可用，请重启开发服务。" : "外部 Agent 交接请求失败，未发布任何部分 revision。"
   })
 });
 function createStyles(document) {
   const styles = document.createElement("style");
   styles.textContent = `
+    ${SELECT_PICKER_STYLES}
     .spotpatch-external-handoff { margin-top: 12px; padding: 12px; border: 1px solid var(--spotpatch-border); border-radius: var(--spotpatch-radius-card); background: rgb(82 168 255 / 5%); }
     .spotpatch-external-handoff[hidden] { display: none; }
     .spotpatch-external-heading { display: flex; align-items: center; justify-content: space-between; gap: 8px; }
@@ -1227,8 +1404,10 @@ function createStyles(document) {
     .spotpatch-external-status[data-state="error"] { border-color: var(--spotpatch-danger); color: #fecdd3; }
     .spotpatch-external-status[data-state="picked-up"] { border-color: var(--spotpatch-success); color: #a7f3d0; }
     .spotpatch-external-control { margin-top: 9px; padding: 9px; border: 1px solid var(--spotpatch-border); border-radius: 8px; background: rgb(3 7 18 / 28%); }
-    .spotpatch-external-control label { display: grid; gap: 4px; color: var(--spotpatch-text-secondary); font-size: 10px; }
-    .spotpatch-external-control select { width: 100%; padding: 6px 8px; border: 1px solid var(--spotpatch-border); border-radius: 6px; background: var(--spotpatch-bg-input); color: var(--spotpatch-text); font: inherit; }
+    .spotpatch-external-control-field { display: grid; gap: 5px; min-width: 0; }
+    .spotpatch-external-control-field + .spotpatch-external-control-field { margin-top: 9px; }
+    .spotpatch-external-control-field > label { color: var(--spotpatch-text-secondary); font-size: 10px; }
+    .spotpatch-external-agent-value { box-sizing: border-box; display: flex; width: 100%; min-height: 38px; align-items: center; border: 1px solid var(--spotpatch-border); border-radius: 9px; padding: 0 11px; overflow: hidden; color: var(--spotpatch-text); background: rgb(255 255 255 / 3%); font: inherit; text-overflow: ellipsis; white-space: nowrap; }
     .spotpatch-external-control-status { margin: 7px 0 0; color: #cbd5e1; font-size: 10.5px; line-height: 1.5; white-space: pre-wrap; }
     .spotpatch-external-control-actions { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 8px; }
     .spotpatch-external-control-actions button { padding: 5px 8px; border: 1px solid var(--spotpatch-border); border-radius: 6px; background: var(--spotpatch-bg-active); color: var(--spotpatch-text); font: inherit; font-size: 10px; cursor: pointer; }
@@ -1383,18 +1562,24 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
   status.setAttribute("aria-live", "polite");
   const controlRoot = createMarkedElement(document, "div");
   controlRoot.className = "spotpatch-external-control";
+  const agentField = createMarkedElement(document, "div");
+  agentField.className = "spotpatch-external-control-field";
   const agentLabel = createMarkedElement(document, "label");
   const agentLabelText = createMarkedElement(document, "span");
-  const agentSelect = createMarkedElement(document, "select");
-  const codexOption = createMarkedElement(document, "option");
-  codexOption.value = "codex";
-  agentSelect.append(codexOption);
-  agentLabel.append(agentLabelText, agentSelect);
+  const agentValue = createMarkedElement(document, "div");
+  agentValue.className = "spotpatch-external-agent-value";
+  agentLabel.append(agentLabelText);
+  agentField.append(agentLabel, agentValue);
+  const modelField = createMarkedElement(document, "div");
+  modelField.className = "spotpatch-external-control-field";
   const modelLabel = createMarkedElement(document, "label");
   const modelLabelText = createMarkedElement(document, "span");
-  const modelSelect = createMarkedElement(document, "select");
+  const modelPicker = createSelectPicker(document, options.onViewChange);
+  const modelSelect = modelPicker.select;
+  modelLabel.htmlFor = modelPicker.trigger.id;
   const modelHint = createMarkedElement(document, "p");
-  modelLabel.append(modelLabelText, modelSelect);
+  modelLabel.append(modelLabelText);
+  modelField.append(modelLabel, modelPicker.root);
   const controlStatus = createMarkedElement(document, "p");
   controlStatus.className = "spotpatch-external-control-status";
   controlStatus.setAttribute("role", "status");
@@ -1418,8 +1603,8 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
   const managedResultDiff = createMarkedElement(document, "pre");
   managedResult.append(managedResultTitle, managedResultSummary, managedResultDiff);
   controlRoot.append(
-    agentLabel,
-    modelLabel,
+    agentField,
+    modelField,
     modelHint,
     controlStatus,
     controlActions,
@@ -1482,10 +1667,11 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
     }
   };
   const modelPending = () => control?.mode === "managed" && modelSelect.value !== "" && modelSelect.value !== control.requestedModel;
+  const modelChangeBlocksSend = () => activeAdapter?.canDispatch === true && modelPending();
   const controlPending = () => controlOperationBusy || control?.connectionState === "diagnosing" || control?.connectionState === "connecting" || control?.connectionState === "disconnecting";
   const refreshActions = () => {
     sendButton.textContent = retryable ? messages.retry : activeAdapter?.canDispatch === true ? messages.send : messages.inboxSend;
-    sendButton.disabled = !visible || !brokerReady || !contextReady || operationBusy || controlPending() || modelPending() || !retryable && dispatchBlocksSend;
+    sendButton.disabled = !visible || !brokerReady || !contextReady || operationBusy || modelChangeBlocksSend() || !retryable && dispatchBlocksSend;
     sendButton.setAttribute("aria-busy", String(operationBusy));
     refreshButton.disabled = !visible || operationBusy;
     resolveButton.hidden = !unknownDelivery;
@@ -1493,8 +1679,8 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
   };
   const refreshControlActions = () => {
     connectButton.textContent = modelPending() ? messages.applyModel : messages.connectManaged;
-    modelSelect.disabled = true;
     if (control === void 0) {
+      modelPicker.setDisabled(true);
       connectButton.disabled = true;
       disconnectButton.disabled = true;
       revokeButton.disabled = true;
@@ -1503,7 +1689,9 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
     }
     const state = control.connectionState;
     const operationPending = controlPending();
-    modelSelect.disabled = operationPending || state === "busy" || !control.models?.length;
+    modelPicker.setDisabled(
+      controlOperationBusy || state === "busy" || !control.models?.length
+    );
     connectButton.disabled = operationPending || state === "ready" && !modelPending() || state === "busy";
     disconnectButton.disabled = operationPending || state === "disconnected";
     revokeButton.disabled = operationPending || control.grantState !== "valid";
@@ -1560,7 +1748,7 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
     if (modelSelect.options.length === 1 && modelSelect.options[0]?.value === "") {
       modelSelect.options[0].textContent = messages.modelLoading;
     }
-    codexOption.textContent = messages.codexManaged;
+    agentValue.textContent = messages.codexManaged;
     connectButton.textContent = messages.connectManaged;
     disconnectButton.textContent = messages.disconnectManaged;
     revokeButton.textContent = messages.revokeManaged;
@@ -1608,12 +1796,13 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
       })
     );
     modelSelect.value = models.includes(previous) ? previous : control?.requestedModel ?? models[0] ?? "";
+    modelPicker.rebuild();
   };
   renderModels();
   const unsubscribeLocale = options.subscribeLocale(applyMessages);
   applyMessages();
   status.textContent = messages.ready;
-  controlStatus.textContent = options.locale() === "zh-CN" ? "\u6B63\u5728\u8BFB\u53D6\u672C\u5730\u8FDE\u63A5\u72B6\u6001\u2026\u2026" : "Reading local connection status\u2026";
+  controlStatus.textContent = options.locale() === "zh-CN" ? "正在读取本地连接状态……" : "Reading local connection status…";
   refreshActions();
   refreshControlActions();
   const summaryMessage = (summary) => summary.state === "expired" ? messages.expired(summary.revision) : summary.state === "superseded" ? messages.superseded(summary.revision) : summary.pickupCount > 0 ? messages.pickedUp(
@@ -1663,7 +1852,7 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
         annotation.targets.length,
         paths.length
       );
-      disclosureFiles.textContent = paths.length === 0 ? "\u2014" : paths.join("\n");
+      disclosureFiles.textContent = paths.length === 0 ? "—" : paths.join("\n");
       disclosure.hidden = false;
       const rootNode = root.getRootNode();
       const activeElement = "activeElement" in rootNode ? rootNode.activeElement : document.activeElement;
@@ -1773,6 +1962,7 @@ function createExternalHandoffPanel(document, framework, locale, sessionId, subs
       settings.removeEventListener("toggle", options.onViewChange);
       managedResult.removeEventListener("toggle", options.onViewChange);
       modelSelect.removeEventListener("change", handleModelChange);
+      modelPicker.dispose();
       unsubscribeLocale();
     }
   });