Merge branch 'tvarohohlavy-volumes-secrets-encryption'

The password should be taken as-is. It could potentially contain a space

.github/copilot-instructions.md

@@ -0,0 +1 @@
+- This project uses the AGENTS.md file to give detailed information about the repository structure and development commands. Make sure to read this file before starting development.

.github/workflows/release.yml

@@ -62,8 +62,6 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}.{{patch}},prefix=v,enable=${{ needs.determine-release-type.outputs.release_type == 'release' }}
           flavor: |
             latest=${{ needs.determine-release-type.outputs.release_type == 'release' }}
-          cache-from: type=registry,ref=ghcr.io/nicotsx/zerobyte:buildcache
-          cache-to: type=registry,ref=ghcr.io/nicotsx/zerobyte:buildcache,mode=max
 
       - name: Build and push images
         uses: docker/build-push-action@v6
@@ -76,6 +74,8 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             APP_VERSION=${{ needs.determine-release-type.outputs.tagname }}
+          cache-from: type=registry,ref=ghcr.io/nicotsx/zerobyte:buildcache
+          cache-to: type=registry,ref=ghcr.io/nicotsx/zerobyte:buildcache,mode=max
 
   publish-release:
     runs-on: ubuntu-latest

AGENTS.md

@@ -0,0 +1,267 @@
+# AGENTS.md
+
+## Important instructions
+
+- Never create migration files manually. Always use the provided command to generate migrations
+- If you realize an automated migration is incorrect, make sure to remove all the associated entries from the `_journal.json` and the newly created files located in `app/drizzle/` before re-generating the migration
+
+## Project Overview
+
+Zerobyte is a backup automation tool built on top of Restic that provides a web interface for scheduling, managing, and monitoring encrypted backups. It supports multiple volume backends (NFS, SMB, WebDAV, local directories) and repository backends (S3, Azure, GCS, local, and rclone-based storage).
+
+## Technology Stack
+
+- **Runtime**: Bun 1.3.1
+- **Server**: Hono (web framework) with Bun runtime
+- **Client**: React Router v7 (SSR) with React 19
+- **Database**: SQLite with Drizzle ORM
+- **Validation**: ArkType for runtime schema validation
+- **Styling**: Tailwind CSS v4 + Radix UI components
+- **Architecture**: Unified application structure (not a monorepo)
+- **Code Quality**: Biome (formatter & linter)
+- **Containerization**: Docker with multi-stage builds
+
+## Repository Structure
+
+This is a unified application with the following structure:
+
+- `app/server` - Bun-based API server with Hono
+- `app/client` - React Router SSR frontend components and modules
+- `app/schemas` - Shared ArkType schemas for validation
+- `app/drizzle` - Database migrations
+
+### Type Checking
+
+```bash
+# Run type checking and generate React Router types
+bun run tsc
+```
+
+### Building
+
+```bash
+# Build for production
+bun run build
+```
+
+### Database Migrations
+
+```bash
+# Generate new migration from schema changes
+bun gen:migrations
+
+# Generate a custom empty migration
+bunx drizzle-kit generate --custom --name=fix-timestamps-to-ms
+
+```
+
+### API Client Generation
+
+```bash
+# Generate TypeScript API client from OpenAPI spec
+# Note: Server is always running don't need to start it separately
+bun run gen:api-client
+```
+
+### Code Quality
+
+```bash
+# Format and lint (Biome)
+bunx biome check --write .
+
+# Format only
+bunx biome format --write .
+
+# Lint only
+bunx biome lint .
+```
+
+## Architecture
+
+### Server Architecture
+
+The server follows a modular service-oriented architecture:
+
+**Entry Point**: `app/server/index.ts`
+
+- Initializes servers using `react-router-hono-server`:
+  1. Main API server on port 4096 (REST API + serves static frontend)
+  2. Docker volume plugin server on Unix socket `/run/docker/plugins/zerobyte.sock` (optional, if Docker is available)
+
+**Modules** (`app/server/modules/`):
+Each module follows a controller <20> service <20> database pattern:
+
+- `auth/` - User authentication and session management
+- `volumes/` - Volume mounting/unmounting (NFS, SMB, WebDAV, directories)
+- `repositories/` - Restic repository management (S3, Azure, GCS, local, rclone)
+- `backups/` - Backup schedule management and execution
+- `notifications/` - Notification system with multiple providers (Discord, email, Gotify, Ntfy, Slack, Pushover)
+- `driver/` - Docker volume plugin implementation
+- `events/` - Server-Sent Events for real-time updates
+- `system/` - System information and capabilities
+- `lifecycle/` - Application startup/shutdown hooks
+
+**Backends** (`app/server/modules/backends/`):
+Each volume backend (NFS, SMB, WebDAV, directory) implements mounting logic using system tools (mount.nfs, mount.cifs, davfs2).
+
+**Jobs** (`app/server/jobs/`):
+Cron-based background jobs managed by the Scheduler:
+
+- `backup-execution.ts` - Runs scheduled backups (every minute)
+- `cleanup-dangling.ts` - Removes stale mounts (hourly)
+- `healthchecks.ts` - Checks volume health (every 5 minutes)
+- `repository-healthchecks.ts` - Validates repositories (every 10 minutes)
+- `cleanup-sessions.ts` - Expires old sessions (daily)
+
+**Core** (`app/server/core/`):
+
+- `scheduler.ts` - Job scheduling system using node-cron
+- `capabilities.ts` - Detects available system features (Docker support, etc.)
+- `constants.ts` - Application-wide constants
+
+**Utils** (`app/server/utils/`):
+
+- `restic.ts` - Restic CLI wrapper with type-safe output parsing
+- `spawn.ts` - Safe subprocess execution helpers
+- `logger.ts` - Winston-based logging
+- `crypto.ts` - Encryption utilities
+- `errors.ts` - Error handling middleware
+
+**Database** (`app/server/db/`):
+
+- Uses Drizzle ORM with SQLite
+- Schema in `schema.ts` defines: volumes, repositories, backup schedules, notifications, users, sessions
+- Migrations: `app/drizzle/`
+
+### Client Architecture
+
+**Framework**: React Router v7 with SSR
+**Entry Point**: `app/root.tsx`
+
+The client uses:
+
+- TanStack Query for server state management
+- Auto-generated API client from OpenAPI spec (in `app/client/api-client/`)
+- Radix UI primitives with custom Tailwind styling
+- Server-Sent Events hook (`use-server-events.ts`) for real-time updates
+
+Routes are organized in feature modules at `app/client/modules/*/routes/`.
+
+### Shared Schemas
+
+`app/schemas/` contains ArkType schemas used by both client and server:
+
+- Volume configurations (NFS, SMB, WebDAV, directory)
+- Repository configurations (S3, Azure, GCS, local, rclone)
+- Restic command output parsing types
+- Backend status types
+
+These schemas provide runtime validation and TypeScript types.
+
+## Restic Integration
+
+Zerobyte is a wrapper around Restic for backup operations. Key integration points:
+
+**Repository Management**:
+
+- Creates/initializes Restic repositories via `restic init`
+- Supports multiple backends: local, S3, Azure Blob Storage, Google Cloud Storage, or any rclone-supported backend
+- Stores single encryption password in `/var/lib/zerobyte/restic/password` (auto-generated on first run)
+
+**Backup Operations**:
+
+- Executes `restic backup` with user-defined schedules (cron expressions)
+- Supports include/exclude patterns for selective backups
+- Parses JSON output for progress tracking and statistics
+- Implements retention policies via `restic forget --prune`
+
+**Repository Utilities** (`utils/restic.ts`):
+
+- `buildRepoUrl()` - Constructs repository URLs for different backends
+- `buildEnv()` - Sets environment variables (credentials, cache dir)
+- `ensurePassfile()` - Manages encryption password file
+- Type-safe parsing of Restic JSON output using ArkType schemas
+
+**Rclone Integration** (`app/server/modules/repositories/`):
+
+- Allows using any rclone backend as a Restic repository
+- Dynamically generates rclone config and passes via environment variables
+- Supports backends like Dropbox, Google Drive, OneDrive, Backblaze B2, etc.
+
+## Docker Volume Plugin
+
+When Docker socket is available (`/var/run/docker.sock`), Zerobyte registers as a Docker volume plugin:
+
+**Plugin Location**: `/run/docker/plugins/zerobyte.sock`
+**Implementation**: `app/server/modules/driver/driver.controller.ts`
+
+This allows other containers to mount Zerobyte volumes using Docker.
+
+The plugin implements the Docker Volume Plugin API v1.
+
+## Environment & Configuration
+
+**Runtime Environment Variables**:
+
+- Database path: `./data/zerobyte.db` (configurable via `drizzle.config.ts`)
+- Restic cache: `/var/lib/zerobyte/restic/cache`
+- Restic password: `/var/lib/zerobyte/restic/password`
+- Volume mounts: `/var/lib/zerobyte/mounts/<volume-name>`
+- Local repositories: `/var/lib/zerobyte/repositories/<repo-name>`
+
+**Capabilities Detection**:
+On startup, the server detects available capabilities (see `core/capabilities.ts`):
+
+- **Docker**: Requires `/var/run/docker.sock` access
+- System will gracefully degrade if capabilities are unavailable
+
+## Common Workflows
+
+### Adding a New Volume Backend
+
+1. Create backend implementation in `app/server/modules/backends/<backend>/`
+2. Implement `mount()` and `unmount()` methods
+3. Add schema to `app/schemas/volumes.ts`
+4. Update `volumeConfigSchema` discriminated union
+5. Update backend factory in `app/server/modules/backends/backend.ts`
+
+### Adding a New Repository Backend
+
+1. Add backend type to `app/schemas/restic.ts`
+2. Update `buildRepoUrl()` in `app/server/utils/restic.ts`
+3. Update `buildEnv()` to handle credentials/configuration
+4. Add DTO schemas in `app/server/modules/repositories/repositories.dto.ts`
+5. Update repository service to handle new backend
+
+### Adding a New Scheduled Job
+
+1. Create job class in `app/server/jobs/<job-name>.ts` extending `Job`
+2. Implement `run()` method
+3. Register in `app/server/modules/lifecycle/startup.ts` with cron expression:
+   ```typescript
+   Scheduler.build(YourJob).schedule("* * * * *");
+   ```
+
+## Important Notes
+
+- **Code Style**: Uses Biome with tabs (not spaces), 120 char line width, double quotes
+- **Imports**: Organize imports is disabled in Biome - do not auto-organize
+- **TypeScript**: Uses `"type": "module"` - all imports must include extensions when targeting Node/Bun
+- **Validation**: Prefer ArkType over Zod - it's used throughout the codebase
+- **Database**: Timestamps are stored as Unix epoch integers, not ISO strings
+- **Security**: Restic password file has 0600 permissions - never expose it
+- **Mounting**: Requires privileged container or CAP_SYS_ADMIN for FUSE mounts
+- **API Documentation**: OpenAPI spec auto-generated at `/api/v1/openapi.json`, docs at `/api/v1/docs`
+
+## Docker Development Setup
+
+The `docker-compose.yml` defines two services:
+
+- `zerobyte-dev` - Development with hot reload (uses `development` stage)
+- `zerobyte-prod` - Production build (uses `production` stage)
+
+Both mount:
+
+- `/var/lib/zerobyte` for persistent data
+- `/dev/fuse` device for FUSE mounting
+- Optionally `/var/run/docker.sock` for Docker plugin functionality

Dockerfile

@@ -14,7 +14,7 @@ WORKDIR /deps
 
 ARG TARGETARCH
 ARG RESTIC_VERSION="0.18.1"
-ARG SHOUTRRR_VERSION="0.12.0"
+ARG SHOUTRRR_VERSION="0.12.1"
 ENV TARGETARCH=${TARGETARCH}
 
 RUN apk add --no-cache curl bzip2 unzip tar

app/client/api-client/@tanstack/react-query.gen.ts

@@ -87,12 +87,10 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
     if (options?.query) {
         params.query = options.query;
     }
-    return [
+    return [params];
-        params
-    ];
 };
 
