Sync dev to main

[tis24dev]

• Handle context deadline in input functions and add tests
• refactor: Implement selective feature-based exclusions for config snapshots
• feat: Apply exclusion patterns to archive packing and metadata
• Improve update check logging in main.go
• Improve log line classification and add debug filtering
• Expand restore categories with staged apply for access control
• Improve error handling in backup and restore workflows
• refactor: split metrics, add storage inventory and fix test resource cleanup
• Reorganize backup categories and archive layout; centralize diagnostics
• ** Extend PBS restore coverage (host/integrations, tape, S3) and align categories/docs Description**
• add PBS mount guards and fstab merge ordering
• Improve fstab restore with stable device remapping
• Document PBS mount guard and smart fstab restore
• Enable restore of PBS proxy and SSL configuration
• Add staged apply for PVE configs and mount guards
• Add PVE storage mount guard logic and improve parsing
• Refactor PVE access control restore to 1:1 file apply
• Enhance PBS access control restore with root safety rail
• Improve TFA/WebAuthn restore guidance and workflow
• Add PVE firewall restore with rollback and glob support
• Add transactional restore support for PVE HA configuration
• fix
• fix minor
• Add PVE SDN restore handling and tests
• PVE SAFE-apply: mappings, pools and ACL rollback
• Add HTTP helpers and robust release tag fetch
• deps(deps): bump github.com/gdamore/tcell/v2 from 2.13.5 to 2.13.8 in the security-patches group (deps(deps): bump github.com/gdamore/tcell/v2 from 2.13.5 to 2.13.8 in the security-patches group #122)
• deps(deps): bump golang.org/x/term from 0.38.0 to 0.39.0 (deps(deps): bump golang.org/x/term from 0.38.0 to 0.39.0 #125)
• deps(deps): bump golang.org/x/crypto from 0.46.0 to 0.47.0 (deps(deps): bump golang.org/x/crypto from 0.46.0 to 0.47.0 #123)
• deps(deps): bump golang.org/x/text from 0.32.0 to 0.33.0 (deps(deps): bump golang.org/x/text from 0.32.0 to 0.33.0 #124)
• Refine unescapeProcPath and add tests

[github-actions]

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

OpenSSF Scorecard

Package	Version	Score	Details
gomod/github.com/gdamore/tcell/v2	2.13.8	🟢 6.2	Details Check Score Reason Code-Review ⚠️ 0 Found 1/15 approved changesets -- score normalized to 0 CII-Best-Practices ⚠️ 0 no effort to earn an OpenSSF best practices badge detected Dangerous-Workflow 🟢 10 no dangerous workflow patterns detected Security-Policy 🟢 10 security policy file detected License 🟢 10 license file detected Maintained 🟢 10 30 commit(s) and 26 issue activity found in the last 90 days -- score normalized to 10 Token-Permissions ⚠️ 0 detected GitHub workflow tokens with excessive permissions Packaging ⚠️ -1 packaging workflow not detected Fuzzing ⚠️ 0 project is not fuzzed Binary-Artifacts 🟢 10 no binaries found in the repo Pinned-Dependencies 🟢 4 dependency not pinned by hash detected -- score normalized to 4 Signed-Releases ⚠️ -1 no releases found Vulnerabilities 🟢 10 0 existing vulnerabilities detected Branch-Protection 🟢 4 branch protection is not maximal on development and all release branches SAST 🟢 9 SAST tool is not run on all commits -- score normalized to 9

Scanned Files

• go.mod

[Copilot]

Pull request overview

Syncs dev back into main by expanding restore/backup capabilities (staged applies, notifications/SDN/HA/firewall support), tightening exclusion behavior, and improving UX/logging while significantly updating test coverage.

Changes:

• Added staged apply logic for additional PVE/PBS configuration areas (notifications, SDN, tape/host/remotes, etc.) plus new restore categories.
• Implemented consistent exclude-pattern handling across collection, generated metadata, and archive packing.
• Improved restore/decrypt UX (UI injection in workflow tests, countdown prompts) and enhanced rclone scan robustness (per-command timeout + progress hooks).

Reviewed changes

Copilot reviewed 95 out of 108 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
internal/orchestrator/restore_workflow_test.go	Updates restore workflow tests to use injected UI + new prepare function.
internal/orchestrator/restore_workflow_more_test.go	Moves restore workflow tests from stdin/stdout wiring to UI fakes.
internal/orchestrator/restore_workflow_integration_test.go	Fixes FakeFS cleanup for integration test.
internal/orchestrator/restore_workflow_abort_test.go	Adds aborted-input coverage using UI error injection.
internal/orchestrator/restore_tui_test.go	Removes some UI wizard-page tests; keeps category filtering tests.
internal/orchestrator/restore_test.go	Updates skip/allow behavior and expands storage parsing coverage.
internal/orchestrator/restore_sdn_test.go	Adds tests for staged SDN apply behavior.
internal/orchestrator/restore_sdn.go	Implements staged PVE SDN apply with root/pmxcfs guards.
internal/orchestrator/restore_plan.go	Adds ClusterBackup flag derived from manifest cluster mode.
internal/orchestrator/restore_notifications_test.go	Adds tests for notifications parsing and staged apply for PVE/PBS.
internal/orchestrator/restore_notifications.go	Implements staged notifications apply (PVE via pvesh, PBS via files).
internal/orchestrator/restore_ha_test.go	Adds tests for staged HA apply.
internal/orchestrator/restore_firewall_test.go	Adds tests for firewall dir sync/prune + staged firewall apply.
internal/orchestrator/restore_filesystem_test.go	Strengthens fstab merge assertions and adds device remap test.
internal/orchestrator/restore_errors_test.go	Fixes FakeFS cleanup for restore error-path tests.
internal/orchestrator/restore_coverage_extra_test.go	Adds SAFE apply coverage for pools and resource mappings; fixes FakeFS cleanup.
internal/orchestrator/resolv_conf_repair.go	Expands archive diagnostic candidates for resolv.conf repair.
internal/orchestrator/pvesh_sensitive.go	Adds helper to redact sensitive CLI args in pvesh error strings.
internal/orchestrator/pve_staged_apply_test.go	Adds tests for PVE staged apply behaviors (mount guards/jobs).
internal/orchestrator/pve_safe_apply_pools.go	Implements SAFE-apply of PVE pools from user.cfg.
internal/orchestrator/pve_safe_apply_mappings.go	Implements SAFE-apply of PVE resource mappings with UI prompt.
internal/orchestrator/prompts_cli_test.go	Adds countdown prompt tests with deadline/timeout behavior.
internal/orchestrator/pbs_staged_apply_test.go	Adds PBS staged apply tests for remote.cfg and datastore checks.
internal/orchestrator/pbs_staged_apply.go	Extends PBS staged apply to more categories (host/remotes/tape/s3) and relaxes datastore mount check behavior.
internal/orchestrator/pbs_mount_guard_test.go	Adds tests for PBS mount guard root inference.
internal/orchestrator/orchestrator.go	Adds file-not-found stats, writes backup manifest, and passes exclude patterns to archiver config; skip metadata on dry-run/excluded paths.
internal/orchestrator/nic_mapping.go	Adds additional inventory candidate path for NIC repair.
internal/orchestrator/network_apply_preflight_rollback_test.go	Switches network rollback test to UI-based path and fixes FakeFS cleanup.
internal/orchestrator/network_apply_countdown_test.go	Adds countdown prompt tests for network commit flow.
internal/orchestrator/log_parser_test.go	Adds regression test ensuring DEBUG lines don’t count as errors.
internal/orchestrator/log_parser.go	Refactors log classification to ignore DEBUG and support multiple formats.
internal/orchestrator/ifupdown2_nodad_patch_test.go	Fixes FakeFS cleanup in tests.
internal/orchestrator/helpers_test.go	Updates category-path matching expectation and adds PBS storage-mode category coverage.
internal/orchestrator/guards_cleanup.go	Adds mount-guard cleanup command implementation.
internal/orchestrator/decrypt_workflow_ui.go	Adds UI-driven decrypt workflow implementation and helpers.
internal/orchestrator/decrypt_tui_test.go	Removes some TUI wizard-page tests.
internal/orchestrator/decrypt_test.go	Fixes FakeFS cleanup in multiple decrypt tests.
internal/orchestrator/decrypt_move_test.go	Fixes FakeFS cleanup for rename-fallback test.
internal/orchestrator/compatibility_test.go	Fixes FakeFS cleanup in compatibility tests.
internal/orchestrator/categories.go	Adds/expands categories, storage/network/ssl coverage, export-only diagnostics category, and improves path matching (globs + absolute path normalization).
internal/orchestrator/backup_sources_test.go	Updates tests for new rclone discovery signature.
internal/orchestrator/backup_sources.go	Adds per-command rclone timeout, progress reporting, and improved error summaries.
internal/orchestrator/backup_safety_test.go	Fixes FakeFS cleanup in safety backup tests.
internal/orchestrator/backup_safety_glob_test.go	Adds tests for glob expansion in safety backup.
internal/orchestrator/backup_safety.go	Adds glob expansion support and new rollback backup types (firewall/HA/access control).
internal/orchestrator/backup_config_test.go	Updates archiver config tests for new exclude field.
internal/orchestrator/backup_config.go	Adds excludePatterns arg to archiver config builder.
internal/orchestrator/additional_helpers_test.go	Adds coverage for excluding backup metadata, fixes FakeFS cleanup.
internal/input/input_test.go	Adds deadline behavior tests for line/password reads.
internal/input/input.go	Differentiates ctx cancel vs deadline errors in input helpers.
internal/config/templates/backup.env	Clarifies per-command rclone scan timeout behavior.
internal/cli/args_test.go	Adds tests for new cleanup-guards flag defaults/parse.
internal/cli/args.go	Adds --cleanup-guards flag.
internal/backup/collector_test.go	Updates expected commands directory layout under proxsave-info.
internal/backup/collector_system_test.go	Adds tests for new critical files and SSH-key exclusion behavior; updates network report paths.
internal/backup/collector_pve_test.go	Adds manifest and selective snapshot exclusion tests for PVE collection.
internal/backup/collector_pve.go	Adds PVE manifest population, selective snapshot exclusions, and additional command captures (pools/mappings).
internal/backup/collector_pbs_test.go	Updates PBS command/output path expectations.
internal/backup/collector_pbs_extra_test.go	Adds PBS selective snapshot exclusion + per-file skip behavior tests.
internal/backup/collector_pbs_datastore_inventory_test.go	Adds PBS datastore inventory collection tests (offline + host command modes).
internal/backup/collector_pbs_commands_coverage_test.go	Expands PBS command coverage expectations and adjusts storage paths.
internal/backup/collector_paths.go	Centralizes proxsave-info path construction.
internal/backup/collector_manifest.go	Adds backup manifest output (manifest.json) and related types.
internal/backup/collector_config_extra_test.go	Updates uniqueCandidates test for new signature.
internal/backup/collector.go	Adds exclude matcher export, skipped/not-found stats, temporary excludes, output exclusion checks, and command output write path changes.
internal/backup/archiver_test.go	Adds archive exclude-pattern test coverage.
internal/backup/archiver.go	Adds archive exclude pattern support during tar walk.
install.sh	Adds robust HTTP fetch helper and release-tag parsing with jq fallback.
go.mod	Bumps toolchain and tcell dependency.
docs/TROUBLESHOOTING.md	Documents rclone scan timeout behavior and support-mode guidance.
docs/RESTORE_TECHNICAL.md	Documents smart fstab merge/remap and mount guard behavior + cleanup flag.
docs/RESTORE_DIAGRAMS.md	Updates restore diagrams for new categories and storage-mode changes.
docs/CONFIGURATION.md	Documents consistent exclusion semantics and feature-based snapshot exclusions.
docs/CLOUD_STORAGE.md	Clarifies per-command timeout during cloud scan and troubleshooting notes.
docs/CLI_REFERENCE.md	Documents --cleanup-guards usage and CLI/TUI parity note.
cmd/proxsave/main.go	Adds --cleanup-guards mode, improves update check logging, and adjusts log level for pre-check line.

Comments suppressed due to low confidence (1)

internal/backup/collector.go:1

• The new FilesSkipped stat is incremented for top-level exclusions (e.g., in safeCopyFile/safeCopyDir), but exclusions encountered during directory walking don’t increment FilesSkipped. That can make stats/manifest summaries misleading. Consider incrementing FilesSkipped here for skipped entries (and for SkipDir), so the new skip counters reflect actual behavior.

package backup

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

If "pveum pool add " fails because the pool already exists and there is no comment to apply, ok remains false and the pool is counted as failed. This can cause SAFE-apply to error out on perfectly valid systems where pools already exist. Consider treating an "already exists" add failure as success (or explicitly checking existence via a read/list command) and only counting it as failed when the pool truly cannot be created/validated.

Suggested change

	logger.Debug("Pools: add %s failed (may already exist): %v", id, addErr)
	logger.Debug("Pools: add %s failed (may already exist): %v", id, addErr)
	// Treat "already exists" as success to make SAFE-apply idempotent when pools are pre-existing.
	if strings.Contains(addErr.Error(), "already exists") {
	ok = true
	}

[Copilot]

If "pveum pool add " fails because the pool already exists and there is no comment to apply, ok remains false and the pool is counted as failed. This can cause SAFE-apply to error out on perfectly valid systems where pools already exist. Consider treating an "already exists" add failure as success (or explicitly checking existence via a read/list command) and only counting it as failed when the pool truly cannot be created/validated.

[Copilot]

PVE notifications can include secrets (e.g., --password from priv/notifications.cfg). If runPvesh includes CLI args in returned/logged error messages, this risks leaking credentials into logs. Consider routing notifications endpoint set/create calls through runPveshSensitive(..., \"--password\", ...) (or ensuring runPvesh itself redacts known sensitive flags) so failed applies never print secrets.

[Copilot]

This introduces a new CLI-exposed behavior (--cleanup-guards) with safety-sensitive mount/unmount logic, but there’s no unit test coverage shown here. Consider adding tests for guardMountpointsFromMountinfo parsing and CleanupMountGuards behavior (dry-run vs apply, handling of remaining hidden mounts, and skipping unmount when mountpoint isn’t on root FS).

[Copilot]

This introduces a new CLI-exposed behavior (--cleanup-guards) with safety-sensitive mount/unmount logic, but there’s no unit test coverage shown here. Consider adding tests for guardMountpointsFromMountinfo parsing and CleanupMountGuards behavior (dry-run vs apply, handling of remaining hidden mounts, and skipping unmount when mountpoint isn’t on root FS).

[Copilot]

This introduces a new CLI-exposed behavior (--cleanup-guards) with safety-sensitive mount/unmount logic, but there’s no unit test coverage shown here. Consider adding tests for guardMountpointsFromMountinfo parsing and CleanupMountGuards behavior (dry-run vs apply, handling of remaining hidden mounts, and skipping unmount when mountpoint isn’t on root FS).

[Copilot]

This introduces a new CLI-exposed behavior (--cleanup-guards) with safety-sensitive mount/unmount logic, but there’s no unit test coverage shown here. Consider adding tests for guardMountpointsFromMountinfo parsing and CleanupMountGuards behavior (dry-run vs apply, handling of remaining hidden mounts, and skipping unmount when mountpoint isn’t on root FS).

[codecov]

Codecov Report

❌ Patch coverage is 45.96577% with 3315 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
internal/orchestrator/restore_firewall.go	17.80%	373 Missing and 38 partials ⚠️
internal/orchestrator/restore_access_control.go	54.41%	243 Missing and 108 partials ⚠️
internal/orchestrator/restore_access_control_ui.go	0.00%	313 Missing ⚠️
internal/orchestrator/restore_ha.go	9.59%	286 Missing and 6 partials ⚠️
internal/orchestrator/network_apply_workflow_ui.go	24.18%	255 Missing and 24 partials ⚠️
internal/orchestrator/pve_staged_apply.go	17.30%	245 Missing and 13 partials ⚠️
internal/orchestrator/mount_guard.go	19.71%	222 Missing and 6 partials ⚠️
internal/orchestrator/restore_filesystem.go	40.08%	129 Missing and 19 partials ⚠️
...ternal/backup/collector_pbs_datastore_inventory.go	76.39%	75 Missing and 48 partials ⚠️
internal/orchestrator/restore_notifications.go	57.08%	85 Missing and 30 partials ⚠️
... and 25 more

📢 Thoughts on this report? Let us know!