refactor(client): remove redundant location spreads (#47086)

This commit is contained in:
Kit Langton
2026-09-03 12:51:12 -04:00
committed by GitHub
Unverified
parent ac874a6e90
commit 610d7e952a
2 changed files with 100 additions and 9 deletions
+2 -9
View File
@@ -574,7 +574,7 @@ export function createData(config: CreateDataInput) {
.location.get({ location: locationQuery(defaultLocation()) })
.then((location) => {
const key = locationKey(location)
setStore("location", key, { ...store.location[key], info: location })
setStore("location", key, { info: location })
})
.catch((error) => console.error("Failed to preload location", error))
void result.location.vcs.sync().catch((error) => console.error("Failed to preload VCS info", error))
@@ -1105,7 +1105,6 @@ export function createData(config: CreateDataInput) {
return
}
setStore("location", key, (data) => ({
...data,
integration: data?.integration?.map((integration) => {
if (integration.id !== event.data.integrationID) return integration
const active = integration.connections.find(
@@ -1147,7 +1146,6 @@ export function createData(config: CreateDataInput) {
break
case "vcs.branch.updated":
setStore("location", locationKey(location), (data) => ({
...data,
vcs: {
branch: {
...data?.vcs?.branch,
@@ -1165,7 +1163,6 @@ export function createData(config: CreateDataInput) {
break
case "shell.created":
setStore("location", locationKey(location), (data) => ({
...data,
shell: {
...data?.shell,
[event.data.info.id]: { ...event.data.info, location },
@@ -1175,7 +1172,6 @@ export function createData(config: CreateDataInput) {
case "shell.exited":
case "shell.deleted":
setStore("location", locationKey(location), (data) => ({
...data,
shell: Object.fromEntries(Object.entries(data?.shell ?? {}).filter(([id]) => id !== event.data.id)),
}))
break
@@ -1801,10 +1797,7 @@ export function createData(config: CreateDataInput) {
const input = { location: locationQuery(ref ?? defaultLocation()) }
const providers = await api().websearch.providers(input)
const key = locationKey(providers.location)
setStore("location", key, {
...store.location[key],
websearch: providers.data,
})
setStore("location", key, { websearch: providers.data })
},
},
skill: locationResource("skill", (location) => api().skill.list({ location })),
+98
View File
@@ -355,8 +355,10 @@ test("refreshes global credential events across every loaded location and worksp
setup.data.location.integration.sync(location),
setup.data.location.model.sync(location),
setup.data.location.provider.sync(location),
setup.data.location.reference.sync(location),
]),
)
const references = locations.map((location) => setup.data.location.reference.list(location))
requests.length = 0
const updated: OpenCodeEvent = {
@@ -402,6 +404,9 @@ test("refreshes global credential events across every loaded location and worksp
["/api/provider", "/other", "workspace-other"],
]),
)
locations.forEach((location, index) =>
expect(setup.data.location.reference.list(location)).toBe(references[index]),
)
requests.length = 0
}
} finally {
@@ -469,6 +474,99 @@ test("refreshes references for the location an update names", async () => {
}
})
test("preserves sibling catalogs through location preload, branch, shell, and websearch updates", async () => {
const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
const location = { directory: "/project", project: { id: "project", directory: "/project", canonical: "/project" } }
const requests: string[] = []
const api = OpenCode.make({
baseUrl: "http://opencode.local",
fetch: async (input, init) => {
const pathname = new URL((input instanceof Request ? input : new Request(input, init)).url).pathname
requests.push(pathname)
if (pathname === "/api/session/active") return Response.json({})
if (pathname === "/api/project") return Response.json([])
if (pathname === "/api/location") return Response.json(location)
if (pathname === "/api/vcs")
return Response.json({ location, data: { branch: { current: "main", default: "main" } } })
if (pathname === "/api/reference")
return Response.json({
location,
data: [{ name: "docs", path: "/docs", source: { type: "local", path: "/docs" } }],
})
if (pathname === "/api/websearch/provider")
return Response.json({ location, data: [{ id: "search", name: "Search" }] })
throw new Error(`Unexpected request: ${pathname}`)
},
})
const setup = createRoot((dispose) => ({
data: createData({
api: () => api,
directory: location.directory,
event: {
on: () => () => {},
listen(handler) {
listeners.add(handler)
return () => listeners.delete(handler)
},
},
}),
dispose,
}))
const emit = (details: OpenCodeEvent) => listeners.forEach((listener) => listener({ name: details.type, details }))
const shell = {
id: "sh_first",
status: "running" as const,
command: "echo hello",
cwd: location.directory,
shell: "/bin/sh",
file: "/shell-output",
metadata: {},
time: { started: 1 },
}
try {
// A live event may arrive before any location reads have populated this key.
emit({ type: "shell.created", location, data: { info: shell } })
expect(setup.data.shell.get(shell.id)).toMatchObject(shell)
const first = setup.data.shell.get(shell.id)
await Promise.all([setup.data.location.reference.sync(), setup.data.location.vcs.sync()])
const references = setup.data.location.reference.list()
expect(references?.map((reference) => [reference.name, reference.path])).toEqual([["docs", "/docs"]])
expect(setup.data.shell.get(shell.id)).toBe(first)
emit({ type: "vcs.branch.updated", location, data: { branch: "feature" } })
expect(setup.data.location.vcs.info()?.branch).toEqual({ current: "feature", default: "main" })
expect(setup.data.location.reference.list()).toBe(references)
emit({ type: "shell.created", location, data: { info: { ...shell, id: "sh_second" } } })
expect(setup.data.shell.list().map((shell) => shell.id)).toEqual(["sh_first", "sh_second"])
expect(setup.data.location.reference.list()).toBe(references)
emit({ type: "shell.deleted", location, data: { id: "sh_second" } })
expect(setup.data.shell.list().map((shell) => shell.id)).toEqual(["sh_first"])
expect(setup.data.shell.get(shell.id)).toBe(first)
expect(setup.data.location.reference.list()).toBe(references)
await setup.data.location.websearch.refresh()
expect(setup.data.location.websearch.list()).toEqual([{ id: "search", name: "Search" }])
expect(setup.data.location.reference.list()).toBe(references)
emit({ type: "server.connected", data: {} })
await wait(() => setup.data.location.info() !== undefined)
expect(setup.data.location.info()).toMatchObject(location)
expect(setup.data.location.reference.list()).toBe(references)
expect(setup.data.shell.get(shell.id)).toBe(first)
expect(setup.data.location.vcs.info()?.branch).toEqual({ current: "feature", default: "main" })
expect(requests.toSorted()).toEqual([
"/api/location",
"/api/project",
"/api/reference",
"/api/session/active",
"/api/vcs",
"/api/websearch/provider",
])
} finally {
setup.dispose()
}
})
test("reports optimistic sessions as creating until the request settles", async () => {
const release = Promise.withResolvers<void>()
const api = OpenCode.make({