-export const getMeQueryKey = (options?: Options<GetMeData>) => createQueryKey("getMe", options);
+export const getMeQueryKey = (options?: Options<GetMeData>) => createQueryKey('getMe', options);
 
 /**
  * Get current authenticated user
@@ -110,7 +108,7 @@ export const getMeOptions = (options?: Options<GetMeData>) => queryOptions<GetMe
     queryKey: getMeQueryKey(options)
 });
 
-export const getStatusQueryKey = (options?: Options<GetStatusData>) => createQueryKey("getStatus", options);
+export const getStatusQueryKey = (options?: Options<GetStatusData>) => createQueryKey('getStatus', options);
 
 /**
  * Get authentication system status
@@ -145,7 +143,7 @@ export const changePasswordMutation = (options?: Partial<Options<ChangePasswordD
     return mutationOptions;
 };
 
-export const listVolumesQueryKey = (options?: Options<ListVolumesData>) => createQueryKey("listVolumes", options);
+export const listVolumesQueryKey = (options?: Options<ListVolumesData>) => createQueryKey('listVolumes', options);
 
 /**
  * List all volumes
@@ -214,7 +212,7 @@ export const deleteVolumeMutation = (options?: Partial<Options<DeleteVolumeData>
     return mutationOptions;
 };
 
-export const getVolumeQueryKey = (options: Options<GetVolumeData>) => createQueryKey("getVolume", options);
+export const getVolumeQueryKey = (options: Options<GetVolumeData>) => createQueryKey('getVolume', options);
 
 /**
  * Get a volume by name
@@ -249,7 +247,7 @@ export const updateVolumeMutation = (options?: Partial<Options<UpdateVolumeData>
     return mutationOptions;
 };
 
-export const getContainersUsingVolumeQueryKey = (options: Options<GetContainersUsingVolumeData>) => createQueryKey("getContainersUsingVolume", options);
+export const getContainersUsingVolumeQueryKey = (options: Options<GetContainersUsingVolumeData>) => createQueryKey('getContainersUsingVolume', options);
 
 /**
  * Get containers using a volume by name
@@ -318,7 +316,7 @@ export const healthCheckVolumeMutation = (options?: Partial<Options<HealthCheckV
     return mutationOptions;
 };
 
-export const listFilesQueryKey = (options: Options<ListFilesData>) => createQueryKey("listFiles", options);
+export const listFilesQueryKey = (options: Options<ListFilesData>) => createQueryKey('listFiles', options);
 
 /**
  * List files in a volume directory
@@ -336,7 +334,7 @@ export const listFilesOptions = (options: Options<ListFilesData>) => queryOption
     queryKey: listFilesQueryKey(options)
 });
 
-export const browseFilesystemQueryKey = (options?: Options<BrowseFilesystemData>) => createQueryKey("browseFilesystem", options);
+export const browseFilesystemQueryKey = (options?: Options<BrowseFilesystemData>) => createQueryKey('browseFilesystem', options);
 
 /**
  * Browse directories on the host filesystem
@@ -354,7 +352,7 @@ export const browseFilesystemOptions = (options?: Options<BrowseFilesystemData>)
     queryKey: browseFilesystemQueryKey(options)
 });
 
-export const listRepositoriesQueryKey = (options?: Options<ListRepositoriesData>) => createQueryKey("listRepositories", options);
+export const listRepositoriesQueryKey = (options?: Options<ListRepositoriesData>) => createQueryKey('listRepositories', options);
 
 /**
  * List all repositories
@@ -389,7 +387,7 @@ export const createRepositoryMutation = (options?: Partial<Options<CreateReposit
     return mutationOptions;
 };
 
-export const listRcloneRemotesQueryKey = (options?: Options<ListRcloneRemotesData>) => createQueryKey("listRcloneRemotes", options);
+export const listRcloneRemotesQueryKey = (options?: Options<ListRcloneRemotesData>) => createQueryKey('listRcloneRemotes', options);
 
 /**
  * List all configured rclone remotes on the host system
@@ -424,7 +422,7 @@ export const deleteRepositoryMutation = (options?: Partial<Options<DeleteReposit
     return mutationOptions;
 };
 
-export const getRepositoryQueryKey = (options: Options<GetRepositoryData>) => createQueryKey("getRepository", options);
+export const getRepositoryQueryKey = (options: Options<GetRepositoryData>) => createQueryKey('getRepository', options);
 
 /**
  * Get a single repository by name
@@ -459,7 +457,7 @@ export const updateRepositoryMutation = (options?: Partial<Options<UpdateReposit
     return mutationOptions;
 };
 
-export const listSnapshotsQueryKey = (options: Options<ListSnapshotsData>) => createQueryKey("listSnapshots", options);
+export const listSnapshotsQueryKey = (options: Options<ListSnapshotsData>) => createQueryKey('listSnapshots', options);
 
 /**
  * List all snapshots in a repository
@@ -494,7 +492,7 @@ export const deleteSnapshotMutation = (options?: Partial<Options<DeleteSnapshotD
     return mutationOptions;
 };
 
-export const getSnapshotDetailsQueryKey = (options: Options<GetSnapshotDetailsData>) => createQueryKey("getSnapshotDetails", options);
+export const getSnapshotDetailsQueryKey = (options: Options<GetSnapshotDetailsData>) => createQueryKey('getSnapshotDetails', options);
 
 /**
  * Get details of a specific snapshot
@@ -512,7 +510,7 @@ export const getSnapshotDetailsOptions = (options: Options<GetSnapshotDetailsDat
     queryKey: getSnapshotDetailsQueryKey(options)
 });
 
-export const listSnapshotFilesQueryKey = (options: Options<ListSnapshotFilesData>) => createQueryKey("listSnapshotFiles", options);
+export const listSnapshotFilesQueryKey = (options: Options<ListSnapshotFilesData>) => createQueryKey('listSnapshotFiles', options);
 
 /**
  * List files and directories in a snapshot
@@ -564,7 +562,7 @@ export const doctorRepositoryMutation = (options?: Partial<Options<DoctorReposit
     return mutationOptions;
 };
 
-export const listBackupSchedulesQueryKey = (options?: Options<ListBackupSchedulesData>) => createQueryKey("listBackupSchedules", options);
+export const listBackupSchedulesQueryKey = (options?: Options<ListBackupSchedulesData>) => createQueryKey('listBackupSchedules', options);
 
 /**
  * List all backup schedules
@@ -616,7 +614,7 @@ export const deleteBackupScheduleMutation = (options?: Partial<Options<DeleteBac
     return mutationOptions;
 };
 
-export const getBackupScheduleQueryKey = (options: Options<GetBackupScheduleData>) => createQueryKey("getBackupSchedule", options);
+export const getBackupScheduleQueryKey = (options: Options<GetBackupScheduleData>) => createQueryKey('getBackupSchedule', options);
 
 /**
  * Get a backup schedule by ID
@@ -651,7 +649,7 @@ export const updateBackupScheduleMutation = (options?: Partial<Options<UpdateBac
     return mutationOptions;
 };
 
-export const getBackupScheduleForVolumeQueryKey = (options: Options<GetBackupScheduleForVolumeData>) => createQueryKey("getBackupScheduleForVolume", options);
+export const getBackupScheduleForVolumeQueryKey = (options: Options<GetBackupScheduleForVolumeData>) => createQueryKey('getBackupScheduleForVolume', options);
 
 /**
  * Get a backup schedule for a specific volume
@@ -720,7 +718,7 @@ export const runForgetMutation = (options?: Partial<Options<RunForgetData>>): Us
     return mutationOptions;
 };
 
-export const getScheduleNotificationsQueryKey = (options: Options<GetScheduleNotificationsData>) => createQueryKey("getScheduleNotifications", options);
+export const getScheduleNotificationsQueryKey = (options: Options<GetScheduleNotificationsData>) => createQueryKey('getScheduleNotifications', options);
 
 /**
  * Get notification assignments for a backup schedule
@@ -755,7 +753,7 @@ export const updateScheduleNotificationsMutation = (options?: Partial<Options<Up
     return mutationOptions;
 };
 
-export const getScheduleMirrorsQueryKey = (options: Options<GetScheduleMirrorsData>) => createQueryKey("getScheduleMirrors", options);
+export const getScheduleMirrorsQueryKey = (options: Options<GetScheduleMirrorsData>) => createQueryKey('getScheduleMirrors', options);
 
 /**
  * Get mirror repository assignments for a backup schedule
@@ -790,7 +788,7 @@ export const updateScheduleMirrorsMutation = (options?: Partial<Options<UpdateSc
     return mutationOptions;
 };
 
-export const getMirrorCompatibilityQueryKey = (options: Options<GetMirrorCompatibilityData>) => createQueryKey("getMirrorCompatibility", options);
+export const getMirrorCompatibilityQueryKey = (options: Options<GetMirrorCompatibilityData>) => createQueryKey('getMirrorCompatibility', options);
 
 /**
  * Get mirror compatibility info for all repositories relative to a backup schedule's primary repository
@@ -808,7 +806,7 @@ export const getMirrorCompatibilityOptions = (options: Options<GetMirrorCompatib
     queryKey: getMirrorCompatibilityQueryKey(options)
 });
 
-export const listNotificationDestinationsQueryKey = (options?: Options<ListNotificationDestinationsData>) => createQueryKey("listNotificationDestinations", options);
+export const listNotificationDestinationsQueryKey = (options?: Options<ListNotificationDestinationsData>) => createQueryKey('listNotificationDestinations', options);
 
 /**
  * List all notification destinations
@@ -860,7 +858,7 @@ export const deleteNotificationDestinationMutation = (options?: Partial<Options<
     return mutationOptions;
 };
 
-export const getNotificationDestinationQueryKey = (options: Options<GetNotificationDestinationData>) => createQueryKey("getNotificationDestination", options);
+export const getNotificationDestinationQueryKey = (options: Options<GetNotificationDestinationData>) => createQueryKey('getNotificationDestination', options);
 
 /**
  * Get a notification destination by ID
@@ -912,7 +910,7 @@ export const testNotificationDestinationMutation = (options?: Partial<Options<Te
     return mutationOptions;
 };
 
-export const getSystemInfoQueryKey = (options?: Options<GetSystemInfoData>) => createQueryKey("getSystemInfo", options);
+export const getSystemInfoQueryKey = (options?: Options<GetSystemInfoData>) => createQueryKey('getSystemInfo', options);
 
 /**
  * Get system information including available capabilities

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

@@ -13,6 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen';
  */
 export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
 
-export const client = createClient(createConfig<ClientOptions2>({
+export const client = createClient(createConfig<ClientOptions2>({ baseUrl: 'http://192.168.2.42:4096' }));
-    baseUrl: 'http://192.168.2.42:4096'
-}));

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

@@ -21,8 +21,7 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 /**
  * Register a new user
  */
