fix(tui): keep the subagent activity filter across navigation (#53318)

Co-authored-by: nexxeln <95541290+nexxeln@users.noreply.github.com>
This commit is contained in:
opencode-agent[bot]
2026-10-05 19:24:45 +05:30
committed by GitHub
Unverified
parent f28f62439e
commit eb2f0d5e5d
4 changed files with 117 additions and 56 deletions
@@ -6,6 +6,7 @@ import { useRoute, useRouteData } from "../../../context/route"
import { useData } from "../../../context/data"
import { useClient } from "../../../context/client"
import { useTheme } from "../../../context/theme"
import { useStorage } from "../../../context/storage"
import { Locale } from "../../../util/locale"
import { Keymap } from "../../../context/keymap"
import { useComposerTab } from "./context"
@@ -31,7 +32,9 @@ export function SubagentsTab(props: { sessionID: string }) {
const shortcuts = Keymap.useShortcuts()
const session = createMemo(() => data.session.get(props.sessionID))
const [store, setStore] = createStore({ selected: 0, active: true })
const [store, setStore] = createStore({ selected: 0 })
// The session route remounts on navigation, so the filter lives in TUI memory and only ctrl+a changes it.
const [filter, updateFilter] = useStorage().memory("subagents-filter", { initial: { active: true } })
const entries = createMemo<SubagentEntry[]>(() => {
const current = session()
@@ -56,7 +59,7 @@ export function SubagentsTab(props: { sessionID: string }) {
},
)
return result.filter((entry) => (store.active ? entry.status === "running" : entry.status !== "running"))
return result.filter((entry) => (filter.active ? entry.status === "running" : entry.status !== "running"))
})
let selectedSessionID = ""
@@ -70,7 +73,7 @@ export function SubagentsTab(props: { sessionID: string }) {
if (!active) {
if (wasActive) {
selectedSessionID = ""
setStore({ selected: 0, active: true })
setStore("selected", 0)
}
wasActive = false
return
@@ -121,7 +124,7 @@ export function SubagentsTab(props: { sessionID: string }) {
? [{ label: "interrupt", shortcut: shortcuts.get("composer.subagent.interrupt") ?? "" }]
: []),
{
label: `show ${store.active ? "inactive" : "active"}`,
label: `show ${filter.active ? "inactive" : "active"}`,
shortcut: shortcuts.get("composer.subagent.toggle-activity") ?? "",
},
]
@@ -172,7 +175,8 @@ export function SubagentsTab(props: { sessionID: string }) {
group: "Composer",
bind: "ctrl+a",
run() {
setStore({ selected: 0, active: !store.active })
updateFilter((draft) => (draft.active = !draft.active))
setStore("selected", 0)
scroll?.scrollTo(0)
},
},
@@ -194,7 +198,7 @@ export function SubagentsTab(props: { sessionID: string }) {
<scrollbox scrollbarOptions={{ visible: false }} maxHeight={5} ref={(r: ScrollBoxRenderable) => (scroll = r)}>
<Show
when={entries().length > 0}
fallback={<text fg={theme.text.muted}> No {store.active ? "active" : "inactive"} subagents</text>}
fallback={<text fg={theme.text.muted}> No {filter.active ? "active" : "inactive"} subagents</text>}
>
<For each={entries()}>
{(entry, index) => {
@@ -1,7 +1,7 @@
/** @jsxImportSource @opentui/solid */
import { testRender } from "@opentui/solid"
import { expect, test } from "bun:test"
import { onMount } from "solid-js"
import { afterAll, expect, test } from "bun:test"
import { onMount, Show } from "solid-js"
import { ConfigProvider } from "../../../src/config"
import type { TuiKeybind } from "../../../src/config/keybind"
import { ClientProvider } from "../../../src/context/client"
@@ -9,10 +9,13 @@ import { DataProvider, useData } from "../../../src/context/data"
import { Keymap } from "../../../src/context/keymap"
import { LocationProvider } from "../../../src/context/location"
import { RouteProvider, useRoute } from "../../../src/context/route"
import { TuiAppProvider } from "../../../src/context/runtime"
import { StorageProvider } from "../../../src/context/storage"
import { ThemeProvider } from "../../../src/context/theme"
import { Composer } from "../../../src/routes/session/composer"
import { DialogProvider } from "../../../src/ui/dialog"
import { ToastProvider } from "../../../src/ui/toast"
import { tmpdir } from "../../fixture/fixture"
import { createApi, createEventStream, createFetch, directory, json } from "../../fixture/tui-client"
import { TestTuiContexts } from "../../fixture/tui-environment"
import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
@@ -21,8 +24,12 @@ const sessions = {
parent: session("parent", "Parent"),
"child-a": session("child-a", "First", "parent"),
"child-b": session("child-b", "Second", "parent"),
"child-c": session("child-c", "Third", "parent"),
}
const state = await tmpdir()
afterAll(() => state[Symbol.asyncDispose]())
const shells = [shell("sh-a", "bun test"), shell("sh-b", "bun dev"), shell("sh-c", "python3 - <<'PY'\nimport json")]
async function renderComposer(
@@ -78,6 +85,7 @@ async function renderComposer(
data.session.sync("parent"),
data.session.sync("child-a"),
data.session.sync("child-b"),
data.session.sync("child-c"),
data.shell.sync(),
])
.then(() => wait(() => data.session.status("child-a") === "running"))
@@ -86,7 +94,12 @@ async function renderComposer(
return (
<>
{focusedTextarea && <textarea focused={true} initialValue="draft" />}
<Composer sessionID="parent" open={true} defaultTab={defaultTab} onClose={() => closed++} />
{/* Mirrors the app, which keys the session route by sessionID and remounts it on navigation. */}
<Show when={route.data.type === "session" ? route.data.sessionID : undefined} keyed>
{(sessionID) => (
<Composer sessionID={sessionID} open={true} defaultTab={defaultTab} onClose={() => closed++} />
)}
</Show>
</>
)
}
@@ -102,27 +115,31 @@ async function renderComposer(
const app = await testRender(
() => (
<TestTuiContexts directory={directory}>
<ConfigProvider config={createTuiResolvedConfig({ keybinds })}>
<Keymap.Provider>
<ClientProvider api={createApi(calls.fetch)}>
<DataProvider directory={process.cwd()}>
<LocationProvider>
<RouteProvider initialRoute={{ type: "session", sessionID: "parent" }}>
<ThemeProvider mode="dark" source={{ discover: async () => ({}) }}>
<ToastProvider>
<DialogProvider>
<Content />
</DialogProvider>
</ToastProvider>
</ThemeProvider>
</RouteProvider>
</LocationProvider>
</DataProvider>
</ClientProvider>
<AppExit />
</Keymap.Provider>
</ConfigProvider>
<TestTuiContexts directory={directory} paths={{ state: state.path }}>
<TuiAppProvider value={{ name: "test", version: "test", channel: "test" }}>
<StorageProvider>
<ConfigProvider config={createTuiResolvedConfig({ keybinds })}>
<Keymap.Provider>
<ClientProvider api={createApi(calls.fetch)}>
<DataProvider directory={process.cwd()}>
<LocationProvider>
<RouteProvider initialRoute={{ type: "session", sessionID: "parent" }}>
<ThemeProvider mode="dark" source={{ discover: async () => ({}) }}>
<ToastProvider>
<DialogProvider>
<Content />
</DialogProvider>
</ToastProvider>
</ThemeProvider>
</RouteProvider>
</LocationProvider>
</DataProvider>
</ClientProvider>
<AppExit />
</Keymap.Provider>
</ConfigProvider>
</StorageProvider>
</TuiAppProvider>
</TestTuiContexts>
),
{ width: 100, height: 20, kittyKeyboard: true },
@@ -165,6 +182,33 @@ test("disabled subagent bindings have no component fallbacks", async () => {
}
})
test("the inactive subagent filter only changes with its toggle", async () => {
const composer = await renderComposer("subagents", {})
try {
expect(composer.app.captureCharFrame()).toContain("First")
expect(composer.app.captureCharFrame()).not.toContain("Third")
composer.app.mockInput.pressKey("a", { ctrl: true })
await composer.app.renderOnce()
expect(composer.app.captureCharFrame()).toContain("Third")
expect(composer.app.captureCharFrame()).not.toContain("First")
composer.app.mockInput.pressEnter()
expect(composer.route()).toMatchObject({ type: "session", sessionID: "child-c" })
await composer.app.renderOnce()
expect(composer.app.captureCharFrame()).toContain("Third")
expect(composer.app.captureCharFrame()).toContain("show active")
expect(composer.app.captureCharFrame()).not.toContain("First")
composer.app.mockInput.pressKey("a", { ctrl: true })
await composer.app.renderOnce()
expect(composer.app.captureCharFrame()).toContain("First")
expect(composer.app.captureCharFrame()).not.toContain("Third")
} finally {
composer.app.renderer.destroy()
}
})
test("disabled shell bindings have no component fallbacks", async () => {
const composer = await renderComposer("shell", {
"composer.shell.up": "none",
+16 -9
View File
@@ -12,6 +12,8 @@ import { DataProvider as DataProviderBase, useData } from "../../../src/context/
import { Keymap } from "../../../src/context/keymap"
import { LocationProvider, useLocation } from "../../../src/context/location"
import { RouteProvider } from "../../../src/context/route"
import { TuiAppProvider } from "../../../src/context/runtime"
import { StorageProvider } from "../../../src/context/storage"
import { ThemeProvider } from "../../../src/context/theme"
import { Composer } from "../../../src/routes/session/composer"
import { DialogProvider } from "../../../src/ui/dialog"
@@ -20,7 +22,7 @@ import { createSessionRows, type SessionRow } from "../../../src/routes/session/
import { groupRefs } from "../../../src/routes/session/grouping/session"
import { unwrap } from "solid-js/store"
import { createApi, createEventStream, createFetch, directory, json, worktree } from "../../fixture/tui-client"
import { emptyThemeSource } from "../../fixture/fixture"
import { emptyThemeSource, tmpdir } from "../../fixture/fixture"
import { TestTuiContexts } from "../../fixture/tui-environment"
import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
@@ -2230,6 +2232,7 @@ test("keeps shell state scoped to location", async () => {
})
}, events)
let data!: ReturnType<typeof useData>
await using state = await tmpdir()
function Probe() {
data = useData()
@@ -2249,14 +2252,18 @@ test("keeps shell state scoped to location", async () => {
}
const app = await testRender(() => (
<TestTuiContexts>
<ClientProvider api={createApi(calls.fetch)}>
<ProjectProvider>
<DataProvider>
<Probe />
</DataProvider>
</ProjectProvider>
</ClientProvider>
<TestTuiContexts paths={{ state: state.path }}>
<TuiAppProvider value={{ name: "test", version: "test", channel: "test" }}>
<StorageProvider>
<ClientProvider api={createApi(calls.fetch)}>
<ProjectProvider>
<DataProvider>
<Probe />
</DataProvider>
</ProjectProvider>
</ClientProvider>
</StorageProvider>
</TuiAppProvider>
</TestTuiContexts>
))
app.renderer.start()
@@ -9,6 +9,8 @@ import { ClientProvider } from "../../src/context/client"
import { DataProvider, useData } from "../../src/context/data"
import { Keymap } from "../../src/context/keymap"
import { RouteProvider } from "../../src/context/route"
import { TuiAppProvider } from "../../src/context/runtime"
import { StorageProvider } from "../../src/context/storage"
import { ThemeProvider } from "../../src/context/theme"
import { Composer } from "../../src/routes/session/composer"
import { DialogProvider } from "../../src/ui/dialog"
@@ -66,23 +68,27 @@ async function setup(width: number, output = "") {
const app = await testRender(
() => (
<TestTuiContexts directory={temporary.path} paths={{ state: temporary.path }}>
<ConfigProvider config={createTuiResolvedConfig()}>
<RouteProvider initialRoute={{ type: "session", sessionID: "ses_fixture" }}>
<ClientProvider api={api}>
<DataProvider directory={temporary.path}>
<ThemeProvider mode={width === 40 ? "light" : "dark"} source={emptyThemeSource}>
<Keymap.Provider>
<ToastProvider>
<DialogProvider>
<Shells />
</DialogProvider>
</ToastProvider>
</Keymap.Provider>
</ThemeProvider>
</DataProvider>
</ClientProvider>
</RouteProvider>
</ConfigProvider>
<TuiAppProvider value={{ name: "test", version: "test", channel: "test" }}>
<StorageProvider>
<ConfigProvider config={createTuiResolvedConfig()}>
<RouteProvider initialRoute={{ type: "session", sessionID: "ses_fixture" }}>
<ClientProvider api={api}>
<DataProvider directory={temporary.path}>
<ThemeProvider mode={width === 40 ? "light" : "dark"} source={emptyThemeSource}>
<Keymap.Provider>
<ToastProvider>
<DialogProvider>
<Shells />
</DialogProvider>
</ToastProvider>
</Keymap.Provider>
</ThemeProvider>
</DataProvider>
</ClientProvider>
</RouteProvider>
</ConfigProvider>
</StorageProvider>
</TuiAppProvider>
</TestTuiContexts>
),
{ width, height: 30, kittyKeyboard: true },