Move MCP "runtime" logic to mcp crate.

Cargo.toml

@@ -38,6 +38,7 @@ command = { path = "crates/command" }
 command-signatures-v2 = { path = "crates/command-signatures-v2" }
 cloud_objects = { path = "crates/cloud_objects" }
 cloud_object_client = { path = "crates/cloud_object_client" }
+cloud_object_persistence = { path = "crates/cloud_object_persistence" }
 cloud_object_models = { path = "crates/cloud_object_models" }
 computer_use = { path = "crates/computer_use" }
 field_mask = { path = "crates/field_mask" }

app/Cargo.toml

@@ -297,6 +297,7 @@ wgpu.workspace = true
 app-installation-detection.workspace = true
 async-io.workspace = true
 axum.workspace = true
+cloud_object_persistence.workspace = true
 comfy-table = "7.1.4"
 inquire = "0.9.1"
 diesel = { workspace = true, features = ["sqlite", "chrono"] }

app/src/ai/agent/task.rs

@@ -13,6 +13,7 @@ use itertools::Itertools;
 use prost_types::FieldMask;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
+use warp_core::datetime_ext::DateTimeExt;
 use warp_multi_agent_api::message::tool_call::subagent::Metadata;
 use warp_multi_agent_api::message::Message;
 use warp_multi_agent_api::{self as api};
@@ -29,7 +30,6 @@ use super::{
     Shared,
 };
 use crate::ai::document::ai_document_model::{AIDocumentId, AIDocumentVersion};
-use crate::server::datetime_ext::DateTimeExt;
 use crate::terminal::model::block::BlockId;
 use crate::AIAgentTodoList;
 

app/src/ai/mcp/gallery.rs

@@ -2,13 +2,13 @@ use std::collections::HashMap;
 
 use chrono::DateTime;
 use uuid::Uuid;
+use warp_core::datetime_ext::DateTimeExt;
 use warpui::{Entity, ModelContext, SingletonEntity};
 
 use crate::ai::mcp::templatable::{
     GalleryData, JsonTemplate, TemplatableMCPServer, TemplateVariable,
 };
 use crate::server::cloud_objects::update_manager::{UpdateManager, UpdateManagerEvent};
-use crate::server::datetime_ext::DateTimeExt;
 
 #[derive(Clone, Debug)]
 pub struct GalleryMCPServer {

app/src/ai/mcp/mod.rs

@@ -1,3 +1,6 @@
+pub mod manager;
+pub mod templatable_manager;
+
 #[cfg(not(target_family = "wasm"))]
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
@@ -6,6 +9,11 @@ use std::path::{Path, PathBuf};
 use diesel::{QueryDsl, RunQueryDsl, SqliteConnection};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
+#[cfg(not(target_family = "wasm"))]
+pub use templatable_manager::McpIntegration;
+pub use templatable_manager::TemplatableMCPServerManager;
+#[cfg(not(target_family = "wasm"))]
+use warp_core::datetime_ext::DateTimeExt;
 use warp_core::ui::appearance::Appearance;
 use warp_core::ui::Icon;
 
@@ -20,18 +28,9 @@ use crate::drive::items::WarpDriveItem;
 use crate::drive::CloudObjectTypeAndId;
 #[cfg(not(target_family = "wasm"))]
 use crate::persistence::model::MCPEnvironmentVariables;
-#[cfg(not(target_family = "wasm"))]
-#[cfg(not(target_family = "wasm"))]
-use crate::server::datetime_ext::DateTimeExt;
 use crate::server::ids::SyncId;
 use crate::server::sync_queue::QueueItem;
 
-pub mod manager;
-pub mod templatable_manager;
-#[cfg(not(target_family = "wasm"))]
-pub use templatable_manager::McpIntegration;
-pub use templatable_manager::TemplatableMCPServerManager;
-
 cfg_if::cfg_if! {
     if #[cfg(not(feature = "local_fs"))] {
         mod dummy_file_based_manager;
@@ -70,8 +69,6 @@ pub mod parsing;
 #[cfg(not(target_family = "wasm"))]
 pub use parsing::ParsedTemplatableMCPServerResult;
 #[cfg(not(target_family = "wasm"))]
-pub mod http_client;
-#[cfg(not(target_family = "wasm"))]
 pub mod reconnecting_peer;
 
 impl CloudObjectUuid for MCPServer {

app/src/ai/mcp/parsing.rs

@@ -4,14 +4,14 @@ use chrono::DateTime;
 use handlebars::{get_arguments, render_template};
 #[cfg(feature = "local_fs")]
 use serde::Deserialize;
+use warp_core::datetime_ext::DateTimeExt;
 
 use crate::ai::mcp::templatable::{JsonTemplate, TemplatableMCPServer, TemplateVariable};
 use crate::ai::mcp::templatable_installation::{
     TemplatableMCPServerInstallation, VariableType, VariableValue,
 };
 #[cfg(feature = "local_fs")]
 use crate::ai::mcp::{JSONMCPServer, JSONTransportType};
-use crate::server::datetime_ext::DateTimeExt;
 
 /// Normalize MCP JSON input to ensure it has a server name wrapper.
 ///