-export const register = <ThrowOnError extends boolean = false>(options?: Options<RegisterData, ThrowOnError>) => {
+export const register = <ThrowOnError extends boolean = false>(options?: Options<RegisterData, ThrowOnError>) => (options?.client ?? client).post<RegisterResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<RegisterResponses, unknown, ThrowOnError>({
     url: '/api/v1/auth/register',
     ...options,
     headers: {
@@ -30,13 +29,11 @@ export const register = <ThrowOnError extends boolean = false>(options?: Options
         ...options?.headers
     }
 });
-};
 
 /**
  * Login with username and password
  */
-export const login = <ThrowOnError extends boolean = false>(options?: Options<LoginData, ThrowOnError>) => {
+export const login = <ThrowOnError extends boolean = false>(options?: Options<LoginData, ThrowOnError>) => (options?.client ?? client).post<LoginResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<LoginResponses, unknown, ThrowOnError>({
     url: '/api/v1/auth/login',
     ...options,
     headers: {
@@ -44,43 +41,26 @@ export const login = <ThrowOnError extends boolean = false>(options?: Options<Lo
         ...options?.headers
     }
 });
-};
 
 /**
  * Logout current user
  */
-export const logout = <ThrowOnError extends boolean = false>(options?: Options<LogoutData, ThrowOnError>) => {
+export const logout = <ThrowOnError extends boolean = false>(options?: Options<LogoutData, ThrowOnError>) => (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>) => {
+export const getMe = <ThrowOnError extends boolean = false>(options?: Options<GetMeData, ThrowOnError>) => (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>) => {
+export const getStatus = <ThrowOnError extends boolean = false>(options?: Options<GetStatusData, ThrowOnError>) => (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>) => {
+export const changePassword = <ThrowOnError extends boolean = false>(options?: Options<ChangePasswordData, ThrowOnError>) => (options?.client ?? client).post<ChangePasswordResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<ChangePasswordResponses, unknown, ThrowOnError>({
     url: '/api/v1/auth/change-password',
     ...options,
     headers: {
@@ -88,23 +68,16 @@ export const changePassword = <ThrowOnError extends boolean = false>(options?: O
         ...options?.headers
     }
 });
-};
 
 /**
  * List all volumes
  */
-export const listVolumes = <ThrowOnError extends boolean = false>(options?: Options<ListVolumesData, ThrowOnError>) => {
+export const listVolumes = <ThrowOnError extends boolean = false>(options?: Options<ListVolumesData, ThrowOnError>) => (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>) => {
+export const createVolume = <ThrowOnError extends boolean = false>(options?: Options<CreateVolumeData, ThrowOnError>) => (options?.client ?? client).post<CreateVolumeResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<CreateVolumeResponses, unknown, ThrowOnError>({
     url: '/api/v1/volumes',
     ...options,
     headers: {
@@ -112,13 +85,11 @@ export const createVolume = <ThrowOnError extends boolean = false>(options?: Opt
         ...options?.headers
     }
 });
-};
 
 /**
  * Test connection to backend
  */
-export const testConnection = <ThrowOnError extends boolean = false>(options?: Options<TestConnectionData, ThrowOnError>) => {
+export const testConnection = <ThrowOnError extends boolean = false>(options?: Options<TestConnectionData, ThrowOnError>) => (options?.client ?? client).post<TestConnectionResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<TestConnectionResponses, unknown, ThrowOnError>({
     url: '/api/v1/volumes/test-connection',
     ...options,
     headers: {
@@ -126,33 +97,21 @@ export const testConnection = <ThrowOnError extends boolean = false>(options?: O
         ...options?.headers
     }
 });
-};
 
 /**
  * Delete a volume
  */
-export const deleteVolume = <ThrowOnError extends boolean = false>(options: Options<DeleteVolumeData, ThrowOnError>) => {
+export const deleteVolume = <ThrowOnError extends boolean = false>(options: Options<DeleteVolumeData, ThrowOnError>) => (options.client ?? client).delete<DeleteVolumeResponses, unknown, ThrowOnError>({ url: '/api/v1/volumes/{name}', ...options });
-    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>) => {
+export const getVolume = <ThrowOnError extends boolean = false>(options: Options<GetVolumeData, ThrowOnError>) => (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>) => {
+export const updateVolume = <ThrowOnError extends boolean = false>(options: Options<UpdateVolumeData, ThrowOnError>) => (options.client ?? client).put<UpdateVolumeResponses, UpdateVolumeErrors, ThrowOnError>({
-    return (options.client ?? client).put<UpdateVolumeResponses, UpdateVolumeErrors, ThrowOnError>({
     url: '/api/v1/volumes/{name}',
     ...options,
     headers: {
@@ -160,83 +119,46 @@ export const updateVolume = <ThrowOnError extends boolean = false>(options: Opti
         ...options.headers
     }
 });
-};
 
 /**
  * Get containers using a volume by name
  */
-export const getContainersUsingVolume = <ThrowOnError extends boolean = false>(options: Options<GetContainersUsingVolumeData, ThrowOnError>) => {
+export const getContainersUsingVolume = <ThrowOnError extends boolean = false>(options: Options<GetContainersUsingVolumeData, ThrowOnError>) => (options.client ?? client).get<GetContainersUsingVolumeResponses, GetContainersUsingVolumeErrors, ThrowOnError>({ url: '/api/v1/volumes/{name}/containers', ...options });
-    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>) => {
+export const mountVolume = <ThrowOnError extends boolean = false>(options: Options<MountVolumeData, ThrowOnError>) => (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>) => {
+export const unmountVolume = <ThrowOnError extends boolean = false>(options: Options<UnmountVolumeData, ThrowOnError>) => (options.client ?? client).post<UnmountVolumeResponses, unknown, ThrowOnError>({ url: '/api/v1/volumes/{name}/unmount', ...options });
-    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>) => {
+export const healthCheckVolume = <ThrowOnError extends boolean = false>(options: Options<HealthCheckVolumeData, ThrowOnError>) => (options.client ?? client).post<HealthCheckVolumeResponses, HealthCheckVolumeErrors, ThrowOnError>({ url: '/api/v1/volumes/{name}/health-check', ...options });
-    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>) => {
+export const listFiles = <ThrowOnError extends boolean = false>(options: Options<ListFilesData, ThrowOnError>) => (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>) => {
+export const browseFilesystem = <ThrowOnError extends boolean = false>(options?: Options<BrowseFilesystemData, ThrowOnError>) => (options?.client ?? client).get<BrowseFilesystemResponses, unknown, ThrowOnError>({ url: '/api/v1/volumes/filesystem/browse', ...options });
-    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>) => {
+export const listRepositories = <ThrowOnError extends boolean = false>(options?: Options<ListRepositoriesData, ThrowOnError>) => (options?.client ?? client).get<ListRepositoriesResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories', ...options });
-    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>) => {
+export const createRepository = <ThrowOnError extends boolean = false>(options?: Options<CreateRepositoryData, ThrowOnError>) => (options?.client ?? client).post<CreateRepositoryResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<CreateRepositoryResponses, unknown, ThrowOnError>({
     url: '/api/v1/repositories',
     ...options,
     headers: {
@@ -244,43 +166,26 @@ export const createRepository = <ThrowOnError extends boolean = false>(options?:
         ...options?.headers
     }
 });
-};
 
 /**
  * List all configured rclone remotes on the host system
  */
-export const listRcloneRemotes = <ThrowOnError extends boolean = false>(options?: Options<ListRcloneRemotesData, ThrowOnError>) => {
+export const listRcloneRemotes = <ThrowOnError extends boolean = false>(options?: Options<ListRcloneRemotesData, ThrowOnError>) => (options?.client ?? client).get<ListRcloneRemotesResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/rclone-remotes', ...options });
-    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>) => {
+export const deleteRepository = <ThrowOnError extends boolean = false>(options: Options<DeleteRepositoryData, ThrowOnError>) => (options.client ?? client).delete<DeleteRepositoryResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/{name}', ...options });
-    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>) => {
+export const getRepository = <ThrowOnError extends boolean = false>(options: Options<GetRepositoryData, ThrowOnError>) => (options.client ?? client).get<GetRepositoryResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/{name}', ...options });
-    return (options.client ?? client).get<GetRepositoryResponses, unknown, ThrowOnError>({
-        url: '/api/v1/repositories/{name}',
-        ...options
-    });
-};
 
 /**
  * Update a repository's name or settings
  */
-export const updateRepository = <ThrowOnError extends boolean = false>(options: Options<UpdateRepositoryData, ThrowOnError>) => {
+export const updateRepository = <ThrowOnError extends boolean = false>(options: Options<UpdateRepositoryData, ThrowOnError>) => (options.client ?? client).patch<UpdateRepositoryResponses, UpdateRepositoryErrors, ThrowOnError>({
-    return (options.client ?? client).patch<UpdateRepositoryResponses, UpdateRepositoryErrors, ThrowOnError>({
     url: '/api/v1/repositories/{name}',
     ...options,
     headers: {
@@ -288,53 +193,31 @@ export const updateRepository = <ThrowOnError extends boolean = false>(options:
         ...options.headers
     }
 });
-};
 
 /**
  * List all snapshots in a repository
  */
-export const listSnapshots = <ThrowOnError extends boolean = false>(options: Options<ListSnapshotsData, ThrowOnError>) => {
+export const listSnapshots = <ThrowOnError extends boolean = false>(options: Options<ListSnapshotsData, ThrowOnError>) => (options.client ?? client).get<ListSnapshotsResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/{name}/snapshots', ...options });
-    return (options.client ?? client).get<ListSnapshotsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/repositories/{name}/snapshots',
-        ...options
-    });
-};
 
 /**
  * Delete a specific snapshot from a repository
  */
-export const deleteSnapshot = <ThrowOnError extends boolean = false>(options: Options<DeleteSnapshotData, ThrowOnError>) => {
+export const deleteSnapshot = <ThrowOnError extends boolean = false>(options: Options<DeleteSnapshotData, ThrowOnError>) => (options.client ?? client).delete<DeleteSnapshotResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/{name}/snapshots/{snapshotId}', ...options });
-    return (options.client ?? client).delete<DeleteSnapshotResponses, unknown, ThrowOnError>({
-        url: '/api/v1/repositories/{name}/snapshots/{snapshotId}',
-        ...options
-    });
-};
 
 /**
  * Get details of a specific snapshot
  */
-export const getSnapshotDetails = <ThrowOnError extends boolean = false>(options: Options<GetSnapshotDetailsData, ThrowOnError>) => {
+export const getSnapshotDetails = <ThrowOnError extends boolean = false>(options: Options<GetSnapshotDetailsData, ThrowOnError>) => (options.client ?? client).get<GetSnapshotDetailsResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/{name}/snapshots/{snapshotId}', ...options });
-    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>) => {
+export const listSnapshotFiles = <ThrowOnError extends boolean = false>(options: Options<ListSnapshotFilesData, ThrowOnError>) => (options.client ?? client).get<ListSnapshotFilesResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/{name}/snapshots/{snapshotId}/files', ...options });
-    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>) => {
+export const restoreSnapshot = <ThrowOnError extends boolean = false>(options: Options<RestoreSnapshotData, ThrowOnError>) => (options.client ?? client).post<RestoreSnapshotResponses, unknown, ThrowOnError>({
-    return (options.client ?? client).post<RestoreSnapshotResponses, unknown, ThrowOnError>({
     url: '/api/v1/repositories/{name}/restore',
     ...options,
     headers: {
@@ -342,33 +225,21 @@ export const restoreSnapshot = <ThrowOnError extends boolean = false>(options: O
         ...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>) => {
+export const doctorRepository = <ThrowOnError extends boolean = false>(options: Options<DoctorRepositoryData, ThrowOnError>) => (options.client ?? client).post<DoctorRepositoryResponses, unknown, ThrowOnError>({ url: '/api/v1/repositories/{name}/doctor', ...options });
-    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>) => {
+export const listBackupSchedules = <ThrowOnError extends boolean = false>(options?: Options<ListBackupSchedulesData, ThrowOnError>) => (options?.client ?? client).get<ListBackupSchedulesResponses, unknown, ThrowOnError>({ url: '/api/v1/backups', ...options });
-    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>) => {
+export const createBackupSchedule = <ThrowOnError extends boolean = false>(options?: Options<CreateBackupScheduleData, ThrowOnError>) => (options?.client ?? client).post<CreateBackupScheduleResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<CreateBackupScheduleResponses, unknown, ThrowOnError>({
     url: '/api/v1/backups',
     ...options,
     headers: {
@@ -376,33 +247,21 @@ export const createBackupSchedule = <ThrowOnError extends boolean = false>(optio
         ...options?.headers
     }
 });
-};
 
 /**
  * Delete a backup schedule
  */
-export const deleteBackupSchedule = <ThrowOnError extends boolean = false>(options: Options<DeleteBackupScheduleData, ThrowOnError>) => {
+export const deleteBackupSchedule = <ThrowOnError extends boolean = false>(options: Options<DeleteBackupScheduleData, ThrowOnError>) => (options.client ?? client).delete<DeleteBackupScheduleResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/{scheduleId}', ...options });
-    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>) => {
+export const getBackupSchedule = <ThrowOnError extends boolean = false>(options: Options<GetBackupScheduleData, ThrowOnError>) => (options.client ?? client).get<GetBackupScheduleResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/{scheduleId}', ...options });
-    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>) => {
+export const updateBackupSchedule = <ThrowOnError extends boolean = false>(options: Options<UpdateBackupScheduleData, ThrowOnError>) => (options.client ?? client).patch<UpdateBackupScheduleResponses, unknown, ThrowOnError>({
-    return (options.client ?? client).patch<UpdateBackupScheduleResponses, unknown, ThrowOnError>({
     url: '/api/v1/backups/{scheduleId}',
     ...options,
     headers: {
@@ -410,63 +269,36 @@ export const updateBackupSchedule = <ThrowOnError extends boolean = false>(optio
         ...options.headers
     }
 });
-};
 
 /**
  * Get a backup schedule for a specific volume
  */
-export const getBackupScheduleForVolume = <ThrowOnError extends boolean = false>(options: Options<GetBackupScheduleForVolumeData, ThrowOnError>) => {
+export const getBackupScheduleForVolume = <ThrowOnError extends boolean = false>(options: Options<GetBackupScheduleForVolumeData, ThrowOnError>) => (options.client ?? client).get<GetBackupScheduleForVolumeResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/volume/{volumeId}', ...options });
-    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>) => {
+export const runBackupNow = <ThrowOnError extends boolean = false>(options: Options<RunBackupNowData, ThrowOnError>) => (options.client ?? client).post<RunBackupNowResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/{scheduleId}/run', ...options });
-    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>) => {
+export const stopBackup = <ThrowOnError extends boolean = false>(options: Options<StopBackupData, ThrowOnError>) => (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>) => {
+export const runForget = <ThrowOnError extends boolean = false>(options: Options<RunForgetData, ThrowOnError>) => (options.client ?? client).post<RunForgetResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/{scheduleId}/forget', ...options });
-    return (options.client ?? client).post<RunForgetResponses, unknown, ThrowOnError>({
-        url: '/api/v1/backups/{scheduleId}/forget',
-        ...options
-    });
-};
 
 /**
  * Get notification assignments for a backup schedule
  */
-export const getScheduleNotifications = <ThrowOnError extends boolean = false>(options: Options<GetScheduleNotificationsData, ThrowOnError>) => {
+export const getScheduleNotifications = <ThrowOnError extends boolean = false>(options: Options<GetScheduleNotificationsData, ThrowOnError>) => (options.client ?? client).get<GetScheduleNotificationsResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/{scheduleId}/notifications', ...options });
-    return (options.client ?? client).get<GetScheduleNotificationsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/backups/{scheduleId}/notifications',
-        ...options
-    });
-};
 
 /**
  * Update notification assignments for a backup schedule
  */
-export const updateScheduleNotifications = <ThrowOnError extends boolean = false>(options: Options<UpdateScheduleNotificationsData, ThrowOnError>) => {
+export const updateScheduleNotifications = <ThrowOnError extends boolean = false>(options: Options<UpdateScheduleNotificationsData, ThrowOnError>) => (options.client ?? client).put<UpdateScheduleNotificationsResponses, unknown, ThrowOnError>({
-    return (options.client ?? client).put<UpdateScheduleNotificationsResponses, unknown, ThrowOnError>({
     url: '/api/v1/backups/{scheduleId}/notifications',
     ...options,
     headers: {
@@ -474,23 +306,16 @@ export const updateScheduleNotifications = <ThrowOnError extends boolean = false
         ...options.headers
     }
 });
-};
 
 /**
  * Get mirror repository assignments for a backup schedule
  */
-export const getScheduleMirrors = <ThrowOnError extends boolean = false>(options: Options<GetScheduleMirrorsData, ThrowOnError>) => {
+export const getScheduleMirrors = <ThrowOnError extends boolean = false>(options: Options<GetScheduleMirrorsData, ThrowOnError>) => (options.client ?? client).get<GetScheduleMirrorsResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/{scheduleId}/mirrors', ...options });
-    return (options.client ?? client).get<GetScheduleMirrorsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/backups/{scheduleId}/mirrors',
-        ...options
-    });
-};
 
 /**
  * Update mirror repository assignments for a backup schedule
  */
-export const updateScheduleMirrors = <ThrowOnError extends boolean = false>(options: Options<UpdateScheduleMirrorsData, ThrowOnError>) => {
+export const updateScheduleMirrors = <ThrowOnError extends boolean = false>(options: Options<UpdateScheduleMirrorsData, ThrowOnError>) => (options.client ?? client).put<UpdateScheduleMirrorsResponses, unknown, ThrowOnError>({
-    return (options.client ?? client).put<UpdateScheduleMirrorsResponses, unknown, ThrowOnError>({
     url: '/api/v1/backups/{scheduleId}/mirrors',
     ...options,
     headers: {
@@ -498,33 +323,21 @@ export const updateScheduleMirrors = <ThrowOnError extends boolean = false>(opti
         ...options.headers
     }
 });
-};
 
 /**
  * Get mirror compatibility info for all repositories relative to a backup schedule's primary repository
  */
-export const getMirrorCompatibility = <ThrowOnError extends boolean = false>(options: Options<GetMirrorCompatibilityData, ThrowOnError>) => {
+export const getMirrorCompatibility = <ThrowOnError extends boolean = false>(options: Options<GetMirrorCompatibilityData, ThrowOnError>) => (options.client ?? client).get<GetMirrorCompatibilityResponses, unknown, ThrowOnError>({ url: '/api/v1/backups/{scheduleId}/mirrors/compatibility', ...options });
-    return (options.client ?? client).get<GetMirrorCompatibilityResponses, unknown, ThrowOnError>({
-        url: '/api/v1/backups/{scheduleId}/mirrors/compatibility',
-        ...options
-    });
-};
 
 /**
  * List all notification destinations
  */
-export const listNotificationDestinations = <ThrowOnError extends boolean = false>(options?: Options<ListNotificationDestinationsData, ThrowOnError>) => {
+export const listNotificationDestinations = <ThrowOnError extends boolean = false>(options?: Options<ListNotificationDestinationsData, ThrowOnError>) => (options?.client ?? client).get<ListNotificationDestinationsResponses, unknown, ThrowOnError>({ url: '/api/v1/notifications/destinations', ...options });
-    return (options?.client ?? client).get<ListNotificationDestinationsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/notifications/destinations',
-        ...options
-    });
-};
 
 /**
  * Create a new notification destination
  */
-export const createNotificationDestination = <ThrowOnError extends boolean = false>(options?: Options<CreateNotificationDestinationData, ThrowOnError>) => {
+export const createNotificationDestination = <ThrowOnError extends boolean = false>(options?: Options<CreateNotificationDestinationData, ThrowOnError>) => (options?.client ?? client).post<CreateNotificationDestinationResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<CreateNotificationDestinationResponses, unknown, ThrowOnError>({
     url: '/api/v1/notifications/destinations',
     ...options,
     headers: {
@@ -532,33 +345,21 @@ export const createNotificationDestination = <ThrowOnError extends boolean = fal
         ...options?.headers
     }
 });
-};
 
 /**
  * Delete a notification destination
  */
-export const deleteNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<DeleteNotificationDestinationData, ThrowOnError>) => {
+export const deleteNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<DeleteNotificationDestinationData, ThrowOnError>) => (options.client ?? client).delete<DeleteNotificationDestinationResponses, DeleteNotificationDestinationErrors, ThrowOnError>({ url: '/api/v1/notifications/destinations/{id}', ...options });
-    return (options.client ?? client).delete<DeleteNotificationDestinationResponses, DeleteNotificationDestinationErrors, ThrowOnError>({
-        url: '/api/v1/notifications/destinations/{id}',
-        ...options
-    });
-};
 
 /**
  * Get a notification destination by ID
  */
-export const getNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<GetNotificationDestinationData, ThrowOnError>) => {
+export const getNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<GetNotificationDestinationData, ThrowOnError>) => (options.client ?? client).get<GetNotificationDestinationResponses, GetNotificationDestinationErrors, ThrowOnError>({ url: '/api/v1/notifications/destinations/{id}', ...options });
-    return (options.client ?? client).get<GetNotificationDestinationResponses, GetNotificationDestinationErrors, ThrowOnError>({
-        url: '/api/v1/notifications/destinations/{id}',
-        ...options
-    });
-};
 
 /**
  * Update a notification destination
  */
-export const updateNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<UpdateNotificationDestinationData, ThrowOnError>) => {
+export const updateNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<UpdateNotificationDestinationData, ThrowOnError>) => (options.client ?? client).patch<UpdateNotificationDestinationResponses, UpdateNotificationDestinationErrors, ThrowOnError>({
-    return (options.client ?? client).patch<UpdateNotificationDestinationResponses, UpdateNotificationDestinationErrors, ThrowOnError>({
     url: '/api/v1/notifications/destinations/{id}',
     ...options,
     headers: {
@@ -566,33 +367,21 @@ export const updateNotificationDestination = <ThrowOnError extends boolean = fal
         ...options.headers
     }
 });
-};
 
 /**
  * Test a notification destination by sending a test message
  */
-export const testNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<TestNotificationDestinationData, ThrowOnError>) => {
+export const testNotificationDestination = <ThrowOnError extends boolean = false>(options: Options<TestNotificationDestinationData, ThrowOnError>) => (options.client ?? client).post<TestNotificationDestinationResponses, TestNotificationDestinationErrors, ThrowOnError>({ url: '/api/v1/notifications/destinations/{id}/test', ...options });
-    return (options.client ?? client).post<TestNotificationDestinationResponses, TestNotificationDestinationErrors, ThrowOnError>({
-        url: '/api/v1/notifications/destinations/{id}/test',
-        ...options
-    });
-};
 
 /**
  * Get system information including available capabilities
  */
-export const getSystemInfo = <ThrowOnError extends boolean = false>(options?: Options<GetSystemInfoData, ThrowOnError>) => {
+export const getSystemInfo = <ThrowOnError extends boolean = false>(options?: Options<GetSystemInfoData, ThrowOnError>) => (options?.client ?? client).get<GetSystemInfoResponses, unknown, ThrowOnError>({ url: '/api/v1/system/info', ...options });
-    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>) => {
+export const downloadResticPassword = <ThrowOnError extends boolean = false>(options?: Options<DownloadResticPasswordData, ThrowOnError>) => (options?.client ?? client).post<DownloadResticPasswordResponses, unknown, ThrowOnError>({
-    return (options?.client ?? client).post<DownloadResticPasswordResponses, unknown, ThrowOnError>({
     url: '/api/v1/system/restic-password',
     ...options,
     headers: {
@@ -600,4 +389,3 @@ export const downloadResticPassword = <ThrowOnError extends boolean = false>(opt
         ...options?.headers
     }
 });
-};

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

@@ -1291,12 +1291,14 @@ export type ListBackupSchedulesResponses = {
         createdAt: number;
         cronExpression: string;
         enabled: boolean;
+        excludeIfPresent: Array<string> | null;
         excludePatterns: Array<string> | null;
         id: number;
         includePatterns: Array<string> | null;
         lastBackupAt: number | null;
         lastBackupError: string | null;
         lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
+        name: string;
         nextBackupAt: number | null;
         repository: {
             compressionMode: 'auto' | 'max' | 'off' | null;
@@ -1435,8 +1437,10 @@ export type CreateBackupScheduleData = {
     body?: {
         cronExpression: string;
         enabled: boolean;
+        name: string;
         repositoryId: string;
         volumeId: number;
+        excludeIfPresent?: Array<string>;
         excludePatterns?: Array<string>;
         includePatterns?: Array<string>;
         retentionPolicy?: {
@@ -1463,12 +1467,14 @@ export type CreateBackupScheduleResponses = {
         createdAt: number;
         cronExpression: string;
         enabled: boolean;
+        excludeIfPresent: Array<string> | null;
         excludePatterns: Array<string> | null;
         id: number;
         includePatterns: Array<string> | null;
         lastBackupAt: number | null;
         lastBackupError: string | null;
         lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
+        name: string;
         nextBackupAt: number | null;
         repositoryId: string;
         retentionPolicy: {
@@ -1524,12 +1530,14 @@ export type GetBackupScheduleResponses = {
         createdAt: number;
         cronExpression: string;
         enabled: boolean;
+        excludeIfPresent: Array<string> | null;
         excludePatterns: Array<string> | null;
         id: number;
         includePatterns: Array<string> | null;
         lastBackupAt: number | null;
         lastBackupError: string | null;
         lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
+        name: string;
         nextBackupAt: number | null;
         repository: {
             compressionMode: 'auto' | 'max' | 'off' | null;
@@ -1669,8 +1677,10 @@ export type UpdateBackupScheduleData = {
         cronExpression: string;
         repositoryId: string;
         enabled?: boolean;
+        excludeIfPresent?: Array<string>;
         excludePatterns?: Array<string>;
         includePatterns?: Array<string>;
+        name?: string;
         retentionPolicy?: {
             keepDaily?: number;
             keepHourly?: number;
@@ -1697,12 +1707,14 @@ export type UpdateBackupScheduleResponses = {
         createdAt: number;
         cronExpression: string;
         enabled: boolean;
+        excludeIfPresent: Array<string> | null;
         excludePatterns: Array<string> | null;
         id: number;
         includePatterns: Array<string> | null;
         lastBackupAt: number | null;
         lastBackupError: string | null;
         lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
+        name: string;
         nextBackupAt: number | null;
         repositoryId: string;
         retentionPolicy: {
@@ -1738,12 +1750,14 @@ export type GetBackupScheduleForVolumeResponses = {
         createdAt: number;
         cronExpression: string;
         enabled: boolean;
+        excludeIfPresent: Array<string> | null;
         excludePatterns: Array<string> | null;
         id: number;
         includePatterns: Array<string> | null;
         lastBackupAt: number | null;
         lastBackupError: string | null;
         lastBackupStatus: 'error' | 'in_progress' | 'success' | 'warning' | null;
+        name: string;
         nextBackupAt: number | null;
         repository: {
             compressionMode: 'auto' | 'max' | 'off' | null;

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

@@ -23,8 +23,11 @@ import type { BackupSchedule, Volume } from "~/client/lib/types";
 import { deepClean } from "~/utils/object";
 
 const internalFormSchema = type({
+	name: "1 <= string <= 32",
 	repositoryId: "string",
 	excludePatternsText: "string?",
+	excludeIfPresentText: "string?",
+	includePatternsText: "string?",
 	includePatterns: "string[]?",
 	frequency: "string",
 	dailyTime: "string?",
@@ -50,8 +53,12 @@ export const weeklyDays = [
 
 type InternalFormValues = typeof internalFormSchema.infer;
 
-export type BackupScheduleFormValues = Omit<InternalFormValues, "excludePatternsText"> & {
+export type BackupScheduleFormValues = Omit<
+	InternalFormValues,
+	"excludePatternsText" | "excludeIfPresentText" | "includePatternsText"
+> & {
 	excludePatterns?: string[];
+	excludeIfPresent?: string[];
 };
 
 type Props = {
@@ -79,13 +86,21 @@ const backupScheduleToFormValues = (schedule?: BackupSchedule): InternalFormValu
 
 	const weeklyDay = frequency === "weekly" ? dayOfWeekPart : undefined;
 
+	const patterns = schedule.includePatterns || [];
+	const isGlobPattern = (p: string) => /[*?[\]]/.test(p);
+	const fileBrowserPaths = patterns.filter((p) => !isGlobPattern(p));
+	const textPatterns = patterns.filter(isGlobPattern);
+
 	return {
+		name: schedule.name,
 		repositoryId: schedule.repositoryId,
 		frequency,
 		dailyTime,
 		weeklyDay,
-		includePatterns: schedule.includePatterns || undefined,
+		includePatterns: fileBrowserPaths.length > 0 ? fileBrowserPaths : undefined,
+		includePatternsText: textPatterns.length > 0 ? textPatterns.join("\n") : undefined,
 		excludePatternsText: schedule.excludePatterns?.join("\n") || undefined,
+		excludeIfPresentText: schedule.excludeIfPresent?.join("\n") || undefined,
 		...schedule.retentionPolicy,
 	};
 };
@@ -98,18 +113,40 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 
 	const handleSubmit = useCallback(
 		(data: InternalFormValues) => {
-			// Convert excludePatternsText string to excludePatterns array
+			const {
-			const { excludePatternsText, ...rest } = data;
+				excludePatternsText,
+				excludeIfPresentText,
+				includePatternsText,
+				includePatterns: fileBrowserPatterns,
+				...rest
+			} = data;
 			const excludePatterns = excludePatternsText
 				? excludePatternsText
 						.split("\n")
 						.map((p) => p.trim())
 						.filter(Boolean)
-				: undefined;
+				: [];
+
+			const excludeIfPresent = excludeIfPresentText
+				? excludeIfPresentText
+						.split("\n")
+						.map((p) => p.trim())
+						.filter(Boolean)
+				: [];
+
+			const textPatterns = includePatternsText
+				? includePatternsText
+						.split("\n")
+						.map((p) => p.trim())
+						.filter(Boolean)
+				: [];
+			const includePatterns = [...(fileBrowserPatterns || []), ...textPatterns];
 
 			onSubmit({
 				...rest,
+				includePatterns: includePatterns.length > 0 ? includePatterns : [],
 				excludePatterns,
+				excludeIfPresent,
 			});
 		},
 		[onSubmit],
@@ -148,6 +185,21 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 							</CardDescription>
 						</CardHeader>
 						<CardContent className="grid gap-6 md:grid-cols-2">
+							<FormField
+								control={form.control}
+								name="name"
+								render={({ field }) => (
+									<FormItem className="md:col-span-2">
+										<FormLabel>Backup name</FormLabel>
+										<FormControl>
+											<Input placeholder="My backup" {...field} />
+										</FormControl>
+										<FormDescription>A unique name to identify this backup schedule.</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+
 							<FormField
 								control={form.control}
 								name="repositoryId"
@@ -260,6 +312,7 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 						</CardHeader>
 						<CardContent>
 							<VolumeFileBrowser
+								key={volume.id}
 								volumeName={volume.name}
 								selectedPaths={selectedPaths}
 								onSelectionChange={handleSelectionChange}
@@ -279,6 +332,27 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 									</div>
 								</div>
 							)}
+							<FormField
+								control={form.control}
+								name="includePatternsText"
+								render={({ field }) => (
+									<FormItem className="mt-6">
+										<FormLabel>Additional include patterns</FormLabel>
+										<FormControl>
+											<Textarea
+												{...field}
+												placeholder="/data/**&#10;/config/*.json&#10;*.db"
+												className="font-mono text-sm min-h-[100px]"
+											/>
+										</FormControl>
+										<FormDescription>
+											Optionally add custom include patterns using glob syntax. Enter one pattern per line. These will
+											be combined with the paths selected above.
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
 						</CardContent>
 					</Card>
 
@@ -320,6 +394,28 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 									</FormItem>
 								)}
 							/>
+							<FormField
+								control={form.control}
+								name="excludeIfPresentText"
+								render={({ field }) => (
+									<FormItem className="mt-6">
+										<FormLabel>Exclude if file present</FormLabel>
+										<FormControl>
+											<Textarea
+												{...field}
+												placeholder=".nobackup&#10;.exclude-from-backup&#10;CACHEDIR.TAG"
+												className="font-mono text-sm min-h-20"
+											/>
+										</FormControl>
+										<FormDescription>
+											Exclude folders containing a file with the specified name. Enter one filename per line. For
+											example, use <code className="bg-muted px-1 rounded">.nobackup</code> to skip any folder
+											containing a <code className="bg-muted px-1 rounded">.nobackup</code> file.
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
 						</CardContent>
 					</Card>
 
@@ -482,18 +578,27 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 									{repositoriesData?.find((r) => r.id === formValues.repositoryId)?.name || "—"}
 								</p>
 							</div>
-							{formValues.includePatterns && formValues.includePatterns.length > 0 && (
+							{(formValues.includePatterns && formValues.includePatterns.length > 0) ||
+							formValues.includePatternsText ? (
 								<div>
-									<p className="text-xs uppercase text-muted-foreground">Include paths</p>
+									<p className="text-xs uppercase text-muted-foreground">Include paths/patterns</p>
 									<div className="flex flex-col gap-1">
-										{formValues.includePatterns.map((path) => (
+										{formValues.includePatterns?.map((path) => (
 											<span key={path} className="text-xs font-mono bg-accent px-1.5 py-0.5 rounded">
 												{path}
 											</span>
 										))}
+										{formValues.includePatternsText
+											?.split("\n")
+											.filter(Boolean)
+											.map((pattern) => (
+												<span key={pattern} className="text-xs font-mono bg-accent px-1.5 py-0.5 rounded">
+													{pattern.trim()}
+												</span>
+											))}
 									</div>
 								</div>
-							)}
+							) : null}
 							{formValues.excludePatternsText && (
 								<div>
 									<p className="text-xs uppercase text-muted-foreground">Exclude patterns</p>
@@ -509,6 +614,21 @@ export const CreateScheduleForm = ({ initialValues, formId, onSubmit, volume }:
 									</div>
 								</div>
 							)}
+							{formValues.excludeIfPresentText && (
+								<div>
+									<p className="text-xs uppercase text-muted-foreground">Exclude if present</p>
+									<div className="flex flex-col gap-1">
+										{formValues.excludeIfPresentText
+											.split("\n")
+											.filter(Boolean)
+											.map((filename) => (
+												<span key={filename} className="text-xs font-mono bg-accent px-1.5 py-0.5 rounded">
+													{filename.trim()}
+												</span>
+											))}
+									</div>
+								</div>
+							)}
 							<div>
 								<p className="text-xs uppercase text-muted-foreground">Retention</p>
 								<p className="font-medium">

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

@@ -1,4 +1,4 @@
-import { Eraser, Pencil, Play, Square, Trash2 } from "lucide-react";
+import { Database, Eraser, HardDrive, 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";
@@ -18,6 +18,7 @@ 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";
+import { Link } from "react-router";
 
 type Props = {
 	schedule: BackupSchedule;
@@ -82,10 +83,17 @@ export const ScheduleSummary = (props: Props) => {
 				<CardHeader className="space-y-4">
 					<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4">
 						<div>
-							<CardTitle>Backup schedule</CardTitle>
+							<CardTitle>{schedule.name}</CardTitle>
-							<CardDescription>
+							<CardDescription className="mt-1">
-								Automated backup configuration for volume&nbsp;
+								<Link to={`/volumes/${schedule.volume.name}`} className="hover:underline">
-								<strong className="text-strong-accent">{schedule.volume.name}</strong>
+									<HardDrive className="inline h-4 w-4 mr-2" />
+									<span>{schedule.volume.name}</span>
+								</Link>
+								<span className="mx-2">→</span>
+								<Link to={`/repositories/${schedule.repository.name}`} className="hover:underline">
+									<Database className="inline h-4 w-4 mr-2 text-strong-accent" />
+									<span className="text-strong-accent">{schedule.repository.name}</span>
+								</Link>
 							</CardDescription>
 						</div>
 						<div className="flex items-center gap-2 justify-between sm:justify-start">

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

@@ -35,10 +35,10 @@ import { ScheduleMirrorsConfig } from "../components/schedule-mirrors-config";
 import { cn } from "~/client/lib/utils";
 
 export const handle = {
-	breadcrumb: (match: Route.MetaArgs) => [
+	breadcrumb: (match: Route.MetaArgs) => {
-		{ label: "Backups", href: "/backups" },
+		const data = match.loaderData;
-		{ label: `Schedule #${match.params.id}` },
+		return [{ label: "Backups", href: "/backups" }, { label: data.schedule.name }];
-	],
+	},
 };
 
 export function meta(_: Route.MetaArgs) {
@@ -153,12 +153,14 @@ export default function ScheduleDetailsPage({ params, loaderData }: Route.Compon
 		updateSchedule.mutate({
 			path: { scheduleId: schedule.id.toString() },
 			body: {
+				name: formValues.name,
 				repositoryId: formValues.repositoryId,
 				enabled: schedule.enabled,
 				cronExpression,
 				retentionPolicy: Object.keys(retentionPolicy).length > 0 ? retentionPolicy : undefined,
 				includePatterns: formValues.includePatterns,
 				excludePatterns: formValues.excludePatterns,
+				excludeIfPresent: formValues.excludeIfPresent,
 			},
 		});
 	};
@@ -171,8 +173,9 @@ export default function ScheduleDetailsPage({ params, loaderData }: Route.Compon
 				enabled,
 				cronExpression: schedule.cronExpression,
 				retentionPolicy: schedule.retentionPolicy || undefined,
-				includePatterns: schedule.includePatterns || undefined,
+				includePatterns: schedule.includePatterns || [],
-				excludePatterns: schedule.excludePatterns || undefined,
+				excludePatterns: schedule.excludePatterns || [],
+				excludeIfPresent: schedule.excludeIfPresent || [],
 			},
 		});
 	};

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

@@ -67,13 +67,11 @@ export default function Backups({ loaderData }: Route.ComponentProps) {
 				{schedules.map((schedule) => (
 					<Link key={schedule.id} to={`/backups/${schedule.id}`}>
 						<Card key={schedule.id} className="flex flex-col h-full">
-							<CardHeader className="pb-3">
+							<CardHeader className="pb-3 overflow-hidden">
-								<div className="flex items-start justify-between gap-2">
+								<div className="flex items-center justify-between gap-2 w-full">
-									<div className="flex items-center gap-2 flex-1 min-w-0">
+									<div className="flex items-center gap-2 flex-1 min-w-0 w-0">
-										<HardDrive className="h-5 w-5 text-muted-foreground shrink-0" />
+										<CalendarClock className="h-5 w-5 text-muted-foreground shrink-0" />
-										<CardTitle className="text-lg truncate">
+										<CardTitle className="text-lg truncate">{schedule.name}</CardTitle>
-											Volume <span className="text-strong-accent">{schedule.volume.name}</span>
-										</CardTitle>
 									</div>
 									<BackupStatusDot
 										enabled={schedule.enabled}
@@ -81,9 +79,12 @@ export default function Backups({ loaderData }: Route.ComponentProps) {
 										isInProgress={schedule.lastBackupStatus === "in_progress"}
 									/>
 								</div>
-								<CardDescription className="flex items-center gap-2 mt-2">
+								<CardDescription className="ml-0.5 flex items-center gap-2 text-xs">
-									<Database className="h-4 w-4" />
+									<HardDrive className="h-3.5 w-3.5" />
-									<span className="truncate">{schedule.repository.name}</span>
+									<span className="truncate">{schedule.volume.name}</span>
+									<span className="text-muted-foreground">→</span>
+									<Database className="h-3.5 w-3.5 text-strong-accent" />
+									<span className="truncate text-strong-accent">{schedule.repository.name}</span>
 								</CardDescription>
 							</CardHeader>
 							<CardContent className="flex-1 space-y-4">

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

@@ -83,6 +83,7 @@ export default function CreateBackup({ loaderData }: Route.ComponentProps) {
 
 		createSchedule.mutate({
 			body: {
+				name: formValues.name,
 				volumeId: selectedVolumeId,
 				repositoryId: formValues.repositoryId,
 				enabled: true,
@@ -90,6 +91,7 @@ export default function CreateBackup({ loaderData }: Route.ComponentProps) {
 				retentionPolicy: Object.keys(retentionPolicy).length > 0 ? retentionPolicy : undefined,
 				includePatterns: formValues.includePatterns,
 				excludePatterns: formValues.excludePatterns,
+				excludeIfPresent: formValues.excludeIfPresent,
 			},
 		});
 	};

app/drizzle/0018_breezy_invaders.sql

@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS `backup_schedule_mirrors_table`;--> statement-breakpoint
 CREATE TABLE `backup_schedule_mirrors_table` (
 	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
 	`schedule_id` integer NOT NULL,
@@ -12,6 +11,7 @@ CREATE TABLE `backup_schedule_mirrors_table` (
 	FOREIGN KEY (`repository_id`) REFERENCES `repositories_table`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
+CREATE UNIQUE INDEX `backup_schedule_mirrors_table_schedule_id_repository_id_unique` ON `backup_schedule_mirrors_table` (`schedule_id`,`repository_id`);--> statement-breakpoint
 PRAGMA foreign_keys=OFF;--> statement-breakpoint
 CREATE TABLE `__new_app_metadata` (
 	`key` text PRIMARY KEY NOT NULL,
@@ -23,6 +23,7 @@ CREATE TABLE `__new_app_metadata` (
 INSERT INTO `__new_app_metadata`("key", "value", "created_at", "updated_at") SELECT "key", "value", "created_at", "updated_at" FROM `app_metadata`;--> statement-breakpoint
 DROP TABLE `app_metadata`;--> statement-breakpoint
 ALTER TABLE `__new_app_metadata` RENAME TO `app_metadata`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
 CREATE TABLE `__new_backup_schedule_notifications_table` (
 	`schedule_id` integer NOT NULL,
 	`destination_id` integer NOT NULL,
@@ -136,4 +137,3 @@ DROP TABLE `volumes_table`;--> statement-breakpoint
 ALTER TABLE `__new_volumes_table` RENAME TO `volumes_table`;--> statement-breakpoint
 CREATE UNIQUE INDEX `volumes_table_short_id_unique` ON `volumes_table` (`short_id`);--> statement-breakpoint
 CREATE UNIQUE INDEX `volumes_table_name_unique` ON `volumes_table` (`name`);
-PRAGMA foreign_keys=ON;--> statement-breakpoint

app/drizzle/0019_heavy_shen.sql

@@ -1 +0,0 @@
-CREATE UNIQUE INDEX `backup_schedule_mirrors_table_schedule_id_repository_id_unique` ON `backup_schedule_mirrors_table` (`schedule_id`,`repository_id`);

app/drizzle/0019_secret_nomad.sql

@@ -0,0 +1,24 @@
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_backup_schedules_table` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`name` text NOT NULL,
+	`volume_id` integer NOT NULL REFERENCES `volumes_table`(`id`) ON DELETE CASCADE,
+	`repository_id` text NOT NULL REFERENCES `repositories_table`(`id`) ON DELETE CASCADE,
+	`enabled` integer DEFAULT true NOT NULL,
+	`cron_expression` text NOT NULL,
+	`retention_policy` text,
+	`exclude_patterns` text DEFAULT '[]',
+	`include_patterns` text DEFAULT '[]',
+	`last_backup_at` integer,
+	`last_backup_status` text,
+	`last_backup_error` text,
+	`next_backup_at` integer,
+	`created_at` integer DEFAULT (unixepoch() * 1000) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch() * 1000) NOT NULL
+);--> statement-breakpoint
+INSERT INTO `__new_backup_schedules_table`(`id`, `name`, `volume_id`, `repository_id`, `enabled`, `cron_expression`, `retention_policy`, `exclude_patterns`, `include_patterns`, `last_backup_at`, `last_backup_status`, `last_backup_error`, `next_backup_at`, `created_at`, `updated_at`)
+SELECT `id`, lower(hex(randomblob(3))), `volume_id`, `repository_id`, `enabled`, `cron_expression`, `retention_policy`, `exclude_patterns`, `include_patterns`, `last_backup_at`, `last_backup_status`, `last_backup_error`, `next_backup_at`, `created_at`, `updated_at` FROM `backup_schedules_table`;--> statement-breakpoint
+DROP TABLE `backup_schedules_table`;--> statement-breakpoint
+ALTER TABLE `__new_backup_schedules_table` RENAME TO `backup_schedules_table`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE UNIQUE INDEX `backup_schedules_table_name_unique` ON `backup_schedules_table` (`name`);

app/drizzle/0020_even_dexter_bennett.sql

@@ -0,0 +1 @@
+ALTER TABLE `backup_schedules_table` ADD `exclude_if_present` text DEFAULT '[]';

app/drizzle/meta/0018_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "6",
   "dialect": "sqlite",
-	"id": "121ef03c-eb5a-4b97-b2f1-4add6adfb080",
+  "id": "d5a60aea-4490-423e-8725-6ace87a76c9b",
   "prevId": "d0bfd316-b8f5-459b-ab17-0ce679479321",
   "tables": {
     "app_metadata": {
@@ -106,14 +106,27 @@
           "default": "(unixepoch() * 1000)"
         }
       },
-			"indexes": {},
+      "indexes": {
+        "backup_schedule_mirrors_table_schedule_id_repository_id_unique": {
+          "name": "backup_schedule_mirrors_table_schedule_id_repository_id_unique",
+          "columns": [
+            "schedule_id",
+            "repository_id"
+          ],
+          "isUnique": true
+        }
+      },
       "foreignKeys": {
         "backup_schedule_mirrors_table_schedule_id_backup_schedules_table_id_fk": {
           "name": "backup_schedule_mirrors_table_schedule_id_backup_schedules_table_id_fk",
           "tableFrom": "backup_schedule_mirrors_table",
           "tableTo": "backup_schedules_table",
-					"columnsFrom": ["schedule_id"],
+          "columnsFrom": [
-					"columnsTo": ["id"],
+            "schedule_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -121,8 +134,12 @@
           "name": "backup_schedule_mirrors_table_repository_id_repositories_table_id_fk",
           "tableFrom": "backup_schedule_mirrors_table",
           "tableTo": "repositories_table",
-					"columnsFrom": ["repository_id"],
+          "columnsFrom": [
-					"columnsTo": ["id"],
+            "repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -187,8 +204,12 @@
           "name": "backup_schedule_notifications_table_schedule_id_backup_schedules_table_id_fk",
           "tableFrom": "backup_schedule_notifications_table",
           "tableTo": "backup_schedules_table",
-					"columnsFrom": ["schedule_id"],
+          "columnsFrom": [
-					"columnsTo": ["id"],
+            "schedule_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -196,15 +217,22 @@
           "name": "backup_schedule_notifications_table_destination_id_notification_destinations_table_id_fk",
           "tableFrom": "backup_schedule_notifications_table",
           "tableTo": "notification_destinations_table",
-					"columnsFrom": ["destination_id"],
+          "columnsFrom": [
-					"columnsTo": ["id"],
+            "destination_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
       },
       "compositePrimaryKeys": {
         "backup_schedule_notifications_table_schedule_id_destination_id_pk": {
-					"columns": ["schedule_id", "destination_id"],
+          "columns": [
+            "schedule_id",
+            "destination_id"
+          ],
           "name": "backup_schedule_notifications_table_schedule_id_destination_id_pk"
         }
       },
@@ -324,8 +352,12 @@
           "name": "backup_schedules_table_volume_id_volumes_table_id_fk",
           "tableFrom": "backup_schedules_table",
           "tableTo": "volumes_table",
-					"columnsFrom": ["volume_id"],
+          "columnsFrom": [
-					"columnsTo": ["id"],
+            "volume_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -333,8 +365,12 @@
           "name": "backup_schedules_table_repository_id_repositories_table_id_fk",
           "tableFrom": "backup_schedules_table",
           "tableTo": "repositories_table",
-					"columnsFrom": ["repository_id"],
+          "columnsFrom": [
-					"columnsTo": ["id"],
+            "repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -402,7 +438,9 @@
       "indexes": {
         "notification_destinations_table_name_unique": {
           "name": "notification_destinations_table_name_unique",
-					"columns": ["name"],
+          "columns": [
+            "name"
+          ],
           "isUnique": true
         }
       },
@@ -499,12 +537,16 @@
       "indexes": {
         "repositories_table_short_id_unique": {
           "name": "repositories_table_short_id_unique",
-					"columns": ["short_id"],
+          "columns": [
+            "short_id"
+          ],
           "isUnique": true
         },
         "repositories_table_name_unique": {
           "name": "repositories_table_name_unique",
-					"columns": ["name"],
+          "columns": [
+            "name"
+          ],
           "isUnique": true
         }
       },
@@ -552,8 +594,12 @@
           "name": "sessions_table_user_id_users_table_id_fk",
           "tableFrom": "sessions_table",
           "tableTo": "users_table",
-					"columnsFrom": ["user_id"],
+          "columnsFrom": [
-					"columnsTo": ["id"],
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -614,7 +660,9 @@
       "indexes": {
         "users_table_username_unique": {
           "name": "users_table_username_unique",
-					"columns": ["username"],
+          "columns": [
+            "username"
+          ],
           "isUnique": true
         }
       },
@@ -712,12 +760,16 @@
       "indexes": {
         "volumes_table_short_id_unique": {
           "name": "volumes_table_short_id_unique",
-					"columns": ["short_id"],
+          "columns": [
+            "short_id"
+          ],
           "isUnique": true
         },
         "volumes_table_name_unique": {
           "name": "volumes_table_name_unique",
-					"columns": ["name"],
+          "columns": [
+            "name"
+          ],
           "isUnique": true
         }
       },

app/drizzle/meta/0019_snapshot.json

@@ -1,8 +1,8 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "dedfb246-68e7-4590-af52-6476eb2999d1",
+  "id": "b5b3acff-51d7-45ae-b9d2-4b07a6286fc3",
-  "prevId": "121ef03c-eb5a-4b97-b2f1-4add6adfb080",
+  "prevId": "d5a60aea-4490-423e-8725-6ace87a76c9b",
   "tables": {
     "app_metadata": {
       "name": "app_metadata",
@@ -249,6 +249,13 @@
           "notNull": true,
           "autoincrement": true
         },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "volume_id": {
           "name": "volume_id",
           "type": "integer",
@@ -346,7 +353,15 @@
           "default": "(unixepoch() * 1000)"
         }
       },
-      "indexes": {},
+      "indexes": {
+        "backup_schedules_table_name_unique": {
+          "name": "backup_schedules_table_name_unique",
+          "columns": [
+            "name"
+          ],
+          "isUnique": true
+        }
+      },
       "foreignKeys": {
         "backup_schedules_table_volume_id_volumes_table_id_fk": {
           "name": "backup_schedules_table_volume_id_volumes_table_id_fk",

app/drizzle/meta/0020_snapshot.json

@@ -0,0 +1,815 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "729d3ce9-b4b9-41f6-a270-d74c96510238",
+  "prevId": "b5b3acff-51d7-45ae-b9d2-4b07a6286fc3",
+  "tables": {
+    "app_metadata": {
+      "name": "app_metadata",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "backup_schedule_mirrors_table": {
+      "name": "backup_schedule_mirrors_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "schedule_id": {
+          "name": "schedule_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_copy_at": {
+          "name": "last_copy_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_copy_status": {
+          "name": "last_copy_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_copy_error": {
+          "name": "last_copy_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {
+        "backup_schedule_mirrors_table_schedule_id_repository_id_unique": {
+          "name": "backup_schedule_mirrors_table_schedule_id_repository_id_unique",
+          "columns": [
+            "schedule_id",
+            "repository_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "backup_schedule_mirrors_table_schedule_id_backup_schedules_table_id_fk": {
+          "name": "backup_schedule_mirrors_table_schedule_id_backup_schedules_table_id_fk",
+          "tableFrom": "backup_schedule_mirrors_table",
+          "tableTo": "backup_schedules_table",
+          "columnsFrom": [
+            "schedule_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "backup_schedule_mirrors_table_repository_id_repositories_table_id_fk": {
+          "name": "backup_schedule_mirrors_table_repository_id_repositories_table_id_fk",
+          "tableFrom": "backup_schedule_mirrors_table",
+          "tableTo": "repositories_table",
+          "columnsFrom": [
+            "repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "backup_schedule_notifications_table": {
+      "name": "backup_schedule_notifications_table",
+      "columns": {
+        "schedule_id": {
+          "name": "schedule_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "destination_id": {
+          "name": "destination_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "notify_on_start": {
+          "name": "notify_on_start",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notify_on_success": {
+          "name": "notify_on_success",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notify_on_failure": {
+          "name": "notify_on_failure",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "backup_schedule_notifications_table_schedule_id_backup_schedules_table_id_fk": {
+          "name": "backup_schedule_notifications_table_schedule_id_backup_schedules_table_id_fk",
+          "tableFrom": "backup_schedule_notifications_table",
+          "tableTo": "backup_schedules_table",
+          "columnsFrom": [
+            "schedule_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "backup_schedule_notifications_table_destination_id_notification_destinations_table_id_fk": {
+          "name": "backup_schedule_notifications_table_destination_id_notification_destinations_table_id_fk",
+          "tableFrom": "backup_schedule_notifications_table",
+          "tableTo": "notification_destinations_table",
+          "columnsFrom": [
+            "destination_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "backup_schedule_notifications_table_schedule_id_destination_id_pk": {
+          "columns": [
+            "schedule_id",
+            "destination_id"
+          ],
+          "name": "backup_schedule_notifications_table_schedule_id_destination_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "backup_schedules_table": {
+      "name": "backup_schedules_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "volume_id": {
+          "name": "volume_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "cron_expression": {
+          "name": "cron_expression",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "retention_policy": {
+          "name": "retention_policy",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "exclude_patterns": {
+          "name": "exclude_patterns",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "exclude_if_present": {
+          "name": "exclude_if_present",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "include_patterns": {
+          "name": "include_patterns",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "last_backup_at": {
+          "name": "last_backup_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_backup_status": {
+          "name": "last_backup_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_backup_error": {
+          "name": "last_backup_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "next_backup_at": {
+          "name": "next_backup_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {
+        "backup_schedules_table_name_unique": {
+          "name": "backup_schedules_table_name_unique",
+          "columns": [
+            "name"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "backup_schedules_table_volume_id_volumes_table_id_fk": {
+          "name": "backup_schedules_table_volume_id_volumes_table_id_fk",
+          "tableFrom": "backup_schedules_table",
+          "tableTo": "volumes_table",
+          "columnsFrom": [
+            "volume_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "backup_schedules_table_repository_id_repositories_table_id_fk": {
+          "name": "backup_schedules_table_repository_id_repositories_table_id_fk",
+          "tableFrom": "backup_schedules_table",
+          "tableTo": "repositories_table",
+          "columnsFrom": [
+            "repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "notification_destinations_table": {
+      "name": "notification_destinations_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {
+        "notification_destinations_table_name_unique": {
+          "name": "notification_destinations_table_name_unique",
+          "columns": [
+            "name"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "repositories_table": {
+      "name": "repositories_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "short_id": {
+          "name": "short_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "compression_mode": {
+          "name": "compression_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'auto'"
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'unknown'"
+        },
+        "last_checked": {
+          "name": "last_checked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {
+        "repositories_table_short_id_unique": {
+          "name": "repositories_table_short_id_unique",
+          "columns": [
+            "short_id"
+          ],
+          "isUnique": true
+        },
+        "repositories_table_name_unique": {
+          "name": "repositories_table_name_unique",
+          "columns": [
+            "name"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "sessions_table": {
+      "name": "sessions_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "sessions_table_user_id_users_table_id_fk": {
+          "name": "sessions_table_user_id_users_table_id_fk",
+          "tableFrom": "sessions_table",
+          "tableTo": "users_table",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_table": {
+      "name": "users_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "has_downloaded_restic_password": {
+          "name": "has_downloaded_restic_password",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        }
+      },
+      "indexes": {
+        "users_table_username_unique": {
+          "name": "users_table_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "volumes_table": {
+      "name": "volumes_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "short_id": {
+          "name": "short_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'unmounted'"
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_health_check": {
+          "name": "last_health_check",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(unixepoch() * 1000)"
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auto_remount": {
+          "name": "auto_remount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        }
+      },
+      "indexes": {
+        "volumes_table_short_id_unique": {
+          "name": "volumes_table_short_id_unique",
+          "columns": [
+            "short_id"
+          ],
+          "isUnique": true
+        },
+        "volumes_table_name_unique": {
+          "name": "volumes_table_name_unique",
+          "columns": [
+            "name"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

app/drizzle/meta/_journal.json

@@ -131,15 +131,22 @@
     {
       "idx": 18,
       "version": "6",
-      "when": 1764619898949,
+      "when": 1764794371040,
-      "tag": "0018_bizarre_zzzax",
+      "tag": "0018_breezy_invaders",
       "breakpoints": true
     },
     {
       "idx": 19,
       "version": "6",
-      "when": 1764790151212,
+      "when": 1764839917446,
-      "tag": "0019_heavy_shen",
+      "tag": "0019_secret_nomad",
+      "breakpoints": true
+    },
+    {
+      "idx": 20,
+      "version": "6",
+      "when": 1764847918249,
+      "tag": "0020_even_dexter_bennett",
       "breakpoints": true
     }
   ]

app/server/core/capabilities.ts

@@ -33,6 +33,18 @@ async function detectCapabilities(): Promise<SystemCapabilities> {
 	};
 }
 
+export const parseDockerHost = (dockerHost?: string) => {
+	const match = dockerHost?.match(/^(ssh|http|https):\/\/([^:]+)(?::(\d+))?$/);
+	if (match) {
+		const protocol = match[1] as "ssh" | "http" | "https";
+		const host = match[2];
+		const port = match[3] ? parseInt(match[3], 10) : undefined;
+		return { protocol, host, port };
+	}
+
+	return {};
+};
+
 /**
  * Checks if Docker is available by:
  * 1. Checking if /var/run/docker.sock exists and is accessible
@@ -40,9 +52,7 @@ async function detectCapabilities(): Promise<SystemCapabilities> {
  */
 async function detectDocker(): Promise<boolean> {
 	try {
-		await fs.access("/var/run/docker.sock");
+		const docker = new Docker(parseDockerHost(process.env.DOCKER_HOST));
-
-		const docker = new Docker();
 		await docker.ping();
 
 		logger.info("Docker capability: enabled");

app/server/core/config.ts

@@ -2,12 +2,10 @@ import { type } from "arktype";
 import "dotenv/config";
 
 const envSchema = type({
-	NODE_ENV: type.enumerated("development", "production", "test").default("development"),
+	NODE_ENV: type.enumerated("development", "production", "test").default("production"),
-	SESSION_SECRET: "string?",
 }).pipe((s) => ({
 	__prod__: s.NODE_ENV === "production",
 	environment: s.NODE_ENV,
-	sessionSecret: s.SESSION_SECRET || "change-me-in-production-please",
 }));
 
 const parseConfig = (env: unknown) => {

app/server/db/db.ts

@@ -6,26 +6,17 @@ import { migrate } from "drizzle-orm/bun-sqlite/migrator";
 import { DATABASE_URL } from "../core/constants";
 import * as schema from "./schema";
 import fs from "node:fs/promises";
-import { logger } from "../utils/logger";
+import { config } from "../core/config";
 
 await fs.mkdir(path.dirname(DATABASE_URL), { recursive: true });
 
 const sqlite = new Database(DATABASE_URL);
-export const db = drizzle({
+export const db = drizzle({ client: sqlite, schema });
-	client: sqlite,
-	schema,
-	logger: {
-		logQuery(query, params) {
-			logger.debug(`[Drizzle] ${query} -- [${params.join(",")}]`);
-		},
-	},
-});
 
 export const runDbMigrations = () => {
 	let migrationsFolder = path.join("/app", "assets", "migrations");
 
-	const { NODE_ENV } = process.env;
+	if (!config.__prod__) {
-	if (NODE_ENV !== "production") {
 		migrationsFolder = path.join("/app", "app", "drizzle");
 	}
 

app/server/db/schema.ts

@@ -67,6 +67,7 @@ export type Repository = typeof repositoriesTable.$inferSelect;
  */
 export const backupSchedulesTable = sqliteTable("backup_schedules_table", {
 	id: int().primaryKey({ autoIncrement: true }),
+	name: text().notNull().unique(),
 	volumeId: int("volume_id")
 		.notNull()
 		.references(() => volumesTable.id, { onDelete: "cascade" }),
@@ -85,6 +86,7 @@ export const backupSchedulesTable = sqliteTable("backup_schedules_table", {
 		keepWithinDuration?: string;
 	}>(),
 	excludePatterns: text("exclude_patterns", { mode: "json" }).$type<string[]>().default([]),
+	excludeIfPresent: text("exclude_if_present", { mode: "json" }).$type<string[]>().default([]),
 	includePatterns: text("include_patterns", { mode: "json" }).$type<string[]>().default([]),
 	lastBackupAt: int("last_backup_at", { mode: "number" }),
 	lastBackupStatus: text("last_backup_status").$type<"success" | "error" | "in_progress" | "warning">(),

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

@@ -1,6 +1,7 @@
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import { OPERATION_TIMEOUT } from "../../../core/constants";
+import { cryptoUtils } from "../../../utils/crypto";
 import { toMessage } from "../../../utils/errors";
 import { logger } from "../../../utils/logger";
 import { getMountForPath } from "../../../utils/mountinfo";
@@ -33,10 +34,12 @@ const mount = async (config: BackendConfig, path: string) => {
 	const run = async () => {
 		await fs.mkdir(path, { recursive: true });
 
+		const password = await cryptoUtils.decrypt(config.password);
+
 		const source = `//${config.server}/${config.share}`;
 		const options = [
 			`user=${config.username}`,
-			`pass=${config.password}`,
+			`pass=${password}`,
 			`vers=${config.vers}`,
 			`port=${config.port}`,
 			"uid=1000",

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

@@ -3,6 +3,7 @@ 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 { cryptoUtils } from "../../../utils/crypto";
 import { toMessage } from "../../../utils/errors";
 import { logger } from "../../../utils/logger";
 import { getMountForPath } from "../../../utils/mountinfo";
@@ -49,8 +50,9 @@ const mount = async (config: BackendConfig, path: string) => {
 			: ["uid=1000", "gid=1000", "file_mode=0664", "dir_mode=0775"];
 
 		if (config.username && config.password) {
+			const password = await cryptoUtils.decrypt(config.password);
 			const secretsFile = "/etc/davfs2/secrets";
-			const secretsContent = `${source} ${config.username} ${config.password}\n`;
+			const secretsContent = `${source} ${config.username} ${password}\n`;
 			await fs.appendFile(secretsFile, secretsContent, { mode: 0o600 });
 		}
 

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

@@ -17,12 +17,14 @@ export type RetentionPolicy = typeof retentionPolicySchema.infer;
 
 const backupScheduleSchema = type({
 	id: "number",
+	name: "string",
 	volumeId: "number",
 	repositoryId: "string",
 	enabled: "boolean",
 	cronExpression: "string",
 	retentionPolicy: retentionPolicySchema.or("null"),
 	excludePatterns: "string[] | null",
+	excludeIfPresent: "string[] | null",
 	includePatterns: "string[] | null",
 	lastBackupAt: "number | null",
 	lastBackupStatus: "'success' | 'error' | 'in_progress' | 'warning' | null",
@@ -120,12 +122,14 @@ export const getBackupScheduleForVolumeDto = describeRoute({
  * Create a new backup schedule
  */
 export const createBackupScheduleBody = type({
+	name: "1 <= string <= 32",
 	volumeId: "number",
 	repositoryId: "string",
 	enabled: "boolean",
 	cronExpression: "string",
 	retentionPolicy: retentionPolicySchema.optional(),
 	excludePatterns: "string[]?",
+	excludeIfPresent: "string[]?",
 	includePatterns: "string[]?",
 	tags: "string[]?",
 });
@@ -156,11 +160,13 @@ export const createBackupScheduleDto = describeRoute({
  * Update a backup schedule
  */
 export const updateBackupScheduleBody = type({
+	name: "(1 <= string <= 32)?",
 	repositoryId: "string",
 	enabled: "boolean?",
 	cronExpression: "string",
 	retentionPolicy: retentionPolicySchema.optional(),
 	excludePatterns: "string[]?",
+	excludeIfPresent: "string[]?",
 	includePatterns: "string[]?",
 	tags: "string[]?",
 });

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

@@ -1,4 +1,4 @@
-import { eq } from "drizzle-orm";
+import { and, eq, ne } from "drizzle-orm";
 import cron from "node-cron";
 import { CronExpressionParser } from "cron-parser";
 import { NotFoundError, BadRequestError, ConflictError } from "http-errors-enhanced";
@@ -44,7 +44,7 @@ const listSchedules = async () => {
 
 const getSchedule = async (scheduleId: number) => {
 	const schedule = await db.query.backupSchedulesTable.findFirst({
-		where: eq(volumesTable.id, scheduleId),
+		where: eq(backupSchedulesTable.id, scheduleId),
 		with: {
 			volume: true,
 			repository: true,
@@ -63,6 +63,14 @@ const createSchedule = async (data: CreateBackupScheduleBody) => {
 		throw new BadRequestError("Invalid cron expression");
 	}
 
+	const existingName = await db.query.backupSchedulesTable.findFirst({
+		where: eq(backupSchedulesTable.name, data.name),
+	});
+
+	if (existingName) {
+		throw new ConflictError("A backup schedule with this name already exists");
+	}
+
 	const volume = await db.query.volumesTable.findFirst({
 		where: eq(volumesTable.id, data.volumeId),
 	});
@@ -84,12 +92,14 @@ const createSchedule = async (data: CreateBackupScheduleBody) => {
 	const [newSchedule] = await db
 		.insert(backupSchedulesTable)
 		.values({
+			name: data.name,
 			volumeId: data.volumeId,
 			repositoryId: data.repositoryId,
 			enabled: data.enabled,
 			cronExpression: data.cronExpression,
 			retentionPolicy: data.retentionPolicy ?? null,
 			excludePatterns: data.excludePatterns ?? [],
+			excludeIfPresent: data.excludeIfPresent ?? [],
 			includePatterns: data.includePatterns ?? [],
 			nextBackupAt: nextBackupAt,
 		})
@@ -115,6 +125,16 @@ const updateSchedule = async (scheduleId: number, data: UpdateBackupScheduleBody
 		throw new BadRequestError("Invalid cron expression");
 	}
 
+	if (data.name) {
+		const existingName = await db.query.backupSchedulesTable.findFirst({
+			where: and(eq(backupSchedulesTable.name, data.name), ne(backupSchedulesTable.id, scheduleId)),
+		});
+
+		if (existingName) {
+			throw new ConflictError("A backup schedule with this name already exists");
+		}
+	}
+
 	const repository = await db.query.repositoriesTable.findFirst({
 		where: eq(repositoriesTable.id, data.repositoryId),
 	});
@@ -227,6 +247,7 @@ const executeBackup = async (scheduleId: number, manual = false) => {
 
 		const backupOptions: {
 			exclude?: string[];
+			excludeIfPresent?: string[];
 			include?: string[];
 			tags?: string[];
 			signal?: AbortSignal;
@@ -239,6 +260,10 @@ const executeBackup = async (scheduleId: number, manual = false) => {
 			backupOptions.exclude = schedule.excludePatterns;
 		}
 
+		if (schedule.excludeIfPresent && schedule.excludeIfPresent.length > 0) {
+			backupOptions.excludeIfPresent = schedule.excludeIfPresent;
+		}
+
 		if (schedule.includePatterns && schedule.includePatterns.length > 0) {
 			backupOptions.include = schedule.includePatterns;
 		}

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

@@ -5,9 +5,10 @@ import Docker from "dockerode";
 import { and, eq, ne } from "drizzle-orm";
 import { ConflictError, InternalServerError, NotFoundError } from "http-errors-enhanced";
 import slugify from "slugify";
-import { getCapabilities } from "../../core/capabilities";
+import { getCapabilities, parseDockerHost } from "../../core/capabilities";
 import { db } from "../../db/db";
 import { volumesTable } from "../../db/schema";
+import { cryptoUtils } from "../../utils/crypto";
 import { toMessage } from "../../utils/errors";
 import { generateShortId } from "../../utils/id";
 import { getStatFs, type StatFs } from "../../utils/mountinfo";
@@ -19,6 +20,23 @@ import { logger } from "../../utils/logger";
 import { serverEvents } from "../../core/events";
 import type { BackendConfig } from "~/schemas/volumes";
 
+async function encryptSensitiveFields(config: BackendConfig): Promise<BackendConfig> {
+	switch (config.backend) {
+		case "smb":
+			return {
+				...config,
+				password: await cryptoUtils.encrypt(config.password),
+			};
+		case "webdav":
+			return {
+				...config,
+				password: config.password ? await cryptoUtils.encrypt(config.password) : undefined,
+			};
+		default:
+			return config;
+	}
+}
+
 const listVolumes = async () => {
 	const volumes = await db.query.volumesTable.findMany({});
 
@@ -37,13 +55,14 @@ const createVolume = async (name: string, backendConfig: BackendConfig) => {
 	}
 
 	const shortId = generateShortId();
+	const encryptedConfig = await encryptSensitiveFields(backendConfig);
 
 	const [created] = await db
 		.insert(volumesTable)
 		.values({
 			shortId,
 			name: slug,
-			config: backendConfig,
+			config: encryptedConfig,
 			type: backendConfig.backend,
 		})
 		.returning();
@@ -175,11 +194,13 @@ const updateVolume = async (name: string, volumeData: UpdateVolumeBody) => {
 		await backend.unmount();
 	}
 
+	const encryptedConfig = volumeData.config ? await encryptSensitiveFields(volumeData.config) : undefined;
+
 	const [updated] = await db
 		.update(volumesTable)
 		.set({
 			name: newName,
-			config: volumeData.config,
+			config: encryptedConfig,
 			type: volumeData.config?.backend,
 			autoRemount: volumeData.autoRemount,
 			updatedAt: Date.now(),
@@ -277,7 +298,8 @@ const getContainersUsingVolume = async (name: string) => {
 	}
 
 	try {
-		const docker = new Docker();
+		const docker = new Docker(parseDockerHost(process.env.DOCKER_HOST));
+
 		const containers = await docker.listContainers({ all: true });
 
 		const usingContainers = [];

app/server/utils/crypto.ts

@@ -6,18 +6,26 @@ const keyLength = 32;
 const encryptionPrefix = "encv1";
 
 /**
- * Given a string, encrypts it using a randomly generated salt
+ * Checks if a given string is encrypted by looking for the encryption prefix.
+ */
+const isEncrypted = (val?: string): boolean => {
+	return typeof val === "string" && val.startsWith(encryptionPrefix);
+};
+
+/**
+ * Given a string, encrypts it using a randomly generated salt.
+ * Returns the input unchanged if it's empty or already encrypted.
  */
 const encrypt = async (data: string) => {
 	if (!data) {
 		return data;
 	}
 
-	if (data.startsWith(encryptionPrefix)) {
+	if (isEncrypted(data)) {
 		return data;
 	}
 
-	const secret = (await Bun.file(RESTIC_PASS_FILE).text()).trim();
+	const secret = await Bun.file(RESTIC_PASS_FILE).text();
 
 	const salt = crypto.randomBytes(16);
 	const key = crypto.pbkdf2Sync(secret, salt, 100000, keyLength, "sha256");
@@ -31,10 +39,15 @@ const encrypt = async (data: string) => {
 };
 
 /**
- * Given an encrypted string, decrypts it using the salt stored in the string
+ * Given an encrypted string, decrypts it using the salt stored in the string.
+ * Returns the input unchanged if it's not encrypted (for backward compatibility).
  */
 const decrypt = async (encryptedData: string) => {
-	const secret = await Bun.file(RESTIC_PASS_FILE).text();
+	if (!isEncrypted(encryptedData)) {
+		return encryptedData;
+	}
+
+	const secret = (await Bun.file(RESTIC_PASS_FILE).text()).trim();
 
 	const parts = encryptedData.split(":").slice(1); // Remove prefix
 	const saltHex = parts.shift() as string;
@@ -58,4 +71,5 @@ const decrypt = async (encryptedData: string) => {
 export const cryptoUtils = {
 	encrypt,
 	decrypt,
+	isEncrypted,
 };

app/server/utils/logger.ts

@@ -1,15 +1,17 @@
 import { createLogger, format, transports } from "winston";
 import { sanitizeSensitiveData } from "./sanitize";
+import { config } from "../core/config";
 
 const { printf, combine, colorize } = format;
 
 const printConsole = printf((info) => `${info.level} > ${info.message}`);
 const consoleFormat = combine(colorize(), printConsole);
 
+const defaultLevel = config.__prod__ ? "info" : "debug";
 const winstonLogger = createLogger({
-	level: "debug",
+	level: process.env.LOG_LEVEL || defaultLevel,
 	format: format.json(),
-	transports: [new transports.Console({ level: "debug", format: consoleFormat })],
+	transports: [new transports.Console({ level: process.env.LOG_LEVEL || defaultLevel, format: consoleFormat })],
 });
 
 const log = (level: "info" | "warn" | "error" | "debug", messages: unknown[]) => {

app/server/utils/restic.ts

@@ -1,6 +1,7 @@
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
+import os from "node:os";
 import { throttle } from "es-toolkit";
 import { type } from "arktype";
 import { $ } from "bun";
@@ -234,6 +235,7 @@ const backup = async (
 	source: string,
 	options?: {
 		exclude?: string[];
+		excludeIfPresent?: string[];
 		include?: string[];
 		tags?: string[];
 		compressionMode?: CompressionMode;
@@ -261,8 +263,9 @@ const backup = async (
 
 	let includeFile: string | null = null;
 	if (options?.include && options.include.length > 0) {
-		const tmp = await fs.mkdtemp("restic-include");
+		const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "zerobyte-restic-include-"));
 		includeFile = path.join(tmp, `include.txt`);
+
 		const includePaths = options.include.map((p) => path.join(source, p));
 
 		await fs.writeFile(includeFile, includePaths.join("\n"), "utf-8");
@@ -278,6 +281,12 @@ const backup = async (
 		}
 	}
 
+	if (options?.excludeIfPresent && options.excludeIfPresent.length > 0) {
+		for (const filename of options.excludeIfPresent) {
+			args.push("--exclude-if-present", filename);
+		}
+	}
+
 	addCommonArgs(args, env);
 
 	const logData = throttle((data: string) => {

bun.lock

@@ -32,7 +32,7 @@
         "dotenv": "^17.2.3",
         "drizzle-orm": "^0.44.7",
         "es-toolkit": "^1.42.0",
-        "hono": "^4.10.7",
+        "hono": "4.10.5",
         "hono-openapi": "^1.1.1",
         "http-errors-enhanced": "^4.0.2",
         "isbot": "^5.1.32",
@@ -41,7 +41,7 @@
         "node-cron": "^4.2.1",
         "react": "^19.2.1",
         "react-dom": "^19.2.1",
-        "react-hook-form": "^7.67.0",
+        "react-hook-form": "^7.68.0",
         "react-router": "^7.10.0",
         "react-router-hono-server": "^2.22.0",
         "recharts": "3.5.1",
@@ -770,7 +770,7 @@
 
     "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="],
 
-    "hono": ["hono@4.10.7", "", {}, "sha512-icXIITfw/07Q88nLSkB9aiUrd8rYzSweK681Kjo/TSggaGbOX4RRyxxm71v+3PC8C/j+4rlxGeoTRxQDkaJkUw=="],
+    "hono": ["hono@4.10.5", "", {}, "sha512-h/MXuTkoAK8NG1EfDp0jI1YLf6yGdDnfkebRO2pwEh5+hE3RAJFXkCsnD0vamSiARK4ZrB6MY+o3E/hCnOyHrQ=="],
 
     "hono-openapi": ["hono-openapi@1.1.1", "", { "peerDependencies": { "@hono/standard-validator": "^0.1.2", "@standard-community/standard-json": "^0.3.5", "@standard-community/standard-openapi": "^0.2.8", "@types/json-schema": "^7.0.15", "hono": "^4.8.3", "openapi-types": "^12.1.3" }, "optionalPeers": ["@hono/standard-validator", "hono"] }, "sha512-AC3HNhZYPHhnZdSy2Je7GDoTTNxPos6rKRQKVDBbSilY3cWJPqsxRnN6zA4pU7tfxmQEMTqkiLXbw6sAaemB8Q=="],
 
@@ -952,7 +952,7 @@
 
     "react-dom": ["react-dom@19.2.1", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.1" } }, "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg=="],
 
-    "react-hook-form": ["react-hook-form@7.67.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-E55EOwKJHHIT/I6J9DmQbCWToAYSw9nN5R57MZw9rMtjh+YQreMDxRLfdjfxQbiJ3/qbg3Z02wGzBX4M+5fMtQ=="],
+    "react-hook-form": ["react-hook-form@7.68.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-oNN3fjrZ/Xo40SWlHf1yCjlMK417JxoSJVUXQjGdvdRCU07NTFei1i1f8ApUAts+IVh14e4EdakeLEA+BEAs/Q=="],
 
     "react-is": ["react-is@19.2.0", "", {}, "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA=="],
 
@@ -1216,8 +1216,6 @@
 
     "react-router-hono-server/@drizzle-team/brocli": ["@drizzle-team/brocli@0.11.0", "", {}, "sha512-hD3pekGiPg0WPCCGAZmusBBJsDqGUR66Y452YgQsZOnkdQ7ViEPKuyP4huUGEZQefp8g34RRodXYmJ2TbCH+tg=="],
 
-    "react-router-hono-server/hono": ["hono@4.10.5", "", {}, "sha512-h/MXuTkoAK8NG1EfDp0jI1YLf6yGdDnfkebRO2pwEh5+hE3RAJFXkCsnD0vamSiARK4ZrB6MY+o3E/hCnOyHrQ=="],
-
     "send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
 
     "send/encodeurl": ["encodeurl@1.0.2", "", {}, "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="],

docker-compose.yml

@@ -41,3 +41,4 @@ services:
       - /var/lib/zerobyte:/var/lib/zerobyte:rshared
       - /run/docker/plugins:/run/docker/plugins
       - /var/run/docker.sock:/var/run/docker.sock
+      - ~/.config/rclone:/root/.config/rclone

package.json

@@ -45,7 +45,7 @@
 		"dotenv": "^17.2.3",
 		"drizzle-orm": "^0.44.7",
 		"es-toolkit": "^1.42.0",
-		"hono": "^4.10.7",
+		"hono": "4.10.5",
 		"hono-openapi": "^1.1.1",
 		"http-errors-enhanced": "^4.0.2",
 		"isbot": "^5.1.32",
@@ -54,7 +54,7 @@
 		"node-cron": "^4.2.1",
 		"react": "^19.2.1",
 		"react-dom": "^19.2.1",
-		"react-hook-form": "^7.67.0",
+		"react-hook-form": "^7.68.0",
 		"react-router": "^7.10.0",
 		"react-router-hono-server": "^2.22.0",
 		"recharts": "3.5.1",