diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7fbd59..ba42887 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,13 @@ submodule.
 ## [Unreleased]
 
 ### Changed
+- **Use the shared engine maintenance update.** Pin the CLI engine to 24db4d7, with focused command/request/lifecycle code, clearer menu and shortcut ownership, shutdown/callback fixes, and improved regression testing. Desktop keeps its existing conversation interface.
 - **Plan mode starts only through /plan.** Ordinary requests run directly, including multi-step tasks and prose outlines. Desktop no longer automatically proposes structured plans based on task complexity or model tool calls. Existing plan review, editing, execution, and recovery remain available. Settings now explain the explicit command instead of offering automatic planning.
 - **Update the bundled engine for explicit planning.** Pin the shared engine to 6915e36, including the CLI Git review feature and the opt-in host policy used by Desktop.
 - **Update the bundled engine to the RazorConsole 0.6 migration alpha (0.16.0-alpha), based on CLI v0.15.2.** The CLI gains a component-based terminal conversation, persistent prompt, completion popups, and model recovery. Desktop retains its WinUI conversation layout; full CLI migration notes are in `MandoCode/docs/CHANGELOG.md`.
 
 ### Fixed
+- **Resolve Desktop snapshot types explicitly.** Avoid ambiguous references when both the updated engine and Desktop expose snapshot helpers.
 - **Clear guidance when Ollama retires a model.** HTTP 410 Gone errors, including wrapped provider errors, identify the unavailable model and recommend choosing another with `/model` instead of restarting Ollama or pulling a retired cloud model. The shared engine does not retry these failures.
 
 ## [0.15.1] — 2026-09-24
diff --git a/MandoCode b/MandoCode
index 6915e36..24db4d7 160000
--- a/MandoCode
+++ b/MandoCode
@@ -1 +1 @@
-Subproject commit 6915e362d7cf1dca6cecae902639cb136adaa1f8
+Subproject commit 24db4d7d6ef5247ad8de3b49636aae98b0c98bfa
diff --git a/src/MandoCode.Desktop/App.xaml.cs b/src/MandoCode.Desktop/App.xaml.cs
index ef31882..1dbded2 100644
--- a/src/MandoCode.Desktop/App.xaml.cs
+++ b/src/MandoCode.Desktop/App.xaml.cs
@@ -1,3 +1,4 @@
+using SnapshotStore = MandoCode.Desktop.Services.SnapshotStore;
 using MandoCode.Models;
 using MandoCode.Services;
 using MandoCode.Desktop.Services;
diff --git a/src/MandoCode.Desktop/ViewModels/ChatController.cs b/src/MandoCode.Desktop/ViewModels/ChatController.cs
index af9e53e..36441db 100644
--- a/src/MandoCode.Desktop/ViewModels/ChatController.cs
+++ b/src/MandoCode.Desktop/ViewModels/ChatController.cs
@@ -1,9 +1,13 @@
+using SnapshotEnhancer = MandoCode.Desktop.Services.SnapshotEnhancer;
+using SnapshotNaming = MandoCode.Desktop.Services.SnapshotNaming;
 using System.Text;
 using System.Text.RegularExpressions;
 using MandoCode.Models;
 using MandoCode.Services;
 using MandoCode.Desktop.Services;
 using ModelContextProtocol.Client;
+using SnapshotStore = MandoCode.Desktop.Services.SnapshotStore;
+using ContextSnapshot = MandoCode.Desktop.Services.ContextSnapshot;
 
 namespace MandoCode.Desktop.ViewModels;