fix(client): reload VCS info when the branch changes (#58982)

Co-authored-by: vimtor <36263538+vimtor@users.noreply.github.com>

Author: opencode-agent[bot]

packages/client/src/solid/data.ts

@@ -1284,14 +1284,10 @@ export function createData(config: CreateDataInput) {
         refresh(() => result.location.skill.sync(location))
         break
       case "vcs.branch.updated":
-        setStore("location", locationKey(location), (data) => ({
-          vcs: {
-            branch: {
-              ...data?.vcs?.branch,
-              current: event.data.branch,
-            },
-          },
-        }))
+        // The event names only the current branch. Reload the rest: the default branch and provider can change with
+        // it, and a read served before the location's VCS provider loaded has neither.
+        result.location.vcs.invalidate(location)
+        refresh(() => result.location.vcs.sync(location))
         break
       case "form.created":
         if (store.session.form[event.data.form.sessionID]?.some((form) => form.id === event.data.form.id)) break

packages/client/test/solid-data.test.ts

@@ -811,10 +811,55 @@ test("refreshes references for the location an update names", async () => {
   }
 })
 
+test("reloads VCS info when the branch changes", async () => {
+  const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
+  const location = { directory: "/worktree", project: { id: "project", directory: "/worktree", canonical: "/main" } }
+  // A location's first read can land before its VCS provider loads, and so has no branches.
+  const responses = [{ branch: {} }, { provider: "git", branch: { current: "feature", default: "dev" } }]
+  const api = OpenCode.make({
+    baseUrl: "http://opencode.local",
+    fetch: async () => Response.json({ location, data: responses.shift() }),
+  })
+  const setup = createRoot((dispose) => ({
+    data: createData({
+      api: () => api,
+      directory: location.directory,
+      event: {
+        on: () => () => {},
+        listen(handler) {
+          listeners.add(handler)
+          return () => listeners.delete(handler)
+        },
+      },
+      connection: { status: () => "connected" },
+    }),
+    dispose,
+  }))
+
+  try {
+    await setup.data.location.vcs.sync()
+    expect(setup.data.location.vcs.info()).toEqual({ branch: {} })
+
+    const updated: OpenCodeEvent = {
+      id: "evt_vcs.branch.updated",
+      created: 1,
+      type: "vcs.branch.updated",
+      location: { directory: location.directory },
+      data: { branch: "feature" },
+    }
+    listeners.forEach((listener) => listener({ name: updated.type, details: updated }))
+    await wait(() => setup.data.location.vcs.info()?.provider === "git")
+    expect(setup.data.location.vcs.info()).toEqual({ provider: "git", branch: { current: "feature", default: "dev" } })
+  } finally {
+    setup.dispose()
+  }
+})
+
 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[] = []
+  let branch = "main"
   const api = OpenCode.make({
     baseUrl: "http://opencode.local",
     fetch: async (input, init) => {
@@ -824,7 +869,7 @@ test("preserves sibling catalogs through location preload, branch, shell, and we
       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" } } })
+        return Response.json({ location, data: { branch: { current: branch, default: "main" } } })
       if (pathname === "/api/reference")
         return Response.json({
           location,
@@ -871,7 +916,9 @@ test("preserves sibling catalogs through location preload, branch, shell, and we
     expect(references?.map((reference) => [reference.name, reference.path])).toEqual([["docs", "/docs"]])
     expect(setup.data.shell.get(shell.id)).toBe(first)
 
+    branch = "feature"
     emit({ type: "vcs.branch.updated", location, data: { branch: "feature" } })
+    await wait(() => setup.data.location.vcs.info()?.branch.current === "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" } } })
@@ -896,6 +943,8 @@ test("preserves sibling catalogs through location preload, branch, shell, and we
       "/api/project",
       "/api/reference",
       "/api/session/active",
+      // The branch update reloads VCS info.
+      "/api/vcs",
       "/api/vcs",
       "/api/websearch/provider",
     ])

packages/tui/test/cli/tui/data.test.tsx

@@ -113,13 +113,14 @@ test("does not preload session summaries into the data context", async () => {
   }
 })
 
-test("syncs VCS info and applies branch updates", async () => {
+test("syncs VCS info and reloads it on branch updates", async () => {
   const events = createEventStream()
+  let branch = "main"
   const calls = createFetch((url) => {
     if (url.pathname !== "/api/vcs") return undefined
     return json({
       location: { directory, project: { id: "proj_test", directory: worktree, canonical: worktree } },
-      data: { branch: { current: "main", default: "main" } },
+      data: { branch: { current: branch, default: "main" } },
     })
   }, events)
   let data!: ReturnType<typeof useData>
@@ -143,6 +144,7 @@ test("syncs VCS info and applies branch updates", async () => {
 
   try {
     await wait(() => data.location.vcs.info()?.branch.current === "main")
+    branch = "feature"
     emitEvent(events, {
       id: "evt_vcs_branch",
       created: Date.now(),