Revert "feat: allow folder drag-drop to speed workspace setup (#173)"

This reverts commit c2f12de.

Author: Dimillian

src-tauri/src/bin/codex_monitor_daemon.rs

@@ -126,20 +126,12 @@ impl DaemonState {
         result
     }
 
-    async fn is_workspace_path_dir(&self, path: String) -> bool {
-        PathBuf::from(&path).is_dir()
-    }
-
     async fn add_workspace(
         &self,
         path: String,
         codex_bin: Option<String>,
         client_version: String,
     ) -> Result<WorkspaceInfo, String> {
-        if !PathBuf::from(&path).is_dir() {
-            return Err("Workspace path must be a folder.".to_string());
-        }
-
         let name = PathBuf::from(&path)
             .file_name()
             .and_then(|s| s.to_str())
@@ -1482,11 +1474,6 @@ async fn handle_rpc_request(
             let workspaces = state.list_workspaces().await;
             serde_json::to_value(workspaces).map_err(|err| err.to_string())
         }
-        "is_workspace_path_dir" => {
-            let path = parse_string(&params, "path")?;
-            let is_dir = state.is_workspace_path_dir(path).await;
-            serde_json::to_value(is_dir).map_err(|err| err.to_string())
-        }
         "add_workspace" => {
             let path = parse_string(&params, "path")?;
             let codex_bin = parse_optional_string(&params, "codex_bin");

src-tauri/src/lib.rs

@@ -281,7 +281,6 @@ pub fn run() {
             settings::update_app_settings,
             codex::codex_doctor,
             workspaces::list_workspaces,
-            workspaces::is_workspace_path_dir,
             workspaces::add_workspace,
             workspaces::add_clone,
             workspaces::add_worktree,

src-tauri/src/workspaces.rs

@@ -411,25 +411,6 @@ pub(crate) async fn list_workspaces(
     Ok(result)
 }
 
-#[tauri::command]
-pub(crate) async fn is_workspace_path_dir(
-    path: String,
-    state: State<'_, AppState>,
-    app: AppHandle,
-) -> Result<bool, String> {
-    if remote_backend::is_remote_mode(&*state).await {
-        let response = remote_backend::call_remote(
-            &*state,
-            app,
-            "is_workspace_path_dir",
-            json!({ "path": path }),
-        )
-        .await?;
-        return serde_json::from_value(response).map_err(|err| err.to_string());
-    }
-    Ok(PathBuf::from(&path).is_dir())
-}
-
 #[tauri::command]
 pub(crate) async fn add_workspace(
     path: String,
@@ -448,10 +429,6 @@ pub(crate) async fn add_workspace(
         return serde_json::from_value(response).map_err(|err| err.to_string());
     }
 
-    if !PathBuf::from(&path).is_dir() {
-        return Err("Workspace path must be a folder.".to_string());
-    }
-
     let name = PathBuf::from(&path)
         .file_name()
         .and_then(|s| s.to_str())

src-tauri/tauri.conf.json

@@ -18,7 +18,7 @@
         "height": 700,
         "minWidth": 360,
         "minHeight": 600,
-        "dragDropEnabled": true,
+        "dragDropEnabled": false,
         "titleBarStyle": "Overlay",
         "hiddenTitle": true,
         "transparent": true,

src/App.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { AlignLeft, Columns2, FolderOpen } from "lucide-react";
+import { AlignLeft, Columns2 } from "lucide-react";
 import "./styles/base.css";
 import "./styles/buttons.css";
 import "./styles/sidebar.css";
@@ -37,7 +37,6 @@ import { TabletLayout } from "./features/layout/components/TabletLayout";
 import { PhoneLayout } from "./features/layout/components/PhoneLayout";
 import { useLayoutNodes } from "./features/layout/hooks/useLayoutNodes";
 import { useWorkspaces } from "./features/workspaces/hooks/useWorkspaces";
-import { useWorkspaceDropZone } from "./features/workspaces/hooks/useWorkspaceDropZone";
 import { useThreads } from "./features/threads/hooks/useThreads";
 import { useWindowDrag } from "./features/layout/hooks/useWindowDrag";
 import { useGitStatus } from "./features/git/hooks/useGitStatus";
@@ -343,8 +342,6 @@ function MainApp() {
     activeWorkspaceId,
     setActiveWorkspaceId,
     addWorkspace,
-    addWorkspaceFromPath,
-    filterWorkspacePaths,
     addCloneAgent,
     addWorktreeAgent,
     connectWorkspace,
@@ -1393,21 +1390,14 @@ function MainApp() {
     listThreadsForWorkspace
   });
 
-  const handleWorkspaceAdded = useCallback(
-    (workspace: WorkspaceInfo) => {
-      setActiveThreadId(null, workspace.id);
-      if (isCompact) {
-        setActiveTab("codex");
-      }
-    },
-    [isCompact, setActiveTab, setActiveThreadId],
-  );
-
   const handleAddWorkspace = useCallback(async () => {
     try {
       const workspace = await addWorkspace();
       if (workspace) {
-        handleWorkspaceAdded(workspace);
+        setActiveThreadId(null, workspace.id);
+        if (isCompact) {
+          setActiveTab("codex");
+        }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -1420,75 +1410,7 @@ function MainApp() {
       });
       alert(`Failed to add workspace.\n\n${message}`);
     }
-  }, [addDebugEntry, addWorkspace, handleWorkspaceAdded]);
-
-  const handleAddWorkspaceFromPath = useCallback(
-    async (path: string) => {
-      try {
-        const workspace = await addWorkspaceFromPath(path);
-        if (workspace) {
-          handleWorkspaceAdded(workspace);
-        }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        addDebugEntry({
-          id: `${Date.now()}-client-add-workspace-error`,
-          timestamp: Date.now(),
-          source: "error",
-          label: "workspace/add error",
-          payload: message
-        });
-        alert(`Failed to add workspace.\n\n${message}`);
-      }
-    },
-    [addDebugEntry, addWorkspaceFromPath, handleWorkspaceAdded],
-  );
-
-  const dropIndicatorTimeoutRef = useRef<number | null>(null);
-  const [dropIndicatorActive, setDropIndicatorActive] = useState(false);
-  const showDropAddIndicator = useCallback(() => {
-    setDropIndicatorActive(true);
-    if (dropIndicatorTimeoutRef.current !== null) {
-      window.clearTimeout(dropIndicatorTimeoutRef.current);
-    }
-    dropIndicatorTimeoutRef.current = window.setTimeout(() => {
-      dropIndicatorTimeoutRef.current = null;
-      setDropIndicatorActive(false);
-    }, 900);
-  }, []);
-
-  useEffect(() => {
-    return () => {
-      if (dropIndicatorTimeoutRef.current !== null) {
-        window.clearTimeout(dropIndicatorTimeoutRef.current);
-      }
-    };
-  }, []);
-
-  const handleDropWorkspacePaths = useCallback(
-    async (paths: string[]) => {
-      showDropAddIndicator();
-      const uniquePaths = Array.from(
-        new Set(paths.map((path) => path.trim()).filter(Boolean)),
-      );
-      const allowedPaths = await filterWorkspacePaths(uniquePaths);
-      allowedPaths.forEach((path) => {
-        void handleAddWorkspaceFromPath(path);
-      });
-    },
-    [filterWorkspacePaths, handleAddWorkspaceFromPath, showDropAddIndicator],
-  );
-
-  const {
-    dropTargetRef: workspaceDropTargetRef,
-    isDragOver: isWorkspaceDropActive,
-    handleDragOver: handleWorkspaceDragOver,
-    handleDragEnter: handleWorkspaceDragEnter,
-    handleDragLeave: handleWorkspaceDragLeave,
-    handleDrop: handleWorkspaceDrop,
-  } = useWorkspaceDropZone({
-    onDropPaths: handleDropWorkspacePaths,
-  });
+  }, [addDebugEntry, addWorkspace, isCompact, setActiveTab, setActiveThreadId]);
 
   const handleAddAgent = useCallback(
     async (workspace: (typeof workspaces)[number]) => {
@@ -1757,10 +1679,6 @@ function MainApp() {
     onDebug: addDebugEntry,
   });
   const isDefaultScale = Math.abs(uiScale - 1) < 0.001;
-  const dropOverlayActive = isWorkspaceDropActive || dropIndicatorActive;
-  const dropOverlayText = isWorkspaceDropActive
-    ? "Drop Project Here"
-    : "Adding Project...";
   const appClassName = `app ${isCompact ? "layout-compact" : "layout-desktop"}${
     isPhone ? " layout-phone" : ""
   }${isTablet ? " layout-tablet" : ""}${
@@ -2179,31 +2097,9 @@ function MainApp() {
           "--ui-scale": String(uiScale)
         } as React.CSSProperties
       }
-      ref={workspaceDropTargetRef}
-      onDragOver={handleWorkspaceDragOver}
-      onDragEnter={handleWorkspaceDragEnter}
-      onDragLeave={handleWorkspaceDragLeave}
-      onDrop={handleWorkspaceDrop}
     >
       <div className="drag-strip" id="titlebar" data-tauri-drag-region />
       <TitlebarExpandControls {...sidebarToggleProps} />
-      <div
-        className={`workspace-drop-overlay${
-          dropOverlayActive ? " is-active" : ""
-        }`}
-        aria-hidden
-      >
-        <div
-          className={`workspace-drop-overlay-text${
-            dropOverlayText === "Adding Project..." ? " is-busy" : ""
-          }`}
-        >
-          {dropOverlayText === "Drop Project Here" && (
-            <FolderOpen className="workspace-drop-overlay-icon" aria-hidden />
-          )}
-          {dropOverlayText}
-        </div>
-      </div>
       {isPhone ? (
         <PhoneLayout
           approvalToastsNode={approvalToastsNode}

src/features/threads/hooks/useThreads.ts

@@ -1002,7 +1002,6 @@ export function useThreads({
       getCustomName,
       handleWorkspaceConnected,
       handleItemUpdate,
-      handleTerminalInteraction,
       handleToolOutputDelta,
       markProcessing,
       onDebug,