From edcf197483810e6eab2618a6bb7b83d13d4c0a7e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 21:32:51 -0700
Subject: [PATCH 01/23] improve: one channel picker and one model picker across
 the Control UI (#122964)

* fix(ui): unify channel pickers with icons

Preserve channel values and mutation ownership across Automations, pairing, setup, and Workboard while sharing accessible picker rendering and artwork.

* refactor(ui): unify model pickers

Share provider-aware model selection across chat, new sessions, Automations, Agents, model defaults, Session Observer, Talk, and Memory while preserving owner-specific values and locks.

* fix(ui): keep picker change callbacks value-only

Keep the Web Awesome element private to model-picker custom-mode handling while preserving one-argument callbacks for every picker consumer.

* fix(ui): satisfy model picker types

Keep custom sentinel options within the shared model option shape and guard optional Memory placeholder translation keys.

* refactor(ui): remove obsolete model option template import

Drop the Lit import after Agents model options became pure shared-picker data.

* fix(ui): satisfy picker lint gates

Use explicit model option mapping, remove stale E2E locals, and keep the Cron behavior suite within its enforced line budget.

* test(ui): target unified session model picker
---
 ui/src/components/channel-icon.ts             |  30 +
 ui/src/components/channel-picker.test.ts      |  64 ++
 ui/src/components/channel-picker.ts           |  17 +
 ui/src/components/model-picker.test.ts        |  78 ++
 ui/src/components/model-picker.ts             |  99 +++
 ui/src/components/select-picker.ts            |  82 ++
 .../web-awesome-migration.node.test.ts        |   6 +-
 ui/src/components/wizard-step-controls.ts     |  71 +-
 .../e2e/channels-whatsapp-logout.e2e.test.ts  |  12 +-
 .../chat-composer-accessory-focus.e2e.test.ts |  11 +-
 ui/src/e2e/chat-composer-redesign.e2e.test.ts |  70 +-
 ui/src/e2e/chat-flow.follow-ups.e2e.test.ts   |   8 +-
 .../chat-flow.models-reasoning.e2e.test.ts    | 124 ++-
 ui/src/e2e/chat-only-model.e2e.test.ts        |  45 +-
 ui/src/e2e/cron-filters.e2e.test.ts           |  14 +-
 ui/src/e2e/cron-select-values.e2e.test.ts     |  24 +-
 ui/src/e2e/model-alias-display.e2e.test.ts    |  16 +-
 ui/src/e2e/model-providers.e2e.test.ts        |  21 +-
 ...session-page.catalog-reconnect.e2e.test.ts |  31 +-
 .../e2e/new-session-page.places.e2e.test.ts   |   4 +-
 ...-session-page.workspace-memory.e2e.test.ts | 145 ++--
 ui/src/e2e/session-suggestions.e2e.test.ts    |  10 +-
 ui/src/i18n/.i18n/raw-copy-baseline.json      |   7 +
 ui/src/i18n/locales/en.ts                     |   1 +
 ui/src/lib/agents/display.ts                  |  49 +-
 ui/src/pages/agents/panels-overview.ts        |  49 +-
 ui/src/pages/agents/view.test.ts              |  54 +-
 ui/src/pages/channels/hub-meta.ts             |  26 -
 ui/src/pages/channels/view.detail.ts          |   5 +-
 ui/src/pages/channels/view.pairing.test.ts    |  39 +-
 ui/src/pages/channels/view.pairing.ts         |  50 +-
 ui/src/pages/channels/view.ts                 |   6 +-
 .../pages/channels/wizard-view.busy.test.ts   |  12 +-
 ui/src/pages/channels/wizard-view.ts          |   8 +-
 ui/src/pages/chat/chat-pane-lifecycle.ts      |   2 -
 .../chat/chat-responsive.browser.test.ts      |  25 +-
 ui/src/pages/chat/chat-view.test.ts           | 349 +++------
 .../chat/components/chat-model-controls.ts    | 255 +++++--
 .../chat/components/chat-model-picker.ts      | 719 ------------------
 ui/src/pages/config/memory-dreaming.test.ts   |   8 +
 ui/src/pages/config/memory-dreaming.ts        |  30 +
 .../config/session-observer-settings.test.ts  |  16 +-
 .../pages/config/session-observer-settings.ts |  70 +-
 ui/src/pages/config/talk.test.ts              |  58 +-
 ui/src/pages/config/talk.ts                   |  14 +-
 ui/src/pages/cron/view.test.ts                |  91 ++-
 ui/src/pages/cron/view.ts                     | 101 +--
 .../model-providers/default-models-view.ts    | 149 ++--
 ui/src/pages/model-providers/view.test.ts     |  42 +-
 .../pages/new-session/model-control.test.ts   | 153 ++--
 ui/src/pages/new-session/model-control.ts     |  48 +-
 ui/src/pages/new-session/new-session-page.ts  |   4 +-
 ui/src/pages/workboard/view.test.ts           |  20 +-
 ui/src/pages/workboard/workboard-select.ts    |  86 +--
 ui/src/styles/channels.css                    |   6 +-
 ui/src/styles/chat/layout.css                 | 348 ++-------
 ui/src/styles/layout.css                      |   7 +-
 ui/src/styles/settings.css                    |  53 ++
 ui/src/styles/workboard.css                   |  33 -
 59 files changed, 1727 insertions(+), 2248 deletions(-)
 create mode 100644 ui/src/components/channel-icon.ts
 create mode 100644 ui/src/components/channel-picker.test.ts
 create mode 100644 ui/src/components/channel-picker.ts
 create mode 100644 ui/src/components/model-picker.test.ts
 create mode 100644 ui/src/components/model-picker.ts
 create mode 100644 ui/src/components/select-picker.ts
 delete mode 100644 ui/src/pages/chat/components/chat-model-picker.ts

diff --git a/ui/src/components/channel-icon.ts b/ui/src/components/channel-icon.ts
new file mode 100644
index 000000000000..e0b87a0464b2
--- /dev/null
+++ b/ui/src/components/channel-icon.ts
@@ -0,0 +1,30 @@
+import { html } from "lit";
+import {
+  pluginArtPath,
+  pluginFallbackGradient,
+  pluginMonogram,
+} from "../pages/plugins/presentation.ts";
+import "../styles/channels.css";
+
+/** Bundled channel art reuses the plugin art set because channel ids match plugin slugs. */
+export function renderChannelIcon(
+  channelId: string,
+  label: string,
+  variant: "tile" | "cover" | "picker",
+) {
+  const artVariant = variant === "picker" ? "tile" : variant;
+  const art = pluginArtPath(channelId);
+  const [from, to] = art ? ["", ""] : pluginFallbackGradient(channelId);
+  const style = `${variant === "picker" ? "--channels-art-size:24px;" : ""}${
+    art ? "" : `--channels-art-a:${from};--channels-art-b:${to}`
+  }`;
+  return html`<span
+    class=${`channels-${artVariant}${art ? "" : ` channels-${artVariant}--fallback`}`}
+    style=${style}
+    aria-hidden="true"
+  >
+    ${art
+      ? html`<img src=${art} alt="" loading="lazy" decoding="async" />`
+      : html`<span>${pluginMonogram(label)}</span>`}
+  </span>`;
+}
diff --git a/ui/src/components/channel-picker.test.ts b/ui/src/components/channel-picker.test.ts
new file mode 100644
index 000000000000..55dd805d6e9f
--- /dev/null
+++ b/ui/src/components/channel-picker.test.ts
@@ -0,0 +1,64 @@
+/* @vitest-environment jsdom */
+import { render } from "lit";
+import { describe, expect, it, vi } from "vitest";
+import { renderChannelPicker } from "./channel-picker.ts";
+
+describe("renderChannelPicker", () => {
+  it("renders neutral and channel artwork while preserving a missing current channel", () => {
+    const container = document.createElement("div");
+    render(
+      renderChannelPicker({
+        label: "Channel",
+        value: "retired-channel",
+        options: [
+          { value: "last", label: "last", kind: "neutral" },
+          { value: "telegram", label: "Telegram" },
+        ],
+        onChange: vi.fn(),
+      }),
+      container,
+    );
+
+    expect(container.querySelector('wa-option[value="last"] [slot="start"]')).toBeNull();
+    expect(container.querySelector('wa-option[value="telegram"] img')).not.toBeNull();
+    expect(container.querySelector('wa-option[value="retired-channel"]')?.textContent).toContain(
+      "retired-channel",
+    );
+    expect(
+      container.querySelector('wa-option[value="retired-channel"] .channels-tile--fallback'),
+    ).not.toBeNull();
+  });
+
+  it("honors disabled choices and reports enabled changes", () => {
+    const container = document.createElement("div");
+    const onChange = vi.fn();
+    render(
+      renderChannelPicker({
+        label: "Channel",
+        value: "telegram",
+        options: [
+          { value: "telegram", label: "Telegram" },
+          { value: "disabled", label: "Disabled", disabled: true },
+        ],
+        onChange,
+      }),
+      container,
+    );
+
+    const picker = container.querySelector<HTMLElement & { value: string }>("wa-select");
+    expect(container.querySelector('wa-option[value="disabled"]')?.hasAttribute("disabled")).toBe(
+      true,
+    );
+    if (!picker) {
+      return;
+    }
+    Object.defineProperty(picker, "value", { configurable: true, value: "disabled" });
+    picker.dispatchEvent(new Event("change", { bubbles: true }));
+    Reflect.deleteProperty(picker, "value");
+    expect(onChange).not.toHaveBeenCalled();
+    Object.defineProperty(picker, "value", { configurable: true, value: "telegram" });
+    picker.dispatchEvent(new Event("change", { bubbles: true }));
+    Reflect.deleteProperty(picker, "value");
+    expect(onChange).toHaveBeenCalledWith("telegram");
+  });
+});
diff --git a/ui/src/components/channel-picker.ts b/ui/src/components/channel-picker.ts
new file mode 100644
index 000000000000..21942b21c9f6
--- /dev/null
+++ b/ui/src/components/channel-picker.ts
@@ -0,0 +1,17 @@
+import { nothing } from "lit";
+import { renderChannelIcon } from "./channel-icon.ts";
+import { renderPicker, type PickerOption, type PickerParams } from "./select-picker.ts";
+
+export type ChannelPickerOption = PickerOption & {
+  /** Neutral choices such as "last" or "all" are routing policy, not transports. */
+  kind?: "channel" | "neutral";
+};
+
+export function renderChannelPicker(params: PickerParams<ChannelPickerOption>) {
+  return renderPicker({
+    ...params,
+    className: "channel-picker",
+    renderLeading: (option) =>
+      option.kind === "neutral" ? nothing : renderChannelIcon(option.value, option.label, "picker"),
+  });
+}
diff --git a/ui/src/components/model-picker.test.ts b/ui/src/components/model-picker.test.ts
new file mode 100644
index 000000000000..38340f8ca361
--- /dev/null
+++ b/ui/src/components/model-picker.test.ts
@@ -0,0 +1,78 @@
+/* @vitest-environment jsdom */
+import { render } from "lit";
+import { describe, expect, it, vi } from "vitest";
+import { renderModelPicker } from "./model-picker.ts";
+
+describe("renderModelPicker", () => {
+  it("renders provider details and caller sentinels while preserving an unknown current model", () => {
+    const container = document.createElement("div");
+    render(
+      renderModelPicker({
+        label: "Model",
+        value: "legacy/model",
+        options: [
+          { value: "", label: "Automatic" },
+          {
+            value: "openai/gpt-5.6-luna",
+            label: "GPT-5.6 Luna",
+            provider: "openai",
+            detail: "Fast · 128k",
+            disabled: true,
+          },
+        ],
+        onChange: vi.fn(),
+      }),
+      container,
+    );
+
+    expect(container.querySelector('wa-option[value=""] [slot="start"]')).toBeNull();
+    const openai = container.querySelector('wa-option[value="openai/gpt-5.6-luna"]');
+    expect(openai?.querySelector('[data-provider-icon="codex"]')).not.toBeNull();
+    expect(openai?.textContent).toContain("Fast · 128k");
+    expect(openai?.hasAttribute("disabled")).toBe(true);
+    expect(container.querySelector('wa-option[value="legacy/model"]')?.textContent).toContain(
+      "legacy/model",
+    );
+  });
+
+  it("reveals free-form entry without leaking its internal option value", () => {
+    const container = document.createElement("div");
+    const onChange = vi.fn();
+    render(
+      renderModelPicker({
+        label: "Model",
+        value: "openai/gpt-5.6-luna",
+        options: [
+          { value: "", label: "Default" },
+          { value: "openai/gpt-5.6-luna", label: "GPT-5.6 Luna", provider: "openai" },
+        ],
+        custom: { label: "Custom model…", placeholder: "provider/model" },
+        onChange,
+      }),
+      container,
+    );
+
+    const customOption = Array.from(container.querySelectorAll("wa-option")).find(
+      (option) => option.textContent?.trim() === "Custom model…",
+    );
+    const picker = container.querySelector<HTMLElement & { value: string }>("wa-select");
+    const input = container.querySelector<HTMLInputElement>("input");
+    expect(customOption).not.toBeNull();
+    expect(input?.hidden).toBe(true);
+    if (!customOption || !picker || !input) {
+      return;
+    }
+    Object.defineProperty(picker, "value", {
+      configurable: true,
+      value: customOption.getAttribute("value"),
+    });
+    picker.dispatchEvent(new Event("change", { bubbles: true }));
+    Reflect.deleteProperty(picker, "value");
+    expect(input.hidden).toBe(false);
+
+    input.value = "vendor/model with spaces";
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+    expect(onChange).toHaveBeenCalledWith("vendor/model with spaces");
+    expect(onChange).not.toHaveBeenCalledWith(customOption.getAttribute("value"));
+  });
+});
diff --git a/ui/src/components/model-picker.ts b/ui/src/components/model-picker.ts
new file mode 100644
index 000000000000..56205b8b5b26
--- /dev/null
+++ b/ui/src/components/model-picker.ts
@@ -0,0 +1,99 @@
+import { html, nothing } from "lit";
+import { renderProviderBrandIcon } from "./provider-icon.ts";
+import { renderPicker } from "./select-picker.ts";
+
+export type ModelPickerOption = {
+  value: string;
+  label: string;
+  provider?: string;
+  detail?: string;
+  disabled?: boolean;
+};
+
+type ModelPickerParams = {
+  id?: string;
+  label: string;
+  value: string;
+  options: readonly ModelPickerOption[];
+  disabled?: boolean;
+  title?: string;
+  className?: string;
+  placement?: "top" | "bottom";
+  custom?: {
+    label: string;
+    placeholder?: string;
+    commit?: "input" | "change";
+    id?: string;
+    invalid?: boolean;
+    describedBy?: string;
+  };
+  onChange: (value: string) => void;
+};
+
+export function renderModelPicker(params: ModelPickerParams) {
+  let customValue = "__openclaw_custom_model__";
+  const values = new Set([params.value, ...params.options.map((option) => option.value)]);
+  while (values.has(customValue)) {
+    customValue += "_";
+  }
+  const currentIsKnown = params.options.some((option) => option.value === params.value);
+  const options: Array<ModelPickerOption & { description?: string }> = [
+    ...params.options.map((option) => ({ ...option, description: option.detail })),
+    ...(params.custom ? [{ value: customValue, label: params.custom.label }] : []),
+  ];
+  return html`
+    <div class="model-picker">
+      ${renderPicker({
+        id: params.id,
+        label: params.label,
+        value: params.value,
+        options,
+        disabled: params.disabled,
+        title: params.title,
+        placement: params.placement,
+        className: `model-picker__select ${params.className ?? ""}`,
+        renderLeading: (option) =>
+          option.provider
+            ? renderProviderBrandIcon(option.provider, { className: "model-picker__provider-icon" })
+            : nothing,
+        onChange: params.onChange,
+        onChangeTarget: (value, select) => {
+          const wrapper = select.closest(".model-picker");
+          const input = wrapper?.querySelector<HTMLInputElement>(".model-picker__custom");
+          if (value === customValue && input) {
+            input.hidden = false;
+            queueMicrotask(() => input.focus());
+            return;
+          }
+          if (input) {
+            input.hidden = true;
+          }
+          params.onChange(value);
+        },
+      })}
+      ${params.custom
+        ? html`<input
+            id=${params.custom.id ?? nothing}
+            class="settings-input model-picker__custom"
+            aria-label=${params.custom.label}
+            aria-invalid=${params.custom.invalid ? "true" : "false"}
+            aria-describedby=${params.custom.describedBy ?? nothing}
+            placeholder=${params.custom.placeholder ?? ""}
+            .value=${params.value}
+            ?hidden=${currentIsKnown}
+            ?disabled=${params.disabled}
+            @input=${(event: InputEvent) => {
+              if (params.custom?.commit !== "change") {
+                params.onChange((event.currentTarget as HTMLInputElement).value);
+              }
+            }}
+            @change=${(event: Event) => {
+              if (params.custom?.commit === "change") {
+                params.onChange((event.currentTarget as HTMLInputElement).value);
+              }
+            }}
+          />`
+        : nothing}
+    </div>
+  `;
+}
diff --git a/ui/src/components/select-picker.ts b/ui/src/components/select-picker.ts
new file mode 100644
index 000000000000..61853d6769de
--- /dev/null
+++ b/ui/src/components/select-picker.ts
@@ -0,0 +1,82 @@
+import { html, nothing } from "lit";
+import "./web-awesome-select.ts";
+
+export type PickerOption = {
+  value: string;
+  label: string;
+  description?: string;
+  disabled?: boolean;
+};
+
+export type PickerParams<Option extends PickerOption> = {
+  id?: string;
+  label: string;
+  value: string | null;
+  options: readonly Option[];
+  disabled?: boolean;
+  className?: string;
+  title?: string;
+  placement?: "top" | "bottom";
+  onChange: (value: string) => void;
+  onChangeTarget?: (value: string, select: HTMLElement) => void;
+  renderLeading?: (option: Option) => unknown;
+};
+
+export function renderPicker<Option extends PickerOption>(params: PickerParams<Option>) {
+  const options =
+    params.value === null ||
+    params.value === "" ||
+    params.options.some((option) => option.value === params.value)
+      ? params.options
+      : [...params.options, { value: params.value, label: params.value } as Option];
+  const leading = (option: Option | undefined) => {
+    const content = option && params.renderLeading?.(option);
+    return content === undefined || content === null || content === nothing
+      ? nothing
+      : html`<span slot="start">${content}</span>`;
+  };
+  return html`
+    <wa-select
+      id=${params.id ?? nothing}
+      class=${`settings-select picker-select ${params.className ?? ""}`}
+      style="width:100%;min-width:0"
+      title=${params.title ?? nothing}
+      placement=${params.placement ?? nothing}
+      .value=${params.value}
+      ?disabled=${params.disabled}
+      @change=${(event: Event) => {
+        const value = (event.currentTarget as HTMLElement & { value?: unknown }).value;
+        const option = typeof value === "string" && options.find((entry) => entry.value === value);
+        if (option && !option.disabled) {
+          if (params.onChangeTarget) {
+            params.onChangeTarget(value, event.currentTarget as HTMLElement);
+          } else {
+            params.onChange(value);
+          }
+        }
+      }}
+    >
+      <span slot="label" class="settings-control__sr-label">${params.label}</span>
+      ${leading(options.find((option) => option.value === params.value))}
+      ${options.map(
+        (option) => html`
+          <wa-option
+            class="picker-select__option"
+            value=${option.value}
+            .label=${option.label}
+            ?selected=${option.value === params.value}
+            ?disabled=${option.disabled}
+          >
+            ${leading(option)}
+            <span class="picker-select__copy">
+              <span class="picker-select__label">${option.label}</span>
+              ${option.description
+                ? html`<span class="picker-select__description">${option.description}</span>`
+                : nothing}
+            </span>
+          </wa-option>
+        `,
+      )}
+    </wa-select>
+  `;
+}
diff --git a/ui/src/components/web-awesome-migration.node.test.ts b/ui/src/components/web-awesome-migration.node.test.ts
index d542e974993d..c536719f7480 100644
--- a/ui/src/components/web-awesome-migration.node.test.ts
+++ b/ui/src/components/web-awesome-migration.node.test.ts
@@ -40,10 +40,7 @@ describe("Web Awesome control ownership", () => {
     ).toEqual([]);
     expect(
       await matchingFiles(/<details\b[^>]*class=["'][^"']*(?:menu|select|popover|dropdown)/u),
-    ).toEqual([
-      "pages/chat/components/chat-effort-picker.ts",
-      "pages/chat/components/chat-model-picker.ts",
-    ]);
+    ).toEqual(["pages/chat/components/chat-effort-picker.ts"]);
   });
 
   it("limits custom comboboxes to dynamic suggestion surfaces", async () => {
@@ -53,7 +50,6 @@ describe("Web Awesome control ownership", () => {
       "components/command-palette.ts",
       "pages/chat/components/chat-composer-skill-menu.ts",
       "pages/chat/components/chat-composer-slash-menu.ts",
-      "pages/chat/components/chat-model-picker.ts",
     ]);
   });
 
diff --git a/ui/src/components/wizard-step-controls.ts b/ui/src/components/wizard-step-controls.ts
index 9d6b970add13..809d1e590870 100644
--- a/ui/src/components/wizard-step-controls.ts
+++ b/ui/src/components/wizard-step-controls.ts
@@ -1,7 +1,9 @@
 import { html, nothing, type TemplateResult } from "lit";
 import type { WizardStep } from "../api/types.ts";
 import { t } from "../i18n/index.ts";
+import { renderChannelPicker } from "./channel-picker.ts";
 import { handleCopyButton } from "./copy-button.ts";
+import { renderPicker } from "./select-picker.ts";
 import { renderSensitiveInput } from "./sensitive-input.ts";
 import "../styles/wizard-step-controls.css";
 
@@ -19,6 +21,7 @@ type WizardStepControlsProps = {
   onValueChange: (value: unknown) => void;
   onAnswer: (value: unknown) => void;
   presentation?: "channels";
+  channelSelect?: boolean;
   answerLabel?: string;
   confirmAffirmativeLabel?: string;
   leadingAction?: TemplateResult;
@@ -112,29 +115,19 @@ function renderAnswerButton(
 function renderOption(
   props: WizardStepControlsProps,
   option: WizardStepOption,
-  index: number,
   selected: unknown[],
 ) {
   const checked = selected.some((value) => Object.is(value, option.value));
   if (props.presentation === "channels") {
-    return props.step.type === "select"
-      ? html`<wa-radio
-          class="channels-wizard__option"
-          appearance="button"
-          value=${String(index)}
-          .checked=${checked}
-        >
-          ${renderOptionBody(option, props.presentation)}
-        </wa-radio>`
-      : html`<button
-          type="button"
-          class="channels-wizard__option"
-          aria-pressed=${checked ? "true" : "false"}
-          ?disabled=${props.busy}
-          @click=${() => props.onValueChange(option.value)}
-        >
-          ${renderOptionBody(option, props.presentation, checked)}
-        </button>`;
+    return html`<button
+      type="button"
+      class="channels-wizard__option"
+      aria-pressed=${checked ? "true" : "false"}
+      ?disabled=${props.busy}
+      @click=${() => props.onValueChange(option.value)}
+    >
+      ${renderOptionBody(option, props.presentation, checked)}
+    </button>`;
   }
   return html`<label class="wizard-step__option">
     <input
@@ -247,24 +240,28 @@ function renderOptionsStep(props: WizardStepControlsProps) {
   const selected = multiple ? (Array.isArray(props.value) ? props.value : []) : [props.value];
   if (props.presentation === "channels" && !multiple) {
     const selectedIndex = options.findIndex((option) => Object.is(option.value, props.value));
+    const channels =
+      props.channelSelect && options.every((option) => typeof option.value === "string");
+    const picker = channels ? renderChannelPicker : renderPicker;
     return html`
-      <wa-radio-group
-        class="channels-wizard__options"
-        label=${props.step.message ?? ""}
-        orientation="vertical"
-        .value=${selectedIndex >= 0 ? String(selectedIndex) : null}
-        ?disabled=${props.busy}
-        @change=${(event: Event) => {
-          const index = (event.currentTarget as HTMLElement & { value?: string | number | null })
-            .value;
-          const option = options[Number(index)];
-          if (option) {
-            props.onAnswer(option.value);
-          }
-        }}
-      >
-        ${options.map((option, index) => renderOption(props, option, index, selected))}
-      </wa-radio-group>
+      ${renderMessage(props)}
+      ${picker({
+        label: props.step.message ?? "",
+        value:
+          selectedIndex < 0
+            ? null
+            : channels
+              ? String(options[selectedIndex]?.value)
+              : String(selectedIndex),
+        options: options.map((option, index) => ({
+          value: channels ? String(option.value) : String(index),
+          label: option.label,
+          description: option.hint,
+          kind: channels ? "channel" : "neutral",
+        })),
+        disabled: props.busy,
+        onChange: (value) => props.onAnswer(channels ? value : options[Number(value)]?.value),
+      })}
     `;
   }
   const answer = multiple
@@ -275,7 +272,7 @@ function renderOptionsStep(props: WizardStepControlsProps) {
   return html`
     ${renderMessage(props)}
     <div class=${stepClass(props, "options")} role=${multiple ? nothing : "radiogroup"}>
-      ${options.map((option, index) => renderOption(props, option, index, selected))}
+      ${options.map((option) => renderOption(props, option, selected))}
     </div>
     ${renderAnswerButton(
       props,
diff --git a/ui/src/e2e/channels-whatsapp-logout.e2e.test.ts b/ui/src/e2e/channels-whatsapp-logout.e2e.test.ts
index 05747ba50946..c55a06349a7f 100644
--- a/ui/src/e2e/channels-whatsapp-logout.e2e.test.ts
+++ b/ui/src/e2e/channels-whatsapp-logout.e2e.test.ts
@@ -276,11 +276,15 @@ suite.define(() => {
       await page.locator(".channels-detail").getByRole("button", { name: "Run setup" }).click();
       const wizard = page.locator(".channels-wizard");
       await gateway.deferNext("wizard.next");
-      await wizard.getByRole("radio", { name: "Work bot" }).click();
+      const account = wizard.locator("wa-select");
+      await account.evaluate(async (select) => {
+        const picker = select as HTMLElement & { value: string; updateComplete: Promise<unknown> };
+        picker.value = "1";
+        await picker.updateComplete;
+        select.dispatchEvent(new Event("change", { bubbles: true }));
+      });
       await expect.poll(async () => gateway.getRequests("wizard.next")).toHaveLength(1);
-      await expect
-        .poll(() => wizard.locator("wa-radio-group").getAttribute("disabled"))
-        .not.toBeNull();
+      await expect.poll(() => account.getAttribute("disabled")).not.toBeNull();
       await gateway.resolveDeferred("wizard.next");
 
       const token = wizard.getByLabel("Telegram bot token");
diff --git a/ui/src/e2e/chat-composer-accessory-focus.e2e.test.ts b/ui/src/e2e/chat-composer-accessory-focus.e2e.test.ts
index 884466d19e90..3822b2932e75 100644
--- a/ui/src/e2e/chat-composer-accessory-focus.e2e.test.ts
+++ b/ui/src/e2e/chat-composer-accessory-focus.e2e.test.ts
@@ -114,17 +114,10 @@ suite.define(() => {
         await trigger.press("Enter");
       }
 
-      const modelTrigger = composer.locator(".chat-controls__model-picker > summary");
+      const modelTrigger = composer.locator("wa-select.chat-controls__model-picker");
       await outside.focus();
       await modelTrigger.click();
-      expect(await modelTrigger.evaluate((element) => document.activeElement === element)).toBe(
-        true,
-      );
-      expect(
-        await page
-          .locator(".chat-controls__model-search")
-          .evaluate((element) => document.activeElement === element),
-      ).toBe(false);
+      await expect.poll(() => modelTrigger.getAttribute("open")).toBe("");
       await page.keyboard.press("Escape");
 
       await outside.focus();
diff --git a/ui/src/e2e/chat-composer-redesign.e2e.test.ts b/ui/src/e2e/chat-composer-redesign.e2e.test.ts
index 059fb407b7b8..b05d8d1a062b 100644
--- a/ui/src/e2e/chat-composer-redesign.e2e.test.ts
+++ b/ui/src/e2e/chat-composer-redesign.e2e.test.ts
@@ -30,12 +30,14 @@ suite.define(() => {
 
       for (const picker of [
         {
-          menu: ".chat-controls__model-menu",
-          trigger: '[data-chat-model-select="true"]',
+          menu: "wa-select.chat-controls__model-picker wa-option:last-of-type",
+          trigger: "wa-select.chat-controls__model-picker",
+          clearsComposer: false,
         },
         {
           menu: ".chat-controls__effort-menu",
           trigger: '[data-chat-thinking-select="true"]',
+          clearsComposer: true,
         },
       ]) {
         await composer.locator(picker.trigger).click();
@@ -54,7 +56,9 @@ suite.define(() => {
           throw new Error(`expected mobile layout boxes for ${picker.menu}`);
         }
         expect(menuBox.y).toBeGreaterThanOrEqual(0);
-        expect(menuBox.y + menuBox.height).toBeLessThanOrEqual(composerBox.y + 1);
+        expect(menuBox.y + menuBox.height).toBeLessThanOrEqual(
+          (picker.clearsComposer ? composerBox.y : triggerBox.y) + 1,
+        );
         expect(triggerBox.y + triggerBox.height).toBeLessThanOrEqual(376);
         expect(footerBox.y + footerBox.height).toBeLessThanOrEqual(376);
         await composer.locator(picker.trigger).click();
@@ -143,7 +147,7 @@ suite.define(() => {
       const composerShell = page.locator(".agent-chat__composer-shell");
       const chatContent = page.locator("main.content--chat");
       const chatMain = page.locator(".chat-workbench__main");
-      const model = composer.locator('[data-chat-model-select="true"]');
+      const model = composer.locator("wa-select.chat-controls__model-picker");
       const effort = composer.locator('[data-chat-thinking-select="true"]');
       const usage = composer.locator('[data-chat-provider-usage="true"]');
       const contextUsage = composer.locator(".context-ring");
@@ -195,7 +199,7 @@ suite.define(() => {
       await expect.poll(() => composer.locator(".agent-chat__composer-header").count()).toBe(0);
       await expect
         .poll(async () =>
-          (await model.locator(".chat-controls__inline-select-label").textContent())?.trim(),
+          (await model.locator("wa-option[selected] .picker-select__label").textContent())?.trim(),
         )
         .toBe("GPT-5.5");
       await expect
@@ -272,16 +276,14 @@ suite.define(() => {
         .toBe(1);
       await page.keyboard.press("Escape");
       await model.click();
-      const providerHeadings = composer.locator("[data-chat-model-provider]");
       await expect
-        .poll(async () => (await providerHeadings.allTextContents()).map((label) => label.trim()))
-        .toEqual(["OpenAI", "Anthropic"]);
-      await expect
-        .poll(() => composer.locator('[data-chat-model-provider-group="openai"]').textContent())
-        .toContain("GPT-5.4 Pro");
-      const anthropicModels = composer.locator('[data-chat-model-provider-group="anthropic"]');
-      await expect.poll(() => anthropicModels.isVisible()).toBe(true);
-      await expect.poll(() => anthropicModels.textContent()).toContain("Claude Sonnet 4.6");
+        .poll(() => model.locator("wa-option").allTextContents())
+        .toEqual(
+          expect.arrayContaining([
+            expect.stringContaining("GPT-5.4 Pro"),
+            expect.stringContaining("Claude Sonnet 4.6"),
+          ]),
+        );
       await model.click();
 
       const [
@@ -538,7 +540,7 @@ suite.define(() => {
       await textarea.fill("");
       await expect.poll(() => camera.count()).toBe(0);
       await model.click();
-      const mobilePickerBox = await composer.locator(".chat-controls__model-menu").boundingBox();
+      const mobilePickerBox = await model.locator("wa-option:last-of-type").boundingBox();
       expect(mobilePickerBox).not.toBeNull();
       if (!mobilePickerBox) {
         throw new Error("expected mobile model picker to have a layout box");
@@ -643,20 +645,14 @@ suite.define(() => {
       expect(await gateway.getRequests("models.list")).toHaveLength(0);
 
       const composer = page.locator(".agent-chat__input");
-      const providers = composer.locator("[data-chat-model-provider]");
+      const modelPicker = composer.locator("wa-select.chat-controls__model-picker");
+      await expect.poll(() => modelPicker.locator("wa-option").count()).toBe(2);
       await expect
-        .poll(async () => (await providers.allTextContents()).map((label) => label.trim()))
-        .toEqual(["OpenAI"]);
-      await expect
-        .poll(() => composer.locator('[data-chat-model-provider-group="openai"]').textContent())
+        .poll(async () => (await modelPicker.locator("wa-option").allTextContents()).join(" "))
         .toContain("GPT-5.5");
-      await expect
-        .poll(() => composer.locator('[data-chat-model-provider-group="codex"]').count())
-        .toBe(0);
-      // The advertised default is unavailable, so no usable catalog row is
-      // marked as the default and no synthetic empty row is introduced.
-      await expect.poll(() => composer.locator('[data-chat-model-default="true"]').count()).toBe(0);
-      await expect.poll(() => composer.locator('[data-chat-model-option=""]').count()).toBe(0);
+      // The catalog default is unavailable, but the empty-string sentinel must
+      // remain so an existing session override can still be cleared.
+      await expect.poll(() => modelPicker.locator('wa-option[value=""]').count()).toBe(1);
     });
   });
 
@@ -753,7 +749,9 @@ suite.define(() => {
         page.locator('openclaw-chat-pane[aria-hidden="false"] .agent-chat__input');
       await expect
         .poll(() =>
-          activeComposer().locator('[data-chat-model-option="openai/work-model"]').count(),
+          activeComposer()
+            .locator('wa-select.chat-controls__model-picker wa-option[value="openai/work-model"]')
+            .count(),
         )
         .toBe(1);
       expect(await gateway.getRequests("models.list")).toEqual([
@@ -772,12 +770,18 @@ suite.define(() => {
       expect(await gateway.getRequests("chat.metadata")).toHaveLength(0);
       await expect
         .poll(() =>
-          activeComposer().locator('[data-chat-model-option="anthropic/other-model"]').count(),
+          activeComposer()
+            .locator(
+              'wa-select.chat-controls__model-picker wa-option[value="anthropic/other-model"]',
+            )
+            .count(),
         )
         .toBe(1);
       await expect
         .poll(() =>
-          activeComposer().locator('[data-chat-model-option="openai/work-model"]').count(),
+          activeComposer()
+            .locator('wa-select.chat-controls__model-picker wa-option[value="openai/work-model"]')
+            .count(),
         )
         .toBe(0);
       expect(await gateway.getRequests("models.list")).toEqual([
@@ -851,7 +855,11 @@ suite.define(() => {
       const composer = page.locator(".agent-chat__input");
       await expect
         .poll(async () =>
-          (await composer.locator("[data-chat-model-option]").allTextContents()).join(" "),
+          (
+            await composer
+              .locator("wa-select.chat-controls__model-picker wa-option")
+              .allTextContents()
+          ).join(" "),
         )
         .not.toContain("GPT Default");
       expect(await gateway.getRequests("chat.metadata")).toHaveLength(0);
diff --git a/ui/src/e2e/chat-flow.follow-ups.e2e.test.ts b/ui/src/e2e/chat-flow.follow-ups.e2e.test.ts
index f0923e41fc8e..829ed985f0a8 100644
--- a/ui/src/e2e/chat-flow.follow-ups.e2e.test.ts
+++ b/ui/src/e2e/chat-flow.follow-ups.e2e.test.ts
@@ -432,7 +432,13 @@ suite.define(() => {
       await page.locator(".chat-thread").getByText(prompt).waitFor({ timeout: 10_000 });
       await page.getByText("First token visible.").waitFor({ timeout: 10_000 });
       await expect
-        .poll(() => page.locator('[data-chat-model-option="openai/startup-model"]').count())
+        .poll(() =>
+          page
+            .locator("wa-select.chat-controls__model-picker .picker-select__label", {
+              hasText: "Startup Model",
+            })
+            .count(),
+        )
         .toBe(1);
       await gateway.emitChatFinal({ runId, text: "History race stayed visible." });
       await page
diff --git a/ui/src/e2e/chat-flow.models-reasoning.e2e.test.ts b/ui/src/e2e/chat-flow.models-reasoning.e2e.test.ts
index b3db40d0e36a..f14a2fba672b 100644
--- a/ui/src/e2e/chat-flow.models-reasoning.e2e.test.ts
+++ b/ui/src/e2e/chat-flow.models-reasoning.e2e.test.ts
@@ -1,3 +1,4 @@
+import type { Locator } from "playwright";
 import { expect, it } from "vitest";
 import {
   chatSessionListResponse,
@@ -10,6 +11,30 @@ import {
 
 const suite = createChatFlowE2eSuite();
 
+function chatModelPicker(root: Locator) {
+  return root.locator("wa-select.chat-controls__model-picker").first();
+}
+
+function chatModelValue(root: Locator) {
+  return chatModelPicker(root).evaluate((element) =>
+    String((element as HTMLElement & { value?: string }).value),
+  );
+}
+
+async function selectChatModel(root: Locator, value: string) {
+  const picker = chatModelPicker(root);
+  await picker
+    .locator(`wa-option[value="${value}"]`)
+    .waitFor({ state: "attached", timeout: 10_000 });
+  await expect.poll(() => picker.isDisabled()).toBe(false);
+  await picker.evaluate(async (element, next) => {
+    const select = element as HTMLElement & { value: string; updateComplete: Promise<unknown> };
+    select.value = next;
+    await select.updateComplete;
+    select.dispatchEvent(new Event("change", { bubbles: true }));
+  }, value);
+}
+
 suite.define(() => {
   it("routes runtime-aware model commands through the server directive path", async () => {
     const context = await suite.newBrowserContext({
@@ -63,8 +88,8 @@ suite.define(() => {
     try {
       await page.goto(`${suite.server.baseUrl}chat`);
       const main = page.getByRole("main");
-      await main.locator('[data-chat-model-select="true"]').click();
-      const modelScroller = main.locator(".chat-controls__model-options");
+      await chatModelPicker(main).click();
+      const modelScroller = chatModelPicker(main).locator("wa-option").last();
       await page.evaluate(() => {
         document.documentElement.style.overflowY = "auto";
         document.body.style.height = "1800px";
@@ -105,23 +130,13 @@ suite.define(() => {
       await page.goto(`${suite.server.baseUrl}chat`);
 
       const main = page.getByRole("main");
-      const openModelSelect = async () => {
-        const trigger = main.locator(
-          'openclaw-chat-pane[aria-hidden="false"] [data-chat-model-select="true"]',
-        );
-        await trigger.waitFor({ state: "visible", timeout: 10_000 });
-        return trigger;
-      };
+      const activePane = () => main.locator('openclaw-chat-pane[aria-hidden="false"]');
       const selectModel = async (value: string) => {
-        const activePane = main.locator('openclaw-chat-pane[aria-hidden="false"]');
-        await activePane.locator('[data-chat-model-select="true"]').click();
-        const option = activePane.locator(`[data-chat-model-option="${value}"]`);
-        await option.waitFor({ state: "visible", timeout: 10_000 });
-        await option.click();
+        await selectChatModel(activePane(), value);
       };
 
-      let modelSelect = await openModelSelect();
-      expect(await modelSelect.getAttribute("data-chat-select-value")).toBe("");
+      await chatModelPicker(activePane()).waitFor({ state: "visible", timeout: 10_000 });
+      expect(await chatModelValue(activePane())).toBe("");
 
       await selectModel("bedrock/claude-opus-4.5");
       const patchRequest = await gateway.waitForRequest("sessions.patch");
@@ -129,9 +144,7 @@ suite.define(() => {
         key: "agent:main:session-a",
         model: "bedrock/claude-opus-4.5",
       });
-      expect(await modelSelect.getAttribute("data-chat-select-value")).toBe(
-        "bedrock/claude-opus-4.5",
-      );
+      expect(await chatModelValue(activePane())).toBe("bedrock/claude-opus-4.5");
 
       await page
         .locator(
@@ -141,8 +154,8 @@ suite.define(() => {
       await page.locator(".sidebar-recent-session--active").getByText("Session B").waitFor({
         timeout: 10_000,
       });
-      modelSelect = await openModelSelect();
-      expect(await modelSelect.getAttribute("data-chat-select-value")).toBe("");
+      await chatModelPicker(activePane()).waitFor({ state: "visible", timeout: 10_000 });
+      expect(await chatModelValue(activePane())).toBe("");
 
       await page
         .locator(
@@ -153,10 +166,8 @@ suite.define(() => {
         timeout: 10_000,
       });
 
-      modelSelect = await openModelSelect();
-      expect(await modelSelect.getAttribute("data-chat-select-value")).toBe(
-        "bedrock/claude-opus-4.5",
-      );
+      await chatModelPicker(activePane()).waitFor({ state: "visible", timeout: 10_000 });
+      expect(await chatModelValue(activePane())).toBe("bedrock/claude-opus-4.5");
     } finally {
       await suite.closeBrowserContext(context);
     }
@@ -232,13 +243,12 @@ suite.define(() => {
     try {
       await page.goto(`${suite.server.baseUrl}chat`);
       const main = page.getByRole("main");
-      const modelSelect = main.locator('[data-chat-model-select="true"]').first();
+      const modelSelect = chatModelPicker(main);
       await modelSelect.waitFor({ state: "visible", timeout: 10_000 });
       expect(await modelSelect.textContent()).toContain("Claude Opus 4.5");
-      expect(await modelSelect.getAttribute("data-chat-select-value")).toBe("");
+      expect(await chatModelValue(main)).toBe("");
 
-      await modelSelect.click();
-      await main.locator('[data-chat-model-option="openai/gpt-5.5"]').click();
+      await selectChatModel(main, "openai/gpt-5.5");
       const firstPatch = await gateway.waitForRequest("sessions.patch");
       expect(requireRecord(firstPatch.params)).toMatchObject({
         key: "agent:ops:session-a",
@@ -249,20 +259,16 @@ suite.define(() => {
       // Model selection closes immediately. Reopen and select the real default
       // catalog row to clear the session override.
       await modelSelect.click();
-      const defaultModel = main.locator(
-        '[data-chat-model-option="anthropic/claude-opus-4-5"][data-chat-model-default="true"]',
-      );
-      await defaultModel.waitFor({ state: "visible", timeout: 10_000 });
+      const defaultModel = modelSelect.locator('wa-option[value=""]');
       expect(await defaultModel.textContent()).toContain("Default");
-      expect(await main.locator('[data-chat-model-option=""]').count()).toBe(0);
-      await defaultModel.click();
+      await selectChatModel(main, "");
       const patches = await waitForRequests(gateway, "sessions.patch", 2);
       expect(requireRecord(patches[1]?.params)).toMatchObject({
         key: "agent:ops:session-a",
         model: null,
       });
       expect(await modelSelect.textContent()).toContain("Claude Opus 4.5");
-      expect(await modelSelect.getAttribute("data-chat-select-value")).toBe("");
+      expect(await chatModelValue(main)).toBe("");
     } finally {
       await suite.closeBrowserContext(context);
     }
@@ -349,7 +355,7 @@ suite.define(() => {
       await page.goto(`${suite.server.baseUrl}chat`);
       const main = page.getByRole("main");
       const activePane = main.locator('openclaw-chat-pane[aria-hidden="false"]');
-      const modelSelect = activePane.locator('[data-chat-model-select="true"]');
+      const modelSelect = chatModelPicker(activePane);
       const effortSelect = activePane.locator('[data-chat-thinking-select="true"]');
       const thinkingSlider = activePane.locator('[data-chat-thinking-slider="true"]');
       const expectedThinkingValues = thinkingLevels.map((level) => level.id).join(",");
@@ -357,13 +363,10 @@ suite.define(() => {
       await modelSelect.waitFor({ state: "visible", timeout: 10_000 });
       expect(await modelSelect.textContent()).toContain("GPT-5.6 Sol");
       expect(await modelSelect.textContent()).not.toContain("@openai:");
-      await modelSelect.click();
-      await expect
-        .poll(() => activePane.locator('[data-chat-model-option="openai/gpt-5.6-sol"]').count())
-        .toBe(1);
-      expect(
-        (await main.locator("[data-chat-model-option]").allTextContents()).join(" "),
-      ).not.toContain("@openai:");
+      await expect.poll(() => modelSelect.locator('wa-option[value=""]').count()).toBe(1);
+      expect((await modelSelect.locator("wa-option").allTextContents()).join(" ")).not.toContain(
+        "@openai:",
+      );
       await expect
         .poll(() => thinkingSlider.getAttribute("data-chat-thinking-values"))
         .toBe(expectedThinkingValues);
@@ -381,10 +384,7 @@ suite.define(() => {
       await page.locator(".sidebar-recent-session--active").getByText("Explicit Sol").waitFor({
         timeout: 10_000,
       });
-      await modelSelect.click();
-      await expect
-        .poll(() => activePane.locator('[data-chat-model-option="openai/gpt-5.6-sol"]').count())
-        .toBe(1);
+      await expect.poll(() => modelSelect.locator('wa-option[value=""]').count()).toBe(1);
       await expect
         .poll(() => thinkingSlider.getAttribute("data-chat-thinking-values"))
         .toBe(expectedThinkingValues);
@@ -424,8 +424,7 @@ suite.define(() => {
       await page.goto(`${suite.server.baseUrl}chat`);
 
       const main = page.getByRole("main");
-      await main.locator('[data-chat-model-select="true"]').click();
-      await main.locator('[data-chat-model-option="bedrock/claude-opus-4.5"]').click();
+      await selectChatModel(main, "bedrock/claude-opus-4.5");
       await gateway.waitForRequest("sessions.patch");
 
       const prompt = "send while the model save is pending";
@@ -488,7 +487,7 @@ suite.define(() => {
       await page.goto(`${suite.server.baseUrl}chat`);
 
       const main = page.getByRole("main");
-      const modelPicker = main.locator('[data-chat-model-select="true"]').first();
+      const modelPicker = chatModelPicker(main);
       const effortPicker = main.locator('[data-chat-thinking-select="true"]').first();
       await effortPicker.click();
       const thinkingSlider = main.locator('[data-chat-thinking-slider="true"]');
@@ -527,29 +526,17 @@ suite.define(() => {
       await page.keyboard.press("Escape");
 
       await modelPicker.click();
-      const search = main.locator('[data-chat-model-search="true"]');
       await expect
-        .poll(() => search.evaluate((element) => element === document.activeElement))
-        .toBe(false);
-      await search.focus();
-      await search.fill("anthropic");
-      const anthropicModel = main.locator('[data-chat-model-option="anthropic/claude-fable-5"]');
-      await expect.poll(() => anthropicModel.isVisible()).toBe(true);
-      await expect
-        .poll(() =>
-          main.locator('[data-chat-model-option="openai/gpt-5.6-sol"]').getAttribute("hidden"),
-        )
-        .toBe("");
+        .poll(() => modelPicker.locator('wa-option[value="anthropic/claude-fable-5"]').count())
+        .toBe(1);
       await expectRequestCountStable(gateway, "sessions.patch", 1);
-      await search.press("Enter");
+      await selectChatModel(main, "anthropic/claude-fable-5");
       const patches = await waitForRequests(gateway, "sessions.patch", 2);
       expect(requireRecord(patches[1]?.params)).toMatchObject({
         key: sessionKey,
         model: "anthropic/claude-fable-5",
       });
-      await expect
-        .poll(() => main.locator(".chat-controls__model-picker").getAttribute("open"))
-        .toBe(null);
+      await expect.poll(() => chatModelValue(main)).toBe("anthropic/claude-fable-5");
     } finally {
       await suite.closeBrowserContext(context);
     }
@@ -608,8 +595,7 @@ suite.define(() => {
       await page.goto(`${suite.server.baseUrl}chat`);
 
       const main = page.getByRole("main");
-      await main.locator('[data-chat-model-select="true"]').click();
-      await main.locator('[data-chat-model-option="openai/gpt-5.6-sol"]').click();
+      await selectChatModel(main, "openai/gpt-5.6-sol");
 
       const modelPatch = await gateway.waitForRequest("sessions.patch");
       expect(requireRecord(modelPatch.params)).toMatchObject({
diff --git a/ui/src/e2e/chat-only-model.e2e.test.ts b/ui/src/e2e/chat-only-model.e2e.test.ts
index e653f27ce975..b39161c35371 100644
--- a/ui/src/e2e/chat-only-model.e2e.test.ts
+++ b/ui/src/e2e/chat-only-model.e2e.test.ts
@@ -1,5 +1,6 @@
 import { mkdir } from "node:fs/promises";
 import path from "node:path";
+import type { Locator } from "playwright";
 import { expect, it } from "vitest";
 import { createChatFlowE2eSuite, installMockGateway } from "./chat-flow.test-support.ts";
 
@@ -27,6 +28,19 @@ const models = [
   },
 ];
 
+async function selectModel(picker: Locator, value: string) {
+  await picker
+    .locator(`wa-option[value="${value}"]`)
+    .waitFor({ state: "attached", timeout: 10_000 });
+  await expect.poll(() => picker.isDisabled()).toBe(false);
+  await picker.evaluate(async (element, next) => {
+    const select = element as HTMLElement & { value: string; updateComplete: Promise<unknown> };
+    select.value = next;
+    await select.updateComplete;
+    select.dispatchEvent(new Event("change", { bubbles: true }));
+  }, value);
+}
+
 function sessionsList(model: string, modelProvider: string) {
   return {
     count: 1,
@@ -84,12 +98,10 @@ suite.define(() => {
 
       const main = page.getByRole("main");
       const composer = main.locator(".agent-chat__composer-shell");
-      const picker = composer.locator('[data-chat-model-select="true"]');
-      const badge = picker.locator(".chat-controls__model-capability-badge");
+      const picker = composer.locator("wa-select.chat-controls__model-picker");
+      const badge = composer.locator(".chat-controls__model-capability-badge");
 
-      await expect.poll(() => picker.getAttribute("data-chat-model-tools")).toBe("unavailable");
       await expect.poll(async () => (await badge.textContent())?.trim()).toBe("Chat only");
-      await expect.poll(() => picker.getAttribute("aria-label")).toContain("Chat only");
 
       if (proofDir) {
         await composer.screenshot({
@@ -99,8 +111,8 @@ suite.define(() => {
       }
 
       await picker.click();
-      const localOption = composer.locator('[data-chat-model-option="lmstudio/qwen3-8b"]');
-      const openAiOption = composer.locator('[data-chat-model-option="openai/gpt-5.5"]');
+      const localOption = picker.locator('wa-option[value=""]');
+      const openAiOption = picker.locator('wa-option[value="openai/gpt-5.5"]');
       await expect
         .poll(async () => (await localOption.textContent())?.replace(/\s+/g, " ").trim())
         .toContain("32.8k · Chat only");
@@ -116,21 +128,13 @@ suite.define(() => {
         });
       }
 
-      await openAiOption.click();
+      await selectModel(picker, "openai/gpt-5.5");
       const patch = await gateway.waitForRequest("sessions.patch");
       expect(patch.params).toMatchObject({ key: sessionKey, model: "openai/gpt-5.5" });
-      await expect.poll(() => picker.getAttribute("data-chat-model-tools")).toBe("available");
       await expect.poll(() => badge.count()).toBe(0);
 
-      const pickerDetails = composer.locator("details.chat-controls__model-picker");
-      if (!(await pickerDetails.evaluate((element: HTMLDetailsElement) => element.open))) {
-        await picker.click();
-      }
-      await localOption.click();
-      await expect.poll(() => picker.getAttribute("data-chat-model-tools")).toBe("unavailable");
-      if (await pickerDetails.evaluate((element: HTMLDetailsElement) => element.open)) {
-        await picker.click();
-      }
+      await selectModel(picker, "");
+      await expect.poll(() => badge.count()).toBe(1);
       await page.setViewportSize({ height: 844, width: 390 });
       await expect.poll(() => picker.isVisible()).toBe(true);
 
@@ -142,13 +146,10 @@ suite.define(() => {
         });
       }
 
-      if (!(await pickerDetails.evaluate((element: HTMLDetailsElement) => element.open))) {
-        await picker.click();
-      }
-      const menu = composer.locator(".chat-controls__model-menu");
+      await picker.click();
       await expect
         .poll(async () => {
-          const box = await menu.boundingBox();
+          const box = await localOption.boundingBox();
           return box !== null && box.x >= 0 && box.x + box.width <= 390;
         })
         .toBe(true);
diff --git a/ui/src/e2e/cron-filters.e2e.test.ts b/ui/src/e2e/cron-filters.e2e.test.ts
index f0d1fdbe7776..d503f99f09b0 100644
--- a/ui/src/e2e/cron-filters.e2e.test.ts
+++ b/ui/src/e2e/cron-filters.e2e.test.ts
@@ -821,11 +821,19 @@ suite.define(() => {
         await page.locator("#cron-name").fill("Model override task");
 
         const modelInput = page.locator("#cron-payload-model");
+        const modelPicker = page.locator("#cron-payload-model-picker");
+        const customValue = await modelPicker
+          .locator("wa-option", { hasText: "Custom model…" })
+          .getAttribute("value");
+        expect(customValue).not.toBeNull();
+        await modelPicker.evaluate((select, value) => {
+          (select as HTMLElement & { value: string }).value = String(value);
+          select.dispatchEvent(new Event("change", { bubbles: true }));
+        }, customValue);
         await modelInput.fill("openai/gpt-5.5");
-        expect(await modelInput.getAttribute("list")).toBe("cron-model-suggestions");
         expect(
-          await page
-            .locator("#cron-model-suggestions option")
+          await modelPicker
+            .locator("wa-option")
             .evaluateAll((options) => options.map((option) => option.getAttribute("value"))),
         ).toContain(configuredModel);
 
diff --git a/ui/src/e2e/cron-select-values.e2e.test.ts b/ui/src/e2e/cron-select-values.e2e.test.ts
index f415eb8d5692..1374d1f4c674 100644
--- a/ui/src/e2e/cron-select-values.e2e.test.ts
+++ b/ui/src/e2e/cron-select-values.e2e.test.ts
@@ -1,4 +1,4 @@
-// Control UI tests cover Automations form native-select display state.
+// Control UI tests cover Automations form select display state.
 import { expect, it } from "vitest";
 import { installMockGateway } from "../test-helpers/control-ui-e2e.ts";
 import { createControlUiE2eSuite } from "./control-ui-e2e-suite.test-support.ts";
@@ -55,15 +55,27 @@ suite.define(() => {
         expect(await page.locator("select.cron-run-sort").inputValue()).toBe("asc");
         await page.locator('[data-test-id="cron-new-task"]').click();
 
-        const action = page.locator("select#cron-payload-kind");
+        const pickerValue = (selector: string) =>
+          page
+            .locator(selector)
+            .evaluate((element) => String((element as HTMLElement & { value?: string }).value));
+        const action = page.locator("wa-select#cron-payload-kind");
         await action.waitFor({ state: "visible" });
         // Form defaults are agentTurn / isolated / minutes — none of which is
         // the first option of its select; the rendered selection must agree.
-        expect(await action.inputValue()).toBe("agentTurn");
-        expect(await page.locator("select#cron-session-target").inputValue()).toBe("isolated");
-        expect(await page.locator('select[aria-label="Unit"]').inputValue()).toBe("minutes");
+        expect(await pickerValue("wa-select#cron-payload-kind")).toBe("agentTurn");
+        expect(await pickerValue("wa-select#cron-session-target")).toBe("isolated");
+        const unit = page.locator("wa-select").filter({
+          has: page.locator('[slot="label"]', { hasText: "Unit" }),
+        });
+        expect(
+          await unit.evaluate((element) =>
+            String((element as HTMLElement & { value?: string }).value),
+          ),
+        ).toBe("minutes");
         // Control: delivery mode's default is also its first option.
-        expect(await page.locator("select#cron-delivery-mode").inputValue()).toBe("announce");
+        expect(await pickerValue("wa-select#cron-delivery-mode")).toBe("announce");
+        expect(await pickerValue("wa-select#cron-delivery-channel")).toBe("last");
       },
     );
   });
diff --git a/ui/src/e2e/model-alias-display.e2e.test.ts b/ui/src/e2e/model-alias-display.e2e.test.ts
index 0166d1be9ba0..2f2385b17898 100644
--- a/ui/src/e2e/model-alias-display.e2e.test.ts
+++ b/ui/src/e2e/model-alias-display.e2e.test.ts
@@ -63,15 +63,15 @@ suite.define(() => {
     try {
       await page.goto(`${suite.server.baseUrl}chat`);
       const main = page.getByRole("main");
-      const picker = main.locator('[data-chat-model-select="true"]').first();
+      const picker = main.locator("wa-select.chat-controls__model-picker").first();
       await picker.waitFor({ state: "visible", timeout: 10_000 });
       await picker.click();
 
       const opus = main.locator(
-        '[data-chat-model-option="anthropic/claude-opus-4-8"] .chat-controls__model-option-name',
+        'wa-option[value="anthropic/claude-opus-4-8"] .picker-select__label',
       );
       const sonnet = main.locator(
-        '[data-chat-model-option="anthropic/claude-sonnet-5"] .chat-controls__model-option-name',
+        'wa-option[value="anthropic/claude-sonnet-5"] .picker-select__label',
       );
       await expect.poll(() => opus.textContent()).toBe("Opus 4.8 · opus");
       await expect.poll(() => sonnet.textContent()).toBe("Sonnet 5 · sonnet");
@@ -84,7 +84,7 @@ suite.define(() => {
       }
 
       const nvidia = main.locator(
-        '[data-chat-model-option="nvidia/moonshotai/kimi-k2.5"] .chat-controls__model-option-name',
+        'wa-option[value="nvidia/moonshotai/kimi-k2.5"] .picker-select__label',
       );
       await expect.poll(() => nvidia.textContent()).toBe("Kimi K2.5 (NVIDIA)");
       expect(await gateway.getRequests("sessions.patch")).toHaveLength(0);
@@ -146,16 +146,16 @@ suite.define(() => {
       expect(modelRequest.params).toEqual({ agentId: "main" });
       expect(await gateway.getRequests("models.list")).toHaveLength(0);
 
-      const select = page.locator("select.settings-select").first();
+      const select = page.locator("wa-select.model-picker__select").first();
       await select.waitFor({ state: "visible", timeout: 10_000 });
       await expect
-        .poll(() => select.locator('option[value="anthropic/claude-opus-4-8"]').textContent())
+        .poll(() => select.locator('wa-option[value="anthropic/claude-opus-4-8"]').textContent())
         .toContain("Opus 4.8 · opus");
       await expect
-        .poll(() => select.locator('option[value="anthropic/claude-sonnet-5"]').textContent())
+        .poll(() => select.locator('wa-option[value="anthropic/claude-sonnet-5"]').textContent())
         .toContain("Sonnet 5 · sonnet");
       await expect
-        .poll(() => select.locator('option[value="nvidia/moonshotai/kimi-k2.5"]').textContent())
+        .poll(() => select.locator('wa-option[value="nvidia/moonshotai/kimi-k2.5"]').textContent())
         .toContain("Kimi K2.5 (NVIDIA)");
       expect(await gateway.getRequests("config.set")).toHaveLength(0);
 
diff --git a/ui/src/e2e/model-providers.e2e.test.ts b/ui/src/e2e/model-providers.e2e.test.ts
index 74bfa9ed3ad0..4433b0fb3448 100644
--- a/ui/src/e2e/model-providers.e2e.test.ts
+++ b/ui/src/e2e/model-providers.e2e.test.ts
@@ -1,7 +1,7 @@
 // Control UI tests cover the Models settings page against a mocked Gateway.
 import { mkdir } from "node:fs/promises";
 import path from "node:path";
-import { chromium, type Browser } from "playwright";
+import { chromium, type Browser, type Locator } from "playwright";
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import {
   canRunPlaywrightChromium,
@@ -40,6 +40,19 @@ function providerConfig(value: string): { apiKey: string } {
   return Object.fromEntries([["apiKey", value]]) as { apiKey: string };
 }
 
+function modelPickerValue(locator: Locator) {
+  return locator.evaluate((element) => String((element as HTMLElement & { value?: string }).value));
+}
+
+async function selectModelPicker(locator: Locator, value: string) {
+  await locator.evaluate(async (element, next) => {
+    const select = element as HTMLElement & { value: string; updateComplete: Promise<unknown> };
+    select.value = next;
+    await select.updateComplete;
+    select.dispatchEvent(new Event("change", { bubbles: true }));
+  }, value);
+}
+
 describeControlUiE2e("Control UI Models mocked Gateway E2E", () => {
   beforeAll(async () => {
     if (!chromiumAvailable) {
@@ -484,7 +497,7 @@ describeControlUiE2e("Control UI Models mocked Gateway E2E", () => {
       await openaiCard.waitFor();
       await expect.poll(async () => openaiCard.textContent()).toContain("API key set in config");
       await expect
-        .poll(async () => page.locator(".model-providers__defaults select").first().inputValue())
+        .poll(() => modelPickerValue(page.locator(".model-providers__defaults wa-select").first()))
         .toBe("openai/gpt-5.5");
       if (recordVisuals) {
         await page.screenshot({
@@ -511,9 +524,9 @@ describeControlUiE2e("Control UI Models mocked Gateway E2E", () => {
       expect(probe.params).toEqual({ provider: "openai", agentId: "main" });
       await expect.poll(async () => openaiCard.textContent()).toContain("87 ms");
 
-      const primary = page.locator(".model-providers__defaults select").first();
+      const primary = page.locator(".model-providers__defaults wa-select").first();
       const defaultPatchCount = (await gateway.getRequests("config.patch")).length;
-      await primary.selectOption("anthropic/claude-sonnet-4-5");
+      await selectModelPicker(primary, "anthropic/claude-sonnet-4-5");
       expect((await gateway.getRequests("config.patch")).length).toBe(defaultPatchCount);
       const updatedDefaultsConfig = {
         ...config,
diff --git a/ui/src/e2e/new-session-page.catalog-reconnect.e2e.test.ts b/ui/src/e2e/new-session-page.catalog-reconnect.e2e.test.ts
index 96e3c465f790..2964bdb6e6d7 100644
--- a/ui/src/e2e/new-session-page.catalog-reconnect.e2e.test.ts
+++ b/ui/src/e2e/new-session-page.catalog-reconnect.e2e.test.ts
@@ -118,9 +118,9 @@ suite.define(() => {
         )
         .toMatchObject({ params: { agentId: "main", limitPerHost: 1 } });
 
-      await page.locator('[data-chat-model-select="true"]').click();
-      const cliGroup = page.locator('[data-chat-model-target-group="cliAgents"]');
-      await expect.poll(() => cliGroup.isVisible()).toBe(true);
+      const cliGroup = page.locator("wa-select.new-session-page__target-picker");
+      await cliGroup.click();
+      await expect.poll(() => cliGroup.getAttribute("open")).toBe("");
       await pollLocatorText(cliGroup).toContain("CLI agents");
       await pollLocatorText(cliGroup).toContain("Claude Code");
       expect(await cliGroup.textContent()).not.toContain("History only");
@@ -132,7 +132,12 @@ suite.define(() => {
         });
       }
 
-      await cliGroup.getByRole("option", { name: "Claude Code" }).click();
+      await cliGroup.evaluate(async (element) => {
+        const select = element as HTMLElement & { value: string; updateComplete: Promise<unknown> };
+        select.value = "claude";
+        await select.updateComplete;
+        select.dispatchEvent(new Event("change", { bubbles: true }));
+      });
       await expect.poll(() => new URL(page.url()).searchParams.get("catalog")).toBe("claude");
       await expect
         .poll(async () =>
@@ -142,7 +147,7 @@ suite.define(() => {
         )
         .toMatchObject({ params: { agentId: "main", catalogId: "claude" } });
       await pollLocatorText(page.locator(".new-session-page__runtime")).toContain("Claude Code");
-      expect(await page.locator('[data-chat-model-select="true"]').count()).toBe(0);
+      expect(await page.locator("wa-select.chat-controls__model-picker").count()).toBe(0);
       if (captureCliAgentsProof) {
         await page.screenshot({
           animations: "disabled",
@@ -469,18 +474,18 @@ suite.define(() => {
       await page.goto(`${suite.server.baseUrl}new`);
       await gateway.waitForRequest("chat.metadata");
 
-      const modelSelect = page.locator('[data-chat-model-select="true"]');
+      const modelSelect = page.locator("wa-select.chat-controls__model-picker");
       await expect.poll(() => modelSelect.textContent()).toContain("Models unavailable");
       await modelSelect.click();
       await expect
         .poll(() => page.locator('[data-chat-model-catalog-state="error"]').isVisible())
         .toBe(true);
-      expect(await page.locator("[data-chat-model-option]").count()).toBe(0);
+      expect(await modelSelect.locator("wa-option").count()).toBe(1);
 
       await page.locator('[data-chat-model-catalog-retry="true"]').click();
 
       await expect.poll(async () => (await gateway.getRequests("chat.metadata")).length).toBe(2);
-      await expect.poll(() => page.locator("[data-chat-model-option]").count()).toBe(3);
+      await expect.poll(() => modelSelect.locator("wa-option").count()).toBe(3);
       expect(await page.locator('[data-chat-model-catalog-state="error"]').count()).toBe(0);
     } finally {
       await context.close();
@@ -525,11 +530,15 @@ suite.define(() => {
       await expect.poll(async () => (await gateway.getRequests("chat.metadata")).length).toBe(2);
 
       const modelSelect = page.locator(
-        '.new-session-page__composer [data-chat-model-select="true"]',
+        ".new-session-page__composer wa-select.chat-controls__model-picker",
       );
       await modelSelect.click();
       await expect
-        .poll(() => page.locator('[data-chat-model-option="openai/gpt-5.6-luna"]').textContent())
+        .poll(() =>
+          modelSelect
+            .locator('wa-option[value="openai/gpt-5.6-luna"] .picker-select__label')
+            .textContent(),
+        )
         .toContain(recoveredModel.name);
 
       expect(await gateway.getRequests("chat.metadata")).toEqual([
@@ -609,7 +618,7 @@ suite.define(() => {
       await pollLocatorText(runtime).toContain("Claude Code");
       expect(await runtime.getAttribute("title")).toBe(model);
       expect(await page.locator('.new-session-page__trigger[title="Agent"]').count()).toBe(0);
-      expect(await page.locator('[data-chat-model-select="true"]').count()).toBe(0);
+      expect(await page.locator("wa-select.chat-controls__model-picker").count()).toBe(0);
 
       await page.locator(".new-session-page__message").fill("use Claude Code");
       await page.getByRole("button", { name: "Start session" }).click();
diff --git a/ui/src/e2e/new-session-page.places.e2e.test.ts b/ui/src/e2e/new-session-page.places.e2e.test.ts
index 49dbc0be6c5f..ed17e6075149 100644
--- a/ui/src/e2e/new-session-page.places.e2e.test.ts
+++ b/ui/src/e2e/new-session-page.places.e2e.test.ts
@@ -135,7 +135,7 @@ suite.define(() => {
       const heroBox = await page.locator(".agent-chat__welcome h2").boundingBox();
       const triggersBox = await page.locator(".new-session-page__triggers").boundingBox();
       const composerBox = await page.locator(".new-session-page__composer").boundingBox();
-      const modelBox = await page.locator('[data-chat-model-select="true"]').boundingBox();
+      const modelBox = await page.locator("wa-select.chat-controls__model-picker").boundingBox();
       const modelWrapperBox = await page
         .locator(".new-session-page__composer .chat-composer-model-control")
         .boundingBox();
@@ -159,7 +159,7 @@ suite.define(() => {
       ).toBe(1);
       expect(
         await page
-          .locator('[data-chat-model-select="true"]')
+          .locator("wa-select.chat-controls__model-picker")
           .evaluate((element) => element.closest(".agent-chat__composer-footer") != null),
       ).toBe(true);
       expect(modelWrapperBox?.x ?? 0).toBeGreaterThan(
diff --git a/ui/src/e2e/new-session-page.workspace-memory.e2e.test.ts b/ui/src/e2e/new-session-page.workspace-memory.e2e.test.ts
index 087f4afe15d8..75d3092df843 100644
--- a/ui/src/e2e/new-session-page.workspace-memory.e2e.test.ts
+++ b/ui/src/e2e/new-session-page.workspace-memory.e2e.test.ts
@@ -33,6 +33,30 @@ const MODELS = [
   { id: "gpt-5.5", name: "GPT 5.5", provider: "openai" },
   { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6", provider: "anthropic" },
 ];
+
+function newSessionModelPicker(page: Page) {
+  return page.locator(".new-session-page__composer wa-select.chat-controls__model-picker");
+}
+
+function newSessionModelValue(page: Page) {
+  return newSessionModelPicker(page).evaluate((element) =>
+    String((element as HTMLElement & { value?: string }).value),
+  );
+}
+
+async function selectNewSessionModel(page: Page, value: string) {
+  const picker = newSessionModelPicker(page);
+  await picker
+    .locator(`wa-option[value="${value}"]`)
+    .waitFor({ state: "attached", timeout: 10_000 });
+  await expect.poll(() => picker.isDisabled()).toBe(false);
+  await picker.evaluate(async (element, next) => {
+    const select = element as HTMLElement & { value: string; updateComplete: Promise<unknown> };
+    select.value = next;
+    await select.updateComplete;
+    select.dispatchEvent(new Event("change", { bubbles: true }));
+  }, value);
+}
 const GIT_BRANCHES = {
   branches: [{ kind: "local", name: "main" }],
   defaultBranch: "main",
@@ -192,38 +216,19 @@ suite.define(() => {
         },
       });
       await page.goto(`${suite.server.baseUrl}new`);
-      const modelSelect = page.locator('[data-chat-model-select="true"]');
+      const modelSelect = newSessionModelPicker(page);
       await modelSelect.waitFor();
       expect(
-        await page.locator('.new-session-page__composer [data-chat-model-select="true"]').count(),
+        await page
+          .locator(".new-session-page__composer wa-select.chat-controls__model-picker")
+          .count(),
       ).toBe(1);
       expect(
-        await page.locator('.new-session-page__triggers [data-chat-model-select="true"]').count(),
+        await page
+          .locator(".new-session-page__triggers wa-select.chat-controls__model-picker")
+          .count(),
       ).toBe(0);
-      await modelSelect.click();
-      const pickerOpen = () =>
-        modelSelect.evaluate(
-          (element) => element.closest("details")?.hasAttribute("open") ?? false,
-        );
-      const modelTriggerBox = await modelSelect.boundingBox();
-      const modelMenuBox = await page.locator(".chat-controls__model-menu").boundingBox();
-      expect(modelTriggerBox).not.toBeNull();
-      expect(modelMenuBox).not.toBeNull();
-      expect(modelMenuBox?.x ?? 0).toBeLessThanOrEqual(modelTriggerBox?.x ?? 0);
-      expect((modelMenuBox?.x ?? 0) + (modelMenuBox?.width ?? 0)).toBeLessThanOrEqual(
-        await page.evaluate(() => window.innerWidth),
-      );
-      await expect.poll(pickerOpen).toBe(true);
-      await page.locator('[data-chat-model-option="anthropic/claude-sonnet-4-6"]').click();
-      // Model selection commits immediately and closes the model popover.
-      await expect.poll(pickerOpen).toBe(false);
-      await expect
-        .poll(() => modelSelect.evaluate((element) => element === document.activeElement))
-        .toBe(true);
-      await modelSelect.click();
-      await expect.poll(pickerOpen).toBe(true);
-      await page.mouse.click(8, 8);
-      await expect.poll(pickerOpen).toBe(false);
+      await selectNewSessionModel(page, "anthropic/claude-sonnet-4-6");
       await page.locator(".new-session-page__message").fill("use this model");
       await page.getByRole("button", { name: "Start session" }).click();
 
@@ -235,62 +240,17 @@ suite.define(() => {
     });
   });
 
-  it("separates model shortcuts from numeric search input by focus", async () => {
+  it("lets Web Awesome own model-picker keyboard dismissal", async () => {
     await withNewSessionPage(DESKTOP_CONTEXT, async (page) => {
       await installMockGateway(page, { models: MODELS });
       await page.goto(`${suite.server.baseUrl}new`);
 
-      const modelSelect = page.locator('[data-chat-model-select="true"]');
-      const picker = page.locator(".chat-controls__model-picker");
-      const search = page.locator('[data-chat-model-search="true"]');
-      const firstModel = page.locator('[data-chat-model-option="openai/gpt-5.5"]');
-      const secondModel = page.locator('[data-chat-model-option="anthropic/claude-sonnet-4-6"]');
+      const modelSelect = newSessionModelPicker(page);
 
       await modelSelect.click();
-      await expect.poll(() => picker.getAttribute("open")).toBe("");
-      await expect
-        .poll(() => modelSelect.evaluate((element) => element === document.activeElement))
-        .toBe(true);
-      const secondShortcut = secondModel.locator('[data-chat-model-shortcut-number="2"]');
-      await expect.poll(() => secondShortcut.count()).toBe(1);
-      const menuBoxBeforeFocus = await page.locator(".chat-controls__model-menu").boundingBox();
-      const actionBoxBeforeFocus = await secondModel
-        .locator(".chat-controls__model-option-action")
-        .boundingBox();
-      expect(menuBoxBeforeFocus).not.toBeNull();
-      expect(actionBoxBeforeFocus).not.toBeNull();
-      await expect
-        .poll(() => secondShortcut.evaluate((element) => getComputedStyle(element).opacity))
-        .toBe("1");
-
-      await search.focus();
-      await expect
-        .poll(() => search.evaluate((element) => element === document.activeElement))
-        .toBe(true);
-      await expect
-        .poll(() => secondShortcut.evaluate((element) => getComputedStyle(element).opacity))
-        .toBe("0");
-      expect(await page.locator(".chat-controls__model-menu").boundingBox()).toEqual(
-        menuBoxBeforeFocus,
-      );
-      expect(
-        await secondModel.locator(".chat-controls__model-option-action").boundingBox(),
-      ).toEqual(actionBoxBeforeFocus);
-      await search.press("1");
-      await expect.poll(() => search.inputValue()).toBe("1");
-      await expect.poll(() => picker.getAttribute("open")).toBe("");
-
-      await search.fill("anthropic");
-      await expect.poll(() => firstModel.isVisible()).toBe(false);
-      await expect.poll(() => secondModel.isVisible()).toBe(true);
-      await modelSelect.focus();
-      const filteredShortcut = secondModel.locator('[data-chat-model-shortcut-number="1"]');
-      await expect
-        .poll(() => filteredShortcut.evaluate((element) => getComputedStyle(element).opacity))
-        .toBe("1");
-      await page.keyboard.press("1");
-      await expect.poll(() => picker.getAttribute("open")).toBe(null);
-      await expect.poll(() => modelSelect.textContent()).toContain("Claude Sonnet 4.6");
+      await expect.poll(() => modelSelect.getAttribute("open")).toBe("");
+      await page.keyboard.press("Escape");
+      await expect.poll(() => modelSelect.getAttribute("open")).toBe(null);
     });
   });
 
@@ -357,9 +317,7 @@ suite.define(() => {
       });
       await expect.poll(() => effortSelect.getAttribute("data-chat-thinking-value")).toBe("xhigh");
 
-      const modelSelect = page.locator('[data-chat-model-select="true"]');
-      await modelSelect.click();
-      await page.locator('[data-chat-model-option="openai/gpt-5.6-sol"]').click();
+      await selectNewSessionModel(page, "openai/gpt-5.6-sol");
       await effortSelect.click();
 
       await expect
@@ -376,7 +334,8 @@ suite.define(() => {
         ),
       ).toBeCloseTo(83.33, 1);
 
-      await effortSelect.click();
+      await page.keyboard.press("Escape");
+      await expect.poll(() => page.locator(".chat-controls__effort-menu").isVisible()).toBe(false);
       await page.locator(".new-session-page__message").fill("keep the selected effort");
       await page.getByRole("button", { name: "Start session" }).click();
       const create = await gateway.waitForRequest("sessions.create");
@@ -409,9 +368,7 @@ suite.define(() => {
       await page.getByLabel("Worktree name").fill("remembered-task");
       await page.keyboard.press("Escape");
 
-      const modelSelect = page.locator('[data-chat-model-select="true"]');
-      await modelSelect.click();
-      await page.locator('[data-chat-model-option="anthropic/claude-sonnet-4-6"]').click();
+      await selectNewSessionModel(page, "anthropic/claude-sonnet-4-6");
       const effortSelect = page.locator('[data-chat-thinking-select="true"]');
       await effortSelect.click();
       const thinkingSlider = page.locator('[data-chat-thinking-slider="true"]');
@@ -432,9 +389,7 @@ suite.define(() => {
         .poll(() => page.getByLabel("Worktree name").inputValue())
         .toBe("remembered-task");
       await page.keyboard.press("Escape");
-      await expect
-        .poll(() => modelSelect.getAttribute("data-chat-select-value"))
-        .toBe("anthropic/claude-sonnet-4-6");
+      await expect.poll(() => newSessionModelValue(page)).toBe("anthropic/claude-sonnet-4-6");
       await expect.poll(() => effortSelect.getAttribute("data-chat-thinking-value")).toBe("high");
       await captureUiProof(page, "new-session-preferences-restored.png");
 
@@ -638,9 +593,7 @@ suite.define(() => {
           .toBe(1);
 
         await gateway.deferNext("users.prefs.set");
-        const modelSelect = page.locator('[data-chat-model-select="true"]');
-        await modelSelect.click();
-        await page.locator('[data-chat-model-option="openai/gpt-5.5"]').click();
+        await selectNewSessionModel(page, "");
         await expect
           .poll(async () => (await gateway.getRequests("users.prefs.set")).length)
           .toBe(2);
@@ -722,9 +675,7 @@ suite.define(() => {
       await placeTrigger.click();
       await page.getByRole("button", { name: "Worktree" }).click();
       await page.keyboard.press("Escape");
-      const modelSelect = page.locator('[data-chat-model-select="true"]');
-      await modelSelect.click();
-      await page.locator('[data-chat-model-option="anthropic/claude-sonnet-4-6"]').click();
+      await selectNewSessionModel(page, "anthropic/claude-sonnet-4-6");
 
       await navigateInApp(page, "chat");
       await waitForCommittedChatRoute(page);
@@ -759,9 +710,7 @@ suite.define(() => {
 
       await page.reload();
       await page.locator(".new-session-page__message").fill("keep both remembered choices");
-      await expect
-        .poll(() => modelSelect.getAttribute("data-chat-select-value"))
-        .toBe("anthropic/claude-sonnet-4-6");
+      await expect.poll(() => newSessionModelValue(page)).toBe("anthropic/claude-sonnet-4-6");
       await expect.poll(() => placeTrigger.getAttribute("data-worktree")).toBe("true");
       await expect.poll(() => start.isDisabled()).toBe(false);
       await start.click();
@@ -807,9 +756,7 @@ suite.define(() => {
         "openclaw-next",
       );
 
-      const modelSelect = page.locator('[data-chat-model-select="true"]');
-      await modelSelect.click();
-      await page.locator('[data-chat-model-option="anthropic/claude-sonnet-4-6"]').click();
+      await selectNewSessionModel(page, "anthropic/claude-sonnet-4-6");
       const storedPreference = await readMainPreference(page);
       expect(storedPreference).toMatchObject({
         workspace: MOVED_WORKSPACE,
diff --git a/ui/src/e2e/session-suggestions.e2e.test.ts b/ui/src/e2e/session-suggestions.e2e.test.ts
index d6cda11da7d1..9b25f05c1325 100644
--- a/ui/src/e2e/session-suggestions.e2e.test.ts
+++ b/ui/src/e2e/session-suggestions.e2e.test.ts
@@ -99,14 +99,14 @@ suite.define(() => {
 
     await page.goto(controlUiSessionUrl(suite.server.baseUrl, sessionKey));
     const composer = page.locator(".agent-chat__composer-combobox textarea");
-    const modelTrigger = page.locator(".chat-controls__model-trigger");
+    const modelPicker = page.locator("wa-select.chat-controls__model-picker");
     const outsideTypingIndicator = page.locator(".agent-chat__typing-indicator--outside");
     await gateway.waitForRequest("session.suggestions.list");
     await expect(composer).toBeEnabled();
-    await modelTrigger.waitFor();
-    const idleModelBox = await modelTrigger.boundingBox();
+    await modelPicker.waitFor();
+    const idleModelBox = await modelPicker.boundingBox();
     if (idleModelBox === null) {
-      throw new Error("Expected the model trigger before remote typing");
+      throw new Error("Expected the model picker before remote typing");
     }
     await expect(outsideTypingIndicator).toHaveCount(0);
     await gateway.emitGatewayEvent("session.typing", {
@@ -119,7 +119,7 @@ suite.define(() => {
     });
     await expect(page.locator(".agent-chat__typing-text")).toHaveText("Owner is typing…");
     const [typingModelBox, typingIndicatorBox, composerShellBox] = await Promise.all([
-      modelTrigger.boundingBox(),
+      modelPicker.boundingBox(),
       outsideTypingIndicator.boundingBox(),
       page.locator(".agent-chat__composer-shell").boundingBox(),
     ]);
diff --git a/ui/src/i18n/.i18n/raw-copy-baseline.json b/ui/src/i18n/.i18n/raw-copy-baseline.json
index 09eab9b99e39..b1677b3366fe 100644
--- a/ui/src/i18n/.i18n/raw-copy-baseline.json
+++ b/ui/src/i18n/.i18n/raw-copy-baseline.json
@@ -554,6 +554,13 @@
       "path": "ui/src/pages/cron/view.ts",
       "text": "default"
     },
+    {
+      "count": 1,
+      "kind": "object-property",
+      "name": "label",
+      "path": "ui/src/pages/cron/view.ts",
+      "text": "last"
+    },
     {
       "count": 1,
       "kind": "html-text",
diff --git a/ui/src/i18n/locales/en.ts b/ui/src/i18n/locales/en.ts
index 0dd95f270d3f..9370d41b3fbb 100644
--- a/ui/src/i18n/locales/en.ts
+++ b/ui/src/i18n/locales/en.ts
@@ -5859,6 +5859,7 @@ export const en: TranslationMap = {
       lightContext: "Light context",
       lightContextHelp: "Use lightweight bootstrap context for this agent job.",
       model: "Model",
+      customModel: "Custom model…",
       modelPlaceholder: "openai/gpt-5.2",
       modelHelp: "Start typing to pick a known model, or enter a custom one.",
       thinking: "Reasoning",
diff --git a/ui/src/lib/agents/display.ts b/ui/src/lib/agents/display.ts
index 05a589c7c8e0..bded502858f6 100644
--- a/ui/src/lib/agents/display.ts
+++ b/ui/src/lib/agents/display.ts
@@ -4,7 +4,6 @@ import {
   normalizeLowercaseStringOrEmpty,
   normalizeOptionalString,
 } from "@openclaw/normalization-core/string-coerce";
-import { html, nothing } from "lit";
 import {
   expandToolGroups,
   normalizeToolPolicyName,
@@ -538,6 +537,7 @@ export function resolveEffectiveModelFallbacks(
 type ConfiguredModelOption = {
   value: string;
   label: string;
+  provider?: string;
 };
 
 function resolveConfiguredModels(
@@ -561,7 +561,12 @@ function resolveConfiguredModels(
           : undefined
         : undefined;
     const label = alias && alias !== trimmed ? `${alias} (${trimmed})` : trimmed;
-    options.push({ value: trimmed, label });
+    const separator = trimmed.indexOf("/");
+    options.push({
+      value: trimmed,
+      label,
+      ...(separator > 0 ? { provider: trimmed.slice(0, separator) } : {}),
+    });
   }
   return options;
 }
@@ -570,26 +575,27 @@ export function buildModelOptions(
   configForm: Record<string, unknown> | null,
   current?: string | null,
   catalog?: ModelCatalogEntry[],
-  selected?: string | null,
 ) {
   const seen = new Set<string>();
   const options: ConfiguredModelOption[] = [];
   const catalogOptions = new Map<string, ConfiguredModelOption>();
-  const selectedKey = selected ? normalizeLowercaseStringOrEmpty(selected) : null;
-  const addOption = (value: string, label: string) => {
+  const addOption = (value: string, label: string, provider?: string) => {
     const key = normalizeLowercaseStringOrEmpty(value);
     if (seen.has(key)) {
       return;
     }
     seen.add(key);
-    options.push({ value, label });
+    options.push({ value, label, ...(provider ? { provider } : {}) });
   };
 
   if (catalog) {
     const displayLookup = buildCatalogDisplayLookup(catalog);
     for (const entry of catalog) {
       const option = buildChatModelOptionFromLookup(entry, displayLookup);
-      catalogOptions.set(normalizeLowercaseStringOrEmpty(option.value), option);
+      catalogOptions.set(normalizeLowercaseStringOrEmpty(option.value), {
+        ...option,
+        provider: entry.provider,
+      });
     }
   }
 
@@ -597,30 +603,27 @@ export function buildModelOptions(
     // Configured options keep their order and fallback aliases; an authoritative
     // catalog match must still expose the same model identity as the chat picker.
     const catalogOption = catalogOptions.get(normalizeLowercaseStringOrEmpty(opt.value));
-    addOption(opt.value, catalogOption?.label ?? opt.label);
+    addOption(
+      opt.value,
+      catalogOption?.label ?? opt.label,
+      catalogOption?.provider ?? opt.provider,
+    );
   }
 
   for (const option of catalogOptions.values()) {
-    addOption(option.value, option.label);
+    addOption(option.value, option.label, option.provider);
   }
 
   if (current && !seen.has(normalizeLowercaseStringOrEmpty(current))) {
-    options.unshift({ value: current, label: `Current (${current})` });
+    const separator = current.indexOf("/");
+    options.unshift({
+      value: current,
+      label: `Current (${current})`,
+      ...(separator > 0 ? { provider: current.slice(0, separator) } : {}),
+    });
   }
 
-  if (options.length === 0) {
-    return nothing;
-  }
-  return options.map(
-    (option) => html`
-      <option
-        value=${option.value}
-        ?selected=${selectedKey === normalizeLowercaseStringOrEmpty(option.value)}
-      >
-        ${option.label}
-      </option>
-    `,
-  );
+  return options;
 }
 
 type CompiledPattern =
diff --git a/ui/src/pages/agents/panels-overview.ts b/ui/src/pages/agents/panels-overview.ts
index 53dbe38bbaed..4f1dc4d7153e 100644
--- a/ui/src/pages/agents/panels-overview.ts
+++ b/ui/src/pages/agents/panels-overview.ts
@@ -7,6 +7,7 @@ import type {
   AgentsListResult,
   ModelCatalogEntry,
 } from "../../api/types.ts";
+import { renderModelPicker } from "../../components/model-picker.ts";
 import { renderPanelRefreshStatus } from "../../components/panel-refresh-status.ts";
 import { renderSettingsRow, renderSettingsSection } from "../../components/settings-ui.ts";
 import "../../components/tooltip.ts";
@@ -292,35 +293,25 @@ export function renderAgentOverview(params: {
           title: isDefault
             ? t("agents.overview.primaryModelDefault")
             : t("agents.overview.primaryModel"),
-          control: html`
-            <select
-              class="settings-select"
-              .value=${selectedPrimary ?? ""}
-              ?disabled=${disabled}
-              @change=${(e: Event) =>
-                onModelChange(agent.id, (e.target as HTMLSelectElement).value || null)}
-            >
-              ${isDefault
-                ? html`
-                    <option value="" ?selected=${!selectedPrimary}>
-                      ${t("agents.overview.notSet")}
-                    </option>
-                  `
-                : html`
-                    <option value="" ?selected=${!selectedPrimary}>
-                      ${defaultPrimary
-                        ? t("agents.overview.inheritDefaultModel", { model: defaultPrimary })
-                        : t("agents.overview.inheritDefault")}
-                    </option>
-                  `}
-              ${buildModelOptions(
-                configForm,
-                effectivePrimary ?? undefined,
-                params.modelCatalog,
-                selectedPrimary,
-              )}
-            </select>
-          `,
+          control: renderModelPicker({
+            label: isDefault
+              ? t("agents.overview.primaryModelDefault")
+              : t("agents.overview.primaryModel"),
+            value: selectedPrimary ?? "",
+            options: [
+              {
+                value: "",
+                label: isDefault
+                  ? t("agents.overview.notSet")
+                  : defaultPrimary
+                    ? t("agents.overview.inheritDefaultModel", { model: defaultPrimary })
+                    : t("agents.overview.inheritDefault"),
+              },
+              ...buildModelOptions(configForm, effectivePrimary ?? undefined, params.modelCatalog),
+            ],
+            disabled,
+            onChange: (value) => onModelChange(agent.id, value || null),
+          }),
         })}
         ${renderSettingsRow({
           title: t("agents.overview.fallbacks"),
diff --git a/ui/src/pages/agents/view.test.ts b/ui/src/pages/agents/view.test.ts
index e588289a9a57..baca37b2dace 100644
--- a/ui/src/pages/agents/view.test.ts
+++ b/ui/src/pages/agents/view.test.ts
@@ -335,12 +335,10 @@ describe("renderAgents", () => {
       container,
     );
 
-    const defaultSelect = await vi.waitFor(() => {
-      const select = container.querySelector<HTMLSelectElement>("select.settings-select");
-      expect(select?.value).toBe("openai/gpt-5.4");
-      return select;
-    });
-    expect(defaultSelect?.selectedOptions[0]?.value).toBe("openai/gpt-5.4");
+    const defaultSelect = container.querySelector("wa-select.model-picker__select");
+    expect(defaultSelect?.querySelector("wa-option[selected]")?.getAttribute("value")).toBe(
+      "openai/gpt-5.4",
+    );
 
     render(
       renderAgents(
@@ -358,12 +356,8 @@ describe("renderAgents", () => {
       container,
     );
 
-    const inheritedSelect = await vi.waitFor(() => {
-      const select = container.querySelector<HTMLSelectElement>("select.settings-select");
-      expect(select?.value).toBe("");
-      return select;
-    });
-    expect(inheritedSelect?.selectedOptions[0]?.textContent?.trim()).toBe(
+    const inheritedSelect = container.querySelector("wa-select.model-picker__select");
+    expect(inheritedSelect?.querySelector("wa-option[selected]")?.textContent?.trim()).toBe(
       "Inherit default (openai/gpt-5.4)",
     );
   });
@@ -421,13 +415,15 @@ describe("renderAgents", () => {
       container,
     );
 
-    const select = await vi.waitFor(() => {
-      const candidate = container.querySelector<HTMLSelectElement>("select.settings-select");
-      expect(candidate?.value).toBe("anthropic/claude-opus-4-8");
-      return candidate;
-    });
+    const select = container.querySelector("wa-select.model-picker__select");
+    expect(select?.querySelector("wa-option[selected]")?.getAttribute("value")).toBe(
+      "anthropic/claude-opus-4-8",
+    );
     const options = new Map(
-      Array.from(select?.options ?? []).map((option) => [option.value, option.textContent?.trim()]),
+      Array.from(select?.querySelectorAll("wa-option") ?? []).map((option) => [
+        option.getAttribute("value"),
+        option.querySelector(".picker-select__label")?.textContent?.trim(),
+      ]),
     );
 
     expect(options.get("anthropic/claude-opus-4-8")).toBe("Opus 4.8 · opus");
@@ -505,13 +501,8 @@ describe("renderAgents", () => {
       container,
     );
 
-    const betaSelect = await vi.waitFor(() => {
-      const select = container.querySelector<HTMLSelectElement>("select.settings-select");
-      expect(
-        Array.from(select?.options ?? []).some((option) => option.value === "openai/gpt-5.4"),
-      ).toBe(true);
-      return select;
-    });
+    const betaSelect = container.querySelector("wa-select.model-picker__select");
+    expect(betaSelect?.querySelector('wa-option[value="openai/gpt-5.4"]')).not.toBeNull();
 
     render(
       renderAgents(
@@ -529,15 +520,10 @@ describe("renderAgents", () => {
       container,
     );
 
-    const alphaSelect = await vi.waitFor(() => {
-      const select = container.querySelector<HTMLSelectElement>("select.settings-select");
-      expect(
-        Array.from(select?.options ?? []).some(
-          (option) => option.value === "anthropic/claude-sonnet-4-6",
-        ),
-      ).toBe(true);
-      return select;
-    });
+    const alphaSelect = container.querySelector("wa-select.model-picker__select");
+    expect(
+      alphaSelect?.querySelector('wa-option[value="anthropic/claude-sonnet-4-6"]'),
+    ).not.toBeNull();
     expect(alphaSelect).not.toBe(betaSelect);
   });
 
diff --git a/ui/src/pages/channels/hub-meta.ts b/ui/src/pages/channels/hub-meta.ts
index efdefe8752c5..334c56348745 100644
--- a/ui/src/pages/channels/hub-meta.ts
+++ b/ui/src/pages/channels/hub-meta.ts
@@ -1,9 +1,6 @@
 // Channel hub presentation: bundled art reuse plus typed per-channel setup
 // helper links surfaced in the setup wizard. Labels/order still come from the
 // gateway channels.status snapshot; this table only decorates known channels.
-import { html, type TemplateResult } from "lit";
-import { pluginArtPath, pluginFallbackGradient, pluginMonogram } from "../plugins/presentation.ts";
-
 type ChannelSetupLink = {
   label: string;
   url: string;
@@ -46,26 +43,3 @@ export function channelHubMeta(channelId: string): ChannelHubMeta {
 export function channelDocsUrl(channelId: string): string {
   return `https://docs.openclaw.ai/channels/${encodeURIComponent(channelId)}`;
 }
-
-/** Bundled channel art reuses the plugin art set (channel ids match slugs). */
-export function renderChannelArt(
-  channelId: string,
-  label: string,
-  variant: "tile" | "cover",
-): TemplateResult {
-  const art = pluginArtPath(channelId);
-  if (art) {
-    return html`<span class="channels-${variant}">
-      <img src=${art} alt="" loading="lazy" decoding="async" />
-    </span>`;
-  }
-  const [from, to] = pluginFallbackGradient(channelId);
-  const monogram = pluginMonogram(label);
-  return html`<span
-    class="channels-${variant} channels-${variant}--fallback"
-    style=${`--channels-art-a:${from};--channels-art-b:${to}`}
-    aria-hidden="true"
-  >
-    <span>${monogram}</span>
-  </span>`;
-}
diff --git a/ui/src/pages/channels/view.detail.ts b/ui/src/pages/channels/view.detail.ts
index 84d565f87d69..59d2b9e9bb28 100644
--- a/ui/src/pages/channels/view.detail.ts
+++ b/ui/src/pages/channels/view.detail.ts
@@ -3,12 +3,13 @@
 import { asNullableRecord, readStringField } from "@openclaw/normalization-core/record-coerce";
 import { html, nothing, type TemplateResult } from "lit";
 import type { NostrProfile } from "../../api/types.ts";
+import { renderChannelIcon } from "../../components/channel-icon.ts";
 import { renderSettingsSection } from "../../components/settings-ui.ts";
 import { t } from "../../i18n/index.ts";
 import "../../components/modal-dialog.ts";
 import { resolveChannelAccounts } from "../../lib/channels/index.ts";
 import { formatRelativeTimestamp } from "../../lib/format.ts";
-import { channelDocsUrl, renderChannelArt } from "./hub-meta.ts";
+import { channelDocsUrl } from "./hub-meta.ts";
 import { renderChannelConfigSection } from "./view.config.ts";
 import { renderNostrCard } from "./view.nostr.ts";
 import { renderChannelPairingDetail } from "./view.pairing.ts";
@@ -221,7 +222,7 @@ export function renderChannelDetail(params: {
     <openclaw-modal-dialog label=${params.label} @modal-cancel=${() => params.onClose()}>
       <div class="channels-detail">
         <div class="channels-detail__header">
-          ${renderChannelArt(params.channelId, params.label, "cover")}
+          ${renderChannelIcon(params.channelId, params.label, "cover")}
           <div class="channels-detail__header-actions">
             <a
               class="btn btn--sm"
diff --git a/ui/src/pages/channels/view.pairing.test.ts b/ui/src/pages/channels/view.pairing.test.ts
index 775d2b94b58a..f2a9fbc05604 100644
--- a/ui/src/pages/channels/view.pairing.test.ts
+++ b/ui/src/pages/channels/view.pairing.test.ts
@@ -166,10 +166,43 @@ describe("channel DM access request views", () => {
     expect(errorContainer.querySelector(".callout")).toBeNull();
   });
 
-  it("uses settings controls for both pairing filters", () => {
-    const container = renderInto(renderChannelPairingQueue(createProps()));
+  it("uses the channel picker and clears the account filter when the channel changes", () => {
+    const onPairingFilterChange = vi.fn();
+    const base = createProps();
+    const container = renderInto(
+      renderChannelPairingQueue(
+        createProps({
+          pairingChannelFilter: "whatsapp",
+          pairingAccountFilter: "personal",
+          pairingSnapshot: {
+            ...base.pairingSnapshot!,
+            accounts: [
+              ...base.pairingSnapshot!.accounts,
+              {
+                channel: "telegram",
+                channelLabel: "Telegram",
+                accountId: "work",
+                accountLabel: "Work",
+                notifySupported: true,
+              },
+            ],
+          },
+          onPairingFilterChange,
+        }),
+      ),
+    );
 
-    expect(container.querySelectorAll("select.settings-select")).toHaveLength(2);
+    const selects = container.querySelectorAll<HTMLElement & { value: string }>("wa-select");
+    const channel = selects.item(0);
+    const account = selects.item(1);
+    expect(channel?.querySelector('wa-option[value="whatsapp"] img')).not.toBeNull();
+    expect(selects).toHaveLength(2);
+    expect(container.querySelectorAll("select.settings-select")).toHaveLength(0);
+    expect(account.querySelector("wa-option[selected]")?.getAttribute("value")).toBe("personal");
+    Object.defineProperty(channel, "value", { configurable: true, value: "telegram" });
+    channel.dispatchEvent(new Event("change", { bubbles: true }));
+    Reflect.deleteProperty(channel, "value");
+    expect(onPairingFilterChange).toHaveBeenCalledWith("telegram", null);
   });
 
   it("disables every request action while one mutation is active", () => {
diff --git a/ui/src/pages/channels/view.pairing.ts b/ui/src/pages/channels/view.pairing.ts
index c798c409c1c0..456373d9448f 100644
--- a/ui/src/pages/channels/view.pairing.ts
+++ b/ui/src/pages/channels/view.pairing.ts
@@ -1,7 +1,9 @@
 // DM sender access request queue shared by the Channels hub and detail panels.
 import { html, nothing } from "lit";
 import type { ChannelsPairingAccount, ChannelsPairingRequest } from "../../api/types.ts";
+import { renderChannelPicker } from "../../components/channel-picker.ts";
 import "../../components/modal-dialog.ts";
+import { renderPicker } from "../../components/select-picker.ts";
 import {
   renderSettingsEmpty,
   renderSettingsSection,
@@ -24,11 +26,6 @@ function formatRequestTime(value: string): string {
   return Number.isFinite(time) ? formatRelativeTimestamp(time) : value;
 }
 
-function selectValue(event: Event): string | null {
-  const value = event.currentTarget instanceof HTMLSelectElement ? event.currentTarget.value : "";
-  return value || null;
-}
-
 function filteredAccounts(props: ChannelsProps): ChannelsPairingAccount[] {
   const accounts = props.pairingSnapshot?.accounts ?? [];
   return props.pairingChannelFilter
@@ -58,29 +55,32 @@ function renderFilters(props: ChannelsProps) {
     <div class="channels-pairing-filters">
       <label>
         <span>${t("channels.pairing.channelFilter")}</span>
-        <select
-          class="settings-select"
-          .value=${props.pairingChannelFilter ?? ""}
-          @change=${(event: Event) => props.onPairingFilterChange(selectValue(event), null)}
-        >
-          <option value="">${t("channels.pairing.allChannels")}</option>
-          ${channels.map(([channel, label]) => html`<option value=${channel}>${label}</option>`)}
-        </select>
+        ${renderChannelPicker({
+          label: t("channels.pairing.channelFilter"),
+          value: props.pairingChannelFilter ?? "",
+          options: [
+            { value: "", label: t("channels.pairing.allChannels"), kind: "neutral" },
+            ...channels.map(([value, label]) => ({ value, label })),
+          ],
+          onChange: (value) => props.onPairingFilterChange(value || null, null),
+        })}
       </label>
       <label>
         <span>${t("channels.pairing.accountFilter")}</span>
-        <select
-          class="settings-select"
-          .value=${props.pairingAccountFilter ?? ""}
-          ?disabled=${!props.pairingChannelFilter}
-          @change=${(event: Event) =>
-            props.onPairingFilterChange(props.pairingChannelFilter, selectValue(event))}
-        >
-          <option value="">${t("channels.pairing.allAccounts")}</option>
-          ${accountsForChannel.map(
-            (account) => html`<option value=${account.accountId}>${accountName(account)}</option>`,
-          )}
-        </select>
+        ${renderPicker({
+          label: t("channels.pairing.accountFilter"),
+          value: props.pairingAccountFilter ?? "",
+          options: [
+            { value: "", label: t("channels.pairing.allAccounts") },
+            ...accountsForChannel.map((account) => ({
+              value: account.accountId,
+              label: accountName(account),
+            })),
+          ],
+          disabled: !props.pairingChannelFilter,
+          onChange: (value) =>
+            props.onPairingFilterChange(props.pairingChannelFilter, value || null),
+        })}
       </label>
     </div>
   `;
diff --git a/ui/src/pages/channels/view.ts b/ui/src/pages/channels/view.ts
index 73ad0c801d25..5c6af148cb26 100644
--- a/ui/src/pages/channels/view.ts
+++ b/ui/src/pages/channels/view.ts
@@ -13,6 +13,7 @@ import type {
   TelegramStatus,
   WhatsAppStatus,
 } from "../../api/types.ts";
+import { renderChannelIcon } from "../../components/channel-icon.ts";
 import { icons } from "../../components/icons.ts";
 import "../../components/openclaw-mascot.ts";
 import {
@@ -24,7 +25,6 @@ import {
 import { t } from "../../i18n/index.ts";
 import { resolveChannelAccounts } from "../../lib/channels/index.ts";
 import { formatRelativeTimestamp } from "../../lib/format.ts";
-import { renderChannelArt } from "./hub-meta.ts";
 import { renderChannelDetail } from "./view.detail.ts";
 import { renderChannelPairingPrompt, renderChannelPairingQueue } from "./view.pairing.ts";
 import { channelEnabled, resolveChannelDisplayState } from "./view.shared.ts";
@@ -232,7 +232,7 @@ function renderConnectedRow(key: ChannelKey, props: ChannelsProps) {
       class="settings-row settings-row--nav channels-item"
       @click=${() => props.onShowDetail(key)}
     >
-      ${renderChannelArt(key, label, "tile")}
+      ${renderChannelIcon(key, label, "tile")}
       <div class="settings-row__text">
         <span class="settings-row__title">${label}</span>
         <span class="settings-row__desc">${description}</span>
@@ -257,7 +257,7 @@ function renderAvailableRow(key: ChannelKey, props: ChannelsProps) {
         title=${t("channels.hub.openDetails")}
         @click=${() => props.onShowDetail(key)}
       >
-        ${renderChannelArt(key, label, "tile")}
+        ${renderChannelIcon(key, label, "tile")}
         <span class="settings-row__text">
           <span class="settings-row__title">${label}</span>
           <span class="settings-row__desc">${description}</span>
diff --git a/ui/src/pages/channels/wizard-view.busy.test.ts b/ui/src/pages/channels/wizard-view.busy.test.ts
index ef77296a2e20..eeb0fec3838e 100644
--- a/ui/src/pages/channels/wizard-view.busy.test.ts
+++ b/ui/src/pages/channels/wizard-view.busy.test.ts
@@ -118,11 +118,9 @@ describe("renderChannelWizard busy controls", () => {
         { label: "Beta", value: "beta" },
       ],
     });
-    const group = select.container.querySelector<HTMLElement & { disabled: boolean }>(
-      "wa-radio-group",
-    );
-    expect(group?.disabled).toBe(true);
+    const group = select.container.querySelector("wa-select");
     expect(group?.hasAttribute("disabled")).toBe(true);
+    expect(group?.querySelector('[slot="label"]')?.textContent).toBe("Pick one");
   });
 
   it("disables multiselect choices and submission while a step is running", () => {
@@ -182,9 +180,7 @@ describe("renderChannelWizard busy controls", () => {
       },
       false,
     );
-    expect(
-      select.container.querySelector<HTMLElement & { disabled: boolean }>("wa-radio-group")
-        ?.disabled,
-    ).toBe(false);
+    const picker = select.container.querySelector("wa-select");
+    expect(picker?.hasAttribute("disabled")).toBe(false);
   });
 });
diff --git a/ui/src/pages/channels/wizard-view.ts b/ui/src/pages/channels/wizard-view.ts
index b8ea238b3de8..90b3fe1eab44 100644
--- a/ui/src/pages/channels/wizard-view.ts
+++ b/ui/src/pages/channels/wizard-view.ts
@@ -1,13 +1,12 @@
 // Channel setup wizard modal: renders gateway wizard steps (note/select/text/
 // confirm/multiselect) plus the WhatsApp QR linking phase after config write.
-import "@awesome.me/webawesome/dist/components/radio/radio.js";
-import "@awesome.me/webawesome/dist/components/radio-group/radio-group.js";
 import { html, nothing, type TemplateResult } from "lit";
+import { renderChannelIcon } from "../../components/channel-icon.ts";
 import { handleCopyButton } from "../../components/copy-button.ts";
 import { renderWizardStepControls } from "../../components/wizard-step-controls.ts";
 import { t } from "../../i18n/index.ts";
 import "../../components/modal-dialog.ts";
-import { channelDocsUrl, channelHubMeta, renderChannelArt } from "./hub-meta.ts";
+import { channelDocsUrl, channelHubMeta } from "./hub-meta.ts";
 import type { ChannelWizardState, ChannelWizardStep } from "./wizard-controller.ts";
 
 type ChannelWizardViewProps = {
@@ -99,6 +98,7 @@ function renderStepBody(step: ChannelWizardStep, props: ChannelWizardViewProps)
     busy: stepIsBusy(props),
     inputId: "channel-wizard-text-input",
     presentation: "channels",
+    channelSelect: props.wizard.phase === "step" && props.wizard.channel === null,
     answerLabel: t("channels.setup.continue"),
     sensitiveRevealed: props.secretVisible,
     onValueChange:
@@ -260,7 +260,7 @@ export function renderChannelWizard(
     >
       <div class="channels-wizard">
         <div class="channels-wizard__header">
-          ${channel ? renderChannelArt(channel, label, "tile") : nothing}
+          ${channel ? renderChannelIcon(channel, label, "tile") : nothing}
           <div class="channels-wizard__heading">
             <h2>${t("channels.setup.title", { channel: label })}</h2>
             <div class="muted">${t("channels.setup.subtitle")}</div>
diff --git a/ui/src/pages/chat/chat-pane-lifecycle.ts b/ui/src/pages/chat/chat-pane-lifecycle.ts
index 23ce7ffd1740..1b73d17f694f 100644
--- a/ui/src/pages/chat/chat-pane-lifecycle.ts
+++ b/ui/src/pages/chat/chat-pane-lifecycle.ts
@@ -50,7 +50,6 @@ import { invalidateChatMetadataCache, refreshPageChat } from "./chat-state-refre
 import { selectedChatSessionRow } from "./chat-state-route.ts";
 import { resetChatViewState } from "./chat-view-state.ts";
 import { dismissConfirmedActionPopovers } from "./components/chat-message.ts";
-import { clearChatModelSearchOnEscape } from "./components/chat-model-picker.ts";
 import { toggleSessionWorkspace } from "./components/chat-session-workspace.ts";
 import { WIDGET_PROMPT_EVENT, type WidgetPromptEventDetail } from "./components/chat-tool-cards.ts";
 import { CHAT_COMPOSER_DRAFT_STORAGE_ERROR } from "./composer-persistence.ts";
@@ -304,7 +303,6 @@ export abstract class ChatPaneLifecycle extends ChatPaneSessionCreation {
       }
     }
 
-    clearChatModelSearchOnEscape(event);
     if (event.defaultPrevented || event.key !== "Escape") {
       return;
     }
diff --git a/ui/src/pages/chat/chat-responsive.browser.test.ts b/ui/src/pages/chat/chat-responsive.browser.test.ts
index c61ac21eafe8..3ec99153f5aa 100644
--- a/ui/src/pages/chat/chat-responsive.browser.test.ts
+++ b/ui/src/pages/chat/chat-responsive.browser.test.ts
@@ -291,22 +291,11 @@ function composerControlsHtml(crowded = false) {
       }
       <div class="chat-composer-model-control">
         <div class="chat-controls__session chat-controls__model chat-controls__model-settings">
-          <details class="chat-controls__inline-select chat-controls__model-picker">
-          <summary class="chat-controls__inline-select-trigger chat-controls__model-trigger" data-chat-composer-model="true" aria-label="Chat model">
+          <div class="chat-controls__model-control">
+          <div class="chat-controls__inline-select-trigger chat-controls__model-trigger" data-chat-composer-model="true" aria-label="Chat model">
             <span class="chat-controls__inline-select-label">GPT-5.6 Luna</span>
-          </summary>
-          <div class="chat-controls__inline-select-menu chat-controls__model-menu">
-            <div class="chat-controls__model-search-wrap"><input class="chat-controls__model-search" placeholder="Search models" /></div>
-            <div class="chat-controls__model-options">
-              <button class="chat-controls__inline-select-option chat-controls__model-option chat-controls__inline-select-option--selected">Default model</button>
-              <button class="chat-controls__inline-select-option chat-controls__model-option">gpt-5.5</button>
-              <button class="chat-controls__inline-select-option chat-controls__model-option">claude-sonnet-4-6</button>
-              <button class="chat-controls__inline-select-option chat-controls__model-option">gpt-5.6-luna</button>
-              <button class="chat-controls__inline-select-option chat-controls__model-option">gpt-5.6-sol</button>
-              <button class="chat-controls__inline-select-option chat-controls__model-option">openrouter/auto</button>
-            </div>
           </div>
-          </details>
+          </div>
           <details class="chat-controls__inline-select chat-controls__effort-picker">
           <summary class="chat-controls__inline-select-trigger chat-controls__effort-trigger" data-chat-composer-effort="true" aria-label="Effort">
             <span class="chat-controls__inline-select-label">High</span>
@@ -2427,10 +2416,6 @@ describeBrowserLayout.concurrent("chat responsive browser layout", () => {
       try {
         const composer = await getBoundingBox(page, ".agent-chat__input");
         for (const picker of [
-          {
-            menu: ".chat-controls__model-menu",
-            trigger: '[data-chat-composer-model="true"]',
-          },
           {
             menu: ".chat-controls__effort-menu",
             trigger: '[data-chat-composer-effort="true"]',
@@ -2484,14 +2469,14 @@ describeBrowserLayout.concurrent("chat responsive browser layout", () => {
         });
       });
       await syncFixtureComposerPopoverAnchor(page);
-      await page.locator('[data-chat-composer-model="true"]').evaluate((node) => {
+      await page.locator('[data-chat-composer-effort="true"]').evaluate((node) => {
         node.parentElement?.setAttribute("open", "");
       });
       await waitForLayoutSettled(page);
       await syncFixtureComposerPopoverAnchor(page);
       await waitForLayoutSettled(page);
       const composer = await getBoundingBox(page, ".agent-chat__input");
-      const menu = await getBoundingBox(page, ".chat-controls__model-menu");
+      const menu = await getBoundingBox(page, ".chat-controls__effort-menu");
       const anchorEvidence = await page.locator(".agent-chat__input").evaluate((node) => ({
         anchorBottom: getComputedStyle(node).getPropertyValue("--chat-composer-popover-bottom"),
         layoutHeight: document.documentElement.clientHeight,
diff --git a/ui/src/pages/chat/chat-view.test.ts b/ui/src/pages/chat/chat-view.test.ts
index fff8382daeb9..3d052746257e 100644
--- a/ui/src/pages/chat/chat-view.test.ts
+++ b/ui/src/pages/chat/chat-view.test.ts
@@ -543,8 +543,10 @@ function createOpenAiHeaderState(overrides: Parameters<typeof createChatHeaderSt
   });
 }
 
-function getChatModelSelect(container: Element): HTMLElement {
-  const select = container.querySelector<HTMLElement>('[data-chat-model-select="true"]');
+function getChatModelSelect(container: Element): HTMLElement & { value: string } {
+  const select = container.querySelector<HTMLElement & { value: string }>(
+    "wa-select.chat-controls__model-picker",
+  );
   expect(select).toBeInstanceOf(HTMLElement);
   if (!(select instanceof HTMLElement)) {
     throw new Error("Expected chat model control");
@@ -552,6 +554,19 @@ function getChatModelSelect(container: Element): HTMLElement {
   return select;
 }
 
+function getChatModelOption(container: Element, value: string): HTMLElement | null {
+  return container.querySelector(
+    `wa-select.chat-controls__model-picker wa-option[value="${value}"]`,
+  );
+}
+
+function changeChatModel(container: Element, value: string) {
+  const select = getChatModelSelect(container);
+  Object.defineProperty(select, "value", { configurable: true, value });
+  select.dispatchEvent(new Event("change", { bubbles: true }));
+  Reflect.deleteProperty(select, "value");
+}
+
 type ChatModelControlsProps = Parameters<typeof renderChatModelControls>[0];
 
 function createChatModelControlsProps(state: ChatHeaderTestState): ChatModelControlsProps {
@@ -5332,7 +5347,7 @@ describe("chat model controls", () => {
     const container = renderModelControls(state);
 
     const modelSelect = getChatModelSelect(container);
-    expect(modelSelect.getAttribute("aria-disabled")).toBe("true");
+    expect(modelSelect.hasAttribute("disabled")).toBe(true);
   });
 
   it("shows an empty state instead of a configured default when no usable models exist", () => {
@@ -5343,7 +5358,9 @@ describe("chat model controls", () => {
     });
     const container = renderModelControls(state);
 
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(0);
+    const options = container.querySelectorAll("wa-select.chat-controls__model-picker wa-option");
+    expect(options).toHaveLength(1);
+    expect(options[0]?.hasAttribute("disabled")).toBe(true);
     expect(
       container.querySelector('[data-chat-model-catalog-state="ready"]')?.textContent,
     ).toContain("No models available");
@@ -5354,12 +5371,12 @@ describe("chat model controls", () => {
     const onModelSelect = vi.fn(async () => true);
     const container = renderModelControls(state, { onModelSelect });
     const modelOption = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]"),
-    ).find((button) => button.getAttribute("aria-selected") === "false");
-    expect(modelOption).toBeInstanceOf(HTMLButtonElement);
-    modelOption?.click();
+      container.querySelectorAll<HTMLElement>("wa-select.chat-controls__model-picker wa-option"),
+    ).find((option) => !option.hasAttribute("selected") && option.getAttribute("value"));
+    expect(modelOption).toBeInstanceOf(HTMLElement);
+    changeChatModel(container, modelOption?.getAttribute("value") ?? "");
 
-    expect(onModelSelect).toHaveBeenCalledWith(modelOption?.dataset.chatModelOption, "main");
+    expect(onModelSelect).toHaveBeenCalledWith(modelOption?.getAttribute("value"), "main");
   });
 
   it("keeps model enabled while write-only access disables effort controls", () => {
@@ -5376,31 +5393,28 @@ describe("chat model controls", () => {
     });
 
     const modelSelect = getChatModelSelect(container);
-    expect(modelSelect.getAttribute("aria-disabled")).toBe("false");
+    expect(modelSelect.hasAttribute("disabled")).toBe(false);
     expect(modelSelect.getAttribute("title")).not.toBe(reason);
     const modelOption = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]"),
-    ).find((button) => button.getAttribute("aria-selected") === "false");
-    modelOption?.click();
+      container.querySelectorAll<HTMLElement>("wa-select.chat-controls__model-picker wa-option"),
+    ).find((option) => !option.hasAttribute("selected") && option.getAttribute("value"));
+    changeChatModel(container, modelOption?.getAttribute("value") ?? "");
     container.querySelector<HTMLButtonElement>("[data-chat-speed-toggle]")?.click();
     getThinkingSlider(container)?.dispatchEvent(new Event("change", { bubbles: true }));
 
     expect(onFastModeSelect).not.toHaveBeenCalled();
-    expect(onModelSelect).toHaveBeenCalledWith(modelOption?.dataset.chatModelOption, "main");
+    expect(onModelSelect).toHaveBeenCalledWith(modelOption?.getAttribute("value"), "main");
     expect(onThinkingSelect).not.toHaveBeenCalled();
   });
 
-  it("marks the inherited default muted and resets an override from the provenance row", () => {
+  it("preserves the empty-string default override and clears an explicit override", () => {
     const { state } = createChatHeaderState({
       model: null,
       models: createOpenAiModelCatalog(),
     });
     const container = renderModelControls(state);
 
-    expect(
-      container.querySelector(".chat-controls__model-provenance-value--inherit"),
-    ).not.toBeNull();
-    expect(container.querySelector("[data-chat-model-reset]")).toBeNull();
+    expect(getChatModelOption(container, "")?.hasAttribute("selected")).toBe(true);
 
     const onModelSelect = vi.fn(async () => true);
     renderModelControls(
@@ -5409,22 +5423,9 @@ describe("chat model controls", () => {
       container,
     );
 
-    expect(container.querySelector(".chat-controls__model-provenance-value--inherit")).toBeNull();
-    const reset = container.querySelector<HTMLButtonElement>("[data-chat-model-reset]");
-    const modelSelect = getChatModelSelect(container);
-    const details = modelSelect.closest<HTMLDetailsElement>("details");
-    document.body.append(container);
-    if (details) {
-      details.open = true;
-    }
-    expect(reset).toBeInstanceOf(HTMLButtonElement);
-    expect(reset?.textContent?.trim()).toBe("Use default");
-    reset?.focus();
-    reset?.click();
+    expect(getChatModelOption(container, "")?.hasAttribute("selected")).toBe(false);
+    changeChatModel(container, "");
     expect(onModelSelect).toHaveBeenCalledWith("", "main");
-    expect(details?.open).toBe(false);
-    expect(document.activeElement).toBe(modelSelect);
-    container.remove();
   });
 
   it("hides model choices for locked sessions while preserving reasoning and speed", () => {
@@ -5446,16 +5447,9 @@ describe("chat model controls", () => {
     });
 
     const modelSelect = getChatModelSelect(container);
-    expect(modelSelect.dataset.chatModelLocked).toBe("true");
-    expect(modelSelect.getAttribute("aria-disabled")).toBe("false");
-    expect(container.querySelector(".chat-controls__locked-model-value")?.textContent).toBe(
-      "Codex-controlled model",
-    );
-    expect(
-      container.querySelector(".chat-controls__inline-select-label")?.textContent,
-    ).not.toContain("GPT-5.5");
-    expect(container.querySelectorAll("[data-chat-model-provider]")).toHaveLength(0);
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(0);
+    expect(modelSelect.hasAttribute("disabled")).toBe(true);
+    expect(modelSelect.querySelectorAll("wa-option")).toHaveLength(1);
+    expect(modelSelect.querySelector("wa-option")?.textContent).toContain("Codex-controlled model");
     expect(onModelSelect).not.toHaveBeenCalled();
 
     const slider = getThinkingSlider(container);
@@ -5502,10 +5496,7 @@ describe("chat model controls", () => {
       modelSelectionRuntimeId: runtimeId,
     });
 
-    expect(container.querySelector(".chat-controls__locked-model-value")?.textContent).toBe(
-      expected,
-    );
-    expect(container.querySelector(".chat-controls__inline-select-label")?.textContent).toContain(
+    expect(getChatModelSelect(container).querySelector("wa-option")?.textContent).toContain(
       expected,
     );
     if (runtimeId === "openclaw") {
@@ -5538,16 +5529,13 @@ describe("chat model controls", () => {
     state.chatStream = "Working";
     const onModelSelect = vi.fn(async () => true);
     const container = renderModelControls(state, { onModelSelect });
-    const modelOption = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]"),
-    ).find((button) => button.getAttribute("aria-selected") === "false");
-    expect(modelOption?.disabled).toBe(true);
-    modelOption?.click();
+    expect(getChatModelSelect(container).hasAttribute("disabled")).toBe(true);
+    changeChatModel(container, "openai/gpt-5.4");
 
     expect(onModelSelect).not.toHaveBeenCalled();
   });
 
-  it("groups models and filters them with keyboard selection", () => {
+  it("renders provider artwork and selects an exact model value", () => {
     const { state } = createChatHeaderState({
       model: "gpt-5.5",
       modelProvider: "openai",
@@ -5559,51 +5547,22 @@ describe("chat model controls", () => {
     });
     const onModelSelect = vi.fn(async () => true);
     const container = renderModelControls(state, { onModelSelect });
-    document.body.append(container);
-
-    const providerHeadings = Array.from(
-      container.querySelectorAll<HTMLElement>("[data-chat-model-provider]"),
+    const options = Array.from(
+      container.querySelectorAll<HTMLElement>("wa-select.chat-controls__model-picker wa-option"),
     );
-    expect(providerHeadings.map((heading) => heading.textContent?.trim())).toEqual([
-      "OpenAI",
-      "Anthropic",
-      "Google",
-    ]);
-    const anthropicModels = container.querySelector<HTMLElement>(
-      '[data-chat-model-provider-group="anthropic"]',
-    );
-    expect(anthropicModels?.textContent).toContain("Claude Sonnet 4.6");
-    const details = container.querySelector<HTMLDetailsElement>(".chat-controls__model-picker");
-    const search = container.querySelector<HTMLInputElement>("[data-chat-model-search]");
-    details!.open = true;
-    search!.value = "anth";
-    search!.dispatchEvent(new InputEvent("input", { bubbles: true }));
-
-    const visibleOptions = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]"),
-    ).filter((option) => !option.hidden);
-    expect(visibleOptions.map((option) => option.dataset.chatModelOption)).toEqual([
+    expect(options.map((option) => option.getAttribute("value"))).toEqual([
+      "",
+      "openai/gpt-5.5",
       "anthropic/claude-sonnet-4-6",
+      "google/gemini-2.5-pro",
     ]);
-    expect(visibleOptions[0]?.hasAttribute("data-chat-model-highlighted")).toBe(true);
     expect(
-      visibleOptions[0]
-        ?.querySelector("[data-chat-model-shortcut]")
-        ?.getAttribute("data-chat-model-shortcut-number"),
-    ).toBe("1");
-    expect(
-      visibleOptions[0]?.querySelector(".chat-controls__model-option-provider"),
-    ).not.toBeNull();
-
-    search!.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }));
-    const highlighted = container.querySelector<HTMLButtonElement>("[data-chat-model-highlighted]");
-    expect(highlighted?.id).not.toBe("");
-    expect(search?.getAttribute("aria-activedescendant")).toBe(highlighted?.id);
-
-    search!.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
+      options.map((option) =>
+        option.querySelector("[data-provider-icon]")?.getAttribute("data-provider-icon"),
+      ),
+    ).toEqual(["codex", "codex", "claude", "gemini"]);
+    changeChatModel(container, "anthropic/claude-sonnet-4-6");
     expect(onModelSelect).toHaveBeenCalledWith("anthropic/claude-sonnet-4-6", "main");
-    expect(details?.open).toBe(false);
-    container.remove();
   });
 
   it("groups legacy Codex model references under OpenAI", () => {
@@ -5617,14 +5576,11 @@ describe("chat model controls", () => {
     });
     const container = renderModelControls(state);
 
-    const providerButtons = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-provider]"),
-    );
-    expect(providerButtons.map((button) => button.textContent?.trim())).toEqual(["OpenAI"]);
+    const options = container.querySelectorAll("wa-select.chat-controls__model-picker wa-option");
+    expect(options).toHaveLength(3);
     expect(
-      container.querySelector<HTMLElement>('[data-chat-model-provider-group="openai"]')?.hidden,
-    ).toBe(false);
-    expect(container.querySelector('[data-chat-model-provider-group="codex"]')).toBeNull();
+      [...options].every((option) => option.querySelector('[data-provider-icon="codex"]')),
+    ).toBe(true);
   });
 
   it("merges provider aliases into unique visible groups", () => {
@@ -5644,35 +5600,27 @@ describe("chat model controls", () => {
     });
     const container = renderModelControls(state);
 
-    const providerButtons = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-provider]"),
+    const options = Array.from(
+      container.querySelectorAll("wa-select.chat-controls__model-picker wa-option"),
     );
-    const providerLabels = providerButtons.map((button) => button.textContent?.trim());
-    expect(providerLabels).toEqual(["Google", "OpenCode", "Moonshot AI"]);
-    expect(new Set(providerLabels).size).toBe(providerLabels.length);
+    expect(options.map((option) => option.textContent?.trim())).toEqual([
+      "Default (gpt-5 · openai)",
+      "Gemini 2.5 Pro",
+      "Gemini CLI",
+      "Sonnet",
+      "Kimi",
+      "GLM",
+      "Kimi K3",
+      "Kimi K2.7",
+      "Kimi K2.6",
+    ]);
     expect(
-      container.querySelector('[data-chat-model-provider-group="google"]')?.textContent,
-    ).toContain("Gemini CLI");
-    const openCodeModels = container.querySelector(
-      '[data-chat-model-provider-group="opencode"]',
-    )?.textContent;
-    expect(openCodeModels).toContain("Sonnet");
-    expect(openCodeModels).toContain("Kimi");
-    expect(openCodeModels).toContain("GLM");
-    expect(openCodeModels).not.toContain("OpenCode Sonnet");
-    expect(
-      container.querySelector('[data-chat-model-provider-group="google-gemini-cli"]'),
-    ).toBeNull();
-    expect(container.querySelector('[data-chat-model-provider-group="opencode-go"]')).toBeNull();
-    expect(container.querySelector('[data-chat-model-provider-group="opencode-zen"]')).toBeNull();
-    const moonshotModels = container.querySelector(
-      '[data-chat-model-provider-group="moonshot"]',
-    )?.textContent;
-    expect(moonshotModels).toContain("Kimi K3");
-    expect(moonshotModels).toContain("Kimi K2.7");
-    expect(moonshotModels).toContain("Kimi K2.6");
-    expect(container.querySelector('[data-chat-model-provider-group="moonshot-ai"]')).toBeNull();
-    expect(container.querySelector('[data-chat-model-provider-group="moonshotai"]')).toBeNull();
+      new Set(
+        options.map((option) =>
+          option.querySelector("[data-provider-icon]")?.getAttribute("data-provider-icon"),
+        ),
+      ),
+    ).toEqual(new Set(["codex", "gemini", "opencode", "kimi"]));
   });
 
   it("shows model context size inline without a redundant tooltip", () => {
@@ -5689,14 +5637,9 @@ describe("chat model controls", () => {
       ],
     });
     const container = renderModelControls(state);
-    const modelOption = container.querySelector<HTMLButtonElement>(
-      '[data-chat-model-option="openai/gpt-5.6-sol"]',
-    );
+    const modelOption = getChatModelOption(container, "openai/gpt-5.6-sol");
 
-    expect(modelOption?.querySelector(".chat-controls__model-option-meta")?.textContent).toBe("1M");
-    expect(
-      getChatModelSelect(container).querySelector(".chat-controls__trigger-meta")?.textContent,
-    ).toBe("1M");
+    expect(modelOption?.querySelector(".picker-select__description")?.textContent).toBe("1M");
     expect(modelOption?.closest("openclaw-tooltip")).toBeNull();
   });
 
@@ -5744,16 +5687,15 @@ describe("chat model controls", () => {
     });
     const container = renderModelControls(state);
     const metaFor = (value: string) =>
-      container.querySelector(
-        `[data-chat-model-option="${value}"] .chat-controls__model-option-meta`,
-      )?.textContent;
+      getChatModelOption(container, value)?.querySelector(".picker-select__description")
+        ?.textContent;
 
-    expect(metaFor("openai/gpt-5.6")).toBe("1M · OpenClaw");
+    expect(metaFor("openai/gpt-5.6")).toBe("OpenClaw · 1M");
     expect(metaFor("openai/gpt-5.6")).not.toContain("Codex");
-    expect(metaFor("openai/gpt-5.6-sol")).toBe("1M · Codex");
+    expect(metaFor("openai/gpt-5.6-sol")).toBe("Codex · 1M");
     // Known CLI runtime ids map to their product labels, not capitalized ids.
-    expect(metaFor("anthropic/claude-opus-4-5")).toBe("200k · Claude CLI");
-    expect(metaFor("google/gemini-3-pro")).toBe("1M · Gemini CLI");
+    expect(metaFor("anthropic/claude-opus-4-5")).toBe("Claude CLI · 200k");
+    expect(metaFor("google/gemini-3-pro")).toBe("Gemini CLI · 1M");
     // Implicitly resolved runtimes stay unlabeled; only operator-pinned
     // (source model/provider) rows carry the runtime meta.
     expect(metaFor("openai/gpt-5.6-terra")).toBe("1M");
@@ -5780,22 +5722,13 @@ describe("chat model controls", () => {
       ],
     });
     const container = renderModelControls(state);
-    const trigger = getChatModelSelect(container);
 
-    expect(trigger.dataset.chatModelTools).toBe("unavailable");
     expect(
-      trigger.querySelector(".chat-controls__model-capability-badge")?.textContent?.trim(),
-    ).toBe("Chat only");
-    expect(trigger.getAttribute("aria-label")).toContain("Chat only");
-    expect(
-      container
-        .querySelector('[data-chat-model-option="lmstudio/qwen3-8b"]')
-        ?.querySelector(".chat-controls__model-option-meta")
+      getChatModelOption(container, "lmstudio/qwen3-8b")
+        ?.querySelector(".picker-select__description")
         ?.textContent?.trim(),
     ).toBe("32.8k · Chat only");
-    expect(
-      container.querySelector('[data-chat-model-option="openai/gpt-5.5"]')?.textContent,
-    ).not.toContain("Chat only");
+    expect(getChatModelOption(container, "openai/gpt-5.5")?.textContent).not.toContain("Chat only");
   });
 
   it("shows canonical OpenAI model names instead of command aliases", () => {
@@ -5820,19 +5753,13 @@ describe("chat model controls", () => {
     });
     const container = renderModelControls(state);
 
-    expect(
-      getChatModelSelect(container)
-        .querySelector(".chat-controls__inline-select-label")
-        ?.textContent?.trim(),
-    ).toBe("GPT-5.5");
+    expect(getChatModelOption(container, "openai/gpt-5.5")?.textContent?.trim()).toBe("GPT-5.5");
     expect(
       getThinkingSelect(container)
         .querySelector(".chat-controls__inline-select-label")
         ?.textContent?.trim(),
     ).toBe("High");
-    expect(
-      container.querySelector('[data-chat-model-option="openai/gpt-5.5"]')?.textContent,
-    ).toContain("GPT-5.5");
+    expect(getChatModelOption(container, "openai/gpt-5.5")?.textContent).toContain("GPT-5.5");
   });
 
   it("marks the actual default model row and selects it when inherited", () => {
@@ -5860,22 +5787,14 @@ describe("chat model controls", () => {
     const container = document.createElement("div");
     renderModelControls(state, { modelOverrides: { main: null } }, container);
 
-    expect(
-      getChatModelSelect(container)
-        .querySelector(".chat-controls__inline-select-label")
-        ?.textContent?.trim(),
-    ).toBe("GPT-5.5");
-    const defaultOptions = container.querySelectorAll<HTMLButtonElement>(
-      '[data-chat-model-default="true"]',
+    const defaultOptions = container.querySelectorAll(
+      'wa-select.chat-controls__model-picker wa-option[value=""]',
     );
     expect(defaultOptions).toHaveLength(1);
     const defaultOption = defaultOptions[0];
-    expect(defaultOption?.dataset.chatModelOption).toBe("openai/gpt-5.5");
-    expect(defaultOption?.getAttribute("aria-selected")).toBe("true");
+    expect(defaultOption?.hasAttribute("selected")).toBe(true);
     expect(defaultOption?.textContent).toContain("GPT-5.5");
     expect(defaultOption?.textContent).toContain("Default");
-    expect(defaultOption?.querySelector(".chat-controls__inline-select-check")).not.toBeNull();
-    expect(container.querySelector('[data-chat-model-option=""]')).toBeNull();
   });
 
   it.each([
@@ -5884,16 +5803,14 @@ describe("chat model controls", () => {
       model: "gpt-5.4",
       models: createOpenAiModelCatalog(),
       sessionKey: "default-clear",
-      selected: "false",
     },
     {
       name: "clears an explicit override that matches the default model",
       model: "gpt-5.5",
       models: [{ id: "gpt-5.5", name: "GPT-5.5", provider: "openai" }],
       sessionKey: "explicit-default",
-      selected: "true",
     },
-  ])("$name", async ({ model, models, sessionKey, selected }) => {
+  ])("$name", async ({ model, models, sessionKey }) => {
     const { state } = createChatHeaderState({ model, modelProvider: "openai", models });
     state.sessionsResult = createSessionsListResult({
       defaultsModel: "gpt-5.5",
@@ -5908,15 +5825,12 @@ describe("chat model controls", () => {
       onModelSelect,
     });
 
-    const defaultOption = container.querySelector<HTMLButtonElement>(
-      '[data-chat-model-option="openai/gpt-5.5"][data-chat-model-default="true"]',
-    );
-    expect(defaultOption).toBeInstanceOf(HTMLButtonElement);
-    expect(defaultOption?.getAttribute("aria-selected")).toBe(selected);
+    const defaultOption = getChatModelOption(container, "");
+    expect(defaultOption).toBeInstanceOf(HTMLElement);
+    expect(defaultOption?.hasAttribute("selected")).toBe(false);
     expect(defaultOption?.textContent).toContain("Default");
-    const currentOption = container.querySelector<HTMLButtonElement>('[aria-selected="true"]');
-    expect(currentOption?.querySelector(".chat-controls__inline-select-check")).not.toBeNull();
-    defaultOption?.click();
+    expect(getChatModelOption(container, `openai/${model}`)?.hasAttribute("selected")).toBe(true);
+    changeChatModel(container, "");
 
     await waitForFast(() => {
       expect(onModelSelect).toHaveBeenCalledWith("", sessionKey);
@@ -5945,21 +5859,19 @@ describe("chat model controls", () => {
     });
     const container = renderModelControls(state);
 
-    const providerButtons = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-provider]"),
+    const options = Array.from(
+      container.querySelectorAll("wa-select.chat-controls__model-picker wa-option"),
     );
-    expect(providerButtons.map((button) => button.textContent?.trim())).toEqual([
-      "OpenRouter",
-      "Google",
+    expect(options.map((option) => option.textContent?.trim())).toEqual([
+      "Gemma 4 · google",
+      "Default (Gemma 4 · openrouter)",
+      "Gemma 4",
     ]);
     expect(
-      container.querySelector<HTMLElement>('[data-chat-model-provider-group="google"]')
-        ?.textContent,
-    ).toContain("Gemma 4");
-    expect(
-      container.querySelector<HTMLElement>('[data-chat-model-provider-group="openrouter"]')
-        ?.textContent,
-    ).toContain("Gemma 4");
+      options.map((option) =>
+        option.querySelector("[data-provider-icon]")?.getAttribute("data-provider-icon"),
+      ),
+    ).toEqual(["gemini", "openrouter", "openrouter"]);
   });
 
   it("uses a unique catalog provider before an unrelated stale session hint", () => {
@@ -5978,14 +5890,10 @@ describe("chat model controls", () => {
       modelOverrides: { main: "moonshotai/kimi-k2.5" },
     });
 
-    const providers = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-provider]"),
-    ).map((button) => button.dataset.chatModelProvider);
-    expect(providers).toContain("nvidia");
-    expect(providers).not.toContain("zai");
-    expect(
-      container.querySelector<HTMLElement>('[data-chat-model-provider-group="nvidia"]')?.hidden,
-    ).toBe(false);
+    const icon = getChatModelOption(container, "moonshotai/kimi-k2.5")?.querySelector(
+      ".provider-brand-icon--fallback",
+    );
+    expect(icon?.textContent?.trim()).toBe("N");
   });
 
   it("renders reasoning as a slider and speed as a fast-mode toggle", () => {
@@ -6011,13 +5919,9 @@ describe("chat model controls", () => {
     expect(speedToggle?.getAttribute("aria-checked")).toBe("false");
     expect(speedToggle?.dataset.chatSpeedToggle).toBe("on");
     expect(
-      container.querySelector('[data-chat-model-select="true"] .chat-controls__provider-icon'),
-    ).toBeNull();
-    expect(
-      container.querySelector("[data-chat-model-option] .chat-controls__provider-icon"),
-    ).not.toBeNull();
-    expect(
-      container.querySelector('[data-chat-model-provider="openai"] [data-provider-icon]'),
+      container.querySelector(
+        'wa-select.chat-controls__model-picker wa-option [data-provider-icon="codex"]',
+      ),
     ).not.toBeNull();
   });
 
@@ -6035,14 +5939,11 @@ describe("chat model controls", () => {
     });
 
     const modelOption = Array.from(
-      container.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]"),
-    ).find(
-      (button) =>
-        button.getAttribute("aria-selected") === "false" && button.dataset.chatModelOption !== "",
-    );
-    expect(modelOption).toBeInstanceOf(HTMLButtonElement);
-    modelOption?.click();
-    expect(onModelSelect).toHaveBeenCalledWith(modelOption?.dataset.chatModelOption, "main");
+      container.querySelectorAll<HTMLElement>("wa-select.chat-controls__model-picker wa-option"),
+    ).find((option) => !option.hasAttribute("selected") && option.getAttribute("value"));
+    expect(modelOption).toBeInstanceOf(HTMLElement);
+    changeChatModel(container, modelOption?.getAttribute("value") ?? "");
+    expect(onModelSelect).toHaveBeenCalledWith(modelOption?.getAttribute("value"), "main");
 
     const slider = getThinkingSlider(container);
     expect(slider).toBeInstanceOf(HTMLInputElement);
@@ -6396,19 +6297,13 @@ describe("chat model controls", () => {
     };
     render(renderChatModelControls(props), container);
 
-    container
-      .querySelector<HTMLButtonElement>('[data-chat-model-option="openai/gpt-5.4"]')
-      ?.click();
+    changeChatModel(container, "openai/gpt-5.4");
 
     await waitForFast(() => {
       expect(onModelSelect).toHaveBeenCalledWith("openai/gpt-5.4", "main");
     });
     render(renderChatModelControls(props), container);
-    expect(
-      container
-        .querySelector<HTMLButtonElement>('[data-chat-model-option="openai/gpt-5.5"]')
-        ?.getAttribute("aria-selected"),
-    ).toBe("true");
+    expect(getChatModelOption(container, "openai/gpt-5.5")?.hasAttribute("selected")).toBe(true);
   });
 
   it("keeps the speed toggle visible and disabled for unsupported providers", () => {
diff --git a/ui/src/pages/chat/components/chat-model-controls.ts b/ui/src/pages/chat/components/chat-model-controls.ts
index bda334b276a4..c47760107245 100644
--- a/ui/src/pages/chat/components/chat-model-controls.ts
+++ b/ui/src/pages/chat/components/chat-model-controls.ts
@@ -1,6 +1,9 @@
 // Chat-owned model, reasoning, and fast-mode picker orchestration.
-import { html } from "lit";
+import { html, nothing } from "lit";
 import type { ModelCatalogEntry, SessionsListResult } from "../../../api/types.ts";
+import { icons } from "../../../components/icons.ts";
+import { type ModelPickerOption, renderModelPicker } from "../../../components/model-picker.ts";
+import { formatRawProviderLabel, providerDisplayLabel } from "../../../components/provider-icon.ts";
 import { t } from "../../../i18n/index.ts";
 import { normalizeChatModelProviderId } from "../../../lib/chat/model-ref.ts";
 import {
@@ -12,16 +15,15 @@ import {
   resolveChatThinkingSelectState,
   type ChatThinkingTarget,
 } from "../../../lib/chat/thinking.ts";
+import { formatContextTokenCapacity } from "../../../lib/format.ts";
 import { areUiSessionKeysEquivalent } from "../../../lib/sessions/session-key.ts";
 import { renderChatEffortPicker } from "./chat-effort-picker.ts";
-import {
-  renderChatModelPicker,
-  type ChatModelCatalogState,
-  type ChatModelPickerOption,
-  type ChatModelPickerTargetGroup,
-} from "./chat-model-picker.ts";
 
-export type { ChatModelCatalogState } from "./chat-model-picker.ts";
+export type ChatModelCatalogState = {
+  hasSnapshot: boolean;
+  onRetry?: () => void;
+  status: "idle" | "loading" | "refreshing" | "ready" | "error";
+};
 
 type ChatModelControlsProps = {
   activeRunId: string | null;
@@ -34,7 +36,6 @@ type ChatModelControlsProps = {
   modelOverrides?: Readonly<Record<string, string | null | undefined>>;
   modelSelectionLocked?: boolean;
   modelSelectionRuntimeId?: string;
-  modelPickerTargetGroups?: readonly ChatModelPickerTargetGroup[];
   modelSwitching: boolean;
   modelsLoading?: boolean;
   modelMutationDisabledReason?: string;
@@ -48,7 +49,6 @@ type ChatModelControlsProps = {
   thinkingSession?: ChatThinkingTarget;
   onFastModeSelect?: (value: ChatFastModeSelectValue, sessionKey: string) => unknown;
   onModelSelect?: (value: string, sessionKey: string) => unknown;
-  onModelPickerTargetSelect?: (groupId: string, value: string) => unknown;
   onRequestUpdate?: () => void;
   onThinkingSelect?: (value: string, sessionKey: string) => unknown;
 };
@@ -136,9 +136,70 @@ function resolveChatModelPickerLabel(
   return fallbackLabel;
 }
 
-function formatPickerModelLabel(label: string): string {
-  const match = /^Default \((.+)\)$/u.exec(label);
-  return match?.[1] ?? label;
+function formatModelLabel(label: string, provider: string): string {
+  const prefixes = [formatRawProviderLabel(provider), providerDisplayLabel(provider)].toSorted(
+    (left, right) => right.length - left.length,
+  );
+  return prefixes.reduce(
+    (result, prefix) =>
+      result.toLowerCase().startsWith(`${prefix.toLowerCase()} `)
+        ? result.slice(prefix.length + 1)
+        : result,
+    label,
+  );
+}
+
+const AGENT_RUNTIME_LABELS: Readonly<Record<string, string>> = {
+  "claude-cli": "Claude CLI",
+  codex: "Codex",
+  "codex-cli": "Codex",
+  "google-gemini-cli": "Gemini CLI",
+  openclaw: "OpenClaw",
+};
+
+function formatAgentRuntimeLabel(id: string): string {
+  const normalized = id.trim().toLowerCase();
+  return (
+    AGENT_RUNTIME_LABELS[normalized] ??
+    `${normalized.charAt(0).toUpperCase()}${normalized.slice(1)}`
+  );
+}
+
+function renderModelCatalogState(state: ChatModelCatalogState, hasOptions: boolean) {
+  if (state.status === "ready" && hasOptions) {
+    return nothing;
+  }
+  const label =
+    state.status === "refreshing"
+      ? t("chat.modelControls.refreshingModels")
+      : state.status === "error"
+        ? state.hasSnapshot
+          ? t("chat.modelControls.modelsRefreshFailed")
+          : t("chat.modelControls.modelsUnavailable")
+        : state.status === "ready"
+          ? t("chat.modelControls.noModelsAvailable")
+          : t("chat.modelControls.loadingModels");
+  return html`
+    <div
+      class="chat-controls__model-catalog-state"
+      data-chat-model-catalog-state=${state.status}
+      aria-live="polite"
+    >
+      <span class="chat-controls__model-catalog-state-label">
+        ${state.status === "error" ? icons.alertTriangle : nothing}<span>${label}</span>
+      </span>
+      ${state.status === "error" && state.onRetry
+        ? html`<button
+            class="chat-controls__model-catalog-retry"
+            data-chat-model-catalog-retry="true"
+            type="button"
+            @click=${state.onRetry}
+          >
+            ${icons.refresh}<span>${t("common.retry")}</span>
+          </button>`
+        : nothing}
+    </div>
+  `;
 }
 
 export function renderChatModelControls(props: ChatModelControlsProps) {
@@ -194,10 +255,13 @@ export function renderChatModelControls(props: ChatModelControlsProps) {
       ? t("chat.modelControls.defaultWithModel", { model: canonicalDefaultLabel })
       : defaultLabel;
   const normalizedDefaultModel = defaultModel.trim().toLowerCase();
-  const modelOptions: ChatModelPickerOption[] = selectOptions.map((option) => {
-    const isDefault =
-      defaultSelectable && option.value.trim().toLowerCase() === normalizedDefaultModel;
+  const defaultCatalogEntry = resolveChatModelCatalogEntry(defaultModel, props.modelCatalog);
+  const modelOptions: ModelPickerOption[] = selectOptions.map((option) => {
     const catalogEntry = resolveChatModelCatalogEntry(option.value, props.modelCatalog);
+    const isDefault =
+      defaultSelectable &&
+      (option.value.trim().toLowerCase() === normalizedDefaultModel ||
+        (catalogEntry !== undefined && catalogEntry === defaultCatalogEntry));
     // Runtime meta labels only operator-pinned runtimes (models/provider config);
     // implicit/default resolution stays unlabeled so ordinary rows stay clean.
     const agentRuntime = catalogEntry?.agentRuntime;
@@ -205,41 +269,53 @@ export function renderChatModelControls(props: ChatModelControlsProps) {
       agentRuntime && (agentRuntime.source === "model" || agentRuntime.source === "provider")
         ? agentRuntime.id.trim()
         : undefined;
+    const provider = resolveChatModelProvider(
+      option.value,
+      props.modelCatalog,
+      "",
+      isDefault ? defaultProviderHint : option.value === currentOverride ? currentProviderHint : "",
+    );
+    const detail = [
+      agentRuntimeId ? formatAgentRuntimeLabel(agentRuntimeId) : "",
+      catalogEntry?.contextWindow ? formatContextTokenCapacity(catalogEntry.contextWindow) : "",
+      catalogEntry?.supportsTools === false ? t("chat.modelControls.chatOnly") : "",
+    ]
+      .filter(Boolean)
+      .join(" · ");
+    const label = isDefault
+      ? pickerDefaultLabel
+      : resolveChatModelPickerLabel(option.value, option.label, props.modelCatalog);
     return {
-      commitValue: isDefault ? "" : option.value,
-      ...(agentRuntimeId ? { agentRuntimeId } : {}),
-      ...(catalogEntry?.contextWindow ? { contextWindow: catalogEntry.contextWindow } : {}),
-      ...(typeof catalogEntry?.supportsTools === "boolean"
-        ? { supportsTools: catalogEntry.supportsTools }
-        : {}),
-      isDefault,
-      value: option.value,
-      label: resolveChatModelPickerLabel(option.value, option.label, props.modelCatalog),
-      provider: resolveChatModelProvider(
-        option.value,
-        props.modelCatalog,
-        "",
-        isDefault
-          ? defaultProviderHint
-          : option.value === currentOverride
-            ? currentProviderHint
-            : "",
-      ),
+      value: isDefault ? "" : option.value,
+      label: formatModelLabel(label, provider),
+      provider,
+      ...(detail ? { detail } : {}),
     };
   });
+  if (currentOverride && !modelOptions.some((option) => option.value === currentOverride)) {
+    const catalogEntry = resolveChatModelCatalogEntry(currentOverride, props.modelCatalog);
+    const detail = [
+      catalogEntry?.contextWindow ? formatContextTokenCapacity(catalogEntry.contextWindow) : "",
+      catalogEntry?.supportsTools === false ? t("chat.modelControls.chatOnly") : "",
+    ]
+      .filter(Boolean)
+      .join(" · ");
+    modelOptions.push({
+      value: currentOverride,
+      label: catalogEntry?.name.trim() || currentOverride,
+      provider: resolveChatModelProvider(
+        currentOverride,
+        props.modelCatalog,
+        "",
+        currentProviderHint,
+      ),
+      ...(detail ? { detail } : {}),
+    });
+  }
   const lockedModelLabel =
     props.modelSelectionRuntimeId?.trim().toLowerCase() === "codex"
       ? t("chat.selectors.nativeCodexModel")
       : t("chat.selectors.lockedSessionModel");
-  const committedModelLabel =
-    props.modelSelectionLocked === true
-      ? lockedModelLabel
-      : (modelOptions.find((entry) => entry.value === currentOverride)?.label ??
-        resolveChatModelPickerLabel(
-          currentOverride,
-          currentOverride || pickerDefaultLabel,
-          props.modelCatalog,
-        ));
   const managedCatalog = props.modelCatalogState ?? {
     hasSnapshot: !props.modelsLoading,
     status: props.modelsLoading ? ("loading" as const) : ("ready" as const),
@@ -249,7 +325,7 @@ export function renderChatModelControls(props: ChatModelControlsProps) {
     ["idle", "loading", "refreshing"].includes(managedCatalog.status);
   const catalogErrorWithoutSnapshot =
     managedCatalog.status === "error" && !managedCatalog.hasSnapshot;
-  const catalogSnapshotEmpty = managedCatalog.hasSnapshot && modelOptions.length === 0;
+  const catalogSnapshotEmpty = managedCatalog.hasSnapshot && selectOptions.length === 0;
   const catalogTriggerStatus = catalogLoadingWithoutSnapshot
     ? t("chat.modelControls.loadingModels")
     : catalogErrorWithoutSnapshot
@@ -277,25 +353,80 @@ export function renderChatModelControls(props: ChatModelControlsProps) {
     commonDisabled ||
     effortMutationDisabled ||
     (thinking.options.length === 0 && (!showFastMode || fastMode.disabled));
+  const pickerOptions =
+    props.modelSelectionLocked === true
+      ? [
+          {
+            value: currentOverride,
+            label: lockedModelLabel,
+            ...(currentProviderHint ? { provider: currentProviderHint } : {}),
+          },
+        ]
+      : catalogLoadingWithoutSnapshot || catalogErrorWithoutSnapshot || catalogSnapshotEmpty
+        ? [
+            {
+              value: currentOverride,
+              label: catalogTriggerStatus ?? pickerDefaultLabel,
+              disabled: true,
+            },
+          ]
+        : modelOptions.length > 0
+          ? modelOptions.some((option) => option.value === "")
+            ? modelOptions
+            : [
+                {
+                  value: "",
+                  label: pickerDefaultLabel,
+                  ...(defaultProviderHint ? { provider: defaultProviderHint } : {}),
+                },
+                ...modelOptions,
+              ]
+          : [
+              {
+                value: currentOverride,
+                label: catalogTriggerStatus ?? pickerDefaultLabel,
+                disabled: true,
+              },
+            ];
+  const activeCatalogEntry = resolveChatModelCatalogEntry(
+    currentOverride || defaultModel,
+    props.modelCatalog,
+  );
+  const modelToolsUnavailable = activeCatalogEntry?.supportsTools === false;
   return html`
     <div class="chat-controls__session chat-controls__model chat-controls__model-settings">
-      ${renderChatModelPicker({
-        defaultModelLabel: formatPickerModelLabel(pickerDefaultLabel),
-        disabled: modelDisabled,
-        disabledReason: props.modelMutationDisabledReason,
-        modelCatalogState: managedCatalog,
-        modelSelectionLocked: props.modelSelectionLocked === true,
-        modelOptions,
-        targetGroups: props.modelPickerTargetGroups,
-        selectedModelValue: currentOverride,
-        sessionKey: props.sessionKey,
-        triggerModelLabel: formatPickerModelLabel(committedModelLabel),
-        triggerStatusLabel: catalogTriggerStatus,
-        onModelSelect: async (next, targetSessionKey) =>
-          props.onModelSelect?.(next, targetSessionKey),
-        onTargetSelect: props.onModelPickerTargetSelect,
-        onRequestUpdate: props.onRequestUpdate,
-      })}
+      <div class="chat-controls__model-control">
+        <div class="chat-controls__model-control-row">
+          ${modelToolsUnavailable
+            ? html`<span
+                class="chat-controls__model-capability-badge"
+                title=${t("chat.modelControls.chatOnlyHelp")}
+                >${icons.alertTriangle}<span>${t("chat.modelControls.chatOnly")}</span></span
+              >`
+            : nothing}
+          ${renderModelPicker({
+            label: t("chat.selectors.model"),
+            value: currentOverride,
+            options: pickerOptions,
+            disabled: modelDisabled || props.modelSelectionLocked === true,
+            title:
+              props.modelMutationDisabledReason ??
+              (props.modelSelectionLocked ? t("chat.selectors.modelLockedLabel") : undefined),
+            className: "chat-controls__model-picker",
+            placement: "top",
+            onChange: (next) => {
+              if (
+                next !== currentOverride &&
+                !modelDisabled &&
+                props.modelSelectionLocked !== true
+              ) {
+                void props.onModelSelect?.(next, props.sessionKey);
+              }
+            },
+          })}
+        </div>
+        ${renderModelCatalogState(managedCatalog, selectOptions.length > 0)}
+      </div>
       ${renderChatEffortPicker({
         disabled: effortDisabled,
         disabledReason: props.effortMutationDisabledReason,
diff --git a/ui/src/pages/chat/components/chat-model-picker.ts b/ui/src/pages/chat/components/chat-model-picker.ts
deleted file mode 100644
index a893f59ea6c2..000000000000
--- a/ui/src/pages/chat/components/chat-model-picker.ts
+++ /dev/null
@@ -1,719 +0,0 @@
-import { html, nothing } from "lit";
-import { repeat } from "lit/directives/repeat.js";
-import { icons } from "../../../components/icons.ts";
-import "../../../components/tooltip.ts";
-import {
-  formatRawProviderLabel,
-  providerDisplayLabel,
-  renderProviderBrandIcon,
-} from "../../../components/provider-icon.ts";
-import { t } from "../../../i18n/index.ts";
-import { formatContextTokenCapacity } from "../../../lib/format.ts";
-
-export type ChatModelCatalogState = {
-  hasSnapshot: boolean;
-  onRetry?: () => void;
-  status: "idle" | "loading" | "refreshing" | "ready" | "error";
-};
-
-export type ChatModelPickerOption = {
-  agentRuntimeId?: string;
-  commitValue: string;
-  contextWindow?: number;
-  isDefault: boolean;
-  label: string;
-  provider: string;
-  supportsTools?: boolean;
-  value: string;
-};
-
-export type ChatModelPickerTargetGroup = {
-  id: string;
-  label: string;
-  options: readonly { label: string; value: string }[];
-};
-
-// Known models.list runtime ids; mirrors src/status/agent-runtime-label.ts,
-// which cannot be imported here (it drags terminal sanitizers into the bundle).
-const AGENT_RUNTIME_LABELS: Readonly<Record<string, string>> = {
-  "claude-cli": "Claude CLI",
-  codex: "Codex",
-  "codex-cli": "Codex",
-  "google-gemini-cli": "Gemini CLI",
-  openclaw: "OpenClaw",
-};
-
-function formatAgentRuntimeLabel(id: string): string {
-  const normalized = id.trim().toLowerCase();
-  return (
-    AGENT_RUNTIME_LABELS[normalized] ??
-    `${normalized.charAt(0).toUpperCase()}${normalized.slice(1)}`
-  );
-}
-
-type ChatModelPickerParams = {
-  defaultModelLabel: string;
-  disabled: boolean;
-  disabledReason?: string;
-  modelCatalogState?: ChatModelCatalogState;
-  modelSelectionLocked: boolean;
-  modelOptions: ChatModelPickerOption[];
-  targetGroups?: readonly ChatModelPickerTargetGroup[];
-  selectedModelValue: string;
-  sessionKey: string;
-  triggerModelLabel: string;
-  triggerStatusLabel?: string;
-  onModelSelect: (value: string, sessionKey: string) => Promise<unknown>;
-  onTargetSelect?: (groupId: string, value: string) => unknown;
-  onRequestUpdate?: () => void;
-};
-
-function renderProviderIcon(provider: string) {
-  return renderProviderBrandIcon(provider, { className: "chat-controls__provider-icon" });
-}
-
-function formatModelLabel(option: ChatModelPickerOption): string {
-  const prefixes = [
-    formatRawProviderLabel(option.provider),
-    providerDisplayLabel(option.provider),
-  ].toSorted((left, right) => right.length - left.length);
-  for (const prefix of prefixes) {
-    if (option.label.toLowerCase().startsWith(`${prefix.toLowerCase()} `)) {
-      return option.label.slice(prefix.length + 1);
-    }
-  }
-  return option.label;
-}
-
-function pickerMenu(target: EventTarget | null): HTMLElement | null {
-  return target instanceof Element
-    ? target.closest<HTMLElement>(".chat-controls__model-menu")
-    : null;
-}
-
-function visibleModelRows(root: HTMLElement): HTMLButtonElement[] {
-  return [...root.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]")]
-    .filter((row) => !row.hidden)
-    .toSorted(
-      (left, right) =>
-        Number(left.dataset.chatModelRank ?? left.dataset.chatModelIndex ?? 0) -
-        Number(right.dataset.chatModelRank ?? right.dataset.chatModelIndex ?? 0),
-    );
-}
-
-function ensureModelPickerIds(menu: HTMLElement): void {
-  const details = menu.closest<HTMLDetailsElement>(".chat-controls__model-picker");
-  const input = menu.querySelector<HTMLInputElement>("[data-chat-model-search]");
-  const listbox = menu.querySelector<HTMLElement>("[data-chat-model-list]");
-  if (!details || !input || !listbox) {
-    return;
-  }
-  const prefix = details.dataset.chatModelPickerId ?? `chat-model-picker-${crypto.randomUUID()}`;
-  details.dataset.chatModelPickerId = prefix;
-  listbox.id = `${prefix}-listbox`;
-  menu.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]").forEach((row, index) => {
-    row.id = `${prefix}-option-${index}`;
-  });
-  input.setAttribute("aria-controls", listbox.id);
-  input.setAttribute("aria-expanded", details.open ? "true" : "false");
-}
-
-function highlightModelRow(menu: HTMLElement, row: HTMLButtonElement | undefined): void {
-  menu.querySelectorAll<HTMLElement>("[data-chat-model-option]").forEach((candidate) => {
-    candidate.toggleAttribute("data-chat-model-highlighted", candidate === row);
-  });
-  const input = menu.querySelector<HTMLInputElement>("[data-chat-model-search]");
-  if (row?.id) {
-    input?.setAttribute("aria-activedescendant", row.id);
-  } else {
-    input?.removeAttribute("aria-activedescendant");
-  }
-}
-
-function updateModelShortcuts(menu: HTMLElement, rows: readonly HTMLButtonElement[]): void {
-  menu.querySelectorAll<HTMLElement>("[data-chat-model-shortcut]").forEach((shortcut) => {
-    shortcut.hidden = true;
-    shortcut.removeAttribute("data-chat-model-shortcut-number");
-  });
-  rows.slice(0, 9).forEach((row, index) => {
-    const shortcut = row.querySelector<HTMLElement>("[data-chat-model-shortcut]");
-    if (!shortcut) {
-      return;
-    }
-    shortcut.hidden = false;
-    shortcut.setAttribute("data-chat-model-shortcut-number", String(index + 1));
-  });
-}
-
-function modelMatchRank(row: HTMLButtonElement, query: string): number | null {
-  const model = row.dataset.chatModelName ?? "";
-  const provider = row.dataset.chatModelProviderLabel ?? "";
-  if (model.startsWith(query)) {
-    return 0;
-  }
-  if (model.includes(query)) {
-    return 1;
-  }
-  if (provider.startsWith(query)) {
-    return 2;
-  }
-  return provider.includes(query) ? 3 : null;
-}
-
-function updateModelSearch(input: HTMLInputElement): void {
-  const menu = pickerMenu(input);
-  if (!menu) {
-    return;
-  }
-  ensureModelPickerIds(menu);
-  const query = input.value.trim().toLocaleLowerCase();
-  menu.toggleAttribute("data-chat-model-filtering", Boolean(query));
-  const rows = [...menu.querySelectorAll<HTMLButtonElement>("[data-chat-model-option]")];
-  const matches: Array<{ row: HTMLButtonElement; score: number; index: number }> = [];
-  rows.forEach((row, index) => {
-    const score = query ? modelMatchRank(row, query) : 0;
-    row.hidden = score === null;
-    row.style.removeProperty("--chat-model-rank");
-    delete row.dataset.chatModelRank;
-    if (score !== null) {
-      matches.push({ row, score, index });
-    }
-  });
-  matches
-    .toSorted((left, right) => left.score - right.score || left.index - right.index)
-    .forEach(({ row }, rank) => {
-      row.dataset.chatModelRank = String(rank);
-      row.style.setProperty("--chat-model-rank", String(rank));
-    });
-  const visibleRows = visibleModelRows(menu);
-  updateModelShortcuts(menu, visibleRows);
-  const selected = visibleRows.find((row) => row.getAttribute("aria-selected") === "true");
-  highlightModelRow(menu, query ? visibleRows[0] : (selected ?? visibleRows[0]));
-  const empty = menu.querySelector<HTMLElement>("[data-chat-model-search-empty]");
-  if (empty) {
-    empty.hidden = !query || visibleRows.length > 0;
-  }
-}
-
-function resetModelSearch(details: HTMLDetailsElement): void {
-  const input = details.querySelector<HTMLInputElement>("[data-chat-model-search]");
-  if (!input) {
-    return;
-  }
-  input.value = "";
-  updateModelSearch(input);
-}
-
-export function clearChatModelSearchOnEscape(event: KeyboardEvent): boolean {
-  if (event.key !== "Escape") {
-    return false;
-  }
-  const input = event
-    .composedPath()
-    .find(
-      (target): target is HTMLInputElement =>
-        target instanceof HTMLInputElement && target.matches("[data-chat-model-search]"),
-    );
-  if (!input?.value) {
-    return false;
-  }
-  input.value = "";
-  updateModelSearch(input);
-  event.preventDefault();
-  event.stopPropagation();
-  return true;
-}
-
-function handleModelSearchKeydown(event: KeyboardEvent): void {
-  const input = event.currentTarget as HTMLInputElement;
-  const menu = pickerMenu(input);
-  if (!menu) {
-    return;
-  }
-  const rows = visibleModelRows(menu);
-  if (rows.length === 0) {
-    return;
-  }
-  if (event.key === "Enter") {
-    const highlighted = rows.find((row) => row.hasAttribute("data-chat-model-highlighted"));
-    if (highlighted) {
-      event.preventDefault();
-      highlighted.click();
-    }
-    return;
-  }
-  if (event.key !== "ArrowDown" && event.key !== "ArrowUp") {
-    return;
-  }
-  event.preventDefault();
-  const currentIndex = rows.findIndex((row) => row.hasAttribute("data-chat-model-highlighted"));
-  const offset = event.key === "ArrowDown" ? 1 : rows.length - 1;
-  const nextIndex = currentIndex < 0 ? 0 : (currentIndex + offset) % rows.length;
-  highlightModelRow(menu, rows[nextIndex]);
-  rows[nextIndex]?.scrollIntoView?.({ block: "nearest" });
-}
-
-function handleModelPickerKeydown(event: KeyboardEvent): void {
-  const details = event.currentTarget as HTMLDetailsElement;
-  if (!details.open || event.target instanceof HTMLInputElement || !/^[1-9]$/u.test(event.key)) {
-    return;
-  }
-  const row = visibleModelRows(details)[Number(event.key) - 1];
-  event.preventDefault();
-  row?.click();
-}
-
-function renderCatalogState(state: ChatModelCatalogState | undefined, hasOptions: boolean) {
-  if (!state || (state.status === "ready" && hasOptions)) {
-    return nothing;
-  }
-  const label =
-    state.status === "refreshing"
-      ? t("chat.modelControls.refreshingModels")
-      : state.status === "error"
-        ? state.hasSnapshot
-          ? t("chat.modelControls.modelsRefreshFailed")
-          : t("chat.modelControls.modelsUnavailable")
-        : state.status === "ready"
-          ? t("chat.modelControls.noModelsAvailable")
-          : t("chat.modelControls.loadingModels");
-  return html`
-    <div
-      class="chat-controls__model-catalog-state ${hasOptions
-        ? ""
-        : "chat-controls__model-catalog-state--empty"}"
-      data-chat-model-catalog-state=${state.status}
-      aria-live="polite"
-    >
-      <span class="chat-controls__model-catalog-state-label">
-        ${state.status === "error" ? icons.alertTriangle : nothing}
-        <span>${label}</span>
-      </span>
-      ${state.status === "error" && state.onRetry
-        ? html`
-            <button
-              class="chat-controls__model-catalog-retry"
-              data-chat-model-catalog-retry="true"
-              type="button"
-              @click=${(event: MouseEvent) => {
-                event.stopPropagation();
-                state.onRetry?.();
-              }}
-            >
-              ${icons.refresh}
-              <span>${t("common.retry")}</span>
-            </button>
-          `
-        : nothing}
-    </div>
-  `;
-}
-
-export function renderChatModelPicker(params: ChatModelPickerParams) {
-  const defaultModelOption = params.modelOptions.find((option) => option.isDefault);
-  const activeModelOption =
-    params.selectedModelValue === ""
-      ? defaultModelOption
-      : params.modelOptions.find((option) => option.value === params.selectedModelValue);
-  const modelToolsUnavailable = activeModelOption?.supportsTools === false;
-  const triggerTitle = [
-    params.triggerStatusLabel ?? params.triggerModelLabel,
-    modelToolsUnavailable ? t("chat.modelControls.chatOnly") : "",
-  ]
-    .filter(Boolean)
-    .join(" · ");
-  const triggerMeta = activeModelOption?.contextWindow
-    ? formatContextTokenCapacity(activeModelOption.contextWindow)
-    : "";
-  const providerGroups = new Map<string, ChatModelPickerOption[]>();
-  for (const option of params.modelOptions) {
-    const existing = providerGroups.get(option.provider);
-    if (existing) {
-      existing.push(option);
-    } else {
-      providerGroups.set(option.provider, [option]);
-    }
-  }
-  const orderedProviderGroups = [...providerGroups];
-  const defaultProviderIndex = orderedProviderGroups.findIndex(
-    ([provider]) => provider === defaultModelOption?.provider,
-  );
-  if (defaultProviderIndex > 0) {
-    const [defaultGroup] = orderedProviderGroups.splice(defaultProviderIndex, 1);
-    if (defaultGroup) {
-      orderedProviderGroups.unshift(defaultGroup);
-    }
-  }
-  const orderedOptions = orderedProviderGroups.flatMap(([, options]) => options);
-  const optionIndex = new Map(orderedOptions.map((option, index) => [option.value, index]));
-  const targetGroups = params.targetGroups ?? [];
-  const targetOptionCount = targetGroups.reduce((count, group) => count + group.options.length, 0);
-  const hasOptions = params.modelOptions.length + targetOptionCount > 0;
-  const commitModel = (value: string) => {
-    if (params.modelSelectionLocked) {
-      return;
-    }
-    void params.onModelSelect(value, params.sessionKey).finally(() => params.onRequestUpdate?.());
-    params.onRequestUpdate?.();
-  };
-  const selectModel = (entry: ChatModelPickerOption, event: MouseEvent) => {
-    event.stopPropagation();
-    if (params.disabled || params.modelSelectionLocked) {
-      event.preventDefault();
-      return;
-    }
-    if (entry.commitValue !== params.selectedModelValue) {
-      commitModel(entry.commitValue);
-    }
-    const details = (event.currentTarget as HTMLElement).closest<HTMLDetailsElement>("details");
-    if (details) {
-      details.open = false;
-      details.querySelector<HTMLElement>("summary")?.focus();
-    }
-  };
-  const selectTarget = (groupId: string, value: string, event: MouseEvent) => {
-    event.stopPropagation();
-    if (params.disabled || params.modelSelectionLocked) {
-      event.preventDefault();
-      return;
-    }
-    params.onTargetSelect?.(groupId, value);
-    const details = (event.currentTarget as HTMLElement).closest<HTMLDetailsElement>("details");
-    if (details) {
-      details.open = false;
-      details.querySelector<HTMLElement>("summary")?.focus();
-    }
-  };
-  return html`
-    <details
-      class="chat-controls__inline-select chat-controls__model-picker"
-      @keydown=${handleModelPickerKeydown}
-      @toggle=${(event: Event) => {
-        const details = event.currentTarget as HTMLDetailsElement;
-        if (!details.open) {
-          resetModelSearch(details);
-          return;
-        }
-        queueMicrotask(() => {
-          const input = details.querySelector<HTMLInputElement>("[data-chat-model-search]");
-          if (input) {
-            updateModelSearch(input);
-          }
-        });
-      }}
-    >
-      <summary
-        class="chat-controls__inline-select-trigger chat-controls__model-trigger ${params.disabled
-          ? "chat-controls__inline-select-trigger--disabled"
-          : ""}"
-        data-chat-model-select="true"
-        data-chat-model-locked=${params.modelSelectionLocked ? "true" : "false"}
-        data-chat-select-value=${params.selectedModelValue}
-        data-chat-model-tools=${modelToolsUnavailable ? "unavailable" : "available"}
-        aria-label=${`${t("chat.selectors.model")}: ${triggerTitle}`}
-        aria-disabled=${params.disabled ? "true" : "false"}
-        title=${params.disabledReason ?? triggerTitle}
-        @click=${(event: MouseEvent) => {
-          if (params.disabled) {
-            event.preventDefault();
-            return;
-          }
-          (event.currentTarget as HTMLElement).focus({ preventScroll: true });
-        }}
-      >
-        ${modelToolsUnavailable
-          ? html`
-              <openclaw-tooltip .content=${t("chat.modelControls.chatOnlyHelp")}>
-                <span class="chat-controls__model-capability-badge" aria-hidden="true">
-                  ${icons.alertTriangle}
-                  <span>${t("chat.modelControls.chatOnly")}</span>
-                </span>
-              </openclaw-tooltip>
-            `
-          : nothing}
-        <span class="chat-controls__inline-select-label">
-          ${params.triggerStatusLabel ?? params.triggerModelLabel}
-        </span>
-        ${params.triggerStatusLabel || !triggerMeta
-          ? nothing
-          : html`<span class="chat-controls__trigger-meta">${triggerMeta}</span>`}
-      </summary>
-      <div
-        class="chat-controls__inline-select-menu chat-controls__model-menu"
-        aria-label=${t("chat.selectors.model")}
-      >
-        ${params.modelSelectionLocked
-          ? html`
-              <div
-                class="chat-controls__locked-model"
-                aria-label=${t("chat.selectors.modelLockedLabel")}
-              >
-                <span class="chat-controls__inline-select-section-label">
-                  ${t("chat.selectors.modelSection")}
-                </span>
-                <span class="chat-controls__locked-model-value">${params.triggerModelLabel}</span>
-                <span class="chat-controls__locked-model-badge">
-                  ${t("chat.selectors.modelLocked")}
-                </span>
-              </div>
-            `
-          : html`
-              <div class="chat-controls__model-search-wrap">
-                ${icons.search}
-                <input
-                  class="chat-controls__model-search"
-                  data-chat-model-search="true"
-                  type="search"
-                  role="combobox"
-                  aria-autocomplete="list"
-                  autocomplete="off"
-                  spellcheck="false"
-                  placeholder=${t("chat.modelControls.searchModels")}
-                  aria-label=${t("chat.modelControls.searchModels")}
-                  ?disabled=${params.disabled}
-                  @input=${(event: InputEvent) =>
-                    updateModelSearch(event.currentTarget as HTMLInputElement)}
-                  @keydown=${handleModelSearchKeydown}
-                />
-              </div>
-              ${renderCatalogState(params.modelCatalogState, params.modelOptions.length > 0)}
-              ${hasOptions
-                ? html`
-                    <div
-                      class="chat-controls__model-options"
-                      data-chat-model-list="true"
-                      role="listbox"
-                      aria-label=${t("chat.selectors.model")}
-                    >
-                      ${repeat(
-                        orderedProviderGroups,
-                        ([provider]) => provider,
-                        ([provider, options]) => html`
-                          <section
-                            class="chat-controls__provider-model-group"
-                            data-chat-model-provider-group=${provider}
-                            aria-label=${t("chat.modelControls.providerModels", {
-                              provider: providerDisplayLabel(provider),
-                            })}
-                          >
-                            <div
-                              class="chat-controls__provider-heading"
-                              data-chat-model-provider=${provider}
-                            >
-                              ${renderProviderIcon(provider)}
-                              <span>${providerDisplayLabel(provider)}</span>
-                            </div>
-                            ${repeat(
-                              options,
-                              (entry) => entry.value,
-                              (entry) => {
-                                const selected =
-                                  entry.value === params.selectedModelValue ||
-                                  (entry.isDefault && params.selectedModelValue === "");
-                                const modelLabel = formatModelLabel(entry);
-                                const modelMeta = [
-                                  entry.contextWindow
-                                    ? formatContextTokenCapacity(entry.contextWindow)
-                                    : "",
-                                  entry.supportsTools === false
-                                    ? t("chat.modelControls.chatOnly")
-                                    : "",
-                                  entry.agentRuntimeId
-                                    ? formatAgentRuntimeLabel(entry.agentRuntimeId)
-                                    : "",
-                                ]
-                                  .filter(Boolean)
-                                  .join(" · ");
-                                const index = optionIndex.get(entry.value) ?? 0;
-                                return html`
-                                  <button
-                                    class="chat-controls__inline-select-option chat-controls__model-option ${selected
-                                      ? "chat-controls__inline-select-option--selected"
-                                      : ""}"
-                                    data-chat-model-option=${entry.value}
-                                    data-chat-model-default=${entry.isDefault ? "true" : nothing}
-                                    data-chat-model-index=${index}
-                                    data-chat-model-name=${modelLabel.toLocaleLowerCase()}
-                                    data-chat-model-provider-label=${providerDisplayLabel(
-                                      entry.provider,
-                                    ).toLocaleLowerCase()}
-                                    role="option"
-                                    aria-selected=${selected ? "true" : "false"}
-                                    type="button"
-                                    ?disabled=${params.disabled}
-                                    @mouseenter=${(event: MouseEvent) => {
-                                      const menu = pickerMenu(event.currentTarget);
-                                      if (menu) {
-                                        highlightModelRow(
-                                          menu,
-                                          event.currentTarget as HTMLButtonElement,
-                                        );
-                                      }
-                                    }}
-                                    @click=${(event: MouseEvent) => selectModel(entry, event)}
-                                  >
-                                    <span class="chat-controls__model-option-provider">
-                                      ${renderProviderIcon(entry.provider)}
-                                    </span>
-                                    <span class="chat-controls__model-option-copy">
-                                      <span class="chat-controls__model-option-title">
-                                        <span class="chat-controls__model-option-name"
-                                          >${modelLabel}</span
-                                        >
-                                        ${entry.isDefault
-                                          ? html`<span
-                                              class="chat-controls__model-state-label chat-controls__model-state-label--default"
-                                              >${t("chat.modelControls.default")}</span
-                                            >`
-                                          : nothing}
-                                      </span>
-                                      ${modelMeta
-                                        ? html`<span class="chat-controls__model-option-meta"
-                                            >${modelMeta}</span
-                                          >`
-                                        : nothing}
-                                    </span>
-                                    <span class="chat-controls__model-option-action">
-                                      ${selected
-                                        ? html`<span
-                                            class="chat-controls__inline-select-check"
-                                            aria-hidden="true"
-                                            >${icons.check}</span
-                                          >`
-                                        : html`<kbd
-                                            data-chat-model-shortcut="true"
-                                            aria-hidden="true"
-                                            hidden
-                                          ></kbd>`}
-                                    </span>
-                                  </button>
-                                `;
-                              },
-                            )}
-                          </section>
-                        `,
-                      )}
-                      ${repeat(
-                        targetGroups,
-                        (group) => group.id,
-                        (group) => html`
-                          <section
-                            class="chat-controls__provider-model-group"
-                            data-chat-model-target-group=${group.id}
-                            aria-label=${group.label}
-                          >
-                            <div class="chat-controls__provider-heading">
-                              <span
-                                class="chat-controls__provider-icon chat-controls__target-icon"
-                                aria-hidden="true"
-                                >${icons.terminal}</span
-                              >
-                              <span>${group.label}</span>
-                            </div>
-                            ${repeat(
-                              group.options,
-                              (entry) => entry.value,
-                              (entry, targetIndex) => html`
-                                <button
-                                  class="chat-controls__inline-select-option chat-controls__model-option"
-                                  data-chat-model-option=${`target:${group.id}:${entry.value}`}
-                                  data-chat-model-target=${entry.value}
-                                  data-chat-model-index=${orderedOptions.length + targetIndex}
-                                  data-chat-model-name=${entry.label.toLocaleLowerCase()}
-                                  data-chat-model-provider-label=${group.label.toLocaleLowerCase()}
-                                  role="option"
-                                  aria-selected="false"
-                                  type="button"
-                                  ?disabled=${params.disabled}
-                                  @mouseenter=${(event: MouseEvent) => {
-                                    const menu = pickerMenu(event.currentTarget);
-                                    if (menu) {
-                                      highlightModelRow(
-                                        menu,
-                                        event.currentTarget as HTMLButtonElement,
-                                      );
-                                    }
-                                  }}
-                                  @click=${(event: MouseEvent) =>
-                                    selectTarget(group.id, entry.value, event)}
-                                >
-                                  <span
-                                    class="chat-controls__model-option-provider chat-controls__target-icon"
-                                    aria-hidden="true"
-                                    >${icons.terminal}</span
-                                  >
-                                  <span class="chat-controls__model-option-copy">
-                                    <span class="chat-controls__model-option-title">
-                                      <span class="chat-controls__model-option-name"
-                                        >${entry.label}</span
-                                      >
-                                    </span>
-                                  </span>
-                                  <span class="chat-controls__model-option-action">
-                                    <kbd
-                                      data-chat-model-shortcut="true"
-                                      aria-hidden="true"
-                                      hidden
-                                    ></kbd>
-                                  </span>
-                                </button>
-                              `,
-                            )}
-                          </section>
-                        `,
-                      )}
-                    </div>
-                    <div
-                      class="chat-controls__model-search-empty"
-                      data-chat-model-search-empty
-                      hidden
-                    >
-                      ${t("chat.modelControls.noMatchingModels")}
-                    </div>
-                    ${params.modelOptions.length > 0
-                      ? html`<footer class="chat-controls__model-provenance">
-                          ${params.selectedModelValue === ""
-                            ? html`<span class="chat-controls__model-provenance-value--inherit">
-                                ${t("chat.modelControls.usingDefault")}
-                              </span>`
-                            : html`
-                                <span>${t("chat.modelControls.sessionOverride")}</span>
-                                <openclaw-tooltip
-                                  .content=${t("chat.modelControls.resetToDefault", {
-                                    model: params.defaultModelLabel,
-                                  })}
-                                >
-                                  <button
-                                    class="chat-controls__model-reset"
-                                    data-chat-model-reset="true"
-                                    type="button"
-                                    ?disabled=${params.disabled}
-                                    @click=${(event: MouseEvent) => {
-                                      event.stopPropagation();
-                                      if (params.disabled) {
-                                        event.preventDefault();
-                                        return;
-                                      }
-                                      commitModel("");
-                                      const details = (
-                                        event.currentTarget as HTMLElement
-                                      ).closest<HTMLDetailsElement>("details");
-                                      if (details) {
-                                        details.open = false;
-                                        details.querySelector<HTMLElement>("summary")?.focus();
-                                      }
-                                    }}
-                                  >
-                                    ${t("chat.modelControls.useDefault")}
-                                  </button>
-                                </openclaw-tooltip>
-                              `}
-                        </footer>`
-                      : nothing}
-                  `
-                : nothing}
-            `}
-      </div>
-    </details>
-  `;
-}
diff --git a/ui/src/pages/config/memory-dreaming.test.ts b/ui/src/pages/config/memory-dreaming.test.ts
index 69f5929dd334..57c751d6159f 100644
--- a/ui/src/pages/config/memory-dreaming.test.ts
+++ b/ui/src/pages/config/memory-dreaming.test.ts
@@ -121,6 +121,14 @@ describe("renderDreamingSettings", () => {
     const row = rowFor(container, "Dreaming model");
 
     expect(row.textContent).toContain("Default: openai/gpt-5.6");
+    expect(row.querySelector('wa-option[value="anthropic/claude-sonnet"]')).not.toBeNull();
+    const custom = row.querySelector<HTMLInputElement>(".model-picker__custom");
+    expect(custom?.hidden).toBe(false);
+    if (custom) {
+      custom.value = "vendor/model with spaces";
+      custom.dispatchEvent(new Event("change", { bubbles: true }));
+    }
+    expect(onPatch).toHaveBeenCalledWith(["model"], "vendor/model with spaces");
     row.querySelector<HTMLButtonElement>('button[aria-label="Reset to default"]')?.click();
     expect(onPatch).toHaveBeenCalledWith(["model"], undefined);
 
diff --git a/ui/src/pages/config/memory-dreaming.ts b/ui/src/pages/config/memory-dreaming.ts
index c65d06465054..55b278fdc17d 100644
--- a/ui/src/pages/config/memory-dreaming.ts
+++ b/ui/src/pages/config/memory-dreaming.ts
@@ -3,6 +3,8 @@
 // picker) lives in memory-dreaming-page.ts, mirroring memory.ts/memory-page.ts.
 import { asNullableRecord as asConfigRecord } from "@openclaw/normalization-core/record-coerce";
 import { html, nothing, type TemplateResult } from "lit";
+import { renderModelPicker } from "../../components/model-picker.ts";
+import { providerIdFromModelRef } from "../../components/provider-icon.ts";
 import {
   renderSettingsDefaultState,
   renderSettingsRow,
@@ -353,6 +355,34 @@ function renderField(props: DreamingSettingsProps, spec: DreamingFieldSpec) {
         ? value
         : "";
   const bounds = spec.kind === "number" ? spec.bounds : null;
+  if (spec.kind === "text" && spec.path[0] === "model") {
+    const provider = providerIdFromModelRef(defaultValue);
+    return renderSettingsRow({
+      title: t(spec.labelKey),
+      description: html`${t(spec.helpKey)} ${defaultState.description}`,
+      control: html`
+        ${defaultState.action}
+        ${renderModelPicker({
+          label: t(spec.labelKey),
+          value: text,
+          options: [
+            {
+              value: "",
+              label: defaultValue,
+              ...(provider ? { provider } : {}),
+            },
+          ],
+          disabled: props.disabled,
+          custom: {
+            label: t("cron.form.customModel"),
+            placeholder: spec.placeholderKey ? t(spec.placeholderKey) : "",
+            commit: "change",
+          },
+          onChange: (model) => props.onPatch(spec.path, model.trim() || undefined),
+        })}
+      `,
+    });
+  }
   return renderSettingsRow({
     title: t(spec.labelKey),
     description: html`${t(spec.helpKey)} ${defaultState.description}`,
diff --git a/ui/src/pages/config/session-observer-settings.test.ts b/ui/src/pages/config/session-observer-settings.test.ts
index 8f10f364886f..76eed1f7fe68 100644
--- a/ui/src/pages/config/session-observer-settings.test.ts
+++ b/ui/src/pages/config/session-observer-settings.test.ts
@@ -46,14 +46,14 @@ describe("session observer settings patches", () => {
       container,
     );
 
-    const select = container.querySelector<HTMLSelectElement>("select");
-    const options = [...(select?.options ?? [])];
-    expect(select?.disabled).toBe(false);
-    expect(options.find((option) => option.text === "Auto (provider default)")?.disabled).toBe(
-      false,
-    );
-    expect(options.find((option) => option.text === "Disabled")?.disabled).toBe(false);
-    expect(options.find((option) => option.text === "GPT Mini")?.disabled).toBe(true);
+    const select = container.querySelector("wa-select.model-picker__select");
+    const options = [...(select?.querySelectorAll("wa-option") ?? [])];
+    const option = (label: string) =>
+      options.find((candidate) => candidate.textContent?.trim() === label);
+    expect(select?.hasAttribute("disabled")).toBe(false);
+    expect(option("Auto (provider default)")?.hasAttribute("disabled")).toBe(false);
+    expect(option("Disabled")?.hasAttribute("disabled")).toBe(false);
+    expect(option("GPT Mini")?.hasAttribute("disabled")).toBe(true);
     expect(container.textContent).toContain("Explicit model catalog unavailable");
   });
 });
diff --git a/ui/src/pages/config/session-observer-settings.ts b/ui/src/pages/config/session-observer-settings.ts
index 094f14061105..793306eda758 100644
--- a/ui/src/pages/config/session-observer-settings.ts
+++ b/ui/src/pages/config/session-observer-settings.ts
@@ -1,6 +1,8 @@
-import { html, nothing } from "lit";
+import { html } from "lit";
 import type { SystemInfoResult } from "../../../../packages/gateway-protocol/src/index.js";
 import type { ModelCatalogEntry } from "../../api/types.ts";
+import { renderModelPicker } from "../../components/model-picker.ts";
+import { providerIdFromModelRef } from "../../components/provider-icon.ts";
 import { renderSettingsRow, renderSettingsToggleRow } from "../../components/settings-ui.ts";
 import { t } from "../../i18n/index.ts";
 
@@ -55,6 +57,7 @@ function modelOptions(models: readonly ModelCatalogEntry[]) {
     .map((model) => ({
       value: model.id.startsWith(`${model.provider}/`) ? model.id : `${model.provider}/${model.id}`,
       label: model.name || model.id,
+      provider: model.provider,
     }))
     .filter((model) => {
       if (seen.has(model.value)) {
@@ -79,6 +82,7 @@ export function renderSessionObserverSettings(props: {
   const selected = props.utilityModel === undefined ? AUTO_VALUE : props.utilityModel;
   const options = modelOptions(props.models);
   const selectedIsCatalogModel = options.some((option) => option.value === selected);
+  const selectedProvider = providerIdFromModelRef(selected);
   return html`
     <div class="settings-group">
       ${renderSettingsToggleRow({
@@ -97,37 +101,39 @@ export function renderSessionObserverSettings(props: {
         description: props.modelsUnavailable
           ? t("configView.sessionObserver.modelCatalogUnavailable")
           : t("configView.sessionObserver.modelPickerHint"),
-        control: html`
-          <select
-            class="settings-select"
-            aria-label=${t("configView.sessionObserver.modelPicker")}
-            .value=${selected}
-            ?disabled=${props.disabled}
-            @change=${(event: Event) => {
-              const value = (event.currentTarget as HTMLSelectElement).value;
-              props.onUtilityModelChange(
-                value === AUTO_VALUE
-                  ? { kind: "auto" }
-                  : value === ""
-                    ? { kind: "disabled" }
-                    : { kind: "model", model: value },
-              );
-            }}
-          >
-            <option value=${AUTO_VALUE}>${t("configView.sessionObserver.auto")}</option>
-            <option value="">${t("configView.sessionObserver.disabled")}</option>
-            ${selected !== AUTO_VALUE && selected !== "" && !selectedIsCatalogModel
-              ? html`<option value=${selected} ?disabled=${props.modelsUnavailable}>
-                  ${selected}
-                </option>`
-              : nothing}
-            ${options.map(
-              (option) => html`<option value=${option.value} ?disabled=${props.modelsUnavailable}>
-                ${option.label}
-              </option>`,
-            )}
-          </select>
-        `,
+        control: renderModelPicker({
+          label: t("configView.sessionObserver.modelPicker"),
+          value: selected,
+          options: [
+            { value: AUTO_VALUE, label: t("configView.sessionObserver.auto") },
+            { value: "", label: t("configView.sessionObserver.disabled") },
+            ...(selected !== AUTO_VALUE && selected !== "" && !selectedIsCatalogModel
+              ? [
+                  {
+                    value: selected,
+                    label: selected,
+                    disabled: props.modelsUnavailable,
+                    ...(selectedProvider ? { provider: selectedProvider } : {}),
+                  },
+                ]
+              : []),
+            ...options.map(({ value, label, provider }) => ({
+              value,
+              label,
+              provider,
+              disabled: props.modelsUnavailable,
+            })),
+          ],
+          disabled: props.disabled,
+          onChange: (value) =>
+            props.onUtilityModelChange(
+              value === AUTO_VALUE
+                ? { kind: "auto" }
+                : value === ""
+                  ? { kind: "disabled" }
+                  : { kind: "model", model: value },
+            ),
+        }),
       })}
     </div>
   `;
diff --git a/ui/src/pages/config/talk.test.ts b/ui/src/pages/config/talk.test.ts
index 80fec682d785..ae92d4f79520 100644
--- a/ui/src/pages/config/talk.test.ts
+++ b/ui/src/pages/config/talk.test.ts
@@ -46,11 +46,61 @@ describe("renderTalk", () => {
       "wa-radio-group",
     );
     expect(provider?.disabled).toBe(true);
-    expect([...container.querySelectorAll<HTMLSelectElement>("select")]).toHaveLength(2);
+    const voice = [...container.querySelectorAll<HTMLSelectElement>("select")];
+    expect(voice).toHaveLength(1);
+    expect(voice.every((select) => select.disabled)).toBe(true);
     expect(
-      [...container.querySelectorAll<HTMLSelectElement>("select")].every(
-        (select) => select.disabled,
-      ),
+      container.querySelector("wa-select.model-picker__select")?.hasAttribute("disabled"),
     ).toBe(true);
   });
+
+  it("commits provider-local model ids without qualifying them", () => {
+    const container = document.createElement("div");
+    const onModelChange = vi.fn();
+    render(
+      renderTalk({
+        selection: {
+          provider: "openai",
+          model: "gpt-live",
+          speakerVoice: null,
+          transport: "webrtc",
+          providerEntries: {},
+        },
+        catalog: {
+          kind: "ready",
+          ready: true,
+          activeProvider: "openai",
+          providers: [
+            {
+              id: "openai",
+              label: "OpenAI",
+              configured: true,
+              aliases: [],
+              models: ["gpt-live", "gpt-realtime"],
+              voices: [],
+              transports: ["webrtc"],
+              defaultModel: "gpt-live",
+            },
+          ],
+        },
+        configBusy: false,
+        onProviderChange: vi.fn(),
+        onModelChange,
+        onVoiceChange: vi.fn(),
+        editor: html``,
+      }),
+      container,
+    );
+
+    const picker = container.querySelector<HTMLElement & { value: string }>(
+      "wa-select.model-picker__select",
+    );
+    expect(picker?.querySelector('wa-option[value="gpt-realtime"]')).not.toBeNull();
+    if (picker) {
+      Object.defineProperty(picker, "value", { configurable: true, value: "gpt-realtime" });
+      picker.dispatchEvent(new Event("change", { bubbles: true }));
+      Reflect.deleteProperty(picker, "value");
+    }
+    expect(onModelChange).toHaveBeenCalledWith("gpt-realtime");
+  });
 });
diff --git a/ui/src/pages/config/talk.ts b/ui/src/pages/config/talk.ts
index 1a347096b12e..9bd6887d63a2 100644
--- a/ui/src/pages/config/talk.ts
+++ b/ui/src/pages/config/talk.ts
@@ -3,6 +3,7 @@
 // same curated-rows-above-schema shape). The pickers and the raw form patch the
 // same config draft, so both stay in sync without narrowing the schema.
 import { html, nothing, type TemplateResult } from "lit";
+import { renderModelPicker } from "../../components/model-picker.ts";
 import {
   renderDocsLink,
   renderSettingsRow,
@@ -242,13 +243,16 @@ function renderModelRow(props: TalkViewProps) {
     // A hand-edited model stays selectable instead of snapping to default.
     ...(model && !known.includes(model) ? [{ value: model, label: model }] : []),
   ];
-  return renderTalkSelectRow({
+  return renderSettingsRow({
     title: t("talkPage.model.title"),
     description: t("talkPage.model.description"),
-    value: model ?? TALK_PICKER_UNSET,
-    options,
-    disabled: props.configBusy,
-    onChange: (value) => props.onModelChange(value || null),
+    control: renderModelPicker({
+      label: t("talkPage.model.title"),
+      value: model ?? TALK_PICKER_UNSET,
+      options: options.map(({ value, label }) => ({ value, label, provider: provider.id })),
+      disabled: props.configBusy,
+      onChange: (value) => props.onModelChange(value || null),
+    }),
   });
 }
 
diff --git a/ui/src/pages/cron/view.test.ts b/ui/src/pages/cron/view.test.ts
index f4e7916b2ce7..094f712c88a5 100644
--- a/ui/src/pages/cron/view.test.ts
+++ b/ui/src/pages/cron/view.test.ts
@@ -519,7 +519,13 @@ describe("cron view editor", () => {
       channels: ["telegram"],
       channelMeta: [{ id: "telegram", label: "", detailLabel: "Telegram" }],
       channelLabels: { telegram: "Telegram fallback" },
-      form: { ...DEFAULT_CRON_FORM, scheduleKind: "cron", failureAlertMode: "custom" },
+      form: {
+        ...DEFAULT_CRON_FORM,
+        scheduleKind: "cron",
+        deliveryChannel: "telegram",
+        failureAlertMode: "custom",
+        failureAlertChannel: "retired-channel",
+      },
       onFormChange,
     });
 
@@ -539,10 +545,24 @@ describe("cron view editor", () => {
       expect(onFormChange).toHaveBeenLastCalledWith({ [field]: field });
     }
 
-    const channel = getElement(container, "#cron-failure-alert-channel", HTMLSelectElement);
-    channel.value = "telegram";
-    expect(channel.selectedOptions[0]?.textContent).toBe("Telegram fallback");
+    const channel = getElement(
+      container,
+      "#cron-failure-alert-channel",
+      HTMLElement,
+    ) as HTMLElement & {
+      value: string;
+    };
+    expect(
+      Array.from(channel.querySelectorAll("wa-option"), (option) => option.getAttribute("value")),
+    ).toContain("retired-channel");
+    expect(channel.querySelector('wa-option[value="telegram"] img')).not.toBeNull();
+    expect(
+      (channel.querySelector('wa-option[value="telegram"]') as HTMLElement & { label?: string })
+        ?.label,
+    ).toBe("Telegram fallback");
+    Object.defineProperty(channel, "value", { configurable: true, value: "telegram" });
     channel.dispatchEvent(new Event("change", { bubbles: true }));
+    Reflect.deleteProperty(channel, "value");
     expect(onFormChange).toHaveBeenLastCalledWith({ failureAlertChannel: "telegram" });
   });
 
@@ -664,8 +684,16 @@ describe("cron view editor", () => {
         everyUnit: "seconds",
       },
     });
-    const unitSelect = getElement(container, 'select[aria-label="Unit"]', HTMLSelectElement);
-    const values = Array.from(unitSelect.querySelectorAll("option")).map((option) => option.value);
+    const unitSelect = Array.from(container.querySelectorAll("wa-select")).find(
+      (select) => select.querySelector('[slot="label"]')?.textContent === "Unit",
+    );
+    expect(unitSelect).toBeInstanceOf(HTMLElement);
+    if (!unitSelect) {
+      throw new Error("Expected the interval unit picker");
+    }
+    const values = Array.from(unitSelect.querySelectorAll("wa-option"), (option) =>
+      option.getAttribute("value"),
+    );
     expect(values).toEqual(["seconds", "minutes", "hours", "days"]);
   });
 
@@ -727,8 +755,10 @@ describe("cron view editor", () => {
         deliveryMode: "announce",
       },
     });
-    const delivery = getElement(container, "#cron-delivery-mode", HTMLSelectElement);
-    const values = Array.from(delivery.querySelectorAll("option")).map((option) => option.value);
+    const delivery = getElement(container, "#cron-delivery-mode", HTMLElement);
+    const values = Array.from(delivery.querySelectorAll("wa-option"), (option) =>
+      option.getAttribute("value"),
+    );
     expect(values).toEqual(["webhook", "none"]);
     expect(container.querySelector("#cron-delivery-channel")).toBeNull();
   });
@@ -1016,7 +1046,7 @@ describe("cron view editor", () => {
     expect(onToggle).toHaveBeenCalledWith(job, true);
   });
 
-  it("renders suggestion datalists for agent/model/thinking/timezone", () => {
+  it("renders model-picker suggestions with the remaining text datalists", () => {
     const container = renderView({
       createOpen: true,
       agentSuggestions: ["main"],
@@ -1028,7 +1058,6 @@ describe("cron view editor", () => {
     });
     for (const id of [
       "cron-agent-suggestions",
-      "cron-model-suggestions",
       "cron-thinking-suggestions",
       "cron-tz-suggestions",
       "cron-delivery-to-suggestions",
@@ -1036,26 +1065,42 @@ describe("cron view editor", () => {
     ]) {
       expect(container.querySelector(`datalist#${id}`)).not.toBeNull();
     }
-    const model = getElement(container, "#cron-payload-model", HTMLInputElement);
-    expect(model.getAttribute("list")).toBe("cron-model-suggestions");
+    const model = getElement(container, "#cron-payload-model-picker", HTMLElement);
+    expect(model.querySelector('wa-option[value="openai/gpt-5.2"]')).not.toBeNull();
+    expect(model.querySelector('[data-provider-icon="codex"]')).not.toBeNull();
+    expect(container.querySelector<HTMLInputElement>("#cron-payload-model")?.hidden).toBe(true);
   });
 });
 
-describe("cron view native selects", () => {
+describe("cron view selects", () => {
   it("shows authoritative form values instead of first options in the create form", () => {
     const container = renderView({ createOpen: true });
-    const action = getElement(container, "select#cron-payload-kind", HTMLSelectElement);
-    expect(action.value).toBe("agentTurn");
-    const runsIn = getElement(container, "select#cron-session-target", HTMLSelectElement);
-    expect(runsIn.value).toBe("isolated");
-    const unit = Array.from(container.querySelectorAll("select")).find(
-      (entry) => entry.getAttribute("aria-label") === "Unit",
-    );
-    expect(unit?.value).toBe("minutes");
+    const action = getElement(
+      container,
+      "wa-select#cron-payload-kind",
+      HTMLElement,
+    ) as HTMLElement & {
+      value: string;
+    };
+    expect(action.querySelector("wa-option[selected]")?.getAttribute("value")).toBe("agentTurn");
+    const runsIn = getElement(
+      container,
+      "wa-select#cron-session-target",
+      HTMLElement,
+    ) as HTMLElement & { value: string };
+    expect(runsIn.querySelector("wa-option[selected]")?.getAttribute("value")).toBe("isolated");
+    const unit = Array.from(
+      container.querySelectorAll<HTMLElement & { value: string }>("wa-select"),
+    ).find((select) => select.querySelector('[slot="label"]')?.textContent === "Unit");
+    expect(unit?.querySelector("wa-option[selected]")?.getAttribute("value")).toBe("minutes");
     // Negative control: the delivery-mode default is also the first option, so
     // this passes before and after the fix and proves the harness reads selects.
-    const delivery = getElement(container, "select#cron-delivery-mode", HTMLSelectElement);
-    expect(delivery.value).toBe("announce");
+    const delivery = getElement(
+      container,
+      "wa-select#cron-delivery-mode",
+      HTMLElement,
+    ) as HTMLElement & { value: string };
+    expect(delivery.querySelector("wa-option[selected]")?.getAttribute("value")).toBe("announce");
   });
 
   it("shows persisted non-first values in jobs filters and runs sort", () => {
diff --git a/ui/src/pages/cron/view.ts b/ui/src/pages/cron/view.ts
index e38f2aa55841..b10bdf5f1302 100644
--- a/ui/src/pages/cron/view.ts
+++ b/ui/src/pages/cron/view.ts
@@ -18,9 +18,13 @@ import type {
   CronJobsSortBy,
   CronSortDir,
 } from "../../api/types.ts";
+import { renderChannelPicker, type ChannelPickerOption } from "../../components/channel-picker.ts";
 import { renderCronJobsPagination } from "../../components/cron-jobs-pagination.ts";
 import { icon, icons } from "../../components/icons.ts";
 import { highlightCodeHtml } from "../../components/markdown-code-blocks.ts";
+import { renderModelPicker } from "../../components/model-picker.ts";
+import { providerIdFromModelRef } from "../../components/provider-icon.ts";
+import { renderPicker, type PickerOption } from "../../components/select-picker.ts";
 import "../../components/tooltip.ts";
 import "../../components/web-awesome.ts";
 import "../../components/web-awesome-popover.ts";
@@ -135,16 +139,17 @@ type CronProps = {
 
 // ── Shared option helpers ──
 
-function buildChannelOptions(props: CronProps): string[] {
-  const current = props.form.deliveryChannel?.trim();
-  return uniqueStrings(["last", ...props.channels.filter(Boolean), ...(current ? [current] : [])]);
-}
-
-function resolveChannelLabel(props: CronProps, channel: string): string {
-  return channel === "last"
-    ? channel
-    : props.channelMeta?.find((entry) => entry.id === channel)?.label ||
-        (props.channelLabels?.[channel] ?? channel);
+function buildChannelOptions(props: CronProps): ChannelPickerOption[] {
+  return [
+    { value: "last", label: "last", kind: "neutral" },
+    ...uniqueStrings(props.channels.filter(Boolean)).map((value) => ({
+      value,
+      label:
+        props.channelMeta?.find((entry) => entry.id === value)?.label ||
+        props.channelLabels?.[value] ||
+        value,
+    })),
+  ];
 }
 
 function renderSuggestionList(id: string, options: string[]) {
@@ -347,7 +352,7 @@ function renderCronInputField(
   });
 }
 
-type CronSelectOption = { value: string; label: string };
+type CronSelectOption = PickerOption;
 
 type CronSelectOptions = {
   label: string;
@@ -356,6 +361,7 @@ type CronSelectOptions = {
   value?: string;
   disabled?: boolean;
   standalone?: boolean;
+  channel?: boolean;
 };
 
 function renderCronSelect(
@@ -364,24 +370,15 @@ function renderCronSelect(
   options: CronSelectOptions,
 ) {
   const selected = options.value ?? props.form[field];
-  return html`
-    <select
-      id=${ifDefined(options.standalone ? undefined : inputIdForField(field))}
-      class="settings-select"
-      .value=${selected}
-      aria-label=${ifDefined(options.standalone ? options.label : undefined)}
-      ?disabled=${options.disabled ?? false}
-      @change=${(event: Event) =>
-        props.onFormChange({ [field]: (event.currentTarget as HTMLSelectElement).value })}
-    >
-      ${options.options.map(
-        // The .value property commits before these mapped options exist, so the
-        // browser falls back to the first option; ?selected marks the real one.
-        ({ value, label }) =>
-          html`<option value=${value} ?selected=${value === selected}>${label}</option>`,
-      )}
-    </select>
-  `;
+  const picker = options.channel ? renderChannelPicker : renderPicker;
+  return picker({
+    id: options.standalone ? undefined : inputIdForField(field),
+    label: options.label,
+    value: options.channel ? selected || "last" : selected,
+    options: options.options,
+    disabled: options.disabled,
+    onChange: (value) => props.onFormChange({ [field]: value }),
+  });
 }
 
 function renderCronSelectField(
@@ -417,7 +414,6 @@ export function renderCron(props: CronProps) {
   return html`
     ${mode === "overview" ? renderListView(props) : renderDetailView(props, mode)}
     ${renderSuggestionList("cron-agent-suggestions", props.agentSuggestions)}
-    ${renderSuggestionList("cron-model-suggestions", props.modelSuggestions)}
     ${renderSuggestionList("cron-thinking-suggestions", props.thinkingSuggestions)}
     ${renderSuggestionList("cron-tz-suggestions", props.timezoneSuggestions)}
     ${renderSuggestionList("cron-delivery-to-suggestions", props.deliveryToSuggestions)}
@@ -1242,15 +1238,34 @@ function renderPromptSection(
           { value: "agentTurn", label: t("cron.form.agentTurn") },
         ],
       });
+  const modelLabel = t("cron.form.model");
+  const modelError = props.fieldErrors.payloadModel;
+  const modelOptions = uniqueStrings(props.modelSuggestions).map((value) => {
+    const provider = providerIdFromModelRef(value);
+    return { value, label: value, provider: provider ?? undefined };
+  });
   const agentTurnRows = ctx.isAgentTurn
     ? html`
-        ${renderCronInputField(props, "payloadModel", {
-          label: t("cron.form.model"),
+        ${renderFieldRow({
+          label: modelLabel,
+          controlId: "",
           help: t("cron.form.modelHelp"),
-          errorKey: "payloadModel",
-          describeError: false,
-          list: "cron-model-suggestions",
-          placeholder: t("cron.form.modelPlaceholder"),
+          error: modelError,
+          errorId: errorIdForField("payloadModel"),
+          control: renderModelPicker({
+            id: "cron-payload-model-picker",
+            label: modelLabel,
+            value: props.form.payloadModel,
+            options: [{ value: "", label: t("common.default") }, ...modelOptions],
+            custom: {
+              id: inputIdForField("payloadModel"),
+              label: t("cron.form.customModel"),
+              placeholder: t("cron.form.modelPlaceholder"),
+              invalid: Boolean(modelError),
+              describedBy: modelError ? errorIdForField("payloadModel") : undefined,
+            },
+            onChange: (payloadModel) => props.onFormChange({ payloadModel }),
+          }),
         })}
         ${renderCronInputField(props, "payloadThinking", {
           label: t("cron.form.thinking"),
@@ -1475,10 +1490,8 @@ function renderDeliverySection(
               label: t("cron.form.channel"),
               help: t("cron.form.channelHelp"),
               value: props.form.deliveryChannel || "last",
-              options: channelOptions.map((channel) => ({
-                value: channel,
-                label: resolveChannelLabel(props, channel),
-              })),
+              options: channelOptions,
+              channel: true,
             })}
             ${renderCronInputField(props, "deliveryTo", {
               label: t("cron.form.to"),
@@ -1645,7 +1658,7 @@ function renderAdvanced(
   `;
 }
 
-function renderFailureAlertRows(props: CronProps, channelOptions: string[]) {
+function renderFailureAlertRows(props: CronProps, channelOptions: readonly ChannelPickerOption[]) {
   return html`
     ${renderCronSelectField(props, "failureAlertMode", {
       label: t("cron.form.failureAlerts"),
@@ -1673,10 +1686,8 @@ function renderFailureAlertRows(props: CronProps, channelOptions: string[]) {
           ${renderCronSelectField(props, "failureAlertChannel", {
             label: t("cron.form.failureAlertChannel"),
             value: props.form.failureAlertChannel || "last",
-            options: channelOptions.map((channel) => ({
-              value: channel,
-              label: resolveChannelLabel(props, channel),
-            })),
+            options: channelOptions,
+            channel: true,
           })}
           ${renderCronInputField(props, "failureAlertTo", {
             label: t("cron.form.failureAlertTo"),
diff --git a/ui/src/pages/model-providers/default-models-view.ts b/ui/src/pages/model-providers/default-models-view.ts
index 955c9d690048..5709f460a281 100644
--- a/ui/src/pages/model-providers/default-models-view.ts
+++ b/ui/src/pages/model-providers/default-models-view.ts
@@ -1,5 +1,5 @@
 import { html, nothing } from "lit";
-import { providerDisplayLabel } from "../../components/provider-icon.ts";
+import { renderModelPicker, type ModelPickerOption } from "../../components/model-picker.ts";
 import { renderSettingsSection } from "../../components/settings-ui.ts";
 import { t } from "../../i18n/index.ts";
 import { modelCatalogRef, type DefaultModelSelection, type ModelPickerEntry } from "./data.ts";
@@ -20,54 +20,24 @@ type DefaultModelsViewProps = {
   onReset: () => void;
 };
 
-type ModelOptionGroup = {
-  provider: string;
-  label: string;
-  models: Array<{ ref: string; label: string }>;
-};
-
 const AUTOMATIC_UTILITY_VALUE = "__openclaw_automatic_utility__";
 
-function modelGroups(models: ModelPickerEntry[]): ModelOptionGroup[] {
-  const groups = new Map<string, ModelOptionGroup>();
+function modelOptions(models: ModelPickerEntry[]): ModelPickerOption[] {
   const seen = new Set<string>();
+  const options: ModelPickerOption[] = [];
   for (const model of models) {
     const ref = modelCatalogRef(model);
     if (seen.has(ref)) {
       continue;
     }
     seen.add(ref);
-    const groupKey = model.provider || "saved-selection";
-    const group = groups.get(groupKey) ?? {
-      provider: groupKey,
-      label: model.provider
-        ? providerDisplayLabel(model.provider)
-        : t("modelProviders.defaults.savedSelection"),
-      models: [],
-    };
-    group.models.push({ ref, label: model.name || ref });
-    groups.set(groupKey, group);
+    options.push({
+      value: ref,
+      label: model.name || ref,
+      ...(model.provider ? { provider: model.provider } : {}),
+    });
   }
-  const sortedGroups = [...groups.values()];
-  for (const group of sortedGroups) {
-    group.models = group.models.toSorted((a, b) => a.label.localeCompare(b.label));
-  }
-  return sortedGroups.toSorted((a, b) => a.label.localeCompare(b.label));
-}
-
-function renderModelOptions(models: ModelPickerEntry[], selected = "") {
-  return modelGroups(models).map(
-    (group) => html`
-      <optgroup label=${group.label}>
-        ${group.models.map(
-          (model) =>
-            html`<option value=${model.ref} ?selected=${model.ref === selected}>
-              ${model.label}
-            </option>`,
-        )}
-      </optgroup>
-    `,
-  );
+  return options.toSorted((a, b) => a.label.localeCompare(b.label));
 }
 
 export function renderDefaultModels(props: DefaultModelsViewProps) {
@@ -82,38 +52,40 @@ export function renderDefaultModels(props: DefaultModelsViewProps) {
       <div class="model-providers__default-grid">
         <label class="field">
           <span>${t("modelProviders.defaults.primary")}</span>
-          <select
-            class="settings-select"
-            .value=${props.selection.primary}
-            ?disabled=${disabled || saving}
-            title=${title}
-            @change=${(event: Event) =>
-              props.onPrimaryChange((event.target as HTMLSelectElement).value)}
-          >
-            <option value="" ?disabled=${Boolean(props.selection.primary)}>
-              ${t("modelProviders.defaults.selectModel")}
-            </option>
-            ${renderModelOptions(props.models, props.selection.primary)}
-          </select>
+          ${renderModelPicker({
+            label: t("modelProviders.defaults.primary"),
+            value: props.selection.primary,
+            options: [
+              {
+                value: "",
+                label: t("modelProviders.defaults.selectModel"),
+                disabled: Boolean(props.selection.primary),
+              },
+              ...modelOptions(props.models),
+            ],
+            disabled: disabled || saving,
+            title,
+            onChange: props.onPrimaryChange,
+          })}
         </label>
         <label class="field">
           <span>${t("modelProviders.defaults.utility")}</span>
-          <select
-            class="settings-select"
-            .value=${props.selection.utilityModel ?? AUTOMATIC_UTILITY_VALUE}
-            ?disabled=${disabled || saving}
-            title=${title}
-            @change=${(event: Event) => {
-              const value = (event.target as HTMLSelectElement).value;
-              props.onUtilityChange(value === AUTOMATIC_UTILITY_VALUE ? null : value);
-            }}
-          >
-            <option value=${AUTOMATIC_UTILITY_VALUE}>
-              ${t("modelProviders.defaults.automatic")}
-            </option>
-            <option value="">${t("modelProviders.defaults.disabled")}</option>
-            ${renderModelOptions(props.models, props.selection.utilityModel ?? "")}
-          </select>
+          ${renderModelPicker({
+            label: t("modelProviders.defaults.utility"),
+            value: props.selection.utilityModel ?? AUTOMATIC_UTILITY_VALUE,
+            options: [
+              {
+                value: AUTOMATIC_UTILITY_VALUE,
+                label: t("modelProviders.defaults.automatic"),
+              },
+              { value: "", label: t("modelProviders.defaults.disabled") },
+              ...modelOptions(props.models),
+            ],
+            disabled: disabled || saving,
+            title,
+            onChange: (value) =>
+              props.onUtilityChange(value === AUTOMATIC_UTILITY_VALUE ? null : value),
+          })}
         </label>
       </div>
       <div class="model-providers__fallbacks">
@@ -140,27 +112,28 @@ export function renderDefaultModels(props: DefaultModelsViewProps) {
             )}
         <label class="field model-providers__fallback-add">
           <span>${t("modelProviders.defaults.addFallback")}</span>
-          <select
-            class="settings-select"
-            .value=${""}
-            ?disabled=${disabled || saving || !props.selection.primary}
-            title=${title}
-            @change=${(event: Event) => {
-              const select = event.target as HTMLSelectElement;
-              if (select.value) {
-                props.onFallbackAdd(select.value);
-                select.value = "";
+          ${renderModelPicker({
+            label: t("modelProviders.defaults.addFallback"),
+            value: "",
+            options: [
+              { value: "", label: t("modelProviders.defaults.selectFallback") },
+              ...modelOptions(
+                props.models.filter((model) => {
+                  const ref = modelCatalogRef(model);
+                  return (
+                    ref !== props.selection.primary && !props.selection.fallbacks.includes(ref)
+                  );
+                }),
+              ),
+            ],
+            disabled: disabled || saving || !props.selection.primary,
+            title,
+            onChange: (value) => {
+              if (value) {
+                props.onFallbackAdd(value);
               }
-            }}
-          >
-            <option value="">${t("modelProviders.defaults.selectFallback")}</option>
-            ${renderModelOptions(
-              props.models.filter((model) => {
-                const ref = modelCatalogRef(model);
-                return ref !== props.selection.primary && !props.selection.fallbacks.includes(ref);
-              }),
-            )}
-          </select>
+            },
+          })}
         </label>
       </div>
       ${props.message
diff --git a/ui/src/pages/model-providers/view.test.ts b/ui/src/pages/model-providers/view.test.ts
index 41c970fb6f39..5118359f52a4 100644
--- a/ui/src/pages/model-providers/view.test.ts
+++ b/ui/src/pages/model-providers/view.test.ts
@@ -321,19 +321,17 @@ describe("renderModelProviders", () => {
     );
 
     const defaults = container.querySelector(".model-providers__defaults");
-    const defaultControls = [
-      ...(defaults?.querySelectorAll<HTMLSelectElement | HTMLButtonElement>(
-        "select, .model-providers__fallback-row button",
-      ) ?? []),
-      button(container, "Save"),
-    ];
-    expect(defaultControls.map((control) => control?.disabled)).toEqual([
-      true,
-      true,
-      true,
-      true,
-      true,
-    ]);
+    const defaultSelects = [...(defaults?.querySelectorAll("wa-select") ?? [])];
+    expect(defaultSelects).toHaveLength(3);
+    expect(defaultSelects.every((select) => select.hasAttribute("disabled"))).toBe(true);
+    expect(
+      [
+        ...(defaults?.querySelectorAll<HTMLButtonElement>(
+          ".model-providers__fallback-row button",
+        ) ?? []),
+      ].every((control) => control.disabled),
+    ).toBe(true);
+    expect(button(container, "Save")?.disabled).toBe(true);
 
     const provider = container.querySelector('[data-provider-id="openai"]');
     expect(
@@ -753,10 +751,10 @@ describe("renderModelProviders", () => {
         },
       }),
     );
-    const option = container.querySelector<HTMLOptionElement>(
-      'option[value="openrouter/anthropic/claude-sonnet-4"]',
+    const option = container.querySelector(
+      'wa-option[value="openrouter/anthropic/claude-sonnet-4"]',
     );
-    expect(option?.selected).toBe(true);
+    expect(option?.hasAttribute("selected")).toBe(true);
   });
 
   it("renders alias defaults and distinct automatic or disabled utility states", () => {
@@ -773,11 +771,12 @@ describe("renderModelProviders", () => {
         defaultModels: { primary: "opus", fallbacks: [], utilityModel: null },
       }),
     );
-    expect(automatic.querySelector<HTMLOptionElement>('option[value="opus"]')?.selected).toBe(true);
+    expect(automatic.querySelector('wa-option[value="opus"]')?.hasAttribute("selected")).toBe(true);
     expect(
       text(
-        automatic.querySelectorAll<HTMLSelectElement>(".model-providers__defaults select")[1]
-          ?.selectedOptions[0] ?? null,
+        automatic
+          .querySelectorAll(".model-providers__defaults wa-select")[1]
+          ?.querySelector("wa-option[selected]") ?? null,
       ),
     ).toContain("Automatic");
 
@@ -789,8 +788,9 @@ describe("renderModelProviders", () => {
     );
     expect(
       text(
-        disabled.querySelectorAll<HTMLSelectElement>(".model-providers__defaults select")[1]
-          ?.selectedOptions[0] ?? null,
+        disabled
+          .querySelectorAll(".model-providers__defaults wa-select")[1]
+          ?.querySelector("wa-option[selected]") ?? null,
       ),
     ).toBe("Disabled");
   });
diff --git a/ui/src/pages/new-session/model-control.test.ts b/ui/src/pages/new-session/model-control.test.ts
index dbddfa7df685..859ae92904f6 100644
--- a/ui/src/pages/new-session/model-control.test.ts
+++ b/ui/src/pages/new-session/model-control.test.ts
@@ -82,6 +82,28 @@ function renderControl(
   return container;
 }
 
+function modelSelect(container: Element) {
+  return container.querySelector<HTMLElement & { value: string }>(
+    "wa-select.chat-controls__model-picker",
+  );
+}
+
+function modelOptions(container: Element) {
+  return container.querySelectorAll("wa-select.chat-controls__model-picker wa-option");
+}
+
+function modelOption(container: Element, value: string) {
+  return container.querySelector(
+    `wa-select.chat-controls__model-picker wa-option[value="${value}"]`,
+  );
+}
+
+function changePicker(select: HTMLElement & { value: string }, value: string) {
+  Object.defineProperty(select, "value", { configurable: true, value });
+  select.dispatchEvent(new Event("change", { bubbles: true }));
+  Reflect.deleteProperty(select, "value");
+}
+
 afterEach(() => {
   vi.useRealTimers();
 });
@@ -99,7 +121,7 @@ describe("new-session model runtime", () => {
     await vi.waitFor(() => expect(request).toHaveBeenCalledOnce());
     expect(request).not.toHaveBeenCalledWith("sessions.catalog.list", expect.anything());
     expect(
-      renderControl(control, context).querySelector("[data-chat-model-target-group]"),
+      renderControl(control, context).querySelector("wa-select.new-session-page__target-picker"),
     ).toBeNull();
   });
 
@@ -150,14 +172,22 @@ describe("new-session model runtime", () => {
     );
     await vi.waitFor(() => {
       const container = renderControl(control, context);
-      expect(container.querySelector('[data-chat-model-target-group="cliAgents"]')).not.toBeNull();
-      expect(container.querySelector('[data-chat-model-target="anthropic"]')).not.toBeNull();
+      expect(container.querySelector("wa-select.new-session-page__target-picker")).not.toBeNull();
+      expect(
+        container.querySelector(
+          'wa-select.new-session-page__target-picker wa-option[value="anthropic"]',
+        ),
+      ).not.toBeNull();
       expect(container.textContent).not.toContain("History only");
     });
 
-    renderControl(control, context)
-      .querySelector<HTMLButtonElement>('[data-chat-model-target="anthropic"]')
-      ?.click();
+    const target = renderControl(control, context).querySelector<HTMLElement & { value: string }>(
+      "wa-select.new-session-page__target-picker",
+    );
+    expect(target).not.toBeNull();
+    if (target) {
+      changePicker(target, "anthropic");
+    }
 
     expect(onCatalogTargetSelect).toHaveBeenCalledExactlyOnceWith("anthropic");
   });
@@ -217,13 +247,10 @@ describe("new-session model runtime", () => {
 
     await vi.waitFor(() => expect(request).toHaveBeenCalledOnce());
     const container = renderControl(control, context);
-    expect(container.querySelector('[data-chat-model-select="true"]')?.textContent).toContain(
-      "Loading models",
-    );
-    expect(
-      container.querySelector('[data-chat-model-select="true"]')?.getAttribute("aria-disabled"),
-    ).toBe("true");
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(0);
+    expect(modelSelect(container)?.textContent).toContain("Loading models");
+    expect(modelSelect(container)?.hasAttribute("disabled")).toBe(true);
+    expect(modelOptions(container)).toHaveLength(1);
+    expect(modelOptions(container)[0]?.hasAttribute("disabled")).toBe(true);
     pending.resolve({ models: [] });
   });
 
@@ -242,7 +269,7 @@ describe("new-session model runtime", () => {
     });
 
     let container = renderControl(control, context, "main", null);
-    const loadingModelTrigger = container.querySelector('[data-chat-model-select="true"]');
+    const loadingModelTrigger = modelSelect(container);
     expect(loadingModelTrigger?.textContent).toContain("Loading models");
     expect(loadingModelTrigger?.textContent).not.toContain("Default model");
     expect(container.querySelector('[data-chat-thinking-select="true"]')?.textContent).toContain(
@@ -256,14 +283,8 @@ describe("new-session model runtime", () => {
       model: { primary: "openai/gpt-5.6-sol" },
       thinkingDefault: "high",
     });
-    expect(
-      container.querySelector(
-        '[data-chat-model-option="openai/gpt-5.6-sol"][data-chat-model-default="true"]',
-      )?.textContent,
-    ).toContain("GPT-5.6 Sol");
-    expect(container.querySelector('[data-chat-model-select="true"]')?.textContent).toContain(
-      "GPT-5.6 Sol",
-    );
+    expect(modelOption(container, "")?.textContent).toContain("GPT-5.6 Sol");
+    expect(modelSelect(container)?.textContent).toContain("GPT-5.6 Sol");
     const thinkingPicker = container.querySelector('[data-chat-thinking-select="true"]');
     expect(thinkingPicker).not.toBeNull();
     expect(thinkingPicker?.textContent).toContain("High");
@@ -293,9 +314,7 @@ describe("new-session model runtime", () => {
       id: "main",
       model: { primary: "openai/gpt-5.6-sol" },
     });
-    expect(container.querySelector('[data-chat-model-select="true"]')?.textContent).toContain(
-      "GPT-5.6 Sol",
-    );
+    expect(modelSelect(container)?.textContent).toContain("GPT-5.6 Sol");
     expect(container.querySelector('[data-chat-thinking-select="true"]')?.textContent).toContain(
       "Medium",
     );
@@ -346,10 +365,8 @@ describe("new-session model runtime", () => {
       ).toBe("error");
     });
     const container = renderControl(control, context);
-    expect(container.querySelector('[data-chat-model-select="true"]')?.textContent).toContain(
-      "Models unavailable",
-    );
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(0);
+    expect(modelSelect(container)?.textContent).toContain("Models unavailable");
+    expect(modelOptions(container)).toHaveLength(1);
     expect(container.querySelector('[data-chat-model-catalog-retry="true"]')).not.toBeNull();
   });
 
@@ -375,11 +392,7 @@ describe("new-session model runtime", () => {
       ?.click();
 
     await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(2));
-    await vi.waitFor(() =>
-      expect(
-        renderControl(control, context).querySelectorAll("[data-chat-model-option]"),
-      ).toHaveLength(3),
-    );
+    await vi.waitFor(() => expect(modelOptions(renderControl(control, context))).toHaveLength(3));
   });
 
   it("renders a successful empty catalog as an explicit empty result", async () => {
@@ -396,12 +409,10 @@ describe("new-session model runtime", () => {
           .querySelector("[data-chat-model-catalog-state]")
           ?.getAttribute("data-chat-model-catalog-state"),
       ).toBe("ready");
-      expect(container.querySelector('[data-chat-model-select="true"]')?.textContent).toContain(
-        "No models available",
-      );
+      expect(modelSelect(container)?.textContent).toContain("No models available");
     });
     const container = renderControl(control, context);
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(0);
+    expect(modelOptions(container)).toHaveLength(1);
     expect(container.querySelector('[data-chat-model-catalog-retry="true"]')).toBeNull();
   });
 
@@ -428,10 +439,8 @@ describe("new-session model runtime", () => {
       ).not.toBeNull(),
     );
     const container = renderControl(control, context);
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(0);
-    expect(container.querySelector('[data-chat-model-select="true"]')?.textContent).toContain(
-      "No models available",
-    );
+    expect(modelOptions(container)).toHaveLength(1);
+    expect(modelSelect(container)?.textContent).toContain("No models available");
     expect(container.textContent).not.toContain("GPT-5.6 Luna");
   });
 
@@ -483,18 +492,14 @@ describe("new-session model runtime", () => {
     const control = new NewSessionModelControl(() => undefined);
 
     control.load(context, "main", true);
-    await vi.waitFor(() =>
-      expect(
-        renderControl(control, context).querySelectorAll("[data-chat-model-option]"),
-      ).toHaveLength(2),
-    );
+    await vi.waitFor(() => expect(modelOptions(renderControl(control, context))).toHaveLength(2));
     request.mockReturnValueOnce(refresh.promise);
 
     control.load(context, "main", true);
 
     let container = renderControl(control, context);
     expect(container.querySelector('[data-chat-model-catalog-state="refreshing"]')).not.toBeNull();
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(2);
+    expect(modelOptions(container)).toHaveLength(2);
 
     refresh.reject(new Error("refresh failed"));
     await vi.waitFor(() =>
@@ -503,7 +508,7 @@ describe("new-session model runtime", () => {
       ).not.toBeNull(),
     );
     container = renderControl(control, context);
-    expect(container.querySelectorAll("[data-chat-model-option]")).toHaveLength(2);
+    expect(modelOptions(container)).toHaveLength(2);
     expect(container.textContent).toContain("Couldn’t refresh models");
 
     container.querySelector<HTMLButtonElement>('[data-chat-model-catalog-retry="true"]')?.click();
@@ -513,9 +518,7 @@ describe("new-session model runtime", () => {
         renderControl(control, context).querySelector("[data-chat-model-catalog-state]"),
       ).toBeNull(),
     );
-    expect(
-      renderControl(control, context).querySelectorAll("[data-chat-model-option]"),
-    ).toHaveLength(2);
+    expect(modelOptions(renderControl(control, context))).toHaveLength(2);
   });
 
   it("keeps stale same-agent data across reconnect invalidation until replacement arrives", async () => {
@@ -531,32 +534,18 @@ describe("new-session model runtime", () => {
     const control = new NewSessionModelControl(() => undefined);
 
     control.load(context, "main", true);
-    await vi.waitFor(() =>
-      expect(
-        renderControl(control, context).querySelector(
-          '[data-chat-model-option="openai/gpt-5.6-luna"]',
-        ),
-      ).not.toBeNull(),
-    );
+    await vi.waitFor(() => expect(modelOption(renderControl(control, context), "")).not.toBeNull());
 
     control.invalidate(false);
     request.mockReturnValueOnce(reconnect.promise);
     control.load(context, "main", true);
 
-    expect(
-      renderControl(control, context).querySelector(
-        '[data-chat-model-option="openai/gpt-5.6-luna"]',
-      ),
-    ).not.toBeNull();
+    expect(modelOption(renderControl(control, context), "")).not.toBeNull();
     reconnect.resolve({ models: newModels });
-    await vi.waitFor(() =>
-      expect(
-        renderControl(control, context).querySelectorAll("[data-chat-model-option]"),
-      ).toHaveLength(2),
-    );
+    await vi.waitFor(() => expect(modelOptions(renderControl(control, context))).toHaveLength(3));
     const container = renderControl(control, context);
-    expect(container.querySelector('[data-chat-model-option="openai/gpt-5.6-luna"]')).toBeNull();
-    expect(container.querySelector('[data-chat-model-option="openai/gpt-5.6-sol"]')).not.toBeNull();
+    expect(modelSelect(container)?.textContent).not.toContain("GPT-5.6 Luna");
+    expect(modelOption(container, "openai/gpt-5.6-sol")).not.toBeNull();
   });
 
   it("clears the old catalog on agent switch and ignores the late old-agent result", async () => {
@@ -583,9 +572,7 @@ describe("new-session model runtime", () => {
     await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(2));
     await vi.waitFor(() =>
       expect(
-        renderControl(control, context, "research").querySelector(
-          '[data-chat-model-option="anthropic/claude-sonnet-5"]',
-        ),
+        modelOption(renderControl(control, context, "research"), "anthropic/claude-sonnet-5"),
       ).not.toBeNull(),
     );
 
@@ -596,10 +583,8 @@ describe("new-session model runtime", () => {
     await Promise.resolve();
 
     const container = renderControl(control, context, "research");
-    expect(
-      container.querySelector('[data-chat-model-option="anthropic/claude-sonnet-5"]'),
-    ).not.toBeNull();
-    expect(container.querySelector('[data-chat-model-option="openai/gpt-5.6-luna"]')).toBeNull();
+    expect(modelOption(container, "anthropic/claude-sonnet-5")).not.toBeNull();
+    expect(modelSelect(container)?.textContent).not.toContain("GPT-5.6 Luna");
   });
 
   it("coalesces equivalent concurrent metadata loads", async () => {
@@ -699,16 +684,16 @@ describe("new-session model runtime", () => {
     control.load(context, "main", true);
     await vi.waitFor(() => {
       expect(request).toHaveBeenCalledOnce();
-      expect(
-        renderControl(control, context).querySelector('[data-chat-model-option="demo/limited"]'),
-      ).not.toBeNull();
+      expect(modelOption(renderControl(control, context), "demo/limited")).not.toBeNull();
     });
     control.selected = "kimi/k3";
     control.thinkingLevel = "xhigh";
 
-    renderControl(control, context)
-      .querySelector<HTMLButtonElement>('[data-chat-model-option="demo/limited"]')
-      ?.click();
+    const picker = modelSelect(renderControl(control, context));
+    expect(picker).not.toBeNull();
+    if (picker) {
+      changePicker(picker, "demo/limited");
+    }
 
     expect(control.selected).toBe("demo/limited");
     expect(control.thinkingLevel).toBe("");
diff --git a/ui/src/pages/new-session/model-control.ts b/ui/src/pages/new-session/model-control.ts
index 97bf520d180f..0a2ffe3506ed 100644
--- a/ui/src/pages/new-session/model-control.ts
+++ b/ui/src/pages/new-session/model-control.ts
@@ -2,12 +2,15 @@ import {
   DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS,
   resolveGatewayStartupRetryAfterMs,
 } from "@openclaw/gateway-client/browser";
+import { html, nothing } from "lit";
 import type {
   SessionCatalog,
   SessionsCatalogListResult,
 } from "../../../../packages/gateway-protocol/src/index.ts";
 import type { GatewayAgentRow, ModelCatalogEntry } from "../../api/types.ts";
 import type { ApplicationContext } from "../../app/context.ts";
+import { icons } from "../../components/icons.ts";
+import { renderPicker } from "../../components/select-picker.ts";
 import { t } from "../../i18n/index.ts";
 import {
   buildQualifiedChatModelValue,
@@ -600,7 +603,31 @@ export class NewSessionModelControl {
       thinkingDefault:
         options.agent?.thinkingDefault ?? sourceResult?.defaults.thinkingDefault ?? "medium",
     };
-    return renderChatModelControls({
+    const targetPicker =
+      this.catalogTargets.length > 0
+        ? renderPicker({
+            label: t("newSession.cliAgentsGroup"),
+            value: "",
+            options: [
+              { value: "", label: t("newSession.cliAgentsGroup"), disabled: true },
+              ...this.catalogTargets.map(({ id, label }) => ({ value: id, label })),
+            ],
+            disabled: options.sending || snapshot?.phase !== "connected",
+            className: "new-session-page__target-picker",
+            renderLeading: (option) =>
+              option.value
+                ? html`<span class="new-session-page__target-icon" aria-hidden="true"
+                    >${icons.terminal}</span
+                  >`
+                : nothing,
+            onChange: (catalogId) => {
+              if (catalogId) {
+                this.onCatalogTargetSelect(catalogId);
+              }
+            },
+          })
+        : nothing;
+    return html`${targetPicker}${renderChatModelControls({
       activeRunId: null,
       agentDefaultModel,
       connected: snapshot?.phase === "connected",
@@ -618,16 +645,6 @@ export class NewSessionModelControl {
             : this.metadataState.status,
       },
       modelOverrides: { [sessionKey]: this.selected },
-      modelPickerTargetGroups:
-        this.catalogTargets.length > 0
-          ? [
-              {
-                id: "cliAgents",
-                label: t("newSession.cliAgentsGroup"),
-                options: this.catalogTargets.map(({ id, label }) => ({ value: id, label })),
-              },
-            ]
-          : undefined,
       modelSwitching: false,
       sending: options.sending,
       sessionKey,
@@ -643,19 +660,16 @@ export class NewSessionModelControl {
         this.selected = selection.model;
         this.thinkingLevel = selection.thinkingLevel;
         this.onSelectionChange({ model: this.selected, thinkingLevel: this.thinkingLevel });
-      },
-      onModelPickerTargetSelect: (groupId, catalogId) => {
-        if (groupId === "cliAgents") {
-          this.onCatalogTargetSelect(catalogId);
-        }
+        this.notify();
       },
       onThinkingSelect: (value) => {
         this.selectionGeneration += 1;
         this.restoringPreference = false;
         this.thinkingLevel = value;
         this.onSelectionChange({ model: this.selected, thinkingLevel: this.thinkingLevel });
+        this.notify();
       },
       onRequestUpdate: this.notify,
-    });
+    })}`;
   }
 }
diff --git a/ui/src/pages/new-session/new-session-page.ts b/ui/src/pages/new-session/new-session-page.ts
index 3d994942122d..a6add602bf17 100644
--- a/ui/src/pages/new-session/new-session-page.ts
+++ b/ui/src/pages/new-session/new-session-page.ts
@@ -16,7 +16,6 @@ import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
 import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import "../../styles/chat.css";
 import "../../styles/new-session.css";
-import { clearChatModelSearchOnEscape } from "../chat/components/chat-model-picker.ts";
 import { renderWelcomeState } from "../chat/components/chat-welcome.ts";
 import * as catalog from "./catalog-target.ts";
 import type { SubmissionOutcomeReason } from "./cloud-recovery-state.ts";
@@ -211,8 +210,7 @@ class NewSessionPage extends OpenClawLightDomElement {
     }
     if (event.type === "keydown") {
       const keyEvent = event as KeyboardEvent;
-      clearChatModelSearchOnEscape(keyEvent);
-      if (keyEvent.defaultPrevented || keyEvent.key !== "Escape") {
+      if (keyEvent.key !== "Escape") {
         return;
       }
       const picker =
diff --git a/ui/src/pages/workboard/view.test.ts b/ui/src/pages/workboard/view.test.ts
index 52b5098c5fd6..cc5d8b6faaf8 100644
--- a/ui/src/pages/workboard/view.test.ts
+++ b/ui/src/pages/workboard/view.test.ts
@@ -94,6 +94,7 @@ function changeWorkboardSelect(select: Element | null | undefined, value: string
   }
   Object.defineProperty(control, "value", { configurable: true, value, writable: true });
   control.dispatchEvent(new Event("change", { bubbles: true }));
+  Reflect.deleteProperty(control, "value");
 }
 
 function selectWorkboardAgent(select: Element | null | undefined, value: string) {
@@ -950,11 +951,13 @@ describe("renderWorkboard", () => {
       ),
     ];
     expect(selects).toHaveLength(2);
-    expect(selects.map((select) => select.getAttribute("label"))).toEqual([
+    expect(selects.map((select) => select.querySelector('[slot="label"]')?.textContent)).toEqual([
       "Workboard view",
       "All priorities",
     ]);
-    expect(selects.map((select) => select.getAttribute("value"))).toEqual(["all", "all"]);
+    expect(
+      selects.map((select) => select.querySelector("wa-option[selected]")?.getAttribute("value")),
+    ).toEqual(["all", "all"]);
     const agentSelect = container.querySelector<
       HTMLElement & { accessibleLabel: string; value: string }
     >(".workboard-agent-select--toolbar");
@@ -2503,7 +2506,9 @@ describe("renderWorkboard", () => {
     expect(state.draftSessionKey).toBe(testCase.sessionKey);
     expect(
       [...container.querySelectorAll(".workboard-draft wa-select")].some(
-        (select) => select.getAttribute("value") === testCase.sessionKey,
+        (select) =>
+          select.querySelector("wa-option[selected]")?.getAttribute("value") ===
+          testCase.sessionKey,
       ),
     ).toBe(true);
 
@@ -2646,6 +2651,7 @@ describe("renderWorkboard", () => {
     expect(
       [...(container.querySelector(".workboard-draft")?.querySelectorAll("wa-select") ?? [])]
         .at(1)
+        ?.querySelector("wa-option[selected]")
         ?.getAttribute("value"),
     ).toBe("high");
   });
@@ -2796,7 +2802,9 @@ describe("renderWorkboard", () => {
         .querySelector(".workboard-draft")
         ?.querySelectorAll<HTMLElement>(".workboard-select") ?? []),
     ].at(2);
-    expect(sessionSelect?.getAttribute("value")).toBe("agent:main:archived-session");
+    expect(sessionSelect?.querySelector("wa-option[selected]")?.getAttribute("value")).toBe(
+      "agent:main:archived-session",
+    );
     expect(
       sessionSelect?.querySelector('wa-option[value="agent:main:archived-session"]'),
     ).not.toBeNull();
@@ -2834,8 +2842,8 @@ describe("renderWorkboard", () => {
         .querySelector(".workboard-draft")
         ?.querySelectorAll<HTMLElement>(".workboard-select") ?? []),
     ].at(2);
-    const labels = [...(sessionOptions?.querySelectorAll(".workboard-select__option") ?? [])].map(
-      (option) => option.textContent?.trim(),
+    const labels = [...(sessionOptions?.querySelectorAll("wa-option") ?? [])].map((option) =>
+      option.textContent?.trim(),
     );
     expect(labels).toContain("Dashboard session");
     expect(labels).not.toContain("heartbeat");
diff --git a/ui/src/pages/workboard/workboard-select.ts b/ui/src/pages/workboard/workboard-select.ts
index 6935f2002dd9..c2982834588a 100644
--- a/ui/src/pages/workboard/workboard-select.ts
+++ b/ui/src/pages/workboard/workboard-select.ts
@@ -1,11 +1,9 @@
 import { html, nothing } from "lit";
+import { renderPicker, type PickerOption } from "../../components/select-picker.ts";
 import { renderWorkboardBoardGlyph } from "../../components/workboard-board-glyph.ts";
-import "../../components/web-awesome-select.ts";
 
-export type WorkboardSelectOption<Value extends string = string> = {
+export type WorkboardSelectOption<Value extends string = string> = PickerOption & {
   value: Value;
-  label: string;
-  description?: string;
   icon?: string;
   color?: string;
   boardId?: string;
@@ -22,66 +20,26 @@ export function renderWorkboardSelect<Value extends string>(params: {
   showLabel?: boolean;
   disabled?: boolean;
 }) {
-  const selectedOption = params.options.find((option) => option.value === params.value);
-  const select = html`
-    <wa-select
-      class="workboard-select ${params.className ?? ""}"
-      label=${params.label}
-      value=${params.value}
-      ?disabled=${params.disabled}
-      @change=${(event: Event) => {
-        const value = (event.currentTarget as HTMLElement & { value?: string }).value as
-          | Value
-          | undefined;
-        if (
-          value !== undefined &&
-          params.options.some((option) => option.value === value && !option.disabled)
-        ) {
-          params.onChange(value);
-          params.requestUpdate?.();
-        }
-      }}
-    >
-      ${selectedOption?.boardId
-        ? html`<span slot="start"
-            >${renderWorkboardBoardGlyph({
-              id: selectedOption.boardId,
-              name: selectedOption.label,
-              icon: selectedOption.icon,
-              color: selectedOption.color,
-            })}</span
-          >`
-        : nothing}
-      ${params.options.map(
-        (option) => html`
-          <wa-option
-            class="workboard-select__option"
-            value=${option.value}
-            .label=${option.label}
-            ?selected=${option.value === params.value}
-            ?disabled=${option.disabled}
-          >
-            ${option.boardId
-              ? html`<span slot="start"
-                  >${renderWorkboardBoardGlyph({
-                    id: option.boardId,
-                    name: option.label,
-                    icon: option.icon,
-                    color: option.color,
-                  })}</span
-                >`
-              : nothing}
-            <span class="workboard-select__copy">
-              <span class="workboard-select__label">${option.label}</span>
-              ${option.description
-                ? html`<span class="workboard-select__description">${option.description}</span>`
-                : nothing}
-            </span>
-          </wa-option>
-        `,
-      )}
-    </wa-select>
-  `;
+  const select = renderPicker({
+    value: params.value,
+    options: params.options,
+    label: params.label,
+    className: `workboard-select ${params.className ?? ""}`,
+    disabled: params.disabled,
+    renderLeading: (option) =>
+      option.boardId
+        ? renderWorkboardBoardGlyph({
+            id: option.boardId,
+            name: option.label,
+            icon: option.icon,
+            color: option.color,
+          })
+        : nothing,
+    onChange: (value) => {
+      params.onChange(value as Value);
+      params.requestUpdate?.();
+    },
+  });
   if (params.showLabel === false) {
     return select;
   }
diff --git a/ui/src/styles/channels.css b/ui/src/styles/channels.css
index 1c38e130bac9..9d3126acfd2a 100644
--- a/ui/src/styles/channels.css
+++ b/ui/src/styles/channels.css
@@ -20,9 +20,9 @@
 
 .channels-tile {
   display: grid;
-  width: 44px;
-  height: 44px;
-  flex: 0 0 44px;
+  width: var(--channels-art-size, 44px);
+  height: var(--channels-art-size, 44px);
+  flex: 0 0 var(--channels-art-size, 44px);
   place-items: center;
   overflow: hidden;
   border: 1px solid var(--border);
diff --git a/ui/src/styles/chat/layout.css b/ui/src/styles/chat/layout.css
index 9005bf84b32b..4b89cd2d8c7b 100644
--- a/ui/src/styles/chat/layout.css
+++ b/ui/src/styles/chat/layout.css
@@ -3792,7 +3792,6 @@ button.chat-reply-preview--message:disabled {
     padding: 0 2px 0 4px;
   }
 
-  .agent-chat__input .chat-controls__model-menu,
   .agent-chat__input .chat-controls__effort-menu {
     box-sizing: border-box;
     position: fixed;
@@ -4305,8 +4304,50 @@ button.chat-reply-preview--message:disabled {
   gap: 4px;
 }
 
-.chat-controls__model-settings .chat-controls__inline-select-trigger {
-  width: auto;
+.chat-controls__model-control {
+  display: grid;
+  min-width: 0;
+  flex: 1 1 auto;
+}
+
+.chat-controls__model-control-row {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+}
+
+.chat-controls__model-control-row .model-picker {
+  min-width: 0;
+  flex: 1 1 auto;
+}
+
+.chat-controls__model-control .model-picker {
+  gap: 0;
+}
+
+.chat-controls__model-picker::part(combobox) {
+  height: 30px;
+  min-height: 30px;
+  padding-inline: 8px;
+  border: 0;
+  background: transparent;
+}
+
+.chat-controls__model-picker:hover::part(combobox),
+.chat-controls__model-picker[open]::part(combobox) {
+  background: color-mix(in srgb, var(--text) 7%, transparent);
+}
+
+@media (max-width: 768px) {
+  .chat-controls__model-picker wa-option {
+    box-sizing: border-box;
+    width: 100%;
+    max-width: calc(100vw - 36px);
+  }
+
+  .chat-controls__model-picker .picker-select__copy {
+    max-width: calc(100vw - 84px);
+  }
 }
 
 .chat-controls__inline-select {
@@ -4448,282 +4489,17 @@ button.chat-reply-preview--message:disabled {
   background: color-mix(in srgb, var(--text) 6%, transparent);
 }
 
-/* Model and effort are independent surfaces so either choice stays one focused
-   interaction without hiding the other pill's effective state. */
-.chat-controls__model-menu,
 .chat-controls__effort-menu {
   display: flex;
   flex-direction: column;
   gap: 0;
   padding: 0;
-  overflow: hidden;
-}
-
-.chat-controls__model-menu {
-  left: auto;
-  right: 0;
-  width: min(380px, calc(100vw - 24px));
-  max-height: min(440px, calc(100vh - 96px));
-}
-
-.chat-controls__effort-menu {
   left: auto;
   right: 0;
   width: min(330px, calc(100vw - 24px));
   overflow: hidden;
 }
 
-.chat-controls__model-search-wrap {
-  display: flex;
-  align-items: center;
-  gap: 7px;
-  margin: 8px;
-  padding: 0 9px;
-  border: 1px solid color-mix(in srgb, var(--border) 78%, transparent);
-  border-radius: var(--radius-sm);
-  background: color-mix(in srgb, var(--card) 78%, transparent);
-}
-
-.chat-controls__model-search-wrap svg {
-  width: 14px;
-  height: 14px;
-  color: var(--muted);
-  flex: 0 0 auto;
-}
-
-.chat-controls__model-search {
-  width: 100%;
-  min-width: 0;
-  height: 34px;
-  padding: 0;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--text);
-  font: inherit;
-  font-size: 13px;
-}
-
-.chat-controls__model-search::placeholder {
-  color: var(--muted);
-}
-
-.chat-controls__locked-model {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-width: 0;
-  padding: 8px 10px;
-  background: color-mix(in srgb, var(--card) 78%, transparent);
-}
-
-.chat-controls__locked-model-value {
-  overflow: hidden;
-  flex: 1 1 auto;
-  color: var(--text-strong);
-  font-size: 12px;
-  font-weight: 600;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.chat-controls__locked-model-badge {
-  flex: 0 0 auto;
-  padding: 2px 6px;
-  border: 1px solid color-mix(in srgb, var(--border) 78%, transparent);
-  border-radius: var(--radius-full);
-  color: var(--muted);
-  font-size: 10px;
-  font-weight: 650;
-  letter-spacing: 0.04em;
-  text-transform: uppercase;
-}
-
-.chat-controls__provider-heading {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  padding: 8px 9px 3px;
-  color: var(--muted);
-  font-size: 11px;
-  font-weight: 700;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-}
-
-/* Mask/brand-color rules live on .provider-brand-icon (components.css). */
-.chat-controls__provider-icon {
-  width: 18px;
-  height: 18px;
-  flex: 0 0 18px;
-}
-
-.chat-controls__provider-icon.provider-brand-icon--fallback {
-  font-size: 9px;
-}
-
-.chat-controls__target-icon svg {
-  width: 100%;
-  height: 100%;
-}
-
-.chat-controls__model-options {
-  display: block;
-  min-width: 0;
-  padding: 0 7px 7px;
-  overflow-y: auto;
-  overscroll-behavior: none;
-}
-
-.chat-controls__provider-model-group {
-  display: grid;
-  gap: 2px;
-}
-
-.chat-controls__inline-select-section-label {
-  padding: 3px 6px 2px;
-  color: var(--muted);
-  font-size: 11px;
-  font-weight: 700;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-}
-
-.chat-controls__model-menu[data-chat-model-filtering] .chat-controls__model-options {
-  display: flex;
-  flex-direction: column;
-}
-
-.chat-controls__model-menu[data-chat-model-filtering] .chat-controls__provider-model-group {
-  display: contents;
-}
-
-.chat-controls__model-menu[data-chat-model-filtering] .chat-controls__provider-heading {
-  display: none;
-}
-
-.chat-controls__model-option {
-  order: var(--chat-model-rank, 0);
-  justify-content: flex-start;
-  gap: 8px;
-  min-height: 40px;
-  padding: 5px 8px;
-}
-
-/* display: flex above beats the UA [hidden] style; without this, filtered-out
-   rows keep rendering even though search marked them hidden. */
-.chat-controls__model-option[hidden] {
-  display: none;
-}
-
-.chat-controls__model-option[data-chat-model-highlighted] {
-  border-color: color-mix(in srgb, var(--border) 76%, transparent);
-  background: var(--bg-hover);
-}
-
-.chat-controls__model-option-provider {
-  display: none;
-}
-
-.chat-controls__model-menu[data-chat-model-filtering] .chat-controls__model-option-provider {
-  display: inline-flex;
-}
-
-.chat-controls__model-option-provider.chat-controls__target-icon {
-  width: 18px;
-  height: 18px;
-  flex: 0 0 18px;
-}
-
-.chat-controls__model-option-action {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 22px;
-  min-width: 22px;
-  margin-left: auto;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .chat-controls__model-option-action kbd {
-    transition: opacity var(--duration-fast) var(--ease-out);
-  }
-}
-
-.chat-controls__model-search-wrap:focus-within
-  ~ .chat-controls__model-options
-  .chat-controls__model-option-action
-  kbd {
-  opacity: 0;
-}
-
-.chat-controls__model-option-action kbd::before {
-  content: attr(data-chat-model-shortcut-number);
-}
-
-.chat-controls__model-search-empty {
-  min-height: 80px;
-  padding: 24px 12px;
-  color: var(--muted);
-  font-size: 12px;
-  text-align: center;
-}
-
-.chat-controls__model-search-empty[hidden] {
-  display: none;
-}
-
-.chat-controls__model-option-copy {
-  display: grid;
-  gap: 1px;
-  min-width: 0;
-  flex: 1 1 auto;
-}
-
-.chat-controls__model-option-title,
-.chat-controls__model-option-meta {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.chat-controls__model-option-title {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  color: var(--text);
-  font-size: 12px;
-  font-weight: 600;
-}
-
-.chat-controls__model-option-name {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.chat-controls__model-state-label {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  flex: 0 0 auto;
-  font-size: 9px;
-  font-weight: 700;
-  letter-spacing: 0.08em;
-  line-height: 1;
-  text-transform: uppercase;
-}
-
-.chat-controls__model-state-label--default {
-  color: var(--muted);
-}
-
-.chat-controls__model-option-meta {
-  color: var(--muted);
-  font-size: 11px;
-  font-weight: 450;
-}
-
 .chat-controls__reasoning-panel {
   position: static;
   display: grid;
@@ -4745,22 +4521,6 @@ button.chat-reply-preview--message:disabled {
   min-width: 0;
 }
 
-.chat-controls__model-provenance {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  min-width: 0;
-  padding: 7px 10px;
-  border-top: 1px solid color-mix(in srgb, var(--border) 55%, transparent);
-  color: var(--muted);
-  font-size: 12px;
-}
-
-.chat-controls__model-provenance-value--inherit {
-  color: var(--muted);
-}
-
 .chat-controls__model-catalog-state {
   display: flex;
   align-items: center;
@@ -4815,26 +4575,6 @@ button.chat-reply-preview--message:disabled {
   outline: none;
 }
 
-.chat-controls__model-reset {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-height: 24px;
-  padding: 0 7px;
-  border: none;
-  border-radius: 4px;
-  background: transparent;
-  color: var(--muted);
-  cursor: var(--cursor-action);
-  font-size: 12px;
-  font-weight: 600;
-}
-
-.chat-controls__model-reset:hover:not(:disabled) {
-  background: color-mix(in srgb, var(--border) 45%, transparent);
-  color: var(--text);
-}
-
 .chat-controls__reasoning-state {
   display: inline-flex;
   align-items: center;
diff --git a/ui/src/styles/layout.css b/ui/src/styles/layout.css
index 08f3086bd137..f221a313e7f5 100644
--- a/ui/src/styles/layout.css
+++ b/ui/src/styles/layout.css
@@ -2783,11 +2783,8 @@ wa-dropdown-item.session-menu__item::part(submenu-icon) {
   white-space: nowrap;
 }
 
-/* Keycap hint, not content: the app's quiet mono shortcut idiom (see
-   .chat-question-panel__option kbd), fixed-width so letters and digits share
-   one rail beside the labels. */
-.session-menu__shortcut,
-.chat-controls__model-option-action kbd {
+/* Keycap hint, not content: fixed-width so letters and digits share one rail. */
+.session-menu__shortcut {
   flex: 0 0 auto;
   min-width: 12px;
   color: var(--muted);
diff --git a/ui/src/styles/settings.css b/ui/src/styles/settings.css
index 46a554fa20f6..a68bbdb8af88 100644
--- a/ui/src/styles/settings.css
+++ b/ui/src/styles/settings.css
@@ -797,6 +797,59 @@ wa-select.settings-select wa-option:state(current) {
   color: var(--primary-foreground);
 }
 
+.picker-select__option {
+  color: var(--text);
+}
+
+.picker-select [slot="start"] {
+  display: inline-flex;
+  align-items: center;
+}
+
+.picker-select__label {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-weight: 650;
+}
+
+.picker-select__copy {
+  display: grid;
+  gap: 2px;
+  min-width: 0;
+}
+
+.picker-select__description {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--muted);
+  font-size: 0.75rem;
+  line-height: 1.2;
+  text-overflow: ellipsis;
+  white-space: normal;
+}
+
+.model-picker {
+  display: grid;
+  gap: 6px;
+  min-width: 0;
+}
+
+.model-picker__provider-icon {
+  width: 20px;
+  height: 20px;
+  flex: 0 0 20px;
+}
+
+.model-picker__provider-icon.provider-brand-icon--fallback {
+  font-size: 9px;
+}
+
+.model-picker__custom[hidden] {
+  display: none;
+}
+
 /* Forced colors suppresses the box-shadow ring and accent fill that stand in
    for the outlines removed above, so restore system-color outlines there. */
 @media (forced-colors: active) {
diff --git a/ui/src/styles/workboard.css b/ui/src/styles/workboard.css
index f1a8be897c7b..48d4fb4c3ab4 100644
--- a/ui/src/styles/workboard.css
+++ b/ui/src/styles/workboard.css
@@ -428,39 +428,6 @@
     inset 0 1px 0 color-mix(in srgb, white 5%, transparent);
 }
 
-.workboard-select__option {
-  color: var(--text);
-}
-
-.workboard-select [slot="start"] {
-  display: inline-flex;
-  align-items: center;
-}
-
-.workboard-select__label {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-weight: 650;
-}
-
-.workboard-select__copy {
-  display: grid;
-  gap: 2px;
-  min-width: 0;
-}
-
-.workboard-select__description {
-  min-width: 0;
-  overflow: hidden;
-  color: var(--muted);
-  font-size: 0.75rem;
-  line-height: 1.2;
-  text-overflow: ellipsis;
-  white-space: normal;
-}
-
 .workboard-field--wide {
   grid-column: 1 / -1;
 }

From e4e558df215a009fb24faa4471c4ee8dc7730151 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 21:33:31 -0700
Subject: [PATCH 02/23] fix(ci): rename state migration assertion map off the
 env-var pattern

OPENCLAW_STATE_MIGRATION_ASSERTIONS (a module-local const introduced by
#122959) matches the OPENCLAW_[A-Z0-9_]+ source scan in
scripts/check-env-var-count.mts, pushing the env-var ratchet to 503/502
and failing check:env-var-count on every branch based on current main.
It is not an environment variable; rename it to STATE_MIGRATION_ASSERTIONS
so the ratchet stays an honest env-var count.
---
 src/state/openclaw-state-db.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/state/openclaw-state-db.ts b/src/state/openclaw-state-db.ts
index 33beb6953142..cf29f9394ecc 100644
--- a/src/state/openclaw-state-db.ts
+++ b/src/state/openclaw-state-db.ts
@@ -81,7 +81,7 @@ import {
 import { getOpenClawStateRuntimeSchema } from "./openclaw-state-schema-compatibility.js";
 import { OPENCLAW_STATE_SCHEMA_SQL } from "./openclaw-state-schema.js";
 
-const OPENCLAW_STATE_MIGRATION_ASSERTIONS = {
+const STATE_MIGRATION_ASSERTIONS = {
   5: assertOpenClawStateDatabaseV5ForMigration,
   6: assertOpenClawStateDatabaseV6ForMigration,
 } as const;
@@ -178,7 +178,7 @@ function repairOpenClawStateDatabaseSchemaWithWriteAccess(
             allowedMissingTables: LAZY_ADDITIVE_STATE_TABLES,
           });
         } else if (previousVersion === 5 || previousVersion === 6) {
-          OPENCLAW_STATE_MIGRATION_ASSERTIONS[previousVersion](db, { pathname });
+          STATE_MIGRATION_ASSERTIONS[previousVersion](db, { pathname });
         }
         if (rebuiltIndexNames.size === 0) {
           assertSqliteIntegrity(db, pathname);
@@ -366,7 +366,7 @@ function ensureSchema(db: DatabaseSync, pathname: string, env: NodeJS.ProcessEnv
           ensureAdditiveStateColumns(db);
           assertCurrentStateRuntimeSchema(db, pathname);
         } else if (previousVersion === 5 || previousVersion === 6) {
-          OPENCLAW_STATE_MIGRATION_ASSERTIONS[previousVersion](db, { pathname });
+          STATE_MIGRATION_ASSERTIONS[previousVersion](db, { pathname });
         }
         dropLegacyStateTables(db);
         migrateRetiredCommitmentsSchema(db, previousVersion);

From 05ffeee016f0cae6c83a78ecddf1ffb4fc3566d7 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 21:40:44 -0700
Subject: [PATCH 03/23] test(oc-path): make perf budgets robust to CI scheduler
 noise (#122994)

---
 .../tests/scenarios/perf-determinism.test.ts  | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/extensions/oc-path/src/oc-path/tests/scenarios/perf-determinism.test.ts b/extensions/oc-path/src/oc-path/tests/scenarios/perf-determinism.test.ts
index 742c1fa516be..1579cd7ba624 100644
--- a/extensions/oc-path/src/oc-path/tests/scenarios/perf-determinism.test.ts
+++ b/extensions/oc-path/src/oc-path/tests/scenarios/perf-determinism.test.ts
@@ -5,9 +5,18 @@ import { parseMd } from "../../parse.js";
 import { resolveMdOcPath as resolveOcPath } from "../../resolve.js";
 
 const perfBudgetMultiplier = process.env.CI ? 4 : 1;
+const perfSampleCount = 3;
 
-function expectWithinPerfBudget(elapsedMs: number, localBudgetMs: number) {
-  expect(elapsedMs).toBeLessThan(localBudgetMs * perfBudgetMultiplier);
+function expectWithinPerfBudget(run: () => void, localBudgetMs: number) {
+  // Loaded shared-vCPU CI can pause any single sample, so use the best of a few runs.
+  // The minimum still catches consistently slow regressions without treating contention as one.
+  let bestElapsedMs = Number.POSITIVE_INFINITY;
+  for (let sample = 0; sample < perfSampleCount; sample++) {
+    const start = performance.now();
+    run();
+    bestElapsedMs = Math.min(bestElapsedMs, performance.now() - start);
+  }
+  expect(bestElapsedMs).toBeLessThan(localBudgetMs * perfBudgetMultiplier);
 }
 
 describe("perf + determinism", () => {
@@ -20,32 +29,27 @@ describe("perf + determinism", () => {
       }
     }
     const raw = lines.join("\n");
-    const start = performance.now();
-    parseMd(raw);
-    const elapsed = performance.now() - start;
-    expectWithinPerfBudget(elapsed, 200);
+    expectWithinPerfBudget(() => parseMd(raw), 200);
   });
 
   it("parses 1000 small files in under 500 ms", () => {
     const raw = `## H\n- a\n- b: c\n## I\n- d\n`;
-    const start = performance.now();
-    for (let i = 0; i < 1000; i++) {
-      parseMd(raw);
-    }
-    const elapsed = performance.now() - start;
-    expectWithinPerfBudget(elapsed, 500);
+    expectWithinPerfBudget(() => {
+      for (let i = 0; i < 1000; i++) {
+        parseMd(raw);
+      }
+    }, 500);
   });
 
   it("100k OcPath resolutions on parsed AST in under 500 ms", () => {
     const raw = `## A\n- a1\n- a2\n## B\n- b1\n- b2\n## C\n- c1: cv\n`;
     const { ast } = parseMd(raw);
     const path = { file: "X.md", section: "b", item: "b1" };
-    const start = performance.now();
-    for (let i = 0; i < 100_000; i++) {
-      resolveOcPath(ast, path);
-    }
-    const elapsed = performance.now() - start;
-    expectWithinPerfBudget(elapsed, 500);
+    expectWithinPerfBudget(() => {
+      for (let i = 0; i < 100_000; i++) {
+        resolveOcPath(ast, path);
+      }
+    }, 500);
   });
 
   it("same input → byte-identical AST.raw across runs", () => {
@@ -115,11 +119,11 @@ describe("perf + determinism", () => {
       lines.push("");
     }
     const raw = lines.join("\n");
-    const start = performance.now();
-    const { ast } = parseMd(raw);
-    const out = emitMd(ast);
-    const elapsed = performance.now() - start;
+    let out = "";
+    expectWithinPerfBudget(() => {
+      const { ast } = parseMd(raw);
+      out = emitMd(ast);
+    }, 100);
     expect(out).toBe(raw);
-    expectWithinPerfBudget(elapsed, 100);
   });
 });

From b05d2308e7a58be5e2b4a8b5d2823e0a217b3425 Mon Sep 17 00:00:00 2001
From: sunlit-deng <yang.jiajun1@xydigit.com>
Date: Thu, 13 Aug 2026 12:42:01 +0800
Subject: [PATCH 04/23] fix(memory): keep session reconciliation off search
 path (#120837)

* fix(memory): keep session reconciliation off search path

* test(memory): decouple reconciliation test from provider fixture

---------

Co-authored-by: Jason (Json) <263060202+fuller-stack-dev@users.noreply.github.com>
---
 .../src/memory/manager-async-state.test.ts    | 41 +++++++++++++++++++
 .../src/memory/manager-async-state.ts         |  6 +++
 .../manager-search-orchestration.test.ts      | 34 +++++++++++++++
 3 files changed, 81 insertions(+)

diff --git a/extensions/memory-core/src/memory/manager-async-state.test.ts b/extensions/memory-core/src/memory/manager-async-state.test.ts
index 48c9414859ad..c946d543ad08 100644
--- a/extensions/memory-core/src/memory/manager-async-state.test.ts
+++ b/extensions/memory-core/src/memory/manager-async-state.test.ts
@@ -66,4 +66,45 @@ describe("memory manager async state", () => {
     });
     expect(syncMock).not.toHaveBeenCalled();
   });
+
+  it("reports background search sync failures", async () => {
+    const syncError = new Error("sync failed");
+    const onError = vi.fn();
+
+    await startAsyncSearchSync({
+      enabled: true,
+      dirty: false,
+      sessionsDirty: true,
+      sync: vi.fn(async () => {
+        throw syncError;
+      }),
+      onError,
+    });
+
+    await vi.waitFor(() => expect(onError).toHaveBeenCalledWith(syncError));
+  });
+
+  it("waits for ordinary dirty sync", async () => {
+    let releaseSync = () => {};
+    const pendingSync = new Promise<void>((resolve) => {
+      releaseSync = () => resolve();
+    });
+    const syncMock = vi.fn(async () => await pendingSync);
+    let settled = false;
+
+    const searchSync = startAsyncSearchSync({
+      enabled: true,
+      dirty: true,
+      sessionsDirty: false,
+      sync: syncMock,
+      onError: vi.fn(),
+    }).then(() => {
+      settled = true;
+    });
+
+    await vi.waitFor(() => expect(syncMock).toHaveBeenCalledWith({ reason: "search" }));
+    expect(settled).toBe(false);
+    releaseSync();
+    await searchSync;
+  });
 });
diff --git a/extensions/memory-core/src/memory/manager-async-state.ts b/extensions/memory-core/src/memory/manager-async-state.ts
index ab1a240f3197..da4e5bd94e3d 100644
--- a/extensions/memory-core/src/memory/manager-async-state.ts
+++ b/extensions/memory-core/src/memory/manager-async-state.ts
@@ -9,6 +9,12 @@ export async function startAsyncSearchSync(params: {
   if (!params.enabled || (!params.dirty && !params.sessionsDirty)) {
     return;
   }
+  if (params.sessionsDirty && !params.dirty) {
+    // Session reconciliation can enumerate and parse a large transcript corpus. Keep
+    // the existing sync admission/close ownership while letting indexed searches proceed.
+    void params.sync({ reason: "search" }).catch(params.onError);
+    return;
+  }
   try {
     await params.sync({ reason: "search" });
   } catch (err: unknown) {
diff --git a/extensions/memory-core/src/memory/manager-search-orchestration.test.ts b/extensions/memory-core/src/memory/manager-search-orchestration.test.ts
index fa30f37e58c8..e56e02ef0bbf 100644
--- a/extensions/memory-core/src/memory/manager-search-orchestration.test.ts
+++ b/extensions/memory-core/src/memory/manager-search-orchestration.test.ts
@@ -336,6 +336,40 @@ describe("memory index", () => {
     expect(providerFixture.providerCalls).toHaveLength(0);
   });
 
+  it("does not block querying on session reconciliation", async () => {
+    const manager = await getPersistentManager(
+      createCfg({ provider: "none", minScore: 0, onSearch: true, hybrid: { enabled: true } }),
+    );
+    await manager.sync({ reason: "test" });
+
+    let releaseSync = () => {};
+    const pendingSync = new Promise<void>((resolve) => {
+      releaseSync = () => resolve();
+    });
+    const syncAdmitted = vi
+      .spyOn(
+        manager as unknown as {
+          syncAdmitted: (params: { reason: string }) => Promise<void>;
+        },
+        "syncAdmitted",
+      )
+      .mockImplementation(async () => await pendingSync);
+
+    Reflect.set(manager, "dirty", false);
+    Reflect.set(manager, "sessionsDirty", true);
+
+    const searchPromise = manager.search("zebra", {
+      maxResults: 5,
+      minScore: 0,
+    });
+    await vi.waitFor(() => expect(syncAdmitted).toHaveBeenCalledWith({ reason: "search" }));
+
+    const results = await searchPromise;
+    expect(results.some((entry) => entry.path === "memory/2026-01-12.md")).toBe(true);
+    releaseSync();
+    await pendingSync;
+  });
+
   it("waits for dirty sync before querying", async () => {
     providerFixture.forceNoProvider = true;
     const manager = await getPersistentManager(

From 0c38af88f3db5a20f040cf43a98795447bcba299 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 21:47:53 -0700
Subject: [PATCH 05/23] fix(agents): preserve headless timeout ownership
 (#122997)

---
 src/agents/code-mode-headless.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/agents/code-mode-headless.ts b/src/agents/code-mode-headless.ts
index 4b3dcef61553..ceb68dcd9b03 100644
--- a/src/agents/code-mode-headless.ts
+++ b/src/agents/code-mode-headless.ts
@@ -99,10 +99,9 @@ async function runHeadlessWorkerLeg(params: {
 }): Promise<CodeModeWorkerResult> {
   const remainingMs = remainingHeadlessMs(params.deadline);
   const timeoutMs = Math.max(1, Math.min(params.config.timeoutMs, remainingMs));
-  const workerTimeoutMs = Math.max(
-    1,
-    Math.min(remainingMs, timeoutMs + CODE_MODE_WORKER_WATCHDOG_GRACE_MS),
-  );
+  // Let the headless abort scope own the wall-clock deadline. Capping the host
+  // watchdog to the same deadline makes its internal timeout message race the scope.
+  const workerTimeoutMs = timeoutMs + CODE_MODE_WORKER_WATCHDOG_GRACE_MS;
   return await runCodeModeWorker(
     {
       ...params.input,

From 867c029d5a8508a1586096798ef4246d33f224fe Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 21:48:10 -0700
Subject: [PATCH 06/23] fix(gateway): preserve system agent ownership (#122987)

* fix(gateway): preserve system agent ownership

* chore(plugin-sdk): refresh ownership API baseline

* fix(gateway): preserve global system event routing
---
 .../agent-harness-runtime.json                |  2 +-
 .../agent-harness.json                        |  2 +-
 .../plugin-sdk-api-baseline/channel-core.json |  2 +-
 .../channel-entry-contract.json               |  2 +-
 .../channel-message.json                      |  2 +-
 .../channel-outbound.json                     |  2 +-
 .../channel-plugin-common.json                |  2 +-
 .../plugin-sdk-api-baseline/core.json         |  2 +-
 .../plugin-sdk-api-baseline/discord.json      |  2 +-
 .../inbound-reply-dispatch.json               |  2 +-
 .../meeting-runtime.json                      |  2 +-
 .../plugin-sdk-api-baseline/plugin-entry.json |  2 +-
 .../plugin-runtime.json                       |  2 +-
 .../provider-catalog-runtime.json             |  2 +-
 .../plugin-sdk-api-baseline/tool-plugin.json  |  2 +-
 .../webhook-ingress.json                      |  2 +-
 src/agents/agent-scope-config.ts              | 25 +++++++-
 ...default-agent-role-materialization.test.ts |  2 +-
 src/config/sessions/main-session.runtime.ts   |  4 +-
 src/config/sessions/main-session.ts           | 27 +++++++-
 .../health.owner-routing.test.ts              | 64 +++++++++++++++++++
 .../system-event-routing.test.ts              | 38 +++++++++++
 src/gateway/server-methods/system.ts          | 24 ++++---
 src/gateway/server/hooks.agent-trust.test.ts  | 45 ++++++++++---
 src/gateway/server/hooks.ts                   | 16 ++---
 .../management-service.owner-routing.test.ts  | 35 ++++++++++
 src/plugins/management-service.ts             |  7 +-
 src/status/summary.ts                         |  4 +-
 src/system-agent/inference-fallback.ts        |  2 +-
 src/system-agent/inference-route.ts           | 23 +------
 30 files changed, 270 insertions(+), 78 deletions(-)
 create mode 100644 src/gateway/server-methods/health.owner-routing.test.ts
 create mode 100644 src/plugins/management-service.owner-routing.test.ts

diff --git a/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json b/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json
index 2d07e7c8afc1..b841616e2324 100644
--- a/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json
@@ -1 +1 @@
-{"contentHash":"d09d23506269b7ca94b52c5e038b26fe9269a8cfc485ce513ee31aa056eece07","entrypoint":"agent-harness-runtime","importSpecifier":"openclaw/plugin-sdk/agent-harness-runtime"}
+{"contentHash":"217a982536f2e60f08287ddfa0cb0ce76bead1b5f6a962635f68a3f09cfed955","entrypoint":"agent-harness-runtime","importSpecifier":"openclaw/plugin-sdk/agent-harness-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/agent-harness.json b/docs/.generated/plugin-sdk-api-baseline/agent-harness.json
index 7371525573b0..9a53bdd1cc65 100644
--- a/docs/.generated/plugin-sdk-api-baseline/agent-harness.json
+++ b/docs/.generated/plugin-sdk-api-baseline/agent-harness.json
@@ -1 +1 @@
-{"contentHash":"2ba58871e5ca61397755a3bdb98bd6beca75d6e3b5400331c6381041f3aa3d6f","entrypoint":"agent-harness","importSpecifier":"openclaw/plugin-sdk/agent-harness"}
+{"contentHash":"745b6376dc744050f9c9602c6530703eca683fa2cd4a3520efafb8b3a611d93f","entrypoint":"agent-harness","importSpecifier":"openclaw/plugin-sdk/agent-harness"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-core.json b/docs/.generated/plugin-sdk-api-baseline/channel-core.json
index 8f4bc3d7b0fc..2990f88d3ee4 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-core.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-core.json
@@ -1 +1 @@
-{"contentHash":"b9fc667192c85df94b1768bc92bc4b621f19afad4e9838fca3886f3bb36b50c9","entrypoint":"channel-core","importSpecifier":"openclaw/plugin-sdk/channel-core"}
+{"contentHash":"2e41ca681490aaea3880512777c6e42bb945e3c19b6a1a0ae8082c5a5d69a787","entrypoint":"channel-core","importSpecifier":"openclaw/plugin-sdk/channel-core"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json b/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json
index 242cba4da697..bbc8e127239c 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json
@@ -1 +1 @@
-{"contentHash":"a4de0e245a75d79ad66f8bf13b9eb3adbd6a0248cc49986fb046b990db6b14b7","entrypoint":"channel-entry-contract","importSpecifier":"openclaw/plugin-sdk/channel-entry-contract"}
+{"contentHash":"c1ec7b510bc71f3dcbda3da1e389536818088a0a5624b269c731aa8ceb0bcc5d","entrypoint":"channel-entry-contract","importSpecifier":"openclaw/plugin-sdk/channel-entry-contract"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-message.json b/docs/.generated/plugin-sdk-api-baseline/channel-message.json
index b831ccc265d4..b24cc0cc96fe 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-message.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-message.json
@@ -1 +1 @@
-{"contentHash":"6c0acdac3db1c698033694ca41efad5bdbe7edf8634f78c5ac9e333ddb94124f","entrypoint":"channel-message","importSpecifier":"openclaw/plugin-sdk/channel-message"}
+{"contentHash":"eee5b7e929fd8b1ed3033e7828c05742ac9490506d5ebc80087b830510c15473","entrypoint":"channel-message","importSpecifier":"openclaw/plugin-sdk/channel-message"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json b/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json
index ba502bb52ed6..8e0584597ab0 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json
@@ -1 +1 @@
-{"contentHash":"20da7d32e9a7937993a7529a5744b6b3457d00c92c7a5ec44f4524459ce7400c","entrypoint":"channel-outbound","importSpecifier":"openclaw/plugin-sdk/channel-outbound"}
+{"contentHash":"1aa4d0540178a6a8ab2eab4cebfb205604fd46a73de21b2f07cda94e01740608","entrypoint":"channel-outbound","importSpecifier":"openclaw/plugin-sdk/channel-outbound"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json b/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json
index c035dbb733ac..b3eca52d42bf 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json
@@ -1 +1 @@
-{"contentHash":"ce27ae6e3f4b61d18bdaff383135dec6b0a3f020901984a4d7883c766e63129a","entrypoint":"channel-plugin-common","importSpecifier":"openclaw/plugin-sdk/channel-plugin-common"}
+{"contentHash":"709ac41f57c2327e19c241f8cb399752cf9e0294f00243e21c24698b06c480b6","entrypoint":"channel-plugin-common","importSpecifier":"openclaw/plugin-sdk/channel-plugin-common"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/core.json b/docs/.generated/plugin-sdk-api-baseline/core.json
index 080b3b04418f..fa9e4b1e892e 100644
--- a/docs/.generated/plugin-sdk-api-baseline/core.json
+++ b/docs/.generated/plugin-sdk-api-baseline/core.json
@@ -1 +1 @@
-{"contentHash":"167ca860b15990c05eaad49e7f2a39e38812d1245011f85e2d536b7d7eb93265","entrypoint":"core","importSpecifier":"openclaw/plugin-sdk/core"}
+{"contentHash":"65b5c7028bd61f6208a3f69b870bb5b783b03005ceaba75c1d0d54ce7c82f293","entrypoint":"core","importSpecifier":"openclaw/plugin-sdk/core"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/discord.json b/docs/.generated/plugin-sdk-api-baseline/discord.json
index da6e98dd0060..f267aef17d6f 100644
--- a/docs/.generated/plugin-sdk-api-baseline/discord.json
+++ b/docs/.generated/plugin-sdk-api-baseline/discord.json
@@ -1 +1 @@
-{"contentHash":"c5c5a37bc949bfb4166f511a846a4e8273fb639c46f9fa4e5bb78a4ab71dbfab","entrypoint":"discord","importSpecifier":"openclaw/plugin-sdk/discord"}
+{"contentHash":"65c0ba8a1690c042f0db0b9ab3433d257177734d5b83ff41d418f6b0cb817301","entrypoint":"discord","importSpecifier":"openclaw/plugin-sdk/discord"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json b/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json
index 4d89ef39a170..61c33e06184e 100644
--- a/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json
+++ b/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json
@@ -1 +1 @@
-{"contentHash":"ab3965e7bb6ce3e1e9e6b684c01e7929980402aaabb12f9750db4c2b04034622","entrypoint":"inbound-reply-dispatch","importSpecifier":"openclaw/plugin-sdk/inbound-reply-dispatch"}
+{"contentHash":"39982625a0bb3d57be7180289dd824a89c514285dd62433005e42c2da866e0c6","entrypoint":"inbound-reply-dispatch","importSpecifier":"openclaw/plugin-sdk/inbound-reply-dispatch"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json b/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json
index 4a620326f5f6..6fce4219b9c4 100644
--- a/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json
@@ -1 +1 @@
-{"contentHash":"1335062907a7948a67c59f4320899aaaf33bbea92001675c12ec392e552d1411","entrypoint":"meeting-runtime","importSpecifier":"openclaw/plugin-sdk/meeting-runtime"}
+{"contentHash":"9462b8d4ca13d7669da993a6b94d4add39ee1f95979e11c636348f008ee087a0","entrypoint":"meeting-runtime","importSpecifier":"openclaw/plugin-sdk/meeting-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json b/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json
index 3d9679b340aa..f9b12410c2b6 100644
--- a/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json
+++ b/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json
@@ -1 +1 @@
-{"contentHash":"7233fde521fda9b80333647953bcb0611133e044920b25bd1554b56d2efe4af9","entrypoint":"plugin-entry","importSpecifier":"openclaw/plugin-sdk/plugin-entry"}
+{"contentHash":"3247b08bfc168591580c57393621143028070133f483a39518955c6f010a0dc4","entrypoint":"plugin-entry","importSpecifier":"openclaw/plugin-sdk/plugin-entry"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json b/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json
index 23a93eb97304..050f572dd199 100644
--- a/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json
@@ -1 +1 @@
-{"contentHash":"644411a0c68bc01afaa7d8ad9d7a00ce03d8000268b4ceca19ca94642591b8ae","entrypoint":"plugin-runtime","importSpecifier":"openclaw/plugin-sdk/plugin-runtime"}
+{"contentHash":"936059292ea538ea8118ac479121b97c8d700526be71b93016678821b59c86e6","entrypoint":"plugin-runtime","importSpecifier":"openclaw/plugin-sdk/plugin-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json b/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json
index 543de3138817..7b6b36d51e36 100644
--- a/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json
@@ -1 +1 @@
-{"contentHash":"285f430aa7b02b6311bd6c1763840245c6b144e2210fac97d664e4ce44ea0d27","entrypoint":"provider-catalog-runtime","importSpecifier":"openclaw/plugin-sdk/provider-catalog-runtime"}
+{"contentHash":"49563f6f32ae3ac798763943dfa47d79c50c2146cc8ab7bcd3cd8c565e29785e","entrypoint":"provider-catalog-runtime","importSpecifier":"openclaw/plugin-sdk/provider-catalog-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json b/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json
index 9482b56f978e..294de8174d3b 100644
--- a/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json
+++ b/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json
@@ -1 +1 @@
-{"contentHash":"d77aac23178bb63cad9dcfc7d8e91f3fd37b5d4f44a4221ea1fa2ff259ccf64c","entrypoint":"tool-plugin","importSpecifier":"openclaw/plugin-sdk/tool-plugin"}
+{"contentHash":"bf6001fd4e14f91ed6dde159c7bb7046814dedad33953a9ce473e2d8bd8fb3d4","entrypoint":"tool-plugin","importSpecifier":"openclaw/plugin-sdk/tool-plugin"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json b/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json
index 376241c2c34e..b0a34ab7b3c6 100644
--- a/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json
+++ b/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json
@@ -1 +1 @@
-{"contentHash":"291f8c385ad37dbafeeab36f8725a9b0e459e670f5db17d5d77a683f87ce830e","entrypoint":"webhook-ingress","importSpecifier":"openclaw/plugin-sdk/webhook-ingress"}
+{"contentHash":"a73d6fd876fa9a2a32fdd0972f8655a5160652c6bbbbc93ee8e5a03787dbb0be","entrypoint":"webhook-ingress","importSpecifier":"openclaw/plugin-sdk/webhook-ingress"}
diff --git a/src/agents/agent-scope-config.ts b/src/agents/agent-scope-config.ts
index b75cd12b363a..9cf73cada839 100644
--- a/src/agents/agent-scope-config.ts
+++ b/src/agents/agent-scope-config.ts
@@ -1,6 +1,9 @@
 /** Resolves configured agent ids, directories, workspaces, and merged agent defaults. */
 import path from "node:path";
-import { readStringValue } from "@openclaw/normalization-core/string-coerce";
+import {
+  normalizeOptionalString,
+  readStringValue,
+} from "@openclaw/normalization-core/string-coerce";
 import { getRetainedLegacyDefaultAgentId } from "../config/legacy.default-agent-owner-state.js";
 import { hasExplicitModelPolicyAllow } from "../config/model-policy-allowlist-migration.js";
 import { resolveStateDir } from "../config/paths.js";
@@ -216,6 +219,26 @@ export function tryResolveLegacyCompatibilityAgentId(cfg: OpenClawConfig): strin
     : tryResolveDefaultAgentId(cfg);
 }
 
+/** Resolves the configured owner for ambient system work and explicit consults. */
+export function resolveSystemAgentTargetAgentId(
+  cfg: OpenClawConfig,
+  requestedAgentId?: string,
+): string {
+  const configuredAgentId =
+    normalizeOptionalString(requestedAgentId) ??
+    normalizeOptionalString(cfg.agents?.defaults?.systemAgent?.agentId);
+  if (configuredAgentId) {
+    return normalizeAgentId(configuredAgentId);
+  }
+  return normalizeAgentId(
+    tryResolveLegacyCompatibilityAgentId(cfg) ??
+      resolveDefaultAgentId(cfg, {
+        surface: "system-agent consult routing",
+        hint: "Set agents.defaults.systemAgent.agentId or pass an explicit consult agent id.",
+      }),
+  );
+}
+
 /** @deprecated Use resolveSoleAgentId; accepts raw shipped markers only for input compatibility. */
 export function resolveDefaultAgentId(
   cfg: OpenClawConfig,
diff --git a/src/commands/doctor/shared/default-agent-role-materialization.test.ts b/src/commands/doctor/shared/default-agent-role-materialization.test.ts
index 828ecc833a37..915b693db842 100644
--- a/src/commands/doctor/shared/default-agent-role-materialization.test.ts
+++ b/src/commands/doctor/shared/default-agent-role-materialization.test.ts
@@ -1,11 +1,11 @@
 import { describe, expect, it } from "vitest";
 import { listAgentEntries, resolveDefaultAgentId } from "../../../agents/agent-scope-config.js";
+import { resolveSystemAgentTargetAgentId } from "../../../agents/agent-scope-config.js";
 import { materializeLegacyDefaultAgentRoles } from "../../../config/legacy.default-agent-roles.js";
 import type { OpenClawConfig } from "../../../config/types.openclaw.js";
 import { resolveCronJobEffectiveAgentId } from "../../../cron/agent-id.js";
 import { resolveHeartbeatAgents } from "../../../infra/heartbeat-runner.js";
 import { resolveAgentRoute } from "../../../routing/resolve-route.js";
-import { resolveSystemAgentTargetAgentId } from "../../../system-agent/inference-route.js";
 import { resolveTalkSessionAgentId, resolveTalkTargetAgentId } from "../../../talk/agent-target.js";
 
 function materializeDefaultAgentRoles(cfg: OpenClawConfig) {
diff --git a/src/config/sessions/main-session.runtime.ts b/src/config/sessions/main-session.runtime.ts
index 9eca6d7401e2..4951307bd488 100644
--- a/src/config/sessions/main-session.runtime.ts
+++ b/src/config/sessions/main-session.runtime.ts
@@ -1,8 +1,8 @@
 // Runtime main-session lookup binds the config-backed helper for callers without config access.
 import { getRuntimeConfig } from "../io.js";
-import { resolveMainSessionKey } from "./main-session.js";
+import { resolveSystemMainSessionKey } from "./main-session.js";
 
 /** Resolves the main session key from the active runtime config. */
 export function resolveMainSessionKeyFromConfig(): string {
-  return resolveMainSessionKey(getRuntimeConfig());
+  return resolveSystemMainSessionKey(getRuntimeConfig());
 }
diff --git a/src/config/sessions/main-session.ts b/src/config/sessions/main-session.ts
index 49e731489f0d..38d401f21dd5 100644
--- a/src/config/sessions/main-session.ts
+++ b/src/config/sessions/main-session.ts
@@ -1,4 +1,8 @@
-import { listAgentIds, resolveDefaultAgentId } from "../../agents/agent-scope-config.js";
+import {
+  listAgentIds,
+  resolveDefaultAgentId,
+  resolveSystemAgentTargetAgentId,
+} from "../../agents/agent-scope-config.js";
 // Main-session keys normalize configured agents and legacy aliases into store keys.
 import {
   normalizeAgentId,
@@ -33,6 +37,27 @@ export function resolveMainSessionKey(cfg: OpenClawConfig): string {
   });
 }
 
+/** Resolves the owner and canonical session target for ambient system work. */
+export function resolveSystemMainSessionTarget(cfg: OpenClawConfig): {
+  agentId: string;
+  sessionKey: string;
+} {
+  const agentId = resolveSystemAgentTargetAgentId(cfg);
+  return {
+    agentId,
+    sessionKey: resolveCanonicalMainSessionKey({
+      agentId,
+      mainKey: cfg.session?.mainKey,
+      sessionScope: cfg.session?.scope,
+    }),
+  };
+}
+
+/** Resolves the main session owned by configured ambient system work. */
+export function resolveSystemMainSessionKey(cfg: OpenClawConfig): string {
+  return resolveSystemMainSessionTarget(cfg).sessionKey;
+}
+
 /** Stable fingerprint for the config values that canonicalize chat session keys. */
 export function resolveSessionRoutingContract(cfg: OpenClawConfig): string {
   const scope = cfg?.session?.scope ?? "per-sender";
diff --git a/src/gateway/server-methods/health.owner-routing.test.ts b/src/gateway/server-methods/health.owner-routing.test.ts
new file mode 100644
index 000000000000..38eff260af82
--- /dev/null
+++ b/src/gateway/server-methods/health.owner-routing.test.ts
@@ -0,0 +1,64 @@
+import path from "node:path";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { resetConfigRuntimeState, setRuntimeConfigSnapshot } from "../../config/config.js";
+import type { OpenClawConfig } from "../../config/types.openclaw.js";
+import { withStateDirEnv } from "../../test-helpers/state-dir-env.js";
+import { resolveRequestedSessionAgentId } from "../session-request-agent.js";
+import { healthHandlers } from "./health.js";
+
+afterEach(() => {
+  resetConfigRuntimeState();
+});
+
+async function callStatus(config: OpenClawConfig) {
+  setRuntimeConfigSnapshot(config, config);
+  const respond = vi.fn();
+  await healthHandlers.status!({
+    req: {} as never,
+    params: { includeChannelSummary: false },
+    respond: respond as never,
+    context: {} as never,
+    client: { connect: { role: "operator", scopes: ["operator.read"] } } as never,
+    isWebchatConnect: () => false,
+  });
+  return respond;
+}
+
+describe("Gateway status owner routing", () => {
+  it("uses the configured system owner without making public main aliases implicit", async () => {
+    await withStateDirEnv("openclaw-gateway-status-owner-", async ({ stateDir }) => {
+      const config = {
+        agents: {
+          ownership: "explicit",
+          defaults: { systemAgent: { agentId: "main" } },
+          entries: { main: {}, molty: {} },
+        },
+        session: { store: path.join(stateDir, "agents", "{agentId}", "sessions.json") },
+      } satisfies OpenClawConfig;
+
+      const respond = await callStatus(config);
+
+      expect(respond).toHaveBeenCalledTimes(1);
+      expect(respond.mock.calls[0]?.[0]).toBe(true);
+      expect(respond.mock.calls[0]?.[2]).toBeUndefined();
+      expect(resolveRequestedSessionAgentId(config, "main")).toMatchObject({ ok: false });
+      expect(resolveRequestedSessionAgentId(config, "agent:molty:main")).toEqual({
+        ok: true,
+        agentId: "molty",
+      });
+    });
+  });
+
+  it("keeps single-agent status unchanged", async () => {
+    await withStateDirEnv("openclaw-gateway-status-single-", async ({ stateDir }) => {
+      const respond = await callStatus({
+        agents: { entries: { main: {} } },
+        session: { store: path.join(stateDir, "sessions.json") },
+      });
+
+      expect(respond).toHaveBeenCalledTimes(1);
+      expect(respond.mock.calls[0]?.[0]).toBe(true);
+      expect(respond.mock.calls[0]?.[2]).toBeUndefined();
+    });
+  });
+});
diff --git a/src/gateway/server-methods/system-event-routing.test.ts b/src/gateway/server-methods/system-event-routing.test.ts
index 6778f6d21b3f..0e567e383549 100644
--- a/src/gateway/server-methods/system-event-routing.test.ts
+++ b/src/gateway/server-methods/system-event-routing.test.ts
@@ -107,6 +107,44 @@ describe("system-event routing", () => {
     expect(respond).toHaveBeenCalledWith(true, { ok: true }, undefined);
   });
 
+  it("keeps ambient explicit-owner events on the global session queue", async () => {
+    const respond = vi.fn();
+    const request = {
+      params: { text: "Wake the system owner.", wake: true },
+      respond,
+      context: {
+        broadcast: vi.fn(),
+        incrementPresenceVersion: vi.fn(() => 1),
+        getHealthVersion: vi.fn(() => 1),
+        getRuntimeConfig: vi.fn(() => ({
+          session: { scope: "global" },
+          agents: {
+            ownership: "explicit",
+            defaults: { systemAgent: { agentId: "main" } },
+            entries: { main: {}, molty: {} },
+          },
+        })),
+      },
+    } as unknown as GatewayRequestHandlerOptions;
+
+    await expectDefined(
+      systemHandlers["system-event"],
+      'systemHandlers["system-event"] test invariant',
+    )(request);
+
+    expect(peekSystemEvents("global")).toEqual(["Wake the system owner."]);
+    expect(peekSystemEvents("agent:main:main")).toEqual([]);
+    expect(mocks.requestHeartbeat).toHaveBeenCalledWith({
+      source: "notifications-event",
+      intent: "immediate",
+      reason: "wake",
+      agentId: "main",
+      sessionKey: "global",
+      heartbeat: { target: "last" },
+    });
+    expect(respond).toHaveBeenCalledWith(true, { ok: true }, undefined);
+  });
+
   it("rejects immediate wakes for unconfigured agents", async () => {
     const respond = vi.fn();
     const request = {
diff --git a/src/gateway/server-methods/system.ts b/src/gateway/server-methods/system.ts
index d6db6d50c0be..fbf2008ad434 100644
--- a/src/gateway/server-methods/system.ts
+++ b/src/gateway/server-methods/system.ts
@@ -23,7 +23,7 @@ import {
 } from "../../agents/utility-model.js";
 import { tryResolveLegacyCompatibilityAgentId } from "../../config/legacy.default-agent-owner.js";
 import { resolveGatewayPort, resolveStateDir } from "../../config/paths.js";
-import { resolveMainSessionKeyFromConfig } from "../../config/sessions.js";
+import { resolveSystemMainSessionTarget } from "../../config/sessions.js";
 import { resolveAdvertisedLanHostCore } from "../../infra/advertised-lan-host.js";
 import {
   loadOrCreateProcessDeviceIdentity,
@@ -171,7 +171,10 @@ export const systemHandlers: GatewayRequestHandlers = {
       respond(false, undefined, requestedOwner.error);
       return;
     }
-    const sessionKey = requestedSessionKey ?? resolveMainSessionKeyFromConfig();
+    const systemTarget = requestedSessionKey
+      ? { agentId: requestedOwner?.agentId, sessionKey: requestedSessionKey }
+      : resolveSystemMainSessionTarget(cfg);
+    const { agentId: eventOwnerAgentId, sessionKey } = systemTarget;
     const wake = params.wake === true;
     const isNodePresenceLine = text.startsWith("Node:");
     if (wake && isNodePresenceLine) {
@@ -183,21 +186,23 @@ export const systemHandlers: GatewayRequestHandlers = {
       return;
     }
     if (wake && requestedSessionKey) {
-      const targetAgentId = normalizeAgentId(
+      const requestedAgentId = normalizeAgentId(
         requestedOwner?.agentId ?? resolveAgentIdFromSessionKey(requestedSessionKey),
       );
       const configuredAgentIds = listAgentIds(cfg).map(normalizeAgentId);
-      if (!configuredAgentIds.includes(targetAgentId)) {
+      if (!configuredAgentIds.includes(requestedAgentId)) {
         respond(
           false,
           undefined,
-          errorShape(ErrorCodes.INVALID_REQUEST, `Unknown agent id "${targetAgentId}"`),
+          errorShape(ErrorCodes.INVALID_REQUEST, `Unknown agent id "${requestedAgentId}"`),
         );
         return;
       }
       // A targeted wake starts a model run. Require a live persisted session
       // so malformed keys cannot create phantom work under agent defaults.
-      const targetSession = loadGatewaySessionRow(requestedSessionKey, { agentId: targetAgentId });
+      const targetSession = loadGatewaySessionRow(requestedSessionKey, {
+        agentId: requestedAgentId,
+      });
       if (!targetSession || targetSession.archived) {
         respond(
           false,
@@ -300,8 +305,8 @@ export const systemHandlers: GatewayRequestHandlers = {
           };
           enqueueSystemEvent(
             deltaText,
-            requestedOwner
-              ? withSystemEventOwner(eventOptions, requestedOwner.agentId)
+            eventOwnerAgentId
+              ? withSystemEventOwner(eventOptions, eventOwnerAgentId)
               : eventOptions,
           );
         }
@@ -310,7 +315,7 @@ export const systemHandlers: GatewayRequestHandlers = {
       const eventOptions = { sessionKey };
       enqueueSystemEvent(
         text,
-        requestedOwner ? withSystemEventOwner(eventOptions, requestedOwner.agentId) : eventOptions,
+        eventOwnerAgentId ? withSystemEventOwner(eventOptions, eventOwnerAgentId) : eventOptions,
       );
       if (wake) {
         // Targeted admin events may need a proactive response. Carry the exact
@@ -321,6 +326,7 @@ export const systemHandlers: GatewayRequestHandlers = {
           // The dispatcher recognizes "wake" as a payload-bearing run, so an
           // empty HEARTBEAT.md cannot suppress this queued system event.
           reason: "wake",
+          ...(!requestedSessionKey && eventOwnerAgentId ? { agentId: eventOwnerAgentId } : {}),
           sessionKey,
           heartbeat: { target: "last" },
         });
diff --git a/src/gateway/server/hooks.agent-trust.test.ts b/src/gateway/server/hooks.agent-trust.test.ts
index b1d98523a399..51a0b3f52dbe 100644
--- a/src/gateway/server/hooks.agent-trust.test.ts
+++ b/src/gateway/server/hooks.agent-trust.test.ts
@@ -16,6 +16,10 @@ const enqueueSystemEventMock = vi.fn();
 const requestHeartbeatMock = vi.fn();
 const runCronIsolatedAgentTurnMock = vi.fn();
 const resolveMainSessionKeyMock = vi.fn(() => "main-session");
+const resolveAgentMainSessionKeyMock = vi.fn(
+  (params: { cfg?: { session?: { mainKey?: string } }; agentId: string }) =>
+    `agent:${params.agentId}:${params.cfg?.session?.mainKey ?? "main"}`,
+);
 const mainRosterConfig = (): OpenClawConfig => ({
   agents: { entries: { main: {} } },
 });
@@ -51,10 +55,7 @@ vi.mock("../../config/sessions.js", () => ({
   resolveMainSessionKey: vi.fn((cfg?: { session?: { mainKey?: string; scope?: string } }) =>
     cfg?.session?.scope === "global" ? "global" : `agent:main:${cfg?.session?.mainKey ?? "main"}`,
   ),
-  resolveAgentMainSessionKey: vi.fn(
-    (params: { cfg?: { session?: { mainKey?: string } }; agentId: string }) =>
-      `agent:${params.agentId}:${params.cfg?.session?.mainKey ?? "main"}`,
-  ),
+  resolveAgentMainSessionKey: resolveAgentMainSessionKeyMock,
 }));
 vi.mock("../../config/io.js", () => ({
   getRuntimeConfig: loadConfigMock,
@@ -221,6 +222,33 @@ describe("dispatchAgentHook trust handling", () => {
     });
   });
 
+  it("keeps the resolved owner when a multi-agent wake omits agentId", () => {
+    loadConfigMock.mockReturnValue({
+      agents: {
+        ownership: "explicit",
+        defaults: { systemAgent: { agentId: "main" } },
+        entries: { main: {}, molty: {} },
+      },
+    });
+
+    dispatchWakeHook({ text: "Mapped wake", mode: "now" }, "molty");
+
+    expect(resolveAgentMainSessionKeyMock).toHaveBeenCalledWith({
+      cfg: expect.any(Object),
+      agentId: "molty",
+    });
+    expect(enqueueSystemEventMock).toHaveBeenCalledWith("Mapped wake", {
+      sessionKey: "agent:molty:main",
+    });
+    expect(requestHeartbeatMock).toHaveBeenCalledWith({
+      source: "hook",
+      intent: "immediate",
+      reason: "hook:wake",
+      agentId: "molty",
+      sessionKey: "agent:molty:main",
+    });
+  });
+
   it("passes normalized delivery through to the isolated CronJob", async () => {
     const delivery = {
       mode: "announce" as const,
@@ -890,10 +918,9 @@ describe("dispatchAgentHook trust handling", () => {
     expect(requestHeartbeatMock.mock.calls[0]?.[0]?.sessionKey).toBeUndefined();
   });
 
-  it("omits the default agentId from the announce wake when no agent is named", async () => {
-    // An unnamed hook resolves its event session from fresh config at announce
-    // time; pairing the dispatch-time default agent with that session could
-    // wake a stale agent after a default-agent reload.
+  it("carries the accepted owner on an unnamed hook announce wake", async () => {
+    // Admission freezes the effective owner. Keep it paired with the scoped
+    // event session instead of rediscovering an ambient default at completion.
     runCronIsolatedAgentTurnMock.mockResolvedValueOnce({
       status: "ok",
       summary: "done",
@@ -913,9 +940,9 @@ describe("dispatchAgentHook trust handling", () => {
       source: "hook",
       intent: "immediate",
       reason: expect.stringMatching(/^hook:[0-9a-f-]+$/),
+      agentId: "main",
       sessionKey: "agent:main:main",
     });
-    expect(wake.agentId).toBeUndefined();
   });
 
   it("keeps global-scope error events and wakes on the selected agent", async () => {
diff --git a/src/gateway/server/hooks.ts b/src/gateway/server/hooks.ts
index a9b877c9cd38..df907e4b47c2 100644
--- a/src/gateway/server/hooks.ts
+++ b/src/gateway/server/hooks.ts
@@ -13,7 +13,6 @@ import { getRuntimeConfig } from "../../config/io.js";
 import {
   canonicalizeMainSessionAlias,
   resolveAgentMainSessionKey,
-  resolveMainSessionKey,
   resolveMainSessionKeyFromConfig,
 } from "../../config/sessions.js";
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
@@ -62,7 +61,6 @@ type HookEventTarget = {
 function resolveHookEventTarget(params: {
   cfg: OpenClawConfig;
   resolvedAgentId: string;
-  explicitAgentId?: string;
   sessionKey?: string;
 }): HookEventTarget {
   if (params.cfg.session?.scope === "global") {
@@ -83,15 +81,10 @@ function resolveHookEventTarget(params: {
           mainKey: params.cfg.session?.mainKey,
         }),
       })
-    : params.explicitAgentId
-      ? resolveAgentMainSessionKey({ cfg: params.cfg, agentId: params.explicitAgentId })
-      : resolveMainSessionKey(params.cfg);
+    : resolveAgentMainSessionKey({ cfg: params.cfg, agentId: params.resolvedAgentId });
   return {
     eventSessionKey,
-    heartbeatTarget: {
-      ...(params.explicitAgentId ? { agentId: params.explicitAgentId } : {}),
-      sessionKey: eventSessionKey,
-    },
+    heartbeatTarget: { agentId: params.resolvedAgentId, sessionKey: eventSessionKey },
   };
 }
 
@@ -453,12 +446,11 @@ export function createGatewayHooksRequestHandler(params: {
             });
             return;
           }
-          // Keep an omitted agent omitted for event routing so global session scope
-          // stays global; runner identity is frozen separately via accepted agentId.
+          // The accepted agent is the stable owner. Global scope stays global;
+          // other events keep that owner in their agent-qualified session key.
           hookEventTarget = resolveHookEventTarget({
             cfg,
             resolvedAgentId: agentId,
-            explicitAgentId: acceptedValue.agentId,
           });
           const { runCronIsolatedAgentTurn } = await loadIsolatedAgentModule();
           // Lazy module loading is the last Gateway-owned async boundary before
diff --git a/src/plugins/management-service.owner-routing.test.ts b/src/plugins/management-service.owner-routing.test.ts
new file mode 100644
index 000000000000..eebb0d51654b
--- /dev/null
+++ b/src/plugins/management-service.owner-routing.test.ts
@@ -0,0 +1,35 @@
+import { expect, it, vi } from "vitest";
+
+const metadata = vi.hoisted(() => vi.fn());
+
+vi.mock("./plugin-metadata-snapshot.js", () => ({
+  loadPluginMetadataSnapshot: (...args: unknown[]) => metadata(...args),
+  resolvePluginMetadataSnapshot: (...args: unknown[]) => metadata(...args),
+}));
+
+const { listManagedPlugins } = await import("./management-service.js");
+
+it("loads plugin metadata from the explicit system-owner workspace", async () => {
+  const config = {
+    agents: {
+      ownership: "explicit" as const,
+      defaults: { systemAgent: { agentId: "research" } },
+      entries: { main: {}, research: { workspace: "~/research-workspace" } },
+    },
+  };
+  const env = { HOME: "/tmp/openclaw-managed-plugin-home" };
+  metadata.mockReturnValue({
+    index: { plugins: [], installRecords: {} },
+    byPluginId: new Map(),
+    diagnostics: [],
+    normalizePluginId: (pluginId: string) => pluginId,
+  });
+
+  await listManagedPlugins({ config, env, officialCatalog: { entries: [] } });
+
+  expect(metadata).toHaveBeenCalledWith({
+    config,
+    env,
+    workspaceDir: "/tmp/openclaw-managed-plugin-home/research-workspace",
+  });
+});
diff --git a/src/plugins/management-service.ts b/src/plugins/management-service.ts
index 6d401b98a510..17fb189d6e7b 100644
--- a/src/plugins/management-service.ts
+++ b/src/plugins/management-service.ts
@@ -3,7 +3,10 @@ import path from "node:path";
 import { asSafeIntegerInRange } from "@openclaw/normalization-core/number-coercion";
 import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
 import { uniqueStrings } from "@openclaw/normalization-core/string-normalization";
-import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope-config.js";
+import {
+  resolveAgentWorkspaceDir,
+  resolveSystemAgentTargetAgentId,
+} from "../agents/agent-scope-config.js";
 import { MANIFEST_KEY } from "../compat/legacy-names.js";
 import { collectChangedPaths } from "../config/config-change-paths.js";
 import {
@@ -653,7 +656,7 @@ function resolveManagedPluginMetadataParams(config: OpenClawConfig, env: NodeJS.
   return {
     config,
     env,
-    workspaceDir: resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config), env),
+    workspaceDir: resolveAgentWorkspaceDir(config, resolveSystemAgentTargetAgentId(config), env),
   };
 }
 
diff --git a/src/status/summary.ts b/src/status/summary.ts
index a80b9a640c76..6f8e200d299d 100644
--- a/src/status/summary.ts
+++ b/src/status/summary.ts
@@ -6,7 +6,7 @@ import { resolveAgentConfig } from "../agents/agent-scope.js";
 import { DEFAULT_CONTEXT_TOKENS, DEFAULT_MODEL, DEFAULT_PROVIDER } from "../agents/defaults.js";
 import { areRuntimeModelRefsEquivalent } from "../agents/model-runtime-aliases.js";
 import { getRuntimeConfig, projectConfigOntoRuntimeSourceSnapshot } from "../config/config.js";
-import { resolveMainSessionKey } from "../config/sessions/main-session.js";
+import { resolveSystemMainSessionKey } from "../config/sessions/main-session.js";
 import {
   hasSessionActiveAutoModelFallback,
   hasSessionAutoModelFallbackProvenance,
@@ -376,7 +376,7 @@ export async function getStatusSummary(
         }),
       )
     : [];
-  const mainSessionKey = resolveMainSessionKey(cfg);
+  const mainSessionKey = resolveSystemMainSessionKey(cfg);
   const queuedSystemEvents = peekSystemEvents(mainSessionKey);
   const taskMaintenanceModule = await loadTaskRegistryMaintenanceModule();
   taskMaintenanceModule.configureTaskRegistryMaintenance();
diff --git a/src/system-agent/inference-fallback.ts b/src/system-agent/inference-fallback.ts
index 3363c8930c85..4a1e7cee16fb 100644
--- a/src/system-agent/inference-fallback.ts
+++ b/src/system-agent/inference-fallback.ts
@@ -1,5 +1,6 @@
 // Provider-neutral live inference ladder for OpenClaw sessions.
 import { normalizeProviderId } from "@openclaw/model-catalog-core/provider-id";
+import { resolveSystemAgentTargetAgentId } from "../agents/agent-scope-config.js";
 import { listAgentIds, tryResolveDefaultAgentId } from "../agents/agent-scope.js";
 import { hasAvailableAuthForProvider } from "../agents/model-auth.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
@@ -7,7 +8,6 @@ import { normalizeAgentId } from "../routing/session-key.js";
 import type { RuntimeEnv } from "../runtime.js";
 import {
   resolveSystemAgentConfiguredRouteFromConfig,
-  resolveSystemAgentTargetAgentId,
   type SystemAgentConfiguredRoute,
 } from "./inference-route.js";
 import { verifySetupInference, type BoundVerifySetupInferenceResult } from "./setup-inference.js";
diff --git a/src/system-agent/inference-route.ts b/src/system-agent/inference-route.ts
index 0ecb4eb87d74..e937b28c04cb 100644
--- a/src/system-agent/inference-route.ts
+++ b/src/system-agent/inference-route.ts
@@ -1,12 +1,10 @@
 // Resolves the configured default agent route shared by OpenClaw inference calls.
 import { isDeepStrictEqual } from "node:util";
 import { normalizeProviderId } from "@openclaw/model-catalog-core/provider-id";
-import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
 import {
   listAgentEntries,
-  resolveDefaultAgentId,
+  resolveSystemAgentTargetAgentId,
   toAgentEntriesRecord,
-  tryResolveLegacyCompatibilityAgentId,
 } from "../agents/agent-scope-config.js";
 import {
   cliBackendAcceptsAuthProfileForwarding,
@@ -33,25 +31,6 @@ export type SystemAgentConfiguredRoute = {
     }
 );
 
-export function resolveSystemAgentTargetAgentId(
-  config: OpenClawConfig,
-  requestedAgentId?: string,
-): string {
-  const configuredAgentId =
-    normalizeOptionalString(requestedAgentId) ??
-    normalizeOptionalString(config.agents?.defaults?.systemAgent?.agentId);
-  if (configuredAgentId) {
-    return normalizeAgentId(configuredAgentId);
-  }
-  return normalizeAgentId(
-    tryResolveLegacyCompatibilityAgentId(config) ??
-      resolveDefaultAgentId(config, {
-        surface: "system-agent consult routing",
-        hint: "Set agents.defaults.systemAgent.agentId or pass an explicit consult agent id.",
-      }),
-  );
-}
-
 export type SystemAgentConfiguredRouteDeps = {
   readConfigFileSnapshot?: typeof import("../config/config.js").readConfigFileSnapshot;
   loadAuthProfileStoreForRuntime?: typeof import("../agents/auth-profiles/store.js").loadAuthProfileStoreForRuntime;

From c68039e7fb0112a4723c9d3010408bc0720dbb8e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 21:51:07 -0700
Subject: [PATCH 07/23] refactor(ui): one task-detail surface for rail and
 subagent clicks (#123003)

* refactor(ui): unify task details in sidebar panel

* docs(ui): describe task detail sidebar

* refactor(ui): collapse onSelectTask into onOpenTaskDetail

Two names for the same open-the-panel action; rows now call the
callback directly.

* fix(ui): clear rail open-task highlight when detail slot closes

openTaskId derived from sidebarContent alone, but region close only
collapses the layout and retains content, leaving a stale
aria-current row; gate the highlight on detail-slot visibility.

* fix(ui): keep requester sessions out of subagent transcripts and let reopen retry failed lookups

A queued subagent has no child session yet; falling back to its
sessionKey rendered the requester's conversation as the task
transcript. And a failed tasks.get permanently suppressed the panel's
render-driven load; selection now clears the recorded error so
reopening retries, matching the old rail behavior.
---
 docs/web/control-ui.md                        |   4 +-
 ui/src/i18n/locales/en.ts                     |  10 +-
 .../pages/chat/background-tasks.e2e.test.ts   | 183 ++++------
 ui/src/pages/chat/chat-pane-base.ts           |   3 +-
 ui/src/pages/chat/chat-pane-render.ts         |  12 +-
 .../chat-pane-retained-presentation.test.ts   |  15 +-
 .../chat/chat-pane-retained-presentation.ts   |   4 +-
 ui/src/pages/chat/chat-session-rail.test.ts   |   4 -
 ui/src/pages/chat/chat-view.test.ts           |   4 -
 ui/src/pages/chat/chat-view.ts                |  20 +-
 .../components/chat-background-task-row.ts    | 122 +------
 .../chat-background-tasks-render.ts           | 177 ++++------
 .../chat-background-tasks-status.ts           |   2 +-
 .../components/chat-background-tasks.test.ts  | 329 +++---------------
 .../chat/components/chat-background-tasks.ts  | 167 +--------
 .../components/chat-background-tasks.types.ts |  18 +-
 .../pages/chat/components/chat-detail-slot.ts |  24 +-
 ui/src/pages/chat/components/chat-sidebar.ts  |   2 +-
 .../components/chat-subagent-activity.test.ts |  12 +-
 .../chat/components/chat-subagent-activity.ts |  10 +-
 ...test.ts => chat-task-detail-state.test.ts} |  29 +-
 ...ail-state.ts => chat-task-detail-state.ts} |  56 +--
 .../chat/components/chat-task-detail.test.ts  | 129 +++++++
 ...subagent-detail.ts => chat-task-detail.ts} | 128 ++++---
 ui/src/styles/chat/sidebar.css                | 184 ++--------
 25 files changed, 530 insertions(+), 1118 deletions(-)
 rename ui/src/pages/chat/components/{chat-subagent-detail-state.test.ts => chat-task-detail-state.test.ts} (84%)
 rename ui/src/pages/chat/components/{chat-subagent-detail-state.ts => chat-task-detail-state.ts} (75%)
 create mode 100644 ui/src/pages/chat/components/chat-task-detail.test.ts
 rename ui/src/pages/chat/components/{chat-subagent-detail.ts => chat-task-detail.ts} (51%)

diff --git a/docs/web/control-ui.md b/docs/web/control-ui.md
index 4bd102700b59..386f82a49425 100644
--- a/docs/web/control-ui.md
+++ b/docs/web/control-ui.md
@@ -287,7 +287,7 @@ select it to open the owning Approvals page.
   </Accordion>
   <Accordion title="Cron, tasks, plugins, skills, devices, exec approvals">
     - Automations (cron jobs): stat cards (automation count, failing count, scheduler state, next wake) above an Automations/Run history tab switch; the Automations tab lists jobs in a filterable table (All/Active/Paused, search, schedule and last-run filters, per-row action menu) with starter suggestions below, and the Run history tab shows recent runs across all automations (`cron.*`).
-    - Tasks: live active and recent background task ledger with linked sessions and cancellation (`tasks.*`). Chat's Background tasks rail groups running and finished work; selecting a row opens a compact in-rail detail view with a back button, bounded prompt, live activity, and output or error summary.
+    - Tasks: live active and recent background task ledger with linked sessions and cancellation (`tasks.*`). Chat's Background tasks rail groups running and finished work; selecting a rail row opens that task's live status and transcript or prompt/output inspector in the detail sidebar.
     - Plugins: browse the installed inventory and curated store, search ClawHub, install and remove plugin code, and enable or disable installed plugins (`plugins.*`); MCP server rows edit `mcp.servers` through the config methods.
     - Skills: status, enable/disable, install, API key updates (`skills.*`).
     - Devices: one inventory joins paired device records, the node catalog, and live presence (`device.pair.list`, `node.list`, `system-presence`). The Gateway host is pinned first; paired clients show connection status, roles, tokens, capabilities, and commands. Duplicate pairings collapse into an expandable group, and **Clean up N stale** bulk-removes admin-confirmed offline duplicates that were auto-approved (silent local, trusted-CIDR, or SSH-verified) or predate approval provenance. Entries can be removed (`node.pair.remove`, `device.pair.remove`), device pairing and node re-approvals handled inline (`device.pair.*`, `node.pair.approve`/`reject`), and mobile setup codes created from the same card.
@@ -503,7 +503,7 @@ Capability toggles stay disabled until the Gateway, session, and runtime config
     - The thread workspace rail in each Chat pane lists thread files, project files, and artifacts. It docks to the pane's right edge by default; drag its header (or use the dock button) to move it to the bottom, and the choice is stored in the current browser profile. A collapsed rail takes no space at all: reopen it with ⇧⌘B or the files toggle in the title bar, which carries a changed-file count badge. The separate file, tool, and Canvas detail panel is unaffected.
     - File paths recognized in chat messages read as their basename with a small glyph for the file type in front — a Markdown page, a `package.json` manifest, a TypeScript source, a `.tsx` component, a config or data file, a shell script, and an image each get their own mark, and anything else falls back to a plain document. When two links in the same message share a basename, each keeps just enough of its trailing path to stay distinct. The full path stays on the link: it is what the tooltip shows, what opens in the file panel, and what the message's **Copy** action returns, since copy hands back the original Markdown. Labels you write yourself in a `[label](path)` link are never rewritten. The glyph is drawn from the bundled icon set, never fetched from the network, and is decorative only: it is not read by screen readers and is not part of copied text. Text that is not a recognizable path — anything carrying spaces, parentheses, a `#` fragment, or a `?` query — stays plain prose.
     - Clicking a file reference in chat, a file path in an expanded read/edit/write tool card, or a file row in the workspace rail opens the file detail panel. UTF-8 text files use a CodeMirror-based code view with syntax highlighting, line numbers, jump-to-line, in-file search, copy actions, and an open-in-external-editor menu. AVIF, GIF, JPEG, PNG, and WebP images no larger than 256 KiB render inline; other binary files show metadata without lossy text decoding. When the Gateway advertises `sessions.files.set` to an `operator.admin` connection, the text panel adds an Edit mode with dirty tracking and Cmd/Ctrl-S save; unsaved drafts survive file, panel, and session navigation in the current browser tab until explicitly saved or discarded. Saves are compare-and-swap on a content hash returned by `sessions.files.get`: if the file changed on disk since it was loaded (for example because the agent kept working), the panel shows a conflict notice with Reload (take the latest content) and Overwrite (keep the local edit) actions. Writes go through the same fs-safe workspace guards as reads — path containment, symlink/hardlink rejection, and a 256 KiB UTF-8 cap — and only overwrite existing files; the editor never creates or deletes them.
-    - The background tasks rail in each Chat pane lists the current agent's background tasks and subagents (`tasks.list` scoped by agent, kept live by `task` events): running work shows a live elapsed timer, tool-use count, the tool currently in use, and a stop control, while the collapsible finished section adds run durations. Selecting a rail row replaces the list with a compact detail view in the same rail; its back button returns to the list. Clicking an inline subagent activity row instead opens that subagent's live status and child transcript in the detail sidebar, without replacing the main conversation. Open the rail with the title-bar activity toggle; the task snapshot loads eagerly, so it carries a running-count badge without opening the rail first. The Tasks page remains the full cross-agent ledger.
+    - The background tasks rail in each Chat pane is the list of the current agent's background tasks and subagents (`tasks.list` scoped by agent, kept live by `task` events): running work shows a live elapsed timer, tool-use count, the tool currently in use, and a stop control, while the collapsible finished section adds run durations. Selecting a task from either a rail row or an inline subagent activity row opens its live status and transcript in the detail sidebar without replacing the main conversation; tasks whose session is the current conversation show their prompt and output inspector there instead. Open the rail with the title-bar activity toggle; the task snapshot loads eagerly, so it carries a running-count badge without opening the rail first. The Tasks page remains the full cross-agent ledger.
     - The workspace rail, background tasks rail, and detail panel adapt to each pane's own width rather than the window: in a narrow pane or compact window both rails present as bottom strips (side-dock controls hide until the pane widens; the workspace rail keeps first claim on the side slot when only one column fits), and the detail panel stacks below the thread with a horizontal resize handle instead of sharing the row with it. Phone-sized viewports still open the detail panel full-screen.
     - The chat header model and thinking pickers patch the active session immediately through `sessions.patch`; they are persistent session overrides, not one-turn-only send options.
     - **Split view:** open it from the chat title bar (beside the thread diff, background tasks, and thread files toggles), then split the active pane right or down for as many panes as fit. Each pane has its own thread, transcript, composer, and tool stream.
diff --git a/ui/src/i18n/locales/en.ts b/ui/src/i18n/locales/en.ts
index 9370d41b3fbb..169d24adc20b 100644
--- a/ui/src/i18n/locales/en.ts
+++ b/ui/src/i18n/locales/en.ts
@@ -5440,21 +5440,15 @@ export const en: TranslationMap = {
       statusRunningMany: "{count} running tasks",
       statusPreviewMore: "+{count} more",
       stopTask: "Stop {title}",
-      viewTranscript: "View transcript",
       toolUseOne: "1 tool use",
       toolUseMany: "{count} tool uses",
-      expandTask: "Show details for {title}",
-      detailTitle: "Task details",
-      transcriptTitle: "Task transcript",
-      backToTasks: "Back to background tasks",
-      backToDetail: "Back to task details",
       detailLoading: "Loading task details…",
       detailFailed: "Could not load task details.",
       transcriptLoading: "Loading task transcript…",
       transcriptEmpty: "No transcript messages yet.",
       transcriptFailed: "Could not load task transcript.",
-      subagentDetailTitle: "Subagent details",
-      subagentUnavailable: "This subagent task is no longer available.",
+      taskDetailTitle: "Task details",
+      taskUnavailable: "This task is no longer available.",
       prompt: "Prompt",
       output: "Output",
       promptUnavailable: "Prompt unavailable.",
diff --git a/ui/src/pages/chat/background-tasks.e2e.test.ts b/ui/src/pages/chat/background-tasks.e2e.test.ts
index ffa8b05f7807..374af5bfc27f 100644
--- a/ui/src/pages/chat/background-tasks.e2e.test.ts
+++ b/ui/src/pages/chat/background-tasks.e2e.test.ts
@@ -94,10 +94,12 @@ const runningExec = {
 suite.define(() => {
   it("opens the rail, applies pushed completion, and sends cancel", async () => {
     await rm(artifactDir, { force: true, recursive: true });
-    await mkdir(artifactDir, { recursive: true });
+    const railFlowDir = path.join(artifactDir, "rail-flow");
+    await mkdir(railFlowDir, { recursive: true });
     await suite.withPage(
       {
         locale: "en-US",
+        recordVideo: { dir: railFlowDir, size: { width: 1440, height: 900 } },
         serviceWorkers: "block",
         viewport: { width: 1440, height: 900 },
       },
@@ -127,47 +129,9 @@ suite.define(() => {
                     thinkingLevel: null,
                   },
                 },
-                {
-                  match: { sessionKey: finishedCli.sessionKey },
-                  response: {
-                    messages: [
-                      {
-                        content: [
-                          { type: "text", text: "CLI transcript stayed in the task rail." },
-                        ],
-                        role: "assistant",
-                        timestamp: Date.now(),
-                      },
-                    ],
-                    sessionId: "cli-task-transcript",
-                    thinkingLevel: null,
-                  },
-                },
               ],
             },
             "tasks.list": { tasks: [runningSubagent, queuedCron, finishedCli] },
-            "tasks.get": {
-              cases: [
-                {
-                  match: { taskId: runningSubagent.id },
-                  response: {
-                    task: {
-                      ...runningSubagent,
-                      prompt: "Trace model routing across provider and session boundaries.",
-                    },
-                  },
-                },
-                {
-                  match: { taskId: finishedCli.id },
-                  response: {
-                    task: {
-                      ...finishedCli,
-                      prompt: "Generate a searchable media index.",
-                    },
-                  },
-                },
-              ],
-            },
             "tasks.cancel": {
               found: true,
               cancelled: true,
@@ -208,27 +172,42 @@ suite.define(() => {
           expect(request.params).toMatchObject({ sessionKey: "main" });
           expect(request.params).not.toHaveProperty("agentId");
         }
-        await page.screenshot({ path: path.join(artifactDir, "01-rail-open.png"), fullPage: true });
+        await page.screenshot({ path: path.join(railFlowDir, "01-rail-open.png"), fullPage: true });
 
         const chatUrl = page.url();
-        await rail
-          .locator('[data-task-id="task-subagent"]')
-          .getByRole("button", { name: "Show details for Map model routing code" })
-          .click();
-        await rail
-          .getByText("Trace model routing across provider and session boundaries.")
-          .waitFor();
-        expect(await rail.textContent()).toContain("Reading provider catalogs");
-        expect(await rail.getByRole("button", { name: "Back to background tasks" }).count()).toBe(
-          1,
+        const mainTranscript = page.locator(".chat-main .chat-thread");
+        const mainTranscriptBefore = await mainTranscript.textContent();
+        const openRow = rail.locator('[data-task-id="task-subagent"]');
+        await openRow.click();
+        const detailPanel = page.locator("[data-task-detail-panel]");
+        await detailPanel.waitFor({ state: "visible" });
+        await detailPanel.getByText("Subagent transcript proof.").waitFor();
+        expect(await detailPanel.textContent()).toContain("Map model routing code");
+        expect(await detailPanel.textContent()).toContain("Subagent");
+        expect(await openRow.getAttribute("aria-current")).toBe("true");
+        expect(
+          await openRow.evaluate((element) =>
+            element.classList.contains("chat-tasks-rail__task--open"),
+          ),
+        ).toBe(true);
+        await expect
+          .poll(async () =>
+            (await gateway.getRequests("chat.history")).some(
+              (request) => requestSessionKey(request) === runningSubagent.childSessionKey,
+            ),
+          )
+          .toBe(true);
+        const transcriptRequest = (await gateway.getRequests("chat.history")).find(
+          (request) => requestSessionKey(request) === runningSubagent.childSessionKey,
         );
-        expect(await rail.getByRole("button", { name: "View transcript" }).count()).toBe(0);
+        expect(transcriptRequest?.params).toEqual({
+          sessionKey: runningSubagent.childSessionKey,
+          limit: 100,
+        });
         expect(page.url()).toBe(chatUrl);
-        await page.getByText("Background tasks rail proof.").waitFor({ state: "visible" });
-        const detailRequest = await gateway.waitForRequest("tasks.get");
-        expect(detailRequest.params).toEqual({ taskId: "task-subagent" });
+        expect(await mainTranscript.textContent()).toBe(mainTranscriptBefore);
         await page.screenshot({
-          path: path.join(artifactDir, "02-task-detail.png"),
+          path: path.join(railFlowDir, "02-task-detail-sidebar.png"),
           fullPage: true,
         });
 
@@ -241,20 +220,22 @@ suite.define(() => {
             terminalSummary: "Routing map complete",
           },
         });
-        await rail.getByText("Routing map complete").waitFor({ state: "visible" });
+        await detailPanel.getByText("Completed").waitFor({ state: "visible" });
+        const completedRow = rail.locator(
+          '[data-tasks-section="finished"] [data-task-id="task-subagent"]',
+        );
+        await completedRow.waitFor({ state: "visible" });
+        expect(await completedRow.getAttribute("aria-current")).toBe("true");
+        expect(
+          await rail
+            .locator('[data-tasks-section="running"] [data-task-id="task-subagent"]')
+            .count(),
+        ).toBe(0);
         await page.screenshot({
-          path: path.join(artifactDir, "03-pushed-completion.png"),
+          path: path.join(railFlowDir, "03-pushed-completion.png"),
           fullPage: true,
         });
 
-        await rail.getByRole("button", { name: "Back to background tasks" }).click();
-        await rail
-          .locator('[data-tasks-section="finished"] [data-task-id="task-subagent"]')
-          .waitFor({ state: "visible" });
-        await rail
-          .locator('[data-tasks-section="running"] [data-task-id="task-subagent"]')
-          .waitFor({ state: "detached" });
-
         await rail
           .locator('[data-task-id="task-cron"]')
           .getByRole("button", { name: "Stop Nightly cleanup" })
@@ -262,64 +243,24 @@ suite.define(() => {
         const cancelRequest = await gateway.waitForRequest("tasks.cancel");
         expect(cancelRequest.params).toEqual({ taskId: "task-cron" });
         expect(page.url()).toBe(chatUrl);
+        await detailPanel.waitFor({ state: "visible" });
+        await page.getByText("Background tasks rail proof.").waitFor({ state: "visible" });
+        expect(await mainTranscript.textContent()).not.toContain("Subagent transcript proof.");
+        await page.screenshot({
+          path: path.join(railFlowDir, "04-list-remains-with-detail-open.png"),
+          fullPage: true,
+        });
+
+        // Region close leaves sidebarContent set; the rail highlight must
+        // follow panel visibility, not retained content.
+        await page.getByRole("button", { name: "Close Details" }).click();
+        await detailPanel.waitFor({ state: "detached" });
+        expect(await completedRow.getAttribute("aria-current")).toBe(null);
         expect(
-          (await gateway.getRequests("chat.history")).some(
-            (request) => requestSessionKey(request) === runningSubagent.childSessionKey,
+          await completedRow.evaluate((element) =>
+            element.classList.contains("chat-tasks-rail__task--open"),
           ),
         ).toBe(false);
-        await page.screenshot({
-          path: path.join(artifactDir, "04-back-to-list.png"),
-          fullPage: true,
-        });
-
-        const mainTranscript = page.locator(".chat-main .chat-thread");
-        const mainTranscriptBefore = await mainTranscript.textContent();
-        await rail
-          .locator('[data-task-id="task-cli"]')
-          .getByRole("button", { name: "Show details for Generate media index" })
-          .click();
-        await rail.getByText("Generate a searchable media index.").waitFor();
-        await page.screenshot({
-          path: path.join(artifactDir, "05-cli-task-detail.png"),
-          fullPage: true,
-        });
-
-        await rail.getByRole("button", { name: "View transcript" }).click();
-        await expect
-          .poll(async () =>
-            (await gateway.getRequests("chat.history")).some(
-              (request) => requestSessionKey(request) === finishedCli.sessionKey,
-            ),
-          )
-          .toBe(true);
-        const transcriptRequest = (await gateway.getRequests("chat.history")).find(
-          (request) => requestSessionKey(request) === finishedCli.sessionKey,
-        );
-        expect(transcriptRequest?.params).toEqual({
-          sessionKey: finishedCli.sessionKey,
-          limit: 100,
-        });
-        await rail.getByText("CLI transcript stayed in the task rail.").waitFor();
-        expect(await rail.locator(".chat-thread").textContent()).toContain(
-          "CLI transcript stayed in the task rail.",
-        );
-        expect(page.url()).toBe(chatUrl);
-        expect(await mainTranscript.textContent()).toBe(mainTranscriptBefore);
-        expect(await rail.getByRole("button", { name: "Back to task details" }).count()).toBe(1);
-        await page.screenshot({
-          path: path.join(artifactDir, "06-cli-task-transcript.png"),
-          fullPage: true,
-        });
-
-        await rail.getByRole("button", { name: "Back to task details" }).click();
-        await rail.locator('[data-task-detail="task-cli"]').waitFor({ state: "visible" });
-        await rail.getByText("Generate a searchable media index.").waitFor();
-        expect(page.url()).toBe(chatUrl);
-        expect(await mainTranscript.textContent()).toBe(mainTranscriptBefore);
-        await page.screenshot({
-          path: path.join(artifactDir, "07-cli-task-detail-restored.png"),
-          fullPage: true,
-        });
       },
     );
   });
@@ -407,7 +348,7 @@ suite.define(() => {
         });
 
         await firstRow.click();
-        const detailPanel = page.locator("[data-subagent-detail-panel]");
+        const detailPanel = page.locator("[data-task-detail-panel]");
         await detailPanel.waitFor({ state: "visible" });
         await detailPanel.getByText("Inspecting session ownership boundaries.").waitFor();
         expect(await detailPanel.textContent()).toContain("Review session ownership");
diff --git a/ui/src/pages/chat/chat-pane-base.ts b/ui/src/pages/chat/chat-pane-base.ts
index 62cdd4f4cea6..e231bd11f5c9 100644
--- a/ui/src/pages/chat/chat-pane-base.ts
+++ b/ui/src/pages/chat/chat-pane-base.ts
@@ -143,8 +143,7 @@ export abstract class ChatPaneBase extends OpenClawLightDomElement {
     this.requestUpdate(),
   );
   protected readonly transcript = new ChatTranscriptController(this);
-  protected readonly backgroundTaskTranscript = new ChatTranscriptController(this);
-  protected readonly subagentSidebarTranscript = new ChatTranscriptController(this);
+  protected readonly taskSidebarTranscript = new ChatTranscriptController(this);
   protected readonly questionPromptState = createQuestionPromptState(() => {
     this.questionPrompts = listQuestionPrompts(this.questionPromptState);
     this.requestUpdate();
diff --git a/ui/src/pages/chat/chat-pane-render.ts b/ui/src/pages/chat/chat-pane-render.ts
index 8e87625bb650..ed9fba637d3f 100644
--- a/ui/src/pages/chat/chat-pane-render.ts
+++ b/ui/src/pages/chat/chat-pane-render.ts
@@ -54,7 +54,7 @@ import {
 } from "./chat-state-route.ts";
 import { renderChat, type ChatProps } from "./chat-view.ts";
 import { createBackgroundTasksProps } from "./components/chat-background-tasks.ts";
-import { renderChatDetailSlot } from "./components/chat-detail-slot.ts";
+import { detailSlotOpen, renderChatDetailSlot } from "./components/chat-detail-slot.ts";
 import { renderChatImageLightbox } from "./components/chat-image-lightbox.ts";
 import { chatPullRequestId, createPullRequestBranch } from "./components/chat-pull-requests.ts";
 import {
@@ -229,8 +229,11 @@ export class ChatPane extends ChatPaneBrowserAnnotationRender {
       narrowLayout:
         chatLayoutWidth <
         WORKSPACE_RAIL_SIDE_MIN_PANE_WIDTH + (railSideDocked ? WORKSPACE_RAIL_MAX_WIDTH : 0),
-      onOpenSubagentDetail: (task) =>
-        state.handleOpenSidebar({ kind: "subagent", taskId: task.id }),
+      openTaskId:
+        state.sidebarContent?.kind === "task" && detailSlotOpen(sidebarLayout)
+          ? state.sidebarContent.taskId
+          : undefined,
+      onOpenTaskDetail: (task) => state.handleOpenSidebar({ kind: "task", taskId: task.id }),
     });
     const tasksSideDocked = !backgroundTasks.collapsed && !backgroundTasks.narrowLayout;
     // Only side-docked rails narrow the conversation region.
@@ -266,7 +269,6 @@ export class ChatPane extends ChatPaneBrowserAnnotationRender {
     });
     const props: ChatProps = {
       transcript: this.transcript,
-      backgroundTaskTranscript: this.backgroundTaskTranscript,
       paneId: this.presentationId,
       sessionKey: state.sessionKey,
       announceTranscript: this.active && this.presented,
@@ -613,7 +615,7 @@ export class ChatPane extends ChatPaneBrowserAnnotationRender {
               fullMessageLoader,
               host: state,
               layout: sidebarLayout,
-              transcript: this.subagentSidebarTranscript,
+              transcript: this.taskSidebarTranscript,
             }),
           }
         : {}),
diff --git a/ui/src/pages/chat/chat-pane-retained-presentation.test.ts b/ui/src/pages/chat/chat-pane-retained-presentation.test.ts
index 8971771886c2..6468afbdd8b3 100644
--- a/ui/src/pages/chat/chat-pane-retained-presentation.test.ts
+++ b/ui/src/pages/chat/chat-pane-retained-presentation.test.ts
@@ -20,10 +20,7 @@ import {
 } from "./chat-pane-shared.ts";
 import { createTestChatPane, type TestChatPane } from "./chat-pane.test-support.ts";
 import type { ChatPageHost } from "./chat-state-host.ts";
-import {
-  readSubagentTranscript,
-  type SubagentDetailHost,
-} from "./components/chat-subagent-detail-state.ts";
+import { readTaskTranscript, type TaskDetailHost } from "./components/chat-task-detail-state.ts";
 
 describe("chat pane retained presentation lifecycle", () => {
   it("expires abandoned eviction payload ownership", () => {
@@ -196,14 +193,14 @@ describe("chat pane retained presentation lifecycle", () => {
     const release = vi.fn();
     state.realtimeTalkSession = { stop } as unknown as ChatPageHost["realtimeTalkSession"];
     state.realtimeTalkActive = true;
-    state.sidebarContent = { kind: "subagent", taskId: "task-live" };
+    state.sidebarContent = { kind: "task", taskId: "task-live" };
     state.imageLightbox = { release, src: "blob:test", title: "preview" };
-    const detailHost = state as unknown as SubagentDetailHost;
-    readSubagentTranscript(detailHost, {
+    const detailHost = state as unknown as TaskDetailHost;
+    readTaskTranscript(detailHost, {
       taskId: "task-live",
       sessionKey: "agent:main:subagent:task-live",
     });
-    expect(detailHost.subagentDetailState).toBeDefined();
+    expect(detailHost.taskDetailState).toBeDefined();
     pane.presentationId = "p1:visible";
     const announcement = document.createElement("span");
     announcement.className = "chat-transcript-announcement";
@@ -216,7 +213,7 @@ describe("chat pane retained presentation lifecycle", () => {
     expect(state.sidebarContent).toBeNull();
     // The wiped detail slot can no longer reset the loader itself; retirement
     // must stop its timer/fetch loop so hidden panes stop reading history.
-    expect(detailHost.subagentDetailState).toBeUndefined();
+    expect(detailHost.taskDetailState).toBeUndefined();
     expect(announcement.getAttribute("aria-live")).toBe("off");
   });
 
diff --git a/ui/src/pages/chat/chat-pane-retained-presentation.ts b/ui/src/pages/chat/chat-pane-retained-presentation.ts
index 854673d351bb..e027c040958a 100644
--- a/ui/src/pages/chat/chat-pane-retained-presentation.ts
+++ b/ui/src/pages/chat/chat-pane-retained-presentation.ts
@@ -12,7 +12,7 @@ import { setChatError } from "./chat-send-queue-state.ts";
 import { refreshCurrentChatSessionList } from "./chat-session.ts";
 import { invalidateImageLightbox } from "./chat-state-page.ts";
 import { dismissConfirmedActionPopovers } from "./components/chat-message.ts";
-import { resetSubagentDetail } from "./components/chat-subagent-detail-state.ts";
+import { resetTaskDetail } from "./components/chat-task-detail-state.ts";
 import { resetTranscriptSession } from "./components/chat-thread-interactions.ts";
 import { CHAT_COMPOSER_DRAFT_STORAGE_ERROR } from "./composer-persistence.ts";
 
@@ -66,7 +66,7 @@ export abstract class ChatPaneRetainedPresentation extends ChatPaneBoard {
       invalidateImageLightbox(state);
       // The detail slot's render guard cannot run once the content is wiped,
       // so the transcript loader's timer/fetch loop must be stopped here.
-      resetSubagentDetail(state);
+      resetTaskDetail(state);
       state.sidebarContent = null;
       state.requestUpdate?.();
     }
diff --git a/ui/src/pages/chat/chat-session-rail.test.ts b/ui/src/pages/chat/chat-session-rail.test.ts
index 7e72ff858d95..2718ab88058e 100644
--- a/ui/src/pages/chat/chat-session-rail.test.ts
+++ b/ui/src/pages/chat/chat-session-rail.test.ts
@@ -58,7 +58,6 @@ function backgroundTasksToggleProps(): BackgroundTasksProps {
       taskIds: new Set<string>(),
       nextExpiryAt: null,
     },
-    view: { kind: "list" },
     taskDetails: new Map(),
     taskDetailErrors: new Map(),
     taskDetailLoadingIds: new Set(),
@@ -68,9 +67,6 @@ function backgroundTasksToggleProps(): BackgroundTasksProps {
     onToggleFinished: () => {},
     onRefresh: () => {},
     onCancel: () => {},
-    onSelectTask: () => {},
-    onBack: () => {},
-    onOpenTranscript: () => {},
   };
 }
 
diff --git a/ui/src/pages/chat/chat-view.test.ts b/ui/src/pages/chat/chat-view.test.ts
index 3d052746257e..fa6bf9113bf2 100644
--- a/ui/src/pages/chat/chat-view.test.ts
+++ b/ui/src/pages/chat/chat-view.test.ts
@@ -870,7 +870,6 @@ function createBackgroundTasks(
       taskIds: new Set<string>(),
       nextExpiryAt: null,
     },
-    view: { kind: "list" },
     cancellingTaskIds: new Set<string>(),
     finishedCollapsed: false,
     taskDetails: new Map(),
@@ -880,9 +879,6 @@ function createBackgroundTasks(
     onToggleFinished: () => undefined,
     onRefresh: () => undefined,
     onCancel: () => undefined,
-    onSelectTask: () => undefined,
-    onBack: () => undefined,
-    onOpenTranscript: () => undefined,
     ...overrides,
   };
 }
diff --git a/ui/src/pages/chat/chat-view.ts b/ui/src/pages/chat/chat-view.ts
index 7776a3b3f043..2da6aac424bf 100644
--- a/ui/src/pages/chat/chat-view.ts
+++ b/ui/src/pages/chat/chat-view.ts
@@ -47,7 +47,6 @@ import { isChatRunWorking, renderChatComposer } from "./components/chat-composer
 import { inlineChatImageFromEvent, openInlineChatImage } from "./components/chat-image-lightbox.ts";
 import type { ArtifactDownloadResolver } from "./components/chat-message-media.ts";
 import { renderChatPullRequests } from "./components/chat-pull-requests.ts";
-import { renderReadOnlyTranscript } from "./components/chat-read-only-transcript.ts";
 import type { SessionRailCommand, SessionRailMode } from "./components/chat-session-rail.ts";
 import { renderChatSessionSuggestions } from "./components/chat-session-suggestions.ts";
 import {
@@ -85,7 +84,6 @@ type ChatReplyTarget = {
 export type ChatProps = ChatTaskSuggestionTrayProps &
   ChatCloudStartupNoticeProps & {
     transcript: ChatTranscriptController;
-    backgroundTaskTranscript?: ChatTranscriptController;
     paneId: string;
     sessionKey: string;
     announceTranscript?: boolean;
@@ -396,22 +394,6 @@ export function renderChat(props: ChatProps) {
     },
     props.transcript,
   );
-  const backgroundTaskView = props.backgroundTasks?.view;
-  const backgroundTaskTranscript = props.backgroundTaskTranscript;
-  const backgroundTaskThread =
-    backgroundTaskTranscript &&
-    backgroundTaskView?.kind === "transcript" &&
-    backgroundTaskView.load.status === "loaded" &&
-    backgroundTaskView.load.messages.length > 0
-      ? renderReadOnlyTranscript({
-          chat: props,
-          messages: backgroundTaskView.load.messages,
-          paneId: `${props.paneId}:background-task-transcript`,
-          sessionKey: backgroundTaskView.sessionKey,
-          transcript: backgroundTaskTranscript,
-        })
-      : nothing;
-
   const chatColumnFooter = renderChatComposer({
     paneId: props.paneId,
     sessionKey: props.sessionKey,
@@ -561,7 +543,7 @@ export function renderChat(props: ChatProps) {
           : ""} ${tasksDockBottom ? "chat-workbench--tasks-dock-bottom" : ""}"
       >
         ${renderSessionWorkspaceRail(props.sessionWorkspace)}
-        ${renderBackgroundTasksRail(props.backgroundTasks, backgroundTaskThread)}
+        ${renderBackgroundTasksRail(props.backgroundTasks)}
         ${props.sessionWorkspace?.dockDragging
           ? html`
               <div class="chat-workbench__dock-zones" aria-hidden="true">
diff --git a/ui/src/pages/chat/components/chat-background-task-row.ts b/ui/src/pages/chat/components/chat-background-task-row.ts
index e8677ef75edd..0065968b91cc 100644
--- a/ui/src/pages/chat/components/chat-background-task-row.ts
+++ b/ui/src/pages/chat/components/chat-background-task-row.ts
@@ -12,11 +12,7 @@ import {
   taskTitle,
 } from "../../../lib/tasks/data.ts";
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
-import {
-  backgroundTaskStatusLabel,
-  newestTaskSnapshot,
-  STATUS_TONES,
-} from "./chat-background-tasks-shared.ts";
+import { backgroundTaskStatusLabel, STATUS_TONES } from "./chat-background-tasks-shared.ts";
 import type { BackgroundTasksProps } from "./chat-background-tasks.types.ts";
 
 type TaskDisplayFacts = {
@@ -26,7 +22,6 @@ type TaskDisplayFacts = {
   timestamp: number;
   title: string;
   toolUseCount: number;
-  transcriptSessionKey?: string;
 };
 
 function taskDisplayFacts(task: TaskSummary): TaskDisplayFacts {
@@ -43,18 +38,11 @@ function taskDisplayFacts(task: TaskSummary): TaskDisplayFacts {
     timestamp: taskTimestampMs(task.updatedAt ?? task.createdAt),
     title: taskTitle(task),
     toolUseCount: task.toolUseCount ?? 0,
-    transcriptSessionKey: task.childSessionKey ?? task.sessionKey,
   };
 }
 
-function renderTaskMeta(
-  task: TaskSummary,
-  props: BackgroundTasksProps,
-  facts: TaskDisplayFacts,
-  transcriptReturnTo: "list" | "detail",
-): TemplateResult {
+function renderTaskMeta(task: TaskSummary, facts: TaskDisplayFacts): TemplateResult {
   const tone = STATUS_TONES[task.status];
-  const showTranscript = task.runtime !== "subagent" && facts.transcriptSessionKey;
   return html`
     <div class="chat-tasks-rail__task-meta">
       <span class="chat-tasks-rail__task-status chat-tasks-rail__task-status--${tone}"
@@ -92,20 +80,6 @@ function renderTaskMeta(
         ? html`<span class="chat-tasks-rail__task-sep" aria-hidden="true">·</span>
             <span class="chat-tasks-rail__task-tool">${task.lastToolName}</span>`
         : nothing}
-      ${showTranscript
-        ? html`
-            <button
-              class="chat-tasks-rail__task-transcript"
-              type="button"
-              @click=${(event: MouseEvent) => {
-                event.stopPropagation();
-                props.onOpenTranscript(task, transcriptReturnTo);
-              }}
-            >
-              ${t("chat.backgroundTasks.viewTranscript")}
-            </button>
-          `
-        : nothing}
     </div>
   `;
 }
@@ -114,25 +88,26 @@ export function renderTaskRow(task: TaskSummary, props: BackgroundTasksProps): T
   const facts = taskDisplayFacts(task);
   const detail = taskDetail(task);
   const cancelling = props.cancellingTaskIds.has(task.id);
+  const open = props.openTaskId === task.id;
   return html`
     <div
-      class="chat-tasks-rail__task"
+      class="chat-tasks-rail__task ${open ? "chat-tasks-rail__task--open" : ""}"
       role="listitem"
       data-task-id=${task.id}
+      aria-current=${open ? "true" : nothing}
       @click=${(event: MouseEvent) => {
         const target = event.target;
         if (target instanceof Element && target.closest("button, a")) {
           return;
         }
-        props.onSelectTask(task);
+        props.onOpenTaskDetail?.(task);
       }}
     >
       <div class="chat-tasks-rail__task-head">
         <button
-          class="chat-tasks-rail__task-disclosure"
+          class="chat-tasks-rail__task-open"
           type="button"
-          aria-label=${t("chat.backgroundTasks.expandTask", { title: facts.title })}
-          @click=${() => props.onSelectTask(task)}
+          @click=${() => props.onOpenTaskDetail?.(task)}
         >
           ${task.status === "running"
             ? html`<span class="chat-tasks-rail__task-pulse" aria-hidden="true"></span>`
@@ -140,9 +115,6 @@ export function renderTaskRow(task: TaskSummary, props: BackgroundTasksProps): T
           <openclaw-tooltip .content=${facts.title}>
             <span class="chat-tasks-rail__task-title">${facts.title}</span>
           </openclaw-tooltip>
-          <span class="chat-tasks-rail__task-chevron" aria-hidden="true">
-            ${icons.chevronRight}
-          </span>
         </button>
         ${facts.active && props.canCancel
           ? html`
@@ -165,84 +137,8 @@ export function renderTaskRow(task: TaskSummary, props: BackgroundTasksProps): T
             `
           : nothing}
       </div>
-      ${renderTaskMeta(task, props, facts, "list")}
+      ${renderTaskMeta(task, facts)}
       ${detail ? html`<div class="chat-tasks-rail__task-detail">${detail}</div>` : nothing}
     </div>
   `;
 }
-
-export function renderTaskDetail(task: TaskSummary, props: BackgroundTasksProps): TemplateResult {
-  const detailedTask = props.taskDetails.get(task.id);
-  const newest = newestTaskSnapshot(task, detailedTask);
-  const facts = taskDisplayFacts(newest);
-  const cancelling = props.cancellingTaskIds.has(task.id);
-  return html`
-    <div class="chat-tasks-rail__detail" data-task-detail=${task.id}>
-      <div class="chat-tasks-rail__detail-summary">
-        <div class="chat-tasks-rail__detail-status-line">
-          ${newest.status === "running"
-            ? html`<span class="chat-tasks-rail__task-pulse" aria-hidden="true"></span>`
-            : nothing}
-          ${renderTaskMeta(newest, props, facts, "detail")}
-        </div>
-        ${facts.active && props.canCancel
-          ? html`
-              <openclaw-tooltip
-                .content=${t("chat.backgroundTasks.stopTask", { title: facts.title })}
-              >
-                <button
-                  class="btn btn--ghost btn--sm chat-tasks-rail__detail-stop"
-                  type="button"
-                  aria-label=${t("chat.backgroundTasks.stopTask", { title: facts.title })}
-                  ?disabled=${cancelling || !props.connected}
-                  @click=${() => props.onCancel(task.id)}
-                >
-                  ${cancelling ? icons.loader : icons.stop}
-                </button>
-              </openclaw-tooltip>
-            `
-          : nothing}
-      </div>
-      ${newest.progressSummary
-        ? html`<div class="chat-tasks-rail__detail-activity">
-            <span>${newest.lastToolName ?? taskRuntimeLabel(newest)}</span>
-            <strong>${newest.progressSummary}</strong>
-          </div>`
-        : nothing}
-      ${renderTaskInspector(newest, props)}
-    </div>
-  `;
-}
-
-export function renderTaskInspector(
-  task: TaskSummary,
-  props: BackgroundTasksProps,
-): TemplateResult {
-  const detailedTask = props.taskDetails.get(task.id);
-  const newest = newestTaskSnapshot(task, detailedTask);
-  const output = taskDetail(newest);
-  const detailLoading = props.taskDetailLoadingIds.has(task.id);
-  const detailError = props.taskDetailErrors.get(task.id);
-  return html`
-    ${detailError
-      ? html`<div
-          class="chat-tasks-rail__task-inspector-state chat-tasks-rail__task-inspector-state--error"
-        >
-          ${detailError}
-        </div>`
-      : nothing}
-    <div class="chat-tasks-rail__detail-blocks">
-      <section class="chat-tasks-rail__task-inspector-block">
-        <div class="chat-tasks-rail__task-inspector-label">${t("chat.backgroundTasks.prompt")}</div>
-        <pre>
-${detailLoading
-            ? t("chat.backgroundTasks.detailLoading")
-            : (detailedTask?.prompt ?? t("chat.backgroundTasks.promptUnavailable"))}</pre>
-      </section>
-      <section class="chat-tasks-rail__task-inspector-block">
-        <div class="chat-tasks-rail__task-inspector-label">${t("chat.backgroundTasks.output")}</div>
-        <pre>${output ?? t("chat.backgroundTasks.outputPending")}</pre>
-      </section>
-    </div>
-  `;
-}
diff --git a/ui/src/pages/chat/components/chat-background-tasks-render.ts b/ui/src/pages/chat/components/chat-background-tasks-render.ts
index ef6ce86f8392..239dd1b66576 100644
--- a/ui/src/pages/chat/components/chat-background-tasks-render.ts
+++ b/ui/src/pages/chat/components/chat-background-tasks-render.ts
@@ -3,9 +3,9 @@ import { repeat } from "lit/directives/repeat.js";
 import { icons } from "../../../components/icons.ts";
 import "../../../components/tooltip.ts";
 import { t } from "../../../i18n/index.ts";
-import { isActiveTask, partitionTasks, taskTitle } from "../../../lib/tasks/data.ts";
+import { isActiveTask, partitionTasks } from "../../../lib/tasks/data.ts";
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
-import { renderTaskDetail, renderTaskRow } from "./chat-background-task-row.ts";
+import { renderTaskRow } from "./chat-background-task-row.ts";
 import type { BackgroundTasksProps } from "./chat-background-tasks.types.ts";
 
 /** Active-count badge shown on the collapsed-rail toggles; 0 until the task
@@ -58,19 +58,12 @@ function renderTaskRows(
 
 export function renderBackgroundTasksRail(
   backgroundTasks: BackgroundTasksProps | undefined,
-  transcript: TemplateResult | typeof nothing = nothing,
 ): TemplateResult | typeof nothing {
   // Collapsed rails render nothing at all — no icon strip. Reopening happens
   // through renderBackgroundTasksToggle.
   if (!backgroundTasks || backgroundTasks.collapsed) {
     return nothing;
   }
-  const view = backgroundTasks.view;
-  const viewedTask =
-    view.kind === "list"
-      ? undefined
-      : backgroundTasks.tasks?.find((task) => task.id === view.taskId);
-  const selectedTask = view.kind === "detail" ? viewedTask : undefined;
   const { active, recent } = partitionTasks(backgroundTasks.tasks ?? []);
   const loaded = backgroundTasks.tasks !== null;
   const empty = loaded && active.length === 0 && recent.length === 0;
@@ -96,48 +89,24 @@ export function renderBackgroundTasksRail(
       aria-label=${t("chat.backgroundTasks.label")}
     >
       <div class="chat-tasks-rail__header">
-        ${view.kind !== "list" && viewedTask
-          ? html`
-              <button
-                class="btn btn--ghost btn--sm chat-tasks-rail__back"
-                type="button"
-                aria-label=${view.kind === "transcript" && view.returnTo === "detail"
-                  ? t("chat.backgroundTasks.backToDetail")
-                  : t("chat.backgroundTasks.backToTasks")}
-                @click=${backgroundTasks.onBack}
-              >
-                ${icons.arrowLeft}
-              </button>
-              <div class="chat-tasks-rail__title">
-                <span class="chat-tasks-rail__eyebrow"
-                  >${view.kind === "transcript"
-                    ? t("chat.backgroundTasks.transcriptTitle")
-                    : t("chat.backgroundTasks.detailTitle")}</span
-                >
-                <strong title=${taskTitle(viewedTask)}>${taskTitle(viewedTask)}</strong>
-              </div>
-              <div class="chat-tasks-rail__actions">${collapseButton}</div>
-            `
-          : html`
-              <div class="chat-tasks-rail__title">
-                <span class="chat-tasks-rail__eyebrow">${backgroundTasks.sessionKey}</span>
-                <strong>${t("chat.backgroundTasks.title")}</strong>
-              </div>
-              <div class="chat-tasks-rail__actions">
-                <openclaw-tooltip .content=${t("chat.backgroundTasks.refresh")}>
-                  <button
-                    class="btn btn--ghost btn--sm chat-tasks-rail__refresh"
-                    type="button"
-                    aria-label=${t("chat.backgroundTasks.refresh")}
-                    ?disabled=${backgroundTasks.loading || !backgroundTasks.connected}
-                    @click=${backgroundTasks.onRefresh}
-                  >
-                    ${icons.refresh}
-                  </button>
-                </openclaw-tooltip>
-                ${collapseButton}
-              </div>
-            `}
+        <div class="chat-tasks-rail__title">
+          <span class="chat-tasks-rail__eyebrow">${backgroundTasks.sessionKey}</span>
+          <strong>${t("chat.backgroundTasks.title")}</strong>
+        </div>
+        <div class="chat-tasks-rail__actions">
+          <openclaw-tooltip .content=${t("chat.backgroundTasks.refresh")}>
+            <button
+              class="btn btn--ghost btn--sm chat-tasks-rail__refresh"
+              type="button"
+              aria-label=${t("chat.backgroundTasks.refresh")}
+              ?disabled=${backgroundTasks.loading || !backgroundTasks.connected}
+              @click=${backgroundTasks.onRefresh}
+            >
+              ${icons.refresh}
+            </button>
+          </openclaw-tooltip>
+          ${collapseButton}
+        </div>
       </div>
       ${!backgroundTasks.connected
         ? html`<div class="chat-tasks-rail__state">${t("tasksPage.disconnected")}</div>`
@@ -147,72 +116,46 @@ export function renderBackgroundTasksRail(
             ${backgroundTasks.error}
           </div>`
         : nothing}
-      ${view.kind === "transcript"
-        ? html`<div class="chat-tasks-rail__transcript" data-task-transcript=${view.taskId}>
-            ${view.load.status === "loading"
-              ? html`<div class="chat-tasks-rail__state">
-                  ${t("chat.backgroundTasks.transcriptLoading")}
-                </div>`
-              : view.load.status === "error"
-                ? html`<div class="chat-tasks-rail__state chat-tasks-rail__state--error">
-                    ${t("chat.backgroundTasks.transcriptFailed")}
-                  </div>`
-                : view.load.messages.length === 0
-                  ? html`<div class="chat-tasks-rail__state">
-                      ${t("chat.backgroundTasks.transcriptEmpty")}
-                    </div>`
-                  : transcript}
-          </div>`
-        : selectedTask
-          ? html`<div class="chat-tasks-rail__scroll">
-              ${renderTaskDetail(selectedTask, backgroundTasks)}
-            </div>`
-          : html`
-              ${backgroundTasks.loading && !loaded
-                ? html`<div class="chat-tasks-rail__state">
-                    ${t("chat.backgroundTasks.loading")}
-                  </div>`
-                : nothing}
-              ${empty
-                ? html`<div class="chat-tasks-rail__state">${t("chat.backgroundTasks.empty")}</div>`
-                : nothing}
-              <div class="chat-tasks-rail__scroll chat-tasks-rail__scroll--split">
-                ${active.length > 0
-                  ? html`
-                      <section class="chat-tasks-rail__section" data-tasks-section="running">
-                        <div class="chat-tasks-rail__section-title">
-                          ${t("chat.backgroundTasks.running", { count: String(active.length) })}
-                        </div>
-                        ${renderTaskRows(active, backgroundTasks)}
-                      </section>
-                    `
-                  : nothing}
-                ${recent.length > 0
-                  ? html`
-                      <section class="chat-tasks-rail__section" data-tasks-section="finished">
-                        <button
-                          class="chat-tasks-rail__section-toggle"
-                          type="button"
-                          aria-expanded=${String(!backgroundTasks.finishedCollapsed)}
-                          @click=${backgroundTasks.onToggleFinished}
-                        >
-                          <span class="chat-tasks-rail__section-title">
-                            ${t("chat.backgroundTasks.finished", { count: String(recent.length) })}
-                          </span>
-                          <span class="chat-tasks-rail__section-chevron" aria-hidden="true">
-                            ${backgroundTasks.finishedCollapsed
-                              ? icons.chevronRight
-                              : icons.chevronDown}
-                          </span>
-                        </button>
-                        ${backgroundTasks.finishedCollapsed
-                          ? nothing
-                          : renderTaskRows(recent, backgroundTasks)}
-                      </section>
-                    `
-                  : nothing}
-              </div>
-            `}
+      ${backgroundTasks.loading && !loaded
+        ? html`<div class="chat-tasks-rail__state">${t("chat.backgroundTasks.loading")}</div>`
+        : nothing}
+      ${empty
+        ? html`<div class="chat-tasks-rail__state">${t("chat.backgroundTasks.empty")}</div>`
+        : nothing}
+      <div class="chat-tasks-rail__scroll chat-tasks-rail__scroll--split">
+        ${active.length > 0
+          ? html`
+              <section class="chat-tasks-rail__section" data-tasks-section="running">
+                <div class="chat-tasks-rail__section-title">
+                  ${t("chat.backgroundTasks.running", { count: String(active.length) })}
+                </div>
+                ${renderTaskRows(active, backgroundTasks)}
+              </section>
+            `
+          : nothing}
+        ${recent.length > 0
+          ? html`
+              <section class="chat-tasks-rail__section" data-tasks-section="finished">
+                <button
+                  class="chat-tasks-rail__section-toggle"
+                  type="button"
+                  aria-expanded=${String(!backgroundTasks.finishedCollapsed)}
+                  @click=${backgroundTasks.onToggleFinished}
+                >
+                  <span class="chat-tasks-rail__section-title">
+                    ${t("chat.backgroundTasks.finished", { count: String(recent.length) })}
+                  </span>
+                  <span class="chat-tasks-rail__section-chevron" aria-hidden="true">
+                    ${backgroundTasks.finishedCollapsed ? icons.chevronRight : icons.chevronDown}
+                  </span>
+                </button>
+                ${backgroundTasks.finishedCollapsed
+                  ? nothing
+                  : renderTaskRows(recent, backgroundTasks)}
+              </section>
+            `
+          : nothing}
+      </div>
     </aside>
   `;
 }
diff --git a/ui/src/pages/chat/components/chat-background-tasks-status.ts b/ui/src/pages/chat/components/chat-background-tasks-status.ts
index 4f1b7f11af4c..75c540484b36 100644
--- a/ui/src/pages/chat/components/chat-background-tasks-status.ts
+++ b/ui/src/pages/chat/components/chat-background-tasks-status.ts
@@ -102,7 +102,7 @@ export function renderBackgroundTasksStatusRow(
   }
   const subagentActivity = renderSubagentActivity(
     backgroundTasks.subagentActivity,
-    backgroundTasks.onOpenSubagentDetail,
+    backgroundTasks.onOpenTaskDetail,
   );
   const remainingTasks = (backgroundTasks.tasks ?? []).filter(
     (task) => !backgroundTasks.subagentActivity.taskIds.has(task.id),
diff --git a/ui/src/pages/chat/components/chat-background-tasks.test.ts b/ui/src/pages/chat/components/chat-background-tasks.test.ts
index 4dcd8257c232..5d8f80d6aeba 100644
--- a/ui/src/pages/chat/components/chat-background-tasks.test.ts
+++ b/ui/src/pages/chat/components/chat-background-tasks.test.ts
@@ -2,7 +2,6 @@ import { html, render } from "lit";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { GatewayBrowserClient } from "../../../api/gateway.ts";
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
-import { CHAT_HISTORY_REQUEST_LIMIT } from "../chat-history.ts";
 import { renderBackgroundTasksRail } from "./chat-background-tasks-render.ts";
 import { renderBackgroundTasksStatusRow } from "./chat-background-tasks-status.ts";
 import {
@@ -19,12 +18,6 @@ function flushAsync() {
   });
 }
 
-function flushAnimationFrame() {
-  return new Promise<void>((resolve) => {
-    window.requestAnimationFrame(() => resolve());
-  });
-}
-
 function makeTask(overrides: Partial<TaskSummary> & { id: string }): TaskSummary {
   return {
     taskId: overrides.id,
@@ -85,7 +78,6 @@ function makeProps(overrides: Partial<BackgroundTasksProps> = {}): BackgroundTas
       terminalObservedAtByTask: new Map(),
       canonicalizeSessionKey: (sessionKey) => sessionKey ?? "",
     }),
-    view: { kind: "list" },
     cancellingTaskIds: new Set(),
     finishedCollapsed: false,
     taskDetails: new Map(),
@@ -95,9 +87,6 @@ function makeProps(overrides: Partial<BackgroundTasksProps> = {}): BackgroundTas
     onToggleFinished: () => {},
     onRefresh: () => {},
     onCancel: () => {},
-    onSelectTask: () => {},
-    onBack: () => {},
-    onOpenTranscript: () => {},
     ...overrides,
   };
 }
@@ -246,7 +235,7 @@ describe("background tasks rail state", () => {
     expect(props.cancellingTaskIds.has("task-1")).toBe(false);
   });
 
-  it("loads the bounded prompt when a task is opened", async () => {
+  it("routes row selection to the task panel and loads its bounded prompt on demand", async () => {
     const running = makeTask({
       id: "task-1",
       taskId: "runtime-task-1",
@@ -261,164 +250,57 @@ describe("background tasks rail state", () => {
     createBackgroundTasksProps(host);
     await flushAsync();
 
-    createBackgroundTasksProps(host).onSelectTask(running);
+    const onOpenTaskDetail = vi.fn();
+    const selected = createBackgroundTasksProps(host, {
+      openTaskId: running.id,
+      onOpenTaskDetail,
+    });
+    selected.onOpenTaskDetail?.(running);
+    expect(onOpenTaskDetail).toHaveBeenCalledWith(running);
+    expect(selected.openTaskId).toBe(running.id);
+    expect(request).not.toHaveBeenCalledWith("tasks.get", expect.anything());
+
+    selected.onLoadDetail?.(running);
     await flushAsync();
 
     expect(request).toHaveBeenCalledWith("tasks.get", { taskId: "task-1" });
     const props = createBackgroundTasksProps(host);
-    expect(props.view).toEqual({ kind: "detail", taskId: "task-1" });
     expect(props.taskDetails.get("task-1")?.prompt).toBe("Audit the background task UI");
-
-    props.onBack();
-    expect(createBackgroundTasksProps(host).view).toEqual({ kind: "list" });
   });
 
-  it("loads a task transcript in the rail and returns to its originating detail", async () => {
-    const task = makeTask({
-      id: "task-1",
-      runtime: "cli",
-      sessionKey: "agent:main:cli:fallback",
-      childSessionKey: "agent:main:cli:child",
-    });
+  it("lets reopening a task retry a failed detail lookup", async () => {
+    const running = makeTask({ id: "task-1" });
+    let failLookup = true;
     const { host, request } = createHost({
       request: (method) => {
-        if (method === "chat.history") {
-          return Promise.resolve({
-            messages: [
-              { role: "assistant", content: [{ type: "text", text: "CLI result" }] },
-              { role: "assistant", content: [{ type: "text", text: "NO_REPLY" }] },
-            ],
-          });
+        if (method !== "tasks.get") {
+          return Promise.resolve({ tasks: [running] });
         }
-        return Promise.resolve({ tasks: [task] });
+        return failLookup
+          ? Promise.reject(new Error("lookup blew up"))
+          : Promise.resolve({ task: { ...running, prompt: "Recovered prompt" } });
       },
     });
     createBackgroundTasksProps(host);
     await flushAsync();
 
-    const props = createBackgroundTasksProps(host);
-    props.onSelectTask(task);
-    props.onOpenTranscript(task, "detail");
-    expect(createBackgroundTasksProps(host).view).toMatchObject({
-      kind: "transcript",
-      taskId: "task-1",
-      sessionKey: "agent:main:cli:child",
-      returnTo: "detail",
-      load: { status: "loading" },
-    });
+    createBackgroundTasksProps(host, { onOpenTaskDetail: () => {} }).onLoadDetail?.(running);
+    await flushAsync();
+    expect(createBackgroundTasksProps(host).taskDetailErrors.get("task-1")).toBe("lookup blew up");
+
+    // Selection clears the recorded error so the panel's render-driven load
+    // (which must skip errored tasks to avoid a retry loop) can run again.
+    failLookup = false;
+    const reopened = createBackgroundTasksProps(host, { onOpenTaskDetail: () => {} });
+    reopened.onOpenTaskDetail?.(running);
+    const afterReopen = createBackgroundTasksProps(host, { onOpenTaskDetail: () => {} });
+    expect(afterReopen.taskDetailErrors.has("task-1")).toBe(false);
+    afterReopen.onLoadDetail?.(running);
     await flushAsync();
 
-    expect(request).toHaveBeenCalledWith("chat.history", {
-      sessionKey: "agent:main:cli:child",
-      limit: CHAT_HISTORY_REQUEST_LIMIT,
-    });
-    const loaded = createBackgroundTasksProps(host).view;
-    expect(loaded.kind).toBe("transcript");
-    if (loaded.kind !== "transcript") {
-      throw new Error("expected transcript view");
-    }
-    expect(loaded.load).toMatchObject({ status: "loaded" });
-    expect(loaded.load.status === "loaded" ? loaded.load.messages : []).toHaveLength(1);
-
-    createBackgroundTasksProps(host).onBack();
-    expect(createBackgroundTasksProps(host).view).toEqual({ kind: "detail", taskId: "task-1" });
-  });
-
-  it.each(["detail", "transcript"] as const)(
-    "returns a stale %s view to the list when refresh omits its task",
-    async (view) => {
-      const task = makeTask({
-        id: "task-1",
-        runtime: "cli",
-        sessionKey: "agent:main:cli:late",
-      });
-      let listCall = 0;
-      let resolveView: ((value: unknown) => void) | undefined;
-      const viewResponse = new Promise<unknown>((resolve) => {
-        resolveView = resolve;
-      });
-      const { host } = createHost({
-        request: (method) => {
-          if (method === "tasks.get" || method === "chat.history") {
-            return viewResponse;
-          }
-          listCall += 1;
-          return Promise.resolve({ tasks: listCall <= 2 ? [task] : [] });
-        },
-      });
-      createBackgroundTasksProps(host);
-      await flushAsync();
-
-      const props = createBackgroundTasksProps(host);
-      if (view === "detail") {
-        props.onSelectTask(task);
-      } else {
-        props.onOpenTranscript(task, "list");
-      }
-      createBackgroundTasksProps(host).onRefresh();
-      await flushAsync();
-      expect(createBackgroundTasksProps(host).tasks).toEqual([]);
-      expect(createBackgroundTasksProps(host).view).toEqual({ kind: "list" });
-
-      resolveView?.(
-        view === "detail"
-          ? { task: { ...task, prompt: "Late task detail" } }
-          : { messages: [{ role: "assistant", content: "Late transcript" }] },
-      );
-      await flushAsync();
-
-      expect(createBackgroundTasksProps(host).view).toEqual({ kind: "list" });
-    },
-  );
-
-  it("moves focus into task details and restores it to the selected row", async () => {
-    const running = makeTask({ id: "task-1", progressSummary: "Reading files" });
-    const completed = makeTask({
-      id: "task-1",
-      status: "completed",
-      updatedAt: 3_000,
-      terminalSummary: "Audit complete",
-      prompt: "Audit the task rail",
-    });
-    const { host } = createHost({
-      request: (method) =>
-        method === "tasks.get"
-          ? Promise.resolve({ task: completed })
-          : Promise.resolve({ tasks: [running] }),
-    });
-    createBackgroundTasksProps(host);
-    await flushAsync();
-
-    const container = document.createElement("div");
-    document.body.append(container);
-    const renderRail = () => {
-      render(html`${renderBackgroundTasksRail(createBackgroundTasksProps(host))}`, container);
-    };
-    host.requestUpdate = renderRail;
-    // finishedCollapsed defaults to true; back-navigation from a finished
-    // detail must expand the section so the returned-to row stays visible.
-    const initialProps = createBackgroundTasksProps(host);
-    initialProps.onToggleCollapsed();
-    renderRail();
-
-    const disclosure = container.querySelector<HTMLButtonElement>(
-      ".chat-tasks-rail__task-disclosure",
-    );
-    disclosure?.focus();
-    disclosure?.click();
-    await flushAnimationFrame();
-
-    const back = container.querySelector<HTMLButtonElement>(".chat-tasks-rail__back");
-    expect(document.activeElement).toBe(back);
-    back?.click();
-    await flushAnimationFrame();
-
-    expect(createBackgroundTasksProps(host).finishedCollapsed).toBe(false);
-    expect(
-      container.querySelector('[data-tasks-section="finished"] [data-task-id="task-1"]'),
-    ).not.toBeNull();
-    expect(document.activeElement).toBe(
-      container.querySelector<HTMLButtonElement>(".chat-tasks-rail__task-disclosure"),
+    expect(request).toHaveBeenCalledWith("tasks.get", { taskId: "task-1" });
+    expect(createBackgroundTasksProps(host).taskDetails.get("task-1")?.prompt).toBe(
+      "Recovered prompt",
     );
   });
 
@@ -440,7 +322,7 @@ describe("background tasks rail state", () => {
     createBackgroundTasksProps(host);
     await flushAsync();
 
-    createBackgroundTasksProps(host).onSelectTask(running);
+    createBackgroundTasksProps(host).onLoadDetail?.(running);
     await flushAsync();
 
     const props = createBackgroundTasksProps(host);
@@ -482,7 +364,7 @@ describe("background tasks rail state", () => {
     await flushAsync();
 
     createBackgroundTasksProps(host).onRefresh();
-    createBackgroundTasksProps(host).onSelectTask(running);
+    createBackgroundTasksProps(host).onLoadDetail?.(running);
     await flushAsync();
     resolveActive?.({ tasks: [running] });
     resolveRecent?.({ tasks: [running] });
@@ -510,14 +392,13 @@ describe("background tasks rail state", () => {
     createBackgroundTasksProps(host);
     await flushAsync();
 
-    createBackgroundTasksProps(host).onSelectTask(running);
+    createBackgroundTasksProps(host).onLoadDetail?.(running);
     handleBackgroundTasksEvent(host, { action: "deleted", taskId: "task-1" });
     resolveDetail?.({ task: { ...running, prompt: "Deleted task prompt" } });
     await flushAsync();
 
     const props = createBackgroundTasksProps(host);
     expect(props.tasks).toEqual([]);
-    expect(props.view).toEqual({ kind: "list" });
     expect(props.taskDetails.has("task-1")).toBe(false);
   });
 });
@@ -609,7 +490,7 @@ describe("background tasks rail events", () => {
     });
     createBackgroundTasksProps(host);
     await flushAsync();
-    createBackgroundTasksProps(host).onSelectTask(completed);
+    createBackgroundTasksProps(host).onLoadDetail?.(completed);
     await flushAsync();
 
     handleBackgroundTasksEvent(host, { action: "upserted", task: correction });
@@ -677,7 +558,7 @@ describe("background tasks rail events", () => {
     });
     createBackgroundTasksProps(host);
     await flushAsync();
-    createBackgroundTasksProps(host).onSelectTask(running);
+    createBackgroundTasksProps(host).onLoadDetail?.(running);
     await flushAsync();
 
     handleBackgroundTasksEvent(host, {
@@ -696,45 +577,12 @@ describe("background tasks rail events", () => {
 });
 
 describe("background tasks rail rendering", () => {
-  it("renders explicit transcript loading, empty, and error states", () => {
-    const task = makeTask({ id: "task-1", runtime: "cli" });
-    const baseView = {
-      kind: "transcript" as const,
-      taskId: "task-1",
-      sessionKey: "agent:main:cli:task",
-      returnTo: "detail" as const,
-    };
-    const loading = renderTaskRail({
-      tasks: [task],
-      view: { ...baseView, load: { status: "loading" } },
-    });
-    expect(loading.textContent).toContain("Loading task transcript…");
-    expect(loading.querySelector(".chat-tasks-rail__back")?.getAttribute("aria-label")).toBe(
-      "Back to task details",
-    );
-
-    const empty = renderTaskRail({
-      tasks: [task],
-      view: { ...baseView, load: { status: "loaded", messages: [] } },
-    });
-    expect(empty.textContent).toContain("No transcript messages yet.");
-
-    const failed = renderTaskRail({
-      tasks: [task],
-      view: {
-        ...baseView,
-        load: { status: "error" },
-      },
-    });
-    expect(failed.textContent).toContain("Could not load task transcript.");
-  });
-
-  it("keeps subagents in the rail and preserves linked sessions for other runtimes", () => {
+  it("routes every task runtime to the panel and highlights the open task", () => {
     const onCancel = vi.fn();
-    const onOpenTranscript = vi.fn();
-    const onSelectTask = vi.fn();
+    const onOpenTaskDetail = vi.fn();
     const container = renderTaskRail({
       canCancel: true,
+      openTaskId: "task-2",
       tasks: [
         makeTask({
           id: "task-1",
@@ -750,8 +598,7 @@ describe("background tasks rail rendering", () => {
         }),
       ],
       onCancel,
-      onSelectTask,
-      onOpenTranscript,
+      onOpenTaskDetail,
     });
 
     const rows = container.querySelectorAll(".chat-tasks-rail__task");
@@ -761,22 +608,13 @@ describe("background tasks rail rendering", () => {
     expect(stop).not.toBeNull();
     stop?.click();
     expect(onCancel).toHaveBeenCalledWith("task-1");
-    expect(onSelectTask).not.toHaveBeenCalled();
-
-    const subagent = container.querySelector('[data-task-id="task-1"]');
-    expect(subagent?.querySelector(".chat-tasks-rail__task-transcript")).toBeNull();
+    expect(onOpenTaskDetail).not.toHaveBeenCalled();
 
     const cliTask = container.querySelector('[data-task-id="task-2"]');
-    const transcript = cliTask?.querySelector<HTMLButtonElement>(
-      ".chat-tasks-rail__task-transcript",
-    );
-    expect(transcript).not.toBeNull();
-    transcript?.click();
-    expect(onOpenTranscript).toHaveBeenCalledWith(
-      expect.objectContaining({ id: "task-2" }),
-      "list",
-    );
-    expect(onSelectTask).not.toHaveBeenCalled();
+    expect(cliTask?.classList.contains("chat-tasks-rail__task--open")).toBe(true);
+    expect(cliTask?.getAttribute("aria-current")).toBe("true");
+    cliTask?.querySelector<HTMLButtonElement>(".chat-tasks-rail__task-open")?.click();
+    expect(onOpenTaskDetail).toHaveBeenCalledWith(expect.objectContaining({ id: "task-2" }));
   });
 
   it("shows live tool activity for running tasks and duration for finished tasks", () => {
@@ -805,75 +643,6 @@ describe("background tasks rail rendering", () => {
     expect(finished?.querySelector("openclaw-elapsed-time")).toBeNull();
   });
 
-  it("opens a compact task detail view with prompt, output, and back navigation", () => {
-    const onBack = vi.fn();
-    const onOpenTranscript = vi.fn();
-    const task = makeTask({
-      id: "task-1",
-      runtime: "cli",
-      sessionKey: "agent:main:cli:audit",
-      status: "completed",
-      terminalSummary: "Audit complete",
-    });
-    const container = renderTaskRail({
-      tasks: [task],
-      view: { kind: "detail", taskId: "task-1" },
-      taskDetails: new Map([
-        [
-          "task-1",
-          { ...task, terminalSummary: "Stale running progress", prompt: "Review running tasks" },
-        ],
-      ]),
-      onBack,
-      onOpenTranscript,
-    });
-
-    const detail = container.querySelector('[data-task-detail="task-1"]');
-    expect(detail?.textContent).toContain("Review running tasks");
-    expect(detail?.textContent).toContain("Audit complete");
-    expect(detail?.textContent).not.toContain("Stale running progress");
-    expect(container.querySelector(".chat-tasks-rail__task")).toBeNull();
-    const transcript = container.querySelector<HTMLButtonElement>(
-      ".chat-tasks-rail__task-transcript",
-    );
-    expect(transcript).not.toBeNull();
-    transcript?.click();
-    expect(onOpenTranscript).toHaveBeenCalledWith(
-      expect.objectContaining({ id: "task-1" }),
-      "detail",
-    );
-
-    const back = container.querySelector<HTMLButtonElement>(".chat-tasks-rail__back");
-    expect(back?.getAttribute("aria-label")).toBe("Back to background tasks");
-    back?.click();
-    expect(onBack).toHaveBeenCalledTimes(1);
-  });
-
-  it("uses a newer lookup snapshot for output", () => {
-    const listTask = makeTask({
-      id: "task-1",
-      status: "running",
-      updatedAt: 2_000,
-      progressSummary: "Still running",
-    });
-    const lookupTask = makeTask({
-      id: "task-1",
-      status: "completed",
-      updatedAt: 3_000,
-      terminalSummary: "Finished in lookup",
-      prompt: "Review running tasks",
-    });
-    const container = renderTaskRail({
-      tasks: [listTask],
-      view: { kind: "detail", taskId: "task-1" },
-      taskDetails: new Map([["task-1", lookupTask]]),
-    });
-
-    const detail = container.querySelector('[data-task-detail="task-1"]');
-    expect(detail?.textContent).toContain("Finished in lookup");
-    expect(detail?.textContent).not.toContain("Still running");
-  });
-
   it("collapses the finished section", () => {
     const container = renderTaskRail({
       tasks: [makeTask({ id: "task-2", status: "completed" })],
diff --git a/ui/src/pages/chat/components/chat-background-tasks.ts b/ui/src/pages/chat/components/chat-background-tasks.ts
index 50086a8853d4..0826f297111b 100644
--- a/ui/src/pages/chat/components/chat-background-tasks.ts
+++ b/ui/src/pages/chat/components/chat-background-tasks.ts
@@ -16,18 +16,10 @@ import {
   taskTimestampMs,
 } from "../../../lib/tasks/data.ts";
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
-import {
-  CHAT_HISTORY_REQUEST_LIMIT,
-  type ChatHistoryResult,
-  visibleChatHistoryMessages,
-} from "../chat-history.ts";
 import { newestTaskSnapshot } from "./chat-background-tasks-shared.ts";
-import type {
-  BackgroundTasksProps,
-  BackgroundTasksRailView,
-} from "./chat-background-tasks.types.ts";
+import type { BackgroundTasksProps } from "./chat-background-tasks.types.ts";
 import { deriveSubagentActivity } from "./chat-subagent-activity.ts";
-import { observeSubagentTaskEvent } from "./chat-subagent-detail-state.ts";
+import { observeTaskDetailEvent } from "./chat-task-detail-state.ts";
 
 type BackgroundTaskLoadEvent = NonNullable<ReturnType<typeof normalizeTaskEventPayload>>;
 
@@ -62,7 +54,6 @@ type BackgroundTasksState = {
   taskActivityById: Map<string, Pick<TaskSummary, "lastActivity" | "diffStat">>;
   terminalObservedAtByTask: Map<string, number>;
   tasks: TaskSummary[] | null;
-  view: BackgroundTasksRailView;
   taskDetails: Map<string, TaskSummary>;
   taskDetailErrors: Map<string, string>;
   taskDetailLoadingIds: Set<string>;
@@ -132,7 +123,6 @@ function getBackgroundTasksState(host: BackgroundTasksHost): BackgroundTasksStat
     taskActivityById: new Map(),
     terminalObservedAtByTask: new Map(),
     tasks: null,
-    view: { kind: "list" },
     taskDetails: new Map(),
     taskDetailErrors: new Map(),
     taskDetailLoadingIds: new Set(),
@@ -281,12 +271,6 @@ function loadBackgroundTasks(
       for (const task of current.tasks) {
         observeTaskTerminal(current, task, "snapshot");
       }
-      const viewedTaskId = current.view.kind === "list" ? null : current.view.taskId;
-      // Detail and transcript navigation depend on the authoritative list;
-      // a bounded refresh may legitimately omit the previously viewed task.
-      if (viewedTaskId && !current.tasks.some((task) => task.id === viewedTaskId)) {
-        current.view = { kind: "list" };
-      }
       current.loadedClient = client;
     } catch (error) {
       const current = getBackgroundTasksState(host);
@@ -382,7 +366,7 @@ export function handleBackgroundTasksEvent(host: BackgroundTasksHost, payload: u
   ) {
     return;
   }
-  observeSubagentTaskEvent(host, normalizedEvent);
+  observeTaskDetailEvent(host, normalizedEvent);
   const event =
     normalizedEvent.action === "upserted"
       ? {
@@ -408,9 +392,6 @@ export function handleBackgroundTasksEvent(host: BackgroundTasksHost, payload: u
       return;
     }
     state.tasks = state.tasks.filter((task) => task.id !== event.taskId);
-    if (state.view.kind !== "list" && state.view.taskId === event.taskId) {
-      state.view = { kind: "list" };
-    }
     state.taskDetails.delete(event.taskId);
     state.taskActivityById.delete(event.taskId);
     state.terminalObservedAtByTask.delete(event.taskId);
@@ -500,126 +481,6 @@ async function loadBackgroundTaskDetail(
   }
 }
 
-function focusBackgroundTaskControl(
-  state: BackgroundTasksState,
-  target: "back" | { taskId: string },
-) {
-  window.requestAnimationFrame(() => {
-    const rail = document.getElementById(`${state.statusRowId}-rail`);
-    if (target === "back") {
-      rail?.querySelector<HTMLElement>(".chat-tasks-rail__back")?.focus();
-      return;
-    }
-    const row = [...(rail?.querySelectorAll<HTMLElement>("[data-task-id]") ?? [])].find(
-      (candidate) => candidate.dataset.taskId === target.taskId,
-    );
-    row?.querySelector<HTMLElement>(".chat-tasks-rail__task-disclosure")?.focus();
-  });
-}
-
-function selectBackgroundTaskDetail(
-  host: BackgroundTasksHost,
-  state: BackgroundTasksState,
-  task: TaskSummary,
-) {
-  state.view = { kind: "detail", taskId: task.id };
-  host.requestUpdate?.();
-  focusBackgroundTaskControl(state, "back");
-  void loadBackgroundTaskDetail(host, state, task);
-}
-
-function showBackgroundTaskList(host: BackgroundTasksHost, state: BackgroundTasksState) {
-  const taskId = state.view.kind === "detail" ? state.view.taskId : null;
-  const listedTask = state.tasks?.find((task) => task.id === taskId);
-  const detailedTask = taskId ? state.taskDetails.get(taskId) : undefined;
-  const selectedTask = listedTask ? newestTaskSnapshot(listedTask, detailedTask) : detailedTask;
-  if (selectedTask && state.tasks) {
-    state.tasks = sortTasks([
-      selectedTask,
-      ...state.tasks.filter((task) => task.id !== selectedTask.id),
-    ]);
-    if (!isActiveTask(selectedTask)) {
-      state.finishedCollapsed = false;
-    }
-  }
-  state.view = { kind: "list" };
-  host.requestUpdate?.();
-  if (taskId) {
-    focusBackgroundTaskControl(state, { taskId });
-  }
-}
-
-function openBackgroundTaskTranscript(
-  host: BackgroundTasksHost,
-  state: BackgroundTasksState,
-  task: TaskSummary,
-  returnTo: "list" | "detail",
-) {
-  const sessionKey = normalizeOptionalString(task.childSessionKey ?? task.sessionKey);
-  const client = host.client;
-  const pendingView: BackgroundTasksRailView = {
-    kind: "transcript",
-    taskId: task.id,
-    sessionKey: sessionKey ?? "",
-    returnTo,
-    load: { status: "loading" },
-  };
-  state.view = pendingView;
-  host.requestUpdate?.();
-  focusBackgroundTaskControl(state, "back");
-  if (!client || !host.connected || !sessionKey) {
-    state.view = {
-      ...pendingView,
-      load: { status: "error" },
-    };
-    host.requestUpdate?.();
-    return;
-  }
-  void (async () => {
-    let load: Extract<BackgroundTasksRailView, { kind: "transcript" }>["load"];
-    try {
-      const result = await client.request<ChatHistoryResult>("chat.history", {
-        sessionKey,
-        limit: CHAT_HISTORY_REQUEST_LIMIT,
-      });
-      load = { status: "loaded", messages: visibleChatHistoryMessages(result.messages) };
-    } catch {
-      load = { status: "error" };
-    }
-    const current = getBackgroundTasksState(host);
-    if (current !== state || current.view !== pendingView) {
-      return;
-    }
-    current.view = { ...pendingView, load };
-    host.requestUpdate?.();
-  })();
-}
-
-function showPreviousBackgroundTaskView(host: BackgroundTasksHost, state: BackgroundTasksState) {
-  if (state.view.kind === "detail") {
-    showBackgroundTaskList(host, state);
-    return;
-  }
-  if (state.view.kind !== "transcript") {
-    return;
-  }
-  const { returnTo, taskId } = state.view;
-  if (returnTo === "detail" && state.tasks?.some((task) => task.id === taskId)) {
-    state.view = { kind: "detail", taskId };
-    host.requestUpdate?.();
-    window.requestAnimationFrame(() => {
-      document
-        .getElementById(`${state.statusRowId}-rail`)
-        ?.querySelector<HTMLElement>(".chat-tasks-rail__task-transcript")
-        ?.focus();
-    });
-    return;
-  }
-  state.view = { kind: "list" };
-  host.requestUpdate?.();
-  focusBackgroundTaskControl(state, { taskId });
-}
-
 async function cancelBackgroundTask(
   host: BackgroundTasksHost,
   state: BackgroundTasksState,
@@ -684,7 +545,8 @@ export function createBackgroundTasksProps(
   host: BackgroundTasksHost,
   opts: {
     narrowLayout?: boolean;
-    onOpenSubagentDetail?: (task: TaskSummary) => void;
+    openTaskId?: string;
+    onOpenTaskDetail?: (task: TaskSummary) => void;
   } = {},
 ): BackgroundTasksProps {
   const state = getBackgroundTasksState(host);
@@ -725,7 +587,7 @@ export function createBackgroundTasksProps(
     error: state.error,
     tasks: state.tasks,
     subagentActivity,
-    view: state.view,
+    openTaskId: opts.openTaskId,
     taskDetails: state.taskDetails,
     taskDetailErrors: state.taskDetailErrors,
     taskDetailLoadingIds: state.taskDetailLoadingIds,
@@ -739,9 +601,18 @@ export function createBackgroundTasksProps(
     onRefresh: () => loadBackgroundTasks(host, state, true),
     onCancel: (taskId) => void cancelBackgroundTask(host, state, taskId),
     onLoadDetail: (task) => void loadBackgroundTaskDetail(host, state, task),
-    onOpenSubagentDetail: opts.onOpenSubagentDetail,
-    onSelectTask: (task) => selectBackgroundTaskDetail(host, state, task),
-    onBack: () => showPreviousBackgroundTaskView(host, state),
-    onOpenTranscript: (task, returnTo) => openBackgroundTaskTranscript(host, state, task, returnTo),
+    onOpenTaskDetail: opts.onOpenTaskDetail
+      ? (task) => {
+          // Opening retries a failed tasks.get: the panel's render-driven load
+          // must skip errored tasks (a retry there would loop every paint), so
+          // user selection is the one path that clears the error.
+          if (state.taskDetailErrors.has(task.id)) {
+            const next = new Map(state.taskDetailErrors);
+            next.delete(task.id);
+            state.taskDetailErrors = next;
+          }
+          opts.onOpenTaskDetail?.(task);
+        }
+      : undefined,
   };
 }
diff --git a/ui/src/pages/chat/components/chat-background-tasks.types.ts b/ui/src/pages/chat/components/chat-background-tasks.types.ts
index 8e53f329264e..f53fe43edfe5 100644
--- a/ui/src/pages/chat/components/chat-background-tasks.types.ts
+++ b/ui/src/pages/chat/components/chat-background-tasks.types.ts
@@ -1,17 +1,6 @@
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
 import type { SubagentActivityPresentation } from "./chat-subagent-activity.ts";
 
-export type BackgroundTasksRailView =
-  | { kind: "list" }
-  | { kind: "detail"; taskId: string }
-  | {
-      kind: "transcript";
-      taskId: string;
-      sessionKey: string;
-      returnTo: "list" | "detail";
-      load: { status: "loading" } | { status: "loaded"; messages: unknown[] } | { status: "error" };
-    };
-
 export type BackgroundTasksProps = {
   sessionKey: string;
   statusRowId: string;
@@ -26,7 +15,7 @@ export type BackgroundTasksProps = {
   /** null until the first load for this session finished. */
   tasks: TaskSummary[] | null;
   subagentActivity: SubagentActivityPresentation;
-  view: BackgroundTasksRailView;
+  openTaskId?: string;
   taskDetails: ReadonlyMap<string, TaskSummary>;
   taskDetailErrors: ReadonlyMap<string, string>;
   taskDetailLoadingIds: ReadonlySet<string>;
@@ -37,8 +26,5 @@ export type BackgroundTasksProps = {
   onRefresh: () => void;
   onCancel: (taskId: string) => void;
   onLoadDetail?: (task: TaskSummary) => void;
-  onOpenSubagentDetail?: (task: TaskSummary) => void;
-  onSelectTask: (task: TaskSummary) => void;
-  onBack: () => void;
-  onOpenTranscript: (task: TaskSummary, returnTo: "list" | "detail") => void;
+  onOpenTaskDetail?: (task: TaskSummary) => void;
 };
diff --git a/ui/src/pages/chat/components/chat-detail-slot.ts b/ui/src/pages/chat/components/chat-detail-slot.ts
index d8cf75d2fcd0..6bfe1eb7e27a 100644
--- a/ui/src/pages/chat/components/chat-detail-slot.ts
+++ b/ui/src/pages/chat/components/chat-detail-slot.ts
@@ -6,10 +6,17 @@ import type { BackgroundTasksProps } from "./chat-background-tasks.types.ts";
 import "./chat-sidebar.ts";
 import { openSessionWorkspaceFile, revealSessionWorkspaceFile } from "./chat-session-workspace.ts";
 import type { SidebarContent, SidebarFullMessageLoader } from "./chat-sidebar.ts";
-import { resetSubagentDetail } from "./chat-subagent-detail-state.ts";
-import { renderSubagentDetailPanel } from "./chat-subagent-detail.ts";
+import { resetTaskDetail } from "./chat-task-detail-state.ts";
+import { renderTaskDetailPanel } from "./chat-task-detail.ts";
 import type { ChatTranscriptController } from "./chat-transcript-controller.ts";
 
+// Region close collapses the detail slot but leaves sidebarContent set, so
+// "task content exists" is not "panel visible"; consumers (panel render, rail
+// open-row highlight) must gate on the layout, not the content.
+export function detailSlotOpen(layout: SidebarLayout): boolean {
+  return layout.columns.some((column) => column.panels.some((panel) => panel.slot === "detail"));
+}
+
 export function renderChatDetailSlot(params: {
   backgroundTasks: BackgroundTasksProps;
   chat: ChatProps;
@@ -20,15 +27,12 @@ export function renderChatDetailSlot(params: {
   transcript: ChatTranscriptController;
 }): TemplateResult {
   const { content, host } = params;
-  if (content.kind === "subagent") {
-    const detailOpen = params.layout.columns.some((column) =>
-      column.panels.some((panel) => panel.slot === "detail"),
-    );
-    if (!detailOpen) {
-      resetSubagentDetail(host);
+  if (content.kind === "task") {
+    if (!detailSlotOpen(params.layout)) {
+      resetTaskDetail(host);
       return html``;
     }
-    return renderSubagentDetailPanel({
+    return renderTaskDetailPanel({
       backgroundTasks: params.backgroundTasks,
       chat: params.chat,
       host,
@@ -36,7 +40,7 @@ export function renderChatDetailSlot(params: {
       transcript: params.transcript,
     });
   }
-  resetSubagentDetail(host);
+  resetTaskDetail(host);
   return html`<openclaw-chat-detail-panel
     class="chat-sidebar"
     .content=${content}
diff --git a/ui/src/pages/chat/components/chat-sidebar.ts b/ui/src/pages/chat/components/chat-sidebar.ts
index 1800a3dc33d9..3783f493f421 100644
--- a/ui/src/pages/chat/components/chat-sidebar.ts
+++ b/ui/src/pages/chat/components/chat-sidebar.ts
@@ -144,7 +144,7 @@ type ChatDetailContent =
   | FileSidebarContent
   | SessionDiffSidebarContent;
 
-export type SidebarContent = ChatDetailContent | { kind: "subagent"; taskId: string };
+export type SidebarContent = ChatDetailContent | { kind: "task"; taskId: string };
 
 function hasFullMessageRequest(content: ChatDetailContent): content is ChatDetailContent & {
   fullMessageRequest: SidebarFullMessageRequest;
diff --git a/ui/src/pages/chat/components/chat-subagent-activity.test.ts b/ui/src/pages/chat/components/chat-subagent-activity.test.ts
index 0b33873a5936..b49e43b16306 100644
--- a/ui/src/pages/chat/components/chat-subagent-activity.test.ts
+++ b/ui/src/pages/chat/components/chat-subagent-activity.test.ts
@@ -45,7 +45,6 @@ function makeProps(overrides: Partial<BackgroundTasksProps>): BackgroundTasksPro
       terminalObservedAtByTask: new Map(),
       canonicalizeSessionKey: (sessionKey) => sessionKey ?? "",
     }),
-    view: { kind: "list" },
     cancellingTaskIds: new Set(),
     finishedCollapsed: false,
     taskDetails: new Map(),
@@ -55,10 +54,7 @@ function makeProps(overrides: Partial<BackgroundTasksProps>): BackgroundTasksPro
     onToggleFinished: () => {},
     onRefresh: () => {},
     onCancel: () => {},
-    onOpenSubagentDetail: undefined,
-    onSelectTask: () => {},
-    onBack: () => {},
-    onOpenTranscript: () => {},
+    onOpenTaskDetail: undefined,
     ...overrides,
   };
 }
@@ -98,7 +94,7 @@ afterEach(() => {
 describe("subagent activity rows", () => {
   it("opens the selected subagent from an accessible activity control", () => {
     const task = makeTask({ id: "clickable-subagent" });
-    const onOpenSubagentDetail = vi.fn();
+    const onOpenTaskDetail = vi.fn();
     const container = renderStatusRow({
       tasks: [task],
       subagentActivity: deriveSubagentActivity({
@@ -107,7 +103,7 @@ describe("subagent activity rows", () => {
         terminalObservedAtByTask: new Map(),
         canonicalizeSessionKey: (sessionKey) => sessionKey ?? "",
       }),
-      onOpenSubagentDetail,
+      onOpenTaskDetail,
     });
 
     const row = container.querySelector<HTMLButtonElement>(
@@ -116,7 +112,7 @@ describe("subagent activity rows", () => {
     expect(row?.tagName).toBe("BUTTON");
     expect(row?.getAttribute("aria-label")).toBe("Open subagent details for Map codebase");
     row?.click();
-    expect(onOpenSubagentDetail).toHaveBeenCalledWith(task);
+    expect(onOpenTaskDetail).toHaveBeenCalledWith(task);
   });
 
   it("keeps activity rows non-interactive when no open callback is provided", () => {
diff --git a/ui/src/pages/chat/components/chat-subagent-activity.ts b/ui/src/pages/chat/components/chat-subagent-activity.ts
index 36006187740a..d3d49942b315 100644
--- a/ui/src/pages/chat/components/chat-subagent-activity.ts
+++ b/ui/src/pages/chat/components/chat-subagent-activity.ts
@@ -113,7 +113,7 @@ function renderSubagentActivityIndicator(task: TaskSummary): TemplateResult {
 
 function renderSubagentActivityRow(
   task: TaskSummary,
-  onOpenSubagentDetail?: (task: TaskSummary) => void,
+  onOpenTaskDetail?: (task: TaskSummary) => void,
 ): TemplateResult {
   const snippet = subagentActivitySnippet(task);
   const label = subagentActivityLabel(task);
@@ -132,7 +132,7 @@ function renderSubagentActivityRow(
       : nothing}
     ${task.diffStat ? renderDiffStatChips(task.diffStat) : nothing}
   `;
-  if (!onOpenSubagentDetail) {
+  if (!onOpenTaskDetail) {
     return html`<div
       class="chat-subagent-activity__row"
       data-subagent-task-id=${task.id}
@@ -149,7 +149,7 @@ function renderSubagentActivityRow(
     aria-label=${t("chat.backgroundTasks.subagentActivity.openDetails", {
       title: taskTitle(task),
     })}
-    @click=${() => onOpenSubagentDetail(task)}
+    @click=${() => onOpenTaskDetail(task)}
   >
     ${content}
   </button>`;
@@ -157,7 +157,7 @@ function renderSubagentActivityRow(
 
 export function renderSubagentActivity(
   presentation: SubagentActivityPresentation,
-  onOpenSubagentDetail?: (task: TaskSummary) => void,
+  onOpenTaskDetail?: (task: TaskSummary) => void,
 ): TemplateResult | typeof nothing {
   if (presentation.rows.length === 0) {
     return nothing;
@@ -170,7 +170,7 @@ export function renderSubagentActivity(
       ${repeat(
         presentation.rows,
         (task) => task.id,
-        (task) => renderSubagentActivityRow(task, onOpenSubagentDetail),
+        (task) => renderSubagentActivityRow(task, onOpenTaskDetail),
       )}
       ${presentation.overflowWorking > 0
         ? html`<div class="chat-subagent-activity__overflow">
diff --git a/ui/src/pages/chat/components/chat-subagent-detail-state.test.ts b/ui/src/pages/chat/components/chat-task-detail-state.test.ts
similarity index 84%
rename from ui/src/pages/chat/components/chat-subagent-detail-state.test.ts
rename to ui/src/pages/chat/components/chat-task-detail-state.test.ts
index 2b4ccd6a604a..1afa66f64528 100644
--- a/ui/src/pages/chat/components/chat-subagent-detail-state.test.ts
+++ b/ui/src/pages/chat/components/chat-task-detail-state.test.ts
@@ -2,10 +2,10 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import type { GatewayBrowserClient } from "../../../api/gateway.ts";
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
 import {
-  observeSubagentTaskEvent,
-  readSubagentTranscript,
-  type SubagentDetailHost,
-} from "./chat-subagent-detail-state.ts";
+  observeTaskDetailEvent,
+  readTaskTranscript,
+  type TaskDetailHost,
+} from "./chat-task-detail-state.ts";
 
 function deferred<T>() {
   let resolve!: (value: T) => void;
@@ -25,8 +25,9 @@ function history(text: string) {
   };
 }
 
-function hostWith(request: ReturnType<typeof vi.fn>): SubagentDetailHost {
+function hostWith(request: ReturnType<typeof vi.fn>): TaskDetailHost {
   return {
+    sessionKey: "agent:main:main",
     client: { request } as unknown as GatewayBrowserClient,
     connected: true,
     connectionEpoch: 4,
@@ -58,14 +59,14 @@ afterEach(() => {
   vi.restoreAllMocks();
 });
 
-describe("subagent detail transcript state", () => {
+describe("task detail transcript state", () => {
   it("loads the selected child transcript", async () => {
     const pending = deferred<ReturnType<typeof history>>();
     const request = vi.fn().mockReturnValue(pending.promise);
     const host = hostWith(request);
 
     expect(
-      readSubagentTranscript(host, {
+      readTaskTranscript(host, {
         taskId: "task-1",
         sessionKey: "agent:main:subagent:child",
       }),
@@ -78,7 +79,7 @@ describe("subagent detail transcript state", () => {
     pending.resolve(history("Child transcript loaded."));
     await flushAsync();
     expect(
-      readSubagentTranscript(host, {
+      readTaskTranscript(host, {
         taskId: "task-1",
         sessionKey: "agent:main:subagent:child",
       }),
@@ -91,7 +92,7 @@ describe("subagent detail transcript state", () => {
   it("surfaces a history request failure", async () => {
     const pending = deferred<never>();
     const host = hostWith(vi.fn().mockReturnValue(pending.promise));
-    readSubagentTranscript(host, {
+    readTaskTranscript(host, {
       taskId: "task-1",
       sessionKey: "agent:main:subagent:child",
     });
@@ -99,7 +100,7 @@ describe("subagent detail transcript state", () => {
     pending.reject(new Error("history unavailable"));
     await flushAsync();
     expect(
-      readSubagentTranscript(host, {
+      readTaskTranscript(host, {
         taskId: "task-1",
         sessionKey: "agent:main:subagent:child",
       }),
@@ -113,13 +114,13 @@ describe("subagent detail transcript state", () => {
     const final = deferred<ReturnType<typeof history>>();
     const request = vi.fn().mockReturnValueOnce(first.promise).mockReturnValueOnce(final.promise);
     const host = hostWith(request);
-    readSubagentTranscript(host, {
+    readTaskTranscript(host, {
       taskId: "task-1",
       sessionKey: "agent:main:subagent:child",
     });
 
-    observeSubagentTaskEvent(host, { action: "upserted", task: task("running") });
-    observeSubagentTaskEvent(host, { action: "upserted", task: task("completed") });
+    observeTaskDetailEvent(host, { action: "upserted", task: task("running") });
+    observeTaskDetailEvent(host, { action: "upserted", task: task("completed") });
     expect(request).toHaveBeenCalledTimes(1);
 
     first.resolve(history("Still running."));
@@ -132,7 +133,7 @@ describe("subagent detail transcript state", () => {
     final.resolve(history("Final child response."));
     await flushAsync();
     expect(
-      readSubagentTranscript(host, {
+      readTaskTranscript(host, {
         taskId: "task-1",
         sessionKey: "agent:main:subagent:child",
       }),
diff --git a/ui/src/pages/chat/components/chat-subagent-detail-state.ts b/ui/src/pages/chat/components/chat-task-detail-state.ts
similarity index 75%
rename from ui/src/pages/chat/components/chat-subagent-detail-state.ts
rename to ui/src/pages/chat/components/chat-task-detail-state.ts
index f7000c61257a..37a62f2afc51 100644
--- a/ui/src/pages/chat/components/chat-subagent-detail-state.ts
+++ b/ui/src/pages/chat/components/chat-task-detail-state.ts
@@ -1,4 +1,5 @@
 import type { GatewayBrowserClient } from "../../../api/gateway.ts";
+import type { UiSessionDefaultsHost } from "../../../lib/sessions/session-key.ts";
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
 import {
   CHAT_HISTORY_REQUEST_LIMIT,
@@ -6,55 +7,56 @@ import {
   visibleChatHistoryMessages,
 } from "../chat-history.ts";
 
-const SUBAGENT_TRANSCRIPT_REFRESH_MS = 2_000;
+const TASK_TRANSCRIPT_REFRESH_MS = 2_000;
 
-type SubagentTranscriptLoad =
+type TaskTranscriptLoad =
   | { status: "loading" }
   | { status: "loaded"; messages: unknown[] }
   | { status: "error" };
 
-type SubagentDetailState = {
+type TaskDetailState = {
   client: GatewayBrowserClient;
   connectionEpoch: number | undefined;
   eventVersion: number;
   inFlight: boolean;
   lastRequestStartedAt: number;
-  load: SubagentTranscriptLoad;
+  load: TaskTranscriptLoad;
   refreshTimer: number | null;
   requestId: number;
   sessionKey: string;
   taskId: string;
 };
 
-export type SubagentDetailHost = {
+export type TaskDetailHost = UiSessionDefaultsHost & {
+  sessionKey: string;
   client: GatewayBrowserClient | null;
   connected: boolean;
   connectionEpoch?: number;
   requestUpdate?: () => void;
-  subagentDetailState?: SubagentDetailState;
+  taskDetailState?: TaskDetailState;
 };
 
-function clearRefreshTimer(state: SubagentDetailState) {
+function clearRefreshTimer(state: TaskDetailState) {
   if (state.refreshTimer !== null) {
     window.clearTimeout(state.refreshTimer);
     state.refreshTimer = null;
   }
 }
 
-export function resetSubagentDetail(host: SubagentDetailHost) {
-  const current = host.subagentDetailState;
+export function resetTaskDetail(host: TaskDetailHost) {
+  const current = host.taskDetailState;
   if (!current) {
     return;
   }
   clearRefreshTimer(current);
-  host.subagentDetailState = undefined;
+  host.taskDetailState = undefined;
 }
 
-function scheduleTranscriptLoad(host: SubagentDetailHost, state: SubagentDetailState) {
-  if (host.subagentDetailState !== state || state.inFlight) {
+function scheduleTranscriptLoad(host: TaskDetailHost, state: TaskDetailState) {
+  if (host.taskDetailState !== state || state.inFlight) {
     return;
   }
-  const remaining = SUBAGENT_TRANSCRIPT_REFRESH_MS - (Date.now() - state.lastRequestStartedAt);
+  const remaining = TASK_TRANSCRIPT_REFRESH_MS - (Date.now() - state.lastRequestStartedAt);
   if (remaining > 0) {
     if (state.refreshTimer === null) {
       state.refreshTimer = window.setTimeout(() => {
@@ -85,7 +87,7 @@ function scheduleTranscriptLoad(host: SubagentDetailHost, state: SubagentDetailS
   }
   host.requestUpdate?.();
   void (async () => {
-    let load: SubagentTranscriptLoad;
+    let load: TaskTranscriptLoad;
     try {
       const result = await client.request<ChatHistoryResult>("chat.history", {
         sessionKey: state.sessionKey,
@@ -95,7 +97,7 @@ function scheduleTranscriptLoad(host: SubagentDetailHost, state: SubagentDetailS
     } catch {
       load = { status: "error" };
     }
-    const current = host.subagentDetailState;
+    const current = host.taskDetailState;
     if (
       current !== state ||
       current.requestId !== requestId ||
@@ -115,12 +117,12 @@ function scheduleTranscriptLoad(host: SubagentDetailHost, state: SubagentDetailS
   })();
 }
 
-export function readSubagentTranscript(
-  host: SubagentDetailHost,
+export function readTaskTranscript(
+  host: TaskDetailHost,
   selection: { taskId: string; sessionKey: string },
-): SubagentTranscriptLoad {
+): TaskTranscriptLoad {
   const client = host.client;
-  const current = host.subagentDetailState;
+  const current = host.taskDetailState;
   if (
     current &&
     current.taskId === selection.taskId &&
@@ -130,11 +132,11 @@ export function readSubagentTranscript(
   ) {
     return current.load;
   }
-  resetSubagentDetail(host);
+  resetTaskDetail(host);
   if (!client || !host.connected) {
     return { status: "error" };
   }
-  const next: SubagentDetailState = {
+  const next: TaskDetailState = {
     client,
     connectionEpoch: host.connectionEpoch,
     eventVersion: 0,
@@ -146,25 +148,25 @@ export function readSubagentTranscript(
     sessionKey: selection.sessionKey,
     taskId: selection.taskId,
   };
-  host.subagentDetailState = next;
+  host.taskDetailState = next;
   scheduleTranscriptLoad(host, next);
   return next.load;
 }
 
-export function observeSubagentTaskEvent(
-  host: SubagentDetailHost,
+export function observeTaskDetailEvent(
+  host: TaskDetailHost,
   event:
     | { action: "upserted"; task: TaskSummary }
     | { action: "deleted"; taskId: string }
     | { action: "restored" },
 ) {
-  const state = host.subagentDetailState;
+  const state = host.taskDetailState;
   if (!state) {
     return;
   }
   if (event.action === "deleted") {
     if (event.taskId === state.taskId) {
-      resetSubagentDetail(host);
+      resetTaskDetail(host);
     }
     return;
   }
@@ -173,6 +175,6 @@ export function observeSubagentTaskEvent(
   }
   state.eventVersion += 1;
   // A terminal version remains pending through an in-flight or throttled read,
-  // so the next request is always the final child-session snapshot.
+  // so the next request is always the final task-session snapshot.
   scheduleTranscriptLoad(host, state);
 }
diff --git a/ui/src/pages/chat/components/chat-task-detail.test.ts b/ui/src/pages/chat/components/chat-task-detail.test.ts
new file mode 100644
index 000000000000..1cdddedd3a7c
--- /dev/null
+++ b/ui/src/pages/chat/components/chat-task-detail.test.ts
@@ -0,0 +1,129 @@
+import { html, render } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../../api/gateway.ts";
+import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
+import type { ChatProps } from "../chat-view.ts";
+import type { BackgroundTasksProps } from "./chat-background-tasks.types.ts";
+import { deriveSubagentActivity } from "./chat-subagent-activity.ts";
+import type { TaskDetailHost } from "./chat-task-detail-state.ts";
+import { renderTaskDetailPanel } from "./chat-task-detail.ts";
+import type { ChatTranscriptController } from "./chat-transcript-controller.ts";
+
+function backgroundTasks(task: TaskSummary): BackgroundTasksProps {
+  return {
+    sessionKey: "agent:main:main",
+    statusRowId: "chat-tasks-status-test",
+    collapsed: false,
+    narrowLayout: false,
+    connected: true,
+    canCancel: false,
+    loading: false,
+    error: null,
+    tasks: [task],
+    subagentActivity: deriveSubagentActivity({
+      tasks: [],
+      sessionKey: "agent:main:main",
+      terminalObservedAtByTask: new Map(),
+      canonicalizeSessionKey: (sessionKey) => sessionKey ?? "",
+    }),
+    taskDetails: new Map([[task.id, { ...task, prompt: "Inspect the current task." }]]),
+    taskDetailErrors: new Map(),
+    taskDetailLoadingIds: new Set(),
+    cancellingTaskIds: new Set(),
+    finishedCollapsed: false,
+    onToggleCollapsed: () => undefined,
+    onToggleFinished: () => undefined,
+    onRefresh: () => undefined,
+    onCancel: () => undefined,
+  };
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("task detail panel", () => {
+  it("uses the inspector for the pane's canonical session and identifies the runtime", () => {
+    const task: TaskSummary = {
+      id: "task-cli",
+      taskId: "task-cli",
+      status: "completed",
+      runtime: "cli",
+      agentId: "main",
+      title: "Current-session command",
+      sessionKey: "agent:main:main",
+      terminalSummary: "Command complete",
+      createdAt: 1_000,
+      updatedAt: 2_000,
+    };
+    const request = vi.fn();
+    const host: TaskDetailHost = {
+      sessionKey: "main",
+      client: { request } as unknown as GatewayBrowserClient,
+      connected: true,
+      hello: null,
+    };
+    const container = document.createElement("div");
+    document.body.append(container);
+
+    render(
+      html`${renderTaskDetailPanel({
+        backgroundTasks: backgroundTasks(task),
+        chat: { paneId: "pane-1" } as ChatProps,
+        host,
+        task,
+        transcript: {} as ChatTranscriptController,
+      })}`,
+      container,
+    );
+
+    const panel = container.querySelector("[data-task-detail-panel]");
+    expect(panel?.textContent).toContain("Current-session command");
+    expect(panel?.textContent).toContain("CLI");
+    expect(panel?.textContent).toContain("Inspect the current task.");
+    expect(panel?.textContent).toContain("Command complete");
+    expect(panel?.textContent).not.toContain("Loading task transcript");
+    expect(request).not.toHaveBeenCalled();
+  });
+
+  it("never treats a subagent's requester session as its transcript", () => {
+    const task: TaskSummary = {
+      id: "task-queued-subagent",
+      taskId: "task-queued-subagent",
+      status: "queued",
+      runtime: "subagent",
+      agentId: "main",
+      title: "Queued child work",
+      // Requester is another conversation; no child session exists yet.
+      sessionKey: "agent:main:other-session",
+      createdAt: 1_000,
+      updatedAt: 2_000,
+    };
+    const request = vi.fn();
+    const host: TaskDetailHost = {
+      sessionKey: "main",
+      client: { request } as unknown as GatewayBrowserClient,
+      connected: true,
+      hello: null,
+    };
+    const container = document.createElement("div");
+    document.body.append(container);
+
+    render(
+      html`${renderTaskDetailPanel({
+        backgroundTasks: backgroundTasks(task),
+        chat: { paneId: "pane-1" } as ChatProps,
+        host,
+        task,
+        transcript: {} as ChatTranscriptController,
+      })}`,
+      container,
+    );
+
+    const panel = container.querySelector("[data-task-detail-panel]");
+    expect(panel?.textContent).toContain("Inspect the current task.");
+    expect(panel?.textContent).not.toContain("Loading task transcript");
+    expect(request).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/src/pages/chat/components/chat-subagent-detail.ts b/ui/src/pages/chat/components/chat-task-detail.ts
similarity index 51%
rename from ui/src/pages/chat/components/chat-subagent-detail.ts
rename to ui/src/pages/chat/components/chat-task-detail.ts
index a14549f8e984..44704ce8fcdd 100644
--- a/ui/src/pages/chat/components/chat-subagent-detail.ts
+++ b/ui/src/pages/chat/components/chat-task-detail.ts
@@ -3,10 +3,16 @@ import { html, nothing, type TemplateResult } from "lit";
 import "../../../components/elapsed-time.ts";
 import { icons } from "../../../components/icons.ts";
 import { t } from "../../../i18n/index.ts";
-import { isActiveTask, taskTimestampMs, taskTitle } from "../../../lib/tasks/data.ts";
+import { canonicalUiSessionKeyForPersistence } from "../../../lib/sessions/session-key.ts";
+import {
+  isActiveTask,
+  taskDetail,
+  taskRuntimeLabel,
+  taskTimestampMs,
+  taskTitle,
+} from "../../../lib/tasks/data.ts";
 import type { TaskSummary } from "../../../lib/tasks/task-summary.ts";
 import type { ChatProps } from "../chat-view.ts";
-import { renderTaskInspector } from "./chat-background-task-row.ts";
 import {
   backgroundTaskStatusLabel,
   newestTaskSnapshot,
@@ -16,40 +22,54 @@ import type { BackgroundTasksProps } from "./chat-background-tasks.types.ts";
 import { renderDiffStatChips } from "./chat-diff-render.ts";
 import { renderReadOnlyTranscript } from "./chat-read-only-transcript.ts";
 import {
-  readSubagentTranscript,
-  resetSubagentDetail,
-  type SubagentDetailHost,
-} from "./chat-subagent-detail-state.ts";
+  readTaskTranscript,
+  resetTaskDetail,
+  type TaskDetailHost,
+} from "./chat-task-detail-state.ts";
 import type { ChatTranscriptController } from "./chat-transcript-controller.ts";
 
-export function renderSubagentDetailPanel(params: {
+export function renderTaskDetailPanel(params: {
   backgroundTasks: BackgroundTasksProps;
   chat: ChatProps;
-  host: SubagentDetailHost;
+  host: TaskDetailHost;
   task: TaskSummary | undefined;
   transcript: ChatTranscriptController;
 }): TemplateResult {
   const { backgroundTasks, task } = params;
   if (!task) {
-    resetSubagentDetail(params.host);
+    resetTaskDetail(params.host);
     return html`
-      <div class="sidebar-panel chat-subagent-detail" data-subagent-detail-panel>
-        ${renderSubagentHeader(t("chat.backgroundTasks.subagentDetailTitle"))}
-        <div class="sidebar-content chat-subagent-detail__state">
-          ${t("chat.backgroundTasks.subagentUnavailable")}
+      <div class="sidebar-panel chat-task-detail" data-task-detail-panel>
+        ${renderTaskHeader(t("chat.backgroundTasks.taskDetailTitle"))}
+        <div class="sidebar-content chat-task-detail__state">
+          ${t("chat.backgroundTasks.taskUnavailable")}
         </div>
       </div>
     `;
   }
   const detailedTask = backgroundTasks.taskDetails.get(task.id);
   const currentTask = newestTaskSnapshot(task, detailedTask);
-  const childSessionKey = normalizeOptionalString(currentTask.childSessionKey);
-  const content = childSessionKey
-    ? renderSubagentTranscript({ ...params, task: currentTask, sessionKey: childSessionKey })
-    : renderSubagentFallback(currentTask, backgroundTasks, params.host);
+  // A subagent's sessionKey is its requester's conversation, never its own
+  // work; only the child session is that task's transcript.
+  const transcriptSessionKey = normalizeOptionalString(
+    currentTask.runtime === "subagent"
+      ? currentTask.childSessionKey
+      : (currentTask.childSessionKey ?? currentTask.sessionKey),
+  );
+  const canonicalTranscriptKey = canonicalUiSessionKeyForPersistence(
+    params.host,
+    transcriptSessionKey,
+  );
+  const canonicalPaneKey = canonicalUiSessionKeyForPersistence(params.host, params.host.sessionKey);
+  // A task pointing at this pane's canonical session uses the inspector. Mirroring
+  // the current conversation into its own detail sidebar would duplicate the chat.
+  const content =
+    transcriptSessionKey && canonicalTranscriptKey !== canonicalPaneKey
+      ? renderTaskTranscript({ ...params, task: currentTask, sessionKey: transcriptSessionKey })
+      : renderTaskFallback(currentTask, backgroundTasks, params.host);
   return html`
-    <div class="sidebar-panel chat-subagent-detail" data-subagent-detail-panel>
-      ${renderSubagentHeader(taskTitle(currentTask), currentTask, backgroundTasks)} ${content}
+    <div class="sidebar-panel chat-task-detail" data-task-detail-panel>
+      ${renderTaskHeader(taskTitle(currentTask), currentTask, backgroundTasks)} ${content}
     </div>
   `;
 }
@@ -57,7 +77,7 @@ export function renderSubagentDetailPanel(params: {
 // No close button here on purpose: the sidebar region header owns the
 // "Close Details" control for every detail-slot panel (the classic panel is
 // embedded with its own header hidden); a second X 40px away duplicated it.
-function renderSubagentHeader(
+function renderTaskHeader(
   title: string,
   task?: TaskSummary,
   backgroundTasks?: BackgroundTasksProps,
@@ -66,11 +86,11 @@ function renderSubagentHeader(
   const startedMs = task ? taskTimestampMs(task.startedAt ?? task.createdAt) : 0;
   const cancelling = task ? backgroundTasks?.cancellingTaskIds.has(task.id) === true : false;
   return html`
-    <div class="sidebar-header chat-subagent-detail__header">
-      <div class="chat-subagent-detail__heading">
+    <div class="sidebar-header chat-task-detail__header">
+      <div class="chat-task-detail__heading">
         <div class="sidebar-title" title=${title}>${title}</div>
         ${task
-          ? html`<div class="chat-subagent-detail__meta">
+          ? html`<div class="chat-task-detail__meta">
               ${task.status === "running"
                 ? html`<span class="chat-tasks-rail__task-pulse" aria-hidden="true"></span>`
                 : nothing}
@@ -80,13 +100,15 @@ function renderSubagentHeader(
                 ]}"
                 >${backgroundTaskStatusLabel(task)}</span
               >
+              <span aria-hidden="true">·</span>
+              <span>${taskRuntimeLabel(task)}</span>
               ${active && startedMs > 0
                 ? html`<span aria-hidden="true">·</span>
                     <openclaw-elapsed-time .startMs=${startedMs}></openclaw-elapsed-time>`
                 : nothing}
               ${task.lastToolName
                 ? html`<span aria-hidden="true">·</span>
-                    <span class="chat-subagent-detail__tool">${task.lastToolName}</span>`
+                    <span class="chat-task-detail__tool">${task.lastToolName}</span>`
                 : nothing}
               ${task.diffStat ? renderDiffStatChips(task.diffStat) : nothing}
             </div>`
@@ -109,40 +131,38 @@ function renderSubagentHeader(
   `;
 }
 
-function renderSubagentTranscript(params: {
+function renderTaskTranscript(params: {
   chat: ChatProps;
-  host: SubagentDetailHost;
+  host: TaskDetailHost;
   sessionKey: string;
   task: TaskSummary;
   transcript: ChatTranscriptController;
 }): TemplateResult {
-  const load = readSubagentTranscript(params.host, {
+  const load = readTaskTranscript(params.host, {
     taskId: params.task.id,
     sessionKey: params.sessionKey,
   });
   if (load.status === "loading") {
-    return html`<div class="sidebar-content chat-subagent-detail__state">
+    return html`<div class="sidebar-content chat-task-detail__state">
       ${t("chat.backgroundTasks.transcriptLoading")}
     </div>`;
   }
   if (load.status === "error") {
-    return html`<div
-      class="sidebar-content chat-subagent-detail__state chat-subagent-detail__state--error"
-    >
+    return html`<div class="sidebar-content chat-task-detail__state chat-task-detail__state--error">
       ${t("chat.backgroundTasks.transcriptFailed")}
     </div>`;
   }
   if (load.messages.length === 0) {
-    return html`<div class="sidebar-content chat-subagent-detail__state">
+    return html`<div class="sidebar-content chat-task-detail__state">
       ${t("chat.backgroundTasks.transcriptEmpty")}
     </div>`;
   }
-  return html`<div class="sidebar-content chat-subagent-detail__content">
-    <div class="chat-subagent-detail__transcript">
+  return html`<div class="sidebar-content chat-task-detail__content">
+    <div class="chat-task-detail__transcript">
       ${renderReadOnlyTranscript({
         chat: params.chat,
         messages: load.messages,
-        paneId: `${params.chat.paneId}:subagent-sidebar`,
+        paneId: `${params.chat.paneId}:task-sidebar`,
         sessionKey: params.sessionKey,
         transcript: params.transcript,
       })}
@@ -150,12 +170,12 @@ function renderSubagentTranscript(params: {
   </div>`;
 }
 
-function renderSubagentFallback(
+function renderTaskFallback(
   task: TaskSummary,
   backgroundTasks: BackgroundTasksProps,
-  host: SubagentDetailHost,
+  host: TaskDetailHost,
 ): TemplateResult {
-  resetSubagentDetail(host);
+  resetTaskDetail(host);
   if (
     !backgroundTasks.taskDetails.has(task.id) &&
     !backgroundTasks.taskDetailErrors.has(task.id) &&
@@ -163,7 +183,37 @@ function renderSubagentFallback(
   ) {
     backgroundTasks.onLoadDetail?.(task);
   }
-  return html`<div class="sidebar-content chat-subagent-detail__fallback">
+  return html`<div class="sidebar-content chat-task-detail__fallback">
     ${renderTaskInspector(task, backgroundTasks)}
   </div>`;
 }
+
+function renderTaskInspector(task: TaskSummary, props: BackgroundTasksProps): TemplateResult {
+  const detailedTask = props.taskDetails.get(task.id);
+  const newest = newestTaskSnapshot(task, detailedTask);
+  const output = taskDetail(newest);
+  const detailLoading = props.taskDetailLoadingIds.has(task.id);
+  const detailError = props.taskDetailErrors.get(task.id);
+  return html`
+    ${detailError
+      ? html`<div
+          class="chat-tasks-rail__task-inspector-state chat-tasks-rail__task-inspector-state--error"
+        >
+          ${detailError}
+        </div>`
+      : nothing}
+    <div class="chat-tasks-rail__detail-blocks">
+      <section class="chat-tasks-rail__task-inspector-block">
+        <div class="chat-tasks-rail__task-inspector-label">${t("chat.backgroundTasks.prompt")}</div>
+        <pre>
+${detailLoading
+            ? t("chat.backgroundTasks.detailLoading")
+            : (detailedTask?.prompt ?? t("chat.backgroundTasks.promptUnavailable"))}</pre>
+      </section>
+      <section class="chat-tasks-rail__task-inspector-block">
+        <div class="chat-tasks-rail__task-inspector-label">${t("chat.backgroundTasks.output")}</div>
+        <pre>${output ?? t("chat.backgroundTasks.outputPending")}</pre>
+      </section>
+    </div>
+  `;
+}
diff --git a/ui/src/styles/chat/sidebar.css b/ui/src/styles/chat/sidebar.css
index 6a349c248de4..a752b878b374 100644
--- a/ui/src/styles/chat/sidebar.css
+++ b/ui/src/styles/chat/sidebar.css
@@ -844,24 +844,6 @@ openclaw-chat-sidebar-region,
   white-space: nowrap;
 }
 
-.chat-tasks-rail__back {
-  display: inline-grid;
-  flex: 0 0 auto;
-  width: 28px;
-  min-width: 28px;
-  height: 28px;
-  padding: 0;
-  place-items: center;
-}
-
-.chat-tasks-rail__back svg {
-  width: 15px;
-  height: 15px;
-  fill: none;
-  stroke: currentColor;
-  stroke-width: 1.8px;
-}
-
 .chat-tasks-rail__actions {
   display: inline-flex;
   align-items: center;
@@ -896,23 +878,6 @@ openclaw-chat-sidebar-region,
   overflow: auto;
 }
 
-.chat-tasks-rail__transcript {
-  display: flex;
-  flex: 1 1 0;
-  min-width: 0;
-  min-height: 0;
-  overflow: hidden;
-}
-
-.chat-tasks-rail__transcript > .chat-thread {
-  padding: 12px 0 6px;
-  border-radius: 0;
-}
-
-.chat-tasks-rail__transcript .chat-thread-inner {
-  width: calc(100% - 16px);
-}
-
 /* List mode splits scrolling per section: running work owns the rail and the
    finished history pins to the bottom, so a long history can never clip the
    active tasks (each section scrolls on its own instead of the container). */
@@ -997,6 +962,11 @@ openclaw-chat-sidebar-region,
   border-color: color-mix(in srgb, var(--border-strong) 45%, transparent);
 }
 
+.chat-tasks-rail__task--open {
+  border-color: color-mix(in srgb, var(--accent) 44%, transparent);
+  background: color-mix(in srgb, var(--accent) 8%, var(--bg-elevated));
+}
+
 .chat-tasks-rail__task-head {
   display: flex;
   align-items: center;
@@ -1004,7 +974,7 @@ openclaw-chat-sidebar-region,
   min-width: 0;
 }
 
-.chat-tasks-rail__task-disclosure {
+.chat-tasks-rail__task-open {
   display: flex;
   flex: 1 1 auto;
   align-items: center;
@@ -1019,23 +989,6 @@ openclaw-chat-sidebar-region,
   cursor: var(--cursor-action);
 }
 
-.chat-tasks-rail__task-chevron {
-  display: inline-grid;
-  flex: 0 0 auto;
-  width: 16px;
-  height: 16px;
-  place-items: center;
-  color: var(--muted);
-}
-
-.chat-tasks-rail__task-chevron svg {
-  width: 13px;
-  height: 13px;
-  fill: none;
-  stroke: currentColor;
-  stroke-width: 1.8px;
-}
-
 /* openclaw-tooltip is display:contents, so the title span itself is the flex
    item; growing it pins the stop button to the card's right edge even for
    short titles. */
@@ -1104,8 +1057,8 @@ openclaw-chat-sidebar-region,
   stroke-width: 1.8px;
 }
 
-/* One quiet text line replaces the status/runtime pill chips: colored status
-   word, runtime, relative time, trailing transcript link. */
+/* One quiet text line replaces the status/runtime pill chips: colored status,
+   runtime, timing, and tool activity. */
 .chat-tasks-rail__task-meta {
   display: flex;
   flex-wrap: wrap;
@@ -1158,78 +1111,6 @@ openclaw-chat-sidebar-region,
   overflow-wrap: anywhere;
 }
 
-.chat-tasks-rail__detail {
-  display: flex;
-  flex: 1 0 auto;
-  flex-direction: column;
-  gap: 14px;
-  min-width: 0;
-  padding: 14px 12px 18px;
-}
-
-.chat-tasks-rail__detail-summary {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 8px;
-}
-
-.chat-tasks-rail__detail-status-line {
-  display: flex;
-  flex: 1 1 auto;
-  align-items: baseline;
-  gap: 7px;
-  min-width: 0;
-}
-
-.chat-tasks-rail__detail-status-line .chat-tasks-rail__task-meta {
-  flex: 1 1 auto;
-}
-
-.chat-tasks-rail__detail-stop {
-  display: inline-grid;
-  flex: 0 0 auto;
-  width: 28px;
-  min-width: 28px;
-  height: 28px;
-  padding: 0;
-  place-items: center;
-  color: var(--danger);
-}
-
-.chat-tasks-rail__detail-stop svg {
-  width: 13px;
-  height: 13px;
-  fill: none;
-  stroke: currentColor;
-  stroke-width: 1.8px;
-}
-
-.chat-tasks-rail__detail-activity {
-  display: flex;
-  flex-direction: column;
-  gap: 3px;
-  padding: 10px;
-  border: 1px solid color-mix(in srgb, var(--warn) 24%, var(--border));
-  border-radius: var(--radius-md);
-  background: color-mix(in srgb, var(--warn) 6%, transparent);
-}
-
-.chat-tasks-rail__detail-activity span {
-  color: var(--warn);
-  font-family: var(--mono);
-  font-size: var(--control-ui-text-xs);
-  font-weight: 650;
-}
-
-.chat-tasks-rail__detail-activity strong {
-  color: var(--text);
-  font-size: var(--control-ui-text-xs);
-  font-weight: 550;
-  line-height: 1.4;
-  overflow-wrap: anywhere;
-}
-
 .chat-tasks-rail__detail-blocks {
   display: grid;
   gap: 12px;
@@ -1280,29 +1161,6 @@ openclaw-chat-sidebar-region,
   color: var(--danger);
 }
 
-/* Quiet by default so a column of rows is not a column of accent links;
-   pushed right to end the meta line like a row action. */
-.chat-tasks-rail__task-transcript {
-  margin-left: auto;
-  padding: 0;
-  border: 0;
-  background: transparent;
-  color: var(--muted);
-  font: inherit;
-  font-size: var(--control-ui-text-xs);
-  line-height: 1.3;
-  cursor: var(--cursor-action);
-  text-decoration: underline;
-  text-decoration-color: color-mix(in srgb, var(--muted) 45%, transparent);
-  text-underline-offset: 2px;
-}
-
-.chat-tasks-rail__task-transcript:hover,
-.chat-tasks-rail__task-transcript:focus-visible {
-  color: var(--accent);
-  text-decoration-color: currentColor;
-}
-
 @keyframes chat-sidebar-fade-in {
   from {
     opacity: 0;
@@ -1359,27 +1217,27 @@ openclaw-chat-sidebar-region,
   padding: 16px;
 }
 
-.chat-subagent-detail {
+.chat-task-detail {
   min-height: 0;
 }
 
-.chat-subagent-detail__header {
+.chat-task-detail__header {
   gap: 10px;
 }
 
-.chat-subagent-detail__heading {
+.chat-task-detail__heading {
   display: grid;
   min-width: 0;
   gap: 5px;
 }
 
-.chat-subagent-detail__heading .sidebar-title {
+.chat-task-detail__heading .sidebar-title {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-.chat-subagent-detail__meta {
+.chat-task-detail__meta {
   display: flex;
   align-items: center;
   min-width: 0;
@@ -1388,19 +1246,19 @@ openclaw-chat-sidebar-region,
   font-size: var(--control-ui-text-xs);
 }
 
-.chat-subagent-detail__tool {
+.chat-task-detail__tool {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-.chat-subagent-detail__content {
+.chat-task-detail__content {
   display: flex;
   padding: 0;
   overflow: hidden;
 }
 
-.chat-subagent-detail__transcript {
+.chat-task-detail__transcript {
   display: flex;
   flex: 1 1 0;
   min-width: 0;
@@ -1408,25 +1266,25 @@ openclaw-chat-sidebar-region,
   overflow: hidden;
 }
 
-.chat-subagent-detail__transcript > .chat-thread {
+.chat-task-detail__transcript > .chat-thread {
   padding: 12px 0 6px;
   border-radius: 0;
 }
 
-.chat-subagent-detail__transcript .chat-thread-inner {
+.chat-task-detail__transcript .chat-thread-inner {
   width: calc(100% - 16px);
 }
 
-.chat-subagent-detail__state {
+.chat-task-detail__state {
   color: var(--muted);
   font-size: var(--control-ui-text-sm);
 }
 
-.chat-subagent-detail__state--error {
+.chat-task-detail__state--error {
   color: var(--danger);
 }
 
-.chat-subagent-detail__fallback .chat-tasks-rail__detail-blocks {
+.chat-task-detail__fallback .chat-tasks-rail__detail-blocks {
   gap: 12px;
 }
 

From 074d75d37208433efdfb9f9b369bf230a2170676 Mon Sep 17 00:00:00 2001
From: Patrick Erichsen <patrick.a.erichsen@gmail.com>
Date: Wed, 12 Aug 2026 21:54:36 -0700
Subject: [PATCH 08/23] test(buzz): add opt-in thread QA coverage (#116081)

* test(buzz): add opt-in thread QA coverage

* fix(buzz): preserve QA conversation kind

---------

Co-authored-by: Dallin Romney <dallinromney@gmail.com>
---
 .../buzz/src/qa/adapter.runtime.test.ts       | 20 +++++++++++-----
 extensions/buzz/src/qa/adapter.runtime.ts     |  8 ++++++-
 extensions/buzz/src/qa/cli.test.ts            | 24 +++++++++++++++++++
 .../qa-lab/src/scenario-catalog.test.ts       | 12 ++++++++--
 qa/scenarios/channels/thread-follow-up.yaml   |  3 ++-
 5 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/extensions/buzz/src/qa/adapter.runtime.test.ts b/extensions/buzz/src/qa/adapter.runtime.test.ts
index 45914366312c..c13cbdb4db7c 100644
--- a/extensions/buzz/src/qa/adapter.runtime.test.ts
+++ b/extensions/buzz/src/qa/adapter.runtime.test.ts
@@ -1,6 +1,7 @@
-import type {
-  QaBusInboundMessageInput,
-  QaBusMessage,
+import {
+  parseQaTarget,
+  type QaBusInboundMessageInput,
+  type QaBusMessage,
 } from "openclaw/plugin-sdk/qa-channel-protocol";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { parseBuzzQaCredentialPayload } from "./credentials.js";
@@ -179,7 +180,13 @@ describe("Buzz QA transport adapter", () => {
       ...input,
       id: `bus-outbound-${++outboundIndex}`,
       direction: "outbound" as const,
-      conversation: { id: "main", kind: "group" as const },
+      conversation: (() => {
+        const target = parseQaTarget(input.to);
+        return {
+          id: target.conversationId,
+          kind: target.chatType,
+        };
+      })(),
     }));
     sendMessage
       .mockResolvedValueOnce({ eventId: "native-root", timestamp: 1_750_000_000_000 })
@@ -199,7 +206,7 @@ describe("Buzz QA transport adapter", () => {
 
     const root = await adapter.sendInbound({
       accountId: "sut",
-      conversation: { id: "main", kind: "group" },
+      conversation: { id: "main", kind: "channel" },
       senderId: "driver",
       senderName: "QA Driver",
       text: "@openclaw root",
@@ -216,7 +223,7 @@ describe("Buzz QA transport adapter", () => {
     });
     const followUp = await adapter.sendInbound({
       accountId: "sut",
-      conversation: { id: "main", kind: "group" },
+      conversation: { id: "main", kind: "channel" },
       senderId: "driver",
       senderName: "QA Driver",
       text: "@openclaw follow-up",
@@ -240,6 +247,7 @@ describe("Buzz QA transport adapter", () => {
     });
     expect(addOutboundMessage).toHaveBeenLastCalledWith(
       expect.objectContaining({
+        to: "channel:main",
         threadId: root.id,
         replyToId: followUp.id,
       }),
diff --git a/extensions/buzz/src/qa/adapter.runtime.ts b/extensions/buzz/src/qa/adapter.runtime.ts
index 772d56db1e33..40bd225272c2 100644
--- a/extensions/buzz/src/qa/adapter.runtime.ts
+++ b/extensions/buzz/src/qa/adapter.runtime.ts
@@ -1,5 +1,6 @@
 import { setTimeout as sleep } from "node:timers/promises";
 import type { OpenClawConfig } from "openclaw/plugin-sdk/config-contracts";
+import type { QaBusConversationKind } from "openclaw/plugin-sdk/qa-channel-protocol";
 import type { QaRunnerCliRegistration } from "openclaw/plugin-sdk/qa-runner-runtime";
 import type { BuzzInboundMessage } from "../message-event.js";
 import { buildBuzzTarget } from "../target.js";
@@ -90,7 +91,10 @@ export async function createBuzzQaTransportAdapter(
   const accountId = options.sutAccountId?.trim() || "sut";
   const nativeMessageIds = new Map<string, string>();
   const busMessageIds = new Map<string, string>();
+  // QA scenarios own the logical target while Buzz uses one physical group room.
+  // Preserve both logical fields so outbound matching sees the conversation it sent.
   let logicalConversationId = credentials.roomId;
+  let logicalConversationKind: QaBusConversationKind = "group";
   let relayDriver: Awaited<ReturnType<typeof createBuzzQaRelayDriver>>;
 
   const resolveBusMessageId = async (nativeId: string | undefined) => {
@@ -118,7 +122,7 @@ export async function createBuzzQaTransportAdapter(
     ]);
     const outbound = await context.messages.addOutboundMessage({
       accountId,
-      to: `group:${logicalConversationId}`,
+      to: `${logicalConversationKind}:${logicalConversationId}`,
       senderId: credentials.sutPublicKey,
       text: message.text,
       timestamp: message.createdAt * 1_000,
@@ -154,6 +158,7 @@ export async function createBuzzQaTransportAdapter(
       heartbeat.throwIfFailed();
       relayDriver.assertHealthy();
       logicalConversationId = input.conversation.id;
+      logicalConversationKind = input.conversation.kind;
       const sent = await relayDriver.sendMessage({
         text: input.text,
         mentionSut: isBuzzMention(input.text),
@@ -172,6 +177,7 @@ export async function createBuzzQaTransportAdapter(
     },
     resetTransport() {
       logicalConversationId = credentials.roomId;
+      logicalConversationKind = "group";
       nativeMessageIds.clear();
       busMessageIds.clear();
     },
diff --git a/extensions/buzz/src/qa/cli.test.ts b/extensions/buzz/src/qa/cli.test.ts
index 4281c79f6fb2..0e3723938172 100644
--- a/extensions/buzz/src/qa/cli.test.ts
+++ b/extensions/buzz/src/qa/cli.test.ts
@@ -48,4 +48,28 @@ describe("Buzz QA CLI", () => {
       }),
     ).toEqual(["channel-canary", "channel-mention-gating"]);
   });
+
+  it("forwards an explicitly selected thread follow-up scenario", async () => {
+    const qa = new Command();
+    buzzQaCliRegistration.register(qa);
+
+    await qa.parseAsync([
+      "node",
+      "openclaw",
+      "buzz",
+      "--credential-file",
+      "/secure/buzz-qa.json",
+      "--scenario",
+      "thread-follow-up",
+    ]);
+
+    const params = runLiveTransportQaSuiteCommand.mock.calls[0]?.[0];
+    expect(
+      params?.selectScenarioIds({
+        primaryModel: "openai/gpt-5.4",
+        providerMode: "mock-openai",
+        scenarioIds: ["thread-follow-up"],
+      }),
+    ).toEqual(["thread-follow-up"]);
+  });
 });
diff --git a/extensions/qa-lab/src/scenario-catalog.test.ts b/extensions/qa-lab/src/scenario-catalog.test.ts
index 9cbe8d8df834..f7f11e1749cb 100644
--- a/extensions/qa-lab/src/scenario-catalog.test.ts
+++ b/extensions/qa-lab/src/scenario-catalog.test.ts
@@ -1018,11 +1018,19 @@ describe("qa scenario catalog", () => {
   });
 
   it("keeps portable thread relation flows on channels with native thread semantics", () => {
-    for (const scenarioId of ["thread-follow-up", "thread-isolation"]) {
+    const expectations = [
+      {
+        scenarioId: "thread-follow-up",
+        channels: ["qa-channel", "buzz", "slack", "matrix"],
+      },
+      { scenarioId: "thread-isolation", channels: ["qa-channel", "slack", "matrix"] },
+    ];
+
+    for (const { scenarioId, channels } of expectations) {
       const scenario = requireFlowScenario(readQaScenarioById(scenarioId));
 
       expect(scenario.execution.channel, scenarioId).toBeUndefined();
-      expect(scenario.execution.channels, scenarioId).toEqual(["qa-channel", "slack", "matrix"]);
+      expect(scenario.execution.channels, scenarioId).toEqual(channels);
     }
   });
 
diff --git a/qa/scenarios/channels/thread-follow-up.yaml b/qa/scenarios/channels/thread-follow-up.yaml
index b35d1b9b1adb..ec15d8fa4118 100644
--- a/qa/scenarios/channels/thread-follow-up.yaml
+++ b/qa/scenarios/channels/thread-follow-up.yaml
@@ -19,11 +19,12 @@ scenario:
     - docs/concepts/qa-e2e-automation.md
   codeRefs:
     - extensions/qa-lab/src/qa-transport.ts
+    - extensions/buzz/src/qa/adapter.runtime.ts
     - extensions/qa-lab/src/live-transports/slack/adapter.runtime.ts
     - extensions/qa-lab/src/live-transports/matrix/adapter.runtime.ts
   execution:
     kind: flow
-    channels: [qa-channel, slack, matrix]
+    channels: [qa-channel, buzz, slack, matrix]
     summary: Send a deterministic follow-up through the shared host and require native thread relation evidence.
     config:
       rootMarker: QA-THREAD-ROOT-OK

From 64e8791601b1eb7e446d5aec4ef0a34a3839702e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 21:58:23 -0700
Subject: [PATCH 09/23] perf(test): avoid unrelated runtime imports in MCP
 suite (#122998)

Remove duplicate adversarial filter integration coverage, replace broad plugin/auth imports with contract-complete test leaves, and repair the main env-var ratchet broken by an unrelated newly added internal constant.

Amp-Thread-ID: https://ampcode.com/threads/T-019fee8d-665d-707b-a380-23f2a6a1ce03

Co-authored-by: Amp <amp@ampcode.com>
---
 src/agents/agent-bundle-mcp-runtime.test.ts | 56 ++++++---------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/src/agents/agent-bundle-mcp-runtime.test.ts b/src/agents/agent-bundle-mcp-runtime.test.ts
index db0ffe3d0e4a..0a8dc45249a4 100644
--- a/src/agents/agent-bundle-mcp-runtime.test.ts
+++ b/src/agents/agent-bundle-mcp-runtime.test.ts
@@ -28,6 +28,15 @@ import type { SessionMcpRuntime } from "./agent-bundle-mcp-types.js";
 import { writeExecutable } from "./bundle-mcp-shared.test-harness.js";
 import { updateMcpAppModelContext } from "./mcp-app-model-context.js";
 
+const pluginToolMetadata = vi.hoisted(() => new WeakMap<object, unknown>());
+
+vi.mock("../plugins/tools.js", () => ({
+  getPluginToolMeta: (tool: object) => pluginToolMetadata.get(tool),
+  setPluginToolMeta: (tool: object, metadata: unknown) => {
+    pluginToolMetadata.set(tool, metadata);
+  },
+}));
+
 vi.mock("./embedded-agent-mcp.js", async (importOriginal) => {
   const actual = await importOriginal<typeof import("./embedded-agent-mcp.js")>();
   return {
@@ -51,6 +60,13 @@ vi.mock("./embedded-agent-mcp.js", async (importOriginal) => {
   };
 });
 
+vi.mock("./mcp-auth-profile.js", () => ({
+  resolveMcpAuthProfileId: () => undefined,
+  withMcpAuthProfileBearer: () => {
+    throw new Error("Unexpected auth-profile transport in MCP runtime test");
+  },
+}));
+
 const tempDirs: string[] = [];
 const tempDirTracker = useAutoCleanupTempDirTracker(afterEach);
 
@@ -1483,46 +1499,6 @@ describe("session MCP runtime", () => {
     }
   });
 
-  it("rejects adversarial MCP tool filters without regex backtracking", async () => {
-    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "bundle-mcp-linear-filter-"));
-    const serverPath = path.join(tempDir, "linear-filter.mjs");
-    const logPath = path.join(tempDir, "server.log");
-    await writeListToolsMcpServer({
-      filePath: serverPath,
-      logPath,
-      tools: [
-        {
-          name: `${"a".repeat(64)}c`,
-          inputSchema: { type: "object", properties: {} },
-        },
-      ],
-    });
-
-    const runtime = await getOrCreateSessionMcpRuntime({
-      sessionId: "session-linear-tool-filter",
-      sessionKey: "agent:test:session-linear-tool-filter",
-      workspaceDir: "/workspace",
-      cfg: {
-        mcp: {
-          servers: {
-            docs: {
-              command: process.execPath,
-              args: [serverPath],
-              toolFilter: { include: [`${"*a".repeat(24)}*b`] },
-            },
-          },
-        },
-      },
-    });
-
-    try {
-      expect((await runtime.getCatalog()).tools).toEqual([]);
-    } finally {
-      await runtime.dispose();
-      await fs.rm(tempDir, { recursive: true, force: true });
-    }
-  });
-
   it("lists MCP tools from servers that omit the tools capability", async () => {
     const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "bundle-mcp-unadvertised-tools-"));
     const serverPath = path.join(tempDir, "unadvertised-tools.mjs");

From 3bc665f6ae495252fa06d1932d9f2479314276f3 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Thu, 13 Aug 2026 13:02:43 +0800
Subject: [PATCH 10/23] fix(ci): sanitize AI manifest during installer pack
 (#122952)

---
 scripts/package-openclaw-for-docker.mts       | 67 +++++++++-----
 .../package-openclaw-for-docker.e2e.test.ts   | 89 ++++++++++++++-----
 2 files changed, 115 insertions(+), 41 deletions(-)

diff --git a/scripts/package-openclaw-for-docker.mts b/scripts/package-openclaw-for-docker.mts
index 21defce661f1..9347666825b7 100644
--- a/scripts/package-openclaw-for-docker.mts
+++ b/scripts/package-openclaw-for-docker.mts
@@ -628,6 +628,7 @@ export async function prepareBundledAiRuntimePackage(
 ) {
   const packageJsonPath = path.join(sourceDir, "package.json");
   const aiRuntimePackageJsonPath = path.join(sourceDir, "packages", "ai", "package.json");
+  const aiRuntimeSourceDir = path.dirname(aiRuntimePackageJsonPath);
   const aiRuntimePath = path.join(sourceDir, "node_modules", "@openclaw", "ai");
   const aiRuntimeBackupPath = path.join(
     sourceDir,
@@ -646,6 +647,8 @@ export async function prepareBundledAiRuntimePackage(
           DEFAULT_PACKAGE_PACK_TIMEOUT_MS,
         ),
       }));
+  const prepareManifest = packageOptions.prepareManifest ?? (async () => false);
+  const restoreManifest = packageOptions.restoreManifest ?? (async () => false);
   const originalPackageJson = await fs.readFile(packageJsonPath, "utf8");
   let packageJson: MutableJsonRecord & {
     bundleDependencies?: unknown;
@@ -721,26 +724,40 @@ export async function prepareBundledAiRuntimePackage(
   };
 
   try {
-    await runCaptureImpl(
-      "pnpm",
-      [
-        "--dir",
-        "packages/ai",
-        "pack",
-        "--loglevel=error",
-        "--use-stderr",
-        "--pack-destination",
-        outputDir,
-      ],
-      sourceDir,
-      {
-        deferForwardedSignalExit: true,
-        timeoutMs: resolveTimeoutMs(
-          "OPENCLAW_DOCKER_PACKAGE_PACK_TIMEOUT_MS",
-          DEFAULT_PACKAGE_PACK_TIMEOUT_MS,
-        ),
-      },
-    );
+    let packError: Error | undefined;
+    await prepareManifest(aiRuntimeSourceDir);
+    try {
+      await runCaptureImpl(
+        "pnpm",
+        [
+          "--dir",
+          "packages/ai",
+          "pack",
+          "--loglevel=error",
+          "--use-stderr",
+          "--pack-destination",
+          outputDir,
+        ],
+        sourceDir,
+        {
+          deferForwardedSignalExit: true,
+          timeoutMs: resolveTimeoutMs(
+            "OPENCLAW_DOCKER_PACKAGE_PACK_TIMEOUT_MS",
+            DEFAULT_PACKAGE_PACK_TIMEOUT_MS,
+          ),
+        },
+      );
+    } catch (error) {
+      packError = toErrorObject(error, "AI runtime package failed.");
+    }
+    try {
+      await restoreManifest(aiRuntimeSourceDir);
+    } catch (restoreError) {
+      throw packError ? packagePreparationRestoreError(packError, restoreError) : restoreError;
+    }
+    if (packError) {
+      throw packError;
+    }
     packedAiTarballs = (await fs.readdir(outputDir))
       .filter(isPackedAiRuntimeTarball)
       .map((filename) => path.join(outputDir, filename));
@@ -924,7 +941,15 @@ export async function packOpenClawPackageForDocker(
   let cleanupBundledAiRuntime = async () => {};
   try {
     await cleanPackedOpenClawTarballs(outputPath);
-    cleanupBundledAiRuntime = await prepareBundledAiRuntime(sourcePath, outputPath, runCaptureImpl);
+    cleanupBundledAiRuntime = await prepareBundledAiRuntime(
+      sourcePath,
+      outputPath,
+      runCaptureImpl,
+      {
+        prepareManifest,
+        restoreManifest,
+      },
+    );
     const packArgs =
       packTool === "pnpm"
         ? ["pack", "--silent", "--config.ignore-scripts=true", "--pack-destination", outputPath]
diff --git a/test/e2e/qa-lab/runtime/package-openclaw-for-docker.e2e.test.ts b/test/e2e/qa-lab/runtime/package-openclaw-for-docker.e2e.test.ts
index 38efd090f6fb..fb279da38110 100644
--- a/test/e2e/qa-lab/runtime/package-openclaw-for-docker.e2e.test.ts
+++ b/test/e2e/qa-lab/runtime/package-openclaw-for-docker.e2e.test.ts
@@ -7,6 +7,10 @@ import { pathToFileURL } from "node:url";
 import { MAX_TIMER_TIMEOUT_MS } from "@openclaw/normalization-core/number-coercion";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { DOCKER_SELECTED_PLUGIN_BUILD_IDS_ENV } from "../../../../scripts/lib/bundled-plugin-build-entries.mjs";
+import {
+  preparePackageManifest,
+  restorePackageManifest,
+} from "../../../../scripts/package-manifest.mjs";
 import {
   buildPackageArtifacts,
   packOpenClawPackageForDocker,
@@ -483,8 +487,11 @@ describe("package-openclaw-for-docker", () => {
       2,
     )}\n`;
     const installedAiPath = path.join(sourceDir, "node_modules", "@openclaw", "ai");
+    const aiPackageJsonPath = path.join(sourceDir, "packages", "ai", "package.json");
+    const originalAiPackageJson =
+      '{"name":"@openclaw/ai","version":"2026.6.17","devDependencies":{"@openclaw/normalization-core":"workspace:*"}}\n';
     fs.mkdirSync(path.join(sourceDir, "packages", "ai"), { recursive: true });
-    fs.writeFileSync(path.join(sourceDir, "packages", "ai", "package.json"), "{}\n");
+    fs.writeFileSync(aiPackageJsonPath, originalAiPackageJson);
     fs.mkdirSync(installedAiPath, { recursive: true });
     fs.writeFileSync(path.join(installedAiPath, "original-marker"), "workspace package");
     fs.writeFileSync(packageJsonPath, originalPackageJson);
@@ -507,6 +514,9 @@ describe("package-openclaw-for-docker", () => {
             command: "pnpm",
             cwd: sourceDir,
           });
+          expect(
+            JSON.parse(fs.readFileSync(aiPackageJsonPath, "utf8")).devDependencies,
+          ).toBeUndefined();
           fs.writeFileSync(path.join(outputDir, "openclaw-ai-2026.6.17.tgz"), "ai package");
           return "";
         },
@@ -525,9 +535,12 @@ describe("package-openclaw-for-docker", () => {
             );
             fs.writeFileSync(path.join(destination, "runtime.js"), "export {};\n");
           },
+          prepareManifest: preparePackageManifest,
+          restoreManifest: restorePackageManifest,
         },
       );
 
+      expect(fs.readFileSync(aiPackageJsonPath, "utf8")).toBe(originalAiPackageJson);
       const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8")) as {
         bundleDependencies: string[];
         dependencies: Record<string, string>;
@@ -565,27 +578,47 @@ describe("package-openclaw-for-docker", () => {
       dependencies: { "@openclaw/ai": "workspace:*" },
       name: "openclaw",
     })}\n`;
+    const aiPackageJsonPath = path.join(sourceDir, "packages", "ai", "package.json");
+    const originalAiPackageJson =
+      '{"name":"@openclaw/ai","devDependencies":{"@openclaw/normalization-core":"workspace:*"}}\n';
     fs.mkdirSync(path.join(sourceDir, "packages", "ai"), { recursive: true });
-    fs.writeFileSync(
-      path.join(sourceDir, "packages", "ai", "package.json"),
-      '{"name":"@openclaw/ai"}\n',
-    );
+    fs.writeFileSync(aiPackageJsonPath, originalAiPackageJson);
     fs.writeFileSync(packageJsonPath, originalPackageJson);
-    let stderr = "";
-    const stderrWrite = vi.spyOn(process.stderr, "write").mockImplementation((chunk) => {
-      stderr += String(chunk);
-      return true;
-    });
+    const packError = new Error("AI pack failed");
 
-    try {
-      await expect(prepareBundledAiRuntimePackage(sourceDir, outputDir)).rejects.toThrow(
-        "pnpm --dir packages/ai pack --loglevel=error --use-stderr",
-      );
-      expect(stderr).toContain("ERR_PNPM_PACKAGE_VERSION_NOT_FOUND");
-      expect(fs.readFileSync(packageJsonPath, "utf8")).toBe(originalPackageJson);
-    } finally {
-      stderrWrite.mockRestore();
-    }
+    await expect(
+      prepareBundledAiRuntimePackage(
+        sourceDir,
+        outputDir,
+        async () => {
+          throw packError;
+        },
+        {
+          prepareManifest: preparePackageManifest,
+          restoreManifest: restorePackageManifest,
+        },
+      ),
+    ).rejects.toBe(packError);
+    expect(fs.readFileSync(aiPackageJsonPath, "utf8")).toBe(originalAiPackageJson);
+    expect(fs.readFileSync(packageJsonPath, "utf8")).toBe(originalPackageJson);
+
+    const restoreError = new Error("AI manifest restore failed");
+    await expect(
+      prepareBundledAiRuntimePackage(
+        sourceDir,
+        outputDir,
+        async () => {
+          throw packError;
+        },
+        {
+          prepareManifest: preparePackageManifest,
+          restoreManifest: async (cwd) => {
+            await restorePackageManifest(cwd);
+            throw restoreError;
+          },
+        },
+      ),
+    ).rejects.toMatchObject({ cause: packError, errors: [packError, restoreError] });
   });
 
   it("reuses the source manifest lifecycle for ignore-scripts package artifacts", async () => {
@@ -605,17 +638,31 @@ describe("package-openclaw-for-docker", () => {
       null,
       2,
     )}\n`;
+    const aiPackageJsonPath = path.join(sourceDir, "packages", "ai", "package.json");
+    const originalAiPackageJson =
+      '{"name":"@openclaw/ai","devDependencies":{"@openclaw/normalization-core":"workspace:*"}}\n';
     fs.mkdirSync(scriptsDir);
+    fs.mkdirSync(path.dirname(aiPackageJsonPath), { recursive: true });
     fs.copyFileSync(
       path.join(process.cwd(), "scripts", "package-manifest.mjs"),
       path.join(scriptsDir, "package-manifest.mjs"),
     );
     fs.writeFileSync(packageJsonPath, originalPackageJson);
+    fs.writeFileSync(aiPackageJsonPath, originalAiPackageJson);
 
     try {
       const tarball = await packOpenClawPackageForDocker(sourceDir, outputDir, {
         ...skipDocsMapLifecycle,
-        prepareBundledAiRuntime: skipBundledAiRuntime,
+        prepareBundledAiRuntime: async (_source, _output, _runCapture, options) => {
+          const aiDir = path.dirname(aiPackageJsonPath);
+          expect(options).toBeDefined();
+          await options?.prepareManifest?.(aiDir);
+          expect(
+            JSON.parse(fs.readFileSync(aiPackageJsonPath, "utf8")).devDependencies,
+          ).toBeUndefined();
+          await options?.restoreManifest?.(aiDir);
+          return async () => {};
+        },
         prepareChangelog: async () => {},
         restoreChangelog: async () => {},
         runCaptureImpl: async () => {
@@ -623,6 +670,7 @@ describe("package-openclaw-for-docker", () => {
             devDependencies?: Record<string, string>;
           };
           expect(packageJson.devDependencies).toEqual({ vitest: "4.1.10" });
+          expect(fs.readFileSync(aiPackageJsonPath, "utf8")).toBe(originalAiPackageJson);
           const packedPath = path.join(outputDir, "openclaw-2026.8.1.tgz");
           fs.writeFileSync(packedPath, "package");
           return `${path.basename(packedPath)}\n`;
@@ -631,6 +679,7 @@ describe("package-openclaw-for-docker", () => {
 
       expect(tarball).toBe(path.join(outputDir, "openclaw-2026.8.1.tgz"));
       expect(fs.readFileSync(packageJsonPath, "utf8")).toBe(originalPackageJson);
+      expect(fs.readFileSync(aiPackageJsonPath, "utf8")).toBe(originalAiPackageJson);
       expect(
         fs.existsSync(
           path.join(sourceDir, ".artifacts", "package-manifest", "package.json.prepack-backup"),

From 6ad5d1104cf74476bad5132cddcd14febb2c8a59 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 22:04:15 -0700
Subject: [PATCH 11/23] test(agents): move recovery transcript proof to QA
 (#123006)

---
 ...ty-response-recovery-replay-safe-read.yaml |   9 +-
 .../attempt-native-video-transcript.test.ts   |  83 ++++++
 ...attempt-transcript-persistence.e2e.test.ts | 257 ------------------
 3 files changed, 91 insertions(+), 258 deletions(-)
 create mode 100644 src/agents/embedded-agent-runner/run/attempt-native-video-transcript.test.ts
 delete mode 100644 src/agents/embedded-agent-runner/run/attempt-transcript-persistence.e2e.test.ts

diff --git a/qa/scenarios/runtime/empty-response-recovery-replay-safe-read.yaml b/qa/scenarios/runtime/empty-response-recovery-replay-safe-read.yaml
index dbdaa04ed824..664fee3606fc 100644
--- a/qa/scenarios/runtime/empty-response-recovery-replay-safe-read.yaml
+++ b/qa/scenarios/runtime/empty-response-recovery-replay-safe-read.yaml
@@ -17,6 +17,7 @@ scenario:
     - The runtime injects the visible-answer continuation instruction after the empty turn.
     - The authenticated read result survives the empty turn and canonical retry unchanged.
     - The final visible reply contains the exact recovery marker.
+    - The host-private recovery prompt never appears in the durable transcript.
   docsRefs:
     - docs/help/testing.md
   codeRefs:
@@ -96,6 +97,8 @@ flow:
           args:
             - ref: env
             - ref: sessionKey
+            - probeText:
+                ref: config.retryNeedle
         - if:
             expr: "Boolean(env.mock)"
             then:
@@ -120,9 +123,13 @@ flow:
                   expr: "[scenarioRequests[1], scenarioRequests[2]].every((request) => String(request.toolOutput ?? '').includes(config.evidenceNonce) && String(request.allInputText ?? '').includes(config.evidenceNonce))"
                   message: authenticated read nonce did not survive into both post-tool requests
         - assert:
-            expr: "transcript.userMessageCount === 2 && transcript.assistantToolCallCounts.read === 1 && transcript.completedToolCallCounts.read === 1 && transcript.successfulToolCallCounts.read === 1 && transcript.finalText.includes(config.expectedReply)"
+            expr: "transcript.userMessageCount === 1 && transcript.assistantToolCallCounts.read === 1 && transcript.completedToolCallCounts.read === 1 && transcript.successfulToolCallCounts.read === 1 && transcript.finalText.includes(config.expectedReply)"
             message:
               expr: "`recovery transcript lost requester, read-result, or final evidence: ${JSON.stringify(transcript)}`"
+        - assert:
+            expr: "transcript.probeTextEndLine === undefined"
+            message:
+              expr: "`host-private recovery prompt leaked into the durable transcript: ${JSON.stringify(transcript)}`"
         - assert:
             expr: "scenarioOutbound.length === 1 && scenarioOutbound[0]?.text.trim() === config.expectedReply && !scenarioOutbound[0].text.trim().startsWith('⚠️')"
             message:
diff --git a/src/agents/embedded-agent-runner/run/attempt-native-video-transcript.test.ts b/src/agents/embedded-agent-runner/run/attempt-native-video-transcript.test.ts
new file mode 100644
index 000000000000..3d1a8a52c393
--- /dev/null
+++ b/src/agents/embedded-agent-runner/run/attempt-native-video-transcript.test.ts
@@ -0,0 +1,83 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { readSessionTranscriptRawDelta } from "openclaw/plugin-sdk/session-transcript-runtime";
+import { afterEach, describe, expect, it } from "vitest";
+import { useAutoCleanupTempDirTracker } from "../../../../test/helpers/temp-dir.js";
+import {
+  appendTranscriptMessage,
+  upsertSessionEntryCore,
+} from "../../../config/sessions/session-accessor.js";
+import { buildPersistedUserTurnMessage } from "../../../sessions/user-turn-transcript.js";
+import { captureEnv, setTestEnvValue } from "../../../test-utils/env.js";
+import { convertToLlm } from "../../sessions/messages.js";
+import { SessionManager } from "../../sessions/session-manager.js";
+import { materializeProviderContext } from "./images.js";
+
+const tempDirs = useAutoCleanupTempDirTracker(afterEach);
+const MP4 = Buffer.from("0000001c6674797069736f6d0000000069736f6d0000000000000000", "hex");
+
+describe("native video transcript replay", () => {
+  it("replays native video after reopening the canonical transcript", async () => {
+    const stateDir = tempDirs.make("openclaw-video-transcript-replay-");
+    const inboundDir = path.join(stateDir, "media", "inbound");
+    await fs.mkdir(inboundDir, { recursive: true });
+    await fs.writeFile(path.join(inboundDir, "history.mp4"), MP4);
+    const env = captureEnv(["OPENCLAW_STATE_DIR"]);
+    setTestEnvValue("OPENCLAW_STATE_DIR", stateDir);
+    const target = {
+      agentId: "main",
+      sessionId: "video-replay",
+      sessionKey: "agent:main:video-replay",
+      storePath: path.join(stateDir, "sessions.json"),
+    };
+    const persisted = buildPersistedUserTurnMessage({
+      text: "inspect historical video",
+      media: [
+        {
+          kind: "video",
+          contentType: "video/mp4",
+          sizeBytes: MP4.length,
+          url: "media://inbound/history.mp4",
+          hydrationSuppressed: true,
+        },
+      ],
+    });
+    const serialized = JSON.stringify(persisted);
+    expect(serialized).toContain("media://inbound/history.mp4");
+    expect(serialized).not.toContain(MP4.toString("base64"));
+    expect(serialized).not.toContain(stateDir);
+
+    try {
+      await upsertSessionEntryCore(target, {
+        sessionId: target.sessionId,
+        updatedAt: 1,
+      });
+      await appendTranscriptMessage(target, {
+        cwd: stateDir,
+        eventId: "historical-user",
+        message: persisted,
+        now: 1,
+      });
+
+      const reopened = SessionManager.open(target, stateDir).buildSessionContext();
+      const provider = await materializeProviderContext({
+        context: { systemPrompt: "system", messages: convertToLlm(reopened.messages), tools: [] },
+        workspaceDir: stateDir,
+      });
+      expect(provider.messages[0]?.content).toEqual([
+        { type: "text", text: "inspect historical video" },
+        { type: "video", data: MP4.toString("base64"), mimeType: "video/mp4" },
+      ]);
+
+      const raw = await readSessionTranscriptRawDelta({
+        ...target,
+        maxBytes: 100_000,
+        maxEvents: 100,
+      });
+      expect(JSON.stringify(raw)).toContain("media://inbound/history.mp4");
+      expect(JSON.stringify(raw)).not.toContain(MP4.toString("base64"));
+    } finally {
+      env.restore();
+    }
+  });
+});
diff --git a/src/agents/embedded-agent-runner/run/attempt-transcript-persistence.e2e.test.ts b/src/agents/embedded-agent-runner/run/attempt-transcript-persistence.e2e.test.ts
deleted file mode 100644
index eded61f6d4dd..000000000000
--- a/src/agents/embedded-agent-runner/run/attempt-transcript-persistence.e2e.test.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import { readSessionTranscriptRawDelta } from "openclaw/plugin-sdk/session-transcript-runtime";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { useAutoCleanupTempDirTracker } from "../../../../test/helpers/temp-dir.js";
-import {
-  appendTranscriptMessage,
-  upsertSessionEntryCore,
-} from "../../../config/sessions/session-accessor.js";
-import { buildPersistedUserTurnMessage } from "../../../sessions/user-turn-transcript.js";
-import { captureEnv, setTestEnvValue } from "../../../test-utils/env.js";
-import { createOpenClawAgentHarness } from "../../harness/builtin-openclaw.js";
-import { guardSessionManager } from "../../session-tool-result-guard-wrapper.js";
-import { convertToLlm } from "../../sessions/messages.js";
-import { SessionManager } from "../../sessions/session-manager.js";
-import { flushSessionManagerTranscript } from "./attempt-transcript-helpers.js";
-import { materializeProviderContext } from "./images.js";
-
-const runEmbeddedAttempt = vi.hoisted(() => vi.fn());
-
-vi.mock("./attempt.js", () => ({ runEmbeddedAttempt }));
-
-const tempDirs = useAutoCleanupTempDirTracker(afterEach);
-const MP4 = Buffer.from("0000001c6674797069736f6d0000000069736f6d0000000000000000", "hex");
-
-function buildAssistantMessage(text: string) {
-  return {
-    role: "assistant" as const,
-    content: [{ type: "text" as const, text }],
-    api: "openai-responses" as const,
-    provider: "openai",
-    model: "test-model",
-    usage: {
-      input: 0,
-      output: 0,
-      cacheRead: 0,
-      cacheWrite: 0,
-      totalTokens: 0,
-      cost: {
-        input: 0,
-        output: 0,
-        cacheRead: 0,
-        cacheWrite: 0,
-        total: 0,
-      },
-    },
-    stopReason: "stop" as const,
-    timestamp: Date.now(),
-  };
-}
-
-describe("embedded attempt transcript persistence", () => {
-  it("omits the host-private settled-turn recovery prompt from the raw transcript", async () => {
-    const dir = tempDirs.make("openclaw-settled-turn-finalization-");
-    const target = {
-      agentId: "main",
-      sessionId: "settled-turn-finalization",
-      sessionKey: "agent:main:settled-turn-finalization",
-      storePath: path.join(dir, "sessions.json"),
-    };
-    const recoveryPrompt =
-      "The previous assistant turn completed its tool calls but did not produce a user-visible answer. Continue from the current transcript and produce the final user-visible answer now. Do not repeat completed tool calls or restart from scratch.";
-    const finalAssistant = buildAssistantMessage("Recovered final answer.");
-    await upsertSessionEntryCore(target, {
-      sessionId: target.sessionId,
-      updatedAt: 1,
-    });
-    await appendTranscriptMessage(target, {
-      cwd: dir,
-      eventId: "original-user",
-      message: { role: "user", content: "Original operator request." },
-      now: 1,
-    });
-
-    runEmbeddedAttempt.mockImplementationOnce(async (attempt) => {
-      const finalization = attempt as {
-        prompt: string;
-        suppressNextUserMessagePersistence?: boolean;
-      };
-      const sessionManager = guardSessionManager(SessionManager.open(target, dir), {
-        skipBeforeMessageWriteHooks: true,
-        suppressNextUserMessagePersistence: finalization.suppressNextUserMessagePersistence,
-      });
-      sessionManager.appendMessage({
-        role: "user",
-        content: [{ type: "text", text: finalization.prompt }],
-        timestamp: Date.now(),
-      });
-      sessionManager.appendMessage(finalAssistant);
-      flushSessionManagerTranscript(sessionManager);
-      return {
-        terminal: { kind: "ok" },
-        sessionIdUsed: target.sessionId,
-        messagesSnapshot: [finalAssistant],
-        assistantTexts: ["Recovered final answer."],
-        toolMetas: [],
-        lastAssistant: finalAssistant,
-        currentAttemptAssistant: finalAssistant,
-        currentAttemptCompletedAssistant: finalAssistant,
-        didSendViaMessagingTool: false,
-        didDeliverSourceReplyViaMessageTool: false,
-        didSendDeterministicApprovalPrompt: false,
-        messagingToolSentTexts: [],
-        messagingToolSentMediaUrls: [],
-        messagingToolSentTargets: [],
-        messagingToolSourceReplyPayloads: [],
-        hasToolMediaBlockReply: false,
-        cloudCodeAssistFormatError: false,
-        replayMetadata: { hadPotentialSideEffects: false, replaySafe: true },
-        currentAttemptReplayMetadata: { hadPotentialSideEffects: false, replaySafe: true },
-        itemLifecycle: { startedCount: 0, completedCount: 0, activeCount: 0 },
-      } as never;
-    });
-
-    await createOpenClawAgentHarness().finalizeSettledTurn?.({
-      attempt: { prompt: recoveryPrompt } as never,
-      settledAttempt: {} as never,
-    });
-
-    const raw = await readSessionTranscriptRawDelta({
-      ...target,
-      maxBytes: 100_000,
-      maxEvents: 100,
-    });
-    const serialized = JSON.stringify(raw);
-    expect(serialized).toContain("Original operator request.");
-    expect(serialized).toContain("Recovered final answer.");
-    expect(serialized).not.toContain(recoveryPrompt);
-  });
-
-  it("replays native video after reopening the canonical transcript", async () => {
-    const stateDir = tempDirs.make("openclaw-video-transcript-replay-");
-    const inboundDir = path.join(stateDir, "media", "inbound");
-    await fs.mkdir(inboundDir, { recursive: true });
-    await fs.writeFile(path.join(inboundDir, "history.mp4"), MP4);
-    const env = captureEnv(["OPENCLAW_STATE_DIR"]);
-    setTestEnvValue("OPENCLAW_STATE_DIR", stateDir);
-    const target = {
-      agentId: "main",
-      sessionId: "video-replay",
-      sessionKey: "agent:main:video-replay",
-      storePath: path.join(stateDir, "sessions.json"),
-    };
-    const persisted = buildPersistedUserTurnMessage({
-      text: "inspect historical video",
-      media: [
-        {
-          kind: "video",
-          contentType: "video/mp4",
-          sizeBytes: MP4.length,
-          url: "media://inbound/history.mp4",
-          hydrationSuppressed: true,
-        },
-      ],
-    });
-    const serialized = JSON.stringify(persisted);
-    expect(serialized).toContain("media://inbound/history.mp4");
-    expect(serialized).not.toContain(MP4.toString("base64"));
-    expect(serialized).not.toContain(stateDir);
-
-    try {
-      await upsertSessionEntryCore(target, {
-        sessionId: target.sessionId,
-        updatedAt: 1,
-      });
-      await appendTranscriptMessage(target, {
-        cwd: stateDir,
-        eventId: "historical-user",
-        message: persisted,
-        now: 1,
-      });
-
-      const reopened = SessionManager.open(target, stateDir).buildSessionContext();
-      const provider = await materializeProviderContext({
-        context: { systemPrompt: "system", messages: convertToLlm(reopened.messages), tools: [] },
-        workspaceDir: stateDir,
-      });
-      expect(provider.messages[0]?.content).toEqual([
-        { type: "text", text: "inspect historical video" },
-        { type: "video", data: MP4.toString("base64"), mimeType: "video/mp4" },
-      ]);
-
-      const raw = await readSessionTranscriptRawDelta({
-        ...target,
-        maxBytes: 100_000,
-        maxEvents: 100,
-      });
-      expect(JSON.stringify(raw)).toContain("media://inbound/history.mp4");
-      expect(JSON.stringify(raw)).not.toContain(MP4.toString("base64"));
-    } finally {
-      env.restore();
-    }
-  });
-
-  it("resumes a raw cursor after append-only attempt settlement", async () => {
-    const dir = tempDirs.make("openclaw-attempt-transcript-");
-    const storePath = path.join(dir, "sessions.json");
-    const target = {
-      agentId: "main",
-      sessionId: "embedded-generation",
-      sessionKey: "agent:main:embedded-generation",
-      storePath,
-    };
-    await upsertSessionEntryCore(target, {
-      sessionId: target.sessionId,
-      updatedAt: 1,
-    });
-    await appendTranscriptMessage(target, {
-      cwd: dir,
-      eventId: "first-user",
-      message: { role: "user", content: "first turn" },
-      now: 1,
-    });
-
-    const bootstrap = await readSessionTranscriptRawDelta({
-      ...target,
-      maxBytes: 100_000,
-      maxEvents: 100,
-    });
-    expect(bootstrap.kind).toBe("page");
-    if (bootstrap.kind !== "page") {
-      throw new Error(`expected bootstrap page, got ${bootstrap.kind}`);
-    }
-
-    const sessionManager = SessionManager.open(target, dir);
-    sessionManager.appendMessage({
-      role: "user",
-      content: "second turn",
-      timestamp: Date.now(),
-    });
-    sessionManager.appendMessage(buildAssistantMessage("second answer"));
-
-    // Production settlement invokes this barrier immediately before afterTurn.
-    flushSessionManagerTranscript(sessionManager);
-
-    const resumed = await readSessionTranscriptRawDelta({
-      ...target,
-      cursor: bootstrap.cursor,
-      maxBytes: 100_000,
-      maxEvents: 100,
-    });
-    expect(resumed.kind).toBe("page");
-    if (resumed.kind !== "page") {
-      throw new Error(`expected append page, got ${resumed.kind}`);
-    }
-    expect(
-      resumed.events
-        .map((row) => row.event)
-        .filter((event): event is { message: { content: unknown }; type: "message" } =>
-          Boolean(
-            event && typeof event === "object" && "type" in event && event.type === "message",
-          ),
-        )
-        .map((event) => event.message.content),
-    ).toEqual(["second turn", [{ type: "text", text: "second answer" }]]);
-  });
-});

From 329ed12fcffa217583acb8a170ba7a4b21074fe5 Mon Sep 17 00:00:00 2001
From: xingzhou <zhang.guiping@xydigit.com>
Date: Thu, 13 Aug 2026 13:07:14 +0800
Subject: [PATCH 12/23] fix(discord): chunk long thread initial messages
 (#117354)

Discord rejected over-limit starter messages and could leave ordinary threads empty after creation.

Split initial content through the existing Discord chunking and nonce-retry path while preserving confirmed-versus-ambiguous partial-delivery results.

Co-authored-by: zhang-guiping <zhang.guiping@xydigit.com>
---
 .../src/actions/runtime.messaging.send.ts     |   4 +-
 .../discord/src/actions/runtime.test.ts       |  89 +++++++
 .../discord/src/send.creates-thread.test.ts   | 246 +++++++++++++++++-
 extensions/discord/src/send.messages.ts       | 143 ++++++++--
 4 files changed, 462 insertions(+), 20 deletions(-)

diff --git a/extensions/discord/src/actions/runtime.messaging.send.ts b/extensions/discord/src/actions/runtime.messaging.send.ts
index ef5ba51e77b1..dea82c14fb45 100644
--- a/extensions/discord/src/actions/runtime.messaging.send.ts
+++ b/extensions/discord/src/actions/runtime.messaging.send.ts
@@ -351,12 +351,14 @@ export async function handleDiscordMessageSendAction(ctx: DiscordMessagingAction
         return jsonResult({ ok: true, thread });
       } catch (error) {
         if (error instanceof DiscordThreadInitialMessageError) {
+          const initialMessageDelivery = error.initialMessageDelivery;
           return jsonResult({
             ok: true,
             partial: true,
             thread: error.thread,
-            warning: "Discord thread was created, but sending the initial message failed.",
+            warning: `${error.initialMessageWarning}.`,
             initialMessageError: error.initialMessageError,
+            ...(initialMessageDelivery ? { initialMessageDelivery } : {}),
           });
         }
         throw error;
diff --git a/extensions/discord/src/actions/runtime.test.ts b/extensions/discord/src/actions/runtime.test.ts
index 06e3e1167fcc..24edd208826e 100644
--- a/extensions/discord/src/actions/runtime.test.ts
+++ b/extensions/discord/src/actions/runtime.test.ts
@@ -2527,6 +2527,95 @@ describe("handleDiscordMessagingAction", () => {
       initialMessageError: "missing access",
     });
   });
+
+  it("returns delivery progress when Discord only delivers part of the initial content", async () => {
+    const thread = { id: "T1", name: "thread", type: 11 };
+    createThreadDiscord.mockRejectedValueOnce(
+      new DiscordThreadInitialMessageError(
+        thread as ConstructorParameters<typeof DiscordThreadInitialMessageError>[0],
+        new Error("missing access"),
+        {
+          starterMessageDelivered: true,
+          deliveredChunkCount: 1,
+          deliveredMessageIds: ["starter1"],
+          failedChunkDelivery: "unknown",
+          failedChunkIndex: 1,
+          totalChunkCount: 2,
+        },
+      ),
+    );
+
+    const result = await handleMessagingAction(
+      "threadCreate",
+      {
+        channelId: "C1",
+        name: "thread",
+        content: "Initial post",
+      },
+      enableAllActions,
+    );
+
+    expect(result.details).toEqual({
+      ok: true,
+      partial: true,
+      thread,
+      warning:
+        "Discord thread was created, but delivery of the remaining initial content could not be confirmed.",
+      initialMessageError: "missing access",
+      initialMessageDelivery: {
+        starterMessageDelivered: true,
+        deliveredChunkCount: 1,
+        deliveredMessageIds: ["starter1"],
+        failedChunkDelivery: "unknown",
+        failedChunkIndex: 1,
+        totalChunkCount: 2,
+      },
+    });
+  });
+
+  it("reports unconfirmed delivery when the first initial content chunk is ambiguous", async () => {
+    const thread = { id: "T1", name: "thread", type: 11 };
+    createThreadDiscord.mockRejectedValueOnce(
+      new DiscordThreadInitialMessageError(
+        thread as ConstructorParameters<typeof DiscordThreadInitialMessageError>[0],
+        new Error("response lost"),
+        {
+          starterMessageDelivered: false,
+          deliveredChunkCount: 0,
+          deliveredMessageIds: [],
+          failedChunkDelivery: "unknown",
+          failedChunkIndex: 0,
+          totalChunkCount: 1,
+        },
+      ),
+    );
+
+    const result = await handleMessagingAction(
+      "threadCreate",
+      {
+        channelId: "C1",
+        name: "thread",
+        content: "Initial post",
+      },
+      enableAllActions,
+    );
+
+    expect(result.details).toEqual({
+      ok: true,
+      partial: true,
+      thread,
+      warning: "Discord thread was created, but initial message delivery could not be confirmed.",
+      initialMessageError: "response lost",
+      initialMessageDelivery: {
+        starterMessageDelivered: false,
+        deliveredChunkCount: 0,
+        deliveredMessageIds: [],
+        failedChunkDelivery: "unknown",
+        failedChunkIndex: 0,
+        totalChunkCount: 1,
+      },
+    });
+  });
 });
 
 describe("handleDiscordGuildAction", () => {
diff --git a/extensions/discord/src/send.creates-thread.test.ts b/extensions/discord/src/send.creates-thread.test.ts
index 32c057dd163c..9fe29c6fed12 100644
--- a/extensions/discord/src/send.creates-thread.test.ts
+++ b/extensions/discord/src/send.creates-thread.test.ts
@@ -4,6 +4,7 @@ import { createRequireRecord } from "openclaw/plugin-sdk/test-fixtures";
 import { loadWebMediaRaw } from "openclaw/plugin-sdk/web-media";
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { RateLimitError } from "./internal/discord.js";
+import { hasDiscordMessageCreateAmbiguity } from "./retry.js";
 import { makeDiscordRest } from "./send.test-harness.js";
 
 vi.mock("openclaw/plugin-sdk/web-media", async () => {
@@ -302,6 +303,110 @@ describe("sendMessageDiscord", () => {
     });
   });
 
+  it("keeps forum starter messages within Discord's content limit", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildForum });
+    postMock.mockResolvedValue({ id: "t1" });
+    const content = "a".repeat(2001);
+
+    await createThreadDiscord("chan1", { name: "thread", content }, discordClientOpts(rest));
+
+    expect(postMock).toHaveBeenCalledTimes(2);
+    expect(requestBody(postMock as unknown as MockCallSource, 0)).toEqual({
+      name: "thread",
+      message: { content: "a".repeat(2000) },
+    });
+    expect(requestPath(postMock as unknown as MockCallSource, 1)).toBe(
+      Routes.channelMessages("t1"),
+    );
+    expect(requestBody(postMock as unknown as MockCallSource, 1)).toMatchObject({
+      content: "a",
+      enforce_nonce: true,
+    });
+  });
+
+  it("keeps sub-limit multi-line forum content in one starter message", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildForum });
+    postMock.mockResolvedValue({ id: "t1" });
+    const content = Array.from({ length: 18 }, (_, index) => `line ${index + 1}`).join("\n");
+
+    await createThreadDiscord("chan1", { name: "thread", content }, discordClientOpts(rest));
+
+    expect(postMock).toHaveBeenCalledTimes(1);
+    expect(requestBody(postMock as unknown as MockCallSource)).toEqual({
+      name: "thread",
+      message: { content },
+    });
+  });
+
+  it("reports a delivered forum starter when a continuation chunk fails", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildForum });
+    postMock
+      .mockResolvedValueOnce({ id: "t1", message: { id: "starter1", channel_id: "t1" } })
+      .mockRejectedValueOnce(Object.assign(new Error("missing access"), { status: 403 }));
+
+    let thrown: unknown;
+    try {
+      await createThreadDiscord(
+        "chan1",
+        { name: "thread", content: "a".repeat(2001) },
+        discordClientOpts(rest),
+      );
+    } catch (error) {
+      thrown = error;
+    }
+
+    expect(thrown).toBeInstanceOf(DiscordThreadInitialMessageError);
+    expect(requireRecord(thrown, "thread initial message error").initialMessageDelivery).toEqual({
+      starterMessageDelivered: true,
+      deliveredChunkCount: 1,
+      deliveredMessageIds: ["starter1"],
+      failedChunkDelivery: "not_delivered",
+      failedChunkIndex: 1,
+      totalChunkCount: 2,
+    });
+  });
+
+  it("reports an exhausted ambiguous forum continuation as unknown delivery", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildForum });
+    const ambiguous = Object.assign(new Error("response lost"), { status: 502 });
+    postMock
+      .mockResolvedValueOnce({ id: "t1", message: { id: "starter1", channel_id: "t1" } })
+      .mockRejectedValue(ambiguous);
+
+    let thrown: unknown;
+    try {
+      await createThreadDiscord(
+        "chan1",
+        { name: "thread", content: "a".repeat(2001) },
+        {
+          ...discordClientOpts(rest),
+          retry: { attempts: 2, minDelayMs: 0, maxDelayMs: 0, jitter: 0 },
+        },
+      );
+    } catch (error) {
+      thrown = error;
+    }
+
+    expect(postMock).toHaveBeenCalledTimes(3);
+    expect(thrown).toBeInstanceOf(DiscordThreadInitialMessageError);
+    expect(hasDiscordMessageCreateAmbiguity(thrown)).toBe(true);
+    expect(requireRecord(thrown, "thread initial message error").message).toContain(
+      "delivery of the remaining initial content could not be confirmed",
+    );
+    expect(requireRecord(thrown, "thread initial message error").initialMessageDelivery).toEqual({
+      starterMessageDelivered: true,
+      deliveredChunkCount: 1,
+      deliveredMessageIds: ["starter1"],
+      failedChunkDelivery: "unknown",
+      failedChunkIndex: 1,
+      totalChunkCount: 2,
+    });
+  });
+
   it("inherits default_auto_archive_duration for forum threads", async () => {
     const { rest, getMock, postMock } = makeDiscordRest();
     getMock.mockResolvedValue({
@@ -457,11 +562,146 @@ describe("sendMessageDiscord", () => {
     expect(requestPath(postMock as unknown as MockCallSource, 1)).toBe(
       Routes.channelMessages("t1"),
     );
-    expect(requestBody(postMock as unknown as MockCallSource, 1)).toEqual({
+    expect(requestBody(postMock as unknown as MockCallSource, 1)).toMatchObject({
       content: "Hello thread!",
+      enforce_nonce: true,
     });
   });
 
+  it("chunks long initial messages for non-forum threads", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildText });
+    postMock.mockResolvedValue({ id: "t1" });
+    const content = "a".repeat(2001);
+
+    await createThreadDiscord("chan1", { name: "thread", content }, discordClientOpts(rest));
+
+    expect(postMock).toHaveBeenCalledTimes(3);
+    expect(requestPath(postMock as unknown as MockCallSource, 1)).toBe(
+      Routes.channelMessages("t1"),
+    );
+    expect(requestBody(postMock as unknown as MockCallSource, 1)).toMatchObject({
+      content: "a".repeat(2000),
+      enforce_nonce: true,
+    });
+    expect(requestPath(postMock as unknown as MockCallSource, 2)).toBe(
+      Routes.channelMessages("t1"),
+    );
+    expect(requestBody(postMock as unknown as MockCallSource, 2)).toMatchObject({
+      content: "a",
+      enforce_nonce: true,
+    });
+  });
+
+  it("keeps sub-limit multi-line non-forum content in one initial message", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildText });
+    postMock.mockResolvedValue({ id: "t1", channel_id: "t1" });
+    const content = Array.from({ length: 18 }, (_, index) => `line ${index + 1}`).join("\n");
+
+    await createThreadDiscord("chan1", { name: "thread", content }, discordClientOpts(rest));
+
+    expect(postMock).toHaveBeenCalledTimes(2);
+    expect(requestBody(postMock as unknown as MockCallSource, 1)).toMatchObject({ content });
+  });
+
+  it("reports delivered non-forum chunks when a later chunk fails", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildText });
+    postMock
+      .mockResolvedValueOnce({ id: "t1", name: "thread", type: ChannelType.PublicThread })
+      .mockResolvedValueOnce({ id: "msg1", channel_id: "t1" })
+      .mockRejectedValueOnce(Object.assign(new Error("missing access"), { status: 403 }));
+
+    let thrown: unknown;
+    try {
+      await createThreadDiscord(
+        "chan1",
+        { name: "thread", content: "a".repeat(4001) },
+        discordClientOpts(rest),
+      );
+    } catch (error) {
+      thrown = error;
+    }
+
+    expect(thrown).toBeInstanceOf(DiscordThreadInitialMessageError);
+    expect(requireRecord(thrown, "thread initial message error").initialMessageDelivery).toEqual({
+      starterMessageDelivered: false,
+      deliveredChunkCount: 1,
+      deliveredMessageIds: ["msg1"],
+      failedChunkDelivery: "not_delivered",
+      failedChunkIndex: 1,
+      totalChunkCount: 3,
+    });
+  });
+
+  it("reports an exhausted ambiguous non-forum chunk as unknown delivery", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildText });
+    const ambiguous = Object.assign(new Error("response lost"), { status: 502 });
+    postMock
+      .mockResolvedValueOnce({ id: "t1", name: "thread", type: ChannelType.PublicThread })
+      .mockResolvedValueOnce({ id: "msg1", channel_id: "t1" })
+      .mockRejectedValue(ambiguous);
+
+    let thrown: unknown;
+    try {
+      await createThreadDiscord(
+        "chan1",
+        { name: "thread", content: "a".repeat(4001) },
+        {
+          ...discordClientOpts(rest),
+          retry: { attempts: 2, minDelayMs: 0, maxDelayMs: 0, jitter: 0 },
+        },
+      );
+    } catch (error) {
+      thrown = error;
+    }
+
+    expect(postMock).toHaveBeenCalledTimes(4);
+    expect(thrown).toBeInstanceOf(DiscordThreadInitialMessageError);
+    expect(hasDiscordMessageCreateAmbiguity(thrown)).toBe(true);
+    expect(requireRecord(thrown, "thread initial message error").message).toContain(
+      "delivery of the remaining initial content could not be confirmed",
+    );
+    expect(requireRecord(thrown, "thread initial message error").initialMessageDelivery).toEqual({
+      starterMessageDelivered: false,
+      deliveredChunkCount: 1,
+      deliveredMessageIds: ["msg1"],
+      failedChunkDelivery: "unknown",
+      failedChunkIndex: 1,
+      totalChunkCount: 3,
+    });
+  });
+
+  it("retries continuation sends with a stable nonce per chunk", async () => {
+    const { rest, getMock, postMock } = makeDiscordRest();
+    getMock.mockResolvedValue({ type: ChannelType.GuildText });
+    postMock
+      .mockResolvedValueOnce({ id: "t1", name: "thread", type: ChannelType.PublicThread })
+      .mockRejectedValueOnce(Object.assign(new Error("bad gateway"), { status: 502 }))
+      .mockResolvedValueOnce({ id: "msg1", channel_id: "t1" })
+      .mockResolvedValueOnce({ id: "msg2", channel_id: "t1" });
+
+    await createThreadDiscord(
+      "chan1",
+      { name: "thread", content: "a".repeat(2001) },
+      {
+        ...discordClientOpts(rest),
+        retry: { attempts: 2, minDelayMs: 0, maxDelayMs: 0, jitter: 0 },
+      },
+    );
+
+    expect(postMock).toHaveBeenCalledTimes(4);
+    const firstAttempt = requestBody(postMock as unknown as MockCallSource, 1);
+    const retryAttempt = requestBody(postMock as unknown as MockCallSource, 2);
+    const nextChunk = requestBody(postMock as unknown as MockCallSource, 3);
+    expect(firstAttempt.enforce_nonce).toBe(true);
+    expect(retryAttempt.nonce).toBe(firstAttempt.nonce);
+    expect(nextChunk.enforce_nonce).toBe(true);
+    expect(nextChunk.nonce).not.toBe(firstAttempt.nonce);
+  });
+
   it("keeps created non-forum thread details when initial message send fails", async () => {
     const { rest, getMock, postMock } = makeDiscordRest();
     getMock.mockResolvedValue({ type: ChannelType.GuildText });
@@ -483,6 +723,7 @@ describe("sendMessageDiscord", () => {
     expect(thrown).toBeInstanceOf(DiscordThreadInitialMessageError);
     const error = requireRecord(thrown, "thread initial message error");
     expect(error.name).toBe("DiscordThreadInitialMessageError");
+    expect(error.message).toContain("initial message delivery could not be confirmed");
     expect(error.initialMessageError).toBe("missing access");
     expect(error.thread).toEqual({ id: "t1", name: "thread", type: ChannelType.PublicThread });
   });
@@ -507,8 +748,9 @@ describe("sendMessageDiscord", () => {
     expect(requestPath(postMock as unknown as MockCallSource, 1)).toBe(
       Routes.channelMessages("t1"),
     );
-    expect(requestBody(postMock as unknown as MockCallSource, 1)).toEqual({
+    expect(requestBody(postMock as unknown as MockCallSource, 1)).toMatchObject({
       content: "Discussion here",
+      enforce_nonce: true,
     });
   });
 
diff --git a/extensions/discord/src/send.messages.ts b/extensions/discord/src/send.messages.ts
index 63699b2708f7..d5a9d459b39e 100644
--- a/extensions/discord/src/send.messages.ts
+++ b/extensions/discord/src/send.messages.ts
@@ -3,7 +3,6 @@ import type { APIChannel, APIMessage } from "discord-api-types/v10";
 import { ChannelType } from "discord-api-types/v10";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import {
-  createChannelMessage,
   createThread,
   deleteChannelMessage,
   editChannelMessage,
@@ -18,7 +17,17 @@ import {
   unpinChannelMessage,
 } from "./internal/discord.js";
 import { parseDiscordRetryAfterBodySeconds } from "./retry-after.js";
-import { resolveDiscordRest } from "./send.shared.js";
+import {
+  classifyDiscordDeliveryFailure,
+  recordDiscordMessageCreateAmbiguity,
+  type DiscordRetryRunner,
+} from "./retry.js";
+import {
+  buildDiscordTextChunks,
+  createDiscordClient,
+  resolveDiscordRest,
+  sendDiscordText,
+} from "./send.shared.js";
 import type {
   DiscordMessageEdit,
   DiscordMessageQuery,
@@ -28,6 +37,29 @@ import type {
   DiscordThreadList,
 } from "./send.types.js";
 
+const DISCORD_THREAD_TRANSPORT_ONLY_MAX_LINES = Number.MAX_SAFE_INTEGER;
+
+type DiscordThreadInitialMessageDelivery = Readonly<{
+  starterMessageDelivered: boolean;
+  deliveredChunkCount: number;
+  deliveredMessageIds: readonly string[];
+  failedChunkDelivery: "not_delivered" | "unknown";
+  failedChunkIndex: number;
+  totalChunkCount: number;
+}>;
+
+function resolveDiscordThreadStarterMessageId(thread: APIChannel): string {
+  const starterMessage = "message" in thread ? thread.message : undefined;
+  if (
+    starterMessage &&
+    typeof starterMessage === "object" &&
+    "id" in starterMessage &&
+    typeof starterMessage.id === "string"
+  ) {
+    return starterMessage.id;
+  }
+  return thread.id;
+}
 function assertDiscordResponseArray<T>(value: unknown, label: string): T[] {
   if (!Array.isArray(value)) {
     throw new Error(`Unexpected Discord response for ${label}: expected array.`);
@@ -49,17 +81,43 @@ function resolveDefaultThreadAutoArchiveDuration(channel?: APIChannel): number |
   return channel.default_auto_archive_duration;
 }
 
+function describeDiscordThreadInitialMessageFailure(
+  delivery?: DiscordThreadInitialMessageDelivery,
+): string {
+  if (delivery?.failedChunkDelivery === "unknown") {
+    return delivery.deliveredChunkCount > 0
+      ? "Discord thread was created, but delivery of the remaining initial content could not be confirmed"
+      : "Discord thread was created, but initial message delivery could not be confirmed";
+  }
+  return delivery && delivery.deliveredChunkCount > 0
+    ? "Discord thread was created, but its initial content was only partially delivered"
+    : "Discord thread was created, but sending the initial message failed";
+}
+
 export class DiscordThreadInitialMessageError extends Error {
+  readonly initialMessageDelivery?: DiscordThreadInitialMessageDelivery;
   readonly initialMessageError: string;
+  readonly initialMessageWarning: string;
   readonly thread: APIChannel;
 
-  constructor(thread: APIChannel, error: unknown) {
+  constructor(
+    thread: APIChannel,
+    error: unknown,
+    initialMessageDelivery?: DiscordThreadInitialMessageDelivery,
+  ) {
     const initialMessageError = formatErrorMessage(error);
-    super(
-      `Discord thread was created, but sending the initial message failed: ${initialMessageError}`,
-    );
+    const initialMessageWarning =
+      describeDiscordThreadInitialMessageFailure(initialMessageDelivery);
+    super(`${initialMessageWarning}: ${initialMessageError}`, { cause: error });
     this.name = "DiscordThreadInitialMessageError";
+    this.initialMessageDelivery = initialMessageDelivery
+      ? {
+          ...initialMessageDelivery,
+          deliveredMessageIds: [...initialMessageDelivery.deliveredMessageIds],
+        }
+      : undefined;
     this.initialMessageError = initialMessageError;
+    this.initialMessageWarning = initialMessageWarning;
     this.thread = thread;
   }
 }
@@ -161,7 +219,7 @@ export async function createThreadDiscord(
   payload: DiscordThreadCreate,
   opts: DiscordReactOpts,
 ) {
-  const rest = resolveDiscordRest(opts);
+  const { rest, request } = createDiscordClient(opts);
   const body: Record<string, unknown> = { name: payload.name };
   if (!payload.messageId && payload.type !== undefined) {
     body.type = payload.type;
@@ -183,8 +241,18 @@ export async function createThreadDiscord(
   }
   const isForumLike =
     channel?.type === ChannelType.GuildForum || channel?.type === ChannelType.GuildMedia;
+  const initialMessageContent = isForumLike
+    ? payload.content?.trim()
+      ? payload.content
+      : payload.name
+    : payload.content?.trim()
+      ? payload.content
+      : "";
+  const initialMessageChunks = buildDiscordTextChunks(initialMessageContent, {
+    maxLinesPerMessage: DISCORD_THREAD_TRANSPORT_ONLY_MAX_LINES,
+  });
   if (isForumLike) {
-    const starterContent = payload.content?.trim() ? payload.content : payload.name;
+    const starterContent = initialMessageChunks[0] ?? payload.name;
     body.message = { content: starterContent };
     if (payload.appliedTags?.length) {
       body.applied_tags = payload.appliedTags;
@@ -198,15 +266,56 @@ export async function createThreadDiscord(
   }
   const thread = await createThread(rest, channelId, { body }, payload.messageId);
 
-  // For non-forum channels, send the initial message separately after thread creation.
-  // Forum channels handle this via the `message` field in the request body.
-  if (!isForumLike && payload.content?.trim() && "id" in thread) {
-    try {
-      await createChannelMessage(rest, thread.id, {
-        body: { content: payload.content },
-      });
-    } catch (error) {
-      throw new DiscordThreadInitialMessageError(thread, error);
+  // Forum creation accepts exactly one starter message, so keep the first chunk in the
+  // create request and deliver any remainder after Discord returns the new thread.
+  const followupChunks = isForumLike ? initialMessageChunks.slice(1) : initialMessageChunks;
+  if (followupChunks.length && "id" in thread) {
+    const deliveredMessageIds = isForumLike ? [resolveDiscordThreadStarterMessageId(thread)] : [];
+    let deliveredChunkCount = isForumLike ? 1 : 0;
+    const firstFollowupChunkIndex = isForumLike ? 1 : 0;
+    for (const [followupIndex, content] of followupChunks.entries()) {
+      let chunkMayHaveDelivered = false;
+      const trackedRequest: DiscordRetryRunner = (fn, label, options) =>
+        request(
+          async () => {
+            try {
+              return await fn();
+            } catch (error) {
+              chunkMayHaveDelivered ||= classifyDiscordDeliveryFailure(error) === "ambiguous";
+              throw error;
+            }
+          },
+          label,
+          options,
+        );
+      try {
+        const result = await sendDiscordText({
+          rest,
+          request: trackedRequest,
+          channelId: thread.id,
+          text: content,
+          maxLinesPerMessage: DISCORD_THREAD_TRANSPORT_ONLY_MAX_LINES,
+        });
+        deliveredMessageIds.push(...result.platformMessageIds);
+        deliveredChunkCount += 1;
+      } catch (error) {
+        const finalFailure = classifyDiscordDeliveryFailure(error);
+        const failedChunkDelivery =
+          chunkMayHaveDelivered || finalFailure === "ambiguous" || finalFailure === "unknown"
+            ? "unknown"
+            : "not_delivered";
+        if (failedChunkDelivery === "unknown") {
+          recordDiscordMessageCreateAmbiguity(error);
+        }
+        throw new DiscordThreadInitialMessageError(thread, error, {
+          starterMessageDelivered: isForumLike,
+          deliveredChunkCount,
+          deliveredMessageIds,
+          failedChunkDelivery,
+          failedChunkIndex: firstFollowupChunkIndex + followupIndex,
+          totalChunkCount: initialMessageChunks.length,
+        });
+      }
     }
   }
 

From cd0fb355c7975ada66e414bde76791107d347543 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 22:07:33 -0700
Subject: [PATCH 13/23] refactor(plugin-sdk): remove retired Copilot login
 chain (#122988)

* refactor(plugin-sdk): remove retired Copilot login chain

* chore(plugin-sdk): refresh generated API baselines

* build(github-copilot): remove unused prompt dependency

* chore(plugin-sdk): reconcile API baselines after rebase
---
 .../agent-harness-runtime.json                |   2 +-
 .../agent-harness.json                        |   2 +-
 .../agent-runtime.json                        |   2 +-
 .../plugin-sdk-api-baseline/channel-core.json |   2 +-
 .../channel-entry-contract.json               |   2 +-
 .../channel-message.json                      |   2 +-
 .../channel-outbound.json                     |   2 +-
 .../channel-plugin-common.json                |   2 +-
 .../config-mutation.json                      |   2 +-
 .../config-runtime.json                       |   2 +-
 .../plugin-sdk-api-baseline/core.json         |   2 +-
 .../plugin-sdk-api-baseline/discord.json      |   2 +-
 .../inbound-reply-dispatch.json               |   2 +-
 .../meeting-runtime.json                      |   2 +-
 .../model-session-runtime.json                |   2 +-
 .../plugin-sdk-api-baseline/plugin-entry.json |   2 +-
 .../plugin-runtime.json                       |   2 +-
 .../provider-auth.json                        |   2 +-
 .../provider-catalog-runtime.json             |   2 +-
 .../plugin-sdk-api-baseline/tool-plugin.json  |   2 +-
 .../webhook-ingress.json                      |   2 +-
 extensions/github-copilot/api.ts              |   2 -
 extensions/github-copilot/domain.test.ts      |  35 +-----
 extensions/github-copilot/domain.ts           |  34 ------
 extensions/github-copilot/login.ts            | 104 +-----------------
 extensions/github-copilot/package.json        |   3 -
 pnpm-lock.yaml                                |   4 -
 src/plugin-sdk/github-copilot-login.ts        |  23 ----
 src/plugin-sdk/provider-auth-login.runtime.ts |   4 -
 src/plugins/compat/deprecation-marking.ts     |   3 -
 src/plugins/compat/registry.test.ts           |   2 +-
 31 files changed, 25 insertions(+), 231 deletions(-)
 delete mode 100644 extensions/github-copilot/api.ts
 delete mode 100644 src/plugin-sdk/github-copilot-login.ts
 delete mode 100644 src/plugin-sdk/provider-auth-login.runtime.ts

diff --git a/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json b/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json
index b841616e2324..ff57f49e1c7d 100644
--- a/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/agent-harness-runtime.json
@@ -1 +1 @@
-{"contentHash":"217a982536f2e60f08287ddfa0cb0ce76bead1b5f6a962635f68a3f09cfed955","entrypoint":"agent-harness-runtime","importSpecifier":"openclaw/plugin-sdk/agent-harness-runtime"}
+{"contentHash":"a35378b670434316ba33a3ba4e595925be685daee9fb0f3c5989983525b18c50","entrypoint":"agent-harness-runtime","importSpecifier":"openclaw/plugin-sdk/agent-harness-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/agent-harness.json b/docs/.generated/plugin-sdk-api-baseline/agent-harness.json
index 9a53bdd1cc65..5cf1ada7b53e 100644
--- a/docs/.generated/plugin-sdk-api-baseline/agent-harness.json
+++ b/docs/.generated/plugin-sdk-api-baseline/agent-harness.json
@@ -1 +1 @@
-{"contentHash":"745b6376dc744050f9c9602c6530703eca683fa2cd4a3520efafb8b3a611d93f","entrypoint":"agent-harness","importSpecifier":"openclaw/plugin-sdk/agent-harness"}
+{"contentHash":"b9c074a11791688e63213f51099ea21745b0e554f63ed13e694ea34a3e4328ac","entrypoint":"agent-harness","importSpecifier":"openclaw/plugin-sdk/agent-harness"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/agent-runtime.json b/docs/.generated/plugin-sdk-api-baseline/agent-runtime.json
index c395276b2e6d..d9524be6ed7d 100644
--- a/docs/.generated/plugin-sdk-api-baseline/agent-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/agent-runtime.json
@@ -1 +1 @@
-{"contentHash":"279ca366d222d694f91fdaa9233c86f0ee6c388bdffffeb2b5093aed27a4ab4c","entrypoint":"agent-runtime","importSpecifier":"openclaw/plugin-sdk/agent-runtime"}
+{"contentHash":"0a014810b900e53959679fa292ed45cb0f1a1a3cc6b1129021bfa63b871f8e68","entrypoint":"agent-runtime","importSpecifier":"openclaw/plugin-sdk/agent-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-core.json b/docs/.generated/plugin-sdk-api-baseline/channel-core.json
index 2990f88d3ee4..31b85bb7faaa 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-core.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-core.json
@@ -1 +1 @@
-{"contentHash":"2e41ca681490aaea3880512777c6e42bb945e3c19b6a1a0ae8082c5a5d69a787","entrypoint":"channel-core","importSpecifier":"openclaw/plugin-sdk/channel-core"}
+{"contentHash":"d8b7c867b29b4651375455e938ae634e7213e3e8c17444dc2b0ef091e46fda6c","entrypoint":"channel-core","importSpecifier":"openclaw/plugin-sdk/channel-core"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json b/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json
index bbc8e127239c..94ceeb3194f9 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-entry-contract.json
@@ -1 +1 @@
-{"contentHash":"c1ec7b510bc71f3dcbda3da1e389536818088a0a5624b269c731aa8ceb0bcc5d","entrypoint":"channel-entry-contract","importSpecifier":"openclaw/plugin-sdk/channel-entry-contract"}
+{"contentHash":"883bbab77caeff122bf8b7505dc9299484fba601e285a42d2c457697b7590b8e","entrypoint":"channel-entry-contract","importSpecifier":"openclaw/plugin-sdk/channel-entry-contract"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-message.json b/docs/.generated/plugin-sdk-api-baseline/channel-message.json
index b24cc0cc96fe..205deefc917c 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-message.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-message.json
@@ -1 +1 @@
-{"contentHash":"eee5b7e929fd8b1ed3033e7828c05742ac9490506d5ebc80087b830510c15473","entrypoint":"channel-message","importSpecifier":"openclaw/plugin-sdk/channel-message"}
+{"contentHash":"2f85610859f047db1d76efbe52d9e63d8126ce8e944d53d6fdafb4e7f503b5dc","entrypoint":"channel-message","importSpecifier":"openclaw/plugin-sdk/channel-message"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json b/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json
index 8e0584597ab0..f1ffe9571fdc 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-outbound.json
@@ -1 +1 @@
-{"contentHash":"1aa4d0540178a6a8ab2eab4cebfb205604fd46a73de21b2f07cda94e01740608","entrypoint":"channel-outbound","importSpecifier":"openclaw/plugin-sdk/channel-outbound"}
+{"contentHash":"6b1f575e77dc71e72c4b2575f366e7e9990d391e85364844e0ecec2146e7f902","entrypoint":"channel-outbound","importSpecifier":"openclaw/plugin-sdk/channel-outbound"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json b/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json
index b3eca52d42bf..a6647ae1cf97 100644
--- a/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json
+++ b/docs/.generated/plugin-sdk-api-baseline/channel-plugin-common.json
@@ -1 +1 @@
-{"contentHash":"709ac41f57c2327e19c241f8cb399752cf9e0294f00243e21c24698b06c480b6","entrypoint":"channel-plugin-common","importSpecifier":"openclaw/plugin-sdk/channel-plugin-common"}
+{"contentHash":"72d713de6cb87ad8e6d9c49456477367a2d30c8157695ddb66ac57919558272b","entrypoint":"channel-plugin-common","importSpecifier":"openclaw/plugin-sdk/channel-plugin-common"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/config-mutation.json b/docs/.generated/plugin-sdk-api-baseline/config-mutation.json
index bdcf1e35f34b..18d68e0be4e8 100644
--- a/docs/.generated/plugin-sdk-api-baseline/config-mutation.json
+++ b/docs/.generated/plugin-sdk-api-baseline/config-mutation.json
@@ -1 +1 @@
-{"contentHash":"eabfc0558c4a4b904d69fcb0b77c67eee1b5f09e8f2d7c8ed297aae7978db3b7","entrypoint":"config-mutation","importSpecifier":"openclaw/plugin-sdk/config-mutation"}
+{"contentHash":"9bcbdee2499e17f5411a42bd45919dfcd7cac92f12e7b0d034b519bbc46c70c5","entrypoint":"config-mutation","importSpecifier":"openclaw/plugin-sdk/config-mutation"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/config-runtime.json b/docs/.generated/plugin-sdk-api-baseline/config-runtime.json
index fd036892e527..5b741b271be5 100644
--- a/docs/.generated/plugin-sdk-api-baseline/config-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/config-runtime.json
@@ -1 +1 @@
-{"contentHash":"0c33e9b6da738eb7627dbcdb324cc90d93c24c844d8777ee7eff9573e5e90a3b","entrypoint":"config-runtime","importSpecifier":"openclaw/plugin-sdk/config-runtime"}
+{"contentHash":"770e079b242b9c56e8876f8fd08b402a78f1870367dca19d006ef147f9d493a4","entrypoint":"config-runtime","importSpecifier":"openclaw/plugin-sdk/config-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/core.json b/docs/.generated/plugin-sdk-api-baseline/core.json
index fa9e4b1e892e..f0957d7f1ba9 100644
--- a/docs/.generated/plugin-sdk-api-baseline/core.json
+++ b/docs/.generated/plugin-sdk-api-baseline/core.json
@@ -1 +1 @@
-{"contentHash":"65b5c7028bd61f6208a3f69b870bb5b783b03005ceaba75c1d0d54ce7c82f293","entrypoint":"core","importSpecifier":"openclaw/plugin-sdk/core"}
+{"contentHash":"2ccfe8eb85378f3be3f78f79f2638b00faa943e351ff69464bfed44ed63e09c1","entrypoint":"core","importSpecifier":"openclaw/plugin-sdk/core"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/discord.json b/docs/.generated/plugin-sdk-api-baseline/discord.json
index f267aef17d6f..c9fa00676e85 100644
--- a/docs/.generated/plugin-sdk-api-baseline/discord.json
+++ b/docs/.generated/plugin-sdk-api-baseline/discord.json
@@ -1 +1 @@
-{"contentHash":"65c0ba8a1690c042f0db0b9ab3433d257177734d5b83ff41d418f6b0cb817301","entrypoint":"discord","importSpecifier":"openclaw/plugin-sdk/discord"}
+{"contentHash":"d23cd5df763235dbe35ede1c23d26735f4c183b03dc216ac212aefe75c0c1f96","entrypoint":"discord","importSpecifier":"openclaw/plugin-sdk/discord"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json b/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json
index 61c33e06184e..ccf2daaf63e6 100644
--- a/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json
+++ b/docs/.generated/plugin-sdk-api-baseline/inbound-reply-dispatch.json
@@ -1 +1 @@
-{"contentHash":"39982625a0bb3d57be7180289dd824a89c514285dd62433005e42c2da866e0c6","entrypoint":"inbound-reply-dispatch","importSpecifier":"openclaw/plugin-sdk/inbound-reply-dispatch"}
+{"contentHash":"f57a244e027b326090ed91cdc105c0c8c83b24318d99be0ec205fffd33504050","entrypoint":"inbound-reply-dispatch","importSpecifier":"openclaw/plugin-sdk/inbound-reply-dispatch"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json b/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json
index 6fce4219b9c4..a4180100b928 100644
--- a/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/meeting-runtime.json
@@ -1 +1 @@
-{"contentHash":"9462b8d4ca13d7669da993a6b94d4add39ee1f95979e11c636348f008ee087a0","entrypoint":"meeting-runtime","importSpecifier":"openclaw/plugin-sdk/meeting-runtime"}
+{"contentHash":"5008615c80d86383e18527d71442f1501e4f02bdb3faa1494a48edf40fd66f84","entrypoint":"meeting-runtime","importSpecifier":"openclaw/plugin-sdk/meeting-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/model-session-runtime.json b/docs/.generated/plugin-sdk-api-baseline/model-session-runtime.json
index 4c722583f968..bf326a52a6cb 100644
--- a/docs/.generated/plugin-sdk-api-baseline/model-session-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/model-session-runtime.json
@@ -1 +1 @@
-{"contentHash":"fa78e49abb6b94784740bffdbe267b310bee1a6fbe12b1204182d749d8bc0c43","entrypoint":"model-session-runtime","importSpecifier":"openclaw/plugin-sdk/model-session-runtime"}
+{"contentHash":"034bb7d9d0e7b1d8f0176c30c409db9f9f013a1c507eea53beb5c3da1d807340","entrypoint":"model-session-runtime","importSpecifier":"openclaw/plugin-sdk/model-session-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json b/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json
index f9b12410c2b6..d7bd00e6e002 100644
--- a/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json
+++ b/docs/.generated/plugin-sdk-api-baseline/plugin-entry.json
@@ -1 +1 @@
-{"contentHash":"3247b08bfc168591580c57393621143028070133f483a39518955c6f010a0dc4","entrypoint":"plugin-entry","importSpecifier":"openclaw/plugin-sdk/plugin-entry"}
+{"contentHash":"6b73741c889f68cc19a5d1f8703df2eca650fe57803795045cff122d746cbb6a","entrypoint":"plugin-entry","importSpecifier":"openclaw/plugin-sdk/plugin-entry"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json b/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json
index 050f572dd199..b8e9d32eb33e 100644
--- a/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/plugin-runtime.json
@@ -1 +1 @@
-{"contentHash":"936059292ea538ea8118ac479121b97c8d700526be71b93016678821b59c86e6","entrypoint":"plugin-runtime","importSpecifier":"openclaw/plugin-sdk/plugin-runtime"}
+{"contentHash":"15704fc50b81cebceb677a5a69a7bc8c97afd962081c647de58a027bd816f19d","entrypoint":"plugin-runtime","importSpecifier":"openclaw/plugin-sdk/plugin-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/provider-auth.json b/docs/.generated/plugin-sdk-api-baseline/provider-auth.json
index 1fc9d0b01933..1657b605ae7a 100644
--- a/docs/.generated/plugin-sdk-api-baseline/provider-auth.json
+++ b/docs/.generated/plugin-sdk-api-baseline/provider-auth.json
@@ -1 +1 @@
-{"contentHash":"e2ef3ba2f2196a04530aea5fdcdbf02e064f6c4cf193fcf56cbbc84869e69109","entrypoint":"provider-auth","importSpecifier":"openclaw/plugin-sdk/provider-auth"}
+{"contentHash":"2c97bf2bccffb72065e3432432788926559cdc97f77a129786c4cc91246882a4","entrypoint":"provider-auth","importSpecifier":"openclaw/plugin-sdk/provider-auth"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json b/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json
index 7b6b36d51e36..3153f34476f5 100644
--- a/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json
+++ b/docs/.generated/plugin-sdk-api-baseline/provider-catalog-runtime.json
@@ -1 +1 @@
-{"contentHash":"49563f6f32ae3ac798763943dfa47d79c50c2146cc8ab7bcd3cd8c565e29785e","entrypoint":"provider-catalog-runtime","importSpecifier":"openclaw/plugin-sdk/provider-catalog-runtime"}
+{"contentHash":"df8043d0630d95bc4c316da28bf675a713e7f1f0c304959d1b4b9c8b30fcbd0d","entrypoint":"provider-catalog-runtime","importSpecifier":"openclaw/plugin-sdk/provider-catalog-runtime"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json b/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json
index 294de8174d3b..b48deb66cf47 100644
--- a/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json
+++ b/docs/.generated/plugin-sdk-api-baseline/tool-plugin.json
@@ -1 +1 @@
-{"contentHash":"bf6001fd4e14f91ed6dde159c7bb7046814dedad33953a9ce473e2d8bd8fb3d4","entrypoint":"tool-plugin","importSpecifier":"openclaw/plugin-sdk/tool-plugin"}
+{"contentHash":"8b0c71c8abe13163eee28ca65e6afb490d0ae3c16288292143ad021975b96ca6","entrypoint":"tool-plugin","importSpecifier":"openclaw/plugin-sdk/tool-plugin"}
diff --git a/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json b/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json
index b0a34ab7b3c6..bb5a15cdc566 100644
--- a/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json
+++ b/docs/.generated/plugin-sdk-api-baseline/webhook-ingress.json
@@ -1 +1 @@
-{"contentHash":"a73d6fd876fa9a2a32fdd0972f8655a5160652c6bbbbc93ee8e5a03787dbb0be","entrypoint":"webhook-ingress","importSpecifier":"openclaw/plugin-sdk/webhook-ingress"}
+{"contentHash":"eb0096fd25551a7f4a58dcf6c6b53120f3f1ddc1248b2b962cca60c75f6daa12","entrypoint":"webhook-ingress","importSpecifier":"openclaw/plugin-sdk/webhook-ingress"}
diff --git a/extensions/github-copilot/api.ts b/extensions/github-copilot/api.ts
deleted file mode 100644
index eade8e3e3dc5..000000000000
--- a/extensions/github-copilot/api.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Github Copilot API module exposes the plugin public contract.
-export { githubCopilotLoginCommand } from "./login.js";
diff --git a/extensions/github-copilot/domain.test.ts b/extensions/github-copilot/domain.test.ts
index fcf173197c47..4fd14bdfd61e 100644
--- a/extensions/github-copilot/domain.test.ts
+++ b/extensions/github-copilot/domain.test.ts
@@ -1,9 +1,5 @@
 import { describe, expect, it } from "vitest";
-import {
-  PUBLIC_GITHUB_COPILOT_DOMAIN,
-  resolveGithubCopilotDomain,
-  withGithubCopilotDomainConfig,
-} from "./domain.js";
+import { PUBLIC_GITHUB_COPILOT_DOMAIN, resolveGithubCopilotDomain } from "./domain.js";
 
 describe("github-copilot domain resolution", () => {
   const withDomain = (githubDomain: string) =>
@@ -40,32 +36,3 @@ describe("github-copilot domain resolution", () => {
     );
   });
 });
-
-describe("withGithubCopilotDomainConfig", () => {
-  const tenantConfig = {
-    models: {
-      providers: { "github-copilot": { params: { githubDomain: "acme.ghe.com" } } },
-    },
-  } as never;
-
-  it("persists the tenant domain when login minted a tenant token", () => {
-    const next = withGithubCopilotDomainConfig({} as never, "acme.ghe.com");
-    expect(
-      (next as { models?: { providers?: Record<string, { params?: Record<string, unknown> }> } })
-        .models?.providers?.["github-copilot"]?.params?.githubDomain,
-    ).toBe("acme.ghe.com");
-  });
-
-  it("clears a stale tenant domain after public login", () => {
-    const next = withGithubCopilotDomainConfig(tenantConfig, "github.com");
-    const params = (
-      next as { models?: { providers?: Record<string, { params?: Record<string, unknown> }> } }
-    ).models?.providers?.["github-copilot"]?.params;
-    expect(params && "githubDomain" in params).toBe(false);
-  });
-
-  it("leaves config untouched for public login without persisted domain", () => {
-    const cfg = {} as never;
-    expect(withGithubCopilotDomainConfig(cfg, "github.com")).toBe(cfg);
-  });
-});
diff --git a/extensions/github-copilot/domain.ts b/extensions/github-copilot/domain.ts
index 1a8d1971cb96..47223bf60700 100644
--- a/extensions/github-copilot/domain.ts
+++ b/extensions/github-copilot/domain.ts
@@ -54,37 +54,3 @@ export function resolveGithubCopilotDomain(params?: {
   }
   return normalizeGithubCopilotDomain(readConfiguredGithubCopilotDomain(params?.config));
 }
-
-// Shortcut login must persist its token's tenant. A missing domain would route
-// the tenant token back to github.com after the environment override is removed.
-export function withGithubCopilotDomainConfig(cfg: OpenClawConfig, domain: string): OpenClawConfig {
-  const models: NonNullable<OpenClawConfig["models"]> = cfg.models ?? {};
-  const providers: NonNullable<typeof models.providers> = models.providers ?? {};
-  const provider = providers["github-copilot"];
-  const params = provider?.params;
-  const isDefault = domain === PUBLIC_GITHUB_COPILOT_DOMAIN;
-  if (isDefault && !(params && "githubDomain" in params)) {
-    return cfg;
-  }
-  const nextParams: Record<string, unknown> = { ...params };
-  if (isDefault) {
-    delete nextParams.githubDomain;
-  } else {
-    nextParams.githubDomain = domain;
-  }
-  const nextProviders = { ...providers };
-  if (provider) {
-    nextProviders["github-copilot"] = { ...provider, params: nextParams };
-  } else {
-    // Source config accepts partial provider inputs; catalog materialization
-    // supplies baseUrl/models before runtime consumption.
-    Object.assign(nextProviders, { "github-copilot": { params: nextParams } });
-  }
-  return {
-    ...cfg,
-    models: {
-      ...models,
-      providers: nextProviders,
-    },
-  };
-}
diff --git a/extensions/github-copilot/login.ts b/extensions/github-copilot/login.ts
index 8e9a371b5fd4..0b532590d9e9 100644
--- a/extensions/github-copilot/login.ts
+++ b/extensions/github-copilot/login.ts
@@ -1,27 +1,14 @@
 // Github Copilot plugin module implements login behavior.
-import { intro, note, outro, spinner } from "@clack/prompts";
-import { stylePromptTitle } from "openclaw/plugin-sdk/cli-runtime";
-import { logConfigUpdated, updateConfig } from "openclaw/plugin-sdk/config-mutation";
 import {
   resolveExpiresAtMsFromDurationMs,
   nonNegativeSecondsToSafeMilliseconds,
   positiveSecondsToSafeMilliseconds,
   resolveTimerTimeoutMs,
 } from "openclaw/plugin-sdk/number-runtime";
-import {
-  applyAuthProfileConfig,
-  ensureAuthProfileStore,
-  normalizeGithubCopilotDomain,
-} from "openclaw/plugin-sdk/provider-auth";
-import { upsertAuthProfileWithLockOrThrow } from "openclaw/plugin-sdk/provider-auth-api-key";
+import { normalizeGithubCopilotDomain } from "openclaw/plugin-sdk/provider-auth";
 import { readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";
-import type { RuntimeEnv } from "openclaw/plugin-sdk/runtime";
 import { fetchWithSsrFGuard, type SsrFPolicy } from "openclaw/plugin-sdk/ssrf-runtime";
-import {
-  PUBLIC_GITHUB_COPILOT_DOMAIN,
-  resolveGithubCopilotDomain,
-  withGithubCopilotDomainConfig,
-} from "./domain.js";
+import { PUBLIC_GITHUB_COPILOT_DOMAIN } from "./domain.js";
 
 const CLIENT_ID = "Iv1.b507a08c87ecfe98";
 const GITHUB_DEVICE_FLOW_REQUEST_TIMEOUT_MS = 30_000;
@@ -360,90 +347,3 @@ export async function runGitHubCopilotDeviceFlow(
     throw err;
   }
 }
-
-export async function githubCopilotLoginCommand(
-  opts: { profileId?: string; yes?: boolean; agentDir?: string },
-  runtime: RuntimeEnv,
-) {
-  if (!process.stdin.isTTY) {
-    throw new Error("github-copilot login requires an interactive TTY.");
-  }
-
-  intro(stylePromptTitle("GitHub Copilot login"));
-
-  const profileId = opts.profileId?.trim() || "github-copilot:github";
-  const store = ensureAuthProfileStore(opts.agentDir, {
-    allowKeychainPrompt: false,
-  });
-
-  if (store.profiles[profileId] && !opts.yes) {
-    note(
-      `Auth profile already exists: ${profileId}\nRe-running will overwrite it.`,
-      stylePromptTitle("Existing credentials"),
-    );
-  }
-
-  // Mint against the same host the runtime will route to. resolveGithubCopilotDomain
-  // is env-authoritative (COPILOT_GITHUB_DOMAIN wins), and runtime authentication
-  // uses the same resolver, so honoring it here keeps the minted token and the
-  // runtime endpoint on the same tenant instead of minting a public token that
-  // then 401s against api.<tenant>.
-  const domain = resolveGithubCopilotDomain();
-  if (domain !== PUBLIC_GITHUB_COPILOT_DOMAIN) {
-    note(
-      `Using the GitHub Enterprise domain from COPILOT_GITHUB_DOMAIN (${domain}). Unset it to log in against github.com.`,
-      stylePromptTitle("GitHub Copilot"),
-    );
-  }
-
-  const spin = spinner();
-  spin.start(`Requesting device code from ${domain}...`);
-  const device = await requestDeviceCode({
-    scope: "read:user",
-    domain,
-  });
-  spin.stop("Device code ready");
-
-  note(
-    [`Visit: ${device.verificationUri}`, `Code: ${device.userCode}`].join("\n"),
-    stylePromptTitle("Authorize"),
-  );
-
-  const intervalMs = Math.max(1000, device.intervalMs);
-
-  const polling = spinner();
-  polling.start("Waiting for GitHub authorization...");
-  const accessToken = await pollForAccessToken({
-    deviceCode: device.deviceCode,
-    intervalMs,
-    expiresAt: device.expiresAt,
-    domain,
-  });
-  polling.stop("GitHub access token acquired");
-
-  await upsertAuthProfileWithLockOrThrow({
-    profileId,
-    credential: {
-      type: "token",
-      provider: "github-copilot",
-      token: accessToken,
-    },
-    agentDir: opts.agentDir,
-  });
-
-  await updateConfig((cfg) =>
-    withGithubCopilotDomainConfig(
-      applyAuthProfileConfig(cfg, {
-        provider: "github-copilot",
-        profileId,
-        mode: "token",
-      }),
-      domain,
-    ),
-  );
-
-  logConfigUpdated(runtime);
-  runtime.log(`Auth profile: ${profileId} (github-copilot/token)`);
-
-  outro("Done");
-}
diff --git a/extensions/github-copilot/package.json b/extensions/github-copilot/package.json
index e42b82423b40..3c5db97aec70 100644
--- a/extensions/github-copilot/package.json
+++ b/extensions/github-copilot/package.json
@@ -4,9 +4,6 @@
   "private": true,
   "description": "OpenClaw GitHub Copilot provider plugin",
   "type": "module",
-  "dependencies": {
-    "@clack/prompts": "1.7.0"
-  },
   "devDependencies": {
     "@openclaw/plugin-sdk": "workspace:*"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 655116a0213f..0bd4ce87c59d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -951,10 +951,6 @@ importers:
         version: link:../../packages/plugin-sdk
 
   extensions/github-copilot:
-    dependencies:
-      '@clack/prompts':
-        specifier: 1.7.0
-        version: 1.7.0
     devDependencies:
       '@openclaw/plugin-sdk':
         specifier: workspace:*
diff --git a/src/plugin-sdk/github-copilot-login.ts b/src/plugin-sdk/github-copilot-login.ts
deleted file mode 100644
index 88f90b2e6d2f..000000000000
--- a/src/plugin-sdk/github-copilot-login.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Manual facade. Keep loader boundary explicit.
-import type { RuntimeEnv } from "../runtime.js";
-import { loadBundledPluginPublicSurfaceModuleSyncCore } from "./facade-loader.js";
-
-type FacadeModule = {
-  githubCopilotLoginCommand: (
-    opts: { profileId?: string; yes?: boolean; agentDir?: string },
-    runtime: RuntimeEnv,
-  ) => Promise<void>;
-};
-
-function loadFacadeModule(): FacadeModule {
-  return loadBundledPluginPublicSurfaceModuleSyncCore<FacadeModule>({
-    dirName: "github-copilot",
-    artifactBasename: "api.js",
-  });
-}
-
-/** @deprecated GitHub Copilot provider-owned login helper; use provider auth hooks instead. */
-export const githubCopilotLoginCommand: FacadeModule["githubCopilotLoginCommand"] = ((...args) =>
-  loadFacadeModule()["githubCopilotLoginCommand"](
-    ...args,
-  )) as FacadeModule["githubCopilotLoginCommand"];
diff --git a/src/plugin-sdk/provider-auth-login.runtime.ts b/src/plugin-sdk/provider-auth-login.runtime.ts
deleted file mode 100644
index d0c7123d40aa..000000000000
--- a/src/plugin-sdk/provider-auth-login.runtime.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/** @deprecated Provider-owned login helpers; use provider auth hooks instead. */
-export { loginOpenAICodexOAuth } from "../plugins/provider-openai-chatgpt-oauth.js";
-/** @deprecated Provider-owned login helpers; use provider auth hooks instead. */
-export { githubCopilotLoginCommand } from "./github-copilot-login.js";
diff --git a/src/plugins/compat/deprecation-marking.ts b/src/plugins/compat/deprecation-marking.ts
index 58a3621f65d3..25114576f2ba 100644
--- a/src/plugins/compat/deprecation-marking.ts
+++ b/src/plugins/compat/deprecation-marking.ts
@@ -119,10 +119,7 @@ export const DEPRECATION_MARKING_COMPAT_RECORDS = [
       "openclaw/plugin-sdk/provider-auth DEFAULT_COPILOT_API_BASE_URL",
       "openclaw/plugin-sdk/provider-auth deriveCopilotApiBaseUrlFromToken",
       "openclaw/plugin-sdk/provider-auth resolveCopilotApiToken",
-      "openclaw/plugin-sdk/provider-auth-login.runtime loginOpenAICodexOAuth",
-      "openclaw/plugin-sdk/provider-auth-login.runtime githubCopilotLoginCommand",
       "openclaw/plugin-sdk/provider-auth-copilot-cache CachedCopilotToken",
-      "openclaw/plugin-sdk/github-copilot-login githubCopilotLoginCommand",
       "openclaw/plugin-sdk/oauth-utils toFormUrlEncoded",
       "openclaw/plugin-sdk/oauth-utils generatePkceVerifierChallenge",
       "openclaw/plugin-sdk/provider-oauth-runtime OAuthProvider",
diff --git a/src/plugins/compat/registry.test.ts b/src/plugins/compat/registry.test.ts
index 1bc4fc7789b6..71d0b64dfd84 100644
--- a/src/plugins/compat/registry.test.ts
+++ b/src/plugins/compat/registry.test.ts
@@ -50,7 +50,7 @@ const deprecationMarkingCodes = [
 const deprecationMarkingSurfaceCounts: Record<(typeof deprecationMarkingCodes)[number], number> = {
   "plugin-sdk-channel-setup-input-fields": 22,
   "plugin-sdk-broad-runtime-barrels": 12,
-  "plugin-sdk-provider-owned-helper-shims": 34,
+  "plugin-sdk-provider-owned-helper-shims": 31,
   "message-presentation-legacy-bridges": 21,
   "plugin-sdk-focused-compat-aliases": 23,
   "agent-harness-terminal-result-aliases": 10,

From 1e7a76f49cc87a5bdfac2651584db1dc6cc4a80d Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Thu, 13 Aug 2026 13:07:55 +0800
Subject: [PATCH 14/23] fix(e2e): declare agents-delete fixture owners
 (#123000)

---
 scripts/e2e/lib/fixtures/workspace.mjs  |  2 ++
 test/scripts/fixtures-workspace.test.ts | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/scripts/e2e/lib/fixtures/workspace.mjs b/scripts/e2e/lib/fixtures/workspace.mjs
index 2632e2434400..139d3dc599e7 100644
--- a/scripts/e2e/lib/fixtures/workspace.mjs
+++ b/scripts/e2e/lib/fixtures/workspace.mjs
@@ -30,6 +30,8 @@ function writeAgentsDeleteConfig() {
   fs.mkdirSync(sharedWorkspace, { recursive: true });
   writeJson(path.join(stateDir, "openclaw.json"), {
     agents: {
+      ownership: "explicit",
+      defaults: { heartbeat: { agentId: "main" } },
       entries: {
         main: { workspace: sharedWorkspace },
         ops: { workspace: sharedWorkspace },
diff --git a/test/scripts/fixtures-workspace.test.ts b/test/scripts/fixtures-workspace.test.ts
index dbc6865f4983..ed4808b75987 100644
--- a/test/scripts/fixtures-workspace.test.ts
+++ b/test/scripts/fixtures-workspace.test.ts
@@ -21,6 +21,17 @@ function runAgentsDeleteAssert(root: string, outputPath: string, env: Record<str
   });
 }
 
+function runAgentsDeleteConfig(root: string) {
+  const stateDir = path.join(root, "state");
+  const workspace = path.join(root, "workspace");
+  mkdirSync(stateDir, { recursive: true });
+  const result = spawnSync(process.execPath, [FIXTURE_SCRIPT, "agents-delete-config"], {
+    encoding: "utf8",
+    env: { ...process.env, OPENCLAW_STATE_DIR: stateDir, SHARED_WORKSPACE: workspace },
+  });
+  return { result, stateDir, workspace };
+}
+
 function runOpenWebUiWorkspace(workspaceDir: string) {
   return spawnSync(process.execPath, [FIXTURE_SCRIPT, "openwebui-workspace"], {
     encoding: "utf8",
@@ -32,6 +43,18 @@ function runOpenWebUiWorkspace(workspaceDir: string) {
 }
 
 describe("workspace fixture assertions", () => {
+  it("writes explicit owners for the shared-workspace agents", () => {
+    const root = tempDirs.make("openclaw-fixture-workspace-");
+    const { result, stateDir, workspace } = runAgentsDeleteConfig(root);
+
+    expect(result.status).toBe(0);
+    expect(JSON.parse(readFileSync(path.join(stateDir, "openclaw.json"), "utf8")).agents).toEqual({
+      ownership: "explicit",
+      defaults: { heartbeat: { agentId: "main" } },
+      entries: { main: { workspace }, ops: { workspace } },
+    });
+  });
+
   it("prepares Open WebUI without retired workspace setup state", () => {
     const root = mkdtempSync(path.join(tmpdir(), "openclaw-fixture-workspace-"));
     const workspaceDir = path.join(root, "workspace");

From f8fcfe34b9f49b985108148d4a584126ea3de3cb Mon Sep 17 00:00:00 2001
From: Dallin Romney <dallinromney@gmail.com>
Date: Thu, 13 Aug 2026 12:08:41 +0700
Subject: [PATCH 15/23] fix(sessions): preserve pinned sessions during
 maintenance (#122990)

---
 .../session-accessor.conformance.test.ts      | 71 +++++++++++++++++++
 src/config/sessions/store-maintenance.ts      |  4 +-
 src/config/sessions/store.pruning.test.ts     | 28 ++++++++
 3 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/src/config/sessions/session-accessor.conformance.test.ts b/src/config/sessions/session-accessor.conformance.test.ts
index 36d303641025..a226bc533f69 100644
--- a/src/config/sessions/session-accessor.conformance.test.ts
+++ b/src/config/sessions/session-accessor.conformance.test.ts
@@ -1660,6 +1660,77 @@ describe("sqlite session normalization", () => {
     ).toEqual(["agent:main:newer", "agent:main:newest"]);
   });
 
+  it("preserves pinned SQLite entries and transcripts during write-triggered capping", async () => {
+    vi.mocked(getRuntimeConfig).mockReturnValue({
+      session: {
+        maintenance: {
+          mode: "enforce",
+          pruneAfter: "365d",
+          maxEntries: 2,
+        },
+      },
+    });
+    const env = { ...process.env, OPENCLAW_STATE_DIR: paths.stateDir };
+    const scopeFor = (sessionKey: string) => ({
+      agentId: "main",
+      env,
+      sessionKey,
+      storePath: paths.sqlitePath,
+    });
+    const pinnedKey = "agent:main:pinned-dashboard";
+    const pinnedSessionId = "pinned-dashboard-session";
+    const pinnedTranscriptEvent = {
+      id: "pinned-event",
+      timestamp: new Date().toISOString(),
+      type: "metadata",
+    };
+
+    await patchSessionEntryCore(
+      scopeFor(pinnedKey),
+      () => ({ sessionId: pinnedSessionId, updatedAt: 1, pinnedAt: 2 }),
+      {
+        fallbackEntry: { sessionId: pinnedSessionId, updatedAt: 1, pinnedAt: 2 },
+        replaceEntry: true,
+        skipMaintenance: true,
+      },
+    );
+    await appendTranscriptEvent(
+      { ...scopeFor(pinnedKey), sessionId: pinnedSessionId },
+      pinnedTranscriptEvent,
+    );
+    await patchSessionEntryCore(
+      scopeFor("agent:main:recent-dashboard"),
+      () => ({ sessionId: "recent-dashboard-session", updatedAt: 3 }),
+      {
+        fallbackEntry: { sessionId: "recent-dashboard-session", updatedAt: 3 },
+        replaceEntry: true,
+        skipMaintenance: true,
+      },
+    );
+
+    await patchSessionEntryCore(
+      scopeFor("agent:main:maintenance-trigger"),
+      () => ({ sessionId: "maintenance-trigger-session", updatedAt: 4 }),
+      {
+        fallbackEntry: { sessionId: "maintenance-trigger-session", updatedAt: 4 },
+        replaceEntry: true,
+      },
+    );
+
+    expect(loadSessionEntry(scopeFor(pinnedKey))).toMatchObject({
+      pinnedAt: 2,
+      sessionId: pinnedSessionId,
+    });
+    await expect(
+      loadTranscriptEvents({
+        agentId: "main",
+        env,
+        sessionId: pinnedSessionId,
+        storePath: paths.sqlitePath,
+      }),
+    ).resolves.toEqual([pinnedTranscriptEvent]);
+  });
+
   it("preserves an admitted SQLite session when another session triggers maintenance", async () => {
     vi.mocked(getRuntimeConfig).mockReturnValue({
       session: {
diff --git a/src/config/sessions/store-maintenance.ts b/src/config/sessions/store-maintenance.ts
index ecabc57142d0..70dbd34cefae 100644
--- a/src/config/sessions/store-maintenance.ts
+++ b/src/config/sessions/store-maintenance.ts
@@ -428,8 +428,8 @@ export function shouldPreserveMaintenanceEntry(params: {
   entry: SessionEntry | undefined;
   preserveKeys?: ReadonlySet<string>;
 }): boolean {
-  // Archived sessions are user-shelved; only an explicit sessions.delete may remove them.
-  if (params.entry?.archivedAt !== undefined) {
+  // Archived and pinned sessions are user-retained; only an explicit user action may release them.
+  if (params.entry?.archivedAt !== undefined || params.entry?.pinnedAt !== undefined) {
     return true;
   }
   // A model lock is durable harness ownership, not merely a UI restriction.
diff --git a/src/config/sessions/store.pruning.test.ts b/src/config/sessions/store.pruning.test.ts
index a5ef6e11a16a..5ad86652ac26 100644
--- a/src/config/sessions/store.pruning.test.ts
+++ b/src/config/sessions/store.pruning.test.ts
@@ -142,6 +142,20 @@ describe("pruneStaleEntries", () => {
     expect(pruneStaleEntries(store, 30 * DAY_MS)).toBe(1);
     expect(store.archived).toBeUndefined();
   });
+
+  it("preserves pinned entries until they are unpinned", () => {
+    const now = Date.now();
+    const store = makeStore([
+      ["pinned", { ...makeEntry(now - 31 * DAY_MS), pinnedAt: now - DAY_MS }],
+    ]);
+
+    expect(pruneStaleEntries(store, 30 * DAY_MS)).toBe(0);
+    expect(store).toHaveProperty("pinned");
+
+    delete store.pinned?.pinnedAt;
+    expect(pruneStaleEntries(store, 30 * DAY_MS)).toBe(1);
+    expect(store.pinned).toBeUndefined();
+  });
 });
 
 describe("resolveQuotaSuspensionEntryMaintenance", () => {
@@ -710,6 +724,20 @@ describe("capEntryCount", () => {
     expect(store.old).toBeUndefined();
   });
 
+  it("preserves pinned sessions when capping", () => {
+    const now = Date.now();
+    const store = makeStore([
+      ["pinned", { ...makeEntry(now - 10 * DAY_MS), pinnedAt: now - 5 * DAY_MS }],
+      ["recent", makeEntry(now)],
+      ["old", makeEntry(now - DAY_MS)],
+    ]);
+
+    expect(capEntryCount(store, 2)).toBe(1);
+    expect(store).toHaveProperty("pinned");
+    expect(store).toHaveProperty("recent");
+    expect(store.old).toBeUndefined();
+  });
+
   it("preserves runtime-provided pending subagent sessions when capping", () => {
     const now = Date.now();
     const childKey = "agent:main:subagent:child";

From c6530738ee0c2bae5647f70cb07642b239ef9541 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Thu, 13 Aug 2026 13:11:43 +0800
Subject: [PATCH 16/23] fix(state): accept shipped commitments schema (#122945)

---
 src/state/openclaw-state-db-schema-repair.ts |  56 ++++----
 src/state/openclaw-state-db.test.ts          | 138 +++++++++++++++++++
 2 files changed, 163 insertions(+), 31 deletions(-)

diff --git a/src/state/openclaw-state-db-schema-repair.ts b/src/state/openclaw-state-db-schema-repair.ts
index 301d968540fa..1c30559efa85 100644
--- a/src/state/openclaw-state-db-schema-repair.ts
+++ b/src/state/openclaw-state-db-schema-repair.ts
@@ -3,7 +3,9 @@ import type { DatabaseSync } from "node:sqlite";
 import { openNodeSqliteDatabase } from "../infra/node-sqlite.js";
 import {
   assertSqliteSchemaContains,
+  collectSqliteNamedIndexContract,
   collectSqliteSchemaIssues,
+  getCanonicalSqliteNamedIndexContracts,
   type SqliteSchemaCompatibility,
 } from "../infra/sqlite-schema-contract.js";
 import { quoteSqliteIdentifier } from "../infra/sqlite-schema-sql.js";
@@ -81,7 +83,7 @@ CREATE INDEX idx_commitments_agent_sent
   ON commitments(agent_id, status, sent_at_ms, session_key);
 `;
 
-const ADDITIVE_RETIRED_COMMITMENTS_SCHEMA_SQL = `
+const SHIPPED_RETIRED_COMMITMENTS_SCHEMA_SQL = `
 CREATE TABLE commitments (
   id TEXT NOT NULL PRIMARY KEY,
   agent_id TEXT NOT NULL,
@@ -91,22 +93,22 @@ CREATE TABLE commitments (
   recipient_id TEXT,
   thread_id TEXT,
   sender_id TEXT,
-  kind TEXT NOT NULL DEFAULT 'followup',
-  sensitivity TEXT NOT NULL DEFAULT 'normal',
-  source TEXT NOT NULL DEFAULT 'unknown',
+  kind TEXT NOT NULL,
+  sensitivity TEXT NOT NULL,
+  source TEXT NOT NULL,
   status TEXT NOT NULL,
-  reason TEXT NOT NULL DEFAULT '',
-  suggested_text TEXT NOT NULL DEFAULT '',
-  dedupe_key TEXT NOT NULL DEFAULT '',
-  confidence REAL NOT NULL DEFAULT 0,
+  reason TEXT NOT NULL,
+  suggested_text TEXT NOT NULL,
+  dedupe_key TEXT NOT NULL,
+  confidence REAL NOT NULL,
   due_earliest_ms INTEGER NOT NULL,
   due_latest_ms INTEGER NOT NULL,
-  due_timezone TEXT NOT NULL DEFAULT 'UTC',
+  due_timezone TEXT NOT NULL,
   source_message_id TEXT,
   source_run_id TEXT,
-  created_at_ms INTEGER NOT NULL DEFAULT 0,
+  created_at_ms INTEGER NOT NULL,
   updated_at_ms INTEGER NOT NULL,
-  attempts INTEGER NOT NULL DEFAULT 0,
+  attempts INTEGER NOT NULL,
   last_attempt_at_ms INTEGER,
   sent_at_ms INTEGER,
   dismissed_at_ms INTEGER,
@@ -118,21 +120,16 @@ CREATE INDEX idx_commitments_scope_due
   ON commitments(agent_id, session_key, status, due_earliest_ms, due_latest_ms);
 CREATE INDEX idx_commitments_status_due
   ON commitments(status, due_earliest_ms, due_latest_ms);
-CREATE INDEX idx_commitments_agent_due
-  ON commitments(agent_id, status, due_earliest_ms, due_latest_ms, session_key);
 CREATE INDEX idx_commitments_scope_dedupe
   ON commitments(agent_id, session_key, channel, dedupe_key, status);
-CREATE INDEX idx_commitments_agent_sent
-  ON commitments(agent_id, status, sent_at_ms, session_key);
 `;
 
-const RETIRED_COMMITMENTS_INDEX_NAMES = [
-  "idx_commitments_agent_due",
-  "idx_commitments_agent_sent",
-  "idx_commitments_scope_dedupe",
-  "idx_commitments_scope_due",
-  "idx_commitments_status_due",
-] as const;
+const RETIRED_COMMITMENTS_INDEX_FINGERPRINTS = new Map(
+  getCanonicalSqliteNamedIndexContracts(RETIRED_COMMITMENTS_SCHEMA_SQL).map(
+    ({ fingerprint, name }) => [name, JSON.stringify(fingerprint)],
+  ),
+);
+const RETIRED_COMMITMENTS_INDEX_NAMES = [...RETIRED_COMMITMENTS_INDEX_FINGERPRINTS.keys()];
 
 const RETIRED_COMMITMENTS_ADDITIVE_COLUMNS = [
   "commitments.account_id",
@@ -178,11 +175,6 @@ const RETIRED_COMMITMENTS_SCHEMA_COMPATIBILITY: SqliteSchemaCompatibility = {
   allowedMissingIndexes: RETIRED_COMMITMENTS_INDEX_NAMES,
 };
 
-const ADDITIVE_RETIRED_COMMITMENTS_SCHEMA_COMPATIBILITY: SqliteSchemaCompatibility = {
-  allowedMissingColumns: RETIRED_COMMITMENTS_ADDITIVE_COLUMNS,
-  allowedMissingIndexes: RETIRED_COMMITMENTS_INDEX_NAMES,
-};
-
 function hasSupportedRetiredCommitmentsSchema(
   db: DatabaseSync,
   schemaSql: string,
@@ -201,9 +193,11 @@ function hasSupportedRetiredCommitmentsSchema(
           ORDER BY type, name`,
     )
     .all() as Array<{ name: string; type: string }>;
-  const expectedIndexes = new Set<string>(RETIRED_COMMITMENTS_INDEX_NAMES);
   return attachedObjects.every(
-    (object) => object.type === "index" && expectedIndexes.has(object.name),
+    (object) =>
+      object.type === "index" &&
+      JSON.stringify(collectSqliteNamedIndexContract(db, object.name)) ===
+        RETIRED_COMMITMENTS_INDEX_FINGERPRINTS.get(object.name),
   );
 }
 
@@ -231,8 +225,8 @@ function hasRecognizedRetiredCommitmentsSchema(db: DatabaseSync): boolean {
     ) ||
     hasSupportedRetiredCommitmentsSchema(
       db,
-      ADDITIVE_RETIRED_COMMITMENTS_SCHEMA_SQL,
-      ADDITIVE_RETIRED_COMMITMENTS_SCHEMA_COMPATIBILITY,
+      SHIPPED_RETIRED_COMMITMENTS_SCHEMA_SQL,
+      RETIRED_COMMITMENTS_SCHEMA_COMPATIBILITY,
     )
   );
 }
diff --git a/src/state/openclaw-state-db.test.ts b/src/state/openclaw-state-db.test.ts
index 4e69002b11d4..aba95b4790a5 100644
--- a/src/state/openclaw-state-db.test.ts
+++ b/src/state/openclaw-state-db.test.ts
@@ -311,6 +311,63 @@ function seedAdditiveV6CommitmentSchema(database: DatabaseSync): void {
   markStateDatabaseVersion(database, 6);
 }
 
+function seedV2026_7_1_2CommitmentSchema(database: DatabaseSync): void {
+  database.exec(`
+    CREATE TABLE commitments (
+      id TEXT NOT NULL PRIMARY KEY,
+      agent_id TEXT NOT NULL,
+      session_key TEXT NOT NULL,
+      channel TEXT NOT NULL,
+      account_id TEXT,
+      recipient_id TEXT,
+      thread_id TEXT,
+      sender_id TEXT,
+      kind TEXT NOT NULL,
+      sensitivity TEXT NOT NULL,
+      source TEXT NOT NULL,
+      status TEXT NOT NULL,
+      reason TEXT NOT NULL,
+      suggested_text TEXT NOT NULL,
+      dedupe_key TEXT NOT NULL,
+      confidence REAL NOT NULL,
+      due_earliest_ms INTEGER NOT NULL,
+      due_latest_ms INTEGER NOT NULL,
+      due_timezone TEXT NOT NULL,
+      source_message_id TEXT,
+      source_run_id TEXT,
+      created_at_ms INTEGER NOT NULL,
+      updated_at_ms INTEGER NOT NULL,
+      attempts INTEGER NOT NULL,
+      last_attempt_at_ms INTEGER,
+      sent_at_ms INTEGER,
+      dismissed_at_ms INTEGER,
+      snoozed_until_ms INTEGER,
+      expired_at_ms INTEGER,
+      record_json TEXT NOT NULL
+    );
+    CREATE INDEX idx_commitments_scope_due
+      ON commitments(agent_id, session_key, status, due_earliest_ms, due_latest_ms);
+    CREATE INDEX idx_commitments_status_due
+      ON commitments(status, due_earliest_ms, due_latest_ms);
+    CREATE INDEX idx_commitments_scope_dedupe
+      ON commitments(agent_id, session_key, channel, dedupe_key, status);
+    INSERT INTO commitments (
+      id, agent_id, session_key, channel, kind, sensitivity, source, status,
+      reason, suggested_text, dedupe_key, confidence, due_earliest_ms,
+      due_latest_ms, due_timezone, created_at_ms, updated_at_ms, attempts, record_json
+    ) VALUES (
+      'released-commitment', 'main', 'agent:main:main', 'telegram', 'followup',
+      'normal', 'message', 'pending', 'inert', 'follow up', 'released-dedupe',
+      1.0, 10, 20, 'UTC', 1, 1, 0, '{}'
+    );
+    INSERT INTO state_leases (
+      scope, lease_key, owner, expires_at, heartbeat_at, payload_json, created_at, updated_at
+    ) VALUES ('test', 'released-preserved-lease', 'migration-test', 100, 50, '{}', 1, 2);
+    PRAGMA user_version = 1;
+    UPDATE schema_meta SET schema_version = 1 WHERE meta_key = 'primary';
+  `);
+}
+
 function seedPartiallyAdditiveV6CommitmentSchema(database: DatabaseSync): void {
   database.exec(`
     CREATE TABLE commitments (
@@ -1546,6 +1603,79 @@ describe("openclaw state database", () => {
     },
   );
 
+  it.each(["runtime open", "doctor repair"] as const)(
+    "retires the shipped v2026.7.1-2 commitments layout through %s",
+    (migrationPath) => {
+      const stateDir = createTempStateDir();
+      const options = { env: { OPENCLAW_STATE_DIR: stateDir } };
+      const databasePath = materializeCurrentStateDatabase(stateDir);
+      const { DatabaseSync } = requireNodeSqlite();
+      const released = new DatabaseSync(databasePath);
+      seedV2026_7_1_2CommitmentSchema(released);
+      expect(readSqliteNumberPragma(released, "user_version")).toBe(1);
+      expect(
+        released.prepare("SELECT schema_version FROM schema_meta WHERE meta_key = 'primary'").get(),
+      ).toEqual({ schema_version: 1 });
+      expect(
+        released.prepare("SELECT strict FROM pragma_table_list WHERE name = 'commitments'").get(),
+      ).toEqual({ strict: 0 });
+      expect(
+        released
+          .prepare(
+            `SELECT name
+               FROM sqlite_schema
+              WHERE type = 'index'
+                AND tbl_name = 'commitments'
+                AND sql IS NOT NULL
+              ORDER BY name`,
+          )
+          .all(),
+      ).toEqual([
+        { name: "idx_commitments_scope_dedupe" },
+        { name: "idx_commitments_scope_due" },
+        { name: "idx_commitments_status_due" },
+      ]);
+      released.close();
+
+      if (migrationPath === "doctor repair") {
+        const result = repairOpenClawStateDatabaseSchema(options);
+        expect(result.warnings).toEqual([]);
+        expect(result.changes).toContain("Retired shared state commitments table and indexes");
+      }
+      const migrated = openOpenClawStateDatabase(options);
+      expect(readSqliteNumberPragma(migrated.db, "user_version")).toBe(7);
+      expect(
+        migrated.db
+          .prepare("SELECT schema_version FROM schema_meta WHERE meta_key = 'primary'")
+          .get(),
+      ).toEqual({ schema_version: 7 });
+      for (const name of RETIRED_COMMITMENT_SCHEMA_OBJECTS) {
+        expect(
+          migrated.db.prepare("SELECT name FROM sqlite_schema WHERE name = ?").get(name),
+        ).toBeUndefined();
+      }
+      expect(
+        migrated.db
+          .prepare(
+            `SELECT scope, lease_key, owner, expires_at, heartbeat_at, payload_json,
+                    created_at, updated_at
+               FROM state_leases
+              WHERE scope = 'test' AND lease_key = 'released-preserved-lease'`,
+          )
+          .get(),
+      ).toEqual({
+        scope: "test",
+        lease_key: "released-preserved-lease",
+        owner: "migration-test",
+        expires_at: 100,
+        heartbeat_at: 50,
+        payload_json: "{}",
+        created_at: 1,
+        updated_at: 2,
+      });
+    },
+  );
+
   it.each(["runtime open", "doctor repair"] as const)(
     "preserves a foreign commitments table and colliding index through %s",
     (migrationPath) => {
@@ -1623,6 +1753,14 @@ describe("openclaw state database", () => {
               AFTER DELETE ON commitments BEGIN SELECT 1; END;`,
       type: "trigger",
     },
+    {
+      label: "drifted optional agent-due index",
+      name: "idx_commitments_agent_due",
+      sql: `DROP INDEX idx_commitments_agent_due;
+            CREATE INDEX idx_commitments_agent_due
+              ON commitments(agent_id, status, session_key);`,
+      type: "index",
+    },
   ])("preserves an $label on the final v6 commitments layout", ({ name, sql, type }) => {
     const stateDir = createTempStateDir();
     const options = { env: { OPENCLAW_STATE_DIR: stateDir } };

From fd353ee5d772385d107cbaaef9e7be683c62ef32 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Thu, 13 Aug 2026 13:14:22 +0800
Subject: [PATCH 17/23] fix(parallels): recover migration-refused gateway
 startup

---
 scripts/e2e/parallels/npm-update-scripts.ts   | 126 ++++++++++++++----
 .../parallels-npm-update-smoke.test.ts        |  43 +++++-
 2 files changed, 137 insertions(+), 32 deletions(-)

diff --git a/scripts/e2e/parallels/npm-update-scripts.ts b/scripts/e2e/parallels/npm-update-scripts.ts
index e5e0ba9aad01..9f0f9427b282 100644
--- a/scripts/e2e/parallels/npm-update-scripts.ts
+++ b/scripts/e2e/parallels/npm-update-scripts.ts
@@ -26,6 +26,8 @@ interface NpmUpdateScriptInput {
 }
 
 const windowsStalePostSwapImportRegex = String.raw`node_modules\\openclaw\\dist\\[^\\]+-[A-Za-z0-9_-]+\.js`;
+const startupMigrationRestartPrefix =
+  "OpenClaw plugin migration inputs changed during startup convergence;";
 const macosGuestPath =
   "/opt/homebrew/bin:/opt/homebrew/opt/node/bin:/usr/local/bin:/usr/local/sbin:/opt/homebrew/sbin:/usr/bin:/bin:/usr/sbin:/sbin";
 const macosOpenClawCommand = '"$OPENCLAW_BIN"';
@@ -155,25 +157,65 @@ $updateExit = $script:OpenClawUpdateExit
 $updateOutput`;
 }
 
-function windowsGatewayReadyScript(): string {
-  return `function Wait-OpenClawGateway {
+function windowsGatewayReadyScript(input: NpmUpdateScriptInput): string {
+  return `$gatewayLogRoot = Join-Path ([System.IO.Path]::GetTempPath()) 'openclaw-parallels-windows-gateway'
+$gatewayLaunch = 0
+$gatewayRestartCount = 0
+function Start-OpenClawGateway {
+  $script:gatewayLaunch += 1
+  $script:gatewayLogPath = "$gatewayLogRoot-$($script:gatewayLaunch).log"
+  Remove-Item $script:gatewayLogPath -Force -ErrorAction SilentlyContinue
+  $gatewayCommand = Resolve-OpenClawCommand
+  $gatewayCommandPath = $gatewayCommand.Path.Replace("'", "''")
+  $gatewayInvocation = if ($gatewayCommand.Kind -eq 'node') {
+    "& node.exe '$gatewayCommandPath' gateway run --bind loopback --port 18789 --force"
+  } else {
+    "& '$gatewayCommandPath' gateway run --bind loopback --port 18789 --force"
+  }
+  $gatewayScript = "\`$ErrorActionPreference = 'Continue'\`n$gatewayInvocation *>> \`$env:OPENCLAW_PARALLELS_GATEWAY_LOG\`nexit \`$LASTEXITCODE"
+  $gatewayEncodedScript = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($gatewayScript))
+  $gatewayPowerShell = (Get-Process -Id $PID).Path
+  Invoke-WithScopedEnv @{
+    OPENCLAW_HOME = $env:USERPROFILE
+    OPENCLAW_STATE_DIR = (Join-Path $env:USERPROFILE '.openclaw')
+    OPENCLAW_CONFIG_PATH = (Join-Path $env:USERPROFILE '.openclaw\\openclaw.json')
+    OPENCLAW_PARALLELS_GATEWAY_LOG = $script:gatewayLogPath
+    ${input.auth.apiKeyEnv} = ${psSingleQuote(input.auth.apiKeyValue)}
+  } {
+    $script:gatewayProcess = Start-Process -FilePath $gatewayPowerShell -ArgumentList @('-NoProfile', '-NonInteractive', '-EncodedCommand', $gatewayEncodedScript) -WindowStyle Hidden -PassThru
+  }
+}
+function Write-CurrentGatewayLog {
+  if (Test-Path $script:gatewayLogPath) {
+    Get-Content $script:gatewayLogPath -ErrorAction SilentlyContinue | Out-Host
+  }
+}
+function Test-CurrentGatewayStartupMigrationRefusal {
+  if (-not (Test-Path $script:gatewayLogPath)) { return $false }
+  return Select-String -Path $script:gatewayLogPath -SimpleMatch ${psSingleQuote(startupMigrationRestartPrefix)} -Quiet
+}
+function Wait-OpenClawGateway {
   $deadline = (Get-Date).AddSeconds(180)
-  $attempt = 0
   while ((Get-Date) -lt $deadline) {
     Invoke-OpenClaw gateway status --deep --require-rpc --timeout 15000
     if ($LASTEXITCODE -eq 0) { return }
-    $attempt += 1
-    if ($attempt -eq 4) {
-      Invoke-OpenClaw gateway start *>&1 | Out-Host
+    if ($script:gatewayProcess.HasExited) {
+      $script:gatewayProcess.WaitForExit()
+      if ($script:gatewayRestartCount -eq 0 -and (Test-CurrentGatewayStartupMigrationRefusal)) {
+        $script:gatewayRestartCount = 1
+        Write-Host 'gateway exited after startup migration convergence refusal; restarting once'
+        Start-OpenClawGateway
+        continue
+      }
+      Write-CurrentGatewayLog
+      throw "gateway exited before becoming ready after update with code $($script:gatewayProcess.ExitCode)"
     }
     Start-Sleep -Seconds 5
   }
+  Write-CurrentGatewayLog
   throw "gateway did not become ready after update"
 }
-Invoke-OpenClaw gateway restart *>&1 | Out-Host
-if ($LASTEXITCODE -ne 0) {
-  "gateway restart exited with code $LASTEXITCODE; probing readiness before failing" | Out-Host
-}
+Start-OpenClawGateway
 Wait-OpenClawGateway`;
 }
 
@@ -259,27 +301,44 @@ stop_openclaw_gateway_processes() {
     fi
   fi
 }
+gateway_log=/tmp/openclaw-parallels-macos-gateway.log
+rm -f "$gateway_log"
+touch "$gateway_log"
+gateway_pid=
+gateway_launch_log_offset=0
+gateway_restart_count=0
 start_openclaw_gateway() {
   stop_openclaw_gateway_processes
-  rm -f /tmp/openclaw-parallels-macos-gateway.log
+  gateway_launch_log_offset="$(wc -c <"$gateway_log" 2>/dev/null | tr -d '[:space:]' || echo 0)"
   trap '' HUP
-  with_provider_api_key /usr/bin/env OPENCLAW_HOME="$HOME" OPENCLAW_STATE_DIR="$HOME/.openclaw" OPENCLAW_CONFIG_PATH="$HOME/.openclaw/openclaw.json" "$OPENCLAW_BIN" gateway run --bind loopback --port 18789 --force >/tmp/openclaw-parallels-macos-gateway.log 2>&1 </dev/null &
+  with_provider_api_key /usr/bin/env OPENCLAW_HOME="$HOME" OPENCLAW_STATE_DIR="$HOME/.openclaw" OPENCLAW_CONFIG_PATH="$HOME/.openclaw/openclaw.json" "$OPENCLAW_BIN" gateway run --bind loopback --port 18789 --force >>"$gateway_log" 2>&1 </dev/null &
+  gateway_pid=$!
   sleep 1
 }
 wait_for_gateway() {
   deadline=$((SECONDS + 240))
-  attempt=0
   while [ "$SECONDS" -lt "$deadline" ]; do
     if "$OPENCLAW_BIN" gateway status --deep --require-rpc --timeout 15000; then
       return
     fi
-    attempt=$((attempt + 1))
-    if [ "$attempt" -eq 4 ]; then
-      start_openclaw_gateway
+    if ! kill -0 "$gateway_pid" 2>/dev/null; then
+      if wait "$gateway_pid"; then gateway_exit_status=0; else gateway_exit_status=$?; fi
+      if [ "$gateway_exit_status" -le 128 ] && [ "$gateway_restart_count" -eq 0 ]; then
+        if tail -c +"$((gateway_launch_log_offset + 1))" "$gateway_log" 2>/dev/null | grep -F -- ${shellQuote(startupMigrationRestartPrefix)} >/dev/null; then
+          gateway_restart_count=1
+          echo "gateway exited after startup migration convergence refusal; restarting once"
+          start_openclaw_gateway
+          continue
+        fi
+      fi
+      print_log_tail "$gateway_log" >&2
+      echo "gateway exited before becoming ready after update (exit $gateway_exit_status)" >&2
+      if [ "$gateway_exit_status" -eq 0 ]; then exit 1; fi
+      exit "$gateway_exit_status"
     fi
     sleep 2
   done
-  print_log_tail /tmp/openclaw-parallels-macos-gateway.log >&2
+  print_log_tail "$gateway_log" >&2
   echo "gateway did not become ready after update" >&2
   exit 1
 }
@@ -368,7 +427,7 @@ if ($updateExit -ne 0) {
   Write-Host "openclaw update returned a stale post-swap module import; continuing to post-update health checks"
 }
 ${windowsVersionCheck(input.expectedNeedle)}
-${windowsGatewayReadyScript()}
+${windowsGatewayReadyScript(input)}
 ${windowsAssertAgentOkScript(input)}`;
 }
 
@@ -403,27 +462,44 @@ stop_openclaw_gateway_processes() {
   OPENCLAW_DISABLE_BUNDLED_PLUGINS=1 OPENCLAW_ALLOW_ROOT=1 openclaw gateway stop || true
   pkill -f 'openclaw.*gateway' >/dev/null 2>&1 || true
 }
+gateway_log=/tmp/openclaw-parallels-linux-gateway.log
+rm -f "$gateway_log"
+touch "$gateway_log"
+gateway_pid=
+gateway_launch_log_offset=0
+gateway_restart_count=0
 start_openclaw_gateway() {
   pkill -f "openclaw gateway run" >/dev/null 2>&1 || true
-  rm -f /tmp/openclaw-parallels-linux-gateway.log
+  gateway_launch_log_offset="$(wc -c <"$gateway_log" 2>/dev/null | tr -d '[:space:]' || echo 0)"
   with_provider_api_key setsid sh -lc ${shellQuote(
-    "exec env OPENCLAW_HOME=/root OPENCLAW_STATE_DIR=/root/.openclaw OPENCLAW_CONFIG_PATH=/root/.openclaw/openclaw.json OPENCLAW_DISABLE_BONJOUR=1 OPENCLAW_ALLOW_ROOT=1 openclaw gateway run --bind loopback --port 18789 --force >/tmp/openclaw-parallels-linux-gateway.log 2>&1",
+    "exec env OPENCLAW_HOME=/root OPENCLAW_STATE_DIR=/root/.openclaw OPENCLAW_CONFIG_PATH=/root/.openclaw/openclaw.json OPENCLAW_DISABLE_BONJOUR=1 OPENCLAW_ALLOW_ROOT=1 openclaw gateway run --bind loopback --port 18789 --force >>/tmp/openclaw-parallels-linux-gateway.log 2>&1",
   )} >/dev/null 2>&1 < /dev/null &
+  gateway_pid=$!
 }
 wait_for_gateway() {
   deadline=$((SECONDS + 240))
-  attempt=0
   while [ "$SECONDS" -lt "$deadline" ]; do
     if openclaw gateway status --deep --require-rpc --timeout 15000; then
       return
     fi
-    attempt=$((attempt + 1))
-    if [ "$attempt" -eq 4 ]; then
-      start_openclaw_gateway
+    if ! kill -0 "$gateway_pid" 2>/dev/null; then
+      if wait "$gateway_pid"; then gateway_exit_status=0; else gateway_exit_status=$?; fi
+      if [ "$gateway_exit_status" -le 128 ] && [ "$gateway_restart_count" -eq 0 ]; then
+        if tail -c +"$((gateway_launch_log_offset + 1))" "$gateway_log" 2>/dev/null | grep -F -- ${shellQuote(startupMigrationRestartPrefix)} >/dev/null; then
+          gateway_restart_count=1
+          echo "gateway exited after startup migration convergence refusal; restarting once"
+          start_openclaw_gateway
+          continue
+        fi
+      fi
+      print_log_tail "$gateway_log" >&2
+      echo "gateway exited before becoming ready after update (exit $gateway_exit_status)" >&2
+      if [ "$gateway_exit_status" -eq 0 ]; then exit 1; fi
+      exit "$gateway_exit_status"
     fi
     sleep 2
   done
-  print_log_tail /tmp/openclaw-parallels-linux-gateway.log >&2
+  print_log_tail "$gateway_log" >&2
   echo "gateway did not become ready after update" >&2
   exit 1
 }
diff --git a/test/scripts/parallels-npm-update-smoke.test.ts b/test/scripts/parallels-npm-update-smoke.test.ts
index f08549a7bd53..f083a07120fb 100644
--- a/test/scripts/parallels-npm-update-smoke.test.ts
+++ b/test/scripts/parallels-npm-update-smoke.test.ts
@@ -371,7 +371,7 @@ exit 1
     expect(windowsUpdateScript(input)).toContain(`NPM_CONFIG_REGISTRY = '${registry}'`);
   });
 
-  it("relaunches POSIX gateways after a transient post-update startup failure", () => {
+  it("restarts POSIX gateways only after an exact current-launch migration refusal", () => {
     const input = {
       auth: TEST_AUTH,
       expectedNeedle: "2026.7.2-beta.5",
@@ -379,11 +379,41 @@ exit 1
     };
 
     for (const script of [macosUpdateScript(input), linuxUpdateScript(input)]) {
-      expect(script).toContain("attempt=$((attempt + 1))");
-      expect(script).toContain('if [ "$attempt" -eq 4 ]; then\n      start_openclaw_gateway');
+      expect(script).toContain(
+        "OpenClaw plugin migration inputs changed during startup convergence;",
+      );
+      expect(script).toContain("gateway_launch_log_offset=");
+      expect(script).toContain("gateway_pid=$!");
+      expect(script).toContain('if ! kill -0 "$gateway_pid" 2>/dev/null; then');
+      expect(script).toContain('tail -c +"$((gateway_launch_log_offset + 1))" "$gateway_log"');
+      expect(script).toContain(
+        'if [ "$gateway_exit_status" -le 128 ] && [ "$gateway_restart_count" -eq 0 ]; then',
+      );
+      expect(script).toContain("gateway_restart_count=1");
+      expect(script).not.toContain('if [ "$attempt" -eq 4 ]');
     }
   });
 
+  it("restarts the Windows gateway only after its current launch exits with the exact refusal", () => {
+    const script = windowsUpdateScript({
+      auth: TEST_AUTH,
+      expectedNeedle: "2026.7.2-beta.5",
+      updateTarget: "2026.7.2-beta.5",
+    });
+
+    expect(script).toContain(
+      "OpenClaw plugin migration inputs changed during startup convergence;",
+    );
+    expect(script).toContain("$script:gatewayProcess.HasExited");
+    expect(script).toContain("$script:gatewayProcess.WaitForExit()");
+    expect(script).toContain("$script:gatewayRestartCount -eq 0");
+    expect(script).toContain("Test-CurrentGatewayStartupMigrationRefusal");
+    expect(script).toContain("Select-String -Path $script:gatewayLogPath -SimpleMatch");
+    expect(script).toContain("$script:gatewayRestartCount = 1");
+    expect(script).not.toContain("$attempt -eq 4");
+    expect(script).not.toContain("Invoke-OpenClaw gateway restart");
+  });
+
   it("keeps POSIX provider secrets out of executable command lines", () => {
     const input = {
       auth: TEST_AUTH,
@@ -515,8 +545,7 @@ exit 1
     expect(scripts).toContain("print_log_tail()");
     expect(scripts).toContain("OPENCLAW_PARALLELS_NPM_UPDATE_LOG_TAIL_BYTES");
     expect(scripts).toContain('print_log_tail "$output_file"');
-    expect(scripts).toContain("print_log_tail /tmp/openclaw-parallels-macos-gateway.log >&2");
-    expect(scripts).toContain("print_log_tail /tmp/openclaw-parallels-linux-gateway.log >&2");
+    expect(scripts).toContain('print_log_tail "$gateway_log" >&2');
     expect(scripts).not.toContain('cat "$output_file"');
     expect(scripts).not.toContain("cat /tmp/openclaw-parallels-");
   });
@@ -1222,14 +1251,14 @@ exit 7
       "Invoke-WithScopedEnv @{ OPENCLAW_ALLOW_OLDER_BINARY_DESTRUCTIVE_ACTIONS",
     );
     const versionIndex = script.indexOf("Invoke-OpenClaw --version", scopedIndex);
-    const restartIndex = script.indexOf("Invoke-OpenClaw gateway restart");
+    const startIndex = script.indexOf("\nStart-OpenClawGateway\n", updateIndex);
     const agentIndex = script.indexOf("Invoke-OpenClaw agent --local");
 
     expect(updateIndex).toBeGreaterThanOrEqual(0);
     expect(scopedIndex).toBeGreaterThanOrEqual(0);
     expect(updateIndex).toBeGreaterThan(scopedIndex);
     expect(versionIndex).toBeGreaterThan(updateIndex);
-    expect(restartIndex).toBeGreaterThan(updateIndex);
+    expect(startIndex).toBeGreaterThan(updateIndex);
     expect(agentIndex).toBeGreaterThan(updateIndex);
     expect(script).not.toContain("OPENCLAW_DISABLE_BUNDLED_PLUGINS");
   });

From 009e53d58271684cd81e3e9da30a5ccbbb1a4631 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 22:19:46 -0700
Subject: [PATCH 18/23] fix(signal): fail probe when RPC verification fails
 (#123001)

---
 extensions/signal/src/core.test.ts | 20 ++++++++++++++++++++
 extensions/signal/src/probe.ts     |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/extensions/signal/src/core.test.ts b/extensions/signal/src/core.test.ts
index 3e1a10e845a7..da6930da5399 100644
--- a/extensions/signal/src/core.test.ts
+++ b/extensions/signal/src/core.test.ts
@@ -218,6 +218,26 @@ describe("probeSignal", () => {
     expect(res.status).toBe(200);
   });
 
+  it("returns ok=false when the version RPC fails after a successful check", async () => {
+    vi.spyOn(clientModule, "signalCheck").mockResolvedValueOnce({
+      ok: true,
+      status: 204,
+      error: null,
+    });
+    vi.spyOn(clientModule, "signalRpcRequest").mockRejectedValueOnce(
+      new Error("Signal RPC returned malformed JSON"),
+    );
+
+    const res = await probeSignal("http://127.0.0.1:8080", 1000);
+
+    expect(res).toMatchObject({
+      ok: false,
+      status: 204,
+      error: "Signal RPC returned malformed JSON",
+      version: null,
+    });
+  });
+
   it("preserves every version reported by a Signal REST container", async () => {
     vi.spyOn(clientModule, "signalCheck").mockResolvedValueOnce({
       ok: true,
diff --git a/extensions/signal/src/probe.ts b/extensions/signal/src/probe.ts
index f45bdd4c117d..0df8e9bffcac 100644
--- a/extensions/signal/src/probe.ts
+++ b/extensions/signal/src/probe.ts
@@ -79,7 +79,7 @@ async function probeSignalTransport(
     } catch (error) {
       result.error = formatErrorMessage(error);
     }
-    return { ...result, ok: true, status: check.status ?? null };
+    return { ...result, ok: result.error === null, status: check.status ?? null };
   });
 }
 

From 3f4d89505a22de70de267905c93dbcd746969c4d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 22:19:49 -0700
Subject: [PATCH 19/23] feat(worker): expose supervised terminal outcomes
 (#123013)

* feat(worker): expose supervised terminal outcomes

* docs(plan): track supervisor terminal outcomes
---
 docs/plan/runners.md                          |   2 +-
 .../invoke-worker-supervisor.test.ts          |  72 ++++-
 src/node-host/node-worker-launch-store.ts     |   2 +-
 .../node-worker-supervisor-contract.ts        | 198 ++----------
 .../node-worker-supervisor-identity.ts        |   9 -
 src/worker/node-supervisor-protocol.test.ts   |  73 +++++
 src/worker/node-supervisor-protocol.ts        | 288 ++++++++++++++++++
 7 files changed, 458 insertions(+), 186 deletions(-)
 delete mode 100644 src/node-host/node-worker-supervisor-identity.ts
 create mode 100644 src/worker/node-supervisor-protocol.test.ts
 create mode 100644 src/worker/node-supervisor-protocol.ts

diff --git a/docs/plan/runners.md b/docs/plan/runners.md
index 8f968083cc1d..ddb4840137b5 100644
--- a/docs/plan/runners.md
+++ b/docs/plan/runners.md
@@ -24,7 +24,7 @@ advances a milestone.
 | 4   | Picker: grouping, placement, liveness, enrichment          | in progress | #120804, #122531, #122635, #122774, #122923 |
 | F   | Real-wire session boundary harness                         | landed      | #121212                                     |
 | 5   | Public worker ingress path                                 | landed      | #122578, #122643                            |
-| 6   | Node worker provider (device runners)                      | in progress | #122683, #122769, #122829, #122939          |
+| 6   | Node worker provider (device runners)                      | in progress | #122683, #122769, #122829, #122939, #123013 |
 | 7   | Bundle push consent + runner updates                       | not started | —                                           |
 | 8   | Stop-and-continue moves                                    | not started | —                                           |
 | 9   | Deletions (ssh sandbox, openshell, exec-host clones, …)    | not started | —                                           |
diff --git a/src/node-host/invoke-worker-supervisor.test.ts b/src/node-host/invoke-worker-supervisor.test.ts
index d861533def30..fd14df0b3c2c 100644
--- a/src/node-host/invoke-worker-supervisor.test.ts
+++ b/src/node-host/invoke-worker-supervisor.test.ts
@@ -161,13 +161,17 @@ describe("node-host worker supervisor commands", () => {
     expect(payload).not.toHaveProperty("errorText");
   });
 
-  it("omits completed worker output from the durable wire receipt", async () => {
+  it("returns completed worker output without internal process fields", async () => {
     const input = launchInput();
-    const privatePath = "/private/workspaces/session-1/secret.txt";
+    const resultJson = JSON.stringify({
+      status: "completed",
+      transcriptLeafId: "leaf-1",
+      transcriptNextSeq: 2,
+    });
     const receipt: NodeWorkerLaunchReceipt = {
       ...fullReceipt(input),
       state: "completed",
-      resultJson: JSON.stringify({ argv: ["worker", "--internal-worker-ipc"], privatePath }),
+      resultJson,
       completedAtMs: 12,
     };
 
@@ -177,10 +181,7 @@ describe("node-host worker supervisor commands", () => {
       supervisor: supervisorWith(receipt),
     });
 
-    const raw = result?.payloadJSON ?? "";
-    expect(raw).not.toContain("argv");
-    expect(raw).not.toContain(privatePath);
-    expect(JSON.parse(raw)).toEqual({
+    expect(JSON.parse(result?.payloadJSON ?? "{}")).toEqual({
       launchId: input.launchId,
       planHash: receipt.planHash,
       environmentId: input.descriptor.admission.environmentId,
@@ -189,6 +190,42 @@ describe("node-host worker supervisor commands", () => {
       placementGeneration: input.placementGeneration,
       runId: input.descriptor.assignment.runId,
       state: "completed",
+      resultJson,
+    });
+    const payload = JSON.parse(result?.payloadJSON ?? "{}") as Record<string, unknown>;
+    expect(payload).not.toHaveProperty("supervisor");
+    expect(payload).not.toHaveProperty("worker");
+    expect(payload).not.toHaveProperty("gatewayNamespace");
+    expect(payload).not.toHaveProperty("descriptor");
+    expect(payload).not.toHaveProperty("errorText");
+  });
+
+  it("returns failed worker diagnostics without completed output", async () => {
+    const input = launchInput();
+    const receipt: NodeWorkerLaunchReceipt = {
+      ...fullReceipt(input),
+      state: "failed",
+      worker: null,
+      errorText: "worker exited before completion",
+      completedAtMs: 12,
+    };
+
+    const { result } = await invokePrivate({
+      command: NODE_WORKER_SUPERVISOR_STATUS_COMMAND,
+      paramsJSON: JSON.stringify({ launchId: input.launchId }),
+      supervisor: supervisorWith(receipt),
+    });
+
+    expect(JSON.parse(result?.payloadJSON ?? "{}")).toEqual({
+      launchId: input.launchId,
+      planHash: receipt.planHash,
+      environmentId: input.descriptor.admission.environmentId,
+      sessionId: input.descriptor.admission.sessionId,
+      ownerEpoch: input.descriptor.admission.ownerEpoch,
+      placementGeneration: input.placementGeneration,
+      runId: input.descriptor.assignment.runId,
+      state: "failed",
+      errorText: receipt.errorText,
     });
   });
 
@@ -226,6 +263,27 @@ describe("node-host worker supervisor commands", () => {
     expect(mocks.cancel.mock.calls).toHaveLength(0);
   });
 
+  it("fails closed when a durable terminal receipt is inconsistent", async () => {
+    const input = launchInput();
+    const receipt: NodeWorkerLaunchReceipt = {
+      ...fullReceipt(input),
+      state: "completed",
+      resultJson: null,
+      completedAtMs: 12,
+    };
+
+    const { result } = await invokePrivate({
+      command: NODE_WORKER_SUPERVISOR_STATUS_COMMAND,
+      paramsJSON: JSON.stringify({ launchId: input.launchId }),
+      supervisor: supervisorWith(receipt),
+    });
+
+    expect(result).toMatchObject({
+      ok: false,
+      error: { code: "UNAVAILABLE", message: "node worker supervisor command failed" },
+    });
+  });
+
   it("returns a bounded generic error without leaking supervisor details", async () => {
     const leaked = `/private/path/${"secret".repeat(2_000)}`;
     const supervisor = supervisorWith(fullReceipt());
diff --git a/src/node-host/node-worker-launch-store.ts b/src/node-host/node-worker-launch-store.ts
index 877a6c125867..dcbe16ddb513 100644
--- a/src/node-host/node-worker-launch-store.ts
+++ b/src/node-host/node-worker-launch-store.ts
@@ -11,11 +11,11 @@ import {
   type OpenClawStateDatabaseOptions,
 } from "../state/openclaw-state-db.js";
 import { OPENCLAW_STATE_SCHEMA_SQL } from "../state/openclaw-state-schema.js";
+import type { NodeWorkerSupervisorIdentity } from "../worker/node-supervisor-protocol.js";
 import {
   inspectNodeWorkerProcessIdentity,
   type NodeWorkerProcessIdentity,
 } from "./node-worker-process-identity.js";
-import type { NodeWorkerSupervisorIdentity } from "./node-worker-supervisor-identity.js";
 
 type NodeWorkerLaunchState =
   | "pending"
diff --git a/src/node-host/node-worker-supervisor-contract.ts b/src/node-host/node-worker-supervisor-contract.ts
index d23ef6a53746..ba087e02c020 100644
--- a/src/node-host/node-worker-supervisor-contract.ts
+++ b/src/node-host/node-worker-supervisor-contract.ts
@@ -1,30 +1,22 @@
-import { createHash } from "node:crypto";
-import { stableStringify } from "@openclaw/normalization-core";
-import { isRecord } from "@openclaw/normalization-core/record-coerce";
 import {
-  parseWorkerLaunchDescriptor,
-  type WorkerLaunchDescriptor,
-} from "../worker/launch-descriptor.js";
+  parseNodeWorkerSupervisorReceipt,
+  type NodeWorkerLaunchInput,
+  type NodeWorkerSupervisorIdentity,
+  type NodeWorkerSupervisorReceipt,
+} from "../worker/node-supervisor-protocol.js";
 import type { NodeWorkerLaunchReceipt } from "./node-worker-launch-store.js";
-import type { NodeWorkerSupervisorIdentity } from "./node-worker-supervisor-identity.js";
 
-export type { NodeWorkerSupervisorIdentity } from "./node-worker-supervisor-identity.js";
-
-const IDENTIFIER_MAX_CHARS = 256;
-const GATEWAY_NAMESPACE_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u;
-const NODE_WORKER_SUPERVISOR_CANCEL_REQUEST_MAX_BYTES = 4 * 1024;
-
-export type NodeWorkerLaunchInput = {
-  launchId: string;
-  gatewayNamespace: string;
-  bundleHash: string;
-  placementGeneration: number;
-  descriptor: WorkerLaunchDescriptor;
-};
-
-export type NodeWorkerSupervisorReceipt = NodeWorkerSupervisorIdentity & {
-  state: "pending" | "running" | "completed" | "failed" | "interrupted" | "cancelled";
-};
+export {
+  nodeWorkerPlanHash,
+  parseNodeWorkerCancelInput,
+  parseNodeWorkerLaunchInput,
+  parseNodeWorkerLookupInput,
+} from "../worker/node-supervisor-protocol.js";
+export type {
+  NodeWorkerLaunchInput,
+  NodeWorkerSupervisorIdentity,
+  NodeWorkerSupervisorReceipt,
+} from "../worker/node-supervisor-protocol.js";
 
 export type NodeWorkerSupervisorControl = {
   launch(input: NodeWorkerLaunchInput): Promise<NodeWorkerLaunchReceipt>;
@@ -32,152 +24,10 @@ export type NodeWorkerSupervisorControl = {
   cancel(expected: NodeWorkerSupervisorIdentity): Promise<NodeWorkerLaunchReceipt | undefined>;
 };
 
-function hasExactKeys(value: Record<string, unknown>, keys: readonly string[]): boolean {
-  return (
-    Object.keys(value).length === keys.length && keys.every((key) => Object.hasOwn(value, key))
-  );
-}
-
-function requireIdentifier(value: unknown, label: string): string {
-  if (
-    typeof value !== "string" ||
-    value.length === 0 ||
-    value.length > IDENTIFIER_MAX_CHARS ||
-    value.trim() !== value ||
-    value.includes("\0")
-  ) {
-    throw new Error(`INVALID_REQUEST: ${label} must be a bounded non-empty identifier`);
-  }
-  return value;
-}
-
-function requireNonNegativeInteger(value: unknown, label: string): number {
-  if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) {
-    throw new Error(`INVALID_REQUEST: ${label} must be a non-negative safe integer`);
-  }
-  return value;
-}
-
-function decodeRequest(raw?: string | null): unknown {
-  if (!raw) {
-    throw new Error("INVALID_REQUEST: paramsJSON required");
-  }
-  try {
-    return JSON.parse(raw) as unknown;
-  } catch {
-    throw new Error("INVALID_REQUEST: paramsJSON malformed JSON");
-  }
-}
-
-export function parseNodeWorkerLaunchInput(raw?: string | null): NodeWorkerLaunchInput {
-  const value = decodeRequest(raw);
-  if (
-    !isRecord(value) ||
-    !hasExactKeys(value, [
-      "launchId",
-      "gatewayNamespace",
-      "bundleHash",
-      "placementGeneration",
-      "descriptor",
-    ])
-  ) {
-    throw new Error("INVALID_REQUEST: invalid node worker launch request");
-  }
-  const launchId = requireIdentifier(value.launchId, "launchId");
-  const gatewayNamespace = requireIdentifier(value.gatewayNamespace, "gatewayNamespace");
-  if (!GATEWAY_NAMESPACE_PATTERN.test(gatewayNamespace)) {
-    throw new Error("INVALID_REQUEST: gatewayNamespace must be a safe bounded path component");
-  }
-  if (typeof value.bundleHash !== "string" || !/^[a-f0-9]{64}$/u.test(value.bundleHash)) {
-    throw new Error("INVALID_REQUEST: bundleHash must be 64 lowercase hexadecimal characters");
-  }
-  let descriptor: WorkerLaunchDescriptor;
-  try {
-    descriptor = parseWorkerLaunchDescriptor(value.descriptor);
-  } catch {
-    throw new Error("INVALID_REQUEST: invalid worker launch descriptor");
-  }
-  if (descriptor.admission.handshake.bundleHash !== value.bundleHash) {
-    throw new Error("INVALID_REQUEST: descriptor bundle hash does not match bundleHash");
-  }
-  return {
-    launchId,
-    gatewayNamespace,
-    bundleHash: value.bundleHash,
-    placementGeneration: requireNonNegativeInteger(
-      value.placementGeneration,
-      "placementGeneration",
-    ),
-    descriptor,
-  };
-}
-
-export function parseNodeWorkerLookupInput(raw?: string | null): { launchId: string } {
-  const value = decodeRequest(raw);
-  if (!isRecord(value) || !hasExactKeys(value, ["launchId"])) {
-    throw new Error("INVALID_REQUEST: invalid node worker lookup request");
-  }
-  return { launchId: requireIdentifier(value.launchId, "launchId") };
-}
-
-export function parseNodeWorkerCancelInput(raw?: string | null): NodeWorkerSupervisorIdentity {
-  if (!raw || Buffer.byteLength(raw, "utf8") > NODE_WORKER_SUPERVISOR_CANCEL_REQUEST_MAX_BYTES) {
-    throw new Error("INVALID_REQUEST: invalid node worker cancel request");
-  }
-  const value = decodeRequest(raw);
-  if (
-    !isRecord(value) ||
-    !hasExactKeys(value, [
-      "launchId",
-      "planHash",
-      "environmentId",
-      "sessionId",
-      "ownerEpoch",
-      "placementGeneration",
-      "runId",
-    ])
-  ) {
-    throw new Error("INVALID_REQUEST: invalid node worker cancel request");
-  }
-  if (typeof value.planHash !== "string" || !/^[a-f0-9]{64}$/u.test(value.planHash)) {
-    throw new Error("INVALID_REQUEST: planHash must be 64 lowercase hexadecimal characters");
-  }
-  return {
-    launchId: requireIdentifier(value.launchId, "launchId"),
-    planHash: value.planHash,
-    environmentId: requireIdentifier(value.environmentId, "environmentId"),
-    sessionId: requireIdentifier(value.sessionId, "sessionId"),
-    ownerEpoch: requireNonNegativeInteger(value.ownerEpoch, "ownerEpoch"),
-    placementGeneration: requireNonNegativeInteger(
-      value.placementGeneration,
-      "placementGeneration",
-    ),
-    runId: requireIdentifier(value.runId, "runId"),
-  };
-}
-
-export function nodeWorkerPlanHash(
-  input: Pick<
-    NodeWorkerLaunchInput,
-    "bundleHash" | "descriptor" | "gatewayNamespace" | "placementGeneration"
-  >,
-): string {
-  return createHash("sha256")
-    .update(
-      stableStringify({
-        bundleHash: input.bundleHash,
-        descriptor: input.descriptor,
-        gatewayNamespace: input.gatewayNamespace,
-        placementGeneration: input.placementGeneration,
-      }),
-    )
-    .digest("hex");
-}
-
 export function projectNodeWorkerSupervisorReceipt(
   receipt: NodeWorkerLaunchReceipt,
 ): NodeWorkerSupervisorReceipt {
-  return {
+  const identity = {
     launchId: receipt.launchId,
     planHash: receipt.planHash,
     environmentId: receipt.environmentId,
@@ -185,6 +35,18 @@ export function projectNodeWorkerSupervisorReceipt(
     ownerEpoch: receipt.ownerEpoch,
     placementGeneration: receipt.placementGeneration,
     runId: receipt.runId,
-    state: receipt.state,
   };
+  const projected =
+    receipt.state === "completed"
+      ? { ...identity, state: receipt.state, resultJson: receipt.resultJson }
+      : receipt.state === "failed" ||
+          receipt.state === "interrupted" ||
+          receipt.state === "cancelled"
+        ? { ...identity, state: receipt.state, errorText: receipt.errorText }
+        : { ...identity, state: receipt.state };
+  const parsed = parseNodeWorkerSupervisorReceipt(projected);
+  if (!parsed) {
+    throw new Error("node worker supervisor durable receipt is inconsistent");
+  }
+  return parsed;
 }
diff --git a/src/node-host/node-worker-supervisor-identity.ts b/src/node-host/node-worker-supervisor-identity.ts
deleted file mode 100644
index 9176ee6e948e..000000000000
--- a/src/node-host/node-worker-supervisor-identity.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type NodeWorkerSupervisorIdentity = {
-  launchId: string;
-  planHash: string;
-  environmentId: string;
-  sessionId: string;
-  ownerEpoch: number;
-  placementGeneration: number;
-  runId: string;
-};
diff --git a/src/worker/node-supervisor-protocol.test.ts b/src/worker/node-supervisor-protocol.test.ts
new file mode 100644
index 000000000000..04829f84ce0e
--- /dev/null
+++ b/src/worker/node-supervisor-protocol.test.ts
@@ -0,0 +1,73 @@
+import { describe, expect, it } from "vitest";
+import {
+  parseNodeWorkerSupervisorReceipt,
+  type NodeWorkerSupervisorIdentity,
+} from "./node-supervisor-protocol.js";
+
+const RESULT_JSON_MAX_BYTES = 64 * 1024;
+const ERROR_TEXT_MAX_BYTES = 4 * 1024;
+
+const identity: NodeWorkerSupervisorIdentity = {
+  launchId: "launch-1",
+  planHash: "a".repeat(64),
+  environmentId: "environment-1",
+  sessionId: "session-1",
+  ownerEpoch: 3,
+  placementGeneration: 4,
+  runId: "run-1",
+};
+
+describe("node worker supervisor wire receipt", () => {
+  it.each([
+    { ...identity, state: "pending" },
+    { ...identity, state: "running" },
+    {
+      ...identity,
+      state: "completed",
+      resultJson: JSON.stringify({ status: "completed", transcriptNextSeq: 2 }),
+    },
+    { ...identity, state: "failed", errorText: "worker exited before completion" },
+    { ...identity, state: "interrupted", errorText: "node host stopped" },
+    { ...identity, state: "cancelled", errorText: "node worker launch cancelled" },
+  ])("round-trips the closed $state receipt", (receipt) => {
+    expect(parseNodeWorkerSupervisorReceipt(receipt)).toEqual(receipt);
+  });
+
+  it.each([
+    { name: "extra field", receipt: { ...identity, state: "running", workerPid: 123 } },
+    { name: "missing plan hash", receipt: { ...identity, planHash: undefined, state: "running" } },
+    { name: "completed without output", receipt: { ...identity, state: "completed" } },
+    {
+      name: "completed with malformed output",
+      receipt: { ...identity, state: "completed", resultJson: "{" },
+    },
+    {
+      name: "oversized completed output",
+      receipt: {
+        ...identity,
+        state: "completed",
+        resultJson: JSON.stringify({ text: "x".repeat(RESULT_JSON_MAX_BYTES) }),
+      },
+    },
+    { name: "failed without error", receipt: { ...identity, state: "failed" } },
+    {
+      name: "multiline error",
+      receipt: { ...identity, state: "failed", errorText: "first\nsecond" },
+    },
+    {
+      name: "oversized error",
+      receipt: {
+        ...identity,
+        state: "failed",
+        errorText: "x".repeat(ERROR_TEXT_MAX_BYTES + 1),
+      },
+    },
+  ])("rejects $name", ({ receipt }) => {
+    expect(parseNodeWorkerSupervisorReceipt(receipt)).toBeNull();
+  });
+
+  it("rejects non-object values without throwing", () => {
+    expect(parseNodeWorkerSupervisorReceipt("{")).toBeNull();
+    expect(parseNodeWorkerSupervisorReceipt(null)).toBeNull();
+  });
+});
diff --git a/src/worker/node-supervisor-protocol.ts b/src/worker/node-supervisor-protocol.ts
new file mode 100644
index 000000000000..4e76d6096bb2
--- /dev/null
+++ b/src/worker/node-supervisor-protocol.ts
@@ -0,0 +1,288 @@
+import { createHash } from "node:crypto";
+import { stableStringify } from "@openclaw/normalization-core";
+import { isRecord } from "@openclaw/normalization-core/record-coerce";
+import { parseWorkerLaunchDescriptor, type WorkerLaunchDescriptor } from "./launch-descriptor.js";
+
+const IDENTIFIER_MAX_CHARS = 256;
+const GATEWAY_NAMESPACE_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u;
+const NODE_WORKER_SUPERVISOR_CANCEL_REQUEST_MAX_BYTES = 4 * 1024;
+const NODE_WORKER_RESULT_JSON_MAX_BYTES = 64 * 1024;
+const NODE_WORKER_ERROR_TEXT_MAX_BYTES = 4 * 1024;
+
+export type NodeWorkerLaunchInput = {
+  launchId: string;
+  gatewayNamespace: string;
+  bundleHash: string;
+  placementGeneration: number;
+  descriptor: WorkerLaunchDescriptor;
+};
+
+export type NodeWorkerSupervisorIdentity = {
+  launchId: string;
+  planHash: string;
+  environmentId: string;
+  sessionId: string;
+  ownerEpoch: number;
+  placementGeneration: number;
+  runId: string;
+};
+
+type NodeWorkerSupervisorActiveReceipt = NodeWorkerSupervisorIdentity & {
+  state: "pending" | "running";
+};
+
+type NodeWorkerSupervisorCompletedReceipt = NodeWorkerSupervisorIdentity & {
+  state: "completed";
+  resultJson: string;
+};
+
+type NodeWorkerSupervisorErrorReceipt = NodeWorkerSupervisorIdentity & {
+  state: "failed" | "interrupted" | "cancelled";
+  errorText: string;
+};
+
+export type NodeWorkerSupervisorReceipt =
+  | NodeWorkerSupervisorActiveReceipt
+  | NodeWorkerSupervisorCompletedReceipt
+  | NodeWorkerSupervisorErrorReceipt;
+
+function hasExactKeys(value: Record<string, unknown>, keys: readonly string[]): boolean {
+  return (
+    Object.keys(value).length === keys.length && keys.every((key) => Object.hasOwn(value, key))
+  );
+}
+
+function isIdentifier(value: unknown): value is string {
+  return (
+    typeof value === "string" &&
+    value.length > 0 &&
+    value.length <= IDENTIFIER_MAX_CHARS &&
+    value.trim() === value &&
+    !value.includes("\0")
+  );
+}
+
+function requireIdentifier(value: unknown, label: string): string {
+  if (!isIdentifier(value)) {
+    throw new Error(`INVALID_REQUEST: ${label} must be a bounded non-empty identifier`);
+  }
+  return value;
+}
+
+function isNonNegativeInteger(value: unknown): value is number {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
+}
+
+function requireNonNegativeInteger(value: unknown, label: string): number {
+  if (!isNonNegativeInteger(value)) {
+    throw new Error(`INVALID_REQUEST: ${label} must be a non-negative safe integer`);
+  }
+  return value;
+}
+
+function isPlanHash(value: unknown): value is string {
+  return typeof value === "string" && /^[a-f0-9]{64}$/u.test(value);
+}
+
+function decodeRequest(raw?: string | null): unknown {
+  if (!raw) {
+    throw new Error("INVALID_REQUEST: paramsJSON required");
+  }
+  try {
+    return JSON.parse(raw) as unknown;
+  } catch {
+    throw new Error("INVALID_REQUEST: paramsJSON malformed JSON");
+  }
+}
+
+export function parseNodeWorkerLaunchInput(raw?: string | null): NodeWorkerLaunchInput {
+  const value = decodeRequest(raw);
+  if (
+    !isRecord(value) ||
+    !hasExactKeys(value, [
+      "launchId",
+      "gatewayNamespace",
+      "bundleHash",
+      "placementGeneration",
+      "descriptor",
+    ])
+  ) {
+    throw new Error("INVALID_REQUEST: invalid node worker launch request");
+  }
+  const launchId = requireIdentifier(value.launchId, "launchId");
+  const gatewayNamespace = requireIdentifier(value.gatewayNamespace, "gatewayNamespace");
+  if (!GATEWAY_NAMESPACE_PATTERN.test(gatewayNamespace)) {
+    throw new Error("INVALID_REQUEST: gatewayNamespace must be a safe bounded path component");
+  }
+  if (!isPlanHash(value.bundleHash)) {
+    throw new Error("INVALID_REQUEST: bundleHash must be 64 lowercase hexadecimal characters");
+  }
+  let descriptor: WorkerLaunchDescriptor;
+  try {
+    descriptor = parseWorkerLaunchDescriptor(value.descriptor);
+  } catch {
+    throw new Error("INVALID_REQUEST: invalid worker launch descriptor");
+  }
+  if (descriptor.admission.handshake.bundleHash !== value.bundleHash) {
+    throw new Error("INVALID_REQUEST: descriptor bundle hash does not match bundleHash");
+  }
+  return {
+    launchId,
+    gatewayNamespace,
+    bundleHash: value.bundleHash,
+    placementGeneration: requireNonNegativeInteger(
+      value.placementGeneration,
+      "placementGeneration",
+    ),
+    descriptor,
+  };
+}
+
+export function parseNodeWorkerLookupInput(raw?: string | null): { launchId: string } {
+  const value = decodeRequest(raw);
+  if (!isRecord(value) || !hasExactKeys(value, ["launchId"])) {
+    throw new Error("INVALID_REQUEST: invalid node worker lookup request");
+  }
+  return { launchId: requireIdentifier(value.launchId, "launchId") };
+}
+
+export function parseNodeWorkerCancelInput(raw?: string | null): NodeWorkerSupervisorIdentity {
+  if (!raw || Buffer.byteLength(raw, "utf8") > NODE_WORKER_SUPERVISOR_CANCEL_REQUEST_MAX_BYTES) {
+    throw new Error("INVALID_REQUEST: invalid node worker cancel request");
+  }
+  const value = decodeRequest(raw);
+  if (
+    !isRecord(value) ||
+    !hasExactKeys(value, [
+      "launchId",
+      "planHash",
+      "environmentId",
+      "sessionId",
+      "ownerEpoch",
+      "placementGeneration",
+      "runId",
+    ])
+  ) {
+    throw new Error("INVALID_REQUEST: invalid node worker cancel request");
+  }
+  if (!isPlanHash(value.planHash)) {
+    throw new Error("INVALID_REQUEST: planHash must be 64 lowercase hexadecimal characters");
+  }
+  return {
+    launchId: requireIdentifier(value.launchId, "launchId"),
+    planHash: value.planHash,
+    environmentId: requireIdentifier(value.environmentId, "environmentId"),
+    sessionId: requireIdentifier(value.sessionId, "sessionId"),
+    ownerEpoch: requireNonNegativeInteger(value.ownerEpoch, "ownerEpoch"),
+    placementGeneration: requireNonNegativeInteger(
+      value.placementGeneration,
+      "placementGeneration",
+    ),
+    runId: requireIdentifier(value.runId, "runId"),
+  };
+}
+
+export function nodeWorkerPlanHash(
+  input: Pick<
+    NodeWorkerLaunchInput,
+    "bundleHash" | "descriptor" | "gatewayNamespace" | "placementGeneration"
+  >,
+): string {
+  return createHash("sha256")
+    .update(
+      stableStringify({
+        bundleHash: input.bundleHash,
+        descriptor: input.descriptor,
+        gatewayNamespace: input.gatewayNamespace,
+        placementGeneration: input.placementGeneration,
+      }),
+    )
+    .digest("hex");
+}
+
+const RECEIPT_IDENTITY_KEYS = [
+  "launchId",
+  "planHash",
+  "environmentId",
+  "sessionId",
+  "ownerEpoch",
+  "placementGeneration",
+  "runId",
+] as const;
+
+function parseReceiptIdentity(value: Record<string, unknown>): NodeWorkerSupervisorIdentity | null {
+  if (
+    !isIdentifier(value.launchId) ||
+    !isPlanHash(value.planHash) ||
+    !isIdentifier(value.environmentId) ||
+    !isIdentifier(value.sessionId) ||
+    !isNonNegativeInteger(value.ownerEpoch) ||
+    !isNonNegativeInteger(value.placementGeneration) ||
+    !isIdentifier(value.runId)
+  ) {
+    return null;
+  }
+  return {
+    launchId: value.launchId,
+    planHash: value.planHash,
+    environmentId: value.environmentId,
+    sessionId: value.sessionId,
+    ownerEpoch: value.ownerEpoch,
+    placementGeneration: value.placementGeneration,
+    runId: value.runId,
+  };
+}
+
+function isBoundedResultJson(value: unknown): value is string {
+  if (
+    typeof value !== "string" ||
+    value.length === 0 ||
+    Buffer.byteLength(value, "utf8") > NODE_WORKER_RESULT_JSON_MAX_BYTES
+  ) {
+    return false;
+  }
+  try {
+    return isRecord(JSON.parse(value) as unknown);
+  } catch {
+    return false;
+  }
+}
+
+function isBoundedErrorText(value: unknown): value is string {
+  return (
+    typeof value === "string" &&
+    value.length > 0 &&
+    Buffer.byteLength(value, "utf8") <= NODE_WORKER_ERROR_TEXT_MAX_BYTES &&
+    !/[\r\n]/u.test(value)
+  );
+}
+
+export function parseNodeWorkerSupervisorReceipt(
+  value: unknown,
+): NodeWorkerSupervisorReceipt | null {
+  if (!isRecord(value) || typeof value.state !== "string") {
+    return null;
+  }
+  const identity = parseReceiptIdentity(value);
+  if (!identity) {
+    return null;
+  }
+  if (value.state === "pending" || value.state === "running") {
+    return hasExactKeys(value, [...RECEIPT_IDENTITY_KEYS, "state"])
+      ? { ...identity, state: value.state }
+      : null;
+  }
+  if (value.state === "completed") {
+    return hasExactKeys(value, [...RECEIPT_IDENTITY_KEYS, "state", "resultJson"]) &&
+      isBoundedResultJson(value.resultJson)
+      ? { ...identity, state: value.state, resultJson: value.resultJson }
+      : null;
+  }
+  if (value.state === "failed" || value.state === "interrupted" || value.state === "cancelled") {
+    return hasExactKeys(value, [...RECEIPT_IDENTITY_KEYS, "state", "errorText"]) &&
+      isBoundedErrorText(value.errorText)
+      ? { ...identity, state: value.state, errorText: value.errorText }
+      : null;
+  }
+  return null;
+}

From 568c07191aa1219fe7b2b47639dd2f9611903719 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 12 Aug 2026 22:20:09 -0700
Subject: [PATCH 20/23] test: speed up attempt execution helpers (#123012)

Co-authored-by: Amp <amp@ampcode.com>
---
 src/agents/command/attempt-execution.test.ts | 147 +++++++------------
 1 file changed, 56 insertions(+), 91 deletions(-)

diff --git a/src/agents/command/attempt-execution.test.ts b/src/agents/command/attempt-execution.test.ts
index f8ad27645ecf..622373f80715 100644
--- a/src/agents/command/attempt-execution.test.ts
+++ b/src/agents/command/attempt-execution.test.ts
@@ -4,6 +4,19 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  readClaudeCliFallbackSeed: vi.fn(),
+}));
+
+vi.mock("../cli-runner/log.js", () => ({
+  cliBackendLog: { warn: vi.fn() },
+}));
+
+vi.mock("../../gateway/cli-session-history.js", () => ({
+  readClaudeCliFallbackSeed: mocks.readClaudeCliFallbackSeed,
+}));
+
 import { cliBackendLog } from "../cli-runner/log.js";
 import {
   buildClaudeCliFallbackContextPrelude,
@@ -41,16 +54,6 @@ describe("resolveFallbackRetryPrompt", () => {
     ).toBe(`[Retry after the previous model attempt failed or timed out]\n\n${originalBody}`);
   });
 
-  it("preserves original body for fallback retry when session has no history (subagent spawn)", () => {
-    expect(
-      resolveFallbackRetryPrompt({
-        body: originalBody,
-        isFallbackRetry: true,
-        sessionHasHistory: false,
-      }),
-    ).toBe(originalBody);
-  });
-
   it("preserves original body for fallback retry when sessionHasHistory is undefined", () => {
     expect(
       resolveFallbackRetryPrompt({
@@ -78,16 +81,6 @@ describe("resolveFallbackRetryPrompt", () => {
     ).toBe(originalBody);
   });
 
-  it("preserves original body on fallback retry without history", () => {
-    expect(
-      resolveFallbackRetryPrompt({
-        body: originalBody,
-        isFallbackRetry: true,
-        sessionHasHistory: false,
-      }),
-    ).toBe(originalBody);
-  });
-
   it("prepends priorContextPrelude before the retry marker on fallback retry", () => {
     const prelude = "## Prior session context (from claude-cli)\nuser: prior question";
     // Claude fallback prelude must come before the retry marker so the model
@@ -244,68 +237,60 @@ describe("formatClaudeCliFallbackPrelude", () => {
 });
 
 describe("buildClaudeCliFallbackContextPrelude", () => {
+  beforeEach(() => {
+    mocks.readClaudeCliFallbackSeed.mockReset();
+  });
+
   it("returns empty string when no sessionId is provided", () => {
     expect(buildClaudeCliFallbackContextPrelude({ cliSessionId: undefined })).toBe("");
     expect(buildClaudeCliFallbackContextPrelude({ cliSessionId: "  " })).toBe("");
+    expect(mocks.readClaudeCliFallbackSeed).not.toHaveBeenCalled();
   });
 
-  it("returns empty string when the Claude session file does not exist", async () => {
-    const tmpHome = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-fallback-prelude-"));
-    try {
-      expect(
-        buildClaudeCliFallbackContextPrelude({
-          cliSessionId: "missing-session",
-          homeDir: tmpHome,
-        }),
-      ).toBe("");
-    } finally {
-      await fs.rm(tmpHome, { recursive: true, force: true });
-    }
+  it("returns empty string when the Claude session loader finds no seed", () => {
+    mocks.readClaudeCliFallbackSeed.mockReturnValue(undefined);
+
+    expect(
+      buildClaudeCliFallbackContextPrelude({
+        cliSessionId: "missing-session",
+        homeDir: "/tmp/test-home",
+      }),
+    ).toBe("");
+    expect(mocks.readClaudeCliFallbackSeed).toHaveBeenCalledWith({
+      cliSessionId: "missing-session",
+      homeDir: "/tmp/test-home",
+    });
   });
 
-  it("reads a real Claude JSONL fixture and emits a labeled prelude end-to-end", async () => {
-    const tmpHome = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-fallback-prelude-"));
-    const sessionId = "e2e-session";
-    const projectsDir = path.join(tmpHome, ".claude", "projects", "demo");
-    try {
-      // Use Claude's JSONL shape directly so parser and formatter behavior stay
-      // aligned with real CLI transcripts rather than synthetic message arrays.
-      await fs.mkdir(projectsDir, { recursive: true });
-      const lines = [
+  it("formats the Claude session loader seed into a labeled fallback prelude", () => {
+    mocks.readClaudeCliFallbackSeed.mockReturnValue({
+      recentTurns: [
         {
-          type: "user",
-          uuid: "u1",
-          message: { role: "user", content: "prior question about deploys" },
+          role: "user",
+          content: "prior question about deploys",
         },
         {
-          type: "assistant",
-          uuid: "a1",
-          message: {
-            role: "assistant",
-            model: "claude-sonnet-4-6",
-            content: [
-              { type: "text", text: "prior answer about blue-green" },
-              { type: "tool_use", id: "toolu_1", name: "Bash", input: { command: "pwd" } },
-            ],
-          },
+          role: "assistant",
+          content: [
+            { type: "text", text: "prior answer about blue-green" },
+            { type: "toolcall", name: "Bash" },
+          ],
         },
-      ];
-      await fs.writeFile(
-        path.join(projectsDir, `${sessionId}.jsonl`),
-        `${lines.map((line) => JSON.stringify(line)).join("\n")}\n`,
-        "utf-8",
-      );
-      const prelude = buildClaudeCliFallbackContextPrelude({
-        cliSessionId: sessionId,
-        homeDir: tmpHome,
-      });
-      expect(prelude).toContain("## Prior session context (from claude-cli)");
-      expect(prelude).toContain("user: prior question about deploys");
-      expect(prelude).toContain("assistant: prior answer about blue-green");
-      expect(prelude).toContain("(tool call: Bash)");
-    } finally {
-      await fs.rm(tmpHome, { recursive: true, force: true });
-    }
+      ],
+    });
+
+    const prelude = buildClaudeCliFallbackContextPrelude({
+      cliSessionId: " e2e-session ",
+      homeDir: "/tmp/test-home",
+    });
+    expect(mocks.readClaudeCliFallbackSeed).toHaveBeenCalledWith({
+      cliSessionId: "e2e-session",
+      homeDir: "/tmp/test-home",
+    });
+    expect(prelude).toContain("## Prior session context (from claude-cli)");
+    expect(prelude).toContain("user: prior question about deploys");
+    expect(prelude).toContain("assistant: prior answer about blue-green");
+    expect(prelude).toContain("(tool call: Bash)");
   });
 });
 
@@ -505,26 +490,6 @@ describe("claudeCliSessionTranscriptHasContent", () => {
 
   const GRACE_MS = 250;
 
-  it("returns false when the Claude project transcript is missing or empty", async () => {
-    const workspaceDir = await makeWorkspace();
-    expect(
-      await claudeCliSessionTranscriptHasContent({
-        sessionId: "missing-session",
-        workspaceDir,
-        homeDir: tmpDir,
-      }),
-    ).toBe(false);
-
-    await writeClaudeProjectFile(workspaceDir, "empty-session", "");
-    expect(
-      await claudeCliSessionTranscriptHasContent({
-        sessionId: "empty-session",
-        workspaceDir,
-        homeDir: tmpDir,
-      }),
-    ).toBe(false);
-  });
-
   it("returns true when the Claude project transcript has an assistant message", async () => {
     const workspaceDir = await makeWorkspace();
     await writeClaudeProjectFile(

From 7d6dfa1939b46cf093389355dbe67254e7bf0756 Mon Sep 17 00:00:00 2001
From: Leon-SK668 <0668001470@xydigit.com>
Date: Thu, 13 Aug 2026 13:23:58 +0800
Subject: [PATCH 21/23] fix(replies): keep approval-unavailable notices durable
 (#121179)

Punchcard-Session: clear-lantern-summit-v2
---
 ...config.hooks-and-send-policy.test-utils.ts |  9 +++++++
 .../reply/dispatch-from-config.payloads.ts    |  5 ++++
 .../dispatch-from-config.prepare-execution.ts |  8 ++++--
 ...dispatch-from-config.routing.test-utils.ts | 25 +++++++++++++++++++
 .../reply/followup-turn-execution.test.ts     |  9 +++++++
 src/infra/exec-approval-reply.test.ts         | 17 ++++++++-----
 src/infra/exec-approval-reply.ts              |  7 ++++++
 7 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/src/auto-reply/reply/dispatch-from-config.hooks-and-send-policy.test-utils.ts b/src/auto-reply/reply/dispatch-from-config.hooks-and-send-policy.test-utils.ts
index b0e976753b74..5ffc6fea6715 100644
--- a/src/auto-reply/reply/dispatch-from-config.hooks-and-send-policy.test-utils.ts
+++ b/src/auto-reply/reply/dispatch-from-config.hooks-and-send-policy.test-utils.ts
@@ -2671,6 +2671,15 @@ describe("sendPolicy deny — suppress delivery, not processing (#53328)", () =>
         },
       },
     },
+    {
+      label: "unavailable exec approvals",
+      payload: {
+        text: "Exec approval is unavailable.",
+        channelData: {
+          execApprovalUnavailable: { reason: "no-approval-route" },
+        },
+      },
+    },
     {
       label: "ask-user prompts",
       payload: {
diff --git a/src/auto-reply/reply/dispatch-from-config.payloads.ts b/src/auto-reply/reply/dispatch-from-config.payloads.ts
index a39cf0382816..0c0e8eb3e949 100644
--- a/src/auto-reply/reply/dispatch-from-config.payloads.ts
+++ b/src/auto-reply/reply/dispatch-from-config.payloads.ts
@@ -51,6 +51,10 @@ export function hasExecApprovalPayload(payload: ReplyPayload): boolean {
   return isRecord(payload.channelData?.execApproval);
 }
 
+export function hasExecApprovalUnavailablePayload(payload: ReplyPayload): boolean {
+  return isRecord(payload.channelData?.execApprovalUnavailable);
+}
+
 export function hasAskUserPayload(payload: ReplyPayload): boolean {
   return isRecord(payload.channelData?.askUser);
 }
@@ -59,6 +63,7 @@ export function requiresDurableToolResultDelivery(payload: ReplyPayload): boolea
   return (
     resolveSendableOutboundReplyParts(payload).hasMedia ||
     hasExecApprovalPayload(payload) ||
+    hasExecApprovalUnavailablePayload(payload) ||
     hasAskUserPayload(payload)
   );
 }
diff --git a/src/auto-reply/reply/dispatch-from-config.prepare-execution.ts b/src/auto-reply/reply/dispatch-from-config.prepare-execution.ts
index 7c03c47bacae..516ed4fd8130 100644
--- a/src/auto-reply/reply/dispatch-from-config.prepare-execution.ts
+++ b/src/auto-reply/reply/dispatch-from-config.prepare-execution.ts
@@ -13,7 +13,11 @@ import { normalizeMessageChannel } from "../../utils/message-channel.js";
 import type { GetReplyOptions } from "../get-reply-options.types.js";
 import type { ReplyPayload } from "../reply-payload.js";
 import type { ChooseDispatchRouteReadyState } from "./dispatch-from-config.choose-route.js";
-import { hasAskUserPayload, hasExecApprovalPayload } from "./dispatch-from-config.payloads.js";
+import {
+  hasAskUserPayload,
+  hasExecApprovalPayload,
+  hasExecApprovalUnavailablePayload,
+} from "./dispatch-from-config.payloads.js";
 import { extendPreparedDispatchState } from "./dispatch-from-config.phase-state.js";
 import { loadGetReplyFromConfigRuntime } from "./dispatch-from-config.runtime-loaders.js";
 import { withFullRuntimeReplyConfig } from "./get-reply-fast-path.js";
@@ -121,7 +125,7 @@ export async function prepareDispatchExecution(state: ChooseDispatchRouteReadySt
     if (shouldSendToolSummaries()) {
       return payload;
     }
-    if (hasExecApprovalPayload(payload)) {
+    if (hasExecApprovalPayload(payload) || hasExecApprovalUnavailablePayload(payload)) {
       return payload;
     }
     if (hasAskUserPayload(payload)) {
diff --git a/src/auto-reply/reply/dispatch-from-config.routing.test-utils.ts b/src/auto-reply/reply/dispatch-from-config.routing.test-utils.ts
index 70a76cc9353d..a43be13e9577 100644
--- a/src/auto-reply/reply/dispatch-from-config.routing.test-utils.ts
+++ b/src/auto-reply/reply/dispatch-from-config.routing.test-utils.ts
@@ -427,6 +427,31 @@ describe("dispatchReplyFromConfig", () => {
     ).toBe(true);
   });
 
+  it("delivers approval-unavailable notices when verbose tool progress is disabled", async () => {
+    setNoAbort();
+    const payload = {
+      text: "Exec approval is unavailable.",
+      channelData: {
+        execApprovalUnavailable: { reason: "no-approval-route" },
+      },
+    } satisfies ReplyPayload;
+    const dispatcher = createDispatcher();
+    const ctx = buildTestCtx({ Provider: "telegram", ChatType: "direct" });
+    const replyResolver = async (
+      _ctx: MsgContext,
+      opts?: GetReplyOptions,
+      _cfg?: OpenClawConfig,
+    ) => {
+      await requireToolResultHandler(opts?.onToolResult)(payload);
+      return undefined;
+    };
+
+    await dispatchReplyFromConfig({ ctx, cfg: emptyConfig, dispatcher, replyResolver });
+
+    expect(dispatcher.sendToolResult).toHaveBeenCalledWith(payload);
+    expect(dispatcher.sendFinalReply).not.toHaveBeenCalled();
+  });
+
   it("drops ask_user prompts that terminalize before dispatcher delivery", async () => {
     setNoAbort();
     askUserMocks.isAskUserPromptPending.mockResolvedValue(false);
diff --git a/src/auto-reply/reply/followup-turn-execution.test.ts b/src/auto-reply/reply/followup-turn-execution.test.ts
index d27973f31870..cac797fea71d 100644
--- a/src/auto-reply/reply/followup-turn-execution.test.ts
+++ b/src/auto-reply/reply/followup-turn-execution.test.ts
@@ -329,6 +329,15 @@ describe("executeFollowupTurn", () => {
         },
       },
     },
+    {
+      label: "unavailable exec approvals",
+      payload: {
+        text: "Exec approval is unavailable.",
+        channelData: {
+          execApprovalUnavailable: { reason: "no-approval-route" },
+        },
+      },
+    },
     {
       label: "ask-user prompts",
       payload: {
diff --git a/src/infra/exec-approval-reply.test.ts b/src/infra/exec-approval-reply.test.ts
index 172e51dae0ff..69bac1be7042 100644
--- a/src/infra/exec-approval-reply.test.ts
+++ b/src/infra/exec-approval-reply.test.ts
@@ -688,18 +688,23 @@ describe("exec approval reply helpers", () => {
       }),
     ).toEqual({
       text: "Careful.\n\nApproval required. I sent approval DMs to the approvers for this account.",
+      channelData: {
+        execApprovalUnavailable: {
+          reason: "no-approval-route",
+        },
+      },
     });
   });
 
   it.each(unavailableReasonCases)(
     "builds unavailable payload for reason $reason",
     ({ reason, channelLabel, expected }) => {
-      expect(
-        buildExecApprovalUnavailableReplyPayload({
-          reason,
-          channelLabel,
-        }).text,
-      ).toContain(expected);
+      const payload = buildExecApprovalUnavailableReplyPayload({
+        reason,
+        channelLabel,
+      });
+      expect(payload.text).toContain(expected);
+      expect(payload.channelData).toEqual({ execApprovalUnavailable: { reason } });
     },
   );
 });
diff --git a/src/infra/exec-approval-reply.ts b/src/infra/exec-approval-reply.ts
index 784492fb45d2..482c215d422a 100644
--- a/src/infra/exec-approval-reply.ts
+++ b/src/infra/exec-approval-reply.ts
@@ -475,6 +475,11 @@ export function buildExecApprovalUnavailableReplyPayload(
   params: ExecApprovalUnavailableReplyParams,
 ): ReplyPayload {
   const lines: string[] = [];
+  const channelData = {
+    execApprovalUnavailable: {
+      reason: params.reason,
+    },
+  };
   const warningText = params.warningText?.trim();
   if (warningText) {
     lines.push(warningText);
@@ -484,6 +489,7 @@ export function buildExecApprovalUnavailableReplyPayload(
     lines.push(getExecApprovalApproverDmNoticeText());
     return {
       text: lines.join("\n\n"),
+      channelData,
     };
   }
 
@@ -535,5 +541,6 @@ export function buildExecApprovalUnavailableReplyPayload(
 
   return {
     text: lines.join("\n\n"),
+    channelData,
   };
 }

From eda22ae1d57812534d1164ef52c05a9c11268996 Mon Sep 17 00:00:00 2001
From: Dallin Romney <dallinromney@gmail.com>
Date: Thu, 13 Aug 2026 12:25:58 +0700
Subject: [PATCH 22/23] fix(ui): stop misreporting limited Custodian access
 (#123011)

---
 ui/src/e2e/device-scope-upgrade.e2e.test.ts    | 18 ++++++++++++++++++
 .../custodian-page-agent-create.test.ts        |  5 +++--
 .../pages/custodian/custodian-session-store.ts |  5 +++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ui/src/e2e/device-scope-upgrade.e2e.test.ts b/ui/src/e2e/device-scope-upgrade.e2e.test.ts
index ff471ccb9dfa..ff0f3b000b8b 100644
--- a/ui/src/e2e/device-scope-upgrade.e2e.test.ts
+++ b/ui/src/e2e/device-scope-upgrade.e2e.test.ts
@@ -194,6 +194,24 @@ describeControlUiE2e("Control UI live device scope upgrade", () => {
     },
   );
 
+  it("does not misreport limited Custodian access as an outdated Gateway", async () => {
+    const context = await createContext();
+    const page = await context.newPage();
+    const gateway = await installMockGateway(page, {
+      featureMethods: ["chat.metadata", "chat.startup", "openclaw.chat", ...SCOPE_UPGRADE_METHODS],
+      operatorScopes: LIMITED_SCOPES,
+    });
+
+    await page.goto(`${server.baseUrl}custodian?intent=new-agent`);
+    await page.getByText("This browser has limited access.", { exact: true }).waitFor();
+
+    expect(
+      await page.getByText("Update the Gateway to continue setup with OpenClaw.").count(),
+    ).toBe(0);
+    expect(await gateway.getRequests("openclaw.chat")).toHaveLength(0);
+    await captureProof(page, "custodian-limited.png");
+  });
+
   it("keeps manual repair guidance when the banner module fails to load", async () => {
     const context = await createContext();
     const page = await context.newPage();
diff --git a/ui/src/pages/custodian/custodian-page-agent-create.test.ts b/ui/src/pages/custodian/custodian-page-agent-create.test.ts
index 3718e2987c58..b98b0ba07ade 100644
--- a/ui/src/pages/custodian/custodian-page-agent-create.test.ts
+++ b/ui/src/pages/custodian/custodian-page-agent-create.test.ts
@@ -117,7 +117,7 @@ describe("custodian new-agent flow", () => {
     expect(request.mock.calls[0]?.[1]).toMatchObject({ welcomeVariant: "new-agent" });
   });
 
-  it("does not start new-agent chat with read-only operator access", async () => {
+  it("does not misreport limited access as an outdated Gateway", async () => {
     const request = vi.fn();
     const { context } = createContext(request);
     context.gateway.snapshot.hello = {
@@ -125,10 +125,11 @@ describe("custodian new-agent flow", () => {
       auth: { role: "operator", scopes: ["operator.read"] },
     };
 
-    await mountPage(context);
+    const page = await mountPage(context);
     await Promise.resolve();
 
     expect(request).not.toHaveBeenCalled();
+    expect(page.querySelector('[role="alert"]')).toBeNull();
   });
 
   it("refreshes the roster and opens the created agent hatch session", async () => {
diff --git a/ui/src/pages/custodian/custodian-session-store.ts b/ui/src/pages/custodian/custodian-session-store.ts
index 5e5213c78c34..628d212b5dcf 100644
--- a/ui/src/pages/custodian/custodian-session-store.ts
+++ b/ui/src/pages/custodian/custodian-session-store.ts
@@ -450,6 +450,7 @@ export class CustodianSessionStore {
     const client = snapshot.phase === "connected" ? snapshot.client : null;
     const chatSupported =
       client !== null && canCallGatewayMethod(snapshot, "openclaw.chat", "operator.admin");
+    const chatUnsupported = isGatewayMethodAdvertised(snapshot, "openclaw.chat") === false;
     const configuredInferenceState = this.resolveConfiguredInferenceState();
     const inferenceStateChanged = configuredInferenceState !== this.configuredInferenceState;
     this.configuredInferenceState = configuredInferenceState;
@@ -489,7 +490,7 @@ export class CustodianSessionStore {
       if (!chatSupported) {
         this.sessionStarted = false;
         this.abandonPendingUserTurn(pendingParams);
-        this.error = t("custodian.unsupportedGateway");
+        this.error = chatUnsupported ? t("custodian.unsupportedGateway") : null;
         return;
       }
       this.chatAvailable = true;
@@ -506,7 +507,7 @@ export class CustodianSessionStore {
       return;
     }
     if (!chatSupported) {
-      this.error = t("custodian.unsupportedGateway");
+      this.error = chatUnsupported ? t("custodian.unsupportedGateway") : null;
       return;
     }
     if (configuredInferenceState === "unresolved") {

From 2dffeae12692f6524a1b624ae49108f6832486bc Mon Sep 17 00:00:00 2001
From: Alix-007 <li.long15@xydigit.com>
Date: Thu, 13 Aug 2026 13:28:12 +0800
Subject: [PATCH 23/23] fix(gateway): scope task-owned terminals by child
 session (#121192)

Punchcard-Session: calm-workshop-cedar-hx
---
 src/agents/tools/terminal-tool.test.ts       | 57 ++++++++++++--
 src/agents/tools/terminal-tool.ts            | 17 ++--
 src/gateway/tool-resolution.terminal.test.ts | 81 ++++++++++++++++++++
 src/gateway/tool-resolution.ts               |  1 +
 src/tasks/task-status-access.ts              | 25 ++++++
 5 files changed, 166 insertions(+), 15 deletions(-)
 create mode 100644 src/gateway/tool-resolution.terminal.test.ts

diff --git a/src/agents/tools/terminal-tool.test.ts b/src/agents/tools/terminal-tool.test.ts
index eb48355d9c7e..1a04f51b2491 100644
--- a/src/agents/tools/terminal-tool.test.ts
+++ b/src/agents/tools/terminal-tool.test.ts
@@ -168,7 +168,7 @@ describe("terminal tool", () => {
       spawn: async () => backends.shift() ?? makeBackend(),
     });
     const agentSessionKey = "agent:main:shared-task-session";
-    const lookupTaskByRunId = vi.fn(async (runId: string) =>
+    const lookupTaskByRunIdForChildSession = vi.fn(async (runId: string) =>
       runId === "conversation-run"
         ? undefined
         : {
@@ -182,7 +182,7 @@ describe("terminal tool", () => {
         agentId: "main",
         agentSessionKey,
         runId,
-        lookupTaskByRunId,
+        lookupTaskByRunIdForChildSession,
         getGatewayContext: () => makeContext(manager),
       });
 
@@ -190,7 +190,11 @@ describe("terminal tool", () => {
     await createTaskTool("run-2").execute("open", { action: "open", show: false });
     await createTaskTool("conversation-run").execute("open", { action: "open", show: false });
 
-    expect(lookupTaskByRunId.mock.calls).toEqual([["run-1"], ["run-2"], ["conversation-run"]]);
+    expect(lookupTaskByRunIdForChildSession.mock.calls).toEqual([
+      ["run-1", agentSessionKey],
+      ["run-2", agentSessionKey],
+      ["conversation-run", agentSessionKey],
+    ]);
     expect(manager.closeAgentSessions("task-1")).toBe(1);
     expect(firstBackend.killed).toBe(true);
     expect(secondBackend.killed).toBe(false);
@@ -198,6 +202,42 @@ describe("terminal tool", () => {
     expect(manager.listAgent(agentSessionKey, "main")).toHaveLength(2);
   });
 
+  it("binds the matching child session when task run ids collide", async () => {
+    const backend = makeBackend();
+    const manager = new TerminalSessionManager({ emit: vi.fn(), spawn: async () => backend });
+    const agentSessionKey = "agent:main:shared-run-task-2";
+    const tasks = [
+      {
+        taskId: "task-1",
+        status: "running" as const,
+        childSessionKey: "agent:main:shared-run-task-1",
+      },
+      {
+        taskId: "task-2",
+        status: "running" as const,
+        childSessionKey: agentSessionKey,
+      },
+    ];
+    const lookupTaskByRunIdForChildSession = vi.fn(
+      async (_runId: string, childSessionKey: string) =>
+        tasks.find((task) => task.childSessionKey === childSessionKey),
+    );
+    const tool = createTerminalTool({
+      agentId: "main",
+      agentSessionKey,
+      runId: "shared-run",
+      lookupTaskByRunIdForChildSession,
+      getGatewayContext: () => makeContext(manager),
+    });
+
+    await tool.execute("open", { action: "open", show: false });
+
+    expect(lookupTaskByRunIdForChildSession).toHaveBeenCalledWith("shared-run", agentSessionKey);
+    expect(manager.closeAgentSessions("task-2")).toBe(1);
+    expect(manager.closeAgentSessions("task-1")).toBe(0);
+    expect(backend.killed).toBe(true);
+  });
+
   it("maps a cron agent run to its detached task before terminal lookup", async () => {
     const backend = makeBackend();
     const manager = new TerminalSessionManager({ emit: vi.fn(), spawn: async () => backend });
@@ -212,7 +252,7 @@ describe("terminal tool", () => {
       throw new Error("expected cron agent run claim");
     }
     expect(bindAgentRunTaskRunId("cron-agent-run", claimId, "detached-task-run")).toBe(true);
-    const lookupTaskByRunId = vi.fn(async () => ({
+    const lookupTaskByRunIdForChildSession = vi.fn(async () => ({
       taskId: "cron-task",
       status: "running" as const,
       childSessionKey: agentSessionKey,
@@ -221,14 +261,17 @@ describe("terminal tool", () => {
       agentId: "main",
       agentSessionKey,
       runId: "cron-agent-run",
-      lookupTaskByRunId,
+      lookupTaskByRunIdForChildSession,
       getGatewayContext: () => makeContext(manager),
     });
 
     try {
       await tool.execute("open", { action: "open", show: false });
 
-      expect(lookupTaskByRunId).toHaveBeenCalledWith("detached-task-run");
+      expect(lookupTaskByRunIdForChildSession).toHaveBeenCalledWith(
+        "detached-task-run",
+        agentSessionKey,
+      );
       expect(manager.closeAgentSessions("cron-task")).toBe(1);
       expect(backend.killed).toBe(true);
     } finally {
@@ -246,7 +289,7 @@ describe("terminal tool", () => {
       agentId: "main",
       agentSessionKey: "agent:main:completed-task",
       runId: "completed-run",
-      lookupTaskByRunId: vi.fn(async () => ({
+      lookupTaskByRunIdForChildSession: vi.fn(async () => ({
         taskId: "task-completed",
         status: "succeeded" as const,
         childSessionKey: "agent:main:completed-task",
diff --git a/src/agents/tools/terminal-tool.ts b/src/agents/tools/terminal-tool.ts
index 5b9ff5f9bcbc..8aec240c4ffa 100644
--- a/src/agents/tools/terminal-tool.ts
+++ b/src/agents/tools/terminal-tool.ts
@@ -82,18 +82,21 @@ type TerminalToolOptions = {
   agentId?: string;
   agentSessionKey?: string;
   runId?: string;
-  lookupTaskByRunId?: (
+  lookupTaskByRunIdForChildSession?: (
     runId: string,
+    childSessionKey: string,
   ) => Promise<Pick<TaskRecord, "taskId" | "status" | "childSessionKey"> | undefined>;
   callGateway?: InProcessGatewayCaller;
   getGatewayContext?: () => TerminalToolGatewayContext | undefined;
 };
 
-async function lookupTaskByRunId(
+async function lookupTaskByRunIdForChildSession(
   runId: string,
+  childSessionKey: string,
 ): Promise<Pick<TaskRecord, "taskId" | "status" | "childSessionKey"> | undefined> {
-  const { findTaskByRunIdForStatus } = await import("../../tasks/task-status-access.js");
-  return findTaskByRunIdForStatus(runId);
+  const { findTaskByRunIdForChildSessionForStatus } =
+    await import("../../tasks/task-status-access.js");
+  return findTaskByRunIdForChildSessionForStatus(runId, childSessionKey);
 }
 
 function readDimension(
@@ -161,7 +164,7 @@ function launchBlockMessage(
 export function createTerminalTool(opts: TerminalToolOptions = {}): AnyAgentTool {
   const gatewayCall = opts.callGateway ?? callInProcessGatewayTool;
   const getContext = opts.getGatewayContext ?? getInProcessGatewayToolContext;
-  const findOwnerTask = opts.lookupTaskByRunId ?? lookupTaskByRunId;
+  const findOwnerTask = opts.lookupTaskByRunIdForChildSession ?? lookupTaskByRunIdForChildSession;
   return {
     label: "Terminal",
     name: "terminal",
@@ -206,9 +209,7 @@ export function createTerminalTool(opts: TerminalToolOptions = {}): AnyAgentTool
         });
         const runId = opts.runId?.trim();
         const taskLookupId = runId ? (getAgentRunTaskRunId(runId) ?? runId) : undefined;
-        const candidateTask = taskLookupId ? await findOwnerTask(taskLookupId) : undefined;
-        const task =
-          candidateTask?.childSessionKey?.trim() === agentSessionKey ? candidateTask : undefined;
+        const task = taskLookupId ? await findOwnerTask(taskLookupId, agentSessionKey) : undefined;
         if (task && isTerminalTaskStatus(task.status)) {
           throw new ToolInputError("terminal task already ended");
         }
diff --git a/src/gateway/tool-resolution.terminal.test.ts b/src/gateway/tool-resolution.terminal.test.ts
new file mode 100644
index 000000000000..c919842bb207
--- /dev/null
+++ b/src/gateway/tool-resolution.terminal.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, it, vi } from "vitest";
+import type { OpenClawConfig } from "../config/types.openclaw.js";
+import type { GatewayRequestContext } from "./server-methods/types.js";
+import { setFallbackGatewayContext } from "./server-plugin-fallback-context.js";
+import { TerminalSessionManager } from "./terminal/session-manager.js";
+import { makeFakePty } from "./terminal/session-manager.test-helpers.js";
+import { resolveGatewayScopedTools } from "./tool-resolution.js";
+
+type TaskLookupRecord = {
+  taskId: string;
+  runId: string;
+  childSessionKey: string;
+  status: "running";
+};
+
+const taskStatusMocks = vi.hoisted(() => ({
+  findTaskByRunIdForChildSessionForStatus: vi.fn(
+    (_runId: string, _childSessionKey: string): TaskLookupRecord | undefined => undefined,
+  ),
+  findTaskByRunIdForStatus: vi.fn((_runId: string): TaskLookupRecord | undefined => undefined),
+}));
+
+vi.mock("../tasks/task-status-access.js", () => taskStatusMocks);
+
+describe("resolveGatewayScopedTools terminal ownership", () => {
+  it("binds a loopback terminal to the matching child when run ids collide", async () => {
+    const backend = makeFakePty();
+    const manager = new TerminalSessionManager({ emit: vi.fn(), spawn: async () => backend });
+    const childSessionKey = "agent:main:loopback-task-2";
+    const tasks: TaskLookupRecord[] = [
+      {
+        taskId: "task-1",
+        runId: "shared-run",
+        childSessionKey: "agent:main:loopback-task-1",
+        status: "running",
+      },
+      { taskId: "task-2", runId: "shared-run", childSessionKey, status: "running" },
+    ];
+    taskStatusMocks.findTaskByRunIdForChildSessionForStatus.mockImplementation(
+      (runId, sessionKey) =>
+        tasks.find((task) => task.runId === runId && task.childSessionKey === sessionKey),
+    );
+    const clearContext = setFallbackGatewayContext({
+      terminalSessions: manager,
+      isTerminalEnabled: () => true,
+      resolveTerminalLaunchPolicy: () => ({
+        ok: true,
+        plan: { agentId: "main", cwd: "/tmp", shell: "/bin/sh", args: [] },
+      }),
+    } as unknown as GatewayRequestContext);
+
+    try {
+      const result = resolveGatewayScopedTools({
+        cfg: { tools: { allow: ["terminal"] } } as OpenClawConfig,
+        sessionKey: childSessionKey,
+        runId: "shared-run",
+        senderIsOwner: true,
+        surface: "loopback",
+      });
+      const terminal = result.tools.find((tool) => tool.name === "terminal");
+      if (!terminal?.execute) {
+        throw new Error("expected loopback terminal tool");
+      }
+
+      await terminal.execute("terminal-open", { action: "open", show: false });
+
+      expect(taskStatusMocks.findTaskByRunIdForChildSessionForStatus).toHaveBeenCalledWith(
+        "shared-run",
+        childSessionKey,
+      );
+      expect(manager.closeAgentSessions("task-2")).toBe(1);
+      expect(manager.closeAgentSessions("task-1")).toBe(0);
+      expect(backend.killed).toBe(true);
+    } finally {
+      clearContext();
+      manager.disposeAll();
+      taskStatusMocks.findTaskByRunIdForChildSessionForStatus.mockReset();
+      taskStatusMocks.findTaskByRunIdForStatus.mockReset();
+    }
+  });
+});
diff --git a/src/gateway/tool-resolution.ts b/src/gateway/tool-resolution.ts
index 48c52bf36930..b276808c70aa 100644
--- a/src/gateway/tool-resolution.ts
+++ b/src/gateway/tool-resolution.ts
@@ -272,6 +272,7 @@ export function resolveGatewayScopedTools(params: {
 
   const openClawTools = createOpenClawTools({
     agentSessionKey: params.sessionKey,
+    runId: params.runId,
     requesterAgentIdOverride: sessionAgentId,
     agentChannel: params.messageProvider ?? undefined,
     agentAccountId: params.accountId,
diff --git a/src/tasks/task-status-access.ts b/src/tasks/task-status-access.ts
index 96416de955da..6044132f7cbb 100644
--- a/src/tasks/task-status-access.ts
+++ b/src/tasks/task-status-access.ts
@@ -5,6 +5,7 @@ import {
   listActiveGeneratedMediaTaskIdsForSessionKey,
 } from "./generated-media-task-activity.js";
 import { isTerminalTaskStatus } from "./task-executor-policy.js";
+import { getTasksByRunScope, pickPreferredRunIdTask } from "./task-registry-state.js";
 // Filters task status visibility by requester, owner, and flow scope.
 import {
   findTaskByRunId,
@@ -58,6 +59,30 @@ export function findTaskByRunIdForStatus(runId: string): TaskRecord | undefined
   return findTaskByRunId(runId);
 }
 
+export function findTaskByRunIdForChildSessionForStatus(
+  runId: string,
+  childSessionKey: string,
+): Pick<TaskRecord, "taskId" | "status" | "childSessionKey"> | undefined {
+  const normalizedChildSessionKey = childSessionKey.trim();
+  if (!normalizedChildSessionKey) {
+    return undefined;
+  }
+  // A run id can span multiple task scopes. Terminal ownership must stay on
+  // the exact child session instead of adopting the registry's global preference.
+  const task = pickPreferredRunIdTask(
+    getTasksByRunScope({ runId, sessionKey: normalizedChildSessionKey }).filter(
+      (candidate) => candidate.childSessionKey?.trim() === normalizedChildSessionKey,
+    ),
+  );
+  return task
+    ? {
+        taskId: task.taskId,
+        status: task.status,
+        childSessionKey: task.childSessionKey,
+      }
+    : undefined;
+}
+
 /** Snapshots generated-media task ids so replay guards stay attempt-local. */
 export function getGeneratedMediaTaskIdsForSessionKey(
   sessionKey: string | undefined,