refactor(backends): cleanup code

.github/workflows/release.yml

@@ -77,7 +77,8 @@ jobs:
 
   publish-release:
     runs-on: ubuntu-latest
-    needs: [build-images]
+    needs: [build-images, determine-release-type]
+    if: needs.determine-release-type.outputs.release_type == 'release'
     outputs:
       id: ${{ steps.create_release.outputs.id }}
     steps:

.gitignore

@@ -9,3 +9,6 @@
 .env
 .turbo
 CLAUDE.md
+
+mutagen.yml.lock
+notes.md

Dockerfile

@@ -2,8 +2,11 @@ ARG BUN_VERSION="1.3.1"
 
 FROM oven/bun:${BUN_VERSION}-alpine AS base
 
-RUN apk add --no-cache davfs2=1.6.1-r2
-
+RUN apk add --no-cache \
+    davfs2=1.6.1-r2 \
+    mariadb-client \
+    mysql-client \
+    postgresql-client
 
 # ------------------------------
 # DEPENDENCIES

README.md

@@ -6,7 +6,7 @@
   </a>
   <br />
   <figure>
-    <img src="https://github.com/nicotsx/ironmount/blob/main/screenshots/volume-details.png?raw=true" alt="Demo" />
+    <img src="https://github.com/nicotsx/ironmount/blob/main/screenshots/backup-details.png?raw=true" alt="Demo" />
     <figcaption>
       <p align="center">
         Backup management with scheduling and monitoring
@@ -36,10 +36,11 @@ In order to run Ironmount, you need to have Docker and Docker Compose installed
 ```yaml
 services:
   ironmount:
-    image: ghcr.io/nicotsx/ironmount:v0.6
+    image: ghcr.io/nicotsx/ironmount:v0.9
     container_name: ironmount
     restart: unless-stopped
-    privileged: true
+    cap_add:
+      - SYS_ADMIN
     ports:
       - "4096:4096"
     devices:
@@ -67,7 +68,7 @@ If you want to track a local directory on the same server where Ironmount is run
 ```diff
 services:
   ironmount:
-    image: ghcr.io/nicotsx/ironmount:v0.6
+    image: ghcr.io/nicotsx/ironmount:v0.9
     container_name: ironmount
     restart: unless-stopped
     cap_add:
@@ -132,10 +133,11 @@ Ironmount can use [rclone](https://rclone.org/) to support 40+ cloud storage pro
    ```diff
    services:
      ironmount:
-       image: ghcr.io/nicotsx/ironmount:v0.6
+       image: ghcr.io/nicotsx/ironmount:v0.9
        container_name: ironmount
        restart: unless-stopped
-       privileged: true
+       cap_add:
+         - SYS_ADMIN
        ports:
          - "4096:4096"
        devices:
@@ -187,7 +189,7 @@ In order to enable this feature, you need to change your bind mount `/var/lib/ir
 ```diff
 services:
   ironmount:
-    image: ghcr.io/nicotsx/ironmount:v0.6
+    image: ghcr.io/nicotsx/ironmount:v0.9
     container_name: ironmount
     restart: unless-stopped
     ports:
@@ -215,7 +217,7 @@ In order to enable this feature, you need to run Ironmount with several items sh
 ```diff
 services:
   ironmount:
-    image: ghcr.io/nicotsx/ironmount:v0.6
+    image: ghcr.io/nicotsx/ironmount:v0.9
     container_name: ironmount
     restart: unless-stopped
     cap_add:

app/client/api-client/client.gen.ts

@@ -1,7 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import { type ClientOptions, type Config, createClient, createConfig } from "./client";
-import type { ClientOptions as ClientOptions2 } from "./types.gen";
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
 
 /**
  * The `createClientConfig()` function will be called on client initialization
@@ -11,12 +11,8 @@ import type { ClientOptions as ClientOptions2 } from "./types.gen";
  * `setConfig()`. This is useful for example if you're using Next.js
  * to ensure your client always has the correct values.
  */
-export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (
-	override?: Config<ClientOptions & T>,
-) => Config<Required<ClientOptions> & T>;
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
 
-export const client = createClient(
-	createConfig<ClientOptions2>({
-		baseUrl: "http://192.168.2.42:4096",
-	}),
-);
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://192.168.2.42:4096'
+}));

app/client/api-client/client/client.gen.ts

@@ -1,278 +1,301 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import { createSseClient } from "../core/serverSentEvents.gen";
-import type { HttpMethod } from "../core/types.gen";
-import { getValidRequestBody } from "../core/utils.gen";
-import type { Client, Config, RequestOptions, ResolvedRequestOptions } from "./types.gen";
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
 import {
-	buildUrl,
-	createConfig,
-	createInterceptors,
-	getParseAs,
-	mergeConfigs,
-	mergeHeaders,
-	setAuthParams,
-} from "./utils.gen";
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
 
-type ReqInit = Omit<RequestInit, "body" | "headers"> & {
-	body?: any;
-	headers: ReturnType<typeof mergeHeaders>;
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
 };
 
 export const createClient = (config: Config = {}): Client => {
-	let _config = mergeConfigs(createConfig(), config);
+  let _config = mergeConfigs(createConfig(), config);
 
-	const getConfig = (): Config => ({ ..._config });
+  const getConfig = (): Config => ({ ..._config });
 
-	const setConfig = (config: Config): Config => {
-		_config = mergeConfigs(_config, config);
-		return getConfig();
-	};
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
 
-	const interceptors = createInterceptors<Request, Response, unknown, ResolvedRequestOptions>();
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
 
-	const beforeRequest = async (options: RequestOptions) => {
-		const opts = {
-			..._config,
-			...options,
-			fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
-			headers: mergeHeaders(_config.headers, options.headers),
-			serializedBody: undefined,
-		};
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
 
-		if (opts.security) {
-			await setAuthParams({
-				...opts,
-				security: opts.security,
-			});
-		}
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
 
-		if (opts.requestValidator) {
-			await opts.requestValidator(opts);
-		}
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
 
-		if (opts.body !== undefined && opts.bodySerializer) {
-			opts.serializedBody = opts.bodySerializer(opts.body);
-		}
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
 
-		// remove Content-Type header if body is empty to avoid sending invalid requests
-		if (opts.body === undefined || opts.serializedBody === "") {
-			opts.headers.delete("Content-Type");
-		}
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
 
-		const url = buildUrl(opts);
+    const url = buildUrl(opts);
 
-		return { opts, url };
-	};
+    return { opts, url };
+  };
 
-	const request: Client["request"] = async (options) => {
-		// @ts-expect-error
-		const { opts, url } = await beforeRequest(options);
-		const requestInit: ReqInit = {
-			redirect: "follow",
-			...opts,
-			body: getValidRequestBody(opts),
-		};
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
 
-		let request = new Request(url, requestInit);
+    let request = new Request(url, requestInit);
 
-		for (const fn of interceptors.request.fns) {
-			if (fn) {
-				request = await fn(request, opts);
-			}
-		}
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
 
-		// fetch must be assigned here, otherwise it would throw the error:
-		// TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
-		const _fetch = opts.fetch!;
-		let response: Response;
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response: Response;
 
-		try {
-			response = await _fetch(request);
-		} catch (error) {
-			// Handle fetch exceptions (AbortError, network errors, etc.)
-			let finalError = error;
+    try {
+      response = await _fetch(request);
+    } catch (error) {
+      // Handle fetch exceptions (AbortError, network errors, etc.)
+      let finalError = error;
 
-			for (const fn of interceptors.error.fns) {
-				if (fn) {
-					finalError = (await fn(error, undefined as any, request, opts)) as unknown;
-				}
-			}
+      for (const fn of interceptors.error.fns) {
+        if (fn) {
+          finalError = (await fn(
+            error,
+            undefined as any,
+            request,
+            opts,
+          )) as unknown;
+        }
+      }
 
-			finalError = finalError || ({} as unknown);
+      finalError = finalError || ({} as unknown);
 
-			if (opts.throwOnError) {
-				throw finalError;
-			}
+      if (opts.throwOnError) {
+        throw finalError;
+      }
 
-			// Return error response
-			return opts.responseStyle === "data"
-				? undefined
-				: {
-						error: finalError,
-						request,
-						response: undefined as any,
-					};
-		}
+      // Return error response
+      return opts.responseStyle === 'data'
+        ? undefined
+        : {
+            error: finalError,
+            request,
+            response: undefined as any,
+          };
+    }
 
-		for (const fn of interceptors.response.fns) {
-			if (fn) {
-				response = await fn(response, request, opts);
-			}
-		}
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
 
-		const result = {
-			request,
-			response,
-		};
+    const result = {
+      request,
+      response,
+    };
 
-		if (response.ok) {
-			const parseAs =
-				(opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json";
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
 
-			if (response.status === 204 || response.headers.get("Content-Length") === "0") {
-				let emptyData: any;
-				switch (parseAs) {
-					case "arrayBuffer":
-					case "blob":
-					case "text":
-						emptyData = await response[parseAs]();
-						break;
-					case "formData":
-						emptyData = new FormData();
-						break;
-					case "stream":
-						emptyData = response.body;
-						break;
-					case "json":
-					default:
-						emptyData = {};
-						break;
-				}
-				return opts.responseStyle === "data"
-					? emptyData
-					: {
-							data: emptyData,
-							...result,
-						};
-			}
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
 
-			let data: any;
-			switch (parseAs) {
-				case "arrayBuffer":
-				case "blob":
-				case "formData":
-				case "json":
-				case "text":
-					data = await response[parseAs]();
-					break;
-				case "stream":
-					return opts.responseStyle === "data"
-						? response.body
-						: {
-								data: response.body,
-								...result,
-							};
-			}
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
 
-			if (parseAs === "json") {
-				if (opts.responseValidator) {
-					await opts.responseValidator(data);
-				}
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
 
-				if (opts.responseTransformer) {
-					data = await opts.responseTransformer(data);
-				}
-			}
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
 
-			return opts.responseStyle === "data"
-				? data
-				: {
-						data,
-						...result,
-					};
-		}
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
 
-		const textError = await response.text();
-		let jsonError: unknown;
+    const textError = await response.text();
+    let jsonError: unknown;
 
-		try {
-			jsonError = JSON.parse(textError);
-		} catch {
-			// noop
-		}
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
 
-		const error = jsonError ?? textError;
-		let finalError = error;
+    const error = jsonError ?? textError;
+    let finalError = error;
 
-		for (const fn of interceptors.error.fns) {
-			if (fn) {
-				finalError = (await fn(error, response, request, opts)) as string;
-			}
-		}
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
 
-		finalError = finalError || ({} as string);
+    finalError = finalError || ({} as string);
 
-		if (opts.throwOnError) {
-			throw finalError;
-		}
+    if (opts.throwOnError) {
+      throw finalError;
+    }
 
-		// TODO: we probably want to return error and improve types
-		return opts.responseStyle === "data"
-			? undefined
-			: {
-					error: finalError,
-					...result,
-				};
-	};
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
 
-	const makeMethodFn = (method: Uppercase<HttpMethod>) => (options: RequestOptions) => request({ ...options, method });
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
 
-	const makeSseFn = (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
-		const { opts, url } = await beforeRequest(options);
-		return createSseClient({
-			...opts,
-			body: opts.body as BodyInit | null | undefined,
-			headers: opts.headers as unknown as Record<string, string>,
-			method,
-			onRequest: async (url, init) => {
-				let request = new Request(url, init);
-				for (const fn of interceptors.request.fns) {
-					if (fn) {
-						request = await fn(request, opts);
-					}
-				}
-				return request;
-			},
-			url,
-		});
-	};
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
 
-	return {
-		buildUrl,
-		connect: makeMethodFn("CONNECT"),
-		delete: makeMethodFn("DELETE"),
-		get: makeMethodFn("GET"),
-		getConfig,
-		head: makeMethodFn("HEAD"),
-		interceptors,
-		options: makeMethodFn("OPTIONS"),
-		patch: makeMethodFn("PATCH"),
-		post: makeMethodFn("POST"),
-		put: makeMethodFn("PUT"),
-		request,
-		setConfig,
-		sse: {
-			connect: makeSseFn("CONNECT"),
-			delete: makeSseFn("DELETE"),
-			get: makeSseFn("GET"),
-			head: makeSseFn("HEAD"),
-			options: makeSseFn("OPTIONS"),
-			patch: makeSseFn("PATCH"),
-			post: makeSseFn("POST"),
-			put: makeSseFn("PUT"),
-			trace: makeSseFn("TRACE"),
-		},
-		trace: makeMethodFn("TRACE"),
-	} as Client;
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
 };

app/client/api-client/client/index.ts

@@ -1,25 +1,25 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-export type { Auth } from "../core/auth.gen";
-export type { QuerySerializerOptions } from "../core/bodySerializer.gen";
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
 export {
-	formDataBodySerializer,
-	jsonBodySerializer,
-	urlSearchParamsBodySerializer,
-} from "../core/bodySerializer.gen";
-export { buildClientParams } from "../core/params.gen";
-export { serializeQueryKeyValue } from "../core/queryKeySerializer.gen";
-export { createClient } from "./client.gen";
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
 export type {
-	Client,
-	ClientOptions,
-	Config,
-	CreateClientConfig,
-	Options,
-	RequestOptions,
-	RequestResult,
-	ResolvedRequestOptions,
-	ResponseStyle,
-	TDataShape,
-} from "./types.gen";
-export { createConfig, mergeHeaders } from "./utils.gen";
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';

app/client/api-client/client/types.gen.ts

@@ -1,174 +1,210 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Auth } from "../core/auth.gen";
-import type { ServerSentEventsOptions, ServerSentEventsResult } from "../core/serverSentEvents.gen";
-import type { Client as CoreClient, Config as CoreConfig } from "../core/types.gen";
-import type { Middleware } from "./utils.gen";
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = "data" | "fields";
+export type ResponseStyle = 'data' | 'fields';
 
 export interface Config<T extends ClientOptions = ClientOptions>
-	extends Omit<RequestInit, "body" | "headers" | "method">,
-		CoreConfig {
-	/**
-	 * Base URL for all requests made by this client.
-	 */
-	baseUrl?: T["baseUrl"];
-	/**
-	 * Fetch API implementation. You can use this option to provide a custom
-	 * fetch instance.
-	 *
-	 * @default globalThis.fetch
-	 */
-	fetch?: typeof fetch;
-	/**
-	 * Please don't use the Fetch client for Next.js applications. The `next`
-	 * options won't have any effect.
-	 *
-	 * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
-	 */
-	next?: never;
-	/**
-	 * Return the response data parsed in a specified format. By default, `auto`
-	 * will infer the appropriate method from the `Content-Type` response header.
-	 * You can override this behavior with any of the {@link Body} methods.
-	 * Select `stream` if you don't want to parse response data at all.
-	 *
-	 * @default 'auto'
-	 */
-	parseAs?: "arrayBuffer" | "auto" | "blob" | "formData" | "json" | "stream" | "text";
-	/**
-	 * Should we return only data or multiple fields (data, error, response, etc.)?
-	 *
-	 * @default 'fields'
-	 */
-	responseStyle?: ResponseStyle;
-	/**
-	 * Throw an error instead of returning it in the response?
-	 *
-	 * @default false
-	 */
-	throwOnError?: T["throwOnError"];
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
 }
 
 export interface RequestOptions<
-	TData = unknown,
-	TResponseStyle extends ResponseStyle = "fields",
-	ThrowOnError extends boolean = boolean,
-	Url extends string = string,
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
 > extends Config<{
-			responseStyle: TResponseStyle;
-			throwOnError: ThrowOnError;
-		}>,
-		Pick<
-			ServerSentEventsOptions<TData>,
-			"onSseError" | "onSseEvent" | "sseDefaultRetryDelay" | "sseMaxRetryAttempts" | "sseMaxRetryDelay"
-		> {
-	/**
-	 * Any body that you want to add to your request.
-	 *
-	 * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
-	 */
-	body?: unknown;
-	path?: Record<string, unknown>;
-	query?: Record<string, unknown>;
-	/**
-	 * Security mechanism(s) to use for the request.
-	 */
-	security?: ReadonlyArray<Auth>;
-	url: Url;
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
 }
 
 export interface ResolvedRequestOptions<
-	TResponseStyle extends ResponseStyle = "fields",
-	ThrowOnError extends boolean = boolean,
-	Url extends string = string,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
 > extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
-	serializedBody?: string;
+  serializedBody?: string;
 }
 
 export type RequestResult<
-	TData = unknown,
-	TError = unknown,
-	ThrowOnError extends boolean = boolean,
-	TResponseStyle extends ResponseStyle = "fields",
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
 > = ThrowOnError extends true
-	? Promise<
-			TResponseStyle extends "data"
-				? TData extends Record<string, unknown>
-					? TData[keyof TData]
-					: TData
-				: {
-						data: TData extends Record<string, unknown> ? TData[keyof TData] : TData;
-						request: Request;
-						response: Response;
-					}
-		>
-	: Promise<
-			TResponseStyle extends "data"
-				? (TData extends Record<string, unknown> ? TData[keyof TData] : TData) | undefined
-				: (
-						| {
-								data: TData extends Record<string, unknown> ? TData[keyof TData] : TData;
-								error: undefined;
-						  }
-						| {
-								data: undefined;
-								error: TError extends Record<string, unknown> ? TError[keyof TError] : TError;
-						  }
-					) & {
-						request: Request;
-						response: Response;
-					}
-		>;
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
 
 export interface ClientOptions {
-	baseUrl?: string;
-	responseStyle?: ResponseStyle;
-	throwOnError?: boolean;
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
 }
 
 type MethodFn = <
-	TData = unknown,
-	TError = unknown,
-	ThrowOnError extends boolean = false,
-	TResponseStyle extends ResponseStyle = "fields",
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
 >(
-	options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, "method">,
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type SseFn = <
-	TData = unknown,
-	TError = unknown,
-	ThrowOnError extends boolean = false,
-	TResponseStyle extends ResponseStyle = "fields",
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
 >(
-	options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, "method">,
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
 ) => Promise<ServerSentEventsResult<TData, TError>>;
 
 type RequestFn = <
-	TData = unknown,
-	TError = unknown,
-	ThrowOnError extends boolean = false,
-	TResponseStyle extends ResponseStyle = "fields",
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
 >(
-	options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, "method"> &
-		Pick<Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>, "method">,
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type BuildUrlFn = <
-	TData extends {
-		body?: unknown;
-		path?: Record<string, unknown>;
-		query?: Record<string, unknown>;
-		url: string;
-	},
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
 >(
-	options: TData & Options<TData>,
+  options: TData & Options<TData>,
 ) => string;
 
-export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn> & {
-	interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
 };
 
 /**
@@ -180,23 +216,26 @@ export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn>
  * to ensure your client always has the correct values.
  */
 export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
-	override?: Config<ClientOptions & T>,
+  override?: Config<ClientOptions & T>,
 ) => Config<Required<ClientOptions> & T>;
 
 export interface TDataShape {
-	body?: unknown;
-	headers?: unknown;
-	path?: unknown;
-	query?: unknown;
-	url: string;
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
 }
 
 type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
 
 export type Options<
-	TData extends TDataShape = TDataShape,
-	ThrowOnError extends boolean = boolean,
-	TResponse = unknown,
-	TResponseStyle extends ResponseStyle = "fields",
-> = OmitKeys<RequestOptions<TResponse, TResponseStyle, ThrowOnError>, "body" | "path" | "query" | "url"> &
-	([TData] extends [never] ? unknown : Omit<TData, "url">);
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);

app/client/api-client/client/utils.gen.ts

@@ -1,289 +1,332 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import { getAuthToken } from "../core/auth.gen";
-import type { QuerySerializerOptions } from "../core/bodySerializer.gen";
-import { jsonBodySerializer } from "../core/bodySerializer.gen";
-import { serializeArrayParam, serializeObjectParam, serializePrimitiveParam } from "../core/pathSerializer.gen";
-import { getUrl } from "../core/utils.gen";
-import type { Client, ClientOptions, Config, RequestOptions } from "./types.gen";
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
 
-export const createQuerySerializer = <T = unknown>({ parameters = {}, ...args }: QuerySerializerOptions = {}) => {
-	const querySerializer = (queryParams: T) => {
-		const search: string[] = [];
-		if (queryParams && typeof queryParams === "object") {
-			for (const name in queryParams) {
-				const value = queryParams[name];
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
 
-				if (value === undefined || value === null) {
-					continue;
-				}
+        if (value === undefined || value === null) {
+          continue;
+        }
 
-				const options = parameters[name] || args;
+        const options = parameters[name] || args;
 
-				if (Array.isArray(value)) {
-					const serializedArray = serializeArrayParam({
-						allowReserved: options.allowReserved,
-						explode: true,
-						name,
-						style: "form",
-						value,
-						...options.array,
-					});
-					if (serializedArray) search.push(serializedArray);
-				} else if (typeof value === "object") {
-					const serializedObject = serializeObjectParam({
-						allowReserved: options.allowReserved,
-						explode: true,
-						name,
-						style: "deepObject",
-						value: value as Record<string, unknown>,
-						...options.object,
-					});
-					if (serializedObject) search.push(serializedObject);
-				} else {
-					const serializedPrimitive = serializePrimitiveParam({
-						allowReserved: options.allowReserved,
-						name,
-						value: value as string,
-					});
-					if (serializedPrimitive) search.push(serializedPrimitive);
-				}
-			}
-		}
-		return search.join("&");
-	};
-	return querySerializer;
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
 };
 
 /**
  * Infers parseAs value from provided Content-Type header.
  */
-export const getParseAs = (contentType: string | null): Exclude<Config["parseAs"], "auto"> => {
-	if (!contentType) {
-		// If no Content-Type header is provided, the best we can do is return the raw response body,
-		// which is effectively the same as the 'stream' option.
-		return "stream";
-	}
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
 
-	const cleanContent = contentType.split(";")[0]?.trim();
+  const cleanContent = contentType.split(';')[0]?.trim();
 
-	if (!cleanContent) {
-		return;
-	}
+  if (!cleanContent) {
+    return;
+  }
 
-	if (cleanContent.startsWith("application/json") || cleanContent.endsWith("+json")) {
-		return "json";
-	}
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
 
-	if (cleanContent === "multipart/form-data") {
-		return "formData";
-	}
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
 
-	if (["application/", "audio/", "image/", "video/"].some((type) => cleanContent.startsWith(type))) {
-		return "blob";
-	}
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
 
-	if (cleanContent.startsWith("text/")) {
-		return "text";
-	}
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
 
-	return;
+  return;
 };
 
 const checkForExistence = (
-	options: Pick<RequestOptions, "auth" | "query"> & {
-		headers: Headers;
-	},
-	name?: string,
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
 ): boolean => {
-	if (!name) {
-		return false;
-	}
-	if (options.headers.has(name) || options.query?.[name] || options.headers.get("Cookie")?.includes(`${name}=`)) {
-		return true;
-	}
-	return false;
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
 };
 
 export const setAuthParams = async ({
-	security,
-	...options
-}: Pick<Required<RequestOptions>, "security"> &
-	Pick<RequestOptions, "auth" | "query"> & {
-		headers: Headers;
-	}) => {
-	for (const auth of security) {
-		if (checkForExistence(options, auth.name)) {
-			continue;
-		}
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
 
-		const token = await getAuthToken(auth, options.auth);
+    const token = await getAuthToken(auth, options.auth);
 
-		if (!token) {
-			continue;
-		}
+    if (!token) {
+      continue;
+    }
 
-		const name = auth.name ?? "Authorization";
+    const name = auth.name ?? 'Authorization';
 
-		switch (auth.in) {
-			case "query":
-				if (!options.query) {
-					options.query = {};
-				}
-				options.query[name] = token;
-				break;
-			case "cookie":
-				options.headers.append("Cookie", `${name}=${token}`);
-				break;
-			case "header":
-			default:
-				options.headers.set(name, token);
-				break;
-		}
-	}
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
 };
 
-export const buildUrl: Client["buildUrl"] = (options) =>
-	getUrl({
-		baseUrl: options.baseUrl as string,
-		path: options.path,
-		query: options.query,
-		querySerializer:
-			typeof options.querySerializer === "function"
-				? options.querySerializer
-				: createQuerySerializer(options.querySerializer),
-		url: options.url,
-	});
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
 
 export const mergeConfigs = (a: Config, b: Config): Config => {
-	const config = { ...a, ...b };
-	if (config.baseUrl?.endsWith("/")) {
-		config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
-	}
-	config.headers = mergeHeaders(a.headers, b.headers);
-	return config;
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
 };
 
 const headersEntries = (headers: Headers): Array<[string, string]> => {
-	const entries: Array<[string, string]> = [];
-	headers.forEach((value, key) => {
-		entries.push([key, value]);
-	});
-	return entries;
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
 };
 
-export const mergeHeaders = (...headers: Array<Required<Config>["headers"] | undefined>): Headers => {
-	const mergedHeaders = new Headers();
-	for (const header of headers) {
-		if (!header) {
-			continue;
-		}
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
 
-		const iterator = header instanceof Headers ? headersEntries(header) : Object.entries(header);
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
 
-		for (const [key, value] of iterator) {
-			if (value === null) {
-				mergedHeaders.delete(key);
-			} else if (Array.isArray(value)) {
-				for (const v of value) {
-					mergedHeaders.append(key, v as string);
-				}
-			} else if (value !== undefined) {
-				// assume object headers are meant to be JSON stringified, i.e. their
-				// content value in OpenAPI specification is 'application/json'
-				mergedHeaders.set(key, typeof value === "object" ? JSON.stringify(value) : (value as string));
-			}
-		}
-	}
-	return mergedHeaders;
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
 };
 
 type ErrInterceptor<Err, Res, Req, Options> = (
-	error: Err,
-	response: Res,
-	request: Req,
-	options: Options,
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
 ) => Err | Promise<Err>;
 
