Improve remote workspace sync and UX

Author: adibhanna

Makefile

@@ -39,7 +39,7 @@ help:
 	@echo "    make clean    — remove local web/server build output"
 	@echo ""
 	@echo "  Useful Docker vars"
-	@echo "    CONTENT_ROOT=~/iCloud Drive/Obsidian   — host folder mounted into the container"
+	@echo "    CONTENT_ROOT=~/iCloud Drive/Obsidian   — host folder used as the live vault root"
 	@echo "    PORT=7878                               — host port"
 	@echo ""
 
@@ -71,7 +71,16 @@ web-build:
 
 up:
 	@mkdir -p "$(CONTENT_ROOT)" "$(DATA)"
-	@ZENNOTES_IMAGE="$(IMAGE)" ZENNOTES_HOST_PORT="$(PORT)" ZENNOTES_HOST_CONTENT_ROOT="$(CONTENT_ROOT)" ZENNOTES_HOST_DATA="$(DATA)" $(COMPOSE) up --build -d
+	@ABS_CONTENT_ROOT="$$(cd "$(CONTENT_ROOT)" && pwd)"; \
+	ABS_DATA="$$(cd "$(DATA)" && pwd)"; \
+	ZENNOTES_IMAGE="$(IMAGE)" \
+	ZENNOTES_HOST_PORT="$(PORT)" \
+	ZENNOTES_HOST_CONTENT_ROOT="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_CONTAINER_CONTENT_ROOT="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_CONTAINER_DEFAULT_VAULT_PATH="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_BROWSE_ROOTS="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_HOST_DATA="$$ABS_DATA" \
+	$(COMPOSE) up --build -d
 	@printf "\nZenNotes is running at $(APP_URL)\n\n"
 ifneq ($(strip $(OPEN_BROWSER)),)
 	@$(OPEN_BROWSER) $(APP_URL) >/dev/null 2>&1 || true
@@ -98,7 +107,16 @@ endif
 
 rebuild:
 	@mkdir -p "$(CONTENT_ROOT)" "$(DATA)"
-	@ZENNOTES_IMAGE="$(IMAGE)" ZENNOTES_HOST_PORT="$(PORT)" ZENNOTES_HOST_CONTENT_ROOT="$(CONTENT_ROOT)" ZENNOTES_HOST_DATA="$(DATA)" $(COMPOSE) build --no-cache
+	@ABS_CONTENT_ROOT="$$(cd "$(CONTENT_ROOT)" && pwd)"; \
+	ABS_DATA="$$(cd "$(DATA)" && pwd)"; \
+	ZENNOTES_IMAGE="$(IMAGE)" \
+	ZENNOTES_HOST_PORT="$(PORT)" \
+	ZENNOTES_HOST_CONTENT_ROOT="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_CONTAINER_CONTENT_ROOT="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_CONTAINER_DEFAULT_VAULT_PATH="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_BROWSE_ROOTS="$$ABS_CONTENT_ROOT" \
+	ZENNOTES_HOST_DATA="$$ABS_DATA" \
+	$(COMPOSE) build --no-cache
 	@$(MAKE) --no-print-directory up
 
 nuke:

README.md

@@ -347,11 +347,13 @@ Then open:
 
 ### Default Docker mounts
 
-The current Docker setup mounts:
+When you start Docker with `make up`, ZenNotes mounts:
 
-- host `./vault` -> container `/workspace`
+- host `./vault` -> container `./vault`'s absolute host path
 - host `./data` -> container `/data`
 
+In practice, that means the container sees the vault at the same absolute path you chose on the host, instead of rewriting it to `/workspace`.
+
 The server stores its config under `/data/server.json` by default.
 
 ### Choosing a different host folder
@@ -366,7 +368,7 @@ That works for paths with spaces too.
 
 Useful variables:
 
-- `CONTENT_ROOT`: host folder mounted into the container
+- `CONTENT_ROOT`: host folder used as the live vault root
 - `DATA`: host directory used for persisted server config
 - `PORT`: published host port
 - `IMAGE`: Docker image tag

