ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(app): refresh V1 MCP state (#38816)

Browse source
This commit is contained in:
Brendan Allan 2026-07-25 15:01:18 +08:00 • committed by GitHub
commit 2b2b69d668
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/app/src/context/global-sync/bootstrap.test.ts
View file

@ -73,14 +73,14 @@ function directoryState() {
} }
describe("bootstrapDirectory", () => { describe("bootstrapDirectory", () => {
test("marks a loading directory partial during bootstrap and complete after success", async () => { test("uses legacy MCP endpoints while refreshing a v1 directory", async () => {
const mcpReads: string[] = [] const mcpReads: string[] = []
const [store, setStore] = directoryState() const [store, setStore] = directoryState()
await bootstrapDirectory({ await bootstrapDirectory({
directory: "/project", directory: "/project",
scope: ServerScope.local, scope: ServerScope.local,
mcp: false, mcp: true,
global: { global: {
config: {} satisfies Config, config: {} satisfies Config,
path: { state: "", config: "", worktree: "/project", directory: "/project", home: "/home" }, path: { state: "", config: "", worktree: "/project", directory: "/project", home: "/home" },
@ -90,6 +90,7 @@ describe("bootstrapDirectory", () => {
sdk: { sdk: {
app: { agents: async () => ({ data: [{ name: "build", mode: "primary" }] }) }, app: { agents: async () => ({ data: [{ name: "build", mode: "primary" }] }) },
config: { get: async () => ({ data: {} }) }, config: { get: async () => ({ data: {} }) },
session: { status: async () => ({ data: {} }) },
vcs: { get: async () => ({ data: undefined }) }, vcs: { get: async () => ({ data: undefined }) },
command: { command: {
list: async () => { list: async () => {
@ -106,6 +107,14 @@ describe("bootstrapDirectory", () => {
return { data: {} } return { data: {} }
}, },
}, },
experimental: {
resource: {
list: async () => {
mcpReads.push("resource")
return { data: {} }
},
},
},
provider: { list: async () => ({ data: { all: [], connected: [], default: {} } }) }, provider: { list: async () => ({ data: { all: [], connected: [], default: {} } }) },
} as unknown as OpencodeClient, } as unknown as OpencodeClient,
api, api,
@ -115,6 +124,7 @@ describe("bootstrapDirectory", () => {
loadSessions() {}, loadSessions() {},
translate: (key) => key, translate: (key) => key,
queryClient: new QueryClient(), queryClient: new QueryClient(),
protocol: Promise.resolve("v1"),
}) })
expect(store.status).toBe("partial") expect(store.status).toBe("partial")
@ -122,7 +132,7 @@ describe("bootstrapDirectory", () => {
await new Promise((resolve) => setTimeout(resolve, 80)) await new Promise((resolve) => setTimeout(resolve, 80))
expect(store.status).toBe("complete") expect(store.status).toBe("complete")
expect(mcpReads).toEqual([]) expect(mcpReads.sort()).toEqual(["command", "resource", "status"])
}) })
}) })

11
packages/app/src/context/global-sync/bootstrap.ts
View file

@ -503,9 +503,16 @@ export async function bootstrapDirectory(input: {
}), }),
), ),
() => Promise.resolve(input.loadSessions(input.directory)), () => Promise.resolve(input.loadSessions(input.directory)),
input.mcp && (() => input.queryClient.fetchQuery(loadMcpQuery(input.scope, input.directory, input.api.mcp))),
input.mcp && input.mcp &&
(() => input.queryClient.fetchQuery(loadMcpResourcesQuery(input.scope, input.directory, input.api.mcp))), (() =>
input.queryClient.fetchQuery(
loadMcpQuery(input.scope, input.directory, input.api.mcp, input.sdk, input.protocol),
)),
input.mcp &&
(() =>
input.queryClient.fetchQuery(
loadMcpResourcesQuery(input.scope, input.directory, input.api.mcp, input.sdk, input.protocol),
)),
() => () =>
input.queryClient input.queryClient
.fetchQuery(loadProvidersQuery(input.scope, input.directory, input.api, input.sdk, input.protocol)) .fetchQuery(loadProvidersQuery(input.scope, input.directory, input.api, input.sdk, input.protocol))