fix(dev): preserve background build errors

docs(dev): explain local PR preference
feat(dev): prefer current local PR builds
2026-08-02 08:26:56 +02:00 · 2026-08-02 08:19:45 +02:00 · 2026-08-02 08:19:29 +02:00 · 2026-08-02 08:19:12 +02:00 · 2026-08-01 23:49:23 +02:00 · 2026-08-01 23:49:23 +02:00
55 changed files with 5472 additions and 523 deletions
@@ -33,6 +33,7 @@ body:
      options:
        # The below comment is used to insert a new version with on-release.yml
        #NEXT_VERSION#
+        - 1.73.0
        - 1.72.0
        - 1.71.0
        - 1.70.0
@@ -46,6 +46,8 @@ homarr/
 ├── tooling/
 │   ├── typescript/      # Base tsconfig
 │   └── github/          # CI setup action
+├── tools/
+│   └── homarr-dev/      # Go CLI for local and PR Docker images
 ├── development/         # Dev docker-compose (Redis, MySQL, PostgreSQL)
 ├── e2e/                 # E2E test specs
 └── Dockerfile           # Multi-stage production build
@@ -68,6 +70,9 @@ When modifying user-facing code, you MUST also update the corresponding document
 ## Monorepo Commands

 - `pnpm dev` — Next.js app only
+- `pnpm dev:cli -- dev` — run the developer CLI without installing a global binary
+- `pnpm db:seed` — seed default database data explicitly
+- `pnpm docker:dev:up` — start the Redis development service in the background
 - `pnpm dev:docs` — Docusaurus docs site only
 - `pnpm turbo build` — build all packages
 - `pnpm turbo build --filter=@homarr/docs` — build docs only
@@ -81,3 +86,7 @@ When modifying user-facing code, you MUST also update the corresponding document
 - UI: Mantine (not Tailwind) — Tailwind is only used in docs app
 - Icons: @tabler/icons-react
 - Docs app can import from `@homarr/definitions` for shared types
