fixed lint errors

apps/desktop/src-tauri/src/cli.rs

@@ -67,7 +67,7 @@ pub fn parse_args(argv: &[String], cwd: Option<PathBuf>) -> CliResult {
                 seen_double_dash = true;
                 continue;
             }
-            
+
             // Handle Discord RPC join flag
             if arg == "--discord-rpc-join-secret" {
                 if let Some(val) = iter.next() {
@@ -101,12 +101,12 @@ pub fn parse_args(argv: &[String], cwd: Option<PathBuf>) -> CliResult {
                 workspace_candidate = Some(value.to_string());
                 continue;
             }
-            
+
             if arg.starts_with("--") {
                 continue;
             }
         }
-        
+
         if workspace_candidate.is_none() {
             workspace_candidate = Some(arg.clone());
         }
@@ -190,14 +190,14 @@ mod tests {
     #[test]
     fn no_args_is_empty() {
         let out = parse_args(&argv(&[]), None);
-        assert_eq!(out, CliWorkspace::Empty);
+        assert_eq!(out.workspace, CliWorkspace::Empty);
     }
 
     #[test]
     fn positional_existing_directory_is_accepted() {
         let dir = TempDir::new().unwrap();
         let out = parse_args(&argv(&[dir.path().to_str().unwrap()]), None);
-        match out {
+        match out.workspace {
             CliWorkspace::Path(p) => assert!(p.is_dir()),
             other => panic!("expected Path, got {:?}", other),
         }
@@ -207,7 +207,7 @@ mod tests {
     fn dash_path_flag_existing_directory_is_accepted() {
         let dir = TempDir::new().unwrap();
         let out = parse_args(&argv(&["--path", dir.path().to_str().unwrap()]), None);
-        match out {
+        match out.workspace {
             CliWorkspace::Path(p) => assert!(p.is_dir()),
             other => panic!("expected Path, got {:?}", other),
         }
@@ -218,7 +218,7 @@ mod tests {
         let dir = TempDir::new().unwrap();
         let arg = format!("--path={}", dir.path().to_str().unwrap());
         let out = parse_args(&argv(&[&arg]), None);
-        match out {
+        match out.workspace {
             CliWorkspace::Path(p) => assert!(p.is_dir()),
             other => panic!("expected Path, got {:?}", other),
         }
@@ -229,7 +229,7 @@ mod tests {
         let dir = TempDir::new().unwrap();
         let canonical_cwd = dir.path().canonicalize().unwrap();
         let out = parse_args(&argv(&["."]), Some(canonical_cwd.clone()));
-        match out {
+        match out.workspace {
             CliWorkspace::Path(p) => assert_eq!(p, canonical_cwd),
             other => panic!("expected Path, got {:?}", other),
         }
@@ -242,7 +242,7 @@ mod tests {
         fs::create_dir(&child).unwrap();
         let cwd = Some(parent.path().canonicalize().unwrap());
         let out = parse_args(&argv(&["sub"]), cwd);
-        match out {
+        match out.workspace {
             CliWorkspace::Path(p) => {
                 assert!(p.is_dir());
                 assert!(p.ends_with("sub"));
@@ -257,7 +257,7 @@ mod tests {
             &argv(&["C:/definitely/not/a/real/path/for/this/test"]),
             None,
         );
-        assert!(matches!(out, CliWorkspace::Invalid { .. }));
+        assert!(matches!(out.workspace, CliWorkspace::Invalid { .. }));
     }
 
     #[test]
@@ -266,7 +266,7 @@ mod tests {
         let file = dir.path().join("a.txt");
         fs::write(&file, "hi").unwrap();
         let out = parse_args(&argv(&[file.to_str().unwrap()]), None);
-        match out {
+        match out.workspace {
             CliWorkspace::Invalid { reason, .. } => {
                 assert!(reason.contains("not a directory"), "got: {}", reason);
             }
@@ -277,7 +277,7 @@ mod tests {
     #[test]
     fn dash_path_without_value_is_invalid() {
         let out = parse_args(&argv(&["--path"]), None);
-        match out {
+        match out.workspace {
             CliWorkspace::Invalid { reason, .. } => {
                 assert!(reason.contains("requires a value"), "got: {}", reason);
             }
@@ -288,7 +288,7 @@ mod tests {
     #[test]
     fn empty_path_is_invalid() {
         let out = parse_args(&argv(&["--path", "   "]), None);
-        match out {
+        match out.workspace {
             CliWorkspace::Invalid { reason, .. } => {
                 assert!(reason.contains("empty"), "got: {}", reason);
             }
@@ -309,7 +309,7 @@ mod tests {
             ]),
             None,
         );
-        match out {
+        match out.workspace {
             CliWorkspace::Path(p) => assert!(p.is_dir()),
             other => panic!("expected Path, got {:?}", other),
         }
@@ -321,6 +321,6 @@ mod tests {
         // positional. It will fail validation (no such dir), but we're
         // checking that flag parsing stopped at `--`.
         let out = parse_args(&argv(&["--", "--path"]), None);
-        assert!(matches!(out, CliWorkspace::Invalid { .. }));
+        assert!(matches!(out.workspace, CliWorkspace::Invalid { .. }));
     }
 }

apps/desktop/src-tauri/src/discord_rpc.rs

@@ -1,13 +1,13 @@
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 
+use log::{error, info, warn};
+use tauri::{AppHandle, Emitter};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 #[cfg(unix)]
 use tokio::net::UnixStream;
-use uuid::Uuid;
-use log::{info, warn, error};
-use tauri::{AppHandle, Emitter};
 use tokio::sync::mpsc;
+use uuid::Uuid;
 
 #[cfg(windows)]
 use tokio::net::windows::named_pipe::ClientOptions;
@@ -22,7 +22,7 @@ pub enum OpCode {
 }
 
 pub enum RpcMessage {
-    UpdateActivity(Option<Activity>),
+    UpdateActivity(Box<Option<Activity>>),
     AcceptJoin(String),
     RejectJoin(String),
 }
@@ -49,12 +49,16 @@ impl IpcStream {
             #[cfg(windows)]
             IpcStream::Windows(s) => {
                 s.write_all(&header).await.map_err(|e| e.to_string())?;
-                s.write_all(payload.as_bytes()).await.map_err(|e| e.to_string())?;
+                s.write_all(payload.as_bytes())
+                    .await
+                    .map_err(|e| e.to_string())?;
             }
             #[cfg(unix)]
             IpcStream::Unix(s) => {
                 s.write_all(&header).await.map_err(|e| e.to_string())?;
-                s.write_all(payload.as_bytes()).await.map_err(|e| e.to_string())?;
+                s.write_all(payload.as_bytes())
+                    .await
+                    .map_err(|e| e.to_string())?;
             }
         }
         Ok(())
@@ -80,11 +84,15 @@ impl IpcStream {
         match self {
             #[cfg(windows)]
             IpcStream::Windows(s) => {
-                s.read_exact(&mut payload).await.map_err(|e| e.to_string())?;
+                s.read_exact(&mut payload)
+                    .await
+                    .map_err(|e| e.to_string())?;
             }
             #[cfg(unix)]
             IpcStream::Unix(s) => {
-                s.read_exact(&mut payload).await.map_err(|e| e.to_string())?;
+                s.read_exact(&mut payload)
+                    .await
+                    .map_err(|e| e.to_string())?;
             }
         }
 
@@ -114,7 +122,7 @@ impl DiscordRpc {
                 match Self::try_connect(&client_id).await {
                     Ok(mut stream) => {
                         info!("[Discord] Connected and handshaked.");
-                        
+
                         let _ = Self::do_subscribe(&mut stream, "ACTIVITY_JOIN").await;
                         let _ = Self::do_subscribe(&mut stream, "ACTIVITY_SPECTATE").await;
                         let _ = Self::do_subscribe(&mut stream, "ACTIVITY_JOIN_REQUEST").await;
@@ -125,7 +133,7 @@ impl DiscordRpc {
                                     let payload = match msg {
                                         RpcMessage::UpdateActivity(activity) => json!({
                                             "cmd": "SET_ACTIVITY",
-                                            "args": { "pid": std::process::id(), "activity": activity },
+                                            "args": { "pid": std::process::id(), "activity": *activity },
                                             "nonce": Uuid::new_v4().to_string()
                                         }).to_string(),
                                         RpcMessage::AcceptJoin(user_id) => json!({
@@ -139,7 +147,7 @@ impl DiscordRpc {
                                             "nonce": Uuid::new_v4().to_string()
                                         }).to_string(),
                                     };
-                                    
+
                                     if let Err(e) = stream.send(OpCode::Frame, &payload).await {
                                         error!("[Discord] Send failed: {}", e);
                                         break;
@@ -149,13 +157,8 @@ impl DiscordRpc {
                                     match res {
                                         Ok((_opcode, payload)) => {
                                             if let Ok(v) = serde_json::from_str::<Value>(&payload) {
-                                                if let Some(evt) = v["evt"].as_str() {
-                                                    match evt {
-                                                        "ACTIVITY_JOIN" | "ACTIVITY_SPECTATE" | "ACTIVITY_JOIN_REQUEST" => {
-                                                            let _ = app_handle.emit("discord-rpc-event", v);
-                                                        }
-                                                        _ => {}
-                                                    }
+                                                if let Some("ACTIVITY_JOIN" | "ACTIVITY_SPECTATE" | "ACTIVITY_JOIN_REQUEST") = v["evt"].as_str() {
+                                                    let _ = app_handle.emit("discord-rpc-event", v);
                                                 }
                                             }
                                         }
@@ -230,14 +233,16 @@ impl DiscordRpc {
             "cmd": "SUBSCRIBE",
             "evt": evt,
             "nonce": Uuid::new_v4().to_string()
-        }).to_string();
+        })
+        .to_string();
         stream.send(OpCode::Frame, &payload).await?;
         Ok(())
     }
 
     pub fn set_activity(&self, activity: Option<Activity>) -> Result<(), String> {
         if let Some(tx) = &self.tx {
-            tx.send(RpcMessage::UpdateActivity(activity)).map_err(|e| e.to_string())?;
+            tx.send(RpcMessage::UpdateActivity(Box::new(activity)))
+                .map_err(|e| e.to_string())?;
             Ok(())
         } else {
             Err("RPC not started".to_string())
@@ -246,7 +251,8 @@ impl DiscordRpc {
 
     pub fn accept_join_request(&self, user_id: String) -> Result<(), String> {
         if let Some(tx) = &self.tx {
-            tx.send(RpcMessage::AcceptJoin(user_id)).map_err(|e| e.to_string())?;
+            tx.send(RpcMessage::AcceptJoin(user_id))
+                .map_err(|e| e.to_string())?;
             Ok(())
         } else {
             Err("RPC not started".to_string())
@@ -255,7 +261,8 @@ impl DiscordRpc {
 
     pub fn reject_join_request(&self, user_id: String) -> Result<(), String> {
         if let Some(tx) = &self.tx {
-            tx.send(RpcMessage::RejectJoin(user_id)).map_err(|e| e.to_string())?;
+            tx.send(RpcMessage::RejectJoin(user_id))
+                .map_err(|e| e.to_string())?;
             Ok(())
         } else {
             Err("RPC not started".to_string())

apps/desktop/src-tauri/src/lib.rs

@@ -1,13 +1,12 @@
 mod about;
 mod cli;
+mod discord_rpc;
 mod error;
 mod fs_atomic;
 mod fs_guard;
 mod fs_watcher;
 mod http;
 mod pty;
-mod discord_rpc;
-
 
 use error::redact_user_paths;
 

apps/desktop/src/addons/builtin.git-explorer/GitExplorerComponent.tsx

@@ -221,7 +221,7 @@ const GitExplorerComponent: React.FC = () => {
         });
       }
     } catch (e) { logger.error(e); } finally { setLoading(false); }
-  }, [rootPath, systemSettings.filesExclude]);
+  }, [rootPath, systemSettings.filesExclude, isCollaborating, role, ydoc]);
 
   const handleOpenFolder = async () => {
     try {

apps/desktop/src/components/EditorArea.tsx

@@ -201,7 +201,7 @@ const EditorArea: React.FC = () => {
       ytext.insert(0, currentFile.content);
     }
 
-    console.log(`[Collaboration] Binding Monaco to Y.Text for: ${currentFile.path}`);
+
 
     const binding = new MonacoBinding(
       ytext,
@@ -216,7 +216,7 @@ const EditorArea: React.FC = () => {
       binding.destroy();
       bindingRef.current = null;
     };
-  }, [isCollaborating, ydoc, provider, currentFile?.path]);
+  }, [isCollaborating, ydoc, provider, currentFile]);
 
   // Performance: Efficient Layout handling
   React.useEffect(() => {
@@ -268,7 +268,7 @@ const EditorArea: React.FC = () => {
         path: currentFile.path 
       });
     }
-  }, [currentFile?.path, isLargeFile]);
+  }, [currentFile, isLargeFile]);
 
   const debounceTimer = useRef<NodeJS.Timeout | null>(null);
 

apps/desktop/src/components/StatusBar.tsx

@@ -3,7 +3,6 @@
 import React, { useEffect, useState } from "react";
 import { GitBranch, Users } from "lucide-react";
 import { useFiles } from "@/context/FilesContext";
-import { useUI } from "@/context/UIContext";
 import { useWorkspace } from "@/context/WorkspaceContext";
 import { useL10n } from "@/hooks/useL10n";
 import { isTauri, safeInvoke } from "@/api/tauri";
@@ -19,11 +18,7 @@ import { useCollaboration } from "@/context/CollaborationContext";
 // converted to a proper `<button>` at that point.
 const StatusBar: React.FC = () => {
   const { currentFile } = useFiles();
-  const {
-    setSidebarOpen,
-    setRightPanelOpen,
-    setBottomPanelOpen,
-  } = useUI();
+
   const { rootPath } = useWorkspace();
   const { t } = useL10n();
   const { isCollaborating, activeUsers, role, provider } = useCollaboration();
@@ -33,12 +28,12 @@ const StatusBar: React.FC = () => {
   // command is best-effort — if the folder is not a git repo we surface
   // nothing (the GitBranch chip hides itself).
   useEffect(() => {
-    if (!rootPath || !isTauri()) {
-      setBranch(null);
-      return;
-    }
     let cancelled = false;
     void (async () => {
+      if (!rootPath || !isTauri()) {
+        if (!cancelled) setBranch(null);
+        return;
+      }
       try {
         const result = await safeInvoke(
           "get_git_branches",

apps/desktop/src/components/Terminal.tsx

@@ -10,6 +10,7 @@ import { logger } from "@/lib/logger";
 import { useCollaboration } from "@/context/CollaborationContext";
 import * as Sentry from "@sentry/nextjs";
 import "@xterm/xterm/css/xterm.css";
+import * as Y from "yjs";
 
 interface TerminalProps {
   /**
@@ -182,9 +183,11 @@ const Terminal: React.FC<TerminalProps> = ({ sessionId, cwd, isActive }) => {
         term.write(sharedText.toString());
 
         // Listen for new data
-        const observer = (event: any) => {
-          event.changes.delta.forEach((item: any) => {
-            if (item.insert) term.write(item.insert);
+        const observer = (event: Y.YTextEvent) => {
+          event.changes.delta.forEach((item) => {
+            if (item.insert && typeof item.insert === "string") {
+              term.write(item.insert);
+            }
           });
         };
         sharedText.observe(observer);