Skip to content

Commit 3660fd0

Browse files
committed
fix(tui): guard against null/undefined MCP status in reactive computations
When the MCP status API returns null data, `reconcile(x.data!)` sets `sync.data.mcp` to undefined, crashing every component that calls Object.entries/keys/values on it. Root fix: replace `x.data!` with `x.data ?? {}` in sync bootstrap. Defense-in-depth: add `?? {}` / `?.` at all six consumption sites so a stale store value can never reach Object.entries. Closes anomalyco#22102 Closes anomalyco#21931 Closes anomalyco#21645 Closes anomalyco#21449 Closes anomalyco#21290 Closes anomalyco#20806
1 parent 8ffadde commit 3660fd0

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ export function DialogStatus() {
5050
esc
5151
</text>
5252
</box>
53-
<Show when={Object.keys(sync.data.mcp).length > 0} fallback={<text fg={theme.text}>No MCP Servers</text>}>
53+
<Show when={Object.keys(sync.data.mcp ?? {}).length > 0} fallback={<text fg={theme.text}>No MCP Servers</text>}>
5454
<box>
55-
<text fg={theme.text}>{Object.keys(sync.data.mcp).length} MCP Servers</text>
56-
<For each={Object.entries(sync.data.mcp)}>
55+
<text fg={theme.text}>{Object.keys(sync.data.mcp ?? {}).length} MCP Servers</text>
56+
<For each={Object.entries(sync.data.mcp ?? {})}>
5757
{([key, item]) => (
5858
<box flexDirection="row" gap={1}>
5959
<text

‎packages/opencode/src/cli/cmd/tui/context/local.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
369369

370370
const mcp = {
371371
isEnabled(name: string) {
372-
const status = sync.data.mcp[name]
372+
const status = sync.data.mcp?.[name]
373373
return status?.status === "connected"
374374
},
375375
async toggle(name: string) {
376-
const status = sync.data.mcp[name]
376+
const status = sync.data.mcp?.[name]
377377
if (status?.status === "connected") {
378378
// Disable: disconnect the MCP
379379
await sdk.client.mcp.disconnect({ name })

‎packages/opencode/src/cli/cmd/tui/context/sync.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
420420
consoleStatePromise.then((consoleState) => setStore("console_state", reconcile(consoleState))),
421421
sdk.client.command.list({ workspace }).then((x) => setStore("command", reconcile(x.data ?? []))),
422422
sdk.client.lsp.status({ workspace }).then((x) => setStore("lsp", reconcile(x.data!))),
423-
sdk.client.mcp.status({ workspace }).then((x) => setStore("mcp", reconcile(x.data!))),
423+
sdk.client.mcp.status({ workspace }).then((x) => setStore("mcp", reconcile(x.data ?? {}))),
424424
sdk.client.experimental.resource
425425
.list({ workspace })
426426
.then((x) => setStore("mcp_resource", reconcile(x.data ?? {}))),

‎packages/opencode/src/cli/cmd/tui/plugin/api.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function stateApi(sync: ReturnType<typeof useSync>): TuiPluginApi["state"] {
176176
return sync.data.lsp.map((item) => ({ id: item.id, root: item.root, status: item.status }))
177177
},
178178
mcp() {
179-
return Object.entries(sync.data.mcp)
179+
return Object.entries(sync.data.mcp ?? {})
180180
.sort(([a], [b]) => a.localeCompare(b))
181181
.map(([name, item]) => ({
182182
name,

‎packages/opencode/src/cli/cmd/tui/routes/session/footer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export function Footer() {
1010
const { theme } = useTheme()
1111
const sync = useSync()
1212
const route = useRoute()
13-
const mcp = createMemo(() => Object.values(sync.data.mcp).filter((x) => x.status === "connected").length)
14-
const mcpError = createMemo(() => Object.values(sync.data.mcp).some((x) => x.status === "failed"))
13+
const mcp = createMemo(() => Object.values(sync.data.mcp ?? {}).filter((x) => x.status === "connected").length)
14+
const mcpError = createMemo(() => Object.values(sync.data.mcp ?? {}).some((x) => x.status === "failed"))
1515
const lsp = createMemo(() => Object.keys(sync.data.lsp))
1616
const permissions = createMemo(() => {
1717
if (route.data.type !== "session") return []

0 commit comments

Comments
 (0)