diff --git a/packages/tui/src/routes/session/composer/subagents-tab.tsx b/packages/tui/src/routes/session/composer/subagents-tab.tsx index 40a4c93f70c..5565fd08c9a 100644 --- a/packages/tui/src/routes/session/composer/subagents-tab.tsx +++ b/packages/tui/src/routes/session/composer/subagents-tab.tsx @@ -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(() => { 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 }) { (scroll = r)}> 0} - fallback={ No {store.active ? "active" : "inactive"} subagents} + fallback={ No {filter.active ? "active" : "inactive"} subagents} > {(entry, index) => { diff --git a/packages/tui/test/cli/tui/composer-keymap.test.tsx b/packages/tui/test/cli/tui/composer-keymap.test.tsx index 7ac7881b5f7..75625386b42 100644 --- a/packages/tui/test/cli/tui/composer-keymap.test.tsx +++ b/packages/tui/test/cli/tui/composer-keymap.test.tsx @@ -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 &&