fix(tui): use v2 vcs diff endpoint

packages/tui/src/feature-plugins/system/diff-viewer.tsx

@@ -1,6 +1,7 @@
 /** @jsxImportSource @opentui/solid */
+import type { FileDiffInfo } from "@opencode-ai/client/promise"
 import type { TuiPlugin, TuiPluginApi, TuiRouteCurrent } from "@opencode-ai/plugin/tui"
-import type { FileDiffInfo, SnapshotFileDiff, VcsFileDiff } from "@opencode-ai/sdk/v2"
+import type { SnapshotFileDiff, VcsFileDiff } from "@opencode-ai/sdk/v2"
 import {
   TextAttributes,
   type BorderSides,
@@ -18,6 +19,7 @@ import { DiffViewerFileTree } from "./diff-viewer-file-tree"
 import { Panel, PanelGroup, Separator } from "./diff-viewer-ui"
 import { DialogSelect } from "../../ui/dialog-select"
 import { getScrollAcceleration } from "../../util/scroll"
+import { useSDK } from "../../context/sdk"
 import {
   allExpandedFileTreeDirectories,
   buildFileTree,
@@ -89,6 +91,7 @@ function diffSourceLabel(mode: DiffMode) {
 }
 
 function DiffViewer(props: { api: TuiPluginApi }) {
+  const sdk = useSDK()
   const dimensions = useTerminalDimensions()
   const themeState = useTheme()
   const theme = () => props.api.theme.current
@@ -122,11 +125,12 @@ function DiffViewer(props: { api: TuiPluginApi }) {
       return normalizeDiffs(result.data ?? [])
     }
 
-    const result = await props.api.client.vcs.diff(
+    const result = await sdk.api.vcs.diff({
-      { directory: input.directory, mode: input.mode, context: VCS_DIFF_CONTEXT_LINES },
+      location: { directory: input.directory },
-      { throwOnError: true },
+      mode: input.mode === "git" ? "working" : input.mode,
-    )
+      context: VCS_DIFF_CONTEXT_LINES,
-    return normalizeDiffs(result.data ?? [])
+    })
+    return normalizeDiffs(result.data)
   })
   const files = createMemo(() => diff() ?? [])
   const [focus, setFocus] = createSignal<DiffViewerFocus>("patches")

packages/tui/test/cli/tui/diff-viewer.test.tsx

@@ -3,9 +3,11 @@ import { expect, test } from "bun:test"
 import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
 import { DiffRenderable, type Renderable, ScrollBoxRenderable } from "@opentui/core"
 import { testRender, useRenderer } from "@opentui/solid"
+import type { OpenCodeClient } from "@opencode-ai/client/promise"
 import type { TuiPluginApi, TuiPluginMeta, TuiRouteCurrent, TuiRouteDefinition } from "@opencode-ai/plugin/tui"
 import type { Session } from "@opencode-ai/sdk/v2"
 import { KVProvider } from "../../../src/context/kv"
+import { SDKProvider } from "../../../src/context/sdk"
 import { ThemeProvider } from "../../../src/context/theme"
 import { TuiConfigProvider } from "../../../src/config"
 import { TuiKeybind } from "../../../src/config/keybind"
@@ -22,7 +24,11 @@ test("closing the diff viewer returns to the route it opened from", async () =>
       name: "diff",
       params: { mode: "git", sessionID: "session-1", returnRoute: startRoute },
     })
-    expect(viewer.vcsDiffInput()).toEqual({ directory: "/repo/session", mode: "git", context: 12 })
+    expect(viewer.vcsDiffInput()).toEqual({
+      location: { directory: "/repo/session" },
+      mode: "working",
+      context: 12,
+    })
 
     expect(viewer.commands.has("diff.close")).toBe(true)
     viewer.commands.get("diff.close")!.run?.({} as never)
@@ -119,12 +125,6 @@ async function renderDiffViewer(vcsDiff: unknown[], height = 20, initialRoute?:
     const base = createTuiPluginApi({
       keymap,
       client: {
-        vcs: {
-          diff: async (input: unknown) => {
-            vcsDiffInput = input
-            return { data: vcsDiff }
-          },
-        },
         session: {
           diff: async (input: unknown) => {
             sessionDiffInput = input
@@ -138,6 +138,25 @@ async function renderDiffViewer(vcsDiff: unknown[], height = 20, initialRoute?:
         },
       },
     })
+    const next = {
+      vcs: {
+        diff: async (input: unknown) => {
+          vcsDiffInput = input
+          return {
+            location: { directory: "/repo/session", project: { id: "project-1", directory: "/repo/session" } },
+            data: vcsDiff,
+          }
+        },
+      },
+      event: {
+        subscribe() {
+          return (async function* () {
+            yield { type: "server.connected" }
+            await new Promise(() => {})
+          })()
+        },
+      },
+    } as unknown as OpenCodeClient
     const api = {
       ...base,
       route: {
@@ -159,15 +178,17 @@ async function renderDiffViewer(vcsDiff: unknown[], height = 20, initialRoute?:
 
     return (
       <TestTuiContexts>
-        <OpencodeKeymapProvider keymap={keymap}>
+        <SDKProvider client={api.client} api={next}>
-          <TuiConfigProvider config={config}>
+          <OpencodeKeymapProvider keymap={keymap}>
-            <KVProvider>
+            <TuiConfigProvider config={config}>
-              <ThemeProvider mode="dark">
+              <KVProvider>
-                {renderDiff?.({ params: "params" in current ? current.params : undefined })}
+                <ThemeProvider mode="dark">
-              </ThemeProvider>
+                  {renderDiff?.({ params: "params" in current ? current.params : undefined })}
-            </KVProvider>
+                </ThemeProvider>
-          </TuiConfigProvider>
+              </KVProvider>
-        </OpencodeKeymapProvider>
+            </TuiConfigProvider>
+          </OpencodeKeymapProvider>
+        </SDKProvider>
       </TestTuiContexts>
     )
   }
@@ -218,7 +239,11 @@ test("branch diff source requests branch VCS diff", async () => {
       name: "diff",
       params: { mode: "branch", sessionID: "session-1", returnRoute: startRoute },
     })
-    expect(viewer.vcsDiffInput()).toEqual({ directory: "/repo/session", mode: "branch", context: 12 })
+    expect(viewer.vcsDiffInput()).toEqual({
+      location: { directory: "/repo/session" },
+      mode: "branch",
+      context: 12,
+    })
     expect(viewer.sessionDiffInput()).toBeUndefined()
   } finally {
     viewer.app.renderer.destroy()