-type ReqInterceptor<Req, Options> = (request: Req, options: Options) => Req | Promise<Req>;
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
 
-type ResInterceptor<Res, Req, Options> = (response: Res, request: Req, options: Options) => Res | Promise<Res>;
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
 
 class Interceptors<Interceptor> {
-	fns: Array<Interceptor | null> = [];
+  fns: Array<Interceptor | null> = [];
 
-	clear(): void {
-		this.fns = [];
-	}
+  clear(): void {
+    this.fns = [];
+  }
 
-	eject(id: number | Interceptor): void {
-		const index = this.getInterceptorIndex(id);
-		if (this.fns[index]) {
-			this.fns[index] = null;
-		}
-	}
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
 
-	exists(id: number | Interceptor): boolean {
-		const index = this.getInterceptorIndex(id);
-		return Boolean(this.fns[index]);
-	}
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
 
-	getInterceptorIndex(id: number | Interceptor): number {
-		if (typeof id === "number") {
-			return this.fns[id] ? id : -1;
-		}
-		return this.fns.indexOf(id);
-	}
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
 
-	update(id: number | Interceptor, fn: Interceptor): number | Interceptor | false {
-		const index = this.getInterceptorIndex(id);
-		if (this.fns[index]) {
-			this.fns[index] = fn;
-			return id;
-		}
-		return false;
-	}
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
 
-	use(fn: Interceptor): number {
-		this.fns.push(fn);
-		return this.fns.length - 1;
-	}
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
 }
 
 export interface Middleware<Req, Res, Err, Options> {
-	error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
-	request: Interceptors<ReqInterceptor<Req, Options>>;
-	response: Interceptors<ResInterceptor<Res, Req, Options>>;
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
 }
 
-export const createInterceptors = <Req, Res, Err, Options>(): Middleware<Req, Res, Err, Options> => ({
-	error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
-	request: new Interceptors<ReqInterceptor<Req, Options>>(),
-	response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
 });
 
 const defaultQuerySerializer = createQuerySerializer({
-	allowReserved: false,
-	array: {
-		explode: true,
-		style: "form",
-	},
-	object: {
-		explode: true,
-		style: "deepObject",
-	},
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
 });
 
 const defaultHeaders = {
-	"Content-Type": "application/json",
+  'Content-Type': 'application/json',
 };
 
 export const createConfig = <T extends ClientOptions = ClientOptions>(
-	override: Config<Omit<ClientOptions, keyof T> & T> = {},
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
 ): Config<Omit<ClientOptions, keyof T> & T> => ({
-	...jsonBodySerializer,
-	headers: defaultHeaders,
-	parseAs: "auto",
-	querySerializer: defaultQuerySerializer,
-	...override,
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
 });

app/client/api-client/core/auth.gen.ts

@@ -3,39 +3,40 @@
 export type AuthToken = string | undefined;
 
 export interface Auth {
-	/**
-	 * Which part of the request do we use to send the auth?
-	 *
-	 * @default 'header'
-	 */
-	in?: "header" | "query" | "cookie";
-	/**
-	 * Header or query parameter name.
-	 *
-	 * @default 'Authorization'
-	 */
-	name?: string;
-	scheme?: "basic" | "bearer";
-	type: "apiKey" | "http";
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
 }
 
 export const getAuthToken = async (
-	auth: Auth,
-	callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
 ): Promise<string | undefined> => {
-	const token = typeof callback === "function" ? await callback(auth) : callback;
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
 
-	if (!token) {
-		return;
-	}
+  if (!token) {
+    return;
+  }
 
-	if (auth.scheme === "bearer") {
-		return `Bearer ${token}`;
-	}
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
 
-	if (auth.scheme === "basic") {
-		return `Basic ${btoa(token)}`;
-	}
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
 
-	return token;
+  return token;
 };

app/client/api-client/core/bodySerializer.gen.ts

@@ -1,82 +1,100 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { ArrayStyle, ObjectStyle, SerializerOptions } from "./pathSerializer.gen";
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
 
 export type QuerySerializer = (query: Record<string, unknown>) => string;
 
 export type BodySerializer = (body: any) => any;
 
 type QuerySerializerOptionsObject = {
-	allowReserved?: boolean;
-	array?: Partial<SerializerOptions<ArrayStyle>>;
-	object?: Partial<SerializerOptions<ObjectStyle>>;
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
 };
 
 export type QuerySerializerOptions = QuerySerializerOptionsObject & {
-	/**
-	 * Per-parameter serialization overrides. When provided, these settings
-	 * override the global array/object settings for specific parameter names.
-	 */
-	parameters?: Record<string, QuerySerializerOptionsObject>;
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
 };
 
-const serializeFormDataPair = (data: FormData, key: string, value: unknown): void => {
-	if (typeof value === "string" || value instanceof Blob) {
-		data.append(key, value);
-	} else if (value instanceof Date) {
-		data.append(key, value.toISOString());
-	} else {
-		data.append(key, JSON.stringify(value));
-	}
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
 };
 
-const serializeUrlSearchParamsPair = (data: URLSearchParams, key: string, value: unknown): void => {
-	if (typeof value === "string") {
-		data.append(key, value);
-	} else {
-		data.append(key, JSON.stringify(value));
-	}
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
 };
 
 export const formDataBodySerializer = {
-	bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(body: T): FormData => {
-		const data = new FormData();
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
 
-		Object.entries(body).forEach(([key, value]) => {
-			if (value === undefined || value === null) {
-				return;
-			}
-			if (Array.isArray(value)) {
-				value.forEach((v) => serializeFormDataPair(data, key, v));
-			} else {
-				serializeFormDataPair(data, key, value);
-			}
-		});
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
 
-		return data;
-	},
+    return data;
+  },
 };
 
 export const jsonBodySerializer = {
-	bodySerializer: <T>(body: T): string =>
-		JSON.stringify(body, (_key, value) => (typeof value === "bigint" ? value.toString() : value)),
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
 };
 
 export const urlSearchParamsBodySerializer = {
-	bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(body: T): string => {
-		const data = new URLSearchParams();
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
 
-		Object.entries(body).forEach(([key, value]) => {
-			if (value === undefined || value === null) {
-				return;
-			}
-			if (Array.isArray(value)) {
-				value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
-			} else {
-				serializeUrlSearchParamsPair(data, key, value);
-			}
-		});
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
 
-		return data.toString();
-	},
+    return data.toString();
+  },
 };

app/client/api-client/core/params.gen.ts

@@ -1,169 +1,176 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-type Slot = "body" | "headers" | "path" | "query";
+type Slot = 'body' | 'headers' | 'path' | 'query';
 
 export type Field =
-	| {
-			in: Exclude<Slot, "body">;
-			/**
-			 * Field name. This is the name we want the user to see and use.
-			 */
-			key: string;
-			/**
-			 * Field mapped name. This is the name we want to use in the request.
-			 * If omitted, we use the same value as `key`.
-			 */
-			map?: string;
-	  }
-	| {
-			in: Extract<Slot, "body">;
-			/**
-			 * Key isn't required for bodies.
-			 */
-			key?: string;
-			map?: string;
-	  }
-	| {
-			/**
-			 * Field name. This is the name we want the user to see and use.
-			 */
-			key: string;
-			/**
-			 * Field mapped name. This is the name we want to use in the request.
-			 * If `in` is omitted, `map` aliases `key` to the transport layer.
-			 */
-			map: Slot;
-	  };
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
 
 export interface Fields {
-	allowExtra?: Partial<Record<Slot, boolean>>;
-	args?: ReadonlyArray<Field>;
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
 }
 
 export type FieldsConfig = ReadonlyArray<Field | Fields>;
 
 const extraPrefixesMap: Record<string, Slot> = {
-	$body_: "body",
-	$headers_: "headers",
-	$path_: "path",
-	$query_: "query",
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
 };
 const extraPrefixes = Object.entries(extraPrefixesMap);
 
 type KeyMap = Map<
-	string,
-	| {
-			in: Slot;
-			map?: string;
-	  }
-	| {
-			in?: never;
-			map: Slot;
-	  }
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
 >;
 
 const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
-	if (!map) {
-		map = new Map();
-	}
+  if (!map) {
+    map = new Map();
+  }
 
-	for (const config of fields) {
-		if ("in" in config) {
-			if (config.key) {
-				map.set(config.key, {
-					in: config.in,
-					map: config.map,
-				});
-			}
-		} else if ("key" in config) {
-			map.set(config.key, {
-				map: config.map,
-			});
-		} else if (config.args) {
-			buildKeyMap(config.args, map);
-		}
-	}
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
 
-	return map;
+  return map;
 };
 
 interface Params {
-	body: unknown;
-	headers: Record<string, unknown>;
-	path: Record<string, unknown>;
-	query: Record<string, unknown>;
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
 }
 
 const stripEmptySlots = (params: Params) => {
-	for (const [slot, value] of Object.entries(params)) {
-		if (value && typeof value === "object" && !Object.keys(value).length) {
-			delete params[slot as Slot];
-		}
-	}
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
 };
 
-export const buildClientParams = (args: ReadonlyArray<unknown>, fields: FieldsConfig) => {
-	const params: Params = {
-		body: {},
-		headers: {},
-		path: {},
-		query: {},
-	};
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
 
-	const map = buildKeyMap(fields);
+  const map = buildKeyMap(fields);
 
-	let config: FieldsConfig[number] | undefined;
+  let config: FieldsConfig[number] | undefined;
 
-	for (const [index, arg] of args.entries()) {
-		if (fields[index]) {
-			config = fields[index];
-		}
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
 
-		if (!config) {
-			continue;
-		}
+    if (!config) {
+      continue;
+    }
 
-		if ("in" in config) {
-			if (config.key) {
-				const field = map.get(config.key)!;
-				const name = field.map || config.key;
-				if (field.in) {
-					(params[field.in] as Record<string, unknown>)[name] = arg;
-				}
-			} else {
-				params.body = arg;
-			}
-		} else {
-			for (const [key, value] of Object.entries(arg ?? {})) {
-				const field = map.get(key);
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
 
-				if (field) {
-					if (field.in) {
-						const name = field.map || key;
-						(params[field.in] as Record<string, unknown>)[name] = value;
-					} else {
-						params[field.map] = value;
-					}
-				} else {
-					const extra = extraPrefixes.find(([prefix]) => key.startsWith(prefix));
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
 
-					if (extra) {
-						const [prefix, slot] = extra;
-						(params[slot] as Record<string, unknown>)[key.slice(prefix.length)] = value;
-					} else if ("allowExtra" in config && config.allowExtra) {
-						for (const [slot, allowed] of Object.entries(config.allowExtra)) {
-							if (allowed) {
-								(params[slot as Slot] as Record<string, unknown>)[key] = value;
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
-	stripEmptySlots(params);
+  stripEmptySlots(params);
 
-	return params;
+  return params;
 };

app/client/api-client/core/pathSerializer.gen.ts

@@ -1,167 +1,181 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-interface SerializeOptions<T> extends SerializePrimitiveOptions, SerializerOptions<T> {}
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
 
 interface SerializePrimitiveOptions {
-	allowReserved?: boolean;
-	name: string;
+  allowReserved?: boolean;
+  name: string;
 }
 
 export interface SerializerOptions<T> {
-	/**
-	 * @default true
-	 */
-	explode: boolean;
-	style: T;
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
 }
 
-export type ArrayStyle = "form" | "spaceDelimited" | "pipeDelimited";
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
 export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
-type MatrixStyle = "label" | "matrix" | "simple";
-export type ObjectStyle = "form" | "deepObject";
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
 type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
 
 interface SerializePrimitiveParam extends SerializePrimitiveOptions {
-	value: string;
+  value: string;
 }
 
 export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
-	switch (style) {
-		case "label":
-			return ".";
-		case "matrix":
-			return ";";
-		case "simple":
-			return ",";
-		default:
-			return "&";
-	}
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
 };
 
 export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
-	switch (style) {
-		case "form":
-			return ",";
-		case "pipeDelimited":
-			return "|";
-		case "spaceDelimited":
-			return "%20";
-		default:
-			return ",";
-	}
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
 };
 
 export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
-	switch (style) {
-		case "label":
-			return ".";
-		case "matrix":
-			return ";";
-		case "simple":
-			return ",";
-		default:
-			return "&";
-	}
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
 };
 
 export const serializeArrayParam = ({
-	allowReserved,
-	explode,
-	name,
-	style,
-	value,
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
 }: SerializeOptions<ArraySeparatorStyle> & {
-	value: unknown[];
+  value: unknown[];
 }) => {
-	if (!explode) {
-		const joinedValues = (allowReserved ? value : value.map((v) => encodeURIComponent(v as string))).join(
-			separatorArrayNoExplode(style),
-		);
-		switch (style) {
-			case "label":
-				return `.${joinedValues}`;
-			case "matrix":
-				return `;${name}=${joinedValues}`;
-			case "simple":
-				return joinedValues;
-			default:
-				return `${name}=${joinedValues}`;
-		}
-	}
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
 
-	const separator = separatorArrayExplode(style);
-	const joinedValues = value
-		.map((v) => {
-			if (style === "label" || style === "simple") {
-				return allowReserved ? v : encodeURIComponent(v as string);
-			}
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
 
-			return serializePrimitiveParam({
-				allowReserved,
-				name,
-				value: v as string,
-			});
-		})
-		.join(separator);
-	return style === "label" || style === "matrix" ? separator + joinedValues : joinedValues;
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
 };
 
-export const serializePrimitiveParam = ({ allowReserved, name, value }: SerializePrimitiveParam) => {
-	if (value === undefined || value === null) {
-		return "";
-	}
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
 
-	if (typeof value === "object") {
-		throw new Error(
-			"Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.",
-		);
-	}
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
 
-	return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
 };
 
 export const serializeObjectParam = ({
-	allowReserved,
-	explode,
-	name,
-	style,
-	value,
-	valueOnly,
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
 }: SerializeOptions<ObjectSeparatorStyle> & {
-	value: Record<string, unknown> | Date;
-	valueOnly?: boolean;
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
 }) => {
-	if (value instanceof Date) {
-		return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
-	}
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
 
-	if (style !== "deepObject" && !explode) {
-		let values: string[] = [];
-		Object.entries(value).forEach(([key, v]) => {
-			values = [...values, key, allowReserved ? (v as string) : encodeURIComponent(v as string)];
-		});
-		const joinedValues = values.join(",");
-		switch (style) {
-			case "form":
-				return `${name}=${joinedValues}`;
-			case "label":
-				return `.${joinedValues}`;
-			case "matrix":
-				return `;${name}=${joinedValues}`;
-			default:
-				return joinedValues;
-		}
-	}
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
 
-	const separator = separatorObjectExplode(style);
-	const joinedValues = Object.entries(value)
-		.map(([key, v]) =>
-			serializePrimitiveParam({
-				allowReserved,
-				name: style === "deepObject" ? `${name}[${key}]` : key,
-				value: v as string,
-			}),
-		)
-		.join(separator);
-	return style === "label" || style === "matrix" ? separator + joinedValues : joinedValues;
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
 };

app/client/api-client/core/queryKeySerializer.gen.ts

@@ -3,109 +3,134 @@
 /**
  * JSON-friendly union that mirrors what Pinia Colada can hash.
  */
-export type JsonValue = null | string | number | boolean | JsonValue[] | { [key: string]: JsonValue };
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
 
 /**
  * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
  */
 export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
-	if (value === undefined || typeof value === "function" || typeof value === "symbol") {
-		return undefined;
-	}
-	if (typeof value === "bigint") {
-		return value.toString();
-	}
-	if (value instanceof Date) {
-		return value.toISOString();
-	}
-	return value;
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
 };
 
 /**
  * Safely stringifies a value and parses it back into a JsonValue.
  */
 export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
-	try {
-		const json = JSON.stringify(input, queryKeyJsonReplacer);
-		if (json === undefined) {
-			return undefined;
-		}
-		return JSON.parse(json) as JsonValue;
-	} catch {
-		return undefined;
-	}
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
 };
 
 /**
  * Detects plain objects (including objects with a null prototype).
  */
 const isPlainObject = (value: unknown): value is Record<string, unknown> => {
-	if (value === null || typeof value !== "object") {
-		return false;
-	}
-	const prototype = Object.getPrototypeOf(value as object);
-	return prototype === Object.prototype || prototype === null;
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
 };
 
 /**
  * Turns URLSearchParams into a sorted JSON object for deterministic keys.
  */
 const serializeSearchParams = (params: URLSearchParams): JsonValue => {
-	const entries = Array.from(params.entries()).sort(([a], [b]) => a.localeCompare(b));
-	const result: Record<string, JsonValue> = {};
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
 
-	for (const [key, value] of entries) {
-		const existing = result[key];
-		if (existing === undefined) {
-			result[key] = value;
-			continue;
-		}
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
 
-		if (Array.isArray(existing)) {
-			(existing as string[]).push(value);
-		} else {
-			result[key] = [existing, value];
-		}
-	}
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
 
-	return result;
+  return result;
 };
 
 /**
  * Normalizes any accepted value into a JSON-friendly shape for query keys.
  */
-export const serializeQueryKeyValue = (value: unknown): JsonValue | undefined => {
-	if (value === null) {
-		return null;
-	}
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
 
-	if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-		return value;
-	}
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
 
-	if (value === undefined || typeof value === "function" || typeof value === "symbol") {
-		return undefined;
-	}
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
 
-	if (typeof value === "bigint") {
-		return value.toString();
-	}
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
 
-	if (value instanceof Date) {
-		return value.toISOString();
-	}
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
 
-	if (Array.isArray(value)) {
-		return stringifyToJsonValue(value);
-	}
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
 
-	if (typeof URLSearchParams !== "undefined" && value instanceof URLSearchParams) {
-		return serializeSearchParams(value);
-	}
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
 
-	if (isPlainObject(value)) {
-		return stringifyToJsonValue(value);
-	}
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
 
-	return undefined;
+  return undefined;
 };

app/client/api-client/core/serverSentEvents.gen.ts

@@ -1,237 +1,264 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Config } from "./types.gen";
+import type { Config } from './types.gen';
 
-export type ServerSentEventsOptions<TData = unknown> = Omit<RequestInit, "method"> &
-	Pick<Config, "method" | "responseTransformer" | "responseValidator"> & {
-		/**
-		 * Fetch API implementation. You can use this option to provide a custom
-		 * fetch instance.
-		 *
-		 * @default globalThis.fetch
-		 */
-		fetch?: typeof fetch;
-		/**
-		 * Implementing clients can call request interceptors inside this hook.
-		 */
-		onRequest?: (url: string, init: RequestInit) => Promise<Request>;
-		/**
-		 * Callback invoked when a network or parsing error occurs during streaming.
-		 *
-		 * This option applies only if the endpoint returns a stream of events.
-		 *
-		 * @param error The error that occurred.
-		 */
-		onSseError?: (error: unknown) => void;
-		/**
-		 * Callback invoked when an event is streamed from the server.
-		 *
-		 * This option applies only if the endpoint returns a stream of events.
-		 *
-		 * @param event Event streamed from the server.
-		 * @returns Nothing (void).
-		 */
-		onSseEvent?: (event: StreamEvent<TData>) => void;
-		serializedBody?: RequestInit["body"];
-		/**
-		 * Default retry delay in milliseconds.
-		 *
-		 * This option applies only if the endpoint returns a stream of events.
-		 *
-		 * @default 3000
-		 */
-		sseDefaultRetryDelay?: number;
-		/**
-		 * Maximum number of retry attempts before giving up.
-		 */
-		sseMaxRetryAttempts?: number;
-		/**
-		 * Maximum retry delay in milliseconds.
-		 *
-		 * Applies only when exponential backoff is used.
-		 *
-		 * This option applies only if the endpoint returns a stream of events.
-		 *
-		 * @default 30000
-		 */
-		sseMaxRetryDelay?: number;
-		/**
-		 * Optional sleep function for retry backoff.
-		 *
-		 * Defaults to using `setTimeout`.
-		 */
-		sseSleepFn?: (ms: number) => Promise<void>;
-		url: string;
-	};
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
 
 export interface StreamEvent<TData = unknown> {
-	data: TData;
-	event?: string;
-	id?: string;
-	retry?: number;
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
 }
 
-export type ServerSentEventsResult<TData = unknown, TReturn = void, TNext = unknown> = {
-	stream: AsyncGenerator<TData extends Record<string, unknown> ? TData[keyof TData] : TData, TReturn, TNext>;
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
 };
 
 export const createSseClient = <TData = unknown>({
-	onRequest,
-	onSseError,
-	onSseEvent,
-	responseTransformer,
-	responseValidator,
-	sseDefaultRetryDelay,
-	sseMaxRetryAttempts,
-	sseMaxRetryDelay,
-	sseSleepFn,
-	url,
-	...options
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
 }: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
-	let lastEventId: string | undefined;
+  let lastEventId: string | undefined;
 
-	const sleep = sseSleepFn ?? ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
 
-	const createStream = async function* () {
-		let retryDelay: number = sseDefaultRetryDelay ?? 3000;
-		let attempt = 0;
-		const signal = options.signal ?? new AbortController().signal;
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
 
-		while (true) {
-			if (signal.aborted) break;
+    while (true) {
+      if (signal.aborted) break;
 
-			attempt++;
+      attempt++;
 
-			const headers =
-				options.headers instanceof Headers
-					? options.headers
-					: new Headers(options.headers as Record<string, string> | undefined);
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
 
-			if (lastEventId !== undefined) {
-				headers.set("Last-Event-ID", lastEventId);
-			}
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
 
-			try {
-				const requestInit: RequestInit = {
-					redirect: "follow",
-					...options,
-					body: options.serializedBody,
-					headers,
-					signal,
-				};
-				let request = new Request(url, requestInit);
-				if (onRequest) {
-					request = await onRequest(url, requestInit);
-				}
-				// fetch must be assigned here, otherwise it would throw the error:
-				// TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
-				const _fetch = options.fetch ?? globalThis.fetch;
-				const response = await _fetch(request);
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
 
-				if (!response.ok) throw new Error(`SSE failed: ${response.status} ${response.statusText}`);
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
 
-				if (!response.body) throw new Error("No body in SSE response");
+        if (!response.body) throw new Error('No body in SSE response');
 
-				const reader = response.body.pipeThrough(new TextDecoderStream()).getReader();
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
 
-				let buffer = "";
+        let buffer = '';
 
-				const abortHandler = () => {
-					try {
-						reader.cancel();
-					} catch {
-						// noop
-					}
-				};
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
 
-				signal.addEventListener("abort", abortHandler);
+        signal.addEventListener('abort', abortHandler);
 
-				try {
-					while (true) {
-						const { done, value } = await reader.read();
-						if (done) break;
-						buffer += value;
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
 
-						const chunks = buffer.split("\n\n");
-						buffer = chunks.pop() ?? "";
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
 
-						for (const chunk of chunks) {
-							const lines = chunk.split("\n");
-							const dataLines: Array<string> = [];
-							let eventName: string | undefined;
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
 
-							for (const line of lines) {
-								if (line.startsWith("data:")) {
-									dataLines.push(line.replace(/^data:\s*/, ""));
-								} else if (line.startsWith("event:")) {
-									eventName = line.replace(/^event:\s*/, "");
-								} else if (line.startsWith("id:")) {
-									lastEventId = line.replace(/^id:\s*/, "");
-								} else if (line.startsWith("retry:")) {
-									const parsed = Number.parseInt(line.replace(/^retry:\s*/, ""), 10);
-									if (!Number.isNaN(parsed)) {
-										retryDelay = parsed;
-									}
-								}
-							}
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
 
-							let data: unknown;
-							let parsedJson = false;
+              let data: unknown;
+              let parsedJson = false;
 
-							if (dataLines.length) {
-								const rawData = dataLines.join("\n");
-								try {
-									data = JSON.parse(rawData);
-									parsedJson = true;
-								} catch {
-									data = rawData;
-								}
-							}
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
 
-							if (parsedJson) {
-								if (responseValidator) {
-									await responseValidator(data);
-								}
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
 
-								if (responseTransformer) {
-									data = await responseTransformer(data);
-								}
-							}
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
 
-							onSseEvent?.({
-								data,
-								event: eventName,
-								id: lastEventId,
-								retry: retryDelay,
-							});
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
 
-							if (dataLines.length) {
-								yield data as any;
-							}
-						}
-					}
-				} finally {
-					signal.removeEventListener("abort", abortHandler);
-					reader.releaseLock();
-				}
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
 
-				break; // exit loop on normal completion
-			} catch (error) {
-				// connection failed or aborted; retry after delay
-				onSseError?.(error);
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
 
-				if (sseMaxRetryAttempts !== undefined && attempt >= sseMaxRetryAttempts) {
-					break; // stop after firing error
-				}
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
 
-				// exponential backoff: double retry each attempt, cap at 30s
-				const backoff = Math.min(retryDelay * 2 ** (attempt - 1), sseMaxRetryDelay ?? 30000);
-				await sleep(backoff);
-			}
-		}
-	};
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
 
-	const stream = createStream();
+  const stream = createStream();
 
-	return { stream };
+  return { stream };
 };

app/client/api-client/core/types.gen.ts

@@ -1,86 +1,118 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Auth, AuthToken } from "./auth.gen";
-import type { BodySerializer, QuerySerializer, QuerySerializerOptions } from "./bodySerializer.gen";
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
 
