Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/tui/src/component/dialog-status.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ export function DialogStatus() {
esc
</text>
</box>
<Show when={Object.keys(sync.data.mcp).length > 0} fallback={<text fg={theme.text}>No MCP Servers</text>}>
<Show when={Object.keys(sync.data.mcp ?? {}).length > 0} fallback={<text fg={theme.text}>No MCP Servers</text>}>
<box>
<text fg={theme.text}>{Object.keys(sync.data.mcp).length} MCP Servers</text>
<For each={Object.entries(sync.data.mcp)}>
<text fg={theme.text}>{Object.keys(sync.data.mcp ?? {}).length} MCP Servers</text>
<For each={Object.entries(sync.data.mcp ?? {})}>
{([key, item]) => (
<box flexDirection="row" gap={1}>
<text
Expand Down
4 changes: 2 additions & 2 deletions packages/tui/src/context/local.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -504,11 +504,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({

const mcp = {
isEnabled(name: string) {
const status = sync.data.mcp[name]
const status = sync.data.mcp?.[name]
return status?.status === "connected"
},
async toggle(name: string) {
const status = sync.data.mcp[name]
const status = sync.data.mcp?.[name]
if (status?.status === "connected") {
// Disable: disconnect the MCP
await sdk.client.mcp.disconnect({ name })
Expand Down
26 changes: 14 additions & 12 deletions packages/tui/src/context/sync.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -477,12 +477,14 @@ export const {
...(args.continue ? [sessionListPromise] : []),
])
.then(async () => {
const providersResponse = providersPromise.then((x) => x.data!)
const providerListResponse = providerListPromise.then((x) => x.data!)
const providersResponse = providersPromise.then((x) => x.data ?? { providers: [], default: {} })
const providerListResponse = providerListPromise.then(
(x) => x.data ?? { all: [], default: {}, connected: [] },
)
const capabilitiesResponse = capabilitiesPromise
const consoleStateResponse = consoleStatePromise
const agentsResponse = agentsPromise.then((x) => x.data ?? [])
const configResponse = configPromise.then((x) => x.data!)
const configResponse = configPromise.then((x) => x.data ?? {})
const sessionListResponse = args.continue ? sessionListPromise : undefined

return Promise.all([
Expand All @@ -503,14 +505,14 @@ export const {
const sessions = responses[6]

batch(() => {
setStore("provider", reconcile(providers.providers))
setStore("provider_default", reconcile(providers.default))
setStore("provider_next", reconcile(providerList))
setStore("provider", reconcile(providers?.providers ?? []))
setStore("provider_default", reconcile(providers?.default ?? {}))
setStore("provider_next", reconcile(providerList ?? { all: [], default: {}, connected: [] }))
setStore("capabilities", "experimentalBackgroundSubagents", capabilities?.backgroundSubagents === true)
setStore("console_state", reconcile(consoleState))
setStore("agent", reconcile(agents))
setStore("config", reconcile(config))
if (sessions !== undefined) setStore("session", reconcile(sessions))
setStore("console_state", reconcile(consoleState ?? emptyConsoleState))
setStore("agent", reconcile(agents ?? []))
setStore("config", reconcile(config ?? {}))
if (sessions !== undefined) setStore("session", reconcile(sessions ?? []))
})
})
})
Expand All @@ -519,7 +521,7 @@ export const {
// non-blocking
void Promise.all([
...(args.continue ? [] : [sessionListPromise.then((sessions) => setStore("session", reconcile(sessions)))]),
consoleStatePromise.then((consoleState) => setStore("console_state", reconcile(consoleState))),
consoleStatePromise.then((consoleState) => setStore("console_state", reconcile(consoleState ?? emptyConsoleState))),
sdk.client.command.list({ workspace }).then((x) => setStore("command", reconcile(x.data ?? []))),
sdk.client.lsp.status({ workspace }).then((x) => setStore("lsp", reconcile(x.data ?? []))),
sdk.client.mcp.status({ workspace }).then((x) => setStore("mcp", reconcile(x.data ?? {}))),
Expand All @@ -531,7 +533,7 @@ export const {
setStore("session_status", reconcile(x.data ?? {}))
}),
sdk.client.provider.auth({ workspace }).then((x) => setStore("provider_auth", reconcile(x.data ?? {}))),
sdk.client.vcs.get({ workspace }).then((x) => setStore("vcs", reconcile(x.data))),
sdk.client.vcs.get({ workspace }).then((x) => setStore("vcs", reconcile(x.data ?? undefined))),
project.workspace.sync(),
]).then(() => {
setStore("status", "complete")
Expand Down
2 changes: 1 addition & 1 deletion packages/tui/src/plugin/adapters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function stateApi(sync: ReturnType<typeof useSync>): TuiPluginApi["state"] {
return sync.data.lsp.map((item) => ({ id: item.id, root: item.root, status: item.status }))
},
mcp() {
return Object.entries(sync.data.mcp)
return Object.entries(sync.data.mcp ?? {})
.sort(([a], [b]) => a.localeCompare(b))
.map(([name, item]) => ({
name,
Expand Down
6 changes: 3 additions & 3 deletions packages/tui/src/routes/session/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export function Footer() {
const { theme } = useTheme()
const sync = useSync()
const route = useRoute()
const mcp = createMemo(() => Object.values(sync.data.mcp).filter((x) => x.status === "connected").length)
const mcpError = createMemo(() => Object.values(sync.data.mcp).some((x) => x.status === "failed"))
const lsp = createMemo(() => Object.keys(sync.data.lsp))
const mcp = createMemo(() => Object.values(sync.data.mcp ?? {}).filter((x) => x.status === "connected").length)
const mcpError = createMemo(() => Object.values(sync.data.mcp ?? {}).some((x) => x.status === "failed"))
const lsp = createMemo(() => Object.keys(sync.data.lsp ?? []))
const permissions = createMemo(() => {
if (route.data.type !== "session") return []
return sync.data.permission[route.data.sessionID] ?? []
Expand Down
2 changes: 1 addition & 1 deletion packages/tui/src/theme/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export function resolveTheme(theme: ThemeJson, mode: "dark" | "light") {
}

const resolved = Object.fromEntries(
Object.entries(theme.theme)
Object.entries(theme.theme ?? {})
.filter(([key]) => key !== "selectedListItemText" && key !== "backgroundMenu" && key !== "thinkingOpacity")
.map(([key, value]) => {
return [key, resolveColor(value as ColorValue)]
Expand Down
Loading