diffr TUI: review features, and @diffr/viewer for other frontends

.github/workflows/diffr-release.yml

@@ -45,6 +45,10 @@ jobs:
       - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: 1.3.14
+      - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6
+      - uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
+        with:
+          node-version: 24
       - uses: dtolnay/rust-toolchain@stable
       - name: Build and package
         env:

.github/workflows/diffr-test.yml

@@ -271,6 +271,33 @@ jobs:
           pnpm build
           pnpm test
 
+  typescript_packages:
+    name: TypeScript frontends
+    permissions:
+      contents: read
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6
+      - uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
+        with:
+          node-version: 24
+          cache: pnpm
+      - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        with:
+          bun-version: 1.3.14
+      - run: pnpm install --frozen-lockfile
+      - working-directory: diffr/packages/viewer
+        run: |
+          pnpm typecheck
+          pnpm test
+      - working-directory: diffr/packages/tui
+        run: |
+          pnpm typecheck
+          pnpm test
+
   whiteboard_integration:
     name: Whiteboard integration with diffr
     runs-on: ubuntu-22.04

.github/workflows/review-desktop-ci.yml

@@ -151,15 +151,16 @@ jobs:
         run: pnpm --filter @dev.fast/whiteboard check:tutorial
 
       # The build already built workspace dependencies and typechecked Code OSS.
+      # Diffr Test checks diffr's packages, with the Bun and Claude Code types they need.
       - name: Typecheck
         run: |
-          pnpm -r --filter '!@dev.fast/review-desktop' --workspace-concurrency=1 --if-present typecheck
+          pnpm -r --filter '!@dev.fast/review-desktop' --filter '!./diffr/**' --workspace-concurrency=1 --if-present typecheck
 
       # Typecheck prepared the shared tutorial assets before concurrent pretests.
       - name: Test
         run: |
           node --test "scripts/**/*.test.mjs"
-          pnpm -r --filter '!@dev.fast/diffr' --no-sort --workspace-concurrency=3 --if-present test
+          pnpm -r --filter '!./diffr/**' --no-sort --workspace-concurrency=3 --if-present test
 
       - name: Upload browser test diagnostics
         if: failure()

diffr/NOTICE

@@ -5,14 +5,14 @@ difftastic
   Copyright (c) 2021-2025 Wilfred Hughes. MIT License (see LICENSE).
   diffr forked difftastic at commit 274d0a8f5 (2026-09-08).
 
-hunk (terminal frontend under tui/)
+hunk (terminal frontend under packages/tui/ and packages/viewer/)
   https://github.com/modem-dev/hunk
-  Copyright (c) Modem Labs Inc. MIT License (see tui/LICENSE).
+  Copyright (c) Modem Labs Inc. MIT License (see packages/tui/LICENSE).
   Import details in TUI_UPSTREAM.md.
 
-Helix editor themes (tui/themes/)
+Helix editor themes (packages/viewer/themes/)
   https://github.com/helix-editor/helix/tree/master/runtime/themes
-  Mozilla Public License 2.0 (see tui/themes/LICENSE).
+  Mozilla Public License 2.0 (see packages/viewer/themes/LICENSE).
 
 GitHub Linguist language data (plugins/classify/rust/src/linguist/)
   https://github.com/github-linguist/linguist

diffr/README.md