-export type HttpMethod = "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
 
-export type Client<RequestFn = never, Config = unknown, MethodFn = never, BuildUrlFn = never, SseFn = never> = {
-	/**
-	 * Returns the final request URL.
-	 */
-	buildUrl: BuildUrlFn;
-	getConfig: () => Config;
-	request: RequestFn;
-	setConfig: (config: Config) => Config;
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
 } & {
-	[K in HttpMethod]: MethodFn;
-} & ([SseFn] extends [never] ? { sse?: never } : { sse: { [K in HttpMethod]: SseFn } });
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
 
 export interface Config {
-	/**
-	 * Auth token or a function returning auth token. The resolved value will be
-	 * added to the request payload as defined by its `security` array.
-	 */
-	auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
-	/**
-	 * A function for serializing request body parameter. By default,
-	 * {@link JSON.stringify()} will be used.
-	 */
-	bodySerializer?: BodySerializer | null;
-	/**
-	 * An object containing any HTTP headers that you want to pre-populate your
-	 * `Headers` object with.
-	 *
-	 * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
-	 */
-	headers?:
-		| RequestInit["headers"]
-		| Record<string, string | number | boolean | (string | number | boolean)[] | null | undefined | unknown>;
-	/**
-	 * The request method.
-	 *
-	 * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
-	 */
-	method?: Uppercase<HttpMethod>;
-	/**
-	 * A function for serializing request query parameters. By default, arrays
-	 * will be exploded in form style, objects will be exploded in deepObject
-	 * style, and reserved characters are percent-encoded.
-	 *
-	 * This method will have no effect if the native `paramsSerializer()` Axios
-	 * API function is used.
-	 *
-	 * {@link https://swagger.io/docs/specification/serialization/#query View examples}
-	 */
-	querySerializer?: QuerySerializer | QuerySerializerOptions;
-	/**
-	 * A function validating request data. This is useful if you want to ensure
-	 * the request conforms to the desired shape, so it can be safely sent to
-	 * the server.
-	 */
-	requestValidator?: (data: unknown) => Promise<unknown>;
-	/**
-	 * A function transforming response data before it's returned. This is useful
-	 * for post-processing data, e.g. converting ISO strings into Date objects.
-	 */
-	responseTransformer?: (data: unknown) => Promise<unknown>;
-	/**
-	 * A function validating response data. This is useful if you want to ensure
-	 * the response conforms to the desired shape, so it can be safely passed to
-	 * the transformers and returned to the user.
-	 */
-	responseValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
 }
 
 type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
-	? true
-	: [T] extends [never | undefined]
-		? [undefined] extends [T]
-			? false
-			: true
-		: false;
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
 
 export type OmitNever<T extends Record<string, unknown>> = {
-	[K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true ? never : K]: T[K];
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
 };

app/client/api-client/core/utils.gen.ts

@@ -1,137 +1,143 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { BodySerializer, QuerySerializer } from "./bodySerializer.gen";
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
 import {
-	type ArraySeparatorStyle,
-	serializeArrayParam,
-	serializeObjectParam,
-	serializePrimitiveParam,
-} from "./pathSerializer.gen";
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
 
 export interface PathSerializer {
-	path: Record<string, unknown>;
-	url: string;
+  path: Record<string, unknown>;
+  url: string;
 }
 
 export const PATH_PARAM_RE = /\{[^{}]+\}/g;
 
 export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
-	let url = _url;
-	const matches = _url.match(PATH_PARAM_RE);
-	if (matches) {
-		for (const match of matches) {
-			let explode = false;
-			let name = match.substring(1, match.length - 1);
-			let style: ArraySeparatorStyle = "simple";
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
 
-			if (name.endsWith("*")) {
-				explode = true;
-				name = name.substring(0, name.length - 1);
-			}
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
 
-			if (name.startsWith(".")) {
-				name = name.substring(1);
-				style = "label";
-			} else if (name.startsWith(";")) {
-				name = name.substring(1);
-				style = "matrix";
-			}
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
 
-			const value = path[name];
+      const value = path[name];
 
-			if (value === undefined || value === null) {
-				continue;
-			}
+      if (value === undefined || value === null) {
+        continue;
+      }
 
-			if (Array.isArray(value)) {
-				url = url.replace(match, serializeArrayParam({ explode, name, style, value }));
-				continue;
-			}
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
 
-			if (typeof value === "object") {
-				url = url.replace(
-					match,
-					serializeObjectParam({
-						explode,
-						name,
-						style,
-						value: value as Record<string, unknown>,
-						valueOnly: true,
-					}),
-				);
-				continue;
-			}
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
 
-			if (style === "matrix") {
-				url = url.replace(
-					match,
-					`;${serializePrimitiveParam({
-						name,
-						value: value as string,
-					})}`,
-				);
-				continue;
-			}
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
 
-			const replaceValue = encodeURIComponent(style === "label" ? `.${value as string}` : (value as string));
-			url = url.replace(match, replaceValue);
-		}
-	}
-	return url;
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
 };
 
 export const getUrl = ({
-	baseUrl,
-	path,
-	query,
-	querySerializer,
-	url: _url,
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
 }: {
-	baseUrl?: string;
-	path?: Record<string, unknown>;
-	query?: Record<string, unknown>;
-	querySerializer: QuerySerializer;
-	url: string;
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
 }) => {
-	const pathUrl = _url.startsWith("/") ? _url : `/${_url}`;
-	let url = (baseUrl ?? "") + pathUrl;
-	if (path) {
-		url = defaultPathSerializer({ path, url });
-	}
-	let search = query ? querySerializer(query) : "";
-	if (search.startsWith("?")) {
-		search = search.substring(1);
-	}
-	if (search) {
-		url += `?${search}`;
-	}
-	return url;
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
 };
 
 export function getValidRequestBody(options: {
-	body?: unknown;
-	bodySerializer?: BodySerializer | null;
-	serializedBody?: unknown;
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
 }) {
-	const hasBody = options.body !== undefined;
-	const isSerializedBody = hasBody && options.bodySerializer;
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
 
-	if (isSerializedBody) {
-		if ("serializedBody" in options) {
-			const hasSerializedBody = options.serializedBody !== undefined && options.serializedBody !== "";
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
 
-			return hasSerializedBody ? options.serializedBody : null;
-		}
+      return hasSerializedBody ? options.serializedBody : null;
+    }
 
-		// not all clients implement a serializedBody property (i.e. client-axios)
-		return options.body !== "" ? options.body : null;
-	}
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
 
-	// plain/text body
-	if (hasBody) {
-		return options.body;
-	}
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
 
-	// no body was provided
-	return undefined;
+  // no body was provided
+  return undefined;
 }

app/client/api-client/index.ts

@@ -1,4 +1,4 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-export type * from "./types.gen";
-export * from "./sdk.gen";
+export type * from './types.gen';
+export * from './sdk.gen';

app/client/api-client/sdk.gen.ts

@@ -1,588 +1,453 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Client, Options as Options2, TDataShape } from "./client";
-import { client } from "./client.gen";
-import type {
-	BrowseFilesystemData,
-	BrowseFilesystemResponses,
-	ChangePasswordData,
-	ChangePasswordResponses,
-	CreateBackupScheduleData,
-	CreateBackupScheduleResponses,
-	CreateRepositoryData,
-	CreateRepositoryResponses,
-	CreateVolumeData,
-	CreateVolumeResponses,
-	DeleteBackupScheduleData,
-	DeleteBackupScheduleResponses,
-	DeleteRepositoryData,
-	DeleteRepositoryResponses,
-	DeleteVolumeData,
-	DeleteVolumeResponses,
-	DoctorRepositoryData,
-	DoctorRepositoryResponses,
-	DownloadResticPasswordData,
-	DownloadResticPasswordResponses,
-	GetBackupScheduleData,
-	GetBackupScheduleForVolumeData,
-	GetBackupScheduleForVolumeResponses,
-	GetBackupScheduleResponses,
-	GetContainersUsingVolumeData,
-	GetContainersUsingVolumeErrors,
-	GetContainersUsingVolumeResponses,
-	GetMeData,
-	GetMeResponses,
-	GetRepositoryData,
-	GetRepositoryResponses,
-	GetSnapshotDetailsData,
-	GetSnapshotDetailsResponses,
-	GetStatusData,
-	GetStatusResponses,
-	GetSystemInfoData,
-	GetSystemInfoResponses,
-	GetVolumeData,
-	GetVolumeErrors,
-	GetVolumeResponses,
-	HealthCheckVolumeData,
-	HealthCheckVolumeErrors,
-	HealthCheckVolumeResponses,
-	ListBackupSchedulesData,
-	ListBackupSchedulesResponses,
-	ListFilesData,
-	ListFilesResponses,
-	ListRcloneRemotesData,
-	ListRcloneRemotesResponses,
-	ListRepositoriesData,
-	ListRepositoriesResponses,
-	ListSnapshotFilesData,
-	ListSnapshotFilesResponses,
-	ListSnapshotsData,
-	ListSnapshotsResponses,
-	ListVolumesData,
-	ListVolumesResponses,
-	LoginData,
-	LoginResponses,
-	LogoutData,
-	LogoutResponses,
-	MountVolumeData,
-	MountVolumeResponses,
-	RegisterData,
-	RegisterResponses,
-	RestoreSnapshotData,
-	RestoreSnapshotResponses,
-	RunBackupNowData,
-	RunBackupNowResponses,
-	StopBackupData,
-	StopBackupErrors,
-	StopBackupResponses,
-	TestConnectionData,
-	TestConnectionResponses,
-	UnmountVolumeData,
-	UnmountVolumeResponses,
-	UpdateBackupScheduleData,
-	UpdateBackupScheduleResponses,
-	UpdateVolumeData,
-	UpdateVolumeErrors,
-	UpdateVolumeResponses,
-} from "./types.gen";
+import type { Client, Options as Options2, TDataShape } from './client';
+import { client } from './client.gen';
+import type { BrowseFilesystemData, BrowseFilesystemResponses, ChangePasswordData, ChangePasswordResponses, CreateBackupScheduleData, CreateBackupScheduleResponses, CreateRepositoryData, CreateRepositoryResponses, CreateVolumeData, CreateVolumeResponses, DeleteBackupScheduleData, DeleteBackupScheduleResponses, DeleteRepositoryData, DeleteRepositoryResponses, DeleteVolumeData, DeleteVolumeResponses, DoctorRepositoryData, DoctorRepositoryResponses, DownloadResticPasswordData, DownloadResticPasswordResponses, GetBackupScheduleData, GetBackupScheduleForVolumeData, GetBackupScheduleForVolumeResponses, GetBackupScheduleResponses, GetContainersUsingVolumeData, GetContainersUsingVolumeErrors, GetContainersUsingVolumeResponses, GetMeData, GetMeResponses, GetRepositoryData, GetRepositoryResponses, GetSnapshotDetailsData, GetSnapshotDetailsResponses, GetStatusData, GetStatusResponses, GetSystemInfoData, GetSystemInfoResponses, GetVolumeData, GetVolumeErrors, GetVolumeResponses, HealthCheckVolumeData, HealthCheckVolumeErrors, HealthCheckVolumeResponses, ListBackupSchedulesData, ListBackupSchedulesResponses, ListFilesData, ListFilesResponses, ListRcloneRemotesData, ListRcloneRemotesResponses, ListRepositoriesData, ListRepositoriesResponses, ListSnapshotFilesData, ListSnapshotFilesResponses, ListSnapshotsData, ListSnapshotsResponses, ListVolumesData, ListVolumesResponses, LoginData, LoginResponses, LogoutData, LogoutResponses, MountVolumeData, MountVolumeResponses, RegisterData, RegisterResponses, RestoreSnapshotData, RestoreSnapshotResponses, RunBackupNowData, RunBackupNowResponses, RunForgetData, RunForgetResponses, StopBackupData, StopBackupErrors, StopBackupResponses, TestConnectionData, TestConnectionResponses, UnmountVolumeData, UnmountVolumeResponses, UpdateBackupScheduleData, UpdateBackupScheduleResponses, UpdateVolumeData, UpdateVolumeErrors, UpdateVolumeResponses } from './types.gen';
 
-export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<
-	TData,
-	ThrowOnError
-> & {
-	/**
-	 * You can provide a client instance returned by `createClient()` instead of
-	 * individual options. This might be also useful if you want to implement a
-	 * custom client.
-	 */
-	client?: Client;
-	/**
-	 * You can pass arbitrary values through the `meta` object. This can be
-	 * used to access values that aren't defined as part of the SDK function.
-	 */
-	meta?: Record<string, unknown>;
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
 };
 
 /**
  * Register a new user
  */
 export const register = <ThrowOnError extends boolean = false>(options?: Options<RegisterData, ThrowOnError>) => {
-	return (options?.client ?? client).post<RegisterResponses, unknown, ThrowOnError>({
-		url: "/api/v1/auth/register",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+    return (options?.client ?? client).post<RegisterResponses, unknown, ThrowOnError>({
+        url: '/api/v1/auth/register',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };
 
 /**
  * Login with username and password
  */
 export const login = <ThrowOnError extends boolean = false>(options?: Options<LoginData, ThrowOnError>) => {
-	return (options?.client ?? client).post<LoginResponses, unknown, ThrowOnError>({
-		url: "/api/v1/auth/login",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+    return (options?.client ?? client).post<LoginResponses, unknown, ThrowOnError>({
+        url: '/api/v1/auth/login',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };
 
 /**
  * Logout current user
  */
 export const logout = <ThrowOnError extends boolean = false>(options?: Options<LogoutData, ThrowOnError>) => {
-	return (options?.client ?? client).post<LogoutResponses, unknown, ThrowOnError>({
-		url: "/api/v1/auth/logout",
-		...options,
-	});
+    return (options?.client ?? client).post<LogoutResponses, unknown, ThrowOnError>({
+        url: '/api/v1/auth/logout',
+        ...options
+    });
 };
 
 /**
  * Get current authenticated user
  */
 export const getMe = <ThrowOnError extends boolean = false>(options?: Options<GetMeData, ThrowOnError>) => {
-	return (options?.client ?? client).get<GetMeResponses, unknown, ThrowOnError>({
-		url: "/api/v1/auth/me",
-		...options,
-	});
+    return (options?.client ?? client).get<GetMeResponses, unknown, ThrowOnError>({
+        url: '/api/v1/auth/me',
+        ...options
+    });
 };
 
 /**
  * Get authentication system status
  */
 export const getStatus = <ThrowOnError extends boolean = false>(options?: Options<GetStatusData, ThrowOnError>) => {
-	return (options?.client ?? client).get<GetStatusResponses, unknown, ThrowOnError>({
-		url: "/api/v1/auth/status",
-		...options,
-	});
+    return (options?.client ?? client).get<GetStatusResponses, unknown, ThrowOnError>({
+        url: '/api/v1/auth/status',
+        ...options
+    });
 };
 
 /**
  * Change current user password
  */
-export const changePassword = <ThrowOnError extends boolean = false>(
-	options?: Options<ChangePasswordData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).post<ChangePasswordResponses, unknown, ThrowOnError>({
-		url: "/api/v1/auth/change-password",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+export const changePassword = <ThrowOnError extends boolean = false>(options?: Options<ChangePasswordData, ThrowOnError>) => {
+    return (options?.client ?? client).post<ChangePasswordResponses, unknown, ThrowOnError>({
+        url: '/api/v1/auth/change-password',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };
 
 /**
  * List all volumes
  */
 export const listVolumes = <ThrowOnError extends boolean = false>(options?: Options<ListVolumesData, ThrowOnError>) => {
-	return (options?.client ?? client).get<ListVolumesResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes",
-		...options,
-	});
+    return (options?.client ?? client).get<ListVolumesResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes',
+        ...options
+    });
 };
 
 /**
  * Create a new volume
  */
-export const createVolume = <ThrowOnError extends boolean = false>(
-	options?: Options<CreateVolumeData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).post<CreateVolumeResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+export const createVolume = <ThrowOnError extends boolean = false>(options?: Options<CreateVolumeData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CreateVolumeResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };
 
 /**
  * Test connection to backend
  */
-export const testConnection = <ThrowOnError extends boolean = false>(
-	options?: Options<TestConnectionData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).post<TestConnectionResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes/test-connection",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+export const testConnection = <ThrowOnError extends boolean = false>(options?: Options<TestConnectionData, ThrowOnError>) => {
+    return (options?.client ?? client).post<TestConnectionResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes/test-connection',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };
 
 /**
  * Delete a volume
  */
-export const deleteVolume = <ThrowOnError extends boolean = false>(
-	options: Options<DeleteVolumeData, ThrowOnError>,
-) => {
-	return (options.client ?? client).delete<DeleteVolumeResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes/{name}",
-		...options,
-	});
+export const deleteVolume = <ThrowOnError extends boolean = false>(options: Options<DeleteVolumeData, ThrowOnError>) => {
+    return (options.client ?? client).delete<DeleteVolumeResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes/{name}',
+        ...options
+    });
 };
 
 /**
  * Get a volume by name
  */
 export const getVolume = <ThrowOnError extends boolean = false>(options: Options<GetVolumeData, ThrowOnError>) => {
-	return (options.client ?? client).get<GetVolumeResponses, GetVolumeErrors, ThrowOnError>({
-		url: "/api/v1/volumes/{name}",
-		...options,
-	});
+    return (options.client ?? client).get<GetVolumeResponses, GetVolumeErrors, ThrowOnError>({
+        url: '/api/v1/volumes/{name}',
+        ...options
+    });
 };
 
 /**
  * Update a volume's configuration
  */
-export const updateVolume = <ThrowOnError extends boolean = false>(
-	options: Options<UpdateVolumeData, ThrowOnError>,
-) => {
-	return (options.client ?? client).put<UpdateVolumeResponses, UpdateVolumeErrors, ThrowOnError>({
-		url: "/api/v1/volumes/{name}",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options.headers,
-		},
-	});
+export const updateVolume = <ThrowOnError extends boolean = false>(options: Options<UpdateVolumeData, ThrowOnError>) => {
+    return (options.client ?? client).put<UpdateVolumeResponses, UpdateVolumeErrors, ThrowOnError>({
+        url: '/api/v1/volumes/{name}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
 };
 
 /**
  * Get containers using a volume by name
  */
-export const getContainersUsingVolume = <ThrowOnError extends boolean = false>(
-	options: Options<GetContainersUsingVolumeData, ThrowOnError>,
-) => {
-	return (options.client ?? client).get<
-		GetContainersUsingVolumeResponses,
-		GetContainersUsingVolumeErrors,
-		ThrowOnError
-	>({
-		url: "/api/v1/volumes/{name}/containers",
-		...options,
-	});
+export const getContainersUsingVolume = <ThrowOnError extends boolean = false>(options: Options<GetContainersUsingVolumeData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetContainersUsingVolumeResponses, GetContainersUsingVolumeErrors, ThrowOnError>({
+        url: '/api/v1/volumes/{name}/containers',
+        ...options
+    });
 };
 
 /**
  * Mount a volume
  */
 export const mountVolume = <ThrowOnError extends boolean = false>(options: Options<MountVolumeData, ThrowOnError>) => {
-	return (options.client ?? client).post<MountVolumeResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes/{name}/mount",
-		...options,
-	});
+    return (options.client ?? client).post<MountVolumeResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes/{name}/mount',
+        ...options
+    });
 };
 
 /**
  * Unmount a volume
  */
-export const unmountVolume = <ThrowOnError extends boolean = false>(
-	options: Options<UnmountVolumeData, ThrowOnError>,
-) => {
-	return (options.client ?? client).post<UnmountVolumeResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes/{name}/unmount",
-		...options,
-	});
+export const unmountVolume = <ThrowOnError extends boolean = false>(options: Options<UnmountVolumeData, ThrowOnError>) => {
+    return (options.client ?? client).post<UnmountVolumeResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes/{name}/unmount',
+        ...options
+    });
 };
 
 /**
  * Perform a health check on a volume
  */
-export const healthCheckVolume = <ThrowOnError extends boolean = false>(
-	options: Options<HealthCheckVolumeData, ThrowOnError>,
-) => {
-	return (options.client ?? client).post<HealthCheckVolumeResponses, HealthCheckVolumeErrors, ThrowOnError>({
-		url: "/api/v1/volumes/{name}/health-check",
-		...options,
-	});
+export const healthCheckVolume = <ThrowOnError extends boolean = false>(options: Options<HealthCheckVolumeData, ThrowOnError>) => {
+    return (options.client ?? client).post<HealthCheckVolumeResponses, HealthCheckVolumeErrors, ThrowOnError>({
+        url: '/api/v1/volumes/{name}/health-check',
+        ...options
+    });
 };
 
 /**
  * List files in a volume directory
  */
 export const listFiles = <ThrowOnError extends boolean = false>(options: Options<ListFilesData, ThrowOnError>) => {
-	return (options.client ?? client).get<ListFilesResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes/{name}/files",
-		...options,
-	});
+    return (options.client ?? client).get<ListFilesResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes/{name}/files',
+        ...options
+    });
 };
 
 /**
  * Browse directories on the host filesystem
  */
-export const browseFilesystem = <ThrowOnError extends boolean = false>(
-	options?: Options<BrowseFilesystemData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).get<BrowseFilesystemResponses, unknown, ThrowOnError>({
-		url: "/api/v1/volumes/filesystem/browse",
-		...options,
-	});
+export const browseFilesystem = <ThrowOnError extends boolean = false>(options?: Options<BrowseFilesystemData, ThrowOnError>) => {
+    return (options?.client ?? client).get<BrowseFilesystemResponses, unknown, ThrowOnError>({
+        url: '/api/v1/volumes/filesystem/browse',
+        ...options
+    });
 };
 
 /**
  * List all repositories
  */
-export const listRepositories = <ThrowOnError extends boolean = false>(
-	options?: Options<ListRepositoriesData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).get<ListRepositoriesResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories",
-		...options,
-	});
+export const listRepositories = <ThrowOnError extends boolean = false>(options?: Options<ListRepositoriesData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ListRepositoriesResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories',
+        ...options
+    });
 };
 
 /**
  * Create a new restic repository
  */
-export const createRepository = <ThrowOnError extends boolean = false>(
-	options?: Options<CreateRepositoryData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).post<CreateRepositoryResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+export const createRepository = <ThrowOnError extends boolean = false>(options?: Options<CreateRepositoryData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CreateRepositoryResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };
 
 /**
  * List all configured rclone remotes on the host system
  */
-export const listRcloneRemotes = <ThrowOnError extends boolean = false>(
-	options?: Options<ListRcloneRemotesData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).get<ListRcloneRemotesResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/rclone-remotes",
-		...options,
-	});
+export const listRcloneRemotes = <ThrowOnError extends boolean = false>(options?: Options<ListRcloneRemotesData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ListRcloneRemotesResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/rclone-remotes',
+        ...options
+    });
 };
 
 /**
  * Delete a repository
  */
-export const deleteRepository = <ThrowOnError extends boolean = false>(
-	options: Options<DeleteRepositoryData, ThrowOnError>,
-) => {
-	return (options.client ?? client).delete<DeleteRepositoryResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/{name}",
-		...options,
-	});
+export const deleteRepository = <ThrowOnError extends boolean = false>(options: Options<DeleteRepositoryData, ThrowOnError>) => {
+    return (options.client ?? client).delete<DeleteRepositoryResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/{name}',
+        ...options
+    });
 };
 
 /**
  * Get a single repository by name
  */
-export const getRepository = <ThrowOnError extends boolean = false>(
-	options: Options<GetRepositoryData, ThrowOnError>,
-) => {
-	return (options.client ?? client).get<GetRepositoryResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/{name}",
-		...options,
-	});
+export const getRepository = <ThrowOnError extends boolean = false>(options: Options<GetRepositoryData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetRepositoryResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/{name}',
+        ...options
+    });
 };
 
 /**
  * List all snapshots in a repository
  */
-export const listSnapshots = <ThrowOnError extends boolean = false>(
-	options: Options<ListSnapshotsData, ThrowOnError>,
-) => {
-	return (options.client ?? client).get<ListSnapshotsResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/{name}/snapshots",
-		...options,
-	});
+export const listSnapshots = <ThrowOnError extends boolean = false>(options: Options<ListSnapshotsData, ThrowOnError>) => {
+    return (options.client ?? client).get<ListSnapshotsResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/{name}/snapshots',
+        ...options
+    });
 };
 
 /**
  * Get details of a specific snapshot
  */
-export const getSnapshotDetails = <ThrowOnError extends boolean = false>(
-	options: Options<GetSnapshotDetailsData, ThrowOnError>,
-) => {
-	return (options.client ?? client).get<GetSnapshotDetailsResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/{name}/snapshots/{snapshotId}",
-		...options,
-	});
+export const getSnapshotDetails = <ThrowOnError extends boolean = false>(options: Options<GetSnapshotDetailsData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetSnapshotDetailsResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/{name}/snapshots/{snapshotId}',
+        ...options
+    });
 };
 
 /**
  * List files and directories in a snapshot
  */
-export const listSnapshotFiles = <ThrowOnError extends boolean = false>(
-	options: Options<ListSnapshotFilesData, ThrowOnError>,
-) => {
-	return (options.client ?? client).get<ListSnapshotFilesResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/{name}/snapshots/{snapshotId}/files",
-		...options,
-	});
+export const listSnapshotFiles = <ThrowOnError extends boolean = false>(options: Options<ListSnapshotFilesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ListSnapshotFilesResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/{name}/snapshots/{snapshotId}/files',
+        ...options
+    });
 };
 
 /**
  * Restore a snapshot to a target path on the filesystem
  */