apps/desktop/src/main/watcher.ts

@@ -4,6 +4,8 @@ import type { NoteFolder, VaultChangeEvent, VaultChangeKind } from '@shared/ipc'
 import { folderForRelativePath } from './vault'
 
 const ATTACHMENTS_DIRS = new Set(['attachements', '_assets'])
+const INTERNAL_VAULT_DIR = '.zennotes'
+const VAULT_SETTINGS_RELATIVE_PATH = `${INTERNAL_VAULT_DIR}/vault.json`
 
 function toPosix(p: string): string {
   return p.split(path.sep).join('/')
@@ -17,6 +19,14 @@ function folderOf(root: string, abs: string): NoteFolder | null {
   return ATTACHMENTS_DIRS.has(top) ? 'inbox' : null
 }
 
+function relativeVaultPath(root: string, abs: string): string {
+  return toPosix(path.relative(root, abs))
+}
+
+function isVaultSettingsPath(root: string, abs: string): boolean {
+  return relativeVaultPath(root, abs) === VAULT_SETTINGS_RELATIVE_PATH
+}
+
 export class VaultWatcher {
   private watcher: FSWatcher | null = null
   private root: string | null = null
@@ -28,6 +38,8 @@ export class VaultWatcher {
       ignoreInitial: true,
       persistent: true,
       ignored: (p: string) => {
+        if (this.root && isVaultSettingsPath(this.root, p)) return false
+        if (this.root && relativeVaultPath(this.root, p) === INTERNAL_VAULT_DIR) return false
         const base = path.basename(p)
         return base.startsWith('.') || base === 'node_modules'
       },
@@ -39,8 +51,17 @@ export class VaultWatcher {
 
     const handler = (kind: VaultChangeKind) => (absPath: string) => {
       const base = path.basename(absPath)
-      if (base.startsWith('.')) return
       if (!this.root) return
+      if (isVaultSettingsPath(this.root, absPath)) {
+        onEvent({
+          kind,
+          path: VAULT_SETTINGS_RELATIVE_PATH,
+          folder: 'inbox',
+          scope: 'vault-settings'
+        })
+        return
+      }
+      if (base.startsWith('.')) return
       const folder = folderOf(this.root, absPath)
       if (!folder) return
       onEvent({

apps/server/internal/vault/types.go

@@ -149,4 +149,5 @@ type ChangeEvent struct {
 	Kind   string     `json:"kind"` // "add" | "change" | "unlink"
 	Path   string     `json:"path"`
 	Folder NoteFolder `json:"folder"`
+	Scope  string     `json:"scope,omitempty"`
 }

apps/server/internal/watcher/watcher.go

@@ -11,6 +11,11 @@ import (
 	"github.com/fsnotify/fsnotify"
 )
 
+const (
+	internalVaultDir      = ".zennotes"
+	vaultSettingsFilePath = ".zennotes/vault.json"
+)
+
 // Watcher recursively watches the vault root and fans out change
 // events to any subscribed channels. Mirrors the chokidar-based
 // watcher in src/main/watcher.ts.
@@ -41,7 +46,7 @@ func Start(root string) (*Watcher, error) {
 		}
 		if d.IsDir() {
 			name := d.Name()
-			if path != root && strings.HasPrefix(name, ".") {
+			if path != root && strings.HasPrefix(name, ".") && name != internalVaultDir {
 				return filepath.SkipDir
 			}
 			_ = fsw.Add(path)
@@ -102,9 +107,21 @@ func (w *Watcher) loop() {
 	}
 }
 
+func (w *Watcher) relativePath(absPath string) string {
+	rel, err := filepath.Rel(w.root, absPath)
+	if err != nil {
+		return ""
+	}
+	return filepath.ToSlash(rel)
+}
+
+func (w *Watcher) isVaultSettingsPath(absPath string) bool {
+	return w.relativePath(absPath) == vaultSettingsFilePath
+}
+
 func (w *Watcher) handle(ev fsnotify.Event) {
 	base := filepath.Base(ev.Name)
-	if strings.HasPrefix(base, ".") {
+	if strings.HasPrefix(base, ".") && !w.isVaultSettingsPath(ev.Name) && base != internalVaultDir {
 		return
 	}
 	info, statErr := os.Stat(ev.Name)
@@ -114,11 +131,23 @@ func (w *Watcher) handle(ev fsnotify.Event) {
 		}
 		return
 	}
-	rel, err := filepath.Rel(w.root, ev.Name)
-	if err != nil {
+	relPosix := w.relativePath(ev.Name)
+	if relPosix == "" {
+		return
+	}
+	if relPosix == vaultSettingsFilePath {
+		kind := eventKind(ev)
+		if kind == "" {
+			return
+		}
+		w.broadcast(vault.ChangeEvent{
+			Kind:   kind,
+			Path:   relPosix,
+			Folder: vault.FolderInbox,
+			Scope:  "vault-settings",
+		})
 		return
 	}
-	relPosix := filepath.ToSlash(rel)
 	if strings.HasPrefix(relPosix, ".") || strings.Contains(relPosix, "/.") {
 		return
 	}
@@ -134,15 +163,8 @@ func (w *Watcher) handle(ev fsnotify.Event) {
 		}
 	}
 
-	kind := ""
-	switch {
-	case ev.Op&fsnotify.Create != 0:
-		kind = "add"
-	case ev.Op&fsnotify.Write != 0:
-		kind = "change"
-	case ev.Op&fsnotify.Remove != 0, ev.Op&fsnotify.Rename != 0:
-		kind = "unlink"
-	default:
+	kind := eventKind(ev)
+	if kind == "" {
 		return
 	}
 
@@ -152,6 +174,23 @@ func (w *Watcher) handle(ev fsnotify.Event) {
 		Folder: folder,
 	}
 
+	w.broadcast(change)
+}
+
+func eventKind(ev fsnotify.Event) string {
+	switch {
+	case ev.Op&fsnotify.Create != 0:
+		return "add"
+	case ev.Op&fsnotify.Write != 0:
+		return "change"
+	case ev.Op&fsnotify.Remove != 0, ev.Op&fsnotify.Rename != 0:
+		return "unlink"
+	default:
+		return ""
+	}
+}
+
+func (w *Watcher) broadcast(change vault.ChangeEvent) {
 	w.mu.Lock()
 	for ch := range w.subs {
 		select {

guide.md

@@ -84,13 +84,14 @@ Then open:
 
 By default, Docker mounts:
 
-- host `./vault` -> container `/workspace`
+- host `./vault` -> container at the same absolute host path
 - host `./data` -> container `/data`
 
 That means:
 
 - your notes live in `./vault`
 - ZenNotes server config lives in `./data`
+- the server sees your vault as a real host path, not `/workspace`
 
 ### Use a different vault folder
 

packages/app-core/src/components/ArchiveView.tsx

@@ -51,6 +51,8 @@ export function ArchiveView(): JSX.Element {
   )
   const canRevealInFileManager =
     window.zen.getAppInfo().runtime === 'desktop' && workspaceMode !== 'remote'
+  const absolutePathLabel =
+    workspaceMode === 'remote' ? 'Copy Server Path' : 'Copy Absolute Path'
 
   const [filter, setFilter] = useState('')
   const [cursorIndex, setCursorIndex] = useState(0)
@@ -203,7 +205,7 @@ export function ArchiveView(): JSX.Element {
       }
     })
     items.push({
-      label: 'Copy Absolute Path',
+      label: absolutePathLabel,
       onSelect: async () => {
         const root = vault?.root ?? ''
         const sep = root.includes('\\') ? '\\' : '/'
@@ -262,6 +264,7 @@ export function ArchiveView(): JSX.Element {
     selectedPath,
     tabsEnabled,
     canRevealInFileManager,
+    absolutePathLabel,
     vault?.root,
     folderLabels.inbox,
     folderLabels.trash

packages/app-core/src/components/NoteList.tsx

@@ -78,6 +78,8 @@ export function NoteList(): JSX.Element {
   const { prompt, modal: promptModal } = usePrompt()
   const canRevealInFileManager =
     window.zen.getAppInfo().runtime === 'desktop' && workspaceMode !== 'remote'
+  const absolutePathLabel =
+    workspaceMode === 'remote' ? 'Copy Server Path' : 'Copy Absolute Path'
   const folderLabels = useMemo(
     () => resolveSystemFolderLabels(systemFolderLabels),
     [systemFolderLabels]
@@ -276,7 +278,7 @@ export function NoteList(): JSX.Element {
         }
       },
       {
-        label: 'Copy Absolute Path',
+        label: absolutePathLabel,
         onSelect: async () => {
           window.zen.clipboardWriteText(abs)
         }
@@ -293,7 +295,7 @@ export function NoteList(): JSX.Element {
     }
 
     return items
-  }, [assetMenu, assetFiles, canRevealInFileManager, vault])
+  }, [assetMenu, assetFiles, canRevealInFileManager, absolutePathLabel, vault])
 
   /**
    * Filter notes for the current view. For folder views we match the

packages/app-core/src/components/PromptModal.tsx

@@ -13,6 +13,7 @@ export interface PromptOptions {
   initialValue?: string
   placeholder?: string
   okLabel?: string
+  allowEmptySubmit?: boolean
   suggestions?: PromptSuggestion[]
   suggestionsHint?: string
   /** Return an error string to block submission, or null/undefined to allow. */
@@ -96,7 +97,7 @@ export function PromptModal({
 
   const submit = (): void => {
     const v = value.trim()
-    if (!v) return
+    if (!v && !options.allowEmptySubmit) return
     const err = options.validate?.(v) ?? null
     if (err) {
       setError(err)

packages/app-core/src/components/SettingsModal.tsx

@@ -201,6 +201,7 @@ export function SettingsModal(): JSX.Element {
   const openVaultPicker = useStore((s) => s.openVaultPicker)
   const connectRemoteWorkspace = useStore((s) => s.connectRemoteWorkspace)
   const connectRemoteWorkspaceProfile = useStore((s) => s.connectRemoteWorkspaceProfile)
+  const changeRemoteWorkspaceVaultPath = useStore((s) => s.changeRemoteWorkspaceVaultPath)
   const disconnectRemoteWorkspace = useStore((s) => s.disconnectRemoteWorkspace)
   const saveRemoteWorkspaceProfile = useStore((s) => s.saveRemoteWorkspaceProfile)
   const deleteRemoteWorkspaceProfile = useStore((s) => s.deleteRemoteWorkspaceProfile)
@@ -920,13 +921,21 @@ export function SettingsModal(): JSX.Element {
               <button
                 onClick={() =>
                   void (workspaceMode === 'remote'
-                    ? disconnectRemoteWorkspace()
+                    ? changeRemoteWorkspaceVaultPath()
                     : openVaultPicker())
                 }
                 className="shrink-0 rounded-xl border border-paper-300/70 bg-paper-100/80 px-3.5 py-2 text-xs font-medium text-ink-800 transition-colors hover:bg-paper-200"
               >
-                {workspaceMode === 'remote' ? 'Return to Local Vault' : 'Change…'}
+                {workspaceMode === 'remote' ? 'Change Remote Vault…' : 'Change…'}
               </button>
+              {workspaceMode === 'remote' && (
+                <button
+                  onClick={() => void disconnectRemoteWorkspace()}
+                  className="shrink-0 rounded-xl border border-paper-300/70 bg-paper-100/80 px-3.5 py-2 text-xs font-medium text-ink-800 transition-colors hover:bg-paper-200"
+                >
+                  Return to Local Vault
+                </button>
+              )}
               {workspaceMode === 'remote' && (
                 <button
                   onClick={() => void openVaultPicker()}