+- Run `pnpm dev:cli -- dev` to browse local `homarr:*` images and remote PR images.
+- Run `pnpm dev:cli -- build <name>` from a Homarr checkout to build `homarr:<name>` with rebuild provenance.
+- Run `pnpm dev:cli -- build --pr <number>` to build a PR locally from a temporary checkout.
+- Run Go checks from `tools/homarr-dev` with `go test ./...` and `go vet ./...`.
@@ -0,0 +1,41 @@
+# Developer Docker CLI
+
+The host-side developer CLI builds and runs local Homarr images and pull-request previews. Run it directly from a checkout with `pnpm dev:cli -- ...`; no shell-specific setup script is required. It is separate from the recovery CLI included in production images.
+
+To install an optional `homarr` binary, run `pnpm dev:cli:install` and make your Go bin directory available on `PATH`. GitHub CLI authentication is only needed for pull-request features.
+
+## Browse development images
+
+```bash
+pnpm dev:cli --
+```
+
+The main screen combines local `homarr:*` images with open pull requests and their GHCR preview status. Select an image to start or stop it, use `R` to build a remote pull request locally in the background or rebuild a local image, or use `p` to force a remote preview pull. Press `d` to switch to the instance dashboard and `d` again to return without losing the browser state. The explicit `dev` and `dash` subcommands start on either screen.
+
+A locally built PR image is folded into its remote PR row only when its recorded revision exactly matches the current GitHub head SHA. The row is marked `◆ local`, and starting it prefers that local image without a registry pull. Outdated local builds remain separate rows. Navigation and dashboard switching remain available during background builds.
+
+## Build images
+
+```bash
+pnpm dev:cli -- build <name>
+pnpm dev:cli -- build --pr <number> [name]
+```
+
+The first command builds the current checkout as `homarr:<name>`. The pull-request form uses a depth-one clone in a temporary directory and defaults to `homarr:pr-<number>` when `name` is omitted.
+
+## Rebuild images
+
+```bash
+pnpm dev:cli -- rebuild <name>
+```
+
+Images built by this CLI record their source checkout, revision, and optional pull-request number. Rebuild uses that provenance to select the original checkout or create a fresh temporary pull-request checkout.
+
+## Run images
+
+```bash
+homarr run <name>
+homarr run --pr <number>
+```
+
+Add `--detach` to run in the background, `--demo` to enable demo data, or repeat `--env KEY=VALUE` to provide additional environment variables.
@@ -17,8 +17,9 @@ This guide will help you set up your development environment to start contributi
 - **Node.js (lts)**: You can download it from the [official website](https://nodejs.org/).
 - **pnpm (latest)**: You can install it by running `npm install -g pnpm`.
 - **Git**: You can download it from the [official website](https://git-scm.com/).
- **Docker or Docker Desktop**: You can download it from the [official website](https://www.docker.com/).
- **A GitHub account**: You can create one on the [official website](https://github.com/).
+- **Docker or Docker Desktop**: Required for the Redis service and the developer Docker CLI.
+- **Go 1.25+**: Required only for the developer Docker CLI. You can download it from the [official website](https://go.dev/).
+- **GitHub CLI**: Required only for pull-request image features. Install it from the [official website](https://cli.github.com/), then authenticate with `gh auth login`.

 ### Setting up the project

@@ -34,11 +35,11 @@ This guide will help you set up your development environment to start contributi

 4. Install the dependencies with `pnpm install`.

-5. Start redis by running `pnpm run docker:dev`. This will run a docker-compose file with a redis service.
+5. Create `.env` from `.env.example`. In a POSIX shell, run `cp .env.example .env`; in PowerShell, run `Copy-Item .env.example .env`. Set `DB_URL` to an absolute path for your SQLite file.

-6. Copy the `.env.example` file to `.env` and replace `DB_URL` with the full path you want to use for the sqlite database file. For example `DB_URL='C:\\Dev\\homarr\\packages\\db\\db.sqlite'`
+6. Start Redis in the background with `pnpm docker:dev:up` if your development workflow needs it.

-7. Run the migrations to create the sqlite db file with `pnpm run db:migration:sqlite:run`.
+7. Create or update the database with `pnpm db:migration:sqlite:run`. This also seeds the default data. To run the seed explicitly later, use `pnpm db:seed`.

 8. Start the development server with `pnpm dev` and wait for a message that says `✓ Ready in 10.7s`

@@ -49,8 +50,15 @@ This guide will help you set up your development environment to start contributi
 #### During development

 - `pnpm dev`: Start the development server.
+- `pnpm dev:cli -- dev`: Browse and run local images and remote pull-request images.
+- `pnpm dev:cli -- build <name>`: Build the current checkout as `homarr:<name>`.
+- `pnpm dev:cli -- build --pr <number>`: Build a pull request locally from a temporary checkout.
+- `pnpm dev:cli -- rebuild <name>`: Rebuild a local image from its recorded checkout or pull request.
+- `pnpm dev:cli:install`: Optionally install the developer CLI as a `homarr` binary.
 - `pnpm cli`: Run cli commands.
 - `pnpm db:migration:sqlite:run`: Run the migrations to create or update the sqlite db file.
+- `pnpm db:seed`: Explicitly seed the default database data.
+- `pnpm docker:dev:up`: Start the Redis development service in the background.
 - `pnpm db:migration:sqlite:generate`: Generate a new migration file for the sqlite db. Also works with `mysql`.
 - `pnpm db:studio`: Open a visual studio for the database.
 - `pnpm package:new`: Create a new package in the monorepo.
@@ -63,6 +71,7 @@ This guide will help you set up your development environment to start contributi
 - `pnpm typecheck`: Run the typescript type checker.

 #### Building the project
+
 - `pnpm build`: Build the project for production.
- `docker build -t homarr .`: Build a docker image for the project.
- `docker run -p 7575:7575 -e SECRET_ENCRYPTION_KEY='your_64_character_hex_string' homarr:latest`: Run the created docker image.
+- `pnpm dev:cli -- build <name>`: Build a `homarr:<name>` image and record its checkout for later rebuilds.
+- `docker run -p 7575:7575 -e SECRET_ENCRYPTION_KEY='your_64_character_hex_string' homarr:<name>`: Run the created docker image.
@@ -2,9 +2,9 @@

 <img src="https://raw.githubusercontent.com/homarr-labs/charts/refs/heads/main/charts/homarr/icon.svg" align="right" width="92" alt="homarr logo">

-![Version: 8.24.0](https://img.shields.io/badge/Version-8.24.0-informational?style=flat)
+![Version: 8.25.0](https://img.shields.io/badge/Version-8.25.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
-![AppVersion: v1.72.0](https://img.shields.io/badge/AppVersion-v1.72.0-informational?style=flat)
+![AppVersion: v1.73.0](https://img.shields.io/badge/AppVersion-v1.73.0-informational?style=flat)

 A Helm chart to deploy homarr for Kubernetes

@@ -429,7 +429,7 @@ All available values are listed on the [artifacthub](https://artifacthub.io/pack
 | httproute.rules[0].matches[0].path.value | string | `"/"` | Path value to match |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.repository | string | `"ghcr.io/homarr-labs/homarr"` | Image repository |
-| image.tag | string | `"v1.72.0"` | Overrides the image tag whose default is the chart appVersion |
+| image.tag | string | `"v1.73.0"` | Overrides the image tag whose default is the chart appVersion |
 | imagePullSecrets | list | `[]` | Secrets for Docker registry |
 | ingress.annotations | object | `{}` | Ingress annotations |
 | ingress.enabled | bool | `false` | Enable ingress |
@@ -17,10 +17,17 @@ import { beszelIntegration } from '@site/docs/integrations/beszel';
  categories={['System Monitoring']}
 />

-This widget displays all your Beszel-monitored systems in a sortable data table. Each row shows system metrics like CPU, memory, disk, network, temperature, and more. Columns can be toggled on or off, and the table supports sorting by any column. When Beszel reports extra filesystems, the disk column adds a hover breakdown for each mount alongside the root disk.
+This widget displays all your Beszel-monitored systems in a sortable data table. Each row shows system metrics like CPU, memory, disk, network, temperature, and more. Columns can be toggled on or off, dragged into a different order, and resized from their headers. Column order and widths are saved automatically for each widget. When Beszel reports extra filesystems, the disk column adds a hover breakdown for each mount alongside the root disk.

 Select a system row to open the complete statistics view, including system, filesystem, Docker, historical, and realtime charts.

+### Interactions
+
+- **Reorder columns** by hovering a header to reveal its grab handle, then dragging it
+- **Resize columns** by dragging a header's right edge
+- **Sort systems** by selecting a sortable column header
+- **Open system statistics** by selecting a row
+
 ### Supported Integrations

 <WidgetIntegrations items={[{
@@ -40,12 +40,19 @@ import dockerTable from './img/table.png';

 ### Interactions

-Each container row has an action menu (accessible via the three-dot icon) with the following options:
+Hover a column header to reveal its grab handle, then drag it to reorder the table or drag the header's edge to resize it. The layout is saved automatically for each widget instance and restored after a reload. These controls are disabled while the board is in edit mode.
+
+Each container row has an action menu, accessible via the three-dot icon or by right-clicking the row, with the following options:
+
 - **View logs** - opens a dedicated terminal page streaming the container's logs
 - **Start** / **Stop** / **Restart** - manage the container's state
- **Remove** - remove the container
+- **Remove** - permanently remove the container after a second confirmation click
 - **Add to Homarr** - create a bookmark app from the container

 ### Adding the widget

 <AddingWidget />
+
+### Configuration
+
+<WidgetConfig configuration={dockerContainersWidget.configuration} />
@@ -8,6 +8,12 @@ export const dockerContainersWidget: WidgetDefinition = {
  path: "../../widgets/docker-containers",
  configuration: {
    items: [
+      {
+        name: "Columns to show",
+        description: "Select which columns are visible in the table",
+        values: "Name, State, Host, CPU usage, Memory usage, and Actions",
+        defaultValue: "All columns",
+      },
      {
        name: "Enable items sorting",
        description: "Allows to sort containers by clicking on the column headers",
@@ -44,7 +44,7 @@ import contextMenuImg from './img/context-menu.png';

 - **Responsive table** — columns automatically adapt to widget width, hiding less important columns at smaller sizes
 - **Sortable columns** — click any column header to sort ascending/descending
- **Column customization** — choose which columns to display via the widget options panel
+- **Column customization** — choose which columns to display, then hover a header to reveal its grab handle for reordering or drag its edge to resize it; layouts save automatically per widget
 - **Right-click context menu** — pause, resume, delete downloads, or copy download names directly from the context menu
 - **Row expansion** — click any row to see full details inline without opening a separate modal
 - **Hover tooltips** — hover a download name to see size, speeds, ETA, ratio, and category
@@ -17,11 +17,15 @@
    "db:migration:postgresql:run": "pnpm -F db migration:postgresql:run",
    "db:migration:sqlite:generate": "pnpm -F db migration:sqlite:generate",
    "db:migration:sqlite:run": "pnpm -F db migration:sqlite:run",
+    "db:seed": "pnpm -F db seed",
    "db:push": "pnpm -F db push:sqlite",
    "db:studio": "pnpm -F db studio",
    "dev": "pnpm -F nextjs dev",
+    "dev:cli": "go -C tools/homarr-dev run .",
+    "dev:cli:install": "go -C tools/homarr-dev install .",
    "dev:docs": "pnpm -F @homarr/docs dev",
    "docker:dev": "docker compose -f ./development/development.docker-compose.yml up",
+    "docker:dev:up": "docker compose -f ./development/development.docker-compose.yml up -d redis",
    "format": "turbo format --continue -- --check",
    "format:fix": "turbo format --continue",
    "lint": "turbo lint --continue",
@@ -0,0 +1,109 @@
+import { act, createElement } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+import { MantineProvider } from "@mantine/core";
+
+import type { Root } from "react-dom/client";
+
+const { findIconsQuery } = vi.hoisted(() => ({
+  findIconsQuery: vi.fn((_query: { searchText: string }) => ({
+    data: { icons: [], countIcons: 0 },
+    isLoading: false,
+    isError: false,
+    refetch: vi.fn(),
+  })),
+}));
+
+vi.mock("@homarr/api/client", () => ({
+  clientApi: { icon: { findIcons: { useQuery: findIconsQuery } } },
+}));
+vi.mock("@homarr/auth/client", () => ({
+  useSession: () => ({ data: { user: { permissions: [] } } }),
+}));
+vi.mock("@homarr/translation", () => ({ supportedLanguages: [] }));
+vi.mock("@homarr/translation/client", () => ({
+  useScopedI18n: () => (key: string) => key,
+}));
+vi.mock("../upload-media/upload-media", () => ({ UploadMedia: () => null }));
+
+import { IconPicker } from "./icon-picker";
+
+const directIconUrl = "https://cdn.example.com/shopify.svg";
+
+const setInputValue = (input: HTMLInputElement, value: string) => {
+  const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")?.set;
+  if (!setter) throw new Error("Input value setter was not found");
+  setter.call(input, value);
+  input.dispatchEvent(new Event("input", { bubbles: true }));
+};
+
+describe("IconPicker", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeAll(() => {
+    Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", { value: true, writable: true });
+    Object.defineProperty(window, "matchMedia", {
+      writable: true,
+      value: (query: string) => ({
+        matches: false,
+        media: query,
+        onchange: null,
+        addListener: () => undefined,
+        removeListener: () => undefined,
+        addEventListener: () => undefined,
+        removeEventListener: () => undefined,
+        dispatchEvent: () => false,
+      }),
+    });
+  });
+
+  beforeEach(() => {
+    findIconsQuery.mockClear();
+  });
+
+  afterEach(() => {
+    root.unmount();
+    container.remove();
+  });
+
+  const renderPicker = async (onChange: (value: string) => void) => {
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+    await act(async () => {
+      root.render(createElement(MantineProvider, null, createElement(IconPicker, { value: "", onChange })));
+    });
+    const input = container.querySelector("input");
+    if (!input) throw new Error("Icon picker input was not rendered");
+    return input;
+  };
+
+  test("keeps a direct URL visible without searching the icon repositories", async () => {
+    const onChange = vi.fn();
+    const input = await renderPicker(onChange);
+
+    await act(async () => {
+      setInputValue(input, directIconUrl);
+      await new Promise((resolve) => setTimeout(resolve, 150));
+    });
+
+    expect(onChange).toHaveBeenCalledWith(directIconUrl);
+    expect(input.value).toBe(directIconUrl);
+    expect(findIconsQuery.mock.calls.some(([query]) => query.searchText === directIconUrl)).toBe(false);
+  });
+
+  test("keeps icon names in repository search mode", async () => {
+    const onChange = vi.fn();
+    const input = await renderPicker(onChange);
+
+    await act(async () => {
+      setInputValue(input, "shopify");
+      await new Promise((resolve) => setTimeout(resolve, 150));
+    });
+
+    expect(onChange).not.toHaveBeenCalled();
+    expect(input.value).toBe("shopify");
+    expect(findIconsQuery.mock.calls.some(([query]) => query.searchText === "shopify")).toBe(true);
+  });
+});
@@ -63,7 +63,7 @@ export const IconPicker = ({
  const tCommon = useScopedI18n("common");
  const [debouncedQuery] = useDebouncedValue(query, 100);

-  const searchText = (debouncedQuery !== (value ?? "") && debouncedQuery) || "";
+  const searchText = !isDirectIconUrl(debouncedQuery) && debouncedQuery !== (value ?? "") ? debouncedQuery : "";

  const { data, isLoading, isError, refetch } = clientApi.icon.findIcons.useQuery(
    { searchText },
@@ -167,15 +167,12 @@ export const IconPicker = ({
            onChange={(event) => {
              const nextValue = event.currentTarget.value;
              const trimmedValue = nextValue.trim();
-              if (/^https?:\/\/[^\s/]+(?:\/\S*)?$/i.test(trimmedValue)) {
-                startTransition(() => {
-                  setValue(trimmedValue);
-                  setQuery("");
-                  combobox.closeDropdown();
-                });
+              setQuery(nextValue);
+              if (isDirectIconUrl(trimmedValue)) {
+                setValue(trimmedValue);
+                combobox.closeDropdown();
              } else {
                combobox.openDropdown();
-                setQuery(nextValue);
              }
            }}
            onClick={() => combobox.openDropdown()}
@@ -230,3 +227,12 @@ const shouldShowPreview = (value: string | null | undefined): value is string =>
  if (!value) return false;
  return !localizationPathRegex.test(value);
 };
+
+const isDirectIconUrl = (value: string) => {
+  try {
+    const url = new URL(value.trim());
+    return (url.protocol === "http:" || url.protocol === "https:") && Boolean(url.hostname);
+  } catch {
+    return false;
+  }
+};
@@ -41,7 +41,11 @@ export interface StreamSession {
          audioCodec: string | null;
          videoCodec: string | null;
        };
+        isVideoDirect: boolean;
+        isAudioDirect: boolean;
+        containerChanged: boolean;
      };
+      bitrateKbps: number | null;
    } | null;
  } | null;
 }
@@ -56,6 +56,9 @@ export class JellyfinIntegration extends Integration implements IMediaServerInte
        if (sessionInfo.NowPlayingItem) {
          const positionMs = ticksToMs(sessionInfo.PlayState?.PositionTicks);
          const durationMs = ticksToMs(sessionInfo.NowPlayingItem.RunTimeTicks);
+          const bitrateBps =
+            sessionInfo.TranscodingInfo?.Bitrate ?? sessionInfo.NowPlayingItem.MediaSources?.[0]?.Bitrate ?? null;
+          const bitrateKbps = bitrateBps !== null ? Math.round(bitrateBps / 1000) : null;

          currentlyPlaying = {
            type: convertJellyfinType(sessionInfo.NowPlayingItem.Type),
@@ -98,7 +101,11 @@ export class JellyfinIntegration extends Integration implements IMediaServerInte
                  videoCodec: sessionInfo.TranscodingInfo?.VideoCodec ?? null,
                },
                container: sessionInfo.TranscodingInfo?.Container ?? null,
+                isVideoDirect: sessionInfo.TranscodingInfo?.IsVideoDirect ?? true,
+                isAudioDirect: sessionInfo.TranscodingInfo?.IsAudioDirect ?? true,
+                containerChanged: sessionInfo.PlayState?.PlayMethod === "DirectStream",
              },
+              bitrateKbps,
            },
          };
        }
@@ -259,7 +259,7 @@ describe("NavidromeIntegration.getCurrentSessionsAsync", () => {
    expect(result).toEqual([]);
  });

-  test("throws on subsonic auth failure", async () => {
+  test("normalizes subsonic auth failures", async () => {
    mockFetch.mockImplementation((url) => {
      const urlStr = toUrlString(url);

@@ -43,6 +43,12 @@ function parseResolution(
  return parsedWidth !== null && parsedHeight !== null ? { width: parsedWidth, height: parsedHeight } : null;
 }

+function isStreamDirect(decision: string | undefined): boolean {
+  // Plex reports "transcode" when a stream is re-encoded. "copy" (remuxed
+  // without re-encoding) and an absent decision both count as direct.
+  return decision !== "transcode";
+}
+
 export class PlexIntegration extends Integration implements IMediaServerIntegration, IMediaReleasesIntegration {
  public async getCurrentSessionsAsync(_options: CurrentSessionsInput): Promise<StreamSession[]> {
    const token = super.getSecretValue("apiKey");
@@ -87,6 +93,16 @@ export class PlexIntegration extends Integration implements IMediaServerIntegrat
        const videoStream = streams.find((stream) => stream.$.streamType === "1");
        const audioStream = streams.find((stream) => stream.$.streamType === "2");

+        const isVideoDirect = isStreamDirect(transcodeElement?.$.videoDecision);
+        const isAudioDirect = isStreamDirect(transcodeElement?.$.audioDecision);
+        const containerChanged = Boolean(
+          transcodeElement?.$.container &&
+            mediaInfoElement?.$.container &&
+            transcodeElement.$.container !== mediaInfoElement.$.container,
+        );
+        const bitrateKbps =
+          parseOptionalNumber(sessionElement?.$.bandwidth) ?? parseOptionalNumber(mediaInfoElement?.$.bitrate);
+
        return {
          sessionId: sessionElement?.$.id ?? "unknown",
          sessionName: `${playerElement.$.product} (${playerElement.$.title})`,
@@ -124,7 +140,11 @@ export class PlexIntegration extends Integration implements IMediaServerIntegrat
                  audioCodec: transcodeElement?.$.audioCodec ?? null,
                  videoCodec: transcodeElement?.$.videoCodec ?? null,
                },
+                isVideoDirect,
+                isAudioDirect,
+                containerChanged,
              },
+              bitrateKbps,
            },
          },
        };
@@ -2428,10 +2428,21 @@
        },
        "descendingDefaultSort": {
          "label": "Invert sorting"
+        },
+        "columnOrder": {
+          "label": "Column order"
+        },
+        "columnWidths": {
+          "label": "Column widths"
        }
      },
      "error": {
-        "internalServerError": "Failed to fetch containers stats"
+        "internalServerError": "Failed to fetch containers stats",
+        "layoutSaveTitle": "Table layout not saved",
+        "layoutSaveMessage": "The Docker table layout could not be saved. Try moving or resizing the column again."
+      },
+      "empty": {
+        "noContainers": "No containers found"
      }
    },
    "coolify": {
@@ -2725,8 +2736,20 @@
        "showOnlyPlaying": {
          "label": "Show only currently playing",
          "description": "Disabling this will not work for plex"
+        },
+        "showBitrate": {
+          "label": "Show bitrate",
+          "description": "Show the current playback bitrate next to the location"
+        },
+        "showLocation": {
+          "label": "Show location",
+          "description": "Show whether the stream is on your LAN or WAN"
        }
      },
+      "footer": {
+        "streams": "{count, plural, one {# active stream} other {# active streams}}",
+        "totalBitrate": "Total: {bitrate}"
+      },
      "items": {
        "currentlyPlaying": "Currently playing",
        "user": "User",
@@ -2734,6 +2757,9 @@
        "id": "Id",
        "status": "Status",
        "directPlay": "Direct play",
+        "directStream": "Direct stream",
+        "transcodeVideo": "Transcoding video",
+        "transcodeAudio": "Transcoding audio",
        "transcoding": "Transcoding",
        "paused": "Paused",
        "remaining": "{minutes} min left",
@@ -3940,11 +3966,19 @@
        },
        "showAgent": {
          "label": "Show agent version"
+        },
+        "columnOrder": {
+          "label": "Column order"
+        },
+        "columnWidths": {
+          "label": "Column widths"
        }
      },
      "noRecords": "No systems found",
      "error": {
-        "internalServerError": "Unable to connect to Beszel. Check your integration settings."
+        "internalServerError": "Unable to connect to Beszel. Check your integration settings.",
+        "layoutSaveTitle": "Unable to save table layout",
+        "layoutSaveMessage": "Your column order or widths could not be saved. Please try again."
      },
      "column": {
        "system": "System",
@@ -5342,6 +5376,7 @@
      },
      "remove": {
        "label": "Remove",
+        "confirm": "Click again to remove permanently",
        "notification": {
          "success": {
            "title": "Containers removed",
@@ -0,0 +1,34 @@
+import { describe, expect, test } from "vitest";
+
+import { parseColumnOrder, parseColumnWidths } from "../common/use-persisted-table-layout";
+
+const columnAccessors = ["name", "cpu", "memory", "disk", "temp"];
+
+describe("Beszel table column layout options", () => {
+  test("ignores malformed column layout JSON", () => {
+    expect(parseColumnOrder("{", columnAccessors)).toEqual([]);
+    expect(parseColumnWidths("[]", columnAccessors)).toEqual({});
+  });
+
+  test("removes stale and duplicate column accessors", () => {
+    expect(parseColumnOrder(JSON.stringify(["memory", "removed", "cpu", "memory"]), columnAccessors)).toEqual([
+      "memory",
+      "cpu",
+    ]);
+  });
+
+  test("keeps only finite positive widths for known columns", () => {
+    expect(
+      parseColumnWidths(
+        JSON.stringify({
+          cpu: 140,
+          memory: -1,
+          disk: "160px",
+          removed: 100,
+          temp: null,
+        }),
+        columnAccessors,
+      ),
+    ).toEqual({ cpu: 140 });
+  });
+});
@@ -1,11 +1,8 @@
 "use client";

-import "./styles.css";
-
-import { useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { Center, Group, Indicator, Loader, Progress, Text } from "@mantine/core";
 import type { DataTableColumn, DataTableSortStatus } from "mantine-datatable";
-import { DataTable } from "mantine-datatable";
 import {
  Activity,
  Battery,
@@ -20,10 +17,16 @@ import {
 } from "lucide-react";

 import { clientApi } from "@homarr/api/client";
+import { useSession } from "@homarr/auth/client";
+import { constructBoardPermissions } from "@homarr/auth/shared";
+import { useOptionalBoard } from "@homarr/boards/context";
 import { useModalAction } from "@homarr/modals";
+import { showErrorNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";

 import type { WidgetComponentProps } from "../definition";
+import { HomarrDataTable } from "../common/homarr-data-table";
+import { usePersistedTableLayout, useTableLayoutPersistence } from "../common/use-persisted-table-layout";
 import type { BeszelSystemRow } from "../beszel/_shared/types";
 import { loadAvgColor, statusColorMap, thresholdColor } from "../beszel/_shared/colors";
 import {
@@ -43,6 +46,21 @@ const directionMultiplier: Record<string, number> = { asc: 1, desc: -1 };

 type SystemRowWithKey = BeszelSystemRow & { _key: string };

+const columnAccessors = [
+  "name",
+  "cpu",
+  "memory",
+  "disk",
+  "gpu",
+  "loadAvg",
+  "netBytes",
+  "temp",
+  "battery",
+  "services",
+  "uptime",
+  "agentVersion",
+] as const satisfies readonly (keyof BeszelSystemRow)[];
+
 interface SizeConfig {
  iconSize: number;
  fontSize: "xs" | "sm";
@@ -75,15 +93,36 @@ export default function BeszelSystemTableWidget({
  integrationIds,
  isEditMode,
  width,
+  boardId,
+  itemId,
+  setOptions,
 }: WidgetComponentProps<"beszelSystemTable">) {
  const t = useScopedI18n("widget.beszelSystemTable");
  const { openModal } = useModalAction(BeszelSystemStatsModal);
+  const board = useOptionalBoard();
+  const { data: session } = useSession();
+  const hasChangeAccess = board ? constructBoardPermissions(board, session).hasChangeAccess : false;
  const {
    data: results = [],
    error: systemsError,
    isPending,
  } = clientApi.widget.beszel.getSystems.useQuery({ integrationIds });
-  const size = getSizeConfig(width);
+  const size = useMemo(() => getSizeConfig(width), [width]);
+
+  const { mutate: saveItemOptions } = clientApi.widget.options.saveItemOptions.useMutation({
+    onError: () =>
+      showErrorNotification({
+        title: t("error.layoutSaveTitle"),
+        message: t("error.layoutSaveMessage"),
+      }),
+  });
+  const persistLayout = useTableLayoutPersistence({
+    boardId,
+    hasChangeAccess,
+    itemId,
+    saveItemOptions,
+    setOptions,
+  });

  const filteredSystems = useBeszelFilteredSystems(results, options.statusFilter);

@@ -91,6 +130,12 @@ export default function BeszelSystemTableWidget({
    columnAccessor: options.sortBy,
    direction: options.sortDirection as "asc" | "desc",
  });
+  useEffect(() => {
+    setSortStatus({
+      columnAccessor: options.sortBy,
+      direction: options.sortDirection as "asc" | "desc",
+    });
+  }, [options.sortBy, options.sortDirection]);

  const sortedSystems = useMemo(() => {
    const accessor = sortStatus.columnAccessor as keyof BeszelSystemRow;
@@ -122,6 +167,8 @@ export default function BeszelSystemTableWidget({
    const cols: (DataTableColumn<SystemRowWithKey> | false)[] = [
      {
        accessor: "name",
+        width: 160,
+        ellipsis: true,
        title: (
          <Group gap={4} wrap="nowrap">
            <Server size={size.iconSize} />
@@ -130,7 +177,7 @@ export default function BeszelSystemTableWidget({
        ),
        sortable: true,
        render: (record) => (
-          <Group gap={8} wrap="nowrap">
+          <Group gap={8} wrap="nowrap" style={{ overflow: "hidden", paddingInlineStart: 4 }}>
            <Indicator color={statusColorMap[record.status]} size={7} />
            <Text size={size.fontSize} fw={500} truncate>
              {record.name}
@@ -140,6 +187,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showCpu && {
        accessor: "cpu",
+        width: 140,
        title: (
          <Group gap={4} wrap="nowrap">
            <Cpu size={size.iconSize} />
@@ -151,6 +199,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showMemory && {
        accessor: "memory",
+        width: 140,
        title: (
          <Group gap={4} wrap="nowrap">
            <MemoryStick size={size.iconSize} />
@@ -162,6 +211,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showDisk && {
        accessor: "disk",
+        width: 160,
        title: (
          <Group gap={4} wrap="nowrap">
            <HardDrive size={size.iconSize} />
@@ -181,6 +231,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showGpu && {
        accessor: "gpu",
+        width: 140,
        title: (
          <Group gap={4} wrap="nowrap">
            <Monitor size={size.iconSize} />
@@ -192,6 +243,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showLoadAvg && {
        accessor: "loadAvg",
+        width: 100,
        title: (
          <Group gap={4} wrap="nowrap">
            <Activity size={size.iconSize} />
@@ -208,6 +260,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showNet && {
        accessor: "netBytes",
+        width: 100,
        title: (
          <Group gap={4} wrap="nowrap">
            <Network size={size.iconSize} />
@@ -223,6 +276,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showTemp && {
        accessor: "temp",
+        width: 80,
        title: (
          <Group gap={4} wrap="nowrap">
            <Thermometer size={size.iconSize} />
@@ -234,6 +288,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showBattery && {
        accessor: "battery",
+        width: 70,
        title: (
          <Group gap={4} wrap="nowrap">
            <Battery size={size.iconSize} />
@@ -244,6 +299,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showServices && {
        accessor: "services",
+        width: 80,
        title: (
          <Group gap={4} wrap="nowrap">
            <Server size={size.iconSize} />
@@ -255,6 +311,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showUptime && {
        accessor: "uptime",
+        width: 90,
        title: (
          <Group gap={4} wrap="nowrap">
            <Activity size={size.iconSize} />
@@ -266,6 +323,7 @@ export default function BeszelSystemTableWidget({
      },
      options.showAgent && {
        accessor: "agentVersion",
+        width: 90,
        title: (
          <Group gap={4} wrap="nowrap">
            <Wifi size={size.iconSize} />
@@ -278,12 +336,39 @@ export default function BeszelSystemTableWidget({
    ];

    return cols.filter(Boolean) as DataTableColumn<SystemRowWithKey>[];
-  }, [options, t, size]);
+  }, [
+    options.showAgent,
+    options.showBattery,
+    options.showCpu,
+    options.showDisk,
+    options.showGpu,
+    options.showLoadAvg,
+    options.showMemory,
+    options.showNet,
+    options.showServices,
+    options.showTemp,
+    options.showUptime,
+    size,
+    t,
+  ]);

-  const handleRowClick = ({ record }: { record: SystemRowWithKey }) => {
-    const integrationId = record._key.split(":")[0] ?? "";
-    openModal({ integrationId, systemId: record.id }, { title: record.name });
-  };
+  const { effectiveColumns, storeKey } = usePersistedTableLayout({
+    columns,
+    columnAccessors,
+    columnOrder: options.columnOrder,
+    columnWidths: options.columnWidths,
+    itemId,
+    storeKeyPrefix: "beszel-system-table",
+    onLayoutChange: persistLayout,
+  });
+
+  const handleRowClick = useCallback(
+    ({ record }: { record: SystemRowWithKey }) => {
+      const integrationId = record._key.split(":")[0] ?? "";
+      openModal({ integrationId, systemId: record.id }, { title: record.name });
+    },
+    [openModal],
+  );

  if (systemsError) throw systemsError;

@@ -300,20 +385,17 @@ export default function BeszelSystemTableWidget({
      <div style={{ position: "absolute", top: 4, right: 8, zIndex: 1 }}>
        <BeszelIntegrationErrorIndicator results={results} />
      </div>
-      <DataTable
-        style={{ pointerEvents: isEditMode ? "none" : undefined }}
-        withTableBorder={false}
-        borderRadius={0}
-        highlightOnHover
+      <HomarrDataTable
+        isEditMode={isEditMode}
+        cellPadding={`${size.cellPadding}px 8px`}
        fz={size.fontSize}
        records={sortedSystems}
-        columns={columns}
+        columns={effectiveColumns}
        sortStatus={sortStatus}
        onSortStatusChange={setSortStatus}
        noRecordsText={t("noRecords")}
        idAccessor="_key"
-        height="100%"
-        className="beszel-table"
+        storeColumnsKey={storeKey}
        onRowClick={isEditMode ? undefined : handleRowClick}
      />
    </div>
@@ -29,28 +29,36 @@ export const { definition, componentLoader } = createWidgetDefinition("beszelSys
  supportedIntegrations: ["beszel", "mock"],
  integrationsRequired: true,
  createOptions() {
-    return optionsBuilder.from((factory) => ({
-      statusFilter: factory.select({
-        defaultValue: "all",
-        options: statusOptions,
+    return optionsBuilder.from(
+      (factory) => ({
+        statusFilter: factory.select({
+          defaultValue: "all",
+          options: statusOptions,
+        }),
+        sortBy: factory.select({ defaultValue: "name", options: sortOptions }),
+        sortDirection: factory.select({
+          defaultValue: "asc",
+          options: sortDirectionOptions,
+        }),
+        showCpu: factory.switch({ defaultValue: true }),
+        showMemory: factory.switch({ defaultValue: true }),
+        showDisk: factory.switch({ defaultValue: true }),
+        showGpu: factory.switch({ defaultValue: true }),
+        showLoadAvg: factory.switch({ defaultValue: true }),
+        showNet: factory.switch({ defaultValue: true }),
+        showTemp: factory.switch({ defaultValue: true }),
+        showBattery: factory.switch({ defaultValue: true }),
+        showServices: factory.switch({ defaultValue: true }),
+        showUptime: factory.switch({ defaultValue: true }),
+        showAgent: factory.switch({ defaultValue: true }),
+        columnOrder: factory.text({ defaultValue: "" }),
+        columnWidths: factory.text({ defaultValue: "" }),
      }),
-      sortBy: factory.select({ defaultValue: "name", options: sortOptions }),
-      sortDirection: factory.select({
-        defaultValue: "asc",
-        options: sortDirectionOptions,
-      }),
-      showCpu: factory.switch({ defaultValue: true }),
-      showMemory: factory.switch({ defaultValue: true }),
-      showDisk: factory.switch({ defaultValue: true }),
-      showGpu: factory.switch({ defaultValue: true }),
-      showLoadAvg: factory.switch({ defaultValue: true }),
-      showNet: factory.switch({ defaultValue: true }),
-      showTemp: factory.switch({ defaultValue: true }),
-      showBattery: factory.switch({ defaultValue: true }),
-      showServices: factory.switch({ defaultValue: true }),
-      showUptime: factory.switch({ defaultValue: true }),
-      showAgent: factory.switch({ defaultValue: true }),
-    }));
+      {
+        columnOrder: { shouldHide: () => true },
+        columnWidths: { shouldHide: () => true },
+      },
+    );
  },
  errors: {
    INTERNAL_SERVER_ERROR: {
@@ -1,47 +0,0 @@
-/* Make the DataTable transparent so the board card's opacity-controlled
-   background shows through. The mantine-datatable defaults to
-   var(--mantine-color-body) which is opaque. */
-.beszel-table,
-.beszel-table .mantine-datatable-table,
-.beszel-table .mantine-datatable-table thead,
-.beszel-table .mantine-datatable-table tbody,
-.beszel-table .mantine-datatable-table tfoot,
-.beszel-table th,
-.beszel-table td {
-  background-color: transparent !important;
-}
-
-.beszel-table .mantine-datatable-table tr {
-  background-color: transparent;
-}
-
-.beszel-table .mantine-datatable-table tbody tr:hover {
-  background-color: color-mix(in srgb, var(--mantine-color-default-hover) 40%, transparent) !important;
-}
-
-.beszel-table th {
-  white-space: nowrap;
-  background-color: color-mix(in srgb, var(--mantine-color-body) 60%, transparent) !important;
-  backdrop-filter: blur(8px);
-}
-
-.beszel-table td {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.beszel-table td .mantine-Text-root,
-.beszel-table td .mantine-Group-root {
-  white-space: nowrap;
-  flex-wrap: nowrap;
-}
-
-.beszel-table .mantine-datatable-header-cell-sortable-icon {
-  opacity: 0;
-  transition: opacity 150ms;
-}
-
-.beszel-table th:hover .mantine-datatable-header-cell-sortable-icon {
-  opacity: 1;
-}
@@ -0,0 +1,52 @@
+.homarr-data-table,
+.homarr-data-table .mantine-datatable-table,
+.homarr-data-table .mantine-datatable-table thead,
+.homarr-data-table .mantine-datatable-table tbody,
+.homarr-data-table .mantine-datatable-table tfoot,
+.homarr-data-table th,
+.homarr-data-table td {
+  background-color: transparent !important;
+}
+
+.homarr-data-table .mantine-datatable-table tr {
+  background-color: transparent;
+}
+
+.homarr-data-table .mantine-datatable-table tbody tr:hover {
+  background-color: color-mix(in srgb, var(--mantine-color-default-hover) 40%, transparent) !important;
+}
+
+.homarr-data-table th {
+  white-space: nowrap;
+  background-color: color-mix(in srgb, var(--mantine-color-body) 60%, transparent) !important;
+  backdrop-filter: blur(8px);
+}
+
+.homarr-data-table td {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.homarr-data-table td .mantine-Text-root,
+.homarr-data-table td .mantine-Group-root {
+  white-space: nowrap;
+  flex-wrap: nowrap;
+}
+
+.homarr-data-table .mantine-datatable-header-cell-sortable-icon,
+.homarr-data-table .mantine-datatable-header-cell-draggable-action-icon {
+  opacity: 0;
+  transition: opacity 150ms ease-out;
+}
+
+.homarr-data-table th:hover .mantine-datatable-header-cell-sortable-icon,
+.homarr-data-table th:hover .mantine-datatable-header-cell-draggable-action-icon,
+.homarr-data-table .mantine-datatable-header-cell-draggable-action-icon:focus-visible,
+.homarr-data-table .mantine-datatable-header-cell-drag-over .mantine-datatable-header-cell-draggable-action-icon {
+  opacity: 1;
+}
+
+.homarr-data-table-row-cursor-default .mantine-datatable-context-menu-cursor {
+  cursor: default;
+}
@@ -0,0 +1,57 @@
+"use client";
+
+import "./homarr-data-table.css";
+
+import type { DataTableProps } from "mantine-datatable";
+import { DataTable } from "mantine-datatable";
+
+type HomarrDataTableProps<T> = DataTableProps<T> & {
+  isEditMode: boolean;
+  cellPadding: string;
+  rowCursor?: "auto" | "default";
+};
+
+export function HomarrDataTable<T>({
+  isEditMode,
+  cellPadding,
+  rowCursor = "auto",
+  className,
+  defaultColumnProps,
+  scrollAreaProps,
+  style,
+  ...props
+}: HomarrDataTableProps<T>) {
+  const mergedClassName = [
+    "homarr-data-table",
+    rowCursor === "default" ? "homarr-data-table-row-cursor-default" : undefined,
+    className,
+  ]
+    .filter(Boolean)
+    .join(" ");
+
+  return (
+    <DataTable<T>
+      withTableBorder={false}
+      borderRadius={0}
+      highlightOnHover
+      striped="odd"
+      stripedColor={{ dark: "dark.7", light: "gray.0" }}
+      highlightOnHoverColor={{ dark: "dark.5", light: "gray.1" }}
+      verticalAlign="center"
+      loaderBackgroundBlur={2}
+      textSelectionDisabled
+      height="100%"
+      {...props}
+      className={mergedClassName}
+      style={[{ pointerEvents: isEditMode ? "none" : undefined }, style]}
+      defaultColumnProps={{
+        ...defaultColumnProps,
+        noWrap: defaultColumnProps?.noWrap ?? true,
+        draggable: !isEditMode,
+        resizable: !isEditMode,
+        cellsStyle: defaultColumnProps?.cellsStyle ?? (() => ({ padding: cellPadding })),
+      }}
+      scrollAreaProps={{ type: "auto", scrollbarSize: 6, ...scrollAreaProps }}
+    />
+  );
+}
@@ -0,0 +1,83 @@
+import { act, createElement } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+
+import type { Root } from "react-dom/client";
+import type { DataTableColumn } from "mantine-datatable";
+
+const tableState = vi.hoisted(() => ({
+  columnsOrder: ["name", "state"],
+  columnsWidth: [] as Record<string, string | number>[],
+}));
+
+vi.mock("mantine-datatable", () => ({
+  useDataTableColumns: ({ columns }: { columns: DataTableColumn<unknown>[] }) => ({
+    effectiveColumns: columns,
+    columnsOrder: tableState.columnsOrder,
+    columnsWidth: tableState.columnsWidth,
+    setColumnsOrder: vi.fn(),
+    setMultipleColumnWidths: vi.fn(),
+  }),
+}));
+
+import { usePersistedTableLayout } from "./use-persisted-table-layout";
+
+const columns: DataTableColumn<{ name: string; state: string }>[] = [{ accessor: "name" }, { accessor: "state" }];
+const columnAccessors = ["name", "state"] as const;
+
+const LayoutHarness = ({ itemId, onLayoutChange }: { itemId: string; onLayoutChange: (layout: unknown) => void }) => {
+  usePersistedTableLayout({
+    columns,
+    columnAccessors,
+    columnOrder: "",
+    columnWidths: "",
+    itemId,
+    storeKeyPrefix: "test-table",
+    onLayoutChange,
+  });
+  return null;
+};
+
+describe("usePersistedTableLayout", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeAll(() => {
+    Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", { value: true, writable: true });
+  });
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    tableState.columnsOrder = ["name", "state"];
+    tableState.columnsWidth = [];
+    container = document.createElement("div");
+    root = createRoot(container);
+  });
+
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    vi.useRealTimers();
+  });
+
+  test("flushes a pending layout through the callback for its originating item", async () => {
+    const firstItemLayoutChange = vi.fn();
+    const secondItemLayoutChange = vi.fn();
+
+    await act(async () => {
+      root.render(createElement(LayoutHarness, { itemId: "first", onLayoutChange: firstItemLayoutChange }));
+    });
+
+    tableState.columnsOrder = ["state", "name"];
+    await act(async () => {
+      root.render(createElement(LayoutHarness, { itemId: "first", onLayoutChange: firstItemLayoutChange }));
+    });
+    expect(firstItemLayoutChange).not.toHaveBeenCalled();
+
+    await act(async () => {
+      root.render(createElement(LayoutHarness, { itemId: "second", onLayoutChange: secondItemLayoutChange }));
+    });
+
+    expect(firstItemLayoutChange).toHaveBeenCalledWith({ columnOrder: JSON.stringify(["state", "name"]) });
+    expect(secondItemLayoutChange).not.toHaveBeenCalled();
+  });
+});
@@ -0,0 +1,233 @@
+"use client";
+
+import { useCallback, useEffect, useMemo, useRef } from "react";
+import type { DataTableColumn } from "mantine-datatable";
+import { useDataTableColumns } from "mantine-datatable";
+
+interface TableLayoutOptions extends Record<string, unknown> {
+  columnOrder?: string;
+  columnWidths?: string;
+}
+
+interface PendingTableLayout {
+  layout: TableLayoutOptions;
+  onLayoutChange: (layout: TableLayoutOptions) => void;
+  storeKey: string;
+}
+
+interface UseTableLayoutPersistenceProps {
+  boardId: string | undefined;
+  hasChangeAccess: boolean;
+  itemId: string | undefined;
+  saveItemOptions: (input: { boardId: string; itemId: string; newOptions: TableLayoutOptions }) => void;
+  setOptions: (input: { newOptions: TableLayoutOptions }) => void;
+}
+
+interface UsePersistedTableLayoutProps<T> {
+  columns: DataTableColumn<T>[];
+  columnAccessors: readonly string[];
+  columnOrder: string;
+  columnWidths: string;
+  itemId: string | undefined;
+  storeKeyPrefix: string;
+  onLayoutChange: (layout: TableLayoutOptions) => void;
+}
+
+const layoutSaveDelay = 350;
+
+export const useTableLayoutPersistence = ({
+  boardId,
+  hasChangeAccess,
+  itemId,
+  saveItemOptions,
+  setOptions,
+}: UseTableLayoutPersistenceProps) =>
+  useCallback(
+    (newOptions: TableLayoutOptions) => {
+      setOptions({ newOptions });
+      if (hasChangeAccess && boardId && itemId) saveItemOptions({ boardId, itemId, newOptions });
+    },
+    [boardId, hasChangeAccess, itemId, saveItemOptions, setOptions],
+  );
+
+const toPixelWidth = (width: string | number): number | undefined => {
+  if (typeof width === "number" && Number.isFinite(width) && width > 0) return width;
+  if (typeof width !== "string" || !width.endsWith("px")) return undefined;
+
+  const parsedWidth = Number.parseInt(width, 10);
+  return Number.isFinite(parsedWidth) && parsedWidth > 0 ? parsedWidth : undefined;
+};
+
+const getColumnWidthMap = (
+  columnsWidth: Record<string, string | number>[],
+  visibleAccessorSet: ReadonlySet<string>,
+): Record<string, number> => {
+  const widths: Record<string, number> = {};
+  for (const entry of columnsWidth) {
+    for (const [accessor, width] of Object.entries(entry)) {
+      if (!visibleAccessorSet.has(accessor)) continue;
+      const pixelWidth = toPixelWidth(width);
+      if (pixelWidth !== undefined) widths[accessor] = pixelWidth;
+    }
+  }
+  return widths;
+};
+
+export const parseColumnOrder = (value: string, columnAccessors: readonly string[]): string[] => {
+  if (!value) return [];
+  try {
+    const parsed: unknown = JSON.parse(value);
+    if (!Array.isArray(parsed)) return [];
+
+    const allowed = new Set(columnAccessors);
+    return parsed.filter(
+      (accessor, index): accessor is string =>
+        typeof accessor === "string" && allowed.has(accessor) && parsed.indexOf(accessor) === index,
+    );
+  } catch {
+    return [];
+  }
+};
+
+export const parseColumnWidths = (value: string, columnAccessors: readonly string[]): Record<string, number> => {
+  if (!value) return {};
+  try {
+    const parsed: unknown = JSON.parse(value);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return {};
+
+    const allowed = new Set(columnAccessors);
+    return Object.fromEntries(
+      Object.entries(parsed).filter(
+        (entry): entry is [string, number] =>
+          allowed.has(entry[0]) && typeof entry[1] === "number" && Number.isFinite(entry[1]) && entry[1] > 0,
+      ),
+    );
+  } catch {
+    return {};
+  }
+};
+
+export const usePersistedTableLayout = <T>({
+  columns,
+  columnAccessors,
+  columnOrder,
+  columnWidths,
+  itemId,
+  storeKeyPrefix,
+  onLayoutChange,
+}: UsePersistedTableLayoutProps<T>) => {
+  const savedOrder = useMemo(() => parseColumnOrder(columnOrder, columnAccessors), [columnAccessors, columnOrder]);
+  const savedWidths = useMemo(() => parseColumnWidths(columnWidths, columnAccessors), [columnAccessors, columnWidths]);
+  const visibleAccessors = useMemo(() => columns.map(({ accessor }) => String(accessor)), [columns]);
+  const visibleAccessorSet = useMemo(() => new Set(visibleAccessors), [visibleAccessors]);
+  const restoredOrder = useMemo(
+    () => [
+      ...savedOrder.filter((accessor) => visibleAccessorSet.has(accessor)),
+      ...visibleAccessors.filter((accessor) => !savedOrder.includes(accessor)),
+    ],
+    [savedOrder, visibleAccessors, visibleAccessorSet],
+  );
+  const storeKey = `${storeKeyPrefix}-${itemId ?? "preview"}-${[...visibleAccessors].toSorted().join(",")}`;
+  const { effectiveColumns, columnsOrder, columnsWidth, setColumnsOrder, setMultipleColumnWidths } =
+    useDataTableColumns<T>({
+      key: storeKey,
+      columns,
+    });
+
+  const lastStoreKey = useRef(storeKey);
+  const hydrated = useRef(false);
+  const previousOrder = useRef(columnsOrder);
+  const previousWidths = useRef(columnsWidth);
+  useEffect(() => {
+    if (lastStoreKey.current !== storeKey) {
+      lastStoreKey.current = storeKey;
+      hydrated.current = false;
+    }
+    if (hydrated.current) return;
+
+    const orderMatches =
+      columnsOrder.length === restoredOrder.length &&
+      columnsOrder.every((accessor, index) => accessor === restoredOrder[index]);
+    const currentWidths = getColumnWidthMap(columnsWidth, visibleAccessorSet);
+    const visibleWidths = Object.entries(savedWidths).filter(([accessor]) => visibleAccessorSet.has(accessor));
+    const widthsMatch = visibleWidths.every(([accessor, width]) => currentWidths[accessor] === width);
+
+    if (orderMatches && widthsMatch) {
+      previousOrder.current = columnsOrder;
+      previousWidths.current = columnsWidth;
+      hydrated.current = true;
+      return;
+    }
+
+    if (!orderMatches) setColumnsOrder(restoredOrder);
+    if (!widthsMatch) {
+      setMultipleColumnWidths(visibleWidths.map(([accessor, width]) => ({ accessor, width })));
+    }
+  }, [
+    columnsOrder,
+    columnsWidth,
+    restoredOrder,
+    savedWidths,
+    setColumnsOrder,
+    setMultipleColumnWidths,
+    storeKey,
+    visibleAccessorSet,
+  ]);
+
+  const pendingLayout = useRef<PendingTableLayout | undefined>(undefined);
+  const saveTimeout = useRef<number | undefined>(undefined);
+  const flushPendingLayout = useCallback(() => {
+    const pending = pendingLayout.current;
+    pendingLayout.current = undefined;
+    window.clearTimeout(saveTimeout.current);
+    saveTimeout.current = undefined;
+    if (pending) pending.onLayoutChange(pending.layout);
+  }, []);
+  useEffect(() => {
+    if (pendingLayout.current && pendingLayout.current.storeKey !== storeKey) flushPendingLayout();
+  }, [flushPendingLayout, storeKey]);
+  useEffect(() => () => flushPendingLayout(), [flushPendingLayout]);
+  useEffect(() => {
+    if (!hydrated.current) return;
+
+    const orderChanged = JSON.stringify(columnsOrder) !== JSON.stringify(previousOrder.current);
+    const widthsChanged = JSON.stringify(columnsWidth) !== JSON.stringify(previousWidths.current);
+    previousOrder.current = columnsOrder;
+    previousWidths.current = columnsWidth;
+    if (!orderChanged && !widthsChanged) return;
+
+    const newLayout: TableLayoutOptions = {};
+    if (orderChanged) {
+      const fullOrder = [...savedOrder, ...columnAccessors.filter((accessor) => !savedOrder.includes(accessor))];
+      const reorderedVisibleColumns = [...columnsOrder];
+      const mergedOrder = fullOrder.map((accessor) =>
+        visibleAccessorSet.has(accessor) ? (reorderedVisibleColumns.shift() ?? accessor) : accessor,
+      );
+      newLayout.columnOrder = JSON.stringify(mergedOrder);
+    }
+    if (widthsChanged) {
+      const widthMap: Record<string, number> = { ...savedWidths };
+      Object.assign(widthMap, getColumnWidthMap(columnsWidth, visibleAccessorSet));
+      newLayout.columnWidths = JSON.stringify(widthMap);
+    }
+
+    if (pendingLayout.current && pendingLayout.current.storeKey !== storeKey) flushPendingLayout();
+    pendingLayout.current = pendingLayout.current
+      ? { ...pendingLayout.current, layout: { ...pendingLayout.current.layout, ...newLayout } }
+      : { layout: newLayout, onLayoutChange, storeKey };
+    window.clearTimeout(saveTimeout.current);
+    saveTimeout.current = window.setTimeout(flushPendingLayout, layoutSaveDelay);
+  }, [
+    columnAccessors,
+    columnsOrder,
+    columnsWidth,
+    flushPendingLayout,
+    onLayoutChange,
+    savedOrder,
+    savedWidths,
+    storeKey,
+    visibleAccessorSet,
+  ]);
+
+  return { effectiveColumns, storeKey };
+};
@@ -0,0 +1,33 @@
+import { describe, expect, test } from "vitest";
+
+import { parseColumnOrder, parseColumnWidths } from "../common/use-persisted-table-layout";
+
+const columnAccessors = ["name", "state", "host", "cpuUsage", "memoryUsage", "actions"];
+
+describe("Docker table column layout options", () => {
+  test("ignores malformed column layout JSON", () => {
+    expect(parseColumnOrder("{", columnAccessors)).toEqual([]);
+    expect(parseColumnWidths("[]", columnAccessors)).toEqual({});
+  });
+
+  test("removes stale and duplicate column accessors", () => {
+    expect(
+      parseColumnOrder(JSON.stringify(["memoryUsage", "removed", "name", "memoryUsage"]), columnAccessors),
+    ).toEqual(["memoryUsage", "name"]);
+  });
+
+  test("keeps only finite positive widths for known columns", () => {
+    expect(
+      parseColumnWidths(
+        JSON.stringify({
+          name: 180,
+          state: -1,
+          host: "120px",
+          removed: 100,
+          actions: null,
+        }),
+        columnAccessors,
+      ),
+    ).toEqual({ name: 180 });
+  });
+});
@@ -1,22 +1,57 @@
 "use client";

-import { useMemo } from "react";
-import { ActionIcon, Avatar, Badge, Center, Group, Stack, Text, Tooltip } from "@mantine/core";
-import type { IconProps } from "@tabler/icons-react";
-import { IconBrandDocker, IconPlayerPlay, IconPlayerStop, IconRefresh, IconRotateClockwise } from "@tabler/icons-react";
-import type { MRT_ColumnDef, MRT_VisibilityState } from "mantine-react-table";
-import { MantineReactTable } from "mantine-react-table";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { ActionIcon, Avatar, Badge, Box, Center, Group, Menu, Portal, Stack, Text, Tooltip } from "@mantine/core";
+import {
+  IconBrandDocker,
+  IconCategoryPlus,
+  IconDots,
+  IconFileText,
+  IconPlayerPlay,
+  IconPlayerStop,
+  IconRefresh,
+  IconRotateClockwise,
+  IconTrash,
+} from "@tabler/icons-react";
+import type { DataTableColumn, DataTableSortStatus } from "mantine-datatable";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
+import { useSession } from "@homarr/auth/client";
+import { constructBoardPermissions } from "@homarr/auth/shared";
+import { useOptionalBoard } from "@homarr/boards/context";
 import { formatBytes, useTimeAgo } from "@homarr/common";
 import type { ContainerState } from "@homarr/docker";
 import { containerStateColorMap, cpuUsageColor, memoryUsageColor, safeValue } from "@homarr/docker/shared";
+import { useModalAction } from "@homarr/modals";
+import { AddDockerAppToHomarr } from "@homarr/modals-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
-import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";

 import type { WidgetComponentProps } from "../definition";
+import { HomarrDataTable } from "../common/homarr-data-table";
+import { usePersistedTableLayout, useTableLayoutPersistence } from "../common/use-persisted-table-layout";
+
+type DockerContainer = RouterOutputs["docker"]["getContainers"]["containers"][number];
+type ContainerAction = "start" | "stop" | "restart" | "remove";
+
+interface ContextMenuState {
+  x: number;
+  y: number;
+  container: DockerContainer;
+}
+
+interface ContainerActionHandlers {
+  onAction: (action: ContainerAction, container: DockerContainer) => void;
+  onAddToHomarr: (container: DockerContainer) => void;
+  onOpenLogs: (container: DockerContainer) => void;
+}
+
+const columnAccessors = ["name", "state", "host", "cpuUsage", "memoryUsage", "actions"] as const;
+const containerMenuWidth = 240;
+
+const createContainerLogsPath = (container: Pick<DockerContainer, "id" | "name">) =>
+  `/manage/tools/docker/logs/${container.id}?name=${encodeURIComponent(container.name)}`;

 const ContainerStateBadge = ({ state }: { state: ContainerState }) => {
  const t = useScopedI18n("docker.field.state.option");
@@ -28,276 +63,293 @@ const ContainerStateBadge = ({ state }: { state: ContainerState }) => {
  );
 };

-const actionIconIconStyle: IconProps["style"] = {
-  height: "var(--ai-icon-size)",
-  width: "var(--ai-icon-size)",
-};
-
 const createColumns = (
  t: ReturnType<typeof useScopedI18n<"docker">>,
-): MRT_ColumnDef<RouterOutputs["docker"]["getContainers"]["containers"][number]>[] => [
+  handlers: ContainerActionHandlers,
+  sortingEnabled: boolean,
+): DataTableColumn<DockerContainer>[] => [
  {
-    id: "name",
-    accessorKey: "name",
-    header: t("field.name.label"),
-    Cell({ renderedCellValue, row }) {
-      return (
-        <Group gap="xs" wrap="nowrap">
-          <Avatar variant="outline" size={20} src={row.original.iconUrl} />
-          <Text p="0.5" size="sm" style={{ overflow: "hidden", textOverflow: "ellipsis" }}>
-            {renderedCellValue}
-          </Text>
-        </Group>
-      );
-    },
-  },
-  {
-    id: "state",
-    accessorKey: "state",
-    size: 100,
-    header: t("field.state.label"),
-    Cell({ row }) {
-      return <ContainerStateBadge state={row.original.state} />;
-    },
-  },
-  {
-    id: "host",
-    accessorKey: "host",
-    size: 100,
-    header: t("field.host.label"),
-    Cell({ row }) {
-      return (
-        <Text size="xs" truncate="end">
-          {row.original.host}
+    accessor: "name",
+    title: t("field.name.label"),
+    width: 180,
+    ellipsis: true,
+    sortable: sortingEnabled,
+    render: (container) => (
+      <Group gap="xs" wrap="nowrap" style={{ overflow: "hidden" }}>
+        <Avatar
+          variant="outline"
+          radius="sm"
+          size={20}
+          styles={{ image: { objectFit: "contain" } }}
+          src={container.iconUrl}
+          style={{ flexShrink: 0 }}
+        >
+          {container.name.at(0)?.toUpperCase()}
+        </Avatar>
+        <Text size="sm" truncate>
+          {container.name}
        </Text>
-      );
-    },
+      </Group>
+    ),
  },
  {
-    id: "cpuUsage",
-    sortingFn: (rowA, rowB) => {
-      const cpuUsageA = safeValue(rowA.original.cpuUsage);
-      const cpuUsageB = safeValue(rowB.original.cpuUsage);
-
-      return cpuUsageA - cpuUsageB;
-    },
-    accessorKey: "cpuUsage",
-    size: 80,
-    header: t("field.stats.cpu.label"),
-    Cell({ row }) {
-      const cpuUsage = safeValue(row.original.cpuUsage);
-
+    accessor: "state",
+    title: t("field.state.label"),
+    width: 100,
+    sortable: sortingEnabled,
+    render: (container) => <ContainerStateBadge state={container.state} />,
+  },
+  {
+    accessor: "host",
+    title: t("field.host.label"),
+    width: 120,
+    sortable: sortingEnabled,
+    ellipsis: true,
+    render: (container) => (
+      <Text size="xs" truncate title={container.host}>
+        {container.host}
+      </Text>
+    ),
+  },
+  {
+    accessor: "cpuUsage",
+    title: t("field.stats.cpu.label"),
+    width: 80,
+    sortable: sortingEnabled,
+    render: (container) => {
+      const cpuUsage = safeValue(container.cpuUsage);
      return (
-        <Text size="xs" c={cpuUsageColor(cpuUsage, row.original.state)}>
+        <Text size="xs" c={cpuUsageColor(cpuUsage, container.state)}>
          {cpuUsage.toFixed(2)}%
        </Text>
      );
    },
  },
  {
-    id: "memoryUsage",
-    sortingFn: (rowA, rowB) => {
-      const memoryUsageA = safeValue(rowA.original.memoryUsage);
-      const memoryUsageB = safeValue(rowB.original.memoryUsage);
-
-      return memoryUsageA - memoryUsageB;
-    },
-    accessorKey: "memoryUsage",
-    size: 80,
-    header: t("field.stats.memory.label"),
-    Cell({ row }) {
-      const bytesUsage = safeValue(row.original.memoryUsage);
-
+    accessor: "memoryUsage",
+    title: t("field.stats.memory.label"),
+    width: 100,
+    sortable: sortingEnabled,
+    render: (container) => {
+      const memoryUsage = safeValue(container.memoryUsage);
      return (
-        <Text size="xs" c={memoryUsageColor(bytesUsage, row.original.state)}>
-          {formatBytes(bytesUsage)}
+        <Text size="xs" c={memoryUsageColor(memoryUsage, container.state)}>
+          {formatBytes(memoryUsage)}
        </Text>
      );
    },
  },
  {
-    id: "actions",
-    accessorKey: "actions",
-    size: 80,
-    header: t("action.title"),
-    enableSorting: false,
-    Cell({ row }) {
-      const utils = clientApi.useUtils();
-      // eslint-disable-next-line no-restricted-syntax
-      const onSettled = async () => {
-        await utils.docker.getContainers.invalidate();
-      };
-      const { mutateAsync: startContainer } = clientApi.docker.startAll.useMutation({ onSettled });
-      const { mutateAsync: stopContainer } = clientApi.docker.stopAll.useMutation({ onSettled });
-      const { mutateAsync: restartContainer } = clientApi.docker.restartAll.useMutation({ onSettled });
-
-      const handleActionAsync = async (action: "start" | "stop" | "restart") => {
-        const mutation = action === "start" ? startContainer : action === "stop" ? stopContainer : restartContainer;
-
-        await mutation(
-          { ids: [row.original.id] },
-          {
-            onSuccess() {
-              showSuccessNotification({
-                title: t(`action.${action}.notification.success.title`),
-                message: t(`action.${action}.notification.success.message`),
-              });
-            },
-            onError() {
-              showErrorNotification({
-                title: t(`action.${action}.notification.error.title`),
-                message: t(`action.${action}.notification.error.message`),
-              });
-            },
-          },
-        );
-      };
-
-      return (
-        <Group wrap="nowrap" gap="xs">
-          <Tooltip label={row.original.state === "running" ? t("action.stop.label") : t("action.start.label")}>
-            <ActionIcon
-              variant="subtle"
-              size="xs"
-              radius="100%"
-              onClick={() => handleActionAsync(row.original.state === "running" ? "stop" : "start")}
-            >
-              {row.original.state === "running" ? (
-                <IconPlayerStop style={actionIconIconStyle} />
-              ) : (
-                <IconPlayerPlay style={actionIconIconStyle} />
-              )}
-            </ActionIcon>
-          </Tooltip>
-          <Tooltip label={t("action.restart.label")}>
-            <ActionIcon variant="subtle" size="xs" radius="100%" onClick={() => handleActionAsync("restart")}>
-              <IconRotateClockwise style={actionIconIconStyle} />
-            </ActionIcon>
-          </Tooltip>
-        </Group>
-      );
-    },
+    accessor: "actions",
+    title: "",
+    width: 44,
+    textAlign: "right",
+    render: (container) => <ContainerMenuButton container={container} handlers={handlers} />,
  },
 ];

-export default function DockerWidget({ options, width, isEditMode }: WidgetComponentProps<"dockerContainers">) {
+const compareContainers = (
+  first: DockerContainer,
+  second: DockerContainer,
+  accessor: DataTableSortStatus<DockerContainer>["columnAccessor"],
+) => {
+  if (accessor === "cpuUsage") return safeValue(first.cpuUsage) - safeValue(second.cpuUsage);
+  if (accessor === "memoryUsage") return safeValue(first.memoryUsage) - safeValue(second.memoryUsage);
+
+  const firstValue = first[accessor as "name" | "state" | "host"];
+  const secondValue = second[accessor as "name" | "state" | "host"];
+  return String(firstValue ?? "").localeCompare(String(secondValue ?? ""));
+};
+
+const useContainerAction = (action: ContainerAction) => {
+  const t = useScopedI18n("docker.action");
+  const utils = clientApi.useUtils();
+
+  return clientApi.docker[`${action}All`].useMutation({
+    async onSettled() {
+      await utils.docker.getContainers.invalidate();
+    },
+    onSuccess() {
+      showSuccessNotification({
+        title: t(`${action}.notification.success.title`),
+        message: t(`${action}.notification.success.message`),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        title: t(`${action}.notification.error.title`),
+        message: t(`${action}.notification.error.message`),
+      });
+    },
+  });
+};
+
+export default function DockerWidget({
+  options,
+  width,
+  isEditMode,
+  boardId,
+  itemId,
+  setOptions,
+}: WidgetComponentProps<"dockerContainers">) {
  const t = useScopedI18n("docker");
+  const tWidget = useScopedI18n("widget.dockerContainers");
+  const { openModal } = useModalAction(AddDockerAppToHomarr);
+  const board = useOptionalBoard();
+  const { data: session } = useSession();
+  const hasChangeAccess = board ? constructBoardPermissions(board, session).hasChangeAccess : false;
  const isTiny = width <= 256;

  const { data, refetch, isFetching } = clientApi.docker.getContainers.useQuery();
-  const containers = data?.containers ?? [];
+  const containers = useMemo(() => data?.containers ?? [], [data?.containers]);
  const timestamp = useMemo(() => data?.timestamp ?? new Date(), [data?.timestamp]);
  const relativeTime = useTimeAgo(timestamp);

-  const totalContainers = containers.length;
+  const { mutate: startContainer } = useContainerAction("start");
+  const { mutate: stopContainer } = useContainerAction("stop");
+  const { mutate: restartContainer } = useContainerAction("restart");
+  const { mutate: removeContainer } = useContainerAction("remove");
+  const handleContainerAction = useCallback(
+    (action: ContainerAction, container: DockerContainer) => {
+      if (action === "start") startContainer({ ids: [container.id] });
+      else if (action === "stop") stopContainer({ ids: [container.id] });
+      else if (action === "restart") restartContainer({ ids: [container.id] });
+      else removeContainer({ ids: [container.id] });
+    },
+    [removeContainer, restartContainer, startContainer, stopContainer],
+  );
+  const handleOpenLogs = useCallback(
+    (container: DockerContainer) => window.location.assign(createContainerLogsPath(container)),
+    [],
+  );
+  const handleAddToHomarr = useCallback(
+    (container: DockerContainer) => openModal({ selectedContainers: [container] }),
+    [openModal],
+  );
+  const actionHandlers = useMemo<ContainerActionHandlers>(
+    () => ({
+      onAction: handleContainerAction,
+      onAddToHomarr: handleAddToHomarr,
+      onOpenLogs: handleOpenLogs,
+    }),
+    [handleAddToHomarr, handleContainerAction, handleOpenLogs],
+  );

-  const totals = useMemo(() => {
-    return containers.reduce(
-      (acc, container) => {
-        acc.cpu += safeValue(container.cpuUsage);
-        acc.memory += safeValue(container.memoryUsage);
-        return acc;
-      },
-      { cpu: 0, memory: 0 },
-    );
-  }, [containers]);
-
-  const columns = useMemo(() => createColumns(t), [t]);
-
-  const columnVisibility: MRT_VisibilityState = {
-    name: options.columns.includes("name"),
-    state: options.columns.includes("state"),
-    host: options.columns.includes("host"),
-    cpuUsage: options.columns.includes("cpuUsage"),
-    memoryUsage: options.columns.includes("memoryUsage"),
-    actions: options.columns.includes("actions"),
-  };
-
-  const table = useTranslatedMantineReactTable({
-    columns,
-    data: containers,
-    enablePagination: false,
-    enableTopToolbar: false,
-    enableBottomToolbar: false,
-    enableColumnActions: false,
-    enableSorting: options.enableRowSorting && !isEditMode,
-    enableStickyHeader: false,
-    enableColumnOrdering: false,
-    enableRowSelection: false,
-    enableFullScreenToggle: false,
-    enableGlobalFilter: false,
-    enableDensityToggle: false,
-    enableFilters: false,
-    enableHiding: false,
-    initialState: {
-      sorting: [{ id: options.defaultSort, desc: options.descendingDefaultSort }],
-      density: "xs",
-    },
-    state: {
-      columnVisibility,
-    },
-    mantinePaperProps: {
-      flex: 1,
-      withBorder: false,
-      shadow: undefined,
-    },
-    mantineTableProps: {
-      className: "docker-widget-table",
-      style: {
-        tableLayout: "fixed",
-      },
-    },
-    mantineTableHeadProps: {
-      fz: "xs",
-    },
-    mantineTableHeadCellProps: {
-      p: 4,
-    },
-    mantineTableBodyCellProps: {
-      p: 4,
-    },
-    mantineTableContainerProps: {
-      style: {
-        height: "100%",
-      },
-    },
+  const { mutate: saveItemOptions } = clientApi.widget.options.saveItemOptions.useMutation({
+    onError: () =>
+      showErrorNotification({
+        title: tWidget("error.layoutSaveTitle"),
+        message: tWidget("error.layoutSaveMessage"),
+      }),
+  });
+  const persistLayout = useTableLayoutPersistence({
+    boardId,
+    hasChangeAccess,
+    itemId,
+    saveItemOptions,
+    setOptions,
  });

-  if (options.columns.length === 0)
+  const defaultDirection = options.descendingDefaultSort ? "desc" : "asc";
+  const [sortStatus, setSortStatus] = useState<DataTableSortStatus<DockerContainer>>({
+    columnAccessor: options.defaultSort,
+    direction: defaultDirection,
+  });
+  useEffect(() => {
+    setSortStatus({ columnAccessor: options.defaultSort, direction: defaultDirection });
+  }, [defaultDirection, options.defaultSort]);
+
+  const sortedContainers = useMemo(() => {
+    const multiplier = sortStatus.direction === "desc" ? -1 : 1;
+    return [...containers].toSorted(
+      (first, second) => compareContainers(first, second, sortStatus.columnAccessor) * multiplier,
+    );
+  }, [containers, sortStatus]);
+
+  const totals = useMemo(
+    () =>
+      containers.reduce(
+        (acc, container) => {
+          acc.cpu += safeValue(container.cpuUsage);
+          acc.memory += safeValue(container.memoryUsage);
+          return acc;
+        },
+        { cpu: 0, memory: 0 },
+      ),
+    [containers],
+  );
+
+  const selectedColumns = useMemo(() => new Set<string>(options.columns), [options.columns]);
+  const columns = useMemo(() => {
+    const sortingEnabled = options.enableRowSorting && !isEditMode;
+    return createColumns(t, actionHandlers, sortingEnabled).filter(({ accessor }) =>
+      selectedColumns.has(String(accessor)),
+    );
+  }, [actionHandlers, isEditMode, options.enableRowSorting, selectedColumns, t]);
+  const { effectiveColumns, storeKey } = usePersistedTableLayout({
+    columns,
+    columnAccessors,
+    columnOrder: options.columnOrder,
+    columnWidths: options.columnWidths,
+    itemId,
+    storeKeyPrefix: "docker-containers",
+    onLayoutChange: persistLayout,
+  });
+
+  const [contextMenu, setContextMenu] = useState<ContextMenuState | null>(null);
+  const closeContextMenu = useCallback(() => setContextMenu(null), []);
+  const handleContextMenu = useCallback(({ record, event }: { record: DockerContainer; event: React.MouseEvent }) => {
+    event.preventDefault();
+    setContextMenu({ x: event.clientX, y: event.clientY, container: record });
+  }, []);
+
+  if (options.columns.length === 0) {
    return (
      <Center h="100%">
        <Text>{t("error.noColumns")}</Text>
      </Center>
    );
+  }

  return (
-    <Stack gap={0} h="100%" display="flex">
-      <MantineReactTable table={table} />
+    <Stack gap={0} h="100%" style={{ overflow: "hidden" }}>
+      <Box style={{ flex: 1, minHeight: 0 }}>
+        <HomarrDataTable
+          isEditMode={isEditMode}
+          cellPadding={width < 400 ? "2px 8px" : "4px 8px"}
+          rowCursor="default"
+          fetching={isFetching && containers.length === 0}
+          fz={width < 400 ? "xs" : "sm"}
+          records={sortedContainers}
+          noRecordsText={tWidget("empty.noContainers")}
+          columns={effectiveColumns}
+          storeColumnsKey={storeKey}
+          sortStatus={sortStatus}
+          onSortStatusChange={options.enableRowSorting && !isEditMode ? setSortStatus : undefined}
+          idAccessor="id"
+          onRowContextMenu={isEditMode ? undefined : handleContextMenu}
+          onScroll={() => {
+            if (contextMenu) closeContextMenu();
+          }}
+        />
+      </Box>

      {!isTiny && (
-        <Group
-          justify="space-between"
-          style={{
-            borderTop: "0.0625rem solid var(--border-color)",
-          }}
-          p={4}
-        >
+        <Group justify="space-between" style={{ borderTop: "0.0625rem solid var(--border-color)" }} p={4} wrap="nowrap">
          <Group gap={4} wrap="nowrap">
            <IconBrandDocker size={20} style={{ flexShrink: 0 }} />
-            <Text size="sm" truncate="end">
-              {t("table.footer", { count: totalContainers.toString() })}
+            <Text size="sm" truncate>
+              {t("table.footer", { count: containers.length.toString() })}
            </Text>
          </Group>

-          <Group gap="sm" wrap="wrap" justify="flex-end" style={{ flex: 1, minWidth: 0 }}>
+          <Group gap="sm" wrap="nowrap" justify="flex-end" style={{ minWidth: 0 }}>
            <Text size="sm" style={{ whiteSpace: "nowrap" }}>
              {t("table.totalCpu", { cpu: totals.cpu.toFixed(2) })}
            </Text>
-
            <Text size="sm" style={{ whiteSpace: "nowrap" }}>
              {t("table.totalMemory", { memory: formatBytes(totals.memory) })}
            </Text>
-
            <Tooltip label={t("table.refresh.lastUpdated", { when: relativeTime })}>
              <ActionIcon
                size="sm"
@@ -307,12 +359,161 @@ export default function DockerWidget({ options, width, isEditMode }: WidgetCompo
                onClick={() => void refetch()}
                aria-label={t("table.refresh.lastUpdated", { when: relativeTime })}
              >
-                <IconRefresh style={actionIconIconStyle} />
+                <IconRefresh size={16} />
              </ActionIcon>
            </Tooltip>
          </Group>
        </Group>
      )}
+
+      {contextMenu && <ContainerContextMenu state={contextMenu} handlers={actionHandlers} onClose={closeContextMenu} />}
    </Stack>
  );
 }
+
+function ContainerMenuButton({
+  container,
+  handlers,
+}: {
+  container: DockerContainer;
+  handlers: ContainerActionHandlers;
+}) {
+  const t = useScopedI18n("docker.action");
+  const [opened, setOpened] = useState(false);
+  const close = () => setOpened(false);
+
+  return (
+    <Menu opened={opened} onChange={setOpened} closeOnItemClick={false} withinPortal position="bottom-end" shadow="sm">
+      <Menu.Target>
+        <ActionIcon
+          variant="subtle"
+          color="gray"
+          size="sm"
+          aria-label={t("title")}
+          onClick={(event) => event.stopPropagation()}
+        >
+          <IconDots size={16} />
+        </ActionIcon>
+      </Menu.Target>
+      <Menu.Dropdown w={containerMenuWidth} miw={containerMenuWidth} maw={containerMenuWidth}>
+        <ContainerActionItems container={container} handlers={handlers} onClose={close} />
+      </Menu.Dropdown>
+    </Menu>
+  );
+}
+
+function ContainerActionItems({
+  container,
+  handlers,
+  onClose,
+}: {
+  container: DockerContainer;
+  handlers: ContainerActionHandlers;
+  onClose: () => void;
+}) {
+  const t = useScopedI18n("docker.action");
+  const [confirmRemove, setConfirmRemove] = useState(false);
+  const stateAction = container.state === "running" ? "stop" : "start";
+  const StateIcon = stateAction === "stop" ? IconPlayerStop : IconPlayerPlay;
+
+  const invokeAction = (action: ContainerAction) => {
+    handlers.onAction(action, container);
+    onClose();
+  };
+
+  return (
+    <>
+      <Menu.Label title={container.name} style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
+        {container.name}
+      </Menu.Label>
+      <Menu.Item
+        leftSection={<IconFileText size={14} />}
+        onClick={() => {
+          handlers.onOpenLogs(container);
+          onClose();
+        }}
+      >
+        {t("logs.label")}
+      </Menu.Item>
+      <Menu.Divider />
+      <Menu.Item
+        color={stateAction === "start" ? "green" : "red"}
+        leftSection={<StateIcon size={14} />}
+        onClick={() => invokeAction(stateAction)}
+      >
+        {t(`${stateAction}.label`)}
+      </Menu.Item>
+      <Menu.Item color="orange" leftSection={<IconRotateClockwise size={14} />} onClick={() => invokeAction("restart")}>
+        {t("restart.label")}
+      </Menu.Item>
+      {!confirmRemove ? (
+        <Menu.Item color="red" leftSection={<IconTrash size={14} />} onClick={() => setConfirmRemove(true)}>
+          {t("remove.label")}
+        </Menu.Item>
+      ) : (
+        <Menu.Item color="red" leftSection={<IconTrash size={14} />} onClick={() => invokeAction("remove")}>
+          {t("remove.confirm")}
+        </Menu.Item>
+      )}
+      <Menu.Divider />
+      <Menu.Item
+        leftSection={<IconCategoryPlus size={14} />}
+        onClick={() => {
+          handlers.onAddToHomarr(container);
+          onClose();
+        }}
+      >
+        {t("addToHomarr.label")}
+      </Menu.Item>
+    </>
+  );
+}
+
+function ContainerContextMenu({
+  state,
+  handlers,
+  onClose,
+}: {
+  state: ContextMenuState;
+  handlers: ContainerActionHandlers;
+  onClose: () => void;
+}) {
+  return (
+    <Portal>
+      <Box
+        pos="fixed"
+        top={0}
+        left={0}
+        w="100vw"
+        h="100vh"
+        style={{ zIndex: 1000 }}
+        onClick={onClose}
+        onContextMenu={(event) => {
+          event.preventDefault();
+          onClose();
+        }}
+      >
+        <Menu
+          opened
+          shadow="md"
+          position="bottom-start"
+          withinPortal={false}
+          closeOnItemClick={false}
+          onClose={onClose}
+        >
+          <Menu.Target>
+            <Box pos="fixed" style={{ left: state.x, top: state.y, width: 1, height: 1 }} />
+          </Menu.Target>
+          <Menu.Dropdown
+            w={containerMenuWidth}
+            miw={containerMenuWidth}
+            maw={containerMenuWidth}
+            onClick={(event) => event.stopPropagation()}
+          >
+            <ContainerActionItems container={state.container} handlers={handlers} onClose={onClose} />
+          </Menu.Dropdown>
+        </Menu>
+      </Box>
+    </Portal>
+  );
+}
@@ -27,29 +27,37 @@ export const { definition, componentLoader } = createWidgetDefinition("dockerCon
  icon: IconBrandDocker,
  queryKey: [["docker", "getContainers"]],
  createOptions() {
-    return optionsBuilder.from((factory) => ({
-      columns: factory.multiSelect({
-        defaultValue: [...allColumnsList],
-        options: allColumnsList.map((value) => ({
-          value,
-          label: (t) => t(columnTranslationKeyMap[value]),
-        })),
-        searchable: true,
+    return optionsBuilder.from(
+      (factory) => ({
+        columns: factory.multiSelect({
+          defaultValue: [...allColumnsList],
+          options: allColumnsList.map((value) => ({
+            value,
+            label: (t) => t(columnTranslationKeyMap[value]),
+          })),
+          searchable: true,
+        }),
+        enableRowSorting: factory.switch({
+          defaultValue: false,
+        }),
+        defaultSort: factory.select({
+          defaultValue: "name",
+          options: columnsList.map((value) => ({
+            value,
+            label: (t) => t(`widget.dockerContainers.option.defaultSort.option.${value}`),
+          })),
+        }),
+        descendingDefaultSort: factory.switch({
+          defaultValue: false,
+        }),
+        columnOrder: factory.text({ defaultValue: "" }),
+        columnWidths: factory.text({ defaultValue: "" }),
      }),
-      enableRowSorting: factory.switch({
-        defaultValue: false,
-      }),
-      defaultSort: factory.select({
-        defaultValue: "name",
-        options: columnsList.map((value) => ({
-          value,
-          label: (t) => t(`widget.dockerContainers.option.defaultSort.option.${value}`),
-        })),
-      }),
-      descendingDefaultSort: factory.switch({
-        defaultValue: false,
-      }),
-    }));
+      {
+        columnOrder: { shouldHide: () => true },
+        columnWidths: { shouldHide: () => true },
+      },
+    );
  },
  errors: {
    INTERNAL_SERVER_ERROR: {
@@ -3,7 +3,7 @@
 import "../widgets-common.css";
 import "./styles.css";

-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import {
  ActionIcon,
  Avatar,
@@ -41,10 +41,11 @@ import {
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
 import type { DataTableColumn, DataTableSortStatus } from "mantine-datatable";
-import { DataTable, useDataTableColumns } from "mantine-datatable";

 import { clientApi } from "@homarr/api/client";
-import { useIntegrationsWithInteractAccess } from "@homarr/auth/client";
+import { useIntegrationsWithInteractAccess, useSession } from "@homarr/auth/client";
+import { constructBoardPermissions } from "@homarr/auth/shared";
+import { useOptionalBoard } from "@homarr/boards/context";
 import { formatByteRate, formatBytes, useIntegrationConnected } from "@homarr/common";
 import { getIconUrl, getIntegrationKindsByCategory } from "@homarr/definitions";
 import type { ExtendedClientStatus, ExtendedDownloadClientItem } from "@homarr/integrations";
@@ -52,6 +53,8 @@ import { showErrorNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";

 import type { WidgetComponentProps } from "../definition";
+import { HomarrDataTable } from "../common/homarr-data-table";
+import { usePersistedTableLayout, useTableLayoutPersistence } from "../common/use-persisted-table-layout";

 dayjs.extend(relativeTime);

@@ -162,14 +165,23 @@ function progressColor(state: DownloadState, progress: number): string {
  return "blue";
 }

-function parseJsonOption<T>(value: string | undefined, fallback: T): T {
-  if (!value) return fallback;
-  try {
-    return JSON.parse(value) as T;
-  } catch {
-    return fallback;
-  }
-}
+const columnAccessors = [
+  "name",
+  "progress",
+  "size",
+  "downSpeed",
+  "upSpeed",
+  "time",
+  "state",
+  "added",
+  "ratio",
+  "received",
+  "sent",
+  "category",
+  "integration",
+  "index",
+  "type",
+] as const;

 function toCategoryArray(category: string | string[]): string[] {
  if (Array.isArray(category)) return category;
@@ -288,6 +300,9 @@ export default function DownloadClientsWidget({
  width,
 }: WidgetComponentProps<"downloads">) {
  const allInteractAccess = useIntegrationsWithInteractAccess();
+  const board = useOptionalBoard();
+  const { data: session } = useSession();
+  const hasChangeAccess = board ? constructBoardPermissions(board, session).hasChangeAccess : false;
  const integrationInteractSet = useMemo(
    () => new Set(allInteractAccess.filter(({ id }) => integrationIds.includes(id)).map(({ id }) => id)),
    [allInteractAccess, integrationIds],
@@ -323,19 +338,13 @@ export default function DownloadClientsWidget({
  const { mutate: saveItemOptions } = clientApi.widget.options.saveItemOptions.useMutation({
    onError: () => showErrorNotification({ title: t("errors.actionFailed"), message: t("errors.actionFailedMessage") }),
  });
-  const persistOption = useCallback(
-    (newOptions: Partial<Record<string, string>>) => {
-      setOptions({ newOptions });
-      if (boardId && itemId) saveItemOptions({ boardId, itemId, newOptions });
-    },
-    [setOptions, boardId, itemId, saveItemOptions],
-  );
-
-  const savedOrder = useMemo(() => parseJsonOption(options.columnOrder, [] as string[]), [options.columnOrder]);
-  const savedWidths = useMemo(
-    () => parseJsonOption(options.columnWidths, {} as Record<string, number>),
-    [options.columnWidths],
-  );
+  const persistOption = useTableLayoutPersistence({
+    boardId,
+    hasChangeAccess,
+    itemId,
+    saveItemOptions,
+    setOptions,
+  });

  let defaultSortDirection: DataTableSortStatus<ExtendedDownloadClientItem>["direction"] = "asc";
  if (options.descendingDefaultSort) defaultSortDirection = "desc";
@@ -659,54 +668,15 @@ export default function DownloadClientsWidget({
    return cols.filter(Boolean) as DataTableColumn<ExtendedDownloadClientItem>[];
  }, [columnContext, t, size, progressColumnWidth]);

-  const storeKey = `downloads-${itemId ?? "preview"}-${[...options.columns].toSorted().join(",")}`;
-  const { effectiveColumns, columnsOrder, columnsWidth, setColumnsOrder, setMultipleColumnWidths } =
-    useDataTableColumns<ExtendedDownloadClientItem>({
-      key: storeKey,
-      columns,
-    });
-
-  const lastStoreKey = useRef(storeKey);
-  const hydrated = useRef(false);
-  useEffect(() => {
-    if (lastStoreKey.current !== storeKey) {
-      lastStoreKey.current = storeKey;
-      hydrated.current = false;
-    }
-    if (hydrated.current) return;
-    if (savedOrder.length > 0) setColumnsOrder(savedOrder);
-    if (Object.keys(savedWidths).length > 0) {
-      setMultipleColumnWidths(Object.entries(savedWidths).map(([accessor, w]) => ({ accessor, width: w })));
-    }
-    // ponytail: defer hydrated flag so the persist effect skips the restore echo
-    requestAnimationFrame(() => {
-      hydrated.current = true;
-    });
-  }, [storeKey, savedOrder, savedWidths, setColumnsOrder, setMultipleColumnWidths]);
-
-  const prevOrder = useRef(columnsOrder);
-  const prevWidths = useRef(columnsWidth);
-  useEffect(() => {
-    if (!hydrated.current) return;
-    const orderChanged = JSON.stringify(columnsOrder) !== JSON.stringify(prevOrder.current);
-    const widthsChanged = JSON.stringify(columnsWidth) !== JSON.stringify(prevWidths.current);
-    prevOrder.current = columnsOrder;
-    prevWidths.current = columnsWidth;
-
-    if (!orderChanged && !widthsChanged) return;
-    if (orderChanged) persistOption({ columnOrder: JSON.stringify(columnsOrder) });
-    if (widthsChanged) {
-      const widthMap: Record<string, number> = {};
-      for (const entry of columnsWidth) {
-        const key = Object.keys(entry)[0];
-        if (!key) continue;
-        const w = entry[key as keyof typeof entry];
-        if (typeof w === "number") widthMap[key] = w;
-        else if (typeof w === "string" && w.endsWith("px")) widthMap[key] = parseInt(w, 10);
-      }
-      persistOption({ columnWidths: JSON.stringify(widthMap) });
-    }
-  }, [columnsOrder, columnsWidth, persistOption]);
+  const { effectiveColumns, storeKey } = usePersistedTableLayout({
+    columns,
+    columnAccessors,
+    columnOrder: options.columnOrder,
+    columnWidths: options.columnWidths,
+    itemId,
+    storeKeyPrefix: "downloads",
+    onLayoutChange: persistOption,
+  });

  const handleContextMenu = useCallback(
    ({ record, event }: { record: ExtendedDownloadClientItem; event: React.MouseEvent }) => {
@@ -761,9 +731,6 @@ export default function DownloadClientsWidget({
    );
  }

-  let tablePointerEvents: React.CSSProperties["pointerEvents"];
-  if (isEditMode) tablePointerEvents = "none";
-
  let rowContextMenuHandler: typeof handleContextMenu | undefined = handleContextMenu;
  if (isEditMode) rowContextMenuHandler = undefined;

@@ -781,35 +748,19 @@ export default function DownloadClientsWidget({
      )}

      <Box style={{ flex: 1, minHeight: 0, position: "relative" }}>
-        <DataTable
-          style={{ pointerEvents: tablePointerEvents }}
-          withTableBorder={false}
-          borderRadius={0}
-          highlightOnHover
-          striped="odd"
-          stripedColor={{ dark: "dark.7", light: "gray.0" }}
-          highlightOnHoverColor={{ dark: "dark.5", light: "gray.1" }}
-          verticalAlign="center"
+        <HomarrDataTable
+          isEditMode={isEditMode}
+          cellPadding={`${size.cellPadding}px 8px`}
          fetching={isFetching && currentItems.length === 0}
-          loaderBackgroundBlur={2}
          fz={size.fontSize}
          records={sortedData}
          columns={effectiveColumns}
          storeColumnsKey={storeKey}
-          textSelectionDisabled
          sortStatus={sortStatus}
          onSortStatusChange={setSortStatus}
          noRecordsText={t("errors.noItems")}
          idAccessor={(record) => `${record.integration.id}:${record.id}`}
-          height="100%"
          className="downloads-table"
-          defaultColumnProps={{
-            noWrap: true,
-            draggable: true,
-            resizable: true,
-            cellsStyle: () => ({ padding: `${size.cellPadding}px 8px` }),
-          }}
-          scrollAreaProps={{ type: "auto", scrollbarSize: 6 }}
          customRowAttributes={(_, index) => ({ "data-row-index": index })}
          onRowContextMenu={rowContextMenuHandler}
          rowBackgroundColor={(record) => rowBgAlpha[record.state]}
@@ -1,51 +1,3 @@
-/* Make the DataTable transparent so the board card's opacity-controlled
-   background shows through. The mantine-datatable defaults to
-   var(--mantine-color-body) which is opaque. */
-.downloads-table,
-.downloads-table .mantine-datatable-table,
-.downloads-table .mantine-datatable-table thead,
-.downloads-table .mantine-datatable-table tbody,
-.downloads-table .mantine-datatable-table tfoot,
-.downloads-table th,
-.downloads-table td {
-  background-color: transparent !important;
-}
-
-.downloads-table .mantine-datatable-table tr {
-  background-color: transparent;
-}
-
-.downloads-table .mantine-datatable-table tbody tr:hover {
-  background-color: color-mix(in srgb, var(--mantine-color-default-hover) 40%, transparent) !important;
-}
-
-.downloads-table th {
-  white-space: nowrap;
-  background-color: color-mix(in srgb, var(--mantine-color-body) 60%, transparent) !important;
-  backdrop-filter: blur(8px);
-}
-
-.downloads-table td {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.downloads-table td .mantine-Text-root,
-.downloads-table td .mantine-Group-root {
-  white-space: nowrap;
-  flex-wrap: nowrap;
-}
-
-.downloads-table .mantine-datatable-header-cell-sortable-icon {
-  opacity: 0;
-  transition: opacity 150ms;
-}
-
-.downloads-table th:hover .mantine-datatable-header-cell-sortable-icon {
-  opacity: 1;
-}
-
 /* Row expansion styling */
 .downloads-table .mantine-datatable-row-expansion-cell {
  background-color: color-mix(in srgb, var(--mantine-color-body) 40%, transparent) !important;
@@ -26,6 +26,35 @@ import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";

 import type { WidgetComponentProps } from "../definition";

+type TranscodingDecision = NonNullable<
+  NonNullable<StreamSession["currentlyPlaying"]>["metadata"]
+>["transcoding"];
+
+type PlaybackStatus = "directPlay" | "directStream" | "transcodeVideo" | "transcodeAudio" | "transcoding";
+
+function getPlaybackStatus(transcoding: TranscodingDecision | undefined): PlaybackStatus {
+  if (!transcoding) return "directPlay";
+  const { isVideoDirect, isAudioDirect, containerChanged } = transcoding;
+
+  if (isVideoDirect && isAudioDirect) return containerChanged ? "directStream" : "directPlay";
+  if (!isVideoDirect && isAudioDirect) return "transcodeVideo";
+  if (isVideoDirect && !isAudioDirect) return "transcodeAudio";
+  return "transcoding";
+}
+
+const playbackStatusColorMap = {
+  directPlay: "green",
+  directStream: "teal",
+  transcodeVideo: "orange",
+  transcodeAudio: "yellow",
+  transcoding: "red",
+} satisfies Record<PlaybackStatus, string>;
+
+function formatBitrate(bitrateKbps: number | null | undefined): string | null {
+  if (!bitrateKbps || bitrateKbps <= 0) return null;
+  return bitrateKbps >= 1000 ? `${(bitrateKbps / 1000).toFixed(1)} Mbps` : `${Math.round(bitrateKbps)} kbps`;
+}
+
 export default function MediaServerWidget({ options, integrationIds }: WidgetComponentProps<"mediaServer">) {
  const { data: currentStreams = [] } = clientApi.widget.mediaServer.getCurrentStreams.useQuery({
    integrationIds,
@@ -122,23 +151,30 @@ export default function MediaServerWidget({ options, integrationIds }: WidgetCom
          const currentlyPlaying = row.original.currentlyPlaying;
          if (!currentlyPlaying) return null;

-          const isTranscoding = Boolean(
-            currentlyPlaying.metadata?.transcoding.target.videoCodec ??
-              currentlyPlaying.metadata?.transcoding.target.audioCodec ??
-              currentlyPlaying.metadata?.transcoding.container,
-          );
+          const status = getPlaybackStatus(currentlyPlaying.metadata?.transcoding);
+          const bitrateLabel = formatBitrate(currentlyPlaying.metadata?.bitrateKbps);

          return (
            <Stack gap={4} align="flex-start">
-              <Badge size="xs" variant="light" color={isTranscoding ? "orange" : "green"}>
-                {isTranscoding ? t("items.transcoding") : t("items.directPlay")}
+              <Badge size="xs" variant="light" color={playbackStatusColorMap[status]}>
+                {t(`items.${status}` as never)}
              </Badge>
-              {currentlyPlaying.location && (
-                <Group gap={4} align="center">
-                  {currentlyPlaying.location === "lan" ? <IconWifi size={12} /> : <IconWorld size={12} />}
-                  <Text size="10px" c="dimmed" tt="uppercase">
-                    {currentlyPlaying.location}
-                  </Text>
+              {(currentlyPlaying.location ?? bitrateLabel) && (
+                <Group gap={4} align="center" justify="space-between" wrap="nowrap" w="100%">
+                  <Group gap={4} align="center">
+                    {currentlyPlaying.location &&
+                      (currentlyPlaying.location === "lan" ? <IconWifi size={12} /> : <IconWorld size={12} />)}
+                    {currentlyPlaying.location && (
+                      <Text size="10px" c="dimmed" tt="uppercase">
+                        {currentlyPlaying.location}
+                      </Text>
+                    )}
+                  </Group>
+                  {bitrateLabel && (
+                    <Text size="10px" c="dimmed">
+                      {bitrateLabel}
+                    </Text>
+                  )}
                </Group>
              )}
            </Stack>
@@ -238,6 +274,12 @@ export default function MediaServerWidget({ options, integrationIds }: WidgetCom
    };
  });

+  const totalBitrateKbps = flatSessions.reduce(
+    (sum, session) => sum + (session.currentlyPlaying?.metadata?.bitrateKbps ?? 0),
+    0,
+  );
+  const totalBitrateLabel = options.showBitrate ? formatBitrate(totalBitrateKbps) : null;
+
  return (
    <Stack gap={0} h="100%" display="flex">
      <MantineReactTable table={table} />
@@ -246,19 +288,34 @@ export default function MediaServerWidget({ options, integrationIds }: WidgetCom
        h={30}
        px="xs"
        pr="md"
-        justify="flex-end"
+        justify="space-between"
        style={{
          borderTop: "1px solid var(--border-color)",
        }}
      >
-        {uniqueIntegrations.map((integration) => (
-          <Group key={integration.integrationKind} gap="xs" align="center">
-            <Avatar className="media-server-icon" src={integration.integrationIcon} radius={"xs"} size="xs" />
-            <Text className="media-server-name" size="sm">
-              {integration.integrationName}
+        <Group gap={4} wrap="nowrap">
+          <IconVideo size={16} style={{ flexShrink: 0 }} />
+          <Text size="sm" style={{ whiteSpace: "nowrap" }}>
+            {(t as unknown as (key: string, params?: { count: number }) => string)("footer.streams", {
+              count: flatSessions.length,
+            })}
+          </Text>
+          {totalBitrateLabel && (
+            <Text size="sm" c="dimmed" style={{ whiteSpace: "nowrap" }}>
+              {t("footer.totalBitrate", { bitrate: totalBitrateLabel })}
            </Text>
-          </Group>
-        ))}
+          )}
+        </Group>
+        <Group gap="xs">
+          {uniqueIntegrations.map((integration) => (
+            <Group key={integration.integrationKind} gap="xs" align="center">
+              <Avatar className="media-server-icon" src={integration.integrationIcon} radius={"xs"} size="xs" />
+              <Text className="media-server-name" size="sm">
+                {integration.integrationName}
+              </Text>
+            </Group>
+          ))}
+        </Group>
      </Group>
    </Stack>
  );
@@ -11,6 +11,8 @@ export const { componentLoader, definition } = createWidgetDefinition("mediaServ
  createOptions() {
    return optionsBuilder.from((factory) => ({
      showOnlyPlaying: factory.switch({ defaultValue: true, withDescription: true }),
+      showBitrate: factory.switch({ defaultValue: true, withDescription: true }),
+      showLocation: factory.switch({ defaultValue: true, withDescription: true }),
    }));
  },
  supportedIntegrations: getIntegrationKindsByCategory("mediaService"),
@@ -0,0 +1,103 @@
+# Homarr Developer CLI
+
+Build and launch local Homarr images and GHCR pull-request builds, then manage them from responsive terminal dashboards.
+
+## Requirements
+
+- Docker or OrbStack
+- Go 1.25+ to build from source
+- GitHub CLI authenticated with `gh auth login` for pull-request features
+
+## Setup
+
+```sh
+pnpm install
+```
+
+Create `.env` from `.env.example` and set `DB_URL` to an absolute path for the SQLite file before running the migration. In a POSIX shell, use `cp .env.example .env`; in PowerShell, use `Copy-Item .env.example .env`.
+Then run `pnpm db:migration:sqlite:run` to create or update the database. The migration command also seeds a new database. Use `pnpm db:seed` explicitly when you need to seed an existing database. Start Redis separately with `pnpm docker:dev:up` when it is needed.
+The examples below use `pnpm dev:cli -- ...`, which works from POSIX shells and PowerShell. If you prefer a global command, install it with `pnpm dev:cli:install` and add your Go bin directory to `PATH`.
+
+## Build
+
+```sh
+pnpm dev:cli -- build feature
+pnpm dev:cli -- build --pr 6441
+pnpm dev:cli -- rebuild feature
+```
+
+Checkout builds are tagged as `homarr:<name>`. The source checkout and revision are recorded on the image so `homarr rebuild` and the development dashboard can rebuild it later. PR builds use a temporary checkout and default to `homarr:pr-<number>`.
+
+## Launch
+
+```sh
+pnpm dev:cli -- run dev
+pnpm dev:cli -- run --detach dev
+pnpm dev:cli -- run --pr 6441
+pnpm dev:cli -- run --pr 6441 --demo
+pnpm dev:cli -- run --env FOO=bar --env FEATURE=true dev
+```
+
+PR launches always pull the latest GHCR tag before starting. Local tags remain local.
+The first launch generates a per-user encryption key in the OS config directory and reuses it for later launches. Set `HOMARR_DEV_SECRET_ENCRYPTION_KEY` to a 64-character hexadecimal key to override it.
+
+The command reference below assumes the optional `homarr` installation. Without it, prefix each command with `pnpm dev:cli --` (for example, `pnpm dev:cli -- dev`).
+
+## Commands
+
+```text
+homarr                     Interactive local and remote image browser
+homarr dev                 Explicit alias for the main browser
+homarr dash                Start on the instance dashboard
+homarr build <name>        Build this checkout as homarr:<name>
+homarr build --pr <number> Build a PR locally from a temporary checkout
+homarr rebuild <name>      Rebuild from recorded provenance
+homarr list                Script-friendly instance list
+homarr logs <container>    Follow logs
+homarr open <container>    Open in browser
+homarr stop <container>    Stop
+homarr restart <container> Restart
+homarr remove <container>  Force-remove
+homarr doctor              Check Docker and optional CLI integrations
+```
+
+## Development Browser
+
+```text
+/              Filter by PR number, title, author, branch, CI, image, state, or port
+↑/↓ or j/k     Select
+Enter or Space Start the matching local build, otherwise pull remote; stop when running
+R              Build a remote PR locally in the background or rebuild a local image
+p              Pull a remote PR image and redeploy, preserving port and volume
+m              Toggle demo mode for the next launch
+o              Open PR on GitHub
+a              Open running app
+l              Toggle inline logs for the selected running PR
+f              Follow or pause inline logs
+Page Up/Down   Scroll inline logs
+b              Show or hide bot PRs
+r              Refresh
+d              Switch to the instance dashboard
+q              Quit; during a pull, cancel it
+```
+
+Pull progress, layer completion, local build provenance, selected PR details, CI state, image availability, inline logs, and the final port remain inside the TUI.
+Local PR images are folded into their remote PR row only when the recorded revision exactly matches the current GitHub head SHA. They are marked `◆ local` and preferred by Enter; outdated builds remain separate local rows. Navigation and the `d` dashboard toggle remain available while a local build runs.
+
+## Instance Dashboard
+
+```text
+/              Filter by name, image, state, health, port, or URL
+↑/↓ or j/k     Select
+l              Toggle inline logs
+f              Follow or pause logs
+Page Up/Down   Scroll logs
+s              Stop
+R              Restart
+x              Remove with confirmation
+o              Open in browser
+c              Copy URL
+r              Refresh
+d              Switch to the development browser
+q              Quit
+```
@@ -0,0 +1,32 @@
+module github.com/homarr-labs/homarr/tools/homarr-dev
+
+go 1.25.0
+
+require (
+	charm.land/bubbles/v2 v2.1.1
+	charm.land/bubbletea/v2 v2.0.8
+	charm.land/lipgloss/v2 v2.0.5
+	github.com/atotto/clipboard v0.1.4
+	github.com/spf13/cobra v1.10.2
+)
+
+require (
+	github.com/charmbracelet/colorprofile v0.4.3 // indirect
+	github.com/charmbracelet/harmonica v0.2.0 // indirect
+	github.com/charmbracelet/ultraviolet v0.0.0-20260703014108-f5a850f9c2b7 // indirect
+	github.com/charmbracelet/x/ansi v0.11.7 // indirect
+	github.com/charmbracelet/x/term v0.2.2 // indirect
+	github.com/charmbracelet/x/termios v0.1.1 // indirect
+	github.com/charmbracelet/x/windows v0.2.2 // indirect
+	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
+	github.com/mattn/go-runewidth v0.0.24 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	golang.org/x/sync v0.21.0 // indirect
+	golang.org/x/sys v0.46.0 // indirect
+)
@@ -0,0 +1,56 @@
+charm.land/bubbles/v2 v2.1.1 h1:7r55WzBxpo/R3z98hGmY7KKPd3ET6vsf0Fb9sDHOV60=
+charm.land/bubbles/v2 v2.1.1/go.mod h1:GE6M31gaWZVXzGw73OeuTTgy4lX+OtkH0E5ymnNsHxo=
+charm.land/bubbletea/v2 v2.0.8 h1:SxTJMhCAI3lbPmy4SgX5LWZ24AdINr4I6UEqzZvYJuY=
+charm.land/bubbletea/v2 v2.0.8/go.mod h1:2SkdgoTXluXJHOUwAoRlRXF/28vklb1rFl6GcgV1/ss=
+charm.land/lipgloss/v2 v2.0.5 h1:kbNxgeeUOYv5J0YdpxFjfvf3dFvqH8Aci4zB6xqFtrY=
+charm.land/lipgloss/v2 v2.0.5/go.mod h1:9oqhxt4yxIMe6q5A4kHr44DremZk7J9UNh74GlWa5nc=
+github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
+github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
+github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o=
+github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=
+github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
+github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
+github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
+github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
+github.com/charmbracelet/ultraviolet v0.0.0-20260703014108-f5a850f9c2b7 h1:3FmWoGNWK4STvqg0O0Aeav2T7rodWJAPeF0QpH+8gFw=
+github.com/charmbracelet/ultraviolet v0.0.0-20260703014108-f5a850f9c2b7/go.mod h1:f/jRa757WUmaOZrbPspXymbg/GnbF+rwe4OLsG7aXYo=
+github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
+github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
+github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
+github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
+github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
+github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
+github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
+github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
+github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
+github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
+github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
+github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
+github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
+github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
+github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
+github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -0,0 +1,427 @@
+package docker
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const developmentEncryptionKeyEnv = "HOMARR_DEV_SECRET_ENCRYPTION_KEY"
+
+type Container struct {
+	ID     string
+	Name   string
+	Image  string
+	Status string
+	Ports  string
+	State  string
+}
+
+func (c Container) HostPort() string {
+	for _, mapping := range strings.Split(c.Ports, ", ") {
+		if strings.HasSuffix(mapping, "->7575/tcp") {
+			parts := strings.Split(mapping, "->")
+			left := parts[0]
+			if i := strings.LastIndex(left, ":"); i >= 0 {
+				return left[i+1:]
+			}
+			return left
+		}
+	}
+	return ""
+}
+
+func (c Container) Running() bool {
+	return c.State == "running"
+}
+
+func List() ([]Container, error) {
+	out, err := exec.Command("docker", "ps", "-a",
+		"--filter", "name=homarr",
+		"--format", "{{json .}}").Output()
+	if err != nil {
+		return nil, err
+	}
+
+	var containers []Container
+	for _, line := range strings.Split(strings.TrimSpace(string(out)), "\n") {
+		if line == "" {
+			continue
+		}
+		var raw struct {
+			ID     string
+			Names  string
+			Image  string
+			Status string
+			Ports  string
+			State  string
+		}
+		if err := json.Unmarshal([]byte(line), &raw); err != nil {
+			continue
+		}
+		containers = append(containers, Container{
+			ID:     raw.ID,
+			Name:   raw.Names,
+			Image:  raw.Image,
+			Status: raw.Status,
+			Ports:  raw.Ports,
+			State:  raw.State,
+		})
+	}
+	filtered := containers[:0]
+	for _, c := range containers {
+		if c.Name == "homarr" || strings.HasPrefix(c.Name, "homarr_") {
+			filtered = append(filtered, c)
+		}
+	}
+	return filtered, nil
+}
+
+func FindFreePort(start int) int {
+	if start > 65535 {
+		return 0
+	}
+	used := usedDockerPorts()
+	start = max(start, 1)
+	for port := start; port <= 65535; port++ {
+		if used[port] {
+			continue
+		}
+		listener, err := net.Listen("tcp4", fmt.Sprintf("0.0.0.0:%d", port))
+		if err == nil {
+			_ = listener.Close()
+			return port
+		}
+	}
+	return 0
+}
+
+func usedDockerPorts() map[int]bool {
+	out, err := exec.Command("docker", "ps", "--format", "{{.Ports}}").Output()
+	if err != nil {
+		return make(map[int]bool)
+	}
+	return parseUsedDockerPorts(out)
+}
+
+func parseUsedDockerPorts(out []byte) map[int]bool {
+	used := make(map[int]bool)
+	for _, line := range strings.Split(string(out), "\n") {
+		for _, mapping := range strings.Split(line, ",") {
+			left, _, found := strings.Cut(mapping, "->")
+			if !found {
+				continue
+			}
+			colon := strings.LastIndex(left, ":")
+			if colon < 0 {
+				continue
+			}
+			ports := strings.SplitN(strings.TrimSpace(left[colon+1:]), "-", 2)
+			first, err := strconv.Atoi(ports[0])
+			if err != nil {
+				continue
+			}
+			last := first
+			if len(ports) == 2 {
+				if parsed, err := strconv.Atoi(ports[1]); err == nil {
+					last = parsed
+				}
+			}
+			for port := first; port <= last; port++ {
+				used[port] = true
+			}
+		}
+	}
+	return used
+}
+
+func IsRunning(name string) bool {
+	containers, _ := List()
+	for _, c := range containers {
+		if c.Name == name && c.Running() {
+			return true
+		}
+	}
+	return false
+}
+
+type StartOptions struct {
+	Name       string
+	Image      string
+	Volume     string
+	HostPort   int
+	Env        []string
+	Platform   string
+	PullAlways bool
+	Daemon     bool
+}
+
+func Start(opts StartOptions) error {
+	encryptionKey, err := developmentEncryptionKey()
+	if err != nil {
+		return err
+	}
+
+	if opts.PullAlways {
+		cmd := PullCommand(opts.Image, opts.Platform)
+		cmd.Stdin = os.Stdin
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		if err := cmd.Run(); err != nil {
+			return fmt.Errorf("pull %s: %w", opts.Image, err)
+		}
+	}
+
+	_ = exec.Command("docker", "rm", "-f", opts.Name).Run()
+
+	args := []string{"run", "--rm", "--name", opts.Name,
+		"-e", "SECRET_ENCRYPTION_KEY=" + encryptionKey,
+	}
+	if opts.Platform != "" {
+		args = append(args, "--platform", opts.Platform)
+	}
+	if opts.Daemon {
+		args = append(args, "-d")
+	} else {
+		args = append(args, "-it")
+	}
+	for _, env := range opts.Env {
+		args = append(args, "-e", env)
+	}
+	args = append(args,
+		"-v", opts.Volume+":/appdata",
+		"-v", "/var/run/docker.sock:/var/run/docker.sock:ro",
+		"-p", fmt.Sprintf("%d:7575", opts.HostPort),
+		opts.Image,
+	)
+
+	cmd := exec.Command("docker", args...)
+	if opts.Daemon {
+		out, err := cmd.CombinedOutput()
+		if err != nil {
+			return fmt.Errorf("%w: %s", err, cleanOutput(out))
+		}
+		return nil
+	}
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	stderr := &tailBuffer{}
+	cmd.Stderr = io.MultiWriter(os.Stderr, stderr)
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("%w: %s", err, cleanOutput(stderr.data))
+	}
+	return nil
+}
+
+func developmentEncryptionKey() (string, error) {
+	if key := os.Getenv(developmentEncryptionKeyEnv); key != "" {
+		return validateDevelopmentEncryptionKey(key)
+	}
+	configDir, err := os.UserConfigDir()
+	if err != nil {
+		return "", fmt.Errorf("locate user config directory: %w", err)
+	}
+	return persistedDevelopmentEncryptionKey(configDir)
+}
+
+func persistedDevelopmentEncryptionKey(configDir string) (string, error) {
+	dir := filepath.Join(configDir, "homarr-dev")
+	path := filepath.Join(dir, "secret-encryption-key")
+	if key, found, err := readDevelopmentEncryptionKey(path); found || err != nil {
+		return key, err
+	}
+
+	if err := os.MkdirAll(dir, 0o700); err != nil {
+		return "", fmt.Errorf("create development config directory: %w", err)
+	}
+	lockPath := path + ".lock"
+	for attempts := 0; ; attempts++ {
+		if err := os.Mkdir(lockPath, 0o700); err == nil {
+			break
+		} else if !os.IsExist(err) {
+			return "", fmt.Errorf("lock development encryption key: %w", err)
+		}
+		if key, found, err := readDevelopmentEncryptionKey(path); found || err != nil {
+			return key, err
+		}
+		if attempts == 99 {
+			return "", fmt.Errorf("timed out waiting for development encryption key lock %q", lockPath)
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+	defer func() { _ = os.Remove(lockPath) }()
+
+	if key, found, err := readDevelopmentEncryptionKey(path); found || err != nil {
+		return key, err
+	}
+	keyBytes := make([]byte, 32)
+	if _, err := rand.Read(keyBytes); err != nil {
+		return "", fmt.Errorf("generate development encryption key: %w", err)
+	}
+	key := hex.EncodeToString(keyBytes)
+	file, err := os.CreateTemp(dir, "secret-encryption-key-*.tmp")
+	if err != nil {
+		return "", fmt.Errorf("create development encryption key: %w", err)
+	}
+	tempPath := file.Name()
+	defer func() { _ = os.Remove(tempPath) }()
+	if _, err := file.WriteString(key + "\n"); err != nil {
+		_ = file.Close()
+		return "", fmt.Errorf("write development encryption key: %w", err)
+	}
+	if err := file.Close(); err != nil {
+		return "", fmt.Errorf("close development encryption key: %w", err)
+	}
+	if err := os.Chmod(tempPath, 0o600); err != nil {
+		return "", fmt.Errorf("secure development encryption key: %w", err)
+	}
+	if err := os.Rename(tempPath, path); err != nil {
+		return "", fmt.Errorf("persist development encryption key: %w", err)
+	}
+	return key, nil
+}
+
+func readDevelopmentEncryptionKey(path string) (string, bool, error) {
+	data, err := os.ReadFile(path)
+	if os.IsNotExist(err) {
+		return "", false, nil
+	}
+	if err != nil {
+		return "", false, fmt.Errorf("read development encryption key: %w", err)
+	}
+	key, err := validateDevelopmentEncryptionKey(strings.TrimSpace(string(data)))
+	return key, true, err
+}
+
+func validateDevelopmentEncryptionKey(key string) (string, error) {
+	decoded, err := hex.DecodeString(key)
+	if err != nil || len(decoded) != 32 {
+		return "", fmt.Errorf("development encryption key must contain exactly 64 hexadecimal characters")
+	}
+	return key, nil
+}
+
+type tailBuffer struct {
+	data []byte
+}
+
+func (b *tailBuffer) Write(p []byte) (int, error) {
+	const limit = 32 * 1024
+	b.data = append(b.data, p...)
+	if len(b.data) > limit {
+		b.data = b.data[len(b.data)-limit:]
+	}
+	return len(p), nil
+}
+
+func cleanOutput(out []byte) string {
+	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
+	cleaned := make([]string, 0, len(lines))
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, "WARNING: The requested image's platform") || isContainerID(line) {
+			continue
+		}
+		if line != "" {
+			cleaned = append(cleaned, line)
+		}
+	}
+	return strings.Join(cleaned, "\n")
+}
+
+func isContainerID(value string) bool {
+	if len(value) != 64 {
+		return false
+	}
+	for _, r := range value {
+		if !(r >= '0' && r <= '9') && !(r >= 'a' && r <= 'f') {
+			return false
+		}
+	}
+	return true
+}
+
+func PullCommand(image, platform string) *exec.Cmd {
+	return PullCommandContext(context.Background(), image, platform)
+}
+
+func PullCommandContext(ctx context.Context, image, platform string) *exec.Cmd {
+	args := []string{"pull"}
+	if platform != "" {
+		args = append(args, "--platform", platform)
+	}
+	args = append(args, image)
+	cmd := exec.CommandContext(ctx, "docker", args...)
+	if platform != "" {
+		cmd.Env = append(os.Environ(), "DOCKER_DEFAULT_PLATFORM="+platform)
+	}
+	return cmd
+}
+
+func IsPortConflict(err error) bool {
+	if err == nil {
+		return false
+	}
+	message := strings.ToLower(err.Error())
+	return strings.Contains(message, "port is already allocated") ||
+		strings.Contains(message, "address already in use") ||
+		strings.Contains(message, "failed programming external connectivity")
+}
+
+func Stop(name string) error {
+	cmd := exec.Command("docker", "stop", name)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("%w: %s", err, strings.TrimSpace(string(out)))
+	}
+	return nil
+}
+
+func Restart(name string) error {
+	cmd := exec.Command("docker", "restart", name)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("%w: %s", err, strings.TrimSpace(string(out)))
+	}
+	return nil
+}
+
+func Remove(name string) error {
+	cmd := exec.Command("docker", "rm", "-f", name)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("%w: %s", err, strings.TrimSpace(string(out)))
+	}
+	return nil
+}
+
+func CheckImage(image string) (bool, error) {
+	cmd := exec.Command("docker", "manifest", "inspect", image)
+	out, err := cmd.CombinedOutput()
+	if err == nil {
+		return true, nil
+	}
+	message := strings.ToLower(string(out))
+	if strings.Contains(message, "manifest unknown") || strings.Contains(message, "no such manifest") {
+		return false, nil
+	}
+	return false, fmt.Errorf("check image %s: %w: %s", image, err, strings.TrimSpace(string(out)))
+}
+
+func FollowLogs(name string) error {
+	cmd := exec.Command("docker", "logs", "-f", "--tail", "100", name)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
@@ -0,0 +1,125 @@
+package docker
+
+import (
+	"encoding/hex"
+	"errors"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func TestContainerHostPort(t *testing.T) {
+	c := Container{Ports: "0.0.0.0:7576->7575/tcp, [::]:7576->7575/tcp"}
+	if got := c.HostPort(); got != "7576" {
+		t.Fatalf("HostPort() = %q, want 7576", got)
+	}
+}
+
+func TestIsPortConflict(t *testing.T) {
+	for _, message := range []string{
+		"Bind for 0.0.0.0:7575 failed: port is already allocated",
+		"driver failed programming external connectivity on endpoint",
+	} {
+		if !IsPortConflict(errors.New(message)) {
+			t.Fatalf("expected port conflict for %q", message)
+		}
+	}
+	if IsPortConflict(errors.New("manifest unknown")) {
+		t.Fatal("manifest error classified as port conflict")
+	}
+}
+
+func TestParseUsedDockerPortsPreservesLineBoundaries(t *testing.T) {
+	ports := parseUsedDockerPorts([]byte("6379/tcp\n0.0.0.0:7575->7575/tcp, [::]:7575->7575/tcp\n0.0.0.0:8000-8002->8000-8002/tcp\n"))
+	for _, port := range []int{7575, 8000, 8001, 8002} {
+		if !ports[port] {
+			t.Fatalf("port %d was not detected", port)
+		}
+	}
+}
+
+func TestFindFreePortRejectsOutOfRangeStart(t *testing.T) {
+	if port := FindFreePort(65536); port != 0 {
+		t.Fatalf("port = %d, want 0", port)
+	}
+}
+
+func TestDevelopmentEncryptionKeyUsesEnvironmentOverride(t *testing.T) {
+	want := strings.Repeat("a", 64)
+	t.Setenv(developmentEncryptionKeyEnv, want)
+	got, err := developmentEncryptionKey()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got != want {
+		t.Fatalf("key = %q, want environment value", got)
+	}
+}
+
+func TestPersistedDevelopmentEncryptionKeyIsReused(t *testing.T) {
+	configDir := t.TempDir()
+	first, err := persistedDevelopmentEncryptionKey(configDir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	second, err := persistedDevelopmentEncryptionKey(configDir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if first != second {
+		t.Fatal("persisted key changed between reads")
+	}
+	decoded, err := hex.DecodeString(first)
+	if err != nil || len(decoded) != 32 {
+		t.Fatalf("generated key is not 32 bytes: %q", first)
+	}
+	info, err := os.Stat(filepath.Join(configDir, "homarr-dev", "secret-encryption-key"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if info.Mode().Perm() != 0o600 {
+		t.Fatalf("key permissions = %o, want 600", info.Mode().Perm())
+	}
+}
+
+func TestPersistedDevelopmentEncryptionKeyRejectsInvalidValue(t *testing.T) {
+	configDir := t.TempDir()
+	dir := filepath.Join(configDir, "homarr-dev")
+	if err := os.Mkdir(dir, 0o700); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(dir, "secret-encryption-key"), []byte("invalid\n"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := persistedDevelopmentEncryptionKey(configDir); err == nil {
+		t.Fatal("expected invalid persisted key to fail")
+	}
+}
+
+func TestPersistedDevelopmentEncryptionKeyConcurrentCreation(t *testing.T) {
+	configDir := t.TempDir()
+	type result struct {
+		key string
+		err error
+	}
+	results := make(chan result, 20)
+	for range 20 {
+		go func() {
+			key, err := persistedDevelopmentEncryptionKey(configDir)
+			results <- result{key: key, err: err}
+		}()
+	}
+	var first string
+	for range 20 {
+		result := <-results
+		if result.err != nil {
+			t.Fatal(result.err)
+		}
+		if first == "" {
+			first = result.key
+		} else if result.key != first {
+			t.Fatal("concurrent callers received different keys")
+		}
+	}
+}
@@ -0,0 +1,149 @@
+package docker
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+const (
+	SourceLabel   = "org.homarr.dev.source"
+	RevisionLabel = "org.homarr.dev.revision"
+	PRLabel       = "org.homarr.dev.pr"
+)
+
+var tagPattern = regexp.MustCompile(`^[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}$`)
+
+type Image struct {
+	ID       string
+	Tag      string
+	Source   string
+	Revision string
+	PRNumber int
+}
+
+func (image Image) Reference() string {
+	return "homarr:" + image.Tag
+}
+
+type imageListRow struct {
+	ID         string
+	Repository string
+	Tag        string
+}
+
+func parseImageList(output []byte) ([]Image, error) {
+	images := make([]Image, 0)
+	for _, line := range strings.Split(strings.TrimSpace(string(output)), "\n") {
+		if line == "" {
+			continue
+		}
+		var row imageListRow
+		if err := json.Unmarshal([]byte(line), &row); err != nil {
+			return nil, fmt.Errorf("parse local Docker image: %w", err)
+		}
+		if row.Repository == "homarr" && row.Tag != "<none>" {
+			images = append(images, Image{ID: row.ID, Tag: row.Tag})
+		}
+	}
+	return images, nil
+}
+
+func ListLocalImages(ctx context.Context) ([]Image, error) {
+	out, err := exec.CommandContext(ctx, "docker", "image", "ls", "--filter", "reference=homarr:*", "--format", "{{json .}}").Output()
+	if err != nil {
+		return nil, fmt.Errorf("list local Homarr images: %w", err)
+	}
+	images, err := parseImageList(out)
+	if err != nil {
+		return nil, err
+	}
+	labelsByImage, err := inspectImageLabels(ctx, images)
+	if err != nil {
+		return nil, err
+	}
+	for index, labels := range labelsByImage {
+		images[index].Source = labels[SourceLabel]
+		images[index].Revision = labels[RevisionLabel]
+		images[index].PRNumber, _ = strconv.Atoi(labels[PRLabel])
+	}
+	return images, nil
+}
+
+func inspectImageLabels(ctx context.Context, images []Image) ([]map[string]string, error) {
+	if len(images) == 0 {
+		return nil, nil
+	}
+	args := []string{"image", "inspect", "--format", "{{json .Config.Labels}}"}
+	for _, image := range images {
+		args = append(args, image.Reference())
+	}
+	out, err := exec.CommandContext(ctx, "docker", args...).Output()
+	if err != nil {
+		return nil, fmt.Errorf("inspect local Homarr images: %w", err)
+	}
+	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
+	if len(lines) != len(images) {
+		return nil, fmt.Errorf("inspect returned %d images, expected %d", len(lines), len(images))
+	}
+	labelsByImage := make([]map[string]string, len(images))
+	for index, line := range lines {
+		labelsByImage[index] = make(map[string]string)
+		if line == "null" {
+			continue
+		}
+		if err := json.Unmarshal([]byte(line), &labelsByImage[index]); err != nil {
+			return nil, fmt.Errorf("parse labels for %s: %w", images[index].Reference(), err)
+		}
+	}
+	return labelsByImage, nil
+}
+
+type BuildOptions struct {
+	Context  string
+	Tag      string
+	Source   string
+	Revision string
+	PRNumber int
+}
+
+func BuildCommand(ctx context.Context, options BuildOptions) (*exec.Cmd, error) {
+	if !tagPattern.MatchString(options.Tag) {
+		return nil, fmt.Errorf("invalid image name %q", options.Tag)
+	}
+	contextPath, err := filepath.Abs(options.Context)
+	if err != nil {
+		return nil, fmt.Errorf("resolve build context: %w", err)
+	}
+	if info, err := os.Stat(filepath.Join(contextPath, "Dockerfile")); err != nil || info.IsDir() {
+		return nil, fmt.Errorf("%s does not contain a Dockerfile", contextPath)
+	}
+	args := []string{"build", "--label", SourceLabel + "=" + options.Source, "--label", RevisionLabel + "=" + options.Revision}
+	if options.PRNumber > 0 {
+		args = append(args, "--label", fmt.Sprintf("%s=%d", PRLabel, options.PRNumber))
+	}
+	args = append(args, "-t", "homarr:"+options.Tag, ".")
+	command := exec.CommandContext(ctx, "docker", args...)
+	command.Dir = contextPath
+	return command, nil
+}
+
+func BuildContext(ctx context.Context, options BuildOptions, stdout, stderr io.Writer) error {
+	command, err := BuildCommand(ctx, options)
+	if err != nil {
+		return err
+	}
+	command.Stdout = stdout
+	command.Stderr = stderr
+	if err := command.Run(); err != nil {
+		return fmt.Errorf("build homarr:%s: %w", options.Tag, err)
+	}
+	return nil
+}
@@ -0,0 +1,69 @@
+package docker
+
+import (
+	"os"
+	"testing"
+)
+
+func TestParseImageListFiltersHomarrTags(t *testing.T) {
+	output := []byte("{\"ID\":\"sha256:1\",\"Repository\":\"homarr\",\"Tag\":\"dev\"}\n{\"ID\":\"sha256:2\",\"Repository\":\"other\",\"Tag\":\"dev\"}\n")
+	images, err := parseImageList(output)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(images) != 1 || images[0].Reference() != "homarr:dev" {
+		t.Fatalf("images = %#v, want homarr:dev", images)
+	}
+}
+
+func TestInspectImageLabelsWithNoImages(t *testing.T) {
+	labels, err := inspectImageLabels(t.Context(), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if labels != nil {
+		t.Fatalf("labels = %#v, want nil", labels)
+	}
+}
+
+func TestBuildCommandIncludesProvenance(t *testing.T) {
+	command, err := BuildCommand(t.Context(), BuildOptions{
+		Context:  "../../../..",
+		Tag:      "feature",
+		Source:   "/tmp/homarr",
+		Revision: "abc123",
+		PRNumber: 42,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := []string{"docker", "build", "--label", SourceLabel + "=/tmp/homarr", "--label", RevisionLabel + "=abc123", "--label", PRLabel + "=42", "-t", "homarr:feature", "."}
+	if len(command.Args) != len(want) {
+		t.Fatalf("args = %v, want %v", command.Args, want)
+	}
+	for index := range want {
+		if command.Args[index] != want[index] {
+			t.Fatalf("args = %v, want %v", command.Args, want)
+		}
+	}
+}
+
+func TestListLocalImagesIntegration(t *testing.T) {
+	wantTag := os.Getenv("HOMARR_TEST_LOCAL_IMAGE")
+	if wantTag == "" {
+		t.Skip("set HOMARR_TEST_LOCAL_IMAGE to a local homarr image tag")
+	}
+	images, err := ListLocalImages(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, image := range images {
+		if image.Tag == wantTag {
+			if image.Source == "" || image.Revision == "" {
+				t.Fatalf("image %#v is missing provenance", image)
+			}
+			return
+		}
+	}
+	t.Fatalf("homarr:%s was not discovered", wantTag)
+}
@@ -0,0 +1,199 @@
+package gh
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"os/exec"
+	"strings"
+	"sync"
+	"time"
+)
+
+const Repo = "homarr-labs/homarr"
+const prCacheTTL = 5 * time.Minute
+
+var prListCache = struct {
+	sync.Mutex
+	entries map[int]cachedPRs
+}{entries: make(map[int]cachedPRs)}
+
+type cachedPRs struct {
+	prs       []PR
+	fetchedAt time.Time
+}
+
+func isBot(login string) bool {
+	return strings.HasSuffix(login, "[bot]") || strings.HasPrefix(login, "app/")
+}
+
+type PR struct {
+	Number    int    `json:"number"`
+	Title     string `json:"title"`
+	Author    string `json:"author"`
+	HeadRef   string `json:"headRefName"`
+	HeadSHA   string `json:"headRefOid"`
+	CIState   string `json:"ciState"`
+	IsDraft   bool   `json:"isDraft"`
+	UpdatedAt string `json:"updatedAt"`
+}
+
+type rawPR struct {
+	Number  int    `json:"number"`
+	Title   string `json:"title"`
+	IsDraft bool   `json:"isDraft"`
+	Author  struct {
+		Login string `json:"login"`
+	} `json:"author"`
+	HeadRefName       string     `json:"headRefName"`
+	HeadRefOID        string     `json:"headRefOid"`
+	UpdatedAt         string     `json:"updatedAt"`
+	StatusCheckRollup []rawCheck `json:"statusCheckRollup"`
+}
+
+type rawCheck struct {
+	Status     string `json:"status"`
+	Conclusion string `json:"conclusion"`
+	State      string `json:"state"`
+}
+
+func rollupState(checks []rawCheck) string {
+	if len(checks) == 0 {
+		return "NONE"
+	}
+	failed, pending := 0, 0
+	for _, c := range checks {
+		if c.State != "" {
+			switch c.State {
+			case "SUCCESS":
+			case "PENDING", "EXPECTED":
+				pending++
+			default:
+				failed++
+			}
+			continue
+		}
+		if c.Status != "COMPLETED" {
+			pending++
+			continue
+		}
+		switch c.Conclusion {
+		case "SUCCESS", "SKIPPED", "NEUTRAL":
+		default:
+			failed++
+		}
+	}
+	if failed > 0 {
+		return "FAILURE"
+	}
+	if pending > 0 {
+		return "PENDING"
+	}
+	return "SUCCESS"
+}
+
+func ListPRs(ctx context.Context, limit int, includeBots bool) ([]PR, error) {
+	return listPRs(ctx, limit, includeBots, false)
+}
+
+func RefreshPRs(ctx context.Context, limit int, includeBots bool) ([]PR, error) {
+	return listPRs(ctx, limit, includeBots, true)
+}
+
+func listPRs(ctx context.Context, limit int, includeBots, refresh bool) ([]PR, error) {
+	cached, fetchedAt := cachedPRList(limit)
+	if !refresh && !fetchedAt.IsZero() && time.Since(fetchedAt) < prCacheTTL {
+		return filterPRs(cached, includeBots), nil
+	}
+
+	out, err := exec.CommandContext(ctx, "gh", "pr", "list",
+		"--repo", Repo,
+		"--state", "open",
+		"--limit", fmt.Sprint(limit),
+		"--json", "number,title,author,headRefName,headRefOid,updatedAt,isDraft,statusCheckRollup",
+	).CombinedOutput()
+	if err != nil {
+		err = commandError(err, out)
+		if len(cached) > 0 {
+			return filterPRs(cached, includeBots), fmt.Errorf("%w; showing cached PRs from %s", err, fetchedAt.Format(time.Kitchen))
+		}
+		return nil, err
+	}
+
+	var raws []rawPR
+	if err := json.Unmarshal(out, &raws); err != nil {
+		return nil, err
+	}
+
+	prs := make([]PR, 0, len(raws))
+	for _, r := range raws {
+		prs = append(prs, PR{
+			Number:    r.Number,
+			Title:     r.Title,
+			Author:    r.Author.Login,
+			HeadRef:   r.HeadRefName,
+			HeadSHA:   r.HeadRefOID,
+			CIState:   rollupState(r.StatusCheckRollup),
+			IsDraft:   r.IsDraft,
+			UpdatedAt: r.UpdatedAt,
+		})
+	}
+	storePRList(limit, prs)
+	return filterPRs(prs, includeBots), nil
+}
+
+func cachedPRList(limit int) ([]PR, time.Time) {
+	prListCache.Lock()
+	defer prListCache.Unlock()
+	entry := prListCache.entries[limit]
+	return append([]PR(nil), entry.prs...), entry.fetchedAt
+}
+
+func storePRList(limit int, prs []PR) {
+	prListCache.Lock()
+	defer prListCache.Unlock()
+	prListCache.entries[limit] = cachedPRs{prs: append([]PR(nil), prs...), fetchedAt: time.Now()}
+}
+
+func filterPRs(prs []PR, includeBots bool) []PR {
+	filtered := make([]PR, 0, len(prs))
+	for _, pr := range prs {
+		if includeBots || !isBot(pr.Author) {
+			filtered = append(filtered, pr)
+		}
+	}
+	return filtered
+}
+
+func commandError(err error, output []byte) error {
+	detail := strings.TrimSpace(string(output))
+	if detail == "" {
+		return err
+	}
+	return fmt.Errorf("%s: %w", detail, err)
+}
+
+func GetPR(ctx context.Context, number int) (*PR, error) {
+	out, err := exec.CommandContext(ctx, "gh", "pr", "view", fmt.Sprint(number),
+		"--repo", Repo,
+		"--json", "number,title,author,headRefName,headRefOid,updatedAt,isDraft,statusCheckRollup",
+	).CombinedOutput()
+	if err != nil {
+		return nil, commandError(err, out)
+	}
+
+	var r rawPR
+	if err := json.Unmarshal(out, &r); err != nil {
+		return nil, err
+	}
+	return &PR{
+		Number:    r.Number,
+		Title:     r.Title,
+		Author:    r.Author.Login,
+		HeadRef:   r.HeadRefName,
+		HeadSHA:   r.HeadRefOID,
+		CIState:   rollupState(r.StatusCheckRollup),
+		IsDraft:   r.IsDraft,
+		UpdatedAt: r.UpdatedAt,
+	}, nil
+}
@@ -0,0 +1,91 @@
+package gh
+
+import (
+	"errors"
+	"os"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestIsBot(t *testing.T) {
+	tests := []struct {
+		login string
+		want  bool
+	}{
+		{login: "app/homarr-renovate", want: true},
+		{login: "dependabot[bot]", want: true},
+		{login: "ajnart", want: false},
+	}
+
+	for _, test := range tests {
+		if got := isBot(test.login); got != test.want {
+			t.Errorf("isBot(%q) = %v, want %v", test.login, got, test.want)
+		}
+	}
+}
+
+func TestRollupStateHandlesChecksAndStatuses(t *testing.T) {
+	tests := []struct {
+		name   string
+		checks []rawCheck
+		want   string
+	}{
+		{name: "check success", checks: []rawCheck{{Status: "COMPLETED", Conclusion: "SUCCESS"}}, want: "SUCCESS"},
+		{name: "status failure", checks: []rawCheck{{State: "FAILURE"}}, want: "FAILURE"},
+		{name: "status pending", checks: []rawCheck{{State: "PENDING"}}, want: "PENDING"},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if got := rollupState(test.checks); got != test.want {
+				t.Fatalf("rollupState() = %q, want %q", got, test.want)
+			}
+		})
+	}
+}
+
+func TestCachedPRListFiltersBotsWithoutMutatingCache(t *testing.T) {
+	limit := 9876
+	storePRList(limit, []PR{{Number: 1, Author: "developer"}, {Number: 2, Author: "bot[bot]"}})
+
+	prs, fetchedAt := cachedPRList(limit)
+	if time.Since(fetchedAt) >= prCacheTTL {
+		t.Fatal("new cache entry is already expired")
+	}
+	if filtered := filterPRs(prs, false); len(filtered) != 1 || filtered[0].Number != 1 {
+		t.Fatalf("filtered PRs = %#v", filtered)
+	}
+	if unfiltered := filterPRs(prs, true); len(unfiltered) != 2 {
+		t.Fatalf("unfiltered PR count = %d, want 2", len(unfiltered))
+	}
+}
+
+func TestCommandErrorIncludesGitHubOutput(t *testing.T) {
+	err := commandError(errors.New("exit status 1"), []byte("GraphQL: API rate limit exceeded\n"))
+	if !strings.Contains(err.Error(), "API rate limit exceeded") {
+		t.Fatalf("error = %q", err)
+	}
+}
+
+func TestListPRsExcludesBotsIntegration(t *testing.T) {
+	if os.Getenv("HOMARR_INTEGRATION_TEST") != "1" {
+		t.Skip("set HOMARR_INTEGRATION_TEST=1 to query GitHub")
+	}
+
+	prs, err := ListPRs(t.Context(), 50, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(prs) == 0 {
+		t.Fatal("expected at least one human-authored open PR")
+	}
+	for _, pr := range prs {
+		if isBot(pr.Author) {
+			t.Fatalf("bot PR was not filtered: #%d by %s", pr.Number, pr.Author)
+		}
+		if pr.HeadSHA == "" {
+			t.Fatalf("PR #%d has no head SHA", pr.Number)
+		}
+	}
+}
@@ -0,0 +1,7 @@
+package platform
+
+import "github.com/atotto/clipboard"
+
+func CopyText(value string) error {
+	return clipboard.WriteAll(value)
+}
@@ -0,0 +1,28 @@
+package platform
+
+import (
+	"fmt"
+	"os/exec"
+	"runtime"
+)
+
+func OpenURL(url string) error {
+	name, args, err := openCommand(runtime.GOOS, url)
+	if err != nil {
+		return err
+	}
+	return exec.Command(name, args...).Start()
+}
+
+func openCommand(goos, url string) (string, []string, error) {
+	switch goos {
+	case "darwin":
+		return "open", []string{url}, nil
+	case "linux":
+		return "xdg-open", []string{url}, nil
+	case "windows":
+		return "rundll32", []string{"url.dll,FileProtocolHandler", url}, nil
+	default:
+		return "", nil, fmt.Errorf("opening URLs is not supported on %s", goos)
+	}
+}
@@ -0,0 +1,25 @@
+package platform
+
+import "testing"
+
+func TestOpenCommand(t *testing.T) {
+	tests := []struct {
+		goos string
+		name string
+	}{
+		{goos: "darwin", name: "open"},
+		{goos: "linux", name: "xdg-open"},
+		{goos: "windows", name: "rundll32"},
+	}
+	for _, test := range tests {
+		t.Run(test.goos, func(t *testing.T) {
+			name, args, err := openCommand(test.goos, "https://example.com")
+			if err != nil {
+				t.Fatal(err)
+			}
+			if name != test.name || len(args) == 0 {
+				t.Fatalf("command = %s %v", name, args)
+			}
+		})
+	}
+}
@@ -0,0 +1,105 @@
+package run
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/docker"
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/gh"
+)
+
+func BuildCurrentImage(tag, directory string) error {
+	return buildCurrentImage(context.Background(), tag, directory, os.Stdout, os.Stderr)
+}
+
+func buildCurrentImage(ctx context.Context, tag, directory string, stdout, stderr io.Writer) error {
+	root, revision, err := checkoutDetails(ctx, directory)
+	if err != nil {
+		return err
+	}
+	return docker.BuildContext(ctx, docker.BuildOptions{Context: root, Tag: tag, Source: root, Revision: revision}, stdout, stderr)
+}
+
+func BuildPRImage(number int, tag string) error {
+	return buildPRImage(context.Background(), number, tag, os.Stdout, os.Stderr)
+}
+
+func buildPRImage(ctx context.Context, number int, tag string, stdout, stderr io.Writer) error {
+	if number <= 0 {
+		return fmt.Errorf("PR number must be positive")
+	}
+	temporaryRoot, err := os.MkdirTemp("", "homarr-pr-*")
+	if err != nil {
+		return fmt.Errorf("create temporary checkout: %w", err)
+	}
+	defer os.RemoveAll(temporaryRoot)
+
+	checkout := filepath.Join(temporaryRoot, "homarr")
+	clone := exec.CommandContext(ctx, "gh", prCloneArgs(checkout)...)
+	clone.Stdout = stdout
+	clone.Stderr = stderr
+	if err := clone.Run(); err != nil {
+		return fmt.Errorf("clone %s: %w", gh.Repo, err)
+	}
+	command := exec.CommandContext(ctx, "gh", "pr", "checkout", strconv.Itoa(number), "--detach")
+	command.Dir = checkout
+	command.Stdout = stdout
+	command.Stderr = stderr
+	if err := command.Run(); err != nil {
+		return fmt.Errorf("checkout PR #%d: %w", number, err)
+	}
+	_, revision, err := checkoutDetails(ctx, checkout)
+	if err != nil {
+		return err
+	}
+	return docker.BuildContext(ctx, docker.BuildOptions{
+		Context:  checkout,
+		Tag:      tag,
+		Source:   fmt.Sprintf("https://github.com/%s/pull/%d", gh.Repo, number),
+		Revision: revision,
+		PRNumber: number,
+	}, stdout, stderr)
+}
+
+func prCloneArgs(checkout string) []string {
+	return []string{"repo", "clone", gh.Repo, checkout, "--", "--depth=1", "--filter=blob:none"}
+}
+
+func RebuildImage(image docker.Image) error {
+	return RebuildImageContext(context.Background(), image, os.Stdout, os.Stderr)
+}
+
+func RebuildImageContext(ctx context.Context, image docker.Image, stdout, stderr io.Writer) error {
+	if image.PRNumber > 0 {
+		return buildPRImage(ctx, image.PRNumber, image.Tag, stdout, stderr)
+	}
+	if image.Source == "" {
+		return fmt.Errorf("homarr:%s has no build source metadata", image.Tag)
+	}
+	if info, err := os.Stat(image.Source); err != nil || !info.IsDir() {
+		return fmt.Errorf("build source %s is no longer available", image.Source)
+	}
+	return buildCurrentImage(ctx, image.Tag, image.Source, stdout, stderr)
+}
+
+func checkoutDetails(ctx context.Context, directory string) (root string, revision string, err error) {
+	rootOutput, err := exec.CommandContext(ctx, "git", "-C", directory, "rev-parse", "--show-toplevel").CombinedOutput()
+	if err != nil {
+		return "", "", fmt.Errorf("find Homarr checkout: %w: %s", err, strings.TrimSpace(string(rootOutput)))
+	}
+	root = strings.TrimSpace(string(rootOutput))
+	if _, err := os.Stat(filepath.Join(root, "Dockerfile")); err != nil {
+		return "", "", fmt.Errorf("%s is not a Homarr checkout", root)
+	}
+	revisionOutput, err := exec.CommandContext(ctx, "git", "-C", root, "rev-parse", "HEAD").CombinedOutput()
+	if err != nil {
+		return "", "", fmt.Errorf("read checkout revision: %w: %s", err, strings.TrimSpace(string(revisionOutput)))
+	}
+	return root, strings.TrimSpace(string(revisionOutput)), nil
+}
@@ -0,0 +1,119 @@
+package run
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/docker"
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/gh"
+)
+
+type Options struct {
+	Context    context.Context
+	PR         int
+	Tag        string
+	Demo       bool
+	Env        []string
+	FetchTitle bool
+	FindPort   func(int) int
+}
+
+type Plan struct {
+	Image    string
+	Name     string
+	Volume   string
+	Label    string
+	HostPort int
+	Env      []string
+	Platform string
+	Pull     bool
+	PRNumber int
+}
+
+func BuildPlan(opts Options) (*Plan, error) {
+	p := &Plan{}
+	ctx := opts.Context
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	findPort := opts.FindPort
+	if findPort == nil {
+		findPort = docker.FindFreePort
+	}
+
+	if opts.PR > 0 {
+		p.PRNumber = opts.PR
+		p.Image = fmt.Sprintf("ghcr.io/homarr-labs/homarr-test:pr-%d", opts.PR)
+		p.Name = fmt.Sprintf("homarr_pr_%d", opts.PR)
+		p.Volume = fmt.Sprintf("homarr_pr_%d_data", opts.PR)
+		p.Label = fmt.Sprintf("PR #%d", opts.PR)
+		p.Pull = true
+		p.Platform = "linux/amd64"
+		if opts.FetchTitle {
+			if pr, err := gh.GetPR(ctx, opts.PR); err == nil && pr.Title != "" {
+				p.Label = fmt.Sprintf("PR #%d — %s", opts.PR, pr.Title)
+			}
+		}
+	} else if opts.Tag != "" {
+		p.Image = "homarr:" + opts.Tag
+		p.Name = "homarr_" + opts.Tag
+		p.Volume = "homarr_" + opts.Tag + "_data"
+		p.Label = "tag: " + opts.Tag
+	} else {
+		return nil, fmt.Errorf("need a tag or --pr")
+	}
+
+	p.HostPort = findPort(7575)
+	if p.HostPort == 0 {
+		return nil, fmt.Errorf("no free host port is available")
+	}
+	p.Env = append(p.Env, opts.Env...)
+	if opts.Demo {
+		p.Env = append(p.Env, "DEMO_MODE=true", "UNSAFE_ENABLE_MOCK_INTEGRATION=true")
+		p.Label += " (demo)"
+	}
+	return p, nil
+}
+
+func StartDetached(p *Plan) error {
+	return start(p, true)
+}
+
+func StartForeground(p *Plan) error {
+	return start(p, false)
+}
+
+func start(p *Plan, daemon bool) error {
+	const attempts = 5
+	for attempt := 0; attempt < attempts; attempt++ {
+		err := docker.Start(docker.StartOptions{
+			Name:       p.Name,
+			Image:      p.Image,
+			Volume:     p.Volume,
+			HostPort:   p.HostPort,
+			Env:        p.Env,
+			Platform:   p.Platform,
+			PullAlways: p.Pull && attempt == 0,
+			Daemon:     daemon,
+		})
+		if err == nil {
+			return nil
+		}
+		if !docker.IsPortConflict(err) || attempt == attempts-1 {
+			if docker.IsPortConflict(err) {
+				return fmt.Errorf("unable to bind a host port after %d attempts; restart Docker or OrbStack: %w", attempts, err)
+			}
+			return err
+		}
+		previousPort := p.HostPort
+		p.HostPort = docker.FindFreePort(p.HostPort + 1)
+		if p.HostPort == 0 {
+			return fmt.Errorf("no free host port is available: %w", err)
+		}
+		if !daemon {
+			fmt.Fprintf(os.Stderr, "Port %d unavailable; retrying on %d.\n", previousPort, p.HostPort)
+		}
+	}
+	return nil
+}
@@ -0,0 +1,59 @@
+package run
+
+import (
+	"os"
+	"slices"
+	"strconv"
+	"testing"
+
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/docker"
+)
+
+func TestPRPlanUsesAMD64(t *testing.T) {
+	plan, err := BuildPlan(Options{PR: 1, FindPort: func(int) int { return 7575 }})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if plan.Platform != "linux/amd64" {
+		t.Fatalf("platform = %q, want linux/amd64", plan.Platform)
+	}
+}
+
+func TestPRCloneIsShallow(t *testing.T) {
+	args := prCloneArgs("/tmp/checkout")
+	if !slices.Contains(args, "--depth=1") || !slices.Contains(args, "--filter=blob:none") {
+		t.Fatalf("clone args = %v", args)
+	}
+}
+
+func TestBuildPlanFailsWhenNoPortIsAvailable(t *testing.T) {
+	_, err := BuildPlan(Options{Tag: "dev", FindPort: func(int) int { return 0 }})
+	if err == nil {
+		t.Fatal("expected no-free-port error")
+	}
+}
+
+func TestStartPRIntegration(t *testing.T) {
+	if os.Getenv("HOMARR_DOCKER_INTEGRATION_TEST") != "1" {
+		t.Skip("set HOMARR_DOCKER_INTEGRATION_TEST=1 and HOMARR_TEST_PR=<number>")
+	}
+	pr, err := strconv.Atoi(os.Getenv("HOMARR_TEST_PR"))
+	if err != nil || pr <= 0 {
+		t.Fatal("HOMARR_TEST_PR must be a positive PR number")
+	}
+
+	plan, err := BuildPlan(Options{PR: pr})
+	if err != nil {
+		t.Fatal(err)
+	}
+	plan.Name += "_integration"
+	plan.Volume += "_integration"
+	defer docker.Remove(plan.Name)
+
+	if err := StartDetached(plan); err != nil {
+		t.Fatal(err)
+	}
+	if !docker.IsRunning(plan.Name) {
+		t.Fatalf("container %s did not remain running", plan.Name)
+	}
+}
@@ -0,0 +1,122 @@
+package tui
+
+import (
+	"charm.land/bubbles/v2/spinner"
+	tea "charm.land/bubbletea/v2"
+)
+
+type appModel struct {
+	dev           prsModel
+	dashboard     dashModel
+	showDashboard bool
+	width         int
+	height        int
+}
+
+func newAppModel(showDashboard bool) appModel {
+	return appModel{dev: newPRsModel(), dashboard: newDashModel(), showDashboard: showDashboard}
+}
+
+func (m appModel) Init() tea.Cmd {
+	if m.showDashboard {
+		return m.dashboard.Init()
+	}
+	return m.dev.Init()
+}
+
+func (m appModel) canSwitch() bool {
+	if m.showDashboard {
+		return !m.dashboard.filtering
+	}
+	return !m.dev.filtering && !m.dev.pulling
+}
+
+func (m appModel) switchScreen() (tea.Model, tea.Cmd) {
+	m.showDashboard = !m.showDashboard
+	commands := make([]tea.Cmd, 0, 2)
+	if m.width > 0 && m.height > 0 {
+		resize := tea.WindowSizeMsg{Width: m.width, Height: m.height}
+		if m.showDashboard {
+			updated, command := m.dashboard.Update(resize)
+			m.dashboard = updated.(dashModel)
+			commands = append(commands, command)
+		} else {
+			updated, command := m.dev.Update(resize)
+			m.dev = updated.(prsModel)
+			commands = append(commands, command)
+		}
+	}
+	if m.showDashboard {
+		commands = append(commands, m.dashboard.Init())
+	} else {
+		commands = append(commands, m.dev.Init())
+	}
+	return m, tea.Batch(commands...)
+}
+
+func (m appModel) updateDev(msg tea.Msg) (appModel, tea.Cmd) {
+	updated, command := m.dev.Update(msg)
+	m.dev = updated.(prsModel)
+	return m, command
+}
+
+func (m appModel) updateDashboard(msg tea.Msg) (appModel, tea.Cmd) {
+	updated, command := m.dashboard.Update(msg)
+	m.dashboard = updated.(dashModel)
+	return m, command
+}
+
+func (m appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	if window, ok := msg.(tea.WindowSizeMsg); ok {
+		m.width = window.Width
+		m.height = window.Height
+		m, devCommand := m.updateDev(msg)
+		m, dashboardCommand := m.updateDashboard(msg)
+		return m, tea.Batch(devCommand, dashboardCommand)
+	}
+	if key, ok := msg.(tea.KeyPressMsg); ok {
+		if key.String() == "d" && m.canSwitch() {
+			return m.switchScreen()
+		}
+		if m.showDashboard {
+			return m.updateDashboard(msg)
+		}
+		return m.updateDev(msg)
+	}
+
+	switch msg.(type) {
+	case prsLoadedMsg, imageCheckedMsg, prActionMsg, rebuildDoneMsg, runningRefreshedMsg, pullReadyMsg, pullEvent, spinner.TickMsg:
+		return m.updateDev(msg)
+	case tickMsg, actionMsg, rowsMsg:
+		if m.showDashboard {
+			return m.updateDashboard(msg)
+		}
+		return m, nil
+	case prLogTickMsg:
+		if !m.showDashboard {
+			return m.updateDev(msg)
+		}
+		return m, nil
+	case logsMsg:
+		m, devCommand := m.updateDev(msg)
+		m, dashboardCommand := m.updateDashboard(msg)
+		return m, tea.Batch(devCommand, dashboardCommand)
+	}
+	if m.showDashboard {
+		return m.updateDashboard(msg)
+	}
+	return m.updateDev(msg)
+}
+
+func (m appModel) View() tea.View {
+	if m.showDashboard {
+		return m.dashboard.View()
+	}
+	return m.dev.View()
+}
+
+func runApp(showDashboard bool) error {
+	program := tea.NewProgram(newAppModel(showDashboard))
+	_, err := program.Run()
+	return err
+}
@@ -0,0 +1,47 @@
+package tui
+
+import (
+	"testing"
+
+	tea "charm.land/bubbletea/v2"
+
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/gh"
+)
+
+func TestAppTogglePreservesDevelopmentState(t *testing.T) {
+	m := newAppModel(false)
+	m.dev.rows = []prRow{{kind: "remote", pr: gh.PR{Number: 6502}}}
+
+	updated, _ := m.Update(tea.KeyPressMsg(tea.Key{Code: 'd', Text: "d"}))
+	dashboard := updated.(appModel)
+	if !dashboard.showDashboard {
+		t.Fatal("d did not open the instance dashboard")
+	}
+	updated, _ = dashboard.Update(tea.KeyPressMsg(tea.Key{Code: 'd', Text: "d"}))
+	development := updated.(appModel)
+	if development.showDashboard || len(development.dev.rows) != 1 || development.dev.rows[0].pr.Number != 6502 {
+		t.Fatalf("development state was not preserved: %#v", development.dev.rows)
+	}
+}
+
+func TestAppToggleDoesNotInterceptFilterInput(t *testing.T) {
+	m := newAppModel(false)
+	m.dev.filtering = true
+	m.dev.filter.Focus()
+
+	updated, _ := m.Update(tea.KeyPressMsg(tea.Key{Code: 'd', Text: "d"}))
+	got := updated.(appModel)
+	if got.showDashboard || got.dev.filter.Value() != "d" {
+		t.Fatalf("filter input was intercepted: dashboard=%v filter=%q", got.showDashboard, got.dev.filter.Value())
+	}
+}
+
+func TestAppCanOpenInstancesDuringBuild(t *testing.T) {
+	m := newAppModel(false)
+	m.dev.rebuilding = true
+
+	updated, _ := m.Update(tea.KeyPressMsg(tea.Key{Code: 'd', Text: "d"}))
+	if !updated.(appModel).showDashboard {
+		t.Fatal("background build blocked dashboard navigation")
+	}
+}
@@ -0,0 +1,415 @@
+package tui
+
+import (
+	"context"
+	"fmt"
+	"os/exec"
+	"strings"
+	"time"
+
+	"charm.land/bubbles/v2/table"
+	"charm.land/bubbles/v2/textinput"
+	"charm.land/bubbles/v2/viewport"
+	tea "charm.land/bubbletea/v2"
+	"charm.land/lipgloss/v2"
+
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/docker"
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/platform"
+)
+
+var (
+	titleStyle    = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("212"))
+	helpStyle     = lipgloss.NewStyle().Foreground(lipgloss.Color("241"))
+	logHeadSt     = lipgloss.NewStyle().Foreground(lipgloss.Color("241"))
+	runningLegend = lipgloss.NewStyle().Foreground(lipgloss.Color("42")).Render("● running")
+	stoppedLegend = lipgloss.NewStyle().Foreground(lipgloss.Color("240")).Render("○ stopped")
+)
+
+type dashModel struct {
+	table         table.Model
+	allRows       []table.Row
+	filter        textinput.Model
+	filtering     bool
+	logs          viewport.Model
+	showLogs      bool
+	follow        bool
+	status        string
+	confirmRemove string
+	width         int
+	height        int
+}
+
+type tickMsg time.Time
+type actionMsg string
+type rowsMsg []table.Row
+type logsMsg struct {
+	name    string
+	content string
+}
+
+func tick() tea.Cmd {
+	return tea.Tick(3*time.Second, func(t time.Time) tea.Msg { return tickMsg(t) })
+}
+
+func fetchLogs(name string) tea.Cmd {
+	return func() tea.Msg {
+		if name == "" {
+			return logsMsg{}
+		}
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		defer cancel()
+		out, err := exec.CommandContext(ctx, "docker", "logs", "--tail", "200", name).CombinedOutput()
+		if err != nil {
+			return logsMsg{name: name, content: "logs unavailable: " + err.Error()}
+		}
+		return logsMsg{name: name, content: string(out)}
+	}
+}
+
+func loadRows() tea.Cmd {
+	return func() tea.Msg { return rowsMsg(refreshRows()) }
+}
+
+func refreshRows() []table.Row {
+	containers, _ := docker.List()
+	rows := make([]table.Row, 0, len(containers))
+	for _, c := range containers {
+		port := c.HostPort()
+		url := ""
+		if port != "" && c.Running() {
+			url = "http://localhost:" + port
+		}
+		state := "● " + c.State
+		if !c.Running() {
+			state = "○ " + c.State
+		}
+		img := strings.TrimPrefix(c.Image, "ghcr.io/homarr-labs/")
+		rows = append(rows, table.Row{c.Name, state, img, port, url, c.Status})
+	}
+	return rows
+}
+
+func dashboardColumns(width int) []table.Column {
+	nameWidth := 26
+	imageWidth := 30
+	urlWidth := 24
+	if width < 100 {
+		nameWidth = 22
+		imageWidth = max(width-54, 18)
+		urlWidth = 0
+	}
+	return []table.Column{
+		{Title: "NAME", Width: nameWidth},
+		{Title: "STATE", Width: 14},
+		{Title: "IMAGE", Width: imageWidth},
+		{Title: "PORT", Width: 6},
+		{Title: "URL", Width: urlWidth},
+		{Title: "STATUS", Width: 0},
+	}
+}
+
+func newDashModel() dashModel {
+	t := table.New(
+		table.WithColumns(dashboardColumns(104)),
+		table.WithFocused(true),
+		table.WithHeight(10),
+		table.WithWidth(104),
+	)
+	s := table.DefaultStyles()
+	s.Header = s.Header.Bold(true)
+	s.Selected = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("230")).Background(lipgloss.Color("57"))
+	t.SetStyles(s)
+	logs := viewport.New(viewport.WithWidth(104), viewport.WithHeight(12))
+	logs.SoftWrap = true
+	filter := textinput.New()
+	filter.Prompt = "/ "
+	filter.Placeholder = "filter name, image, port, state…"
+	filter.SetWidth(50)
+	styles := textinput.DefaultDarkStyles()
+	styles.Focused.Prompt = styles.Focused.Prompt.Foreground(lipgloss.Color("212")).Bold(true)
+	styles.Focused.Text = styles.Focused.Text.Foreground(lipgloss.Color("229"))
+	filter.SetStyles(styles)
+	return dashModel{table: t, filter: filter, logs: logs, showLogs: true, follow: true, width: 104, height: 30}
+}
+
+func (m *dashModel) applyFilter() {
+	query := strings.ToLower(strings.TrimSpace(m.filter.Value()))
+	if query == "" {
+		m.table.SetRows(m.allRows)
+		return
+	}
+	rows := make([]table.Row, 0, len(m.allRows))
+	for _, row := range m.allRows {
+		if strings.Contains(strings.ToLower(strings.Join(row, " ")), query) {
+			rows = append(rows, row)
+		}
+	}
+	m.table.SetRows(rows)
+}
+
+func (m dashModel) selected() string {
+	row := m.table.SelectedRow()
+	if len(row) == 0 {
+		return ""
+	}
+	return row[0]
+}
+
+func (m dashModel) selectedPort() string {
+	row := m.table.SelectedRow()
+	if len(row) < 4 {
+		return ""
+	}
+	return row[3]
+}
+
+func (m dashModel) Init() tea.Cmd {
+	return tea.Batch(tick(), loadRows(), fetchLogs(m.selected()))
+}
+
+func (m dashModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		m.height = msg.Height
+		m.table.SetColumns(dashboardColumns(msg.Width))
+		m.table.SetWidth(msg.Width)
+		m.logs.SetWidth(msg.Width)
+		m.filter.SetWidth(max(min(msg.Width-4, 60), 10))
+		m.layout()
+		return m, nil
+	case tickMsg:
+		return m, tea.Batch(tick(), loadRows())
+	case rowsMsg:
+		m.allRows = []table.Row(msg)
+		m.applyFilter()
+		return m, fetchLogs(m.selected())
+	case logsMsg:
+		if msg.name != "" && msg.name != m.selected() {
+			return m, nil
+		}
+		m.logs.SetContent(strings.TrimRight(msg.content, "\n"))
+		if m.follow {
+			m.logs.GotoBottom()
+		}
+		return m, nil
+	case actionMsg:
+		m.status = string(msg)
+		m.confirmRemove = ""
+		return m, loadRows()
+	case tea.KeyPressMsg:
+		if m.filtering {
+			switch msg.Key().Code {
+			case tea.KeyEscape:
+				m.filtering = false
+				m.filter.Reset()
+				m.filter.Blur()
+				m.applyFilter()
+				return m, fetchLogs(m.selected())
+			case tea.KeyEnter:
+				m.filtering = false
+				m.filter.Blur()
+				return m, fetchLogs(m.selected())
+			}
+			var cmd tea.Cmd
+			m.filter, cmd = m.filter.Update(msg)
+			m.applyFilter()
+			return m, tea.Batch(cmd, fetchLogs(m.selected()))
+		}
+		name := m.selected()
+		switch msg.Key().Code {
+		case tea.KeyUp, tea.KeyKpUp:
+			m.table.MoveUp(1)
+			return m, fetchLogs(m.selected())
+		case tea.KeyDown, tea.KeyKpDown:
+			m.table.MoveDown(1)
+			return m, fetchLogs(m.selected())
+		case tea.KeyPgUp, tea.KeyKpPgUp:
+			m.follow = false
+			m.logs.PageUp()
+			return m, nil
+		case tea.KeyPgDown, tea.KeyKpPgDown:
+			m.logs.PageDown()
+			m.follow = m.logs.AtBottom()
+			return m, nil
+		}
+		switch msg.String() {
+		case "q", "ctrl+c", "esc":
+			return m, tea.Quit
+		case "l":
+			m.showLogs = !m.showLogs
+			m.layout()
+			if m.showLogs {
+				return m, fetchLogs(name)
+			}
+			return m, nil
+		case "/":
+			m.filtering = true
+			return m, m.filter.Focus()
+		case "f":
+			m.follow = !m.follow
+			if m.follow {
+				m.logs.GotoBottom()
+			}
+			return m, nil
+		case "s":
+			if name != "" {
+				m.status = "stopping " + name + "…"
+				return m, func() tea.Msg {
+					if err := docker.Stop(name); err != nil {
+						return actionMsg("stop failed: " + err.Error())
+					}
+					return actionMsg("stopped " + name)
+				}
+			}
+		case "x":
+			if name != "" {
+				if m.confirmRemove != name {
+					m.confirmRemove = name
+					m.status = "press x again to remove " + name
+					return m, nil
+				}
+				m.status = "removing " + name + "…"
+				return m, func() tea.Msg {
+					if err := docker.Remove(name); err != nil {
+						return actionMsg("remove failed: " + err.Error())
+					}
+					return actionMsg("removed " + name)
+				}
+			}
+		case "R":
+			if name != "" {
+				m.status = "restarting " + name + "…"
+				return m, func() tea.Msg {
+					if err := docker.Restart(name); err != nil {
+						return actionMsg("restart failed: " + err.Error())
+					}
+					return actionMsg("restarted " + name)
+				}
+			}
+		case "o":
+			if name != "" {
+				if port := m.selectedPort(); port != "" {
+					if err := platform.OpenURL("http://localhost:" + port); err != nil {
+						m.status = "open failed: " + err.Error()
+					}
+				}
+			}
+		case "c":
+			if name != "" {
+				if port := m.selectedPort(); port != "" {
+					url := "http://localhost:" + port
+					if err := platform.CopyText(url); err != nil {
+						m.status = "copy failed: " + err.Error()
+					} else {
+						m.status = "copied " + url
+					}
+				}
+			}
+		case "r":
+			return m, loadRows()
+		case "k":
+			m.table.MoveUp(1)
+			return m, fetchLogs(m.selected())
+		case "j":
+			m.table.MoveDown(1)
+			return m, fetchLogs(m.selected())
+		}
+	}
+	var cmd tea.Cmd
+	m.table, cmd = m.table.Update(msg)
+	return m, cmd
+}
+
+func (m *dashModel) layout() {
+	available := m.height - 11
+	if m.filtering || m.filter.Value() != "" {
+		available -= 2
+	}
+	if !m.showLogs {
+		m.table.SetHeight(max(available, 5))
+		return
+	}
+	tableH := min(12, max(available/2, 5))
+	m.table.SetHeight(tableH)
+	logsH := available - tableH
+	if logsH < 3 {
+		logsH = 3
+	}
+	m.logs.SetHeight(logsH)
+}
+
+func (m dashModel) selectedDetailView() string {
+	row := m.table.SelectedRow()
+	if len(row) < 6 {
+		return ""
+	}
+	title := lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("229")).Render(row[0])
+	meta := row[2] + " · " + row[1]
+	if row[3] != "" {
+		meta += " · port " + row[3]
+	}
+	if row[4] != "" {
+		meta += " · " + row[4]
+	}
+	if row[5] != "" {
+		meta += " · " + row[5]
+	}
+	return title + "\n" + helpStyle.Render(meta)
+}
+
+func (m dashModel) View() tea.View {
+	var b strings.Builder
+	running := 0
+	for _, row := range m.allRows {
+		if len(row) > 1 && strings.Contains(row[1], "running") {
+			running++
+		}
+	}
+	b.WriteString(titleStyle.Render("🦞 homarr instances") + "  " + helpStyle.Render(fmt.Sprintf("%d total · %d running · %d shown", len(m.allRows), running, len(m.table.Rows()))))
+	b.WriteString("\n\n")
+	if m.filtering || m.filter.Value() != "" {
+		b.WriteString(m.filter.View() + "\n\n")
+	}
+	if len(m.table.Rows()) == 0 {
+		message := "no homarr containers — start one with `homarr run <tag>` or `homarr run --pr N`"
+		if len(m.allRows) > 0 {
+			message = "no instances match " + m.filter.Value()
+		}
+		b.WriteString(helpStyle.Render("  " + message + "\n"))
+	} else {
+		b.WriteString(m.table.View())
+		b.WriteString("\n")
+	}
+	if detail := m.selectedDetailView(); detail != "" {
+		b.WriteString("\n" + detail + "\n")
+	}
+	if m.showLogs && len(m.table.Rows()) > 0 {
+		mode := "paused"
+		if m.follow {
+			mode = "following"
+		}
+		b.WriteString("\n" + logHeadSt.Render("── logs: "+m.selected()+" ("+mode+") ──") + "\n")
+		b.WriteString(m.logs.View())
+	}
+	if m.status != "" {
+		statusStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("42"))
+		lower := strings.ToLower(m.status)
+		if strings.Contains(lower, "fail") || strings.Contains(lower, "error") {
+			statusStyle = statusStyle.Foreground(lipgloss.Color("196"))
+		} else if strings.Contains(lower, "press x") {
+			statusStyle = statusStyle.Foreground(lipgloss.Color("214"))
+		}
+		b.WriteString("\n" + statusStyle.Render(m.status))
+	}
+	b.WriteString("\n\n" + helpStyle.Render("/ filter · ↑/↓ select · l logs · f follow · pgup/pgdn scroll · s stop · R restart · x remove · o open · c copy URL · r refresh · d development · q quit"))
+	b.WriteString("\n" + helpStyle.Render(runningLegend+" · "+stoppedLegend))
+	v := tea.NewView(b.String())
+	v.AltScreen = true
+	v.WindowTitle = "🦞 Homarr instances"
+	return v
+}
+
+func RunDashboard() error {
+	return runApp(true)
+}
@@ -0,0 +1,62 @@
+package tui
+
+import (
+	"strings"
+	"testing"
+
+	"charm.land/bubbles/v2/table"
+	tea "charm.land/bubbletea/v2"
+)
+
+func TestDashboardRendersRowsAndLogs(t *testing.T) {
+	m := newDashModel()
+	m.table.SetRows([]table.Row{{
+		"homarr_pr_6441",
+		"running",
+		"homarr-test:pr-6441",
+		"7575",
+		"http://localhost:7575",
+		"Up 2 minutes",
+	}})
+	m.logs.SetWidth(104)
+	m.logs.SetHeight(5)
+	m.logs.SetContent("server ready")
+
+	got := m.View().Content
+	for _, want := range []string{"homarr_pr_6441", "server ready"} {
+		if !strings.Contains(got, want) {
+			t.Fatalf("dashboard omitted %q: %q", want, got)
+		}
+	}
+	if !m.View().AltScreen {
+		t.Fatal("dashboard must use the alternate screen")
+	}
+}
+
+func TestDashboardArrowNavigation(t *testing.T) {
+	m := newDashModel()
+	m.table.SetRows([]table.Row{
+		{"homarr_first", "running", "homarr:first", "7575", "", "Up 1 minute"},
+		{"homarr_second", "running", "homarr:second", "7576", "", "Up 1 minute"},
+	})
+
+	updated, _ := m.Update(tea.KeyPressMsg(tea.Key{Code: tea.KeyDown}))
+	got := updated.(dashModel).selected()
+	if got != "homarr_second" {
+		t.Fatalf("down arrow selected %q, want homarr_second", got)
+	}
+}
+
+func TestDashboardIgnoresStaleLogs(t *testing.T) {
+	m := newDashModel()
+	m.table.SetRows([]table.Row{{"homarr_current", "running", "homarr:current", "7575", "", "Up 1 minute"}})
+	m.logs.SetWidth(104)
+	m.logs.SetHeight(5)
+	m.logs.SetContent("current logs")
+
+	updated, _ := m.Update(logsMsg{name: "homarr_old", content: "stale logs"})
+	got := updated.(dashModel).View().Content
+	if strings.Contains(got, "stale logs") || !strings.Contains(got, "current logs") {
+		t.Fatalf("stale log result replaced current content: %q", got)
+	}
+}
@@ -0,0 +1,228 @@
+package tui
+
+import (
+	"errors"
+	"strings"
+	"testing"
+
+	tea "charm.land/bubbletea/v2"
+
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/docker"
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/gh"
+)
+
+func TestPRTableRendersRows(t *testing.T) {
+	m := newPRsModel()
+	m.rows = []prRow{{
+		kind:       "remote",
+		pr:         gh.PR{Number: 6441, Title: "Human PR", Author: "ajnart", CIState: "SUCCESS"},
+		imageState: "yes",
+	}}
+	m.table.SetRows(buildTableRows(m.rows))
+
+	if got := m.View().Content; !strings.Contains(got, "Human PR") {
+		t.Fatalf("table view omitted rows: %q", got)
+	}
+	if !m.View().AltScreen {
+		t.Fatal("development browser must use the alternate screen")
+	}
+}
+
+func TestPRTableArrowNavigation(t *testing.T) {
+	m := newPRsModel()
+	m.rows = []prRow{
+		{kind: "remote", pr: gh.PR{Number: 1, Title: "First"}},
+		{kind: "remote", pr: gh.PR{Number: 2, Title: "Second"}},
+	}
+	m.table.SetRows(buildTableRows(m.rows))
+
+	updated, _ := m.Update(tea.KeyPressMsg(tea.Key{Code: tea.KeyDown}))
+	got := updated.(prsModel).table.SelectedRow()
+	if len(got) < 3 || got[2] != "2" {
+		t.Fatalf("down arrow selected %v, want PR 2", got)
+	}
+}
+
+func TestPRImageChecksAreBounded(t *testing.T) {
+	m := newPRsModel()
+	prs := make([]gh.PR, 20)
+	for i := range prs {
+		prs[i] = gh.PR{Number: i + 1, Title: "PR"}
+	}
+
+	updated, cmd := m.Update(prsLoadedMsg{prs: prs})
+	got := updated.(prsModel)
+	if cmd == nil {
+		t.Fatal("expected image check commands")
+	}
+	if got.imageActive != 6 || len(got.imageQueue) != 14 {
+		t.Fatalf("active=%d queued=%d, want active=6 queued=14", got.imageActive, len(got.imageQueue))
+	}
+}
+
+func TestPRLoadedReusesImageChecksUnlessRefreshIsForced(t *testing.T) {
+	m := newPRsModel()
+	m.rows = []prRow{{kind: "remote", pr: gh.PR{Number: 1}, imageState: "yes"}}
+
+	updated, _ := m.Update(prsLoadedMsg{prs: []gh.PR{{Number: 1}, {Number: 2}}})
+	cached := updated.(prsModel)
+	if cached.rows[0].imageState != "yes" || len(cached.imageQueue) != 0 || cached.imageActive != 1 {
+		t.Fatalf("cached states were not reused: rows=%#v queue=%v active=%d", cached.rows, cached.imageQueue, cached.imageActive)
+	}
+
+	updated, _ = cached.Update(prsLoadedMsg{prs: []gh.PR{{Number: 1}, {Number: 2}}, refresh: true})
+	refreshed := updated.(prsModel)
+	if refreshed.rows[0].imageState != "checking" || refreshed.imageActive != 2 {
+		t.Fatalf("forced refresh reused image states: rows=%#v active=%d", refreshed.rows, refreshed.imageActive)
+	}
+}
+
+func TestDevelopmentRowsFoldCurrentLocalPRImage(t *testing.T) {
+	prs := []gh.PR{{Number: 6502, HeadSHA: "current"}}
+	images := []docker.Image{
+		{Tag: "pr-6502", PRNumber: 6502, Revision: "current"},
+		{Tag: "pr-6502-stale", PRNumber: 6502, Revision: "stale"},
+	}
+
+	rows, queue := developmentRows(prs, images, nil)
+	if len(rows) != 2 || !rows[0].hasCurrentLocalImage() || rows[0].local.Tag != "pr-6502" {
+		t.Fatalf("current image was not folded into PR row: %#v", rows)
+	}
+	if rows[1].kind != "local" || rows[1].local.Tag != "pr-6502-stale" {
+		t.Fatalf("stale image should remain separate: %#v", rows[1])
+	}
+	if got := buildTableRows(rows)[0][6]; got != imgLocal {
+		t.Fatalf("image marker = %q, want %q", got, imgLocal)
+	}
+	if len(queue) != 0 {
+		t.Fatalf("current local image queued unnecessary registry checks: %v", queue)
+	}
+}
+
+func TestLocalPRPlanUsesPRContainerIdentity(t *testing.T) {
+	row := prRow{
+		kind:  "remote",
+		pr:    gh.PR{Number: 6502, HeadSHA: "abcdef1234567890"},
+		local: docker.Image{Tag: "pr-6502", PRNumber: 6502, Revision: "abcdef1234567890"},
+	}
+	plan, err := localPRPlan(row, false, func(int) int { return 7575 })
+	if err != nil {
+		t.Fatal(err)
+	}
+	if plan.Image != "homarr:pr-6502" || plan.Name != "homarr_pr_6502" || plan.Volume != "homarr_pr_6502_data" || plan.Pull || plan.PRNumber != 6502 {
+		t.Fatalf("unexpected local PR plan: %#v", plan)
+	}
+}
+
+func TestRemotePRBuildUsesTemporaryPRWorkflow(t *testing.T) {
+	image, action, status := localBuildForRow(prRow{kind: "remote", pr: gh.PR{Number: 6441}})
+	if image.Tag != "pr-6441" || image.PRNumber != 6441 || action != "built" || !strings.Contains(status, "building PR #6441 locally") {
+		t.Fatalf("image=%#v action=%q status=%q", image, action, status)
+	}
+}
+
+func TestPRImageCheckInProgressDoesNotLaunch(t *testing.T) {
+	m := newPRsModel()
+	m.rows = []prRow{{kind: "remote", pr: gh.PR{Number: 6441, Title: "Pending image"}, imageState: "checking"}}
+	m.table.SetRows(buildTableRows(m.rows))
+
+	updated, cmd := m.Update(tea.KeyPressMsg(tea.Key{Code: tea.KeyEnter}))
+	got := updated.(prsModel)
+	if cmd != nil {
+		t.Fatal("unavailable image returned a launch command")
+	}
+	if !strings.Contains(got.status, "still in progress") {
+		t.Fatalf("status = %q, want launch rejection", got.status)
+	}
+}
+
+func TestPullErrorIncludesLastDockerMessage(t *testing.T) {
+	err := commandErrorWithDetail(errors.New("exit status 1"), "manifest unknown")
+	if !strings.Contains(err.Error(), "manifest unknown") {
+		t.Fatalf("pull error = %v", err)
+	}
+}
+
+func TestOutputTailRetainsBuildFailure(t *testing.T) {
+	tail := &outputTail{}
+	_, _ = tail.Write([]byte("building\r\nERROR: Dockerfile not found\n"))
+	if got := tail.lastLine(); got != "ERROR: Dockerfile not found" {
+		t.Fatalf("last line = %q", got)
+	}
+}
+
+func TestDevTableRendersLocalImageSource(t *testing.T) {
+	m := newPRsModel()
+	m.rows = []prRow{{
+		kind:       "local",
+		local:      docker.Image{Tag: "feature", Source: "/tmp/homarr", Revision: "abcdef1234567890"},
+		imageState: "yes",
+	}}
+	m.table.SetRows(buildTableRows(m.rows))
+
+	content := m.View().Content
+	for _, want := range []string{"local", "homarr:feature", "/tmp/homarr", "abcdef123456"} {
+		if !strings.Contains(content, want) {
+			t.Fatalf("development view omitted %q: %q", want, content)
+		}
+	}
+}
+
+func TestRebuildCompletionRestoresLoadingState(t *testing.T) {
+	m := newPRsModel()
+	m.rebuilding = true
+	image := docker.Image{Tag: "feature"}
+
+	updated, cmd := m.Update(rebuildDoneMsg{image: image})
+	got := updated.(prsModel)
+	if got.rebuilding || !got.loading || got.status != "rebuilt homarr:feature" || cmd == nil {
+		t.Fatalf("unexpected rebuild state: rebuilding=%v loading=%v status=%q", got.rebuilding, got.loading, got.status)
+	}
+}
+
+func TestRebuildCanBeCanceled(t *testing.T) {
+	m := newPRsModel()
+	canceled := false
+	m.rebuilding = true
+	m.rebuildCancel = func() { canceled = true }
+
+	updated, cmd := m.Update(tea.KeyPressMsg(tea.Key{Code: 'q'}))
+	got := updated.(prsModel)
+	if !canceled || cmd != nil || got.status != "canceling rebuild…" {
+		t.Fatalf("cancel state: canceled=%v status=%q", canceled, got.status)
+	}
+}
+
+func TestNavigationRemainsAvailableDuringBuild(t *testing.T) {
+	m := newPRsModel()
+	m.rebuilding = true
+	m.rows = []prRow{
+		{kind: "remote", pr: gh.PR{Number: 1}},
+		{kind: "remote", pr: gh.PR{Number: 2}},
+	}
+	m.table.SetRows(buildTableRows(m.rows))
+
+	updated, _ := m.Update(tea.KeyPressMsg(tea.Key{Code: tea.KeyDown}))
+	selected := updated.(prsModel).table.SelectedRow()
+	if len(selected) < 3 || selected[2] != "2" {
+		t.Fatalf("build blocked navigation: %v", selected)
+	}
+}
+
+func TestCompletedPullWithoutPlanDoesNotPanic(t *testing.T) {
+	m := newPRsModel()
+	m.pulling = true
+	m.pullCancel = func() {}
+
+	updated, cmd := m.Update(pullEvent{done: true})
+	got := updated.(prsModel)
+	if got.pulling || cmd != nil {
+		t.Fatalf("pulling=%v cmd=%v", got.pulling, cmd)
+	}
+}
+
+func TestTruncateTextPreservesUTF8(t *testing.T) {
+	if got := truncateText("🦞homarr", 2); got != "🦞h" {
+		t.Fatalf("truncateText() = %q", got)
+	}
+}
@@ -0,0 +1,301 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+
+	"github.com/spf13/cobra"
+
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/docker"
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/platform"
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/run"
+	"github.com/homarr-labs/homarr/tools/homarr-dev/internal/tui"
+)
+
+var (
+	flagDemo    bool
+	flagPR      int
+	flagEnv     []string
+	flagDetach  bool
+	flagBuildPR int
+	runMain     = tui.RunDev
+)
+
+func main() {
+	if err := rootCmd.Execute(); err != nil {
+		os.Exit(1)
+	}
+}
+
+var rootCmd = &cobra.Command{
+	Use:          "homarr",
+	Short:        "Launch and manage Homarr Docker instances",
+	SilenceUsage: true,
+	Long: `Launch and manage Homarr Docker containers.
+
+Start a local image, a PR test build from ghcr.io, browse open PRs,
+or manage running instances from an interactive dashboard.
+
+Examples:
+  homarr run dev                # launch local homarr:dev image
+  homarr run --pr 6390          # launch remote PR test image
+  homarr run --pr 6390 --demo   # PR + demo mode
+  homarr run -e FOO=bar dev     # extra env vars
+  homarr run --detach dev       # start in background
+  homarr dash                   # interactive instance dashboard
+  homarr dev                    # browse remote PRs and local images
+  homarr build feature          # build this checkout as homarr:feature
+  homarr build --pr 6390        # build PR #6390 locally as homarr:pr-6390
+  homarr list                   # script-friendly instance list
+  homarr logs homarr_pr_6390    # follow logs
+  homarr doctor                 # check Docker and optional integrations`,
+	Args: cobra.NoArgs,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return runMain()
+	},
+}
+
+var dashCmd = &cobra.Command{
+	Use:   "dash",
+	Short: "Interactive dashboard of running instances",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return tui.RunDashboard()
+	},
+}
+
+var runCmd = &cobra.Command{
+	Use:   "run [tag]",
+	Short: "Launch a local image or remote pull-request image",
+	Args:  cobra.MaximumNArgs(1),
+	RunE:  runLaunch,
+}
+
+var devCmd = &cobra.Command{
+	Use:   "dev",
+	Short: "Browse remote PRs and local development images",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return tui.RunDev()
+	},
+}
+
+var buildCmd = &cobra.Command{
+	Use:   "build [name]",
+	Short: "Build a local Homarr image from this checkout or a pull request",
+	Args:  cobra.MaximumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		tag := ""
+		if len(args) > 0 {
+			tag = args[0]
+		}
+		if flagBuildPR < 0 {
+			return fmt.Errorf("PR number must be positive")
+		}
+		if flagBuildPR > 0 {
+			if tag == "" {
+				tag = fmt.Sprintf("pr-%d", flagBuildPR)
+			}
+			return run.BuildPRImage(flagBuildPR, tag)
+		}
+		if tag == "" {
+			return fmt.Errorf("image name is required when --pr is not set")
+		}
+		return run.BuildCurrentImage(tag, ".")
+	},
+}
+
+var rebuildCmd = &cobra.Command{
+	Use:   "rebuild <name>",
+	Short: "Rebuild a local image from its recorded checkout or pull request",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		images, err := docker.ListLocalImages(cmd.Context())
+		if err != nil {
+			return err
+		}
+		for _, image := range images {
+			if image.Tag == args[0] || image.Reference() == args[0] {
+				return run.RebuildImage(image)
+			}
+		}
+		return fmt.Errorf("local image homarr:%s was not found", strings.TrimPrefix(args[0], "homarr:"))
+	},
+}
+
+var logsCmd = &cobra.Command{
+	Use:   "logs <container>",
+	Short: "Follow logs of a running instance",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return docker.FollowLogs(args[0])
+	},
+}
+
+var stopCmd = &cobra.Command{
+	Use:   "stop <container>",
+	Short: "Stop a running instance",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return docker.Stop(args[0])
+	},
+}
+
+var restartCmd = &cobra.Command{
+	Use:   "restart <container>",
+	Short: "Restart a running instance",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return docker.Restart(args[0])
+	},
+}
+
+var removeCmd = &cobra.Command{
+	Use:   "remove <container>",
+	Short: "Force-remove an instance",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return docker.Remove(args[0])
+	},
+}
+
+var openCmd = &cobra.Command{
+	Use:   "open <container>",
+	Short: "Open a running instance in the browser",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		containers, err := docker.List()
+		if err != nil {
+			return err
+		}
+		for _, container := range containers {
+			if container.Name != args[0] {
+				continue
+			}
+			if !container.Running() {
+				return fmt.Errorf("container %q is not running", args[0])
+			}
+			port := container.HostPort()
+			if port == "" {
+				return fmt.Errorf("container %q does not publish the Homarr port", args[0])
+			}
+			return platform.OpenURL("http://localhost:" + port)
+		}
+		return fmt.Errorf("container %q was not found", args[0])
+	},
+}
+
+var listCmd = &cobra.Command{
+	Use:     "list",
+	Aliases: []string{"ls"},
+	Short:   "List Homarr instances without opening the dashboard",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		containers, err := docker.List()
+		if err != nil {
+			return err
+		}
+		if len(containers) == 0 {
+			fmt.Println("No Homarr instances found.")
+			return nil
+		}
+		fmt.Printf("%-28s %-10s %-7s %s\n", "NAME", "STATE", "PORT", "IMAGE")
+		for _, container := range containers {
+			fmt.Printf("%-28s %-10s %-7s %s\n", container.Name, container.State, container.HostPort(), container.Image)
+		}
+		return nil
+	},
+}
+
+var doctorCmd = &cobra.Command{
+	Use:   "doctor",
+	Short: "Check Docker and optional developer CLI integrations",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		failed := false
+		output, err := exec.Command("docker", "info", "--format", "{{.ServerVersion}}").CombinedOutput()
+		if err != nil {
+			failed = true
+			fmt.Printf("✗ Docker daemon: %s\n", strings.TrimSpace(string(output)))
+		} else {
+			fmt.Printf("✓ Docker daemon: %s\n", strings.TrimSpace(string(output)))
+		}
+
+		if _, err := exec.LookPath("gh"); err != nil {
+			fmt.Println("- GitHub CLI not found (optional; required for pull-request features)")
+		} else if output, err := exec.Command("gh", "auth", "status").CombinedOutput(); err != nil {
+			fmt.Printf("- GitHub CLI is not authenticated (optional; run `gh auth login` for pull-request features): %s\n", strings.TrimSpace(string(output)))
+		} else {
+			fmt.Println("✓ GitHub CLI authentication")
+		}
+
+		if _, err := exec.LookPath("homarr"); err != nil {
+			fmt.Println("- homarr is not on PATH (optional; use `pnpm dev:cli -- ...` or run `pnpm dev:cli:install`)")
+		} else {
+			fmt.Println("✓ homarr is on PATH")
+		}
+		if failed {
+			return fmt.Errorf("one or more checks failed")
+		}
+		return nil
+	},
+}
+
+func init() {
+	runCmd.Flags().BoolVarP(&flagDemo, "demo", "m", false, "Demo mode (mock integrations)")
+	runCmd.Flags().IntVarP(&flagPR, "pr", "p", 0, "Launch PR test image from ghcr.io")
+	runCmd.Flags().StringArrayVarP(&flagEnv, "env", "e", nil, "Extra env vars (repeatable, KEY=VALUE)")
+	runCmd.Flags().BoolVar(&flagDetach, "detach", false, "Start in the background")
+	buildCmd.Flags().IntVarP(&flagBuildPR, "pr", "p", 0, "Build a pull request in a temporary checkout")
+
+	rootCmd.AddCommand(runCmd, dashCmd, devCmd, buildCmd, rebuildCmd, listCmd, logsCmd, stopCmd, restartCmd, removeCmd, openCmd, doctorCmd)
+}
+
+func runLaunch(cmd *cobra.Command, args []string) error {
+	tag := ""
+	if len(args) > 0 {
+		tag = args[0]
+	}
+	if flagPR < 0 {
+		return fmt.Errorf("PR number must be positive")
+	}
+	if flagPR > 0 && tag != "" {
+		return fmt.Errorf("tag and --pr cannot be used together")
+	}
+	if flagPR == 0 && tag == "" {
+		if err := cmd.Usage(); err != nil {
+			return err
+		}
+		return fmt.Errorf("provide a tag or --pr")
+	}
+
+	plan, err := run.BuildPlan(run.Options{
+		Context:    cmd.Context(),
+		PR:         flagPR,
+		Tag:        tag,
+		Demo:       flagDemo,
+		Env:        flagEnv,
+		FetchTitle: flagPR > 0,
+	})
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Starting Homarr (%s)\n", plan.Label)
+	fmt.Printf("  Image     : %s\n", plan.Image)
+	fmt.Printf("  Container : %s\n", plan.Name)
+	fmt.Printf("  Volume    : %s\n", plan.Volume)
+	fmt.Printf("  Port      : %d:7575\n", plan.HostPort)
+	fmt.Printf("  URL       : http://localhost:%d\n", plan.HostPort)
+	if plan.PRNumber > 0 {
+		fmt.Printf("  PR        : https://github.com/homarr-labs/homarr/pull/%d\n", plan.PRNumber)
+	}
+	fmt.Println()
+
+	if flagDetach {
+		if err := run.StartDetached(plan); err != nil {
+			return err
+		}
+		fmt.Printf("Started in background: http://localhost:%d\n", plan.HostPort)
+		return nil
+	}
+	return run.StartForeground(plan)
+}
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"errors"
+	"strings"
+	"testing"
+)
+
+func TestRootCommandLaunchesDevelopmentDashboard(t *testing.T) {
+	want := errors.New("dashboard started")
+	previous := runMain
+	t.Cleanup(func() { runMain = previous })
+	runMain = func() error { return want }
+
+	if err := rootCmd.RunE(rootCmd, nil); !errors.Is(err, want) {
+		t.Fatalf("root command error = %v", err)
+	}
+}
+
+func TestRunLaunchRejectsTagWithPR(t *testing.T) {
+	previousPR := flagPR
+	t.Cleanup(func() { flagPR = previousPR })
+	flagPR = 42
+
+	err := runLaunch(runCmd, []string{"feature"})
+	if err == nil || !strings.Contains(err.Error(), "cannot be used together") {
+		t.Fatalf("error = %v", err)
+	}
+}
+
+func TestRunLaunchRejectsNegativePR(t *testing.T) {
+	previousPR := flagPR
+	t.Cleanup(func() { flagPR = previousPR })
+	flagPR = -1
+
+	err := runLaunch(runCmd, nil)
+	if err == nil || !strings.Contains(err.Error(), "must be positive") {
+		t.Fatalf("error = %v", err)
+	}
+}
+
+func TestRunLaunchRejectsMissingImage(t *testing.T) {
+	previousPR := flagPR
+	t.Cleanup(func() { flagPR = previousPR })
+	flagPR = 0
+
+	err := runLaunch(runCmd, nil)
+	if err == nil || !strings.Contains(err.Error(), "provide a tag or --pr") {
+		t.Fatalf("error = %v", err)
+	}
+}
Author	SHA1	Message	Date
Thomas Camlong	ae2a1df453	fix(dev): preserve background build errors	2026-08-02 08:26:56 +02:00
Thomas Camlong	ca7e50fb96	docs(dev): explain local PR preference	2026-08-02 08:19:45 +02:00
Thomas Camlong	db6aa0b26e	feat(dev): prefer current local PR builds	2026-08-02 08:19:29 +02:00
Thomas Camlong	d096aecd59	feat(dev): track pull request head revisions	2026-08-02 08:19:12 +02:00
Thomas Camlong	49a41431b9	docs(dev): document dashboard navigation	2026-08-01 23:49:23 +02:00
Thomas Camlong	df587ec76a	feat(dev): toggle dashboard screens	2026-08-01 23:49:23 +02:00
Thomas Camlong	3b450eb04a	feat(dev): launch browser by default	2026-08-01 23:49:23 +02:00
Thomas	406fb4c0b6	Merge branch 'dev' into feat/dev-cli-tool	2026-08-01 23:46:16 +02:00
Thomas Camlong	f23c35645c	fix(dev): surface registry pull errors	2026-08-01 23:40:41 +02:00
Thomas Camlong	667bf62396	docs(dev): document remote PR builds	2026-08-01 23:36:38 +02:00
Thomas Camlong	c5a056b8e5	feat(dev): build remote pull requests locally	2026-08-01 23:35:08 +02:00
Thomas Camlong	934b6e69f4	fix(dev): shallow clone pull requests	2026-08-01 23:35:08 +02:00
Thomas Camlong	c8c5dbc506	fix(dev): cache GitHub pull requests	2026-08-01 23:35:08 +02:00
Thomas	797bdd001f	fix: keep direct icon URLs visible (#6504 )	2026-08-01 23:28:18 +02:00
Bergasha	49314533bf	feat(Media player widget): expands on Direct Play and Transcoding badges (#6489 )	2026-08-01 23:21:13 +02:00
Thomas	27ca058088	feat(widgets): persist Beszel and Docker table layouts (#6490 )	2026-08-01 23:20:09 +02:00
homarr-releases[bot]	f4449f9581	chore: update bug report template (#6498 )	2026-08-01 23:08:14 +02:00
Thomas	b52bc03c8d	Merge pull request #6499 from homarr-labs/docs/update-helm-docs docs(helm): update chart installation page	2026-08-01 23:07:58 +02:00
Thomas Camlong	b1e79e4641	fix(dev): keep optional tools optional	2026-08-01 14:01:52 +02:00
Thomas Camlong	5b04ed1ab5	refactor(dev): make setup explicit and portable	2026-07-31 23:52:14 +02:00
github-actions[bot]	bd669a1a8f	docs(helm): update chart installation page	2026-07-31 19:35:37 +00:00
Thomas Camlong	b733ed6a79	fix(dev): make key creation atomic	2026-07-31 15:28:00 +02:00
Thomas Camlong	ae3e9f7793	fix(dev): persist unique local encryption key	2026-07-31 15:11:38 +02:00
Thomas Camlong	c8485ed7fc	fix(dev): address CLI review feedback	2026-07-31 14:53:43 +02:00
Thomas Camlong	e97eb7fc58	feat(dev): add Docker development CLI	2026-07-31 14:28:31 +02:00