-export const restoreSnapshot = <ThrowOnError extends boolean = false>(
-	options: Options<RestoreSnapshotData, ThrowOnError>,
-) => {
-	return (options.client ?? client).post<RestoreSnapshotResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/{name}/restore",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options.headers,
-		},
-	});
+export const restoreSnapshot = <ThrowOnError extends boolean = false>(options: Options<RestoreSnapshotData, ThrowOnError>) => {
+    return (options.client ?? client).post<RestoreSnapshotResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/{name}/restore',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
 };
 
 /**
  * Run doctor operations on a repository to fix common issues (unlock, check, repair index). Use this when the repository is locked or has errors.
  */
-export const doctorRepository = <ThrowOnError extends boolean = false>(
-	options: Options<DoctorRepositoryData, ThrowOnError>,
-) => {
-	return (options.client ?? client).post<DoctorRepositoryResponses, unknown, ThrowOnError>({
-		url: "/api/v1/repositories/{name}/doctor",
-		...options,
-	});
+export const doctorRepository = <ThrowOnError extends boolean = false>(options: Options<DoctorRepositoryData, ThrowOnError>) => {
+    return (options.client ?? client).post<DoctorRepositoryResponses, unknown, ThrowOnError>({
+        url: '/api/v1/repositories/{name}/doctor',
+        ...options
+    });
 };
 
 /**
  * List all backup schedules
  */
-export const listBackupSchedules = <ThrowOnError extends boolean = false>(
-	options?: Options<ListBackupSchedulesData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).get<ListBackupSchedulesResponses, unknown, ThrowOnError>({
-		url: "/api/v1/backups",
-		...options,
-	});
+export const listBackupSchedules = <ThrowOnError extends boolean = false>(options?: Options<ListBackupSchedulesData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ListBackupSchedulesResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups',
+        ...options
+    });
 };
 
 /**
  * Create a new backup schedule for a volume
  */
-export const createBackupSchedule = <ThrowOnError extends boolean = false>(
-	options?: Options<CreateBackupScheduleData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).post<CreateBackupScheduleResponses, unknown, ThrowOnError>({
-		url: "/api/v1/backups",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+export const createBackupSchedule = <ThrowOnError extends boolean = false>(options?: Options<CreateBackupScheduleData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CreateBackupScheduleResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };
 
 /**
  * Delete a backup schedule
  */
-export const deleteBackupSchedule = <ThrowOnError extends boolean = false>(
-	options: Options<DeleteBackupScheduleData, ThrowOnError>,
-) => {
-	return (options.client ?? client).delete<DeleteBackupScheduleResponses, unknown, ThrowOnError>({
-		url: "/api/v1/backups/{scheduleId}",
-		...options,
-	});
+export const deleteBackupSchedule = <ThrowOnError extends boolean = false>(options: Options<DeleteBackupScheduleData, ThrowOnError>) => {
+    return (options.client ?? client).delete<DeleteBackupScheduleResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups/{scheduleId}',
+        ...options
+    });
 };
 
 /**
  * Get a backup schedule by ID
  */
-export const getBackupSchedule = <ThrowOnError extends boolean = false>(
-	options: Options<GetBackupScheduleData, ThrowOnError>,
-) => {
-	return (options.client ?? client).get<GetBackupScheduleResponses, unknown, ThrowOnError>({
-		url: "/api/v1/backups/{scheduleId}",
-		...options,
-	});
+export const getBackupSchedule = <ThrowOnError extends boolean = false>(options: Options<GetBackupScheduleData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetBackupScheduleResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups/{scheduleId}',
+        ...options
+    });
 };
 
 /**
  * Update a backup schedule
  */
-export const updateBackupSchedule = <ThrowOnError extends boolean = false>(
-	options: Options<UpdateBackupScheduleData, ThrowOnError>,
-) => {
-	return (options.client ?? client).patch<UpdateBackupScheduleResponses, unknown, ThrowOnError>({
-		url: "/api/v1/backups/{scheduleId}",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options.headers,
-		},
-	});
+export const updateBackupSchedule = <ThrowOnError extends boolean = false>(options: Options<UpdateBackupScheduleData, ThrowOnError>) => {
+    return (options.client ?? client).patch<UpdateBackupScheduleResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups/{scheduleId}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
 };
 
 /**
  * Get a backup schedule for a specific volume
  */
-export const getBackupScheduleForVolume = <ThrowOnError extends boolean = false>(
-	options: Options<GetBackupScheduleForVolumeData, ThrowOnError>,
-) => {
-	return (options.client ?? client).get<GetBackupScheduleForVolumeResponses, unknown, ThrowOnError>({
-		url: "/api/v1/backups/volume/{volumeId}",
-		...options,
-	});
+export const getBackupScheduleForVolume = <ThrowOnError extends boolean = false>(options: Options<GetBackupScheduleForVolumeData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetBackupScheduleForVolumeResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups/volume/{volumeId}',
+        ...options
+    });
 };
 
 /**
  * Trigger a backup immediately for a schedule
  */
-export const runBackupNow = <ThrowOnError extends boolean = false>(
-	options: Options<RunBackupNowData, ThrowOnError>,
-) => {
-	return (options.client ?? client).post<RunBackupNowResponses, unknown, ThrowOnError>({
-		url: "/api/v1/backups/{scheduleId}/run",
-		...options,
-	});
+export const runBackupNow = <ThrowOnError extends boolean = false>(options: Options<RunBackupNowData, ThrowOnError>) => {
+    return (options.client ?? client).post<RunBackupNowResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups/{scheduleId}/run',
+        ...options
+    });
 };
 
 /**
  * Stop a backup that is currently in progress
  */
 export const stopBackup = <ThrowOnError extends boolean = false>(options: Options<StopBackupData, ThrowOnError>) => {
-	return (options.client ?? client).post<StopBackupResponses, StopBackupErrors, ThrowOnError>({
-		url: "/api/v1/backups/{scheduleId}/stop",
-		...options,
-	});
+    return (options.client ?? client).post<StopBackupResponses, StopBackupErrors, ThrowOnError>({
+        url: '/api/v1/backups/{scheduleId}/stop',
+        ...options
+    });
+};
+
+/**
+ * Manually apply retention policy to clean up old snapshots
+ */
+export const runForget = <ThrowOnError extends boolean = false>(options: Options<RunForgetData, ThrowOnError>) => {
+    return (options.client ?? client).post<RunForgetResponses, unknown, ThrowOnError>({
+        url: '/api/v1/backups/{scheduleId}/forget',
+        ...options
+    });
 };
 
 /**
  * Get system information including available capabilities
  */
-export const getSystemInfo = <ThrowOnError extends boolean = false>(
-	options?: Options<GetSystemInfoData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).get<GetSystemInfoResponses, unknown, ThrowOnError>({
-		url: "/api/v1/system/info",
-		...options,
-	});
+export const getSystemInfo = <ThrowOnError extends boolean = false>(options?: Options<GetSystemInfoData, ThrowOnError>) => {
+    return (options?.client ?? client).get<GetSystemInfoResponses, unknown, ThrowOnError>({
+        url: '/api/v1/system/info',
+        ...options
+    });
 };
 
 /**
  * Download the Restic password file for backup recovery. Requires password re-authentication.
  */