@@ -45,7 +45,7 @@ cargo install diffr-cli --locked
 
 Windows x64: download `diffr-<version>-<target>.tar.gz` from [Whiteboard Releases](https://github.com/devdotfast/whiteboard/releases) and extract it with `tar -xzf`, or use `cargo binstall`.
 
-From a Whiteboard checkout: `cd diffr && cargo xtask install` (requires Rust and [Bun](https://bun.sh)).
+TODO(smenon):UPDATEME!
 
 ## History
 

diffr/TUI_UPSTREAM.md

@@ -1,7 +1,7 @@
 # Terminal frontend provenance
 
 Imported unchanged from https://github.com/modem-dev/hunk at f86a04ed0325e641d7d96067992f14849016ec8b.
-Upstream MIT license is retained in tui/LICENSE.
+Upstream MIT license is retained in packages/tui/LICENSE.
 Import and subsequent refactoring performed with AI assistance.
 
 Additional restored primitives: `ui/lib/sidebar.ts` is copied unchanged from Hunk;

diffr/diffr-ts/README.md

@@ -21,7 +21,7 @@ Keep these files in sync:
 |---|---|
 | `crates/diffr-core/src/protocol/mod.rs`, `crates/diffr-core/src/pairing.rs`, `diffr-ts/src/contract.ts` | Contract tests against the binary; Rust version check |
 | `docs/streaming.md` | Review against the wire format |
-| `tui/packages/hunk/src/diffr/wire.ts` (v3 only) | TUI fixture tests |
+| `packages/viewer/src/protocol/wire.ts` (v3 only) | TUI fixture tests |
 | `../packages/review-protocol/package.json` and `../packages/review/package.json` | Exact package version pins |
 
 ## Release

diffr/diffr-ts/src/contract.test.ts

@@ -88,7 +88,7 @@ describe("every record the binary writes validates", () => {
 });
 
 test("the terminal UI's committed v3 fixture still validates", () => {
-  const text = readFileSync(join(repositoryRoot, "tui/test/fixtures/comparison.ndjson"), "utf8");
+  const text = readFileSync(join(repositoryRoot, "packages/tui/test/fixtures/comparison.ndjson"), "utf8");
   const events = text.split("\n").filter((line) => line.length > 0).map(decodeStructuralDiffEvent);
   expect(events[0]).toMatchObject({ type: "start", version: STRUCTURAL_DIFF_WIRE_VERSION });
   expect(events.at(-1)).toMatchObject({ type: "complete", failed: 0 });

diffr/tui/package.json → diffr/packages/tui/package.json

@@ -4,17 +4,18 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "start": "bun run packages/hunk/src/main.tsx",
+    "start": "bun run src/main.tsx",
     "typecheck": "tsc --noEmit",
-    "test": "bun test packages"
+    "test": "bun test src"
   },
   "dependencies": {
+    "@diffr/viewer": "workspace:*",
     "@opentui/core": "0.5.6",
     "@opentui/react": "0.5.6",
     "react": "19.2.0",
-    "get-east-asian-width": "1.4.0",
-    "string-width": "8.1.0",
-    "zod": "4.1.12"
+    "react-devtools-core": "7.0.1",
+    "web-tree-sitter": "0.25.10",
+    "ws": "8.21.3"
   },
   "devDependencies": {
     "@types/bun": "1.3.14",

diffr/tui/packages/hunk/src/diffr/stream.test.ts → diffr/packages/tui/src/diffr/stream.test.ts

@@ -1,7 +1,7 @@
 import { expect, test } from "bun:test";
 import { readDiffStream } from "./stream";
-import { createTestDiffFile, fold, leaf, root } from "./fixture";
-import { fileVisibility, type FileChange } from "./wire";
+import { createTestDiffFile, fold, leaf, root } from "@diffr/viewer/protocol/fixture";
+import { fileVisibility, type FileChange } from "@diffr/viewer/protocol/wire";
 const manifest = (file: ReturnType<typeof createTestDiffFile>): FileChange =>
   ({ file: file.file, status: "modified", tags: [] });
 const start = {
@@ -86,7 +86,7 @@ test("results arrive in any order", async () => {
 test("a stream recorded from diffr parses, with manifest tags and each record's visibility", async () => {
   // Recorded with `diffr <base> <head> --format ndjson --syntax --jobs 1` from a repository with
   // one source file and one test file; the test file is hidden by the hide-files plugin.
-  const bytes = await Bun.file(new URL("../../../../test/fixtures/comparison.ndjson", import.meta.url)).bytes();
+  const bytes = await Bun.file(new URL("../../test/fixtures/comparison.ndjson", import.meta.url)).bytes();
   async function* chunks() {
     yield bytes;
   }

diffr/packages/tui/src/diffr/stream.ts

@@ -0,0 +1,12 @@
+import { parseDiffEvents } from "@diffr/viewer/protocol/events";
+import type { DiffEvent } from "@diffr/viewer/protocol/wire";
+export async function* readDiffStream(
+  chunks: AsyncIterable<Uint8Array>,
+): AsyncGenerator<DiffEvent> {
+  const decoder = new TextDecoder("utf-8", { fatal: true });
+  async function* texts() {
+    for await (const chunk of chunks) yield decoder.decode(chunk, { stream: true });
+    yield decoder.decode();
+  }
+  yield* parseDiffEvents(texts());
+}

diffr/packages/tui/src/diffr/theme.test.ts

@@ -0,0 +1,13 @@
+import { expect, test } from "bun:test";
+import { themeConfig } from "@diffr/viewer/theme/palette";
+import { themesFromConfig } from "./theme";
+test("the theme set follows diffr's config and errors on a missing section", () => {
+  expect(themeConfig({ theme: { name: "gruvbox", path: null } })).toEqual({ name: "gruvbox", path: null });
+  expect(() => themeConfig({ folds: {} })).toThrow("theme section");
+  const set = themesFromConfig({ name: "gruvbox", path: null });
+  expect(set.initial.name).toBe("gruvbox");
+  expect(set.dark.name).toBe("default-dark");
+  expect(set.light.name).toBe("default-light");
+  expect(() => themesFromConfig({ name: "nope", path: null })).toThrow("Unknown theme");
+  expect(() => themesFromConfig({ name: "default-dark", path: "/nonexistent/theme.toml" })).toThrow();
+});

diffr/packages/tui/src/diffr/theme.ts

@@ -0,0 +1,17 @@
+import { readFileSync } from "node:fs";
+import { paletteFromHelix, type Palette } from "@diffr/viewer/theme/palette";
+import { loadBundledTheme, parseHelixTheme } from "@diffr/viewer/theme/themes";
+export function loadThemeFile(path: string): Palette {
+  return paletteFromHelix(parseHelixTheme(readFileSync(path, "utf8"), path));
+}
+export interface ThemeSet {
+  initial: Palette;
+  dark: Palette;
+  light: Palette;
+}
+/** Resolve the theme diffr's config names, plus the two defaults the `t` key toggles between. */
+export function themesFromConfig(config: { name: string; path: string | null }): ThemeSet {
+  const dark = loadBundledTheme("default-dark"), light = loadBundledTheme("default-light");
+  const initial = config.path ? loadThemeFile(config.path) : loadBundledTheme(config.name);
+  return { initial, dark, light };
+}

diffr/tui/packages/hunk/src/main.tsx → diffr/packages/tui/src/main.tsx

@@ -6,9 +6,11 @@ import { spawn } from "node:child_process";
 import { createCliRenderer } from "@opentui/core";
 import { createRoot } from "@opentui/react";
 import { readDiffStream } from "./diffr/stream";
-import { DiffStore } from "./diffr/store";
+import { DiffStore } from "@diffr/viewer/protocol/store";
 import { cliClient, flattenSchema, type Setting } from "./diffr/config";
-import { loadBundledTheme, loadThemeFile, themeConfig, themesFromConfig, type ThemeSet } from "./diffr/theme";
+import { loadThemeFile, themesFromConfig, type ThemeSet } from "./diffr/theme";
+import { loadBundledTheme } from "@diffr/viewer/theme/themes";
+import { themeConfig } from "@diffr/viewer/theme/palette";
 import { App } from "./ui/App";
 import { Settings } from "./ui/Settings";
 const args = process.argv.slice(2),

diffr/tui/packages/hunk/src/ui/App.test.tsx → diffr/packages/tui/src/ui/App.test.tsx

@@ -4,11 +4,10 @@ import { act, Profiler } from "react";
 import { TextRenderable, type BaseRenderable } from "@opentui/core";
 
 import { App } from "./App";
-import { DiffStore } from "../diffr/store";
-import { createTestDiffFile, leaf, line, manifestEntry, startFor, withIdenticalLines, root } from "../diffr/fixture";
-import type { DiffEvent, DiffFile } from "../diffr/wire";
-import { createBundledDiffFile, createFoldedDiffFile } from "../diffr/regions.test";
-import { loadBundledTheme } from "../diffr/theme";
+import { DiffStore } from "@diffr/viewer/protocol/store";
+import { createBundledDiffFile, createFoldedDiffFile, createTestDiffFile, leaf, line, manifestEntry, startFor, withIdenticalLines, root } from "@diffr/viewer/protocol/fixture";
+import type { DiffEvent, DiffFile } from "@diffr/viewer/protocol/wire";
+import { loadBundledTheme } from "@diffr/viewer/theme/themes";
 const themes = { initial: loadBundledTheme("default-dark"), dark: loadBundledTheme("default-dark"), light: loadBundledTheme("default-light") };
 // Wait for the stream batch to be published inside React's act boundary.
 async function accept(store: DiffStore, ...events: DiffEvent[]) {