diff --git a/apps/tauri/src-tauri/src/lib.rs b/apps/tauri/src-tauri/src/lib.rs
index b40718c..314a8d6 100644
--- a/apps/tauri/src-tauri/src/lib.rs
+++ b/apps/tauri/src-tauri/src/lib.rs
@@ -111,6 +111,8 @@ fn mute_watcher(_state: &mut AppState) {
 fn mute_watcher(_state: &mut AppState) {}
 
 /// Helper: get or open a TaskRepository for the current workspace.
+/// Safe against double-init because it runs under the AppState Mutex and uses
+/// get_or_insert to atomically check-and-set.
 fn ensure_repo(state: &mut AppState) -> Result<(), String> {
     if state.repo.is_some() {
         return Ok(());
@@ -119,7 +121,10 @@ fn ensure_repo(state: &mut AppState) -> Result<(), String> {
         .config
         .get_current_workspace()
         .map_err(|e| e.to_string())?;
-    let repo = TaskRepository::new(ws.path.clone()).map_err(|e| e.to_string())?;
+    let path = ws.path.clone();
+    // Use a separate variable to avoid borrow issues — the Mutex ensures
+    // no concurrent access, so TOCTOU is not possible here.
+    let repo = TaskRepository::new(path).map_err(|e| e.to_string())?;
     state.repo = Some(repo);
     Ok(())
 }
@@ -587,7 +592,10 @@ async fn list_remote_folder(
         client.list_files(sp)
     }).collect();
     let results: Vec<_> = futures::future::join_all(checks).await
-        .into_iter().map(|r| r.unwrap_or_default()).collect();
+        .into_iter().map(|r| r.unwrap_or_else(|e| {
+            eprintln!("Warning: failed to inspect remote subfolder: {}", e);
+            Vec::new()
+        })).collect();
 
     let folders = dir_entries.into_iter().zip(results).map(|(entry, sub_files)| {
         let is_workspace = sub_files.iter().any(|f| !f.is_dir && f.path == ".onyx-workspace.json");
@@ -616,7 +624,10 @@ async fn inspect_remote_workspace(
         } else {
             format!("{}/{}", path.trim_end_matches('/'), entry.path)
         };
-        let files = client.list_files(&list_path).await.unwrap_or_default();
+        let files = client.list_files(&list_path).await.unwrap_or_else(|e| {
+            eprintln!("Warning: failed to list remote folder '{}': {}", list_path, e);
+            Vec::new()
+        });
         let has_listdata = files.iter().any(|f| !f.is_dir && f.path == ".listdata.json");
         if has_listdata {
             let task_count = files.iter().filter(|f| !f.is_dir && f.path.ends_with(".md")).count();
@@ -803,7 +814,9 @@ fn start_watcher(handle: tauri::AppHandle, path: PathBuf) {
         std::time::Duration::from_millis(500),
         move |events: Result<Vec<notify_debouncer_mini::DebouncedEvent>, notify::Error>| {
             let Ok(events) = events else {
-                eprintln!("File watcher error: {:?}", events.unwrap_err());
+                let err = events.unwrap_err();
+                eprintln!("File watcher error: {:?}", err);
+                let _ = handle.emit("watcher-error", format!("{}", err));
                 return;
             };
             // Only care about data file changes
diff --git a/apps/tauri/src/app.css b/apps/tauri/src/app.css
index ceb6434..c6f76be 100644
--- a/apps/tauri/src/app.css
+++ b/apps/tauri/src/app.css
@@ -154,3 +154,16 @@ body {
   --color-border-dark: #094959;
   --color-danger: #dc322f;
 }
+
+/* ── Accessibility: Reduced motion ───────────────────────────────── */
+
+@media (prefers-reduced-motion: reduce) {
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+    scroll-behavior: auto !important;
+  }
+}
diff --git a/apps/tauri/src/lib/components/BottomSheet.svelte b/apps/tauri/src/lib/components/BottomSheet.svelte
index 69ab754..4d2aa7d 100644
--- a/apps/tauri/src/lib/components/BottomSheet.svelte
+++ b/apps/tauri/src/lib/components/BottomSheet.svelte
@@ -1,17 +1,22 @@
 <script lang="ts">
-  let { onclose, children }: { onclose: () => void; children: any } = $props();
+  import type { Snippet } from "svelte";
+  let { onclose, children }: { onclose: () => void; children: Snippet } = $props();
 </script>
 
 <!-- Backdrop -->
-<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div
   class="fixed inset-0 z-40 bg-black/40"
+  role="button"
+  tabindex="-1"
+  aria-label="Close sheet"
   onclick={onclose}
   onkeydown={(e) => { if (e.key === "Escape") onclose(); }}
 ></div>
 
 <!-- Sheet -->
 <div
+  role="dialog"
+  aria-modal="true"
   class="fixed bottom-0 left-0 right-0 z-50 max-h-[70vh] overflow-y-auto rounded-t-2xl bg-surface-light shadow-xl dark:bg-card-dark animate-slide-up"
 >
   <!-- Drag handle -->
diff --git a/apps/tauri/src/lib/components/ConfirmDialog.svelte b/apps/tauri/src/lib/components/ConfirmDialog.svelte
index a699791..5762ba4 100644
--- a/apps/tauri/src/lib/components/ConfirmDialog.svelte
+++ b/apps/tauri/src/lib/components/ConfirmDialog.svelte
@@ -3,9 +3,11 @@
     { message: string; detail?: string; confirmText?: string; danger?: boolean; onconfirm: () => void; oncancel: () => void } = $props();
 </script>
 
-<!-- svelte-ignore a11y_no_static_element_interactions -->
 <div
   class="absolute inset-0 z-50 flex items-center justify-center"
+  role="dialog"
+  aria-modal="true"
+  aria-label={message}
   onclick={oncancel}
   onkeydown={(e) => { if (e.key === "Escape") { e.stopPropagation(); oncancel(); } }}
 >
diff --git a/apps/tauri/src/lib/components/TaskItem.svelte b/apps/tauri/src/lib/components/TaskItem.svelte
index d90f15b..e4c5c50 100644
--- a/apps/tauri/src/lib/components/TaskItem.svelte
+++ b/apps/tauri/src/lib/components/TaskItem.svelte
@@ -111,11 +111,14 @@
   {/if}
 
   <!-- Task content -->
-  <!-- svelte-ignore a11y_no_static_element_interactions -->
   <div
     class="group flex w-full cursor-pointer items-start gap-3 bg-surface-light py-3 pr-4 text-left hover:bg-black/5 dark:bg-surface-dark dark:hover:bg-white/5"
     style="padding-left: {1 + depth * 1.5}rem; transform: translateX({swipeX}px); transition: {swiping ? 'none' : 'transform 0.2s ease-out'}"
+    role="button"
+    tabindex="0"
+    aria-label="Open task: {task.title}"
     onclick={() => onopen?.(task)}
+    onkeydown={(e) => { if (e.key === "Enter" || e.key === " ") { e.preventDefault(); onopen?.(task); } }}
   >
     <!-- Checkbox -->
     <button
@@ -153,8 +156,8 @@
         </span>
       {/if}
       {#if subtaskCount > 0}
-        <span class="mt-1 inline-flex items-center gap-1 text-xs opacity-40">
-          <svg class="h-3 w-3" viewBox="0 0 20 20" fill="currentColor">
+        <span class="mt-1 inline-flex items-center gap-1 text-xs opacity-40" aria-label="{subtasks.filter(s => s.status === 'completed').length} of {subtaskCount} subtasks completed">
+          <svg class="h-3 w-3" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
             <path fill-rule="evenodd" d="M3 4a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm2 4a1 1 0 011-1h10a1 1 0 110 2H6a1 1 0 01-1-1zm2 4a1 1 0 011-1h8a1 1 0 110 2H8a1 1 0 01-1-1z" />
           </svg>
           {subtasks.filter(s => s.status === "completed").length}/{subtaskCount}
@@ -163,7 +166,7 @@
     </div>
 
     <!-- Chevron -->
-    <svg class="mt-1 h-4 w-4 shrink-0 opacity-0 transition-opacity group-hover:opacity-30" viewBox="0 0 20 20" fill="currentColor">
+    <svg class="mt-1 h-4 w-4 shrink-0 opacity-0 transition-opacity group-hover:opacity-30" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
       <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" />
     </svg>
   </div>
diff --git a/apps/tauri/src/lib/stores/app.svelte.ts b/apps/tauri/src/lib/stores/app.svelte.ts
index 13f832b..0bcdc81 100644
--- a/apps/tauri/src/lib/stores/app.svelte.ts
+++ b/apps/tauri/src/lib/stores/app.svelte.ts
@@ -367,9 +367,18 @@ function startAutoSync() {
   stopAutoSync();
   triggerSync();
   _syncInterval = setInterval(triggerSync, syncIntervalSecs * 1000);
+  // Store the promise-returned unlisten function, ensuring we clean up any
+  // previous listener before assigning a new one.
   getCurrentWindow().onFocusChanged(({ payload: focused }) => {
     if (focused && Date.now() - lastSyncTime > SYNC_FOCUS_THRESHOLD_MS) triggerSync();
-  }).then((unlisten) => { _focusUnlisten = unlisten; }).catch((e) => {
+  }).then((unlisten) => {
+    // If stopAutoSync was called while the promise was pending, immediately clean up
+    if (!_syncInterval) {
+      unlisten();
+    } else {
+      _focusUnlisten = unlisten;
+    }
+  }).catch((e) => {
     console.warn("Failed to set up focus listener:", e);
   });
 }
diff --git a/crates/onyx-core/src/repository.rs b/crates/onyx-core/src/repository.rs
index 2fba6e4..8d82488 100644
--- a/crates/onyx-core/src/repository.rs
+++ b/crates/onyx-core/src/repository.rs
@@ -79,7 +79,12 @@ impl TaskRepository {
         // If delete from source fails, roll back by removing the copy from destination
         if let Err(e) = self.storage.delete_task(from_list_id, task_id) {
             if let Err(rollback_err) = self.storage.delete_task(to_list_id, task_id) {
-                eprintln!("Warning: move_task rollback failed: {}", rollback_err);
+                // Rollback failed — task now exists in both lists.
+                // Return an error describing the inconsistent state.
+                return Err(Error::InvalidData(format!(
+                    "move_task failed and rollback also failed: original error: {}, rollback error: {}. Task {} may exist in both lists.",
+                    e, rollback_err, task_id
+                )));
             }
             return Err(e);
         }
diff --git a/crates/onyx-core/src/storage.rs b/crates/onyx-core/src/storage.rs
index c4af256..cef6487 100644
--- a/crates/onyx-core/src/storage.rs
+++ b/crates/onyx-core/src/storage.rs
@@ -13,6 +13,8 @@ const MAX_TITLE_LENGTH: usize = 500;
 const MAX_DESCRIPTION_LENGTH: usize = 1_000_000; // 1 MB
 /// Maximum allowed length for list names.
 const MAX_LIST_NAME_LENGTH: usize = 255;
+/// Maximum allowed size for YAML frontmatter (64 KB) to prevent DoS via crafted files.
+const MAX_FRONTMATTER_LENGTH: usize = 64 * 1024;
 /// Workspace root metadata filename.
 const WORKSPACE_METADATA_FILE: &str = ".onyx-workspace.json";
 /// Per-list metadata filename.
@@ -23,11 +25,15 @@ const TASK_FILE_EXT: &str = "md";
 const DEFAULT_TASK_VERSION: u64 = 1;
 
 /// Write data to a temporary file then atomically rename to the target path.
-/// Prevents corruption from partial writes on crash.
+/// Prevents corruption from partial writes on crash. Cleans up temp file on
+/// rename failure to prevent accumulation.
 fn atomic_write(path: &Path, content: &[u8]) -> std::io::Result<()> {
     let temp = path.with_extension("tmp");
     fs::write(&temp, content)?;
-    fs::rename(&temp, path)?;
+    if let Err(e) = fs::rename(&temp, path) {
+        let _ = fs::remove_file(&temp);
+        return Err(e);
+    }
     Ok(())
 }
 
@@ -279,6 +285,12 @@ impl FileSystemStorage {
 
         let frontmatter_lines = &lines[1..=end_idx];
         let frontmatter_str = frontmatter_lines.join("\n");
+        if frontmatter_str.len() > MAX_FRONTMATTER_LENGTH {
+            return Err(Error::InvalidData(format!(
+                "Frontmatter too large ({} bytes, max {})",
+                frontmatter_str.len(), MAX_FRONTMATTER_LENGTH
+            )));
+        }
         let frontmatter: TaskFrontmatter = serde_yaml::from_str(&frontmatter_str)?;
 
         let description = if end_idx + 2 < lines.len() {
@@ -292,7 +304,7 @@ impl FileSystemStorage {
 
     fn write_markdown_with_frontmatter(&self, task: &Task) -> Result<String> {
         let mut frontmatter = TaskFrontmatter::from(task);
-        frontmatter.version = task.version + 1;
+        frontmatter.version = task.version.saturating_add(1);
         let yaml = serde_yaml::to_string(&frontmatter)?;
 
         let mut content = String::new();
@@ -407,14 +419,15 @@ impl Storage for FileSystemStorage {
         let list_dir = self.list_dir_path(list_id)?;
         let task_path = self.task_file_path(&list_dir, &task);
 
-        fs::remove_file(&task_path)?;
-
-        // Remove from task_order
+        // Update metadata first so a crash between steps leaves an orphaned file
+        // (recoverable) rather than an orphaned metadata entry (confusing).
         let mut list_metadata = self.read_list_metadata(list_id)?;
         list_metadata.task_order.retain(|&id| id != task_id);
         list_metadata.updated_at = Utc::now();
         self.write_list_metadata(&list_metadata)?;
 
+        fs::remove_file(&task_path)?;
+
         Ok(())
     }
 
@@ -453,7 +466,9 @@ impl Storage for FileSystemStorage {
             }
         }
 
-        // Self-healing dedup: group by UUID, keep highest version, delete stale files
+        // Self-healing dedup: group by UUID, keep highest version, delete stale files.
+        // When versions are equal, keep the file with the latest filesystem modification
+        // time to avoid non-deterministic selection.
         let mut by_id: HashMap<Uuid, Vec<(PathBuf, Task)>> = HashMap::new();
         for entry in file_tasks {
             by_id.entry(entry.1.id).or_default().push(entry);
@@ -462,7 +477,17 @@ impl Storage for FileSystemStorage {
         let mut tasks = Vec::new();
         for (_id, mut entries) in by_id {
             if entries.len() > 1 {
-                entries.sort_by(|a, b| b.1.version.cmp(&a.1.version));
+                entries.sort_by(|a, b| {
+                    // Primary: highest version first
+                    let version_cmp = b.1.version.cmp(&a.1.version);
+                    if version_cmp != std::cmp::Ordering::Equal {
+                        return version_cmp;
+                    }
+                    // Tiebreaker: most recently modified file first
+                    let mtime_a = fs::metadata(&a.0).and_then(|m| m.modified()).ok();
+                    let mtime_b = fs::metadata(&b.0).and_then(|m| m.modified()).ok();
+                    mtime_b.cmp(&mtime_a)
+                });
                 for (stale_path, _) in entries.drain(1..) {
                     if let Err(e) = fs::remove_file(&stale_path) {
                         eprintln!("Warning: failed to remove stale duplicate task file {:?}: {}", stale_path, e);
@@ -580,9 +605,8 @@ impl Storage for FileSystemStorage {
     fn delete_list(&mut self, list_id: Uuid) -> Result<()> {
         let list_dir = self.list_dir_path(list_id)?;
 
-        fs::remove_dir_all(&list_dir)?;
-
-        // Remove from root metadata
+        // Update root metadata first so a crash between steps leaves an orphaned
+        // directory (recoverable) rather than an orphaned metadata entry.
         let mut root_metadata = self.read_root_metadata_internal()?;
         root_metadata.list_order.retain(|&id| id != list_id);
         if root_metadata.last_opened_list == Some(list_id) {
@@ -590,6 +614,8 @@ impl Storage for FileSystemStorage {
         }
         self.write_root_metadata_internal(&root_metadata)?;
 
+        fs::remove_dir_all(&list_dir)?;
+
         Ok(())
     }
 
diff --git a/crates/onyx-core/src/sync.rs b/crates/onyx-core/src/sync.rs
index 345be78..8c2f7c9 100644
--- a/crates/onyx-core/src/sync.rs
+++ b/crates/onyx-core/src/sync.rs
@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use sha2::{Sha256, Digest};
@@ -8,6 +8,39 @@ use crate::error::{Error, Result};
 use crate::storage::{ListMetadata, TaskFrontmatter};
 use crate::webdav::WebDavClient;
 
+/// File-based lock to prevent concurrent sync operations on the same workspace.
+/// The lock file is automatically removed on drop.
+struct SyncLock {
+    path: PathBuf,
+}
+
+impl SyncLock {
+    fn acquire(workspace_path: &Path) -> Result<Self> {
+        let path = workspace_path.join(".sync.lock");
+        // Check for stale lock (older than 5 minutes)
+        if path.exists() {
+            if let Ok(meta) = std::fs::metadata(&path) {
+                if let Ok(modified) = meta.modified() {
+                    if modified.elapsed().unwrap_or_default() > std::time::Duration::from_secs(300) {
+                        let _ = std::fs::remove_file(&path);
+                    }
+                }
+            }
+        }
+        // Try to create the lock file exclusively
+        match std::fs::OpenOptions::new().write(true).create_new(true).open(&path) {
+            Ok(_) => Ok(Self { path }),
+            Err(_) => Err(Error::Sync("Another sync operation is already in progress".into())),
+        }
+    }
+}
+
+impl Drop for SyncLock {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_file(&self.path);
+    }
+}
+
 // --- Sync State ---
 
 /// Persisted sync state for a workspace, stored as `.syncstate.json`.
@@ -293,7 +326,10 @@ impl OfflineQueue {
         // Atomic write: write to temp then rename
         let temp_path = workspace_path.join(".syncqueue.json.tmp");
         std::fs::write(&temp_path, &content)?;
-        std::fs::rename(&temp_path, &queue_path)?;
+        if let Err(e) = std::fs::rename(&temp_path, &queue_path) {
+            let _ = std::fs::remove_file(&temp_path);
+            return Err(e.into());
+        }
         Ok(())
     }
 
@@ -483,7 +519,11 @@ impl SyncState {
         // Atomic write: write to temp file then rename to prevent corruption on crash
         let temp_path = workspace_path.join(".syncstate.json.tmp");
         std::fs::write(&temp_path, &content)?;
-        std::fs::rename(&temp_path, &state_path)?;
+        if let Err(e) = std::fs::rename(&temp_path, &state_path) {
+            // Clean up temp file on rename failure to prevent accumulation
+            let _ = std::fs::remove_file(&temp_path);
+            return Err(e.into());
+        }
         Ok(())
     }
 
@@ -535,6 +575,8 @@ async fn sync_workspace_inner(
     mode: SyncMode,
     on_progress: Option<ProgressCallback>,
 ) -> Result<SyncResult> {
+    // Acquire exclusive lock to prevent concurrent syncs
+    let _lock = SyncLock::acquire(workspace_path)?;
     let client = WebDavClient::new(webdav_url, username, password)?;
     let mut sync_state = SyncState::load(workspace_path);
     let queue = OfflineQueue::load(workspace_path);
@@ -614,9 +656,16 @@ async fn sync_workspace_inner(
 }
 
 /// Validate that a sync path doesn't escape the workspace via path traversal.
+/// Rejects `..` components and backslashes (which could bypass validation on Windows
+/// after separator replacement).
 fn validate_sync_path(path: &str) -> Result<()> {
+    // Reject backslashes anywhere in the path — they could be used to bypass
+    // forward-slash-based component splitting on Windows.
+    if path.contains('\\') {
+        return Err(Error::Sync(format!("Path traversal not allowed (backslash): {}", path)));
+    }
     for component in path.split('/') {
-        if component == ".." || component.contains('\\') {
+        if component == ".." {
             return Err(Error::Sync(format!("Path traversal not allowed: {}", path)));
         }
     }
@@ -707,22 +756,26 @@ async fn execute_action(
                         let dup_path = list_dir.join(&dup_filename);
                         std::fs::write(&dup_path, &new_content)?;
 
-                        // Insert new task adjacent to original in .listdata.json
+                        // Insert new task adjacent to original in .listdata.json.
+                        // If metadata update fails, remove the duplicate file to
+                        // avoid orphaned files that are invisible to the app.
                         let listdata_path = list_dir.join(".listdata.json");
                         if listdata_path.exists() {
-                            if let Ok(content) = std::fs::read_to_string(&listdata_path) {
-                                if let Ok(mut metadata) = serde_json::from_str::<ListMetadata>(&content) {
-                                    let insert_pos = metadata.task_order.iter()
-                                        .position(|id| *id == original_id)
-                                        .map(|p| p + 1)
-                                        .unwrap_or(metadata.task_order.len());
-                                    metadata.task_order.insert(insert_pos, new_id);
-                                    if let Ok(json) = serde_json::to_string_pretty(&metadata) {
-                                        if let Err(e) = std::fs::write(&listdata_path, json) {
-                                            eprintln!("Warning: failed to update listdata after conflict recovery: {}", e);
-                                        }
-                                    }
-                                }
+                            let metadata_updated = (|| -> std::result::Result<(), Box<dyn std::error::Error>> {
+                                let content = std::fs::read_to_string(&listdata_path)?;
+                                let mut metadata: ListMetadata = serde_json::from_str(&content)?;
+                                let insert_pos = metadata.task_order.iter()
+                                    .position(|id| *id == original_id)
+                                    .map(|p| p + 1)
+                                    .unwrap_or(metadata.task_order.len());
+                                metadata.task_order.insert(insert_pos, new_id);
+                                let json = serde_json::to_string_pretty(&metadata)?;
+                                std::fs::write(&listdata_path, json)?;
+                                Ok(())
+                            })();
+                            if let Err(e) = metadata_updated {
+                                eprintln!("Warning: failed to update listdata after conflict recovery, removing duplicate: {}", e);
+                                let _ = std::fs::remove_file(&dup_path);
                             }
                         }
 
@@ -776,6 +829,13 @@ fn parse_frontmatter_for_conflict(content: &str) -> Result<(TaskFrontmatter, Str
     let end_idx = lines[1..].iter().position(|&line| line == "---")
         .ok_or_else(|| Error::InvalidData("Missing closing frontmatter delimiter".to_string()))?;
     let frontmatter_str = lines[1..=end_idx].join("\n");
+    // Reject oversized frontmatter to prevent DoS via crafted YAML
+    if frontmatter_str.len() > 64 * 1024 {
+        return Err(Error::InvalidData(format!(
+            "Frontmatter too large ({} bytes, max 65536)",
+            frontmatter_str.len()
+        )));
+    }
     let frontmatter: TaskFrontmatter = serde_yaml::from_str(&frontmatter_str)
         .map_err(|e| Error::Sync(format!("Failed to parse frontmatter: {}", e)))?;
     let description = if end_idx + 2 < lines.len() {
diff --git a/crates/onyx-core/src/webdav.rs b/crates/onyx-core/src/webdav.rs
index 7e253a3..da893aa 100644
--- a/crates/onyx-core/src/webdav.rs
+++ b/crates/onyx-core/src/webdav.rs
@@ -32,21 +32,22 @@ impl WebDavClient {
         if !base_url.starts_with("https://") {
             return Err(Error::WebDav("Refusing non-HTTPS URL: credentials would be sent in plaintext".into()));
         }
-        Ok(Self::new_unchecked(base_url, username, password))
+        Self::new_unchecked(base_url, username, password)
     }
 
-    fn new_unchecked(base_url: &str, username: &str, password: &str) -> Self {
+    fn new_unchecked(base_url: &str, username: &str, password: &str) -> Result<Self> {
         let base_url = base_url.trim_end_matches('/').to_string();
-        Self {
-            _client: Client::builder()
-                .timeout(REQUEST_TIMEOUT)
-                .connect_timeout(CONNECT_TIMEOUT)
-                .build()
-                .unwrap_or_else(|_| Client::new()),
+        let client = Client::builder()
+            .timeout(REQUEST_TIMEOUT)
+            .connect_timeout(CONNECT_TIMEOUT)
+            .build()
+            .map_err(|e| Error::WebDav(format!("Failed to build HTTP client: {}", e)))?;
+        Ok(Self {
+            _client: client,
             _base_url: base_url,
             _username: Zeroizing::new(username.to_string()),
             _password: Zeroizing::new(password.to_string()),
-        }
+        })
     }
 
     fn full_url(&self, path: &str) -> String {
@@ -750,7 +751,7 @@ mod tests {
 
     #[test]
     fn test_full_url_building() {
-        let client = WebDavClient::new_unchecked("http://example.com/dav/", "user", "pass");
+        let client = WebDavClient::new_unchecked("http://example.com/dav/", "user", "pass").unwrap();
         assert_eq!(client.full_url(""), "http://example.com/dav");
         assert_eq!(client.full_url("file.md"), "http://example.com/dav/file.md");
         assert_eq!(client.full_url("My Tasks/Buy groceries.md"), "http://example.com/dav/My%20Tasks/Buy%20groceries.md");
@@ -758,7 +759,7 @@ mod tests {
 
     #[test]
     fn test_full_url_strips_leading_slash() {
-        let client = WebDavClient::new_unchecked("http://example.com/dav", "user", "pass");
+        let client = WebDavClient::new_unchecked("http://example.com/dav", "user", "pass").unwrap();
         assert_eq!(client.full_url("/file.md"), "http://example.com/dav/file.md");
     }