-export const downloadResticPassword = <ThrowOnError extends boolean = false>(
-	options?: Options<DownloadResticPasswordData, ThrowOnError>,
-) => {
-	return (options?.client ?? client).post<DownloadResticPasswordResponses, unknown, ThrowOnError>({
-		url: "/api/v1/system/restic-password",
-		...options,
-		headers: {
-			"Content-Type": "application/json",
-			...options?.headers,
-		},
-	});
+export const downloadResticPassword = <ThrowOnError extends boolean = false>(options?: Options<DownloadResticPasswordData, ThrowOnError>) => {
+    return (options?.client ?? client).post<DownloadResticPasswordResponses, unknown, ThrowOnError>({
+        url: '/api/v1/system/restic-password',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
 };

app/client/components/app-breadcrumb.tsx

@@ -1,4 +1,4 @@
-import { Link } from "react-router";
+import { Link, useMatches, type UIMatch } from "react-router";
 import {
 	Breadcrumb,
 	BreadcrumbItem,
@@ -7,14 +7,38 @@ import {
 	BreadcrumbPage,
 	BreadcrumbSeparator,
 } from "~/client/components/ui/breadcrumb";
-import { useBreadcrumbs } from "~/client/lib/breadcrumbs";
+
+export interface BreadcrumbItemData {
+	label: string;
+	href?: string;
+}
+
+interface RouteHandle {
+	breadcrumb?: (match: UIMatch) => BreadcrumbItemData[] | null;
+}
 
 export function AppBreadcrumb() {
-	const breadcrumbs = useBreadcrumbs();
+	const matches = useMatches();
+
+	// Find the last match with a breadcrumb handler
+	const lastMatchWithBreadcrumb = [...matches].reverse().find((match) => {
+		const handle = match.handle as RouteHandle | undefined;
+		return handle?.breadcrumb;
+	});
+
+	if (!lastMatchWithBreadcrumb) {
+		return null;
+	}
+
+	const handle = lastMatchWithBreadcrumb.handle as RouteHandle;
+	const breadcrumbs = handle.breadcrumb?.(lastMatchWithBreadcrumb);
+
+	if (!breadcrumbs || breadcrumbs.length === 0) {
+		return null;
+	}
 
 	return (
 		<Breadcrumb>
-			<BreadcrumbLink asChild></BreadcrumbLink>
 			<BreadcrumbList>
 				{breadcrumbs.map((breadcrumb, index) => {
 					const isLast = index === breadcrumbs.length - 1;
@@ -22,14 +46,12 @@ export function AppBreadcrumb() {
 					return (
 						<div key={`${breadcrumb.label}-${index}`} className="contents">
 							<BreadcrumbItem>
-								{isLast || breadcrumb.isCurrentPage ? (
+								{isLast || !breadcrumb.href ? (
 									<BreadcrumbPage>{breadcrumb.label}</BreadcrumbPage>
-								) : breadcrumb.href ? (
+								) : (
 									<BreadcrumbLink asChild>
 										<Link to={breadcrumb.href}>{breadcrumb.label}</Link>
 									</BreadcrumbLink>
-								) : (
-									<BreadcrumbPage>{breadcrumb.label}</BreadcrumbPage>
 								)}
 							</BreadcrumbItem>
 							{!isLast && <BreadcrumbSeparator />}

app/client/components/create-repository-dialog.tsx

@@ -1,66 +0,0 @@
-import { useMutation } from "@tanstack/react-query";
-import { Plus } from "lucide-react";
-import { useId } from "react";
-import { toast } from "sonner";
-import { parseError } from "~/client/lib/errors";
-import { CreateRepositoryForm } from "./create-repository-form";
-import { Button } from "./ui/button";
-import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "./ui/dialog";
-import { ScrollArea } from "./ui/scroll-area";
-import { createRepositoryMutation } from "../api-client/@tanstack/react-query.gen";
-
-type Props = {
-	open: boolean;
-	setOpen: (open: boolean) => void;
-};
-
-export const CreateRepositoryDialog = ({ open, setOpen }: Props) => {
-	const formId = useId();
-
-	const create = useMutation({
-		...createRepositoryMutation(),
-		onSuccess: () => {
-			toast.success("Repository created successfully");
-			setOpen(false);
-		},
-		onError: (error) => {
-			toast.error("Failed to create repository", {
-				description: parseError(error)?.message,
-			});
-		},
-	});
-
-	return (
-		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
-				<Button>
-					<Plus size={16} className="mr-2" />
-					Create Repository
-				</Button>
-			</DialogTrigger>
-			<DialogContent>
-				<ScrollArea className="h-[500px] p-4">
-					<DialogHeader>
-						<DialogTitle>Create repository</DialogTitle>
-					</DialogHeader>
-					<CreateRepositoryForm
-						className="mt-4"
-						mode="create"
-						formId={formId}
-						onSubmit={(values) => {
-							create.mutate({ body: { config: values, name: values.name, compressionMode: values.compressionMode } });
-						}}
-					/>
-					<DialogFooter className="mt-4">
-						<Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-							Cancel
-						</Button>
-						<Button type="submit" form={formId} disabled={create.isPending}>
-							Create
-						</Button>
-					</DialogFooter>
-				</ScrollArea>
-			</DialogContent>
-		</Dialog>
-	);
-};

app/client/components/create-repository-form.tsx

@@ -1,6 +1,6 @@
 import { arktypeResolver } from "@hookform/resolvers/arktype";
 import { type } from "arktype";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { cn, slugify } from "~/client/lib/utils";
 import { deepClean } from "~/utils/object";
@@ -15,6 +15,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "./ui/tooltip";
 import { useSystemInfo } from "~/client/hooks/use-system-info";
 import { COMPRESSION_MODES, repositoryConfigSchema } from "~/schemas/restic";
 import { listRcloneRemotesOptions } from "../api-client/@tanstack/react-query.gen";
+import { Checkbox } from "./ui/checkbox";
 
 export const formSchema = type({
 	name: "2<=string<=32",
@@ -36,6 +37,7 @@ type Props = {
 const defaultValuesForType = {
 	local: { backend: "local" as const, compressionMode: "auto" as const },
 	s3: { backend: "s3" as const, compressionMode: "auto" as const },
+	r2: { backend: "r2" as const, compressionMode: "auto" as const },
 	gcs: { backend: "gcs" as const, compressionMode: "auto" as const },
 	azure: { backend: "azure" as const, compressionMode: "auto" as const },
 	rclone: { backend: "rclone" as const, compressionMode: "auto" as const },
@@ -58,23 +60,29 @@ export const CreateRepositoryForm = ({
 		},
 	});
 
-	const { watch } = form;
+	const { watch, setValue } = form;
 
 	const watchedBackend = watch("backend");
+	const watchedIsExistingRepository = watch("isExistingRepository");
+
+	const [passwordMode, setPasswordMode] = useState<"default" | "custom">("default");
+
+	const { capabilities } = useSystemInfo();
 
 	const { data: rcloneRemotes, isLoading: isLoadingRemotes } = useQuery({
 		...listRcloneRemotesOptions(),
+		enabled: capabilities.rclone,
 	});
 
 	useEffect(() => {
 		form.reset({
 			name: form.getValues().name,
+			isExistingRepository: form.getValues().isExistingRepository,
+			customPassword: form.getValues().customPassword,
 			...defaultValuesForType[watchedBackend as keyof typeof defaultValuesForType],
 		});
 	}, [watchedBackend, form]);
 
-	const { capabilities } = useSystemInfo();
-
 	return (
 		<Form {...form}>
 			<form id={formId} onSubmit={form.handleSubmit(onSubmit)} className={cn("space-y-4", className)}>
@@ -115,6 +123,7 @@ export const CreateRepositoryForm = ({
 								<SelectContent>
 									<SelectItem value="local">Local</SelectItem>
 									<SelectItem value="s3">S3</SelectItem>
+									<SelectItem value="r2">Cloudflare R2</SelectItem>
 									<SelectItem value="gcs">Google Cloud Storage</SelectItem>
 									<SelectItem value="azure">Azure Blob Storage</SelectItem>
 									<Tooltip>
@@ -161,6 +170,81 @@ export const CreateRepositoryForm = ({
 					)}
 				/>
 
+				<FormField
+					control={form.control}
+					name="isExistingRepository"
+					render={({ field }) => (
+						<FormItem className="flex flex-row items-center space-x-3">
+							<FormControl>
+								<Checkbox
+									checked={field.value}
+									onCheckedChange={(checked) => {
+										field.onChange(checked);
+										if (!checked) {
+											setPasswordMode("default");
+											setValue("customPassword", undefined);
+										}
+									}}
+								/>
+							</FormControl>
+							<div className="space-y-1">
+								<FormLabel>Import existing repository</FormLabel>
+								<FormDescription>Check this if the repository already exists at the specified location</FormDescription>
+							</div>
+						</FormItem>
+					)}
+				/>
+				{watchedIsExistingRepository && (
+					<>
+						<FormItem>
+							<FormLabel>Repository Password</FormLabel>
+							<Select
+								onValueChange={(value) => {
+									setPasswordMode(value as "default" | "custom");
+									if (value === "default") {
+										setValue("customPassword", undefined);
+									}
+								}}
+								defaultValue={passwordMode}
+								value={passwordMode}
+							>
+								<FormControl>
+									<SelectTrigger>
+										<SelectValue placeholder="Select password option" />
+									</SelectTrigger>
+								</FormControl>
+								<SelectContent>
+									<SelectItem value="default">Use Ironmount's password</SelectItem>
+									<SelectItem value="custom">Enter password manually</SelectItem>
+								</SelectContent>
+							</Select>
+							<FormDescription>
+								Choose whether to use Ironmount's master password or enter a custom password for the existing
+								repository.
+							</FormDescription>
+						</FormItem>
+
+						{passwordMode === "custom" && (
+							<FormField
+								control={form.control}
+								name="customPassword"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Repository Password</FormLabel>
+										<FormControl>
+											<Input type="password" placeholder="Enter repository password" {...field} />
+										</FormControl>
+										<FormDescription>
+											The password used to encrypt this repository. It will be stored securely.
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+						)}
+					</>
+				)}
+
 				{watchedBackend === "s3" && (
 					<>
 						<FormField
@@ -222,6 +306,69 @@ export const CreateRepositoryForm = ({
 					</>
 				)}
 
+				{watchedBackend === "r2" && (
+					<>
+						<FormField
+							control={form.control}
+							name="endpoint"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Endpoint</FormLabel>
+									<FormControl>
+										<Input placeholder="<account-id>.r2.cloudflarestorage.com" {...field} />
+									</FormControl>
+									<FormDescription>
+										R2 endpoint (without https://). Find in R2 dashboard under bucket settings.
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="bucket"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Bucket</FormLabel>
+									<FormControl>
+										<Input placeholder="my-backup-bucket" {...field} />
+									</FormControl>
+									<FormDescription>R2 bucket name for storing backups.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="accessKeyId"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Access Key ID</FormLabel>
+									<FormControl>
+										<Input placeholder="Access Key ID from R2 API tokens" {...field} />
+									</FormControl>
+									<FormDescription>R2 API token Access Key ID (create in Cloudflare R2 dashboard).</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="secretAccessKey"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Secret Access Key</FormLabel>
+									<FormControl>
+										<Input type="password" placeholder="••••••••" {...field} />
+									</FormControl>
+									<FormDescription>R2 API token Secret Access Key (shown once when creating token).</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					</>
+				)}
+
 				{watchedBackend === "gcs" && (
 					<>
 						<FormField

app/client/components/create-volume-dialog.tsx

@@ -1,66 +0,0 @@
-import { useMutation } from "@tanstack/react-query";
-import { Plus } from "lucide-react";
-import { useId } from "react";
-import { toast } from "sonner";
-import { parseError } from "~/client/lib/errors";
-import { CreateVolumeForm } from "./create-volume-form";
-import { Button } from "./ui/button";
-import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "./ui/dialog";
-import { ScrollArea } from "./ui/scroll-area";
-import { createVolumeMutation } from "../api-client/@tanstack/react-query.gen";
-
-type Props = {
-	open: boolean;
-	setOpen: (open: boolean) => void;
-};
-
-export const CreateVolumeDialog = ({ open, setOpen }: Props) => {
-	const formId = useId();
-
-	const create = useMutation({
-		...createVolumeMutation(),
-		onSuccess: () => {
-			toast.success("Volume created successfully");
-			setOpen(false);
-		},
-		onError: (error) => {
-			toast.error("Failed to create volume", {
-				description: parseError(error)?.message,
-			});
-		},
-	});
-
-	return (
-		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
-				<Button>
-					<Plus size={16} className="mr-2" />
-					Create volume
-				</Button>
-			</DialogTrigger>
-			<DialogContent>
-				<ScrollArea className="h-[500px] p-4">
-					<DialogHeader>
-						<DialogTitle>Create volume</DialogTitle>
-					</DialogHeader>
-					<CreateVolumeForm
-						className="mt-4"
-						mode="create"
-						formId={formId}
-						onSubmit={(values) => {
-							create.mutate({ body: { config: values, name: values.name } });
-						}}
-					/>
-					<DialogFooter className="mt-4">
-						<Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-							Cancel
-						</Button>
-						<Button type="submit" form={formId} disabled={create.isPending}>
-							Create
-						</Button>
-					</DialogFooter>
-				</ScrollArea>
-			</DialogContent>
-		</Dialog>
-	);
-};

app/client/components/directory-browser.tsx

@@ -1,8 +1,8 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useCallback, useMemo, useState } from "react";
-import { FileTree, type FileEntry } from "./file-tree";
+import { FileTree } from "./file-tree";
 import { ScrollArea } from "./ui/scroll-area";
 import { browseFilesystemOptions } from "../api-client/@tanstack/react-query.gen";
+import { useFileBrowser } from "../hooks/use-file-browser";
 
 type Props = {
 	onSelectPath: (path: string) => void;
@@ -11,82 +11,23 @@ type Props = {
 
 export const DirectoryBrowser = ({ onSelectPath, selectedPath }: Props) => {
 	const queryClient = useQueryClient();
-	const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());
-	const [fetchedFolders, setFetchedFolders] = useState<Set<string>>(new Set(["/"]));
-	const [loadingFolders, setLoadingFolders] = useState<Set<string>>(new Set());
-	const [allFiles, setAllFiles] = useState<Map<string, FileEntry>>(new Map());
 
 	const { data, isLoading } = useQuery({
 		...browseFilesystemOptions({ query: { path: "/" } }),
 	});
 
-	useMemo(() => {
-		if (data?.directories) {
-			setAllFiles((prev) => {
-				const next = new Map(prev);
-				for (const dir of data.directories) {
-					next.set(dir.path, { name: dir.name, path: dir.path, type: "folder" });
-				}
-				return next;
-			});
-		}
-	}, [data]);
-
-	const fileArray = useMemo(() => Array.from(allFiles.values()), [allFiles]);
-
-	const handleFolderExpand = useCallback(
-		async (folderPath: string) => {
-			setExpandedFolders((prev) => {
-				const next = new Set(prev);
-				next.add(folderPath);
-				return next;
-			});
-
-			if (!fetchedFolders.has(folderPath)) {
-				setLoadingFolders((prev) => new Set(prev).add(folderPath));
-
-				try {
-					const result = await queryClient.ensureQueryData(
-						browseFilesystemOptions({
-							query: { path: folderPath },
-						}),
-					);
-
-					if (result.directories) {
-						setAllFiles((prev) => {
-							const next = new Map(prev);
-							for (const dir of result.directories) {
-								next.set(dir.path, { name: dir.name, path: dir.path, type: "folder" });
-							}
-							return next;
-						});
-
-						setFetchedFolders((prev) => new Set(prev).add(folderPath));
-					}
-				} catch (error) {
-					console.error("Failed to fetch folder contents:", error);
-				} finally {
-					setLoadingFolders((prev) => {
-						const next = new Set(prev);
-						next.delete(folderPath);
-						return next;
-					});
-				}
-			}
+	const fileBrowser = useFileBrowser({
+		initialData: data,
+		isLoading,
+		fetchFolder: async (path) => {
+			return await queryClient.ensureQueryData(browseFilesystemOptions({ query: { path } }));
 		},
-		[fetchedFolders, queryClient],
-	);
-
-	const handleFolderHover = useCallback(
-		(folderPath: string) => {
-			if (!fetchedFolders.has(folderPath) && !loadingFolders.has(folderPath)) {
-				queryClient.prefetchQuery(browseFilesystemOptions({ query: { path: folderPath } }));
-			}
+		prefetchFolder: (path) => {
+			queryClient.prefetchQuery(browseFilesystemOptions({ query: { path } }));
 		},
-		[fetchedFolders, loadingFolders, queryClient],
-	);
+	});
 
-	if (isLoading && fileArray.length === 0) {
+	if (fileBrowser.isLoading) {
 		return (
 			<div className="border rounded-lg overflow-hidden">
 				<ScrollArea className="h-64">
@@ -96,7 +37,7 @@ export const DirectoryBrowser = ({ onSelectPath, selectedPath }: Props) => {
 		);
 	}
 
-	if (fileArray.length === 0) {
+	if (fileBrowser.isEmpty) {
 		return (
 			<div className="border rounded-lg overflow-hidden">
 				<ScrollArea className="h-64">
@@ -110,11 +51,11 @@ export const DirectoryBrowser = ({ onSelectPath, selectedPath }: Props) => {
 		<div className="border rounded-lg overflow-hidden">
 			<ScrollArea className="h-64">
 				<FileTree
-					files={fileArray}
-					onFolderExpand={handleFolderExpand}
-					onFolderHover={handleFolderHover}
-					expandedFolders={expandedFolders}
-					loadingFolders={loadingFolders}
+					files={fileBrowser.fileArray}
+					onFolderExpand={fileBrowser.handleFolderExpand}
+					onFolderHover={fileBrowser.handleFolderHover}
+					expandedFolders={fileBrowser.expandedFolders}
+					loadingFolders={fileBrowser.loadingFolders}
 					foldersOnly
 					selectableFolders
 					selectedFolder={selectedPath}

app/client/components/volume-file-browser.tsx

@@ -1,16 +1,8 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { FolderOpen } from "lucide-react";
-import { useCallback, useMemo, useState } from "react";
 import { FileTree } from "~/client/components/file-tree";
 import { listFilesOptions } from "../api-client/@tanstack/react-query.gen";
-
-interface FileEntry {
-	name: string;
-	path: string;
-	type: "file" | "directory";
-	size?: number;
-	modifiedAt?: number;
-}
+import { useFileBrowser } from "../hooks/use-file-browser";
 
 type VolumeFileBrowserProps = {
 	volumeName: string;
@@ -36,89 +28,34 @@ export const VolumeFileBrowser = ({
 	emptyDescription,
 }: VolumeFileBrowserProps) => {
 	const queryClient = useQueryClient();
-	const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());
-	const [fetchedFolders, setFetchedFolders] = useState<Set<string>>(new Set(["/"]));
-	const [loadingFolders, setLoadingFolders] = useState<Set<string>>(new Set());
-	const [allFiles, setAllFiles] = useState<Map<string, FileEntry>>(new Map());
 
 	const { data, isLoading, error } = useQuery({
 		...listFilesOptions({ path: { name: volumeName } }),
 		enabled,
 	});
 
-	useMemo(() => {
-		if (data?.files) {
-			setAllFiles((prev) => {
-				const next = new Map(prev);
-				for (const file of data.files) {
-					next.set(file.path, file);
-				}
-				return next;
-			});
-		}
-	}, [data]);
-
-	const fileArray = useMemo(() => Array.from(allFiles.values()), [allFiles]);
-
-	const handleFolderExpand = useCallback(
-		async (folderPath: string) => {
-			setExpandedFolders((prev) => {
-				const next = new Set(prev);
-				next.add(folderPath);
-				return next;
-			});
-
-			if (!fetchedFolders.has(folderPath)) {
-				setLoadingFolders((prev) => new Set(prev).add(folderPath));
-
-				try {
-					const result = await queryClient.ensureQueryData(
-						listFilesOptions({
-							path: { name: volumeName },
-							query: { path: folderPath },
-						}),
-					);
-
-					if (result.files) {
-						setAllFiles((prev) => {
-							const next = new Map(prev);
-							for (const file of result.files) {
-								next.set(file.path, file);
-							}
-							return next;
-						});
-
-						setFetchedFolders((prev) => new Set(prev).add(folderPath));
-					}
-				} catch (error) {
-					console.error("Failed to fetch folder contents:", error);
-				} finally {
-					setLoadingFolders((prev) => {
-						const next = new Set(prev);
-						next.delete(folderPath);
-						return next;
-					});
-				}
-			}
+	const fileBrowser = useFileBrowser({
+		initialData: data,
+		isLoading,
+		fetchFolder: async (path) => {
+			return await queryClient.ensureQueryData(
+				listFilesOptions({
+					path: { name: volumeName },
+					query: { path },
+				}),
+			);
 		},
-		[volumeName, fetchedFolders, queryClient.ensureQueryData],
-	);
-
-	const handleFolderHover = useCallback(
-		(folderPath: string) => {
-			if (!fetchedFolders.has(folderPath) && !loadingFolders.has(folderPath)) {
-				queryClient.prefetchQuery(
-					listFilesOptions({
-						path: { name: volumeName },
-						query: { path: folderPath },
-					}),
-				);
-			}
+		prefetchFolder: (path) => {
+			queryClient.prefetchQuery(
+				listFilesOptions({
+					path: { name: volumeName },
+					query: { path },
+				}),
+			);
 		},
-		[volumeName, fetchedFolders, loadingFolders, queryClient],
-	);
+	});
 
-	if (isLoading && fileArray.length === 0) {
+	if (fileBrowser.isLoading) {
 		return (
 			<div className="flex items-center justify-center h-full min-h-[200px]">
 				<p className="text-muted-foreground">Loading files...</p>
@@ -134,7 +71,7 @@ export const VolumeFileBrowser = ({
 		);
 	}
 
-	if (fileArray.length === 0) {
+	if (fileBrowser.isEmpty) {
 		return (
 			<div className="flex flex-col items-center justify-center h-full text-center p-8 min-h-[200px]">
 				<FolderOpen className="mb-4 h-12 w-12 text-muted-foreground" />
@@ -147,11 +84,11 @@ export const VolumeFileBrowser = ({
 	return (
 		<div className={className}>
 			<FileTree
-				files={fileArray}
-				onFolderExpand={handleFolderExpand}
-				onFolderHover={handleFolderHover}
-				expandedFolders={expandedFolders}
-				loadingFolders={loadingFolders}
+				files={fileBrowser.fileArray}
+				onFolderExpand={fileBrowser.handleFolderExpand}
+				onFolderHover={fileBrowser.handleFolderHover}
+				expandedFolders={fileBrowser.expandedFolders}
+				loadingFolders={fileBrowser.loadingFolders}
 				withCheckboxes={withCheckboxes}
 				selectedPaths={selectedPaths}
 				onSelectionChange={onSelectionChange}

app/client/components/volume-icon.tsx

@@ -1,4 +1,4 @@
-import { Cloud, Folder, Server, Share2 } from "lucide-react";
+import { Cloud, Database, Folder, Server, Share2 } from "lucide-react";
 import type { BackendType } from "~/schemas/volumes";
 
 type VolumeIconProps = {
@@ -32,6 +32,24 @@ const getIconAndColor = (backend: BackendType) => {
 				color: "text-green-600 dark:text-green-400",
 				label: "WebDAV",
 			};
+		case "mariadb":
+			return {
+				icon: Database,
+				color: "text-teal-600 dark:text-teal-400",
+				label: "MariaDB",
+			};
+		case "mysql":
+			return {
+				icon: Database,
+				color: "text-cyan-600 dark:text-cyan-400",
+				label: "MySQL",
+			};
+		case "postgres":
+			return {
+				icon: Database,
+				color: "text-indigo-600 dark:text-indigo-400",
+				label: "PostgreSQL",
+			};
 		default:
 			return {
 				icon: Folder,

app/client/hooks/use-file-browser.ts

@@ -0,0 +1,135 @@
+import { useCallback, useMemo, useState } from "react";
+import type { FileEntry } from "../components/file-tree";
+
+type FetchFolderFn = (
+	path: string,
+) => Promise<{ files?: FileEntry[]; directories?: Array<{ name: string; path: string }> }>;
+
+type PathTransformFns = {
+	strip?: (path: string) => string;
+	add?: (path: string) => string;
+};
+
+type UseFileBrowserOptions = {
+	initialData?: { files?: FileEntry[]; directories?: Array<{ name: string; path: string }> };
+	isLoading?: boolean;
+	fetchFolder: FetchFolderFn;
+	prefetchFolder?: (path: string) => void;
+	pathTransform?: PathTransformFns;
+	rootPath?: string;
+};
+
+export const useFileBrowser = (props: UseFileBrowserOptions) => {
+	const { initialData, isLoading, fetchFolder, prefetchFolder, pathTransform, rootPath = "/" } = props;
+	const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());
+	const [fetchedFolders, setFetchedFolders] = useState<Set<string>>(new Set([rootPath]));
+	const [loadingFolders, setLoadingFolders] = useState<Set<string>>(new Set());
+	const [allFiles, setAllFiles] = useState<Map<string, FileEntry>>(new Map());
+
+	const stripPath = pathTransform?.strip;
+	const addPath = pathTransform?.add;
+
+	useMemo(() => {
+		if (initialData?.files) {
+			const files = initialData.files;
+			setAllFiles((prev) => {
+				const next = new Map(prev);
+				for (const file of files) {
+					const path = stripPath ? stripPath(file.path) : file.path;
+					if (path !== rootPath) {
+						next.set(path, { ...file, path });
+					}
+				}
+				return next;
+			});
+			if (rootPath) {
+				setFetchedFolders((prev) => new Set(prev).add(rootPath));
+			}
+		} else if (initialData?.directories) {
+			const directories = initialData.directories;
+			setAllFiles((prev) => {
+				const next = new Map(prev);
+				for (const dir of directories) {
+					next.set(dir.path, { name: dir.name, path: dir.path, type: "folder" });
+				}
+				return next;
+			});
+		}
+	}, [initialData, stripPath, rootPath]);
+
+	const fileArray = useMemo(() => Array.from(allFiles.values()), [allFiles]);
+
+	const handleFolderExpand = useCallback(
+		async (folderPath: string) => {
+			setExpandedFolders((prev) => {
+				const next = new Set(prev);
+				next.add(folderPath);
+				return next;
+			});
+
+			if (!fetchedFolders.has(folderPath)) {
+				setLoadingFolders((prev) => new Set(prev).add(folderPath));
+
+				try {
+					const pathToFetch = addPath ? addPath(folderPath) : folderPath;
+					const result = await fetchFolder(pathToFetch);
+
+					if (result.files) {
+						const files = result.files;
+						setAllFiles((prev) => {
+							const next = new Map(prev);
+							for (const file of files) {
+								const strippedPath = stripPath ? stripPath(file.path) : file.path;
+								// Skip the directory itself
+								if (strippedPath !== folderPath) {
+									next.set(strippedPath, { ...file, path: strippedPath });
+								}
+							}
+							return next;
+						});
+					} else if (result.directories) {
+						const directories = result.directories;
+						setAllFiles((prev) => {
+							const next = new Map(prev);
+							for (const dir of directories) {
+								next.set(dir.path, { name: dir.name, path: dir.path, type: "folder" });
+							}
+							return next;
+						});
+					}
+
+					setFetchedFolders((prev) => new Set(prev).add(folderPath));
+				} catch (error) {
+					console.error("Failed to fetch folder contents:", error);
+				} finally {
+					setLoadingFolders((prev) => {
+						const next = new Set(prev);
+						next.delete(folderPath);
+						return next;
+					});
+				}
+			}
+		},
+		[fetchedFolders, fetchFolder, stripPath, addPath],
+	);
+
+	const handleFolderHover = useCallback(
+		(folderPath: string) => {
+			if (!fetchedFolders.has(folderPath) && !loadingFolders.has(folderPath) && prefetchFolder) {
+				const pathToPrefetch = addPath ? addPath(folderPath) : folderPath;
+				prefetchFolder(pathToPrefetch);
+			}
+		},
+		[fetchedFolders, loadingFolders, prefetchFolder, addPath],
+	);
+
+	return {
+		fileArray,
+		expandedFolders,
+		loadingFolders,
+		handleFolderExpand,
+		handleFolderHover,
+		isLoading: isLoading && fileArray.length === 0,
+		isEmpty: fileArray.length === 0 && !isLoading,
+	};
+};

app/client/lib/breadcrumbs.ts

@@ -1,86 +0,0 @@
-import { useLocation, useParams } from "react-router";
-
-export interface BreadcrumbItem {
-	label: string;
-	href?: string;
-	isCurrentPage?: boolean;
-}
-
-/**
- * Generates breadcrumb items based on the current route
- * @param pathname - Current pathname from useLocation
- * @param params - Route parameters from useParams
- * @returns Array of breadcrumb items
- */
-export function generateBreadcrumbs(pathname: string, params: Record<string, string | undefined>): BreadcrumbItem[] {
-	const breadcrumbs: BreadcrumbItem[] = [];
-
-	if (pathname.startsWith("/repositories")) {
-		breadcrumbs.push({
-			label: "Repositories",
-			href: "/repositories",
-			isCurrentPage: pathname === "/repositories",
-		});
-
-		if (pathname.startsWith("/repositories/") && params.name) {
-			const isSnapshotPage = !!params.snapshotId;
-
-			breadcrumbs.push({
-				label: params.name,
-				href: isSnapshotPage ? `/repositories/${params.name}` : undefined,
-				isCurrentPage: !isSnapshotPage,
-			});
-
-			if (isSnapshotPage && params.snapshotId) {
-				breadcrumbs.push({
-					label: params.snapshotId,
-					isCurrentPage: true,
-				});
-			}
-		}
-
-		return breadcrumbs;
-	}
-
-	if (pathname.startsWith("/backups")) {
-		breadcrumbs.push({
-			label: "Backups",
-			href: "/backups",
-			isCurrentPage: pathname === "/backups",
-		});
-
-		if (pathname.startsWith("/backups/") && params.id) {
-			breadcrumbs.push({
-				label: `Schedule #${params.id}`,
-				isCurrentPage: true,
-			});
-		}
-
-		return breadcrumbs;
-	}
-
-	breadcrumbs.push({
-		label: "Volumes",
-		href: "/volumes",
-		isCurrentPage: pathname === "/volumes",
-	});
-
-	if (pathname.startsWith("/volumes/") && params.name) {
-		breadcrumbs.push({
-			label: params.name,
-			isCurrentPage: true,
-		});
-	}
-
-	return breadcrumbs;
-}
-
-/**
- * Hook to get breadcrumb data for the current route
- */
-export function useBreadcrumbs(): BreadcrumbItem[] {
-	const location = useLocation();
-	const params = useParams();
-
-	return generateBreadcrumbs(location.pathname, params);
-}

app/client/modules/backups/components/create-schedule-form.tsx

@@ -254,7 +254,7 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 						<CardHeader>
 							<CardTitle>Backup paths</CardTitle>
 							<CardDescription>
-								Select which folders to include in the backup. If no paths are selected, the entire volume will be
+								Select which folders or files to include in the backup. If no paths are selected, the entire volume will be
 								backed up.
 							</CardDescription>
 						</CardHeader>
@@ -264,7 +264,7 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 								selectedPaths={selectedPaths}
 								onSelectionChange={handleSelectionChange}
 								withCheckboxes={true}
-								foldersOnly={true}
+								foldersOnly={false}
 								className="flex-1 border rounded-md bg-card p-2 min-h-[300px] max-h-[400px] overflow-auto"
 							/>
 							{selectedPaths.size > 0 && (

app/client/modules/backups/components/schedule-summary.tsx

@@ -1,4 +1,4 @@
-import { Pencil, Play, Square, Trash2 } from "lucide-react";
+import { Eraser, Pencil, Play, Square, Trash2 } from "lucide-react";
 import { useMemo, useState } from "react";
 import { OnOff } from "~/client/components/onoff";
 import { Button } from "~/client/components/ui/button";
@@ -14,6 +14,10 @@ import {
 } from "~/client/components/ui/alert-dialog";
 import type { BackupSchedule } from "~/client/lib/types";
 import { BackupProgressCard } from "./backup-progress-card";
+import { runForgetMutation } from "~/client/api-client/@tanstack/react-query.gen";
+import { useMutation } from "@tanstack/react-query";
+import { toast } from "sonner";
+import { parseError } from "~/client/lib/errors";
 
 type Props = {
 	schedule: BackupSchedule;
@@ -28,6 +32,17 @@ export const ScheduleSummary = (props: Props) => {
 	const { schedule, handleToggleEnabled, handleRunBackupNow, handleStopBackup, handleDeleteSchedule, setIsEditMode } =
 		props;
 	const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
+	const [showForgetConfirm, setShowForgetConfirm] = useState(false);
+
+	const runForget = useMutation({
+		...runForgetMutation(),
+		onSuccess: () => {
+			toast.success("Retention policy applied successfully");
+		},
+		onError: (error) => {
+			toast.error("Failed to apply retention policy", { description: parseError(error)?.message });
+		},
+	});
 
 	const summary = useMemo(() => {
 		const scheduleLabel = schedule ? schedule.cronExpression : "-";
@@ -56,6 +71,11 @@ export const ScheduleSummary = (props: Props) => {
 		handleDeleteSchedule();
 	};
 
+	const handleConfirmForget = () => {
+		setShowForgetConfirm(false);
+		runForget.mutate({ path: { scheduleId: schedule.id.toString() } });
+	};
+
 	return (
 		<div className="space-y-4">
 			<Card>
@@ -89,6 +109,18 @@ export const ScheduleSummary = (props: Props) => {
 								<span className="sm:inline">Backup now</span>
 							</Button>
 						)}
+						{schedule.retentionPolicy && (
+							<Button
+								variant="outline"
+								size="sm"
+								loading={runForget.isPending}
+								onClick={() => setShowForgetConfirm(true)}
+								className="w-full sm:w-auto"
+							>
+								<Eraser className="h-4 w-4 mr-2" />
+								<span className="sm:inline">Run cleanup</span>
+							</Button>
+						)}
 						<Button variant="outline" size="sm" onClick={() => setIsEditMode(true)} className="w-full sm:w-auto">
 							<Pencil className="h-4 w-4 mr-2" />
 							<span className="sm:inline">Edit schedule</span>
@@ -167,6 +199,22 @@ export const ScheduleSummary = (props: Props) => {
 					</div>
 				</AlertDialogContent>
 			</AlertDialog>
+
+			<AlertDialog open={showForgetConfirm} onOpenChange={setShowForgetConfirm}>
+				<AlertDialogContent>
+					<AlertDialogHeader>
+						<AlertDialogTitle>Run retention policy cleanup?</AlertDialogTitle>
+						<AlertDialogDescription>
+							This will apply the retention policy and permanently delete old snapshots according to the configured
+							rules ({summary.retentionLabel}). This action cannot be undone.
+						</AlertDialogDescription>
+					</AlertDialogHeader>
+					<div className="flex gap-3 justify-end">
+						<AlertDialogCancel>Cancel</AlertDialogCancel>
+						<AlertDialogAction onClick={handleConfirmForget}>Run cleanup</AlertDialogAction>
+					</div>
+				</AlertDialogContent>
+			</AlertDialog>
 		</div>
 	);
 };

app/client/modules/backups/components/snapshot-file-browser.tsx

@@ -1,7 +1,7 @@
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useState } from "react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { FileIcon } from "lucide-react";
-import { FileTree, type FileEntry } from "~/client/components/file-tree";
+import { FileTree } from "~/client/components/file-tree";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "~/client/components/ui/card";
 import { Button } from "~/client/components/ui/button";
 import { Checkbox } from "~/client/components/ui/checkbox";
@@ -20,6 +20,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "~/client/components/ui/
 import type { Snapshot, Volume } from "~/client/lib/types";
 import { toast } from "sonner";
 import { listSnapshotFilesOptions, restoreSnapshotMutation } from "~/client/api-client/@tanstack/react-query.gen";
+import { useFileBrowser } from "~/client/hooks/use-file-browser";
 
 interface Props {
 	snapshot: Snapshot;
@@ -33,10 +34,6 @@ export const SnapshotFileBrowser = (props: Props) => {
 	const isReadOnly = volume?.config && "readOnly" in volume.config && volume.config.readOnly === true;
 
 	const queryClient = useQueryClient();
-	const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());
-	const [fetchedFolders, setFetchedFolders] = useState<Set<string>>(new Set());
-	const [loadingFolders, setLoadingFolders] = useState<Set<string>>(new Set());
-	const [allFiles, setAllFiles] = useState<Map<string, FileEntry>>(new Map());
 	const [selectedPaths, setSelectedPaths] = useState<Set<string>>(new Set());
 	const [showRestoreDialog, setShowRestoreDialog] = useState(false);
 	const [deleteExtraFiles, setDeleteExtraFiles] = useState(false);
@@ -72,89 +69,30 @@ export const SnapshotFileBrowser = (props: Props) => {
 		[volumeBasePath],
 	);
 
-	useMemo(() => {
-		if (filesData?.files) {
-			setAllFiles((prev) => {
-				const next = new Map(prev);
-				for (const file of filesData.files) {
-					const strippedPath = stripBasePath(file.path);
-					if (strippedPath !== "/") {
-						next.set(strippedPath, { ...file, path: strippedPath });
-					}
-				}
-				return next;
-			});
-			setFetchedFolders((prev) => new Set(prev).add("/"));
-		}
-	}, [filesData, stripBasePath]);
-
-	const fileArray = useMemo(() => Array.from(allFiles.values()), [allFiles]);
-
-	const handleFolderExpand = useCallback(
-		async (folderPath: string) => {
-			setExpandedFolders((prev) => {
-				const next = new Set(prev);
-				next.add(folderPath);
-				return next;
-			});
-
-			if (!fetchedFolders.has(folderPath)) {
-				setLoadingFolders((prev) => new Set(prev).add(folderPath));
-
-				try {
-					const fullPath = addBasePath(folderPath);
-
-					const result = await queryClient.ensureQueryData(
-						listSnapshotFilesOptions({
-							path: { name: repositoryName, snapshotId: snapshot.short_id },
-							query: { path: fullPath },
-						}),
-					);
-
-					if (result.files) {
-						setAllFiles((prev) => {
-							const next = new Map(prev);
-							for (const file of result.files) {
-								const strippedPath = stripBasePath(file.path);
-								// Skip the directory itself
-								if (strippedPath !== folderPath) {
-									next.set(strippedPath, { ...file, path: strippedPath });
-								}
-							}
-							return next;
-						});
-
-						setFetchedFolders((prev) => new Set(prev).add(folderPath));
-					}
-				} catch (error) {
-					console.error("Failed to fetch folder contents:", error);
-				} finally {
-					setLoadingFolders((prev) => {
-						const next = new Set(prev);
-						next.delete(folderPath);
-						return next;
-					});
-				}
-			}
+	const fileBrowser = useFileBrowser({
+		initialData: filesData,
+		isLoading: filesLoading,
+		fetchFolder: async (path) => {
+			return await queryClient.ensureQueryData(
+				listSnapshotFilesOptions({
+					path: { name: repositoryName, snapshotId: snapshot.short_id },
+					query: { path },
+				}),
+			);
 		},
-		[repositoryName, snapshot, fetchedFolders, queryClient, stripBasePath, addBasePath],
-	);
-
-	const handleFolderHover = useCallback(
-		(folderPath: string) => {
-			if (!fetchedFolders.has(folderPath) && !loadingFolders.has(folderPath)) {
-				const fullPath = addBasePath(folderPath);
-
-				queryClient.prefetchQuery({
-					...listSnapshotFilesOptions({
-						path: { name: repositoryName, snapshotId: snapshot.short_id },
-						query: { path: fullPath },
-					}),
-				});
-			}
+		prefetchFolder: (path) => {
+			queryClient.prefetchQuery(
+				listSnapshotFilesOptions({
+					path: { name: repositoryName, snapshotId: snapshot.short_id },
+					query: { path },
+				}),
+			);
 		},
-		[repositoryName, snapshot, fetchedFolders, loadingFolders, queryClient, addBasePath],
-	);
+		pathTransform: {
+			strip: stripBasePath,
+			add: addBasePath,
+		},
+	});
 
 	const { mutate: restoreSnapshot, isPending: isRestoring } = useMutation({
 		...restoreSnapshotMutation(),
@@ -225,27 +163,27 @@ export const SnapshotFileBrowser = (props: Props) => {
 					</div>
 				</CardHeader>
 				<CardContent className="flex-1 overflow-hidden flex flex-col p-0">
-					{filesLoading && fileArray.length === 0 && (
+					{fileBrowser.isLoading && (
 						<div className="flex items-center justify-center flex-1">
 							<p className="text-muted-foreground">Loading files...</p>
 						</div>
 					)}
 
-					{fileArray.length === 0 && !filesLoading && (
+					{fileBrowser.isEmpty && (
 						<div className="flex flex-col items-center justify-center flex-1 text-center p-8">
 							<FileIcon className="w-12 h-12 text-muted-foreground/50 mb-4" />
 							<p className="text-muted-foreground">No files in this snapshot</p>
 						</div>
 					)}
 
-					{fileArray.length > 0 && (
+					{!fileBrowser.isLoading && !fileBrowser.isEmpty && (
 						<div className="overflow-auto flex-1 border border-border rounded-md bg-card m-4">
 							<FileTree
-								files={fileArray}
-								onFolderExpand={handleFolderExpand}
-								onFolderHover={handleFolderHover}
-								expandedFolders={expandedFolders}
-								loadingFolders={loadingFolders}
+								files={fileBrowser.fileArray}
+								onFolderExpand={fileBrowser.handleFolderExpand}
+								onFolderHover={fileBrowser.handleFolderHover}
+								expandedFolders={fileBrowser.expandedFolders}
+								loadingFolders={fileBrowser.loadingFolders}
 								className="px-2 py-2"
 								withCheckboxes={true}
 								selectedPaths={selectedPaths}

app/client/modules/backups/routes/backup-details.tsx

@@ -20,6 +20,13 @@ import { SnapshotFileBrowser } from "../components/snapshot-file-browser";
 import { SnapshotTimeline } from "../components/snapshot-timeline";
 import { getBackupSchedule } from "~/client/api-client";
 
+export const handle = {
+	breadcrumb: (match: Route.MetaArgs) => [
+		{ label: "Backups", href: "/backups" },
+		{ label: `Schedule #${match.params.id}` },
+	],
+};
+
 export function meta(_: Route.MetaArgs) {
 	return [
 		{ title: "Backup Job Details" },

app/client/modules/backups/routes/backups.tsx

@@ -9,6 +9,10 @@ import type { Route } from "./+types/backups";
 import { listBackupSchedules } from "~/client/api-client";
 import { listBackupSchedulesOptions } from "~/client/api-client/@tanstack/react-query.gen";
 
+export const handle = {
+	breadcrumb: () => [{ label: "Backups" }],
+};
+
 export function meta(_: Route.MetaArgs) {
 	return [
 		{ title: "Backup Jobs" },

app/client/modules/backups/routes/create-backup.tsx

@@ -18,6 +18,10 @@ import { CreateScheduleForm, type BackupScheduleFormValues } from "../components
 import type { Route } from "./+types/create-backup";
 import { listRepositories, listVolumes } from "~/client/api-client";
 
+export const handle = {
+	breadcrumb: () => [{ label: "Backups", href: "/backups" }, { label: "Create" }],
+};
+
 export function meta(_: Route.MetaArgs) {
 	return [
 		{ title: "Create Backup Job" },

app/client/modules/repositories/routes/create-repository.tsx

@@ -0,0 +1,89 @@
+import { useMutation } from "@tanstack/react-query";
+import { Database } from "lucide-react";
+import { useId } from "react";
+import { useNavigate } from "react-router";
+import { toast } from "sonner";
+import { createRepositoryMutation } from "~/client/api-client/@tanstack/react-query.gen";
+import { CreateRepositoryForm, type RepositoryFormValues } from "~/client/components/create-repository-form";
+import { Button } from "~/client/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "~/client/components/ui/card";
+import { parseError } from "~/client/lib/errors";
+import type { Route } from "./+types/create-repository";
+import { Alert, AlertDescription } from "~/client/components/ui/alert";
+
+export const handle = {
+	breadcrumb: () => [{ label: "Repositories", href: "/repositories" }, { label: "Create" }],
+};
+
+export function meta(_: Route.MetaArgs) {
+	return [
+		{ title: "Create Repository" },
+		{
+			name: "description",
+			content: "Create a new backup repository with encryption and compression.",
+		},
+	];
+}
+
+export default function CreateRepository() {
+	const navigate = useNavigate();
+	const formId = useId();
+
+	const createRepository = useMutation({
+		...createRepositoryMutation(),
+		onSuccess: (data) => {
+			toast.success("Repository created successfully");
+			navigate(`/repositories/${data.repository.name}`);
+		},
+	});
+
+	const handleSubmit = (values: RepositoryFormValues) => {
+		createRepository.mutate({
+			body: {
+				config: values,
+				name: values.name,
+				compressionMode: values.compressionMode,
+			},
+		});
+	};
+
+	return (
+		<div className="container mx-auto space-y-6">
+			<Card>
+				<CardHeader>
+					<div className="flex items-center gap-3">
+						<div className="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10">
+							<Database className="w-5 h-5 text-primary" />
+						</div>
+						<CardTitle>Create Repository</CardTitle>
+					</div>
+				</CardHeader>
+				<CardContent className="space-y-6">
+					{createRepository.isError && (
+						<Alert variant="destructive">
+							<AlertDescription>
+								<strong>Failed to create repository:</strong>
+								<br />
+								{parseError(createRepository.error)?.message}
+							</AlertDescription>
+						</Alert>
+					)}
+					<CreateRepositoryForm
+						mode="create"
+						formId={formId}
+						onSubmit={handleSubmit}
+						loading={createRepository.isPending}
+					/>
+					<div className="flex justify-end gap-2 pt-4 border-t">
+						<Button type="button" variant="secondary" onClick={() => navigate("/repositories")}>
+							Cancel
+						</Button>
+						<Button type="submit" form={formId} loading={createRepository.isPending}>
+							Create Repository
+						</Button>
+					</div>
+				</CardContent>
+			</Card>
+		</div>
+	);
+}

app/client/modules/repositories/routes/repositories.tsx

@@ -1,10 +1,9 @@
 import { useQuery } from "@tanstack/react-query";
-import { Database, RotateCcw } from "lucide-react";
+import { Database, Plus, RotateCcw } from "lucide-react";
 import { useState } from "react";
 import { useNavigate } from "react-router";
 import { listRepositories } from "~/client/api-client/sdk.gen";
 import { listRepositoriesOptions } from "~/client/api-client/@tanstack/react-query.gen";
-import { CreateRepositoryDialog } from "~/client/components/create-repository-dialog";
 import { RepositoryIcon } from "~/client/components/repository-icon";
 import { Button } from "~/client/components/ui/button";
 import { Card } from "~/client/components/ui/card";
@@ -15,6 +14,10 @@ import type { Route } from "./+types/repositories";
 import { cn } from "~/client/lib/utils";
 import { EmptyState } from "~/client/components/empty-state";
 
+export const handle = {
+	breadcrumb: () => [{ label: "Repositories" }],
+};
+
 export function meta(_: Route.MetaArgs) {
 	return [
 		{ title: "Repositories" },
@@ -35,7 +38,6 @@ export default function Repositories({ loaderData }: Route.ComponentProps) {
 	const [searchQuery, setSearchQuery] = useState("");
 	const [statusFilter, setStatusFilter] = useState("");
 	const [backendFilter, setBackendFilter] = useState("");
-	const [createRepositoryOpen, setCreateRepositoryOpen] = useState(false);
 
 	const clearFilters = () => {
 		setSearchQuery("");
@@ -69,7 +71,12 @@ export default function Repositories({ loaderData }: Route.ComponentProps) {
 				icon={Database}
 				title="No repository"
 				description="Repositories are remote storage locations where you can backup your volumes securely. Encrypted and optimized for storage efficiency."
-				button={<CreateRepositoryDialog open={createRepositoryOpen} setOpen={setCreateRepositoryOpen} />}
+				button={
+					<Button onClick={() => navigate("/repositories/create")}>
+						<Plus size={16} className="mr-2" />
+						Create Repository
+					</Button>
+				}
 			/>
 		);
 	}
@@ -112,7 +119,10 @@ export default function Repositories({ loaderData }: Route.ComponentProps) {
 						</Button>
 					)}
 				</span>
-				<CreateRepositoryDialog open={createRepositoryOpen} setOpen={setCreateRepositoryOpen} />
+				<Button onClick={() => navigate("/repositories/create")}>
+					<Plus size={16} className="mr-2" />
+					Create Repository
+				</Button>
 			</div>
 			<div className="overflow-x-auto">
 				<Table className="border-t">

app/client/modules/repositories/routes/repository-details.tsx

@@ -27,6 +27,13 @@ import { RepositoryInfoTabContent } from "../tabs/info";
 import { RepositorySnapshotsTabContent } from "../tabs/snapshots";
 import { Loader2 } from "lucide-react";
 
+export const handle = {
+	breadcrumb: (match: Route.MetaArgs) => [
+		{ label: "Repositories", href: "/repositories" },
+		{ label: match.params.name },
+	],
+};
+
 export function meta({ params }: Route.MetaArgs) {
 	return [
 		{ title: params.name },

app/client/modules/repositories/routes/snapshot-details.tsx

@@ -7,6 +7,14 @@ import { SnapshotFileBrowser } from "~/client/modules/backups/components/snapsho
 import { getSnapshotDetails } from "~/client/api-client";
 import type { Route } from "./+types/snapshot-details";
 
+export const handle = {
+	breadcrumb: (match: Route.MetaArgs) => [
+		{ label: "Repositories", href: "/repositories" },
+		{ label: match.params.name, href: `/repositories/${match.params.name}` },
+		{ label: match.params.snapshotId },
+	],
+};
+
 export function meta({ params }: Route.MetaArgs) {
 	return [
 		{ title: `Snapshot ${params.snapshotId}` },

app/client/modules/settings/routes/settings.tsx

@@ -24,6 +24,10 @@ import {
 	logoutMutation,
 } from "~/client/api-client/@tanstack/react-query.gen";
 
+export const handle = {
+	breadcrumb: () => [{ label: "Settings" }],
+};
+
 export function meta(_: Route.MetaArgs) {
 	return [
 		{ title: "Settings" },

app/client/modules/volumes/components/create-volume-form.tsx

@@ -6,13 +6,31 @@ import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { cn, slugify } from "~/client/lib/utils";
 import { deepClean } from "~/utils/object";
-import { DirectoryBrowser } from "./directory-browser";
-import { Button } from "./ui/button";
-import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from "./ui/form";
-import { Input } from "./ui/input";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
 import { volumeConfigSchema } from "~/schemas/volumes";
-import { testConnectionMutation } from "../api-client/@tanstack/react-query.gen";
+import { testConnectionMutation } from "~/client/api-client/@tanstack/react-query.gen";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "~/client/components/ui/form";
+import { Input } from "~/client/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectGroup,
+	SelectItem,
+	SelectLabel,
+	SelectTrigger,
+	SelectValue,
+} from "~/client/components/ui/select";
+import { Button } from "~/client/components/ui/button";
+import { DirectoryBrowser } from "~/client/components/directory-browser";
+
+const SUPPORTS_CONNECTION_TEST = ["nfs", "smb", "webdav", "mariadb", "mysql", "postgres"];
 
 export const formSchema = type({
 	name: "2<=string<=32",
@@ -35,6 +53,9 @@ const defaultValuesForType = {
 	nfs: { backend: "nfs" as const, port: 2049, version: "4.1" as const },
 	smb: { backend: "smb" as const, port: 445, vers: "3.0" as const },
 	webdav: { backend: "webdav" as const, port: 80, ssl: false },
+	mariadb: { backend: "mariadb" as const, port: 3306 },
+	mysql: { backend: "mysql" as const, port: 3306 },
+	postgres: { backend: "postgres" as const, port: 5432, dumpFormat: "custom" as const },
 };
 
 export const CreateVolumeForm = ({ onSubmit, mode = "create", initialValues, formId, loading, className }: Props) => {
@@ -81,7 +102,7 @@ export const CreateVolumeForm = ({ onSubmit, mode = "create", initialValues, for
 	const handleTestConnection = async () => {
 		const formValues = getValues();
 
-		if (formValues.backend === "nfs" || formValues.backend === "smb" || formValues.backend === "webdav") {
+		if (SUPPORTS_CONNECTION_TEST.includes(formValues.backend)) {
 			testBackendConnection.mutate({
 				body: { config: formValues },
 			});
@@ -121,15 +142,26 @@ export const CreateVolumeForm = ({ onSubmit, mode = "create", initialValues, for
 							<FormLabel>Backend</FormLabel>
 							<Select onValueChange={field.onChange} defaultValue={field.value} value={field.value}>
 								<FormControl>
-									<SelectTrigger>
+									<SelectTrigger className="w-[280px]">
 										<SelectValue placeholder="Select a backend" />
 									</SelectTrigger>
 								</FormControl>
 								<SelectContent>
-									<SelectItem value="directory">Directory</SelectItem>
-									<SelectItem value="nfs">NFS</SelectItem>
-									<SelectItem value="smb">SMB</SelectItem>
-									<SelectItem value="webdav">WebDAV</SelectItem>
+									<SelectGroup>
+										<SelectItem value="directory">Directory</SelectItem>
+									</SelectGroup>
+									<SelectGroup>
+										<SelectLabel>Network Storage</SelectLabel>
+										<SelectItem value="nfs">NFS</SelectItem>
+										<SelectItem value="smb">SMB</SelectItem>
+										<SelectItem value="webdav">WebDAV</SelectItem>
+									</SelectGroup>
+									<SelectGroup>
+										<SelectLabel>Databases</SelectLabel>
+										<SelectItem value="mariadb">MariaDB</SelectItem>
+										<SelectItem value="mysql">MySQL</SelectItem>
+										<SelectItem value="postgres">PostgreSQL</SelectItem>
+									</SelectGroup>
 								</SelectContent>
 							</Select>
 							<FormDescription>Choose the storage backend for this volume.</FormDescription>
@@ -536,42 +568,296 @@ export const CreateVolumeForm = ({ onSubmit, mode = "create", initialValues, for
 					</>
 				)}
 
-				<div className="space-y-3">
-					<div className="flex items-center gap-2">
-						<Button
-							type="button"
-							variant="outline"
-							onClick={handleTestConnection}
-							disabled={testBackendConnection.isPending}
-							className="flex-1"
-						>
-							{testBackendConnection.isPending && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-							{!testBackendConnection.isPending && testMessage?.success && (
-								<CheckCircle className="mr-2 h-4 w-4 text-green-500" />
+				{watchedBackend === "mariadb" && (
+					<>
+						<FormField
+							control={form.control}
+							name="host"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Host</FormLabel>
+									<FormControl>
+										<Input placeholder="localhost" {...field} />
+									</FormControl>
+									<FormDescription>MariaDB server hostname or IP address.</FormDescription>
+									<FormMessage />
+								</FormItem>
 							)}
-							{!testBackendConnection.isPending && testMessage && !testMessage.success && (
-								<XCircle className="mr-2 h-4 w-4 text-red-500" />
+						/>
+						<FormField
+							control={form.control}
+							name="port"
+							defaultValue={3306}
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Port</FormLabel>
+									<FormControl>
+										<Input type="number" placeholder="3306" {...field} />
+									</FormControl>
+									<FormDescription>MariaDB server port (default: 3306).</FormDescription>
+									<FormMessage />
+								</FormItem>
 							)}
-							{testBackendConnection.isPending
-								? "Testing..."
-								: testMessage
-									? testMessage.success
-										? "Connection Successful"
-										: "Test Failed"
-									: "Test Connection"}
-						</Button>
-					</div>
-					{testMessage && (
-						<div
-							className={cn("text-xs p-2 rounded-md text-wrap wrap-anywhere", {
-								"bg-green-50 text-green-700 border border-green-200": testMessage.success,
-								"bg-red-50 text-red-700 border border-red-200": !testMessage.success,
-							})}
-						>
-							{testMessage.message}
+						/>
+						<FormField
+							control={form.control}
+							name="username"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Username</FormLabel>
+									<FormControl>
+										<Input placeholder="root" {...field} />
+									</FormControl>
+									<FormDescription>Database user with backup privileges.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="password"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Password</FormLabel>
+									<FormControl>
+										<Input type="password" placeholder="••••••••" {...field} />
+									</FormControl>
+									<FormDescription>Password for database authentication.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="database"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Database</FormLabel>
+									<FormControl>
+										<Input placeholder="myapp_production" {...field} />
+									</FormControl>
+									<FormDescription>Name of the database to backup.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					</>
+				)}
+
+				{watchedBackend === "mysql" && (
+					<>
+						<FormField
+							control={form.control}
+							name="host"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Host</FormLabel>
+									<FormControl>
+										<Input placeholder="localhost" {...field} />
+									</FormControl>
+									<FormDescription>MySQL server hostname or IP address.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="port"
+							defaultValue={3306}
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Port</FormLabel>
+									<FormControl>
+										<Input type="number" placeholder="3306" {...field} />
+									</FormControl>
+									<FormDescription>MySQL server port (default: 3306).</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="username"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Username</FormLabel>
+									<FormControl>
+										<Input placeholder="root" {...field} />
+									</FormControl>
+									<FormDescription>Database user with backup privileges.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="password"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Password</FormLabel>
+									<FormControl>
+										<Input type="password" placeholder="••••••••" {...field} />
+									</FormControl>
+									<FormDescription>Password for database authentication.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="database"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Database</FormLabel>
+									<FormControl>
+										<Input placeholder="myapp_production" {...field} />
+									</FormControl>
+									<FormDescription>Name of the database to backup.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					</>
+				)}
+
+				{watchedBackend === "postgres" && (
+					<>
+						<FormField
+							control={form.control}
+							name="host"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Host</FormLabel>
+									<FormControl>
+										<Input placeholder="localhost" {...field} />
+									</FormControl>
+									<FormDescription>PostgreSQL server hostname or IP address.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="port"
+							defaultValue={5432}
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Port</FormLabel>
+									<FormControl>
+										<Input type="number" placeholder="5432" {...field} />
+									</FormControl>
+									<FormDescription>PostgreSQL server port (default: 5432).</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="username"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Username</FormLabel>
+									<FormControl>
+										<Input placeholder="postgres" {...field} />
+									</FormControl>
+									<FormDescription>Database user with backup privileges.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="password"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Password</FormLabel>
+									<FormControl>
+										<Input type="password" placeholder="••••••••" {...field} />
+									</FormControl>
+									<FormDescription>Password for database authentication.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="database"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Database</FormLabel>
+									<FormControl>
+										<Input placeholder="myapp_production" {...field} />
+									</FormControl>
+									<FormDescription>Name of the database to backup.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="dumpFormat"
+							defaultValue="custom"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Dump Format</FormLabel>
+									<Select onValueChange={field.onChange} defaultValue={field.value || "custom"}>
+										<FormControl>
+											<SelectTrigger>
+												<SelectValue placeholder="Select dump format" />
+											</SelectTrigger>
+										</FormControl>
+										<SelectContent>
+											<SelectItem value="custom">Custom (Compressed)</SelectItem>
+											<SelectItem value="plain">Plain SQL</SelectItem>
+											<SelectItem value="directory">Directory</SelectItem>
+										</SelectContent>
+									</Select>
+									<FormDescription>Format for database dumps (custom recommended).</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					</>
+				)}
+
+				{watchedBackend !== "directory" && (
+					<div className="space-y-3">
+						<div className="flex items-center gap-2">
+							<Button
+								type="button"
+								variant="outline"
+								onClick={handleTestConnection}
+								disabled={testBackendConnection.isPending}
+								className="flex-1"
+							>
+								{testBackendConnection.isPending && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+								{!testBackendConnection.isPending && testMessage?.success && (
+									<CheckCircle className="mr-2 h-4 w-4 text-green-500" />
+								)}
+								{!testBackendConnection.isPending && testMessage && !testMessage.success && (
+									<XCircle className="mr-2 h-4 w-4 text-red-500" />
+								)}
+								{testBackendConnection.isPending
+									? "Testing..."
+									: testMessage
+										? testMessage.success
+											? "Connection Successful"
+											: "Test Failed"
+										: "Test Connection"}
+							</Button>
 						</div>
-					)}
-				</div>
+						{testMessage && (
+							<div
+								className={cn("text-xs p-2 rounded-md text-wrap wrap-anywhere", {
+									"bg-green-50 text-green-700 border border-green-200": testMessage.success,
+									"bg-red-50 text-red-700 border border-red-200": !testMessage.success,
+								})}
+							>
+								{testMessage.message}
+							</div>
+						)}
+					</div>
+				)}
 				{mode === "update" && (
 					<Button type="submit" className="w-full" loading={loading}>
 						Save Changes

app/client/modules/volumes/routes/create-volume.tsx

@@ -0,0 +1,83 @@
+import { useMutation } from "@tanstack/react-query";
+import { HardDrive } from "lucide-react";
+import { useId } from "react";
+import { useNavigate } from "react-router";
+import { toast } from "sonner";
+import { createVolumeMutation } from "~/client/api-client/@tanstack/react-query.gen";
+import { Button } from "~/client/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "~/client/components/ui/card";
+import { parseError } from "~/client/lib/errors";
+import type { Route } from "./+types/create-volume";
+import { Alert, AlertDescription } from "~/client/components/ui/alert";
+import { CreateVolumeForm, type FormValues } from "../components/create-volume-form";
+
+export const handle = {
+	breadcrumb: () => [{ label: "Volumes", href: "/volumes" }, { label: "Create" }],
+};
+
+export function meta(_: Route.MetaArgs) {
+	return [
+		{ title: "Create Volume" },
+		{
+			name: "description",
+			content: "Create a new storage volume with automatic mounting and health checks.",
+		},
+	];
+}
+
+export default function CreateVolume() {
+	const navigate = useNavigate();
+	const formId = useId();
+
+	const createVolume = useMutation({
+		...createVolumeMutation(),
+		onSuccess: (data) => {
+			toast.success("Volume created successfully");
+			navigate(`/volumes/${data.name}`);
+		},
+	});
+
+	const handleSubmit = (values: FormValues) => {
+		createVolume.mutate({
+			body: {
+				config: values,
+				name: values.name,
+			},
+		});
+	};
+
+	return (
+		<div className="container mx-auto space-y-6">
+			<Card>
+				<CardHeader>
+					<div className="flex items-center gap-3">
+						<div className="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10">
+							<HardDrive className="w-5 h-5 text-primary" />
+						</div>
+						<CardTitle>Create Volume</CardTitle>
+					</div>
+				</CardHeader>
+				<CardContent className="space-y-6">
+					{createVolume.isError && (
+						<Alert variant="destructive">
+							<AlertDescription>
+								<strong>Failed to create volume:</strong>
+								<br />
+								{parseError(createVolume.error)?.message}
+							</AlertDescription>
+						</Alert>
+					)}
+					<CreateVolumeForm mode="create" formId={formId} onSubmit={handleSubmit} loading={createVolume.isPending} />
+					<div className="flex justify-end gap-2 pt-4 border-t">
+						<Button type="button" variant="secondary" onClick={() => navigate("/volumes")}>
+							Cancel
+						</Button>
+						<Button type="submit" form={formId} loading={createVolume.isPending}>
+							Create Volume
+						</Button>
+					</div>
+				</CardContent>
+			</Card>
+		</div>
+	);
+}

app/client/modules/volumes/routes/volume-details.tsx

@@ -31,6 +31,10 @@ import {
 	unmountVolumeMutation,
 } from "~/client/api-client/@tanstack/react-query.gen";
 
+export const handle = {
+	breadcrumb: (match: Route.MetaArgs) => [{ label: "Volumes", href: "/volumes" }, { label: match.params.name }],
+};
+
 export function meta({ params }: Route.MetaArgs) {
 	return [
 		{ title: params.name },
@@ -115,6 +119,8 @@ export default function VolumeDetails({ loaderData }: Route.ComponentProps) {
 	const { volume, statfs } = data;
 	const dockerAvailable = capabilities.docker;
 
+	const isDatabaseVolume = ["mariadb", "mysql", "postgres"].includes(volume.config.backend);
+
 	return (
 		<>
 			<div className="flex flex-col items-start xs:items-center xs:flex-row xs:justify-between">
@@ -148,7 +154,9 @@ export default function VolumeDetails({ loaderData }: Route.ComponentProps) {
 			<Tabs value={activeTab} onValueChange={(value) => setSearchParams({ tab: value })} className="mt-4">
 				<TabsList className="mb-2">
 					<TabsTrigger value="info">Configuration</TabsTrigger>
-					<TabsTrigger value="files">Files</TabsTrigger>
+					<TabsTrigger disabled={isDatabaseVolume} value="files">
+						Files
+					</TabsTrigger>
 					<Tooltip>
 						<TooltipTrigger>
 							<TabsTrigger disabled={!dockerAvailable} value="docker">
@@ -163,9 +171,11 @@ export default function VolumeDetails({ loaderData }: Route.ComponentProps) {
 				<TabsContent value="info">
 					<VolumeInfoTabContent volume={volume} statfs={statfs} />
 				</TabsContent>
-				<TabsContent value="files">
-					<FilesTabContent volume={volume} />
-				</TabsContent>
+				{!isDatabaseVolume && (
+					<TabsContent value="files">
+						<FilesTabContent volume={volume} />
+					</TabsContent>
+				)}
 				{dockerAvailable && (
 					<TabsContent value="docker">
 						<DockerTabContent volume={volume} />

app/client/modules/volumes/routes/volumes.tsx

@@ -1,8 +1,7 @@
 import { useQuery } from "@tanstack/react-query";
-import { HardDrive, RotateCcw } from "lucide-react";
+import { HardDrive, Plus, RotateCcw } from "lucide-react";
 import { useState } from "react";
 import { useNavigate } from "react-router";
-import { CreateVolumeDialog } from "~/client/components/create-volume-dialog";
 import { EmptyState } from "~/client/components/empty-state";
 import { StatusDot } from "~/client/components/status-dot";
 import { Button } from "~/client/components/ui/button";
@@ -15,6 +14,10 @@ import type { Route } from "./+types/volumes";
 import { listVolumes } from "~/client/api-client";
 import { listVolumesOptions } from "~/client/api-client/@tanstack/react-query.gen";
 
+export const handle = {
+	breadcrumb: () => [{ label: "Volumes" }],
+};
+
 export function meta(_: Route.MetaArgs) {
 	return [
 		{ title: "Volumes" },
@@ -32,7 +35,6 @@ export const clientLoader = async () => {
 };
 
 export default function Volumes({ loaderData }: Route.ComponentProps) {
-	const [createVolumeOpen, setCreateVolumeOpen] = useState(false);
 	const [searchQuery, setSearchQuery] = useState("");
 	const [statusFilter, setStatusFilter] = useState("");
 	const [backendFilter, setBackendFilter] = useState("");
@@ -69,7 +71,12 @@ export default function Volumes({ loaderData }: Route.ComponentProps) {
 				icon={HardDrive}
 				title="No volume"
 				description="Manage and monitor all your storage backends in one place with advanced features like automatic mounting and health checks."
-				button={<CreateVolumeDialog open={createVolumeOpen} setOpen={setCreateVolumeOpen} />}
+				button={
+					<Button onClick={() => navigate("/volumes/create")}>
+						<Plus size={16} className="mr-2" />
+						Create Volume
+					</Button>
+				}
 			/>
 		);
 	}
@@ -102,6 +109,10 @@ export default function Volumes({ loaderData }: Route.ComponentProps) {
 							<SelectItem value="directory">Directory</SelectItem>
 							<SelectItem value="nfs">NFS</SelectItem>
 							<SelectItem value="smb">SMB</SelectItem>
+							<SelectItem value="webdav">WebDAV</SelectItem>
+							<SelectItem value="mariadb">MariaDB</SelectItem>
+							<SelectItem value="mysql">MySQL</SelectItem>
+							<SelectItem value="postgres">PostgreSQL</SelectItem>
 						</SelectContent>
 					</Select>
 					{(searchQuery || statusFilter || backendFilter) && (
@@ -111,7 +122,10 @@ export default function Volumes({ loaderData }: Route.ComponentProps) {
 						</Button>
 					)}
 				</span>
-				<CreateVolumeDialog open={createVolumeOpen} setOpen={setCreateVolumeOpen} />
+				<Button onClick={() => navigate("/volumes/create")}>
+					<Plus size={16} className="mr-2" />
+					Create Volume
+				</Button>
 			</div>
 			<div className="overflow-x-auto">
 				<Table className="border-t">

app/client/modules/volumes/tabs/info.tsx

@@ -1,7 +1,6 @@
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
 import { toast } from "sonner";
-import { CreateVolumeForm, type FormValues } from "~/client/components/create-volume-form";
 import {
 	AlertDialog,
 	AlertDialogAction,
@@ -17,6 +16,7 @@ import type { StatFs, Volume } from "~/client/lib/types";
 import { HealthchecksCard } from "../components/healthchecks-card";
 import { StorageChart } from "../components/storage-chart";
 import { updateVolumeMutation } from "~/client/api-client/@tanstack/react-query.gen";
+import { CreateVolumeForm, type FormValues } from "../components/create-volume-form";
 
 type Props = {
 	volume: Volume;

app/client/routes/root.tsx

@@ -1,9 +1,9 @@
 import { redirect } from "react-router";
 
-export const loader = async () => {
-	return redirect("/volumes");
-};
-
 export const clientLoader = async () => {
 	return redirect("/volumes");
 };
+
+export const loader = async () => {
+	return redirect("/volumes");
+};

app/routes.ts

@@ -7,11 +7,13 @@ export default [
 	layout("./client/components/layout.tsx", [
 		route("/", "./client/routes/root.tsx"),
 		route("volumes", "./client/modules/volumes/routes/volumes.tsx"),
+		route("volumes/create", "./client/modules/volumes/routes/create-volume.tsx"),
 		route("volumes/:name", "./client/modules/volumes/routes/volume-details.tsx"),
 		route("backups", "./client/modules/backups/routes/backups.tsx"),
 		route("backups/create", "./client/modules/backups/routes/create-backup.tsx"),
 		route("backups/:id", "./client/modules/backups/routes/backup-details.tsx"),
 		route("repositories", "./client/modules/repositories/routes/repositories.tsx"),
+		route("repositories/create", "./client/modules/repositories/routes/create-repository.tsx"),
 		route("repositories/:name", "./client/modules/repositories/routes/repository-details.tsx"),
 		route("repositories/:name/:snapshotId", "./client/modules/repositories/routes/snapshot-details.tsx"),
 		route("settings", "./client/modules/settings/routes/settings.tsx"),

app/schemas/node_modules/arktype

@@ -1 +0,0 @@
-../../../node_modules/.bun/arktype@2.1.26/node_modules/arktype

app/schemas/restic.ts

@@ -3,6 +3,7 @@ import { type } from "arktype";
 export const REPOSITORY_BACKENDS = {
 	local: "local",
 	s3: "s3",
+	r2: "r2",
 	gcs: "gcs",
 	azure: "azure",
 	rclone: "rclone",
@@ -10,25 +11,39 @@ export const REPOSITORY_BACKENDS = {
 
 export type RepositoryBackend = keyof typeof REPOSITORY_BACKENDS;
 
+// Common fields for all repository configs
+const baseRepositoryConfigSchema = type({
+	isExistingRepository: "boolean?",
+	customPassword: "string?",
+});
+
 export const s3RepositoryConfigSchema = type({
 	backend: "'s3'",
 	endpoint: "string",
 	bucket: "string",
 	accessKeyId: "string",
 	secretAccessKey: "string",
-});
+}).and(baseRepositoryConfigSchema);
+
+export const r2RepositoryConfigSchema = type({
+	backend: "'r2'",
+	endpoint: "string",
+	bucket: "string",
+	accessKeyId: "string",
+	secretAccessKey: "string",
+}).and(baseRepositoryConfigSchema);
 
 export const localRepositoryConfigSchema = type({
 	backend: "'local'",
 	name: "string",
-});
+}).and(baseRepositoryConfigSchema);
 
 export const gcsRepositoryConfigSchema = type({
 	backend: "'gcs'",
 	bucket: "string",
 	projectId: "string",
 	credentialsJson: "string",
-});
+}).and(baseRepositoryConfigSchema);
 
 export const azureRepositoryConfigSchema = type({
 	backend: "'azure'",
@@ -36,15 +51,16 @@ export const azureRepositoryConfigSchema = type({
 	accountName: "string",
 	accountKey: "string",
 	endpointSuffix: "string?",
-});
+}).and(baseRepositoryConfigSchema);
 
 export const rcloneRepositoryConfigSchema = type({
 	backend: "'rclone'",
 	remote: "string",
 	path: "string",
-});
+}).and(baseRepositoryConfigSchema);
 
 export const repositoryConfigSchema = s3RepositoryConfigSchema
+	.or(r2RepositoryConfigSchema)
 	.or(localRepositoryConfigSchema)
 	.or(gcsRepositoryConfigSchema)
 	.or(azureRepositoryConfigSchema)

app/schemas/volumes.ts

@@ -5,6 +5,9 @@ export const BACKEND_TYPES = {
 	smb: "smb",
 	directory: "directory",
 	webdav: "webdav",
+	mariadb: "mariadb",
+	mysql: "mysql",
+	postgres: "postgres",
 } as const;
 
 export type BackendType = keyof typeof BACKEND_TYPES;
@@ -47,7 +50,47 @@ export const webdavConfigSchema = type({
 	ssl: "boolean?",
 });
 
-export const volumeConfigSchema = nfsConfigSchema.or(smbConfigSchema).or(webdavConfigSchema).or(directoryConfigSchema);
+export const mariadbConfigSchema = type({
+	backend: "'mariadb'",
+	host: "string",
+	port: type("string.integer").or(type("number")).to("1 <= number <= 65535").default(3306),
+	username: "string",
+	password: "string",
+	database: "string",
+	dumpOptions: "string[]?",
+	readOnly: "false?",
+});
+
+export const mysqlConfigSchema = type({
+	backend: "'mysql'",
+	host: "string",
+	port: type("string.integer").or(type("number")).to("1 <= number <= 65535").default(3306),
+	username: "string",
+	password: "string",
+	database: "string",
+	dumpOptions: "string[]?",
+	readOnly: "false?",
+});
+
+export const postgresConfigSchema = type({
+	backend: "'postgres'",
+	host: "string",
+	port: type("string.integer").or(type("number")).to("1 <= number <= 65535").default(5432),
+	username: "string",
+	password: "string",
+	database: "string",
+	dumpFormat: type("'plain' | 'custom' | 'directory'").default("custom"),
+	dumpOptions: "string[]?",
+	readOnly: "false?",
+});
+
+export const volumeConfigSchema = nfsConfigSchema
+	.or(smbConfigSchema)
+	.or(webdavConfigSchema)
+	.or(directoryConfigSchema)
+	.or(mariadbConfigSchema)
+	.or(mysqlConfigSchema)
+	.or(postgresConfigSchema);
 
 export type BackendConfig = typeof volumeConfigSchema.infer;
 

app/server/core/scheduler.ts

@@ -39,6 +39,14 @@ class SchedulerClass {
 		this.tasks = [];
 		logger.info("Scheduler stopped");
 	}
+
+	async clear() {
+		for (const task of this.tasks) {
+			task.destroy();
+		}
+		this.tasks = [];
+		logger.info("Scheduler cleared all tasks");
+	}
 }
 
 export const Scheduler = new SchedulerClass();

app/server/jobs/cleanup-dangling.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 import fs from "node:fs/promises";
 import { volumeService } from "../modules/volumes/volume.service";
 import { readMountInfo } from "../utils/mountinfo";
-import { getVolumePath } from "../modules/volumes/helpers";
+import { createVolumeBackend } from "../modules/backends/backend";
 import { logger } from "../utils/logger";
 import { executeUnmount } from "../modules/backends/utils/backend-utils";
 import { toMessage } from "../utils/errors";
@@ -16,10 +16,16 @@ export class CleanupDanglingMountsJob extends Job {
 
 		for (const mount of allSystemMounts) {
 			if (mount.mountPoint.includes("ironmount") && mount.mountPoint.endsWith("_data")) {
-				const matchingVolume = allVolumes.find((v) => getVolumePath(v) === mount.mountPoint);
+				const matchingVolume = allVolumes.find((v) => {
+					const backend = createVolumeBackend(v);
+					return backend.getVolumePath() === mount.mountPoint;
+				});
+
 				if (!matchingVolume) {
 					logger.info(`Found dangling mount at ${mount.mountPoint}, attempting to unmount...`);
-					await executeUnmount(mount.mountPoint);
+					await executeUnmount(mount.mountPoint).catch((err) => {
+						logger.warn(`Failed to unmount dangling mount ${mount.mountPoint}: ${toMessage(err)}`);
+					});
 
 					await fs.rmdir(path.dirname(mount.mountPoint)).catch((err) => {
 						logger.warn(
@@ -34,7 +40,10 @@ export class CleanupDanglingMountsJob extends Job {
 
 		for (const dir of allIronmountDirs) {
 			const volumePath = `${VOLUME_MOUNT_BASE}/${dir}/_data`;
-			const matchingVolume = allVolumes.find((v) => getVolumePath(v) === volumePath);
+			const matchingVolume = allVolumes.find((v) => {
+				const backend = createVolumeBackend(v);
+				return backend.getVolumePath() === volumePath;
+			});
 			if (!matchingVolume) {
 				const fullPath = path.join(VOLUME_MOUNT_BASE, dir);
 				logger.info(`Found dangling mount directory at ${fullPath}, attempting to remove...`);

app/server/modules/auth/auth.controller.ts

@@ -25,7 +25,7 @@ import { toMessage } from "../../utils/errors";
 const COOKIE_NAME = "session_id";
 const COOKIE_OPTIONS = {
 	httpOnly: true,
-	secure: process.env.NODE_ENV === "production",
+	secure: false,
 	sameSite: "lax" as const,
 	path: "/",
 };

app/server/modules/backends/backend.ts

@@ -1,10 +1,12 @@
 import type { BackendStatus } from "~/schemas/volumes";
 import type { Volume } from "../../db/schema";
-import { getVolumePath } from "../volumes/helpers";
 import { makeDirectoryBackend } from "./directory/directory-backend";
 import { makeNfsBackend } from "./nfs/nfs-backend";
 import { makeSmbBackend } from "./smb/smb-backend";
 import { makeWebdavBackend } from "./webdav/webdav-backend";
+import { makeMariaDBBackend } from "./mariadb/mariadb-backend";
+import { makeMySQLBackend } from "./mysql/mysql-backend";
+import { makePostgresBackend } from "./postgres/postgres-backend";
 
 type OperationResult = {
 	error?: string;
@@ -15,23 +17,35 @@ export type VolumeBackend = {
 	mount: () => Promise<OperationResult>;
 	unmount: () => Promise<OperationResult>;
 	checkHealth: () => Promise<OperationResult>;
+	getVolumePath: () => string;
+	getBackupPath: () => Promise<string>;
 };
 
 export const createVolumeBackend = (volume: Volume): VolumeBackend => {
-	const path = getVolumePath(volume);
-
 	switch (volume.config.backend) {
 		case "nfs": {
-			return makeNfsBackend(volume.config, path);
+			return makeNfsBackend(volume.config, volume.name);
 		}
 		case "smb": {
-			return makeSmbBackend(volume.config, path);
+			return makeSmbBackend(volume.config, volume.name);
 		}
 		case "directory": {
-			return makeDirectoryBackend(volume.config, path);
+			return makeDirectoryBackend(volume.config, volume.name);
 		}
 		case "webdav": {
-			return makeWebdavBackend(volume.config, path);
+			return makeWebdavBackend(volume.config, volume.name);
+		}
+		case "mariadb": {
+			return makeMariaDBBackend(volume.config);
+		}
+		case "mysql": {
+			return makeMySQLBackend(volume.config);
+		}
+		case "postgres": {
+			return makePostgresBackend(volume.config);
+		}
+		default: {
+			throw new Error(`Unsupported backend type: ${(volume.config as any).backend}`);
 		}
 	}
 };

app/server/modules/backends/directory/directory-backend.ts

@@ -52,8 +52,18 @@ const checkHealth = async (config: BackendConfig) => {
 	}
 };
 
+const getVolumePath = (config: BackendConfig): string => {
+	if (config.backend !== "directory") {
+		throw new Error("Invalid backend type");
+	}
+
+	return config.path;
+};
+
 export const makeDirectoryBackend = (config: BackendConfig, volumePath: string): VolumeBackend => ({
 	mount: () => mount(config, volumePath),
 	unmount,
 	checkHealth: () => checkHealth(config),
+	getVolumePath: () => getVolumePath(config),
+	getBackupPath: async () => getVolumePath(config),
 });

app/server/modules/backends/mariadb/mariadb-backend.ts

@@ -0,0 +1,81 @@
+import * as fs from "node:fs/promises";
+import { toMessage } from "../../../utils/errors";
+import { logger } from "../../../utils/logger";
+import type { VolumeBackend } from "../backend";
+import { BACKEND_STATUS, type BackendConfig } from "~/schemas/volumes";
+import { $ } from "bun";
+
+const checkHealth = async (config: BackendConfig) => {
+	if (config.backend !== "mariadb") {
+		return { status: BACKEND_STATUS.error, error: "Invalid backend type" };
+	}
+
+	try {
+		logger.debug(`Testing MariaDB connection to: ${config.host}:${config.port}`);
+
+		const args = [
+			`--host=${config.host}`,
+			`--port=${config.port}`,
+			`--user=${config.username}`,
+			`--database=${config.database}`,
+			"--skip-ssl",
+			"--execute=SELECT 1",
+		];
+
+		const env = {
+			MYSQL_PWD: config.password,
+		};
+
+		await $`mariadb ${args.join(" ")}`.env(env);
+
+		return { status: BACKEND_STATUS.mounted };
+	} catch (error) {
+		logger.error("MariaDB health check failed:", error);
+		return { status: BACKEND_STATUS.error, error: toMessage(error) };
+	}
+};
+
+const getBackupPath = async (config: BackendConfig) => {
+	const dumpDir = await fs.mkdtemp(`/tmp/ironmount-mariadb-`);
+
+	if (config.backend !== "mariadb") {
+		throw new Error("Invalid backend type for MariaDB dump");
+	}
+
+	logger.info(`Starting MariaDB dump for database: ${config.database}`);
+
+	const args = [
+		`--host=${config.host}`,
+		`--port=${config.port}`,
+		`--user=${config.username}`,
+		`--skip-ssl`,
+		`--single-transaction`,
+		`--quick`,
+		`--lock-tables=false`,
+		...(config.dumpOptions || []),
+		config.database,
+	];
+
+	const env = {
+		MYSQL_PWD: config.password,
+	};
+
+	const result = await $`mariadb-dump ${args}`.env(env).nothrow();
+
+	if (result.exitCode !== 0) {
+		throw new Error(`mariadb-dump failed with exit code ${result.exitCode}: ${result.stderr}`);
+	}
+
+	await fs.writeFile(`${dumpDir}/dump.sql`, result.stdout);
+	logger.info(`MariaDB dump completed: ${dumpDir}/dump.sql`);
+
+	return `${dumpDir}/dump.sql`;
+};
+
+export const makeMariaDBBackend = (config: BackendConfig): VolumeBackend => ({
+	mount: () => Promise.resolve({ status: BACKEND_STATUS.mounted }),
+	unmount: () => Promise.resolve({ status: BACKEND_STATUS.unmounted }),
+	checkHealth: () => checkHealth(config),
+	getVolumePath: () => "/tmp",
+	getBackupPath: () => getBackupPath(config),
+});

app/server/modules/backends/mysql/mysql-backend.ts

@@ -0,0 +1,76 @@
+import { toMessage } from "../../../utils/errors";
+import { logger } from "../../../utils/logger";
+import type { VolumeBackend } from "../backend";
+import { BACKEND_STATUS, type BackendConfig } from "~/schemas/volumes";
+import { $ } from "bun";
+
+const checkHealth = async (config: BackendConfig) => {
+	if (config.backend !== "mysql") {
+		return { status: BACKEND_STATUS.error, error: "Invalid backend type" };
+	}
+
+	logger.debug(`Testing MySQL connection to: ${config.host}:${config.port}`);
+	try {
+		const args = [
+			`--host=${config.host}`,
+			`--port=${config.port}`,
+			`--user=${config.username}`,
+			`--database=${config.database}`,
+			"--skip-ssl",
+			"--execute=SELECT 1",
+		];
+
+		const env = {
+			...process.env,
+			MYSQL_PWD: config.password,
+		};
+
+		await $`mysql ${args.join(" ")}`.env(env);
+		return { status: BACKEND_STATUS.mounted };
+	} catch (error) {
+		logger.error("MySQL health check failed:", error);
+		return { status: BACKEND_STATUS.error, error: toMessage(error) };
+	}
+};
+
+const getBackupPath = async (config: BackendConfig) => {
+	if (config.backend !== "mysql") {
+		throw new Error("Invalid backend type");
+	}
+
+	logger.info(`Starting MySQL dump for database: ${config.database}`);
+
+	const args = [
+		`--host=${config.host}`,
+		`--port=${config.port}`,
+		`--user=${config.username}`,
+		`--skip-ssl`,
+		`--single-transaction`,
+		`--quick`,
+		`--lock-tables=false`,
+		...(config.dumpOptions || []),
+		config.database,
+	];
+
+	const env = {
+		MYSQL_PWD: config.password,
+	};
+
+	const result = await $`mysql ${args}`.env(env).nothrow();
+
+	if (result.exitCode !== 0) {
+		throw new Error(`MySQL dump failed: ${result.stderr}`);
+	}
+
+	console.log(result.stdout);
+
+	return "Nothing for now";
+};
+
+export const makeMySQLBackend = (config: BackendConfig): VolumeBackend => ({
+	mount: () => Promise.resolve({ status: BACKEND_STATUS.mounted }),
+	unmount: () => Promise.resolve({ status: BACKEND_STATUS.unmounted }),
+	checkHealth: () => checkHealth(config),
+	getVolumePath: () => "/tmp",
+	getBackupPath: () => getBackupPath(config),
+});

app/server/modules/backends/nfs/nfs-backend.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
-import { OPERATION_TIMEOUT } from "../../../core/constants";
+import { OPERATION_TIMEOUT, VOLUME_MOUNT_BASE } from "../../../core/constants";
 import { toMessage } from "../../../utils/errors";
 import { logger } from "../../../utils/logger";
 import { getMountForPath } from "../../../utils/mountinfo";
@@ -9,7 +9,8 @@ import type { VolumeBackend } from "../backend";
 import { createTestFile, executeMount, executeUnmount } from "../utils/backend-utils";
 import { BACKEND_STATUS, type BackendConfig } from "~/schemas/volumes";
 
-const mount = async (config: BackendConfig, path: string) => {
+const mount = async (config: BackendConfig, name: string) => {
+	const path = getVolumePath(name);
 	logger.debug(`Mounting volume ${path}...`);
 
 	if (config.backend !== "nfs") {
@@ -22,13 +23,13 @@ const mount = async (config: BackendConfig, path: string) => {
 		return { status: BACKEND_STATUS.error, error: "NFS mounting is only supported on Linux hosts." };
 	}
 
-	const { status } = await checkHealth(path, config.readOnly ?? false);
+	const { status } = await checkHealth(name, config.readOnly ?? false);
 	if (status === "mounted") {
 		return { status: BACKEND_STATUS.mounted };
 	}
 
 	logger.debug(`Trying to unmount any existing mounts at ${path} before mounting...`);
-	await unmount(path);
+	await unmount(name);
 
 	const run = async () => {
 		await fs.mkdir(path, { recursive: true });
@@ -57,7 +58,9 @@ const mount = async (config: BackendConfig, path: string) => {
 	}
 };
 
-const unmount = async (path: string) => {
+const unmount = async (name: string) => {
+	const path = getVolumePath(name);
+
 	if (os.platform() !== "linux") {
 		logger.error("NFS unmounting is only supported on Linux hosts.");
 		return { status: BACKEND_STATUS.error, error: "NFS unmounting is only supported on Linux hosts." };
@@ -87,7 +90,9 @@ const unmount = async (path: string) => {
 	}
 };
 
-const checkHealth = async (path: string, readOnly: boolean) => {
+const checkHealth = async (name: string, readOnly: boolean) => {
+	const path = getVolumePath(name);
+
 	const run = async () => {
 		logger.debug(`Checking health of NFS volume at ${path}...`);
 		await fs.access(path);
@@ -114,8 +119,14 @@ const checkHealth = async (path: string, readOnly: boolean) => {
 	}
 };
 
-export const makeNfsBackend = (config: BackendConfig, path: string): VolumeBackend => ({
-	mount: () => mount(config, path),
-	unmount: () => unmount(path),
-	checkHealth: () => checkHealth(path, config.readOnly ?? false),
+const getVolumePath = (name: string) => {
+	return `${VOLUME_MOUNT_BASE}/${name}/_data`;
+};
+
+export const makeNfsBackend = (config: BackendConfig, name: string): VolumeBackend => ({
+	mount: () => mount(config, name),
+	unmount: () => unmount(name),
+	checkHealth: () => checkHealth(name, config.readOnly ?? false),
+	getVolumePath: () => getVolumePath(name),
+	getBackupPath: async () => getVolumePath(name),
 });

app/server/modules/backends/postgres/postgres-backend.ts

@@ -0,0 +1,80 @@
+import * as fs from "node:fs/promises";
+import { toMessage } from "../../../utils/errors";
+import { logger } from "../../../utils/logger";
+import type { VolumeBackend } from "../backend";
+import { BACKEND_STATUS, type BackendConfig } from "~/schemas/volumes";
+import { $ } from "bun";
+
+const checkHealth = async (config: BackendConfig) => {
+	if (config.backend !== "postgres") {
+		return { status: BACKEND_STATUS.error, error: "Invalid backend type" };
+	}
+
+	if (config.backend !== "postgres") {
+		throw new Error("Invalid backend type for PostgreSQL connection test");
+	}
+
+	logger.debug(`Testing PostgreSQL connection to: ${config.host}:${config.port}`);
+
+	const args = [
+		`--host=${config.host}`,
+		`--port=${config.port}`,
+		`--username=${config.username}`,
+		`--dbname=${config.database}`,
+		"--command=SELECT 1",
+		"--no-password",
+	];
+
+	const env = {
+		PGPASSWORD: config.password,
+		PGSSLMODE: "disable",
+	};
+
+	logger.debug(`Running psql with args: ${args.join(" ")}`);
+	const res = await $`psql ${args}`.env(env).nothrow();
+
+	if (res.exitCode !== 0) {
+		return { status: BACKEND_STATUS.error, error: res.stderr.toString() };
+	}
+
+	return { status: BACKEND_STATUS.mounted };
+};
+
+const getBackupPath = async (config: BackendConfig) => {
+	if (config.backend !== "postgres") {
+		throw new Error("Invalid backend type for PostgreSQL dump");
+	}
+
+	const dumpDir = await fs.mkdtemp(`/tmp/ironmount-postgres-`);
+	const outputPath = `${dumpDir}/${config.dumpFormat === "plain" ? "dump.sql" : "dump.dump"}`;
+
+	logger.info(`Starting PostgreSQL dump for database: ${config.database}`);
+
+	const args = [
+		`--host=${config.host}`,
+		`--port=${config.port}`,
+		`--username=${config.username}`,
+		`--dbname=${config.database}`,
+		`--format=${config.dumpFormat}`,
+		`--file=${outputPath}`,
+		"--no-password",
+		...(config.dumpOptions || []),
+	];
+
+	const env = {
+		PGPASSWORD: config.password,
+		PGSSLMODE: "disable",
+	};
+
+	await $`pg_dump ${args}`.env(env);
+
+	return outputPath;
+};
+
+export const makePostgresBackend = (config: BackendConfig): VolumeBackend => ({
+	mount: () => Promise.resolve({ status: "mounted" }),
+	unmount: () => Promise.resolve({ status: "unmounted" }),
+	checkHealth: () => checkHealth(config),
+	getVolumePath: () => "/tmp",
+	getBackupPath: () => getBackupPath(config),
+});

app/server/modules/backends/smb/smb-backend.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
-import { OPERATION_TIMEOUT } from "../../../core/constants";
+import { OPERATION_TIMEOUT, VOLUME_MOUNT_BASE } from "../../../core/constants";
 import { toMessage } from "../../../utils/errors";
 import { logger } from "../../../utils/logger";
 import { getMountForPath } from "../../../utils/mountinfo";
@@ -9,7 +9,8 @@ import type { VolumeBackend } from "../backend";
 import { createTestFile, executeMount, executeUnmount } from "../utils/backend-utils";
 import { BACKEND_STATUS, type BackendConfig } from "~/schemas/volumes";
 
-const mount = async (config: BackendConfig, path: string) => {
+const mount = async (config: BackendConfig, name: string) => {
+	const path = getVolumePath(name);
 	logger.debug(`Mounting SMB volume ${path}...`);
 
 	if (config.backend !== "smb") {
@@ -22,13 +23,13 @@ const mount = async (config: BackendConfig, path: string) => {
 		return { status: BACKEND_STATUS.error, error: "SMB mounting is only supported on Linux hosts." };
 	}
 
-	const { status } = await checkHealth(path, config.readOnly ?? false);
+	const { status } = await checkHealth(name, config.readOnly ?? false);
 	if (status === "mounted") {
 		return { status: BACKEND_STATUS.mounted };
 	}
 
 	logger.debug(`Trying to unmount any existing mounts at ${path} before mounting...`);
-	await unmount(path);
+	await unmount(name);
 
 	const run = async () => {
 		await fs.mkdir(path, { recursive: true });
@@ -70,7 +71,9 @@ const mount = async (config: BackendConfig, path: string) => {
 	}
 };
 
-const unmount = async (path: string) => {
+const unmount = async (name: string) => {
+	const path = getVolumePath(name);
+
 	if (os.platform() !== "linux") {
 		logger.error("SMB unmounting is only supported on Linux hosts.");
 		return { status: BACKEND_STATUS.error, error: "SMB unmounting is only supported on Linux hosts." };
@@ -100,7 +103,9 @@ const unmount = async (path: string) => {
 	}
 };
 
-const checkHealth = async (path: string, readOnly: boolean) => {
+const checkHealth = async (name: string, readOnly: boolean) => {
+	const path = getVolumePath(name);
+
 	const run = async () => {
 		logger.debug(`Checking health of SMB volume at ${path}...`);
 		await fs.access(path);
@@ -127,8 +132,14 @@ const checkHealth = async (path: string, readOnly: boolean) => {
 	}
 };
 
-export const makeSmbBackend = (config: BackendConfig, path: string): VolumeBackend => ({
-	mount: () => mount(config, path),
-	unmount: () => unmount(path),
-	checkHealth: () => checkHealth(path, config.readOnly ?? false),
+const getVolumePath = (name: string) => {
+	return `${VOLUME_MOUNT_BASE}/${name}/_data`;
+};
+
+export const makeSmbBackend = (config: BackendConfig, name: string): VolumeBackend => ({
+	mount: () => mount(config, name),
+	unmount: () => unmount(name),
+	checkHealth: () => checkHealth(name, config.readOnly ?? false),
+	getVolumePath: () => getVolumePath(name),
+	getBackupPath: async () => getVolumePath(name),
 });

app/server/modules/backends/utils/backend-utils.ts

@@ -13,6 +13,10 @@ export const executeMount = async (args: string[]): Promise<void> => {
 	if (stderr?.trim()) {
 		logger.warn(stderr.trim());
 	}
+
+	if (result.exitCode !== 0) {
+		throw new Error(`Mount command failed with exit code ${result.exitCode}: ${stderr?.trim()}`);
+	}
 };
 
 export const executeUnmount = async (path: string): Promise<void> => {
@@ -24,6 +28,10 @@ export const executeUnmount = async (path: string): Promise<void> => {
 	if (stderr?.trim()) {
 		logger.warn(stderr.trim());
 	}
+
+	if (result.exitCode !== 0) {
+		throw new Error(`Mount command failed with exit code ${result.exitCode}: ${stderr?.trim()}`);
+	}
 };
 
 export const createTestFile = async (path: string): Promise<void> => {

app/server/modules/backends/webdav/webdav-backend.ts

@@ -2,7 +2,7 @@ import { execFile as execFileCb } from "node:child_process";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import { promisify } from "node:util";
-import { OPERATION_TIMEOUT } from "../../../core/constants";
+import { OPERATION_TIMEOUT, VOLUME_MOUNT_BASE } from "../../../core/constants";
 import { toMessage } from "../../../utils/errors";
 import { logger } from "../../../utils/logger";
 import { getMountForPath } from "../../../utils/mountinfo";
@@ -13,7 +13,8 @@ import { BACKEND_STATUS, type BackendConfig } from "~/schemas/volumes";
 
 const execFile = promisify(execFileCb);
 
-const mount = async (config: BackendConfig, path: string) => {
+const mount = async (config: BackendConfig, name: string) => {
+	const path = getVolumePath(name);
 	logger.debug(`Mounting WebDAV volume ${path}...`);
 
 	if (config.backend !== "webdav") {
@@ -104,7 +105,8 @@ const mount = async (config: BackendConfig, path: string) => {
 	}
 };
 
-const unmount = async (path: string) => {
+const unmount = async (name: string) => {
+	const path = getVolumePath(name);
 	if (os.platform() !== "linux") {
 		logger.error("WebDAV unmounting is only supported on Linux hosts.");
 		return { status: BACKEND_STATUS.error, error: "WebDAV unmounting is only supported on Linux hosts." };
@@ -134,7 +136,9 @@ const unmount = async (path: string) => {
 	}
 };
 
-const checkHealth = async (path: string, readOnly: boolean) => {
+const checkHealth = async (name: string, readOnly: boolean) => {
+	const path = getVolumePath(name);
+
 	const run = async () => {
 		logger.debug(`Checking health of WebDAV volume at ${path}...`);
 		await fs.access(path);
@@ -161,8 +165,14 @@ const checkHealth = async (path: string, readOnly: boolean) => {
 	}
 };
 
-export const makeWebdavBackend = (config: BackendConfig, path: string): VolumeBackend => ({
-	mount: () => mount(config, path),
-	unmount: () => unmount(path),
-	checkHealth: () => checkHealth(path, config.readOnly ?? false),
+const getVolumePath = (name: string) => {
+	return `${VOLUME_MOUNT_BASE}/${name}/_data`;
+};
+
+export const makeWebdavBackend = (config: BackendConfig, name: string): VolumeBackend => ({
+	mount: () => mount(config, name),
+	unmount: () => unmount(name),
+	checkHealth: () => checkHealth(name, config.readOnly ?? false),
+	getVolumePath: () => getVolumePath(name),
+	getBackupPath: async () => getVolumePath(name),
 });

app/server/modules/backups/backups.controller.ts

@@ -8,6 +8,7 @@ import {
 	getBackupScheduleForVolumeDto,
 	listBackupSchedulesDto,
 	runBackupNowDto,
+	runForgetDto,
 	stopBackupDto,
 	updateBackupScheduleDto,
 	updateBackupScheduleBody,
@@ -17,6 +18,7 @@ import {
 	type GetBackupScheduleForVolumeResponseDto,
 	type ListBackupSchedulesResponseDto,
 	type RunBackupNowDto,
+	type RunForgetDto,
 	type StopBackupDto,
 	type UpdateBackupScheduleDto,
 } from "./backups.dto";
@@ -78,4 +80,11 @@ export const backupScheduleController = new Hono()
 		await backupsService.stopBackup(Number(scheduleId));
 
 		return c.json<StopBackupDto>({ success: true }, 200);
+	})
+	.post("/:scheduleId/forget", runForgetDto, async (c) => {
+		const scheduleId = c.req.param("scheduleId");
+
+		await backupsService.runForget(Number(scheduleId));
+
+		return c.json<RunForgetDto>({ success: true }, 200);
 	});

app/server/modules/backups/backups.dto.ts

@@ -251,3 +251,28 @@ export const stopBackupDto = describeRoute({
 		},
 	},
 });
+
+/**
+ * Run retention policy (forget) manually
+ */
+export const runForgetResponse = type({
+	success: "boolean",
+});
+
+export type RunForgetDto = typeof runForgetResponse.infer;
+
+export const runForgetDto = describeRoute({
+	description: "Manually apply retention policy to clean up old snapshots",
+	operationId: "runForget",
+	tags: ["Backups"],
+	responses: {
+		200: {
+			description: "Retention policy applied successfully",
+			content: {
+				"application/json": {
+					schema: resolver(runForgetResponse),
+				},
+			},
+		},
+	},
+});

app/server/modules/backups/backups.service.ts

@@ -6,7 +6,7 @@ import { db } from "../../db/db";
 import { backupSchedulesTable, repositoriesTable, volumesTable } from "../../db/schema";
 import { restic } from "../../utils/restic";
 import { logger } from "../../utils/logger";
-import { getVolumePath } from "../volumes/helpers";
+import { createVolumeBackend } from "../backends/backend";
 import type { CreateBackupScheduleBody, UpdateBackupScheduleBody } from "./backups.dto";
 import { toMessage } from "../../utils/errors";
 import { serverEvents } from "../../core/events";
@@ -195,16 +195,19 @@ const executeBackup = async (scheduleId: number, manual = false) => {
 		repositoryName: repository.name,
 	});
 
+	const nextBackupAt = calculateNextRun(schedule.cronExpression);
+
 	await db
 		.update(backupSchedulesTable)
-		.set({ lastBackupStatus: "in_progress", updatedAt: Date.now(), lastBackupError: null })
+		.set({ lastBackupStatus: "in_progress", updatedAt: Date.now(), lastBackupError: null, nextBackupAt })
 		.where(eq(backupSchedulesTable.id, scheduleId));
 
 	const abortController = new AbortController();
 	runningBackups.set(scheduleId, abortController);
 
 	try {
-		const volumePath = getVolumePath(volume);
+		const backend = createVolumeBackend(volume);
+		const backupPath = await backend.getBackupPath();
 
 		const backupOptions: {
 			exclude?: string[];
@@ -224,7 +227,7 @@ const executeBackup = async (scheduleId: number, manual = false) => {
 			backupOptions.include = schedule.includePatterns;
 		}
 
-		await restic.backup(repository.config, volumePath, {
+		await restic.backup(repository.config, backupPath, {
 			...backupOptions,
 			onProgress: (progress) => {
 				serverEvents.emit("backup:progress", {
@@ -340,6 +343,32 @@ const stopBackup = async (scheduleId: number) => {
 	abortController.abort();
 };
 
+const runForget = async (scheduleId: number) => {
+	const schedule = await db.query.backupSchedulesTable.findFirst({
+		where: eq(backupSchedulesTable.id, scheduleId),
+	});
+
+	if (!schedule) {
+		throw new NotFoundError("Backup schedule not found");
+	}
+
+	if (!schedule.retentionPolicy) {
+		throw new BadRequestError("No retention policy configured for this schedule");
+	}
+
+	const repository = await db.query.repositoriesTable.findFirst({
+		where: eq(repositoriesTable.id, schedule.repositoryId),
+	});
+
+	if (!repository) {
+		throw new NotFoundError("Repository not found");
+	}
+
+	logger.info(`Manually running retention policy (forget) for schedule ${scheduleId}`);
+	await restic.forget(repository.config, schedule.retentionPolicy, { tag: schedule.id.toString() });
+	logger.info(`Retention policy applied successfully for schedule ${scheduleId}`);
+};
+
 export const backupsService = {
 	listSchedules,
 	getSchedule,
@@ -350,4 +379,5 @@ export const backupsService = {
 	getSchedulesToExecute,
 	getScheduleForVolume,
 	stopBackup,
+	runForget,
 };

app/server/modules/driver/driver.controller.ts

@@ -1,6 +1,6 @@
 import { Hono } from "hono";
 import { volumeService } from "../volumes/volume.service";
-import { getVolumePath } from "../volumes/helpers";
+import { createVolumeBackend } from "../backends/backend";
 
 export const driverController = new Hono()
 	.post("/VolumeDriver.Capabilities", (c) => {
@@ -31,9 +31,11 @@ export const driverController = new Hono()
 		}
 
 		const volumeName = body.Name.replace(/^im-/, "");
+		const { volume } = await volumeService.getVolume(volumeName);
+		const backend = createVolumeBackend(volume);
 
 		return c.json({
-			Mountpoint: getVolumePath(volumeName),
+			Mountpoint: backend.getVolumePath(),
 		});
 	})
 	.post("/VolumeDriver.Unmount", (c) => {
@@ -49,9 +51,10 @@ export const driverController = new Hono()
 		}
 
 		const { volume } = await volumeService.getVolume(body.Name.replace(/^im-/, ""));
+		const backend = createVolumeBackend(volume);
 
 		return c.json({
-			Mountpoint: getVolumePath(volume),
+			Mountpoint: backend.getVolumePath(),
 		});
 	})
 	.post("/VolumeDriver.Get", async (c) => {
@@ -62,11 +65,12 @@ export const driverController = new Hono()
 		}
 
 		const { volume } = await volumeService.getVolume(body.Name.replace(/^im-/, ""));
+		const backend = createVolumeBackend(volume);
 
 		return c.json({
 			Volume: {
 				Name: `im-${volume.name}`,
-				Mountpoint: getVolumePath(volume),
+				Mountpoint: backend.getVolumePath(),
 				Status: {},
 			},
 			Err: "",
@@ -75,11 +79,16 @@ export const driverController = new Hono()
 	.post("/VolumeDriver.List", async (c) => {
 		const volumes = await volumeService.listVolumes();
 
-		const res = volumes.map((volume) => ({
-			Name: `im-${volume.name}`,
-			Mountpoint: getVolumePath(volume),
-			Status: {},
-		}));
+		let res = [];
+		for (const volume of volumes) {
+			const backend = createVolumeBackend(volume);
+
+			res.push({
+				Name: `im-${volume.name}`,
+				Mountpoint: backend.getVolumePath(),
+				Status: {},
+			});
+		}
 
 		return c.json({
 			Volumes: res,

app/server/modules/lifecycle/startup.ts

@@ -13,6 +13,7 @@ import { CleanupSessionsJob } from "../../jobs/cleanup-sessions";
 
 export const startup = async () => {
 	await Scheduler.start();
+	await Scheduler.clear();
 
 	await restic.ensurePassfile().catch((err) => {
 		logger.error(`Error ensuring restic passfile exists: ${err.message}`);

app/server/modules/repositories/repositories.service.ts

@@ -15,10 +15,15 @@ const listRepositories = async () => {
 };
 
 const encryptConfig = async (config: RepositoryConfig): Promise<RepositoryConfig> => {
-	const encryptedConfig: Record<string, string> = { ...config };
+	const encryptedConfig: Record<string, string | boolean> = { ...config };
+
+	if (config.customPassword) {
+		encryptedConfig.customPassword = await cryptoUtils.encrypt(config.customPassword);
+	}
 
 	switch (config.backend) {
 		case "s3":
+		case "r2":
 			encryptedConfig.accessKeyId = await cryptoUtils.encrypt(config.accessKeyId);
 			encryptedConfig.secretAccessKey = await cryptoUtils.encrypt(config.secretAccessKey);
 			break;
@@ -64,16 +69,24 @@ const createRepository = async (name: string, config: RepositoryConfig, compress
 		throw new InternalServerError("Failed to create repository");
 	}
 
-	const { success, error } = await restic.init(encryptedConfig);
+	let error: string | null = null;
 
-	if (success) {
+	if (config.isExistingRepository) {
+		const result = await restic
+			.snapshots(encryptedConfig)
+			.then(() => ({ error: null }))
+			.catch((error) => ({ error }));
+
+		error = result.error;
+	} else {
+		const initResult = await restic.init(encryptedConfig);
+		error = initResult.error;
+	}
+
+	if (!error) {
 		await db
 			.update(repositoriesTable)
-			.set({
-				status: "healthy",
-				lastChecked: Date.now(),
-				lastError: null,
-			})
+			.set({ status: "healthy", lastChecked: Date.now(), lastError: null })
 			.where(eq(repositoriesTable.id, id));
 
 		return { repository: created, status: 201 };

app/server/modules/volumes/helpers.ts

@@ -1,10 +0,0 @@
-import { VOLUME_MOUNT_BASE } from "../../core/constants";
-import type { Volume } from "../../db/schema";
-
-export const getVolumePath = (volume: Volume) => {
-	if (volume.config.backend === "directory") {
-		return volume.config.path;
-	}
-
-	return `${VOLUME_MOUNT_BASE}/${volume.name}/_data`;
-};

app/server/modules/volumes/volume.controller.ts

@@ -25,7 +25,7 @@ import {
 	type BrowseFilesystemDto,
 } from "./volume.dto";
 import { volumeService } from "./volume.service";
-import { getVolumePath } from "./helpers";
+import { createVolumeBackend } from "../backends/backend";
 
 export const volumeController = new Hono()
 	.get("/", listVolumesDto, async (c) => {
@@ -37,9 +37,10 @@ export const volumeController = new Hono()
 		const body = c.req.valid("json");
 		const res = await volumeService.createVolume(body.name, body.config);
 
+		const backend = createVolumeBackend(res.volume);
 		const response = {
 			...res.volume,
-			path: getVolumePath(res.volume),
+			path: backend.getVolumePath(),
 		};
 
 		return c.json<CreateVolumeDto>(response, 201);
@@ -60,10 +61,11 @@ export const volumeController = new Hono()
 		const { name } = c.req.param();
 		const res = await volumeService.getVolume(name);
 
+		const backend = createVolumeBackend(res.volume);
 		const response = {
 			volume: {
 				...res.volume,
-				path: getVolumePath(res.volume),
+				path: backend.getVolumePath(),
 			},
 			statfs: {
 				total: res.statfs.total ?? 0,
@@ -85,9 +87,10 @@ export const volumeController = new Hono()
 		const body = c.req.valid("json");
 		const res = await volumeService.updateVolume(name, body);
 
+		const backend = createVolumeBackend(res.volume);
 		const response = {
 			...res.volume,
-			path: getVolumePath(res.volume),
+			path: backend.getVolumePath(),
 		};
 
 		return c.json<UpdateVolumeDto>(response, 200);

app/server/modules/volumes/volume.service.ts

@@ -13,7 +13,6 @@ import { getStatFs, type StatFs } from "../../utils/mountinfo";
 import { withTimeout } from "../../utils/timeout";
 import { createVolumeBackend } from "../backends/backend";
 import type { UpdateVolumeBody } from "./volume.dto";
-import { getVolumePath } from "./helpers";
 import { logger } from "../../utils/logger";
 import { serverEvents } from "../../core/events";
 import type { BackendConfig } from "~/schemas/volumes";
@@ -129,7 +128,9 @@ const getVolume = async (name: string) => {
 
 	let statfs: Partial<StatFs> = {};
 	if (volume.status === "mounted") {
-		statfs = await withTimeout(getStatFs(getVolumePath(volume)), 1000, "getStatFs").catch((error) => {
+		const backend = createVolumeBackend(volume);
+		const volumePath = backend.getVolumePath();
+		statfs = await withTimeout(getStatFs(volumePath), 1000, "getStatFs").catch((error) => {
 			logger.warn(`Failed to get statfs for volume ${name}: ${toMessage(error)}`);
 			return {};
 		});
@@ -203,7 +204,16 @@ const testConnection = async (backendConfig: BackendConfig) => {
 	};
 
 	const backend = createVolumeBackend(mockVolume);
-	const { error } = await backend.mount();
+	let error: string | null = null;
+	const mount = await backend.mount();
+	if (mount.error) {
+		error = mount.error;
+	} else {
+		const health = await backend.checkHealth();
+		if (health.error) {
+			error = health.error;
+		}
+	}
 
 	await backend.unmount();
 
@@ -295,8 +305,8 @@ const listFiles = async (name: string, subPath?: string) => {
 		throw new InternalServerError("Volume is not mounted");
 	}
 
-	// For directory volumes, use the configured path directly
-	const volumePath = getVolumePath(volume);
+	const backend = createVolumeBackend(volume);
+	const volumePath = backend.getVolumePath();
 
 	const requestedPath = subPath ? path.join(volumePath, subPath) : volumePath;
 

app/server/utils/restic.ts

@@ -74,6 +74,10 @@ const buildRepoUrl = (config: RepositoryConfig): string => {
 			return `${REPOSITORY_BASE}/${config.name}`;
 		case "s3":
 			return `s3:${config.endpoint}/${config.bucket}`;
+		case "r2": {
+			const endpoint = config.endpoint.replace(/^https?:\/\//, "");
+			return `s3:${endpoint}/${config.bucket}`;
+		}
 		case "gcs":
 			return `gs:${config.bucket}:/`;
 		case "azure":
@@ -89,18 +93,33 @@ const buildRepoUrl = (config: RepositoryConfig): string => {
 const buildEnv = async (config: RepositoryConfig) => {
 	const env: Record<string, string> = {
 		RESTIC_CACHE_DIR: "/var/lib/ironmount/restic/cache",
-		RESTIC_PASSWORD_FILE: RESTIC_PASS_FILE,
 		PATH: process.env.PATH || "/usr/local/bin:/usr/bin:/bin",
 	};
 
+	if (config.isExistingRepository && config.customPassword) {
+		const decryptedPassword = await cryptoUtils.decrypt(config.customPassword);
+		const passwordFilePath = path.join("/tmp", `ironmount-pass-${crypto.randomBytes(8).toString("hex")}.txt`);
+
+		await fs.writeFile(passwordFilePath, decryptedPassword, { mode: 0o600 });
+		env.RESTIC_PASSWORD_FILE = passwordFilePath;
+	} else {
+		env.RESTIC_PASSWORD_FILE = RESTIC_PASS_FILE;
+	}
+
 	switch (config.backend) {
 		case "s3":
 			env.AWS_ACCESS_KEY_ID = await cryptoUtils.decrypt(config.accessKeyId);
 			env.AWS_SECRET_ACCESS_KEY = await cryptoUtils.decrypt(config.secretAccessKey);
 			break;
+		case "r2":
+			env.AWS_ACCESS_KEY_ID = await cryptoUtils.decrypt(config.accessKeyId);
+			env.AWS_SECRET_ACCESS_KEY = await cryptoUtils.decrypt(config.secretAccessKey);
+			env.AWS_REGION = "auto";
+			env.AWS_S3_FORCE_PATH_STYLE = "true";
+			break;
 		case "gcs": {
 			const decryptedCredentials = await cryptoUtils.decrypt(config.credentialsJson);
-			const credentialsPath = path.join("/tmp", `gcs-credentials-${crypto.randomBytes(8).toString("hex")}.json`);
+			const credentialsPath = path.join("/tmp", `ironmount-gcs-${crypto.randomBytes(8).toString("hex")}.json`);
 			await fs.writeFile(credentialsPath, decryptedCredentials, { mode: 0o600 });
 			env.GOOGLE_PROJECT_ID = config.projectId;
 			env.GOOGLE_APPLICATION_CREDENTIALS = credentialsPath;
@@ -129,7 +148,7 @@ const init = async (config: RepositoryConfig) => {
 
 	if (res.exitCode !== 0) {
 		logger.error(`Restic init failed: ${res.stderr}`);
-		return { success: false, error: res.stderr };
+		return { success: false, error: res.stderr.toString() };
 	}
 
 	logger.info(`Restic repository initialized: ${repoUrl}`);

app/server/utils/sanitize.ts

@@ -3,6 +3,10 @@
  * This removes passwords and credentials from logs and error messages
  */
 export const sanitizeSensitiveData = (text: string): string => {
+	if (process.env.NODE_ENV === "development") {
+		return text;
+	}
+
 	let sanitized = text.replace(/\b(pass|password)=([^\s,]+)/gi, "$1=***");
 
 	sanitized = sanitized.replace(/\/\/([^:@\s]+):([^@\s]+)@/g, "//$1:***@");

app/server/utils/spawn.ts

@@ -5,6 +5,8 @@ interface Params {
 	args: string[];
 	env?: NodeJS.ProcessEnv;
 	signal?: AbortSignal;
+	stdin?: string;
+	timeout?: number;
 	onStdout?: (data: string) => void;
 	onStderr?: (error: string) => void;
 	onError?: (error: Error) => Promise<void> | void;
@@ -19,17 +21,26 @@ type SpawnResult = {
 };
 
 export const safeSpawn = (params: Params) => {
-	const { command, args, env = {}, signal, ...callbacks } = params;
+	const { command, args, env = {}, signal, stdin, timeout, ...callbacks } = params;
 
-	return new Promise<SpawnResult>((resolve) => {
+	return new Promise<SpawnResult>((resolve, reject) => {
 		let stdoutData = "";
 		let stderrData = "";
+		let timeoutId: NodeJS.Timeout | undefined;
 
 		const child = spawn(command, args, {
 			env: { ...process.env, ...env },
 			signal: signal,
 		});
 
+		// Handle timeout if specified
+		if (timeout) {
+			timeoutId = setTimeout(() => {
+				child.kill("SIGTERM");
+				reject(new Error(`Command timed out after ${timeout}ms`));
+			}, timeout);
+		}
+
 		child.stdout.on("data", (data) => {
 			if (callbacks.onStdout) {
 				callbacks.onStdout(data.toString());
@@ -47,6 +58,7 @@ export const safeSpawn = (params: Params) => {
 		});
 
 		child.on("error", async (error) => {
+			if (timeoutId) clearTimeout(timeoutId);
 			if (callbacks.onError) {
 				await callbacks.onError(error);
 			}
@@ -62,6 +74,7 @@ export const safeSpawn = (params: Params) => {
 		});
 
 		child.on("close", async (code) => {
+			if (timeoutId) clearTimeout(timeoutId);
 			if (callbacks.onClose) {
 				await callbacks.onClose(code);
 			}
@@ -69,11 +82,15 @@ export const safeSpawn = (params: Params) => {
 				await callbacks.finally();
 			}
 
-			resolve({
-				exitCode: code === null ? -1 : code,
-				stdout: stdoutData,
-				stderr: stderrData,
-			});
+			if (code !== 0 && code !== null) {
+				reject(new Error(`Command failed with exit code ${code}: ${stderrData || stdoutData}`));
+			} else {
+				resolve({
+					exitCode: code === null ? -1 : code,
+					stdout: stdoutData,
+					stderr: stderrData,
+				});
+			}
 		});
 	});
 };

docker-compose.yml

@@ -18,7 +18,10 @@ services:
       - /var/lib/ironmount:/var/lib/ironmount
 
       - ./app:/app/app
-      # - ~/.config/rclone:/root/.config/rclone
+      - ~/.config/rclone:/root/.config/rclone
+      - /var/lib/ironmount:/var/lib/ironmount:rshared
+      - /run/docker/plugins:/run/docker/plugins
+      - /var/run/docker.sock:/var/run/docker.sock
 
   ironmount-prod:
     build:

mutagen.yml.lock

@@ -1 +0,0 @@
-proj_Nwis7nYU1DiPGTtNlwRKBVtdgo5cOWPsnwbtxj2Urg0

notes.md

@@ -1,4 +0,0 @@
-docker run --rm -it -v nicolas:/data alpine sh -lc 'echo hello > /data/hi && cat /data/hi'
-
-mount -t davfs http://192.168.2.42 /mnt/webdav
-