mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2026-01-21 03:51:15 -08:00
* fix: missing return
* feat: showApiKey
* feat: undo commit
* feat: amend commit
* fix: file name quoted in git log
* fix: wikiWorkspaceDefaultValues
* fix: no ai commit message sometimes
* Persist only non-default preferences to storage
Added a utility to store only preferences that differ from defaults, reducing storage size and improving config readability. Updated the setPreferences method to use this utility before saving preferences.
* fix: External Attachment Handling in fs plugin instead of ext-attachment-plugin to handle direct tag update case which won't trigger th-saving-tiddler hook
* feat: api for plugin to create base64 file
* Show all untracked files and recreate Git history window
Updated git status commands to use '-uall' for displaying all untracked files, not just directories. Modified windowService.open calls for Git history to include the { recreate: true } option, ensuring the window is refreshed when opened from various menus.
* fix: handling of external attachments with _canonical_uri
Ensure tiddlers with _canonical_uri are always saved as .tid files, not as binary files, by forcing the .tid extension in FileSystemAdaptor. Update tests to verify this behavior. Also, skip loading files from the external attachments folder in loadWikiTiddlersWithSubWikis to prevent them from being loaded as separate tiddlers.
* Refactor external attachment utilities to module exports
Refactored externalAttachmentUtilities to use ES module exports instead of attaching functions to $tw.utils. Updated imports and mocks accordingly, removed related type definitions from ExtendedUtilities, and cleaned up obsolete meta file.
* disable enableFileSystemWatch to prevent bug for innocent users
* fix: test that requires enableFileSystemWatch use new step set to true
* Fix extension filter usage and sync workspace state after save
Refactored variable naming for extension filters in FileSystemAdaptor to improve clarity and fixed their usage in generateTiddlerFileInfo calls. Removed an unused import in routingUtilities.type.ts. Added a useEffect in useForm to sync workspace state with originalWorkspace after save, ensuring the save button disappears as expected.
* fix: review
* lint
* feat: unify AI commit entry points and add availability check - Unified all AI commit message generation to use syncService.syncWikiIfNeeded() for consistent business logic handling - Added externalAPI.isAIAvailable() method to check if AI provider and model are properly configured - Updated gitService.isAIGenerateBackupTitleEnabled() to use the new availability check - Removed redundant logging code since generateFromAI() automatically logs to database when externalAPIDebug is enabled - Simplified menu item creation logic in menuItems.ts - Ensured AI menu options only appear when both API credentials and free model are configured - Updated documentation to reflect the unified architecture
* Improve AI commit message diff filtering and API checks
Renamed the AI commit message entry points doc for clarity. Enhanced the AI availability check to better handle provider API key requirements, including support for providers that do not require keys. Improved plugin diff filtering to retain small config file diffs while omitting large plugin file contents, optimizing AI token usage.
* Update wiki
* Refactor and enhance Tidgi mini window initialization and sync
Refactors Tidgi mini window startup to use a new initializeTidgiMiniWindow method, improving workspace selection logic and view management. Adds concurrency locks to prevent race conditions during open/close operations. Enhances workspace sync/fixed mode handling, view cleanup, and error logging. Updates interfaces and utilities to support new behaviors and improves robustness of tray icon creation and view realignment.
* Refactor file system sync to use $tw.syncer.syncFromServer()
Introduces FileSystemWatcher to monitor file changes and collect updates for the syncer, replacing direct wiki updates in WatchFileSystemAdaptor. Updates documentation to describe the new syncer-driven architecture, echo prevention, and event handling. WatchFileSystemAdaptor now delegates file change detection and lazy loading to FileSystemWatcher, improving batch change handling and eliminating echo loops.
* Improve logging and cleanup in file system watcher and git ops
Added detailed logging to WatchFileSystemAdaptor and FileSystemWatcher for better traceability during initialization and test stabilization. Introduced a constant for the temporary git index prefix in gitOperations. Removed the unused comparison.ts utility for tiddler comparison. Enhanced comments and logging for AI commit message generation context.
* Improve GitLog i18n test and config refresh logic
Updated gitLog.feature to use only Chinese selectors for actions, revert, and discard buttons, improving i18n test reliability. In FileSystemWatcher, re-fetch workspace config before checking enableFileSystemWatch to ensure latest settings are respected. In useGitLogData, prevent file-change events from overriding commit/undo events to maintain correct auto-selection behavior.
* Improve Git log selection and test stability
Refines auto-selection logic in the Git log window to better handle uncommitted changes, commits, reverts, and undos. Updates the feature test to explicitly verify selection and UI state after each operation, improving reliability. Removes unnecessary config re-fetch in FileSystemWatcher and enhances logging for more accurate DOM update detection.
* Implement workspace config sync via tidgi.config.json
Adds support for syncing workspace configuration to tidgi.config.json in the wiki folder, enabling settings persistence and migration across devices. Introduces new documentation, feature tests, and supporting utilities for config file reading, writing, migration, and validation. Updates step definitions and test helpers to support config sync scenarios, and refactors database config utilities for modularity.
* Improve workspace config handling and sync logic
Enhances workspace lookup in step definitions to check both settings.json and tidgi.config.json, ensuring properties are found even if moved. Updates tidgiConfig write logic to remove the config file if all values are default. Refactors workspace save logic to always write syncable config to tidgi.config.json for all wiki workspaces before removing those fields from settings.json, preventing config loss.
* Update .gitignore
* Update wiki.ts
* Add delay before waiting for git log render after revert
- Add 1 second wait after clearing git-log-data-rendered markers following revert
- This gives UI time to start refreshing before we check for the new marker
- Fixes CI timing issue where revert operation needs more time to trigger UI refresh
* Update test log markers for git log refresh events
Replaces '[test-id-git-log-data-rendered]' with '[test-id-git-log-refreshed]' in gitLog.feature to better reflect UI refresh events after commit and revert actions. Adds a debug log marker '[test-id-git-revert-complete]' in revertCommit for improved test synchronization.
* Fix git revert refresh timing - remove intermediate step and rely on git-log-refreshed
* Add detailed logging to handleRevert for CI debugging
* Fix git log refresh by adding manual triggerRefresh fallback
- Add triggerRefresh function to useGitLogData hook for manual refresh
- Call triggerRefresh in handleCommitSuccess, handleRevertSuccess, and handleUndoSuccess
- This fixes cross-process IPC observable subscription issues where gitStateChange$
notifications from main process may not reach renderer process reliably
- Add detailed logging to handleRevert for CI debugging
* Update index.tsx
306 lines
12 KiB
Markdown
306 lines
12 KiB
Markdown
# Sync Architecture: IPC and Watch-FS Plugins
|
|
|
|
This document describes how the `tidgi-ipc-syncadaptor` (frontend) and `watch-filesystem-adaptor` (backend) plugins work together to provide real-time bidirectional synchronization between the TiddlyWiki in-memory store and the file system.
|
|
|
|
## Architecture Overview
|
|
|
|
```
|
|
Frontend (Browser) Backend (Node.js Worker)
|
|
┌─────────────────────────────┐ ┌─────────────────────────────────────┐
|
|
│ TiddlyWiki │ │ TiddlyWiki (Server) │
|
|
│ In-Memory Store │ │ In-Memory Store │
|
|
└──────────┬──────────────────┘ └──────────┬──────────────────────────┘
|
|
│ │
|
|
│ TidGiIPCSyncAdaptor │ WatchFileSystemAdaptor
|
|
│ (syncadaptor) │ (syncadaptor)
|
|
│ │
|
|
│ ├── FileSystemWatcher
|
|
│ │ (monitors files via nsfw)
|
|
│ │
|
|
├─── Save via IPC ──────────────────►│
|
|
│ │
|
|
│◄────── IPC Observable ─────────────┤
|
|
│ (Change Events) │
|
|
│ │
|
|
│ ├── FileSystemAdaptor
|
|
│ │ (read/write files)
|
|
│ │
|
|
│ ▼
|
|
│ File System
|
|
└────────────────────────────────────┘
|
|
```
|
|
|
|
## Key Design Principles
|
|
|
|
### 1. Single Source of Truth: File System
|
|
|
|
- Backend watch-fs monitors the file system using `nsfw` library
|
|
- All file changes (external edits, saves from frontend) flow through file system
|
|
- Backend wiki state reflects file system state
|
|
|
|
### 2. Syncer-Driven Updates (Refactored Architecture)
|
|
|
|
**Previous Approach (Problematic):**
|
|
|
|
- FileSystemWatcher directly called `wiki.addTiddler()` when files changed
|
|
- Led to echo problems and complex edge case handling
|
|
|
|
**Current Approach (Syncer-Driven):**
|
|
|
|
- FileSystemWatcher only collects changes into `updatedTiddlers` list
|
|
- Triggers `$tw.syncer.syncFromServer()` to let TiddlyWiki's syncer handle updates
|
|
- Syncer calls `getUpdatedTiddlers()` to get change list
|
|
- Syncer calls `loadTiddler()` for each modified tiddler
|
|
- Syncer uses `storeTiddler()` which properly updates changeCount to prevent echo
|
|
|
|
Benefits:
|
|
|
|
- Leverages TiddlyWiki's built-in sync queue and throttling
|
|
- Proper handling of batch changes (git checkout)
|
|
- Eliminates echo loops via syncer's changeCount tracking
|
|
|
|
### 3. Two-Layer Echo Prevention
|
|
|
|
**IPC Layer (First Defense)**:
|
|
|
|
- `ipcServerRoutes.ts` tracks recently saved tiddlers in `recentlySavedTiddlers` Set
|
|
- When `wiki.addTiddler()` triggers change event, filter out tiddlers in the Set
|
|
- Prevents frontend from receiving its own save operations as change notifications
|
|
|
|
**Watch-FS Layer (Second Defense)**:
|
|
|
|
- When saving/deleting, watch-fs temporarily excludes file from monitoring
|
|
- Prevents watcher from detecting the file write operation
|
|
- Re-includes file after operation completes (with delay for nsfw debounce)
|
|
|
|
### 4. IPC Observable for Change Notification
|
|
|
|
- Backend sends change events to frontend via IPC Observable pattern (via `ipc-cat`)
|
|
- Frontend subscribes to `getWikiChangeObserver$` observable from `window.observables.wiki`
|
|
- Change events trigger frontend's `syncFromServer()` to pull updates
|
|
|
|
## Module Responsibilities
|
|
|
|
### FileSystemWatcher (Backend - New)
|
|
|
|
**Purpose:** Monitor file system changes without directly modifying wiki state
|
|
|
|
**Key Features:**
|
|
|
|
- Uses `nsfw` library for native file system watching
|
|
- Maintains `updatedTiddlers` list for pending changes
|
|
- Implements `getUpdatedTiddlers()` for syncer integration
|
|
- Implements `loadTiddler()` for lazy loading from file system
|
|
- Handles git revert/checkout via delayed deletion processing
|
|
- Manages file exclusion list for echo prevention
|
|
|
|
**Key Methods:**
|
|
|
|
- `getUpdatedTiddlers(syncer, callback)`: Returns collected changes
|
|
- `loadTiddler(title, callback)`: Loads tiddler content from file
|
|
- `excludeFile(path)`: Temporarily exclude file from watching
|
|
- `scheduleFileInclusion(path)`: Re-include file after delay
|
|
|
|
### WatchFileSystemAdaptor (Backend)
|
|
|
|
**Purpose:** Coordinate between FileSystemWatcher and syncer, implement syncadaptor interface
|
|
|
|
**Key Features:**
|
|
|
|
- Extends FileSystemAdaptor for file save/delete operations
|
|
- Delegates file watching to FileSystemWatcher
|
|
- Implements full syncadaptor interface for Node.js syncer
|
|
- Coordinates file exclusion during save/delete operations
|
|
|
|
**Key Methods:**
|
|
|
|
- `getUpdatedTiddlers()`: Delegates to FileSystemWatcher
|
|
- `loadTiddler()`: Delegates to FileSystemWatcher
|
|
- `saveTiddler()`: Saves to file with exclusion handling
|
|
- `deleteTiddler()`: Deletes file with exclusion handling
|
|
|
|
### FileSystemAdaptor (Backend - Base Class)
|
|
|
|
**Purpose:** Handle tiddler file save/delete operations with sub-wiki routing
|
|
|
|
**Key Features:**
|
|
|
|
- Routes tiddlers to sub-wikis based on tags
|
|
- Generates file paths using TiddlyWiki's FileSystemPaths
|
|
- Handles external attachment file movement
|
|
- Provides retry logic for file lock errors
|
|
|
|
### TidGiIPCSyncAdaptor (Frontend)
|
|
|
|
**Purpose:** Bridge between frontend TiddlyWiki and backend file system
|
|
|
|
**Key Features:**
|
|
|
|
- Communicates via IPC using `tidgi://` custom protocol
|
|
- Subscribes to change events via IPC Observable
|
|
- Maintains `updatedTiddlers` list from IPC events
|
|
- Implements full syncadaptor interface for browser syncer
|
|
|
|
## Data Flow Examples
|
|
|
|
### Example 1: User Edits in Frontend
|
|
|
|
```
|
|
1. User clicks save in browser
|
|
├─► Frontend syncer calls saveTiddler()
|
|
│
|
|
2. TidGiIPCSyncAdaptor.saveTiddler()
|
|
├─► IPC call to putTiddler in ipcServerRoutes.ts
|
|
│
|
|
3. ipcServerRoutes.putTiddler()
|
|
├─► Marks tiddler in recentlySavedTiddlers (IPC echo prevention)
|
|
├─► Calls wiki.addTiddler() (triggers change event)
|
|
├─► Change event filtered by recentlySavedTiddlers
|
|
│
|
|
4. Backend syncer detects change
|
|
├─► Calls WatchFileSystemAdaptor.saveTiddler()
|
|
│
|
|
5. WatchFileSystemAdaptor.saveTiddler()
|
|
├─► Excludes file path from watching
|
|
├─► Calls FileSystemAdaptor.saveTiddler()
|
|
├─► Writes file to disk
|
|
├─► Schedules file re-inclusion after delay
|
|
│
|
|
6. nsfw might detect file change
|
|
├─► FileSystemWatcher checks exclusion list
|
|
├─► File is excluded, event ignored
|
|
```
|
|
|
|
### Example 2: External Editor Modifies File
|
|
|
|
```
|
|
1. User edits file in VSCode/Vim
|
|
├─► File content changes on disk
|
|
│
|
|
2. nsfw detects file change
|
|
├─► File NOT in excludedFiles
|
|
│
|
|
3. FileSystemWatcher.handleFileAddOrChange()
|
|
├─► Adds title to updatedTiddlers.modifications
|
|
├─► Stores file info in pendingFileLoads
|
|
├─► Schedules syncer trigger (debounced 200ms)
|
|
│
|
|
4. $tw.syncer.syncFromServer() called
|
|
├─► Creates SyncFromServerTask
|
|
│
|
|
5. SyncFromServerTask.run()
|
|
├─► Calls getUpdatedTiddlers()
|
|
├─► Gets modifications/deletions list
|
|
├─► Adds titles to titlesToBeLoaded
|
|
│
|
|
6. For each title to load:
|
|
├─► LoadTiddlerTask.run()
|
|
├─► Calls loadTiddler(title)
|
|
├─► FileSystemWatcher loads from file
|
|
├─► syncer.storeTiddler() updates wiki
|
|
├─► Properly sets changeCount (prevents echo save)
|
|
│
|
|
7. wiki.addTiddler() triggers change event
|
|
├─► getWikiChangeObserver sends to frontend
|
|
│
|
|
8. Frontend receives change
|
|
├─► TidGiIPCSyncAdaptor adds to updatedTiddlers
|
|
├─► Frontend syncer.syncFromServer()
|
|
├─► Frontend loadTiddler() via IPC
|
|
├─► Frontend wiki updated
|
|
```
|
|
|
|
### Example 3: Git Checkout (Batch Changes)
|
|
|
|
```
|
|
1. User runs git checkout
|
|
├─► Many files deleted/created/modified
|
|
│
|
|
2. nsfw debounces events (100ms)
|
|
├─► Multiple events batched together
|
|
│
|
|
3. FileSystemWatcher.handleNsfwEvents()
|
|
├─► For each DELETED file:
|
|
│ └─► Schedule deletion with 100ms delay
|
|
│ (handles git revert/checkout pattern)
|
|
├─► For each CREATED/MODIFIED file:
|
|
│ └─► Cancel any pending deletion for same path
|
|
│ └─► Add to updatedTiddlers.modifications
|
|
│
|
|
4. Syncer trigger debounced (200ms)
|
|
├─► All changes collected before sync starts
|
|
│
|
|
5. Single SyncFromServerTask processes all changes
|
|
├─► All modifications queued for loading
|
|
├─► All deletions processed (wiki.deleteTiddler)
|
|
│
|
|
6. LoadTiddlerTasks process sequentially
|
|
├─► Each tiddler loaded from file
|
|
├─► Frontend notified via IPC Observable
|
|
```
|
|
|
|
## Key Configuration
|
|
|
|
### Timing Constants
|
|
|
|
```typescript
|
|
// FileSystemWatcher.ts
|
|
FILE_DELETION_DELAY_MS = 100 // Delay before processing DELETE events
|
|
FILE_INCLUSION_DELAY_MS = 150 // Delay before re-including file after save
|
|
GIT_NOTIFICATION_DELAY_MS = 1000 // Debounce for git status notification
|
|
SYNCER_TRIGGER_DELAY_MS = 200 // Debounce for syncer trigger
|
|
```
|
|
|
|
### Syncer Configuration
|
|
|
|
- Frontend: `pollTimerInterval = 2_147_483_647` (effectively disabled)
|
|
- All updates come via IPC Observable (event-driven)
|
|
|
|
## Troubleshooting
|
|
|
|
### Changes Not Appearing in Frontend
|
|
|
|
1. Check IPC Observable connection: Look for `[test-id-SSE_READY]` in logs
|
|
2. Verify watch-fs is running: Look for `[test-id-WATCH_FS_STABILIZED]`
|
|
3. Check file exclusion: Should see file being excluded then included
|
|
|
|
### Echo/Duplicate Updates
|
|
|
|
1. Check `recentlySavedTiddlers` filtering in ipcServerRoutes.ts
|
|
2. Verify file exclusion during save/delete operations
|
|
3. Check syncer's changeCount tracking
|
|
|
|
### Git Checkout Issues
|
|
|
|
1. Ensure FILE_DELETION_DELAY_MS is working (files not prematurely deleted)
|
|
2. Check that SYNCER_TRIGGER_DELAY_MS allows batch collection
|
|
3. Verify syncer processes all changes in single SyncFromServerTask
|
|
|
|
### Sub-Wiki Not Syncing
|
|
|
|
1. Check sub-wiki watcher initialization: Look for `[WATCH_FS_SUBWIKI]` logs
|
|
2. Verify tiddlywiki.info has correct configuration
|
|
3. Check workspace `subWikiFolders` setting
|
|
|
|
## Design Decisions
|
|
|
|
### Why Syncer-Driven Instead of Direct Updates?
|
|
|
|
1. **Echo Prevention**: Syncer's `storeTiddler()` properly updates changeCount, preventing save loops
|
|
2. **Batch Handling**: Syncer queues all changes and processes them sequentially
|
|
3. **Throttling**: Built-in throttle prevents rapid-fire saves
|
|
4. **Error Recovery**: Syncer has built-in retry logic
|
|
|
|
### Why Two-Layer Echo Prevention?
|
|
|
|
1. **IPC Layer**: Prevents frontend from seeing its own saves via IPC
|
|
2. **Watch-FS Layer**: Prevents file watcher from seeing our own file writes
|
|
3. **Both needed**: IPC prevents wiki→wiki echo, Watch-FS prevents file→wiki echo
|
|
|
|
### Why Delay DELETE Events?
|
|
|
|
Git operations often delete then recreate files quickly. The delay allows:
|
|
|
|
1. CREATE event to arrive and cancel pending DELETE
|
|
2. Treat as modification instead of delete+create
|
|
3. Prevents "missing tiddler" errors during git operations
|