From 18eeb3201df247e94500383817adccad6ca0cf1e Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" <219766164+opencode-agent[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2026 09:49:53 -0400 Subject: [PATCH] refactor(tui): break composer import cycle (#50637) Co-authored-by: jlongster <17031+jlongster@users.noreply.github.com> --- .../src/routes/session/composer/context.ts | 25 +++++++++++++++ .../tui/src/routes/session/composer/index.tsx | 31 +++---------------- .../src/routes/session/composer/shell-tab.tsx | 2 +- .../routes/session/composer/subagents-tab.tsx | 2 +- .../routes/session/composer/terminals-tab.tsx | 2 +- 5 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 packages/tui/src/routes/session/composer/context.ts diff --git a/packages/tui/src/routes/session/composer/context.ts b/packages/tui/src/routes/session/composer/context.ts new file mode 100644 index 00000000000..2821eb9bb58 --- /dev/null +++ b/packages/tui/src/routes/session/composer/context.ts @@ -0,0 +1,25 @@ +import { createContext, useContext } from "solid-js" + +export interface ComposerHint { + label: string + shortcut: string +} + +export interface ComposerTab { + id: string + label: string + hints?: () => ComposerHint[] + onClose?: () => void +} + +export const ComposerContext = createContext<{ + register: (tab: ComposerTab) => () => void + active: (id: string) => boolean + close: () => void +}>() + +export function useComposerTab() { + const ctx = useContext(ComposerContext) + if (!ctx) throw new Error("useComposerTab must be used within a Composer") + return ctx +} diff --git a/packages/tui/src/routes/session/composer/index.tsx b/packages/tui/src/routes/session/composer/index.tsx index 784c5303aa6..2acbdea76ab 100644 --- a/packages/tui/src/routes/session/composer/index.tsx +++ b/packages/tui/src/routes/session/composer/index.tsx @@ -1,4 +1,4 @@ -import { createEffect, createMemo, For, onCleanup, Show, useContext, createContext } from "solid-js" +import { createEffect, createMemo, For, onCleanup, Show } from "solid-js" import { createStore } from "solid-js/store" import { TextAttributes } from "@opentui/core" import { useTheme } from "../../../context/theme" @@ -8,30 +8,9 @@ import { SubagentsTab } from "./subagents-tab" import { ShellTab } from "./shell-tab" import { TerminalsTab } from "./terminals-tab" import { useConfig } from "../../../config" +import { ComposerContext, type ComposerTab } from "./context" -export interface ComposerHint { - label: string - shortcut: string -} - -interface Tab { - id: string - label: string - hints?: () => ComposerHint[] - onClose?: () => void -} - -const ComposerContext = createContext<{ - register: (tab: Tab) => () => void - active: (id: string) => boolean - close: () => void -}>() - -export function useComposerTab() { - const ctx = useContext(ComposerContext) - if (!ctx) throw new Error("useComposerTab must be used within a Composer") - return ctx -} +export { useComposerTab, type ComposerHint } from "./context" export type ComposerProps = { sessionID: string @@ -46,7 +25,7 @@ export function Composer(props: ComposerProps) { const config = useConfig().data const [store, setStore] = createStore({ - tabs: {} as Record, + tabs: {} as Record, active: "", }) @@ -70,7 +49,7 @@ export function Composer(props: ComposerProps) { } const ctx = { - register(tab: Tab) { + register(tab: ComposerTab) { setStore("tabs", tab.id, tab) if (!store.active) setStore("active", tab.id) return () => setStore("tabs", tab.id, undefined!) diff --git a/packages/tui/src/routes/session/composer/shell-tab.tsx b/packages/tui/src/routes/session/composer/shell-tab.tsx index 2b2da262dce..95aa275ec52 100644 --- a/packages/tui/src/routes/session/composer/shell-tab.tsx +++ b/packages/tui/src/routes/session/composer/shell-tab.tsx @@ -5,7 +5,7 @@ import { useData } from "../../../context/data" import { useClient } from "../../../context/client" import { useTheme } from "../../../context/theme" import { Keymap } from "../../../context/keymap" -import { useComposerTab } from "./index" +import { useComposerTab } from "./context" import { useDialog } from "../../../ui/dialog" import { DialogShellOutput } from "../../../component/dialog-shell-output" diff --git a/packages/tui/src/routes/session/composer/subagents-tab.tsx b/packages/tui/src/routes/session/composer/subagents-tab.tsx index 6c5367d2bec..40a4c93f70c 100644 --- a/packages/tui/src/routes/session/composer/subagents-tab.tsx +++ b/packages/tui/src/routes/session/composer/subagents-tab.tsx @@ -8,7 +8,7 @@ import { useClient } from "../../../context/client" import { useTheme } from "../../../context/theme" import { Locale } from "../../../util/locale" import { Keymap } from "../../../context/keymap" -import { useComposerTab } from "./index" +import { useComposerTab } from "./context" import { withTimestampedFallback } from "@opencode/util/session-title-fallback" import { sessionFamily } from "../../../util/session" diff --git a/packages/tui/src/routes/session/composer/terminals-tab.tsx b/packages/tui/src/routes/session/composer/terminals-tab.tsx index 85f3a4ea31a..af43f0a0e57 100644 --- a/packages/tui/src/routes/session/composer/terminals-tab.tsx +++ b/packages/tui/src/routes/session/composer/terminals-tab.tsx @@ -4,7 +4,7 @@ import { Keymap } from "../../../context/keymap" import { useSessionTerminals } from "../../../context/session-terminals" import { useTheme } from "../../../context/theme" import { useToast } from "../../../ui/toast" -import { useComposerTab } from "./index" +import { useComposerTab } from "./context" export function TerminalsTab(props: { sessionID: string; visibleTerminalID?: string }) { const composer = useComposerTab()