@pheem49/mint 1.15.0 → 1.16.0

package/crates/mint-core/src/api_server/routes/chat.rs

@@ -3,7 +3,88 @@ use tokio::net::TcpStream;
 
 use super::super::*;
 
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct ApiChatRequest {
+    message: String,
+    attachment_metadata: Option<crate::library::AttachmentMetadata>,
+    system_instruction: Option<String>,
+    chat_id: Option<String>,
+    image_data_uri: Option<String>,
+    audio_data_uri: Option<String>,
+    video_data_uri: Option<String>,
+    document_attachment: Option<crate::chat::DocumentAttachment>,
+    #[serde(default)]
+    workspace_path: Option<String>,
+    agent_id: Option<String>,
+    #[serde(default)]
+    plan_mode: bool,
+    #[serde(default)]
+    pinned_mcp_server: Option<String>,
+    #[serde(default)]
+    temperature: Option<f64>,
+    #[serde(default)]
+    thinking_enabled: Option<bool>,
+    #[serde(default)]
+    thinking_effort: Option<String>,
+}
+
+impl ApiChatRequest {
+    fn into_chat_request(self, config: &MintConfig) -> ChatRequest {
+        ChatRequest {
+            message: self.message,
+            system_instruction: self.system_instruction.unwrap_or_default(),
+            chat_id: self.chat_id,
+            image_data_uri: self.image_data_uri,
+            audio_data_uri: self.audio_data_uri,
+            video_data_uri: self.video_data_uri,
+            document_attachment: self.document_attachment,
+            workspace_path: self.workspace_path,
+            agent_id: self.agent_id,
+            plan_mode: self.plan_mode,
+            pinned_mcp_server: self.pinned_mcp_server,
+            messages: None,
+            tools: None,
+            temperature: self.temperature.or(config.temperature),
+            thinking_enabled: self.thinking_enabled,
+            thinking_effort: self.thinking_effort,
+            ..Default::default()
+        }
+    }
+}
+
 pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpStream) {
+    let owner = match background_request_owner(ctx.request_str) {
+        Ok(owner) => owner,
+        Err(message) => {
+            send_json_response(
+                socket,
+                "401 Unauthorized",
+                &json!({"message": message}).to_string(),
+            )
+            .await;
+            return;
+        }
+    };
+    if ctx.method == "POST" && matches!(ctx.route, "/api/chat" | "/api/chat-stream") {
+        if let Ok(value) = serde_json::from_str::<Value>(ctx.body) {
+            let chat = value
+                .get("chatId")
+                .or_else(|| value.get("chat_id"))
+                .and_then(Value::as_str)
+                .unwrap_or(DEFAULT_CONVERSATION_ID);
+            if !crate::bg_shell::bind_chat_owner(chat, owner) {
+                send_json_response(
+                    socket,
+                    "403 Forbidden",
+                    "{\"message\":\"Conversation belongs to another user\"}",
+                )
+                .await;
+                return;
+            }
+        }
+    }
+
     let RequestCtx {
         method,
         route,
@@ -16,79 +97,56 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
     } = ctx;
     match (method, route) {
         ("POST", "/api/chat") => {
-            #[derive(Deserialize)]
-            #[serde(rename_all = "camelCase")]
-            struct ApiChatRequest {
-                message: String,
-                system_instruction: Option<String>,
-                chat_id: Option<String>,
-                image_data_uri: Option<String>,
-                audio_data_uri: Option<String>,
-                video_data_uri: Option<String>,
-                document_attachment: Option<crate::chat::DocumentAttachment>,
-                #[serde(default)]
-                workspace_path: Option<String>,
-                agent_id: Option<String>,
-                #[serde(default)]
-                pinned_mcp_server: Option<String>,
-                #[serde(default)]
-                temperature: Option<f64>,
-                #[serde(default)]
-                thinking_enabled: Option<bool>,
-                #[serde(default)]
-                thinking_effort: Option<String>,
-            }
-
             if let Ok(req) = serde_json::from_str::<ApiChatRequest>(body) {
                 let config = load_config().unwrap_or_default();
-                let chat_req = ChatRequest {
-                    message: req.message,
-                    system_instruction: req.system_instruction.unwrap_or_default(),
-                    chat_id: req.chat_id,
-                    image_data_uri: req.image_data_uri,
-                    audio_data_uri: req.audio_data_uri,
-                    video_data_uri: req.video_data_uri,
-                    document_attachment: req.document_attachment,
-                    workspace_path: req.workspace_path,
-                    agent_id: req.agent_id,
-                    plan_mode: false,
-                    pinned_mcp_server: req.pinned_mcp_server,
-                    messages: None,
-                    tools: None,
-                    temperature: req.temperature.or(config.temperature),
-                    thinking_enabled: req.thinking_enabled,
-                    thinking_effort: req.thinking_effort,
-                    ..Default::default()
-                };
-                let mut chat_req = match chat_req.with_document_context(&config) {
-                    Ok(req) => req,
-                    Err(error) => {
-                        log_api_err("API /api/chat document error", &error);
-                        let err_json = serde_json::json!({
-                            "text": format!("Could not read the attached document: {error}")
-                        });
-                        send_json_response(socket, "400 Bad Request", &err_json.to_string()).await;
-                        return;
-                    }
-                };
-                let sent_image = chat_req.image_data_uri.clone();
-                let sent_video = chat_req.video_data_uri.clone();
-                let sent_message = chat_req.message.clone();
+                let metadata = req.attachment_metadata.clone();
+                let chat_req = req.into_chat_request(&config);
+                let (mut chat_req, receipt) =
+                    match crate::library::prepare_chat(&chat_req, metadata.as_ref(), &config).await
+                    {
+                        Ok(prepared) => prepared,
+                        Err(error) => {
+                            log_api_err("API /api/chat document error", &error);
+                            let err_json = serde_json::json!({
+                                "text": format!("Could not read the attached document: {error}")
+                            });
+                            send_json_response(socket, "400 Bad Request", &err_json.to_string())
+                                .await;
+                            return;
+                        }
+                    };
 
-                let response = if let Some(clean_message) =
-                    chat_req.message.strip_prefix("/chat ").map(str::to_owned)
-                {
-                    chat_req.message = clean_message;
-                    if chat_req.system_instruction.trim().is_empty() {
-                        chat_req.system_instruction = default_chat_system_instruction();
-                    }
-                    orchestrate_chat_with_fallback(&config, &chat_req)
-                        .await
-                        .map(|(response, _)| response)
-                        .map_err(|error| error.to_string())
-                } else {
-                    run_web_agent_loop(&config, &chat_req).await
-                };
+                let expected_chat_id = chat_req
+                    .chat_id
+                    .clone()
+                    .unwrap_or_else(|| DEFAULT_CONVERSATION_ID.into());
+                let response = crate::with_turn_start_listener(
+                    expected_chat_id,
+                    move |id| {
+                        if let Some(receipt) = &receipt
+                            && let Err(error) = receipt.bind(id)
+                        {
+                            eprintln!("Library reference: {error}")
+                        }
+                    },
+                    async {
+                        if let Some(clean_message) =
+                            chat_req.message.strip_prefix("/chat ").map(str::to_owned)
+                        {
+                            chat_req.message = clean_message;
+                            if chat_req.system_instruction.trim().is_empty() {
+                                chat_req.system_instruction = default_chat_system_instruction();
+                            }
+                            orchestrate_chat_with_fallback(&config, &chat_req)
+                                .await
+                                .map(|(response, _)| response)
+                                .map_err(|error| error.to_string())
+                        } else {
+                            run_web_agent_loop(&config, &chat_req).await
+                        }
+                    },
+                )
+                .await;
 
                 match response {
                     Ok(resp) => {
@@ -98,26 +156,6 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                             "200 OK",
                             Some(&format!("Model: {} | {}", config.ai_provider, auth_label)),
                         );
-                        if let Some(image) = sent_image {
-                            let _ = save_chat_images(
-                                image
-                                    .split_whitespace()
-                                    .map(str::to_owned)
-                                    .collect::<Vec<_>>(),
-                                Some("web".into()),
-                                Some(sent_message.clone()),
-                            );
-                        }
-                        if let Some(video) = sent_video {
-                            let _ = save_chat_images(
-                                video
-                                    .split_whitespace()
-                                    .map(str::to_owned)
-                                    .collect::<Vec<_>>(),
-                                Some("web".into()),
-                                Some(sent_message),
-                            );
-                        }
                         if let Ok(json_str) = serde_json::to_string(&resp) {
                             send_json_response(socket, "200 OK", &json_str).await;
                             return;
@@ -190,64 +228,24 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
         }
 
         ("POST", "/api/chat-stream") => {
-            #[derive(Deserialize)]
-            #[serde(rename_all = "camelCase")]
-            struct ApiChatRequest {
-                message: String,
-                system_instruction: Option<String>,
-                chat_id: Option<String>,
-                image_data_uri: Option<String>,
-                audio_data_uri: Option<String>,
-                video_data_uri: Option<String>,
-                document_attachment: Option<crate::chat::DocumentAttachment>,
-                #[serde(default)]
-                workspace_path: Option<String>,
-                agent_id: Option<String>,
-                #[serde(default)]
-                pinned_mcp_server: Option<String>,
-                #[serde(default)]
-                temperature: Option<f64>,
-                #[serde(default)]
-                thinking_enabled: Option<bool>,
-                #[serde(default)]
-                thinking_effort: Option<String>,
-            }
-
             if let Ok(req) = serde_json::from_str::<ApiChatRequest>(body) {
                 let config = load_config().unwrap_or_default();
-                let chat_req = ChatRequest {
-                    message: req.message,
-                    system_instruction: req.system_instruction.unwrap_or_default(),
-                    chat_id: req.chat_id,
-                    image_data_uri: req.image_data_uri,
-                    audio_data_uri: req.audio_data_uri,
-                    video_data_uri: req.video_data_uri,
-                    document_attachment: req.document_attachment,
-                    workspace_path: req.workspace_path,
-                    agent_id: req.agent_id,
-                    plan_mode: false,
-                    pinned_mcp_server: req.pinned_mcp_server,
-                    messages: None,
-                    tools: None,
-                    temperature: req.temperature.or(config.temperature),
-                    thinking_enabled: req.thinking_enabled,
-                    thinking_effort: req.thinking_effort,
-                    ..Default::default()
-                };
-                let mut chat_req = match chat_req.with_document_context(&config) {
-                    Ok(req) => req,
-                    Err(error) => {
-                        log_api_err("API /api/chat-stream document error", &error);
-                        let err_json = serde_json::json!({
-                            "text": format!("Could not read the attached document: {error}")
-                        });
-                        send_json_response(socket, "400 Bad Request", &err_json.to_string()).await;
-                        return;
-                    }
-                };
-                let sent_image = chat_req.image_data_uri.clone();
-                let sent_video = chat_req.video_data_uri.clone();
-                let sent_message = chat_req.message.clone();
+                let metadata = req.attachment_metadata.clone();
+                let chat_req = req.into_chat_request(&config);
+                let (mut chat_req, receipt) =
+                    match crate::library::prepare_chat(&chat_req, metadata.as_ref(), &config).await
+                    {
+                        Ok(prepared) => prepared,
+                        Err(error) => {
+                            log_api_err("API /api/chat-stream document error", &error);
+                            let err_json = serde_json::json!({
+                                "text": format!("Could not read the attached document: {error}")
+                            });
+                            send_json_response(socket, "400 Bad Request", &err_json.to_string())
+                                .await;
+                            return;
+                        }
+                    };
 
                 let is_chat = if let Some(clean_message) =
                     chat_req.message.strip_prefix("/chat ").map(str::to_owned)
@@ -307,6 +305,7 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                                     .clone()
                                     .unwrap_or_else(|| DEFAULT_CONVERSATION_ID.to_owned());
                                 let result = crate::with_turn_start_listener(expected_chat_id, move |id| {
+                                    if let Some(receipt)=&receipt && let Err(error)=receipt.bind(id){eprintln!("Library reference: {error}")}
                                     let event = serde_json::json!({ "type": "started", "interactionId": id });
                                     let _ = tx_started.send(format!("{}\n", event));
                                 }, orchestrate_chat_stream_with_fallback(
@@ -360,6 +359,7 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                                 }
                             });
 
+                            let registered_task_id = join_handle.id();
                             let abort_handle = join_handle.abort_handle();
                             if !chat_id_str.is_empty() {
                                 crate::ACTIVE_AGENTS
@@ -372,10 +372,10 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                             tokio::spawn(async move {
                                 let _ = join_handle.await;
                                 if !chat_id_str_cleanup.is_empty() {
-                                    crate::ACTIVE_AGENTS
-                                        .lock()
-                                        .unwrap()
-                                        .remove(&chat_id_str_cleanup);
+                                    crate::unregister_agent(
+                                        &chat_id_str_cleanup,
+                                        registered_task_id,
+                                    );
                                 }
                             });
                         } else {
@@ -413,38 +413,22 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                             let audio_data_uri = chat_req.audio_data_uri.clone();
                             let video_data_uri = chat_req.video_data_uri.clone();
                             let agent_id = chat_req.agent_id.clone();
+                            let plan_mode = chat_req.plan_mode;
                             let pinned_mcp_server = chat_req.pinned_mcp_server.clone();
                             let tx_approval = tx.clone();
                             let tx_started = tx.clone();
 
                             let join_handle = tokio::spawn(async move {
-                                // Real (not auto-deny) approval flow: the request-payload
-                                // shape and blocking mechanism mirror desktop's approve_cb
-                                // (src-tauri/src/lib.rs) exactly, but the "requested" event
-                                // rides this same ndjson stream instead of a Tauri event,
-                                // and the token is a UUID (not a sequential counter) since
-                                // this endpoint, unlike Tauri IPC, is LAN-reachable by
-                                // default — see mint_core::PENDING_APPROVALS' docs.
                                 let approve_cb = move |approval: &AgentApproval| -> Result<ApprovalOutcome, String> {
-                                    let (approval_tx, approval_rx) = tokio::sync::oneshot::channel();
-                                    let token = uuid::Uuid::new_v4().to_string();
-                                    crate::PENDING_APPROVALS
-                                        .lock()
-                                        .unwrap()
-                                        .insert(token.clone(), approval_tx);
-                                    if let Ok(json_val) = serde_json::to_string(&serde_json::json!({
-                                        "type": "approval-requested",
-                                        "token": token,
-                                        "approval": approval
-                                    })) {
-                                        let _ = tx_approval.send(format!("{}\n", json_val));
-                                    }
-                                    Ok(tokio::task::block_in_place(move || {
-                                        tokio::runtime::Handle::current().block_on(approval_rx)
+                                    crate::PENDING_APPROVALS.request_blocking(|token| {
+                                        let event = serde_json::to_string(&serde_json::json!({
+                                            "type": "approval-requested", "token": token, "approval": approval
+                                        })).map_err(|error| error.to_string())?;
+                                        tx_approval.send(format!("{event}\n")).map_err(|error| error.to_string())
                                     })
-                                    .unwrap_or(ApprovalOutcome::Denied))
                                 };
                                 let result = crate::with_turn_start_listener(agent_scoped_chat_id.clone(), move |id| {
+                                    if let Some(receipt)=&receipt && let Err(error)=receipt.bind(id){eprintln!("Library reference: {error}")}
                                     let event = serde_json::json!({ "type": "started", "interactionId": id });
                                     let _ = tx_started.send(format!("{}\n", event));
                                 }, orchestrate_agent_loop(
@@ -459,7 +443,7 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                                     None,
                                     pinned_mcp_server.as_deref(),
                                     fast_mode,
-                                    false,
+                                    plan_mode,
                                     approve_cb,
                                     progress_cb,
                                     on_chunk,
@@ -504,6 +488,7 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                                 }
                             });
 
+                            let registered_task_id = join_handle.id();
                             let abort_handle = join_handle.abort_handle();
                             if !chat_id_str.is_empty() {
                                 crate::ACTIVE_AGENTS
@@ -516,10 +501,10 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                             tokio::spawn(async move {
                                 let _ = join_handle.await;
                                 if !chat_id_str_cleanup.is_empty() {
-                                    crate::ACTIVE_AGENTS
-                                        .lock()
-                                        .unwrap()
-                                        .remove(&chat_id_str_cleanup);
+                                    crate::unregister_agent(
+                                        &chat_id_str_cleanup,
+                                        registered_task_id,
+                                    );
                                 }
                             });
                         }
@@ -533,27 +518,6 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
                         }
                         let _ = socket.flush().await;
                     }
-
-                    if let Some(image) = sent_image {
-                        let _ = save_chat_images(
-                            image
-                                .split_whitespace()
-                                .map(str::to_owned)
-                                .collect::<Vec<_>>(),
-                            Some("web".into()),
-                            Some(sent_message.clone()),
-                        );
-                    }
-                    if let Some(video) = sent_video {
-                        let _ = save_chat_images(
-                            video
-                                .split_whitespace()
-                                .map(str::to_owned)
-                                .collect::<Vec<_>>(),
-                            Some("web".into()),
-                            Some(sent_message),
-                        );
-                    }
                 }
                 return;
             }
@@ -570,3 +534,56 @@ pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, mut socket: TcpS
         ),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn api_chat_request_preserves_plan_mode_and_conversation_context() {
+        let request: ApiChatRequest = serde_json::from_value(json!({
+            "message": "inspect", "systemInstruction": "read only", "chatId": "chat-1",
+            "workspacePath": "/project", "agentId": "agent-1", "pinnedMcpServer": "mcp-1",
+            "imageDataUri": "image", "audioDataUri": "audio", "videoDataUri": "video",
+            "planMode": true, "temperature": 0.4, "thinkingEnabled": true, "thinkingEffort": "high"
+        }))
+        .unwrap();
+        let config = MintConfig {
+            temperature: Some(0.8),
+            ..Default::default()
+        };
+        let request = request.into_chat_request(&config);
+        assert!(request.plan_mode);
+        assert_eq!(request.message, "inspect");
+        assert_eq!(request.system_instruction, "read only");
+        assert_eq!(request.chat_id.as_deref(), Some("chat-1"));
+        assert_eq!(request.workspace_path.as_deref(), Some("/project"));
+        assert_eq!(request.agent_id.as_deref(), Some("agent-1"));
+        assert_eq!(request.pinned_mcp_server.as_deref(), Some("mcp-1"));
+        assert_eq!(request.image_data_uri.as_deref(), Some("image"));
+        assert_eq!(request.audio_data_uri.as_deref(), Some("audio"));
+        assert_eq!(request.video_data_uri.as_deref(), Some("video"));
+        assert_eq!(request.temperature, Some(0.4));
+        assert_eq!(request.thinking_enabled, Some(true));
+        assert_eq!(request.thinking_effort.as_deref(), Some("high"));
+    }
+
+    #[test]
+    fn api_chat_request_defaults_to_agent_mode_and_config_temperature() {
+        for body in [
+            r#"{"message":"hello"}"#,
+            r#"{"message":"hello","planMode":false,"systemInstruction":null}"#,
+        ] {
+            let request: ApiChatRequest = serde_json::from_str(body).unwrap();
+            let request = request.into_chat_request(&MintConfig {
+                temperature: Some(0.8),
+                ..Default::default()
+            });
+            assert!(!request.plan_mode);
+            assert_eq!(request.system_instruction, "");
+            assert_eq!(request.temperature, Some(0.8));
+            assert!(request.messages.is_none());
+            assert!(request.tools.is_none());
+        }
+    }
+}

package/crates/mint-core/src/api_server/routes/html_preview.rs

@@ -0,0 +1,77 @@
+use super::{super::*, RequestCtx};
+use tokio::net::TcpStream;
+
+pub(in crate::api_server) async fn execute(ctx: RequestCtx<'_>, socket: TcpStream) {
+    // Preview URLs deliberately bind only to loopback, matching native Desktop.
+    if socket
+        .peer_addr()
+        .map_or(true, |address| !address.ip().is_loopback())
+    {
+        send_json_response(socket, "403 Forbidden", "{\"message\":\"File preview requires a browser on the same machine as the Mint backend.\"}").await;
+        return;
+    }
+    let owner = match background_request_owner(ctx.request_str) {
+        Ok(owner) => owner,
+        Err(message) => {
+            send_json_response(
+                socket,
+                "401 Unauthorized",
+                &serde_json::json!({"message": message}).to_string(),
+            )
+            .await;
+            return;
+        }
+    };
+    let result = async {
+        let body: serde_json::Value = serde_json::from_str(ctx.body).map_err(|e| e.to_string())?;
+        let root = body["root"]
+            .as_str()
+            .ok_or("Missing workspace root")?
+            .to_string();
+        let path = body["relativePath"]
+            .as_str()
+            .ok_or("Missing preview path")?
+            .to_string();
+        let mint = body["mintBrowser"].as_bool().unwrap_or(false);
+        let mut config = load_config().map_err(|e| e.to_string())?;
+        let worker_config = config.clone();
+        let preview = tokio::task::spawn_blocking(move || {
+            crate::system::html_preview::start(
+                std::path::Path::new(&root),
+                &path,
+                owner,
+                &worker_config,
+            )
+        })
+        .await
+        .map_err(|e| e.to_string())??;
+        let url = preview["url"].as_str().ok_or("Preview URL unavailable")?;
+        reqwest::Client::new()
+            .head(url)
+            .timeout(std::time::Duration::from_secs(2))
+            .send()
+            .await
+            .map_err(|e| e.to_string())?
+            .error_for_status()
+            .map_err(|e| e.to_string())?;
+        if mint {
+            if crate::enable_browser_tools(&mut config) {
+                crate::save_config(&config).map_err(|e| e.to_string())?;
+            }
+            crate::browser::spawn_automation_browser_with_url(&config, Some(url)).await?;
+        }
+        Ok::<_, String>(preview)
+    }
+    .await;
+    match result {
+        Ok(value) => send_json_response(socket, "200 OK", &value.to_string()).await,
+        Err(message) => {
+            send_json_response(
+                socket,
+                "400 Bad Request",
+                &serde_json::json!({"message": message}).to_string(),
+            )
+            .await
+        }
+    }
+}