ability to symlink a vault

Author: arkml

apps/x/apps/main/src/ipc.ts

@@ -1,4 +1,4 @@
-import { ipcMain, BrowserWindow, shell } from 'electron';
+import { ipcMain, BrowserWindow, shell, dialog } from 'electron';
 import { ipc } from '@x/shared';
 import path from 'node:path';
 import os from 'node:os';
@@ -26,6 +26,11 @@ import type { IOAuthRepo } from '@x/core/dist/auth/repo.js';
 import { IGranolaConfigRepo } from '@x/core/dist/knowledge/granola/repo.js';
 import { triggerSync as triggerGranolaSync } from '@x/core/dist/knowledge/granola/sync.js';
 import { isOnboardingComplete, markOnboardingComplete } from '@x/core/dist/config/note_creation_config.js';
+import {
+  addKnowledgeVault,
+  listKnowledgeVaults,
+  removeKnowledgeVault,
+} from '@x/core/dist/config/knowledge_vaults.js';
 import * as composioHandler from './composio-handler.js';
 import { IAgentScheduleRepo } from '@x/core/dist/agent-schedule/repo.js';
 import { IAgentScheduleStateRepo } from '@x/core/dist/agent-schedule/state-repo.js';
@@ -318,6 +323,30 @@ export function setupIpcHandlers() {
     'workspace:remove': async (_event, args) => {
       return workspace.remove(args.path, args.opts);
     },
+    'knowledge:listVaults': async () => {
+      return { vaults: listKnowledgeVaults() };
+    },
+    'knowledge:pickVaultDirectory': async () => {
+      const result = await dialog.showOpenDialog({
+        properties: ['openDirectory'],
+      });
+      if (result.canceled || result.filePaths.length === 0) {
+        return { path: null };
+      }
+      return { path: result.filePaths[0] };
+    },
+    'knowledge:addVault': async (_event, args) => {
+      const vault = addKnowledgeVault({
+        name: args.name,
+        path: args.path,
+        readOnly: args.readOnly,
+      });
+      return { vault };
+    },
+    'knowledge:removeVault': async (_event, args) => {
+      const removed = removeKnowledgeVault(args.nameOrMountPath);
+      return { removed };
+    },
     'mcp:listTools': async (_event, args) => {
       return mcpCore.listTools(args.serverName, args.cursor);
     },

apps/x/apps/renderer/src/App.tsx

@@ -45,6 +45,15 @@ import {
 } from "@/components/ui/sidebar"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
 import { Toaster } from "@/components/ui/sonner"
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog"
+import { Input } from "@/components/ui/input"
 import { stripKnowledgePrefix, toKnowledgePath, wikiLabel } from '@/lib/wiki-links'
 import { OnboardingModal } from '@/components/onboarding-modal'
 import { SearchDialog } from '@/components/search-dialog'
@@ -356,6 +365,10 @@ function App() {
   const [tree, setTree] = useState<TreeNode[]>([])
   const [expandedPaths, setExpandedPaths] = useState<Set<string>>(new Set())
   const [recentWikiFiles, setRecentWikiFiles] = useState<string[]>([])
+  const [isAddVaultOpen, setIsAddVaultOpen] = useState(false)
+  const [pendingVaultPath, setPendingVaultPath] = useState<string | null>(null)
+  const [pendingVaultName, setPendingVaultName] = useState<string>('')
+  const [isAddingVault, setIsAddingVault] = useState(false)
   const [isGraphOpen, setIsGraphOpen] = useState(false)
   const [expandedFrom, setExpandedFrom] = useState<{ path: string | null; graph: boolean } | null>(null)
   const [graphData, setGraphData] = useState<{ nodes: GraphNode[]; edges: GraphEdge[] }>({
@@ -2186,6 +2199,62 @@ function App() {
     setExpandedPaths(newExpanded)
   }
 
+  // Handle sidebar section changes - switch to chat view for tasks
+  const handleSectionChange = useCallback((section: ActiveSection) => {
+    if (section === 'tasks') {
+      if (selectedBackgroundTask) return
+      if (selectedPath || isGraphOpen) {
+        void navigateToView({ type: 'chat', runId })
+      }
+    }
+  }, [isGraphOpen, navigateToView, runId, selectedBackgroundTask, selectedPath])
+
+  const deriveVaultName = useCallback((vaultPath: string) => {
+    const trimmed = vaultPath.replace(/[\\/]+$/, '')
+    const parts = trimmed.split(/[/\\]/)
+    return parts[parts.length - 1] || 'Folder'
+  }, [])
+
+  const handleAddVault = useCallback(async () => {
+    try {
+      const result = await window.ipc.invoke('knowledge:pickVaultDirectory', null)
+      if (!result.path) return
+      const defaultName = deriveVaultName(result.path)
+      setPendingVaultPath(result.path)
+      setPendingVaultName(defaultName)
+      setIsAddVaultOpen(true)
+    } catch (err) {
+      console.error('Failed to pick vault directory:', err)
+      toast('Failed to open folder picker')
+    }
+  }, [deriveVaultName])
+
+  const handleConfirmAddVault = useCallback(async () => {
+    if (!pendingVaultPath) return
+    const name = pendingVaultName.trim()
+    if (!name) {
+      toast('Folder name is required')
+      return
+    }
+    setIsAddingVault(true)
+    try {
+      await window.ipc.invoke('knowledge:addVault', {
+        path: pendingVaultPath,
+        name,
+        readOnly: false,
+      })
+      setIsAddVaultOpen(false)
+      setPendingVaultPath(null)
+      setPendingVaultName('')
+      loadDirectory().then(setTree)
+      toast(`Added knowledge folder "${name}"`)
+    } catch (err) {
+      console.error('Failed to add vault:', err)
+      toast('Failed to add knowledge folder')
+    } finally {
+      setIsAddingVault(false)
+    }
+  }, [loadDirectory, pendingVaultName, pendingVaultPath])
   // Knowledge quick actions
   const knowledgeFiles = React.useMemo(() => {
     const files = collectFilePaths(tree).filter((path) => path.endsWith('.md'))
@@ -2278,6 +2347,9 @@ function App() {
         throw err
       }
     },
+    addVault: () => {
+      void handleAddVault()
+    },
     createFolder: async (parentPath: string = 'knowledge') => {
       try {
         await window.ipc.invoke('workspace:mkdir', {
@@ -2289,6 +2361,17 @@ function App() {
         throw err
       }
     },
+    unlinkVault: async (mountPath: string) => {
+      try {
+        await window.ipc.invoke('knowledge:removeVault', { nameOrMountPath: mountPath })
+        if (selectedPath && (selectedPath === mountPath || selectedPath.startsWith(`${mountPath}/`))) {
+          setSelectedPath(null)
+        }
+      } catch (err) {
+        console.error('Failed to unlink knowledge folder:', err)
+        throw err
+      }
+    },
     openGraph: () => {
       void navigateToView({ type: 'graph' })
     },
@@ -2355,7 +2438,19 @@ function App() {
     onOpenInNewTab: (path: string) => {
       openFileInNewTab(path)
     },
-  }), [tree, selectedPath, workspaceRoot, navigateToFile, navigateToView, openFileInNewTab, fileTabs, closeFileTab, removeEditorCacheForPath])
+  }), [
+    tree,
+    selectedPath,
+    workspaceRoot,
+    collectDirPaths,
+    navigateToFile,
+    navigateToView,
+    handleAddVault,
+    openFileInNewTab,
+    fileTabs,
+    closeFileTab,
+    removeEditorCacheForPath,
+  ])
 
   // Handler for when a voice note is created/updated
   const handleVoiceNoteCreated = useCallback(async (notePath: string) => {
@@ -3089,6 +3184,50 @@ function App() {
           onSelectRun={(id) => { void navigateToView({ type: 'chat', runId: id }) }}
         />
       </SidebarSectionProvider>
+      <Dialog
+        open={isAddVaultOpen}
+        onOpenChange={(open) => {
+          if (!open) {
+            setIsAddVaultOpen(false)
+            setPendingVaultPath(null)
+            setPendingVaultName('')
+          }
+        }}
+      >
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>Add Knowledge Folder</DialogTitle>
+            <DialogDescription>
+              Link an existing folder into knowledge.
+            </DialogDescription>
+          </DialogHeader>
+          <div className="space-y-3">
+            <div className="text-xs text-muted-foreground break-all">
+              {pendingVaultPath ?? 'No folder selected'}
+            </div>
+            <Input
+              value={pendingVaultName}
+              onChange={(event) => setPendingVaultName(event.target.value)}
+              placeholder="Folder name"
+            />
+          </div>
+          <DialogFooter>
+            <Button
+              variant="ghost"
+              onClick={() => {
+                setIsAddVaultOpen(false)
+                setPendingVaultPath(null)
+                setPendingVaultName('')
+              }}
+            >
+              Cancel
+            </Button>
+            <Button onClick={handleConfirmAddVault} disabled={isAddingVault}>
+              {isAddingVault ? 'Adding...' : 'Add Folder'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
       <Toaster />
       <OnboardingModal
         open={showOnboarding}

apps/x/apps/renderer/src/components/sidebar-content.tsx

@@ -18,6 +18,7 @@ import {
   Pencil,
   Plug,
   LoaderIcon,
+  PlusCircle,
   Settings,
   Square,
   Trash2,
@@ -100,6 +101,8 @@ interface TreeNode {
 type KnowledgeActions = {
   createNote: (parentPath?: string) => void
   createFolder: (parentPath?: string) => void
+  addVault: () => void
+  unlinkVault: (mountPath: string) => Promise<void>
   openGraph: () => void
   expandAll: () => void
   collapseAll: () => void
@@ -824,6 +827,7 @@ function KnowledgeSection({
   const quickActions = [
     { icon: FilePlus, label: "New Note", action: () => actions.createNote() },
     { icon: FolderPlus, label: "New Folder", action: () => actions.createFolder() },
+    { icon: PlusCircle, label: "Add Knowledge Folder", action: () => actions.addVault() },
     { icon: Network, label: "Graph View", action: () => actions.openGraph() },
   ]
 
@@ -911,6 +915,8 @@ function Tree({
   const isDir = item.kind === 'dir'
   const isExpanded = expandedPaths.has(item.path)
   const isSelected = selectedPath === item.path
+  const [isSymlinkMount, setIsSymlinkMount] = useState(false)
+  const [symlinkChecked, setSymlinkChecked] = useState(false)
   const [isRenaming, setIsRenaming] = useState(false)
   const isSubmittingRef = React.useRef(false)
 
@@ -925,6 +931,20 @@ function Tree({
     setNewName(baseName)
   }, [baseName])
 
+  const ensureSymlinkStatus = async () => {
+    if (symlinkChecked || !isDir) return isSymlinkMount
+    try {
+      const stat = await window.ipc.invoke('workspace:stat', { path: item.path })
+      const isLink = Boolean(stat.isSymlink)
+      setIsSymlinkMount(isLink)
+      setSymlinkChecked(true)
+      return isLink
+    } catch {
+      setSymlinkChecked(true)
+      return false
+    }
+  }
+
   const handleRename = async () => {
     // Prevent double submission
     if (isSubmittingRef.current) return
@@ -933,6 +953,11 @@ function Tree({
     const trimmedName = newName.trim()
     if (trimmedName && trimmedName !== baseName) {
       try {
+        if (await ensureSymlinkStatus()) {
+          toast('Linked folders cannot be renamed here', 'error')
+          setIsRenaming(false)
+          return
+        }
         await actions.rename(item.path, trimmedName, isDir)
         toast('Renamed successfully', 'success')
       } catch (err) {
@@ -947,11 +972,18 @@ function Tree({
   }
 
   const handleDelete = async () => {
+    let isLink = false
     try {
-      await actions.remove(item.path)
-      toast('Moved to trash', 'success')
+      isLink = await ensureSymlinkStatus()
+      if (isLink) {
+        await actions.unlinkVault(item.path)
+        toast('Unlinked knowledge folder', 'success')
+      } else {
+        await actions.remove(item.path)
+        toast('Moved to trash', 'success')
+      }
     } catch (err) {
-      toast('Failed to delete', 'error')
+      toast(isLink ? 'Failed to unlink' : 'Failed to delete', 'error')
     }
   }
 
@@ -998,17 +1030,32 @@ function Tree({
         Copy Path
       </ContextMenuItem>
       <ContextMenuSeparator />
-      <ContextMenuItem onClick={() => { setNewName(baseName); isSubmittingRef.current = false; setIsRenaming(true) }}>
-        <Pencil className="mr-2 size-4" />
-        Rename
-      </ContextMenuItem>
+      {!isSymlinkMount && (
+        <ContextMenuItem onClick={async () => {
+          if (await ensureSymlinkStatus()) {
+            toast('Linked folders cannot be renamed here', 'error')
+            return
+          }
+          setNewName(baseName)
+          isSubmittingRef.current = false
+          setIsRenaming(true)
+        }}>
+          <Pencil className="mr-2 size-4" />
+          Rename
+        </ContextMenuItem>
+      )}
       <ContextMenuItem variant="destructive" onClick={handleDelete}>
         <Trash2 className="mr-2 size-4" />
-        Delete
+        {isSymlinkMount ? 'Unlink Knowledge Folder' : 'Delete'}
       </ContextMenuItem>
     </ContextMenuContent>
   )
 
+  const handleContextMenuOpenChange = (open: boolean) => {
+    if (!open || symlinkChecked || !isDir) return
+    void ensureSymlinkStatus()
+  }
+
   // Inline rename input
   if (isRenaming) {
     return (
@@ -1043,7 +1090,7 @@ function Tree({
 
   if (!isDir) {
     return (
-      <ContextMenu>
+      <ContextMenu onOpenChange={handleContextMenuOpenChange}>
         <ContextMenuTrigger asChild>
           <SidebarMenuItem className="group/file-item">
             <SidebarMenuButton
@@ -1068,7 +1115,7 @@ function Tree({
   }
 
   return (
-    <ContextMenu>
+    <ContextMenu onOpenChange={handleContextMenuOpenChange}>
       <ContextMenuTrigger asChild>
         <SidebarMenuItem>
           <Collapsible