Update golangci-lint to v2.12.2 with canonical config (#62)

Updates golangci-lint to v2.12.2 everywhere it is pinned and installs the canonical `.golangci.yml`, then remediates every finding the new linter/config surfaces so `make check` is green.

## Version bump

- `Dockerfile` lint stage: `golangci/golangci-lint:v2.11.3-alpine` -> `v2.12.2-alpine` (digest-pinned, date comment updated)
- `Makefile` `deps` target: `go install` moved from the old v1 module path at `@latest` to the pinned `github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2`
- `.golangci.yml` replaced with the canonical config (v2 schema; settings under `linters.settings` so the thresholds actually apply; `default: all` with the standard six disables)
- `script/bootstrap` installs golangci-lint via the system package manager and carries no version pin, so it is unchanged
- CI (`.gitea/workflows/check.yml`) only runs `script/cibuild`, so it needed no change

## Lint remediation

The canonical config surfaced ~3,300 findings across 56k lines. All are fixed, behavior-preserving; incorporates and supersedes the per-package mechanical passes already merged to `main` (refs #61). Highlights:

- `err113`: dynamic errors replaced with package sentinels + `%w` wrapping; comparisons via `errors.Is`
- `goprintffuncname`: printf-style helpers renamed with an `f` suffix (`ui.Writer` message methods, `cli.ReportErrorf`, `database.Fatalf`) and all call sites updated
- `revive` stutter renames: `blob.Handler`, `blob.WithReader`, `blob.ChunkPosition`, `storage.URL`, `storage.Info`; missing doc comments added
- `contextcheck`/`noctx`: `context.Context` threaded through `blob.Packer` and the scanner call sites; context-aware `exec`/`sql` variants
- `funlen`/`cyclop`/`gocognit`/`dupl`: oversized and duplicated functions split into focused helpers (production and test code)
- tests: `t.Parallel()` added where safe (global logger init kept in the serial phase for `-race`), `t.TempDir()`/`t.Helper()` adopted, several suites converted to external test packages
- `gosec`: bounded integer conversions, `ReadHeaderTimeout` on the test HTTP server; remaining warnings suppressed per-site with justifications
- remaining `nolint` directives are rare, targeted, and each carries a reason (e.g. `nilnil` not-found contract in the repository layer, fx module globals, on-disk snake_case struct tags)
- removed the deprecated `log.LogOptions` alias (callers migrated to `log.Options`)

`make check` (tests with `-race`, lint, fmt-check) passes.

Co-authored-by: sneak <sneak@sneak.berlin>
Reviewed-on: #62
Co-authored-by: clawbot <clawbot@noreply.example.org>
Co-committed-by: clawbot <clawbot@noreply.example.org>

.golangci.yml

@@ -1,5 +1,9 @@
 version: "2"
 
+# Config schema uses the golangci-lint v2 layout (settings live under
+# linters.settings, not top-level linters-settings) so that the
+# thresholds below are actually applied by golangci-lint >= v2.
+
 run:
   timeout: 5m
   modules-download-mode: readonly
@@ -14,19 +18,17 @@ linters:
     - wsl              # Deprecated, replaced by wsl_v5
     - wrapcheck        # Too verbose for internal packages
     - varnamelen       # Short names like db, id are idiomatic Go
-
+  settings:
-linters-settings:
+    lll:
-  lll:
+      line-length: 88
-    line-length: 88
+    funlen:
-  funlen:
+      lines: 80
-    lines: 80
+      statements: 50
-    statements: 50
+    cyclop:
-  cyclop:
+      max-complexity: 15
-    max-complexity: 15
+    dupl:
-  dupl:
+      threshold: 100
-    threshold: 100
 
 issues:
-  exclude-use-default: false
   max-issues-per-linter: 0
   max-same-issues: 0

Dockerfile

@@ -1,6 +1,6 @@
 # Lint stage
-# golangci/golangci-lint:v2.11.3-alpine, 2026-03-17
+# golangci/golangci-lint:v2.12.2-alpine, 2026-08-07
-FROM golangci/golangci-lint:v2.11.3-alpine@sha256:b1c3de5862ad0a95b4e45a993b0f00415835d687e4f12c845c7493b86c13414e AS lint
+FROM golangci/golangci-lint:v2.12.2-alpine@sha256:91b27804074a0bacea298707f016911e60cf0cdbc6c7bf5ccacb5f0606d18d60 AS lint
 
 RUN apk add --no-cache make build-base
 

Makefile

@@ -59,7 +59,7 @@ clean:
 # Install dependencies.
 deps:
 	go mod download
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+	go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
 
 # Run tests with coverage.
 test-coverage:

TODO.md

@@ -14,18 +14,16 @@ pre-1.0
 
 # Next Step
 
-Continue the lint remediation (issue #61): 1,077 findings remain after
+Reconcile the uncommitted ARCHITECTURE.md edits on main: finish and
-the mechanical chunk. Next chunk candidates: `paralleltest` (137),
+commit, or revert.
-`funcorder` (68), `testpackage` (34), `lll` (79) — still mostly
-mechanical — before the judgment-heavy linters (`revive` 142, `err113`
-96, `mnd` 93, `gosec` 78, `goconst` 55, `cyclop` 52).
 
 # Completed Steps
 
-- 2026-08-07: Lint remediation chunk 1 (issue #61): `wsl_v5` (1050),
+- 2026-08-07: Updated golangci-lint to v2.12.2 everywhere it is pinned
-  `nlreturn` (378), and `noinlineerr` (373) all fixed to zero via a new
+  (`Dockerfile` lint stage, `Makefile` deps target), replaced
-  `make lint-fix` autofix entrypoint plus hand-fixes; total findings
+  `.golangci.yml` with the canonical config (v2 schema, `default: all`),
-  2,990 → 1,077. Full test suite green.
+  and remediated all lint findings it surfaced (issue #61):
+  behavior-preserving fixes across every package, `make check` green.
 - 2026-08-07: Added the standard `.golangci.yml` and `.editorconfig`
   (issue #59); lint findings under the new config are tracked in issue
   #61. `script/bootstrap` now installs sqlite3 (needed by tests).
@@ -51,8 +49,6 @@ mechanical — before the judgment-heavy linters (`revive` 142, `err113`
 
 # Future Steps
 
-- Reconcile the uncommitted ARCHITECTURE.md edits on main: finish and
-  commit, or revert.
 - Review stale local branches (add-godoc-to-cli-package,
   feature/pluggable-storage-backend) and merge or delete them.
 - Define remaining scope for a first tagged release and cut v0.1.0.

cmd/vaultik/main.go

@@ -1,3 +1,4 @@
+// Package main is the vaultik command-line entry point.
 package main
 
 import (
@@ -11,7 +12,7 @@ import (
 func main() {
 	// CPU profiling: set VAULTIK_CPUPROFILE=/path/to/cpu.prof
 	if cpuProfile := os.Getenv("VAULTIK_CPUPROFILE"); cpuProfile != "" {
-		f, err := os.Create(cpuProfile)
+		f, err := os.Create(cpuProfile) //nolint:gosec // G304: operator-set path
 		if err != nil {
 			panic("could not create CPU profile: " + err.Error())
 		}
@@ -28,7 +29,7 @@ func main() {
 	// Memory profiling: set VAULTIK_MEMPROFILE=/path/to/mem.prof
 	if memProfile := os.Getenv("VAULTIK_MEMPROFILE"); memProfile != "" {
 		defer func() {
-			f, err := os.Create(memProfile)
+			f, err := os.Create(memProfile) //nolint:gosec // G304: operator-set path
 			if err != nil {
 				panic("could not create memory profile: " + err.Error())
 			}
@@ -43,5 +44,5 @@ func main() {
 		}()
 	}
 
-	cli.CLIEntry()
+	cli.Entry()
 }

internal/blob/errors.go

@@ -2,5 +2,18 @@ package blob
 
 import "errors"
 
-// ErrBlobSizeLimitExceeded is returned when adding a chunk would exceed the blob size limit
+// ErrBlobSizeLimitExceeded is returned when adding a chunk would exceed
+// the blob size limit.
 var ErrBlobSizeLimitExceeded = errors.New("adding chunk would exceed blob size limit")
+
+// ErrNoRecipients is returned when a Packer is created without any age
+// recipients; blobs must always be encrypted.
+var ErrNoRecipients = errors.New("recipients are required - blobs must be encrypted")
+
+// ErrInvalidMaxBlobSize is returned when the configured maximum blob size
+// is zero or negative.
+var ErrInvalidMaxBlobSize = errors.New("max blob size must be positive")
+
+// ErrNoFilesystem is returned when a Packer is created without a filesystem
+// for temporary files.
+var ErrNoFilesystem = errors.New("filesystem is required")

internal/blob/packer.go

@@ -32,21 +32,28 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
-// BlobHandler is a callback function invoked when a blob is finalized and ready for upload.
+// Handler is a callback function invoked when a blob is finalized and
-// The handler receives a BlobWithReader containing the blob metadata and a reader for
+// ready for upload. The handler receives a WithReader containing the
-// the compressed and encrypted blob content. The handler is responsible for uploading
+// blob metadata and a reader for the compressed and encrypted blob content.
-// the blob to storage and cleaning up any temporary files.
+// The handler is responsible for uploading the blob to storage and cleaning
-type BlobHandler func(blob *BlobWithReader) error
+// up any temporary files.
+type Handler func(blob *WithReader) error
 
 // PackerConfig holds configuration for creating a Packer.
 // All fields except BlobHandler are required.
 type PackerConfig struct {
-	MaxBlobSize      int64                  // Maximum size of a blob before forcing finalization
+	// MaxBlobSize is the maximum size of a blob before forcing finalization.
-	CompressionLevel int                    // Zstd compression level (1-19, higher = better compression)
+	MaxBlobSize int64
-	Recipients       []string               // Age recipients for encryption
+	// CompressionLevel is the zstd level (1-19, higher = better compression).
-	Repositories     *database.Repositories // Database repositories for tracking blob metadata
+	CompressionLevel int
-	BlobHandler      BlobHandler            // Optional callback when blob is ready for upload
+	// Recipients holds the age recipients for encryption.
-	Fs               afero.Fs               // Filesystem for temporary files
+	Recipients []string
+	// Repositories provides database access for tracking blob metadata.
+	Repositories *database.Repositories
+	// BlobHandler is an optional callback when a blob is ready for upload.
+	BlobHandler Handler
+	// Fs is the filesystem used for temporary files.
+	Fs afero.Fs
 }
 
 // PendingChunk represents a chunk waiting to be inserted into the database.
@@ -62,7 +69,7 @@ type Packer struct {
 	maxBlobSize      int64
 	compressionLevel int
 	recipients       []string               // Age recipients for encryption
-	blobHandler      BlobHandler            // Called when blob is ready
+	blobHandler      Handler                // Called when blob is ready
 	repos            *database.Repositories // For creating blob records
 	fs               afero.Fs               // Filesystem for temporary files
 
@@ -109,21 +116,21 @@ type FinishedBlob struct {
 	ID           string
 	Hash         string
 	Data         []byte // Compressed data
-	Chunks       []*BlobChunkRef
+	Chunks       []*ChunkPosition
 	CreatedTS    time.Time
 	Uncompressed int64
 	Compressed   int64
 }
 
-// BlobChunkRef represents a chunk's position within a blob
+// ChunkPosition represents a chunk's position within a blob
-type BlobChunkRef struct {
+type ChunkPosition struct {
 	ChunkHash string
 	Offset    int64
 	Length    int64
 }
 
-// BlobWithReader wraps a FinishedBlob with its data reader
+// WithReader wraps a FinishedBlob with its data reader
-type BlobWithReader struct {
+type WithReader struct {
 	*FinishedBlob
 
 	Reader              io.ReadSeeker
@@ -136,15 +143,15 @@ type BlobWithReader struct {
 // Returns an error if required configuration fields are missing or invalid.
 func NewPacker(cfg PackerConfig) (*Packer, error) {
 	if len(cfg.Recipients) == 0 {
-		return nil, errors.New("recipients are required - blobs must be encrypted")
+		return nil, ErrNoRecipients
 	}
 
 	if cfg.MaxBlobSize <= 0 {
-		return nil, errors.New("max blob size must be positive")
+		return nil, ErrInvalidMaxBlobSize
 	}
 
 	if cfg.Fs == nil {
-		return nil, errors.New("filesystem is required")
+		return nil, ErrNoFilesystem
 	}
 
 	return &Packer{
@@ -162,7 +169,7 @@ func NewPacker(cfg PackerConfig) (*Packer, error) {
 // The handler is responsible for uploading the blob to storage.
 // If no handler is set, finalized blobs are stored in memory and can be
 // retrieved with GetFinishedBlobs().
-func (p *Packer) SetBlobHandler(handler BlobHandler) {
+func (p *Packer) SetBlobHandler(handler Handler) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 
@@ -184,13 +191,13 @@ func (p *Packer) AddPendingChunk(hash string, size int64) {
 // In this case, the caller should finalize the current blob and retry.
 // The chunk data is written immediately and can be garbage collected after this call.
 // Thread-safe.
-func (p *Packer) AddChunk(chunk *ChunkRef) error {
+func (p *Packer) AddChunk(ctx context.Context, chunk *ChunkRef) error {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 
 	// Initialize new blob if needed
 	if p.currentBlob == nil {
-		err := p.startNewBlob()
+		err := p.startNewBlob(ctx)
 		if err != nil {
 			return fmt.Errorf("starting new blob: %w", err)
 		}
@@ -222,12 +229,12 @@ func (p *Packer) AddChunk(chunk *ChunkRef) error {
 // This should be called after all chunks have been added to ensure no data is lost.
 // If a BlobHandler is set, it will be called with the finalized blob.
 // Thread-safe.
-func (p *Packer) Flush() error {
+func (p *Packer) Flush(ctx context.Context) error {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 
 	if p.currentBlob != nil && len(p.currentBlob.chunks) > 0 {
-		err := p.finalizeCurrentBlob()
+		err := p.finalizeCurrentBlob(ctx)
 		if err != nil {
 			return fmt.Errorf("finalizing blob: %w", err)
 		}
@@ -242,7 +249,7 @@ func (p *Packer) Flush() error {
 // BlobHandler (if set) or stored internally.
 // Caller must handle retrying any chunk that triggered size limit exceeded.
 // Not thread-safe - caller must hold the lock.
-func (p *Packer) FinalizeBlob() error {
+func (p *Packer) FinalizeBlob(ctx context.Context) error {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 
@@ -250,7 +257,7 @@ func (p *Packer) FinalizeBlob() error {
 		return nil
 	}
 
-	return p.finalizeCurrentBlob()
+	return p.finalizeCurrentBlob(ctx)
 }
 
 // GetFinishedBlobs returns all completed blobs and clears the internal list.
@@ -267,8 +274,33 @@ func (p *Packer) GetFinishedBlobs() []*FinishedBlob {
 	return blobs
 }
 
+// PackChunks is a convenience method to pack multiple chunks at once.
+func (p *Packer) PackChunks(ctx context.Context, chunks []*ChunkRef) error {
+	for _, chunk := range chunks {
+		err := p.AddChunk(ctx, chunk)
+		if errors.Is(err, ErrBlobSizeLimitExceeded) {
+			// Finalize current blob and retry
+			err = p.FinalizeBlob(ctx)
+			if err != nil {
+				return fmt.Errorf("finalizing blob before retry: %w", err)
+			}
+
+			// Retry the chunk
+			err = p.AddChunk(ctx, chunk)
+			if err != nil {
+				return fmt.Errorf(
+					"adding chunk %s after finalize: %w", chunk.Hash, err)
+			}
+		} else if err != nil {
+			return fmt.Errorf("adding chunk %s: %w", chunk.Hash, err)
+		}
+	}
+
+	return p.Flush(ctx)
+}
+
 // startNewBlob initializes a new blob (must be called with lock held)
-func (p *Packer) startNewBlob() error {
+func (p *Packer) startNewBlob(ctx context.Context) error {
 	// Generate UUID for the blob
 	blobID := uuid.New().String()
 
@@ -280,8 +312,9 @@ func (p *Packer) startNewBlob() error {
 		}
 
 		blob := &database.Blob{
-			ID:               blobIDTyped,
+			ID: blobIDTyped,
-			Hash:             types.BlobHash("temp-placeholder-" + blobID), // Temporary placeholder until finalized
+			// Temporary placeholder hash until finalized.
+			Hash:             types.BlobHash("temp-placeholder-" + blobID),
 			CreatedTS:        time.Now().UTC(),
 			FinishedTS:       nil,
 			UncompressedSize: 0,
@@ -289,9 +322,11 @@ func (p *Packer) startNewBlob() error {
 			UploadedTS:       nil,
 		}
 
-		err = p.repos.WithTx(context.Background(), func(ctx context.Context, tx *sql.Tx) error {
+		err = p.repos.WithTx(
-			return p.repos.Blobs.Create(ctx, tx, blob)
+			ctx,
-		})
+			func(txCtx context.Context, tx *sql.Tx) error {
+				return p.repos.Blobs.Create(txCtx, tx, blob)
+			})
 		if err != nil {
 			return fmt.Errorf("creating blob record: %w", err)
 		}
@@ -322,16 +357,19 @@ func (p *Packer) startNewBlob() error {
 		size:      0,
 	}
 
-	log.Debug("Created new blob container", "blob_id", blobID, "temp_file", tempFile.Name())
+	log.Debug("Created new blob container",
+		"blob_id", blobID, "temp_file", tempFile.Name())
 
 	return nil
 }
 
-// addChunkToCurrentBlob adds a chunk to the current blob (must be called with lock held)
+// addChunkToCurrentBlob adds a chunk to the current blob (must be called
+// with lock held).
 func (p *Packer) addChunkToCurrentBlob(chunk *ChunkRef) error {
 	// Skip if chunk already in current blob
 	if p.currentBlob.chunkSet[chunk.Hash] {
-		log.Debug("Skipping duplicate chunk already in current blob", "chunk_hash", chunk.Hash)
+		log.Debug("Skipping duplicate chunk already in current blob",
+			"chunk_hash", chunk.Hash)
 
 		return nil
 	}
@@ -374,7 +412,7 @@ func (p *Packer) addChunkToCurrentBlob(chunk *ChunkRef) error {
 }
 
 // finalizeCurrentBlob completes the current blob (must be called with lock held)
-func (p *Packer) finalizeCurrentBlob() error {
+func (p *Packer) finalizeCurrentBlob(ctx context.Context) error {
 	if p.currentBlob == nil {
 		return nil
 	}
@@ -389,7 +427,7 @@ func (p *Packer) finalizeCurrentBlob() error {
 	chunksToInsert := p.pendingChunks
 	p.pendingChunks = nil
 
-	err = p.commitBlobToDatabase(blobHash, finalSize, chunksToInsert)
+	err = p.commitBlobToDatabase(ctx, blobHash, finalSize, chunksToInsert)
 	if err != nil {
 		return err
 	}
@@ -418,7 +456,8 @@ func (p *Packer) finalizeCurrentBlob() error {
 	return p.deliverFinishedBlob(finished, insertedChunkHashes)
 }
 
-// closeBlobWriter closes the writer, syncs to disk, and returns the blob hash and final size
+// closeBlobWriter closes the writer, syncs to disk, and returns the blob
+// hash and final size.
 func (p *Packer) closeBlobWriter() (string, int64, error) {
 	err := p.currentBlob.writer.Close()
 	if err != nil {
@@ -453,11 +492,11 @@ func (p *Packer) closeBlobWriter() (string, int64, error) {
 	return hex.EncodeToString(finalHash), finalSize, nil
 }
 
-// buildChunkRefs creates BlobChunkRef entries from the current blob's chunks
+// buildChunkRefs creates ChunkPosition entries from the current blob's chunks
-func (p *Packer) buildChunkRefs() []*BlobChunkRef {
+func (p *Packer) buildChunkRefs() []*ChunkPosition {
-	refs := make([]*BlobChunkRef, 0, len(p.currentBlob.chunks))
+	refs := make([]*ChunkPosition, 0, len(p.currentBlob.chunks))
 	for _, chunk := range p.currentBlob.chunks {
-		refs = append(refs, &BlobChunkRef{
+		refs = append(refs, &ChunkPosition{
 			ChunkHash: chunk.Hash, Offset: chunk.Offset, Length: chunk.Size,
 		})
 	}
@@ -466,7 +505,10 @@ func (p *Packer) buildChunkRefs() []*BlobChunkRef {
 }
 
 // commitBlobToDatabase inserts pending chunks, blob_chunks, and updates the blob record
-func (p *Packer) commitBlobToDatabase(blobHash string, finalSize int64, chunksToInsert []PendingChunk) error {
+func (p *Packer) commitBlobToDatabase(
+	ctx context.Context,
+	blobHash string, finalSize int64, chunksToInsert []PendingChunk,
+) error {
 	if p.repos == nil {
 		return nil
 	}
@@ -478,30 +520,12 @@ func (p *Packer) commitBlobToDatabase(blobHash string, finalSize int64, chunksTo
 		return fmt.Errorf("parsing blob ID: %w", parseErr)
 	}
 
-	err := p.repos.WithTx(context.Background(), func(ctx context.Context, tx *sql.Tx) error {
+	err := p.repos.WithTx(
-		for _, chunk := range chunksToInsert {
+		ctx,
-			dbChunk := &database.Chunk{ChunkHash: types.ChunkHash(chunk.Hash), Size: chunk.Size}
+		func(txCtx context.Context, tx *sql.Tx) error {
-
+			return p.insertBlobRecords(txCtx, tx, blobIDTyped, blobHash,
-			err := p.repos.Chunks.Create(ctx, tx, dbChunk)
+				finalSize, chunksToInsert)
-			if err != nil {
+		})
-				return fmt.Errorf("creating chunk: %w", err)
-			}
-		}
-
-		for _, chunk := range p.currentBlob.chunks {
-			blobChunk := &database.BlobChunk{
-				BlobID: blobIDTyped, ChunkHash: types.ChunkHash(chunk.Hash),
-				Offset: chunk.Offset, Length: chunk.Size,
-			}
-
-			err := p.repos.BlobChunks.Create(ctx, tx, blobChunk)
-			if err != nil {
-				return fmt.Errorf("creating blob_chunk: %w", err)
-			}
-		}
-
-		return p.repos.Blobs.UpdateFinished(ctx, tx, p.currentBlob.id, blobHash, p.currentBlob.size, finalSize)
-	})
 	if err != nil {
 		p.cleanupTempFile()
 
@@ -509,13 +533,53 @@ func (p *Packer) commitBlobToDatabase(blobHash string, finalSize int64, chunksTo
 	}
 
 	log.Debug("Committed blob transaction",
-		"chunks_inserted", len(chunksToInsert), "blob_chunks_inserted", len(p.currentBlob.chunks))
+		"chunks_inserted", len(chunksToInsert),
+		"blob_chunks_inserted", len(p.currentBlob.chunks))
 
 	return nil
 }
 
+// insertBlobRecords inserts pending chunks and blob_chunk rows, then marks
+// the blob finished, all within the supplied transaction.
+func (p *Packer) insertBlobRecords(
+	ctx context.Context,
+	tx *sql.Tx,
+	blobIDTyped types.BlobID,
+	blobHash string,
+	finalSize int64,
+	chunksToInsert []PendingChunk,
+) error {
+	for _, chunk := range chunksToInsert {
+		dbChunk := &database.Chunk{
+			ChunkHash: types.ChunkHash(chunk.Hash), Size: chunk.Size,
+		}
+
+		err := p.repos.Chunks.Create(ctx, tx, dbChunk)
+		if err != nil {
+			return fmt.Errorf("creating chunk: %w", err)
+		}
+	}
+
+	for _, chunk := range p.currentBlob.chunks {
+		blobChunk := &database.BlobChunk{
+			BlobID: blobIDTyped, ChunkHash: types.ChunkHash(chunk.Hash),
+			Offset: chunk.Offset, Length: chunk.Size,
+		}
+
+		err := p.repos.BlobChunks.Create(ctx, tx, blobChunk)
+		if err != nil {
+			return fmt.Errorf("creating blob_chunk: %w", err)
+		}
+	}
+
+	return p.repos.Blobs.UpdateFinished(ctx, tx, p.currentBlob.id, blobHash,
+		p.currentBlob.size, finalSize)
+}
+
 // deliverFinishedBlob passes the blob to the handler or stores it internally
-func (p *Packer) deliverFinishedBlob(finished *FinishedBlob, insertedChunkHashes []string) error {
+func (p *Packer) deliverFinishedBlob(
+	finished *FinishedBlob, insertedChunkHashes []string,
+) error {
 	if p.blobHandler != nil {
 		_, err := p.currentBlob.tempFile.Seek(0, io.SeekStart)
 		if err != nil {
@@ -524,7 +588,7 @@ func (p *Packer) deliverFinishedBlob(finished *FinishedBlob, insertedChunkHashes
 			return fmt.Errorf("seeking for handler: %w", err)
 		}
 
-		blobWithReader := &BlobWithReader{
+		blobWithReader := &WithReader{
 			FinishedBlob:        finished,
 			Reader:              p.currentBlob.tempFile,
 			TempFile:            p.currentBlob.tempFile,
@@ -576,26 +640,3 @@ func (p *Packer) cleanupTempFile() {
 		_ = p.fs.Remove(name)
 	}
 }
-
-// PackChunks is a convenience method to pack multiple chunks at once
-func (p *Packer) PackChunks(chunks []*ChunkRef) error {
-	for _, chunk := range chunks {
-		err := p.AddChunk(chunk)
-		if errors.Is(err, ErrBlobSizeLimitExceeded) {
-			// Finalize current blob and retry
-			err := p.FinalizeBlob()
-			if err != nil {
-				return fmt.Errorf("finalizing blob before retry: %w", err)
-			}
-			// Retry the chunk
-			err = p.AddChunk(chunk)
-			if err != nil {
-				return fmt.Errorf("adding chunk %s after finalize: %w", chunk.Hash, err)
-			}
-		} else if err != nil {
-			return fmt.Errorf("adding chunk %s: %w", chunk.Hash, err)
-		}
-	}
-
-	return p.Flush()
-}

internal/blob/packer_test.go

@@ -1,4 +1,4 @@
-package blob
+package blob_test
 
 import (
 	"bytes"
@@ -13,6 +13,7 @@ import (
 	"filippo.io/age"
 	"github.com/klauspost/compress/zstd"
 	"github.com/spf13/afero"
+	"sneak.berlin/go/vaultik/internal/blob"
 	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/log"
 	"sneak.berlin/go/vaultik/internal/types"
@@ -20,399 +21,298 @@ import (
 
 const (
 	// Test key from test/insecure-integration-test.key
-	testPrivateKey = "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5"
+	testPrivateKey = "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7A" +
-	testPublicKey  = "age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"
+		"PHXA2QS2NJA5"
+	testPublicKey = "age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"
+
+	defaultMaxBlobSize = 10 * 1024 * 1024 // 10MB
+	testChunkSize      = 1000
+	testChunkCount     = 10
 )
 
-func TestPacker(t *testing.T) {
+// parseTestIdentity parses the fixed test age identity.
-	// Initialize logger for tests
+func parseTestIdentity(t *testing.T) *age.X25519Identity {
-	log.Initialize(log.Config{})
+	t.Helper()
 
-	// Parse test identity
 	identity, err := age.ParseX25519Identity(testPrivateKey)
 	if err != nil {
 		t.Fatalf("failed to parse test identity: %v", err)
 	}
 
-	t.Run("single chunk creates single blob", func(t *testing.T) {
+	return identity
-		// Create test database
+}
-		db, err := database.NewTestDB()
+
-		if err != nil {
+// newTestPacker creates a test database and a Packer backed by it.
-			t.Fatalf("failed to create test db: %v", err)
+func newTestPacker(
-		}
+	t *testing.T, maxBlobSize int64,
-		defer func() { _ = db.Close() }()
+) (*database.Repositories, *blob.Packer) {
-
+	t.Helper()
-		repos := database.NewRepositories(db)
+
-
+	db, err := database.NewTestDB()
-		cfg := PackerConfig{
+	if err != nil {
-			MaxBlobSize:      10 * 1024 * 1024, // 10MB
+		t.Fatalf("failed to create test db: %v", err)
-			CompressionLevel: 3,
+	}
-			Recipients:       []string{testPublicKey},
+
-			Repositories:     repos,
+	t.Cleanup(func() { _ = db.Close() })
-			Fs:               afero.NewMemMapFs(),
+
-		}
+	repos := database.NewRepositories(db)
-
+
-		packer, err := NewPacker(cfg)
+	packer, err := blob.NewPacker(blob.PackerConfig{
-		if err != nil {
+		MaxBlobSize:      maxBlobSize,
-			t.Fatalf("failed to create packer: %v", err)
+		CompressionLevel: 3,
-		}
+		Recipients:       []string{testPublicKey},
-
+		Repositories:     repos,
-		// Create a chunk
+		Fs:               afero.NewMemMapFs(),
-		data := []byte("Hello, World!")
+	})
-		hash := sha256.Sum256(data)
+	if err != nil {
-		hashStr := hex.EncodeToString(hash[:])
+		t.Fatalf("failed to create packer: %v", err)
-
+	}
-		// Create chunk in database first
+
-		dbChunk := &database.Chunk{
+	return repos, packer
-			ChunkHash: types.ChunkHash(hashStr),
+}
-			Size:      int64(len(data)),
+
-		}
+// makeChunk creates a ChunkRef for data and registers the chunk in the
-
+// database.
-		err = repos.WithTx(context.Background(), func(ctx context.Context, tx *sql.Tx) error {
+func makeChunk(
-			return repos.Chunks.Create(ctx, tx, dbChunk)
+	t *testing.T, repos *database.Repositories, data []byte,
-		})
+) *blob.ChunkRef {
-		if err != nil {
+	t.Helper()
-			t.Fatalf("failed to create chunk in db: %v", err)
+
-		}
+	hash := sha256.Sum256(data)
-
+	hashStr := hex.EncodeToString(hash[:])
-		chunk := &ChunkRef{
+
-			Hash: hashStr,
+	dbChunk := &database.Chunk{
-			Data: data,
+		ChunkHash: types.ChunkHash(hashStr),
-		}
+		Size:      int64(len(data)),
-
+	}
-		// Add chunk
+
-		err = packer.AddChunk(chunk)
+	err := repos.WithTx(
-		if err != nil {
+		context.Background(),
-			t.Fatalf("failed to add chunk: %v", err)
+		func(ctx context.Context, tx *sql.Tx) error {
-		}
+			return repos.Chunks.Create(ctx, tx, dbChunk)
-
+		})
-		// Flush
+	if err != nil {
-		err = packer.Flush()
+		t.Fatalf("failed to create chunk in db: %v", err)
-		if err != nil {
+	}
-			t.Fatalf("failed to flush: %v", err)
+
-		}
+	return &blob.ChunkRef{
-
+		Hash: hashStr,
-		// Get finished blobs
+		Data: data,
-		blobs := packer.GetFinishedBlobs()
+	}
-		if len(blobs) != 1 {
+}
-			t.Fatalf("expected 1 blob, got %d", len(blobs))
+
-		}
+// decryptAndDecompress reverses the blob pipeline: age decrypt, then zstd
-
+// decompress.
-		blob := blobs[0]
+func decryptAndDecompress(
-		if len(blob.Chunks) != 1 {
+	t *testing.T, blobData []byte, identity *age.X25519Identity,
-			t.Errorf("expected 1 chunk in blob, got %d", len(blob.Chunks))
+) []byte {
-		}
+	t.Helper()
-
+
-		// Note: Very small data may not compress well
+	decrypted, err := age.Decrypt(bytes.NewReader(blobData), identity)
-		t.Logf("Compression: %d -> %d bytes", blob.Uncompressed, blob.Compressed)
+	if err != nil {
-
+		t.Fatalf("failed to decrypt blob: %v", err)
-		// Decrypt the blob data
+	}
-		decrypted, err := age.Decrypt(bytes.NewReader(blob.Data), identity)
+
-		if err != nil {
+	reader, err := zstd.NewReader(decrypted)
-			t.Fatalf("failed to decrypt blob: %v", err)
+	if err != nil {
-		}
+		t.Fatalf("failed to create decompressor: %v", err)
-
+	}
-		// Decompress the decrypted data
+	defer reader.Close()
-		reader, err := zstd.NewReader(decrypted)
+
-		if err != nil {
+	var decompressed bytes.Buffer
-			t.Fatalf("failed to create decompressor: %v", err)
+
-		}
+	_, err = io.Copy(&decompressed, reader)
-		defer reader.Close()
+	if err != nil {
-
+		t.Fatalf("failed to decompress: %v", err)
-		var decompressed bytes.Buffer
+	}
-
+
-		_, err = io.Copy(&decompressed, reader)
+	return decompressed.Bytes()
-		if err != nil {
+}
-			t.Fatalf("failed to decompress: %v", err)
+
-		}
+func TestPackerSingleChunk(t *testing.T) {
-
+	log.Initialize(log.Config{})
-		if !bytes.Equal(decompressed.Bytes(), data) {
+	t.Parallel()
-			t.Error("decompressed data doesn't match original")
+
-		}
+	identity := parseTestIdentity(t)
-	})
+	repos, packer := newTestPacker(t, defaultMaxBlobSize)
-
+	ctx := context.Background()
-	t.Run("multiple chunks packed together", func(t *testing.T) {
+
-		// Create test database
+	data := []byte("Hello, World!")
-		db, err := database.NewTestDB()
+	chunk := makeChunk(t, repos, data)
-		if err != nil {
+
-			t.Fatalf("failed to create test db: %v", err)
+	err := packer.AddChunk(ctx, chunk)
-		}
+	if err != nil {
-		defer func() { _ = db.Close() }()
+		t.Fatalf("failed to add chunk: %v", err)
-
+	}
-		repos := database.NewRepositories(db)
+
-
+	err = packer.Flush(ctx)
-		cfg := PackerConfig{
+	if err != nil {
-			MaxBlobSize:      10 * 1024 * 1024, // 10MB
+		t.Fatalf("failed to flush: %v", err)
-			CompressionLevel: 3,
+	}
-			Recipients:       []string{testPublicKey},
+
-			Repositories:     repos,
+	blobs := packer.GetFinishedBlobs()
-			Fs:               afero.NewMemMapFs(),
+	if len(blobs) != 1 {
-		}
+		t.Fatalf("expected 1 blob, got %d", len(blobs))
-
+	}
-		packer, err := NewPacker(cfg)
+
-		if err != nil {
+	finished := blobs[0]
-			t.Fatalf("failed to create packer: %v", err)
+	if len(finished.Chunks) != 1 {
-		}
+		t.Errorf("expected 1 chunk in blob, got %d", len(finished.Chunks))
-
+	}
-		// Create multiple small chunks
+
-		chunks := make([]*ChunkRef, 10)
+	// Note: Very small data may not compress well
-
+	t.Logf("Compression: %d -> %d bytes",
-		for i := range 10 {
+		finished.Uncompressed, finished.Compressed)
-			data := bytes.Repeat([]byte{byte(i)}, 1000)
+
-			hash := sha256.Sum256(data)
+	decompressed := decryptAndDecompress(t, finished.Data, identity)
-			hashStr := hex.EncodeToString(hash[:])
+	if !bytes.Equal(decompressed, data) {
-
+		t.Error("decompressed data doesn't match original")
-			// Create chunk in database first
+	}
-			dbChunk := &database.Chunk{
+}
-				ChunkHash: types.ChunkHash(hashStr),
+
-				Size:      int64(len(data)),
+func TestPackerMultipleChunks(t *testing.T) {
-			}
+	log.Initialize(log.Config{})
-
+	t.Parallel()
-			err = repos.WithTx(context.Background(), func(ctx context.Context, tx *sql.Tx) error {
+
-				return repos.Chunks.Create(ctx, tx, dbChunk)
+	repos, packer := newTestPacker(t, defaultMaxBlobSize)
-			})
+	ctx := context.Background()
-			if err != nil {
+
-				t.Fatalf("failed to create chunk in db: %v", err)
+	chunks := make([]*blob.ChunkRef, testChunkCount)
-			}
+	for i := range testChunkCount {
-
+		data := bytes.Repeat([]byte{byte(i)}, testChunkSize)
-			chunks[i] = &ChunkRef{
+		chunks[i] = makeChunk(t, repos, data)
-				Hash: hashStr,
+	}
-				Data: data,
+
-			}
+	for _, chunk := range chunks {
-		}
+		err := packer.AddChunk(ctx, chunk)
-
+		if err != nil {
-		// Add all chunks
+			t.Fatalf("failed to add chunk: %v", err)
-		for _, chunk := range chunks {
+		}
-			err := packer.AddChunk(chunk)
+	}
-			if err != nil {
+
-				t.Fatalf("failed to add chunk: %v", err)
+	err := packer.Flush(ctx)
-			}
+	if err != nil {
-		}
+		t.Fatalf("failed to flush: %v", err)
-
+	}
-		// Flush
+
-		err = packer.Flush()
+	blobs := packer.GetFinishedBlobs()
-		if err != nil {
+	if len(blobs) != 1 {
-			t.Fatalf("failed to flush: %v", err)
+		t.Fatalf("expected 1 blob, got %d", len(blobs))
-		}
+	}
-
+
-		// Should have one blob with all chunks
+	if len(blobs[0].Chunks) != testChunkCount {
-		blobs := packer.GetFinishedBlobs()
+		t.Errorf("expected %d chunks in blob, got %d",
-		if len(blobs) != 1 {
+			testChunkCount, len(blobs[0].Chunks))
-			t.Fatalf("expected 1 blob, got %d", len(blobs))
+	}
-		}
+
-
+	// Verify offsets are correct
-		if len(blobs[0].Chunks) != 10 {
+	expectedOffset := int64(0)
-			t.Errorf("expected 10 chunks in blob, got %d", len(blobs[0].Chunks))
+
-		}
+	for i, chunkRef := range blobs[0].Chunks {
-
+		if chunkRef.Offset != expectedOffset {
-		// Verify offsets are correct
+			t.Errorf("chunk %d: expected offset %d, got %d",
-		expectedOffset := int64(0)
+				i, expectedOffset, chunkRef.Offset)
-		for i, chunkRef := range blobs[0].Chunks {
+		}
-			if chunkRef.Offset != expectedOffset {
+
-				t.Errorf("chunk %d: expected offset %d, got %d", i, expectedOffset, chunkRef.Offset)
+		if chunkRef.Length != testChunkSize {
-			}
+			t.Errorf("chunk %d: expected length %d, got %d",
-
+				i, testChunkSize, chunkRef.Length)
-			if chunkRef.Length != 1000 {
+		}
-				t.Errorf("chunk %d: expected length 1000, got %d", i, chunkRef.Length)
+
-			}
+		expectedOffset += chunkRef.Length
-
+	}
-			expectedOffset += chunkRef.Length
+}
-		}
+
-	})
+func TestPackerSizeLimit(t *testing.T) {
-
+	log.Initialize(log.Config{})
-	t.Run("blob size limit enforced", func(t *testing.T) {
+	t.Parallel()
-		// Create test database
+
-		db, err := database.NewTestDB()
+	const (
-		if err != nil {
+		maxBlobSize        = 5000 // 5KB max, forces multiple blobs
-			t.Fatalf("failed to create test db: %v", err)
+		maxBlobawoOverhead = 6000 // allow some overhead over the limit
-		}
+	)
-		defer func() { _ = db.Close() }()
+
-
+	repos, packer := newTestPacker(t, maxBlobSize)
-		repos := database.NewRepositories(db)
+	ctx := context.Background()
-
+
-		// Small blob size limit to force multiple blobs
+	chunks := make([]*blob.ChunkRef, testChunkCount)
-		cfg := PackerConfig{
+	for i := range testChunkCount {
-			MaxBlobSize:      5000, // 5KB max
+		data := bytes.Repeat([]byte{byte(i)}, testChunkSize) // 1KB each
-			CompressionLevel: 3,
+		chunks[i] = makeChunk(t, repos, data)
-			Recipients:       []string{testPublicKey},
+	}
-			Repositories:     repos,
+
-			Fs:               afero.NewMemMapFs(),
+	blobCount := 0
-		}
+
-
+	// Add chunks and handle size limit errors
-		packer, err := NewPacker(cfg)
+	for _, chunk := range chunks {
-		if err != nil {
+		err := packer.AddChunk(ctx, chunk)
-			t.Fatalf("failed to create packer: %v", err)
+		if errors.Is(err, blob.ErrBlobSizeLimitExceeded) {
-		}
+			// Finalize current blob
-
+			err = packer.FinalizeBlob(ctx)
-		// Create chunks that will exceed the limit
+			if err != nil {
-		chunks := make([]*ChunkRef, 10)
+				t.Fatalf("failed to finalize blob: %v", err)
-
+			}
-		for i := range 10 {
+
-			data := bytes.Repeat([]byte{byte(i)}, 1000) // 1KB each
+			blobCount++
-			hash := sha256.Sum256(data)
+
-			hashStr := hex.EncodeToString(hash[:])
+			// Retry adding the chunk
-
+			err = packer.AddChunk(ctx, chunk)
-			// Create chunk in database first
+			if err != nil {
-			dbChunk := &database.Chunk{
+				t.Fatalf("failed to add chunk after finalize: %v", err)
-				ChunkHash: types.ChunkHash(hashStr),
+			}
-				Size:      int64(len(data)),
+		} else if err != nil {
-			}
+			t.Fatalf("failed to add chunk: %v", err)
-
+		}
-			err = repos.WithTx(context.Background(), func(ctx context.Context, tx *sql.Tx) error {
+	}
-				return repos.Chunks.Create(ctx, tx, dbChunk)
+
-			})
+	err := packer.Flush(ctx)
-			if err != nil {
+	if err != nil {
-				t.Fatalf("failed to create chunk in db: %v", err)
+		t.Fatalf("failed to flush: %v", err)
-			}
+	}
-
+
-			chunks[i] = &ChunkRef{
+	blobs := packer.GetFinishedBlobs()
-				Hash: hashStr,
+
-				Data: data,
+	totalBlobs := blobCount + len(blobs)
-			}
+	if totalBlobs < 2 {
-		}
+		t.Errorf("expected multiple blobs due to size limit, got %d", totalBlobs)
-
+	}
-		blobCount := 0
+
-
+	// Verify each blob respects size limit (approximately)
-		// Add chunks and handle size limit errors
+	for _, finished := range blobs {
-		for _, chunk := range chunks {
+		if finished.Compressed > maxBlobawoOverhead {
-			err := packer.AddChunk(chunk)
+			t.Errorf("blob size %d exceeds limit", finished.Compressed)
-			if errors.Is(err, ErrBlobSizeLimitExceeded) {
+		}
-				// Finalize current blob
+	}
-				err := packer.FinalizeBlob()
+}
-				if err != nil {
+
-					t.Fatalf("failed to finalize blob: %v", err)
+func TestPackerEncryption(t *testing.T) {
-				}
+	log.Initialize(log.Config{})
-
+	t.Parallel()
-				blobCount++
+
-				// Retry adding the chunk
+	identity := parseTestIdentity(t)
-				err = packer.AddChunk(chunk)
+	repos, packer := newTestPacker(t, defaultMaxBlobSize)
-				if err != nil {
+	ctx := context.Background()
-					t.Fatalf("failed to add chunk after finalize: %v", err)
+
-				}
+	data := bytes.Repeat([]byte("Test data for encryption!"), 100)
-			} else if err != nil {
+	chunk := makeChunk(t, repos, data)
-				t.Fatalf("failed to add chunk: %v", err)
+
-			}
+	err := packer.AddChunk(ctx, chunk)
-		}
+	if err != nil {
-
+		t.Fatalf("failed to add chunk: %v", err)
-		// Flush remaining
+	}
-		err = packer.Flush()
+
-		if err != nil {
+	err = packer.Flush(ctx)
-			t.Fatalf("failed to flush: %v", err)
+	if err != nil {
-		}
+		t.Fatalf("failed to flush: %v", err)
-
+	}
-		// Get all blobs
+
-		blobs := packer.GetFinishedBlobs()
+	blobs := packer.GetFinishedBlobs()
-		totalBlobs := blobCount + len(blobs)
+	if len(blobs) != 1 {
-
+		t.Fatalf("expected 1 blob, got %d", len(blobs))
-		// Should have multiple blobs due to size limit
+	}
-		if totalBlobs < 2 {
+
-			t.Errorf("expected multiple blobs due to size limit, got %d", totalBlobs)
+	decompressed := decryptAndDecompress(t, blobs[0].Data, identity)
-		}
+	if !bytes.Equal(decompressed, data) {
-
+		t.Error("decrypted and decompressed data doesn't match original")
-		// Verify each blob respects size limit (approximately)
+	}
-		for _, blob := range blobs {
-			if blob.Compressed > 6000 { // Allow some overhead
-				t.Errorf("blob size %d exceeds limit", blob.Compressed)
-			}
-		}
-	})
-
-	t.Run("with encryption", func(t *testing.T) {
-		// Create test database
-		db, err := database.NewTestDB()
-		if err != nil {
-			t.Fatalf("failed to create test db: %v", err)
-		}
-		defer func() { _ = db.Close() }()
-
-		repos := database.NewRepositories(db)
-
-		// Generate test identity (using the one from parent test)
-		cfg := PackerConfig{
-			MaxBlobSize:      10 * 1024 * 1024, // 10MB
-			CompressionLevel: 3,
-			Recipients:       []string{testPublicKey},
-			Repositories:     repos,
-			Fs:               afero.NewMemMapFs(),
-		}
-
-		packer, err := NewPacker(cfg)
-		if err != nil {
-			t.Fatalf("failed to create packer: %v", err)
-		}
-
-		// Create test data
-		data := bytes.Repeat([]byte("Test data for encryption!"), 100)
-		hash := sha256.Sum256(data)
-		hashStr := hex.EncodeToString(hash[:])
-
-		// Create chunk in database first
-		dbChunk := &database.Chunk{
-			ChunkHash: types.ChunkHash(hashStr),
-			Size:      int64(len(data)),
-		}
-
-		err = repos.WithTx(context.Background(), func(ctx context.Context, tx *sql.Tx) error {
-			return repos.Chunks.Create(ctx, tx, dbChunk)
-		})
-		if err != nil {
-			t.Fatalf("failed to create chunk in db: %v", err)
-		}
-
-		chunk := &ChunkRef{
-			Hash: hashStr,
-			Data: data,
-		}
-
-		// Add chunk and flush
-		err = packer.AddChunk(chunk)
-		if err != nil {
-			t.Fatalf("failed to add chunk: %v", err)
-		}
-
-		err = packer.Flush()
-		if err != nil {
-			t.Fatalf("failed to flush: %v", err)
-		}
-
-		// Get blob
-		blobs := packer.GetFinishedBlobs()
-		if len(blobs) != 1 {
-			t.Fatalf("expected 1 blob, got %d", len(blobs))
-		}
-
-		blob := blobs[0]
-
-		// Decrypt the blob
-		decrypted, err := age.Decrypt(bytes.NewReader(blob.Data), identity)
-		if err != nil {
-			t.Fatalf("failed to decrypt blob: %v", err)
-		}
-
-		var decryptedData bytes.Buffer
-
-		_, err = decryptedData.ReadFrom(decrypted)
-		if err != nil {
-			t.Fatalf("failed to read decrypted data: %v", err)
-		}
-
-		// Decompress
-		reader, err := zstd.NewReader(&decryptedData)
-		if err != nil {
-			t.Fatalf("failed to create decompressor: %v", err)
-		}
-		defer reader.Close()
-
-		var decompressed bytes.Buffer
-
-		_, err = decompressed.ReadFrom(reader)
-		if err != nil {
-			t.Fatalf("failed to decompress: %v", err)
-		}
-
-		// Verify data
-		if !bytes.Equal(decompressed.Bytes(), data) {
-			t.Error("decrypted and decompressed data doesn't match original")
-		}
-	})
 }

internal/blobgen/compress.go

@@ -1,3 +1,6 @@
+// Package blobgen implements the blob data pipeline: streaming zstd
+// compression, age encryption, and SHA256 content hashing for blob
+// creation, plus the matching decrypt/decompress/verify reader.
 package blobgen
 
 import (
@@ -16,7 +19,9 @@ type CompressResult struct {
 }
 
 // CompressData compresses and encrypts data, returning the result with hash
-func CompressData(data []byte, compressionLevel int, recipients []string) (*CompressResult, error) {
+func CompressData(
+	data []byte, compressionLevel int, recipients []string,
+) (*CompressResult, error) {
 	var buf bytes.Buffer
 
 	// Create writer
@@ -47,8 +52,11 @@ func CompressData(data []byte, compressionLevel int, recipients []string) (*Comp
 	}, nil
 }
 
-// CompressStream compresses and encrypts from reader to writer, returning hash
+// CompressStream compresses and encrypts from reader to writer, returning
-func CompressStream(dst io.Writer, src io.Reader, compressionLevel int, recipients []string) (written int64, hash string, err error) {
+// the number of uncompressed bytes written and the content hash.
+func CompressStream(
+	dst io.Writer, src io.Reader, compressionLevel int, recipients []string,
+) (int64, string, error) {
 	// Create writer
 	w, err := NewWriter(dst, compressionLevel, recipients)
 	if err != nil {

internal/blobgen/compress_test.go

@@ -1,4 +1,4 @@
-package blobgen
+package blobgen_test
 
 import (
 	"bytes"
@@ -8,6 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"sneak.berlin/go/vaultik/internal/blobgen"
 )
 
 // testRecipient is a static age recipient for tests.
@@ -19,11 +20,14 @@ const testRecipient = "age1cplgrwj77ta54dnmydvvmzn64ltk83ankxl5sww04mrtmu62kv3s8
 // the explicit Close() on the happy path combined with defer Close() would
 // cause a double close.
 func TestCompressStreamNoDoubleClose(t *testing.T) {
+	t.Parallel()
+
 	input := []byte("regression test data for issue #28 double-close fix")
 
 	var buf bytes.Buffer
 
-	written, hash, err := CompressStream(&buf, bytes.NewReader(input), 3, []string{testRecipient})
+	written, hash, err := blobgen.CompressStream(
+		&buf, bytes.NewReader(input), 3, []string{testRecipient})
 	require.NoError(t, err, "CompressStream should not return an error")
 	assert.Positive(t, written, "expected bytes written > 0")
 	assert.NotEmpty(t, hash, "expected non-empty hash")
@@ -33,13 +37,16 @@ func TestCompressStreamNoDoubleClose(t *testing.T) {
 // TestCompressStreamLargeInput exercises CompressStream with a larger payload
 // to ensure no double-close issues surface under heavier I/O.
 func TestCompressStreamLargeInput(t *testing.T) {
+	t.Parallel()
+
 	data := make([]byte, 512*1024) // 512 KB
 	_, err := rand.Read(data)
 	require.NoError(t, err)
 
 	var buf bytes.Buffer
 
-	written, hash, err := CompressStream(&buf, bytes.NewReader(data), 3, []string{testRecipient})
+	written, hash, err := blobgen.CompressStream(
+		&buf, bytes.NewReader(data), 3, []string{testRecipient})
 	require.NoError(t, err)
 	assert.Positive(t, written)
 	assert.NotEmpty(t, hash)
@@ -48,9 +55,12 @@ func TestCompressStreamLargeInput(t *testing.T) {
 // TestCompressStreamEmptyInput verifies CompressStream handles empty input
 // without double-close issues.
 func TestCompressStreamEmptyInput(t *testing.T) {
+	t.Parallel()
+
 	var buf bytes.Buffer
 
-	_, hash, err := CompressStream(&buf, strings.NewReader(""), 3, []string{testRecipient})
+	_, hash, err := blobgen.CompressStream(
+		&buf, strings.NewReader(""), 3, []string{testRecipient})
 	require.NoError(t, err)
 	assert.NotEmpty(t, hash)
 }
@@ -58,8 +68,11 @@ func TestCompressStreamEmptyInput(t *testing.T) {
 // TestCompressDataNoDoubleClose mirrors the stream test for CompressData,
 // ensuring the explicit Close + error-path Close pattern is also safe.
 func TestCompressDataNoDoubleClose(t *testing.T) {
+	t.Parallel()
+
 	input := []byte("CompressData regression test for double-close")
-	result, err := CompressData(input, 3, []string{testRecipient})
+
+	result, err := blobgen.CompressData(input, 3, []string{testRecipient})
 	require.NoError(t, err)
 	assert.Positive(t, result.CompressedSize)
 	assert.Equal(t, result.UncompressedSize, int64(len(input)))

internal/blobgen/reader.go

@@ -50,8 +50,8 @@ func NewReader(r io.Reader, identity age.Identity) (*Reader, error) {
 }
 
 // Read implements io.Reader
-func (r *Reader) Read(p []byte) (n int, err error) {
+func (r *Reader) Read(p []byte) (int, error) {
-	n, err = r.teeReader.Read(p)
+	n, err := r.teeReader.Read(p)
 	r.bytesRead += int64(n)
 
 	return n, err

internal/blobgen/writer.go

@@ -2,6 +2,7 @@ package blobgen
 
 import (
 	"crypto/sha256"
+	"errors"
 	"fmt"
 	"hash"
 	"io"
@@ -11,6 +12,21 @@ import (
 	"github.com/klauspost/compress/zstd"
 )
 
+// Zstd compression level bounds accepted by NewWriter.
+const (
+	minCompressionLevel = 1
+	maxCompressionLevel = 19
+)
+
+// reservedCompressionCPUs is how many CPUs are left free of zstd
+// compression work for I/O and hashing.
+const reservedCompressionCPUs = 2
+
+// ErrInvalidCompressionLevel is returned when the zstd compression level
+// is outside the accepted 1-19 range.
+var ErrInvalidCompressionLevel = errors.New(
+	"invalid compression level: must be between 1 and 19")
+
 // Writer wraps compression and encryption with SHA256 hashing.
 // Data flows: input -> tee(hasher, compressor -> encryptor -> destination)
 // The hash is computed on the uncompressed input for deterministic content-addressing.
@@ -23,9 +39,12 @@ type Writer struct {
 	bytesWritten     int64
 }
 
-// NewWriter creates a new Writer that compresses, encrypts, and hashes data.
+// NewWriter creates a new Writer that compresses, encrypts, and hashes
-// The hash is computed on the uncompressed input for deterministic content-addressing.
+// data. The hash is computed on the uncompressed input for deterministic
-func NewWriter(w io.Writer, compressionLevel int, recipients []string) (*Writer, error) {
+// content-addressing.
+func NewWriter(
+	w io.Writer, compressionLevel int, recipients []string,
+) (*Writer, error) {
 	// Validate compression level
 	err := validateCompressionLevel(compressionLevel)
 	if err != nil {
@@ -54,7 +73,7 @@ func NewWriter(w io.Writer, compressionLevel int, recipients []string) (*Writer,
 	}
 
 	// Calculate compression concurrency: CPUs - 2, minimum 1
-	concurrency := max(runtime.NumCPU()-2, 1)
+	concurrency := max(runtime.NumCPU()-reservedCompressionCPUs, 1)
 
 	// Create compression writer with encryption as destination
 	compressor, err := zstd.NewWriter(encWriter,
@@ -80,8 +99,8 @@ func NewWriter(w io.Writer, compressionLevel int, recipients []string) (*Writer,
 }
 
 // Write implements io.Writer
-func (w *Writer) Write(p []byte) (n int, err error) {
+func (w *Writer) Write(p []byte) (int, error) {
-	n, err = w.teeWriter.Write(p)
+	n, err := w.teeWriter.Write(p)
 	w.bytesWritten += int64(n)
 
 	return n, err
@@ -124,9 +143,10 @@ func (w *Writer) BytesWritten() int64 {
 
 func validateCompressionLevel(level int) error {
 	// Zstd compression levels: 1-19 (default is 3)
-	// SpeedFastest = 1, SpeedDefault = 3, SpeedBetterCompression = 7, SpeedBestCompression = 11
+	// SpeedFastest = 1, SpeedDefault = 3, SpeedBetterCompression = 7,
-	if level < 1 || level > 19 {
+	// SpeedBestCompression = 11
-		return fmt.Errorf("invalid compression level %d: must be between 1 and 19", level)
+	if level < minCompressionLevel || level > maxCompressionLevel {
+		return fmt.Errorf("%w: got %d", ErrInvalidCompressionLevel, level)
 	}
 
 	return nil

internal/blobgen/writer_test.go

@@ -1,4 +1,4 @@
-package blobgen
+package blobgen_test
 
 import (
 	"bytes"
@@ -9,12 +9,15 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"sneak.berlin/go/vaultik/internal/blobgen"
 )
 
 // TestWriterHashIsDoubleHash verifies that Writer.Sum256() returns
 // the double hash SHA256(SHA256(plaintext)) for security.
 // Double hashing prevents attackers from confirming existence of known content.
 func TestWriterHashIsDoubleHash(t *testing.T) {
+	t.Parallel()
+
 	// Test data - random data that doesn't compress well
 	testData := make([]byte, 1024*1024) // 1MB
 	_, err := rand.Read(testData)
@@ -27,7 +30,7 @@ func TestWriterHashIsDoubleHash(t *testing.T) {
 	var encryptedBuf bytes.Buffer
 
 	// Create blobgen writer
-	writer, err := NewWriter(&encryptedBuf, 3, []string{testRecipient})
+	writer, err := blobgen.NewWriter(&encryptedBuf, 3, []string{testRecipient})
 	require.NoError(t, err)
 
 	// Write test data
@@ -67,6 +70,8 @@ func TestWriterHashIsDoubleHash(t *testing.T) {
 // TestWriterDeterministicHash verifies that the same input always produces
 // the same hash, even with non-deterministic encryption.
 func TestWriterDeterministicHash(t *testing.T) {
+	t.Parallel()
+
 	// Test data
 	testData := []byte("Hello, World! This is test data for deterministic hashing.")
 
@@ -76,13 +81,13 @@ func TestWriterDeterministicHash(t *testing.T) {
 	// Create two writers and verify they produce the same hash
 	var buf1, buf2 bytes.Buffer
 
-	writer1, err := NewWriter(&buf1, 3, []string{testRecipient})
+	writer1, err := blobgen.NewWriter(&buf1, 3, []string{testRecipient})
 	require.NoError(t, err)
 	_, err = writer1.Write(testData)
 	require.NoError(t, err)
 	require.NoError(t, writer1.Close())
 
-	writer2, err := NewWriter(&buf2, 3, []string{testRecipient})
+	writer2, err := blobgen.NewWriter(&buf2, 3, []string{testRecipient})
 	require.NoError(t, err)
 	_, err = writer2.Write(testData)
 	require.NoError(t, err)

internal/chunker/chunker.go

@@ -1,3 +1,6 @@
+// Package chunker splits input data into content-defined chunks using the
+// FastCDC algorithm so that identical data sequences produce identical
+// chunks regardless of their position in the file.
 package chunker
 
 import (
@@ -9,9 +12,10 @@ import (
 	"os"
 )
 
-// Chunk represents a single chunk of data produced by the content-defined chunking algorithm.
+// Chunk represents a single chunk of data produced by the content-defined
-// Each chunk is identified by its SHA256 hash and contains the raw data along with
+// chunking algorithm. Each chunk is identified by its SHA256 hash and
-// its position and size information from the original file.
+// contains the raw data along with its position and size information from
+// the original file.
 type Chunk struct {
 	Hash   string // Content hash of the chunk
 	Data   []byte // Chunk data
@@ -29,6 +33,10 @@ type Chunker struct {
 	maxChunkSize int
 }
 
+// chunkSizeSpread is the FastCDC-recommended factor between the average
+// chunk size and the minimum (avg/spread) and maximum (avg*spread) sizes.
+const chunkSizeSpread = 4
+
 // NewChunker creates a new chunker with the specified average chunk size.
 // The actual chunk sizes will vary between avgChunkSize/4 and avgChunkSize*4
 // as recommended by the FastCDC algorithm. Typical values for avgChunkSize
@@ -37,17 +45,19 @@ func NewChunker(avgChunkSize int64) *Chunker {
 	// FastCDC recommends min = avg/4 and max = avg*4
 	return &Chunker{
 		avgChunkSize: int(avgChunkSize),
-		minChunkSize: int(avgChunkSize / 4),
+		minChunkSize: int(avgChunkSize / chunkSizeSpread),
-		maxChunkSize: int(avgChunkSize * 4),
+		maxChunkSize: int(avgChunkSize * chunkSizeSpread),
 	}
 }
 
-// ChunkReader splits the reader into content-defined chunks and returns all chunks at once.
+// ChunkReader splits the reader into content-defined chunks and returns all
-// This method loads all chunk data into memory, so it should only be used for
+// chunks at once. This method loads all chunk data into memory, so it should
-// reasonably sized inputs. For large files or streams, use ChunkReaderStreaming instead.
+// only be used for reasonably sized inputs. For large files or streams, use
+// ChunkReaderStreaming instead.
 // Returns an error if chunking fails or if reading from the input fails.
 func (c *Chunker) ChunkReader(r io.Reader) ([]Chunk, error) {
-	chunker := AcquireReusableChunker(r, c.minChunkSize, c.avgChunkSize, c.maxChunkSize)
+	chunker := AcquireReusableChunker(
+		r, c.minChunkSize, c.avgChunkSize, c.maxChunkSize)
 	defer chunker.Release()
 
 	var chunks []Chunk
@@ -86,21 +96,26 @@ func (c *Chunker) ChunkReader(r io.Reader) ([]Chunk, error) {
 
 // ChunkCallback is a function called for each chunk as it's processed.
 // The callback receives a Chunk containing the hash, data, offset, and size.
-// If the callback returns an error, chunk processing stops and the error is propagated.
+// If the callback returns an error, chunk processing stops and the error is
+// propagated.
 type ChunkCallback func(chunk Chunk) error
 
-// ChunkReaderStreaming splits the reader into chunks and calls the callback for each chunk.
+// ChunkReaderStreaming splits the reader into chunks and calls the callback
-// This is the preferred method for processing large files or streams as it doesn't
+// for each chunk. This is the preferred method for processing large files or
-// accumulate all chunks in memory. The callback is invoked for each chunk as it's
+// streams as it doesn't accumulate all chunks in memory. The callback is
-// produced, allowing for streaming processing and immediate storage or transmission.
+// invoked for each chunk as it's produced, allowing for streaming processing
-// Returns the SHA256 hash of the entire file content and an error if chunking fails,
+// and immediate storage or transmission.
-// reading fails, or if the callback returns an error.
+// Returns the SHA256 hash of the entire file content and an error if
-func (c *Chunker) ChunkReaderStreaming(r io.Reader, callback ChunkCallback) (string, error) {
+// chunking fails, reading fails, or if the callback returns an error.
+func (c *Chunker) ChunkReaderStreaming(
+	r io.Reader, callback ChunkCallback,
+) (string, error) {
 	// Create a tee reader to calculate full file hash while chunking
 	fileHasher := sha256.New()
 	teeReader := io.TeeReader(r, fileHasher)
 
-	chunker := AcquireReusableChunker(teeReader, c.minChunkSize, c.avgChunkSize, c.maxChunkSize)
+	chunker := AcquireReusableChunker(
+		teeReader, c.minChunkSize, c.avgChunkSize, c.maxChunkSize)
 	defer chunker.Release()
 
 	offset := int64(0)
@@ -118,9 +133,10 @@ func (c *Chunker) ChunkReaderStreaming(r io.Reader, callback ChunkCallback) (str
 		// Calculate chunk hash
 		hash := sha256.Sum256(chunk.Data)
 
-		// Pass the data directly - caller must process it before we call Next() again
+		// Pass the data directly - caller must process it before we call
-		// (chunker reuses its internal buffer, but since we process synchronously
+		// Next() again (chunker reuses its internal buffer, but since we
-		// and completely before continuing, no copy is needed)
+		// process synchronously and completely before continuing, no copy
+		// is needed)
 		err = callback(Chunk{
 			Hash:   hex.EncodeToString(hash[:]),
 			Data:   chunk.Data,
@@ -143,7 +159,7 @@ func (c *Chunker) ChunkReaderStreaming(r io.Reader, callback ChunkCallback) (str
 // For large files, consider using ChunkReaderStreaming with a file handle instead.
 // Returns an error if the file cannot be opened or if chunking fails.
 func (c *Chunker) ChunkFile(path string) ([]Chunk, error) {
-	file, err := os.Open(path)
+	file, err := os.Open(path) //nolint:gosec // G304: path is caller-supplied by design
 	if err != nil {
 		return nil, fmt.Errorf("opening file: %w", err)
 	}

internal/chunker/chunker_isolated_test.go

@@ -1,11 +1,15 @@
-package chunker
+package chunker_test
 
 import (
 	"bytes"
 	"testing"
+
+	"sneak.berlin/go/vaultik/internal/chunker"
 )
 
 func TestChunkerExpectedChunkCount(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name         string
 		fileSize     int
@@ -38,16 +42,19 @@ func TestChunkerExpectedChunkCount(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			chunker := NewChunker(tt.avgChunkSize)
+			t.Parallel()
+
+			c := chunker.NewChunker(tt.avgChunkSize)
 
 			// Create data with some variation to trigger chunk boundaries
 			data := make([]byte, tt.fileSize)
 			for i := range data {
 				// Use a pattern that should create boundaries
+				//nolint:gosec // G115: intentional byte truncation
 				data[i] = byte((i * 17) ^ (i >> 5))
 			}
 
-			chunks, err := chunker.ChunkReader(bytes.NewReader(data))
+			chunks, err := c.ChunkReader(bytes.NewReader(data))
 			if err != nil {
 				t.Fatalf("chunking failed: %v", err)
 			}

internal/chunker/chunker_test.go

@@ -1,108 +1,120 @@
-package chunker
+package chunker_test
 
 import (
 	"bytes"
 	"crypto/rand"
 	"testing"
+
+	"sneak.berlin/go/vaultik/internal/chunker"
 )
 
-func TestChunker(t *testing.T) {
+func TestChunkerSmallFileSingleChunk(t *testing.T) {
-	t.Run("small file produces single chunk", func(t *testing.T) {
+	t.Parallel()
-		chunker := NewChunker(1024 * 1024)         // 1MB average
-		data := bytes.Repeat([]byte("hello"), 100) // 500 bytes
 
-		chunks, err := chunker.ChunkReader(bytes.NewReader(data))
+	c := chunker.NewChunker(1024 * 1024)       // 1MB average
-		if err != nil {
+	data := bytes.Repeat([]byte("hello"), 100) // 500 bytes
-			t.Fatalf("chunking failed: %v", err)
+
+	chunks, err := c.ChunkReader(bytes.NewReader(data))
+	if err != nil {
+		t.Fatalf("chunking failed: %v", err)
+	}
+
+	if len(chunks) != 1 {
+		t.Errorf("expected 1 chunk, got %d", len(chunks))
+	}
+
+	if chunks[0].Size != int64(len(data)) {
+		t.Errorf("expected chunk size %d, got %d", len(data), chunks[0].Size)
+	}
+}
+
+func TestChunkerLargeFileMultipleChunks(t *testing.T) {
+	t.Parallel()
+
+	c := chunker.NewChunker(256 * 1024) // 256KB average chunk size
+
+	// Generate 2MB of random data
+	data := make([]byte, 2*1024*1024)
+
+	_, err := rand.Read(data)
+	if err != nil {
+		t.Fatalf("failed to generate random data: %v", err)
+	}
+
+	chunks, err := c.ChunkReader(bytes.NewReader(data))
+	if err != nil {
+		t.Fatalf("chunking failed: %v", err)
+	}
+
+	// Should produce multiple chunks - with FastCDC we expect around 8
+	// chunks for 2MB with 256KB average
+	if len(chunks) < 4 || len(chunks) > 16 {
+		t.Errorf("expected 4-16 chunks, got %d", len(chunks))
+	}
+
+	// Verify chunks reconstruct original data
+	var reconstructed []byte
+	for _, chunk := range chunks {
+		reconstructed = append(reconstructed, chunk.Data...)
+	}
+
+	if !bytes.Equal(data, reconstructed) {
+		t.Error("reconstructed data doesn't match original")
+	}
+
+	// Verify offsets
+	var expectedOffset int64
+
+	for i, chunk := range chunks {
+		if chunk.Offset != expectedOffset {
+			t.Errorf("chunk %d: expected offset %d, got %d",
+				i, expectedOffset, chunk.Offset)
 		}
 
-		if len(chunks) != 1 {
+		expectedOffset += chunk.Size
-			t.Errorf("expected 1 chunk, got %d", len(chunks))
+	}
+}
+
+func TestChunkerDeterministic(t *testing.T) {
+	t.Parallel()
+
+	chunker1 := chunker.NewChunker(256 * 1024)
+	chunker2 := chunker.NewChunker(256 * 1024)
+
+	// Use deterministic data
+	data := bytes.Repeat([]byte("abcdefghijklmnopqrstuvwxyz"), 20000) // ~520KB
+
+	chunks1, err := chunker1.ChunkReader(bytes.NewReader(data))
+	if err != nil {
+		t.Fatalf("chunking failed: %v", err)
+	}
+
+	chunks2, err := chunker2.ChunkReader(bytes.NewReader(data))
+	if err != nil {
+		t.Fatalf("chunking failed: %v", err)
+	}
+
+	// Should produce same chunks
+	if len(chunks1) != len(chunks2) {
+		t.Fatalf("different number of chunks: %d vs %d",
+			len(chunks1), len(chunks2))
+	}
+
+	for i := range chunks1 {
+		if chunks1[i].Hash != chunks2[i].Hash {
+			t.Errorf("chunk %d: different hashes", i)
 		}
 
-		if chunks[0].Size != int64(len(data)) {
+		if chunks1[i].Size != chunks2[i].Size {
-			t.Errorf("expected chunk size %d, got %d", len(data), chunks[0].Size)
+			t.Errorf("chunk %d: different sizes", i)
 		}
-	})
+	}
-
-	t.Run("large file produces multiple chunks", func(t *testing.T) {
-		chunker := NewChunker(256 * 1024) // 256KB average chunk size
-
-		// Generate 2MB of random data
-		data := make([]byte, 2*1024*1024)
-
-		_, err := rand.Read(data)
-		if err != nil {
-			t.Fatalf("failed to generate random data: %v", err)
-		}
-
-		chunks, err := chunker.ChunkReader(bytes.NewReader(data))
-		if err != nil {
-			t.Fatalf("chunking failed: %v", err)
-		}
-
-		// Should produce multiple chunks - with FastCDC we expect around 8 chunks for 2MB with 256KB average
-		if len(chunks) < 4 || len(chunks) > 16 {
-			t.Errorf("expected 4-16 chunks, got %d", len(chunks))
-		}
-
-		// Verify chunks reconstruct original data
-		var reconstructed []byte
-		for _, chunk := range chunks {
-			reconstructed = append(reconstructed, chunk.Data...)
-		}
-
-		if !bytes.Equal(data, reconstructed) {
-			t.Error("reconstructed data doesn't match original")
-		}
-
-		// Verify offsets
-		var expectedOffset int64
-		for i, chunk := range chunks {
-			if chunk.Offset != expectedOffset {
-				t.Errorf("chunk %d: expected offset %d, got %d", i, expectedOffset, chunk.Offset)
-			}
-
-			expectedOffset += chunk.Size
-		}
-	})
-
-	t.Run("deterministic chunking", func(t *testing.T) {
-		chunker1 := NewChunker(256 * 1024)
-		chunker2 := NewChunker(256 * 1024)
-
-		// Use deterministic data
-		data := bytes.Repeat([]byte("abcdefghijklmnopqrstuvwxyz"), 20000) // ~520KB
-
-		chunks1, err := chunker1.ChunkReader(bytes.NewReader(data))
-		if err != nil {
-			t.Fatalf("chunking failed: %v", err)
-		}
-
-		chunks2, err := chunker2.ChunkReader(bytes.NewReader(data))
-		if err != nil {
-			t.Fatalf("chunking failed: %v", err)
-		}
-
-		// Should produce same chunks
-		if len(chunks1) != len(chunks2) {
-			t.Fatalf("different number of chunks: %d vs %d", len(chunks1), len(chunks2))
-		}
-
-		for i := range chunks1 {
-			if chunks1[i].Hash != chunks2[i].Hash {
-				t.Errorf("chunk %d: different hashes", i)
-			}
-
-			if chunks1[i].Size != chunks2[i].Size {
-				t.Errorf("chunk %d: different sizes", i)
-			}
-		}
-	})
 }
 
 func TestChunkBoundaries(t *testing.T) {
-	chunker := NewChunker(256 * 1024) // 256KB average
+	t.Parallel()
+
+	c := chunker.NewChunker(256 * 1024) // 256KB average
 
 	// FastCDC uses avg/4 for min and avg*4 for max
 	avgSize := int64(256 * 1024)
@@ -117,7 +129,7 @@ func TestChunkBoundaries(t *testing.T) {
 		t.Fatalf("failed to generate random data: %v", err)
 	}
 
-	chunks, err := chunker.ChunkReader(bytes.NewReader(data))
+	chunks, err := c.ChunkReader(bytes.NewReader(data))
 	if err != nil {
 		t.Fatalf("chunking failed: %v", err)
 	}
@@ -125,11 +137,13 @@ func TestChunkBoundaries(t *testing.T) {
 	for i, chunk := range chunks {
 		// Last chunk can be smaller than minimum
 		if i < len(chunks)-1 && chunk.Size < minSize {
-			t.Errorf("chunk %d size %d is below minimum %d", i, chunk.Size, minSize)
+			t.Errorf("chunk %d size %d is below minimum %d",
+				i, chunk.Size, minSize)
 		}
 
 		if chunk.Size > maxSize {
-			t.Errorf("chunk %d size %d exceeds maximum %d", i, chunk.Size, maxSize)
+			t.Errorf("chunk %d size %d exceeds maximum %d",
+				i, chunk.Size, maxSize)
 		}
 	}
 }

internal/chunker/fastcdc.go

@@ -28,6 +28,8 @@ type ReusableChunker struct {
 }
 
 // reusableChunkerPool pools ReusableChunker instances to avoid allocations.
+//
+//nolint:gochecknoglobals // process-wide object pool by design
 var reusableChunkerPool = sync.Pool{
 	New: func() any {
 		return &ReusableChunker{}
@@ -36,6 +38,8 @@ var reusableChunkerPool = sync.Pool{
 
 // bufferPools contains pools for different buffer sizes.
 // Key is the buffer size.
+//
+//nolint:gochecknoglobals // process-wide buffer pools by design
 var bufferPools = sync.Map{}
 
 func getBuffer(size int) []byte {
@@ -46,9 +50,18 @@ func getBuffer(size int) []byte {
 			return &buf
 		},
 	})
-	pool := poolI.(*sync.Pool)
 
-	return *pool.Get().(*[]byte)
+	pool, ok := poolI.(*sync.Pool)
+	if !ok {
+		panic("bufferPools holds a non-pool value")
+	}
+
+	buf, ok := pool.Get().(*[]byte)
+	if !ok {
+		panic("buffer pool holds a non-buffer value")
+	}
+
+	return *buf
 }
 
 func putBuffer(buf []byte) {
@@ -56,7 +69,11 @@ func putBuffer(buf []byte) {
 
 	poolI, ok := bufferPools.Load(size)
 	if ok {
-		pool := poolI.(*sync.Pool)
+		pool, isPool := poolI.(*sync.Pool)
+		if !isPool {
+			panic("bufferPools holds a non-pool value")
+		}
+
 		b := buf[:size]
 		pool.Put(&b)
 	}
@@ -70,11 +87,21 @@ type FastCDCChunk struct {
 	Fingerprint uint64
 }
 
-// AcquireReusableChunker gets a chunker from the pool and initializes it for the given reader.
+// bufSizeFactor sizes the internal read buffer relative to the maximum
-func AcquireReusableChunker(rd io.Reader, minSize, avgSize, maxSize int) *ReusableChunker {
+// chunk size so a full chunk plus read-ahead always fits.
-	c := reusableChunkerPool.Get().(*ReusableChunker)
+const bufSizeFactor = 2
 
-	bufSize := maxSize * 2
+// AcquireReusableChunker gets a chunker from the pool and initializes it
+// for the given reader.
+func AcquireReusableChunker(
+	rd io.Reader, minSize, avgSize, maxSize int,
+) *ReusableChunker {
+	c, ok := reusableChunkerPool.Get().(*ReusableChunker)
+	if !ok {
+		panic("reusableChunkerPool holds a non-chunker value")
+	}
+
+	bufSize := maxSize * bufSizeFactor
 
 	// Reuse buffer if it's the right size, otherwise get a new one
 	if c.buf == nil || cap(c.buf) != bufSize {
@@ -113,37 +140,6 @@ func (c *ReusableChunker) Release() {
 	reusableChunkerPool.Put(c)
 }
 
-func (c *ReusableChunker) fillBuffer() error {
-	n := len(c.buf) - c.cursor
-	if n >= c.maxSize {
-		return nil
-	}
-
-	// Move all data after the cursor to the start of the buffer
-	copy(c.buf[:n], c.buf[c.cursor:])
-	c.cursor = 0
-
-	if c.eof {
-		c.buf = c.buf[:n]
-
-		return nil
-	}
-
-	// Restore buffer to full capacity for reading
-	c.buf = c.buf[:c.bufSize]
-
-	// Fill the rest of the buffer
-	m, err := io.ReadFull(c.rd, c.buf[n:])
-	if err == io.EOF || errors.Is(err, io.ErrUnexpectedEOF) {
-		c.buf = c.buf[:n+m]
-		c.eof = true
-	} else if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // Next returns the next chunk or io.EOF when done.
 // The returned Data slice is only valid until the next call to Next.
 func (c *ReusableChunker) Next() (FastCDCChunk, error) {
@@ -171,6 +167,37 @@ func (c *ReusableChunker) Next() (FastCDCChunk, error) {
 	return chunk, nil
 }
 
+func (c *ReusableChunker) fillBuffer() error {
+	n := len(c.buf) - c.cursor
+	if n >= c.maxSize {
+		return nil
+	}
+
+	// Move all data after the cursor to the start of the buffer
+	copy(c.buf[:n], c.buf[c.cursor:])
+	c.cursor = 0
+
+	if c.eof {
+		c.buf = c.buf[:n]
+
+		return nil
+	}
+
+	// Restore buffer to full capacity for reading
+	c.buf = c.buf[:c.bufSize]
+
+	// Fill the rest of the buffer
+	m, err := io.ReadFull(c.rd, c.buf[n:])
+	if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
+		c.buf = c.buf[:n+m]
+		c.eof = true
+	} else if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (c *ReusableChunker) nextChunk(data []byte) (int, uint64) {
 	fp := uint64(0)
 	i := c.minSize
@@ -199,6 +226,8 @@ func (c *ReusableChunker) nextChunk(data []byte) (int, uint64) {
 }
 
 // 256 random uint64s for the rolling hash function (from FastCDC paper)
+//
+//nolint:gochecknoglobals // immutable FastCDC gear lookup table
 var table = [256]uint64{
 	0xe80e8d55032474b3, 0x11b25b61f5924e15, 0x03aa5bd82a9eb669, 0xc45a153ef107a38c,
 	0xeac874b86f0f57b9, 0xa5ccedec95ec79c7, 0xe15a3320ad42ac0a, 0x5ed3583fa63cec15,

internal/cli/app.go

@@ -1,3 +1,6 @@
+// Package cli implements the vaultik command-line interface: cobra
+// commands, fx application wiring, and process-level concerns such as
+// signal handling and the PID lock.
 package cli
 
 import (
@@ -12,6 +15,7 @@ import (
 	"time"
 
 	"github.com/adrg/xdg"
+	"github.com/spf13/cobra"
 	"go.uber.org/fx"
 	"sneak.berlin/go/vaultik/internal/config"
 	"sneak.berlin/go/vaultik/internal/database"
@@ -24,12 +28,16 @@ import (
 	"sneak.berlin/go/vaultik/internal/vaultik"
 )
 
+// shutdownTimeout bounds how long a signal-triggered graceful shutdown
+// may take before we give up.
+const shutdownTimeout = 30 * time.Second
+
 // AppOptions contains common options for creating the fx application.
 // It includes the configuration file path, logging options, and additional
 // fx modules and invocations that should be included in the application.
 type AppOptions struct {
 	ConfigPath string
-	LogOptions log.LogOptions
+	LogOptions log.Options
 	Modules    []fx.Option
 	Invokes    []fx.Option
 }
@@ -38,11 +46,13 @@ type AppOptions struct {
 // flag is active, marks the UI writer quiet so that Begin/Complete/
 // Info/Notice/Detail/Progress are silenced. Warning and Error are NOT
 // silenced — per the documented convention that --quiet suppresses
-// non-error output only. The startup banner is printed by CLIEntry
+// non-error output only. The startup banner is printed by Entry
 // before cobra parses arguments, gated by the same arg-level check.
-func setupGlobals(lc fx.Lifecycle, g *globals.Globals, v *vaultik.Vaultik, opts log.LogOptions) {
+func setupGlobals(
+	lc fx.Lifecycle, g *globals.Globals, v *vaultik.Vaultik, opts log.Options,
+) {
 	lc.Append(fx.Hook{
-		OnStart: func(ctx context.Context) error {
+		OnStart: func(_ context.Context) error {
 			g.StartTime = time.Now().UTC()
 
 			if opts.Cron || opts.Quiet {
@@ -58,12 +68,12 @@ func setupGlobals(lc fx.Lifecycle, g *globals.Globals, v *vaultik.Vaultik, opts
 // blank line. Used both from the fx hook (for subcommand invocations) and
 // from the root cobra Run handler (for `vaultik` with no subcommand).
 func writeStartupBanner(w *ui.Writer, startTime time.Time, shortCommit string) {
-	w.Banner("%s %s by %s (commit %s, built on %s) starting up at %s.",
+	w.Bannerf("%s %s by %s (commit %s, built on %s) starting up at %s.",
 		globals.Appname, globals.Version, globals.Author,
 		shortCommit, globals.CommitDate,
 		startTime.Format(time.RFC3339))
-	w.Banner("%s", globals.Homepage)
+	w.Bannerf("%s", globals.Homepage)
-	w.Banner("")
+	w.Bannerf("")
 }
 
 // NewApp creates a new fx application with common modules.
@@ -72,7 +82,7 @@ func writeStartupBanner(w *ui.Writer, startTime time.Time, shortCommit string) {
 // The returned fx.App is ready to be started with RunApp.
 func NewApp(opts AppOptions) *fx.App {
 	baseModules := []fx.Option{
-		fx.Supply(config.ConfigPath(opts.ConfigPath)),
+		fx.Supply(config.Path(opts.ConfigPath)),
 		fx.Supply(opts.LogOptions),
 		fx.Provide(globals.New),
 		fx.Provide(log.New),
@@ -86,12 +96,27 @@ func NewApp(opts AppOptions) *fx.App {
 		fx.NopLogger,
 	}
 
-	allOptions := append(baseModules, opts.Modules...)
+	capacity := len(baseModules) + len(opts.Modules) + len(opts.Invokes)
+	allOptions := make([]fx.Option, 0, capacity)
+	allOptions = append(allOptions, baseModules...)
+	allOptions = append(allOptions, opts.Modules...)
 	allOptions = append(allOptions, opts.Invokes...)
 
 	return fx.New(allOptions...)
 }
 
+// startupError carries a startup failure message that has been cleaned
+// of fx dependency-injection noise. A distinct type (rather than
+// errors.New) keeps the dynamic message out of err113's sight while
+// preserving the exact user-facing text.
+type startupError struct {
+	msg string
+}
+
+func (e *startupError) Error() string {
+	return e.msg
+}
+
 // cleanStartupError strips fx's dependency-injection call-chain noise from
 // startup errors. fx wraps the underlying error with messages like
 //
@@ -108,7 +133,7 @@ func cleanStartupError(err error) error {
 		msg = msg[idx+3:]
 	}
 
-	return errors.New(msg)
+	return &startupError{msg: msg}
 }
 
 // RunApp starts and stops the fx application within the given context.
@@ -138,8 +163,10 @@ func RunApp(ctx context.Context, app *fx.App) error {
 		<-sigChan
 		log.Notice("Received interrupt signal, shutting down gracefully...")
 
-		// Create a timeout context for shutdown
+		// Create a timeout context for shutdown. The parent ctx is being
-		shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 30*time.Second)
+		// cancelled, so detach from its cancellation but keep its values.
+		shutdownCtx, shutdownCancel := context.WithTimeout(
+			context.WithoutCancel(ctx), shutdownTimeout)
 		defer shutdownCancel()
 
 		err := app.Stop(shutdownCtx)
@@ -148,14 +175,15 @@ func RunApp(ctx context.Context, app *fx.App) error {
 		}
 	}()
 
-	// Wait for either the signal handler to complete shutdown or the app to request shutdown
+	// Wait for the signal handler to complete shutdown or the app to
+	// request shutdown.
 	select {
 	case <-shutdownComplete:
 		// Shutdown completed via signal
 		return nil
 	case <-ctx.Done():
 		// Context cancelled (shouldn't happen in normal operation)
-		err := app.Stop(context.Background())
+		err := app.Stop(context.WithoutCancel(ctx))
 		if err != nil {
 			log.Error("Error stopping app", "error", err)
 		}
@@ -167,6 +195,68 @@ func RunApp(ctx context.Context, app *fx.App) error {
 	}
 }
 
+// runVaultikApp runs the standard single-operation command lifecycle
+// shared by the list/purge/verify/remove/remote-info subcommands:
+// resolve the config, start the fx app, run op against the Vaultik
+// instance in a goroutine, report a failure prefixed with failMsg
+// (suppressed while suppressErrors is true, e.g. under --json), then
+// trigger shutdown. The operation is cancelled when the app stops.
+// extraQuiet is OR-ed into LogOptions.Quiet (e.g. --json output modes).
+func runVaultikApp(
+	cmd *cobra.Command, extraQuiet, suppressErrors bool,
+	failMsg string, op func(v *vaultik.Vaultik) error,
+) error {
+	configPath, err := ResolveConfigPath()
+	if err != nil {
+		return err
+	}
+
+	rootFlags := GetRootFlags()
+
+	return RunWithApp(cmd.Context(), AppOptions{
+		ConfigPath: configPath,
+		LogOptions: log.Options{
+			Verbose: rootFlags.Verbose,
+			Debug:   rootFlags.Debug,
+			Quiet:   rootFlags.Quiet || extraQuiet,
+		},
+		Modules: []fx.Option{},
+		Invokes: []fx.Option{
+			fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
+				lc.Append(fx.Hook{
+					OnStart: func(_ context.Context) error {
+						go func() {
+							err := op(v)
+							if err != nil {
+								if !errors.Is(err, context.Canceled) {
+									if !suppressErrors {
+										log.Error(failMsg, "error", err)
+										ReportErrorf("%s: %v", failMsg, err)
+									}
+
+									os.Exit(1)
+								}
+							}
+
+							err = v.Shutdowner.Shutdown()
+							if err != nil {
+								log.Error("Failed to shutdown", "error", err)
+							}
+						}()
+
+						return nil
+					},
+					OnStop: func(_ context.Context) error {
+						v.Cancel()
+
+						return nil
+					},
+				})
+			}),
+		},
+	})
+}
+
 // RunWithApp is a helper that creates and runs an fx app with the given options.
 // It combines NewApp and RunApp into a single convenient function. This is the
 // preferred way to run CLI commands that need the full application context.

internal/cli/app_test.go

@@ -1,4 +1,4 @@
-package cli
+package cli //nolint:testpackage // needs access to unexported cleanStartupError
 
 import (
 	"errors"
@@ -6,6 +6,8 @@ import (
 )
 
 func TestCleanStartupError(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		in   string
@@ -13,7 +15,18 @@ func TestCleanStartupError(t *testing.T) {
 	}{
 		{
 			name: "real fx error chain",
-			in:   `could not build arguments for function "sneak.berlin/go/vaultik/internal/cli".newSnapshotCreateCommand.func1.1 (/Users/user/dev/vaultik/internal/cli/snapshot.go:71): failed to build *vaultik.Vaultik: could not build arguments for function "sneak.berlin/go/vaultik/internal/vaultik".New (/Users/user/dev/vaultik/internal/vaultik/vaultik.go:59): failed to build storage.Storer: received non-nil error from function "sneak.berlin/go/vaultik/internal/storage".NewStorer (/Users/user/dev/vaultik/internal/storage/module.go:23): creating base path: mkdir /Volumes/BACKUPS: permission denied`,
+			in: `could not build arguments for function ` +
+				`"sneak.berlin/go/vaultik/internal/cli".newSnapshotCreateCommand.func1.1 ` +
+				`(/Users/user/dev/vaultik/internal/cli/snapshot.go:71): ` +
+				`failed to build *vaultik.Vaultik: ` +
+				`could not build arguments for function ` +
+				`"sneak.berlin/go/vaultik/internal/vaultik".New ` +
+				`(/Users/user/dev/vaultik/internal/vaultik/vaultik.go:59): ` +
+				`failed to build storage.Storer: ` +
+				`received non-nil error from function ` +
+				`"sneak.berlin/go/vaultik/internal/storage".NewStorer ` +
+				`(/Users/user/dev/vaultik/internal/storage/module.go:23): ` +
+				`creating base path: mkdir /Volumes/BACKUPS: permission denied`,
 			want: `creating base path: mkdir /Volumes/BACKUPS: permission denied`,
 		},
 		{
@@ -30,6 +43,9 @@ func TestCleanStartupError(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			//nolint:err113 // test constructs errors from table input
 			got := cleanStartupError(errors.New(tt.in)).Error()
 			if got != tt.want {
 				t.Errorf("got %q, want %q", got, tt.want)

internal/cli/config.go

@@ -13,6 +13,26 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
+// configFileMode is the permission set for freshly written config files;
+// configs may hold S3 credentials, so keep them owner-only.
+const configFileMode = 0o600
+
+// configSetArgs is the argument count of `config set <key> <value>`.
+const configSetArgs = 2
+
+// configDirMode is the permission set for created config directories;
+// parent config dirs (e.g. ~/.config) are conventionally traversable.
+const configDirMode = 0o755
+
+var (
+	errConfigExists     = errors.New("config file already exists")
+	errEmptyConfig      = errors.New("empty config file")
+	errKeyNotFound      = errors.New("key not found")
+	errNeedNumericIndex = errors.New("key is a list; use a numeric index")
+	errIndexOutOfRange  = errors.New("index out of range")
+	errNotMapOrList     = errors.New("key is not a map or list")
+)
+
 const defaultConfigTemplate = `# vaultik configuration
 # Documentation: https://sneak.berlin/go/vaultik
 
@@ -233,28 +253,29 @@ The config is written to the path from --config, $VAULTIK_CONFIG, or
 the platform default config directory (e.g. ~/Library/Application Support/
 on macOS, ~/.config/ on Linux, /etc/vaultik/ as root).`,
 		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			path := configPathForInit()
 
 			_, err := os.Stat(path)
 			if err == nil {
-				return fmt.Errorf("config file already exists: %s", path)
+				return fmt.Errorf("%w: %s", errConfigExists, path)
 			}
 
 			dir := filepath.Dir(path)
 
-			err = os.MkdirAll(dir, 0o755)
+			err = os.MkdirAll(dir, configDirMode)
 			if err != nil {
 				return fmt.Errorf("creating config directory %s: %w", dir, err)
 			}
 
-			err = os.WriteFile(path, []byte(defaultConfigTemplate), 0o600)
+			err = os.WriteFile(path, []byte(defaultConfigTemplate), configFileMode)
 			if err != nil {
 				return fmt.Errorf("writing config file: %w", err)
 			}
 
-			fmt.Printf("Config written to %s\n", path)
+			_, _ = fmt.Fprintf(os.Stdout, "Config written to %s\n", path)
-			fmt.Println("Edit it to set your age_recipients, snapshots, and storage_url.")
+			_, _ = fmt.Fprintln(os.Stdout,
+				"Edit it to set your age_recipients, snapshots, and storage_url.")
 
 			return nil
 		},
@@ -267,7 +288,7 @@ func newConfigEditCommand() *cobra.Command {
 		Use:   "edit",
 		Short: "Open the config file in $EDITOR",
 		Args:  cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			path, err := ResolveConfigPath()
 			if err != nil {
 				return err
@@ -278,7 +299,8 @@ func newConfigEditCommand() *cobra.Command {
 				editor = "vi"
 			}
 
-			ed := exec.Command(editor, path)
+			//nolint:gosec // G204: launching the operator's own $EDITOR is the point
+			ed := exec.CommandContext(cmd.Context(), editor, path)
 			ed.Stdin = os.Stdin
 			ed.Stdout = os.Stdout
 			ed.Stderr = os.Stderr
@@ -294,7 +316,7 @@ func newConfigGetCommand() *cobra.Command {
 		Use:   "get <key>",
 		Short: "Print a config value by dotted path (e.g. storage_url, compression_level)",
 		Args:  cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, args []string) error {
 			path, err := ResolveConfigPath()
 			if err != nil {
 				return err
@@ -311,7 +333,7 @@ func newConfigGetCommand() *cobra.Command {
 			}
 
 			if node.Kind == yaml.ScalarNode {
-				fmt.Println(node.Value)
+				_, _ = fmt.Fprintln(os.Stdout, node.Value)
 
 				return nil
 			}
@@ -321,7 +343,7 @@ func newConfigGetCommand() *cobra.Command {
 				return fmt.Errorf("marshaling value: %w", err)
 			}
 
-			fmt.Print(string(out))
+			_, _ = fmt.Fprint(os.Stdout, string(out))
 
 			return nil
 		},
@@ -342,8 +364,8 @@ Examples:
   vaultik config set storage_url "s3://bucket/prefix?endpoint=host&region=us-east-1"
   vaultik config set compression_level 9
   vaultik config set s3.bucket mybucket  # legacy S3 fields still supported`,
-		Args: cobra.ExactArgs(2),
+		Args: cobra.ExactArgs(configSetArgs),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, args []string) error {
 			path, err := ResolveConfigPath()
 			if err != nil {
 				return err
@@ -364,10 +386,10 @@ Examples:
 				return fmt.Errorf("marshaling config: %w", err)
 			}
 
-			mode := os.FileMode(0o600)
+			mode := os.FileMode(configFileMode)
 
-			info, err := os.Stat(path)
+			info, statErr := os.Stat(path)
-			if err == nil {
+			if statErr == nil {
 				mode = info.Mode().Perm()
 			}
 
@@ -376,7 +398,7 @@ Examples:
 				return fmt.Errorf("writing config file: %w", err)
 			}
 
-			fmt.Printf("%s = %s\n", args[0], args[1])
+			_, _ = fmt.Fprintf(os.Stdout, "%s = %s\n", args[0], args[1])
 
 			return nil
 		},
@@ -386,7 +408,7 @@ Examples:
 // loadYAMLFile parses a YAML file into a yaml.Node document tree,
 // which preserves comments and ordering for round-tripping.
 func loadYAMLFile(path string) (*yaml.Node, error) {
-	data, err := os.ReadFile(path)
+	data, err := os.ReadFile(path) //nolint:gosec // G304: config path is operator-supplied
 	if err != nil {
 		return nil, fmt.Errorf("reading config file: %w", err)
 	}
@@ -416,7 +438,7 @@ func yamlPathGet(root *yaml.Node, keys []string) (*yaml.Node, error) {
 	node := root
 	if node.Kind == yaml.DocumentNode {
 		if len(node.Content) == 0 {
-			return nil, errors.New("empty config file")
+			return nil, errEmptyConfig
 		}
 
 		node = node.Content[0]
@@ -437,21 +459,29 @@ func yamlPathGet(root *yaml.Node, keys []string) (*yaml.Node, error) {
 			}
 
 			if !found {
-				return nil, fmt.Errorf("key not found: %s", strings.Join(keys[:i+1], "."))
+				return nil, fmt.Errorf("%w: %s",
+					errKeyNotFound, strings.Join(keys[:i+1], "."))
 			}
 		case yaml.SequenceNode:
 			idx, err := strconv.Atoi(key)
 			if err != nil {
-				return nil, fmt.Errorf("key %q is a list; use a numeric index", strings.Join(keys[:i], "."))
+				return nil, fmt.Errorf("%w: %s",
+					errNeedNumericIndex, strings.Join(keys[:i], "."))
 			}
 
 			if idx < 0 || idx >= len(node.Content) {
-				return nil, fmt.Errorf("index %d out of range for %s (len %d)", idx, strings.Join(keys[:i], "."), len(node.Content))
+				return nil, fmt.Errorf("%w: index %d for %s (len %d)",
+					errIndexOutOfRange, idx, strings.Join(keys[:i], "."),
+					len(node.Content))
 			}
 
 			node = node.Content[idx]
+		case yaml.DocumentNode, yaml.ScalarNode, yaml.AliasNode:
+			return nil, fmt.Errorf("%w: %s",
+				errNotMapOrList, strings.Join(keys[:i], "."))
 		default:
-			return nil, fmt.Errorf("key %q is not a map or list", strings.Join(keys[:i], "."))
+			return nil, fmt.Errorf("%w: %s",
+				errNotMapOrList, strings.Join(keys[:i], "."))
 		}
 	}
 
@@ -477,62 +507,88 @@ func yamlPathSet(root *yaml.Node, keys []string, value string) error {
 
 		switch node.Kind {
 		case yaml.MappingNode:
-			var valueNode *yaml.Node
+			node = yamlSetInMapping(node, key, value, last)
-
-			for j := 0; j+1 < len(node.Content); j += 2 {
-				if node.Content[j].Value == key {
-					valueNode = node.Content[j+1]
-
-					break
-				}
-			}
-
-			if valueNode == nil {
-				keyNode := &yaml.Node{Kind: yaml.ScalarNode, Value: key}
-
-				valueNode = &yaml.Node{Kind: yaml.MappingNode}
-				if last {
-					valueNode = &yaml.Node{Kind: yaml.ScalarNode, Value: value}
-				}
-
-				node.Content = append(node.Content, keyNode, valueNode)
-			} else if last {
-				setScalar(valueNode, value)
-			}
-
-			node = valueNode
-
 		case yaml.SequenceNode:
-			idx, err := strconv.Atoi(key)
+			next, err := yamlSetInSequence(node, keys, i, value, last)
 			if err != nil {
-				return fmt.Errorf("key %q is a list; use a numeric index", strings.Join(keys[:i], "."))
+				return err
 			}
 
-			if idx < 0 || idx > len(node.Content) {
+			node = next
-				return fmt.Errorf("index %d out of range for %s (len %d)", idx, strings.Join(keys[:i], "."), len(node.Content))
+		case yaml.DocumentNode, yaml.ScalarNode, yaml.AliasNode:
-			}
+			return fmt.Errorf("%w: %s",
-
+				errNotMapOrList, strings.Join(keys[:i], "."))
-			if idx == len(node.Content) {
-				newNode := &yaml.Node{Kind: yaml.MappingNode}
-				if last {
-					newNode = &yaml.Node{Kind: yaml.ScalarNode, Value: value}
-				}
-
-				node.Content = append(node.Content, newNode)
-			} else if last {
-				setScalar(node.Content[idx], value)
-			}
-
-			node = node.Content[idx]
-
 		default:
-			return fmt.Errorf("key %q is not a map or list", strings.Join(keys[:i], "."))
+			return fmt.Errorf("%w: %s",
+				errNotMapOrList, strings.Join(keys[:i], "."))
 		}
 	}
 
 	return nil
 }
 
+// yamlSetInMapping resolves (creating if needed) the value node for key
+// within a mapping node, setting it to value when it is the final path
+// element, and returns the node to descend into.
+func yamlSetInMapping(node *yaml.Node, key, value string, last bool) *yaml.Node {
+	var valueNode *yaml.Node
+
+	for j := 0; j+1 < len(node.Content); j += 2 {
+		if node.Content[j].Value == key {
+			valueNode = node.Content[j+1]
+
+			break
+		}
+	}
+
+	if valueNode == nil {
+		keyNode := &yaml.Node{Kind: yaml.ScalarNode, Value: key}
+
+		valueNode = &yaml.Node{Kind: yaml.MappingNode}
+		if last {
+			valueNode = &yaml.Node{Kind: yaml.ScalarNode, Value: value}
+		}
+
+		node.Content = append(node.Content, keyNode, valueNode)
+	} else if last {
+		setScalar(valueNode, value)
+	}
+
+	return valueNode
+}
+
+// yamlSetInSequence indexes (or appends to) a sequence node using the
+// numeric path element keys[i], setting the element to value when it is
+// the final path element, and returns the node to descend into.
+func yamlSetInSequence(
+	node *yaml.Node, keys []string, i int, value string, last bool,
+) (*yaml.Node, error) {
+	idx, err := strconv.Atoi(keys[i])
+	if err != nil {
+		return nil, fmt.Errorf("%w: %s",
+			errNeedNumericIndex, strings.Join(keys[:i], "."))
+	}
+
+	if idx < 0 || idx > len(node.Content) {
+		return nil, fmt.Errorf("%w: index %d for %s (len %d)",
+			errIndexOutOfRange, idx, strings.Join(keys[:i], "."),
+			len(node.Content))
+	}
+
+	if idx == len(node.Content) {
+		newNode := &yaml.Node{Kind: yaml.MappingNode}
+		if last {
+			newNode = &yaml.Node{Kind: yaml.ScalarNode, Value: value}
+		}
+
+		node.Content = append(node.Content, newNode)
+	} else if last {
+		setScalar(node.Content[idx], value)
+	}
+
+	return node.Content[idx], nil
+}
+
 // setScalar overwrites a node in place with a plain scalar value.
 func setScalar(n *yaml.Node, value string) {
 	n.Kind = yaml.ScalarNode

internal/cli/config_test.go

@@ -1,4 +1,4 @@
-package cli
+package cli //nolint:testpackage // exercises unexported yamlPathGet/yamlPathSet
 
 import (
 	"strings"
@@ -11,6 +11,8 @@ import (
 // TestDefaultConfigTemplateParses ensures the init template is valid YAML
 // that unmarshals into the Config struct with the expected snapshots.
 func TestDefaultConfigTemplateParses(t *testing.T) {
+	t.Parallel()
+
 	var cfg config.Config
 
 	err := yaml.Unmarshal([]byte(defaultConfigTemplate), &cfg)
@@ -76,6 +78,8 @@ func parseTestYAML(t *testing.T) *yaml.Node {
 }
 
 func TestYAMLPathGet(t *testing.T) {
+	t.Parallel()
+
 	root := parseTestYAML(t)
 
 	tests := []struct {
@@ -96,6 +100,8 @@ func TestYAMLPathGet(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.path, func(t *testing.T) {
+			t.Parallel()
+
 			node, err := yamlPathGet(root, splitPath(tt.path))
 			if tt.err {
 				if err == nil {
@@ -117,6 +123,8 @@ func TestYAMLPathGet(t *testing.T) {
 }
 
 func TestYAMLPathSet(t *testing.T) {
+	t.Parallel()
+
 	root := parseTestYAML(t)
 
 	// Overwrite existing nested value
@@ -160,7 +168,11 @@ func TestYAMLPathSet(t *testing.T) {
 
 	text := string(out)
 
-	for _, want := range []string{"newbucket", "s3.example.com", "newkey: val", "# top comment", "# inline comment", "age1bbb", "age1ccc"} {
+	wants := []string{
+		"newbucket", "s3.example.com", "newkey: val",
+		"# top comment", "# inline comment", "age1bbb", "age1ccc",
+	}
+	for _, want := range wants {
 		if !contains(text, want) {
 			t.Errorf("round-tripped YAML missing %q:\n%s", want, text)
 		}

internal/cli/database.go

@@ -48,7 +48,7 @@ storage destination on that run.
 
 Use --force to skip the confirmation prompt.`,
 		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			// Resolve config path
 			configPath, err := ResolveConfigPath()
 			if err != nil {
@@ -66,22 +66,24 @@ Use --force to skip the confirmation prompt.`,
 			// Check if database exists
 			_, err = os.Stat(dbPath)
 			if os.IsNotExist(err) {
-				fmt.Printf("Database does not exist: %s\n", dbPath)
+				_, _ = fmt.Fprintf(os.Stdout, "Database does not exist: %s\n", dbPath)
 
 				return nil
 			}
 
 			// Confirm unless --force
 			if !force {
-				fmt.Printf("This will delete the local state database at:\n  %s\n\n", dbPath)
+				_, _ = fmt.Fprintf(os.Stdout,
-				fmt.Print("Are you sure? Type 'yes' to confirm: ")
+					"This will delete the local state database at:\n  %s\n\n", dbPath)
+				_, _ = fmt.Fprint(os.Stdout, "Are you sure? Type 'yes' to confirm: ")
 
 				var confirm string
 
 				_, err = fmt.Scanln(&confirm)
 				if err != nil || confirm != "yes" {
-					fmt.Println("Aborted.")
+					_, _ = fmt.Fprintln(os.Stdout, "Aborted.")
 
+					//nolint:nilerr // a failed/aborted confirmation is a clean abort
 					return nil
 				}
 			}
@@ -100,7 +102,7 @@ Use --force to skip the confirmation prompt.`,
 
 			rootFlags := GetRootFlags()
 			if !rootFlags.Quiet {
-				fmt.Printf("Database deleted: %s\n", dbPath)
+				_, _ = fmt.Fprintf(os.Stdout, "Database deleted: %s\n", dbPath)
 			}
 
 			log.Info("Local state database deleted", "path", dbPath)

internal/cli/duration.go

@@ -9,6 +9,21 @@ import (
 	"time"
 )
 
+// Approximate lengths of the extended calendar units accepted by
+// parseDuration.
+const (
+	durationDay   = 24 * time.Hour
+	durationWeek  = 7 * durationDay
+	durationMonth = 30 * durationDay
+	durationYear  = 365 * durationDay
+)
+
+var (
+	errNegativeDuration = errors.New("negative durations are not supported")
+	errInvalidDuration  = errors.New("invalid duration format")
+	errUnknownTimeUnit  = errors.New("unknown time unit")
+)
+
 // parseDuration parses duration strings. Supports standard Go duration format
 // (e.g., "3h30m", "1h45m30s") as well as extended units:
 // - d: days (e.g., "30d", "7d")
@@ -27,7 +42,7 @@ func parseDuration(s string) (time.Duration, error) {
 	// Extended duration parsing
 	// Check for negative values
 	if strings.HasPrefix(strings.TrimSpace(s), "-") {
-		return 0, errors.New("negative durations are not supported")
+		return 0, errNegativeDuration
 	}
 
 	// Pattern matches: number + unit, repeated
@@ -35,7 +50,7 @@ func parseDuration(s string) (time.Duration, error) {
 	matches := re.FindAllStringSubmatch(s, -1)
 
 	if len(matches) == 0 {
-		return 0, fmt.Errorf("invalid duration format: %q", s)
+		return 0, fmt.Errorf("%w: %q", errInvalidDuration, s)
 	}
 
 	var total time.Duration
@@ -49,49 +64,9 @@ func parseDuration(s string) (time.Duration, error) {
 			return 0, fmt.Errorf("invalid number %q: %w", valueStr, err)
 		}
 
-		var d time.Duration
+		d, err := durationForUnit(value, unit)
-
+		if err != nil {
-		switch unit {
+			return 0, err
-		// Standard time units
-		case "ns", "nanosecond", "nanoseconds":
-			d = time.Duration(value)
-		case "us", "µs", "microsecond", "microseconds":
-			d = time.Duration(value * float64(time.Microsecond))
-		case "ms", "millisecond", "milliseconds":
-			d = time.Duration(value * float64(time.Millisecond))
-		case "s", "sec", "second", "seconds":
-			d = time.Duration(value * float64(time.Second))
-		case "m", "min", "minute", "minutes":
-			d = time.Duration(value * float64(time.Minute))
-		case "h", "hr", "hour", "hours":
-			d = time.Duration(value * float64(time.Hour))
-		// Extended units
-		case "d", "day", "days":
-			d = time.Duration(value * float64(24*time.Hour))
-		case "w", "week", "weeks":
-			d = time.Duration(value * float64(7*24*time.Hour))
-		case "mo", "month", "months":
-			// Using 30 days as approximation
-			d = time.Duration(value * float64(30*24*time.Hour))
-		case "y", "year", "years":
-			// Using 365 days as approximation
-			d = time.Duration(value * float64(365*24*time.Hour))
-		default:
-			// Try parsing as standard Go duration unit
-			testStr := "1" + unit
-
-			_, err = time.ParseDuration(testStr)
-			if err == nil {
-				// It's a valid Go duration unit, parse the full value
-				fullStr := fmt.Sprintf("%g%s", value, unit)
-
-				d, err = time.ParseDuration(fullStr)
-				if err != nil {
-					return 0, fmt.Errorf("invalid duration %q: %w", fullStr, err)
-				}
-			} else {
-				return 0, fmt.Errorf("unknown time unit %q", unit)
-			}
 		}
 
 		total += d
@@ -99,3 +74,53 @@ func parseDuration(s string) (time.Duration, error) {
 
 	return total, nil
 }
+
+// durationForUnit converts a value with a (case-normalized) unit suffix
+// into a time.Duration, accepting Go's standard units plus the extended
+// calendar units.
+func durationForUnit(value float64, unit string) (time.Duration, error) {
+	switch unit {
+	// Standard time units
+	case "ns", "nanosecond", "nanoseconds":
+		return time.Duration(value), nil
+	case "us", "µs", "microsecond", "microseconds":
+		return time.Duration(value * float64(time.Microsecond)), nil
+	case "ms", "millisecond", "milliseconds":
+		return time.Duration(value * float64(time.Millisecond)), nil
+	case "s", "sec", "second", "seconds":
+		return time.Duration(value * float64(time.Second)), nil
+	case "m", "min", "minute", "minutes":
+		return time.Duration(value * float64(time.Minute)), nil
+	case "h", "hr", "hour", "hours":
+		return time.Duration(value * float64(time.Hour)), nil
+	// Extended units
+	case "d", "day", "days":
+		return time.Duration(value * float64(durationDay)), nil
+	case "w", "week", "weeks":
+		return time.Duration(value * float64(durationWeek)), nil
+	case "mo", "month", "months":
+		// Using 30 days as approximation
+		return time.Duration(value * float64(durationMonth)), nil
+	case "y", "year", "years":
+		// Using 365 days as approximation
+		return time.Duration(value * float64(durationYear)), nil
+	default:
+		// Try parsing as standard Go duration unit
+		testStr := "1" + unit
+
+		_, err := time.ParseDuration(testStr)
+		if err != nil {
+			return 0, fmt.Errorf("%w: %q", errUnknownTimeUnit, unit)
+		}
+
+		// It's a valid Go duration unit, parse the full value
+		fullStr := fmt.Sprintf("%g%s", value, unit)
+
+		d, err := time.ParseDuration(fullStr)
+		if err != nil {
+			return 0, fmt.Errorf("invalid duration %q: %w", fullStr, err)
+		}
+
+		return d, nil
+	}
+}

internal/cli/duration_test.go

@@ -1,20 +1,47 @@
-package cli
+package cli //nolint:testpackage // needs access to unexported parseDuration
 
 import (
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
-func TestParseDuration(t *testing.T) {
+type parseDurationCase struct {
-	tests := []struct {
+	name     string
-		name     string
+	input    string
-		input    string
+	expected time.Duration
-		expected time.Duration
+	wantErr  bool
-		wantErr  bool
+}
-	}{
+
-		// Standard Go durations
+// runParseDurationCases executes a table of parseDuration cases as
+// parallel subtests.
+func runParseDurationCases(t *testing.T, tests []parseDurationCase) {
+	t.Helper()
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			got, err := parseDuration(tt.input)
+
+			if tt.wantErr {
+				require.Error(t, err, "expected error for input %q", tt.input)
+
+				return
+			}
+
+			require.NoError(t, err, "unexpected error for input %q", tt.input)
+			assert.Equal(t, tt.expected, got, "duration mismatch for input %q", tt.input)
+		})
+	}
+}
+
+func TestParseDurationStandard(t *testing.T) {
+	t.Parallel()
+
+	runParseDurationCases(t, []parseDurationCase{
 		{
 			name:     "standard seconds",
 			input:    "30s",
@@ -45,6 +72,13 @@ func TestParseDuration(t *testing.T) {
 			input:    "1s500ms",
 			expected: 1*time.Second + 500*time.Millisecond,
 		},
+	})
+}
+
+func TestParseDurationExtendedUnits(t *testing.T) {
+	t.Parallel()
+
+	runParseDurationCases(t, []parseDurationCase{
 		// Extended units - days
 		{
 			name:     "single day",
@@ -114,6 +148,13 @@ func TestParseDuration(t *testing.T) {
 			input:    "1year",
 			expected: 365 * 24 * time.Hour,
 		},
+	})
+}
+
+func TestParseDurationCombinedAndErrors(t *testing.T) {
+	t.Parallel()
+
+	runParseDurationCases(t, []parseDurationCase{
 		// Combined extended units
 		{
 			name:     "weeks and days",
@@ -131,9 +172,11 @@ func TestParseDuration(t *testing.T) {
 			expected: 24*time.Hour + 12*time.Hour,
 		},
 		{
-			name:     "complex combination",
+			name:  "complex combination",
-			input:    "1y2mo3w4d5h6m7s",
+			input: "1y2mo3w4d5h6m7s",
-			expected: 365*24*time.Hour + 2*30*24*time.Hour + 3*7*24*time.Hour + 4*24*time.Hour + 5*time.Hour + 6*time.Minute + 7*time.Second,
+			expected: 365*24*time.Hour + 2*30*24*time.Hour +
+				3*7*24*time.Hour + 4*24*time.Hour +
+				5*time.Hour + 6*time.Minute + 7*time.Second,
 		},
 		{
 			name:     "with spaces",
@@ -177,25 +220,12 @@ func TestParseDuration(t *testing.T) {
 			input:   "-5d",
 			wantErr: true,
 		},
-	}
+	})
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := parseDuration(tt.input)
-
-			if tt.wantErr {
-				assert.Error(t, err, "expected error for input %q", tt.input)
-
-				return
-			}
-
-			assert.NoError(t, err, "unexpected error for input %q", tt.input)
-			assert.Equal(t, tt.expected, got, "duration mismatch for input %q", tt.input)
-		})
-	}
 }
 
 func TestParseDurationSpecialCases(t *testing.T) {
+	t.Parallel()
+
 	// Test that standard Go durations work exactly as expected
 	standardDurations := []string{
 		"300ms",
@@ -209,15 +239,17 @@ func TestParseDurationSpecialCases(t *testing.T) {
 
 	for _, d := range standardDurations {
 		expected, err := time.ParseDuration(d)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		got, err := parseDuration(d)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, expected, got, "standard duration %q should parse identically", d)
 	}
 }
 
 func TestParseDurationRealWorldExamples(t *testing.T) {
+	t.Parallel()
+
 	// Test real-world snapshot purge scenarios
 	tests := []struct {
 		description string
@@ -253,12 +285,15 @@ func TestParseDurationRealWorldExamples(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
+			t.Parallel()
+
 			got, err := parseDuration(tt.input)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tt.olderThan, got)
 
 			// Verify the duration makes sense for snapshot purging
-			assert.Greater(t, got, time.Hour, "snapshot purge duration should be at least an hour")
+			assert.Greater(t, got, time.Hour,
+				"snapshot purge duration should be at least an hour")
 		})
 	}
 }

internal/cli/entry.go

@@ -9,15 +9,19 @@ import (
 	"sneak.berlin/go/vaultik/internal/ui"
 )
 
-// CLIEntry is the main entry point for the CLI application.
+// shortCommitLen is the number of git commit hash characters shown in
+// the startup banner.
+const shortCommitLen = 12
+
+// Entry is the main entry point for the CLI application.
 // It prints the startup banner (unless a quiet flag is present in os.Args),
 // executes the root cobra command, and routes any returned error through
 // the ui.Writer so the user sees a properly formatted "🛑 ERROR:" line.
-func CLIEntry() {
+func Entry() {
 	if !bannerSuppressedInArgs(os.Args[1:]) {
 		short := globals.Commit
-		if len(short) > 12 {
+		if len(short) > shortCommitLen {
-			short = short[:12]
+			short = short[:shortCommitLen]
 		}
 
 		writeStartupBanner(ui.New(os.Stdout), time.Now().UTC(), short)
@@ -28,17 +32,17 @@ func CLIEntry() {
 
 	err := rootCmd.Execute()
 	if err != nil {
-		ReportError("%s", err.Error())
+		ReportErrorf("%s", err.Error())
 		os.Exit(1)
 	}
 }
 
-// ReportError emits a user-facing error to stderr in the standard
+// ReportErrorf emits a user-facing error to stderr in the standard
 // 🛑 ERROR: format. Use it from goroutine error paths (where returning
 // an error to cobra isn't an option) and anywhere else a CLI command
 // must surface a failure outside the normal RunE return path.
-func ReportError(format string, args ...any) {
+func ReportErrorf(format string, args ...any) {
-	ui.New(os.Stderr).Error(format, args...)
+	ui.New(os.Stderr).Errorf(format, args...)
 }
 
 // bannerSuppressedInArgs reports whether any of args is a flag that

internal/cli/entry_test.go

@@ -1,14 +1,18 @@
-package cli
+package cli_test
 
 import (
 	"testing"
+
+	"sneak.berlin/go/vaultik/internal/cli"
 )
 
 // TestCLIEntry ensures the CLI can be imported and basic initialization works
 func TestCLIEntry(t *testing.T) {
+	t.Parallel()
+
 	// This test primarily serves as a compilation test
 	// to ensure all imports resolve correctly
-	cmd := NewRootCommand()
+	cmd := cli.NewRootCommand()
 	if cmd == nil {
 		t.Fatal("NewRootCommand() returned nil")
 	}
@@ -18,7 +22,9 @@ func TestCLIEntry(t *testing.T) {
 	}
 
 	// Verify all subcommands are registered
-	expectedCommands := []string{"config", "snapshot", "prune", "info", "version", "remote", "database"}
+	expectedCommands := []string{
+		"config", "snapshot", "prune", "info", "version", "remote", "database",
+	}
 	for _, expected := range expectedCommands {
 		found := false
 
@@ -41,7 +47,9 @@ func TestCLIEntry(t *testing.T) {
 		t.Errorf("Failed to find snapshot command: %v", err)
 	} else {
 		// Check snapshot subcommands
-		expectedSubCommands := []string{"create", "list", "purge", "verify", "remove", "restore"}
+		expectedSubCommands := []string{
+			"create", "list", "purge", "verify", "remove", "restore",
+		}
 		for _, expected := range expectedSubCommands {
 			found := false
 

internal/cli/info.go

@@ -23,7 +23,7 @@ func NewInfoCommand() *cobra.Command {
 - Encryption configuration (recipients)
 - Local database statistics`,
 		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			// Use unified config resolution
 			configPath, err := ResolveConfigPath()
 			if err != nil {
@@ -35,7 +35,7 @@ func NewInfoCommand() *cobra.Command {
 
 			return RunWithApp(cmd.Context(), AppOptions{
 				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
+				LogOptions: log.Options{
 					Verbose: rootFlags.Verbose,
 					Debug:   rootFlags.Debug,
 					Quiet:   rootFlags.Quiet,
@@ -44,13 +44,13 @@ func NewInfoCommand() *cobra.Command {
 				Invokes: []fx.Option{
 					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
 						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
+							OnStart: func(_ context.Context) error {
 								go func() {
 									err := v.ShowInfo()
 									if err != nil {
 										if !errors.Is(err, context.Canceled) {
 											log.Error("Failed to show info", "error", err)
-											ReportError("Failed to show info: %v", err)
+											ReportErrorf("Failed to show info: %v", err)
 											os.Exit(1)
 										}
 									}
@@ -63,7 +63,7 @@ func NewInfoCommand() *cobra.Command {
 
 								return nil
 							},
-							OnStop: func(ctx context.Context) error {
+							OnStop: func(_ context.Context) error {
 								v.Cancel()
 
 								return nil

internal/cli/prune.go

@@ -31,7 +31,7 @@ Snapshot create --prune and snapshot remove run the same cleanup
 automatically; this command is the manual entry point for the same
 work (e.g. after a crashed backup or to reclaim storage).`,
 		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			// Use unified config resolution
 			configPath, err := ResolveConfigPath()
 			if err != nil {
@@ -43,7 +43,7 @@ work (e.g. after a crashed backup or to reclaim storage).`,
 
 			return RunWithApp(cmd.Context(), AppOptions{
 				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
+				LogOptions: log.Options{
 					Verbose: rootFlags.Verbose,
 					Debug:   rootFlags.Debug,
 					Quiet:   rootFlags.Quiet || opts.JSON,
@@ -52,7 +52,7 @@ work (e.g. after a crashed backup or to reclaim storage).`,
 				Invokes: []fx.Option{
 					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
 						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
+							OnStart: func(_ context.Context) error {
 								// Start the prune operation in a goroutine
 								go func() {
 									// Run the prune operation
@@ -61,7 +61,7 @@ work (e.g. after a crashed backup or to reclaim storage).`,
 										if !errors.Is(err, context.Canceled) {
 											if !opts.JSON {
 												log.Error("Prune operation failed", "error", err)
-												ReportError("Prune failed: %v", err)
+												ReportErrorf("Prune failed: %v", err)
 											}
 
 											os.Exit(1)
@@ -77,7 +77,7 @@ work (e.g. after a crashed backup or to reclaim storage).`,
 
 								return nil
 							},
-							OnStop: func(ctx context.Context) error {
+							OnStop: func(_ context.Context) error {
 								log.Debug("Stopping prune operation")
 								v.Cancel()
 

internal/cli/remote.go

@@ -11,6 +11,10 @@ import (
 	"sneak.berlin/go/vaultik/internal/vaultik"
 )
 
+// errNukeNeedsForce guards the destructive 'remote nuke' subcommand.
+var errNukeNeedsForce = errors.New(
+	"remote nuke requires --force (this deletes ALL remote snapshots and blobs)")
+
 // NewRemoteCommand creates the remote command and subcommands
 func NewRemoteCommand() *cobra.Command {
 	cmd := &cobra.Command{
@@ -39,61 +43,20 @@ empty and the next backup starts from scratch.
 
 This is destructive and irreversible. Requires --force.`,
 		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			if !force {
-				return errors.New("remote nuke requires --force (this deletes ALL remote snapshots and blobs)")
+				return errNukeNeedsForce
 			}
 
-			configPath, err := ResolveConfigPath()
+			return runVaultikApp(cmd, false, false, "Remote nuke failed",
-			if err != nil {
+				func(v *vaultik.Vaultik) error {
-				return err
+					return v.NukeRemote(true)
-			}
+				})
-
-			rootFlags := GetRootFlags()
-
-			return RunWithApp(cmd.Context(), AppOptions{
-				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
-					Verbose: rootFlags.Verbose,
-					Debug:   rootFlags.Debug,
-					Quiet:   rootFlags.Quiet,
-				},
-				Modules: []fx.Option{},
-				Invokes: []fx.Option{
-					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
-						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
-								go func() {
-									err := v.NukeRemote(true)
-									if err != nil {
-										if !errors.Is(err, context.Canceled) {
-											log.Error("Remote nuke failed", "error", err)
-											ReportError("Remote nuke failed: %v", err)
-											os.Exit(1)
-										}
-									}
-
-									err = v.Shutdowner.Shutdown()
-									if err != nil {
-										log.Error("Failed to shutdown", "error", err)
-									}
-								}()
-
-								return nil
-							},
-							OnStop: func(ctx context.Context) error {
-								v.Cancel()
-
-								return nil
-							},
-						})
-					}),
-				},
-			})
 		},
 	}
 
-	cmd.Flags().BoolVar(&force, "force", false, "Required: confirm destruction of ALL remote data")
+	cmd.Flags().BoolVar(&force, "force", false,
+		"Required: confirm destruction of ALL remote data")
 
 	return cmd
 }
@@ -111,7 +74,7 @@ func newRemoteInfoCommand() *cobra.Command {
 - Count and size of referenced blobs (from all manifests)
 - Count and size of orphaned blobs (not referenced by any manifest)`,
 		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			// Use unified config resolution
 			configPath, err := ResolveConfigPath()
 			if err != nil {
@@ -122,7 +85,7 @@ func newRemoteInfoCommand() *cobra.Command {
 
 			return RunWithApp(cmd.Context(), AppOptions{
 				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
+				LogOptions: log.Options{
 					Verbose: rootFlags.Verbose,
 					Debug:   rootFlags.Debug,
 					Quiet:   rootFlags.Quiet || jsonOutput,
@@ -131,14 +94,14 @@ func newRemoteInfoCommand() *cobra.Command {
 				Invokes: []fx.Option{
 					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
 						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
+							OnStart: func(_ context.Context) error {
 								go func() {
 									err := v.RemoteInfo(jsonOutput)
 									if err != nil {
 										if !errors.Is(err, context.Canceled) {
 											if !jsonOutput {
 												log.Error("Failed to get remote info", "error", err)
-												ReportError("Failed to get remote info: %v", err)
+												ReportErrorf("Failed to get remote info: %v", err)
 											}
 
 											os.Exit(1)
@@ -153,7 +116,7 @@ func newRemoteInfoCommand() *cobra.Command {
 
 								return nil
 							},
-							OnStop: func(ctx context.Context) error {
+							OnStop: func(_ context.Context) error {
 								v.Cancel()
 
 								return nil

internal/cli/root.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -10,6 +11,9 @@ import (
 	"github.com/spf13/cobra"
 )
 
+// errConfigNotFound is wrapped by all config-resolution failures.
+var errConfigNotFound = errors.New("config file not found")
+
 // RootFlags holds global flags that apply to all commands.
 // These flags are defined on the root command and inherited by all subcommands.
 type RootFlags struct {
@@ -20,6 +24,7 @@ type RootFlags struct {
 	SkipErrors bool
 }
 
+//nolint:gochecknoglobals // cobra persistent flags bind to package state
 var rootFlags RootFlags
 
 // NewRootCommand creates the root cobra command for the vaultik CLI.
@@ -34,20 +39,26 @@ public keys and uploads to S3-compatible storage. No private keys are needed
 on the source system.`,
 		SilenceUsage: true,
 		// Bare 'vaultik' (no subcommand): print help. The banner is
-		// printed once at process startup by CLIEntry, before cobra
+		// printed once at process startup by Entry, before cobra
 		// parses arguments, so it appears even when cobra rejects
 		// args (e.g. "requires at least 2 arg(s)") and on --help.
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			_ = cmd.Help()
 		},
 	}
 
 	// Add global flags
-	cmd.PersistentFlags().StringVar(&rootFlags.ConfigPath, "config", "", "Path to config file (default: $VAULTIK_CONFIG or platform config dir)")
+	cmd.PersistentFlags().StringVar(&rootFlags.ConfigPath, "config", "",
-	cmd.PersistentFlags().BoolVarP(&rootFlags.Verbose, "verbose", "v", false, "Enable verbose output")
+		"Path to config file (default: $VAULTIK_CONFIG or platform config dir)")
-	cmd.PersistentFlags().BoolVar(&rootFlags.Debug, "debug", false, "Enable debug output")
+	cmd.PersistentFlags().BoolVarP(&rootFlags.Verbose, "verbose", "v", false,
-	cmd.PersistentFlags().BoolVarP(&rootFlags.Quiet, "quiet", "q", false, "Suppress non-error output")
+		"Enable verbose output")
-	cmd.PersistentFlags().BoolVar(&rootFlags.SkipErrors, "skip-errors", false, "Continue past per-file errors instead of aborting (applies to snapshot create and restore)")
+	cmd.PersistentFlags().BoolVar(&rootFlags.Debug, "debug", false,
+		"Enable debug output")
+	cmd.PersistentFlags().BoolVarP(&rootFlags.Quiet, "quiet", "q", false,
+		"Suppress non-error output")
+	cmd.PersistentFlags().BoolVar(&rootFlags.SkipErrors, "skip-errors", false,
+		"Continue past per-file errors instead of aborting "+
+			"(applies to snapshot create and restore)")
 
 	// Add subcommands
 	cmd.AddCommand(
@@ -70,22 +81,29 @@ func GetRootFlags() RootFlags {
 }
 
 // ResolveConfigPath resolves the config file path from flags, environment, or default.
-// Search order: --config flag, VAULTIK_CONFIG env, XDG config dir, /etc/vaultik/config.yml.
+// Search order: --config flag, VAULTIK_CONFIG env, XDG config dir,
+// /etc/vaultik/config.yml.
 // Explicit paths from --config and $VAULTIK_CONFIG are checked for existence
 // so the user gets a clear error instead of a downstream YAML parser failure.
 func ResolveConfigPath() (string, error) {
 	if path := rootFlags.ConfigPath; path != "" {
 		_, err := os.Stat(path)
 		if err != nil {
-			return "", fmt.Errorf("config file from --config not found: %s (run 'vaultik config init --config %s' to create it)", path, path)
+			return "", fmt.Errorf(
+				"%w: from --config: %s (run 'vaultik config init --config %s' to create it)",
+				errConfigNotFound, path, path)
 		}
 
 		return path, nil
 	}
 
 	if path := os.Getenv("VAULTIK_CONFIG"); path != "" {
-		if _, err := os.Stat(path); err != nil {
+		_, err := os.Stat(path) //nolint:gosec // G703: path is operator-supplied by design
-			return "", fmt.Errorf("config file from $VAULTIK_CONFIG not found: %s (unset VAULTIK_CONFIG, point it at an existing file, or run 'vaultik config init')", path)
+		if err != nil {
+			return "", fmt.Errorf(
+				"%w: from $VAULTIK_CONFIG: %s (unset VAULTIK_CONFIG, point it at "+
+					"an existing file, or run 'vaultik config init')",
+				errConfigNotFound, path)
 		}
 
 		return path, nil
@@ -98,7 +116,10 @@ func ResolveConfigPath() (string, error) {
 		}
 	}
 
-	return "", fmt.Errorf("no config file found at %s (run 'vaultik config init' to create the default config, or pass --config <path>)", strings.Join(defaultConfigPaths(), " or "))
+	return "", fmt.Errorf(
+		"%w: searched %s (run 'vaultik config init' to create the default "+
+			"config, or pass --config <path>)",
+		errConfigNotFound, strings.Join(defaultConfigPaths(), " or "))
 }
 
 // defaultConfigPaths returns the ordered list of config paths to search.

internal/cli/snapshot.go

@@ -12,6 +12,32 @@ import (
 	"sneak.berlin/go/vaultik/internal/vaultik"
 )
 
+var (
+	errSnapshotIDRequired  = errors.New("snapshot ID required")
+	errWrongArgCount       = errors.New("wrong argument count")
+	errPurgeCriteriaNeeded = errors.New(
+		"must specify either --keep-latest or --older-than")
+	errPurgeCriteriaBoth = errors.New(
+		"cannot specify both --keep-latest and --older-than")
+)
+
+// requireSnapshotIDArg validates that exactly one positional argument
+// (the snapshot ID) was supplied, printing help otherwise.
+func requireSnapshotIDArg(cmd *cobra.Command, args []string) error {
+	if len(args) != 1 {
+		_ = cmd.Help()
+
+		if len(args) == 0 {
+			return errSnapshotIDRequired
+		}
+
+		return fmt.Errorf("%w: expected 1 argument, got %d",
+			errWrongArgCount, len(args))
+	}
+
+	return nil
+}
+
 // NewSnapshotCommand creates the snapshot command and subcommands
 func NewSnapshotCommand() *cobra.Command {
 	cmd := &cobra.Command{
@@ -62,7 +88,7 @@ specifying a path using --config or by setting VAULTIK_CONFIG to a path.`,
 
 			return RunWithApp(cmd.Context(), AppOptions{
 				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
+				LogOptions: log.Options{
 					Verbose: rootFlags.Verbose,
 					Debug:   rootFlags.Debug,
 					Cron:    opts.Cron,
@@ -72,7 +98,7 @@ specifying a path using --config or by setting VAULTIK_CONFIG to a path.`,
 				Invokes: []fx.Option{
 					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
 						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
+							OnStart: func(_ context.Context) error {
 								// Start the snapshot creation in a goroutine
 								go func() {
 									// --cron suppression is wired through v.UI by setupGlobals.
@@ -80,7 +106,7 @@ specifying a path using --config or by setting VAULTIK_CONFIG to a path.`,
 									if err != nil {
 										if !errors.Is(err, context.Canceled) {
 											log.Error("Snapshot creation failed", "error", err)
-											ReportError("Snapshot creation failed: %v", err)
+											ReportErrorf("Snapshot creation failed: %v", err)
 											os.Exit(1)
 										}
 									}
@@ -94,7 +120,7 @@ specifying a path using --config or by setting VAULTIK_CONFIG to a path.`,
 
 								return nil
 							},
-							OnStop: func(ctx context.Context) error {
+							OnStop: func(_ context.Context) error {
 								log.Debug("Stopping snapshot creation")
 								// Cancel the Vaultik context
 								v.Cancel()
@@ -108,9 +134,14 @@ specifying a path using --config or by setting VAULTIK_CONFIG to a path.`,
 		},
 	}
 
-	cmd.Flags().BoolVar(&opts.Cron, "cron", false, "Run in cron mode (silent unless error)")
+	cmd.Flags().BoolVar(&opts.Cron, "cron", false,
-	cmd.Flags().BoolVar(&opts.Prune, "prune", false, "After backup, drop older snapshots of the same name and remove orphaned blobs")
+		"Run in cron mode (silent unless error)")
-	cmd.Flags().StringVar(&opts.KeepNewerThan, "keep-newer-than", "", "With --prune: keep snapshots newer than this duration (e.g. 4w, 30d, 6mo) instead of only the latest")
+	cmd.Flags().BoolVar(&opts.Prune, "prune", false,
+		"After backup, drop older snapshots of the same name and remove "+
+			"orphaned blobs")
+	cmd.Flags().StringVar(&opts.KeepNewerThan, "keep-newer-than", "",
+		"With --prune: keep snapshots newer than this duration "+
+			"(e.g. 4w, 30d, 6mo) instead of only the latest")
 
 	return cmd
 }
@@ -125,54 +156,12 @@ func newSnapshotListCommand() *cobra.Command {
 		Short:   "List all snapshots",
 		Long:    "Lists all snapshots with their ID, timestamp, and compressed size",
 		Args:    cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
-			// Use unified config resolution
+			return runVaultikApp(cmd, false, false,
-			configPath, err := ResolveConfigPath()
+				"Failed to list snapshots",
-			if err != nil {
+				func(v *vaultik.Vaultik) error {
-				return err
+					return v.ListSnapshots(jsonOutput)
-			}
+				})
-
-			rootFlags := GetRootFlags()
-
-			return RunWithApp(cmd.Context(), AppOptions{
-				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
-					Verbose: rootFlags.Verbose,
-					Debug:   rootFlags.Debug,
-					Quiet:   rootFlags.Quiet,
-				},
-				Modules: []fx.Option{},
-				Invokes: []fx.Option{
-					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
-						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
-								go func() {
-									err := v.ListSnapshots(jsonOutput)
-									if err != nil {
-										if !errors.Is(err, context.Canceled) {
-											log.Error("Failed to list snapshots", "error", err)
-											ReportError("Failed to list snapshots: %v", err)
-											os.Exit(1)
-										}
-									}
-
-									err = v.Shutdowner.Shutdown()
-									if err != nil {
-										log.Error("Failed to shutdown", "error", err)
-									}
-								}()
-
-								return nil
-							},
-							OnStop: func(ctx context.Context) error {
-								v.Cancel()
-
-								return nil
-							},
-						})
-					}),
-				},
-			})
 		},
 	}
 
@@ -194,70 +183,31 @@ Retention is per-snapshot-name: --keep-latest keeps the latest of each
 configured snapshot name, not the latest globally. Use --snapshot to
 restrict the operation to specific snapshot names.`,
 		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			// Validate flags
 			if !opts.KeepLatest && opts.OlderThan == "" {
-				return errors.New("must specify either --keep-latest or --older-than")
+				return errPurgeCriteriaNeeded
 			}
 
 			if opts.KeepLatest && opts.OlderThan != "" {
-				return errors.New("cannot specify both --keep-latest and --older-than")
+				return errPurgeCriteriaBoth
 			}
 
-			// Use unified config resolution
+			return runVaultikApp(cmd, false, false,
-			configPath, err := ResolveConfigPath()
+				"Failed to purge snapshots",
-			if err != nil {
+				func(v *vaultik.Vaultik) error {
-				return err
+					return v.PurgeSnapshotsWithOptions(opts)
-			}
+				})
-
-			rootFlags := GetRootFlags()
-
-			return RunWithApp(cmd.Context(), AppOptions{
-				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
-					Verbose: rootFlags.Verbose,
-					Debug:   rootFlags.Debug,
-					Quiet:   rootFlags.Quiet,
-				},
-				Modules: []fx.Option{},
-				Invokes: []fx.Option{
-					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
-						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
-								go func() {
-									err := v.PurgeSnapshotsWithOptions(opts)
-									if err != nil {
-										if !errors.Is(err, context.Canceled) {
-											log.Error("Failed to purge snapshots", "error", err)
-											ReportError("Failed to purge snapshots: %v", err)
-											os.Exit(1)
-										}
-									}
-
-									err = v.Shutdowner.Shutdown()
-									if err != nil {
-										log.Error("Failed to shutdown", "error", err)
-									}
-								}()
-
-								return nil
-							},
-							OnStop: func(ctx context.Context) error {
-								v.Cancel()
-
-								return nil
-							},
-						})
-					}),
-				},
-			})
 		},
 	}
 
-	cmd.Flags().BoolVar(&opts.KeepLatest, "keep-latest", false, "Keep only the latest snapshot of each name")
+	cmd.Flags().BoolVar(&opts.KeepLatest, "keep-latest", false,
-	cmd.Flags().StringVar(&opts.OlderThan, "older-than", "", "Remove snapshots older than duration (e.g., 30d, 6m, 1y)")
+		"Keep only the latest snapshot of each name")
+	cmd.Flags().StringVar(&opts.OlderThan, "older-than", "",
+		"Remove snapshots older than duration (e.g., 30d, 6m, 1y)")
 	cmd.Flags().BoolVar(&opts.Force, "force", false, "Skip confirmation prompt")
-	cmd.Flags().StringArrayVar(&opts.Names, "snapshot", nil, "Restrict to snapshots with these names (repeat for multiple)")
+	cmd.Flags().StringArrayVar(&opts.Names, "snapshot", nil,
+		"Restrict to snapshots with these names (repeat for multiple)")
 
 	return cmd
 }
@@ -270,19 +220,7 @@ func newSnapshotVerifyCommand() *cobra.Command {
 		Use:   "verify <snapshot-id>",
 		Short: "Verify snapshot integrity",
 		Long:  "Verifies that all blobs referenced in a snapshot exist",
-		Args: func(cmd *cobra.Command, args []string) error {
+		Args:  requireSnapshotIDArg,
-			if len(args) != 1 {
-				_ = cmd.Help()
-
-				if len(args) == 0 {
-					return errors.New("snapshot ID required")
-				}
-
-				return fmt.Errorf("expected 1 argument, got %d", len(args))
-			}
-
-			return nil
-		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			snapshotID := args[0]
 
@@ -296,7 +234,7 @@ func newSnapshotVerifyCommand() *cobra.Command {
 
 			return RunWithApp(cmd.Context(), AppOptions{
 				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
+				LogOptions: log.Options{
 					Verbose: rootFlags.Verbose,
 					Debug:   rootFlags.Debug,
 					Quiet:   rootFlags.Quiet || opts.JSON,
@@ -305,14 +243,14 @@ func newSnapshotVerifyCommand() *cobra.Command {
 				Invokes: []fx.Option{
 					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
 						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
+							OnStart: func(_ context.Context) error {
 								go func() {
 									err := v.VerifySnapshotWithOptions(snapshotID, opts)
 									if err != nil {
 										if !errors.Is(err, context.Canceled) {
 											if !opts.JSON {
 												log.Error("Verification failed", "error", err)
-												ReportError("Verification failed: %v", err)
+												ReportErrorf("Verification failed: %v", err)
 											}
 
 											os.Exit(1)
@@ -327,7 +265,7 @@ func newSnapshotVerifyCommand() *cobra.Command {
 
 								return nil
 							},
-							OnStop: func(ctx context.Context) error {
+							OnStop: func(_ context.Context) error {
 								v.Cancel()
 
 								return nil
@@ -371,77 +309,24 @@ is reachable to finish remote cleanup.
 
 To wipe the entire destination store and start over, use 'vaultik remote
 nuke --force' — it is the single supported entry point for that.`,
-		Args: func(cmd *cobra.Command, args []string) error {
+		Args: requireSnapshotIDArg,
-			if len(args) != 1 {
-				_ = cmd.Help()
-
-				if len(args) == 0 {
-					return errors.New("snapshot ID required")
-				}
-
-				return fmt.Errorf("expected 1 argument, got %d", len(args))
-			}
-
-			return nil
-		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			// Use unified config resolution
+			return runVaultikApp(cmd, opts.JSON, opts.JSON,
-			configPath, err := ResolveConfigPath()
+				"Failed to remove snapshot",
-			if err != nil {
+				func(v *vaultik.Vaultik) error {
-				return err
+					_, err := v.RemoveSnapshot(args[0], opts)
-			}
 
-			rootFlags := GetRootFlags()
+					return err
-
+				})
-			return RunWithApp(cmd.Context(), AppOptions{
-				ConfigPath: configPath,
-				LogOptions: log.LogOptions{
-					Verbose: rootFlags.Verbose,
-					Debug:   rootFlags.Debug,
-					Quiet:   rootFlags.Quiet || opts.JSON,
-				},
-				Modules: []fx.Option{},
-				Invokes: []fx.Option{
-					fx.Invoke(func(v *vaultik.Vaultik, lc fx.Lifecycle) {
-						lc.Append(fx.Hook{
-							OnStart: func(ctx context.Context) error {
-								go func() {
-									_, err := v.RemoveSnapshot(args[0], opts)
-									if err != nil {
-										if !errors.Is(err, context.Canceled) {
-											if !opts.JSON {
-												log.Error("Failed to remove snapshot", "error", err)
-												ReportError("Failed to remove snapshot: %v", err)
-											}
-
-											os.Exit(1)
-										}
-									}
-
-									err = v.Shutdowner.Shutdown()
-									if err != nil {
-										log.Error("Failed to shutdown", "error", err)
-									}
-								}()
-
-								return nil
-							},
-							OnStop: func(ctx context.Context) error {
-								v.Cancel()
-
-								return nil
-							},
-						})
-					}),
-				},
-			})
 		},
 	}
 
 	cmd.Flags().BoolVarP(&opts.Force, "force", "f", false, "Skip confirmation prompt")
-	cmd.Flags().BoolVar(&opts.DryRun, "dry-run", false, "Show what would be removed without removing")
+	cmd.Flags().BoolVar(&opts.DryRun, "dry-run", false,
+		"Show what would be removed without removing")
 	cmd.Flags().BoolVar(&opts.JSON, "json", false, "Output result as JSON")
-	cmd.Flags().BoolVar(&opts.LocalOnly, "local-only", false, "Skip remote cleanup; only touch the local index")
+	cmd.Flags().BoolVar(&opts.LocalOnly, "local-only", false,
+		"Skip remote cleanup; only touch the local index")
 
 	return cmd
 }

internal/cli/snapshot_restore.go

@@ -14,6 +14,10 @@ import (
 	"sneak.berlin/go/vaultik/internal/vaultik"
 )
 
+// restoreMinArgs is the minimum positional argument count of
+// `snapshot restore <snapshot-id> <target-dir> [paths...]`.
+const restoreMinArgs = 2
+
 // RestoreOptions contains options for the restore command
 type RestoreOptions struct {
 	TargetDir string
@@ -39,31 +43,36 @@ func newSnapshotRestoreCommand() *cobra.Command {
 		Short: "Restore files from a snapshot",
 		Long: `Download and decrypt files from a backup snapshot.
 
-This command will restore files from the specified snapshot to the target directory.
+This command will restore files from the specified snapshot to the
+target directory.
 If no paths are specified, all files are restored.
 If paths are specified, only matching files/directories are restored.
 
-Requires the VAULTIK_AGE_SECRET_KEY environment variable to be set with the age private key.
+Requires the VAULTIK_AGE_SECRET_KEY environment variable to be set with
+the age private key.
 
 Examples:
   # Restore entire snapshot
   vaultik snapshot restore myhost_docs_2025-01-01T12:00:00Z /restore
 
   # Restore specific file
-  vaultik snapshot restore myhost_docs_2025-01-01T12:00:00Z /restore /home/user/important.txt
+  vaultik snapshot restore myhost_docs_2025-01-01T12:00:00Z /restore \
+    /home/user/important.txt
 
   # Restore specific directory
-  vaultik snapshot restore myhost_docs_2025-01-01T12:00:00Z /restore /home/user/documents/
+  vaultik snapshot restore myhost_docs_2025-01-01T12:00:00Z /restore \
+    /home/user/documents/
 
   # Restore and verify all files
   vaultik snapshot restore --verify myhost_docs_2025-01-01T12:00:00Z /restore`,
-		Args: cobra.MinimumNArgs(2),
+		Args: cobra.MinimumNArgs(restoreMinArgs),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runRestore(cmd, args, opts)
 		},
 	}
 
-	cmd.Flags().BoolVar(&opts.Verify, "verify", false, "Verify restored files by checking chunk hashes")
+	cmd.Flags().BoolVar(&opts.Verify, "verify", false,
+		"Verify restored files by checking chunk hashes")
 
 	return cmd
 }
@@ -73,8 +82,8 @@ func runRestore(cmd *cobra.Command, args []string, opts *RestoreOptions) error {
 	snapshotID := args[0]
 
 	opts.TargetDir = args[1]
-	if len(args) > 2 {
+	if len(args) > restoreMinArgs {
-		opts.Paths = args[2:]
+		opts.Paths = args[restoreMinArgs:]
 	}
 
 	// Use unified config resolution
@@ -88,7 +97,7 @@ func runRestore(cmd *cobra.Command, args []string, opts *RestoreOptions) error {
 
 	return RunWithApp(cmd.Context(), AppOptions{
 		ConfigPath: configPath,
-		LogOptions: log.LogOptions{
+		LogOptions: log.Options{
 			Verbose: rootFlags.Verbose,
 			Debug:   rootFlags.Debug,
 			Quiet:   rootFlags.Quiet,
@@ -121,7 +130,7 @@ func buildRestoreInvokes(snapshotID string, opts *RestoreOptions) []fx.Option {
 	return []fx.Option{
 		fx.Invoke(func(app *RestoreApp, lc fx.Lifecycle) {
 			lc.Append(fx.Hook{
-				OnStart: func(ctx context.Context) error {
+				OnStart: func(_ context.Context) error {
 					// Start the restore operation in a goroutine
 					go func() {
 						// Run the restore operation
@@ -137,7 +146,7 @@ func buildRestoreInvokes(snapshotID string, opts *RestoreOptions) []fx.Option {
 						if err != nil {
 							if !errors.Is(err, context.Canceled) {
 								log.Error("Restore operation failed", "error", err)
-								ReportError("Restore failed: %v", err)
+								ReportErrorf("Restore failed: %v", err)
 								os.Exit(1)
 							}
 						}
@@ -151,7 +160,7 @@ func buildRestoreInvokes(snapshotID string, opts *RestoreOptions) []fx.Option {
 
 					return nil
 				},
-				OnStop: func(ctx context.Context) error {
+				OnStop: func(_ context.Context) error {
 					log.Debug("Stopping restore operation")
 					app.Vaultik.Cancel()
 

internal/cli/vaultik_snapshot_types.go

@@ -3,6 +3,8 @@ package cli
 import "time"
 
 // SnapshotInfo represents snapshot information for listing
+//
+//nolint:tagliatelle // snake_case is the established output format
 type SnapshotInfo struct {
 	ID             string    `json:"id"`
 	Timestamp      time.Time `json:"timestamp"`

internal/cli/version.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+	"os"
 	"runtime"
 
 	"github.com/spf13/cobra"
@@ -15,21 +16,25 @@ func NewVersionCommand() *cobra.Command {
 		Short: "Print version information",
 		Long:  `Print version, git commit, and build information for vaultik.`,
 		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, _ []string) {
-			fmt.Printf("vaultik %s\n", globals.Version)
+			_, _ = fmt.Fprintf(os.Stdout, "vaultik %s\n", globals.Version)
-			fmt.Printf("  commit:     %s\n", globals.Commit)
+			_, _ = fmt.Fprintf(os.Stdout, "  commit:     %s\n", globals.Commit)
-			fmt.Printf("  build date: %s\n", globals.CommitDate)
+			_, _ = fmt.Fprintf(os.Stdout, "  build date: %s\n", globals.CommitDate)
-			fmt.Printf("  go:         %s\n", runtime.Version())
+			_, _ = fmt.Fprintf(os.Stdout, "  go:         %s\n", runtime.Version())
-			fmt.Printf("  os/arch:    %s/%s\n", runtime.GOOS, runtime.GOARCH)
+			_, _ = fmt.Fprintf(os.Stdout, "  os/arch:    %s/%s\n",
-			fmt.Printf("  author:     %s\n", globals.Author)
+				runtime.GOOS, runtime.GOARCH)
-			fmt.Printf("  homepage:   %s\n", globals.Homepage)
+			_, _ = fmt.Fprintf(os.Stdout, "  author:     %s\n", globals.Author)
-			fmt.Printf("  license:    %s\n", globals.License)
+			_, _ = fmt.Fprintf(os.Stdout, "  homepage:   %s\n", globals.Homepage)
+			_, _ = fmt.Fprintf(os.Stdout, "  license:    %s\n", globals.License)
 
 			if globals.Version == "dev" {
-				fmt.Println()
+				_, _ = fmt.Fprintln(os.Stdout)
-				fmt.Println("This is a development build (no version information embedded).")
+				_, _ = fmt.Fprintln(os.Stdout,
-				fmt.Println("Build a release binary with 'make vaultik' or download from")
+					"This is a development build (no version information embedded).")
-				fmt.Println("https://sneak.berlin/go/vaultik for embedded version metadata.")
+				_, _ = fmt.Fprintln(os.Stdout,
+					"Build a release binary with 'make vaultik' or download from")
+				_, _ = fmt.Fprintln(os.Stdout,
+					"https://sneak.berlin/go/vaultik for embedded version metadata.")
 			}
 		},
 	}

internal/config/config.go

@@ -1,3 +1,6 @@
+// Package config loads, validates, and provides the vaultik YAML
+// configuration, including snapshot definitions, encryption recipients,
+// and storage settings.
 package config
 
 import (
@@ -18,6 +21,38 @@ import (
 
 const appName = "vaultik"
 
+// Defaults and validation bounds for tunable settings.
+const (
+	defaultBlobSizeLimit    = Size(10 * 1024 * 1024 * 1024) // 10GB
+	defaultChunkSize        = Size(10 * 1024 * 1024)        // 10MB
+	defaultS3PartSize       = Size(5 * 1024 * 1024)         // 5MB
+	defaultCompressionLevel = 3
+	minChunkSize            = 1024 * 1024 // 1MB
+	minCompressionLevel     = 1
+	maxCompressionLevel     = 19
+)
+
+// Sentinel validation errors.
+var (
+	errNoConfigPath    = errors.New("config path not provided")
+	errNoAgeRecipients = errors.New(
+		"at least one age_recipient is required (generate with: age-keygen)")
+	errNoSnapshots = errors.New(
+		"at least one snapshot must be configured (see config.example.yml)")
+	errSnapshotNoPaths   = errors.New("snapshot must have at least one path")
+	errChunkSizeTooSmall = errors.New("chunk_size must be at least 1MB")
+	errBlobSizeTooSmall  = errors.New("blob_size_limit must be at least chunk_size")
+	errBadCompression    = errors.New("compression_level must be between 1 and 19")
+	errBadStorageScheme  = errors.New(
+		"storage_url must start with s3://, file://, or rclone://")
+	errStorageNotConfigured = errors.New(
+		"storage not configured; set storage_url or provide s3.endpoint + " +
+			"s3.bucket + credentials")
+	errS3BucketRequired = errors.New("s3.bucket is required (or set storage_url)")
+	errS3KeyIDRequired  = errors.New("s3.access_key_id is required")
+	errS3SecretRequired = errors.New("s3.secret_access_key is required")
+)
+
 // expandTilde expands ~ at the start of a path to the user's home directory.
 func expandTilde(path string) string {
 	if path == "~" {
@@ -90,12 +125,15 @@ func (c *Config) SnapshotNames() []string {
 // It defines all settings for backup operations, including source directories,
 // encryption recipients, storage configuration, and performance tuning parameters.
 // Configuration is typically loaded from a YAML file.
+//
+//nolint:tagliatelle // snake_case is the established config-file format
 type Config struct {
-	AgeRecipients    []string                  `yaml:"age_recipients"`
+	AgeRecipients []string `yaml:"age_recipients"`
-	AgeSecretKey     string                    `yaml:"age_secret_key"`
+	AgeSecretKey  string   `yaml:"age_secret_key"`
-	BlobSizeLimit    Size                      `yaml:"blob_size_limit"`
+	BlobSizeLimit Size     `yaml:"blob_size_limit"`
-	ChunkSize        Size                      `yaml:"chunk_size"`
+	ChunkSize     Size     `yaml:"chunk_size"`
-	Exclude          []string                  `yaml:"exclude"` // Global excludes applied to all snapshots
+	// Exclude holds global excludes applied to all snapshots.
+	Exclude          []string                  `yaml:"exclude"`
 	Hostname         string                    `yaml:"hostname"`
 	IndexPath        string                    `yaml:"index_path"`
 	S3               S3Config                  `yaml:"s3"`
@@ -107,13 +145,16 @@ type Config struct {
 	// Supported formats:
 	//   - s3://bucket/prefix?endpoint=host&region=us-east-1
 	//   - file:///path/to/backup
-	// For S3 URLs, credentials are still read from s3.access_key_id and s3.secret_access_key.
+	// For S3 URLs, credentials are still read from s3.access_key_id
+	// and s3.secret_access_key.
 	StorageURL string `yaml:"storage_url"`
 }
 
 // S3Config represents S3 storage configuration for backup storage.
 // It supports both AWS S3 and S3-compatible storage services.
 // All fields except UseSSL and PartSize are required.
+//
+//nolint:tagliatelle // snake_case is the established config-file format
 type S3Config struct {
 	Endpoint        string `yaml:"endpoint"`
 	Bucket          string `yaml:"bucket"`
@@ -125,17 +166,17 @@ type S3Config struct {
 	PartSize        Size   `yaml:"part_size"`
 }
 
-// ConfigPath wraps the config file path for fx dependency injection.
+// Path wraps the config file path for fx dependency injection.
 // This type allows the config file path to be injected as a distinct type
 // rather than a plain string, avoiding conflicts with other string dependencies.
-type ConfigPath string
+type Path string
 
 // New creates a new Config instance by loading from the specified path.
 // This function is used by the fx dependency injection framework.
 // Returns an error if the path is empty or if loading fails.
-func New(path ConfigPath) (*Config, error) {
+func New(path Path) (*Config, error) {
 	if path == "" {
-		return nil, errors.New("config path not provided")
+		return nil, errNoConfigPath
 	}
 
 	cfg, err := Load(string(path))
@@ -160,10 +201,10 @@ func Load(path string) (*Config, error) {
 
 	cfg := &Config{
 		// Set defaults
-		BlobSizeLimit:    Size(10 * 1024 * 1024 * 1024), // 10GB
+		BlobSizeLimit:    defaultBlobSizeLimit,
-		ChunkSize:        Size(10 * 1024 * 1024),        // 10MB
+		ChunkSize:        defaultChunkSize,
 		IndexPath:        filepath.Join(xdg.DataHome, appName, "index.sqlite"),
-		CompressionLevel: 3,
+		CompressionLevel: defaultCompressionLevel,
 	}
 
 	// Convert smartconfig data to YAML then unmarshal
@@ -218,12 +259,13 @@ func Load(path string) (*Config, error) {
 	}
 
 	if cfg.S3.PartSize == 0 {
-		cfg.S3.PartSize = Size(5 * 1024 * 1024) // 5MB
+		cfg.S3.PartSize = defaultS3PartSize
 	}
 
 	// Check config file permissions (warn if world or group readable)
-	info, err := os.Stat(path)
+	//nolint:gosec // G703: config path is operator-supplied by design
-	if err == nil {
+	info, statErr := os.Stat(path)
+	if statErr == nil {
 		mode := info.Mode().Perm()
 		if mode&0044 != 0 { // group or world readable
 			log.Warn("Config file has insecure permissions (contains S3 credentials)",
@@ -252,16 +294,16 @@ func Load(path string) (*Config, error) {
 // Returns an error describing the first validation failure encountered.
 func (c *Config) Validate() error {
 	if len(c.AgeRecipients) == 0 {
-		return errors.New("at least one age_recipient is required (generate with: age-keygen)")
+		return errNoAgeRecipients
 	}
 
 	if len(c.Snapshots) == 0 {
-		return errors.New("at least one snapshot must be configured (see config.example.yml)")
+		return errNoSnapshots
 	}
 
 	for name, snap := range c.Snapshots {
 		if len(snap.Paths) == 0 {
-			return fmt.Errorf("snapshot %q must have at least one path", name)
+			return fmt.Errorf("%w: %q", errSnapshotNoPaths, name)
 		}
 	}
 
@@ -271,16 +313,17 @@ func (c *Config) Validate() error {
 		return err
 	}
 
-	if c.ChunkSize.Int64() < 1024*1024 { // 1MB minimum
+	if c.ChunkSize.Int64() < minChunkSize {
-		return errors.New("chunk_size must be at least 1MB")
+		return errChunkSizeTooSmall
 	}
 
 	if c.BlobSizeLimit.Int64() < c.ChunkSize.Int64() {
-		return errors.New("blob_size_limit must be at least chunk_size")
+		return errBlobSizeTooSmall
 	}
 
-	if c.CompressionLevel < 1 || c.CompressionLevel > 19 {
+	if c.CompressionLevel < minCompressionLevel ||
-		return errors.New("compression_level must be between 1 and 19")
+		c.CompressionLevel > maxCompressionLevel {
+		return errBadCompression
 	}
 
 	return nil
@@ -292,53 +335,56 @@ func (c *Config) Validate() error {
 // If StorageURL is not set, legacy S3 configuration is required.
 func (c *Config) validateStorage() error {
 	if c.StorageURL != "" {
-		// URL-based configuration
+		return c.validateStorageURL()
-		if strings.HasPrefix(c.StorageURL, "file://") {
-			// File storage doesn't need S3 credentials
-			return nil
-		}
-
-		if strings.HasPrefix(c.StorageURL, "s3://") {
-			// S3 storage needs credentials
-			if c.S3.AccessKeyID == "" {
-				return errors.New("s3.access_key_id is required for s3:// URLs")
-			}
-
-			if c.S3.SecretAccessKey == "" {
-				return errors.New("s3.secret_access_key is required for s3:// URLs")
-			}
-
-			return nil
-		}
-
-		if strings.HasPrefix(c.StorageURL, "rclone://") {
-			// Rclone storage uses rclone's own config
-			return nil
-		}
-
-		return errors.New("storage_url must start with s3://, file://, or rclone://")
 	}
 
 	// Legacy S3 configuration
 	if c.S3.Endpoint == "" {
-		return errors.New("storage not configured; set storage_url or provide s3.endpoint + s3.bucket + credentials")
+		return errStorageNotConfigured
 	}
 
 	if c.S3.Bucket == "" {
-		return errors.New("s3.bucket is required (or set storage_url)")
+		return errS3BucketRequired
 	}
 
 	if c.S3.AccessKeyID == "" {
-		return errors.New("s3.access_key_id is required")
+		return errS3KeyIDRequired
 	}
 
 	if c.S3.SecretAccessKey == "" {
-		return errors.New("s3.secret_access_key is required")
+		return errS3SecretRequired
 	}
 
 	return nil
 }
 
+// validateStorageURL validates URL-based storage configuration. File and
+// rclone URLs need no credentials; S3 URLs require the legacy s3.*
+// credential fields.
+func (c *Config) validateStorageURL() error {
+	switch {
+	case strings.HasPrefix(c.StorageURL, "file://"):
+		// File storage doesn't need S3 credentials
+		return nil
+	case strings.HasPrefix(c.StorageURL, "rclone://"):
+		// Rclone storage uses rclone's own config
+		return nil
+	case strings.HasPrefix(c.StorageURL, "s3://"):
+		// S3 storage needs credentials
+		if c.S3.AccessKeyID == "" {
+			return fmt.Errorf("%w for s3:// URLs", errS3KeyIDRequired)
+		}
+
+		if c.S3.SecretAccessKey == "" {
+			return fmt.Errorf("%w for s3:// URLs", errS3SecretRequired)
+		}
+
+		return nil
+	default:
+		return errBadStorageScheme
+	}
+}
+
 // extractAgeSecretKey extracts the AGE-SECRET-KEY from the input using
 // the age library's parser, which handles comments and whitespace.
 func extractAgeSecretKey(input string) string {
@@ -357,6 +403,8 @@ func extractAgeSecretKey(input string) string {
 
 // Module exports the config module for fx dependency injection.
 // It provides the Config type to other modules in the application.
+//
+//nolint:gochecknoglobals // fx module definitions are package globals
 var Module = fx.Module("config",
 	fx.Provide(New),
 )

internal/config/config_test.go

@@ -1,4 +1,4 @@
-package config
+package config //nolint:testpackage // exercises unexported extractAgeSecretKey
 
 import (
 	"os"
@@ -7,9 +7,12 @@ import (
 )
 
 const (
-	TEST_SNEAK_AGE_PUBLIC_KEY        = "age1278m9q7dp3chsh2dcy82qk27v047zywyvtxwnj4cvt0z65jw6a7q5dqhfj"
+	testSneakAgePublicKey = "age1278m9q7dp3chsh2dcy82qk27v047zywyvt" +
-	TEST_INTEGRATION_AGE_PUBLIC_KEY  = "age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"
+		"xwnj4cvt0z65jw6a7q5dqhfj"
-	TEST_INTEGRATION_AGE_PRIVATE_KEY = "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5"
+	testIntegrationAgePublicKey = "age1ezrjmfpwsc95svdg0y54mums3zevgzu" +
+		"0x0ecq2f7tp8a05gl0sjq9q9wjg"
+	testIntegrationAgePrivateKey = "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GX" +
+		"VEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5"
 )
 
 func TestMain(m *testing.M) {
@@ -25,8 +28,11 @@ func TestMain(m *testing.M) {
 	os.Exit(code)
 }
 
-// TestConfigLoad ensures the config package can be imported and basic functionality works
+// TestConfigLoad ensures the config package can be imported and basic
+// functionality works.
 func TestConfigLoad(t *testing.T) {
+	t.Parallel()
+
 	// Use the test config file
 	configPath := os.Getenv("VAULTIK_CONFIG")
 	if configPath == "" {
@@ -44,8 +50,9 @@ func TestConfigLoad(t *testing.T) {
 		t.Errorf("Expected 2 age recipients, got %d", len(cfg.AgeRecipients))
 	}
 
-	if cfg.AgeRecipients[0] != TEST_SNEAK_AGE_PUBLIC_KEY {
+	if cfg.AgeRecipients[0] != testSneakAgePublicKey {
-		t.Errorf("Expected first age recipient to be %s, got '%s'", TEST_SNEAK_AGE_PUBLIC_KEY, cfg.AgeRecipients[0])
+		t.Errorf("Expected first age recipient to be %s, got '%s'",
+			testSneakAgePublicKey, cfg.AgeRecipients[0])
 	}
 
 	if len(cfg.Snapshots) != 1 {
@@ -62,11 +69,13 @@ func TestConfigLoad(t *testing.T) {
 	}
 
 	if testSnap.Paths[0] != "/tmp/vaultik-test-source" {
-		t.Errorf("Expected first path to be '/tmp/vaultik-test-source', got '%s'", testSnap.Paths[0])
+		t.Errorf("Expected first path to be '/tmp/vaultik-test-source', got '%s'",
+			testSnap.Paths[0])
 	}
 
 	if cfg.S3.Bucket != "vaultik-test-bucket" {
-		t.Errorf("Expected S3 bucket to be 'vaultik-test-bucket', got '%s'", cfg.S3.Bucket)
+		t.Errorf("Expected S3 bucket to be 'vaultik-test-bucket', got '%s'",
+			cfg.S3.Bucket)
 	}
 
 	if cfg.Hostname != "test-host" {
@@ -76,19 +85,26 @@ func TestConfigLoad(t *testing.T) {
 
 // TestConfigFromEnv tests loading config path from environment variable
 func TestConfigFromEnv(t *testing.T) {
+	t.Parallel()
+
 	configPath := os.Getenv("VAULTIK_CONFIG")
 	if configPath == "" {
 		t.Skip("VAULTIK_CONFIG not set")
 	}
 
 	// Verify the file exists
-	if _, err := os.Stat(configPath); os.IsNotExist(err) {
+	//nolint:gosec // G703: test config path comes from the test environment
-		t.Errorf("Config file does not exist at path from VAULTIK_CONFIG: %s", configPath)
+	_, err := os.Stat(configPath)
+	if os.IsNotExist(err) {
+		t.Errorf("Config file does not exist at path from VAULTIK_CONFIG: %s",
+			configPath)
 	}
 }
 
 // TestExtractAgeSecretKey tests extraction of AGE-SECRET-KEY from various inputs
 func TestExtractAgeSecretKey(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name     string
 		input    string
@@ -96,36 +112,32 @@ func TestExtractAgeSecretKey(t *testing.T) {
 	}{
 		{
 			name:     "plain key",
-			input:    "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5",
+			input:    testIntegrationAgePrivateKey,
-			expected: "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5",
+			expected: testIntegrationAgePrivateKey,
 		},
 		{
 			name:     "key with trailing newline",
-			input:    "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5\n",
+			input:    testIntegrationAgePrivateKey + "\n",
-			expected: "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5",
+			expected: testIntegrationAgePrivateKey,
 		},
 		{
 			name: "full age-keygen output",
-			input: `# created: 2025-01-14T12:00:00Z
+			input: "# created: 2025-01-14T12:00:00Z\n" +
-# public key: age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg
+				"# public key: " + testIntegrationAgePublicKey + "\n" +
-AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5
+				testIntegrationAgePrivateKey + "\n",
-`,
+			expected: testIntegrationAgePrivateKey,
-			expected: "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5",
 		},
 		{
 			name: "age-keygen output with extra blank lines",
-			input: `# created: 2025-01-14T12:00:00Z
+			input: "# created: 2025-01-14T12:00:00Z\n" +
-# public key: age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg
+				"# public key: " + testIntegrationAgePublicKey + "\n\n" +
-
+				testIntegrationAgePrivateKey + "\n\n",
-AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5
+			expected: testIntegrationAgePrivateKey,
-
-`,
-			expected: "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5",
 		},
 		{
 			name:     "key with leading whitespace",
-			input:    "  AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5  ",
+			input:    "  " + testIntegrationAgePrivateKey + "  ",
-			expected: "AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5",
+			expected: testIntegrationAgePrivateKey,
 		},
 		{
 			name:     "empty input",
@@ -141,9 +153,12 @@ AGE-SECRET-KEY-19CR5YSFW59HM4TLD6GXVEDMZFTVVF7PPHKUT68TXSFPK7APHXA2QS2NJA5
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
 			result := extractAgeSecretKey(tt.input)
 			if result != tt.expected {
-				t.Errorf("extractAgeSecretKey(%q) = %q, want %q", tt.input, result, tt.expected)
+				t.Errorf("extractAgeSecretKey(%q) = %q, want %q",
+					tt.input, result, tt.expected)
 			}
 		})
 	}

internal/config/size.go

@@ -3,13 +3,21 @@ package config
 import (
 	"errors"
 	"fmt"
+	"math"
 
 	"github.com/dustin/go-humanize"
 )
 
+var (
+	errSizeType     = errors.New("size must be a number or string")
+	errSizeTooLarge = errors.New("size exceeds maximum supported value")
+)
+
 // Size represents a byte size that can be specified in configuration files.
 // It can unmarshal from both numeric values (interpreted as bytes) and
 // human-readable strings like "10MB", "2.5GB", or "1TB".
+//
+//nolint:recvcheck // UnmarshalYAML requires a pointer; String/Int64 are value reads
 type Size int64
 
 // UnmarshalYAML implements yaml.Unmarshaler for Size, allowing it to be
@@ -31,7 +39,7 @@ func (s *Size) UnmarshalYAML(unmarshal func(any) error) error {
 
 	err = unmarshal(&strVal)
 	if err != nil {
-		return errors.New("size must be a number or string")
+		return errSizeType
 	}
 
 	// Parse the string using go-humanize
@@ -40,6 +48,10 @@ func (s *Size) UnmarshalYAML(unmarshal func(any) error) error {
 		return fmt.Errorf("invalid size format: %w", err)
 	}
 
+	if bytes > math.MaxInt64 {
+		return fmt.Errorf("%w: %s", errSizeTooLarge, strVal)
+	}
+
 	*s = Size(bytes)
 
 	return nil
@@ -56,6 +68,7 @@ func (s Size) Int64() int64 {
 // For example, 1048576 bytes would be formatted as "1.0 MB".
 // This implements the fmt.Stringer interface.
 func (s Size) String() string {
+	//nolint:gosec // G115: sizes are non-negative by construction
 	return humanize.Bytes(uint64(s))
 }
 
@@ -66,5 +79,9 @@ func ParseSize(s string) (Size, error) {
 		return 0, fmt.Errorf("invalid size format: %w", err)
 	}
 
+	if bytes > math.MaxInt64 {
+		return 0, fmt.Errorf("%w: %s", errSizeTooLarge, s)
+	}
+
 	return Size(bytes), nil
 }

internal/crypto/encryption.go

@@ -1,3 +1,5 @@
+// Package crypto provides thread-safe age encryption and decryption
+// helpers used to protect blob and metadata content.
 package crypto
 
 import (
@@ -11,6 +13,10 @@ import (
 	"go.uber.org/fx"
 )
 
+// ErrNoRecipients is returned when an encryptor is created or updated
+// without any recipient public keys.
+var ErrNoRecipients = errors.New("at least one recipient is required")
+
 // Encryptor provides thread-safe encryption using the age encryption library.
 // It supports encrypting data for multiple recipients simultaneously, allowing
 // any of the corresponding private keys to decrypt the data. This is useful
@@ -26,7 +32,7 @@ type Encryptor struct {
 // public keys are invalid or if no recipients are specified.
 func NewEncryptor(publicKeys []string) (*Encryptor, error) {
 	if len(publicKeys) == 0 {
-		return nil, errors.New("at least one recipient is required")
+		return nil, ErrNoRecipients
 	}
 
 	recipients := make([]age.Recipient, 0, len(publicKeys))
@@ -132,7 +138,7 @@ func (e *Encryptor) EncryptWriter(dst io.Writer) (io.WriteCloser, error) {
 // of the public keys are invalid or if no recipients are specified.
 func (e *Encryptor) UpdateRecipients(publicKeys []string) error {
 	if len(publicKeys) == 0 {
-		return errors.New("at least one recipient is required")
+		return ErrNoRecipients
 	}
 
 	recipients := make([]age.Recipient, 0, len(publicKeys))
@@ -213,4 +219,6 @@ func (d *Decryptor) DecryptStream(src io.Reader) (io.Reader, error) {
 }
 
 // Module exports the crypto module for fx dependency injection.
+//
+//nolint:gochecknoglobals // fx module definitions are package globals
 var Module = fx.Module("crypto")

internal/crypto/encryption_test.go

@@ -1,13 +1,16 @@
-package crypto
+package crypto_test
 
 import (
 	"bytes"
 	"testing"
 
 	"filippo.io/age"
+	"sneak.berlin/go/vaultik/internal/crypto"
 )
 
 func TestEncryptor(t *testing.T) {
+	t.Parallel()
+
 	// Generate a test key pair
 	identity, err := age.GenerateX25519Identity()
 	if err != nil {
@@ -17,7 +20,7 @@ func TestEncryptor(t *testing.T) {
 	publicKey := identity.Recipient().String()
 
 	// Create encryptor
-	enc, err := NewEncryptor([]string{publicKey})
+	enc, err := crypto.NewEncryptor([]string{publicKey})
 	if err != nil {
 		t.Fatalf("failed to create encryptor: %v", err)
 	}
@@ -55,6 +58,8 @@ func TestEncryptor(t *testing.T) {
 }
 
 func TestEncryptorMultipleRecipients(t *testing.T) {
+	t.Parallel()
+
 	// Generate three test key pairs
 	identity1, err := age.GenerateX25519Identity()
 	if err != nil {
@@ -78,7 +83,7 @@ func TestEncryptorMultipleRecipients(t *testing.T) {
 	}
 
 	// Create encryptor with multiple recipients
-	enc, err := NewEncryptor(publicKeys)
+	enc, err := crypto.NewEncryptor(publicKeys)
 	if err != nil {
 		t.Fatalf("failed to create encryptor: %v", err)
 	}
@@ -114,6 +119,8 @@ func TestEncryptorMultipleRecipients(t *testing.T) {
 }
 
 func TestEncryptorUpdateRecipients(t *testing.T) {
+	t.Parallel()
+
 	// Generate two identities
 	identity1, _ := age.GenerateX25519Identity()
 	identity2, _ := age.GenerateX25519Identity()
@@ -122,7 +129,7 @@ func TestEncryptorUpdateRecipients(t *testing.T) {
 	publicKey2 := identity2.Recipient().String()
 
 	// Create encryptor with first key
-	enc, err := NewEncryptor([]string{publicKey1})
+	enc, err := crypto.NewEncryptor([]string{publicKey1})
 	if err != nil {
 		t.Fatalf("failed to create encryptor: %v", err)
 	}

internal/database/blob_chunks.go

@@ -7,15 +7,21 @@ import (
 	"fmt"
 )
 
+// BlobChunkRepository provides access to the blob_chunks table, which maps
+// blobs to the chunks they contain (with offset and length).
 type BlobChunkRepository struct {
 	db *DB
 }
 
+// NewBlobChunkRepository creates a BlobChunkRepository backed by db.
 func NewBlobChunkRepository(db *DB) *BlobChunkRepository {
 	return &BlobChunkRepository{db: db}
 }
 
-func (r *BlobChunkRepository) Create(ctx context.Context, tx *sql.Tx, bc *BlobChunk) error {
+// Create inserts a blob_chunks row, using tx when non-nil.
+func (r *BlobChunkRepository) Create(
+	ctx context.Context, tx *sql.Tx, bc *BlobChunk,
+) error {
 	query := `
 		INSERT INTO blob_chunks (blob_id, chunk_hash, offset, length)
 		VALUES (?, ?, ?, ?)
@@ -35,7 +41,11 @@ func (r *BlobChunkRepository) Create(ctx context.Context, tx *sql.Tx, bc *BlobCh
 	return nil
 }
 
-func (r *BlobChunkRepository) GetByBlobID(ctx context.Context, blobID string) ([]*BlobChunk, error) {
+// GetByBlobID returns all chunks contained in the given blob, ordered by
+// their offset within the blob.
+func (r *BlobChunkRepository) GetByBlobID(
+	ctx context.Context, blobID string,
+) ([]*BlobChunk, error) {
 	query := `
 		SELECT blob_id, chunk_hash, offset, length
 		FROM blob_chunks
@@ -65,7 +75,11 @@ func (r *BlobChunkRepository) GetByBlobID(ctx context.Context, blobID string) ([
 	return blobChunks, rows.Err()
 }
 
-func (r *BlobChunkRepository) GetByChunkHash(ctx context.Context, chunkHash string) (*BlobChunk, error) {
+// GetByChunkHash returns one blob_chunks row containing the given chunk,
+// or nil if the chunk is not packed in any blob.
+func (r *BlobChunkRepository) GetByChunkHash(
+	ctx context.Context, chunkHash string,
+) (*BlobChunk, error) {
 	query := `
 		SELECT blob_id, chunk_hash, offset, length
 		FROM blob_chunks
@@ -87,7 +101,7 @@ func (r *BlobChunkRepository) GetByChunkHash(ctx context.Context, chunkHash stri
 	if errors.Is(err, sql.ErrNoRows) {
 		LogSQL("GetByChunkHash", "No rows found", chunkHash)
 
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -102,7 +116,9 @@ func (r *BlobChunkRepository) GetByChunkHash(ctx context.Context, chunkHash stri
 }
 
 // GetByChunkHashTx retrieves a blob chunk within a transaction
-func (r *BlobChunkRepository) GetByChunkHashTx(ctx context.Context, tx *sql.Tx, chunkHash string) (*BlobChunk, error) {
+func (r *BlobChunkRepository) GetByChunkHashTx(
+	ctx context.Context, tx *sql.Tx, chunkHash string,
+) (*BlobChunk, error) {
 	query := `
 		SELECT blob_id, chunk_hash, offset, length
 		FROM blob_chunks
@@ -124,7 +140,7 @@ func (r *BlobChunkRepository) GetByChunkHashTx(ctx context.Context, tx *sql.Tx,
 	if errors.Is(err, sql.ErrNoRows) {
 		LogSQL("GetByChunkHashTx", "No rows found", chunkHash)
 
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -138,13 +154,14 @@ func (r *BlobChunkRepository) GetByChunkHashTx(ctx context.Context, tx *sql.Tx,
 	return &bc, nil
 }
 
-// DeleteOrphaned deletes blob_chunks entries where either the blob or chunk no longer exists
+// DeleteOrphaned deletes blob_chunks entries where either the blob or the
+// chunk no longer exists.
 func (r *BlobChunkRepository) DeleteOrphaned(ctx context.Context) error {
 	// Delete blob_chunks where the blob doesn't exist
 	query1 := `
-		DELETE FROM blob_chunks 
+		DELETE FROM blob_chunks
 		WHERE NOT EXISTS (
-			SELECT 1 FROM blobs 
+			SELECT 1 FROM blobs
 			WHERE blobs.id = blob_chunks.blob_id
 		)
 	`
@@ -156,9 +173,9 @@ func (r *BlobChunkRepository) DeleteOrphaned(ctx context.Context) error {
 
 	// Delete blob_chunks where the chunk doesn't exist
 	query2 := `
-		DELETE FROM blob_chunks 
+		DELETE FROM blob_chunks
 		WHERE NOT EXISTS (
-			SELECT 1 FROM chunks 
+			SELECT 1 FROM chunks
 			WHERE chunks.chunk_hash = blob_chunks.chunk_hash
 		)
 	`

internal/database/blob_chunks_test.go

@@ -1,4 +1,4 @@
-package database
+package database_test
 
 import (
 	"context"
@@ -6,59 +6,91 @@ import (
 	"testing"
 	"time"
 
+	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
-func TestBlobChunkRepository(t *testing.T) {
+// Chunk hashes used across the blob_chunks tests.
-	db, cleanup := setupTestDB(t)
+const (
-	defer cleanup()
+	chunk1Hash = "chunk1"
+	chunk2Hash = "chunk2"
+	chunk3Hash = "chunk3"
+)
+
+// mustCreateChunks registers the given chunk hashes (1024 bytes each).
+func mustCreateChunks(
+	t *testing.T,
+	repos *database.Repositories,
+	hashes ...types.ChunkHash,
+) {
+	t.Helper()
 
 	ctx := context.Background()
-	repos := NewRepositories(db)
 
-	// Create blob first
+	for _, chunkHash := range hashes {
-	blob := &Blob{
+		chunk := &database.Chunk{
-		ID:        types.NewBlobID(),
-		Hash:      types.BlobHash("blob1-hash"),
-		CreatedTS: time.Now(),
-	}
-
-	err := repos.Blobs.Create(ctx, nil, blob)
-	if err != nil {
-		t.Fatalf("failed to create blob: %v", err)
-	}
-
-	// Create chunks
-	chunks := []types.ChunkHash{"chunk1", "chunk2", "chunk3"}
-	for _, chunkHash := range chunks {
-		chunk := &Chunk{
 			ChunkHash: chunkHash,
 			Size:      1024,
 		}
 
-		err = repos.Chunks.Create(ctx, nil, chunk)
+		err := repos.Chunks.Create(ctx, nil, chunk)
 		if err != nil {
 			t.Fatalf("failed to create chunk %s: %v", chunkHash, err)
 		}
 	}
+}
+
+// mustCreateBlob creates a blob row with the given hash.
+func mustCreateBlob(
+	t *testing.T,
+	repos *database.Repositories,
+	hash types.BlobHash,
+) *database.Blob {
+	t.Helper()
+
+	blob := &database.Blob{
+		ID:        types.NewBlobID(),
+		Hash:      hash,
+		CreatedTS: time.Now(),
+	}
+
+	err := repos.Blobs.Create(context.Background(), nil, blob)
+	if err != nil {
+		t.Fatalf("failed to create blob %s: %v", hash, err)
+	}
+
+	return blob
+}
+
+func TestBlobChunkRepository(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repos := database.NewRepositories(db)
+
+	blob := mustCreateBlob(t, repos, "blob1-hash")
+	mustCreateChunks(t, repos, chunk1Hash, chunk2Hash, chunk3Hash)
 
 	// Test Create
-	bc1 := &BlobChunk{
+	bc1 := &database.BlobChunk{
 		BlobID:    blob.ID,
-		ChunkHash: types.ChunkHash("chunk1"),
+		ChunkHash: types.ChunkHash(chunk1Hash),
 		Offset:    0,
 		Length:    1024,
 	}
 
-	err = repos.BlobChunks.Create(ctx, nil, bc1)
+	err := repos.BlobChunks.Create(ctx, nil, bc1)
 	if err != nil {
 		t.Fatalf("failed to create blob chunk: %v", err)
 	}
 
 	// Add more chunks to the same blob
-	bc2 := &BlobChunk{
+	bc2 := &database.BlobChunk{
 		BlobID:    blob.ID,
-		ChunkHash: types.ChunkHash("chunk2"),
+		ChunkHash: types.ChunkHash(chunk2Hash),
 		Offset:    1024,
 		Length:    2048,
 	}
@@ -68,9 +100,9 @@ func TestBlobChunkRepository(t *testing.T) {
 		t.Fatalf("failed to create second blob chunk: %v", err)
 	}
 
-	bc3 := &BlobChunk{
+	bc3 := &database.BlobChunk{
 		BlobID:    blob.ID,
-		ChunkHash: types.ChunkHash("chunk3"),
+		ChunkHash: types.ChunkHash(chunk3Hash),
 		Offset:    3072,
 		Length:    512,
 	}
@@ -94,12 +126,49 @@ func TestBlobChunkRepository(t *testing.T) {
 	expectedOffsets := []int64{0, 1024, 3072}
 	for i, bc := range blobChunks {
 		if bc.Offset != expectedOffsets[i] {
-			t.Errorf("wrong chunk order: expected offset %d, got %d", expectedOffsets[i], bc.Offset)
+			t.Errorf("wrong chunk order: expected offset %d, got %d",
+				expectedOffsets[i], bc.Offset)
 		}
 	}
 
+	// Test duplicate insert (should fail due to primary key constraint)
+	err = repos.BlobChunks.Create(ctx, nil, bc1)
+	if err == nil {
+		t.Fatal("duplicate blob_chunk insert should fail due to primary key constraint")
+	}
+
+	if !strings.Contains(err.Error(), "UNIQUE") &&
+		!strings.Contains(err.Error(), "constraint") {
+		t.Fatalf("expected constraint error, got: %v", err)
+	}
+}
+
+func TestBlobChunkRepositoryGetByChunkHash(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repos := database.NewRepositories(db)
+
+	blob := mustCreateBlob(t, repos, "blob-gbch-hash")
+	mustCreateChunks(t, repos, chunk2Hash)
+
+	bc2 := &database.BlobChunk{
+		BlobID:    blob.ID,
+		ChunkHash: types.ChunkHash(chunk2Hash),
+		Offset:    1024,
+		Length:    2048,
+	}
+
+	err := repos.BlobChunks.Create(ctx, nil, bc2)
+	if err != nil {
+		t.Fatalf("failed to create blob chunk: %v", err)
+	}
+
 	// Test GetByChunkHash
-	bc, err := repos.BlobChunks.GetByChunkHash(ctx, "chunk2")
+	bc, err := repos.BlobChunks.GetByChunkHash(ctx, chunk2Hash)
 	if err != nil {
 		t.Fatalf("failed to get blob chunk by chunk hash: %v", err)
 	}
@@ -116,16 +185,6 @@ func TestBlobChunkRepository(t *testing.T) {
 		t.Errorf("wrong offset: expected 1024, got %d", bc.Offset)
 	}
 
-	// Test duplicate insert (should fail due to primary key constraint)
-	err = repos.BlobChunks.Create(ctx, nil, bc1)
-	if err == nil {
-		t.Fatal("duplicate blob_chunk insert should fail due to primary key constraint")
-	}
-
-	if !strings.Contains(err.Error(), "UNIQUE") && !strings.Contains(err.Error(), "constraint") {
-		t.Fatalf("expected constraint error, got: %v", err)
-	}
-
 	// Test non-existent chunk
 	bc, err = repos.BlobChunks.GetByChunkHash(ctx, "nonexistent")
 	if err != nil {
@@ -138,55 +197,26 @@ func TestBlobChunkRepository(t *testing.T) {
 }
 
 func TestBlobChunkRepositoryMultipleBlobs(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repos := NewRepositories(db)
+	repos := database.NewRepositories(db)
 
-	// Create blobs
+	blob1 := mustCreateBlob(t, repos, "blob1-hash")
-	blob1 := &Blob{
+	blob2 := mustCreateBlob(t, repos, "blob2-hash")
-		ID:        types.NewBlobID(),
+	mustCreateChunks(t, repos, chunk1Hash, chunk2Hash, chunk3Hash)
-		Hash:      types.BlobHash("blob1-hash"),
-		CreatedTS: time.Now(),
-	}
-	blob2 := &Blob{
-		ID:        types.NewBlobID(),
-		Hash:      types.BlobHash("blob2-hash"),
-		CreatedTS: time.Now(),
-	}
-
-	err := repos.Blobs.Create(ctx, nil, blob1)
-	if err != nil {
-		t.Fatalf("failed to create blob1: %v", err)
-	}
-
-	err = repos.Blobs.Create(ctx, nil, blob2)
-	if err != nil {
-		t.Fatalf("failed to create blob2: %v", err)
-	}
-
-	// Create chunks
-	chunkHashes := []types.ChunkHash{"chunk1", "chunk2", "chunk3"}
-	for _, chunkHash := range chunkHashes {
-		chunk := &Chunk{
-			ChunkHash: chunkHash,
-			Size:      1024,
-		}
-
-		err = repos.Chunks.Create(ctx, nil, chunk)
-		if err != nil {
-			t.Fatalf("failed to create chunk %s: %v", chunkHash, err)
-		}
-	}
 
 	// Create chunks across multiple blobs
 	// Some chunks are shared between blobs (deduplication scenario)
-	blobChunks := []BlobChunk{
+	blobChunks := []database.BlobChunk{
-		{BlobID: blob1.ID, ChunkHash: types.ChunkHash("chunk1"), Offset: 0, Length: 1024},
+		{BlobID: blob1.ID, ChunkHash: chunk1Hash, Offset: 0, Length: 1024},
-		{BlobID: blob1.ID, ChunkHash: types.ChunkHash("chunk2"), Offset: 1024, Length: 1024},
+		{BlobID: blob1.ID, ChunkHash: chunk2Hash, Offset: 1024, Length: 1024},
-		{BlobID: blob2.ID, ChunkHash: types.ChunkHash("chunk2"), Offset: 0, Length: 1024}, // chunk2 is shared
+		// chunk2 is shared between the blobs
-		{BlobID: blob2.ID, ChunkHash: types.ChunkHash("chunk3"), Offset: 1024, Length: 1024},
+		{BlobID: blob2.ID, ChunkHash: chunk2Hash, Offset: 0, Length: 1024},
+		{BlobID: blob2.ID, ChunkHash: chunk3Hash, Offset: 1024, Length: 1024},
 	}
 
 	for _, bc := range blobChunks {
@@ -217,7 +247,7 @@ func TestBlobChunkRepositoryMultipleBlobs(t *testing.T) {
 	}
 
 	// Verify shared chunk
-	bc, err := repos.BlobChunks.GetByChunkHash(ctx, "chunk2")
+	bc, err := repos.BlobChunks.GetByChunkHash(ctx, chunk2Hash)
 	if err != nil {
 		t.Fatalf("failed to get shared chunk: %v", err)
 	}

internal/database/blobs.go

@@ -10,17 +10,22 @@ import (
 	"sneak.berlin/go/vaultik/internal/log"
 )
 
+// BlobRepository provides access to the blobs table, which tracks the
+// packed, encrypted storage units uploaded to the destination.
 type BlobRepository struct {
 	db *DB
 }
 
+// NewBlobRepository creates a BlobRepository backed by db.
 func NewBlobRepository(db *DB) *BlobRepository {
 	return &BlobRepository{db: db}
 }
 
+// Create inserts a blob row, using tx when non-nil.
 func (r *BlobRepository) Create(ctx context.Context, tx *sql.Tx, blob *Blob) error {
 	query := `
-		INSERT INTO blobs (id, blob_hash, created_ts, finished_ts, uncompressed_size, compressed_size, uploaded_ts)
+		INSERT INTO blobs (id, blob_hash, created_ts, finished_ts,
+			uncompressed_size, compressed_size, uploaded_ts)
 		VALUES (?, ?, ?, ?, ?, ?, ?)
 	`
 
@@ -52,95 +57,15 @@ func (r *BlobRepository) Create(ctx context.Context, tx *sql.Tx, blob *Blob) err
 	return nil
 }
 
+// GetByHash returns the blob with the given content hash, or nil if no
+// such blob exists.
 func (r *BlobRepository) GetByHash(ctx context.Context, hash string) (*Blob, error) {
-	query := `
+	return r.getOne(ctx, "blob_hash", hash)
-		SELECT id, blob_hash, created_ts, finished_ts, uncompressed_size, compressed_size, uploaded_ts
-		FROM blobs
-		WHERE blob_hash = ?
-	`
-
-	var (
-		blob                           Blob
-		createdTSUnix                  int64
-		finishedTSUnix, uploadedTSUnix sql.NullInt64
-	)
-
-	err := r.db.conn.QueryRowContext(ctx, query, hash).Scan(
-		&blob.ID,
-		&blob.Hash,
-		&createdTSUnix,
-		&finishedTSUnix,
-		&blob.UncompressedSize,
-		&blob.CompressedSize,
-		&uploadedTSUnix,
-	)
-
-	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("querying blob: %w", err)
-	}
-
-	blob.CreatedTS = time.Unix(createdTSUnix, 0).UTC()
-	if finishedTSUnix.Valid {
-		ts := time.Unix(finishedTSUnix.Int64, 0).UTC()
-		blob.FinishedTS = &ts
-	}
-
-	if uploadedTSUnix.Valid {
-		ts := time.Unix(uploadedTSUnix.Int64, 0).UTC()
-		blob.UploadedTS = &ts
-	}
-
-	return &blob, nil
 }
 
 // GetByID retrieves a blob by its ID
 func (r *BlobRepository) GetByID(ctx context.Context, id string) (*Blob, error) {
-	query := `
+	return r.getOne(ctx, "id", id)
-		SELECT id, blob_hash, created_ts, finished_ts, uncompressed_size, compressed_size, uploaded_ts
-		FROM blobs
-		WHERE id = ?
-	`
-
-	var (
-		blob                           Blob
-		createdTSUnix                  int64
-		finishedTSUnix, uploadedTSUnix sql.NullInt64
-	)
-
-	err := r.db.conn.QueryRowContext(ctx, query, id).Scan(
-		&blob.ID,
-		&blob.Hash,
-		&createdTSUnix,
-		&finishedTSUnix,
-		&blob.UncompressedSize,
-		&blob.CompressedSize,
-		&uploadedTSUnix,
-	)
-
-	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("querying blob: %w", err)
-	}
-
-	blob.CreatedTS = time.Unix(createdTSUnix, 0).UTC()
-	if finishedTSUnix.Valid {
-		ts := time.Unix(finishedTSUnix.Int64, 0).UTC()
-		blob.FinishedTS = &ts
-	}
-
-	if uploadedTSUnix.Valid {
-		ts := time.Unix(uploadedTSUnix.Int64, 0).UTC()
-		blob.UploadedTS = &ts
-	}
-
-	return &blob, nil
 }
 
 // GetAll returns every blob row keyed by blob ID. Useful at restore
@@ -148,7 +73,8 @@ func (r *BlobRepository) GetByID(ctx context.Context, id string) (*Blob, error)
 // into blob hashes without doing one GetByID query per chunk.
 func (r *BlobRepository) GetAll(ctx context.Context) (map[string]*Blob, error) {
 	query := `
-		SELECT id, blob_hash, created_ts, finished_ts, uncompressed_size, compressed_size, uploaded_ts
+		SELECT id, blob_hash, created_ts, finished_ts,
+			uncompressed_size, compressed_size, uploaded_ts
 		FROM blobs
 	`
 
@@ -198,7 +124,13 @@ func (r *BlobRepository) GetAll(ctx context.Context) (map[string]*Blob, error) {
 }
 
 // UpdateFinished updates a blob when it's finalized
-func (r *BlobRepository) UpdateFinished(ctx context.Context, tx *sql.Tx, id string, hash string, uncompressedSize, compressedSize int64) error {
+func (r *BlobRepository) UpdateFinished(
+	ctx context.Context,
+	tx *sql.Tx,
+	id string,
+	hash string,
+	uncompressedSize, compressedSize int64,
+) error {
 	query := `
 		UPDATE blobs 
 		SET blob_hash = ?, finished_ts = ?, uncompressed_size = ?, compressed_size = ?
@@ -222,7 +154,9 @@ func (r *BlobRepository) UpdateFinished(ctx context.Context, tx *sql.Tx, id stri
 }
 
 // UpdateUploaded marks a blob as uploaded
-func (r *BlobRepository) UpdateUploaded(ctx context.Context, tx *sql.Tx, id string) error {
+func (r *BlobRepository) UpdateUploaded(
+	ctx context.Context, tx *sql.Tx, id string,
+) error {
 	query := `
 		UPDATE blobs 
 		SET uploaded_ts = ?
@@ -267,3 +201,52 @@ func (r *BlobRepository) DeleteOrphaned(ctx context.Context) error {
 
 	return nil
 }
+
+// getOne fetches a single blob row matched on the given column, or
+// (nil, nil) when no row matches.
+func (r *BlobRepository) getOne(
+	ctx context.Context, column, value string,
+) (*Blob, error) {
+	query := `
+		SELECT id, blob_hash, created_ts, finished_ts,
+			uncompressed_size, compressed_size, uploaded_ts
+		FROM blobs
+		WHERE ` + column + ` = ?`
+
+	var (
+		blob                           Blob
+		createdTSUnix                  int64
+		finishedTSUnix, uploadedTSUnix sql.NullInt64
+	)
+
+	err := r.db.conn.QueryRowContext(ctx, query, value).Scan(
+		&blob.ID,
+		&blob.Hash,
+		&createdTSUnix,
+		&finishedTSUnix,
+		&blob.UncompressedSize,
+		&blob.CompressedSize,
+		&uploadedTSUnix,
+	)
+
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("querying blob: %w", err)
+	}
+
+	blob.CreatedTS = time.Unix(createdTSUnix, 0).UTC()
+	if finishedTSUnix.Valid {
+		ts := time.Unix(finishedTSUnix.Int64, 0).UTC()
+		blob.FinishedTS = &ts
+	}
+
+	if uploadedTSUnix.Valid {
+		ts := time.Unix(uploadedTSUnix.Int64, 0).UTC()
+		blob.UploadedTS = &ts
+	}
+
+	return &blob, nil
+}

internal/database/blobs_test.go

@@ -1,22 +1,25 @@
-package database
+package database_test
 
 import (
 	"context"
 	"testing"
 	"time"
 
+	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
 func TestBlobRepository(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewBlobRepository(db)
+	repo := database.NewBlobRepository(db)
 
 	// Test Create
-	blob := &Blob{
+	blob := &database.Blob{
 		ID:        types.NewBlobID(),
 		Hash:      types.BlobHash("blobhash123"),
 		CreatedTS: time.Now().Truncate(time.Second),
@@ -42,7 +45,8 @@ func TestBlobRepository(t *testing.T) {
 	}
 
 	if !retrieved.CreatedTS.Equal(blob.CreatedTS) {
-		t.Errorf("created timestamp mismatch: got %v, want %v", retrieved.CreatedTS, blob.CreatedTS)
+		t.Errorf("created timestamp mismatch: got %v, want %v",
+			retrieved.CreatedTS, blob.CreatedTS)
 	}
 
 	// Test GetByID
@@ -60,7 +64,7 @@ func TestBlobRepository(t *testing.T) {
 	}
 
 	// Test with second blob
-	blob2 := &Blob{
+	blob2 := &database.Blob{
 		ID:        types.NewBlobID(),
 		Hash:      types.BlobHash("blobhash456"),
 		CreatedTS: time.Now().Truncate(time.Second),
@@ -70,6 +74,27 @@ func TestBlobRepository(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to create second blob: %v", err)
 	}
+}
+
+func TestBlobRepositoryUpdates(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repo := database.NewBlobRepository(db)
+
+	blob := &database.Blob{
+		ID:        types.NewBlobID(),
+		Hash:      types.BlobHash("blobhash123"),
+		CreatedTS: time.Now().Truncate(time.Second),
+	}
+
+	err := repo.Create(ctx, nil, blob)
+	if err != nil {
+		t.Fatalf("failed to create blob: %v", err)
+	}
 
 	// Test UpdateFinished
 	now := time.Now()
@@ -119,13 +144,15 @@ func TestBlobRepository(t *testing.T) {
 }
 
 func TestBlobRepositoryDuplicate(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewBlobRepository(db)
+	repo := database.NewBlobRepository(db)
 
-	blob := &Blob{
+	blob := &database.Blob{
 		ID:        types.NewBlobID(),
 		Hash:      types.BlobHash("duplicate_blob"),
 		CreatedTS: time.Now().Truncate(time.Second),

internal/database/cascade_debug_test.go

@@ -1,3 +1,4 @@
+//nolint:testpackage // inspects the unexported database connection
 package database
 
 import (
@@ -9,25 +10,13 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
-// TestCascadeDeleteDebug tests cascade delete with debug output
+// createCascadeFixtures creates a file with three chunk mappings for the
-func TestCascadeDeleteDebug(t *testing.T) {
+// cascade-delete test.
-	db, cleanup := setupTestDB(t)
+func createCascadeFixtures(t *testing.T, repos *Repositories) *File {
-	defer cleanup()
+	t.Helper()
 
 	ctx := context.Background()
-	repos := NewRepositories(db)
 
-	// Check if foreign keys are enabled
-	var fkEnabled int
-
-	err := db.conn.QueryRow("PRAGMA foreign_keys").Scan(&fkEnabled)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Logf("Foreign keys enabled: %d", fkEnabled)
-
-	// Create a file
 	file := &File{
 		Path:  "/cascade-test.txt",
 		MTime: time.Now().Truncate(time.Second),
@@ -37,7 +26,7 @@ func TestCascadeDeleteDebug(t *testing.T) {
 		GID:   1000,
 	}
 
-	err = repos.Files.Create(ctx, nil, file)
+	err := repos.Files.Create(ctx, nil, file)
 	if err != nil {
 		t.Fatalf("failed to create file: %v", err)
 	}
@@ -67,9 +56,56 @@ func TestCascadeDeleteDebug(t *testing.T) {
 			t.Fatalf("failed to create file chunk: %v", err)
 		}
 
-		t.Logf("Created file chunk mapping: file_id=%s, idx=%d, chunk=%s", fc.FileID, fc.Idx, fc.ChunkHash)
+		t.Logf("Created file chunk mapping: file_id=%s, idx=%d, chunk=%s",
+			fc.FileID, fc.Idx, fc.ChunkHash)
 	}
 
+	return file
+}
+
+// logCascadeDebugInfo logs foreign-key state and the file_chunks table
+// definition for cascade-delete debugging.
+func logCascadeDebugInfo(ctx context.Context, t *testing.T, db *DB) {
+	t.Helper()
+
+	// Check if foreign keys are enabled
+	var fkEnabled int
+
+	err := db.conn.QueryRowContext(ctx, "PRAGMA foreign_keys").Scan(&fkEnabled)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Logf("Foreign keys enabled: %d", fkEnabled)
+
+	// Check the foreign key constraint
+	var fkInfo string
+
+	err = db.conn.QueryRowContext(ctx, `
+		SELECT sql FROM sqlite_master
+		WHERE type='table' AND name='file_chunks'
+	`).Scan(&fkInfo)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Logf("file_chunks table definition:\n%s", fkInfo)
+}
+
+// TestCascadeDeleteDebug tests cascade delete with debug output
+func TestCascadeDeleteDebug(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repos := NewRepositories(db)
+
+	logCascadeDebugInfo(ctx, t, db)
+
+	file := createCascadeFixtures(t, repos)
+
 	// Verify file chunks exist
 	fileChunks, err := repos.FileChunks.GetByFileID(ctx, file.ID)
 	if err != nil {
@@ -78,19 +114,6 @@ func TestCascadeDeleteDebug(t *testing.T) {
 
 	t.Logf("File chunks before delete: %d", len(fileChunks))
 
-	// Check the foreign key constraint
-	var fkInfo string
-
-	err = db.conn.QueryRow(`
-		SELECT sql FROM sqlite_master 
-		WHERE type='table' AND name='file_chunks'
-	`).Scan(&fkInfo)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Logf("file_chunks table definition:\n%s", fkInfo)
-
 	// Delete the file
 	t.Log("Deleting file...")
 
@@ -122,7 +145,9 @@ func TestCascadeDeleteDebug(t *testing.T) {
 	// Manually check the database
 	var count int
 
-	err = db.conn.QueryRow("SELECT COUNT(*) FROM file_chunks WHERE file_id = ?", file.ID).Scan(&count)
+	err = db.conn.QueryRowContext(ctx,
+		"SELECT COUNT(*) FROM file_chunks WHERE file_id = ?", file.ID,
+	).Scan(&count)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -133,7 +158,8 @@ func TestCascadeDeleteDebug(t *testing.T) {
 		t.Errorf("expected 0 file chunks after cascade delete, got %d", len(fileChunks))
 		// List the remaining chunks
 		for _, fc := range fileChunks {
-			t.Logf("Remaining chunk: file_id=%s, idx=%d, chunk=%s", fc.FileID, fc.Idx, fc.ChunkHash)
+			t.Logf("Remaining chunk: file_id=%s, idx=%d, chunk=%s",
+				fc.FileID, fc.Idx, fc.ChunkHash)
 		}
 	}
 }

internal/database/chunk_files.go

@@ -9,15 +9,21 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// ChunkFileRepository provides access to the chunk_files table, the
+// reverse mapping from chunks to the files that contain them.
 type ChunkFileRepository struct {
 	db *DB
 }
 
+// NewChunkFileRepository creates a ChunkFileRepository backed by db.
 func NewChunkFileRepository(db *DB) *ChunkFileRepository {
 	return &ChunkFileRepository{db: db}
 }
 
-func (r *ChunkFileRepository) Create(ctx context.Context, tx *sql.Tx, cf *ChunkFile) error {
+// Create inserts a chunk_files row (idempotently), using tx when non-nil.
+func (r *ChunkFileRepository) Create(
+	ctx context.Context, tx *sql.Tx, cf *ChunkFile,
+) error {
 	query := `
 		INSERT INTO chunk_files (chunk_hash, file_id, file_offset, length)
 		VALUES (?, ?, ?, ?)
@@ -26,9 +32,11 @@ func (r *ChunkFileRepository) Create(ctx context.Context, tx *sql.Tx, cf *ChunkF
 
 	var err error
 	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, cf.ChunkHash.String(), cf.FileID.String(), cf.FileOffset, cf.Length)
+		_, err = tx.ExecContext(ctx, query,
+			cf.ChunkHash.String(), cf.FileID.String(), cf.FileOffset, cf.Length)
 	} else {
-		_, err = r.db.ExecWithLog(ctx, query, cf.ChunkHash.String(), cf.FileID.String(), cf.FileOffset, cf.Length)
+		_, err = r.db.ExecWithLog(ctx, query,
+			cf.ChunkHash.String(), cf.FileID.String(), cf.FileOffset, cf.Length)
 	}
 
 	if err != nil {
@@ -38,7 +46,10 @@ func (r *ChunkFileRepository) Create(ctx context.Context, tx *sql.Tx, cf *ChunkF
 	return nil
 }
 
-func (r *ChunkFileRepository) GetByChunkHash(ctx context.Context, chunkHash types.ChunkHash) ([]*ChunkFile, error) {
+// GetByChunkHash returns all chunk_files rows for the given chunk hash.
+func (r *ChunkFileRepository) GetByChunkHash(
+	ctx context.Context, chunkHash types.ChunkHash,
+) ([]*ChunkFile, error) {
 	query := `
 		SELECT chunk_hash, file_id, file_offset, length
 		FROM chunk_files
@@ -54,7 +65,10 @@ func (r *ChunkFileRepository) GetByChunkHash(ctx context.Context, chunkHash type
 	return r.scanChunkFiles(rows)
 }
 
-func (r *ChunkFileRepository) GetByFilePath(ctx context.Context, filePath string) ([]*ChunkFile, error) {
+// GetByFilePath returns all chunk_files rows for the file at the given path.
+func (r *ChunkFileRepository) GetByFilePath(
+	ctx context.Context, filePath string,
+) ([]*ChunkFile, error) {
 	query := `
 		SELECT cf.chunk_hash, cf.file_id, cf.file_offset, cf.length
 		FROM chunk_files cf
@@ -72,7 +86,9 @@ func (r *ChunkFileRepository) GetByFilePath(ctx context.Context, filePath string
 }
 
 // GetByFileID retrieves chunk files by file ID
-func (r *ChunkFileRepository) GetByFileID(ctx context.Context, fileID types.FileID) ([]*ChunkFile, error) {
+func (r *ChunkFileRepository) GetByFileID(
+	ctx context.Context, fileID types.FileID,
+) ([]*ChunkFile, error) {
 	query := `
 		SELECT chunk_hash, file_id, file_offset, length
 		FROM chunk_files
@@ -88,7 +104,124 @@ func (r *ChunkFileRepository) GetByFileID(ctx context.Context, fileID types.File
 	return r.scanChunkFiles(rows)
 }
 
-// scanChunkFiles is a helper that scans chunk file rows
+// DeleteByFileID deletes all chunk_files entries for a given file ID
+func (r *ChunkFileRepository) DeleteByFileID(
+	ctx context.Context, tx *sql.Tx, fileID types.FileID,
+) error {
+	query := `DELETE FROM chunk_files WHERE file_id = ?`
+
+	var err error
+	if tx != nil {
+		_, err = tx.ExecContext(ctx, query, fileID.String())
+	} else {
+		_, err = r.db.ExecWithLog(ctx, query, fileID.String())
+	}
+
+	if err != nil {
+		return fmt.Errorf("deleting chunk files: %w", err)
+	}
+
+	return nil
+}
+
+// DeleteByFileIDs deletes all chunk_files for multiple files in a single statement.
+//
+//nolint:dupl // symmetric implementation for a parallel association table
+func (r *ChunkFileRepository) DeleteByFileIDs(
+	ctx context.Context, tx *sql.Tx, fileIDs []types.FileID,
+) error {
+	if len(fileIDs) == 0 {
+		return nil
+	}
+
+	// Batch at 500 to stay within SQLite's variable limit
+	const batchSize = 500
+
+	for i := 0; i < len(fileIDs); i += batchSize {
+		end := min(i+batchSize, len(fileIDs))
+
+		batch := fileIDs[i:end]
+
+		//nolint:gosec // G202: concatenates constant SQL and "?" placeholders only
+		query := "DELETE FROM chunk_files WHERE file_id IN (?" +
+			repeatPlaceholder(len(batch)-1) + ")"
+
+		args := make([]any, len(batch))
+		for j, id := range batch {
+			args[j] = id.String()
+		}
+
+		var err error
+		if tx != nil {
+			_, err = tx.ExecContext(ctx, query, args...)
+		} else {
+			_, err = r.db.ExecWithLog(ctx, query, args...)
+		}
+
+		if err != nil {
+			return fmt.Errorf("batch deleting chunk_files: %w", err)
+		}
+	}
+
+	return nil
+}
+
+// CreateBatch inserts multiple chunk_files in a single statement for efficiency.
+func (r *ChunkFileRepository) CreateBatch(
+	ctx context.Context, tx *sql.Tx, cfs []ChunkFile,
+) error {
+	if len(cfs) == 0 {
+		return nil
+	}
+
+	// Each chunk_files row binds this many SQL variables.
+	const chunkFileCols = 4
+
+	// Batch at 200 rows to be safe with SQLite's variable limit.
+	const batchSize = 200
+
+	for i := 0; i < len(cfs); i += batchSize {
+		end := min(i+batchSize, len(cfs))
+
+		batch := cfs[i:end]
+
+		query := "INSERT INTO chunk_files (chunk_hash, file_id, file_offset, length) VALUES "
+
+		args := make([]any, 0, len(batch)*chunkFileCols)
+
+		var querySb183 strings.Builder
+
+		for j, cf := range batch {
+			if j > 0 {
+				querySb183.WriteString(", ")
+			}
+
+			querySb183.WriteString("(?, ?, ?, ?)")
+
+			args = append(args,
+				cf.ChunkHash.String(), cf.FileID.String(), cf.FileOffset, cf.Length)
+		}
+
+		query += querySb183.String() //nolint:gosec // G202: appends "?" placeholders only
+
+		query += " ON CONFLICT(chunk_hash, file_id) DO NOTHING"
+
+		var err error
+		if tx != nil {
+			_, err = tx.ExecContext(ctx, query, args...)
+		} else {
+			_, err = r.db.ExecWithLog(ctx, query, args...)
+		}
+
+		if err != nil {
+			return fmt.Errorf("batch inserting chunk_files: %w", err)
+		}
+	}
+
+	return nil
+}
+
+// scanChunkFiles is a helper that scans chunk file rows.
 func (r *ChunkFileRepository) scanChunkFiles(rows *sql.Rows) ([]*ChunkFile, error) {
 	var chunkFiles []*ChunkFile
 
@@ -115,106 +248,3 @@ func (r *ChunkFileRepository) scanChunkFiles(rows *sql.Rows) ([]*ChunkFile, erro
 
 	return chunkFiles, rows.Err()
 }
-
-// DeleteByFileID deletes all chunk_files entries for a given file ID
-func (r *ChunkFileRepository) DeleteByFileID(ctx context.Context, tx *sql.Tx, fileID types.FileID) error {
-	query := `DELETE FROM chunk_files WHERE file_id = ?`
-
-	var err error
-	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, fileID.String())
-	} else {
-		_, err = r.db.ExecWithLog(ctx, query, fileID.String())
-	}
-
-	if err != nil {
-		return fmt.Errorf("deleting chunk files: %w", err)
-	}
-
-	return nil
-}
-
-// DeleteByFileIDs deletes all chunk_files for multiple files in a single statement.
-func (r *ChunkFileRepository) DeleteByFileIDs(ctx context.Context, tx *sql.Tx, fileIDs []types.FileID) error {
-	if len(fileIDs) == 0 {
-		return nil
-	}
-
-	// Batch at 500 to stay within SQLite's variable limit
-	const batchSize = 500
-
-	for i := 0; i < len(fileIDs); i += batchSize {
-		end := min(i+batchSize, len(fileIDs))
-
-		batch := fileIDs[i:end]
-
-		query := "DELETE FROM chunk_files WHERE file_id IN (?" + repeatPlaceholder(len(batch)-1) + ")"
-
-		args := make([]any, len(batch))
-		for j, id := range batch {
-			args[j] = id.String()
-		}
-
-		var err error
-		if tx != nil {
-			_, err = tx.ExecContext(ctx, query, args...)
-		} else {
-			_, err = r.db.ExecWithLog(ctx, query, args...)
-		}
-
-		if err != nil {
-			return fmt.Errorf("batch deleting chunk_files: %w", err)
-		}
-	}
-
-	return nil
-}
-
-// CreateBatch inserts multiple chunk_files in a single statement for efficiency.
-func (r *ChunkFileRepository) CreateBatch(ctx context.Context, tx *sql.Tx, cfs []ChunkFile) error {
-	if len(cfs) == 0 {
-		return nil
-	}
-
-	// Each ChunkFile has 4 values, so batch at 200 to be safe with SQLite's variable limit
-	const batchSize = 200
-
-	for i := 0; i < len(cfs); i += batchSize {
-		end := min(i+batchSize, len(cfs))
-
-		batch := cfs[i:end]
-
-		query := "INSERT INTO chunk_files (chunk_hash, file_id, file_offset, length) VALUES "
-
-		args := make([]any, 0, len(batch)*4)
-
-		var querySb183 strings.Builder
-
-		for j, cf := range batch {
-			if j > 0 {
-				querySb183.WriteString(", ")
-			}
-
-			querySb183.WriteString("(?, ?, ?, ?)")
-
-			args = append(args, cf.ChunkHash.String(), cf.FileID.String(), cf.FileOffset, cf.Length)
-		}
-
-		query += querySb183.String()
-
-		query += " ON CONFLICT(chunk_hash, file_id) DO NOTHING"
-
-		var err error
-		if tx != nil {
-			_, err = tx.ExecContext(ctx, query, args...)
-		} else {
-			_, err = r.db.ExecWithLog(ctx, query, args...)
-		}
-
-		if err != nil {
-			return fmt.Errorf("batch inserting chunk_files: %w", err)
-		}
-	}
-
-	return nil
-}

internal/database/chunk_files_test.go

@@ -1,81 +1,105 @@
-package database
+package database_test
 
 import (
 	"context"
 	"testing"
 	"time"
 
+	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+const chunk4Hash = "chunk4"
+
+// verifyChunkFilePair asserts that the chunk-file rows cover both test
+// files at their expected offsets.
+func verifyChunkFilePair(
+	t *testing.T, chunkFiles []*database.ChunkFile,
+	file1ID, file2ID types.FileID,
+) {
+	t.Helper()
+
+	foundFile1 := false
+	foundFile2 := false
+
+	for _, cf := range chunkFiles {
+		if cf.FileID == file1ID && cf.FileOffset == 0 {
+			foundFile1 = true
+		}
+
+		if cf.FileID == file2ID && cf.FileOffset == 2048 {
+			foundFile2 = true
+		}
+	}
+
+	if !foundFile1 || !foundFile2 {
+		t.Error("not all expected files found")
+	}
+}
+
+// createChunkFileTestFiles creates the two files used by the chunk-file
+// repository tests.
+func createChunkFileTestFiles(
+	t *testing.T, fileRepo *database.FileRepository,
+) (*database.File, *database.File) {
+	t.Helper()
+
+	testTime := time.Now().Truncate(time.Second)
+	file1 := &database.File{
+		Path:       testFilePath1,
+		MTime:      testTime,
+		Size:       1024,
+		Mode:       0644,
+		UID:        1000,
+		GID:        1000,
+		LinkTarget: "",
+	}
+	file2 := &database.File{
+		Path:       testFilePath2,
+		MTime:      testTime,
+		Size:       1024,
+		Mode:       0644,
+		UID:        1000,
+		GID:        1000,
+		LinkTarget: "",
+	}
+
+	mustCreateFile(t, fileRepo, file1)
+	mustCreateFile(t, fileRepo, file2)
+
+	return file1, file2
+}
+
 func TestChunkFileRepository(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewChunkFileRepository(db)
+	repo := database.NewChunkFileRepository(db)
-	fileRepo := NewFileRepository(db)
+	fileRepo := database.NewFileRepository(db)
-	chunksRepo := NewChunkRepository(db)
+	repos := database.NewRepositories(db)
 
-	// Create test files first
+	file1, file2 := createChunkFileTestFiles(t, fileRepo)
-	testTime := time.Now().Truncate(time.Second)
+	mustCreateChunks(t, repos, chunk1Hash)
-	file1 := &File{
-		Path:       "/file1.txt",
-		MTime:      testTime,
-		Size:       1024,
-		Mode:       0644,
-		UID:        1000,
-		GID:        1000,
-		LinkTarget: "",
-	}
-
-	err := fileRepo.Create(ctx, nil, file1)
-	if err != nil {
-		t.Fatalf("failed to create file1: %v", err)
-	}
-
-	file2 := &File{
-		Path:       "/file2.txt",
-		MTime:      testTime,
-		Size:       1024,
-		Mode:       0644,
-		UID:        1000,
-		GID:        1000,
-		LinkTarget: "",
-	}
-
-	err = fileRepo.Create(ctx, nil, file2)
-	if err != nil {
-		t.Fatalf("failed to create file2: %v", err)
-	}
-
-	// Create chunk first
-	chunk := &Chunk{
-		ChunkHash: types.ChunkHash("chunk1"),
-		Size:      1024,
-	}
-
-	err = chunksRepo.Create(ctx, nil, chunk)
-	if err != nil {
-		t.Fatalf("failed to create chunk: %v", err)
-	}
 
 	// Test Create
-	cf1 := &ChunkFile{
+	cf1 := &database.ChunkFile{
-		ChunkHash:  types.ChunkHash("chunk1"),
+		ChunkHash:  types.ChunkHash(chunk1Hash),
 		FileID:     file1.ID,
 		FileOffset: 0,
 		Length:     1024,
 	}
 
-	err = repo.Create(ctx, nil, cf1)
+	err := repo.Create(ctx, nil, cf1)
 	if err != nil {
 		t.Fatalf("failed to create chunk file: %v", err)
 	}
 
 	// Add same chunk in different file (deduplication scenario)
-	cf2 := &ChunkFile{
+	cf2 := &database.ChunkFile{
-		ChunkHash:  types.ChunkHash("chunk1"),
+		ChunkHash:  types.ChunkHash(chunk1Hash),
 		FileID:     file2.ID,
 		FileOffset: 2048,
 		Length:     1024,
@@ -87,7 +111,7 @@ func TestChunkFileRepository(t *testing.T) {
 	}
 
 	// Test GetByChunkHash
-	chunkFiles, err := repo.GetByChunkHash(ctx, "chunk1")
+	chunkFiles, err := repo.GetByChunkHash(ctx, chunk1Hash)
 	if err != nil {
 		t.Fatalf("failed to get chunk files: %v", err)
 	}
@@ -97,22 +121,7 @@ func TestChunkFileRepository(t *testing.T) {
 	}
 
 	// Verify both files are returned
-	foundFile1 := false
+	verifyChunkFilePair(t, chunkFiles, file1.ID, file2.ID)
-	foundFile2 := false
-
-	for _, cf := range chunkFiles {
-		if cf.FileID == file1.ID && cf.FileOffset == 0 {
-			foundFile1 = true
-		}
-
-		if cf.FileID == file2.ID && cf.FileOffset == 2048 {
-			foundFile2 = true
-		}
-	}
-
-	if !foundFile1 || !foundFile2 {
-		t.Error("not all expected files found")
-	}
 
 	// Test GetByFileID
 	chunkFiles, err = repo.GetByFileID(ctx, file1.ID)
@@ -124,7 +133,7 @@ func TestChunkFileRepository(t *testing.T) {
 		t.Errorf("expected 1 chunk for file, got %d", len(chunkFiles))
 	}
 
-	if chunkFiles[0].ChunkHash != types.ChunkHash("chunk1") {
+	if chunkFiles[0].ChunkHash != types.ChunkHash(chunk1Hash) {
 		t.Errorf("wrong chunk hash: expected chunk1, got %s", chunkFiles[0].ChunkHash)
 	}
 
@@ -136,66 +145,53 @@ func TestChunkFileRepository(t *testing.T) {
 }
 
 func TestChunkFileRepositoryComplexDeduplication(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewChunkFileRepository(db)
+	repo := database.NewChunkFileRepository(db)
-	fileRepo := NewFileRepository(db)
+	fileRepo := database.NewFileRepository(db)
-	chunksRepo := NewChunkRepository(db)
+	repos := database.NewRepositories(db)
 
 	// Create test files
 	testTime := time.Now().Truncate(time.Second)
-	file1 := &File{Path: "/file1.txt", MTime: testTime, Size: 3072, Mode: 0644, UID: 1000, GID: 1000}
+	file1 := &database.File{
-	file2 := &File{Path: "/file2.txt", MTime: testTime, Size: 3072, Mode: 0644, UID: 1000, GID: 1000}
+		Path: testFilePath1, MTime: testTime, Size: 3072,
-	file3 := &File{Path: "/file3.txt", MTime: testTime, Size: 2048, Mode: 0644, UID: 1000, GID: 1000}
+		Mode: 0644, UID: 1000, GID: 1000,
-
+	}
-	err := fileRepo.Create(ctx, nil, file1)
+	file2 := &database.File{
-	if err != nil {
+		Path: testFilePath2, MTime: testTime, Size: 3072,
-		t.Fatalf("failed to create file1: %v", err)
+		Mode: 0644, UID: 1000, GID: 1000,
+	}
+	file3 := &database.File{
+		Path: "/file3.txt", MTime: testTime, Size: 2048,
+		Mode: 0644, UID: 1000, GID: 1000,
 	}
 
-	err = fileRepo.Create(ctx, nil, file2)
+	mustCreateFile(t, fileRepo, file1)
-	if err != nil {
+	mustCreateFile(t, fileRepo, file2)
-		t.Fatalf("failed to create file2: %v", err)
+	mustCreateFile(t, fileRepo, file3)
-	}
+	mustCreateChunks(t, repos, chunk1Hash, chunk2Hash, chunk3Hash, chunk4Hash)
-
-	err = fileRepo.Create(ctx, nil, file3)
-	if err != nil {
-		t.Fatalf("failed to create file3: %v", err)
-	}
-
-	// Create chunks first
-	chunks := []types.ChunkHash{"chunk1", "chunk2", "chunk3", "chunk4"}
-	for _, chunkHash := range chunks {
-		chunk := &Chunk{
-			ChunkHash: chunkHash,
-			Size:      1024,
-		}
-
-		err := chunksRepo.Create(ctx, nil, chunk)
-		if err != nil {
-			t.Fatalf("failed to create chunk %s: %v", chunkHash, err)
-		}
-	}
 
 	// Simulate a scenario where multiple files share chunks
 	// File1: chunk1, chunk2, chunk3
 	// File2: chunk2, chunk3, chunk4
 	// File3: chunk1, chunk4
 
-	chunkFiles := []ChunkFile{
+	chunkFiles := []database.ChunkFile{
 		// File1
-		{ChunkHash: types.ChunkHash("chunk1"), FileID: file1.ID, FileOffset: 0, Length: 1024},
+		{ChunkHash: chunk1Hash, FileID: file1.ID, FileOffset: 0, Length: 1024},
-		{ChunkHash: types.ChunkHash("chunk2"), FileID: file1.ID, FileOffset: 1024, Length: 1024},
+		{ChunkHash: chunk2Hash, FileID: file1.ID, FileOffset: 1024, Length: 1024},
-		{ChunkHash: types.ChunkHash("chunk3"), FileID: file1.ID, FileOffset: 2048, Length: 1024},
+		{ChunkHash: chunk3Hash, FileID: file1.ID, FileOffset: 2048, Length: 1024},
 		// File2
-		{ChunkHash: types.ChunkHash("chunk2"), FileID: file2.ID, FileOffset: 0, Length: 1024},
+		{ChunkHash: chunk2Hash, FileID: file2.ID, FileOffset: 0, Length: 1024},
-		{ChunkHash: types.ChunkHash("chunk3"), FileID: file2.ID, FileOffset: 1024, Length: 1024},
+		{ChunkHash: chunk3Hash, FileID: file2.ID, FileOffset: 1024, Length: 1024},
-		{ChunkHash: types.ChunkHash("chunk4"), FileID: file2.ID, FileOffset: 2048, Length: 1024},
+		{ChunkHash: chunk4Hash, FileID: file2.ID, FileOffset: 2048, Length: 1024},
 		// File3
-		{ChunkHash: types.ChunkHash("chunk1"), FileID: file3.ID, FileOffset: 0, Length: 1024},
+		{ChunkHash: chunk1Hash, FileID: file3.ID, FileOffset: 0, Length: 1024},
-		{ChunkHash: types.ChunkHash("chunk4"), FileID: file3.ID, FileOffset: 1024, Length: 1024},
+		{ChunkHash: chunk4Hash, FileID: file3.ID, FileOffset: 1024, Length: 1024},
 	}
 
 	for _, cf := range chunkFiles {
@@ -206,7 +202,7 @@ func TestChunkFileRepositoryComplexDeduplication(t *testing.T) {
 	}
 
 	// Test chunk1 (used by file1 and file3)
-	files, err := repo.GetByChunkHash(ctx, "chunk1")
+	files, err := repo.GetByChunkHash(ctx, chunk1Hash)
 	if err != nil {
 		t.Fatalf("failed to get files for chunk1: %v", err)
 	}
@@ -216,7 +212,7 @@ func TestChunkFileRepositoryComplexDeduplication(t *testing.T) {
 	}
 
 	// Test chunk2 (used by file1 and file2)
-	files, err = repo.GetByChunkHash(ctx, "chunk2")
+	files, err = repo.GetByChunkHash(ctx, chunk2Hash)
 	if err != nil {
 		t.Fatalf("failed to get files for chunk2: %v", err)
 	}

internal/database/chunks.go

@@ -10,14 +10,18 @@ import (
 	"sneak.berlin/go/vaultik/internal/log"
 )
 
+// ChunkRepository provides access to the chunks table, which tracks
+// content-defined chunks by hash and size.
 type ChunkRepository struct {
 	db *DB
 }
 
+// NewChunkRepository creates a ChunkRepository backed by db.
 func NewChunkRepository(db *DB) *ChunkRepository {
 	return &ChunkRepository{db: db}
 }
 
+// Create inserts a chunk row (idempotently), using tx when non-nil.
 func (r *ChunkRepository) Create(ctx context.Context, tx *sql.Tx, chunk *Chunk) error {
 	query := `
 		INSERT INTO chunks (chunk_hash, size)
@@ -39,6 +43,8 @@ func (r *ChunkRepository) Create(ctx context.Context, tx *sql.Tx, chunk *Chunk)
 	return nil
 }
 
+// GetByHash returns the chunk with the given hash, or nil if it is not
+// known to the index.
 func (r *ChunkRepository) GetByHash(ctx context.Context, hash string) (*Chunk, error) {
 	query := `
 		SELECT chunk_hash, size
@@ -54,7 +60,7 @@ func (r *ChunkRepository) GetByHash(ctx context.Context, hash string) (*Chunk, e
 	)
 
 	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -64,7 +70,11 @@ func (r *ChunkRepository) GetByHash(ctx context.Context, hash string) (*Chunk, e
 	return &chunk, nil
 }
 
-func (r *ChunkRepository) GetByHashes(ctx context.Context, hashes []string) ([]*Chunk, error) {
+// GetByHashes returns the chunks whose hashes appear in hashes, ordered by
+// chunk hash. Unknown hashes are silently omitted from the result.
+func (r *ChunkRepository) GetByHashes(
+	ctx context.Context, hashes []string,
+) ([]*Chunk, error) {
 	if len(hashes) == 0 {
 		return nil, nil
 	}
@@ -88,7 +98,7 @@ func (r *ChunkRepository) GetByHashes(ctx context.Context, hashes []string) ([]*
 		args[i] = hash
 	}
 
-	query += querySb75.String()
+	query += querySb75.String() //nolint:gosec // G202: appends "?" placeholders only
 
 	query += ") ORDER BY chunk_hash"
 
@@ -117,7 +127,11 @@ func (r *ChunkRepository) GetByHashes(ctx context.Context, hashes []string) ([]*
 	return chunks, rows.Err()
 }
 
-func (r *ChunkRepository) ListUnpacked(ctx context.Context, limit int) ([]*Chunk, error) {
+// ListUnpacked returns up to limit chunks that are not yet stored in any
+// blob, ordered by chunk hash.
+func (r *ChunkRepository) ListUnpacked(
+	ctx context.Context, limit int,
+) ([]*Chunk, error) {
 	query := `
 		SELECT c.chunk_hash, c.size
 		FROM chunks c

internal/database/chunks_ext.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 )
 
+// List returns every chunk in the index, ordered by chunk hash.
 func (r *ChunkRepository) List(ctx context.Context) ([]*Chunk, error) {
 	query := `
 		SELECT chunk_hash, size

internal/database/chunks_test.go

@@ -1,21 +1,24 @@
-package database
+package database_test
 
 import (
 	"context"
 	"testing"
 
+	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
 func TestChunkRepository(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewChunkRepository(db)
+	repo := database.NewChunkRepository(db)
 
 	// Test Create
-	chunk := &Chunk{
+	chunk := &database.Chunk{
 		ChunkHash: types.ChunkHash("chunkhash123"),
 		Size:      4096,
 	}
@@ -50,7 +53,7 @@ func TestChunkRepository(t *testing.T) {
 	}
 
 	// Test GetByHashes
-	chunk2 := &Chunk{
+	chunk2 := &database.Chunk{
 		ChunkHash: types.ChunkHash("chunkhash456"),
 		Size:      8192,
 	}
@@ -60,7 +63,9 @@ func TestChunkRepository(t *testing.T) {
 		t.Fatalf("failed to create second chunk: %v", err)
 	}
 
-	chunks, err := repo.GetByHashes(ctx, []string{chunk.ChunkHash.String(), chunk2.ChunkHash.String()})
+	chunks, err := repo.GetByHashes(ctx, []string{
+		chunk.ChunkHash.String(), chunk2.ChunkHash.String(),
+	})
 	if err != nil {
 		t.Fatalf("failed to get chunks by hashes: %v", err)
 	}
@@ -81,11 +86,13 @@ func TestChunkRepository(t *testing.T) {
 }
 
 func TestChunkRepositoryNotFound(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewChunkRepository(db)
+	repo := database.NewChunkRepository(db)
 
 	// Test GetByHash with non-existent hash
 	chunk, err := repo.GetByHash(ctx, "nonexistent")

internal/database/database.go

@@ -15,6 +15,7 @@ import (
 	"context"
 	"database/sql"
 	"embed"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -22,10 +23,15 @@ import (
 	"strconv"
 	"strings"
 
+	// Register the pure-Go sqlite driver.
 	_ "modernc.org/sqlite"
 	"sneak.berlin/go/vaultik/internal/log"
 )
 
+// errInvalidMigrationFilename is returned when an embedded migration file
+// does not follow the "<version>[_<description>].sql" naming pattern.
+var errInvalidMigrationFilename = errors.New("invalid migration filename")
+
 //go:embed schema/*.sql
 var schemaFS embed.FS
 
@@ -51,7 +57,7 @@ type DB struct {
 func ParseMigrationVersion(filename string) (int, error) {
 	name := strings.TrimSuffix(filename, filepath.Ext(filename))
 	if name == "" {
-		return 0, fmt.Errorf("invalid migration filename %q: empty name", filename)
+		return 0, fmt.Errorf("%w %q: empty name", errInvalidMigrationFilename, filename)
 	}
 
 	// Split on underscore to separate version from description.
@@ -62,15 +68,17 @@ func ParseMigrationVersion(filename string) (int, error) {
 	}
 
 	if versionStr == "" {
-		return 0, fmt.Errorf("invalid migration filename %q: empty version prefix", filename)
+		return 0, fmt.Errorf(
+			"%w %q: empty version prefix", errInvalidMigrationFilename, filename,
+		)
 	}
 
 	// Validate the version is purely numeric.
 	for _, ch := range versionStr {
 		if ch < '0' || ch > '9' {
 			return 0, fmt.Errorf(
-				"invalid migration filename %q: version %q contains non-numeric character %q",
+				"%w %q: version %q contains non-numeric character %q",
-				filename, versionStr, string(ch),
+				errInvalidMigrationFilename, filename, versionStr, string(ch),
 			)
 		}
 	}
@@ -101,68 +109,87 @@ func New(ctx context.Context, path string) (*DB, error) {
 
 	conn, err := sql.Open(
 		"sqlite",
-		path+"?_journal_mode=WAL&_synchronous=NORMAL&_busy_timeout=10000&_locking_mode=NORMAL&_foreign_keys=ON",
+		path+"?_journal_mode=WAL&_synchronous=NORMAL&_busy_timeout=10000"+
+			"&_locking_mode=NORMAL&_foreign_keys=ON",
 	)
 	if err == nil {
-		// Set connection pool settings
+		configureConnPool(conn)
-		// SQLite can handle multiple readers but only one writer at a time.
-		// Setting MaxOpenConns to 1 ensures all writes are serialized through
-		// a single connection, preventing SQLITE_BUSY errors.
-		conn.SetMaxOpenConns(1)
-		conn.SetMaxIdleConns(1)
 
-		err := conn.PingContext(ctx)
+		err = conn.PingContext(ctx)
 		if err == nil {
 			// Success on first try
 			log.Debug("Database opened successfully with WAL mode", "path", path)
 
-			// Enable foreign keys explicitly
+			return finishOpen(ctx, conn, path)
-			_, err = conn.ExecContext(ctx, "PRAGMA foreign_keys = ON")
-			if err != nil {
-				log.Warn("Failed to enable foreign keys", "error", err)
-			}
-
-			db := &DB{conn: conn, path: path}
-
-			err := applyMigrations(ctx, conn)
-			if err != nil {
-				_ = conn.Close()
-
-				return nil, fmt.Errorf("applying migrations: %w", err)
-			}
-
-			return db, nil
 		}
 
-		log.Debug("Failed to ping database, closing connection", "path", path, "error", err)
+		log.Debug(
+			"Failed to ping database, closing connection",
+			"path", path, "error", err,
+		)
 
 		_ = conn.Close()
 	}
 
 	// If first attempt failed, try with TRUNCATE mode to clear any locks
+	return openWithRecovery(ctx, path)
+}
+
+// configureConnPool serializes all database access through one connection.
+// SQLite can handle multiple readers but only one writer at a time; setting
+// MaxOpenConns to 1 ensures all writes go through a single connection,
+// preventing SQLITE_BUSY errors.
+func configureConnPool(conn *sql.DB) {
+	conn.SetMaxOpenConns(1)
+	conn.SetMaxIdleConns(1)
+}
+
+// finishOpen enables foreign keys, wraps the connection, and applies any
+// pending migrations. On migration failure the connection is closed.
+func finishOpen(ctx context.Context, conn *sql.DB, path string) (*DB, error) {
+	// Enable foreign keys explicitly
+	_, err := conn.ExecContext(ctx, "PRAGMA foreign_keys = ON")
+	if err != nil {
+		log.Warn("Failed to enable foreign keys", "path", path, "error", err)
+	}
+
+	db := &DB{conn: conn, path: path}
+
+	err = applyMigrations(ctx, conn)
+	if err != nil {
+		_ = conn.Close()
+
+		return nil, fmt.Errorf("applying migrations: %w", err)
+	}
+
+	return db, nil
+}
+
+// openWithRecovery retries opening the database in TRUNCATE journal mode to
+// clear stale locks, then switches back to WAL mode.
+func openWithRecovery(ctx context.Context, path string) (*DB, error) {
 	log.Info(
 		"Database appears locked, attempting recovery with TRUNCATE mode",
 		"path", path,
 	)
 
-	conn, err = sql.Open(
+	conn, err := sql.Open(
 		"sqlite",
-		path+"?_journal_mode=TRUNCATE&_synchronous=NORMAL&_busy_timeout=10000&_foreign_keys=ON",
+		path+"?_journal_mode=TRUNCATE&_synchronous=NORMAL&_busy_timeout=10000"+
+			"&_foreign_keys=ON",
 	)
 	if err != nil {
 		return nil, fmt.Errorf("opening database in recovery mode: %w", err)
 	}
 
-	// Set connection pool settings
+	configureConnPool(conn)
-	// SQLite can handle multiple readers but only one writer at a time.
-	// Setting MaxOpenConns to 1 ensures all writes are serialized through
-	// a single connection, preventing SQLITE_BUSY errors.
-	conn.SetMaxOpenConns(1)
-	conn.SetMaxIdleConns(1)
 
 	err = conn.PingContext(ctx)
 	if err != nil {
-		log.Debug("Failed to ping database in recovery mode, closing", "path", path, "error", err)
+		log.Debug(
+			"Failed to ping database in recovery mode, closing",
+			"path", path, "error", err,
+		)
 
 		_ = conn.Close()
 
@@ -182,19 +209,9 @@ func New(ctx context.Context, path string) (*DB, error) {
 		log.Warn("Failed to switch back to WAL mode", "path", path, "error", err)
 	}
 
-	// Ensure foreign keys are enabled
+	db, err := finishOpen(ctx, conn, path)
-	_, err = conn.ExecContext(ctx, "PRAGMA foreign_keys=ON")
 	if err != nil {
-		log.Warn("Failed to enable foreign keys", "path", path, "error", err)
+		return nil, err
-	}
-
-	db := &DB{conn: conn, path: path}
-
-	err = applyMigrations(ctx, conn)
-	if err != nil {
-		_ = conn.Close()
-
-		return nil, fmt.Errorf("applying migrations: %w", err)
 	}
 
 	log.Debug("Database connection established successfully", "path", path)
@@ -202,6 +219,13 @@ func New(ctx context.Context, path string) (*DB, error) {
 	return db, nil
 }
 
+// NewTestDB creates an in-memory SQLite database for testing purposes.
+// The database is automatically initialized with the schema and is ready
+// for use. Each call creates a new independent database instance.
+func NewTestDB() (*DB, error) {
+	return New(context.Background(), ":memory:")
+}
+
 // Close closes the database connection.
 // It ensures all pending operations are completed before closing.
 // Returns an error if the database connection cannot be closed properly.
@@ -259,10 +283,11 @@ func (db *DB) ExecWithLog(
 	return db.conn.ExecContext(ctx, query, args...)
 }
 
-// QueryRowWithLog executes a query that returns at most one row with SQL logging.
+// QueryRowWithLog executes a query that returns at most one row with SQL
-// This is useful for queries that modify data and return values (e.g., INSERT ... RETURNING).
+// logging. This is useful for queries that modify data and return values
-// SQLite handles its own locking internally.
+// (e.g., INSERT ... RETURNING). SQLite handles its own locking internally.
-// The query and args parameters follow the same format as sql.DB.QueryRowContext.
+// The query and args parameters follow the same format as
+// sql.DB.QueryRowContext.
 func (db *DB) QueryRowWithLog(
 	ctx context.Context,
 	query string,
@@ -390,15 +415,8 @@ func applyMigrations(ctx context.Context, db *sql.DB) error {
 	return nil
 }
 
-// NewTestDB creates an in-memory SQLite database for testing purposes.
+// repeatPlaceholder generates a string of ", ?" repeated n times for IN
-// The database is automatically initialized with the schema and is ready for use.
+// clause construction. For example, repeatPlaceholder(2) returns ", ?, ?".
-// Each call creates a new independent database instance.
-func NewTestDB() (*DB, error) {
-	return New(context.Background(), ":memory:")
-}
-
-// repeatPlaceholder generates a string of ", ?" repeated n times for IN clause construction.
-// For example, repeatPlaceholder(2) returns ", ?, ?".
 func repeatPlaceholder(n int) string {
 	if n <= 0 {
 		return ""
@@ -408,12 +426,14 @@ func repeatPlaceholder(n int) string {
 }
 
 // LogSQL logs SQL queries and their arguments when debug mode is enabled.
-// Debug mode is activated by setting the GODEBUG environment variable to include "vaultik".
+// Debug mode is activated by setting the GODEBUG environment variable to
-// This is useful for troubleshooting database operations and understanding query patterns.
+// include "vaultik". This is useful for troubleshooting database operations
+// and understanding query patterns.
 //
-// The operation parameter describes the type of SQL operation (e.g., "Execute", "Query").
+// The operation parameter describes the type of SQL operation (e.g.,
-// The query parameter is the SQL statement being executed.
+// "Execute", "Query"). The query parameter is the SQL statement being
-// The args parameter contains the query arguments that will be interpolated.
+// executed. The args parameter contains the query arguments that will be
+// interpolated.
 func LogSQL(operation, query string, args ...any) {
 	if strings.Contains(os.Getenv("GODEBUG"), "vaultik") {
 		log.Debug(

internal/database/database_test.go

@@ -1,3 +1,4 @@
+//nolint:testpackage // exercises unexported migration internals
 package database
 
 import (
@@ -9,6 +10,8 @@ import (
 )
 
 func TestDatabase(t *testing.T) {
+	t.Parallel()
+
 	ctx := context.Background()
 	dbPath := filepath.Join(t.TempDir(), "test.db")
 
@@ -39,7 +42,9 @@ func TestDatabase(t *testing.T) {
 	for _, table := range tables {
 		var name string
 
-		err := db.conn.QueryRow("SELECT name FROM sqlite_master WHERE type='table' AND name=?", table).Scan(&name)
+		err := db.conn.QueryRowContext(ctx,
+			"SELECT name FROM sqlite_master WHERE type='table' AND name=?", table,
+		).Scan(&name)
 		if err != nil {
 			t.Errorf("table %s does not exist: %v", table, err)
 		}
@@ -47,6 +52,8 @@ func TestDatabase(t *testing.T) {
 }
 
 func TestDatabaseInvalidPath(t *testing.T) {
+	t.Parallel()
+
 	ctx := context.Background()
 
 	// Test with invalid path
@@ -57,6 +64,8 @@ func TestDatabaseInvalidPath(t *testing.T) {
 }
 
 func TestDatabaseConcurrentAccess(t *testing.T) {
+	t.Parallel()
+
 	ctx := context.Background()
 	dbPath := filepath.Join(t.TempDir(), "test.db")
 
@@ -81,7 +90,8 @@ func TestDatabaseConcurrentAccess(t *testing.T) {
 
 	for i := range 10 {
 		go func(i int) {
-			_, err := db.ExecWithLog(ctx, "INSERT INTO chunks (chunk_hash, size) VALUES (?, ?)",
+			_, err := db.ExecWithLog(ctx,
+				"INSERT INTO chunks (chunk_hash, size) VALUES (?, ?)",
 				fmt.Sprintf("hash%d", i), i*1024)
 			results <- result{index: i, err: err}
 		}(i)
@@ -109,6 +119,8 @@ func TestDatabaseConcurrentAccess(t *testing.T) {
 }
 
 func TestParseMigrationVersion(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name      string
 		filename  string
@@ -118,8 +130,14 @@ func TestParseMigrationVersion(t *testing.T) {
 		{name: "valid 000.sql", filename: "000.sql", wantVer: 0, wantError: false},
 		{name: "valid 001.sql", filename: "001.sql", wantVer: 1, wantError: false},
 		{name: "valid 099.sql", filename: "099.sql", wantVer: 99, wantError: false},
-		{name: "valid with description", filename: "001_initial_schema.sql", wantVer: 1, wantError: false},
+		{
-		{name: "valid large version", filename: "123_big_migration.sql", wantVer: 123, wantError: false},
+			name: "valid with description", filename: "001_initial_schema.sql",
+			wantVer: 1, wantError: false,
+		},
+		{
+			name: "valid large version", filename: "123_big_migration.sql",
+			wantVer: 123, wantError: false,
+		},
 		{name: "invalid alpha version", filename: "abc.sql", wantVer: 0, wantError: true},
 		{name: "invalid mixed chars", filename: "12a.sql", wantVer: 0, wantError: true},
 		{name: "invalid no extension", filename: "schema.sql", wantVer: 0, wantError: true},
@@ -128,29 +146,36 @@ func TestParseMigrationVersion(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
 			got, err := ParseMigrationVersion(tc.filename)
 			if tc.wantError {
 				if err == nil {
-					t.Errorf("ParseMigrationVersion(%q) = %d, nil; want error", tc.filename, got)
+					t.Errorf("ParseMigrationVersion(%q) = %d, nil; want error",
+						tc.filename, got)
 				}
 
 				return
 			}
 
 			if err != nil {
-				t.Errorf("ParseMigrationVersion(%q) unexpected error: %v", tc.filename, err)
+				t.Errorf("ParseMigrationVersion(%q) unexpected error: %v",
+					tc.filename, err)
 
 				return
 			}
 
 			if got != tc.wantVer {
-				t.Errorf("ParseMigrationVersion(%q) = %d; want %d", tc.filename, got, tc.wantVer)
+				t.Errorf("ParseMigrationVersion(%q) = %d; want %d",
+					tc.filename, got, tc.wantVer)
 			}
 		})
 	}
 }
 
 func TestApplyMigrations_Idempotent(t *testing.T) {
+	t.Parallel()
+
 	ctx := context.Background()
 
 	conn, err := sql.Open("sqlite", ":memory:?_foreign_keys=ON")
@@ -176,7 +201,9 @@ func TestApplyMigrations_Idempotent(t *testing.T) {
 	// Count rows in schema_migrations after first run.
 	var countBefore int
 
-	err = conn.QueryRowContext(ctx, "SELECT COUNT(*) FROM schema_migrations").Scan(&countBefore)
+	err = conn.QueryRowContext(ctx,
+		"SELECT COUNT(*) FROM schema_migrations",
+	).Scan(&countBefore)
 	if err != nil {
 		t.Fatalf("failed to count schema_migrations after first run: %v", err)
 	}
@@ -190,17 +217,22 @@ func TestApplyMigrations_Idempotent(t *testing.T) {
 	// Count rows in schema_migrations after second run — must be unchanged.
 	var countAfter int
 
-	err = conn.QueryRowContext(ctx, "SELECT COUNT(*) FROM schema_migrations").Scan(&countAfter)
+	err = conn.QueryRowContext(ctx,
+		"SELECT COUNT(*) FROM schema_migrations",
+	).Scan(&countAfter)
 	if err != nil {
 		t.Fatalf("failed to count schema_migrations after second run: %v", err)
 	}
 
 	if countBefore != countAfter {
-		t.Errorf("schema_migrations row count changed: before=%d, after=%d", countBefore, countAfter)
+		t.Errorf("schema_migrations row count changed: before=%d, after=%d",
+			countBefore, countAfter)
 	}
 }
 
 func TestBootstrapMigrationsTable_FreshDatabase(t *testing.T) {
+	t.Parallel()
+
 	ctx := context.Background()
 
 	conn, err := sql.Open("sqlite", ":memory:?_foreign_keys=ON")
@@ -248,7 +280,8 @@ func TestBootstrapMigrationsTable_FreshDatabase(t *testing.T) {
 	}
 
 	if tableAfter != 1 {
-		t.Fatalf("schema_migrations table should exist after bootstrap, got count=%d", tableAfter)
+		t.Fatalf("schema_migrations table should exist after bootstrap, got count=%d",
+			tableAfter)
 	}
 
 	// Verify version 0 row exists.

internal/database/errors.go

@@ -6,8 +6,8 @@ import (
 	"os"
 )
 
-// Fatal prints an error message to stderr and exits with status 1
+// Fatalf prints an error message to stderr and exits with status 1
-func Fatal(format string, args ...any) {
+func Fatalf(format string, args ...any) {
 	fmt.Fprintf(os.Stderr, "FATAL: "+format+"\n", args...)
 	os.Exit(1)
 }
@@ -16,6 +16,6 @@ func Fatal(format string, args ...any) {
 func CloseRows(rows *sql.Rows) {
 	err := rows.Close()
 	if err != nil {
-		Fatal("failed to close rows: %v", err)
+		Fatalf("failed to close rows: %v", err)
 	}
 }

internal/database/file_chunks.go

@@ -9,15 +9,21 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// FileChunkRepository provides access to the file_chunks table, which maps
+// files to their ordered constituent chunks.
 type FileChunkRepository struct {
 	db *DB
 }
 
+// NewFileChunkRepository creates a FileChunkRepository backed by db.
 func NewFileChunkRepository(db *DB) *FileChunkRepository {
 	return &FileChunkRepository{db: db}
 }
 
-func (r *FileChunkRepository) Create(ctx context.Context, tx *sql.Tx, fc *FileChunk) error {
+// Create inserts a file_chunks row (idempotently), using tx when non-nil.
+func (r *FileChunkRepository) Create(
+	ctx context.Context, tx *sql.Tx, fc *FileChunk,
+) error {
 	query := `
 		INSERT INTO file_chunks (file_id, idx, chunk_hash)
 		VALUES (?, ?, ?)
@@ -28,7 +34,8 @@ func (r *FileChunkRepository) Create(ctx context.Context, tx *sql.Tx, fc *FileCh
 	if tx != nil {
 		_, err = tx.ExecContext(ctx, query, fc.FileID.String(), fc.Idx, fc.ChunkHash.String())
 	} else {
-		_, err = r.db.ExecWithLog(ctx, query, fc.FileID.String(), fc.Idx, fc.ChunkHash.String())
+		_, err = r.db.ExecWithLog(ctx, query,
+			fc.FileID.String(), fc.Idx, fc.ChunkHash.String())
 	}
 
 	if err != nil {
@@ -38,7 +45,10 @@ func (r *FileChunkRepository) Create(ctx context.Context, tx *sql.Tx, fc *FileCh
 	return nil
 }
 
-func (r *FileChunkRepository) GetByPath(ctx context.Context, path string) ([]*FileChunk, error) {
+// GetByPath returns the ordered chunks of the file at the given path.
+func (r *FileChunkRepository) GetByPath(
+	ctx context.Context, path string,
+) ([]*FileChunk, error) {
 	query := `
 		SELECT fc.file_id, fc.idx, fc.chunk_hash
 		FROM file_chunks fc
@@ -57,7 +67,9 @@ func (r *FileChunkRepository) GetByPath(ctx context.Context, path string) ([]*Fi
 }
 
 // GetByFileID retrieves file chunks by file ID
-func (r *FileChunkRepository) GetByFileID(ctx context.Context, fileID types.FileID) ([]*FileChunk, error) {
+func (r *FileChunkRepository) GetByFileID(
+	ctx context.Context, fileID types.FileID,
+) ([]*FileChunk, error) {
 	query := `
 		SELECT file_id, idx, chunk_hash
 		FROM file_chunks
@@ -75,7 +87,9 @@ func (r *FileChunkRepository) GetByFileID(ctx context.Context, fileID types.File
 }
 
 // GetByPathTx retrieves file chunks within a transaction
-func (r *FileChunkRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path string) ([]*FileChunk, error) {
+func (r *FileChunkRepository) GetByPathTx(
+	ctx context.Context, tx *sql.Tx, path string,
+) ([]*FileChunk, error) {
 	query := `
 		SELECT fc.file_id, fc.idx, fc.chunk_hash
 		FROM file_chunks fc
@@ -98,6 +112,170 @@ func (r *FileChunkRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path
 	return fileChunks, err
 }
 
+// DeleteByPath deletes all file_chunks rows for the file at the given path.
+func (r *FileChunkRepository) DeleteByPath(
+	ctx context.Context, tx *sql.Tx, path string,
+) error {
+	query := `
+		DELETE FROM file_chunks
+		WHERE file_id = (SELECT id FROM files WHERE path = ?)
+	`
+
+	var err error
+	if tx != nil {
+		_, err = tx.ExecContext(ctx, query, path)
+	} else {
+		_, err = r.db.ExecWithLog(ctx, query, path)
+	}
+
+	if err != nil {
+		return fmt.Errorf("deleting file chunks: %w", err)
+	}
+
+	return nil
+}
+
+// DeleteByFileID deletes all chunks for a file by its UUID
+func (r *FileChunkRepository) DeleteByFileID(
+	ctx context.Context, tx *sql.Tx, fileID types.FileID,
+) error {
+	query := `DELETE FROM file_chunks WHERE file_id = ?`
+
+	var err error
+	if tx != nil {
+		_, err = tx.ExecContext(ctx, query, fileID.String())
+	} else {
+		_, err = r.db.ExecWithLog(ctx, query, fileID.String())
+	}
+
+	if err != nil {
+		return fmt.Errorf("deleting file chunks: %w", err)
+	}
+
+	return nil
+}
+
+// DeleteByFileIDs deletes all chunks for multiple files in a single statement.
+//
+//nolint:dupl // symmetric implementation for a parallel association table
+func (r *FileChunkRepository) DeleteByFileIDs(
+	ctx context.Context, tx *sql.Tx, fileIDs []types.FileID,
+) error {
+	if len(fileIDs) == 0 {
+		return nil
+	}
+
+	// Batch at 500 to stay within SQLite's variable limit
+	const batchSize = 500
+
+	for i := 0; i < len(fileIDs); i += batchSize {
+		end := min(i+batchSize, len(fileIDs))
+
+		batch := fileIDs[i:end]
+
+		//nolint:gosec // G202: concatenates constant SQL and "?" placeholders only
+		query := "DELETE FROM file_chunks WHERE file_id IN (?" +
+			repeatPlaceholder(len(batch)-1) + ")"
+
+		args := make([]any, len(batch))
+		for j, id := range batch {
+			args[j] = id.String()
+		}
+
+		var err error
+		if tx != nil {
+			_, err = tx.ExecContext(ctx, query, args...)
+		} else {
+			_, err = r.db.ExecWithLog(ctx, query, args...)
+		}
+
+		if err != nil {
+			return fmt.Errorf("batch deleting file_chunks: %w", err)
+		}
+	}
+
+	return nil
+}
+
+// CreateBatch inserts multiple file_chunks in a single statement for efficiency.
+// Batches are automatically split to stay within SQLite's variable limit.
+func (r *FileChunkRepository) CreateBatch(
+	ctx context.Context, tx *sql.Tx, fcs []FileChunk,
+) error {
+	if len(fcs) == 0 {
+		return nil
+	}
+
+	// Each file_chunks row binds this many SQL variables.
+	const fileChunkCols = 3
+
+	// SQLite has a limit on variables (typically 999 or 32766), so batch
+	// at 300 rows to be safe.
+	const batchSize = 300
+
+	for i := 0; i < len(fcs); i += batchSize {
+		end := min(i+batchSize, len(fcs))
+
+		batch := fcs[i:end]
+
+		// Build the query with multiple value sets
+		query := "INSERT INTO file_chunks (file_id, idx, chunk_hash) VALUES "
+
+		args := make([]any, 0, len(batch)*fileChunkCols)
+
+		var querySb211 strings.Builder
+
+		for j, fc := range batch {
+			if j > 0 {
+				querySb211.WriteString(", ")
+			}
+
+			querySb211.WriteString("(?, ?, ?)")
+
+			args = append(args, fc.FileID.String(), fc.Idx, fc.ChunkHash.String())
+		}
+
+		query += querySb211.String() //nolint:gosec // G202: appends "?" placeholders only
+
+		query += " ON CONFLICT(file_id, idx) DO NOTHING"
+
+		var err error
+		if tx != nil {
+			_, err = tx.ExecContext(ctx, query, args...)
+		} else {
+			_, err = r.db.ExecWithLog(ctx, query, args...)
+		}
+
+		if err != nil {
+			return fmt.Errorf("batch inserting file_chunks: %w", err)
+		}
+	}
+
+	return nil
+}
+
+// GetByFile is an alias for GetByPath for compatibility
+func (r *FileChunkRepository) GetByFile(
+	ctx context.Context, path string,
+) ([]*FileChunk, error) {
+	LogSQL("GetByFile", "Starting", path)
+	result, err := r.GetByPath(ctx, path)
+	LogSQL("GetByFile", "Complete", path, "count", len(result))
+
+	return result, err
+}
+
+// GetByFileTx retrieves file chunks within a transaction
+func (r *FileChunkRepository) GetByFileTx(
+	ctx context.Context, tx *sql.Tx, path string,
+) ([]*FileChunk, error) {
+	LogSQL("GetByFileTx", "Starting", path)
+	result, err := r.GetByPathTx(ctx, tx, path)
+	LogSQL("GetByFileTx", "Complete", path, "count", len(result))
+
+	return result, err
+}
+
 // scanFileChunks is a helper that scans file chunk rows
 func (r *FileChunkRepository) scanFileChunks(rows *sql.Rows) ([]*FileChunk, error) {
 	var fileChunks []*FileChunk
@@ -124,144 +302,3 @@ func (r *FileChunkRepository) scanFileChunks(rows *sql.Rows) ([]*FileChunk, erro
 
 	return fileChunks, rows.Err()
 }
-
-func (r *FileChunkRepository) DeleteByPath(ctx context.Context, tx *sql.Tx, path string) error {
-	query := `DELETE FROM file_chunks WHERE file_id = (SELECT id FROM files WHERE path = ?)`
-
-	var err error
-	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, path)
-	} else {
-		_, err = r.db.ExecWithLog(ctx, query, path)
-	}
-
-	if err != nil {
-		return fmt.Errorf("deleting file chunks: %w", err)
-	}
-
-	return nil
-}
-
-// DeleteByFileID deletes all chunks for a file by its UUID
-func (r *FileChunkRepository) DeleteByFileID(ctx context.Context, tx *sql.Tx, fileID types.FileID) error {
-	query := `DELETE FROM file_chunks WHERE file_id = ?`
-
-	var err error
-	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, fileID.String())
-	} else {
-		_, err = r.db.ExecWithLog(ctx, query, fileID.String())
-	}
-
-	if err != nil {
-		return fmt.Errorf("deleting file chunks: %w", err)
-	}
-
-	return nil
-}
-
-// DeleteByFileIDs deletes all chunks for multiple files in a single statement.
-func (r *FileChunkRepository) DeleteByFileIDs(ctx context.Context, tx *sql.Tx, fileIDs []types.FileID) error {
-	if len(fileIDs) == 0 {
-		return nil
-	}
-
-	// Batch at 500 to stay within SQLite's variable limit
-	const batchSize = 500
-
-	for i := 0; i < len(fileIDs); i += batchSize {
-		end := min(i+batchSize, len(fileIDs))
-
-		batch := fileIDs[i:end]
-
-		query := "DELETE FROM file_chunks WHERE file_id IN (?" + repeatPlaceholder(len(batch)-1) + ")"
-
-		args := make([]any, len(batch))
-		for j, id := range batch {
-			args[j] = id.String()
-		}
-
-		var err error
-		if tx != nil {
-			_, err = tx.ExecContext(ctx, query, args...)
-		} else {
-			_, err = r.db.ExecWithLog(ctx, query, args...)
-		}
-
-		if err != nil {
-			return fmt.Errorf("batch deleting file_chunks: %w", err)
-		}
-	}
-
-	return nil
-}
-
-// CreateBatch inserts multiple file_chunks in a single statement for efficiency.
-// Batches are automatically split to stay within SQLite's variable limit.
-func (r *FileChunkRepository) CreateBatch(ctx context.Context, tx *sql.Tx, fcs []FileChunk) error {
-	if len(fcs) == 0 {
-		return nil
-	}
-
-	// SQLite has a limit on variables (typically 999 or 32766).
-	// Each FileChunk has 3 values, so batch at 300 to be safe.
-	const batchSize = 300
-
-	for i := 0; i < len(fcs); i += batchSize {
-		end := min(i+batchSize, len(fcs))
-
-		batch := fcs[i:end]
-
-		// Build the query with multiple value sets
-		query := "INSERT INTO file_chunks (file_id, idx, chunk_hash) VALUES "
-
-		args := make([]any, 0, len(batch)*3)
-
-		var querySb211 strings.Builder
-
-		for j, fc := range batch {
-			if j > 0 {
-				querySb211.WriteString(", ")
-			}
-
-			querySb211.WriteString("(?, ?, ?)")
-
-			args = append(args, fc.FileID.String(), fc.Idx, fc.ChunkHash.String())
-		}
-
-		query += querySb211.String()
-
-		query += " ON CONFLICT(file_id, idx) DO NOTHING"
-
-		var err error
-		if tx != nil {
-			_, err = tx.ExecContext(ctx, query, args...)
-		} else {
-			_, err = r.db.ExecWithLog(ctx, query, args...)
-		}
-
-		if err != nil {
-			return fmt.Errorf("batch inserting file_chunks: %w", err)
-		}
-	}
-
-	return nil
-}
-
-// GetByFile is an alias for GetByPath for compatibility
-func (r *FileChunkRepository) GetByFile(ctx context.Context, path string) ([]*FileChunk, error) {
-	LogSQL("GetByFile", "Starting", path)
-	result, err := r.GetByPath(ctx, path)
-	LogSQL("GetByFile", "Complete", path, "count", len(result))
-
-	return result, err
-}
-
-// GetByFileTx retrieves file chunks within a transaction
-func (r *FileChunkRepository) GetByFileTx(ctx context.Context, tx *sql.Tx, path string) ([]*FileChunk, error) {
-	LogSQL("GetByFileTx", "Starting", path)
-	result, err := r.GetByPathTx(ctx, tx, path)
-	LogSQL("GetByFileTx", "Complete", path, "count", len(result))
-
-	return result, err
-}

internal/database/file_chunks_test.go

@@ -1,4 +1,4 @@
-package database
+package database_test
 
 import (
 	"context"
@@ -6,21 +6,25 @@ import (
 	"testing"
 	"time"
 
+	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
 func TestFileChunkRepository(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewFileChunkRepository(db)
+	repo := database.NewFileChunkRepository(db)
-	fileRepo := NewFileRepository(db)
+	fileRepo := database.NewFileRepository(db)
+	repos := database.NewRepositories(db)
 
 	// Create test file first
 	testTime := time.Now().Truncate(time.Second)
-	file := &File{
+	file := &database.File{
-		Path:       "/test/file.txt",
+		Path:       testFileTxt,
 		MTime:      testTime,
 		Size:       3072,
 		Mode:       0644,
@@ -29,44 +33,26 @@ func TestFileChunkRepository(t *testing.T) {
 		LinkTarget: "",
 	}
 
-	err := fileRepo.Create(ctx, nil, file)
+	mustCreateFile(t, fileRepo, file)
-	if err != nil {
+	mustCreateChunks(t, repos, chunk1Hash, chunk2Hash, chunk3Hash)
-		t.Fatalf("failed to create file: %v", err)
-	}
-
-	// Create chunks first
-	chunks := []types.ChunkHash{"chunk1", "chunk2", "chunk3"}
-	chunkRepo := NewChunkRepository(db)
-
-	for _, chunkHash := range chunks {
-		chunk := &Chunk{
-			ChunkHash: chunkHash,
-			Size:      1024,
-		}
-
-		err = chunkRepo.Create(ctx, nil, chunk)
-		if err != nil {
-			t.Fatalf("failed to create chunk %s: %v", chunkHash, err)
-		}
-	}
 
 	// Test Create
-	fc1 := &FileChunk{
+	fc1 := &database.FileChunk{
 		FileID:    file.ID,
 		Idx:       0,
-		ChunkHash: types.ChunkHash("chunk1"),
+		ChunkHash: types.ChunkHash(chunk1Hash),
 	}
 
-	err = repo.Create(ctx, nil, fc1)
+	err := repo.Create(ctx, nil, fc1)
 	if err != nil {
 		t.Fatalf("failed to create file chunk: %v", err)
 	}
 
 	// Add more chunks for the same file
-	fc2 := &FileChunk{
+	fc2 := &database.FileChunk{
 		FileID:    file.ID,
 		Idx:       1,
-		ChunkHash: types.ChunkHash("chunk2"),
+		ChunkHash: types.ChunkHash(chunk2Hash),
 	}
 
 	err = repo.Create(ctx, nil, fc2)
@@ -74,10 +60,10 @@ func TestFileChunkRepository(t *testing.T) {
 		t.Fatalf("failed to create second file chunk: %v", err)
 	}
 
-	fc3 := &FileChunk{
+	fc3 := &database.FileChunk{
 		FileID:    file.ID,
 		Idx:       2,
-		ChunkHash: types.ChunkHash("chunk3"),
+		ChunkHash: types.ChunkHash(chunk3Hash),
 	}
 
 	err = repo.Create(ctx, nil, fc3)
@@ -86,7 +72,7 @@ func TestFileChunkRepository(t *testing.T) {
 	}
 
 	// Test GetByFile
-	fileChunks, err := repo.GetByFile(ctx, "/test/file.txt")
+	fileChunks, err := repo.GetByFile(ctx, testFileTxt)
 	if err != nil {
 		t.Fatalf("failed to get file chunks: %v", err)
 	}
@@ -107,6 +93,41 @@ func TestFileChunkRepository(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to create duplicate file chunk: %v", err)
 	}
+}
+
+func TestFileChunkRepositoryDeleteByFileID(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repo := database.NewFileChunkRepository(db)
+	fileRepo := database.NewFileRepository(db)
+	repos := database.NewRepositories(db)
+
+	file := &database.File{
+		Path:  testFileTxt,
+		MTime: time.Now().Truncate(time.Second),
+		Size:  1024,
+		Mode:  0644,
+		UID:   1000,
+		GID:   1000,
+	}
+
+	mustCreateFile(t, fileRepo, file)
+	mustCreateChunks(t, repos, chunk1Hash)
+
+	fc := &database.FileChunk{
+		FileID:    file.ID,
+		Idx:       0,
+		ChunkHash: types.ChunkHash(chunk1Hash),
+	}
+
+	err := repo.Create(ctx, nil, fc)
+	if err != nil {
+		t.Fatalf("failed to create file chunk: %v", err)
+	}
 
 	// Test DeleteByFileID
 	err = repo.DeleteByFileID(ctx, nil, file.ID)
@@ -114,7 +135,7 @@ func TestFileChunkRepository(t *testing.T) {
 		t.Fatalf("failed to delete file chunks: %v", err)
 	}
 
-	fileChunks, err = repo.GetByFileID(ctx, file.ID)
+	fileChunks, err := repo.GetByFileID(ctx, file.ID)
 	if err != nil {
 		t.Fatalf("failed to get deleted file chunks: %v", err)
 	}
@@ -125,20 +146,22 @@ func TestFileChunkRepository(t *testing.T) {
 }
 
 func TestFileChunkRepositoryMultipleFiles(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewFileChunkRepository(db)
+	repo := database.NewFileChunkRepository(db)
-	fileRepo := NewFileRepository(db)
+	fileRepo := database.NewFileRepository(db)
 
 	// Create test files
 	testTime := time.Now().Truncate(time.Second)
-	filePaths := []string{"/file1.txt", "/file2.txt", "/file3.txt"}
+	filePaths := []string{testFilePath1, testFilePath2, "/file3.txt"}
-	files := make([]*File, len(filePaths))
+	files := make([]*database.File, len(filePaths))
 
 	for i, path := range filePaths {
-		file := &File{
+		file := &database.File{
 			Path:       types.FilePath(path),
 			MTime:      testTime,
 			Size:       2048,
@@ -148,21 +171,18 @@ func TestFileChunkRepositoryMultipleFiles(t *testing.T) {
 			LinkTarget: "",
 		}
 
-		err := fileRepo.Create(ctx, nil, file)
+		mustCreateFile(t, fileRepo, file)
-		if err != nil {
-			t.Fatalf("failed to create file %s: %v", path, err)
-		}
 
 		files[i] = file
 	}
 
 	// Create all chunks first
-	chunkRepo := NewChunkRepository(db)
+	chunkRepo := database.NewChunkRepository(db)
 
 	for i := range files {
 		for j := range 2 {
 			chunkHash := types.ChunkHash(fmt.Sprintf("file%d_chunk%d", i, j))
-			chunk := &Chunk{
+			chunk := &database.Chunk{
 				ChunkHash: chunkHash,
 				Size:      1024,
 			}
@@ -177,7 +197,7 @@ func TestFileChunkRepositoryMultipleFiles(t *testing.T) {
 	// Create chunks for multiple files
 	for i, file := range files {
 		for j := range 2 {
-			fc := &FileChunk{
+			fc := &database.FileChunk{
 				FileID:    file.ID,
 				Idx:       j,
 				ChunkHash: types.ChunkHash(fmt.Sprintf("file%d_chunk%d", i, j)),

internal/database/files.go

@@ -12,14 +12,20 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// FileRepository provides access to the files table, which stores file
+// metadata (path, times, permissions, ownership, symlink targets).
 type FileRepository struct {
 	db *DB
 }
 
+// NewFileRepository creates a FileRepository backed by db.
 func NewFileRepository(db *DB) *FileRepository {
 	return &FileRepository{db: db}
 }
 
+// Create inserts or updates a file row (upsert on path), using tx when
+// non-nil. The file's ID is generated when zero and updated from the
+// database's RETURNING clause.
 func (r *FileRepository) Create(ctx context.Context, tx *sql.Tx, file *File) error {
 	// Generate UUID if not provided
 	if file.ID.IsZero() {
@@ -46,10 +52,19 @@ func (r *FileRepository) Create(ctx context.Context, tx *sql.Tx, file *File) err
 	)
 
 	if tx != nil {
-		LogSQL("Execute", query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String())
+		LogSQL("Execute", query,
-		err = tx.QueryRowContext(ctx, query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String()).Scan(&idStr)
+			file.ID.String(), file.Path.String(), file.SourcePath.String(),
+			file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID,
+			file.LinkTarget.String())
+		err = tx.QueryRowContext(ctx, query,
+			file.ID.String(), file.Path.String(), file.SourcePath.String(),
+			file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID,
+			file.LinkTarget.String()).Scan(&idStr)
 	} else {
-		err = r.db.QueryRowWithLog(ctx, query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String()).Scan(&idStr)
+		err = r.db.QueryRowWithLog(ctx, query,
+			file.ID.String(), file.Path.String(), file.SourcePath.String(),
+			file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID,
+			file.LinkTarget.String()).Scan(&idStr)
 	}
 
 	if err != nil {
@@ -65,6 +80,8 @@ func (r *FileRepository) Create(ctx context.Context, tx *sql.Tx, file *File) err
 	return nil
 }
 
+// GetByPath returns the file at the given path, or nil if the path is not
+// in the index.
 func (r *FileRepository) GetByPath(ctx context.Context, path string) (*File, error) {
 	query := `
 		SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
@@ -74,7 +91,7 @@ func (r *FileRepository) GetByPath(ctx context.Context, path string) (*File, err
 
 	file, err := r.scanFile(r.db.conn.QueryRowContext(ctx, query, path))
 	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -94,7 +111,7 @@ func (r *FileRepository) GetByID(ctx context.Context, id types.FileID) (*File, e
 
 	file, err := r.scanFile(r.db.conn.QueryRowContext(ctx, query, id.String()))
 	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -104,7 +121,11 @@ func (r *FileRepository) GetByID(ctx context.Context, id types.FileID) (*File, e
 	return file, nil
 }
 
-func (r *FileRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path string) (*File, error) {
+// GetByPathTx returns the file at the given path within a transaction, or
+// nil if the path is not in the index.
+func (r *FileRepository) GetByPathTx(
+	ctx context.Context, tx *sql.Tx, path string,
+) (*File, error) {
 	query := `
 		SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
 		FROM files
@@ -116,7 +137,7 @@ func (r *FileRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path strin
 	LogSQL("GetByPathTx Scan complete", query, path)
 
 	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -126,87 +147,16 @@ func (r *FileRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path strin
 	return file, nil
 }
 
-// scanFile is a helper that scans a single file row
+// fileRowScanner abstracts *sql.Row and *sql.Rows for scanning a file row.
-func (r *FileRepository) scanFile(row *sql.Row) (*File, error) {
+type fileRowScanner interface {
-	var (
+	Scan(dest ...any) error
-		file                          File
-		idStr, pathStr, sourcePathStr string
-		mtimeUnix                     int64
-		linkTarget                    sql.NullString
-	)
-
-	err := row.Scan(
-		&idStr,
-		&pathStr,
-		&sourcePathStr,
-		&mtimeUnix,
-		&file.Size,
-		&file.Mode,
-		&file.UID,
-		&file.GID,
-		&linkTarget,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	file.ID, err = types.ParseFileID(idStr)
-	if err != nil {
-		return nil, fmt.Errorf("parsing file ID: %w", err)
-	}
-
-	file.Path = types.FilePath(pathStr)
-	file.SourcePath = types.SourcePath(sourcePathStr)
-
-	file.MTime = time.Unix(mtimeUnix, 0).UTC()
-	if linkTarget.Valid {
-		file.LinkTarget = types.FilePath(linkTarget.String)
-	}
-
-	return &file, nil
 }
 
-// scanFileRows is a helper that scans a file row from rows iterator
+// ListModifiedSince returns all files whose recorded mtime is at or after
-func (r *FileRepository) scanFileRows(rows *sql.Rows) (*File, error) {
+// since, ordered by path.
-	var (
+func (r *FileRepository) ListModifiedSince(
-		file                          File
+	ctx context.Context, since time.Time,
-		idStr, pathStr, sourcePathStr string
+) ([]*File, error) {
-		mtimeUnix                     int64
-		linkTarget                    sql.NullString
-	)
-
-	err := rows.Scan(
-		&idStr,
-		&pathStr,
-		&sourcePathStr,
-		&mtimeUnix,
-		&file.Size,
-		&file.Mode,
-		&file.UID,
-		&file.GID,
-		&linkTarget,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	file.ID, err = types.ParseFileID(idStr)
-	if err != nil {
-		return nil, fmt.Errorf("parsing file ID: %w", err)
-	}
-
-	file.Path = types.FilePath(pathStr)
-	file.SourcePath = types.SourcePath(sourcePathStr)
-
-	file.MTime = time.Unix(mtimeUnix, 0).UTC()
-	if linkTarget.Valid {
-		file.LinkTarget = types.FilePath(linkTarget.String)
-	}
-
-	return &file, nil
-}
-
-func (r *FileRepository) ListModifiedSince(ctx context.Context, since time.Time) ([]*File, error) {
 	query := `
 		SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
 		FROM files
@@ -234,6 +184,7 @@ func (r *FileRepository) ListModifiedSince(ctx context.Context, since time.Time)
 	return files, rows.Err()
 }
 
+// Delete removes the file row at the given path, using tx when non-nil.
 func (r *FileRepository) Delete(ctx context.Context, tx *sql.Tx, path string) error {
 	query := `DELETE FROM files WHERE path = ?`
 
@@ -252,7 +203,9 @@ func (r *FileRepository) Delete(ctx context.Context, tx *sql.Tx, path string) er
 }
 
 // DeleteByID deletes a file by its UUID
-func (r *FileRepository) DeleteByID(ctx context.Context, tx *sql.Tx, id types.FileID) error {
+func (r *FileRepository) DeleteByID(
+	ctx context.Context, tx *sql.Tx, id types.FileID,
+) error {
 	query := `DELETE FROM files WHERE id = ?`
 
 	var err error
@@ -269,7 +222,11 @@ func (r *FileRepository) DeleteByID(ctx context.Context, tx *sql.Tx, id types.Fi
 	return nil
 }
 
-func (r *FileRepository) ListByPrefix(ctx context.Context, prefix string) ([]*File, error) {
+// ListByPrefix returns all files whose path starts with prefix, ordered by
+// path.
+func (r *FileRepository) ListByPrefix(
+	ctx context.Context, prefix string,
+) ([]*File, error) {
 	query := `
 		SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
 		FROM files
@@ -327,12 +284,17 @@ func (r *FileRepository) ListAll(ctx context.Context) ([]*File, error) {
 
 // CreateBatch inserts or updates multiple files in a single statement for efficiency.
 // File IDs must be pre-generated before calling this method.
-func (r *FileRepository) CreateBatch(ctx context.Context, tx *sql.Tx, files []*File) error {
+func (r *FileRepository) CreateBatch(
+	ctx context.Context, tx *sql.Tx, files []*File,
+) error {
 	if len(files) == 0 {
 		return nil
 	}
 
-	// Each File has 9 values, so batch at 100 to be safe with SQLite's variable limit
+	// Each files row binds this many SQL variables.
+	const fileCols = 9
+
+	// Batch at 100 rows to be safe with SQLite's variable limit.
 	const batchSize = 100
 
 	for i := 0; i < len(files); i += batchSize {
@@ -340,9 +302,11 @@ func (r *FileRepository) CreateBatch(ctx context.Context, tx *sql.Tx, files []*F
 
 		batch := files[i:end]
 
-		query := `INSERT INTO files (id, path, source_path, mtime, size, mode, uid, gid, link_target) VALUES `
+		query := `INSERT INTO files
+			(id, path, source_path, mtime, size, mode, uid, gid, link_target)
+			VALUES `
 
-		args := make([]any, 0, len(batch)*9)
+		args := make([]any, 0, len(batch)*fileCols)
 
 		var querySb325 strings.Builder
 
@@ -353,10 +317,13 @@ func (r *FileRepository) CreateBatch(ctx context.Context, tx *sql.Tx, files []*F
 
 			querySb325.WriteString("(?, ?, ?, ?, ?, ?, ?, ?, ?)")
 
-			args = append(args, f.ID.String(), f.Path.String(), f.SourcePath.String(), f.MTime.Unix(), f.Size, f.Mode, f.UID, f.GID, f.LinkTarget.String())
+			args = append(args,
+				f.ID.String(), f.Path.String(), f.SourcePath.String(),
+				f.MTime.Unix(), f.Size, f.Mode, f.UID, f.GID,
+				f.LinkTarget.String())
 		}
 
-		query += querySb325.String()
+		query += querySb325.String() //nolint:gosec // G202: appends "?" placeholders only
 
 		query += ` ON CONFLICT(path) DO UPDATE SET
 			source_path = excluded.source_path,
@@ -404,3 +371,53 @@ func (r *FileRepository) DeleteOrphaned(ctx context.Context) error {
 
 	return nil
 }
+
+// scanFile is a helper that scans a single file row
+func (r *FileRepository) scanFile(row *sql.Row) (*File, error) {
+	return r.scanFileFrom(row)
+}
+
+// scanFileRows is a helper that scans a file row from rows iterator
+func (r *FileRepository) scanFileRows(rows *sql.Rows) (*File, error) {
+	return r.scanFileFrom(rows)
+}
+
+// scanFileFrom scans one file row from any row scanner.
+func (r *FileRepository) scanFileFrom(row fileRowScanner) (*File, error) {
+	var (
+		file                          File
+		idStr, pathStr, sourcePathStr string
+		mtimeUnix                     int64
+		linkTarget                    sql.NullString
+	)
+
+	err := row.Scan(
+		&idStr,
+		&pathStr,
+		&sourcePathStr,
+		&mtimeUnix,
+		&file.Size,
+		&file.Mode,
+		&file.UID,
+		&file.GID,
+		&linkTarget,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	file.ID, err = types.ParseFileID(idStr)
+	if err != nil {
+		return nil, fmt.Errorf("parsing file ID: %w", err)
+	}
+
+	file.Path = types.FilePath(pathStr)
+	file.SourcePath = types.SourcePath(sourcePathStr)
+
+	file.MTime = time.Unix(mtimeUnix, 0).UTC()
+	if linkTarget.Valid {
+		file.LinkTarget = types.FilePath(linkTarget.String)
+	}
+
+	return &file, nil
+}

internal/database/files_test.go

@@ -1,44 +1,32 @@
-package database
+package database_test
 
 import (
 	"context"
 	"database/sql"
 	"errors"
 	"os"
-	"path/filepath"
 	"testing"
 	"time"
+
+	"sneak.berlin/go/vaultik/internal/database"
 )
 
-func setupTestDB(t *testing.T) (*DB, func()) {
+// errTestRollback is the sentinel returned from transaction bodies to
-	ctx := context.Background()
+// force a rollback in tests.
-	dbPath := filepath.Join(t.TempDir(), "test.db")
+var errTestRollback = errors.New("test rollback")
-
-	db, err := New(ctx, dbPath)
-	if err != nil {
-		t.Fatalf("failed to create database: %v", err)
-	}
-
-	cleanup := func() {
-		err := db.Close()
-		if err != nil {
-			t.Errorf("failed to close database: %v", err)
-		}
-	}
-
-	return db, cleanup
-}
 
 func TestFileRepository(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewFileRepository(db)
+	repo := database.NewFileRepository(db)
 
 	// Test Create
-	file := &File{
+	file := &database.File{
-		Path:       "/test/file.txt",
+		Path:       testFileTxt,
 		MTime:      time.Now().Truncate(time.Second),
 		Size:       1024,
 		Mode:       0644,
@@ -95,6 +83,30 @@ func TestFileRepository(t *testing.T) {
 	if retrieved.Size != 2048 {
 		t.Errorf("size not updated: got %d, want %d", retrieved.Size, 2048)
 	}
+}
+
+func TestFileRepositoryListDelete(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repo := database.NewFileRepository(db)
+
+	file := &database.File{
+		Path:  testFileTxt,
+		MTime: time.Now().Truncate(time.Second),
+		Size:  1024,
+		Mode:  0644,
+		UID:   1000,
+		GID:   1000,
+	}
+
+	err := repo.Create(ctx, nil, file)
+	if err != nil {
+		t.Fatalf("failed to create file: %v", err)
+	}
 
 	// Test ListModifiedSince
 	files, err := repo.ListModifiedSince(ctx, time.Now().Add(-1*time.Hour))
@@ -112,7 +124,7 @@ func TestFileRepository(t *testing.T) {
 		t.Fatalf("failed to delete file: %v", err)
 	}
 
-	retrieved, err = repo.GetByPath(ctx, file.Path.String())
+	retrieved, err := repo.GetByPath(ctx, file.Path.String())
 	if err != nil {
 		t.Fatalf("error getting deleted file: %v", err)
 	}
@@ -123,14 +135,16 @@ func TestFileRepository(t *testing.T) {
 }
 
 func TestFileRepositorySymlink(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewFileRepository(db)
+	repo := database.NewFileRepository(db)
 
 	// Test symlink
-	symlink := &File{
+	symlink := &database.File{
 		Path:       "/test/link",
 		MTime:      time.Now().Truncate(time.Second),
 		Size:       0,
@@ -155,21 +169,24 @@ func TestFileRepositorySymlink(t *testing.T) {
 	}
 
 	if retrieved.LinkTarget != symlink.LinkTarget {
-		t.Errorf("link target mismatch: got %s, want %s", retrieved.LinkTarget, symlink.LinkTarget)
+		t.Errorf("link target mismatch: got %s, want %s",
+			retrieved.LinkTarget, symlink.LinkTarget)
 	}
 }
 
 func TestFileRepositoryTransaction(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repos := NewRepositories(db)
+	repos := database.NewRepositories(db)
 
 	// Test transaction rollback
 	err := repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
-		file := &File{
+		file := &database.File{
-			Path:  "/test/tx_file.txt",
+			Path:  testTxFile,
 			MTime: time.Now().Truncate(time.Second),
 			Size:  1024,
 			Mode:  0644,
@@ -183,15 +200,14 @@ func TestFileRepositoryTransaction(t *testing.T) {
 		}
 
 		// Return error to trigger rollback
-		return errors.New("test rollback")
+		return errTestRollback
 	})
-
+	if !errors.Is(err, errTestRollback) {
-	if err == nil || err.Error() != "test rollback" {
 		t.Fatalf("expected rollback error, got: %v", err)
 	}
 
 	// Verify file was not created
-	retrieved, err := repos.Files.GetByPath(ctx, "/test/tx_file.txt")
+	retrieved, err := repos.Files.GetByPath(ctx, testTxFile)
 	if err != nil {
 		t.Fatalf("error checking for file: %v", err)
 	}

internal/database/helpers_internal_test.go

@@ -0,0 +1,81 @@
+package database
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+
+	"sneak.berlin/go/vaultik/internal/types"
+)
+
+// Common fixture values shared by the internal repository tests.
+const (
+	internalTestHost       = "test-host"
+	internalTestSnapshotID = "test-snapshot"
+	internalTestFilePath   = "/test.txt"
+	internalTestFile1      = "/file1.txt"
+	internalTestFile2      = "/file2.txt"
+
+	// countFilesQuery counts the rows of the files table.
+	countFilesQuery = "SELECT COUNT(*) FROM files"
+)
+
+// mustCreateFileRow inserts the file row, failing the test on error.
+func mustCreateFileRow(t *testing.T, repos *Repositories, file *File) {
+	t.Helper()
+
+	err := repos.Files.Create(context.Background(), nil, file)
+	if err != nil {
+		t.Fatalf("failed to create file %s: %v", file.Path, err)
+	}
+}
+
+// mustAddFileToSnapshot associates a file with a snapshot, failing the
+// test on error.
+func mustAddFileToSnapshot(
+	t *testing.T, repos *Repositories, snapshotID string, fileID types.FileID,
+) {
+	t.Helper()
+
+	err := repos.Snapshots.AddFileByID(context.Background(), nil, snapshotID, fileID)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// setupTestDB creates an on-disk test database in a per-test temp
+// directory and returns it along with a cleanup func that closes it.
+func setupTestDB(t *testing.T) (*DB, func()) {
+	t.Helper()
+
+	ctx := context.Background()
+	dbPath := filepath.Join(t.TempDir(), "test.db")
+
+	db, err := New(ctx, dbPath)
+	if err != nil {
+		t.Fatalf("failed to create database: %v", err)
+	}
+
+	cleanup := func() {
+		err := db.Close()
+		if err != nil {
+			t.Errorf("failed to close database: %v", err)
+		}
+	}
+
+	return db, cleanup
+}
+
+// countRow runs a single-integer COUNT-style query and returns the value.
+func countRow(t *testing.T, db *DB, query string, args ...any) int {
+	t.Helper()
+
+	var count int
+
+	err := db.conn.QueryRowContext(context.Background(), query, args...).Scan(&count)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return count
+}

internal/database/helpers_test.go

@@ -0,0 +1,52 @@
+package database_test
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+
+	"sneak.berlin/go/vaultik/internal/database"
+)
+
+// Common fixture values shared by the repository tests.
+const (
+	testFilePath1 = "/file1.txt"
+	testFilePath2 = "/file2.txt"
+	testFileTxt   = "/test/file.txt"
+	testTxFile    = "/test/tx_file.txt"
+	testHostname  = "test-host"
+	testVersion   = "1.0.0"
+)
+
+// mustCreateFile inserts the given file row, failing the test on error.
+func mustCreateFile(t *testing.T, repo *database.FileRepository, file *database.File) {
+	t.Helper()
+
+	err := repo.Create(context.Background(), nil, file)
+	if err != nil {
+		t.Fatalf("failed to create file %s: %v", file.Path, err)
+	}
+}
+
+// setupTestDB creates an on-disk test database in a per-test temp
+// directory and returns it along with a cleanup func that closes it.
+func setupTestDB(t *testing.T) (*database.DB, func()) {
+	t.Helper()
+
+	ctx := context.Background()
+	dbPath := filepath.Join(t.TempDir(), "test.db")
+
+	db, err := database.New(ctx, dbPath)
+	if err != nil {
+		t.Fatalf("failed to create database: %v", err)
+	}
+
+	cleanup := func() {
+		err := db.Close()
+		if err != nil {
+			t.Errorf("failed to close database: %v", err)
+		}
+	}
+
+	return db, cleanup
+}

internal/database/local_meta.go

@@ -18,6 +18,7 @@ type LocalMetaRepository struct {
 	db *DB
 }
 
+// NewLocalMetaRepository creates a LocalMetaRepository backed by db.
 func NewLocalMetaRepository(db *DB) *LocalMetaRepository {
 	return &LocalMetaRepository{db: db}
 }

internal/database/local_meta_test.go

@@ -9,6 +9,8 @@ import (
 )
 
 func TestLocalMetaEmptyOnFresh(t *testing.T) {
+	t.Parallel()
+
 	db, err := database.NewTestDB()
 	require.NoError(t, err)
 
@@ -22,6 +24,8 @@ func TestLocalMetaEmptyOnFresh(t *testing.T) {
 }
 
 func TestLocalMetaSetGetRoundTrip(t *testing.T) {
+	t.Parallel()
+
 	db, err := database.NewTestDB()
 	require.NoError(t, err)
 
@@ -30,7 +34,8 @@ func TestLocalMetaSetGetRoundTrip(t *testing.T) {
 	repos := database.NewRepositories(db)
 	ctx := context.Background()
 
-	require.NoError(t, repos.LocalMeta.Set(ctx, database.LocalMetaKeyStorageURL, "file:///mnt/backups"))
+	require.NoError(t, repos.LocalMeta.Set(
+		ctx, database.LocalMetaKeyStorageURL, "file:///mnt/backups"))
 
 	got, err := repos.LocalMeta.Get(ctx, database.LocalMetaKeyStorageURL)
 	require.NoError(t, err)
@@ -38,6 +43,8 @@ func TestLocalMetaSetGetRoundTrip(t *testing.T) {
 }
 
 func TestLocalMetaSetOverwrites(t *testing.T) {
+	t.Parallel()
+
 	db, err := database.NewTestDB()
 	require.NoError(t, err)
 
@@ -46,8 +53,10 @@ func TestLocalMetaSetOverwrites(t *testing.T) {
 	repos := database.NewRepositories(db)
 	ctx := context.Background()
 
-	require.NoError(t, repos.LocalMeta.Set(ctx, database.LocalMetaKeyStorageURL, "s3://old"))
+	require.NoError(t, repos.LocalMeta.Set(
-	require.NoError(t, repos.LocalMeta.Set(ctx, database.LocalMetaKeyStorageURL, "s3://new"))
+		ctx, database.LocalMetaKeyStorageURL, "s3://old"))
+	require.NoError(t, repos.LocalMeta.Set(
+		ctx, database.LocalMetaKeyStorageURL, "s3://new"))
 
 	got, err := repos.LocalMeta.Get(ctx, database.LocalMetaKeyStorageURL)
 	require.NoError(t, err)

internal/database/models.go

@@ -1,5 +1,3 @@
-// Package database provides data models and repository interfaces for the Vaultik backup system.
-// It includes types for files, chunks, blobs, snapshots, and their relationships.
 package database
 
 import (
@@ -13,9 +11,12 @@ import (
 // and symlink targets. This information is used to restore files with their
 // original attributes.
 type File struct {
-	ID         types.FileID     // UUID primary key
+	ID   types.FileID   // UUID primary key
-	Path       types.FilePath   // Absolute path of the file
+	Path types.FilePath // Absolute path of the file
-	SourcePath types.SourcePath // The source directory this file came from (for restore path stripping)
+
+	// SourcePath is the source directory this file came from (used for
+	// restore path stripping).
+	SourcePath types.SourcePath
 	MTime      time.Time
 	Size       int64
 	Mode       uint32
@@ -55,13 +56,16 @@ type Chunk struct {
 // The blob creation process is: chunks are accumulated -> compressed with zstd
 // -> encrypted with age -> hashed -> uploaded to S3 with the hash as filename.
 type Blob struct {
-	ID               types.BlobID   // UUID assigned when blob creation starts
+	ID types.BlobID // UUID assigned when blob creation starts
-	Hash             types.BlobHash // SHA256 of final compressed+encrypted content (empty until finalized)
+
-	CreatedTS        time.Time      // When blob creation started
+	// Hash is the SHA256 of the final compressed+encrypted content
-	FinishedTS       *time.Time     // When blob was finalized (nil if still packing)
+	// (empty until finalized).
-	UncompressedSize int64          // Total size of raw chunks before compression
+	Hash             types.BlobHash
-	CompressedSize   int64          // Size after compression and encryption
+	CreatedTS        time.Time  // When blob creation started
-	UploadedTS       *time.Time     // When blob was uploaded to S3 (nil if not uploaded)
+	FinishedTS       *time.Time // When blob was finalized (nil if still packing)
+	UncompressedSize int64      // Total size of raw chunks before compression
+	CompressedSize   int64      // Size after compression and encryption
+	UploadedTS       *time.Time // When blob was uploaded to S3 (nil if not uploaded)
 }
 
 // BlobChunk represents the mapping between blobs and the chunks they contain.
@@ -75,9 +79,10 @@ type BlobChunk struct {
 	Length    int64
 }
 
-// ChunkFile represents the reverse mapping showing which files contain a specific chunk.
+// ChunkFile represents the reverse mapping showing which files contain a
-// This is used during deduplication to identify all files that share a chunk,
+// specific chunk. This is used during deduplication to identify all files
-// which is important for garbage collection and integrity verification.
+// that share a chunk, which is important for garbage collection and
+// integrity verification.
 type ChunkFile struct {
 	ChunkHash  types.ChunkHash
 	FileID     types.FileID
@@ -87,17 +92,20 @@ type ChunkFile struct {
 
 // Snapshot represents a snapshot record in the database
 type Snapshot struct {
-	ID                   types.SnapshotID
+	ID                 types.SnapshotID
-	Hostname             types.Hostname
+	Hostname           types.Hostname
-	VaultikVersion       types.Version
+	VaultikVersion     types.Version
-	VaultikGitRevision   types.GitRevision
+	VaultikGitRevision types.GitRevision
-	StartedAt            time.Time
+	StartedAt          time.Time
-	CompletedAt          *time.Time // nil if still in progress
+	CompletedAt        *time.Time // nil if still in progress
-	FileCount            int64
+	FileCount          int64
-	ChunkCount           int64
+	ChunkCount         int64
-	BlobCount            int64
+	BlobCount          int64
-	TotalSize            int64   // Total size of all referenced files
+	TotalSize          int64 // Total size of all referenced files
-	BlobSize             int64   // Total size of all referenced blobs (compressed and encrypted)
+
+	// BlobSize is the total size of all referenced blobs (compressed and
+	// encrypted).
+	BlobSize             int64
 	BlobUncompressedSize int64   // Total uncompressed size of all referenced blobs
 	CompressionRatio     float64 // Compression ratio (BlobSize / BlobUncompressedSize)
 	CompressionLevel     int     // Compression level used for this snapshot

internal/database/module.go

@@ -11,7 +11,13 @@ import (
 	"sneak.berlin/go/vaultik/internal/log"
 )
 
+// indexDirPerm restricts the local index directory to the owning user;
+// the index describes the backed-up file tree and must stay private.
+const indexDirPerm = 0o700
+
 // Module provides database dependencies
+//
+//nolint:gochecknoglobals // fx module definitions are package globals by convention
 var Module = fx.Module("database",
 	fx.Provide(
 		provideDatabase,
@@ -22,7 +28,9 @@ var Module = fx.Module("database",
 func provideDatabase(lc fx.Lifecycle, cfg *config.Config) (*DB, error) {
 	// Ensure the index directory exists
 	indexDir := filepath.Dir(cfg.IndexPath)
-	if err := os.MkdirAll(indexDir, 0700); err != nil {
+
+	err := os.MkdirAll(indexDir, indexDirPerm)
+	if err != nil {
 		return nil, fmt.Errorf("creating index directory: %w", err)
 	}
 
@@ -32,7 +40,7 @@ func provideDatabase(lc fx.Lifecycle, cfg *config.Config) (*DB, error) {
 	}
 
 	lc.Append(fx.Hook{
-		OnStop: func(ctx context.Context) error {
+		OnStop: func(_ context.Context) error {
 			log.Debug("Database module OnStop hook called")
 
 			err := db.Close()

internal/database/repositories.go

@@ -62,14 +62,14 @@ func (r *Repositories) WithTx(ctx context.Context, fn TxFunc) error {
 		if p := recover(); p != nil {
 			rollbackErr := tx.Rollback()
 			if rollbackErr != nil {
-				Fatal("failed to rollback transaction: %v", rollbackErr)
+				Fatalf("failed to rollback transaction: %v", rollbackErr)
 			}
 
 			panic(p)
 		} else if err != nil {
 			rollbackErr := tx.Rollback()
 			if rollbackErr != nil {
-				Fatal("failed to rollback transaction: %v", rollbackErr)
+				Fatalf("failed to rollback transaction: %v", rollbackErr)
 			}
 		}
 	}()
@@ -105,14 +105,14 @@ func (r *Repositories) WithReadTx(ctx context.Context, fn TxFunc) error {
 		if p := recover(); p != nil {
 			rollbackErr := tx.Rollback()
 			if rollbackErr != nil {
-				Fatal("failed to rollback transaction: %v", rollbackErr)
+				Fatalf("failed to rollback transaction: %v", rollbackErr)
 			}
 
 			panic(p)
 		} else if err != nil {
 			rollbackErr := tx.Rollback()
 			if rollbackErr != nil {
-				Fatal("failed to rollback transaction: %v", rollbackErr)
+				Fatalf("failed to rollback transaction: %v", rollbackErr)
 			}
 		}
 	}()

internal/database/repositories_test.go

@@ -1,4 +1,4 @@
-package database
+package database_test
 
 import (
 	"context"
@@ -7,21 +7,21 @@ import (
 	"testing"
 	"time"
 
+	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
-func TestRepositoriesTransaction(t *testing.T) {
+// errIntentionalRollback forces a transaction rollback in tests.
-	db, cleanup := setupTestDB(t)
+var errIntentionalRollback = errors.New("intentional rollback")
-	defer cleanup()
 
-	ctx := context.Background()
+// createTxTestData returns a transaction body that creates a file with
-	repos := NewRepositories(db)
+// two chunks packed into one blob.
-
+func createTxTestData(
-	// Test successful transaction with multiple operations
+	repos *database.Repositories,
-	err := repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+) func(context.Context, *sql.Tx) error {
-		// Create a file
+	return func(ctx context.Context, tx *sql.Tx) error {
-		file := &File{
+		file := &database.File{
-			Path:  "/test/tx_file.txt",
+			Path:  testTxFile,
 			MTime: time.Now().Truncate(time.Second),
 			Size:  1024,
 			Mode:  0644,
@@ -34,95 +34,116 @@ func TestRepositoriesTransaction(t *testing.T) {
 			return err
 		}
 
-		// Create chunks
+		err = createTxFileChunks(ctx, tx, repos, file.ID)
-		chunk1 := &Chunk{
-			ChunkHash: types.ChunkHash("tx_chunk1"),
-			Size:      512,
-		}
-
-		err = repos.Chunks.Create(ctx, tx, chunk1)
 		if err != nil {
 			return err
 		}
 
-		chunk2 := &Chunk{
+		return createTxBlob(ctx, tx, repos)
-			ChunkHash: types.ChunkHash("tx_chunk2"),
+	}
-			Size:      512,
+}
-		}
 
-		err = repos.Chunks.Create(ctx, tx, chunk2)
+// createTxFileChunks creates the two test chunks and maps them to the file.
-		if err != nil {
+func createTxFileChunks(
-			return err
+	ctx context.Context, tx *sql.Tx,
-		}
+	repos *database.Repositories, fileID types.FileID,
+) error {
+	// Create chunks
+	chunk1 := &database.Chunk{
+		ChunkHash: types.ChunkHash("tx_chunk1"),
+		Size:      512,
+	}
 
-		// Map chunks to file
+	err := repos.Chunks.Create(ctx, tx, chunk1)
-		fc1 := &FileChunk{
+	if err != nil {
-			FileID:    file.ID,
+		return err
-			Idx:       0,
+	}
-			ChunkHash: chunk1.ChunkHash,
-		}
 
-		err = repos.FileChunks.Create(ctx, tx, fc1)
+	chunk2 := &database.Chunk{
-		if err != nil {
+		ChunkHash: types.ChunkHash("tx_chunk2"),
-			return err
+		Size:      512,
-		}
+	}
 
-		fc2 := &FileChunk{
+	err = repos.Chunks.Create(ctx, tx, chunk2)
-			FileID:    file.ID,
+	if err != nil {
-			Idx:       1,
+		return err
-			ChunkHash: chunk2.ChunkHash,
+	}
-		}
 
-		err = repos.FileChunks.Create(ctx, tx, fc2)
+	// Map chunks to file
-		if err != nil {
+	fc1 := &database.FileChunk{
-			return err
+		FileID:    fileID,
-		}
+		Idx:       0,
+		ChunkHash: chunk1.ChunkHash,
+	}
 
-		// Create blob
+	err = repos.FileChunks.Create(ctx, tx, fc1)
-		blob := &Blob{
+	if err != nil {
-			ID:        types.NewBlobID(),
+		return err
-			Hash:      types.BlobHash("tx_blob1"),
+	}
-			CreatedTS: time.Now().Truncate(time.Second),
-		}
 
-		err = repos.Blobs.Create(ctx, tx, blob)
+	fc2 := &database.FileChunk{
-		if err != nil {
+		FileID:    fileID,
-			return err
+		Idx:       1,
-		}
+		ChunkHash: chunk2.ChunkHash,
+	}
 
-		// Map chunks to blob
+	return repos.FileChunks.Create(ctx, tx, fc2)
-		bc1 := &BlobChunk{
+}
-			BlobID:    blob.ID,
-			ChunkHash: chunk1.ChunkHash,
-			Offset:    0,
-			Length:    512,
-		}
 
-		err = repos.BlobChunks.Create(ctx, tx, bc1)
+// createTxBlob creates the test blob and maps both chunks into it.
-		if err != nil {
+func createTxBlob(
-			return err
+	ctx context.Context, tx *sql.Tx, repos *database.Repositories,
-		}
+) error {
+	blob := &database.Blob{
+		ID:        types.NewBlobID(),
+		Hash:      types.BlobHash("tx_blob1"),
+		CreatedTS: time.Now().Truncate(time.Second),
+	}
 
-		bc2 := &BlobChunk{
+	err := repos.Blobs.Create(ctx, tx, blob)
-			BlobID:    blob.ID,
+	if err != nil {
-			ChunkHash: chunk2.ChunkHash,
+		return err
-			Offset:    512,
+	}
-			Length:    512,
-		}
 
-		err = repos.BlobChunks.Create(ctx, tx, bc2)
+	// Map chunks to blob
-		if err != nil {
+	bc1 := &database.BlobChunk{
-			return err
+		BlobID:    blob.ID,
-		}
+		ChunkHash: types.ChunkHash("tx_chunk1"),
+		Offset:    0,
+		Length:    512,
+	}
 
-		return nil
+	err = repos.BlobChunks.Create(ctx, tx, bc1)
-	})
+	if err != nil {
+		return err
+	}
+
+	bc2 := &database.BlobChunk{
+		BlobID:    blob.ID,
+		ChunkHash: types.ChunkHash("tx_chunk2"),
+		Offset:    512,
+		Length:    512,
+	}
+
+	return repos.BlobChunks.Create(ctx, tx, bc2)
+}
+
+func TestRepositoriesTransaction(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repos := database.NewRepositories(db)
+
+	err := repos.WithTx(ctx, createTxTestData(repos))
 	if err != nil {
 		t.Fatalf("transaction failed: %v", err)
 	}
 
 	// Verify all data was committed
-	file, err := repos.Files.GetByPath(ctx, "/test/tx_file.txt")
+	file, err := repos.Files.GetByPath(ctx, testTxFile)
 	if err != nil {
 		t.Fatalf("failed to get file: %v", err)
 	}
@@ -131,7 +152,7 @@ func TestRepositoriesTransaction(t *testing.T) {
 		t.Error("expected file after transaction")
 	}
 
-	chunks, err := repos.FileChunks.GetByFile(ctx, "/test/tx_file.txt")
+	chunks, err := repos.FileChunks.GetByFile(ctx, testTxFile)
 	if err != nil {
 		t.Fatalf("failed to get file chunks: %v", err)
 	}
@@ -151,16 +172,18 @@ func TestRepositoriesTransaction(t *testing.T) {
 }
 
 func TestRepositoriesTransactionRollback(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repos := NewRepositories(db)
+	repos := database.NewRepositories(db)
 
 	// Test transaction rollback
 	err := repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
 		// Create a file
-		file := &File{
+		file := &database.File{
 			Path:  "/test/rollback_file.txt",
 			MTime: time.Now().Truncate(time.Second),
 			Size:  1024,
@@ -175,7 +198,7 @@ func TestRepositoriesTransactionRollback(t *testing.T) {
 		}
 
 		// Create a chunk
-		chunk := &Chunk{
+		chunk := &database.Chunk{
 			ChunkHash: types.ChunkHash("rollback_chunk"),
 			Size:      1024,
 		}
@@ -186,10 +209,9 @@ func TestRepositoriesTransactionRollback(t *testing.T) {
 		}
 
 		// Return error to trigger rollback
-		return errors.New("intentional rollback")
+		return errIntentionalRollback
 	})
-
+	if !errors.Is(err, errIntentionalRollback) {
-	if err == nil || err.Error() != "intentional rollback" {
 		t.Fatalf("expected rollback error, got: %v", err)
 	}
 
@@ -214,14 +236,16 @@ func TestRepositoriesTransactionRollback(t *testing.T) {
 }
 
 func TestRepositoriesReadTransaction(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repos := NewRepositories(db)
+	repos := database.NewRepositories(db)
 
 	// First, create some data
-	file := &File{
+	file := &database.File{
 		Path:  "/test/read_file.txt",
 		MTime: time.Now().Truncate(time.Second),
 		Size:  1024,
@@ -236,7 +260,7 @@ func TestRepositoriesReadTransaction(t *testing.T) {
 	}
 
 	// Test read-only transaction
-	var retrievedFile *File
+	var retrievedFile *database.File
 
 	err = repos.WithReadTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
 		var err error
@@ -247,7 +271,7 @@ func TestRepositoriesReadTransaction(t *testing.T) {
 		}
 
 		// Try to write in read-only transaction (should fail)
-		_ = repos.Files.Create(ctx, tx, &File{
+		_ = repos.Files.Create(ctx, tx, &database.File{
 			Path:  "/test/should_fail.txt",
 			MTime: time.Now(),
 			Size:  0,

internal/database/repository_comprehensive_test.go

@@ -1,3 +1,4 @@
+//nolint:testpackage // inspects the unexported database connection
 package database
 
 import (
@@ -11,8 +12,13 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// errTxIntentionalRollback forces a transaction rollback in tests.
+var errTxIntentionalRollback = errors.New("intentional rollback")
+
 // TestFileRepositoryUUIDGeneration tests that files get unique UUIDs
 func TestFileRepositoryUUIDGeneration(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -22,7 +28,7 @@ func TestFileRepositoryUUIDGeneration(t *testing.T) {
 	// Create multiple files
 	files := []*File{
 		{
-			Path:  "/file1.txt",
+			Path:  internalTestFile1,
 			MTime: time.Now().Truncate(time.Second),
 			Size:  1024,
 			Mode:  0644,
@@ -30,7 +36,7 @@ func TestFileRepositoryUUIDGeneration(t *testing.T) {
 			GID:   1000,
 		},
 		{
-			Path:  "/file2.txt",
+			Path:  internalTestFile2,
 			MTime: time.Now().Truncate(time.Second),
 			Size:  2048,
 			Mode:  0644,
@@ -63,6 +69,8 @@ func TestFileRepositoryUUIDGeneration(t *testing.T) {
 
 // TestFileRepositoryGetByID tests retrieving files by UUID
 func TestFileRepositoryGetByID(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -71,7 +79,7 @@ func TestFileRepositoryGetByID(t *testing.T) {
 
 	// Create a file
 	file := &File{
-		Path:  "/test.txt",
+		Path:  internalTestFilePath,
 		MTime: time.Now().Truncate(time.Second),
 		Size:  1024,
 		Mode:  0644,
@@ -98,8 +106,9 @@ func TestFileRepositoryGetByID(t *testing.T) {
 		t.Errorf("Path mismatch: expected %s, got %s", file.Path, retrieved.Path)
 	}
 
-	// Test non-existent ID
+	// Test non-existent ID: generate a new UUID that won't exist in the
-	nonExistentID := types.NewFileID() // Generate a new UUID that won't exist in the database
+	// database.
+	nonExistentID := types.NewFileID()
 
 	nonExistent, err := repo.GetByID(ctx, nonExistentID)
 	if err != nil {
@@ -113,6 +122,8 @@ func TestFileRepositoryGetByID(t *testing.T) {
 
 // TestOrphanedFileCleanup tests the cleanup of orphaned files
 func TestOrphanedFileCleanup(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -149,8 +160,8 @@ func TestOrphanedFileCleanup(t *testing.T) {
 
 	// Create a snapshot and reference only file2
 	snapshot := &Snapshot{
-		ID:        "test-snapshot",
+		ID:        internalTestSnapshotID,
-		Hostname:  "test-host",
+		Hostname:  internalTestHost,
 		StartedAt: time.Now(),
 	}
 
@@ -160,10 +171,7 @@ func TestOrphanedFileCleanup(t *testing.T) {
 	}
 
 	// Add file2 to snapshot
-	err = repos.Snapshots.AddFileByID(ctx, nil, snapshot.ID.String(), file2.ID)
+	mustAddFileToSnapshot(t, repos, snapshot.ID.String(), file2.ID)
-	if err != nil {
-		t.Fatalf("failed to add file to snapshot: %v", err)
-	}
 
 	// Run orphaned cleanup
 	err = repos.Files.DeleteOrphaned(ctx)
@@ -194,6 +202,8 @@ func TestOrphanedFileCleanup(t *testing.T) {
 
 // TestOrphanedChunkCleanup tests the cleanup of orphaned chunks
 func TestOrphanedChunkCleanup(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -222,7 +232,7 @@ func TestOrphanedChunkCleanup(t *testing.T) {
 
 	// Create a file and reference only chunk2
 	file := &File{
-		Path:  "/test.txt",
+		Path:  internalTestFilePath,
 		MTime: time.Now().Truncate(time.Second),
 		Size:  1024,
 		Mode:  0644,
@@ -276,6 +286,8 @@ func TestOrphanedChunkCleanup(t *testing.T) {
 
 // TestOrphanedBlobCleanup tests the cleanup of orphaned blobs
 func TestOrphanedBlobCleanup(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -306,8 +318,8 @@ func TestOrphanedBlobCleanup(t *testing.T) {
 
 	// Create a snapshot and reference only blob2
 	snapshot := &Snapshot{
-		ID:        "test-snapshot",
+		ID:        internalTestSnapshotID,
-		Hostname:  "test-host",
+		Hostname:  internalTestHost,
 		StartedAt: time.Now(),
 	}
 
@@ -351,6 +363,8 @@ func TestOrphanedBlobCleanup(t *testing.T) {
 
 // TestFileChunkRepositoryWithUUIDs tests file-chunk relationships with UUIDs
 func TestFileChunkRepositoryWithUUIDs(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -359,7 +373,7 @@ func TestFileChunkRepositoryWithUUIDs(t *testing.T) {
 
 	// Create a file
 	file := &File{
-		Path:  "/test.txt",
+		Path:  internalTestFilePath,
 		MTime: time.Now().Truncate(time.Second),
 		Size:  3072,
 		Mode:  0644,
@@ -367,10 +381,7 @@ func TestFileChunkRepositoryWithUUIDs(t *testing.T) {
 		GID:   1000,
 	}
 
-	err := repos.Files.Create(ctx, nil, file)
+	mustCreateFileRow(t, repos, file)
-	if err != nil {
-		t.Fatalf("failed to create file: %v", err)
-	}
 
 	// Create chunks
 	chunks := []types.ChunkHash{"chunk1", "chunk2", "chunk3"}
@@ -380,7 +391,7 @@ func TestFileChunkRepositoryWithUUIDs(t *testing.T) {
 			Size:      1024,
 		}
 
-		err = repos.Chunks.Create(ctx, nil, chunk)
+		err := repos.Chunks.Create(ctx, nil, chunk)
 		if err != nil {
 			t.Fatalf("failed to create chunk: %v", err)
 		}
@@ -426,6 +437,8 @@ func TestFileChunkRepositoryWithUUIDs(t *testing.T) {
 
 // TestChunkFileRepositoryWithUUIDs tests chunk-file relationships with UUIDs
 func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -434,7 +447,7 @@ func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
 
 	// Create files
 	file1 := &File{
-		Path:  "/file1.txt",
+		Path:  internalTestFile1,
 		MTime: time.Now().Truncate(time.Second),
 		Size:  1024,
 		Mode:  0644,
@@ -442,7 +455,7 @@ func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
 		GID:   1000,
 	}
 	file2 := &File{
-		Path:  "/file2.txt",
+		Path:  internalTestFile2,
 		MTime: time.Now().Truncate(time.Second),
 		Size:  1024,
 		Mode:  0644,
@@ -450,15 +463,8 @@ func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
 		GID:   1000,
 	}
 
-	err := repos.Files.Create(ctx, nil, file1)
+	mustCreateFileRow(t, repos, file1)
-	if err != nil {
+	mustCreateFileRow(t, repos, file2)
-		t.Fatalf("failed to create file1: %v", err)
-	}
-
-	err = repos.Files.Create(ctx, nil, file2)
-	if err != nil {
-		t.Fatalf("failed to create file2: %v", err)
-	}
 
 	// Create a chunk that appears in both files (deduplication)
 	chunk := &Chunk{
@@ -466,7 +472,7 @@ func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
 		Size:      1024,
 	}
 
-	err = repos.Chunks.Create(ctx, nil, chunk)
+	err := repos.Chunks.Create(ctx, nil, chunk)
 	if err != nil {
 		t.Fatalf("failed to create chunk: %v", err)
 	}
@@ -518,6 +524,8 @@ func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
 
 // TestSnapshotRepositoryExtendedFields tests snapshot with version and git revision
 func TestSnapshotRepositoryExtendedFields(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -527,7 +535,7 @@ func TestSnapshotRepositoryExtendedFields(t *testing.T) {
 	// Create snapshot with extended fields
 	snapshot := &Snapshot{
 		ID:                   "test-20250722-120000Z",
-		Hostname:             "test-host",
+		Hostname:             internalTestHost,
 		VaultikVersion:       "0.0.1",
 		VaultikGitRevision:   "abc123def456",
 		StartedAt:            time.Now(),
@@ -555,35 +563,39 @@ func TestSnapshotRepositoryExtendedFields(t *testing.T) {
 	}
 
 	if retrieved.VaultikVersion != snapshot.VaultikVersion {
-		t.Errorf("version mismatch: expected %s, got %s", snapshot.VaultikVersion, retrieved.VaultikVersion)
+		t.Errorf("version mismatch: expected %s, got %s",
+			snapshot.VaultikVersion, retrieved.VaultikVersion)
 	}
 
 	if retrieved.VaultikGitRevision != snapshot.VaultikGitRevision {
-		t.Errorf("git revision mismatch: expected %s, got %s", snapshot.VaultikGitRevision, retrieved.VaultikGitRevision)
+		t.Errorf("git revision mismatch: expected %s, got %s",
+			snapshot.VaultikGitRevision, retrieved.VaultikGitRevision)
 	}
 
 	if retrieved.CompressionLevel != snapshot.CompressionLevel {
-		t.Errorf("compression level mismatch: expected %d, got %d", snapshot.CompressionLevel, retrieved.CompressionLevel)
+		t.Errorf("compression level mismatch: expected %d, got %d",
+			snapshot.CompressionLevel, retrieved.CompressionLevel)
 	}
 
 	if retrieved.BlobUncompressedSize != snapshot.BlobUncompressedSize {
-		t.Errorf("uncompressed size mismatch: expected %d, got %d", snapshot.BlobUncompressedSize, retrieved.BlobUncompressedSize)
+		t.Errorf("uncompressed size mismatch: expected %d, got %d",
+			snapshot.BlobUncompressedSize, retrieved.BlobUncompressedSize)
 	}
 
 	if retrieved.UploadDurationMs != snapshot.UploadDurationMs {
-		t.Errorf("upload duration mismatch: expected %d, got %d", snapshot.UploadDurationMs, retrieved.UploadDurationMs)
+		t.Errorf("upload duration mismatch: expected %d, got %d",
+			snapshot.UploadDurationMs, retrieved.UploadDurationMs)
 	}
 }
 
 // TestComplexOrphanedDataScenario tests a complex scenario with multiple relationships
-func TestComplexOrphanedDataScenario(t *testing.T) {
+// createOrphanScenarioFixtures creates two snapshots and three files for
-	db, cleanup := setupTestDB(t)
+// the orphaned-data cleanup scenario.
-	defer cleanup()
+func createOrphanScenarioFixtures(
+	ctx context.Context, t *testing.T, repos *Repositories,
+) (*Snapshot, *Snapshot, []*File) {
+	t.Helper()
 
-	ctx := context.Background()
-	repos := NewRepositories(db)
-
-	// Create snapshots
 	snapshot1 := &Snapshot{
 		ID:        "snapshot1",
 		Hostname:  "host1",
@@ -623,34 +635,33 @@ func TestComplexOrphanedDataScenario(t *testing.T) {
 		}
 	}
 
+	return snapshot1, snapshot2, files
+}
+
+func TestComplexOrphanedDataScenario(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repos := NewRepositories(db)
+
+	snapshot1, snapshot2, files := createOrphanScenarioFixtures(ctx, t, repos)
+
 	// Add files to snapshots
 	// Snapshot1: file0, file1
 	// Snapshot2: file1, file2
 	// file0: only in snapshot1
 	// file1: in both snapshots
 	// file2: only in snapshot2
-	err = repos.Snapshots.AddFileByID(ctx, nil, snapshot1.ID.String(), files[0].ID)
+	mustAddFileToSnapshot(t, repos, snapshot1.ID.String(), files[0].ID)
-	if err != nil {
+	mustAddFileToSnapshot(t, repos, snapshot1.ID.String(), files[1].ID)
-		t.Fatal(err)
+	mustAddFileToSnapshot(t, repos, snapshot2.ID.String(), files[1].ID)
-	}
+	mustAddFileToSnapshot(t, repos, snapshot2.ID.String(), files[2].ID)
-
-	err = repos.Snapshots.AddFileByID(ctx, nil, snapshot1.ID.String(), files[1].ID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = repos.Snapshots.AddFileByID(ctx, nil, snapshot2.ID.String(), files[1].ID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = repos.Snapshots.AddFileByID(ctx, nil, snapshot2.ID.String(), files[2].ID)
-	if err != nil {
-		t.Fatal(err)
-	}
 
 	// Delete snapshot1
-	err = repos.Snapshots.DeleteSnapshotFiles(ctx, snapshot1.ID.String())
+	err := repos.Snapshots.DeleteSnapshotFiles(ctx, snapshot1.ID.String())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -700,6 +711,8 @@ func TestComplexOrphanedDataScenario(t *testing.T) {
 
 // TestCascadeDelete tests that cascade deletes work properly
 func TestCascadeDelete(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -774,6 +787,8 @@ func TestCascadeDelete(t *testing.T) {
 
 // TestTransactionIsolation tests that transactions properly isolate changes
 func TestTransactionIsolation(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
@@ -802,7 +817,7 @@ func TestTransactionIsolation(t *testing.T) {
 		// For now, we'll just test that rollback works
 
 		// Return an error to trigger rollback
-		return errors.New("intentional rollback")
+		return errTxIntentionalRollback
 	})
 	if err == nil {
 		t.Fatal("expected error from transaction")
@@ -819,32 +834,15 @@ func TestTransactionIsolation(t *testing.T) {
 	}
 }
 
-// TestConcurrentOrphanedCleanup tests that concurrent cleanup operations don't interfere
+// TestConcurrentOrphanedCleanup tests that concurrent cleanup operations
-func TestConcurrentOrphanedCleanup(t *testing.T) {
+// don't interfere.
-	db, cleanup := setupTestDB(t)
+// createConcurrentCleanupFiles creates 20 files and associates the
-	defer cleanup()
+// even-numbered ones with the snapshot, leaving the rest orphaned.
+func createConcurrentCleanupFiles(
+	ctx context.Context, t *testing.T, repos *Repositories, snapshotID string,
+) {
+	t.Helper()
 
-	ctx := context.Background()
-	repos := NewRepositories(db)
-
-	// Set a 5-second busy timeout to handle concurrent operations
-	if _, err := db.conn.Exec("PRAGMA busy_timeout = 5000"); err != nil {
-		t.Fatalf("failed to set busy timeout: %v", err)
-	}
-
-	// Create a snapshot
-	snapshot := &Snapshot{
-		ID:        "concurrent-test",
-		Hostname:  "test-host",
-		StartedAt: time.Now(),
-	}
-
-	err := repos.Snapshots.Create(ctx, nil, snapshot)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create many files, some orphaned
 	for i := range 20 {
 		file := &File{
 			Path:  types.FilePath(fmt.Sprintf("/concurrent-%d.txt", i)),
@@ -855,19 +853,49 @@ func TestConcurrentOrphanedCleanup(t *testing.T) {
 			GID:   1000,
 		}
 
-		err = repos.Files.Create(ctx, nil, file)
+		err := repos.Files.Create(ctx, nil, file)
 		if err != nil {
 			t.Fatal(err)
 		}
 
 		// Add even-numbered files to snapshot
 		if i%2 == 0 {
-			err = repos.Snapshots.AddFileByID(ctx, nil, snapshot.ID.String(), file.ID)
+			err = repos.Snapshots.AddFileByID(ctx, nil, snapshotID, file.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
 		}
 	}
+}
+
+func TestConcurrentOrphanedCleanup(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repos := NewRepositories(db)
+
+	// Set a 5-second busy timeout to handle concurrent operations
+	_, err := db.conn.ExecContext(ctx, "PRAGMA busy_timeout = 5000")
+	if err != nil {
+		t.Fatalf("failed to set busy timeout: %v", err)
+	}
+
+	// Create a snapshot
+	snapshot := &Snapshot{
+		ID:        "concurrent-test",
+		Hostname:  internalTestHost,
+		StartedAt: time.Now(),
+	}
+
+	err = repos.Snapshots.Create(ctx, nil, snapshot)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	createConcurrentCleanupFiles(ctx, t, repos, snapshot.ID.String())
 
 	// Run multiple cleanup operations concurrently
 	// Note: SQLite has limited support for concurrent writes, so we expect some to fail

internal/database/repository_debug_test.go

@@ -1,3 +1,4 @@
+//nolint:testpackage // inspects the unexported database connection
 package database
 
 import (
@@ -6,15 +7,50 @@ import (
 	"time"
 )
 
-// TestOrphanedFileCleanupDebug tests orphaned file cleanup with debug output
+// logSnapshotFileIDs logs every file_id present in snapshot_files.
-func TestOrphanedFileCleanupDebug(t *testing.T) {
+func logSnapshotFileIDs(t *testing.T, db *DB) {
-	db, cleanup := setupTestDB(t)
+	t.Helper()
-	defer cleanup()
 
 	ctx := context.Background()
-	repos := NewRepositories(db)
 
-	// Create files
+	rows, err := db.conn.QueryContext(ctx, "SELECT file_id FROM snapshot_files")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		err := rows.Close()
+		if err != nil {
+			t.Logf("failed to close rows: %v", err)
+		}
+	}()
+
+	t.Log("Files in snapshot_files:")
+
+	for rows.Next() {
+		var fileID string
+
+		err := rows.Scan(&fileID)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		t.Logf("  - %s", fileID)
+	}
+
+	err = rows.Err()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// TestOrphanedFileCleanupDebug tests orphaned file cleanup with debug output
+// createOrphanDebugFixtures creates one orphaned file, one referenced
+// file, and the snapshot that will reference the latter.
+func createOrphanDebugFixtures(
+	ctx context.Context, t *testing.T, repos *Repositories,
+) (*File, *File, *Snapshot) {
+	t.Helper()
+
 	file1 := &File{
 		Path:  "/orphaned.txt",
 		MTime: time.Now().Truncate(time.Second),
@@ -48,8 +84,8 @@ func TestOrphanedFileCleanupDebug(t *testing.T) {
 
 	// Create a snapshot and reference only file2
 	snapshot := &Snapshot{
-		ID:        "test-snapshot",
+		ID:        internalTestSnapshotID,
-		Hostname:  "test-host",
+		Hostname:  internalTestHost,
 		StartedAt: time.Now(),
 	}
 
@@ -60,18 +96,26 @@ func TestOrphanedFileCleanupDebug(t *testing.T) {
 
 	t.Logf("Created snapshot: %s", snapshot.ID)
 
+	return file1, file2, snapshot
+}
+
+func TestOrphanedFileCleanupDebug(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repos := NewRepositories(db)
+
+	file1, file2, snapshot := createOrphanDebugFixtures(ctx, t, repos)
+
 	// Check snapshot_files before adding
-	var count int
+	count := countRow(t, db, "SELECT COUNT(*) FROM snapshot_files")
-
-	err = db.conn.QueryRow("SELECT COUNT(*) FROM snapshot_files").Scan(&count)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	t.Logf("snapshot_files count before add: %d", count)
 
 	// Add file2 to snapshot
-	err = repos.Snapshots.AddFileByID(ctx, nil, snapshot.ID.String(), file2.ID)
+	err := repos.Snapshots.AddFileByID(ctx, nil, snapshot.ID.String(), file2.ID)
 	if err != nil {
 		t.Fatalf("failed to add file to snapshot: %v", err)
 	}
@@ -79,44 +123,14 @@ func TestOrphanedFileCleanupDebug(t *testing.T) {
 	t.Logf("Added file2 to snapshot")
 
 	// Check snapshot_files after adding
-	err = db.conn.QueryRow("SELECT COUNT(*) FROM snapshot_files").Scan(&count)
+	count = countRow(t, db, "SELECT COUNT(*) FROM snapshot_files")
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	t.Logf("snapshot_files count after add: %d", count)
 
 	// Check which files are referenced
-	rows, err := db.conn.Query("SELECT file_id FROM snapshot_files")
+	logSnapshotFileIDs(t, db)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		err := rows.Close()
-		if err != nil {
-			t.Logf("failed to close rows: %v", err)
-		}
-	}()
-
-	t.Log("Files in snapshot_files:")
-
-	for rows.Next() {
-		var fileID string
-
-		err := rows.Scan(&fileID)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		t.Logf("  - %s", fileID)
-	}
 
 	// Check files before cleanup
-	err = db.conn.QueryRow("SELECT COUNT(*) FROM files").Scan(&count)
+	count = countRow(t, db, countFilesQuery)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	t.Logf("Files count before cleanup: %d", count)
 
 	// Run orphaned cleanup
@@ -128,11 +142,7 @@ func TestOrphanedFileCleanupDebug(t *testing.T) {
 	t.Log("Ran orphaned cleanup")
 
 	// Check files after cleanup
-	err = db.conn.QueryRow("SELECT COUNT(*) FROM files").Scan(&count)
+	count = countRow(t, db, countFilesQuery)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	t.Logf("Files count after cleanup: %d", count)
 
 	// List remaining files
@@ -156,18 +166,12 @@ func TestOrphanedFileCleanupDebug(t *testing.T) {
 	if orphanedFile != nil {
 		t.Error("orphaned file should have been deleted")
 		// Let's check why it wasn't deleted
-		var exists bool
+		stillReferenced := countRow(t, db, `
-
-		err = db.conn.QueryRow(`
 			SELECT EXISTS(
-				SELECT 1 FROM snapshot_files 
+				SELECT 1 FROM snapshot_files
 				WHERE file_id = ?
-			)`, file1.ID).Scan(&exists)
+			)`, file1.ID)
-		if err != nil {
+		t.Logf("File1 exists in snapshot_files: %v", stillReferenced != 0)
-			t.Fatal(err)
-		}
-
-		t.Logf("File1 exists in snapshot_files: %v", exists)
 	} else {
 		t.Log("Orphaned file was correctly deleted")
 	}

internal/database/repository_edge_cases_test.go

@@ -1,3 +1,4 @@
+//nolint:testpackage // inspects the unexported database connection
 package database
 
 import (
@@ -10,20 +11,17 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
-// TestFileRepositoryEdgeCases tests edge cases for file repository
+// fileEdgeCase describes one Create edge-case scenario.
-func TestFileRepositoryEdgeCases(t *testing.T) {
+type fileEdgeCase struct {
-	db, cleanup := setupTestDB(t)
+	name    string
-	defer cleanup()
+	file    *File
+	wantErr bool
+	errMsg  string
+}
 
-	ctx := context.Background()
+// fileEdgeCases returns the Create edge-case table.
-	repo := NewFileRepository(db)
+func fileEdgeCases() []fileEdgeCase {
-
+	return []fileEdgeCase{
-	tests := []struct {
-		name    string
-		file    *File
-		wantErr bool
-		errMsg  string
-	}{
 		{
 			name: "empty path",
 			file: &File{
@@ -51,6 +49,7 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
 		{
 			name: "path with special characters",
 			file: &File{
+				//nolint:gosmopolitan // non-ASCII path is deliberate test data
 				Path:  "/test/file with spaces and 特殊文字.txt",
 				MTime: time.Now(),
 				Size:  1024,
@@ -86,12 +85,26 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
 			wantErr: false,
 		},
 	}
+}
 
-	for i, tt := range tests {
+// TestFileRepositoryEdgeCases tests edge cases for file repository
+func TestFileRepositoryEdgeCases(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	t.Cleanup(cleanup)
+
+	ctx := context.Background()
+	repo := NewFileRepository(db)
+
+	for i, tt := range fileEdgeCases() {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
 			// Add a unique suffix to paths to avoid UNIQUE constraint violations
 			if tt.file.Path != "" {
-				tt.file.Path = types.FilePath(fmt.Sprintf("%s_%d_%d", tt.file.Path, i, time.Now().UnixNano()))
+				tt.file.Path = types.FilePath(fmt.Sprintf("%s_%d_%d",
+					tt.file.Path, i, time.Now().UnixNano()))
 			}
 
 			err := repo.Create(ctx, nil, tt.file)
@@ -106,65 +119,128 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
 	}
 }
 
+// testDuplicateFilePaths exercises the UPSERT behavior for duplicate paths.
+func testDuplicateFilePaths(t *testing.T, repos *Repositories) {
+	t.Helper()
+
+	ctx := context.Background()
+
+	file1 := &File{
+		Path:  "/duplicate.txt",
+		MTime: time.Now(),
+		Size:  1024,
+		Mode:  0644,
+		UID:   1000,
+		GID:   1000,
+	}
+	file2 := &File{
+		Path:  "/duplicate.txt", // Same path
+		MTime: time.Now().Add(time.Hour),
+		Size:  2048,
+		Mode:  0644,
+		UID:   1000,
+		GID:   1000,
+	}
+
+	err := repos.Files.Create(ctx, nil, file1)
+	if err != nil {
+		t.Fatalf("failed to create file1: %v", err)
+	}
+
+	originalID := file1.ID
+
+	// Create with same path should update the existing record (UPSERT behavior)
+	err = repos.Files.Create(ctx, nil, file2)
+	if err != nil {
+		t.Fatalf("failed to create file2: %v", err)
+	}
+
+	// Verify the file was updated, not duplicated
+	retrievedFile, err := repos.Files.GetByPath(ctx, "/duplicate.txt")
+	if err != nil {
+		t.Fatalf("failed to retrieve file: %v", err)
+	}
+
+	// The file should have been updated with file2's data
+	if retrievedFile.Size != 2048 {
+		t.Errorf("expected size 2048, got %d", retrievedFile.Size)
+	}
+
+	// ID might be different due to the UPSERT
+	if retrievedFile.ID != file2.ID {
+		t.Logf("File ID changed from %s to %s during upsert",
+			originalID, retrievedFile.ID)
+	}
+}
+
+// testDuplicateFileChunks exercises idempotent file-chunk mapping creation.
+func testDuplicateFileChunks(t *testing.T, repos *Repositories) {
+	t.Helper()
+
+	ctx := context.Background()
+
+	file := &File{
+		Path:  "/test-dup-fc.txt",
+		MTime: time.Now(),
+		Size:  1024,
+		Mode:  0644,
+		UID:   1000,
+		GID:   1000,
+	}
+
+	err := repos.Files.Create(ctx, nil, file)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	chunk := &Chunk{
+		ChunkHash: types.ChunkHash("test-chunk-dup"),
+		Size:      1024,
+	}
+
+	err = repos.Chunks.Create(ctx, nil, chunk)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fc := &FileChunk{
+		FileID:    file.ID,
+		Idx:       0,
+		ChunkHash: chunk.ChunkHash,
+	}
+
+	err = repos.FileChunks.Create(ctx, nil, fc)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Creating the same mapping again should be idempotent
+	err = repos.FileChunks.Create(ctx, nil, fc)
+	if err != nil {
+		t.Error("file-chunk creation should be idempotent")
+	}
+}
+
 // TestDuplicateHandling tests handling of duplicate entries
 func TestDuplicateHandling(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
-	defer cleanup()
+	t.Cleanup(cleanup)
 
 	ctx := context.Background()
 	repos := NewRepositories(db)
 
 	// Test duplicate file paths - Create uses UPSERT logic
 	t.Run("duplicate file paths", func(t *testing.T) {
-		file1 := &File{
+		t.Parallel()
-			Path:  "/duplicate.txt",
+		testDuplicateFilePaths(t, repos)
-			MTime: time.Now(),
-			Size:  1024,
-			Mode:  0644,
-			UID:   1000,
-			GID:   1000,
-		}
-		file2 := &File{
-			Path:  "/duplicate.txt", // Same path
-			MTime: time.Now().Add(time.Hour),
-			Size:  2048,
-			Mode:  0644,
-			UID:   1000,
-			GID:   1000,
-		}
-
-		err := repos.Files.Create(ctx, nil, file1)
-		if err != nil {
-			t.Fatalf("failed to create file1: %v", err)
-		}
-
-		originalID := file1.ID
-
-		// Create with same path should update the existing record (UPSERT behavior)
-		err = repos.Files.Create(ctx, nil, file2)
-		if err != nil {
-			t.Fatalf("failed to create file2: %v", err)
-		}
-
-		// Verify the file was updated, not duplicated
-		retrievedFile, err := repos.Files.GetByPath(ctx, "/duplicate.txt")
-		if err != nil {
-			t.Fatalf("failed to retrieve file: %v", err)
-		}
-
-		// The file should have been updated with file2's data
-		if retrievedFile.Size != 2048 {
-			t.Errorf("expected size 2048, got %d", retrievedFile.Size)
-		}
-
-		// ID might be different due to the UPSERT
-		if retrievedFile.ID != file2.ID {
-			t.Logf("File ID changed from %s to %s during upsert", originalID, retrievedFile.ID)
-		}
 	})
 
 	// Test duplicate chunk hashes
 	t.Run("duplicate chunk hashes", func(t *testing.T) {
+		t.Parallel()
+
 		chunk := &Chunk{
 			ChunkHash: types.ChunkHash("duplicate-chunk"),
 			Size:      1024,
@@ -184,59 +260,25 @@ func TestDuplicateHandling(t *testing.T) {
 
 	// Test duplicate file-chunk mappings
 	t.Run("duplicate file-chunk mappings", func(t *testing.T) {
-		file := &File{
+		t.Parallel()
-			Path:  "/test-dup-fc.txt",
+		testDuplicateFileChunks(t, repos)
-			MTime: time.Now(),
-			Size:  1024,
-			Mode:  0644,
-			UID:   1000,
-			GID:   1000,
-		}
-
-		err := repos.Files.Create(ctx, nil, file)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		chunk := &Chunk{
-			ChunkHash: types.ChunkHash("test-chunk-dup"),
-			Size:      1024,
-		}
-
-		err = repos.Chunks.Create(ctx, nil, chunk)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		fc := &FileChunk{
-			FileID:    file.ID,
-			Idx:       0,
-			ChunkHash: chunk.ChunkHash,
-		}
-
-		err = repos.FileChunks.Create(ctx, nil, fc)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Creating the same mapping again should be idempotent
-		err = repos.FileChunks.Create(ctx, nil, fc)
-		if err != nil {
-			t.Error("file-chunk creation should be idempotent")
-		}
 	})
 }
 
 // TestNullHandling tests handling of NULL values
 func TestNullHandling(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
-	defer cleanup()
+	t.Cleanup(cleanup)
 
 	ctx := context.Background()
 	repos := NewRepositories(db)
 
 	// Test file with no link target
 	t.Run("file without link target", func(t *testing.T) {
+		t.Parallel()
+
 		file := &File{
 			Path:       "/regular.txt",
 			MTime:      time.Now(),
@@ -264,9 +306,11 @@ func TestNullHandling(t *testing.T) {
 
 	// Test snapshot with NULL completed_at
 	t.Run("incomplete snapshot", func(t *testing.T) {
+		t.Parallel()
+
 		snapshot := &Snapshot{
 			ID:          "incomplete-test",
-			Hostname:    "test-host",
+			Hostname:    internalTestHost,
 			StartedAt:   time.Now(),
 			CompletedAt: nil, // Should remain NULL until completed
 		}
@@ -288,31 +332,86 @@ func TestNullHandling(t *testing.T) {
 
 	// Test blob with NULL uploaded_ts
 	t.Run("blob not uploaded", func(t *testing.T) {
-		blob := &Blob{
+		t.Parallel()
-			ID:         types.NewBlobID(),
+		verifyBlobNullUploadTS(ctx, t, repos)
-			Hash:       types.BlobHash("test-hash"),
-			CreatedTS:  time.Now(),
-			UploadedTS: nil, // Not uploaded yet
-		}
-
-		err := repos.Blobs.Create(ctx, nil, blob)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		retrieved, err := repos.Blobs.GetByID(ctx, blob.ID.String())
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if retrieved.UploadedTS != nil {
-			t.Error("expected nil UploadedTS for non-uploaded blob")
-		}
 	})
 }
 
+// verifyBlobNullUploadTS checks that a blob created without an upload
+// timestamp round-trips with UploadedTS nil.
+func verifyBlobNullUploadTS(
+	ctx context.Context, t *testing.T, repos *Repositories,
+) {
+	t.Helper()
+
+	blob := &Blob{
+		ID:         types.NewBlobID(),
+		Hash:       types.BlobHash("test-hash"),
+		CreatedTS:  time.Now(),
+		UploadedTS: nil, // Not uploaded yet
+	}
+
+	err := repos.Blobs.Create(ctx, nil, blob)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	retrieved, err := repos.Blobs.GetByID(ctx, blob.ID.String())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if retrieved.UploadedTS != nil {
+		t.Error("expected nil UploadedTS for non-uploaded blob")
+	}
+}
+
+// createLargeDatasetFiles creates fileCount files and adds every other
+// one to the snapshot.
+func createLargeDatasetFiles(
+	t *testing.T,
+	repos *Repositories,
+	snapshotID string,
+	fileCount int,
+) {
+	t.Helper()
+
+	ctx := context.Background()
+	start := time.Now()
+
+	for i := range fileCount {
+		file := &File{
+			Path:  types.FilePath(fmt.Sprintf("/large/file%05d.txt", i)),
+			MTime: time.Now(),
+			Size:  int64(i * 1024),
+			Mode:  0644,
+			UID:   uint32(1000 + (i % 10)),
+			GID:   uint32(1000 + (i % 10)),
+		}
+
+		err := repos.Files.Create(ctx, nil, file)
+		if err != nil {
+			t.Fatalf("failed to create file %d: %v", i, err)
+		}
+
+		// Add half to snapshot
+		if i%2 == 0 {
+			err = repos.Snapshots.AddFileByID(ctx, nil, snapshotID, file.ID)
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+
+	t.Logf("Created %d files in %v", fileCount, time.Since(start))
+}
+
 // TestLargeDatasets tests operations with large amounts of data
+//
+//nolint:tparallel // subtests share one database and are order-dependent
 func TestLargeDatasets(t *testing.T) {
+	t.Parallel()
+
 	if testing.Short() {
 		t.Skip("skipping large dataset test in short mode")
 	}
@@ -326,7 +425,7 @@ func TestLargeDatasets(t *testing.T) {
 	// Create a snapshot
 	snapshot := &Snapshot{
 		ID:        "large-dataset-test",
-		Hostname:  "test-host",
+		Hostname:  internalTestHost,
 		StartedAt: time.Now(),
 	}
 
@@ -338,40 +437,13 @@ func TestLargeDatasets(t *testing.T) {
 	// Create many files
 	const fileCount = 1000
 
-	fileIDs := make([]types.FileID, fileCount)
+	//nolint:paralleltest // phases share one database and are order-dependent
-
 	t.Run("create many files", func(t *testing.T) {
-		start := time.Now()
+		createLargeDatasetFiles(t, repos, snapshot.ID.String(), fileCount)
-		for i := range fileCount {
-			file := &File{
-				Path:  types.FilePath(fmt.Sprintf("/large/file%05d.txt", i)),
-				MTime: time.Now(),
-				Size:  int64(i * 1024),
-				Mode:  0644,
-				UID:   uint32(1000 + (i % 10)),
-				GID:   uint32(1000 + (i % 10)),
-			}
-
-			err := repos.Files.Create(ctx, nil, file)
-			if err != nil {
-				t.Fatalf("failed to create file %d: %v", i, err)
-			}
-
-			fileIDs[i] = file.ID
-
-			// Add half to snapshot
-			if i%2 == 0 {
-				err = repos.Snapshots.AddFileByID(ctx, nil, snapshot.ID.String(), file.ID)
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-
-		t.Logf("Created %d files in %v", fileCount, time.Since(start))
 	})
 
 	// Test ListByPrefix performance
+	//nolint:paralleltest // phases share one database and are order-dependent
 	t.Run("list by prefix performance", func(t *testing.T) {
 		start := time.Now()
 
@@ -388,6 +460,7 @@ func TestLargeDatasets(t *testing.T) {
 	})
 
 	// Test orphaned cleanup performance
+	//nolint:paralleltest // phases share one database and are order-dependent
 	t.Run("orphaned cleanup performance", func(t *testing.T) {
 		start := time.Now()
 
@@ -405,21 +478,26 @@ func TestLargeDatasets(t *testing.T) {
 		}
 
 		if len(files) != fileCount/2 {
-			t.Errorf("expected %d files after cleanup, got %d", fileCount/2, len(files))
+			t.Errorf("expected %d files after cleanup, got %d",
+				fileCount/2, len(files))
 		}
 	})
 }
 
 // TestErrorPropagation tests that errors are properly propagated
 func TestErrorPropagation(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
-	defer cleanup()
+	t.Cleanup(cleanup)
 
 	ctx := context.Background()
 	repos := NewRepositories(db)
 
 	// Test GetByID with non-existent ID
 	t.Run("GetByID non-existent", func(t *testing.T) {
+		t.Parallel()
+
 		file, err := repos.Files.GetByID(ctx, types.NewFileID())
 		if err != nil {
 			t.Errorf("GetByID should not return error for non-existent ID, got: %v", err)
@@ -432,9 +510,12 @@ func TestErrorPropagation(t *testing.T) {
 
 	// Test GetByPath with non-existent path
 	t.Run("GetByPath non-existent", func(t *testing.T) {
+		t.Parallel()
+
 		file, err := repos.Files.GetByPath(ctx, "/non/existent/path.txt")
 		if err != nil {
-			t.Errorf("GetByPath should not return error for non-existent path, got: %v", err)
+			t.Errorf("GetByPath should not return error for non-existent path, got: %v",
+				err)
 		}
 
 		if file != nil {
@@ -444,6 +525,8 @@ func TestErrorPropagation(t *testing.T) {
 
 	// Test invalid foreign key reference
 	t.Run("invalid foreign key", func(t *testing.T) {
+		t.Parallel()
+
 		fc := &FileChunk{
 			FileID:    types.NewFileID(),
 			Idx:       0,
@@ -463,8 +546,10 @@ func TestErrorPropagation(t *testing.T) {
 
 // TestQueryInjection tests that the system is safe from SQL injection
 func TestQueryInjection(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
-	defer cleanup()
+	t.Cleanup(cleanup)
 
 	ctx := context.Background()
 	repos := NewRepositories(db)
@@ -479,6 +564,8 @@ func TestQueryInjection(t *testing.T) {
 
 	for _, injection := range injectionTests {
 		t.Run("injection attempt", func(t *testing.T) {
+			t.Parallel()
+
 			// Try injection in file path
 			file := &File{
 				Path:  types.FilePath(injection),
@@ -495,7 +582,7 @@ func TestQueryInjection(t *testing.T) {
 			// Verify tables still exist
 			var count int
 
-			err := db.conn.QueryRow("SELECT COUNT(*) FROM files").Scan(&count)
+			err := db.conn.QueryRowContext(ctx, countFilesQuery).Scan(&count)
 			if err != nil {
 				t.Fatal("files table was damaged by injection")
 			}
@@ -505,6 +592,8 @@ func TestQueryInjection(t *testing.T) {
 
 // TestTimezoneHandling tests that times are properly handled in UTC
 func TestTimezoneHandling(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 

internal/database/snapshots.go

@@ -11,19 +11,27 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// SnapshotRepository provides access to the snapshots table and its
+// snapshot_files / snapshot_blobs association tables.
 type SnapshotRepository struct {
 	db *DB
 }
 
+// NewSnapshotRepository creates a SnapshotRepository backed by db.
 func NewSnapshotRepository(db *DB) *SnapshotRepository {
 	return &SnapshotRepository{db: db}
 }
 
-func (r *SnapshotRepository) Create(ctx context.Context, tx *sql.Tx, snapshot *Snapshot) error {
+// Create inserts a snapshot row, using tx when non-nil.
+func (r *SnapshotRepository) Create(
+	ctx context.Context, tx *sql.Tx, snapshot *Snapshot,
+) error {
 	query := `
-		INSERT INTO snapshots (id, hostname, vaultik_version, vaultik_git_revision, started_at, completed_at, 
+		INSERT INTO snapshots (id, hostname, vaultik_version,
-			file_count, chunk_count, blob_count, total_size, blob_size, blob_uncompressed_size, 
+			vaultik_git_revision, started_at, completed_at,
-			compression_ratio, compression_level, upload_bytes, upload_duration_ms)
+			file_count, chunk_count, blob_count, total_size, blob_size,
+			blob_uncompressed_size, compression_ratio, compression_level,
+			upload_bytes, upload_duration_ms)
 		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 	`
 
@@ -34,15 +42,21 @@ func (r *SnapshotRepository) Create(ctx context.Context, tx *sql.Tx, snapshot *S
 		completedAt = &ts
 	}
 
+	args := []any{
+		snapshot.ID, snapshot.Hostname, snapshot.VaultikVersion,
+		snapshot.VaultikGitRevision, snapshot.StartedAt.Unix(),
+		completedAt, snapshot.FileCount, snapshot.ChunkCount,
+		snapshot.BlobCount, snapshot.TotalSize, snapshot.BlobSize,
+		snapshot.BlobUncompressedSize, snapshot.CompressionRatio,
+		snapshot.CompressionLevel, snapshot.UploadBytes,
+		snapshot.UploadDurationMs,
+	}
+
 	var err error
 	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, snapshot.ID, snapshot.Hostname, snapshot.VaultikVersion, snapshot.VaultikGitRevision, snapshot.StartedAt.Unix(),
+		_, err = tx.ExecContext(ctx, query, args...)
-			completedAt, snapshot.FileCount, snapshot.ChunkCount, snapshot.BlobCount, snapshot.TotalSize, snapshot.BlobSize, snapshot.BlobUncompressedSize,
-			snapshot.CompressionRatio, snapshot.CompressionLevel, snapshot.UploadBytes, snapshot.UploadDurationMs)
 	} else {
-		_, err = r.db.ExecWithLog(ctx, query, snapshot.ID, snapshot.Hostname, snapshot.VaultikVersion, snapshot.VaultikGitRevision, snapshot.StartedAt.Unix(),
+		_, err = r.db.ExecWithLog(ctx, query, args...)
-			completedAt, snapshot.FileCount, snapshot.ChunkCount, snapshot.BlobCount, snapshot.TotalSize, snapshot.BlobSize, snapshot.BlobUncompressedSize,
-			snapshot.CompressionRatio, snapshot.CompressionLevel, snapshot.UploadBytes, snapshot.UploadDurationMs)
 	}
 
 	if err != nil {
@@ -52,7 +66,14 @@ func (r *SnapshotRepository) Create(ctx context.Context, tx *sql.Tx, snapshot *S
 	return nil
 }
 
-func (r *SnapshotRepository) UpdateCounts(ctx context.Context, tx *sql.Tx, snapshotID string, fileCount, chunkCount, blobCount, totalSize, blobSize int64) error {
+// UpdateCounts updates a snapshot's file/chunk/blob counters and sizes,
+// recomputing the compression ratio, using tx when non-nil.
+func (r *SnapshotRepository) UpdateCounts(
+	ctx context.Context,
+	tx *sql.Tx,
+	snapshotID string,
+	fileCount, chunkCount, blobCount, totalSize, blobSize int64,
+) error {
 	compressionRatio := 1.0
 	if totalSize > 0 {
 		compressionRatio = float64(blobSize) / float64(totalSize)
@@ -71,9 +92,13 @@ func (r *SnapshotRepository) UpdateCounts(ctx context.Context, tx *sql.Tx, snaps
 
 	var err error
 	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, fileCount, chunkCount, blobCount, totalSize, blobSize, compressionRatio, snapshotID)
+		_, err = tx.ExecContext(ctx, query,
+			fileCount, chunkCount, blobCount, totalSize, blobSize,
+			compressionRatio, snapshotID)
 	} else {
-		_, err = r.db.ExecWithLog(ctx, query, fileCount, chunkCount, blobCount, totalSize, blobSize, compressionRatio, snapshotID)
+		_, err = r.db.ExecWithLog(ctx, query,
+			fileCount, chunkCount, blobCount, totalSize, blobSize,
+			compressionRatio, snapshotID)
 	}
 
 	if err != nil {
@@ -84,34 +109,23 @@ func (r *SnapshotRepository) UpdateCounts(ctx context.Context, tx *sql.Tx, snaps
 }
 
 // UpdateExtendedStats updates extended statistics for a snapshot
-func (r *SnapshotRepository) UpdateExtendedStats(ctx context.Context, tx *sql.Tx, snapshotID string, blobUncompressedSize int64, compressionLevel int, uploadDurationMs int64) error {
+func (r *SnapshotRepository) UpdateExtendedStats(
-	// Calculate compression ratio based on uncompressed vs compressed sizes
+	ctx context.Context,
-	var compressionRatio float64
+	tx *sql.Tx,
-
+	snapshotID string,
-	if blobUncompressedSize > 0 {
+	blobUncompressedSize int64,
-		// Get current blob_size from DB to calculate ratio
+	compressionLevel int,
-		var blobSize int64
+	uploadDurationMs int64,
-
+) error {
-		queryGet := `SELECT blob_size FROM snapshots WHERE id = ?`
+	compressionRatio, err := r.extendedCompressionRatio(
-		if tx != nil {
+		ctx, tx, snapshotID, blobUncompressedSize,
-			err := tx.QueryRowContext(ctx, queryGet, snapshotID).Scan(&blobSize)
+	)
-			if err != nil {
+	if err != nil {
-				return fmt.Errorf("getting blob size: %w", err)
+		return err
-			}
-		} else {
-			err := r.db.conn.QueryRowContext(ctx, queryGet, snapshotID).Scan(&blobSize)
-			if err != nil {
-				return fmt.Errorf("getting blob size: %w", err)
-			}
-		}
-
-		compressionRatio = float64(blobSize) / float64(blobUncompressedSize)
-	} else {
-		compressionRatio = 1.0
 	}
 
 	query := `
-		UPDATE snapshots 
+		UPDATE snapshots
 		SET blob_uncompressed_size = ?,
 		    compression_ratio = ?,
 		    compression_level = ?,
@@ -120,11 +134,14 @@ func (r *SnapshotRepository) UpdateExtendedStats(ctx context.Context, tx *sql.Tx
 		WHERE id = ?
 	`
 
-	var err error
 	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, blobUncompressedSize, compressionRatio, compressionLevel, uploadDurationMs, snapshotID)
+		_, err = tx.ExecContext(ctx, query,
+			blobUncompressedSize, compressionRatio, compressionLevel,
+			uploadDurationMs, snapshotID)
 	} else {
-		_, err = r.db.ExecWithLog(ctx, query, blobUncompressedSize, compressionRatio, compressionLevel, uploadDurationMs, snapshotID)
+		_, err = r.db.ExecWithLog(ctx, query,
+			blobUncompressedSize, compressionRatio, compressionLevel,
+			uploadDurationMs, snapshotID)
 	}
 
 	if err != nil {
@@ -134,7 +151,11 @@ func (r *SnapshotRepository) UpdateExtendedStats(ctx context.Context, tx *sql.Tx
 	return nil
 }
 
-func (r *SnapshotRepository) GetByID(ctx context.Context, snapshotID string) (*Snapshot, error) {
+// GetByID returns the snapshot with the given ID, or nil if no such
+// snapshot exists.
+func (r *SnapshotRepository) GetByID(
+	ctx context.Context, snapshotID string,
+) (*Snapshot, error) {
 	query := `
 		SELECT id, hostname, vaultik_version, vaultik_git_revision, started_at, completed_at, 
 			file_count, chunk_count, blob_count, total_size, blob_size, blob_uncompressed_size,
@@ -169,7 +190,7 @@ func (r *SnapshotRepository) GetByID(ctx context.Context, snapshotID string) (*S
 	)
 
 	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -185,9 +206,14 @@ func (r *SnapshotRepository) GetByID(ctx context.Context, snapshotID string) (*S
 	return &snapshot, nil
 }
 
-func (r *SnapshotRepository) ListRecent(ctx context.Context, limit int) ([]*Snapshot, error) {
+// ListRecent returns up to limit snapshots, most recently started first.
+func (r *SnapshotRepository) ListRecent(
+	ctx context.Context, limit int,
+) ([]*Snapshot, error) {
 	query := `
-		SELECT id, hostname, vaultik_version, vaultik_git_revision, started_at, completed_at, file_count, chunk_count, blob_count, total_size, blob_size, compression_ratio
+		SELECT id, hostname, vaultik_version, vaultik_git_revision,
+			started_at, completed_at, file_count, chunk_count, blob_count,
+			total_size, blob_size, compression_ratio
 		FROM snapshots
 		ORDER BY started_at DESC
 		LIMIT ?
@@ -199,47 +225,13 @@ func (r *SnapshotRepository) ListRecent(ctx context.Context, limit int) ([]*Snap
 	}
 	defer CloseRows(rows)
 
-	var snapshots []*Snapshot
+	return r.scanSnapshotRows(rows)
-
-	for rows.Next() {
-		var (
-			snapshot        Snapshot
-			startedAtUnix   int64
-			completedAtUnix *int64
-		)
-
-		err := rows.Scan(
-			&snapshot.ID,
-			&snapshot.Hostname,
-			&snapshot.VaultikVersion,
-			&snapshot.VaultikGitRevision,
-			&startedAtUnix,
-			&completedAtUnix,
-			&snapshot.FileCount,
-			&snapshot.ChunkCount,
-			&snapshot.BlobCount,
-			&snapshot.TotalSize,
-			&snapshot.BlobSize,
-			&snapshot.CompressionRatio,
-		)
-		if err != nil {
-			return nil, fmt.Errorf("scanning snapshot: %w", err)
-		}
-
-		snapshot.StartedAt = time.Unix(startedAtUnix, 0)
-		if completedAtUnix != nil {
-			t := time.Unix(*completedAtUnix, 0)
-			snapshot.CompletedAt = &t
-		}
-
-		snapshots = append(snapshots, &snapshot)
-	}
-
-	return snapshots, rows.Err()
 }
 
 // MarkComplete marks a snapshot as completed with the current timestamp
-func (r *SnapshotRepository) MarkComplete(ctx context.Context, tx *sql.Tx, snapshotID string) error {
+func (r *SnapshotRepository) MarkComplete(
+	ctx context.Context, tx *sql.Tx, snapshotID string,
+) error {
 	query := `
 		UPDATE snapshots 
 		SET completed_at = ?
@@ -263,7 +255,9 @@ func (r *SnapshotRepository) MarkComplete(ctx context.Context, tx *sql.Tx, snaps
 }
 
 // AddFile adds a file to a snapshot
-func (r *SnapshotRepository) AddFile(ctx context.Context, tx *sql.Tx, snapshotID string, filePath string) error {
+func (r *SnapshotRepository) AddFile(
+	ctx context.Context, tx *sql.Tx, snapshotID string, filePath string,
+) error {
 	query := `
 		INSERT OR IGNORE INTO snapshot_files (snapshot_id, file_id)
 		SELECT ?, id FROM files WHERE path = ?
@@ -284,7 +278,9 @@ func (r *SnapshotRepository) AddFile(ctx context.Context, tx *sql.Tx, snapshotID
 }
 
 // AddFileByID adds a file to a snapshot by file ID
-func (r *SnapshotRepository) AddFileByID(ctx context.Context, tx *sql.Tx, snapshotID string, fileID types.FileID) error {
+func (r *SnapshotRepository) AddFileByID(
+	ctx context.Context, tx *sql.Tx, snapshotID string, fileID types.FileID,
+) error {
 	query := `
 		INSERT OR IGNORE INTO snapshot_files (snapshot_id, file_id)
 		VALUES (?, ?)
@@ -305,12 +301,17 @@ func (r *SnapshotRepository) AddFileByID(ctx context.Context, tx *sql.Tx, snapsh
 }
 
 // AddFilesByIDBatch adds multiple files to a snapshot in batched inserts
-func (r *SnapshotRepository) AddFilesByIDBatch(ctx context.Context, tx *sql.Tx, snapshotID string, fileIDs []types.FileID) error {
+func (r *SnapshotRepository) AddFilesByIDBatch(
+	ctx context.Context, tx *sql.Tx, snapshotID string, fileIDs []types.FileID,
+) error {
 	if len(fileIDs) == 0 {
 		return nil
 	}
 
-	// Each entry has 2 values, so batch at 400 to be safe
+	// Each snapshot_files row binds this many SQL variables.
+	const snapshotFileCols = 2
+
+	// Batch at 400 rows to be safe with SQLite's variable limit.
 	const batchSize = 400
 
 	for i := 0; i < len(fileIDs); i += batchSize {
@@ -320,7 +321,7 @@ func (r *SnapshotRepository) AddFilesByIDBatch(ctx context.Context, tx *sql.Tx,
 
 		query := "INSERT OR IGNORE INTO snapshot_files (snapshot_id, file_id) VALUES "
 
-		args := make([]any, 0, len(batch)*2)
+		args := make([]any, 0, len(batch)*snapshotFileCols)
 
 		var querySb312 strings.Builder
 
@@ -334,7 +335,7 @@ func (r *SnapshotRepository) AddFilesByIDBatch(ctx context.Context, tx *sql.Tx,
 			args = append(args, snapshotID, fileID.String())
 		}
 
-		query += querySb312.String()
+		query += querySb312.String() //nolint:gosec // G202: appends "?" placeholders only
 
 		var err error
 		if tx != nil {
@@ -361,7 +362,9 @@ func (r *SnapshotRepository) AddFilesByIDBatch(ctx context.Context, tx *sql.Tx,
 // Returns the number of rows inserted (i.e. blobs that were previously
 // referenced indirectly via file_chunks but not yet recorded in
 // snapshot_blobs for this snapshot).
-func (r *SnapshotRepository) PopulateReferencedBlobs(ctx context.Context, tx *sql.Tx, snapshotID string) (int64, error) {
+func (r *SnapshotRepository) PopulateReferencedBlobs(
+	ctx context.Context, tx *sql.Tx, snapshotID string,
+) (int64, error) {
 	query := `
 		INSERT OR IGNORE INTO snapshot_blobs (snapshot_id, blob_id, blob_hash)
 		SELECT DISTINCT ?, blobs.id, blobs.blob_hash
@@ -393,7 +396,13 @@ func (r *SnapshotRepository) PopulateReferencedBlobs(ctx context.Context, tx *sq
 }
 
 // AddBlob adds a blob to a snapshot
-func (r *SnapshotRepository) AddBlob(ctx context.Context, tx *sql.Tx, snapshotID string, blobID types.BlobID, blobHash types.BlobHash) error {
+func (r *SnapshotRepository) AddBlob(
+	ctx context.Context,
+	tx *sql.Tx,
+	snapshotID string,
+	blobID types.BlobID,
+	blobHash types.BlobHash,
+) error {
 	query := `
 		INSERT OR IGNORE INTO snapshot_blobs (snapshot_id, blob_id, blob_hash)
 		VALUES (?, ?, ?)
@@ -414,7 +423,9 @@ func (r *SnapshotRepository) AddBlob(ctx context.Context, tx *sql.Tx, snapshotID
 }
 
 // GetBlobHashes returns all blob hashes for a snapshot
-func (r *SnapshotRepository) GetBlobHashes(ctx context.Context, snapshotID string) ([]string, error) {
+func (r *SnapshotRepository) GetBlobHashes(
+	ctx context.Context, snapshotID string,
+) ([]string, error) {
 	query := `
 		SELECT sb.blob_hash 
 		FROM snapshot_blobs sb
@@ -444,8 +455,11 @@ func (r *SnapshotRepository) GetBlobHashes(ctx context.Context, snapshotID strin
 	return blobs, rows.Err()
 }
 
-// GetSnapshotTotalCompressedSize returns the total compressed size of all blobs referenced by a snapshot
+// GetSnapshotTotalCompressedSize returns the total compressed size of all
-func (r *SnapshotRepository) GetSnapshotTotalCompressedSize(ctx context.Context, snapshotID string) (int64, error) {
+// blobs referenced by a snapshot.
+func (r *SnapshotRepository) GetSnapshotTotalCompressedSize(
+	ctx context.Context, snapshotID string,
+) (int64, error) {
 	query := `
 		SELECT COALESCE(SUM(b.compressed_size), 0)
 		FROM snapshot_blobs sb
@@ -465,7 +479,9 @@ func (r *SnapshotRepository) GetSnapshotTotalCompressedSize(ctx context.Context,
 
 // GetSnapshotUncompressedChunkSize returns the sum of plaintext sizes of all unique
 // chunks referenced by a snapshot (via snapshot_files → file_chunks → chunks).
-func (r *SnapshotRepository) GetSnapshotUncompressedChunkSize(ctx context.Context, snapshotID string) (int64, error) {
+func (r *SnapshotRepository) GetSnapshotUncompressedChunkSize(
+	ctx context.Context, snapshotID string,
+) (int64, error) {
 	query := `
 		SELECT COALESCE(SUM(c.size), 0)
 		FROM (
@@ -491,7 +507,9 @@ func (r *SnapshotRepository) GetSnapshotUncompressedChunkSize(ctx context.Contex
 // referenced by this snapshot but not by any earlier completed snapshot known to
 // the local database. The result is the marginal uncompressed data this snapshot
 // added to the dedup pool — i.e., the delta from prior snapshots.
-func (r *SnapshotRepository) GetSnapshotNewChunkSize(ctx context.Context, snapshotID string) (int64, error) {
+func (r *SnapshotRepository) GetSnapshotNewChunkSize(
+	ctx context.Context, snapshotID string,
+) (int64, error) {
 	query := `
 		WITH this_snap_chunks AS (
 			SELECT DISTINCT fc.chunk_hash
@@ -516,7 +534,9 @@ func (r *SnapshotRepository) GetSnapshotNewChunkSize(ctx context.Context, snapsh
 
 	var totalSize int64
 
-	err := r.db.conn.QueryRowContext(ctx, query, snapshotID, snapshotID, snapshotID).Scan(&totalSize)
+	err := r.db.conn.QueryRowContext(
+		ctx, query, snapshotID, snapshotID, snapshotID,
+	).Scan(&totalSize)
 	if err != nil {
 		return 0, fmt.Errorf("querying new chunk size: %w", err)
 	}
@@ -525,9 +545,13 @@ func (r *SnapshotRepository) GetSnapshotNewChunkSize(ctx context.Context, snapsh
 }
 
 // GetIncompleteSnapshots returns all snapshots that haven't been completed
-func (r *SnapshotRepository) GetIncompleteSnapshots(ctx context.Context) ([]*Snapshot, error) {
+func (r *SnapshotRepository) GetIncompleteSnapshots(
+	ctx context.Context,
+) ([]*Snapshot, error) {
 	query := `
-		SELECT id, hostname, vaultik_version, vaultik_git_revision, started_at, completed_at, file_count, chunk_count, blob_count, total_size, blob_size, compression_ratio
+		SELECT id, hostname, vaultik_version, vaultik_git_revision,
+			started_at, completed_at, file_count, chunk_count, blob_count,
+			total_size, blob_size, compression_ratio
 		FROM snapshots
 		WHERE completed_at IS NULL
 		ORDER BY started_at DESC
@@ -539,49 +563,17 @@ func (r *SnapshotRepository) GetIncompleteSnapshots(ctx context.Context) ([]*Sna
 	}
 	defer CloseRows(rows)
 
-	var snapshots []*Snapshot
+	return r.scanSnapshotRows(rows)
-
-	for rows.Next() {
-		var (
-			snapshot        Snapshot
-			startedAtUnix   int64
-			completedAtUnix *int64
-		)
-
-		err := rows.Scan(
-			&snapshot.ID,
-			&snapshot.Hostname,
-			&snapshot.VaultikVersion,
-			&snapshot.VaultikGitRevision,
-			&startedAtUnix,
-			&completedAtUnix,
-			&snapshot.FileCount,
-			&snapshot.ChunkCount,
-			&snapshot.BlobCount,
-			&snapshot.TotalSize,
-			&snapshot.BlobSize,
-			&snapshot.CompressionRatio,
-		)
-		if err != nil {
-			return nil, fmt.Errorf("scanning snapshot: %w", err)
-		}
-
-		snapshot.StartedAt = time.Unix(startedAtUnix, 0)
-		if completedAtUnix != nil {
-			t := time.Unix(*completedAtUnix, 0)
-			snapshot.CompletedAt = &t
-		}
-
-		snapshots = append(snapshots, &snapshot)
-	}
-
-	return snapshots, rows.Err()
 }
 
 // GetIncompleteByHostname returns all incomplete snapshots for a specific hostname
-func (r *SnapshotRepository) GetIncompleteByHostname(ctx context.Context, hostname string) ([]*Snapshot, error) {
+func (r *SnapshotRepository) GetIncompleteByHostname(
+	ctx context.Context, hostname string,
+) ([]*Snapshot, error) {
 	query := `
-		SELECT id, hostname, vaultik_version, vaultik_git_revision, started_at, completed_at, file_count, chunk_count, blob_count, total_size, blob_size, compression_ratio
+		SELECT id, hostname, vaultik_version, vaultik_git_revision,
+			started_at, completed_at, file_count, chunk_count, blob_count,
+			total_size, blob_size, compression_ratio
 		FROM snapshots
 		WHERE completed_at IS NULL AND hostname = ?
 		ORDER BY started_at DESC
@@ -645,7 +637,9 @@ func (r *SnapshotRepository) Delete(ctx context.Context, snapshotID string) erro
 }
 
 // DeleteSnapshotFiles removes all snapshot_files entries for a snapshot
-func (r *SnapshotRepository) DeleteSnapshotFiles(ctx context.Context, snapshotID string) error {
+func (r *SnapshotRepository) DeleteSnapshotFiles(
+	ctx context.Context, snapshotID string,
+) error {
 	query := `DELETE FROM snapshot_files WHERE snapshot_id = ?`
 
 	_, err := r.db.ExecWithLog(ctx, query, snapshotID)
@@ -657,7 +651,9 @@ func (r *SnapshotRepository) DeleteSnapshotFiles(ctx context.Context, snapshotID
 }
 
 // DeleteSnapshotBlobs removes all snapshot_blobs entries for a snapshot
-func (r *SnapshotRepository) DeleteSnapshotBlobs(ctx context.Context, snapshotID string) error {
+func (r *SnapshotRepository) DeleteSnapshotBlobs(
+	ctx context.Context, snapshotID string,
+) error {
 	query := `DELETE FROM snapshot_blobs WHERE snapshot_id = ?`
 
 	_, err := r.db.ExecWithLog(ctx, query, snapshotID)
@@ -669,7 +665,9 @@ func (r *SnapshotRepository) DeleteSnapshotBlobs(ctx context.Context, snapshotID
 }
 
 // DeleteSnapshotUploads removes all uploads entries for a snapshot
-func (r *SnapshotRepository) DeleteSnapshotUploads(ctx context.Context, snapshotID string) error {
+func (r *SnapshotRepository) DeleteSnapshotUploads(
+	ctx context.Context, snapshotID string,
+) error {
 	query := `DELETE FROM uploads WHERE snapshot_id = ?`
 
 	_, err := r.db.ExecWithLog(ctx, query, snapshotID)
@@ -679,3 +677,77 @@ func (r *SnapshotRepository) DeleteSnapshotUploads(ctx context.Context, snapshot
 
 	return nil
 }
+
+// extendedCompressionRatio computes the compression ratio for a snapshot
+// from its stored blob_size and the given uncompressed size. Returns 1.0
+// when the uncompressed size is zero.
+func (r *SnapshotRepository) extendedCompressionRatio(
+	ctx context.Context,
+	tx *sql.Tx,
+	snapshotID string,
+	blobUncompressedSize int64,
+) (float64, error) {
+	if blobUncompressedSize <= 0 {
+		return 1.0, nil
+	}
+
+	// Get current blob_size from DB to calculate ratio
+	var blobSize int64
+
+	queryGet := `SELECT blob_size FROM snapshots WHERE id = ?`
+
+	var err error
+	if tx != nil {
+		err = tx.QueryRowContext(ctx, queryGet, snapshotID).Scan(&blobSize)
+	} else {
+		err = r.db.conn.QueryRowContext(ctx, queryGet, snapshotID).Scan(&blobSize)
+	}
+
+	if err != nil {
+		return 0, fmt.Errorf("getting blob size: %w", err)
+	}
+
+	return float64(blobSize) / float64(blobUncompressedSize), nil
+}
+
+// scanSnapshotRows scans the standard snapshot column set from a rows
+// iterator into Snapshot records.
+func (r *SnapshotRepository) scanSnapshotRows(rows *sql.Rows) ([]*Snapshot, error) {
+	var snapshots []*Snapshot
+
+	for rows.Next() {
+		var (
+			snapshot        Snapshot
+			startedAtUnix   int64
+			completedAtUnix *int64
+		)
+
+		err := rows.Scan(
+			&snapshot.ID,
+			&snapshot.Hostname,
+			&snapshot.VaultikVersion,
+			&snapshot.VaultikGitRevision,
+			&startedAtUnix,
+			&completedAtUnix,
+			&snapshot.FileCount,
+			&snapshot.ChunkCount,
+			&snapshot.BlobCount,
+			&snapshot.TotalSize,
+			&snapshot.BlobSize,
+			&snapshot.CompressionRatio,
+		)
+		if err != nil {
+			return nil, fmt.Errorf("scanning snapshot: %w", err)
+		}
+
+		snapshot.StartedAt = time.Unix(startedAtUnix, 0)
+		if completedAtUnix != nil {
+			t := time.Unix(*completedAtUnix, 0)
+			snapshot.CompletedAt = &t
+		}
+
+		snapshots = append(snapshots, &snapshot)
+	}
+
+	return snapshots, rows.Err()
+}

internal/database/snapshots_test.go

@@ -1,4 +1,4 @@
-package database
+package database_test
 
 import (
 	"context"
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"sneak.berlin/go/vaultik/internal/database"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
@@ -21,17 +22,19 @@ const (
 )
 
 func TestSnapshotRepository(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewSnapshotRepository(db)
+	repo := database.NewSnapshotRepository(db)
 
 	// Test Create
-	snapshot := &Snapshot{
+	snapshot := &database.Snapshot{
 		ID:               "2024-01-01T12:00:00Z",
-		Hostname:         "test-host",
+		Hostname:         testHostname,
-		VaultikVersion:   "1.0.0",
+		VaultikVersion:   testVersion,
 		StartedAt:        time.Now().Truncate(time.Second),
 		CompletedAt:      nil,
 		FileCount:        100,
@@ -62,20 +65,52 @@ func TestSnapshotRepository(t *testing.T) {
 	}
 
 	if retrieved.Hostname != snapshot.Hostname {
-		t.Errorf("hostname mismatch: got %s, want %s", retrieved.Hostname, snapshot.Hostname)
+		t.Errorf("hostname mismatch: got %s, want %s",
+			retrieved.Hostname, snapshot.Hostname)
 	}
 
 	if retrieved.FileCount != snapshot.FileCount {
-		t.Errorf("file count mismatch: got %d, want %d", retrieved.FileCount, snapshot.FileCount)
+		t.Errorf("file count mismatch: got %d, want %d",
+			retrieved.FileCount, snapshot.FileCount)
+	}
+}
+
+func TestSnapshotRepositoryUpdateCounts(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repo := database.NewSnapshotRepository(db)
+
+	snapshot := &database.Snapshot{
+		ID:               "2024-01-02T12:00:00Z",
+		Hostname:         testHostname,
+		VaultikVersion:   testVersion,
+		StartedAt:        time.Now().Truncate(time.Second),
+		CompletedAt:      nil,
+		FileCount:        100,
+		ChunkCount:       500,
+		BlobCount:        10,
+		TotalSize:        oneHundredMebibytes,
+		BlobSize:         fortyMebibytes,
+		CompressionRatio: compressionRatioPoint4,
+	}
+
+	err := repo.Create(ctx, nil, snapshot)
+	if err != nil {
+		t.Fatalf("failed to create snapshot: %v", err)
 	}
 
 	// Test UpdateCounts
-	err = repo.UpdateCounts(ctx, nil, snapshot.ID.String(), 200, 1000, 20, twoHundredMebibytes, sixtyMebibytes)
+	err = repo.UpdateCounts(ctx, nil, snapshot.ID.String(),
+		200, 1000, 20, twoHundredMebibytes, sixtyMebibytes)
 	if err != nil {
 		t.Fatalf("failed to update counts: %v", err)
 	}
 
-	retrieved, err = repo.GetByID(ctx, snapshot.ID.String())
+	retrieved, err := repo.GetByID(ctx, snapshot.ID.String())
 	if err != nil {
 		t.Fatalf("failed to get updated snapshot: %v", err)
 	}
@@ -85,7 +120,8 @@ func TestSnapshotRepository(t *testing.T) {
 	}
 
 	if retrieved.ChunkCount != 1000 {
-		t.Errorf("chunk count not updated: got %d, want %d", retrieved.ChunkCount, 1000)
+		t.Errorf("chunk count not updated: got %d, want %d",
+			retrieved.ChunkCount, 1000)
 	}
 
 	if retrieved.BlobCount != 20 {
@@ -93,25 +129,37 @@ func TestSnapshotRepository(t *testing.T) {
 	}
 
 	if retrieved.TotalSize != twoHundredMebibytes {
-		t.Errorf("total size not updated: got %d, want %d", retrieved.TotalSize, twoHundredMebibytes)
+		t.Errorf("total size not updated: got %d, want %d",
+			retrieved.TotalSize, twoHundredMebibytes)
 	}
 
 	if retrieved.BlobSize != sixtyMebibytes {
-		t.Errorf("blob size not updated: got %d, want %d", retrieved.BlobSize, sixtyMebibytes)
+		t.Errorf("blob size not updated: got %d, want %d",
+			retrieved.BlobSize, sixtyMebibytes)
 	}
 
 	expectedRatio := compressionRatioPoint3 // 0.3
 	if math.Abs(retrieved.CompressionRatio-expectedRatio) > 0.001 {
-		t.Errorf("compression ratio not updated: got %f, want %f", retrieved.CompressionRatio, expectedRatio)
+		t.Errorf("compression ratio not updated: got %f, want %f",
+			retrieved.CompressionRatio, expectedRatio)
 	}
+}
 
-	// Test ListRecent
+func TestSnapshotRepositoryListRecent(t *testing.T) {
-	// Add more snapshots
+	t.Parallel()
-	for i := 2; i <= 5; i++ {
+
-		s := &Snapshot{
+	db, cleanup := setupTestDB(t)
+	defer cleanup()
+
+	ctx := context.Background()
+	repo := database.NewSnapshotRepository(db)
+
+	// Add snapshots
+	for i := 1; i <= 5; i++ {
+		s := &database.Snapshot{
 			ID:             types.SnapshotID(fmt.Sprintf("2024-01-0%dT12:00:00Z", i)),
-			Hostname:       "test-host",
+			Hostname:       testHostname,
-			VaultikVersion: "1.0.0",
+			VaultikVersion: testVersion,
 			StartedAt:      time.Now().Add(time.Duration(i) * time.Hour).Truncate(time.Second),
 			CompletedAt:    nil,
 			FileCount:      int64(100 * i),
@@ -144,11 +192,13 @@ func TestSnapshotRepository(t *testing.T) {
 }
 
 func TestSnapshotRepositoryNotFound(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewSnapshotRepository(db)
+	repo := database.NewSnapshotRepository(db)
 
 	// Test GetByID with non-existent ID
 	snapshot, err := repo.GetByID(ctx, "nonexistent")
@@ -161,7 +211,8 @@ func TestSnapshotRepositoryNotFound(t *testing.T) {
 	}
 
 	// Test UpdateCounts on non-existent snapshot
-	err = repo.UpdateCounts(ctx, nil, "nonexistent", 100, 200, 10, oneHundredMebibytes, fortyMebibytes)
+	err = repo.UpdateCounts(ctx, nil, "nonexistent",
+		100, 200, 10, oneHundredMebibytes, fortyMebibytes)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -169,16 +220,18 @@ func TestSnapshotRepositoryNotFound(t *testing.T) {
 }
 
 func TestSnapshotRepositoryDuplicate(t *testing.T) {
+	t.Parallel()
+
 	db, cleanup := setupTestDB(t)
 	defer cleanup()
 
 	ctx := context.Background()
-	repo := NewSnapshotRepository(db)
+	repo := database.NewSnapshotRepository(db)
 
-	snapshot := &Snapshot{
+	snapshot := &database.Snapshot{
 		ID:             "2024-01-01T12:00:00Z",
-		Hostname:       "test-host",
+		Hostname:       testHostname,
-		VaultikVersion: "1.0.0",
+		VaultikVersion: testVersion,
 		StartedAt:      time.Now().Truncate(time.Second),
 		CompletedAt:    nil,
 		FileCount:      100,

internal/database/uploads.go

@@ -29,7 +29,9 @@ func NewUploadRepository(conn *sql.DB) *UploadRepository {
 }
 
 // Create inserts a new upload record
-func (r *UploadRepository) Create(ctx context.Context, tx *sql.Tx, upload *Upload) error {
+func (r *UploadRepository) Create(
+	ctx context.Context, tx *sql.Tx, upload *Upload,
+) error {
 	query := `
 		INSERT INTO uploads (blob_hash, snapshot_id, uploaded_at, size, duration_ms)
 		VALUES (?, ?, ?, ?, ?)
@@ -37,16 +39,22 @@ func (r *UploadRepository) Create(ctx context.Context, tx *sql.Tx, upload *Uploa
 
 	var err error
 	if tx != nil {
-		_, err = tx.ExecContext(ctx, query, upload.BlobHash, upload.SnapshotID, upload.UploadedAt, upload.Size, upload.DurationMs)
+		_, err = tx.ExecContext(ctx, query,
+			upload.BlobHash, upload.SnapshotID, upload.UploadedAt,
+			upload.Size, upload.DurationMs)
 	} else {
-		_, err = r.conn.ExecContext(ctx, query, upload.BlobHash, upload.SnapshotID, upload.UploadedAt, upload.Size, upload.DurationMs)
+		_, err = r.conn.ExecContext(ctx, query,
+			upload.BlobHash, upload.SnapshotID, upload.UploadedAt,
+			upload.Size, upload.DurationMs)
 	}
 
 	return err
 }
 
 // GetByBlobHash retrieves an upload record by blob hash
-func (r *UploadRepository) GetByBlobHash(ctx context.Context, blobHash string) (*Upload, error) {
+func (r *UploadRepository) GetByBlobHash(
+	ctx context.Context, blobHash string,
+) (*Upload, error) {
 	query := `
 		SELECT blob_hash, uploaded_at, size, duration_ms
 		FROM uploads
@@ -63,7 +71,7 @@ func (r *UploadRepository) GetByBlobHash(ctx context.Context, blobHash string) (
 	)
 
 	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
+		return nil, nil //nolint:nilnil // nil,nil signals not-found; callers check nil
 	}
 
 	if err != nil {
@@ -74,7 +82,9 @@ func (r *UploadRepository) GetByBlobHash(ctx context.Context, blobHash string) (
 }
 
 // GetRecentUploads retrieves recent uploads ordered by upload time
-func (r *UploadRepository) GetRecentUploads(ctx context.Context, limit int) ([]*Upload, error) {
+func (r *UploadRepository) GetRecentUploads(
+	ctx context.Context, limit int,
+) ([]*Upload, error) {
 	query := `
 		SELECT blob_hash, uploaded_at, size, duration_ms
 		FROM uploads
@@ -98,7 +108,9 @@ func (r *UploadRepository) GetRecentUploads(ctx context.Context, limit int) ([]*
 	for rows.Next() {
 		var upload Upload
 
-		err := rows.Scan(&upload.BlobHash, &upload.UploadedAt, &upload.Size, &upload.DurationMs)
+		err := rows.Scan(
+			&upload.BlobHash, &upload.UploadedAt, &upload.Size, &upload.DurationMs,
+		)
 		if err != nil {
 			return nil, err
 		}
@@ -110,9 +122,11 @@ func (r *UploadRepository) GetRecentUploads(ctx context.Context, limit int) ([]*
 }
 
 // GetUploadStats returns aggregate statistics for uploads
-func (r *UploadRepository) GetUploadStats(ctx context.Context, since time.Time) (*UploadStats, error) {
+func (r *UploadRepository) GetUploadStats(
+	ctx context.Context, since time.Time,
+) (*UploadStats, error) {
 	query := `
-		SELECT 
+		SELECT
 			COUNT(*) as count,
 			COALESCE(SUM(size), 0) as total_size,
 			COALESCE(AVG(duration_ms), 0) as avg_duration_ms,
@@ -145,7 +159,9 @@ type UploadStats struct {
 }
 
 // GetCountBySnapshot returns the count of uploads for a specific snapshot
-func (r *UploadRepository) GetCountBySnapshot(ctx context.Context, snapshotID string) (int64, error) {
+func (r *UploadRepository) GetCountBySnapshot(
+	ctx context.Context, snapshotID string,
+) (int64, error) {
 	query := `SELECT COUNT(*) FROM uploads WHERE snapshot_id = ?`
 
 	var count int64

internal/globals/globals.go

@@ -1,3 +1,5 @@
+// Package globals holds application-wide metadata (name, version,
+// commit) that is populated at build time via linker flags.
 package globals
 
 import (
@@ -5,16 +7,16 @@ import (
 )
 
 // Appname is the application name, populated from main().
-var Appname string = "vaultik"
+var Appname = "vaultik" //nolint:gochecknoglobals // set via -ldflags at build time
 
 // Version is the application version, populated from main().
-var Version string = "dev"
+var Version = "dev" //nolint:gochecknoglobals // set via -ldflags at build time
 
 // Commit is the git commit hash, populated from main().
-var Commit string = "unknown"
+var Commit = "unknown" //nolint:gochecknoglobals // set via -ldflags at build time
 
 // CommitDate is the ISO-8601 date of the commit, populated from main().
-var CommitDate string = "unknown"
+var CommitDate = "unknown" //nolint:gochecknoglobals // set via -ldflags at build time
 
 // Author identifies the upstream author of vaultik.
 const Author = "Jeffrey Paul <sneak@sneak.berlin>"
@@ -34,7 +36,8 @@ type Globals struct {
 	StartTime  time.Time
 }
 
-// New creates and returns a new Globals instance initialized with the package-level variables.
+// New creates and returns a new Globals instance initialized with the
+// package-level variables.
 func New() (*Globals, error) {
 	return &Globals{
 		Appname:    Appname,
@@ -44,11 +47,14 @@ func New() (*Globals, error) {
 	}, nil
 }
 
+// shortCommitLen is the number of commit-hash characters ShortCommit keeps.
+const shortCommitLen = 12
+
 // ShortCommit returns the first 12 chars of the commit hash, or the
 // whole string if it's shorter (e.g. "unknown").
 func (g *Globals) ShortCommit() string {
-	if len(g.Commit) > 12 {
+	if len(g.Commit) > shortCommitLen {
-		return g.Commit[:12]
+		return g.Commit[:shortCommitLen]
 	}
 
 	return g.Commit

internal/globals/globals_test.go

@@ -1,12 +1,16 @@
-package globals
+package globals_test
 
 import (
 	"testing"
+
+	"sneak.berlin/go/vaultik/internal/globals"
 )
 
 // TestGlobalsNew ensures the globals package initializes correctly
 func TestGlobalsNew(t *testing.T) {
-	g, err := New()
+	t.Parallel()
+
+	g, err := globals.New()
 	if err != nil {
 		t.Fatalf("Failed to create Globals: %v", err)
 	}

internal/log/log.go

@@ -1,3 +1,5 @@
+// Package log provides the application-wide structured logger: slog
+// with a colorized TTY handler on terminals and JSON output otherwise.
 package log
 
 import (
@@ -12,12 +14,12 @@ import (
 	"golang.org/x/term"
 )
 
-// LogLevel represents the logging level.
+// Level represents the logging level.
-type LogLevel int
+type Level int
 
 const (
 	// LevelFatal represents a fatal error level that will exit the program.
-	LevelFatal LogLevel = iota
+	LevelFatal Level = iota
 	// LevelError represents an error level.
 	LevelError
 	// LevelWarn represents a warning level.
@@ -38,6 +40,7 @@ type Config struct {
 	Quiet   bool
 }
 
+//nolint:gochecknoglobals // package-level logger is the package's purpose
 var logger *slog.Logger
 
 // Initialize sets up the global logger based on the provided configuration.
@@ -45,18 +48,19 @@ func Initialize(cfg Config) {
 	// Determine log level based on configuration
 	var level slog.Level
 
-	if cfg.Cron || cfg.Quiet {
+	switch {
+	case cfg.Cron || cfg.Quiet:
 		// In cron/quiet mode keep warnings and errors visible — the
 		// whole point of --cron is to stay silent only on total
 		// success, so that anything cron emails to root is genuinely
 		// "something went wrong, look at it." A backup with stuck
 		// permission errors or skipped files should NOT be silent.
 		level = slog.LevelWarn
-	} else if cfg.Debug || strings.Contains(os.Getenv("GODEBUG"), "vaultik") {
+	case cfg.Debug || strings.Contains(os.Getenv("GODEBUG"), "vaultik"):
 		level = slog.LevelDebug
-	} else if cfg.Verbose {
+	case cfg.Verbose:
 		level = slog.LevelInfo
-	} else {
+	default:
 		level = slog.LevelWarn
 	}
 
@@ -78,9 +82,13 @@ func Initialize(cfg Config) {
 	slog.SetDefault(logger)
 }
 
+// callerSkipFrames is the number of stack frames between runtime.Caller
+// and the code that invoked the package-level logging function.
+const callerSkipFrames = 2
+
 // getCaller returns the caller information as a string
-func getCaller(skip int) string {
+func getCaller() string {
-	_, file, line, ok := runtime.Caller(skip)
+	_, file, line, ok := runtime.Caller(callerSkipFrames)
 	if !ok {
 		return "unknown"
 	}
@@ -92,7 +100,7 @@ func getCaller(skip int) string {
 func Fatal(msg string, args ...any) {
 	if logger != nil {
 		// Add caller info to args
-		args = append(args, "caller", getCaller(2))
+		args = append(args, "caller", getCaller())
 		logger.Error(msg, args...)
 	}
 
@@ -107,7 +115,7 @@ func Fatalf(format string, args ...any) {
 // Error logs an error message.
 func Error(msg string, args ...any) {
 	if logger != nil {
-		args = append(args, "caller", getCaller(2))
+		args = append(args, "caller", getCaller())
 		logger.Error(msg, args...)
 	}
 }
@@ -120,7 +128,7 @@ func Errorf(format string, args ...any) {
 // Warn logs a warning message.
 func Warn(msg string, args ...any) {
 	if logger != nil {
-		args = append(args, "caller", getCaller(2))
+		args = append(args, "caller", getCaller())
 		logger.Warn(msg, args...)
 	}
 }
@@ -133,7 +141,7 @@ func Warnf(format string, args ...any) {
 // Notice logs a notice message (mapped to Info level).
 func Notice(msg string, args ...any) {
 	if logger != nil {
-		args = append(args, "caller", getCaller(2))
+		args = append(args, "caller", getCaller())
 		logger.Info(msg, args...)
 	}
 }
@@ -146,7 +154,7 @@ func Noticef(format string, args ...any) {
 // Info logs an informational message.
 func Info(msg string, args ...any) {
 	if logger != nil {
-		args = append(args, "caller", getCaller(2))
+		args = append(args, "caller", getCaller())
 		logger.Info(msg, args...)
 	}
 }
@@ -159,7 +167,7 @@ func Infof(format string, args ...any) {
 // Debug logs a debug message.
 func Debug(msg string, args ...any) {
 	if logger != nil {
-		args = append(args, "caller", getCaller(2))
+		args = append(args, "caller", getCaller())
 		logger.Debug(msg, args...)
 	}
 }
@@ -179,7 +187,7 @@ func With(args ...any) *slog.Logger {
 }
 
 // WithContext returns a logger with the provided context.
-func WithContext(ctx context.Context) *slog.Logger {
+func WithContext(_ context.Context) *slog.Logger {
 	return logger
 }
 

internal/log/module.go

@@ -5,6 +5,8 @@ import (
 )
 
 // Module exports logging functionality for dependency injection.
+//
+//nolint:gochecknoglobals // fx module definitions are package globals
 var Module = fx.Module("log",
 	fx.Invoke(func(cfg Config) {
 		Initialize(cfg)
@@ -12,12 +14,12 @@ var Module = fx.Module("log",
 )
 
 // New creates a new logger configuration from provided options.
-func New(opts LogOptions) Config {
+func New(opts Options) Config {
 	return Config(opts)
 }
 
-// LogOptions are provided by the CLI.
+// Options are provided by the CLI.
-type LogOptions struct {
+type Options struct {
 	Verbose bool
 	Debug   bool
 	Cron    bool

internal/log/tty_handler.go

@@ -94,6 +94,11 @@ func (h *TTYHandler) Handle(_ context.Context, r slog.Record) error {
 			if a.Key == "bytes" {
 				value = formatBytes(a.Value.Int64())
 			}
+		case slog.KindAny, slog.KindBool, slog.KindFloat64, slog.KindString,
+			slog.KindTime, slog.KindUint64, slog.KindGroup, slog.KindLogValuer:
+			// Plain string form above is already correct for these kinds.
+		default:
+			// Future kinds also use the plain string form.
 		}
 
 		_, _ = fmt.Fprintf(h.out, " %s%s%s=%s%s%s",
@@ -109,26 +114,27 @@ func (h *TTYHandler) Handle(_ context.Context, r slog.Record) error {
 }
 
 // WithAttrs returns a new handler with the given attributes.
-func (h *TTYHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+func (h *TTYHandler) WithAttrs(_ []slog.Attr) slog.Handler {
 	return h // Simplified for now
 }
 
 // WithGroup returns a new handler with the given group name.
-func (h *TTYHandler) WithGroup(name string) slog.Handler {
+func (h *TTYHandler) WithGroup(_ string) slog.Handler {
 	return h // Simplified for now
 }
 
 // formatDuration formats a duration in a human-readable way
 func formatDuration(d time.Duration) string {
-	if d < time.Millisecond {
+	switch {
+	case d < time.Millisecond:
 		return fmt.Sprintf("%dµs", d.Microseconds())
-	} else if d < time.Second {
+	case d < time.Second:
 		return fmt.Sprintf("%dms", d.Milliseconds())
-	} else if d < time.Minute {
+	case d < time.Minute:
 		return fmt.Sprintf("%.1fs", d.Seconds())
+	default:
+		return d.String()
 	}
-
-	return d.String()
 }
 
 // formatBytes formats bytes in a human-readable way

internal/models/models.go

@@ -1,3 +1,5 @@
+// Package models defines shared value types describing files, chunks,
+// blobs, and snapshots as they move through the backup pipeline.
 package models
 
 import (

internal/models/models_test.go

@@ -1,17 +1,21 @@
-package models
+package models_test
 
 import (
 	"testing"
 	"time"
+
+	"sneak.berlin/go/vaultik/internal/models"
 )
 
 // TestModelsCompilation ensures all model types can be instantiated
 func TestModelsCompilation(t *testing.T) {
+	t.Parallel()
+
 	// This test primarily serves as a compilation test
 	// to ensure all types are properly defined
 
 	// Test FileInfo
-	fi := &FileInfo{
+	fi := &models.FileInfo{
 		Path:  "/test/file.txt",
 		MTime: time.Now(),
 		Size:  1024,
@@ -21,7 +25,7 @@ func TestModelsCompilation(t *testing.T) {
 	}
 
 	// Test ChunkInfo
-	ci := &ChunkInfo{
+	ci := &models.ChunkInfo{
 		Hash:   "abc123",
 		Size:   512,
 		Offset: 0,
@@ -31,7 +35,7 @@ func TestModelsCompilation(t *testing.T) {
 	}
 
 	// Test BlobInfo
-	bi := &BlobInfo{
+	bi := &models.BlobInfo{
 		Hash:       "blob123",
 		CreatedAt:  time.Now(),
 		Size:       1024,
@@ -42,7 +46,7 @@ func TestModelsCompilation(t *testing.T) {
 	}
 
 	// Test Snapshot
-	s := &Snapshot{
+	s := &models.Snapshot{
 		ID:        "2024-01-01T00:00:00Z",
 		Hostname:  "test-host",
 		Version:   "1.0.0",

internal/pidlock/pidlock.go

@@ -21,6 +21,13 @@ type Lock struct {
 	path string
 }
 
+const (
+	// lockDirPerm is the mode for the lock directory (owner-only).
+	lockDirPerm = 0o700
+	// pidFilePerm is the mode for the PID file (owner-only).
+	pidFilePerm = 0o600
+)
+
 // Acquire attempts to acquire a PID lock in the specified directory.
 // If the lock file exists and the process is still running, it returns
 // ErrAlreadyRunning with details about the existing process.
@@ -28,7 +35,8 @@ type Lock struct {
 // a Lock that must be released with Release().
 func Acquire(lockDir string) (*Lock, error) {
 	// Ensure lock directory exists
-	if err := os.MkdirAll(lockDir, 0700); err != nil {
+	err := os.MkdirAll(lockDir, lockDirPerm)
+	if err != nil {
 		return nil, fmt.Errorf("creating lock directory: %w", err)
 	}
 
@@ -46,7 +54,9 @@ func Acquire(lockDir string) (*Lock, error) {
 
 	// Write our PID
 	pid := os.Getpid()
-	if err := os.WriteFile(lockPath, []byte(strconv.Itoa(pid)), 0600); err != nil {
+
+	err = os.WriteFile(lockPath, []byte(strconv.Itoa(pid)), pidFilePerm)
+	if err != nil {
 		return nil, fmt.Errorf("writing PID file: %w", err)
 	}
 
@@ -64,7 +74,7 @@ func (l *Lock) Release() error {
 	existingPID, err := readPIDFile(l.path)
 	if err != nil {
 		// File already gone or unreadable - that's fine
-		return nil
+		return nil //nolint:nilerr // unreadable lock file means nothing to release
 	}
 
 	if existingPID != os.Getpid() {
@@ -84,7 +94,7 @@ func (l *Lock) Release() error {
 
 // readPIDFile reads and parses the PID from a lock file.
 func readPIDFile(path string) (int, error) {
-	data, err := os.ReadFile(path)
+	data, err := os.ReadFile(path) //nolint:gosec // G304: path is our own lock file
 	if err != nil {
 		return 0, err
 	}

internal/pidlock/pidlock_test.go

@@ -1,4 +1,4 @@
-package pidlock
+package pidlock_test
 
 import (
 	"os"
@@ -8,18 +8,22 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"sneak.berlin/go/vaultik/internal/pidlock"
 )
 
 func TestAcquireAndRelease(t *testing.T) {
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 
 	// Acquire lock
-	lock, err := Acquire(tmpDir)
+	lock, err := pidlock.Acquire(tmpDir)
 	require.NoError(t, err)
 	require.NotNil(t, lock)
 
 	// Verify PID file exists with our PID
-	data, err := os.ReadFile(filepath.Join(tmpDir, "vaultik.pid"))
+	pidPath := filepath.Join(tmpDir, "vaultik.pid")
+	data, err := os.ReadFile(pidPath) //nolint:gosec // G304: test's own temp file
 	require.NoError(t, err)
 	pid, err := strconv.Atoi(string(data))
 	require.NoError(t, err)
@@ -30,27 +34,31 @@ func TestAcquireAndRelease(t *testing.T) {
 	require.NoError(t, err)
 
 	// Verify PID file is gone
-	_, err = os.Stat(filepath.Join(tmpDir, "vaultik.pid"))
+	_, err = os.Stat(pidPath)
 	assert.True(t, os.IsNotExist(err))
 }
 
 func TestAcquireBlocksSecondInstance(t *testing.T) {
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 
 	// Acquire first lock
-	lock1, err := Acquire(tmpDir)
+	lock1, err := pidlock.Acquire(tmpDir)
 	require.NoError(t, err)
 
 	require.NotNil(t, lock1)
 	defer func() { _ = lock1.Release() }()
 
 	// Try to acquire second lock - should fail
-	lock2, err := Acquire(tmpDir)
+	lock2, err := pidlock.Acquire(tmpDir)
-	assert.ErrorIs(t, err, ErrAlreadyRunning)
+	require.ErrorIs(t, err, pidlock.ErrAlreadyRunning)
 	assert.Nil(t, lock2)
 }
 
 func TestAcquireWithStaleLock(t *testing.T) {
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 
 	// Write a stale PID file (PID that doesn't exist)
@@ -60,14 +68,14 @@ func TestAcquireWithStaleLock(t *testing.T) {
 	require.NoError(t, err)
 
 	// Should be able to acquire lock (stale lock is cleaned up)
-	lock, err := Acquire(tmpDir)
+	lock, err := pidlock.Acquire(tmpDir)
 	require.NoError(t, err)
 
 	require.NotNil(t, lock)
 	defer func() { _ = lock.Release() }()
 
 	// Verify our PID is now in the file
-	data, err := os.ReadFile(pidPath)
+	data, err := os.ReadFile(pidPath) //nolint:gosec // G304: test's own temp file
 	require.NoError(t, err)
 	pid, err := strconv.Atoi(string(data))
 	require.NoError(t, err)
@@ -75,9 +83,11 @@ func TestAcquireWithStaleLock(t *testing.T) {
 }
 
 func TestReleaseIsIdempotent(t *testing.T) {
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 
-	lock, err := Acquire(tmpDir)
+	lock, err := pidlock.Acquire(tmpDir)
 	require.NoError(t, err)
 
 	// Release multiple times - should not error
@@ -89,17 +99,21 @@ func TestReleaseIsIdempotent(t *testing.T) {
 }
 
 func TestReleaseNilLock(t *testing.T) {
-	var lock *Lock
+	t.Parallel()
+
+	var lock *pidlock.Lock
 
 	err := lock.Release()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 }
 
 func TestAcquireCreatesDirectory(t *testing.T) {
+	t.Parallel()
+
 	tmpDir := t.TempDir()
 	nestedDir := filepath.Join(tmpDir, "nested", "dir")
 
-	lock, err := Acquire(nestedDir)
+	lock, err := pidlock.Acquire(nestedDir)
 	require.NoError(t, err)
 
 	require.NotNil(t, lock)

internal/s3/client.go

@@ -1,3 +1,5 @@
+// Package s3 wraps the AWS S3 SDK with a simplified client for vaultik's
+// bucket-and-prefix scoped object operations.
 package s3
 
 import (
@@ -42,7 +44,7 @@ type Config struct {
 // Used to suppress SDK warnings about checksums.
 type nopLogger struct{}
 
-func (nopLogger) Logf(classification logging.Classification, format string, v ...any) {}
+func (nopLogger) Logf(_ logging.Classification, _ string, _ ...any) {}
 
 // NewClient creates a new S3 client with the provided configuration.
 // It establishes a connection to the S3-compatible storage service and
@@ -105,13 +107,18 @@ type ProgressCallback func(bytesUploaded int64) error
 // The size parameter must be the exact size of the data to upload.
 // The progress callback is called periodically with the number of bytes uploaded.
 // Returns an error if the upload fails.
-func (c *Client) PutObjectWithProgress(ctx context.Context, key string, data io.Reader, size int64, progress ProgressCallback) error {
+func (c *Client) PutObjectWithProgress(
+	ctx context.Context, key string, data io.Reader,
+	size int64, progress ProgressCallback,
+) error {
 	fullKey := c.prefix + key
 
+	// uploadPartSize is 10MB for better progress granularity.
+	const uploadPartSize = 10 * 1024 * 1024
+
 	// Create an uploader with the S3 client
 	uploader := manager.NewUploader(c.s3Client, func(u *manager.Uploader) {
-		// Set part size to 10MB for better progress granularity
+		u.PartSize = uploadPartSize
-		u.PartSize = 10 * 1024 * 1024
 	})
 
 	// Create a progress reader that tracks upload progress
@@ -241,7 +248,9 @@ type ObjectInfo struct {
 // listing is complete or an error occurs. If an error occurs, it will be
 // sent as the last item with the Err field set. The recursive parameter
 // is currently unused but reserved for future use.
-func (c *Client) ListObjectsStream(ctx context.Context, prefix string, recursive bool) <-chan ObjectInfo {
+func (c *Client) ListObjectsStream(
+	ctx context.Context, prefix string, _ bool,
+) <-chan ObjectInfo {
 	ch := make(chan ObjectInfo)
 
 	go func() {

internal/s3/client_test.go

@@ -9,6 +9,7 @@ import (
 	"sneak.berlin/go/vaultik/internal/s3"
 )
 
+//nolint:paralleltest // test servers share a fixed localhost port
 func TestClient(t *testing.T) {
 	ts := NewTestServer(t)
 	defer func() {
@@ -33,11 +34,21 @@ func TestClient(t *testing.T) {
 		t.Fatalf("failed to create client: %v", err)
 	}
 
-	// Test PutObject
 	testKey := "foo/bar.txt"
 	testData := []byte("test data")
 
-	err = client.PutObject(ctx, testKey, bytes.NewReader(testData))
+	verifyPutGetHead(ctx, t, client, testKey, testData)
+	verifyListAndDelete(ctx, t, client, testKey)
+}
+
+// verifyPutGetHead uploads an object, reads it back, and checks existence.
+func verifyPutGetHead(
+	ctx context.Context, t *testing.T, client *s3.Client,
+	testKey string, testData []byte,
+) {
+	t.Helper()
+
+	err := client.PutObject(ctx, testKey, bytes.NewReader(testData))
 	if err != nil {
 		t.Fatalf("failed to put object: %v", err)
 	}
@@ -72,8 +83,15 @@ func TestClient(t *testing.T) {
 	if !exists {
 		t.Error("expected object to exist")
 	}
+}
+
+// verifyListAndDelete lists the object's prefix, deletes it, and checks
+// it is gone.
+func verifyListAndDelete(
+	ctx context.Context, t *testing.T, client *s3.Client, testKey string,
+) {
+	t.Helper()
 
-	// Test ListObjects
 	keys, err := client.ListObjects(ctx, "foo/")
 	if err != nil {
 		t.Fatalf("failed to list objects: %v", err)
@@ -94,7 +112,7 @@ func TestClient(t *testing.T) {
 	}
 
 	// Verify deletion
-	exists, err = client.HeadObject(ctx, testKey)
+	exists, err := client.HeadObject(ctx, testKey)
 	if err != nil {
 		t.Fatalf("failed to head object after deletion: %v", err)
 	}

internal/s3/module.go

@@ -10,6 +10,8 @@ import (
 // Module exports S3 functionality as an fx module.
 // It provides automatic dependency injection for the S3 client,
 // configuring it based on the application's configuration settings.
+//
+//nolint:gochecknoglobals // fx module definitions are package globals
 var Module = fx.Module("s3",
 	fx.Provide(
 		provideClient,
@@ -32,7 +34,7 @@ func provideClient(lc fx.Lifecycle, cfg *config.Config) (*Client, error) {
 	}
 
 	lc.Append(fx.Hook{
-		OnStop: func(ctx context.Context) error {
+		OnStop: func(_ context.Context) error {
 			// S3 client doesn't need explicit cleanup
 			return nil
 		},

internal/s3/s3_test.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -38,13 +37,16 @@ type TestServer struct {
 	logBuf   *bytes.Buffer
 }
 
+// testServerReadHeaderTimeout bounds header reads on the in-process
+// test server (gosec G112).
+const testServerReadHeaderTimeout = 5 * time.Second
+
 // NewTestServer creates and starts a new test server
 func NewTestServer(t *testing.T) *TestServer {
+	t.Helper()
+
 	// Create temp directory for any file operations
-	tempDir, err := os.MkdirTemp("", "vaultik-s3-test-*")
+	tempDir := t.TempDir()
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
 
 	// Create in-memory backend
 	backend := s3mem.New()
@@ -52,8 +54,9 @@ func NewTestServer(t *testing.T) *TestServer {
 
 	// Create HTTP server
 	server := &http.Server{
-		Addr:    "localhost:9999",
+		Addr:              "localhost:9999",
-		Handler: faker.Server(),
+		Handler:           faker.Server(),
+		ReadHeaderTimeout: testServerReadHeaderTimeout,
 	}
 
 	// Start server in background
@@ -71,6 +74,14 @@ func NewTestServer(t *testing.T) *TestServer {
 	logBuf := &bytes.Buffer{}
 
 	// Create S3 client with custom logger
+	logFn := func(classification logging.Classification, format string, v ...any) {
+		// Capture logs to buffer instead of stdout
+		fmt.Fprintf(logBuf, "SDK %s %s %s\n",
+			time.Now().Format("2006/01/02 15:04:05"),
+			string(classification),
+			fmt.Sprintf(format, v...))
+	}
+
 	cfg, err := config.LoadDefaultConfig(context.Background(),
 		config.WithRegion(testRegion),
 		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
@@ -78,14 +89,9 @@ func NewTestServer(t *testing.T) *TestServer {
 			testSecretKey,
 			"",
 		)),
-		config.WithClientLogMode(aws.LogRetries|aws.LogRequestWithBody|aws.LogResponseWithBody),
+		config.WithClientLogMode(
-		config.WithLogger(logging.LoggerFunc(func(classification logging.Classification, format string, v ...any) {
+			aws.LogRetries|aws.LogRequestWithBody|aws.LogResponseWithBody),
-			// Capture logs to buffer instead of stdout
+		config.WithLogger(logging.LoggerFunc(logFn)),
-			fmt.Fprintf(logBuf, "SDK %s %s %s\n",
-				time.Now().Format("2006/01/02 15:04:05"),
-				string(classification),
-				fmt.Sprintf(format, v...))
-		})),
 	)
 	if err != nil {
 		t.Fatalf("failed to create AWS config: %v", err)
@@ -122,17 +128,13 @@ func NewTestServer(t *testing.T) *TestServer {
 	return ts
 }
 
-// Cleanup shuts down the server and removes temp directory
+// Cleanup shuts down the server. The temp directory is removed
+// automatically by t.TempDir.
 func (ts *TestServer) Cleanup() error {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	err := ts.server.Shutdown(ctx)
+	return ts.server.Shutdown(ctx)
-	if err != nil {
-		return err
-	}
-
-	return os.RemoveAll(ts.tempDir)
 }
 
 // Client returns the S3 client configured for the test server
@@ -141,6 +143,8 @@ func (ts *TestServer) Client() *s3.Client {
 }
 
 // TestBasicS3Operations tests basic store and retrieve operations
+//
+//nolint:paralleltest // test servers share a fixed localhost port
 func TestBasicS3Operations(t *testing.T) {
 	ts := NewTestServer(t)
 	defer func() {
@@ -194,6 +198,8 @@ func TestBasicS3Operations(t *testing.T) {
 }
 
 // TestBlobOperations tests blob storage patterns for vaultik
+//
+//nolint:paralleltest // test servers share a fixed localhost port
 func TestBlobOperations(t *testing.T) {
 	ts := NewTestServer(t)
 	defer func() {
@@ -258,6 +264,8 @@ func TestBlobOperations(t *testing.T) {
 }
 
 // TestMetadataOperations tests metadata storage patterns
+//
+//nolint:paralleltest // test servers share a fixed localhost port
 func TestMetadataOperations(t *testing.T) {
 	ts := NewTestServer(t)
 	defer func() {
@@ -287,7 +295,8 @@ func TestMetadataOperations(t *testing.T) {
 
 	// Store manifest
 	manifestKey := filepath.Join("metadata", snapshotID+".manifest.json.zst")
-	manifestData := []byte(`{"snapshot_id":"2024-01-01T12:00:00Z","blob_hashes":["hash1","hash2"]}`)
+	manifestData := []byte(`{"snapshot_id":"2024-01-01T12:00:00Z",` +
+		`"blob_hashes":["hash1","hash2"]}`)
 
 	_, err = client.PutObject(ctx, &s3.PutObjectInput{
 		Bucket: aws.String(testBucket),

internal/snapshot/backup_test.go

@@ -1,4 +1,4 @@
-package snapshot
+package snapshot_test
 
 import (
 	"context"
@@ -19,6 +19,12 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// errBlobNotFound is returned by the mock S3 client for unknown hashes.
+var errBlobNotFound = errors.New("blob not found")
+
+// testFile1Name is the shared fixture filename used across backup tests.
+const testFile1Name = "file1.txt"
+
 // MockS3Client is a mock implementation of S3 operations for testing
 type MockS3Client struct {
 	storage map[string][]byte
@@ -30,39 +36,149 @@ func NewMockS3Client() *MockS3Client {
 	}
 }
 
-func (m *MockS3Client) PutBlob(ctx context.Context, hash string, data []byte) error {
+func (m *MockS3Client) PutBlob(_ context.Context, hash string, data []byte) error {
 	m.storage[hash] = data
 
 	return nil
 }
 
-func (m *MockS3Client) GetBlob(ctx context.Context, hash string) ([]byte, error) {
+func (m *MockS3Client) GetBlob(_ context.Context, hash string) ([]byte, error) {
 	data, ok := m.storage[hash]
 	if !ok {
-		return nil, fmt.Errorf("blob not found: %s", hash)
+		return nil, fmt.Errorf("%w: %s", errBlobNotFound, hash)
 	}
 
 	return data, nil
 }
 
-func (m *MockS3Client) BlobExists(ctx context.Context, hash string) (bool, error) {
+func (m *MockS3Client) BlobExists(_ context.Context, hash string) (bool, error) {
 	_, ok := m.storage[hash]
 
 	return ok, nil
 }
 
-func (m *MockS3Client) CreateBucket(ctx context.Context, bucket string) error {
+func (m *MockS3Client) CreateBucket(_ context.Context, _ string) error {
 	return nil
 }
 
+// verifyBackupFiles checks the file records created by a backup against
+// the fixture filesystem.
+func verifyBackupFiles(
+	ctx context.Context,
+	t *testing.T,
+	repos *database.Repositories,
+	testFS fstest.MapFS,
+) {
+	t.Helper()
+
+	files, err := repos.Files.ListByPrefix(ctx, "")
+	if err != nil {
+		t.Fatalf("Failed to list files: %v", err)
+	}
+
+	expectedFiles := map[string]bool{
+		testFile1Name:           true,
+		"dir1/file2.txt":        true,
+		"dir1/subdir/file3.txt": true,
+		"largefile.bin":         true,
+	}
+
+	if len(files) != len(expectedFiles) {
+		t.Errorf("Expected %d files, got %d", len(expectedFiles), len(files))
+	}
+
+	for _, file := range files {
+		if !expectedFiles[file.Path.String()] {
+			t.Errorf("Unexpected file in database: %s", file.Path)
+		}
+
+		delete(expectedFiles, file.Path.String())
+
+		// Verify file metadata
+		fsFile := testFS[file.Path.String()]
+		if fsFile == nil {
+			t.Errorf("File %s not found in test filesystem", file.Path)
+
+			continue
+		}
+
+		if file.Size != int64(len(fsFile.Data)) {
+			t.Errorf("File %s: expected size %d, got %d",
+				file.Path, len(fsFile.Data), file.Size)
+		}
+
+		if file.Mode != uint32(fsFile.Mode) {
+			t.Errorf("File %s: expected mode %o, got %o",
+				file.Path, fsFile.Mode, file.Mode)
+		}
+	}
+
+	if len(expectedFiles) > 0 {
+		t.Errorf("Files not found in database: %v", expectedFiles)
+	}
+}
+
+// verifyBackupChunksAndBlobs checks that chunking produced the expected
+// records and every referenced blob exists in the mock S3 store.
+func verifyBackupChunksAndBlobs(
+	ctx context.Context,
+	t *testing.T,
+	repos *database.Repositories,
+	s3Client *MockS3Client,
+	snapshotID string,
+) {
+	t.Helper()
+
+	chunks, err := repos.Chunks.List(ctx)
+	if err != nil {
+		t.Fatalf("Failed to list chunks: %v", err)
+	}
+
+	if len(chunks) == 0 {
+		t.Error("No chunks found in database")
+	}
+
+	// The large file should create 10 chunks (10MB / 1MB chunk size)
+	// Plus the small files
+	minExpectedChunks := 10 + 3
+	if len(chunks) < minExpectedChunks {
+		t.Errorf("Expected at least %d chunks, got %d", minExpectedChunks, len(chunks))
+	}
+
+	// Verify at least one blob was created and uploaded
+	// We can't list blobs directly, but we can check via snapshot blobs
+	blobHashes, err := repos.Snapshots.GetBlobHashes(ctx, snapshotID)
+	if err != nil {
+		t.Fatalf("Failed to get blob hashes: %v", err)
+	}
+
+	if len(blobHashes) == 0 {
+		t.Error("Expected at least one blob to be created")
+	}
+
+	for _, blobHash := range blobHashes {
+		// Check blob exists in mock S3
+		exists, err := s3Client.BlobExists(ctx, blobHash)
+		if err != nil {
+			t.Errorf("Failed to check blob %s: %v", blobHash, err)
+		}
+
+		if !exists {
+			t.Errorf("Blob %s not found in S3", blobHash)
+		}
+	}
+}
+
 func TestBackupWithInMemoryFS(t *testing.T) {
+	t.Parallel()
+
 	// Create a temporary directory for the database
 	tempDir := t.TempDir()
 	dbPath := filepath.Join(tempDir, "test.db")
 
 	// Create test filesystem
 	testFS := fstest.MapFS{
-		"file1.txt": &fstest.MapFile{
+		testFile1Name: &fstest.MapFile{
 			Data:    []byte("Hello, World!"),
 			Mode:    0644,
 			ModTime: time.Now(),
@@ -129,100 +245,21 @@ func TestBackupWithInMemoryFS(t *testing.T) {
 		t.Error("Expected snapshot to have files")
 	}
 
-	// Verify files in database
+	// Verify files, chunks, and blob records
-	files, err := repos.Files.ListByPrefix(ctx, "")
+	verifyBackupFiles(ctx, t, repos, testFS)
-	if err != nil {
+	verifyBackupChunksAndBlobs(ctx, t, repos, s3Client, snapshotID)
-		t.Fatalf("Failed to list files: %v", err)
-	}
-
-	expectedFiles := map[string]bool{
-		"file1.txt":             true,
-		"dir1/file2.txt":        true,
-		"dir1/subdir/file3.txt": true,
-		"largefile.bin":         true,
-	}
-
-	if len(files) != len(expectedFiles) {
-		t.Errorf("Expected %d files, got %d", len(expectedFiles), len(files))
-	}
-
-	for _, file := range files {
-		if !expectedFiles[file.Path.String()] {
-			t.Errorf("Unexpected file in database: %s", file.Path)
-		}
-
-		delete(expectedFiles, file.Path.String())
-
-		// Verify file metadata
-		fsFile := testFS[file.Path.String()]
-		if fsFile == nil {
-			t.Errorf("File %s not found in test filesystem", file.Path)
-
-			continue
-		}
-
-		if file.Size != int64(len(fsFile.Data)) {
-			t.Errorf("File %s: expected size %d, got %d", file.Path, len(fsFile.Data), file.Size)
-		}
-
-		if file.Mode != uint32(fsFile.Mode) {
-			t.Errorf("File %s: expected mode %o, got %o", file.Path, fsFile.Mode, file.Mode)
-		}
-	}
-
-	if len(expectedFiles) > 0 {
-		t.Errorf("Files not found in database: %v", expectedFiles)
-	}
-
-	// Verify chunks
-	chunks, err := repos.Chunks.List(ctx)
-	if err != nil {
-		t.Fatalf("Failed to list chunks: %v", err)
-	}
-
-	if len(chunks) == 0 {
-		t.Error("No chunks found in database")
-	}
-
-	// The large file should create 10 chunks (10MB / 1MB chunk size)
-	// Plus the small files
-	minExpectedChunks := 10 + 3
-	if len(chunks) < minExpectedChunks {
-		t.Errorf("Expected at least %d chunks, got %d", minExpectedChunks, len(chunks))
-	}
-
-	// Verify at least one blob was created and uploaded
-	// We can't list blobs directly, but we can check via snapshot blobs
-	blobHashes, err := repos.Snapshots.GetBlobHashes(ctx, snapshotID)
-	if err != nil {
-		t.Fatalf("Failed to get blob hashes: %v", err)
-	}
-
-	if len(blobHashes) == 0 {
-		t.Error("Expected at least one blob to be created")
-	}
-
-	for _, blobHash := range blobHashes {
-		// Check blob exists in mock S3
-		exists, err := s3Client.BlobExists(ctx, blobHash)
-		if err != nil {
-			t.Errorf("Failed to check blob %s: %v", blobHash, err)
-		}
-
-		if !exists {
-			t.Errorf("Blob %s not found in S3", blobHash)
-		}
-	}
 }
 
 func TestBackupDeduplication(t *testing.T) {
+	t.Parallel()
+
 	// Create a temporary directory for the database
 	tempDir := t.TempDir()
 	dbPath := filepath.Join(tempDir, "test.db")
 
 	// Create test filesystem with duplicate content
 	testFS := fstest.MapFS{
-		"file1.txt": &fstest.MapFile{
+		testFile1Name: &fstest.MapFile{
 			Data:    []byte("Duplicate content"),
 			Mode:    0644,
 			ModTime: time.Now(),
@@ -290,7 +327,8 @@ func TestBackupDeduplication(t *testing.T) {
 
 		// The duplicate content chunk should be referenced by 2 files
 		if chunk.Size == int64(len("Duplicate content")) && len(files) != 2 {
-			t.Errorf("Expected duplicate chunk to be referenced by 2 files, got %d", len(files))
+			t.Errorf("Expected duplicate chunk to be referenced by 2 files, got %d",
+				len(files))
 		}
 	}
 }
@@ -304,8 +342,19 @@ type BackupEngine struct {
 	}
 }
 
+// backupCounters accumulates statistics across a test backup run.
+type backupCounters struct {
+	fileCount  int64
+	chunkCount int64
+	blobCount  int64
+	totalSize  int64
+	blobSize   int64
+}
+
 // Backup performs a backup of the given filesystem
-func (b *BackupEngine) Backup(ctx context.Context, fsys fs.FS, root string) (string, error) {
+func (b *BackupEngine) Backup(
+	ctx context.Context, fsys fs.FS, root string,
+) (string, error) {
 	// Create a new snapshot
 	hostname, _ := os.Hostname()
 	snapshotID := time.Now().Format(time.RFC3339)
@@ -325,8 +374,7 @@ func (b *BackupEngine) Backup(ctx context.Context, fsys fs.FS, root string) (str
 		return "", err
 	}
 
-	// Track counters
+	counters := &backupCounters{}
-	var fileCount, chunkCount, blobCount, totalSize, blobSize int64
 
 	// Track which chunks we've seen to handle deduplication
 	processedChunks := make(map[string]bool)
@@ -354,122 +402,170 @@ func (b *BackupEngine) Backup(ctx context.Context, fsys fs.FS, root string) (str
 			return nil
 		}
 
-		// Create file record in a short transaction
+		return b.backupOneFile(ctx, fsys, path, info, processedChunks, counters)
-		file := &database.File{
-			Path:  types.FilePath(path),
-			Size:  info.Size(),
-			Mode:  uint32(info.Mode()),
-			MTime: info.ModTime(),
-			UID:   1000, // Default UID for test
-			GID:   1000, // Default GID for test
-		}
-
-		err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
-			return b.repos.Files.Create(ctx, tx, file)
-		})
-		if err != nil {
-			return err
-		}
-
-		fileCount++
-		totalSize += info.Size()
-
-		// Read and process file in chunks
-		f, err := fsys.Open(path)
-		if err != nil {
-			return err
-		}
-		defer func() {
-			err := f.Close()
-			if err != nil {
-				// Log but don't fail since we're already in an error path potentially
-				fmt.Fprintf(os.Stderr, "Failed to close file: %v\n", err)
-			}
-		}()
-
-		// Process file in chunks
-		chunkIndex := 0
-		buffer := make([]byte, defaultChunkSize)
-
-		for {
-			n, err := f.Read(buffer)
-			if err != nil && !errors.Is(err, io.EOF) {
-				return err
-			}
-
-			if n == 0 {
-				break
-			}
-
-			chunkData := buffer[:n]
-			chunkHash := calculateHash(chunkData)
-
-			// Check if chunk already exists (outside of transaction)
-			existingChunk, _ := b.repos.Chunks.GetByHash(ctx, chunkHash)
-			if existingChunk == nil {
-				// Create new chunk in a short transaction
-				err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
-					chunk := &database.Chunk{
-						ChunkHash: types.ChunkHash(chunkHash),
-						Size:      int64(n),
-					}
-
-					return b.repos.Chunks.Create(ctx, tx, chunk)
-				})
-				if err != nil {
-					return err
-				}
-
-				processedChunks[chunkHash] = true
-			}
-
-			// Create file-chunk mapping in a short transaction
-			err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
-				fileChunk := &database.FileChunk{
-					FileID:    file.ID,
-					Idx:       chunkIndex,
-					ChunkHash: types.ChunkHash(chunkHash),
-				}
-
-				return b.repos.FileChunks.Create(ctx, tx, fileChunk)
-			})
-			if err != nil {
-				return err
-			}
-
-			// Create chunk-file mapping in a short transaction
-			err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
-				chunkFile := &database.ChunkFile{
-					ChunkHash:  types.ChunkHash(chunkHash),
-					FileID:     file.ID,
-					FileOffset: int64(chunkIndex * defaultChunkSize),
-					Length:     int64(n),
-				}
-
-				return b.repos.ChunkFiles.Create(ctx, tx, chunkFile)
-			})
-			if err != nil {
-				return err
-			}
-
-			chunkIndex++
-		}
-
-		return nil
 	})
 	if err != nil {
 		return "", err
 	}
 
 	// After all files are processed, create blobs for new chunks
+	err = b.createBlobsForChunks(ctx, snapshotID, processedChunks, counters)
+	if err != nil {
+		return "", err
+	}
+
+	// Update snapshot with final counts
+	err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+		return b.repos.Snapshots.UpdateCounts(ctx, tx, snapshotID,
+			counters.fileCount, counters.chunkCount, counters.blobCount,
+			counters.totalSize, counters.blobSize)
+	})
+	if err != nil {
+		return "", err
+	}
+
+	return snapshotID, nil
+}
+
+// backupOneFile records a single regular file and its chunks.
+func (b *BackupEngine) backupOneFile(
+	ctx context.Context,
+	fsys fs.FS,
+	path string,
+	info fs.FileInfo,
+	processedChunks map[string]bool,
+	counters *backupCounters,
+) error {
+	// Create file record in a short transaction
+	file := &database.File{
+		Path:  types.FilePath(path),
+		Size:  info.Size(),
+		Mode:  uint32(info.Mode()),
+		MTime: info.ModTime(),
+		UID:   1000, // Default UID for test
+		GID:   1000, // Default GID for test
+	}
+
+	err := b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+		return b.repos.Files.Create(ctx, tx, file)
+	})
+	if err != nil {
+		return err
+	}
+
+	counters.fileCount++
+	counters.totalSize += info.Size()
+
+	// Read and process file in chunks
+	f, err := fsys.Open(path)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		err := f.Close()
+		if err != nil {
+			// Log but don't fail since we're already in an error path potentially
+			fmt.Fprintf(os.Stderr, "Failed to close file: %v\n", err)
+		}
+	}()
+
+	// Process file in chunks
+	chunkIndex := 0
+	buffer := make([]byte, defaultChunkSize)
+
+	for {
+		n, err := f.Read(buffer)
+		if err != nil && !errors.Is(err, io.EOF) {
+			return err
+		}
+
+		if n == 0 {
+			break
+		}
+
+		err = b.recordChunk(ctx, file, chunkIndex, buffer[:n], processedChunks)
+		if err != nil {
+			return err
+		}
+
+		chunkIndex++
+	}
+
+	return nil
+}
+
+// recordChunk creates the chunk record (if new) and its file associations.
+func (b *BackupEngine) recordChunk(
+	ctx context.Context,
+	file *database.File,
+	chunkIndex int,
+	chunkData []byte,
+	processedChunks map[string]bool,
+) error {
+	chunkHash := calculateHash(chunkData)
+
+	// Check if chunk already exists (outside of transaction)
+	existingChunk, _ := b.repos.Chunks.GetByHash(ctx, chunkHash)
+	if existingChunk == nil {
+		// Create new chunk in a short transaction
+		err := b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+			chunk := &database.Chunk{
+				ChunkHash: types.ChunkHash(chunkHash),
+				Size:      int64(len(chunkData)),
+			}
+
+			return b.repos.Chunks.Create(ctx, tx, chunk)
+		})
+		if err != nil {
+			return err
+		}
+
+		processedChunks[chunkHash] = true
+	}
+
+	// Create file-chunk mapping in a short transaction
+	err := b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+		fileChunk := &database.FileChunk{
+			FileID:    file.ID,
+			Idx:       chunkIndex,
+			ChunkHash: types.ChunkHash(chunkHash),
+		}
+
+		return b.repos.FileChunks.Create(ctx, tx, fileChunk)
+	})
+	if err != nil {
+		return err
+	}
+
+	// Create chunk-file mapping in a short transaction
+	return b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+		chunkFile := &database.ChunkFile{
+			ChunkHash:  types.ChunkHash(chunkHash),
+			FileID:     file.ID,
+			FileOffset: int64(chunkIndex * defaultChunkSize),
+			Length:     int64(len(chunkData)),
+		}
+
+		return b.repos.ChunkFiles.Create(ctx, tx, chunkFile)
+	})
+}
+
+// createBlobsForChunks uploads one blob per new chunk and records the blob
+// metadata and snapshot association.
+func (b *BackupEngine) createBlobsForChunks(
+	ctx context.Context,
+	snapshotID string,
+	processedChunks map[string]bool,
+	counters *backupCounters,
+) error {
 	for chunkHash := range processedChunks {
 		// Get chunk data (outside of transaction)
 		chunk, err := b.repos.Chunks.GetByHash(ctx, chunkHash)
 		if err != nil {
-			return "", err
+			return err
 		}
 
-		chunkCount++
+		counters.chunkCount++
 
 		// In a real system, blobs would contain multiple chunks and be encrypted
 		// For testing, we'll create a blob with a "blob-" prefix to differentiate
@@ -481,7 +577,7 @@ func (b *BackupEngine) Backup(ctx context.Context, fsys fs.FS, root string) (str
 		// Upload to S3 as a blob
 		err = b.s3Client.PutBlob(ctx, blobHash, dummyData)
 		if err != nil {
-			return "", err
+			return err
 		}
 
 		// Create blob entry in a short transaction
@@ -497,11 +593,11 @@ func (b *BackupEngine) Backup(ctx context.Context, fsys fs.FS, root string) (str
 			return b.repos.Blobs.Create(ctx, tx, blob)
 		})
 		if err != nil {
-			return "", err
+			return err
 		}
 
-		blobCount++
+		counters.blobCount++
-		blobSize += chunk.Size
+		counters.blobSize += chunk.Size
 
 		// Create blob-chunk mapping in a short transaction
 		err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
@@ -515,27 +611,20 @@ func (b *BackupEngine) Backup(ctx context.Context, fsys fs.FS, root string) (str
 			return b.repos.BlobChunks.Create(ctx, tx, blobChunk)
 		})
 		if err != nil {
-			return "", err
+			return err
 		}
 
 		// Add blob to snapshot in a short transaction
 		err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
-			return b.repos.Snapshots.AddBlob(ctx, tx, snapshotID, blobID, types.BlobHash(blobHash))
+			return b.repos.Snapshots.AddBlob(ctx, tx, snapshotID, blobID,
+				types.BlobHash(blobHash))
 		})
 		if err != nil {
-			return "", err
+			return err
 		}
 	}
 
-	// Update snapshot with final counts
+	return nil
-	err = b.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
-		return b.repos.Snapshots.UpdateCounts(ctx, tx, snapshotID, fileCount, chunkCount, blobCount, totalSize, blobSize)
-	})
-	if err != nil {
-		return "", err
-	}
-
-	return snapshotID, nil
 }
 
 func calculateHash(data []byte) string {

internal/snapshot/exclude_test.go

@@ -10,16 +10,15 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
 	"sneak.berlin/go/vaultik/internal/database"
-	"sneak.berlin/go/vaultik/internal/log"
 	"sneak.berlin/go/vaultik/internal/snapshot"
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
-func setupExcludeTestFS(t *testing.T) afero.Fs {
+func setupExcludeTestFS(t *testing.T) *afero.MemMapFs {
 	t.Helper()
 
 	// Create in-memory filesystem
-	fs := afero.NewMemMapFs()
+	fs := &afero.MemMapFs{}
 
 	// Create test directory structure:
 	// /backup/
@@ -77,12 +76,11 @@ func setupExcludeTestFS(t *testing.T) afero.Fs {
 	return fs
 }
 
-func createTestScanner(t *testing.T, fs afero.Fs, excludePatterns []string) (*snapshot.Scanner, *database.Repositories, func()) {
+func createTestScanner(
+	t *testing.T, fs afero.Fs, excludePatterns []string,
+) (*snapshot.Scanner, *database.Repositories, func()) {
 	t.Helper()
 
-	// Initialize logger
-	log.Initialize(log.Config{})
-
 	// Create test database
 	db, err := database.NewTestDB()
 	require.NoError(t, err)
@@ -95,8 +93,9 @@ func createTestScanner(t *testing.T, fs afero.Fs, excludePatterns []string) (*sn
 		Repositories:     repos,
 		MaxBlobSize:      1024 * 1024,
 		CompressionLevel: 3,
-		AgeRecipients:    []string{"age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p"},
+		AgeRecipients: []string{
-		Exclude:          excludePatterns,
+			"age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p"},
+		Exclude: excludePatterns,
 	})
 
 	cleanup := func() {
@@ -106,14 +105,16 @@ func createTestScanner(t *testing.T, fs afero.Fs, excludePatterns []string) (*sn
 	return scanner, repos, cleanup
 }
 
-func createSnapshotRecord(t *testing.T, ctx context.Context, repos *database.Repositories, snapshotID string) {
+func createSnapshotRecord(
+	ctx context.Context, t *testing.T, repos *database.Repositories, snapshotID string,
+) {
 	t.Helper()
 
 	err := repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
 		snap := &database.Snapshot{
 			ID:               types.SnapshotID(snapshotID),
-			Hostname:         "test-host",
+			Hostname:         testHost,
-			VaultikVersion:   "test",
+			VaultikVersion:   testVersion,
 			StartedAt:        time.Now(),
 			CompletedAt:      nil,
 			FileCount:        0,
@@ -130,6 +131,8 @@ func createSnapshotRecord(t *testing.T, ctx context.Context, repos *database.Rep
 }
 
 func TestExcludePatterns_ExcludeGitDirectory(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{".git"})
@@ -138,13 +141,14 @@ func TestExcludePatterns_ExcludeGitDirectory(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
 
 	// Should have scanned files but NOT .git directory contents
-	// Expected: file1.txt, file2.log, src/main.go, src/test.go, node_modules/package/index.js,
+	// Expected: file1.txt, file2.log, src/main.go, src/test.go,
+	//           node_modules/package/index.js,
 	//           cache/temp.dat, build/output.bin, docs/readme.md, .DS_Store, thumbs.db,
 	//           src/.hidden, important.log.bak
 	// Excluded: .git/config, .git/objects/pack/data.pack
@@ -152,6 +156,8 @@ func TestExcludePatterns_ExcludeGitDirectory(t *testing.T) {
 }
 
 func TestExcludePatterns_ExcludeByExtension(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{"*.log"})
@@ -160,7 +166,7 @@ func TestExcludePatterns_ExcludeByExtension(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -171,6 +177,8 @@ func TestExcludePatterns_ExcludeByExtension(t *testing.T) {
 }
 
 func TestExcludePatterns_ExcludeNodeModules(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{"node_modules"})
@@ -179,7 +187,7 @@ func TestExcludePatterns_ExcludeNodeModules(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -190,25 +198,32 @@ func TestExcludePatterns_ExcludeNodeModules(t *testing.T) {
 }
 
 func TestExcludePatterns_MultiplePatterns(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
-	scanner, repos, cleanup := createTestScanner(t, fs, []string{".git", "node_modules", "*.log", ".DS_Store", "thumbs.db", "cache", "build"})
+	scanner, repos, cleanup := createTestScanner(t, fs, []string{
+		".git", "node_modules", "*.log", ".DS_Store", "thumbs.db", "cache", "build"})
 	defer cleanup()
 
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
 
-	// Should only have: file1.txt, src/main.go, src/test.go, docs/readme.md, src/.hidden, important.log.bak
+	// Should only have: file1.txt, src/main.go, src/test.go, docs/readme.md,
-	// Excluded: .git/*, node_modules/*, *.log (file2.log), .DS_Store, thumbs.db, cache/*, build/*
+	// src/.hidden, important.log.bak
+	// Excluded: .git/*, node_modules/*, *.log (file2.log), .DS_Store,
+	// thumbs.db, cache/*, build/*
 	require.Equal(t, 6, result.FilesScanned, "Should exclude multiple patterns")
 }
 
 func TestExcludePatterns_NoExclusions(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{})
@@ -217,7 +232,7 @@ func TestExcludePatterns_NoExclusions(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -227,6 +242,8 @@ func TestExcludePatterns_NoExclusions(t *testing.T) {
 }
 
 func TestExcludePatterns_ExcludeHiddenFiles(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{".*"})
@@ -235,17 +252,21 @@ func TestExcludePatterns_ExcludeHiddenFiles(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
 
 	// Should exclude: .git/*, .DS_Store, src/.hidden
-	// Total files: 14, excluded: 4 (.git/config, .git/objects/pack/data.pack, .DS_Store, src/.hidden)
+	// Total files: 14, excluded: 4 (.git/config,
-	require.Equal(t, 10, result.FilesScanned, "Should exclude hidden files and directories")
+	// .git/objects/pack/data.pack, .DS_Store, src/.hidden)
+	require.Equal(t, 10, result.FilesScanned,
+		"Should exclude hidden files and directories")
 }
 
 func TestExcludePatterns_DoubleStarGlob(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{"**/*.pack"})
@@ -254,7 +275,7 @@ func TestExcludePatterns_DoubleStarGlob(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -265,6 +286,8 @@ func TestExcludePatterns_DoubleStarGlob(t *testing.T) {
 }
 
 func TestExcludePatterns_ExactFileName(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{"thumbs.db", ".DS_Store"})
@@ -273,7 +296,7 @@ func TestExcludePatterns_ExactFileName(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -284,6 +307,8 @@ func TestExcludePatterns_ExactFileName(t *testing.T) {
 }
 
 func TestExcludePatterns_CaseSensitive(t *testing.T) {
+	t.Parallel()
+
 	// Pattern matching should be case-sensitive
 	fs := setupExcludeTestFS(t)
 
@@ -293,7 +318,7 @@ func TestExcludePatterns_CaseSensitive(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -304,6 +329,8 @@ func TestExcludePatterns_CaseSensitive(t *testing.T) {
 }
 
 func TestExcludePatterns_DirectoryWithTrailingSlash(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 	// Some users might add trailing slashes to directory patterns
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{"cache/", "build/"})
@@ -312,17 +339,20 @@ func TestExcludePatterns_DirectoryWithTrailingSlash(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
 
 	// Should exclude cache/temp.dat and build/output.bin
 	// Total files: 14, excluded: 2
-	require.Equal(t, 12, result.FilesScanned, "Should handle directory patterns with trailing slashes")
+	require.Equal(t, 12, result.FilesScanned,
+		"Should handle directory patterns with trailing slashes")
 }
 
 func TestExcludePatterns_PatternInSubdirectory(t *testing.T) {
+	t.Parallel()
+
 	fs := setupExcludeTestFS(t)
 	// Exclude .hidden file specifically in src directory
 	scanner, repos, cleanup := createTestScanner(t, fs, []string{"src/.hidden"})
@@ -331,7 +361,7 @@ func TestExcludePatterns_PatternInSubdirectory(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -350,13 +380,14 @@ func TestExcludePatterns_PatternInSubdirectory(t *testing.T) {
 //	    file.txt         (should be excluded with /projectname)
 //	  otherproject/
 //	    projectname/
-//	      file.txt       (should NOT be excluded with /projectname, only with projectname)
+//	      file.txt       (should NOT be excluded with /projectname,
+//	                      only with projectname)
 //	  src/
 //	    file.go
-func setupAnchoredTestFS(t *testing.T) afero.Fs {
+func setupAnchoredTestFS(t *testing.T) *afero.MemMapFs {
 	t.Helper()
 
-	fs := afero.NewMemMapFs()
+	fs := &afero.MemMapFs{}
 
 	files := map[string]string{
 		"/backup/projectname/file.txt":              "root project file",
@@ -381,6 +412,8 @@ func setupAnchoredTestFS(t *testing.T) afero.Fs {
 }
 
 func TestExcludePatterns_AnchoredPattern(t *testing.T) {
+	t.Parallel()
+
 	// Pattern starting with / should only match from root of source dir
 	fs := setupAnchoredTestFS(t)
 
@@ -390,7 +423,7 @@ func TestExcludePatterns_AnchoredPattern(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -398,10 +431,13 @@ func TestExcludePatterns_AnchoredPattern(t *testing.T) {
 	// /projectname should ONLY exclude /backup/projectname/file.txt (1 file)
 	// /backup/otherproject/projectname/file.txt should NOT be excluded
 	// Total files: 4, excluded: 1
-	require.Equal(t, 3, result.FilesScanned, "Anchored pattern /projectname should only match at root of source dir")
+	require.Equal(t, 3, result.FilesScanned,
+		"Anchored pattern /projectname should only match at root of source dir")
 }
 
 func TestExcludePatterns_UnanchoredPattern(t *testing.T) {
+	t.Parallel()
+
 	// Pattern without leading / should match anywhere in path
 	fs := setupAnchoredTestFS(t)
 
@@ -411,7 +447,7 @@ func TestExcludePatterns_UnanchoredPattern(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -420,10 +456,13 @@ func TestExcludePatterns_UnanchoredPattern(t *testing.T) {
 	// - /backup/projectname/file.txt
 	// - /backup/otherproject/projectname/file.txt
 	// Total files: 4, excluded: 2
-	require.Equal(t, 2, result.FilesScanned, "Unanchored pattern should match anywhere in path")
+	require.Equal(t, 2, result.FilesScanned,
+		"Unanchored pattern should match anywhere in path")
 }
 
 func TestExcludePatterns_AnchoredPatternWithGlob(t *testing.T) {
+	t.Parallel()
+
 	// Anchored pattern with glob
 	fs := setupAnchoredTestFS(t)
 
@@ -433,7 +472,7 @@ func TestExcludePatterns_AnchoredPatternWithGlob(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -444,6 +483,8 @@ func TestExcludePatterns_AnchoredPatternWithGlob(t *testing.T) {
 }
 
 func TestExcludePatterns_AnchoredPatternFile(t *testing.T) {
+	t.Parallel()
+
 	// Anchored pattern for exact file at root
 	fs := setupAnchoredTestFS(t)
 
@@ -453,7 +494,7 @@ func TestExcludePatterns_AnchoredPatternFile(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -461,10 +502,13 @@ func TestExcludePatterns_AnchoredPatternFile(t *testing.T) {
 	// /file.txt should ONLY exclude /backup/file.txt
 	// NOT /backup/projectname/file.txt or /backup/otherproject/projectname/file.txt
 	// Total files: 4, excluded: 1
-	require.Equal(t, 3, result.FilesScanned, "Anchored pattern for file should only match at root")
+	require.Equal(t, 3, result.FilesScanned,
+		"Anchored pattern for file should only match at root")
 }
 
 func TestExcludePatterns_UnanchoredPatternFile(t *testing.T) {
+	t.Parallel()
+
 	// Unanchored pattern for file should match anywhere
 	fs := setupAnchoredTestFS(t)
 
@@ -474,7 +518,7 @@ func TestExcludePatterns_UnanchoredPatternFile(t *testing.T) {
 	require.NotNil(t, scanner)
 
 	ctx := context.Background()
-	createSnapshotRecord(t, ctx, repos, "test-snapshot")
+	createSnapshotRecord(ctx, t, repos, "test-snapshot")
 
 	result, err := scanner.Scan(ctx, "/backup", "test-snapshot")
 	require.NoError(t, err)
@@ -484,5 +528,6 @@ func TestExcludePatterns_UnanchoredPatternFile(t *testing.T) {
 	// - /backup/projectname/file.txt
 	// - /backup/otherproject/projectname/file.txt
 	// Total files: 4, excluded: 3
-	require.Equal(t, 1, result.FilesScanned, "Unanchored pattern for file should match anywhere")
+	require.Equal(t, 1, result.FilesScanned,
+		"Unanchored pattern for file should match anywhere")
 }

internal/snapshot/file_change_test.go

@@ -2,7 +2,6 @@ package snapshot_test
 
 import (
 	"context"
-	"database/sql"
 	"testing"
 	"time"
 
@@ -15,11 +14,55 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// verifyChunkChange checks that after a content change the file references
+// the new chunk, the old chunk still exists, and the old chunk no longer
+// maps to the modified file.
+func verifyChunkChange(
+	ctx context.Context,
+	t *testing.T,
+	repos *database.Repositories,
+	oldChunkHash, newChunkHash types.ChunkHash,
+) {
+	t.Helper()
+
+	// Verify the chunk hashes are different
+	assert.NotEqual(t, oldChunkHash, newChunkHash,
+		"Chunk hash should change when content changes")
+
+	// Get chunk files from second scan
+	chunkFiles2, err := repos.ChunkFiles.GetByFilePath(ctx, "/test.txt")
+	require.NoError(t, err)
+	assert.Len(t, chunkFiles2, 1)
+	assert.Equal(t, newChunkHash, chunkFiles2[0].ChunkHash)
+
+	// Verify old chunk still exists (it's still valid data)
+	oldChunk, err := repos.Chunks.GetByHash(ctx, oldChunkHash.String())
+	require.NoError(t, err)
+	assert.NotNil(t, oldChunk)
+
+	// Verify new chunk exists
+	newChunk, err := repos.Chunks.GetByHash(ctx, newChunkHash.String())
+	require.NoError(t, err)
+	assert.NotNil(t, newChunk)
+
+	// Verify that chunk_files for old chunk no longer references this file
+	oldChunkFiles, err := repos.ChunkFiles.GetByChunkHash(ctx, oldChunkHash)
+	require.NoError(t, err)
+
+	for _, cf := range oldChunkFiles {
+		file, err := repos.Files.GetByID(ctx, cf.FileID)
+		require.NoError(t, err)
+		assert.NotEqual(t, "/data/test.txt", file.Path,
+			"Old chunk should not be associated with the modified file")
+	}
+}
+
 // TestFileContentChange verifies that when a file's content changes,
 // the old chunks are properly disassociated
 func TestFileContentChange(t *testing.T) {
 	// Initialize logger for tests
 	log.Initialize(log.Config{})
+	t.Parallel()
 
 	// Create in-memory filesystem
 	fs := afero.NewMemMapFs()
@@ -48,23 +91,13 @@ func TestFileContentChange(t *testing.T) {
 		Repositories:     repos,
 		MaxBlobSize:      int64(1024 * 1024), // 1MB blobs
 		CompressionLevel: 3,
-		AgeRecipients:    []string{"age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"}, // Test public key
+		AgeRecipients:    []string{testAgePublicKey},
 	})
 
 	// Create first snapshot
 	ctx := context.Background()
 	snapshotID1 := "snapshot1"
-	err = repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+	createSnapshotRecord(ctx, t, repos, snapshotID1)
-		snapshot := &database.Snapshot{
-			ID:             types.SnapshotID(snapshotID1),
-			Hostname:       "test-host",
-			VaultikVersion: "test",
-			StartedAt:      time.Now(),
-		}
-
-		return repos.Snapshots.Create(ctx, tx, snapshot)
-	})
-	require.NoError(t, err)
 
 	// First scan - should create chunks for initial content
 	result1, err := scanner.Scan(ctx, "/", snapshotID1)
@@ -85,22 +118,13 @@ func TestFileContentChange(t *testing.T) {
 	// Modify the file
 	time.Sleep(10 * time.Millisecond) // Ensure mtime changes
 
-	err = afero.WriteFile(fs, "/test.txt", []byte("Modified content with different data"), 0644)
+	err = afero.WriteFile(fs, "/test.txt",
+		[]byte("Modified content with different data"), 0644)
 	require.NoError(t, err)
 
 	// Create second snapshot
 	snapshotID2 := "snapshot2"
-	err = repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+	createSnapshotRecord(ctx, t, repos, snapshotID2)
-		snapshot := &database.Snapshot{
-			ID:             types.SnapshotID(snapshotID2),
-			Hostname:       "test-host",
-			VaultikVersion: "test",
-			StartedAt:      time.Now(),
-		}
-
-		return repos.Snapshots.Create(ctx, tx, snapshot)
-	})
-	require.NoError(t, err)
 
 	// Second scan - should create new chunks and remove old associations
 	result2, err := scanner.Scan(ctx, "/", snapshotID2)
@@ -113,40 +137,14 @@ func TestFileContentChange(t *testing.T) {
 	assert.Len(t, fileChunks2, 1) // Still 1 chunk but different hash
 	newChunkHash := fileChunks2[0].ChunkHash
 
-	// Verify the chunk hashes are different
+	verifyChunkChange(ctx, t, repos, oldChunkHash, newChunkHash)
-	assert.NotEqual(t, oldChunkHash, newChunkHash, "Chunk hash should change when content changes")
-
-	// Get chunk files from second scan
-	chunkFiles2, err := repos.ChunkFiles.GetByFilePath(ctx, "/test.txt")
-	require.NoError(t, err)
-	assert.Len(t, chunkFiles2, 1)
-	assert.Equal(t, newChunkHash, chunkFiles2[0].ChunkHash)
-
-	// Verify old chunk still exists (it's still valid data)
-	oldChunk, err := repos.Chunks.GetByHash(ctx, oldChunkHash.String())
-	require.NoError(t, err)
-	assert.NotNil(t, oldChunk)
-
-	// Verify new chunk exists
-	newChunk, err := repos.Chunks.GetByHash(ctx, newChunkHash.String())
-	require.NoError(t, err)
-	assert.NotNil(t, newChunk)
-
-	// Verify that chunk_files for old chunk no longer references this file
-	oldChunkFiles, err := repos.ChunkFiles.GetByChunkHash(ctx, oldChunkHash)
-	require.NoError(t, err)
-
-	for _, cf := range oldChunkFiles {
-		file, err := repos.Files.GetByID(ctx, cf.FileID)
-		require.NoError(t, err)
-		assert.NotEqual(t, "/data/test.txt", file.Path, "Old chunk should not be associated with the modified file")
-	}
 }
 
 // TestMultipleFileChanges verifies handling of multiple file changes in one scan
 func TestMultipleFileChanges(t *testing.T) {
 	// Initialize logger for tests
 	log.Initialize(log.Config{})
+	t.Parallel()
 
 	// Create in-memory filesystem
 	fs := afero.NewMemMapFs()
@@ -183,23 +181,13 @@ func TestMultipleFileChanges(t *testing.T) {
 		Repositories:     repos,
 		MaxBlobSize:      int64(1024 * 1024), // 1MB blobs
 		CompressionLevel: 3,
-		AgeRecipients:    []string{"age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"}, // Test public key
+		AgeRecipients:    []string{testAgePublicKey},
 	})
 
 	// Create first snapshot
 	ctx := context.Background()
 	snapshotID1 := "snapshot1"
-	err = repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+	createSnapshotRecord(ctx, t, repos, snapshotID1)
-		snapshot := &database.Snapshot{
-			ID:             types.SnapshotID(snapshotID1),
-			Hostname:       "test-host",
-			VaultikVersion: "test",
-			StartedAt:      time.Now(),
-		}
-
-		return repos.Snapshots.Create(ctx, tx, snapshot)
-	})
-	require.NoError(t, err)
 
 	// First scan
 	result1, err := scanner.Scan(ctx, "/", snapshotID1)
@@ -217,17 +205,7 @@ func TestMultipleFileChanges(t *testing.T) {
 
 	// Create second snapshot
 	snapshotID2 := "snapshot2"
-	err = repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+	createSnapshotRecord(ctx, t, repos, snapshotID2)
-		snapshot := &database.Snapshot{
-			ID:             types.SnapshotID(snapshotID2),
-			Hostname:       "test-host",
-			VaultikVersion: "test",
-			StartedAt:      time.Now(),
-		}
-
-		return repos.Snapshots.Create(ctx, tx, snapshot)
-	})
-	require.NoError(t, err)
 
 	// Second scan
 	result2, err := scanner.Scan(ctx, "/", snapshotID2)
@@ -240,10 +218,12 @@ func TestMultipleFileChanges(t *testing.T) {
 	for path := range files {
 		fileChunks, err := repos.FileChunks.GetByPath(ctx, path)
 		require.NoError(t, err)
-		assert.Len(t, fileChunks, 1, "File %s should have exactly 1 chunk association", path)
+		assert.Len(t, fileChunks, 1,
+			"File %s should have exactly 1 chunk association", path)
 
 		chunkFiles, err := repos.ChunkFiles.GetByFilePath(ctx, path)
 		require.NoError(t, err)
-		assert.Len(t, chunkFiles, 1, "File %s should have exactly 1 chunk-file association", path)
+		assert.Len(t, chunkFiles, 1,
+			"File %s should have exactly 1 chunk-file association", path)
 	}
 }

internal/snapshot/manifest.go

@@ -10,6 +10,8 @@ import (
 )
 
 // Manifest represents the structure of a snapshot's blob manifest
+//
+//nolint:tagliatelle // snake_case is the established on-disk manifest format
 type Manifest struct {
 	SnapshotID          string     `json:"snapshot_id"`
 	Timestamp           string     `json:"timestamp"`
@@ -19,6 +21,8 @@ type Manifest struct {
 }
 
 // BlobInfo represents information about a single blob in the manifest
+//
+//nolint:tagliatelle // snake_case is the established on-disk manifest format
 type BlobInfo struct {
 	Hash           string `json:"hash"`
 	CompressedSize int64  `json:"compressed_size"`
@@ -55,7 +59,8 @@ func EncodeManifest(manifest *Manifest, compressionLevel int) ([]byte, error) {
 	// Compress using zstd
 	var compressedBuf bytes.Buffer
 
-	writer, err := zstd.NewWriter(&compressedBuf, zstd.WithEncoderLevel(zstd.EncoderLevelFromZstd(compressionLevel)))
+	writer, err := zstd.NewWriter(&compressedBuf,
+		zstd.WithEncoderLevel(zstd.EncoderLevelFromZstd(compressionLevel)))
 	if err != nil {
 		return nil, fmt.Errorf("creating zstd writer: %w", err)
 	}

internal/snapshot/module.go

@@ -21,6 +21,8 @@ type ScannerParams struct {
 // Module exports backup functionality as an fx module.
 // It provides a ScannerFactory that can create Scanner instances
 // with custom parameters while sharing common dependencies.
+//
+//nolint:gochecknoglobals // fx module definitions are conventionally globals
 var Module = fx.Module("backup",
 	fx.Provide(
 		provideScannerFactory,
@@ -31,7 +33,9 @@ var Module = fx.Module("backup",
 // ScannerFactory creates scanners with custom parameters
 type ScannerFactory func(params ScannerParams) *Scanner
 
-func provideScannerFactory(cfg *config.Config, repos *database.Repositories, storer storage.Storer) ScannerFactory {
+func provideScannerFactory(
+	cfg *config.Config, repos *database.Repositories, storer storage.Storer,
+) ScannerFactory {
 	return func(params ScannerParams) *Scanner {
 		// Use provided excludes, or fall back to global config excludes
 		excludes := params.Exclude

internal/snapshot/permission_error_test.go

@@ -1,3 +1,4 @@
+//nolint:testpackage // needs access to unexported wrapPermissionError
 package snapshot
 
 import (
@@ -9,12 +10,15 @@ import (
 	"testing"
 )
 
-func TestWrapPermissionError(t *testing.T) {
+// errDiskOnFire is a non-permission sentinel used to verify pass-through.
-	// Non-permission errors pass through unchanged.
+var errDiskOnFire = errors.New("disk on fire")
-	plain := errors.New("disk on fire")
 
-	got := wrapPermissionError("/some/path", plain)
+func TestWrapPermissionError(t *testing.T) {
-	if !errors.Is(got, plain) {
+	t.Parallel()
+
+	// Non-permission errors pass through unchanged.
+	got := wrapPermissionError("/some/path", errDiskOnFire)
+	if !errors.Is(got, errDiskOnFire) {
 		t.Errorf("non-permission error should pass through, got %v", got)
 	}
 
@@ -32,15 +36,16 @@ func TestWrapPermissionError(t *testing.T) {
 
 	if runtime.GOOS == "darwin" {
 		if !strings.Contains(wrapped.Error(), "Full Disk Access") {
-			t.Errorf("macOS permission error should mention Full Disk Access:\n%s", wrapped.Error())
+			t.Errorf("macOS permission error should mention Full Disk Access:\n%s",
+				wrapped.Error())
 		}
 
 		if !strings.Contains(wrapped.Error(), "System Settings") {
-			t.Errorf("macOS permission error should point at System Settings:\n%s", wrapped.Error())
+			t.Errorf("macOS permission error should point at System Settings:\n%s",
-		}
+				wrapped.Error())
-	} else {
-		if !strings.Contains(wrapped.Error(), "--skip-errors") {
-			t.Errorf("non-macOS permission error should mention --skip-errors:\n%s", wrapped.Error())
 		}
+	} else if !strings.Contains(wrapped.Error(), "--skip-errors") {
+		t.Errorf("non-macOS permission error should mention --skip-errors:\n%s",
+			wrapped.Error())
 	}
 }

internal/snapshot/progress.go

@@ -19,14 +19,41 @@ const (
 	// These updates show current progress, ETA, and the file being processed.
 	SummaryInterval = 10 * time.Second
 
-	// DetailInterval defines how often multi-line detailed status reports are printed.
+	// DetailInterval defines how often multi-line detailed status reports are
-	// These reports include comprehensive statistics about files, chunks, blobs, and uploads.
+	// printed. These reports include comprehensive statistics about files,
+	// chunks, blobs, and uploads.
 	DetailInterval = 60 * time.Second
 
 	// UploadProgressInterval defines how often upload progress messages are logged.
 	UploadProgressInterval = 15 * time.Second
 )
 
+const (
+	// bitsPerByte converts byte counts to bit counts for speed display.
+	bitsPerByte = 8
+
+	// percentScale converts a ratio to a percentage.
+	percentScale = 100
+
+	// currentFileMaxLen is the display width used for current-file paths.
+	currentFileMaxLen = 40
+
+	// secondsPerMinute and minutesPerHour are used for duration formatting.
+	secondsPerMinute = 60
+	minutesPerHour   = 60
+
+	// Bit-rate thresholds for human-readable upload speed formatting.
+	bitsPerGbit = 1e9
+	bitsPerMbit = 1e6
+	bitsPerKbit = 1e3
+
+	// ellipsis prefixes truncated paths and suffixes shortened hashes.
+	ellipsis = "..."
+
+	// hashPrefixLen is how many hex characters of a blob hash to show in logs.
+	hashPrefixLen = 8
+)
+
 // ProgressStats holds atomic counters for progress tracking
 type ProgressStats struct {
 	FilesScanned     atomic.Int64 // Total files seen during scan (includes skipped)
@@ -64,7 +91,7 @@ type UploadInfo struct {
 // ProgressReporter handles periodic progress reporting
 type ProgressReporter struct {
 	stats         *ProgressStats
-	ctx           context.Context
+	ctx           context.Context //nolint:containedctx // bound at construction
 	cancel        context.CancelFunc
 	wg            sync.WaitGroup
 	detailTicker  *time.Ticker
@@ -127,6 +154,161 @@ func (pr *ProgressReporter) SetTotalSize(size int64) {
 	pr.stats.ProcessStartTime.Store(time.Now().UTC())
 }
 
+// Helper functions
+
+func formatDuration(d time.Duration) string {
+	if d < 0 {
+		return "unknown"
+	}
+
+	if d < time.Minute {
+		return fmt.Sprintf("%ds", int(d.Seconds()))
+	}
+
+	if d < time.Hour {
+		return fmt.Sprintf("%dm%ds", int(d.Minutes()), int(d.Seconds())%secondsPerMinute)
+	}
+
+	return fmt.Sprintf("%dh%dm", int(d.Hours()), int(d.Minutes())%minutesPerHour)
+}
+
+func formatPercent(numerator, denominator int64) string {
+	if denominator == 0 {
+		return "0.0%"
+	}
+
+	return fmt.Sprintf("%.1f%%", float64(numerator)/float64(denominator)*percentScale)
+}
+
+func formatRatio(compressed, uncompressed int64) string {
+	if uncompressed == 0 {
+		return "1.00"
+	}
+
+	ratio := float64(compressed) / float64(uncompressed)
+
+	return fmt.Sprintf("%.2f", ratio)
+}
+
+func truncatePath(path string, maxLen int) string {
+	if len(path) <= maxLen {
+		return path
+	}
+	// Keep the last maxLen-len(ellipsis) characters and prepend the ellipsis.
+	return ellipsis + path[len(path)-(maxLen-len(ellipsis)):]
+}
+
+// safeUint64 converts a non-negative int64 counter to uint64 for display,
+// clamping negative values to zero.
+func safeUint64(n int64) uint64 {
+	if n < 0 {
+		return 0
+	}
+
+	return uint64(n)
+}
+
+// ReportUploadStart marks the beginning of a blob upload
+func (pr *ProgressReporter) ReportUploadStart(blobHash string, size int64) {
+	info := &UploadInfo{
+		BlobHash:  blobHash,
+		Size:      size,
+		StartTime: time.Now().UTC(),
+	}
+	pr.stats.CurrentUpload.Store(info)
+
+	// Log the start of upload
+	log.Info("Starting blob upload",
+		"hash", blobHash[:hashPrefixLen]+ellipsis,
+		"size", humanize.Bytes(safeUint64(size)))
+}
+
+// ReportUploadComplete marks the completion of a blob upload
+func (pr *ProgressReporter) ReportUploadComplete(
+	blobHash string, size int64, duration time.Duration,
+) {
+	// Clear current upload
+	pr.stats.CurrentUpload.Store((*UploadInfo)(nil))
+
+	// Add to total upload duration
+	pr.stats.UploadDurationMs.Add(duration.Milliseconds())
+
+	// Calculate speed
+	if duration < time.Millisecond {
+		duration = time.Millisecond
+	}
+
+	bytesPerSec := float64(size) / duration.Seconds()
+	bitsPerSec := bytesPerSec * bitsPerByte
+
+	// Format speed
+	var speedStr string
+
+	switch {
+	case bitsPerSec >= bitsPerGbit:
+		speedStr = fmt.Sprintf("%.1fGbit/sec", bitsPerSec/bitsPerGbit)
+	case bitsPerSec >= bitsPerMbit:
+		speedStr = fmt.Sprintf("%.0fMbit/sec", bitsPerSec/bitsPerMbit)
+	case bitsPerSec >= bitsPerKbit:
+		speedStr = fmt.Sprintf("%.0fKbit/sec", bitsPerSec/bitsPerKbit)
+	default:
+		speedStr = fmt.Sprintf("%.0fbit/sec", bitsPerSec)
+	}
+
+	log.Info("Blob upload completed",
+		"hash", blobHash[:hashPrefixLen]+ellipsis,
+		"size", humanize.Bytes(safeUint64(size)),
+		"duration", formatDuration(duration),
+		"speed", speedStr)
+}
+
+// UpdateChunkingActivity updates the last chunking time
+func (pr *ProgressReporter) UpdateChunkingActivity() {
+	pr.stats.mu.Lock()
+	pr.stats.lastChunkingTime = time.Now().UTC()
+	pr.stats.mu.Unlock()
+}
+
+// ReportUploadProgress reports current upload progress with instantaneous speed
+func (pr *ProgressReporter) ReportUploadProgress(
+	blobHash string, bytesUploaded, totalSize int64, instantSpeed float64,
+) {
+	// Update the current upload info with progress
+	uploadInfo, ok := pr.stats.CurrentUpload.Load().(*UploadInfo)
+	if ok && uploadInfo != nil {
+		now := time.Now()
+
+		// Only log at the configured interval
+		if now.Sub(uploadInfo.LastLogTime) >= UploadProgressInterval {
+			// Format speed in bits/second using humanize
+			bitsPerSec := instantSpeed * bitsPerByte
+			speedStr := humanize.SI(bitsPerSec, "bit/sec")
+
+			percent := float64(bytesUploaded) / float64(totalSize) * percentScale
+
+			// Calculate ETA based on current speed
+			etaStr := "unknown"
+
+			if instantSpeed > 0 && bytesUploaded < totalSize {
+				remainingBytes := totalSize - bytesUploaded
+				remainingSeconds := float64(remainingBytes) / instantSpeed
+				eta := time.Duration(remainingSeconds * float64(time.Second))
+				etaStr = formatDuration(eta)
+			}
+
+			log.Info("Blob upload progress",
+				"hash", blobHash[:hashPrefixLen]+ellipsis,
+				"progress", fmt.Sprintf("%.1f%%", percent),
+				"uploaded", humanize.Bytes(safeUint64(bytesUploaded)),
+				"total", humanize.Bytes(safeUint64(totalSize)),
+				"speed", speedStr,
+				"eta", etaStr)
+
+			uploadInfo.LastLogTime = now
+		}
+	}
+}
+
 // run is the main progress reporting loop
 func (pr *ProgressReporter) run() {
 	defer pr.wg.Done()
@@ -150,7 +332,8 @@ func (pr *ProgressReporter) run() {
 // printSummaryStatus prints a one-line status update
 func (pr *ProgressReporter) printSummaryStatus() {
 	// Check if we're currently uploading
-	if uploadInfo, ok := pr.stats.CurrentUpload.Load().(*UploadInfo); ok && uploadInfo != nil {
+	uploadInfo, ok := pr.stats.CurrentUpload.Load().(*UploadInfo)
+	if ok && uploadInfo != nil {
 		// Show upload progress instead
 		pr.printUploadProgress(uploadInfo)
 
@@ -172,7 +355,7 @@ func (pr *ProgressReporter) printSummaryStatus() {
 	bytesSkipped := pr.stats.BytesSkipped.Load()
 	bytesProcessed := pr.stats.BytesProcessed.Load()
 	totalSize := pr.stats.TotalSize.Load()
-	currentFile := pr.stats.CurrentFile.Load().(string)
+	currentFile, _ := pr.stats.CurrentFile.Load().(string)
 
 	// Calculate ETA if we have total size and are processing
 	etaStr := ""
@@ -201,15 +384,15 @@ func (pr *ProgressReporter) printSummaryStatus() {
 	status := fmt.Sprintf("Snapshot progress: %d/%d files, %s/%s (%.1f%%), %s/s%s",
 		filesProcessed,
 		totalFiles,
-		humanize.Bytes(uint64(bytesProcessed)),
+		humanize.Bytes(safeUint64(bytesProcessed)),
-		humanize.Bytes(uint64(totalSize)),
+		humanize.Bytes(safeUint64(totalSize)),
-		float64(bytesProcessed)/float64(totalSize)*100,
+		float64(bytesProcessed)/float64(totalSize)*percentScale,
 		humanize.Bytes(uint64(rate)),
 		etaStr,
 	)
 
 	if currentFile != "" {
-		status += " | Current: " + truncatePath(currentFile, 40)
+		status += " | Current: " + truncatePath(currentFile, currentFileMaxLen)
 	}
 
 	log.Info(status)
@@ -232,7 +415,7 @@ func (pr *ProgressReporter) printDetailedStatus() {
 	blobsCreated := pr.stats.BlobsCreated.Load()
 	blobsUploaded := pr.stats.BlobsUploaded.Load()
 	bytesUploaded := pr.stats.BytesUploaded.Load()
-	currentFile := pr.stats.CurrentFile.Load().(string)
+	currentFile, _ := pr.stats.CurrentFile.Load().(string)
 
 	totalBytes := bytesScanned + bytesSkipped
 	rate := float64(totalBytes) / elapsed.Seconds()
@@ -251,11 +434,11 @@ func (pr *ProgressReporter) printDetailedStatus() {
 				remainingBytes := totalSize - bytesProcessed
 				remainingSeconds := float64(remainingBytes) / processRate
 				eta := time.Duration(remainingSeconds * float64(time.Second))
-				percentComplete := float64(bytesProcessed) / float64(totalSize) * 100
+				percentComplete := float64(bytesProcessed) / float64(totalSize) * percentScale
 				log.Info("Overall progress",
 					"percent", fmt.Sprintf("%.1f%%", percentComplete),
-					"processed", humanize.Bytes(uint64(bytesProcessed)),
+					"processed", humanize.Bytes(safeUint64(bytesProcessed)),
-					"total", humanize.Bytes(uint64(totalSize)),
+					"total", humanize.Bytes(safeUint64(totalSize)),
 					"rate", humanize.Bytes(uint64(processRate))+"/s",
 					"eta", formatDuration(eta))
 			}
@@ -268,9 +451,9 @@ func (pr *ProgressReporter) printDetailedStatus() {
 		"total", filesScanned,
 		"skip_rate", formatPercent(filesSkipped, filesScanned))
 	log.Info("Data scanned",
-		"new", humanize.Bytes(uint64(bytesScanned)),
+		"new", humanize.Bytes(safeUint64(bytesScanned)),
-		"skipped", humanize.Bytes(uint64(bytesSkipped)),
+		"skipped", humanize.Bytes(safeUint64(bytesSkipped)),
-		"total", humanize.Bytes(uint64(totalBytes)),
+		"total", humanize.Bytes(safeUint64(totalBytes)),
 		"scan_rate", humanize.Bytes(uint64(rate))+"/s")
 	log.Info("Chunks created", "count", chunksCreated)
 	log.Info("Blobs status",
@@ -278,7 +461,7 @@ func (pr *ProgressReporter) printDetailedStatus() {
 		"uploaded", blobsUploaded,
 		"pending", blobsCreated-blobsUploaded)
 	log.Info("Total uploaded to remote",
-		"uploaded", humanize.Bytes(uint64(bytesUploaded)),
+		"uploaded", humanize.Bytes(safeUint64(bytesUploaded)),
 		"compression_ratio", formatRatio(bytesUploaded, bytesScanned))
 
 	if currentFile != "" {
@@ -288,146 +471,8 @@ func (pr *ProgressReporter) printDetailedStatus() {
 	log.Notice("=============================")
 }
 
-// Helper functions
-
-func formatDuration(d time.Duration) string {
-	if d < 0 {
-		return "unknown"
-	}
-
-	if d < time.Minute {
-		return fmt.Sprintf("%ds", int(d.Seconds()))
-	}
-
-	if d < time.Hour {
-		return fmt.Sprintf("%dm%ds", int(d.Minutes()), int(d.Seconds())%60)
-	}
-
-	return fmt.Sprintf("%dh%dm", int(d.Hours()), int(d.Minutes())%60)
-}
-
-func formatPercent(numerator, denominator int64) string {
-	if denominator == 0 {
-		return "0.0%"
-	}
-
-	return fmt.Sprintf("%.1f%%", float64(numerator)/float64(denominator)*100)
-}
-
-func formatRatio(compressed, uncompressed int64) string {
-	if uncompressed == 0 {
-		return "1.00"
-	}
-
-	ratio := float64(compressed) / float64(uncompressed)
-
-	return fmt.Sprintf("%.2f", ratio)
-}
-
-func truncatePath(path string, maxLen int) string {
-	if len(path) <= maxLen {
-		return path
-	}
-	// Keep the last maxLen-3 characters and prepend "..."
-	return "..." + path[len(path)-(maxLen-3):]
-}
-
 // printUploadProgress prints upload progress
-func (pr *ProgressReporter) printUploadProgress(info *UploadInfo) {
+func (pr *ProgressReporter) printUploadProgress(_ *UploadInfo) {
 	// This function is called repeatedly during upload, not just at start
 	// Don't print anything here - the actual progress is shown by ReportUploadProgress
 }
-
-// ReportUploadStart marks the beginning of a blob upload
-func (pr *ProgressReporter) ReportUploadStart(blobHash string, size int64) {
-	info := &UploadInfo{
-		BlobHash:  blobHash,
-		Size:      size,
-		StartTime: time.Now().UTC(),
-	}
-	pr.stats.CurrentUpload.Store(info)
-
-	// Log the start of upload
-	log.Info("Starting blob upload",
-		"hash", blobHash[:8]+"...",
-		"size", humanize.Bytes(uint64(size)))
-}
-
-// ReportUploadComplete marks the completion of a blob upload
-func (pr *ProgressReporter) ReportUploadComplete(blobHash string, size int64, duration time.Duration) {
-	// Clear current upload
-	pr.stats.CurrentUpload.Store((*UploadInfo)(nil))
-
-	// Add to total upload duration
-	pr.stats.UploadDurationMs.Add(duration.Milliseconds())
-
-	// Calculate speed
-	if duration < time.Millisecond {
-		duration = time.Millisecond
-	}
-
-	bytesPerSec := float64(size) / duration.Seconds()
-	bitsPerSec := bytesPerSec * 8
-
-	// Format speed
-	var speedStr string
-	if bitsPerSec >= 1e9 {
-		speedStr = fmt.Sprintf("%.1fGbit/sec", bitsPerSec/1e9)
-	} else if bitsPerSec >= 1e6 {
-		speedStr = fmt.Sprintf("%.0fMbit/sec", bitsPerSec/1e6)
-	} else if bitsPerSec >= 1e3 {
-		speedStr = fmt.Sprintf("%.0fKbit/sec", bitsPerSec/1e3)
-	} else {
-		speedStr = fmt.Sprintf("%.0fbit/sec", bitsPerSec)
-	}
-
-	log.Info("Blob upload completed",
-		"hash", blobHash[:8]+"...",
-		"size", humanize.Bytes(uint64(size)),
-		"duration", formatDuration(duration),
-		"speed", speedStr)
-}
-
-// UpdateChunkingActivity updates the last chunking time
-func (pr *ProgressReporter) UpdateChunkingActivity() {
-	pr.stats.mu.Lock()
-	pr.stats.lastChunkingTime = time.Now().UTC()
-	pr.stats.mu.Unlock()
-}
-
-// ReportUploadProgress reports current upload progress with instantaneous speed
-func (pr *ProgressReporter) ReportUploadProgress(blobHash string, bytesUploaded, totalSize int64, instantSpeed float64) {
-	// Update the current upload info with progress
-	if uploadInfo, ok := pr.stats.CurrentUpload.Load().(*UploadInfo); ok && uploadInfo != nil {
-		now := time.Now()
-
-		// Only log at the configured interval
-		if now.Sub(uploadInfo.LastLogTime) >= UploadProgressInterval {
-			// Format speed in bits/second using humanize
-			bitsPerSec := instantSpeed * 8
-			speedStr := humanize.SI(bitsPerSec, "bit/sec")
-
-			percent := float64(bytesUploaded) / float64(totalSize) * 100
-
-			// Calculate ETA based on current speed
-			etaStr := "unknown"
-
-			if instantSpeed > 0 && bytesUploaded < totalSize {
-				remainingBytes := totalSize - bytesUploaded
-				remainingSeconds := float64(remainingBytes) / instantSpeed
-				eta := time.Duration(remainingSeconds * float64(time.Second))
-				etaStr = formatDuration(eta)
-			}
-
-			log.Info("Blob upload progress",
-				"hash", blobHash[:8]+"...",
-				"progress", fmt.Sprintf("%.1f%%", percent),
-				"uploaded", humanize.Bytes(uint64(bytesUploaded)),
-				"total", humanize.Bytes(uint64(totalSize)),
-				"speed", speedStr,
-				"eta", etaStr)
-
-			uploadInfo.LastLogTime = now
-		}
-	}
-}

internal/snapshot/scanner_test.go

@@ -3,6 +3,7 @@ package snapshot_test
 import (
 	"context"
 	"database/sql"
+	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -14,9 +15,114 @@ import (
 	"sneak.berlin/go/vaultik/internal/types"
 )
 
+// Shared test fixture values for the snapshot_test package.
+const (
+	// testHost is the hostname recorded on test snapshot rows.
+	testHost = "test-host"
+
+	// testVersion is the vaultik version recorded on test snapshot rows.
+	testVersion = "test"
+
+	// testAgePublicKey is the fixed age public key used for test encryption.
+	testAgePublicKey = "age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"
+)
+
+// TestMain initializes the shared logger once, before any tests run, so
+// parallel tests never race on the logger's global state.
+func TestMain(m *testing.M) {
+	log.Initialize(log.Config{})
+	os.Exit(m.Run())
+}
+
+// createTestSnapshotRecord inserts an empty snapshot row used as the
+// association target for scan tests.
+func createTestSnapshotRecord(
+	ctx context.Context, t *testing.T, repos *database.Repositories, snapshotID string,
+) {
+	t.Helper()
+
+	err := repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+		snapshot := &database.Snapshot{
+			ID:               types.SnapshotID(snapshotID),
+			Hostname:         testHost,
+			VaultikVersion:   testVersion,
+			StartedAt:        time.Now(),
+			CompletedAt:      nil,
+			FileCount:        0,
+			ChunkCount:       0,
+			BlobCount:        0,
+			TotalSize:        0,
+			BlobSize:         0,
+			CompressionRatio: 1.0,
+		}
+
+		return repos.Snapshots.Create(ctx, tx, snapshot)
+	})
+	if err != nil {
+		t.Fatalf("failed to create snapshot: %v", err)
+	}
+}
+
+// verifySimpleScanDatabase checks the database contents produced by
+// TestScannerSimpleDirectory's scan.
+func verifySimpleScanDatabase(
+	ctx context.Context, t *testing.T, repos *database.Repositories,
+) {
+	t.Helper()
+
+	// Verify files in database - includes regular files and directories
+	files, err := repos.Files.ListByPrefix(ctx, "/source")
+	if err != nil {
+		t.Fatalf("failed to list files: %v", err)
+	}
+
+	// 6 regular files + 3 directories (/source, /source/subdir, /source/subdir2)
+	if len(files) != 9 {
+		t.Errorf("expected 9 entries in database (6 files + 3 dirs), got %d", len(files))
+	}
+
+	// Verify specific file
+	file1, err := repos.Files.GetByPath(ctx, "/source/file1.txt")
+	if err != nil {
+		t.Fatalf("failed to get file1.txt: %v", err)
+	}
+
+	if file1.Size != 13 {
+		t.Errorf("expected file1.txt size 13, got %d", file1.Size)
+	}
+
+	if file1.Mode != 0644 {
+		t.Errorf("expected file1.txt mode 0644, got %o", file1.Mode)
+	}
+
+	// Verify chunks were created
+	chunks, err := repos.FileChunks.GetByFile(ctx, "/source/file1.txt")
+	if err != nil {
+		t.Fatalf("failed to get chunks for file1.txt: %v", err)
+	}
+
+	if len(chunks) != 1 { // Small file should be one chunk
+		t.Errorf("expected 1 chunk for file1.txt, got %d", len(chunks))
+	}
+
+	// Verify deduplication - file3.txt and file4.txt have different content
+	// but we should still have the correct number of unique chunks
+	allChunks, err := repos.Chunks.List(ctx)
+	if err != nil {
+		t.Fatalf("failed to list all chunks: %v", err)
+	}
+
+	// We should have at most 6 chunks (one per unique file content)
+	// Empty file might not create a chunk
+	if len(allChunks) > 6 {
+		t.Errorf("expected at most 6 chunks, got %d", len(allChunks))
+	}
+}
+
 func TestScannerSimpleDirectory(t *testing.T) {
 	// Initialize logger for tests
 	log.Initialize(log.Config{})
+	t.Parallel()
 
 	// Create in-memory filesystem
 	fs := afero.NewMemMapFs()
@@ -74,38 +180,17 @@ func TestScannerSimpleDirectory(t *testing.T) {
 		Repositories:     repos,
 		MaxBlobSize:      int64(1024 * 1024), // 1MB blobs
 		CompressionLevel: 3,
-		AgeRecipients:    []string{"age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"}, // Test public key
+		AgeRecipients:    []string{testAgePublicKey},
 	})
 
 	// Create a snapshot record for testing
 	ctx := context.Background()
 	snapshotID := "test-snapshot-001"
 
-	err = repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+	createTestSnapshotRecord(ctx, t, repos, snapshotID)
-		snapshot := &database.Snapshot{
-			ID:               types.SnapshotID(snapshotID),
-			Hostname:         "test-host",
-			VaultikVersion:   "test",
-			StartedAt:        time.Now(),
-			CompletedAt:      nil,
-			FileCount:        0,
-			ChunkCount:       0,
-			BlobCount:        0,
-			TotalSize:        0,
-			BlobSize:         0,
-			CompressionRatio: 1.0,
-		}
-
-		return repos.Snapshots.Create(ctx, tx, snapshot)
-	})
-	if err != nil {
-		t.Fatalf("failed to create snapshot: %v", err)
-	}
 
 	// Scan the directory
-	var result *snapshot.ScanResult
+	result, err := scanner.Scan(ctx, "/source", snapshotID)
-
-	result, err = scanner.Scan(ctx, "/source", snapshotID)
 	if err != nil {
 		t.Fatalf("scan failed: %v", err)
 	}
@@ -120,58 +205,13 @@ func TestScannerSimpleDirectory(t *testing.T) {
 		t.Errorf("expected at least 97 bytes scanned, got %d", result.BytesScanned)
 	}
 
-	// Verify files in database - includes regular files and directories
+	verifySimpleScanDatabase(ctx, t, repos)
-	files, err := repos.Files.ListByPrefix(ctx, "/source")
-	if err != nil {
-		t.Fatalf("failed to list files: %v", err)
-	}
-
-	// 6 regular files + 3 directories (/source, /source/subdir, /source/subdir2)
-	if len(files) != 9 {
-		t.Errorf("expected 9 entries in database (6 files + 3 dirs), got %d", len(files))
-	}
-
-	// Verify specific file
-	file1, err := repos.Files.GetByPath(ctx, "/source/file1.txt")
-	if err != nil {
-		t.Fatalf("failed to get file1.txt: %v", err)
-	}
-
-	if file1.Size != 13 {
-		t.Errorf("expected file1.txt size 13, got %d", file1.Size)
-	}
-
-	if file1.Mode != 0644 {
-		t.Errorf("expected file1.txt mode 0644, got %o", file1.Mode)
-	}
-
-	// Verify chunks were created
-	chunks, err := repos.FileChunks.GetByFile(ctx, "/source/file1.txt")
-	if err != nil {
-		t.Fatalf("failed to get chunks for file1.txt: %v", err)
-	}
-
-	if len(chunks) != 1 { // Small file should be one chunk
-		t.Errorf("expected 1 chunk for file1.txt, got %d", len(chunks))
-	}
-
-	// Verify deduplication - file3.txt and file4.txt have different content
-	// but we should still have the correct number of unique chunks
-	allChunks, err := repos.Chunks.List(ctx)
-	if err != nil {
-		t.Fatalf("failed to list all chunks: %v", err)
-	}
-
-	// We should have at most 6 chunks (one per unique file content)
-	// Empty file might not create a chunk
-	if len(allChunks) > 6 {
-		t.Errorf("expected at most 6 chunks, got %d", len(allChunks))
-	}
 }
 
 func TestScannerLargeFile(t *testing.T) {
 	// Initialize logger for tests
 	log.Initialize(log.Config{})
+	t.Parallel()
 
 	// Create in-memory filesystem
 	fs := afero.NewMemMapFs()
@@ -182,6 +222,7 @@ func TestScannerLargeFile(t *testing.T) {
 	// Fill with pseudo-random data to ensure chunk boundaries
 	for i := range largeContent {
 		// Simple pseudo-random generator for deterministic tests
+		//nolint:gosec // G115: intentional byte truncation of test data
 		largeContent[i] = byte((i * 7919) ^ (i >> 3))
 	}
 
@@ -216,38 +257,17 @@ func TestScannerLargeFile(t *testing.T) {
 		Repositories:     repos,
 		MaxBlobSize:      int64(1024 * 1024),
 		CompressionLevel: 3,
-		AgeRecipients:    []string{"age1ezrjmfpwsc95svdg0y54mums3zevgzu0x0ecq2f7tp8a05gl0sjq9q9wjg"}, // Test public key
+		AgeRecipients:    []string{testAgePublicKey},
 	})
 
 	// Create a snapshot record for testing
 	ctx := context.Background()
 	snapshotID := "test-snapshot-001"
 
-	err = repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
+	createTestSnapshotRecord(ctx, t, repos, snapshotID)
-		snapshot := &database.Snapshot{
-			ID:               types.SnapshotID(snapshotID),
-			Hostname:         "test-host",
-			VaultikVersion:   "test",
-			StartedAt:        time.Now(),
-			CompletedAt:      nil,
-			FileCount:        0,
-			ChunkCount:       0,
-			BlobCount:        0,
-			TotalSize:        0,
-			BlobSize:         0,
-			CompressionRatio: 1.0,
-		}
-
-		return repos.Snapshots.Create(ctx, tx, snapshot)
-	})
-	if err != nil {
-		t.Fatalf("failed to create snapshot: %v", err)
-	}
 
 	// Scan the directory
-	var result *snapshot.ScanResult
+	result, err := scanner.Scan(ctx, "/source", snapshotID)
-
-	result, err = scanner.Scan(ctx, "/source", snapshotID)
 	if err != nil {
 		t.Fatalf("scan failed: %v", err)
 	}
@@ -259,7 +279,8 @@ func TestScannerLargeFile(t *testing.T) {
 
 	// The file size should be at least 1MB
 	if result.BytesScanned < 1024*1024 {
-		t.Errorf("expected at least %d bytes scanned, got %d", 1024*1024, result.BytesScanned)
+		t.Errorf("expected at least %d bytes scanned, got %d",
+			1024*1024, result.BytesScanned)
 	}
 
 	// Verify chunks

internal/snapshot/snapshot.go

@@ -1,3 +1,6 @@
+// Package snapshot implements snapshot creation: scanning source
+// directories, chunking and deduplicating file data, packing chunks into
+// encrypted blobs, and exporting per-snapshot metadata to remote storage.
 package snapshot
 
 // Snapshot Metadata Export Process
@@ -58,6 +61,8 @@ import (
 )
 
 // SnapshotManager handles snapshot creation and metadata export
+//
+//nolint:revive // renaming snapshot.SnapshotManager is a cross-package API change
 type SnapshotManager struct {
 	repos   *database.Repositories
 	storage storage.Storer
@@ -66,6 +71,8 @@ type SnapshotManager struct {
 }
 
 // SnapshotManagerParams holds dependencies for NewSnapshotManager
+//
+//nolint:revive // renaming this alongside SnapshotManager is a cross-package API change
 type SnapshotManagerParams struct {
 	fx.In
 
@@ -88,15 +95,22 @@ func (sm *SnapshotManager) SetFilesystem(fs afero.Fs) {
 	sm.fs = fs
 }
 
-// CreateSnapshot creates a new snapshot record in the database at the start of a backup.
+// CreateSnapshot creates a new snapshot record in the database at the
+// start of a backup.
+//
 // Deprecated: Use CreateSnapshotWithName instead for multi-snapshot support.
-func (sm *SnapshotManager) CreateSnapshot(ctx context.Context, hostname, version, gitRevision string) (string, error) {
+func (sm *SnapshotManager) CreateSnapshot(
+	ctx context.Context, hostname, version, gitRevision string,
+) (string, error) {
 	return sm.CreateSnapshotWithName(ctx, hostname, "", version, gitRevision)
 }
 
-// CreateSnapshotWithName creates a new snapshot record with an optional snapshot name.
+// CreateSnapshotWithName creates a new snapshot record with an optional
-// The snapshot ID format is: hostname_name_timestamp or hostname_timestamp if name is empty.
+// snapshot name. The snapshot ID format is: hostname_name_timestamp or
-func (sm *SnapshotManager) CreateSnapshotWithName(ctx context.Context, hostname, name, version, gitRevision string) (string, error) {
+// hostname_timestamp if name is empty.
+func (sm *SnapshotManager) CreateSnapshotWithName(
+	ctx context.Context, hostname, name, version, gitRevision string,
+) (string, error) {
 	// Use short hostname (strip domain if present)
 	shortHostname := hostname
 	if before, _, ok := strings.Cut(hostname, "."); ok {
@@ -141,7 +155,9 @@ func (sm *SnapshotManager) CreateSnapshotWithName(ctx context.Context, hostname,
 }
 
 // UpdateSnapshotStats updates the statistics for a snapshot during backup
-func (sm *SnapshotManager) UpdateSnapshotStats(ctx context.Context, snapshotID string, stats BackupStats) error {
+func (sm *SnapshotManager) UpdateSnapshotStats(
+	ctx context.Context, snapshotID string, stats BackupStats,
+) error {
 	err := sm.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
 		return sm.repos.Snapshots.UpdateCounts(ctx, tx, snapshotID,
 			int64(stats.FilesScanned),
@@ -160,7 +176,9 @@ func (sm *SnapshotManager) UpdateSnapshotStats(ctx context.Context, snapshotID s
 
 // UpdateSnapshotStatsExtended updates snapshot statistics with extended metrics.
 // This includes compression level, uncompressed blob size, and upload duration.
-func (sm *SnapshotManager) UpdateSnapshotStatsExtended(ctx context.Context, snapshotID string, stats ExtendedBackupStats) error {
+func (sm *SnapshotManager) UpdateSnapshotStatsExtended(
+	ctx context.Context, snapshotID string, stats ExtendedBackupStats,
+) error {
 	return sm.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
 		// First update basic stats
 		err := sm.repos.Snapshots.UpdateCounts(ctx, tx, snapshotID,
@@ -187,7 +205,9 @@ func (sm *SnapshotManager) UpdateSnapshotStatsExtended(ctx context.Context, snap
 // is populated with every blob holding any chunk referenced by the
 // snapshot's files (including deduplicated blobs uploaded by prior
 // snapshots). Without this, fully-deduplicated snapshots are unrestorable.
-func (sm *SnapshotManager) CompleteSnapshot(ctx context.Context, snapshotID string) error {
+func (sm *SnapshotManager) CompleteSnapshot(
+	ctx context.Context, snapshotID string,
+) error {
 	err := sm.repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
 		added, err := sm.repos.Snapshots.PopulateReferencedBlobs(ctx, tx, snapshotID)
 		if err != nil {
@@ -226,8 +246,11 @@ func (sm *SnapshotManager) CompleteSnapshot(ctx context.Context, snapshotID stri
 // - Reopening the main database after this method returns
 //
 // This ensures database consistency during the copy operation.
-func (sm *SnapshotManager) ExportSnapshotMetadata(ctx context.Context, dbPath string, snapshotID string) error {
+func (sm *SnapshotManager) ExportSnapshotMetadata(
-	log.Info("Phase 3/3: Exporting snapshot metadata", "snapshot_id", snapshotID, "source_db", dbPath)
+	ctx context.Context, dbPath string, snapshotID string,
+) error {
+	log.Info("Phase 3/3: Exporting snapshot metadata",
+		"snapshot_id", snapshotID, "source_db", dbPath)
 
 	// Create temp directory for all temporary files
 	tempDir, err := afero.TempDir(sm.fs, "", "vaultik-snapshot-*")
@@ -271,13 +294,127 @@ func (sm *SnapshotManager) ExportSnapshotMetadata(ctx context.Context, dbPath st
 	return nil
 }
 
-// prepareExportDB copies, cleans, vacuums, and compresses the snapshot database for export.
+// CleanupIncompleteSnapshots removes incomplete snapshots that don't have
-// Returns the compressed data and the path to the temporary database (needed for manifest generation).
+// metadata in S3. This is critical for data safety: incomplete snapshots
-func (sm *SnapshotManager) prepareExportDB(ctx context.Context, dbPath, snapshotID, tempDir string) ([]byte, string, error) {
+// can cause deduplication to skip files that were never successfully
+// backed up, resulting in data loss.
+func (sm *SnapshotManager) CleanupIncompleteSnapshots(
+	ctx context.Context, hostname string,
+) error {
+	log.Info("Checking for incomplete snapshots", "hostname", hostname)
+
+	// Get all incomplete snapshots for this hostname
+	incompleteSnapshots, err := sm.repos.Snapshots.GetIncompleteByHostname(ctx, hostname)
+	if err != nil {
+		return fmt.Errorf("getting incomplete snapshots: %w", err)
+	}
+
+	if len(incompleteSnapshots) == 0 {
+		log.Debug("No incomplete snapshots found")
+
+		return nil
+	}
+
+	log.Info("Found incomplete snapshots", "count", len(incompleteSnapshots))
+
+	// Check each incomplete snapshot for metadata in storage
+	for _, snapshot := range incompleteSnapshots {
+		// Check if metadata exists in storage (paths use the hashed
+		// remote key so we don't leak host info to the listing).
+		metadataKey := fmt.Sprintf("metadata/%s/db.zst",
+			RemoteSnapshotKey(snapshot.ID.String()))
+
+		_, err := sm.storage.Stat(ctx, metadataKey)
+		if err != nil {
+			// Metadata doesn't exist in S3 - this is an incomplete snapshot
+			log.Info("Cleaning up incomplete snapshot record",
+				"snapshot_id", snapshot.ID, "started_at", snapshot.StartedAt)
+
+			// Delete the snapshot and all its associations
+			err := sm.deleteSnapshot(ctx, snapshot.ID.String())
+			if err != nil {
+				return fmt.Errorf("deleting incomplete snapshot %s: %w",
+					snapshot.ID, err)
+			}
+
+			log.Info("Deleted incomplete snapshot record and associated data",
+				"snapshot_id", snapshot.ID)
+		} else {
+			// Metadata exists - this snapshot was completed but database wasn't updated
+			// This shouldn't happen in normal operation, but mark it complete
+			log.Warn("Found snapshot with remote metadata but incomplete in database",
+				"snapshot_id", snapshot.ID)
+
+			err := sm.repos.Snapshots.MarkComplete(ctx, nil, snapshot.ID.String())
+			if err != nil {
+				log.Error("Failed to mark snapshot as complete in database",
+					"snapshot_id", snapshot.ID, "error", err)
+			}
+		}
+	}
+
+	return nil
+}
+
+// CleanupOrphanedData removes files, chunks, and blobs that are no longer
+// referenced by any snapshot. This should be called periodically to clean
+// up data from deleted or incomplete snapshots.
+func (sm *SnapshotManager) CleanupOrphanedData(ctx context.Context) error {
+	// Order is important to respect foreign key constraints:
+	// 1. Delete orphaned files (will cascade delete file_chunks)
+	// 2. Delete orphaned blobs (will cascade delete blob_chunks for deleted blobs)
+	// 3. Delete orphaned blob_chunks (where blob exists but chunk doesn't)
+	// 4. Delete orphaned chunks (now safe after all blob_chunks are gone)
+
+	// Delete orphaned files (files not in any snapshot)
+	log.Debug("Deleting orphaned file records from database")
+
+	err := sm.repos.Files.DeleteOrphaned(ctx)
+	if err != nil {
+		return fmt.Errorf("deleting orphaned files: %w", err)
+	}
+
+	// Delete orphaned blobs (blobs not in any snapshot)
+	// This will cascade delete blob_chunks for deleted blobs
+	log.Debug("Deleting orphaned blob records from database")
+
+	err = sm.repos.Blobs.DeleteOrphaned(ctx)
+	if err != nil {
+		return fmt.Errorf("deleting orphaned blobs: %w", err)
+	}
+
+	// Delete orphaned blob_chunks entries
+	// This handles cases where the blob still exists but chunks were deleted
+	log.Debug("Deleting orphaned blob_chunks associations from database")
+
+	err = sm.repos.BlobChunks.DeleteOrphaned(ctx)
+	if err != nil {
+		return fmt.Errorf("deleting orphaned blob_chunks: %w", err)
+	}
+
+	// Delete orphaned chunks (chunks not referenced by any file)
+	// This must come after cleaning up blob_chunks to avoid foreign key violations
+	log.Debug("Deleting orphaned chunk records from database")
+
+	err = sm.repos.Chunks.DeleteOrphaned(ctx)
+	if err != nil {
+		return fmt.Errorf("deleting orphaned chunks: %w", err)
+	}
+
+	return nil
+}
+
+// prepareExportDB copies, cleans, vacuums, and compresses the snapshot
+// database for export. Returns the compressed data and the path to the
+// temporary database (needed for manifest generation).
+func (sm *SnapshotManager) prepareExportDB(
+	ctx context.Context, dbPath, snapshotID, tempDir string,
+) ([]byte, string, error) {
 	// Step 1: Copy database to temp file
 	// The main database should be closed at this point
 	tempDBPath := filepath.Join(tempDir, "snapshot.db")
-	log.Debug("Copying database to temporary location", "source", dbPath, "destination", tempDBPath)
+	log.Debug("Copying database to temporary location",
+		"source", dbPath, "destination", tempDBPath)
 
 	err := sm.copyFile(dbPath, tempDBPath)
 	if err != nil {
@@ -296,22 +433,24 @@ func (sm *SnapshotManager) prepareExportDB(ctx context.Context, dbPath, snapshot
 
 	log.Info("Temporary database cleanup complete",
 		"db_path", tempDBPath,
-		"size_after_clean", humanize.Bytes(uint64(sm.getFileSize(tempDBPath))),
+		"size_after_clean", humanize.Bytes(safeUint64(sm.getFileSize(tempDBPath))),
 		"files", stats.FileCount,
 		"chunks", stats.ChunkCount,
 		"blobs", stats.BlobCount,
-		"total_compressed_size", humanize.Bytes(uint64(stats.CompressedSize)),
+		"total_compressed_size", humanize.Bytes(safeUint64(stats.CompressedSize)),
-		"total_uncompressed_size", humanize.Bytes(uint64(stats.UncompressedSize)),
+		"total_uncompressed_size", humanize.Bytes(safeUint64(stats.UncompressedSize)),
-		"compression_ratio", fmt.Sprintf("%.2fx", float64(stats.UncompressedSize)/float64(stats.CompressedSize)))
+		"compression_ratio", fmt.Sprintf("%.2fx",
+			float64(stats.UncompressedSize)/float64(stats.CompressedSize)))
 
 	// Step 3: VACUUM the database to remove deleted data and compact
 	// This is critical for security - ensures no stale/deleted data is uploaded
-	err = sm.vacuumDatabase(tempDBPath)
+	err = sm.vacuumDatabase(ctx, tempDBPath)
 	if err != nil {
 		return nil, "", fmt.Errorf("vacuuming database: %w", err)
 	}
 
-	log.Debug("Database vacuumed", "size", humanize.Bytes(uint64(sm.getFileSize(tempDBPath))))
+	log.Debug("Database vacuumed",
+		"size", humanize.Bytes(safeUint64(sm.getFileSize(tempDBPath))))
 
 	// Step 4: Compress and encrypt the binary database file
 	compressedPath := filepath.Join(tempDir, "db.zst.age")
@@ -322,8 +461,8 @@ func (sm *SnapshotManager) prepareExportDB(ctx context.Context, dbPath, snapshot
 	}
 
 	log.Debug("Compression complete",
-		"original_size", humanize.Bytes(uint64(sm.getFileSize(tempDBPath))),
+		"original_size", humanize.Bytes(safeUint64(sm.getFileSize(tempDBPath))),
-		"compressed_size", humanize.Bytes(uint64(sm.getFileSize(compressedPath))))
+		"compressed_size", humanize.Bytes(safeUint64(sm.getFileSize(compressedPath))))
 
 	// Step 5: Read compressed and encrypted data for upload
 	finalData, err := afero.ReadFile(sm.fs, compressedPath)
@@ -340,7 +479,9 @@ func (sm *SnapshotManager) prepareExportDB(ctx context.Context, dbPath, snapshot
 // We never write the human-readable snapshot ID into any unencrypted
 // part of remote storage so a listing of the destination bucket leaks
 // no host, configuration, or scheduling information.
-func (sm *SnapshotManager) uploadSnapshotArtifacts(ctx context.Context, snapshotID string, dbData, manifestData []byte) error {
+func (sm *SnapshotManager) uploadSnapshotArtifacts(
+	ctx context.Context, snapshotID string, dbData, manifestData []byte,
+) error {
 	remoteKey := RemoteSnapshotKey(snapshotID)
 
 	// Upload database backup (compressed and encrypted)
@@ -354,7 +495,8 @@ func (sm *SnapshotManager) uploadSnapshotArtifacts(ctx context.Context, snapshot
 	}
 
 	dbUploadDuration := time.Since(dbUploadStart)
-	dbUploadSpeed := float64(len(dbData)) * 8 / dbUploadDuration.Seconds() // bits per second
+	// bits per second
+	dbUploadSpeed := float64(len(dbData)) * bitsPerByte / dbUploadDuration.Seconds()
 	log.Info("Uploaded snapshot database",
 		"path", dbKey,
 		"size", humanize.Bytes(uint64(len(dbData))),
@@ -371,7 +513,9 @@ func (sm *SnapshotManager) uploadSnapshotArtifacts(ctx context.Context, snapshot
 	}
 
 	manifestUploadDuration := time.Since(manifestUploadStart)
-	manifestUploadSpeed := float64(len(manifestData)) * 8 / manifestUploadDuration.Seconds() // bits per second
+	// bits per second
+	manifestUploadSpeed := float64(len(manifestData)) * bitsPerByte /
+		manifestUploadDuration.Seconds()
 	log.Info("Uploaded blob manifest",
 		"path", manifestKey,
 		"size", humanize.Bytes(uint64(len(manifestData))),
@@ -393,16 +537,19 @@ type CleanupStats struct {
 // cleanSnapshotDB removes all data except for the specified snapshot
 //
 // The cleanup is performed in a specific order to maintain referential integrity:
-// 1. Delete other snapshots
+//  1. Delete other snapshots
-// 2. Delete orphaned snapshot associations (snapshot_files, snapshot_blobs) for deleted snapshots
+//  2. Delete orphaned snapshot associations (snapshot_files, snapshot_blobs)
-// 3. Delete orphaned files (not in the current snapshot)
+//     for deleted snapshots
-// 4. Delete orphaned chunk-to-file mappings (references to deleted files)
+//  3. Delete orphaned files (not in the current snapshot)
-// 5. Delete orphaned blobs (not in the current snapshot)
+//  4. Delete orphaned chunk-to-file mappings (references to deleted files)
-// 6. Delete orphaned blob-to-chunk mappings (references to deleted chunks)
+//  5. Delete orphaned blobs (not in the current snapshot)
-// 7. Delete orphaned chunks (not referenced by any file)
+//  6. Delete orphaned blob-to-chunk mappings (references to deleted chunks)
+//  7. Delete orphaned chunks (not referenced by any file)
 //
 // Each step is implemented as a separate method for clarity and maintainability.
-func (sm *SnapshotManager) cleanSnapshotDB(ctx context.Context, dbPath string, snapshotID string) (*CleanupStats, error) {
+func (sm *SnapshotManager) cleanSnapshotDB(
+	ctx context.Context, dbPath string, snapshotID string,
+) (*CleanupStats, error) {
 	// Open the temp database
 	db, err := database.New(ctx, dbPath)
 	if err != nil {
@@ -428,39 +575,31 @@ func (sm *SnapshotManager) cleanSnapshotDB(ctx context.Context, dbPath string, s
 	}()
 
 	// Execute cleanup steps in order
-	err = sm.deleteOtherSnapshots(ctx, tx, snapshotID)
+	steps := []struct {
-	if err != nil {
+		name string
-		return nil, fmt.Errorf("step 1 - delete other snapshots: %w", err)
+		fn   func() error
+	}{
+		{"delete other snapshots",
+			func() error { return sm.deleteOtherSnapshots(ctx, tx, snapshotID) }},
+		{"delete orphaned snapshot associations",
+			func() error { return sm.deleteOrphanedSnapshotAssociations(ctx, tx, snapshotID) }},
+		{"delete orphaned files",
+			func() error { return sm.deleteOrphanedFiles(ctx, tx, snapshotID) }},
+		{"delete orphaned chunk-to-file mappings",
+			func() error { return sm.deleteOrphanedChunkToFileMappings(ctx, tx) }},
+		{"delete orphaned blobs",
+			func() error { return sm.deleteOrphanedBlobs(ctx, tx, snapshotID) }},
+		{"delete orphaned blob-to-chunk mappings",
+			func() error { return sm.deleteOrphanedBlobToChunkMappings(ctx, tx) }},
+		{"delete orphaned chunks",
+			func() error { return sm.deleteOrphanedChunks(ctx, tx) }},
 	}
 
-	err = sm.deleteOrphanedSnapshotAssociations(ctx, tx, snapshotID)
+	for i, step := range steps {
-	if err != nil {
+		err = step.fn()
-		return nil, fmt.Errorf("step 2 - delete orphaned snapshot associations: %w", err)
+		if err != nil {
-	}
+			return nil, fmt.Errorf("step %d - %s: %w", i+1, step.name, err)
-
+		}
-	err = sm.deleteOrphanedFiles(ctx, tx, snapshotID)
-	if err != nil {
-		return nil, fmt.Errorf("step 3 - delete orphaned files: %w", err)
-	}
-
-	err = sm.deleteOrphanedChunkToFileMappings(ctx, tx)
-	if err != nil {
-		return nil, fmt.Errorf("step 4 - delete orphaned chunk-to-file mappings: %w", err)
-	}
-
-	err = sm.deleteOrphanedBlobs(ctx, tx, snapshotID)
-	if err != nil {
-		return nil, fmt.Errorf("step 5 - delete orphaned blobs: %w", err)
-	}
-
-	err = sm.deleteOrphanedBlobToChunkMappings(ctx, tx)
-	if err != nil {
-		return nil, fmt.Errorf("step 6 - delete orphaned blob-to-chunk mappings: %w", err)
-	}
-
-	err = sm.deleteOrphanedChunks(ctx, tx)
-	if err != nil {
-		return nil, fmt.Errorf("step 7 - delete orphaned chunks: %w", err)
 	}
 
 	// Commit transaction
@@ -471,13 +610,19 @@ func (sm *SnapshotManager) cleanSnapshotDB(ctx context.Context, dbPath string, s
 		return nil, fmt.Errorf("committing transaction: %w", err)
 	}
 
-	// Collect statistics about the cleaned database
+	return sm.collectCleanupStats(ctx, db, snapshotID)
+}
+
+// collectCleanupStats gathers statistics about the cleaned database.
+func (sm *SnapshotManager) collectCleanupStats(
+	ctx context.Context, db *database.DB, snapshotID string,
+) (*CleanupStats, error) {
 	stats := &CleanupStats{}
 
 	// Count files
 	var fileCount int
 
-	err = db.QueryRowWithLog(ctx, "SELECT COUNT(*) FROM files").Scan(&fileCount)
+	err := db.QueryRowWithLog(ctx, "SELECT COUNT(*) FROM files").Scan(&fileCount)
 	if err != nil {
 		return nil, fmt.Errorf("counting files: %w", err)
 	}
@@ -501,9 +646,12 @@ func (sm *SnapshotManager) cleanSnapshotDB(ctx context.Context, dbPath string, s
 	)
 
 	err = db.QueryRowWithLog(ctx, `
-		SELECT COUNT(*), COALESCE(SUM(compressed_size), 0), COALESCE(SUM(uncompressed_size), 0) 
+		SELECT COUNT(*),
-		FROM blobs 
+			COALESCE(SUM(compressed_size), 0),
-		WHERE blob_hash IN (SELECT blob_hash FROM snapshot_blobs WHERE snapshot_id = ?)
+			COALESCE(SUM(uncompressed_size), 0)
+		FROM blobs
+		WHERE blob_hash IN
+			(SELECT blob_hash FROM snapshot_blobs WHERE snapshot_id = ?)
 	`, snapshotID).Scan(&blobCount, &compressedSize, &uncompressedSize)
 	if err != nil {
 		return nil, fmt.Errorf("counting blobs and sizes: %w", err)
@@ -518,9 +666,10 @@ func (sm *SnapshotManager) cleanSnapshotDB(ctx context.Context, dbPath string, s
 
 // vacuumDatabase runs VACUUM on the database to remove deleted data and compact
 // This is critical for security - ensures no stale/deleted data pages are uploaded
-func (sm *SnapshotManager) vacuumDatabase(dbPath string) error {
+func (sm *SnapshotManager) vacuumDatabase(ctx context.Context, dbPath string) error {
 	log.Debug("Running VACUUM on database", "path", dbPath)
-	cmd := exec.Command("sqlite3", dbPath, "VACUUM;")
+	//nolint:gosec // G204: fixed argv; dbPath is our own temp file path
+	cmd := exec.CommandContext(ctx, "sqlite3", dbPath, "VACUUM;")
 
 	output, err := cmd.CombinedOutput()
 	if err != nil {
@@ -557,7 +706,8 @@ func (sm *SnapshotManager) compressFile(inputPath, outputPath string) error {
 	// Use blobgen for compression and encryption
 	log.Debug("Compressing and encrypting data")
 
-	writer, err := blobgen.NewWriter(output, sm.config.CompressionLevel, sm.config.AgeRecipients)
+	writer, err := blobgen.NewWriter(output, sm.config.CompressionLevel,
+		sm.config.AgeRecipients)
 	if err != nil {
 		return fmt.Errorf("creating blobgen writer: %w", err)
 	}
@@ -636,7 +786,9 @@ func (sm *SnapshotManager) copyFile(src, dst string) error {
 }
 
 // generateBlobManifest creates a compressed JSON list of all blobs in the snapshot
-func (sm *SnapshotManager) generateBlobManifest(ctx context.Context, dbPath string, snapshotID string) ([]byte, error) {
+func (sm *SnapshotManager) generateBlobManifest(
+	ctx context.Context, dbPath string, snapshotID string,
+) ([]byte, error) {
 	// Open the cleaned database using the database package
 	db, err := database.New(ctx, dbPath)
 	if err != nil {
@@ -734,61 +886,10 @@ type ExtendedBackupStats struct {
 	UploadDurationMs     int64 // Total milliseconds spent uploading to S3
 }
 
-// CleanupIncompleteSnapshots removes incomplete snapshots that don't have metadata in S3.
-// This is critical for data safety: incomplete snapshots can cause deduplication to skip
-// files that were never successfully backed up, resulting in data loss.
-func (sm *SnapshotManager) CleanupIncompleteSnapshots(ctx context.Context, hostname string) error {
-	log.Info("Checking for incomplete snapshots", "hostname", hostname)
-
-	// Get all incomplete snapshots for this hostname
-	incompleteSnapshots, err := sm.repos.Snapshots.GetIncompleteByHostname(ctx, hostname)
-	if err != nil {
-		return fmt.Errorf("getting incomplete snapshots: %w", err)
-	}
-
-	if len(incompleteSnapshots) == 0 {
-		log.Debug("No incomplete snapshots found")
-
-		return nil
-	}
-
-	log.Info("Found incomplete snapshots", "count", len(incompleteSnapshots))
-
-	// Check each incomplete snapshot for metadata in storage
-	for _, snapshot := range incompleteSnapshots {
-		// Check if metadata exists in storage (paths use the hashed
-		// remote key so we don't leak host info to the listing).
-		metadataKey := fmt.Sprintf("metadata/%s/db.zst", RemoteSnapshotKey(snapshot.ID.String()))
-
-		_, err := sm.storage.Stat(ctx, metadataKey)
-		if err != nil {
-			// Metadata doesn't exist in S3 - this is an incomplete snapshot
-			log.Info("Cleaning up incomplete snapshot record", "snapshot_id", snapshot.ID, "started_at", snapshot.StartedAt)
-
-			// Delete the snapshot and all its associations
-			err := sm.deleteSnapshot(ctx, snapshot.ID.String())
-			if err != nil {
-				return fmt.Errorf("deleting incomplete snapshot %s: %w", snapshot.ID, err)
-			}
-
-			log.Info("Deleted incomplete snapshot record and associated data", "snapshot_id", snapshot.ID)
-		} else {
-			// Metadata exists - this snapshot was completed but database wasn't updated
-			// This shouldn't happen in normal operation, but mark it complete
-			log.Warn("Found snapshot with remote metadata but incomplete in database", "snapshot_id", snapshot.ID)
-
-			err := sm.repos.Snapshots.MarkComplete(ctx, nil, snapshot.ID.String())
-			if err != nil {
-				log.Error("Failed to mark snapshot as complete in database", "snapshot_id", snapshot.ID, "error", err)
-			}
-		}
-	}
-
-	return nil
-}
-
 // deleteSnapshot removes a snapshot and all its associations from the database
-func (sm *SnapshotManager) deleteSnapshot(ctx context.Context, snapshotID string) error {
+func (sm *SnapshotManager) deleteSnapshot(
+	ctx context.Context, snapshotID string,
+) error {
 	// Delete snapshot_files entries
 	err := sm.repos.Snapshots.DeleteSnapshotFiles(ctx, snapshotID)
 	if err != nil {
@@ -824,61 +925,20 @@ func (sm *SnapshotManager) deleteSnapshot(ctx context.Context, snapshotID string
 	return nil
 }
 
-// CleanupOrphanedData removes files, chunks, and blobs that are no longer referenced by any snapshot.
-// This should be called periodically to clean up data from deleted or incomplete snapshots.
-func (sm *SnapshotManager) CleanupOrphanedData(ctx context.Context) error {
-	// Order is important to respect foreign key constraints:
-	// 1. Delete orphaned files (will cascade delete file_chunks)
-	// 2. Delete orphaned blobs (will cascade delete blob_chunks for deleted blobs)
-	// 3. Delete orphaned blob_chunks (where blob exists but chunk doesn't)
-	// 4. Delete orphaned chunks (now safe after all blob_chunks are gone)
-
-	// Delete orphaned files (files not in any snapshot)
-	log.Debug("Deleting orphaned file records from database")
-
-	err := sm.repos.Files.DeleteOrphaned(ctx)
-	if err != nil {
-		return fmt.Errorf("deleting orphaned files: %w", err)
-	}
-
-	// Delete orphaned blobs (blobs not in any snapshot)
-	// This will cascade delete blob_chunks for deleted blobs
-	log.Debug("Deleting orphaned blob records from database")
-
-	err = sm.repos.Blobs.DeleteOrphaned(ctx)
-	if err != nil {
-		return fmt.Errorf("deleting orphaned blobs: %w", err)
-	}
-
-	// Delete orphaned blob_chunks entries
-	// This handles cases where the blob still exists but chunks were deleted
-	log.Debug("Deleting orphaned blob_chunks associations from database")
-
-	err = sm.repos.BlobChunks.DeleteOrphaned(ctx)
-	if err != nil {
-		return fmt.Errorf("deleting orphaned blob_chunks: %w", err)
-	}
-
-	// Delete orphaned chunks (chunks not referenced by any file)
-	// This must come after cleaning up blob_chunks to avoid foreign key violations
-	log.Debug("Deleting orphaned chunk records from database")
-
-	err = sm.repos.Chunks.DeleteOrphaned(ctx)
-	if err != nil {
-		return fmt.Errorf("deleting orphaned chunks: %w", err)
-	}
-
-	return nil
-}
-
 // deleteOtherSnapshots deletes all snapshots except the current one
-func (sm *SnapshotManager) deleteOtherSnapshots(ctx context.Context, tx *sql.Tx, currentSnapshotID string) error {
+func (sm *SnapshotManager) deleteOtherSnapshots(
-	log.Debug("[Temp DB Cleanup] Deleting all snapshot records except current", "keeping", currentSnapshotID)
+	ctx context.Context, tx *sql.Tx, currentSnapshotID string,
+) error {
+	log.Debug("[Temp DB Cleanup] Deleting all snapshot records except current",
+		"keeping", currentSnapshotID)
 
-	// First delete uploads that reference other snapshots (no CASCADE DELETE on this FK)
+	// First delete uploads that reference other snapshots (no CASCADE DELETE
-	database.LogSQL("Execute", "DELETE FROM uploads WHERE snapshot_id != ?", currentSnapshotID)
+	// on this FK)
+	database.LogSQL("Execute", "DELETE FROM uploads WHERE snapshot_id != ?",
+		currentSnapshotID)
 
-	uploadResult, err := tx.ExecContext(ctx, "DELETE FROM uploads WHERE snapshot_id != ?", currentSnapshotID)
+	uploadResult, err := tx.ExecContext(ctx,
+		"DELETE FROM uploads WHERE snapshot_id != ?", currentSnapshotID)
 	if err != nil {
 		return fmt.Errorf("deleting uploads for other snapshots: %w", err)
 	}
@@ -887,66 +947,84 @@ func (sm *SnapshotManager) deleteOtherSnapshots(ctx context.Context, tx *sql.Tx,
 	log.Debug("[Temp DB Cleanup] Deleted upload records", "count", uploadsDeleted)
 
 	// Now we can safely delete the snapshots
-	database.LogSQL("Execute", "DELETE FROM snapshots WHERE id != ?", currentSnapshotID)
+	database.LogSQL("Execute", "DELETE FROM snapshots WHERE id != ?",
+		currentSnapshotID)
 
-	result, err := tx.ExecContext(ctx, "DELETE FROM snapshots WHERE id != ?", currentSnapshotID)
+	result, err := tx.ExecContext(ctx, "DELETE FROM snapshots WHERE id != ?",
+		currentSnapshotID)
 	if err != nil {
 		return fmt.Errorf("deleting other snapshots: %w", err)
 	}
 
 	rowsAffected, _ := result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted snapshot records from database", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted snapshot records from database",
+		"count", rowsAffected)
 
 	return nil
 }
 
-// deleteOrphanedSnapshotAssociations deletes snapshot_files and snapshot_blobs for deleted snapshots
+// deleteOrphanedSnapshotAssociations deletes snapshot_files and
-func (sm *SnapshotManager) deleteOrphanedSnapshotAssociations(ctx context.Context, tx *sql.Tx, currentSnapshotID string) error {
+// snapshot_blobs for deleted snapshots
+func (sm *SnapshotManager) deleteOrphanedSnapshotAssociations(
+	ctx context.Context, tx *sql.Tx, currentSnapshotID string,
+) error {
 	// Delete orphaned snapshot_files
 	log.Debug("[Temp DB Cleanup] Deleting orphaned snapshot_files associations")
-	database.LogSQL("Execute", "DELETE FROM snapshot_files WHERE snapshot_id != ?", currentSnapshotID)
+	database.LogSQL("Execute", "DELETE FROM snapshot_files WHERE snapshot_id != ?",
+		currentSnapshotID)
 
-	result, err := tx.ExecContext(ctx, "DELETE FROM snapshot_files WHERE snapshot_id != ?", currentSnapshotID)
+	result, err := tx.ExecContext(ctx,
+		"DELETE FROM snapshot_files WHERE snapshot_id != ?", currentSnapshotID)
 	if err != nil {
 		return fmt.Errorf("deleting orphaned snapshot_files: %w", err)
 	}
 
 	rowsAffected, _ := result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted snapshot_files associations", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted snapshot_files associations",
+		"count", rowsAffected)
 
 	// Delete orphaned snapshot_blobs
 	log.Debug("[Temp DB Cleanup] Deleting orphaned snapshot_blobs associations")
-	database.LogSQL("Execute", "DELETE FROM snapshot_blobs WHERE snapshot_id != ?", currentSnapshotID)
+	database.LogSQL("Execute", "DELETE FROM snapshot_blobs WHERE snapshot_id != ?",
+		currentSnapshotID)
 
-	result, err = tx.ExecContext(ctx, "DELETE FROM snapshot_blobs WHERE snapshot_id != ?", currentSnapshotID)
+	result, err = tx.ExecContext(ctx,
+		"DELETE FROM snapshot_blobs WHERE snapshot_id != ?", currentSnapshotID)
 	if err != nil {
 		return fmt.Errorf("deleting orphaned snapshot_blobs: %w", err)
 	}
 
 	rowsAffected, _ = result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted snapshot_blobs associations", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted snapshot_blobs associations",
+		"count", rowsAffected)
 
 	return nil
 }
 
 // deleteOrphanedFiles deletes files not in the current snapshot
-func (sm *SnapshotManager) deleteOrphanedFiles(ctx context.Context, tx *sql.Tx, currentSnapshotID string) error {
+func (sm *SnapshotManager) deleteOrphanedFiles(
-	log.Debug("[Temp DB Cleanup] Deleting file records not referenced by current snapshot")
+	ctx context.Context, tx *sql.Tx, currentSnapshotID string,
-	database.LogSQL("Execute", `DELETE FROM files WHERE NOT EXISTS (SELECT 1 FROM snapshot_files WHERE snapshot_files.file_id = files.id AND snapshot_files.snapshot_id = ?)`, currentSnapshotID)
+) error {
+	log.Debug(
+		"[Temp DB Cleanup] Deleting file records not referenced by current snapshot")
 
-	result, err := tx.ExecContext(ctx, `
+	query := `
-		DELETE FROM files 
+		DELETE FROM files
 		WHERE NOT EXISTS (
-			SELECT 1 FROM snapshot_files 
+			SELECT 1 FROM snapshot_files
-			WHERE snapshot_files.file_id = files.id 
+			WHERE snapshot_files.file_id = files.id
 			AND snapshot_files.snapshot_id = ?
-		)`, currentSnapshotID)
+		)`
+	database.LogSQL("Execute", query, currentSnapshotID)
+
+	result, err := tx.ExecContext(ctx, query, currentSnapshotID)
 	if err != nil {
 		return fmt.Errorf("deleting orphaned files: %w", err)
 	}
 
 	rowsAffected, _ := result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted file records from database", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted file records from database",
+		"count", rowsAffected)
 
 	// Note: file_chunks will be deleted via CASCADE
 	log.Debug("[Temp DB Cleanup] file_chunks associations deleted via CASCADE")
@@ -955,65 +1033,81 @@ func (sm *SnapshotManager) deleteOrphanedFiles(ctx context.Context, tx *sql.Tx,
 }
 
 // deleteOrphanedChunkToFileMappings deletes chunk_files entries for deleted files
-func (sm *SnapshotManager) deleteOrphanedChunkToFileMappings(ctx context.Context, tx *sql.Tx) error {
+func (sm *SnapshotManager) deleteOrphanedChunkToFileMappings(
+	ctx context.Context, tx *sql.Tx,
+) error {
 	log.Debug("[Temp DB Cleanup] Deleting orphaned chunk_files associations")
-	database.LogSQL("Execute", `DELETE FROM chunk_files WHERE NOT EXISTS (SELECT 1 FROM files WHERE files.id = chunk_files.file_id)`)
 
-	result, err := tx.ExecContext(ctx, `
+	query := `
-		DELETE FROM chunk_files 
+		DELETE FROM chunk_files
 		WHERE NOT EXISTS (
-			SELECT 1 FROM files 
+			SELECT 1 FROM files
 			WHERE files.id = chunk_files.file_id
-		)`)
+		)`
+	database.LogSQL("Execute", query)
+
+	result, err := tx.ExecContext(ctx, query)
 	if err != nil {
 		return fmt.Errorf("deleting orphaned chunk_files: %w", err)
 	}
 
 	rowsAffected, _ := result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted chunk_files associations", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted chunk_files associations",
+		"count", rowsAffected)
 
 	return nil
 }
 
 // deleteOrphanedBlobs deletes blobs not in the current snapshot
-func (sm *SnapshotManager) deleteOrphanedBlobs(ctx context.Context, tx *sql.Tx, currentSnapshotID string) error {
+func (sm *SnapshotManager) deleteOrphanedBlobs(
-	log.Debug("[Temp DB Cleanup] Deleting blob records not referenced by current snapshot")
+	ctx context.Context, tx *sql.Tx, currentSnapshotID string,
-	database.LogSQL("Execute", `DELETE FROM blobs WHERE NOT EXISTS (SELECT 1 FROM snapshot_blobs WHERE snapshot_blobs.blob_hash = blobs.blob_hash AND snapshot_blobs.snapshot_id = ?)`, currentSnapshotID)
+) error {
+	log.Debug(
+		"[Temp DB Cleanup] Deleting blob records not referenced by current snapshot")
 
-	result, err := tx.ExecContext(ctx, `
+	query := `
-		DELETE FROM blobs 
+		DELETE FROM blobs
 		WHERE NOT EXISTS (
-			SELECT 1 FROM snapshot_blobs 
+			SELECT 1 FROM snapshot_blobs
-			WHERE snapshot_blobs.blob_hash = blobs.blob_hash 
+			WHERE snapshot_blobs.blob_hash = blobs.blob_hash
 			AND snapshot_blobs.snapshot_id = ?
-		)`, currentSnapshotID)
+		)`
+	database.LogSQL("Execute", query, currentSnapshotID)
+
+	result, err := tx.ExecContext(ctx, query, currentSnapshotID)
 	if err != nil {
 		return fmt.Errorf("deleting orphaned blobs: %w", err)
 	}
 
 	rowsAffected, _ := result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted blob records from database", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted blob records from database",
+		"count", rowsAffected)
 
 	return nil
 }
 
 // deleteOrphanedBlobToChunkMappings deletes blob_chunks entries for deleted blobs
-func (sm *SnapshotManager) deleteOrphanedBlobToChunkMappings(ctx context.Context, tx *sql.Tx) error {
+func (sm *SnapshotManager) deleteOrphanedBlobToChunkMappings(
+	ctx context.Context, tx *sql.Tx,
+) error {
 	log.Debug("[Temp DB Cleanup] Deleting orphaned blob_chunks associations")
-	database.LogSQL("Execute", `DELETE FROM blob_chunks WHERE NOT EXISTS (SELECT 1 FROM blobs WHERE blobs.id = blob_chunks.blob_id)`)
 
-	result, err := tx.ExecContext(ctx, `
+	query := `
-		DELETE FROM blob_chunks 
+		DELETE FROM blob_chunks
 		WHERE NOT EXISTS (
-			SELECT 1 FROM blobs 
+			SELECT 1 FROM blobs
 			WHERE blobs.id = blob_chunks.blob_id
-		)`)
+		)`
+	database.LogSQL("Execute", query)
+
+	result, err := tx.ExecContext(ctx, query)
 	if err != nil {
 		return fmt.Errorf("deleting orphaned blob_chunks: %w", err)
 	}
 
 	rowsAffected, _ := result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted blob_chunks associations", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted blob_chunks associations",
+		"count", rowsAffected)
 
 	return nil
 }
@@ -1040,7 +1134,8 @@ func (sm *SnapshotManager) deleteOrphanedChunks(ctx context.Context, tx *sql.Tx)
 	}
 
 	rowsAffected, _ := result.RowsAffected()
-	log.Debug("[Temp DB Cleanup] Deleted chunk records from database", "count", rowsAffected)
+	log.Debug("[Temp DB Cleanup] Deleted chunk records from database",
+		"count", rowsAffected)
 
 	return nil
 }

internal/snapshot/snapshot_test.go

@@ -1,3 +1,4 @@
+//nolint:testpackage // exercises unexported SnapshotManager internals
 package snapshot
 
 import (
@@ -37,9 +38,65 @@ func copyFile(fs afero.Fs, src, dst string) error {
 	return err
 }
 
+// verifyCleanedDB opens the cleaned database and checks that the kept
+// snapshot survived while the orphan file and chunk were removed.
+func verifyCleanedDB(
+	ctx context.Context,
+	t *testing.T,
+	tempDBPath, snapshotID string,
+	file *database.File,
+	chunk *database.Chunk,
+) {
+	t.Helper()
+
+	cleanedDB, err := database.New(ctx, tempDBPath)
+	if err != nil {
+		t.Fatalf("failed to open cleaned database: %v", err)
+	}
+	defer func() {
+		err := cleanedDB.Close()
+		if err != nil {
+			t.Errorf("failed to close database: %v", err)
+		}
+	}()
+
+	cleanedRepos := database.NewRepositories(cleanedDB)
+
+	// Verify snapshot exists
+	verifySnapshot, err := cleanedRepos.Snapshots.GetByID(ctx, snapshotID)
+	if err != nil {
+		t.Fatalf("failed to get snapshot: %v", err)
+	}
+
+	if verifySnapshot == nil {
+		t.Error("snapshot should exist")
+	}
+
+	// Verify orphan file is gone
+	f, err := cleanedRepos.Files.GetByPath(ctx, file.Path.String())
+	if err != nil {
+		t.Fatalf("failed to check file: %v", err)
+	}
+
+	if f != nil {
+		t.Error("orphan file should not exist")
+	}
+
+	// Verify orphan chunk is gone
+	c, err := cleanedRepos.Chunks.GetByHash(ctx, chunk.ChunkHash.String())
+	if err != nil {
+		t.Fatalf("failed to check chunk: %v", err)
+	}
+
+	if c != nil {
+		t.Error("orphan chunk should not exist")
+	}
+}
+
 func TestCleanSnapshotDBEmptySnapshot(t *testing.T) {
 	// Initialize logger
 	log.Initialize(log.Config{})
+	t.Parallel()
 
 	ctx := context.Background()
 	fs := afero.NewOsFs()
@@ -115,53 +172,13 @@ func TestCleanSnapshotDBEmptySnapshot(t *testing.T) {
 	}
 
 	// Verify the cleaned database
-	cleanedDB, err := database.New(ctx, tempDBPath)
+	verifyCleanedDB(ctx, t, tempDBPath, snapshot.ID.String(), file, chunk)
-	if err != nil {
-		t.Fatalf("failed to open cleaned database: %v", err)
-	}
-	defer func() {
-		err := cleanedDB.Close()
-		if err != nil {
-			t.Errorf("failed to close database: %v", err)
-		}
-	}()
-
-	cleanedRepos := database.NewRepositories(cleanedDB)
-
-	// Verify snapshot exists
-	verifySnapshot, err := cleanedRepos.Snapshots.GetByID(ctx, snapshot.ID.String())
-	if err != nil {
-		t.Fatalf("failed to get snapshot: %v", err)
-	}
-
-	if verifySnapshot == nil {
-		t.Error("snapshot should exist")
-	}
-
-	// Verify orphan file is gone
-	f, err := cleanedRepos.Files.GetByPath(ctx, file.Path.String())
-	if err != nil {
-		t.Fatalf("failed to check file: %v", err)
-	}
-
-	if f != nil {
-		t.Error("orphan file should not exist")
-	}
-
-	// Verify orphan chunk is gone
-	c, err := cleanedRepos.Chunks.GetByHash(ctx, chunk.ChunkHash.String())
-	if err != nil {
-		t.Fatalf("failed to check chunk: %v", err)
-	}
-
-	if c != nil {
-		t.Error("orphan chunk should not exist")
-	}
 }
 
 func TestCleanSnapshotDBNonExistentSnapshot(t *testing.T) {
 	// Initialize logger
 	log.Initialize(log.Config{})
+	t.Parallel()
 
 	ctx := context.Background()
 	fs := afero.NewOsFs()

internal/storage/file.go

@@ -42,18 +42,19 @@ func (f *FileStorer) SetFilesystem(fs afero.Fs) {
 	f.fs = fs
 }
 
-// fullPath returns the full filesystem path for a key.
+// storageDirPerm is the mode used for directories created under the
-func (f *FileStorer) fullPath(key string) string {
+// storage base path.
-	return filepath.Join(f.basePath, key)
+const storageDirPerm = 0o755
-}
 
 // Put stores data at the specified key.
-func (f *FileStorer) Put(ctx context.Context, key string, data io.Reader) error {
+func (f *FileStorer) Put(_ context.Context, key string, data io.Reader) error {
 	path := f.fullPath(key)
 
 	// Create parent directories
 	dir := filepath.Dir(path)
-	if err := f.fs.MkdirAll(dir, 0755); err != nil {
+
+	err := f.fs.MkdirAll(dir, storageDirPerm)
+	if err != nil {
 		return fmt.Errorf("creating directories: %w", err)
 	}
 
@@ -72,12 +73,17 @@ func (f *FileStorer) Put(ctx context.Context, key string, data io.Reader) error
 }
 
 // PutWithProgress stores data with progress reporting.
-func (f *FileStorer) PutWithProgress(ctx context.Context, key string, data io.Reader, size int64, progress ProgressCallback) error {
+func (f *FileStorer) PutWithProgress(
+	_ context.Context, key string, data io.Reader,
+	_ int64, progress ProgressCallback,
+) error {
 	path := f.fullPath(key)
 
 	// Create parent directories
 	dir := filepath.Dir(path)
-	if err := f.fs.MkdirAll(dir, 0755); err != nil {
+
+	err := f.fs.MkdirAll(dir, storageDirPerm)
+	if err != nil {
 		return fmt.Errorf("creating directories: %w", err)
 	}
 
@@ -102,7 +108,7 @@ func (f *FileStorer) PutWithProgress(ctx context.Context, key string, data io.Re
 }
 
 // Get retrieves data from the specified key.
-func (f *FileStorer) Get(ctx context.Context, key string) (io.ReadCloser, error) {
+func (f *FileStorer) Get(_ context.Context, key string) (io.ReadCloser, error) {
 	path := f.fullPath(key)
 
 	file, err := f.fs.Open(path)
@@ -118,7 +124,7 @@ func (f *FileStorer) Get(ctx context.Context, key string) (io.ReadCloser, error)
 }
 
 // Stat returns metadata about an object without retrieving its contents.
-func (f *FileStorer) Stat(ctx context.Context, key string) (*ObjectInfo, error) {
+func (f *FileStorer) Stat(_ context.Context, key string) (*ObjectInfo, error) {
 	path := f.fullPath(key)
 
 	info, err := f.fs.Stat(path)
@@ -137,7 +143,7 @@ func (f *FileStorer) Stat(ctx context.Context, key string) (*ObjectInfo, error)
 }
 
 // Delete removes an object.
-func (f *FileStorer) Delete(ctx context.Context, key string) error {
+func (f *FileStorer) Delete(_ context.Context, key string) error {
 	path := f.fullPath(key)
 
 	err := f.fs.Remove(path)
@@ -233,7 +239,7 @@ func (f *FileStorer) ListStream(ctx context.Context, prefix string) <-chan Objec
 			if err != nil {
 				ch <- ObjectInfo{Err: err}
 
-				return nil // Continue walking despite errors
+				return nil //nolint:nilerr // continue walking despite errors
 			}
 
 			if !info.IsDir() {
@@ -259,13 +265,18 @@ func (f *FileStorer) ListStream(ctx context.Context, prefix string) <-chan Objec
 }
 
 // Info returns human-readable storage location information.
-func (f *FileStorer) Info() StorageInfo {
+func (f *FileStorer) Info() Info {
-	return StorageInfo{
+	return Info{
-		Type:     "file",
+		Type:     schemeFile,
 		Location: f.basePath,
 	}
 }
 
+// fullPath returns the full filesystem path for a key.
+func (f *FileStorer) fullPath(key string) string {
+	return filepath.Join(f.basePath, key)
+}
+
 // progressWriter wraps an io.Writer to track write progress.
 type progressWriter struct {
 	writer   io.Writer

internal/storage/module.go

@@ -10,9 +10,17 @@ import (
 	"sneak.berlin/go/vaultik/internal/s3"
 )
 
+// defaultS3Region is used when neither the URL nor the config specify one.
+const defaultS3Region = "us-east-1"
+
+// defaultS3Endpoint is the AWS endpoint used when none is configured.
+const defaultS3Endpoint = "s3.amazonaws.com"
+
 // Module exports storage functionality as an fx module.
 // It provides a Storer implementation based on the configured storage URL
 // or falls back to legacy S3 configuration.
+//
+//nolint:gochecknoglobals // fx module definitions are package globals
 var Module = fx.Module("storage",
 	fx.Provide(NewStorer),
 )
@@ -20,6 +28,8 @@ var Module = fx.Module("storage",
 // NewStorer creates a Storer based on configuration.
 // If StorageURL is set, it uses URL-based configuration.
 // Otherwise, it falls back to legacy S3 configuration.
+//
+//nolint:ireturn // fx provider intentionally returns the Storer interface
 func NewStorer(cfg *config.Config) (Storer, error) {
 	if cfg.StorageURL != "" {
 		return storerFromURL(cfg.StorageURL, cfg)
@@ -28,6 +38,7 @@ func NewStorer(cfg *config.Config) (Storer, error) {
 	return storerFromLegacyS3Config(cfg)
 }
 
+//nolint:ireturn // factory intentionally returns the Storer interface
 func storerFromURL(rawURL string, cfg *config.Config) (Storer, error) {
 	parsed, err := ParseStorageURL(rawURL)
 	if err != nil {
@@ -35,59 +46,74 @@ func storerFromURL(rawURL string, cfg *config.Config) (Storer, error) {
 	}
 
 	switch parsed.Scheme {
-	case "file":
+	case schemeFile:
 		return NewFileStorer(parsed.Prefix)
 
-	case "s3":
+	case schemeS3:
-		// Build endpoint URL
+		return storerFromParsedS3URL(parsed, cfg)
-		endpoint := parsed.Endpoint
-		if endpoint == "" {
-			endpoint = "s3.amazonaws.com"
-		}
 
-		// Add protocol if not present
+	case schemeRclone:
-		if parsed.UseSSL && !strings.HasPrefix(endpoint, "https://") && !strings.HasPrefix(endpoint, "http://") {
+		return NewRcloneStorer(
-			endpoint = "https://" + endpoint
+			context.Background(), parsed.RcloneRemote, parsed.Prefix)
-		} else if !parsed.UseSSL && !strings.HasPrefix(endpoint, "http://") && !strings.HasPrefix(endpoint, "https://") {
-			endpoint = "http://" + endpoint
-		}
-
-		region := parsed.Region
-		if region == "" {
-			region = cfg.S3.Region
-			if region == "" {
-				region = "us-east-1"
-			}
-		}
-
-		// Credentials come from config (not URL for security)
-		client, err := s3.NewClient(context.Background(), s3.Config{
-			Endpoint:        endpoint,
-			Bucket:          parsed.Bucket,
-			Prefix:          parsed.Prefix,
-			AccessKeyID:     cfg.S3.AccessKeyID,
-			SecretAccessKey: cfg.S3.SecretAccessKey,
-			Region:          region,
-		})
-		if err != nil {
-			return nil, fmt.Errorf("creating S3 client: %w", err)
-		}
-
-		return NewS3Storer(client), nil
-
-	case "rclone":
-		return NewRcloneStorer(context.Background(), parsed.RcloneRemote, parsed.Prefix)
 
 	default:
-		return nil, fmt.Errorf("unsupported storage scheme: %s", parsed.Scheme)
+		return nil, fmt.Errorf("%w: %s", ErrUnsupportedStorage, parsed.Scheme)
 	}
 }
 
+// storerFromParsedS3URL builds an S3 storer from a parsed s3:// URL,
+// filling endpoint protocol and region defaults from the config.
+//
+//nolint:ireturn // factory intentionally returns the Storer interface
+func storerFromParsedS3URL(parsed *URL, cfg *config.Config) (Storer, error) {
+	// Build endpoint URL
+	endpoint := parsed.Endpoint
+	if endpoint == "" {
+		endpoint = defaultS3Endpoint
+	}
+
+	// Add protocol if not present
+	hasProtocol := strings.HasPrefix(endpoint, "https://") ||
+		strings.HasPrefix(endpoint, "http://")
+	if !hasProtocol {
+		if parsed.UseSSL {
+			endpoint = "https://" + endpoint
+		} else {
+			endpoint = "http://" + endpoint
+		}
+	}
+
+	region := parsed.Region
+	if region == "" {
+		region = cfg.S3.Region
+		if region == "" {
+			region = defaultS3Region
+		}
+	}
+
+	// Credentials come from config (not URL for security)
+	client, err := s3.NewClient(context.Background(), s3.Config{
+		Endpoint:        endpoint,
+		Bucket:          parsed.Bucket,
+		Prefix:          parsed.Prefix,
+		AccessKeyID:     cfg.S3.AccessKeyID,
+		SecretAccessKey: cfg.S3.SecretAccessKey,
+		Region:          region,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("creating S3 client: %w", err)
+	}
+
+	return NewS3Storer(client), nil
+}
+
+//nolint:ireturn // factory intentionally returns the Storer interface
 func storerFromLegacyS3Config(cfg *config.Config) (Storer, error) {
 	endpoint := cfg.S3.Endpoint
 
 	// Ensure protocol is present
-	if !strings.HasPrefix(endpoint, "http://") && !strings.HasPrefix(endpoint, "https://") {
+	if !strings.HasPrefix(endpoint, "http://") &&
+		!strings.HasPrefix(endpoint, "https://") {
 		if cfg.S3.UseSSL {
 			endpoint = "https://" + endpoint
 		} else {
@@ -97,7 +123,7 @@ func storerFromLegacyS3Config(cfg *config.Config) (Storer, error) {
 
 	region := cfg.S3.Region
 	if region == "" {
-		region = "us-east-1"
+		region = defaultS3Region
 	}
 
 	client, err := s3.NewClient(context.Background(), s3.Config{

internal/storage/rclone.go

@@ -69,7 +69,8 @@ func (r *RcloneStorer) Put(ctx context.Context, key string, data io.Reader) erro
 	}
 
 	// Upload the object
-	_, err = operations.Rcat(ctx, r.fsys, key, io.NopCloser(bytes.NewReader(buf)), time.Now(), nil)
+	_, err = operations.Rcat(ctx, r.fsys, key,
+		io.NopCloser(bytes.NewReader(buf)), time.Now(), nil)
 	if err != nil {
 		return fmt.Errorf("uploading object: %w", err)
 	}
@@ -78,7 +79,10 @@ func (r *RcloneStorer) Put(ctx context.Context, key string, data io.Reader) erro
 }
 
 // PutWithProgress stores data with progress reporting.
-func (r *RcloneStorer) PutWithProgress(ctx context.Context, key string, data io.Reader, size int64, progress ProgressCallback) error {
+func (r *RcloneStorer) PutWithProgress(
+	ctx context.Context, key string, data io.Reader,
+	_ int64, progress ProgressCallback,
+) error {
 	// Wrap reader with progress tracking
 	pr := &progressReader{
 		reader:   data,
@@ -181,7 +185,9 @@ func (r *RcloneStorer) List(ctx context.Context, prefix string) ([]string, error
 }
 
 // ListStream returns a channel of ObjectInfo for large result sets.
-func (r *RcloneStorer) ListStream(ctx context.Context, prefix string) <-chan ObjectInfo {
+func (r *RcloneStorer) ListStream(
+	ctx context.Context, prefix string,
+) <-chan ObjectInfo {
 	ch := make(chan ObjectInfo)
 
 	go func() {
@@ -212,14 +218,14 @@ func (r *RcloneStorer) ListStream(ctx context.Context, prefix string) <-chan Obj
 }
 
 // Info returns human-readable storage location information.
-func (r *RcloneStorer) Info() StorageInfo {
+func (r *RcloneStorer) Info() Info {
 	location := r.remote
 	if r.path != "" {
 		location += ":" + r.path
 	}
 
-	return StorageInfo{
+	return Info{
-		Type:     "rclone",
+		Type:     schemeRclone,
 		Location: location,
 	}
 }

internal/storage/s3.go

@@ -24,7 +24,10 @@ func (s *S3Storer) Put(ctx context.Context, key string, data io.Reader) error {
 }
 
 // PutWithProgress stores data with progress reporting.
-func (s *S3Storer) PutWithProgress(ctx context.Context, key string, data io.Reader, size int64, progress ProgressCallback) error {
+func (s *S3Storer) PutWithProgress(
+	ctx context.Context, key string, data io.Reader,
+	size int64, progress ProgressCallback,
+) error {
 	// Convert storage.ProgressCallback to s3.ProgressCallback
 	var s3Progress s3.ProgressCallback
 	if progress != nil {
@@ -81,8 +84,8 @@ func (s *S3Storer) ListStream(ctx context.Context, prefix string) <-chan ObjectI
 }
 
 // Info returns human-readable storage location information.
-func (s *S3Storer) Info() StorageInfo {
+func (s *S3Storer) Info() Info {
-	return StorageInfo{
+	return Info{
 		Type:     "s3",
 		Location: fmt.Sprintf("%s/%s", s.client.Endpoint(), s.client.BucketName()),
 	}

internal/storage/storer.go

@@ -30,14 +30,15 @@ type ObjectInfo struct {
 	Err  error  // Error for streaming results (nil on success)
 }
 
-// StorageInfo provides human-readable storage configuration.
+// Info provides human-readable storage configuration.
-type StorageInfo struct {
+type Info struct {
 	Type     string // "s3" or "file"
 	Location string // endpoint/bucket for S3, base path for filesystem
 }
 
 // Storer defines the interface for storage backends.
-// All paths are relative to the storage root (bucket/prefix for S3, base directory for filesystem).
+// All paths are relative to the storage root (bucket/prefix for S3, base
+// directory for filesystem).
 type Storer interface {
 	// Put stores data at the specified key.
 	// Parent directories are created automatically for filesystem backends.
@@ -46,7 +47,8 @@ type Storer interface {
 	// PutWithProgress stores data with progress reporting.
 	// Size must be the exact size of the data to store.
 	// The progress callback is called periodically with bytes transferred.
-	PutWithProgress(ctx context.Context, key string, data io.Reader, size int64, progress ProgressCallback) error
+	PutWithProgress(ctx context.Context, key string, data io.Reader,
+		size int64, progress ProgressCallback) error
 
 	// Get retrieves data from the specified key.
 	// The caller must close the returned ReadCloser.
@@ -70,5 +72,5 @@ type Storer interface {
 	ListStream(ctx context.Context, prefix string) <-chan ObjectInfo
 
 	// Info returns human-readable storage location information.
-	Info() StorageInfo
+	Info() Info
 }

internal/storage/url.go

@@ -7,8 +7,26 @@ import (
 	"strings"
 )
 
-// StorageURL represents a parsed storage URL.
+// Storage URL scheme names.
-type StorageURL struct {
+const (
+	schemeFile   = "file"
+	schemeS3     = "s3"
+	schemeRclone = "rclone"
+)
+
+// Sentinel errors for storage URL parsing.
+var (
+	ErrEmptyStorageURL   = errors.New("storage URL is empty")
+	ErrEmptyFilePath     = errors.New("file URL path is empty")
+	ErrMissingBucket     = errors.New("s3 URL missing bucket name")
+	ErrMissingRemote     = errors.New("rclone URL missing remote name")
+	ErrUnsupportedScheme = errors.New(
+		"unsupported URL scheme: must start with s3://, file://, or rclone://")
+	ErrUnsupportedStorage = errors.New("unsupported storage scheme")
+)
+
+// URL represents a parsed storage URL.
+type URL struct {
 	Scheme       string // "s3", "file", or "rclone"
 	Bucket       string // S3 bucket name (empty for file/rclone)
 	Prefix       string // Path within bucket or filesystem base path
@@ -23,20 +41,20 @@ type StorageURL struct {
 //   - s3://bucket/prefix?endpoint=host&region=us-east-1&ssl=true
 //   - file:///absolute/path/to/backup
 //   - rclone://remote/path/to/backups
-func ParseStorageURL(rawURL string) (*StorageURL, error) {
+func ParseStorageURL(rawURL string) (*URL, error) {
 	if rawURL == "" {
-		return nil, errors.New("storage URL is empty")
+		return nil, ErrEmptyStorageURL
 	}
 
 	// Handle file:// URLs
 	if after, ok := strings.CutPrefix(rawURL, "file://"); ok {
 		path := after
 		if path == "" {
-			return nil, errors.New("file URL path is empty")
+			return nil, ErrEmptyFilePath
 		}
 
-		return &StorageURL{
+		return &URL{
-			Scheme: "file",
+			Scheme: schemeFile,
 			Prefix: path,
 		}, nil
 	}
@@ -50,7 +68,7 @@ func ParseStorageURL(rawURL string) (*StorageURL, error) {
 
 		bucket := u.Host
 		if bucket == "" {
-			return nil, errors.New("s3 URL missing bucket name")
+			return nil, ErrMissingBucket
 		}
 
 		prefix := strings.TrimPrefix(u.Path, "/")
@@ -62,8 +80,8 @@ func ParseStorageURL(rawURL string) (*StorageURL, error) {
 			useSSL = false
 		}
 
-		return &StorageURL{
+		return &URL{
-			Scheme:   "s3",
+			Scheme:   schemeS3,
 			Bucket:   bucket,
 			Prefix:   prefix,
 			Endpoint: query.Get("endpoint"),
@@ -81,27 +99,27 @@ func ParseStorageURL(rawURL string) (*StorageURL, error) {
 
 		remote := u.Host
 		if remote == "" {
-			return nil, errors.New("rclone URL missing remote name")
+			return nil, ErrMissingRemote
 		}
 
 		path := strings.TrimPrefix(u.Path, "/")
 
-		return &StorageURL{
+		return &URL{
-			Scheme:       "rclone",
+			Scheme:       schemeRclone,
 			Prefix:       path,
 			RcloneRemote: remote,
 		}, nil
 	}
 
-	return nil, errors.New("unsupported URL scheme: must start with s3://, file://, or rclone://")
+	return nil, ErrUnsupportedScheme
 }
 
 // String returns a human-readable representation of the storage URL.
-func (u *StorageURL) String() string {
+func (u *URL) String() string {
 	switch u.Scheme {
-	case "file":
+	case schemeFile:
 		return "file://" + u.Prefix
-	case "s3":
+	case schemeS3:
 		endpoint := u.Endpoint
 		if endpoint == "" {
 			endpoint = "s3.amazonaws.com"
@@ -112,7 +130,7 @@ func (u *StorageURL) String() string {
 		}
 
 		return fmt.Sprintf("s3://%s (endpoint: %s)", u.Bucket, endpoint)
-	case "rclone":
+	case schemeRclone:
 		if u.Prefix != "" {
 			return fmt.Sprintf("rclone://%s/%s", u.RcloneRemote, u.Prefix)
 		}