Compare commits
No commits in common. "main" and "codex/alpha-product-ux" have entirely different histories.
main
...
codex/alph
|
|
@ -1,8 +1,7 @@
|
|||
# .gitignore
|
||||
frontend/node_modules/
|
||||
frontend/dist/
|
||||
build/
|
||||
verstak-desktop-res.syso
|
||||
build/bin/verstak-desktop
|
||||
smoke-platform
|
||||
plugins/
|
||||
vendor/
|
||||
|
|
|
|||
397
README.md
397
README.md
|
|
@ -1,368 +1,81 @@
|
|||
<div align="center">
|
||||
# Verstak Desktop
|
||||
|
||||
<img src="packaging/linux/verstak.svg" width="112" alt="Verstak logo">
|
||||
Verstak is a local-first desktop workspace for files, notes, browser captures,
|
||||
activity and work journal entries. This repository contains the Go/Wails desktop
|
||||
host and UI shell; user-facing functions are delivered by official plugins.
|
||||
|
||||
# Verstak
|
||||
> **Alpha software.** Use a disposable vault while evaluating it. APIs, storage
|
||||
> formats and packaging can change before the first stable release.
|
||||
|
||||
### Keep the context of your work together — locally.
|
||||
## What the alpha does
|
||||
|
||||
Files, notes, links, browser captures, activity and work history
|
||||
in one extensible local-first workbench.
|
||||
- keeps each workspace's identity independent of its current directory name;
|
||||
- keeps browser captures in a reviewable Inbox, with archive and restore rather
|
||||
than a destructive “remove from inbox” action;
|
||||
- records local file/note activity and, after review, turns it into journal
|
||||
entries without creating a workspace automatically;
|
||||
- accepts optional browser domain-time batches. The browser extension is
|
||||
opt-in: it sends only normalized domain names and bounded durations, never
|
||||
URLs, page titles, page contents, keystrokes or navigation history;
|
||||
- runs official plugins from a `plugins/` directory next to the executable.
|
||||
|
||||
**English** · [Русский](README.ru.md)
|
||||
## Components
|
||||
|
||||
[](https://github.com/mirivlad/verstak/releases)
|
||||
|
||||
|
||||
[](LICENSE)
|
||||
Clone these repositories as siblings when building a complete local setup:
|
||||
|
||||
[Download](https://github.com/mirivlad/verstak/releases/latest) ·
|
||||
[Documentation](https://github.com/mirivlad/verstak-docs) ·
|
||||
[Report an issue](https://github.com/mirivlad/verstak/issues)
|
||||
|
||||
</div>
|
||||
|
||||
> [!WARNING]
|
||||
> Verstak is currently **alpha software**. APIs, storage formats and packaging may change before the first stable release. Use a test vault and keep backups of important data.
|
||||
|
||||
## What is Verstak?
|
||||
|
||||
Verstak is a local-first workbench that keeps the context around your work in one place.
|
||||
|
||||
A **Deal** can represent almost anything:
|
||||
|
||||
* a software project;
|
||||
* a client or customer;
|
||||
* a server or infrastructure site;
|
||||
* a device under repair;
|
||||
* an article or research topic;
|
||||
* a training course;
|
||||
* a personal long-term project.
|
||||
|
||||
Normally, information about such work is scattered across directories, notes, browser tabs, task managers, password managers, terminal history and memory.
|
||||
|
||||
Verstak brings it together in a local **vault** that remains under your control.
|
||||
|
||||
No account, cloud service or sync server is required for local use.
|
||||
|
||||
## Verstak in use
|
||||
|
||||
| Overview: return to a Deal and see its recent work, captures and items that need attention. | Files: manage ordinary folders and documents inside a Deal. |
|
||||
| Repository | Purpose |
|
||||
| --- | --- |
|
||||
|  |  |
|
||||
| `verstak-desktop` | desktop host and UI shell |
|
||||
| `verstak-official-plugins` | Files, Notes, Browser Inbox, Activity, Journal and other official plugins |
|
||||
| `verstak-browser-extension` | Chromium/Firefox capture and optional domain-activity extension |
|
||||
| `verstak-sdk` | plugin manifest schema and TypeScript API |
|
||||
|
||||
| Notes: keep Markdown notes next to the Deal they describe. | Journal: record a completed session and retain its context. |
|
||||
| --- | --- |
|
||||
|  |  |
|
||||
## Build from source (Linux)
|
||||
|
||||
## Main features
|
||||
|
||||
| Feature | Description |
|
||||
| ------------------------ | -------------------------------------------------------------------------------------------- |
|
||||
| **Deals** | Organize files, notes and activity around durable projects, clients and other areas of work. |
|
||||
| **Files** | Browse and manage ordinary files stored inside your vault. |
|
||||
| **Notes** | Create Markdown notes, overview pages and links between related information. |
|
||||
| **Overview** | Quickly return to recent work and see what may need attention. |
|
||||
| **Browser Inbox** | Send pages, links, selections and files from a browser into Verstak. |
|
||||
| **Activity and Journal** | Reconstruct work sessions and turn selected activity into journal entries. |
|
||||
| **Todo** | Keep optional task lists inside individual Deals and across the whole vault. |
|
||||
| **Search** | Search across notes, files and supported plugin data. |
|
||||
| **Trash** | Restore deleted items or remove them permanently from one central location. |
|
||||
| **Secrets** | Keep credentials and access information connected to the relevant Deal. |
|
||||
| **Templates** | Create repeatable Deal structures for common types of work. |
|
||||
| **Plugins** | Add, replace or disable tools without turning Verstak into one rigid monolithic application. |
|
||||
| **Optional sync** | Synchronize vaults between devices using a self-hosted Verstak Sync Server. |
|
||||
|
||||
## Download and install
|
||||
|
||||
Download the latest build from the
|
||||
[GitHub Releases page](https://github.com/mirivlad/verstak/releases/latest).
|
||||
|
||||
Release packages already include the matching official plugins.
|
||||
|
||||
| System | Download | Installation |
|
||||
| --------------------------------- | ----------------------------------------- | --------------------------------------------- |
|
||||
| Debian 13 / Ubuntu 24.04 or newer | `verstak_<version>_amd64.deb` | Install through APT. |
|
||||
| Other x86_64 Linux distributions | `verstak-linux-x86_64-<version>.AppImage` | Make the file executable and run it. |
|
||||
| Windows 10/11 x64 | `verstak-windows-amd64-<version>.zip` | Extract the archive and launch `Verstak.cmd`. |
|
||||
|
||||
### Debian and Ubuntu
|
||||
Requirements: Go, Node.js with npm, Python 3, the [Wails v2 build
|
||||
prerequisites](https://wails.io/docs/gettingstarted/installation/), and the
|
||||
WebKitGTK development package for your distribution.
|
||||
|
||||
```bash
|
||||
sudo apt install ./verstak_*_amd64.deb
|
||||
```
|
||||
git clone https://git.mirv.top/verstak/verstak-sdk.git
|
||||
git clone https://git.mirv.top/verstak/verstak-official-plugins.git
|
||||
git clone https://git.mirv.top/verstak/verstak-desktop.git
|
||||
git clone https://git.mirv.top/verstak/verstak-browser-extension.git
|
||||
|
||||
Launch Verstak from the application menu or run:
|
||||
|
||||
```bash
|
||||
verstak
|
||||
```
|
||||
|
||||
### AppImage
|
||||
|
||||
```bash
|
||||
chmod +x verstak-linux-x86_64-*.AppImage
|
||||
./verstak-linux-x86_64-*.AppImage
|
||||
```
|
||||
|
||||
On a system without FUSE support:
|
||||
|
||||
```bash
|
||||
APPIMAGE_EXTRACT_AND_RUN=1 ./verstak-linux-x86_64-*.AppImage
|
||||
```
|
||||
|
||||
### Windows portable version
|
||||
|
||||
1. Download `verstak-windows-amd64-<version>.zip`.
|
||||
2. Extract it to a local directory.
|
||||
3. Run `Verstak.cmd`.
|
||||
|
||||
Do not run Verstak directly from inside the ZIP archive or from a network share.
|
||||
|
||||
Verstak uses the Microsoft WebView2 Runtime. It is already included with Windows 11 and most current Windows 10 installations. If Verstak does not start, install the
|
||||
[Microsoft WebView2 Runtime x64](https://go.microsoft.com/fwlink/p/?LinkId=2124701).
|
||||
|
||||
## Background and tray mode
|
||||
|
||||
After the tray icon is ready, closing the main window keeps Verstak running in the system tray. One left click restores and focuses the window; a right click opens the native **Show Verstak** and **Quit** menu. **Quit** exits the application completely. If the tray cannot start, closing the window exits normally rather than leaving an unreachable process. Scheduled Todo reminders continue while the window is hidden.
|
||||
|
||||
### Verify a download
|
||||
|
||||
Each release includes a `SHA256SUMS` file.
|
||||
|
||||
On Linux:
|
||||
|
||||
```bash
|
||||
sha256sum -c SHA256SUMS --ignore-missing
|
||||
```
|
||||
|
||||
## First start
|
||||
|
||||
### 1. Create or open a vault
|
||||
|
||||
A **vault** is the root directory where Verstak stores your work.
|
||||
|
||||
Choose a writable local directory. For example:
|
||||
|
||||
```text
|
||||
Documents/
|
||||
└── Verstak/
|
||||
```
|
||||
|
||||
Your files and notes remain ordinary files that can be accessed without Verstak.
|
||||
|
||||
### 2. Create your first Deal
|
||||
|
||||
Inside the vault, create a Deal for a project, client, server, device or another area of work.
|
||||
|
||||
For example:
|
||||
|
||||
```text
|
||||
Home server
|
||||
Customer Alpha
|
||||
Verstak development
|
||||
3D printer
|
||||
Training course
|
||||
```
|
||||
|
||||
### 3. Add context
|
||||
|
||||
Open the Deal and add the information needed to return to it later:
|
||||
|
||||
* notes and decisions;
|
||||
* documents and source files;
|
||||
* useful links;
|
||||
* access information;
|
||||
* journal entries;
|
||||
* tasks;
|
||||
* materials captured from the browser.
|
||||
|
||||
### 4. Return through Overview
|
||||
|
||||
The Overview screen shows recent changes, unfinished captures, activity and other useful entry points back into your work.
|
||||
|
||||
## How Verstak stores data
|
||||
|
||||
Verstak follows several principles:
|
||||
|
||||
* your vault is local and works without an account or internet connection;
|
||||
* files and notes remain readable outside the application;
|
||||
* synchronization is optional and is not the source of truth;
|
||||
* the user should understand where data is stored and what happens to it;
|
||||
* application tools are provided by plugins rather than being permanently embedded into the core.
|
||||
|
||||
The desktop application loads plugins from a `plugins/` directory located beside the executable.
|
||||
|
||||
## Browser integration
|
||||
|
||||
The optional browser extension can send the following into Browser Inbox:
|
||||
|
||||
* the current page;
|
||||
* selected text;
|
||||
* a link;
|
||||
* a downloaded or selected file.
|
||||
|
||||
Repository:
|
||||
|
||||
[mirivlad/verstak-browser-extension](https://github.com/mirivlad/verstak-browser-extension)
|
||||
|
||||
To connect the extension:
|
||||
|
||||
1. Open Browser Inbox settings in Verstak.
|
||||
2. Copy the Receiver URL and Pairing Token.
|
||||
3. Paste them into the extension settings.
|
||||
4. Save the settings and send a test page.
|
||||
|
||||
Passive domain activity tracking is disabled by default. When enabled, it sends bounded time totals by normalized domain. It does not send page contents, keystrokes or full browsing history.
|
||||
|
||||
## Optional synchronization
|
||||
|
||||
Local use does not require a server.
|
||||
|
||||
For synchronization between devices, deploy the optional self-hosted
|
||||
[Verstak Sync Server](https://github.com/mirivlad/verstak-sync-server).
|
||||
|
||||
Each vault is connected separately. The local vault remains the primary copy of your data.
|
||||
|
||||
Desktop core maintains an atomic local sync snapshot under `.verstak/sync/`.
|
||||
It scans when a vault opens, before a manual sync, and after debounced external
|
||||
file-watcher events, so files changed in an editor or while Desktop was closed
|
||||
are reconciled too. The watcher only speeds up discovery. A first connection
|
||||
pulls before it publishes a local bootstrap: an empty local vault does not send
|
||||
deletes, and incompatible files become visible conflicts rather than silent
|
||||
overwrites. Pairing can optionally use an existing remote vault ID to restore
|
||||
that scope on a new device.
|
||||
|
||||
The current transport supports ordinary files and folders plus workspace (Deal)
|
||||
create/rename/trash/restore with a durable workspace UUID. `.verstak`, trash,
|
||||
temporary files, and symlinks are excluded from ordinary file sync. UTF-8 text
|
||||
remains inline only within the existing 2 MB bound; binary and larger content
|
||||
is staged privately under `.verstak/sync/blobs`, uploaded through the scoped
|
||||
Blob API, and represented in the operation log only by SHA-256 and size. The
|
||||
download is streamed, hash/size-verified, and atomically applied. A file over
|
||||
the configured server blob limit or otherwise unsupported remains a visible
|
||||
unresolved warning instead of being treated as synchronized.
|
||||
|
||||
Pull is paginated. Desktop applies operations in increasing server sequence,
|
||||
persists its cursor only after each successful operation, stops before later
|
||||
pages at the first failure, and retries after restart. Blob references are
|
||||
authorized per user/vault; a missing or corrupt blob likewise leaves the cursor
|
||||
unchanged. The server is optional and file bytes are not end-to-end encrypted.
|
||||
Operation-log retention/checkpoints and synchronization of Secrets, plugin
|
||||
settings, Todo, Journal, Activity, and Browser Inbox remain future milestones.
|
||||
|
||||
## Build from source
|
||||
|
||||
### Requirements
|
||||
|
||||
* Go 1.24 or newer;
|
||||
* Node.js 20 or newer with npm;
|
||||
* Python 3;
|
||||
* Git;
|
||||
* ImageMagick (`magick`) to generate the branded tray and application icons;
|
||||
* Wails v2 build dependencies;
|
||||
* WebKitGTK development packages on Linux.
|
||||
|
||||
See the
|
||||
[Wails installation documentation](https://wails.io/docs/gettingstarted/installation/)
|
||||
for distribution-specific dependencies.
|
||||
|
||||
### Clone the repositories
|
||||
|
||||
The desktop, SDK and official plugin repositories must be cloned as sibling directories:
|
||||
|
||||
```text
|
||||
verstak-source/
|
||||
├── verstak/
|
||||
├── verstak-sdk/
|
||||
└── verstak-official-plugins/
|
||||
```
|
||||
|
||||
```bash
|
||||
mkdir verstak-source
|
||||
cd verstak-source
|
||||
|
||||
git clone https://github.com/mirivlad/verstak.git
|
||||
git clone https://github.com/mirivlad/verstak-sdk.git
|
||||
git clone https://github.com/mirivlad/verstak-official-plugins.git
|
||||
```
|
||||
|
||||
### Build
|
||||
|
||||
```bash
|
||||
cd verstak-sdk
|
||||
./scripts/build.sh
|
||||
|
||||
cd ../verstak-official-plugins
|
||||
./scripts/build.sh
|
||||
|
||||
cd ../verstak
|
||||
cd verstak-sdk && ./scripts/build.sh
|
||||
cd ../verstak-official-plugins && ./scripts/build.sh
|
||||
cd ../verstak-desktop
|
||||
./scripts/install-dev-plugins.sh
|
||||
./scripts/build.sh
|
||||
```
|
||||
|
||||
The resulting application will be located at:
|
||||
The Linux executable is placed in `build/bin/`. Start it with `--debug` to
|
||||
display internal plugin-provider IDs and write diagnostic logs.
|
||||
|
||||
## Release artifacts
|
||||
|
||||
Maintainers can create a Linux desktop tarball after the sibling repositories
|
||||
above have been built:
|
||||
|
||||
```bash
|
||||
./build/bin/verstak-desktop
|
||||
cd verstak-desktop
|
||||
./scripts/release.sh v0.1.0-alpha.1
|
||||
```
|
||||
|
||||
Run it with additional diagnostics:
|
||||
It writes `release/verstak-desktop-linux-amd64-<version>.tar.gz` and a matching
|
||||
`SHA256SUMS` file. The archive is self-contained: unpack it and run the
|
||||
included executable. Browser and SDK packages have their own release scripts
|
||||
in their repositories.
|
||||
|
||||
```bash
|
||||
./build/bin/verstak-desktop --debug
|
||||
```
|
||||
## Privacy and activity tracking
|
||||
|
||||
## Build release packages locally
|
||||
|
||||
These commands create local artifacts in `release/`. They do not publish a GitHub Release.
|
||||
|
||||
### Debian package
|
||||
|
||||
```bash
|
||||
./scripts/package-deb.sh v0.1.0-alpha.1
|
||||
```
|
||||
|
||||
### AppImage
|
||||
|
||||
```bash
|
||||
./scripts/package-appimage.sh v0.1.0-alpha.1
|
||||
```
|
||||
|
||||
### Windows portable ZIP
|
||||
|
||||
The Windows archive can be cross-compiled on Linux using MinGW:
|
||||
|
||||
```bash
|
||||
sudo apt install gcc-mingw-w64-x86-64 zip
|
||||
./scripts/package-windows-portable.sh v0.1.0-alpha.1
|
||||
```
|
||||
|
||||
## Project repositories
|
||||
|
||||
| Repository | Purpose |
|
||||
| ---------------------------------------------------------------------------------- | ------------------------------------------------------ |
|
||||
| [verstak](https://github.com/mirivlad/verstak) | Desktop application, core platform and UI shell |
|
||||
| [verstak-official-plugins](https://github.com/mirivlad/verstak-official-plugins) | Official Files, Notes, Journal, Todo and other plugins |
|
||||
| [verstak-sdk](https://github.com/mirivlad/verstak-sdk) | TypeScript SDK, schemas and plugin contracts |
|
||||
| [verstak-browser-extension](https://github.com/mirivlad/verstak-browser-extension) | Browser capture and optional activity integration |
|
||||
| [verstak-sync-server](https://github.com/mirivlad/verstak-sync-server) | Optional self-hosted synchronization server |
|
||||
| [verstak-docs](https://github.com/mirivlad/verstak-docs) | Product and platform architecture documentation |
|
||||
|
||||
Compatible components should be built from the same release line.
|
||||
|
||||
## Development status
|
||||
|
||||
Verstak is under active development.
|
||||
|
||||
The current alpha is intended for testing, feedback and experimentation. Backward compatibility is not guaranteed until the first stable release.
|
||||
|
||||
Bug reports and feature discussions are welcome in
|
||||
[GitHub Issues](https://github.com/mirivlad/verstak/issues).
|
||||
The extension's passive domain tracker is disabled by default. Enabling it
|
||||
requires an explicit choice in the extension and lets the user maintain a
|
||||
domain exclusion list. Manual page, selection and link captures are separate
|
||||
actions; they enter Browser Inbox and never create a workspace or journal
|
||||
entry by themselves.
|
||||
|
||||
## License
|
||||
|
||||
Copyright © 2026 Verstak contributors.
|
||||
|
||||
Verstak is licensed under the
|
||||
[GNU Affero General Public License v3.0 or later](LICENSE).
|
||||
Copyright © 2026 Verstak contributors. Licensed under
|
||||
[GNU AGPLv3 or later](LICENSE).
|
||||
|
|
|
|||
340
README.ru.md
340
README.ru.md
|
|
@ -1,340 +0,0 @@
|
|||
<div align="center">
|
||||
|
||||
<img src="packaging/linux/verstak.svg" width="112" alt="Логотип Верстака">
|
||||
|
||||
# Верстак
|
||||
|
||||
### Рабочий контекст остаётся рядом — и хранится локально.
|
||||
|
||||
Файлы, заметки, ссылки, материалы из браузера, активность и история работы
|
||||
в одной расширяемой локальной среде.
|
||||
|
||||
[English](README.md) · **Русский**
|
||||
|
||||
[](https://github.com/mirivlad/verstak/releases)
|
||||
|
||||
|
||||
[](LICENSE)
|
||||
|
||||
[Скачать](https://github.com/mirivlad/verstak/releases/latest) ·
|
||||
[Документация](https://github.com/mirivlad/verstak-docs) ·
|
||||
[Сообщить о проблеме](https://github.com/mirivlad/verstak/issues)
|
||||
|
||||
</div>
|
||||
|
||||
> [!WARNING]
|
||||
> Верстак пока находится на стадии **alpha**. До первого стабильного выпуска могут меняться API, форматы хранения и состав пакетов. Для знакомства используйте тестовый vault и сохраняйте резервные копии важных данных.
|
||||
|
||||
## Что такое Верстак
|
||||
|
||||
Верстак — это local-first рабочая среда, которая удерживает в одном месте контекст вокруг ваших дел.
|
||||
|
||||
**Делом** может быть что угодно:
|
||||
|
||||
* программный проект;
|
||||
* клиент или заказчик;
|
||||
* сервер или площадка;
|
||||
* ремонтируемое устройство;
|
||||
* статья или исследование;
|
||||
* учебный курс;
|
||||
* личный долгосрочный проект.
|
||||
|
||||
Обычно информация о таком деле расползается по папкам, заметкам, браузерным вкладкам, менеджерам задач, хранилищам паролей, истории терминала и памяти.
|
||||
|
||||
Верстак собирает её в один локальный **vault**, который остаётся под вашим контролем.
|
||||
|
||||
Для локальной работы не нужны учётная запись, облачный сервис или собственный сервер.
|
||||
|
||||
## Верстак в работе
|
||||
|
||||
| Обзор: возвращает к делу и показывает недавнюю работу, входящие и то, что требует внимания. | Файлы: обычные папки и документы прямо внутри дела. |
|
||||
| --- | --- |
|
||||
|  |  |
|
||||
|
||||
| Заметки: Markdown-заметки остаются рядом с делом, которое они описывают. | Журнал: фиксирует завершённую работу и её контекст. |
|
||||
| --- | --- |
|
||||
|  |  |
|
||||
|
||||
## Основные возможности
|
||||
|
||||
| Возможность | Что она даёт |
|
||||
| ------------------------ | ---------------------------------------------------------------------------------------------- |
|
||||
| **Дела** | Объединяют файлы, заметки и историю работы вокруг проектов, клиентов и других направлений. |
|
||||
| **Файлы** | Позволяют работать с обычными файлами, расположенными внутри vault. |
|
||||
| **Заметки** | Markdown-заметки, обзорные страницы и связи между материалами. |
|
||||
| **Обзор** | Помогает быстро вернуться к недавней работе и увидеть то, что требует внимания. |
|
||||
| **Входящие из браузера** | Принимают страницы, ссылки, выделенный текст и файлы из браузера. |
|
||||
| **Активность и журнал** | Помогают восстановить рабочие сессии и превратить выбранную активность в записи журнала. |
|
||||
| **Задачи** | Необязательные списки задач внутри отдельных дел и во всём vault. |
|
||||
| **Поиск** | Ищет по заметкам, файлам и данным поддерживаемых плагинов. |
|
||||
| **Корзина** | Позволяет восстановить удалённое или окончательно удалить его из одного общего раздела. |
|
||||
| **Секреты** | Хранит доступы и учётные данные рядом с делом, к которому они относятся. |
|
||||
| **Шаблоны** | Создают повторяемую структуру для однотипных дел. |
|
||||
| **Плагины** | Позволяют добавлять, заменять и отключать инструменты, не превращая Верстак в жёсткий монолит. |
|
||||
| **Синхронизация** | Необязательно синхронизирует vault между устройствами через собственный сервер. |
|
||||
|
||||
## Скачивание и установка
|
||||
|
||||
Готовые сборки находятся на странице
|
||||
[GitHub Releases](https://github.com/mirivlad/verstak/releases/latest).
|
||||
|
||||
В релизные пакеты уже входят совместимые версии официальных плагинов. Устанавливать их отдельно не требуется.
|
||||
|
||||
| Система | Какой файл скачать | Как установить |
|
||||
| -------------------------------- | ---------------------------------------- | -------------------------------------------- |
|
||||
| Debian 13 / Ubuntu 24.04 и новее | `verstak_<версия>_amd64.deb` | Установить через APT. |
|
||||
| Другие дистрибутивы Linux x86_64 | `verstak-linux-x86_64-<версия>.AppImage` | Сделать файл исполняемым и запустить. |
|
||||
| Windows 10/11 x64 | `verstak-windows-amd64-<версия>.zip` | Распаковать архив и запустить `Verstak.cmd`. |
|
||||
|
||||
### Debian и Ubuntu
|
||||
|
||||
```bash
|
||||
sudo apt install ./verstak_*_amd64.deb
|
||||
```
|
||||
|
||||
После установки запустите Верстак из меню приложений или командой:
|
||||
|
||||
```bash
|
||||
verstak
|
||||
```
|
||||
|
||||
### AppImage
|
||||
|
||||
```bash
|
||||
chmod +x verstak-linux-x86_64-*.AppImage
|
||||
./verstak-linux-x86_64-*.AppImage
|
||||
```
|
||||
|
||||
Если в системе нет поддержки FUSE:
|
||||
|
||||
```bash
|
||||
APPIMAGE_EXTRACT_AND_RUN=1 ./verstak-linux-x86_64-*.AppImage
|
||||
```
|
||||
|
||||
### Портативная версия для Windows
|
||||
|
||||
1. Скачайте `verstak-windows-amd64-<версия>.zip`.
|
||||
2. Распакуйте архив в локальную папку.
|
||||
3. Запустите `Verstak.cmd`.
|
||||
|
||||
Не запускайте Верстак прямо из ZIP-архива или с сетевого диска.
|
||||
|
||||
Верстак использует Microsoft WebView2 Runtime. Он уже присутствует в Windows 11 и большинстве актуальных установок Windows 10. Если приложение не запускается, установите
|
||||
[Microsoft WebView2 Runtime x64](https://go.microsoft.com/fwlink/p/?LinkId=2124701).
|
||||
|
||||
## Фоновая работа и трей
|
||||
|
||||
После готовности значка в трее закрытие главного окна не завершает Верстак. Один левый клик возвращает и фокусирует окно, правый клик открывает нативное меню **«Показать Верстак»** и **«Выйти»**. **«Выйти»** полностью завершает приложение. Если трей не удалось запустить, закрытие окна завершает приложение обычным образом и не оставляет недоступный процесс. Пока окно скрыто, напоминания Todo продолжают работать.
|
||||
|
||||
### Проверка скачанного файла
|
||||
|
||||
В каждый релиз входит файл `SHA256SUMS`.
|
||||
|
||||
Проверка в Linux:
|
||||
|
||||
```bash
|
||||
sha256sum -c SHA256SUMS --ignore-missing
|
||||
```
|
||||
|
||||
## Первый запуск
|
||||
|
||||
### 1. Создайте или откройте vault
|
||||
|
||||
**Vault** — это корневая папка, в которой Верстак хранит ваши дела.
|
||||
|
||||
Выберите доступный для записи локальный каталог. Например:
|
||||
|
||||
```text
|
||||
Документы/
|
||||
└── Верстак/
|
||||
```
|
||||
|
||||
Файлы и заметки остаются обычными файлами. Их можно открыть и без Верстака.
|
||||
|
||||
### 2. Создайте первое дело
|
||||
|
||||
Внутри vault создайте дело для проекта, клиента, сервера, устройства или другого направления работы.
|
||||
|
||||
Например:
|
||||
|
||||
```text
|
||||
Домашний сервер
|
||||
Заказчик Альфа
|
||||
Разработка Верстака
|
||||
3D-принтер
|
||||
Учебный курс
|
||||
```
|
||||
|
||||
### 3. Соберите контекст
|
||||
|
||||
Добавьте в дело всё, что поможет вернуться к нему через неделю, месяц или год:
|
||||
|
||||
* заметки и принятые решения;
|
||||
* документы и исходные файлы;
|
||||
* полезные ссылки;
|
||||
* данные для доступа;
|
||||
* записи журнала;
|
||||
* задачи;
|
||||
* материалы, отправленные из браузера.
|
||||
|
||||
### 4. Возвращайтесь через Обзор
|
||||
|
||||
Экран «Обзор» показывает недавние изменения, необработанные входящие, активность и другие подходящие точки для продолжения работы.
|
||||
|
||||
## Как Верстак хранит данные
|
||||
|
||||
Верстак придерживается нескольких принципов:
|
||||
|
||||
* vault хранится локально и доступен без учётной записи и интернета;
|
||||
* файлы и заметки остаются читаемыми вне приложения;
|
||||
* синхронизация является дополнением, а не источником истины;
|
||||
* пользователь должен понимать, где находятся его данные и что с ними происходит;
|
||||
* инструменты реализуются плагинами, а не навсегда встраиваются в ядро.
|
||||
|
||||
Настольное приложение загружает плагины из каталога `plugins/`, расположенного рядом с исполняемым файлом.
|
||||
|
||||
## Интеграция с браузером
|
||||
|
||||
Необязательное расширение позволяет отправлять во «Входящие из браузера»:
|
||||
|
||||
* текущую страницу;
|
||||
* выделенный текст;
|
||||
* ссылку;
|
||||
* выбранный или скачанный файл.
|
||||
|
||||
Репозиторий расширения:
|
||||
|
||||
[mirivlad/verstak-browser-extension](https://github.com/mirivlad/verstak-browser-extension)
|
||||
|
||||
Чтобы подключить расширение:
|
||||
|
||||
1. Откройте настройки «Входящих из браузера» в Верстаке.
|
||||
2. Скопируйте адрес приёмника и токен сопряжения.
|
||||
3. Вставьте их в настройки расширения.
|
||||
4. Сохраните настройки и отправьте тестовую страницу.
|
||||
|
||||
Пассивный учёт активности по доменам по умолчанию отключён. После включения расширение передаёт только ограниченные интервалы времени для нормализованных доменов. Оно не отправляет содержимое страниц, нажатия клавиш или полную историю посещений.
|
||||
|
||||
## Необязательная синхронизация
|
||||
|
||||
Для локального использования сервер не нужен.
|
||||
|
||||
Для синхронизации между устройствами можно развернуть собственный
|
||||
[Verstak Sync Server](https://github.com/mirivlad/verstak-sync-server).
|
||||
|
||||
Каждый vault подключается отдельно. Основной копией данных остаётся локальный vault.
|
||||
|
||||
## Сборка из исходного кода
|
||||
|
||||
### Требования
|
||||
|
||||
* Go 1.24 или новее;
|
||||
* Node.js 20 или новее и npm;
|
||||
* Python 3;
|
||||
* Git;
|
||||
* ImageMagick (`magick`) для генерации фирменных значков трея и приложения;
|
||||
* зависимости для сборки Wails v2;
|
||||
* пакеты разработки WebKitGTK в Linux.
|
||||
|
||||
Зависимости для конкретного дистрибутива перечислены в
|
||||
[документации Wails](https://wails.io/docs/gettingstarted/installation/).
|
||||
|
||||
### Клонирование репозиториев
|
||||
|
||||
Desktop, SDK и официальные плагины должны находиться в соседних каталогах:
|
||||
|
||||
```text
|
||||
verstak-source/
|
||||
├── verstak/
|
||||
├── verstak-sdk/
|
||||
└── verstak-official-plugins/
|
||||
```
|
||||
|
||||
```bash
|
||||
mkdir verstak-source
|
||||
cd verstak-source
|
||||
|
||||
git clone https://github.com/mirivlad/verstak.git
|
||||
git clone https://github.com/mirivlad/verstak-sdk.git
|
||||
git clone https://github.com/mirivlad/verstak-official-plugins.git
|
||||
```
|
||||
|
||||
### Сборка
|
||||
|
||||
```bash
|
||||
cd verstak-sdk
|
||||
./scripts/build.sh
|
||||
|
||||
cd ../verstak-official-plugins
|
||||
./scripts/build.sh
|
||||
|
||||
cd ../verstak
|
||||
./scripts/install-dev-plugins.sh
|
||||
./scripts/build.sh
|
||||
```
|
||||
|
||||
Готовое приложение появится по адресу:
|
||||
|
||||
```bash
|
||||
./build/bin/verstak-desktop
|
||||
```
|
||||
|
||||
Запуск с дополнительной диагностикой:
|
||||
|
||||
```bash
|
||||
./build/bin/verstak-desktop --debug
|
||||
```
|
||||
|
||||
## Локальная сборка релизных пакетов
|
||||
|
||||
Следующие команды создают пакеты в каталоге `release/`, но не публикуют GitHub Release.
|
||||
|
||||
### Пакет Debian
|
||||
|
||||
```bash
|
||||
./scripts/package-deb.sh v0.1.0-alpha.1
|
||||
```
|
||||
|
||||
### AppImage
|
||||
|
||||
```bash
|
||||
./scripts/package-appimage.sh v0.1.0-alpha.1
|
||||
```
|
||||
|
||||
### Портативный ZIP для Windows
|
||||
|
||||
Windows-версию можно собрать в Linux при помощи MinGW:
|
||||
|
||||
```bash
|
||||
sudo apt install gcc-mingw-w64-x86-64 zip
|
||||
./scripts/package-windows-portable.sh v0.1.0-alpha.1
|
||||
```
|
||||
|
||||
## Репозитории проекта
|
||||
|
||||
| Репозиторий | Назначение |
|
||||
| ---------------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
|
||||
| [verstak](https://github.com/mirivlad/verstak) | Настольное приложение, ядро платформы и оболочка интерфейса |
|
||||
| [verstak-official-plugins](https://github.com/mirivlad/verstak-official-plugins) | Официальные плагины файлов, заметок, журнала, задач и других инструментов |
|
||||
| [verstak-sdk](https://github.com/mirivlad/verstak-sdk) | TypeScript SDK, схемы и контракты плагинов |
|
||||
| [verstak-browser-extension](https://github.com/mirivlad/verstak-browser-extension) | Отправка материалов из браузера и необязательный учёт активности |
|
||||
| [verstak-sync-server](https://github.com/mirivlad/verstak-sync-server) | Необязательный собственный сервер синхронизации |
|
||||
| [verstak-docs](https://github.com/mirivlad/verstak-docs) | Продуктовая и архитектурная документация |
|
||||
|
||||
Совместимые компоненты следует собирать из одной релизной линии.
|
||||
|
||||
## Состояние разработки
|
||||
|
||||
Верстак активно развивается.
|
||||
|
||||
Текущая alpha предназначена для тестирования, обратной связи и экспериментов. До первого стабильного выпуска обратная совместимость не гарантируется.
|
||||
|
||||
Сообщения об ошибках и предложения принимаются в
|
||||
[GitHub Issues](https://github.com/mirivlad/verstak/issues).
|
||||
|
||||
## Лицензия
|
||||
|
||||
Copyright © 2026 Verstak contributors.
|
||||
|
||||
Верстак распространяется на условиях
|
||||
[GNU Affero General Public License v3.0 или новее](LICENSE).
|
||||
|
|
@ -0,0 +1,403 @@
|
|||
# Milestone 6a Files Core Service Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use
|
||||
> `superpowers:subagent-driven-development` or `superpowers:executing-plans` to
|
||||
> implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for
|
||||
> tracking.
|
||||
|
||||
**Goal:** Add a safe backend Files core service and plugin bridge for
|
||||
vault-relative text file operations.
|
||||
|
||||
**Architecture:** Files Core is a backend service under `internal/core/files`
|
||||
that accepts vault-relative paths, enforces reserved path policy, and performs
|
||||
atomic text writes. The Wails API exposes plugin-scoped methods guarded by plugin
|
||||
state and `files.*` permissions; SDK types describe the bridge shape.
|
||||
|
||||
**Tech Stack:** Go backend services/tests, Wails-bound API methods, TypeScript
|
||||
SDK type definitions, existing Playwright/Vitest checks.
|
||||
|
||||
---
|
||||
|
||||
## Implementation Status
|
||||
|
||||
Milestone 6a is implemented.
|
||||
|
||||
Actual backend package:
|
||||
|
||||
- `internal/core/files/types.go`
|
||||
- `internal/core/files/path_policy.go`
|
||||
- `internal/core/files/service.go`
|
||||
- `internal/core/files/*_test.go`
|
||||
|
||||
Actual plugin-scoped Wails methods:
|
||||
|
||||
```go
|
||||
func (a *App) ListVaultFiles(pluginID string, relativeDir string) ([]files.FileEntry, string)
|
||||
func (a *App) GetVaultFileMetadata(pluginID string, relativePath string) (files.FileMetadata, string)
|
||||
func (a *App) ReadVaultTextFile(pluginID string, relativePath string) (string, string)
|
||||
func (a *App) WriteVaultTextFile(pluginID string, relativePath string, content string, options files.WriteOptions) string
|
||||
func (a *App) CreateVaultFolder(pluginID string, relativePath string) string
|
||||
func (a *App) MoveVaultPath(pluginID string, fromRelativePath string, toRelativePath string, options files.MoveOptions) string
|
||||
func (a *App) TrashVaultPath(pluginID string, relativePath string) (files.TrashResult, string)
|
||||
```
|
||||
|
||||
Actual bundled frontend API:
|
||||
|
||||
- `api.files.list(relativeDir)`
|
||||
- `api.files.metadata(relativePath)`
|
||||
- `api.files.readText(relativePath)`
|
||||
- `api.files.writeText(relativePath, content, options)`
|
||||
- `api.files.createFolder(relativePath)`
|
||||
- `api.files.move(fromRelativePath, toRelativePath, options)`
|
||||
- `api.files.trash(relativePath)`
|
||||
|
||||
Implemented limits:
|
||||
|
||||
- canonical vault-relative slash paths only;
|
||||
- backslashes, POSIX absolute paths, Windows drive paths, UNC paths, traversal,
|
||||
null bytes, and empty file paths are rejected;
|
||||
- `.verstak/` is reserved case-insensitively and hidden from public Files API;
|
||||
- metadata may report symlinks, but list-through-symlink and
|
||||
read/write/move/trash through symlink are forbidden;
|
||||
- text read/write only, with `readText` limited to UTF-8 files up to 2 MB;
|
||||
- trash uses `.verstak/trash/files/<trashId>/...` with restore metadata, but
|
||||
restore itself is deferred;
|
||||
- binary streaming, watcher, external editor, Files UI, Notes service, sidecar,
|
||||
sandbox/security isolation deferred.
|
||||
|
||||
---
|
||||
|
||||
## Scope
|
||||
|
||||
Implement:
|
||||
|
||||
- Backend Files service.
|
||||
- Safe vault-relative path handling.
|
||||
- Reserved `.verstak/` policy.
|
||||
- List files.
|
||||
- Read/write text files.
|
||||
- Create folder.
|
||||
- Move path.
|
||||
- Trash path.
|
||||
- Atomic writes.
|
||||
- Backend tests.
|
||||
- SDK bridge shape draft.
|
||||
|
||||
Do not implement:
|
||||
|
||||
- Full Notes plugin.
|
||||
- Notes UI.
|
||||
- Sync.
|
||||
- Watcher.
|
||||
- Binary streaming.
|
||||
- External editor integration.
|
||||
- Sidecar/security isolation.
|
||||
|
||||
## Canonical Policy
|
||||
|
||||
All public Files API methods use canonical vault-relative slash paths.
|
||||
|
||||
Rejected inputs:
|
||||
|
||||
- absolute paths;
|
||||
- backslashes;
|
||||
- Windows drive paths and UNC/network paths;
|
||||
- paths containing `..` after normalization;
|
||||
- null bytes;
|
||||
- empty paths where a file path is required;
|
||||
- access to `.verstak/` through the public plugin Files API, including
|
||||
`.Verstak` case variants.
|
||||
|
||||
Delete behavior:
|
||||
|
||||
- `TrashVaultPath` moves files/folders into `.verstak/trash`.
|
||||
- Trash metadata includes `originalPath`, `deletedAt`, `originalType`,
|
||||
`trashId`, and `basename`.
|
||||
- Permanent delete is out of scope.
|
||||
- Restore is out of scope.
|
||||
|
||||
Write behavior:
|
||||
|
||||
- Text writes use a temporary file in the target directory and rename into place.
|
||||
- Existing files are overwritten only when the method explicitly allows overwrite.
|
||||
- Parent directory must exist unless the method explicitly creates it.
|
||||
|
||||
Binary behavior:
|
||||
|
||||
- Binary files can appear in list/metadata results.
|
||||
- Binary read/write streaming is out of scope.
|
||||
|
||||
## Public Backend Shape
|
||||
|
||||
Implemented plugin-scoped Wails methods:
|
||||
|
||||
```go
|
||||
func (a *App) ListVaultFiles(pluginID string, relativeDir string) ([]files.FileEntry, string)
|
||||
func (a *App) GetVaultFileMetadata(pluginID string, relativePath string) (files.FileMetadata, string)
|
||||
func (a *App) ReadVaultTextFile(pluginID string, relativePath string) (string, string)
|
||||
func (a *App) WriteVaultTextFile(pluginID string, relativePath string, content string, options files.WriteOptions) string
|
||||
func (a *App) CreateVaultFolder(pluginID string, relativePath string) string
|
||||
func (a *App) MoveVaultPath(pluginID string, fromRelativePath string, toRelativePath string, options files.MoveOptions) string
|
||||
func (a *App) TrashVaultPath(pluginID string, relativePath string) (files.TrashResult, string)
|
||||
```
|
||||
|
||||
Permission mapping:
|
||||
|
||||
- `ListVaultFiles`, `GetVaultFileMetadata`, `ReadVaultTextFile`: `files.read`.
|
||||
- `WriteVaultTextFile`, `CreateVaultFolder`, `MoveVaultPath`: `files.write`.
|
||||
- `TrashVaultPath`: `files.delete`.
|
||||
|
||||
## Data Types
|
||||
|
||||
Create `internal/core/files/types.go`:
|
||||
|
||||
```go
|
||||
package files
|
||||
|
||||
type EntryKind string
|
||||
|
||||
const (
|
||||
KindFile EntryKind = "file"
|
||||
KindDirectory EntryKind = "directory"
|
||||
)
|
||||
|
||||
type Entry struct {
|
||||
Name string `json:"name"`
|
||||
Path string `json:"path"`
|
||||
Kind EntryKind `json:"kind"`
|
||||
Size int64 `json:"size"`
|
||||
ModifiedAt string `json:"modifiedAt"`
|
||||
IsText bool `json:"isText"`
|
||||
IsBinary bool `json:"isBinary"`
|
||||
IsHidden bool `json:"isHidden"`
|
||||
IsReserved bool `json:"isReserved"`
|
||||
}
|
||||
```
|
||||
|
||||
## Task 1: Path Policy
|
||||
|
||||
**Files:**
|
||||
|
||||
- Create: `internal/core/files/path.go`
|
||||
- Create: `internal/core/files/path_test.go`
|
||||
|
||||
- [x] Add `NormalizeVaultRelativePath(relative string) (string, error)`.
|
||||
- [x] Reject absolute paths, null bytes, `..`, and empty file paths.
|
||||
- [x] Preserve path case, including canonical `Notes`.
|
||||
- [x] Add `IsReservedPath(relative string) bool` returning true for `.verstak`
|
||||
and `.verstak/...`.
|
||||
- [x] Add tests:
|
||||
`TestNormalizeRejectsAbsolutePath`,
|
||||
`TestNormalizeRejectsTraversal`,
|
||||
`TestNormalizeRejectsNullByte`,
|
||||
`TestNormalizePreservesCase`,
|
||||
`TestReservedPathPolicy`.
|
||||
- [x] Run:
|
||||
|
||||
```bash
|
||||
go test ./internal/core/files
|
||||
```
|
||||
|
||||
Expected: all `internal/core/files` tests pass.
|
||||
|
||||
## Task 2: Files Service
|
||||
|
||||
**Files:**
|
||||
|
||||
- Create: `internal/core/files/service.go`
|
||||
- Create/modify: `internal/core/files/service_test.go`
|
||||
|
||||
- [x] Define `Service` with a vault dependency that can return the current vault
|
||||
root and status.
|
||||
- [x] Implement `List(relativeDir string) ([]Entry, error)`.
|
||||
- [x] Implement `Metadata(relativePath string) (Entry, error)`.
|
||||
- [x] Implement `ReadText(relativePath string) (string, error)`.
|
||||
- [x] Implement `WriteText(relativePath, content string, overwrite bool) (Entry, error)`.
|
||||
- [x] Implement `Mkdir(relativePath string) (Entry, error)`.
|
||||
- [x] Implement `Move(fromRelativePath, toRelativePath string, overwrite bool) (Entry, error)`.
|
||||
- [x] Implement `Trash(relativePath string) (Entry, error)`.
|
||||
- [x] Use the shared path policy for every public method.
|
||||
- [x] Block `.verstak` paths in every public method.
|
||||
- [x] Add tests for closed vault, list, metadata, text read/write, mkdir, move,
|
||||
trash, overwrite false conflict, overwrite true replace, and reserved path
|
||||
rejection.
|
||||
- [x] Run:
|
||||
|
||||
```bash
|
||||
go test ./internal/core/files
|
||||
```
|
||||
|
||||
Expected: all `internal/core/files` tests pass.
|
||||
|
||||
## Task 3: Atomic Writes
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `internal/core/files/service.go`
|
||||
- Modify: `internal/core/files/service_test.go`
|
||||
|
||||
- [x] Write text content to a temp file in the target directory.
|
||||
- [x] Rename the temp file into the final path only after successful write.
|
||||
- [x] Remove temp file on write failure.
|
||||
- [x] Add test `TestWriteTextIsAtomicOnFailure` using a controlled failing path
|
||||
or permission-denied directory.
|
||||
- [x] Add test `TestWriteTextDoesNotLeaveTempFile`.
|
||||
- [x] Run:
|
||||
|
||||
```bash
|
||||
go test ./internal/core/files
|
||||
```
|
||||
|
||||
Expected: all `internal/core/files` tests pass.
|
||||
|
||||
## Task 4: Permissions And Capabilities
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `internal/core/permissions/registry.go`
|
||||
- Modify: `main.go`
|
||||
- Modify: `internal/api/app_test.go`
|
||||
|
||||
- [x] Register permissions: `files.read`, `files.write`, `files.delete`.
|
||||
- [x] Register core capability `verstak/core/files/v1` when vault services are
|
||||
initialized.
|
||||
- [x] Add API guard tests proving each Files bridge method rejects plugins that
|
||||
are missing the required permission.
|
||||
- [x] Run:
|
||||
|
||||
```bash
|
||||
go test ./internal/core/permissions ./internal/api
|
||||
```
|
||||
|
||||
Expected: permission registry and API tests pass.
|
||||
|
||||
## Task 5: Wails API Bridge
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `internal/api/app.go`
|
||||
- Modify: `internal/api/app_test.go`
|
||||
- Modify after Wails generation or by hand if generation is unavailable:
|
||||
`frontend/wailsjs/go/api/App.d.ts`
|
||||
- Modify after Wails generation or by hand if generation is unavailable:
|
||||
`frontend/wailsjs/go/api/App.js`
|
||||
|
||||
- [x] Add `files.Service` to `api.App`.
|
||||
- [x] Add plugin-scoped methods listed in "Public Backend Shape".
|
||||
- [x] Use `requirePluginAccess(pluginID, permission)` for every method.
|
||||
- [x] Return readable errors for closed vault, missing file, reserved path,
|
||||
conflict, and missing permission.
|
||||
- [x] Add tests for successful read/write/list/mkdir/move/trash through `App`.
|
||||
- [x] Run:
|
||||
|
||||
```bash
|
||||
go test ./internal/api
|
||||
```
|
||||
|
||||
Expected: API tests pass.
|
||||
|
||||
## Task 6: Frontend Plugin API Draft
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `frontend/src/lib/plugin-host/VerstakPluginAPI.js`
|
||||
- Modify: `frontend/src/lib/test/wails-mock.js`
|
||||
- Add/modify focused frontend tests under `frontend/e2e/` only if existing test
|
||||
coverage cannot validate the shape outside Playwright.
|
||||
|
||||
- [x] Add `api.files.list(relativeDir)`.
|
||||
- [x] Add `api.files.metadata(relativePath)`.
|
||||
- [x] Add `api.files.readText(relativePath)`.
|
||||
- [x] Add `api.files.writeText(relativePath, content, options)`.
|
||||
- [x] Add `api.files.mkdir(relativePath)`.
|
||||
- [x] Add `api.files.move(fromRelativePath, toRelativePath, options)`.
|
||||
- [x] Add `api.files.trash(relativePath)`.
|
||||
- [x] Keep all calls plugin-scoped; plugin code must not pass `pluginId`.
|
||||
- [x] Mock readable errors for reserved path and missing permission.
|
||||
- [x] Run:
|
||||
|
||||
```bash
|
||||
cd frontend
|
||||
npm run build
|
||||
```
|
||||
|
||||
Expected: frontend build passes.
|
||||
|
||||
## Task 7: SDK Bridge Shape Draft
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `../verstak-sdk/src/plugin-api.ts`
|
||||
- Modify: `../verstak-sdk/src/test-utils.ts`
|
||||
- Modify: `../verstak-sdk/src/plugin-api.test.ts`
|
||||
|
||||
- [x] Add `files` API TypeScript interfaces matching the frontend API names.
|
||||
- [x] Add mock Files API methods in `createMockPluginAPI`.
|
||||
- [x] Add contract tests for API shape, text write/read, reserved path error, and
|
||||
trash result shape.
|
||||
- [x] Run:
|
||||
|
||||
```bash
|
||||
cd ../verstak-sdk
|
||||
./scripts/check.sh
|
||||
./scripts/build.sh
|
||||
./scripts/test.sh
|
||||
```
|
||||
|
||||
Expected: SDK check, build, and tests pass.
|
||||
|
||||
## Task 8: Documentation
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `docs/PLUGIN_RUNTIME.md`
|
||||
- Modify: `docs/NOTES_FILES_PLUGIN_PLAN.md`
|
||||
|
||||
- [x] Document Files Core API as functional for Milestone 6a.
|
||||
- [x] Keep Notes API documented as planned until Milestone 6b or later.
|
||||
- [x] Document `.verstak` reserved path policy.
|
||||
- [x] Document slash-only path policy, Windows/UNC rejection, and symlink policy.
|
||||
- [x] Document text-only write support and deferred binary streaming.
|
||||
|
||||
## Task 9: Final Verification
|
||||
|
||||
- [x] Run desktop backend tests:
|
||||
|
||||
```bash
|
||||
cd verstak-desktop
|
||||
go test ./...
|
||||
```
|
||||
|
||||
- [x] Run desktop frontend build:
|
||||
|
||||
```bash
|
||||
cd verstak-desktop/frontend
|
||||
npm run build
|
||||
```
|
||||
|
||||
- [x] Run desktop e2e:
|
||||
|
||||
```bash
|
||||
cd verstak-desktop/frontend
|
||||
npm run test:e2e -- --reporter=list
|
||||
```
|
||||
|
||||
- [x] Run official plugins checks:
|
||||
|
||||
```bash
|
||||
cd verstak-official-plugins
|
||||
./scripts/check.sh
|
||||
./scripts/build.sh
|
||||
```
|
||||
|
||||
- [x] Run SDK checks:
|
||||
|
||||
```bash
|
||||
cd verstak-sdk
|
||||
./scripts/check.sh
|
||||
./scripts/build.sh
|
||||
./scripts/test.sh
|
||||
```
|
||||
|
||||
Expected: all commands exit 0. Existing Svelte unused CSS warnings are acceptable
|
||||
only if they remain warnings and do not fail the build.
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
# Milestone 6b - Open/Edit Provider Registry + Workbench Routing Skeleton
|
||||
|
||||
This milestone adds the minimal infrastructure layer for open/edit routing before
|
||||
Files UI, Notes UI, or editor implementation starts. It does not implement those
|
||||
plugins and does not add a concrete core-owned Markdown editor.
|
||||
|
||||
## Existing Architecture Found
|
||||
|
||||
| Path | Section/title | Summary |
|
||||
|---|---|---|
|
||||
| `../verstak-docs/00_README.md` | Main architecture invariant | Core does not know concrete notes, file manager, or markdown editor features. It owns vault, plugin runtime, capability registry, contribution points, permissions, settings, events, storage, and UI shell. |
|
||||
| `../verstak-docs/01_Product_Vision.md` | What is not in core / platform goal | Markdown editor, file manager, preview, and notes workflow are plugins. Users should be able to replace the markdown editor or install multiple editors. |
|
||||
| `../verstak-docs/02_Platform_Architecture.md` | UI Shell / Capability Registry | UI Shell knows contribution points, not concrete note editor or file preview implementations. Files plugin checks editor/viewer capabilities instead of depending on `official.markdown-editor`. |
|
||||
| `../verstak-docs/03_Repositories.md` | Repository split | `verstak-desktop` is Core Platform + UI Shell and does not contain mandatory notes, file manager, or markdown editor modules. Official plugins live separately. |
|
||||
| `../verstak-docs/04_Plugin_System.md` | Goal / capabilities instead of plugin names / contribution points | Notes, file manager, editor, and viewer are plugin functions. The docs explicitly reject `requires: ["official.markdown-editor"]` and prefer `optionalRequires: ["editor.text.markdown"]`. |
|
||||
| `../verstak-docs/05_Official_Plugins.md` | official.files / official.notes / official.markdown-editor | Files optionally depends on editor/viewer capabilities. Markdown editor provides `editor.text`, `editor.text.markdown`, and `editor.note.markdown`, and must not own note storage or depend directly on `official.notes`. |
|
||||
| `../verstak-docs/06_Migration_Strategy.md` | Do not / Definition of Done | Do not make notes/files/editor mandatory core parts. The platform transition is done only when notes/files/editor/preview/activity work as plugins. |
|
||||
| `docs/NOTES_FILES_PLUGIN_PLAN.md` | Canonical Notes Model | Notes are ordinary Markdown files in canonical `Notes/` folders. No lowercase `notes`, no `.verstak/notes`, no plugin-data note content, no UUID-only filenames. |
|
||||
| `docs/NOTES_FILES_PLUGIN_PLAN.md` | Files Service Model | Files Core is raw vault file access and does not understand note semantics. Milestone 6a exposes safe text file methods and defers UI, watcher, binary streaming, external editor, and restore. |
|
||||
| `docs/PLUGIN_RUNTIME.md` | Contribution Points / Bundled Frontend Plugin API | Current runtime hosts views/sidebar/settings/commands and exposes plugin-scoped Files API. `fileActions`, `noteActions`, `contextMenuEntries`, search/activity/status bar entries are registered but not hosted. |
|
||||
| `internal/core/contribution/registry.go` | Contribution registry | Registry has the established contribution points and now extends that model with `openProviders`. |
|
||||
| `internal/core/plugin/plugin.go` | Manifest contributions | Plugin manifest types now include `openProviders` alongside existing contribution points. |
|
||||
| `frontend/src/lib/shell/WorkbenchHost.svelte` and `frontend/src/lib/plugin-host/PluginBundleHost.svelte` | Frontend plugin host | Workbench mounts the selected provider component by plugin id and component id. It remains generic and does not know a concrete editor. |
|
||||
| `frontend/src/lib/plugin-host/VerstakPluginAPI.js` | Plugin API | Bundled plugins can call `api.workbench.openResource()` and `api.workbench.editResource()` in addition to settings, capabilities, events, commands, and Files API. |
|
||||
| `../verstak-sdk/src/types.ts` and `../verstak-sdk/schemas/manifest.json` | SDK contribution contracts | SDK types/schema define `openProviders`, `OpenResourceRequest`, provider supports, and `files.*` permissions. |
|
||||
|
||||
## What Matches The Desired Model
|
||||
|
||||
- Files/Notes/Editor are already documented as plugins, not core modules.
|
||||
- Official plugins are expected to use the same runtime as community plugins.
|
||||
- Files plugin is already documented as capability-driven, not hard-wired to a markdown editor.
|
||||
- Markdown editor is already documented as replaceable via capabilities.
|
||||
- Notes are already documented as Markdown files under canonical `Notes/` folders, without `.verstak/notes`, UUID note entities, or a second storage truth.
|
||||
- Desktop code has no hardcoded Markdown editor component.
|
||||
- Existing plugin host can mount arbitrary plugin components, which is enough foundation for an editor provider host.
|
||||
|
||||
## Contradictions Found
|
||||
|
||||
- `docs/NOTES_FILES_PLUGIN_PLAN.md` still said Files Core API/capability/permissions were unavailable, while later sections and code show Milestone 6a implemented them.
|
||||
- `../verstak-docs/05_Official_Plugins.md` calls notes "first-class Verstak entities". That is acceptable only as UI semantics; implementation must not create a separate note storage entity.
|
||||
- `../verstak-docs/05_Official_Plugins.md` lists "Open externally" as a Files fallback. External open remains deferred and must not enter Milestone 6b.
|
||||
- `../verstak-sdk/schemas/manifest.json` previously did not include `files.read`, `files.write`, or `files.delete` in the permissions enum, while SDK TS types, desktop permissions, and official `platform-test` manifest already used them. Milestone 6b resolves this 6a contract cleanup item.
|
||||
|
||||
## Missing Before 6b
|
||||
|
||||
- `openProviders` contribution point.
|
||||
- `OpenResourceRequest` contract.
|
||||
- Workbench open/edit routing API for Files/Notes plugins.
|
||||
- Provider selection model using resource kind, extension/mime, notes context, user preference, provider priority, deterministic fallback, and disabled provider fallback.
|
||||
- User preferences for default text editor provider, default markdown editor provider, and default notes-context markdown editor provider.
|
||||
- Host slot/tab that mounts the selected provider component with an open resource request.
|
||||
- Tests for provider registration, selection, preferences, disabled provider fallback, and notes-context routing.
|
||||
|
||||
## Added In 6b
|
||||
|
||||
- `contributes.openProviders` in SDK schema/types and desktop manifest structs.
|
||||
- Desktop contribution registry support for registering, replacing, listing, and
|
||||
unregistering open providers.
|
||||
- `OpenResourceRequest`, `OpenResourceContext`, `OpenResourceResult`, and
|
||||
opened-resource state in the Workbench routing skeleton.
|
||||
- Provider selection by resource kind, extension/mime, `generic-text`,
|
||||
`generic-markdown`, or `notes-markdown` context, user preference, priority,
|
||||
deterministic `pluginId/providerId` fallback, and active plugin filtering.
|
||||
- `workbench.open` policy permission for plugins that request Workbench routing.
|
||||
- Draft app settings preferences for default text, markdown, and notes-context
|
||||
markdown providers.
|
||||
- `api.workbench.openResource()` and `api.workbench.editResource()` exposed to
|
||||
frontend plugin bundles.
|
||||
- Minimal Workbench host that mounts the selected provider component from the
|
||||
selected provider plugin.
|
||||
- `no-provider` fallback state when no matching provider exists.
|
||||
- `platform-test` diagnostic open provider used only to prove routing.
|
||||
|
||||
## Decision
|
||||
|
||||
Open/edit provider should be an extension of the existing contribution registry,
|
||||
not a parallel system. It should add `openProviders` beside `views`, `commands`,
|
||||
`fileActions`, and `noteActions`.
|
||||
|
||||
Capabilities remain useful for broad availability and degraded mode, but they are
|
||||
too coarse for choosing between multiple providers. Provider selection needs a
|
||||
declarative provider contribution with `supports`, priority, and component id.
|
||||
|
||||
## Correct Notes Model
|
||||
|
||||
- Notes are a contextual view over ordinary Markdown files under canonical
|
||||
`Notes/` folders.
|
||||
- `.md` inside `Notes/` opens through the selected markdown editor with
|
||||
notes-context.
|
||||
- `.md` outside `Notes/` opens through the selected markdown editor in generic
|
||||
markdown mode.
|
||||
- Plain text opens through the selected text editor provider in `generic-text`
|
||||
context.
|
||||
- Files and Notes call open/edit resource; neither embeds a concrete editor.
|
||||
- Editor provider selection belongs to Workbench/provider registry.
|
||||
- No `.verstak/notes`, no UUID note entities, no second truth separate from the
|
||||
`.md` file.
|
||||
|
||||
## Minimal Infrastructure Changes
|
||||
|
||||
1. Add `openProviders` to SDK manifest/schema/types.
|
||||
2. Add `openProviders` to desktop plugin manifest structs and contribution
|
||||
registry.
|
||||
3. Add `OpenResourceRequest` and provider support match types.
|
||||
4. Add Workbench/provider selection service with deterministic rules.
|
||||
5. Add user preferences for `defaultTextEditorProvider`,
|
||||
`defaultMarkdownEditorProvider`, and `defaultNotesMarkdownEditorProvider`.
|
||||
6. Add frontend host plumbing so Workbench can mount the selected plugin
|
||||
component.
|
||||
7. Fix `verstak-sdk/schemas/manifest.json` permissions enum for `files.*`.
|
||||
|
||||
## Proposed Milestone 6b Scope
|
||||
|
||||
In scope:
|
||||
|
||||
- Contribution/types/schema support for `openProviders`.
|
||||
- Workbench `openResource`/`editResource` routing API.
|
||||
- Provider selection with notes context and user preferences.
|
||||
- Minimal host tab/slot for provider component mounting.
|
||||
- Diagnostic provider plugin contribution sufficient to prove routing.
|
||||
- Tests for routing, provider selection, disabled fallback, and notes-context
|
||||
markdown.
|
||||
|
||||
Out of scope:
|
||||
|
||||
- Full Files UI feature set.
|
||||
- Full Notes UI feature set.
|
||||
- Full editor implementation.
|
||||
- Real default editor plugin (Milestone 6c).
|
||||
- Files plugin open/edit integration.
|
||||
- Notes plugin open/edit integration.
|
||||
- Hardcoded core Markdown editor.
|
||||
- Watcher/sync/binary streaming/external editor.
|
||||
- Sidecar/security boundary.
|
||||
- Large rewrite.
|
||||
|
||||
## 6b-fix: Infrastructure Gaps Closed
|
||||
|
||||
Post-review fixes before Milestone 6c:
|
||||
|
||||
- Added `openProviders` to `verstak-sdk/schemas/contributions.json` contribution points.
|
||||
- Added provider matching tests: text/markdown preference, MIME matching, extension
|
||||
case-insensitivity, multiple supports entries, kind mismatch.
|
||||
- Added disabled provider exclusion test in `api/app_test.go`.
|
||||
- Fixed SDK `build.sh`/`test.sh` to detect incomplete `node_modules`.
|
||||
- Documented disabled provider lifecycle: contributions remain in registry until
|
||||
ReloadPlugins; `activeOpenProviders()` filters disabled/unloaded at request time.
|
||||
- Installed Playwright browsers for E2E tests.
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
# Milestone 6c — Default Editor Plugin
|
||||
|
||||
## Goal
|
||||
|
||||
Create the official Default Editor Plugin as an openProvider for text, generic
|
||||
markdown, and notes-context markdown files. Core desktop does not own or import
|
||||
the editor component.
|
||||
|
||||
## What was built
|
||||
|
||||
### Plugin: `verstak.default-editor`
|
||||
|
||||
Location: `verstak-official-plugins/plugins/default-editor/`
|
||||
|
||||
**Manifest declares 3 openProviders:**
|
||||
|
||||
| Provider ID | Context | Extensions |
|
||||
|-------------|---------|------------|
|
||||
| `verstak.default-editor.text` | `generic-text` | `.txt`, `.log`, `.conf`, `.ini`, `.toml`, `.yaml`, `.yml`, `.json`, `.csv` |
|
||||
| `verstak.default-editor.markdown` | `generic-markdown` | `.md`, `.markdown` |
|
||||
| `verstak.default-editor.notes-markdown` | `notes-markdown` | `.md`, `.markdown` |
|
||||
|
||||
All providers use the same `DefaultEditor` component (unified, not 3 separate editors).
|
||||
|
||||
**Permissions:** `files.read`, `files.write`, `workbench.open`
|
||||
|
||||
**Capabilities required:** `verstak/core/files/v1`, `verstak/core/workbench/v1`
|
||||
|
||||
### Frontend component: `DefaultEditor`
|
||||
|
||||
- **Modes:** text (textarea), generic-markdown (editor + preview), notes-markdown (editor + preview + notes badge)
|
||||
- **File loading:** `api.files.readText(path)` with loading/error states
|
||||
- **Saving:** `api.files.writeText(path, content, { overwrite: true })` with dirty/saved/error states
|
||||
- **Keyboard:** Ctrl+S / Cmd+S save, Tab indentation
|
||||
- **Markdown preview:** Simple renderer (no raw HTML, no script injection)
|
||||
- **Notes context:** Badge + info bar, no separate note entity, no `.verstak/notes`
|
||||
|
||||
## Verification
|
||||
|
||||
- `go test ./...` — PASS
|
||||
- `go vet ./...` — PASS
|
||||
- `npm run build` (frontend) — PASS
|
||||
- `npm run test:e2e` — 28/28 PASS (20 existing + 8 new)
|
||||
- `scripts/check.sh` (official-plugins) — PASS
|
||||
- `scripts/build.sh` (official-plugins) — PASS
|
||||
- SDK checks — PASS
|
||||
|
||||
## Manual testing
|
||||
|
||||
Until Files UI plugin exists, use platform-test diagnostics panel to manually
|
||||
open files via workbench: click "Open Text Diagnostic", "Open Markdown Diagnostic",
|
||||
or "Open Notes Diagnostic" buttons. These call `api.workbench.editResource` and
|
||||
route through the default-editor provider.
|
||||
|
||||
## Deferred
|
||||
|
||||
- CodeMirror/Monaco editor
|
||||
- Backlinks, internal link navigation
|
||||
- Secret widgets
|
||||
- Image asset pipeline
|
||||
- Files UI plugin
|
||||
- Notes UI plugin
|
||||
- Watcher/sync
|
||||
- External open
|
||||
- Sidecar/security isolation
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
# Milestone 6d — Minimal Files Plugin
|
||||
|
||||
## Goal
|
||||
|
||||
Create a minimal Files plugin that shows vault files/folders and opens files
|
||||
through Workbench openResource. No editor embedded.
|
||||
|
||||
## What was built
|
||||
|
||||
### Plugin: `verstak.files`
|
||||
|
||||
Location: `verstak-official-plugins/plugins/files/`
|
||||
|
||||
**Contributions:**
|
||||
- views: `verstak.files.view` → `FilesView` component
|
||||
- No sidebarItems — Files is not a global sidebar item
|
||||
|
||||
**Permissions:** `files.read`, `files.write`, `workbench.open`, `ui.register`
|
||||
|
||||
### Files View
|
||||
|
||||
- Root listing on mount
|
||||
- Folder navigation (double-click)
|
||||
- File open via `api.workbench.openResource()`
|
||||
- Breadcrumb navigation
|
||||
- Create folder/file buttons
|
||||
- Refresh button
|
||||
- Loading/error/empty states
|
||||
- `.verstak` filtered out
|
||||
|
||||
### Provider priority
|
||||
|
||||
- default-editor: priority 50
|
||||
- platform-test diagnostic: priority 10
|
||||
- default-editor wins for normal file opens
|
||||
|
||||
### Bundle fix
|
||||
|
||||
Fixed missing opening quote in STYLES string (`.files-empty` → `'.files-empty'`).
|
||||
Added automated bundle execution check to `scripts/check.sh`.
|
||||
|
||||
## 6d-hotfix
|
||||
|
||||
- Removed sidebarItems from Files plugin (Files is not a global sidebar item)
|
||||
- Added `[frontend bundle execution]` check to `check.sh` — verifies all plugin
|
||||
bundles parse via `new Function()` and register via `VerstakPluginRegister`
|
||||
- Updated E2E tests: Files no longer expected in global sidebar
|
||||
- Documented: sidebarItems are global shell navigation, not workspace template tabs
|
||||
|
||||
## Verification
|
||||
|
||||
- `go test ./...` — PASS
|
||||
- `go vet ./...` — PASS
|
||||
- `npm run build` — PASS
|
||||
- `npm run test:e2e` — 34/34 PASS
|
||||
- Official plugins — 3 plugins built, bundle execution check passes
|
||||
- SDK — 11/11 tests pass
|
||||
|
||||
## Deferred
|
||||
|
||||
- Notes plugin, rename/move/trash UI, drag-and-drop, context menu,
|
||||
watcher/inotify, sync, external open, binary streaming, sidecar/security,
|
||||
workspace template host (Milestone 6d2)
|
||||
|
||||
|
|
@ -1,30 +1,39 @@
|
|||
# Notes/Files Plugin Architecture Plan
|
||||
|
||||
This document captures the architectural decisions for Notes, Files, and
|
||||
Workbench routing. Most items described below are now implemented; this
|
||||
document remains as a reference for the canonical data model and rules.
|
||||
This document locks the Notes/Files/Open architecture for the next milestones.
|
||||
Files Core Service was implemented in Milestone 6a; this document still does not
|
||||
start Notes UI, Notes plugin, Files UI plugin, editor plugin, watcher, sync, or
|
||||
binary streaming.
|
||||
|
||||
## Current Readiness
|
||||
|
||||
All key components are implemented:
|
||||
The platform is ready for bundled plugin UI experiments. Files Core is available
|
||||
as a safe vault-scoped text file API. Notes, Files UI, and editor/viewer UI still
|
||||
need plugin-level implementations and host surfaces before real product use.
|
||||
|
||||
- Files Core API with safe vault-scoped text and binary file operations.
|
||||
- Notes plugin as a semantic view over canonical `Notes/` Markdown files.
|
||||
- Files UI plugin with folder navigation and Workbench-based file opening.
|
||||
- Default Editor plugin providing text/markdown openProviders.
|
||||
- File Preview plugin for images.
|
||||
- Workbench open/edit routing with provider selection.
|
||||
Already available:
|
||||
|
||||
- Plugin discovery, lifecycle, settings, capabilities, bundled commands, and
|
||||
bundled frontend events.
|
||||
- Workspace lifecycle APIs for top-level physical folders under the vault root.
|
||||
- Plugin-owned internal storage directories:
|
||||
`.verstak/plugin-data/<pluginId>`, `.verstak/plugin-settings/<pluginId>`, and
|
||||
`.verstak/plugin-cache/<pluginId>`.
|
||||
- Contribution registry entries for `fileActions`, `noteActions`,
|
||||
`contextMenuEntries`, `searchProviders`, `activityProviders`, and
|
||||
`statusBarItems`.
|
||||
|
||||
Not available yet:
|
||||
|
||||
- Notes plugin/API as a semantic view over Markdown files.
|
||||
- Files UI plugin.
|
||||
- Editor/viewer plugin.
|
||||
- Open/edit resource routing and provider selection.
|
||||
- UI hosts for file actions, note actions, context menus, search providers,
|
||||
activity providers, and status bar items.
|
||||
- File watcher for external filesystem changes.
|
||||
- Trash plugin for restore and permanent delete.
|
||||
|
||||
Not yet available:
|
||||
|
||||
- Real plugin isolation (bundled plugins run in shared JS context;
|
||||
sidecar/sandbox is a future milestone).
|
||||
- Chunked streaming/large-file import (bounded to 2 MB text / 8 MB bytes).
|
||||
- Production-grade auto-update and release channel.
|
||||
activity providers, or status bar items.
|
||||
- Watcher/indexer for external filesystem changes.
|
||||
- Real plugin isolation. Current permission checks are contract/policy checks,
|
||||
not a security boundary for bundled frontend JavaScript.
|
||||
|
||||
## Canonical Notes Model
|
||||
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ contributions summary.
|
|||
Conflicts are rejected unless `options.overwrite` is true.
|
||||
- `files.deleteTrash(trashId)` — permanently removes a file/folder already in
|
||||
internal trash. This operation cannot be undone.
|
||||
- UI policy: the Deal `Files` plugin displays only live files and folders.
|
||||
- UI policy: the workspace `Files` plugin displays only live files and folders.
|
||||
The global official `verstak.trash` plugin owns listing, restoring, filtering,
|
||||
and permanently deleting deleted items across the vault.
|
||||
- `files.openExternal(relativePath)` — opens a vault-relative file/folder in
|
||||
|
|
@ -477,8 +477,8 @@ contributions summary.
|
|||
- All paths are canonical vault-relative slash paths. Backslashes, POSIX
|
||||
absolute paths, Windows drive paths, UNC/network paths, `..`, null bytes,
|
||||
symlink traversal, and public access to `.verstak/` are rejected.
|
||||
- `.verstak` is reserved case-insensitively in every path segment: its marker,
|
||||
sync snapshot, trash, and workspace identity are internal-only.
|
||||
- `.verstak` is reserved case-insensitively: `.verstak`, `.Verstak`, and any
|
||||
first path segment with that spelling are internal-only.
|
||||
- `files.metadata` may report a final symlink as `type: "symlink"`, but
|
||||
`files.list` through a symlink directory and all read/write/move/trash
|
||||
operations through symlinks are forbidden in Milestone 6a.
|
||||
|
|
@ -486,39 +486,20 @@ contributions summary.
|
|||
`writeBytes` are bounded byte contracts up to 8 MB; chunked streaming is
|
||||
deferred.
|
||||
- Live watcher refresh is active while Verstak is running and a vault is open.
|
||||
It publishes `file.changed` as a UI hint and debounces a full core scanner;
|
||||
the persistent `.verstak/sync/snapshot.json` scanner, not the watcher, is the
|
||||
source of truth. It runs on open, before manual sync, after watcher events,
|
||||
and therefore detects changes made while Verstak was closed. Internal paths,
|
||||
trash, temporary files, and symlinks are excluded.
|
||||
It performs an initial no-event snapshot, then publishes `file.changed` for
|
||||
external creates, updates, and deletes outside `.verstak/`. It does not keep a
|
||||
persistent snapshot or report what changed while Verstak was closed.
|
||||
|
||||
`sync`
|
||||
|
||||
- `sync.now()` scans local files, pulls/reconciles in `server_sequence` order,
|
||||
then pushes local operations and returns `{ pushed, pulled, serverSequence,
|
||||
conflicts? }`. A remote apply failure stops the batch immediately, keeps that
|
||||
operation and later sequences unacknowledged, and retries it on the next run.
|
||||
- `sync.now()` pushes local operations, pulls remote operations, and returns
|
||||
`{ pushed, pulled, serverSequence, conflicts?, applyErrors? }`.
|
||||
- `conflicts` is an array of server-reported sync conflicts. Conflict objects
|
||||
may include `op_id`, `entity_type`, `entity_id`, `reason`, and additional
|
||||
server fields. The Sync plugin must show conflict details instead of only a
|
||||
count, and it must not silently resolve or overwrite local data.
|
||||
- `sync.status()` includes `vaultId` (the paired remote scope) and
|
||||
`lastWarning` for unresolved scanner input. A first connection pulls before
|
||||
bootstrap: an empty local snapshot never publishes deletes, and incompatible
|
||||
local/remote content is an explicit conflict rather than an overwrite.
|
||||
- File and folder operations come from the scanner. An external rename is
|
||||
intentionally represented as delete + create in this milestone. Workspace
|
||||
lifecycle is a separate core `workspace` entity (`create`, `rename`,
|
||||
`trash`, `restore`) carrying the durable `workspaceId`; plugins never obtain
|
||||
access to the nested workspace marker.
|
||||
- File transport remains bounded: UTF-8 text uses the 2 MB Files API limit;
|
||||
binary and larger regular files are staged privately, sent through Blob API,
|
||||
and referenced by SHA-256/size rather than base64 in `payload_json`. Desktop
|
||||
streams and verifies downloads before atomic apply. Pull is paginated and the
|
||||
durable cursor advances only after every applied sequence. Files above the
|
||||
configured blob limit or otherwise unsupported remain unresolved warnings.
|
||||
Operation retention/checkpoints and synchronization of Secrets, plugin
|
||||
settings, Todo, Journal, Activity, and Browser Inbox are future work.
|
||||
- `applyErrors` lists local apply failures for pulled operations. These are
|
||||
user-visible warnings and do not imply that sync was fully successful.
|
||||
- Transport push/pull uses bounded retry/backoff for transient HTTP/network
|
||||
failures. Client/auth errors are not retried.
|
||||
|
||||
|
|
@ -604,8 +585,8 @@ bundled runtime. Это реальный runtime contract для cooperative bun
|
|||
| `api.files.showInFolder(relativePath)` | ✅ Работает | Показывает vault file/folder в системном файловом менеджере, требует `files.openExternal` |
|
||||
| `api.workbench.openResource(request)` | ✅ Работает | Routes vault resources to `openProviders` |
|
||||
| `api.workbench.editResource(request)` | ✅ Работает | Same routing, forcing `mode: "edit"` |
|
||||
| `api.sync.now()` | ✅ Работает | Snapshot scan, строгий ordered pull/retry и bounded retry/backoff для transient HTTP/network failures |
|
||||
| `api.sync.status()` | ✅ Работает | Возвращает configured/connected/error/revoked, remote `vaultId`, lastError/lastWarning и unpushed count |
|
||||
| `api.sync.now()` | ✅ Работает | Push/pull с bounded retry/backoff для transient HTTP/network failures |
|
||||
| `api.sync.status()` | ✅ Работает | Возвращает configured/connected/error/revoked state, lastError, unpushed count |
|
||||
| `api.dispose()` | ✅ Работает | Очищает command handlers и event subscriptions текущего API instance |
|
||||
|
||||
Ограничения:
|
||||
|
|
@ -654,7 +635,7 @@ bundled runtime. Это реальный runtime contract для cooperative bun
|
|||
|
||||
1. Unregister contributions всех plugins предыдущего discovery.
|
||||
2. Unregister all non-core capabilities.
|
||||
3. Re-register core capabilities + vault + Deal manager (если открыт).
|
||||
3. Re-register core capabilities + vault + workspace (если открыт).
|
||||
4. Re-scan discovery directories и повторить capability resolution.
|
||||
5. Register contributions для loaded/degraded plugins (disabled/failed — не регистрируются).
|
||||
6. Update plugins list.
|
||||
|
|
@ -729,17 +710,6 @@ not-created ──CreateVault──▶ open ──CloseVault──▶ closed
|
|||
| `internal/core/permissions/registry.go` | PermissionsRegistry |
|
||||
| `internal/core/events/bus.go` | EventBus |
|
||||
| `internal/api/app.go` | Wails API, ReloadPlugins |
|
||||
| `internal/core/files/` | Files Core API: safe path policy, text/binary read/write, move, trash |
|
||||
| `internal/core/filewatcher/` | Live filesystem watcher for external changes |
|
||||
| `internal/core/workbench/` | Workbench open/edit provider routing |
|
||||
| `internal/core/workspace/` | Workspace manager: create, rename, trash, templates, identity |
|
||||
| `internal/core/notes/` | Notes file utilities (title↔filename, conflict detection) |
|
||||
| `internal/core/sync/` | Sync scanner, snapshot, reconciliation, operation recording |
|
||||
| `internal/core/secrets/` | AES-GCM secret store |
|
||||
| `internal/core/browserreceiver/` | Local HTTP receiver for browser extension |
|
||||
| `internal/core/notifications/` | Native desktop notifications |
|
||||
| `internal/core/hostname/` | Hostname normalization for browser domain activity |
|
||||
| `internal/core/externalopen/` | Platform-specific external file/folder opening |
|
||||
| `internal/core/vault/vault.go` | Vault service: CreateVault, OpenVault, CloseVault, ResolveSafePath, plugin namespace paths |
|
||||
|| `internal/core/vault/vault_test.go` | Vault tests: layout creation, open/close, path traversal, events |
|
||||
|| `internal/core/storage/api.go` | Plugin storage API: settings/data/cache JSON with namespace isolation |
|
||||
|
|
@ -868,52 +838,51 @@ Vault plugin state хранится **внутри vault** в `.verstak/plugins.
|
|||
- `./scripts/smoke-platform.sh` — ✅ (enable/disable/plugins.json)
|
||||
- `./scripts/build.sh` — ✅
|
||||
|
||||
## Дело: core capability
|
||||
## Workspace Core Capability
|
||||
|
||||
Дело — это физическая папка верхнего уровня внутри vault root. Filesystem
|
||||
является source of truth для списка Дел.
|
||||
Workspace — это физическая папка верхнего уровня внутри vault root. Filesystem
|
||||
является source of truth для списка workspaces.
|
||||
|
||||
Пример:
|
||||
|
||||
```
|
||||
<vault>/
|
||||
Deal/
|
||||
Workspace/
|
||||
Notes/
|
||||
Project/
|
||||
ClientA/
|
||||
.verstak/
|
||||
```
|
||||
|
||||
Нет единого `<vault>/Deal/` контейнера для всех Дел. Папка `Deal/` может быть
|
||||
обычным Делом, но `Project/` и `ClientA/` являются такими же Делами на том же
|
||||
уровне.
|
||||
Нет единого `<vault>/Workspace/` контейнера для всех workspaces. Папка
|
||||
`Workspace/` может быть обычным workspace, но `Project/` и `ClientA/` являются
|
||||
такими же workspace на том же уровне.
|
||||
|
||||
### Хранение
|
||||
|
||||
Существование и список Дел хранятся только в filesystem:
|
||||
Workspace existence/list хранится только в filesystem:
|
||||
|
||||
- `ListWorkspaces()` читает top-level directories из vault root.
|
||||
- `.verstak`, reserved/internal directories, top-level files и symlinks не
|
||||
считаются Делами.
|
||||
- `.verstak/workspace*.json` не является source of truth для списка Дел.
|
||||
- Нет virtual workspace tree, которое
|
||||
считаются workspaces.
|
||||
- `.verstak/workspace*.json` не является source of truth для списка workspaces.
|
||||
- Нет persisted workspace path mapping и нет virtual workspace tree, которое
|
||||
мапится на произвольные папки.
|
||||
|
||||
`.verstak` может хранить только metadata, которая не заменяет filesystem:
|
||||
|
||||
- UI state: выбранное Дело, expanded folders, sort/pin state, preferences.
|
||||
- UI state: selected workspace, expanded folders, sort/pin state, preferences.
|
||||
- Semantic snapshot: applied template snapshot, enabled feature areas, exact
|
||||
`workspaceTools`, and folder conventions.
|
||||
|
||||
При создании Дела runtime генерирует UUID и сохраняет его в
|
||||
`.verstak/workspace.json`. `workspaceId` — постоянная личность Дела;
|
||||
`workspaceRootPath` и `workspaceName` — изменяемый адрес и presentation fields.
|
||||
Переименование обновляет путь, но не ID. Новая папка с прежним именем получает
|
||||
другой ID и не может перехватить старые привязки.
|
||||
Template snapshot копируется в metadata при создании workspace. Workspace
|
||||
identity при этом остаётся именем top-level folder; `metadata.workspaceName`
|
||||
является presentation/snapshot field, not canonical identity. Если сохранённое
|
||||
значение расходится с именем папки, runtime возвращает canonical `workspaceName`
|
||||
равным имени папки без filesystem side effects.
|
||||
|
||||
```json
|
||||
{
|
||||
"workspaceId": "1eb7cc69-52e8-4a18-ae2a-50d5229c5b60",
|
||||
"workspaceName": "Project",
|
||||
"createdFromTemplate": {
|
||||
"templateId": "project",
|
||||
|
|
@ -952,25 +921,25 @@ Vault plugin state хранится **внутри vault** в `.verstak/plugins.
|
|||
}
|
||||
```
|
||||
|
||||
Если original template удалён или изменён позже, существующее Дело
|
||||
Если original template удалён или изменён позже, существующий workspace
|
||||
открывается по сохранённому snapshot и не мутирует автоматически. Template
|
||||
update/migration может быть только явной future feature. Если metadata
|
||||
отсутствует, Дело открывается как generic Deal минимум с `files: true`.
|
||||
отсутствует, workspace открывается как generic workspace минимум с `files: true`.
|
||||
|
||||
### API
|
||||
|
||||
- `ListWorkspaces()` — список top-level папок Дел с их `workspaceId`.
|
||||
- `ListWorkspaces()` — список top-level physical folders.
|
||||
- `ListWorkspaceTemplates()` — selectable built-in templates с presentation
|
||||
metadata и `workspaceTools`.
|
||||
- `CreateWorkspace(name, templateId?)` — создать `<vault>/<name>/`, применить
|
||||
template один раз, сохранить snapshot metadata.
|
||||
- `RenameWorkspace(oldName, newName)` — физически переименовать top-level папку
|
||||
Дела и обновить metadata name, не меняя `workspaceId`.
|
||||
- `TrashWorkspace(name)` — перенести весь top-level folder Дела в internal
|
||||
- `RenameWorkspace(oldName, newName)` — физически переименовать top-level folder
|
||||
и обновить metadata key/name.
|
||||
- `TrashWorkspace(name)` — перенести весь top-level workspace folder в internal
|
||||
trash policy.
|
||||
- `GetWorkspaceMetadata(name)` — прочитать metadata или вернуть generic fallback.
|
||||
- `UpdateWorkspaceMetadata(name, patch)` — обновить metadata без влияния на
|
||||
существование Дела.
|
||||
существование workspace.
|
||||
|
||||
Deprecated compatibility APIs:
|
||||
|
||||
|
|
@ -980,7 +949,7 @@ Deprecated compatibility APIs:
|
|||
- `ArchiveWorkspaceNode(...)` — wrapper over `TrashWorkspace`.
|
||||
- `MoveWorkspaceNode(...)` — unsupported; old nested/mapped moves are rejected.
|
||||
- `GetCurrentWorkspaceNode()` / `SetCurrentWorkspaceNode(...)` — wrappers over
|
||||
selected top-level Deal UI state.
|
||||
selected top-level workspace UI state.
|
||||
|
||||
Эти методы существуют только для постепенного frontend/Wails cleanup. Они не
|
||||
должны создавать или сохранять nested workspace tree и не должны восстанавливать
|
||||
|
|
@ -988,33 +957,32 @@ Deprecated compatibility APIs:
|
|||
|
||||
### Capability
|
||||
|
||||
`verstak/core/workspace/v1` — техническое имя capability; оно регистрируется
|
||||
только когда vault открыт и Deal manager инициализирован.
|
||||
`verstak/core/workspace/v1` — регистрируется только когда vault открыт и workspace инициализирован.
|
||||
|
||||
### Правила
|
||||
|
||||
- Имя Дела — один safe folder name, не path.
|
||||
- Workspace name — один safe folder name, не path.
|
||||
- Reject: empty, slash, backslash, absolute-looking paths, `..`, null byte,
|
||||
`.verstak`, reserved/internal names, symlink Дел, conflicts.
|
||||
- WorkspaceItems получают техническое поле `workspaceRootPath`, равное имени top-level папки
|
||||
`.verstak`, reserved/internal names, symlink workspaces, conflicts.
|
||||
- WorkspaceItems получают `workspaceRootPath`, равный имени top-level папки
|
||||
(`Project`, `ClientA`, etc). Files plugin показывает именно эту папку.
|
||||
- Files API остаётся raw vault-relative API: `Project/Notes/example.md`,
|
||||
`Project/docs/file.md`, `Test/readme.md`.
|
||||
- Notes are ordinary Markdown files under `<Deal>/Notes/`; нет
|
||||
- Notes are ordinary Markdown files under `<workspace>/Notes/`; нет
|
||||
`.verstak/notes`, UUID note storage или второго source of truth для note
|
||||
content.
|
||||
|
||||
### Lifecycle Events
|
||||
|
||||
Runtime publishes lifecycle events Дел после успешных операций:
|
||||
Runtime publishes workspace lifecycle events after successful operations:
|
||||
|
||||
- `workspace.created` — payload includes `operation: "create"`, `workspaceId`,
|
||||
- `workspace.created` — payload includes `operation: "create"`,
|
||||
`workspaceRootPath`, `workspaceName`, and optional `templateId`.
|
||||
- `workspace.renamed` — payload includes `operation: "rename"`, `workspaceId`,
|
||||
new `workspaceRootPath` / `workspaceName`, and previous path fields.
|
||||
- `workspace.trashed` — payload includes `operation: "trash"`, `workspaceId`,
|
||||
- `workspace.renamed` — payload includes `operation: "rename"`, new
|
||||
`workspaceRootPath` / `workspaceName`, and previous workspace fields.
|
||||
- `workspace.trashed` — payload includes `operation: "trash"`,
|
||||
`workspaceRootPath`, `workspaceName`, `trashId`, `trashPath`, and `deletedAt`.
|
||||
- `workspace.selected` — payload includes `operation: "select"`, `workspaceId`,
|
||||
- `workspace.selected` — payload includes `operation: "select"`,
|
||||
`workspaceRootPath`, and `workspaceName`.
|
||||
|
||||
Official Activity subscribes to these events and stores them through the normal
|
||||
|
|
@ -1022,11 +990,11 @@ activity provider path.
|
|||
|
||||
### UI
|
||||
|
||||
Список Дел в sidebar:
|
||||
- Flat list of top-level папок Дел.
|
||||
- Создать Дело, переименовать Дело, переместить Дело в корзину.
|
||||
- Selection is stored as selected Deal name.
|
||||
- No expand/collapse tree and no case/folder node creation in core.
|
||||
Workspace list в sidebar:
|
||||
- Flat list of top-level workspace folders.
|
||||
- Create workspace, rename workspace, trash workspace.
|
||||
- Selection is stored as selected workspace name.
|
||||
- No expand/collapse workspace tree and no case/folder node creation in core.
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Deal Templates
|
||||
# Workspace Templates
|
||||
|
||||
Deal templates choose which dynamic plugin Deal tabs are visible when a new
|
||||
top-level Deal is created. They do not enable or disable plugins for the
|
||||
Workspace templates choose which dynamic plugin workspace tabs are visible when a
|
||||
new top-level workspace is created. They do not enable or disable plugins for the
|
||||
whole vault and do not affect global sidebar tools.
|
||||
|
||||
## Built-in templates
|
||||
|
||||
| Template | Deal tabs |
|
||||
| Template | Workspace tabs |
|
||||
| --- | --- |
|
||||
| General | Notes, Files, Journal, Activity, Browser Inbox |
|
||||
| Project | Notes, Files, Todos, Journal, Activity, Browser Inbox |
|
||||
|
|
@ -14,27 +14,27 @@ whole vault and do not affect global sidebar tools.
|
|||
| Admin | Notes, Files, Secrets, Todos, Journal |
|
||||
| Minimal | Notes, Files |
|
||||
|
||||
The create-Deal modal displays the selected template description and its
|
||||
The create-workspace modal displays the selected template description and its
|
||||
included plugin tabs before the folder is created.
|
||||
|
||||
## Metadata and compatibility
|
||||
|
||||
Creation stores a template snapshot in `.verstak/workspaces/` metadata. The
|
||||
snapshot contains the template id, name, version, applied time, and an ordered
|
||||
`workspaceTools` list of plugin IDs. Existing Deal metadata without
|
||||
`workspaceTools` remains compatible: its Deal continues to show all globally
|
||||
enabled Deal plugins rather than unexpectedly hiding tabs.
|
||||
`workspaceTools` list of plugin IDs. Existing workspace metadata without
|
||||
`workspaceTools` remains compatible: its workspace continues to show all globally
|
||||
enabled workspace plugins rather than unexpectedly hiding tabs.
|
||||
|
||||
Templates are applied once. Editing the built-in catalog or creating another
|
||||
Deal with a different template never changes an existing Deal snapshot.
|
||||
workspace with a different template never changes an existing workspace snapshot.
|
||||
There is no template editor or post-creation template switcher yet.
|
||||
|
||||
## Global tools and unavailable plugins
|
||||
|
||||
Template visibility applies only to `workspaceItems` in the selected Deal.
|
||||
Template visibility applies only to `workspaceItems` in the selected workspace.
|
||||
Global views and sidebar items, such as global Todos, Browser Inbox, and Trash,
|
||||
remain available according to the normal plugin enablement state.
|
||||
|
||||
The Deal host intersects the snapshot with dynamically discovered, globally
|
||||
The workspace host intersects the snapshot with dynamically discovered, globally
|
||||
enabled plugin contributions. If a template references a plugin that is missing or
|
||||
disabled, that tab is simply absent; the other template tabs remain usable.
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 59 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 50 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 68 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 75 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 99 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 116 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 118 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 61 KiB |
|
|
@ -27,38 +27,6 @@ test.describe('Activity workflow', () => {
|
|||
await expect(activity.locator('[data-activity-action="clear"]')).toBeDisabled();
|
||||
});
|
||||
|
||||
test('clearing activity requires destructive confirmation for the current case', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
await window.go.api.App.WritePluginSettings('verstak.activity', {
|
||||
'events:workspace:Project': [{
|
||||
activityId: 'activity-to-clear',
|
||||
occurredAt: '2026-06-30T08:00:00.000Z',
|
||||
type: 'note.saved',
|
||||
title: 'Keep until confirmed',
|
||||
workspaceRootPath: 'Project',
|
||||
}],
|
||||
});
|
||||
});
|
||||
|
||||
await page.getByRole('tab', { name: 'Activity' }).click();
|
||||
const activity = page.locator('.activity-root');
|
||||
await expect(activity.locator('.activity-count')).toHaveText('1 event');
|
||||
|
||||
await activity.locator('[data-activity-action="clear"]').click();
|
||||
const confirmation = activity.locator('[data-activity-clear-confirmation]');
|
||||
await expect(confirmation).toBeVisible();
|
||||
await expect(confirmation).toContainText(/Project|Дело/);
|
||||
await expect(activity.locator('.activity-count')).toHaveText('1 event');
|
||||
|
||||
await confirmation.locator('[data-activity-clear-cancel]').click();
|
||||
await expect(confirmation).toHaveCount(0);
|
||||
await expect(activity.locator('.activity-count')).toHaveText('1 event');
|
||||
|
||||
await activity.locator('[data-activity-action="clear"]').click();
|
||||
await activity.locator('[data-activity-clear-confirm]').click();
|
||||
await expect(activity.locator('.activity-count')).toHaveText('0 events');
|
||||
});
|
||||
|
||||
test('workspace activity keeps raw events and renders factual work session candidates', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
await window.go.api.App.WritePluginSettings('verstak.activity', {
|
||||
|
|
@ -106,8 +74,8 @@ test.describe('Activity workflow', () => {
|
|||
await expect(candidateSection).toContainText('Possible journal entries');
|
||||
const candidate = candidateSection.locator('[data-work-session-candidate]');
|
||||
await expect(candidate).toHaveCount(1);
|
||||
await expect(candidate).toContainText('Deal: Project');
|
||||
await expect(candidate).toContainText('Estimated duration: 10 min');
|
||||
await expect(candidate).toContainText('Workspace: Project');
|
||||
await expect(candidate).toContainText('Estimated duration: 20 min');
|
||||
await expect(candidate).toContainText('Activities: 2');
|
||||
await expect(candidate).not.toContainText('Project work on');
|
||||
await expect(candidate.locator('[data-work-session-action="review"]')).toBeVisible();
|
||||
|
|
@ -142,11 +110,11 @@ test.describe('Activity workflow', () => {
|
|||
await expect(page.getByRole('tab', { name: 'Journal' })).toHaveAttribute('aria-selected', 'true');
|
||||
const journal = page.locator('.journal-root');
|
||||
await expect(journal).toBeVisible({ timeout: 10000 });
|
||||
await expect(journal.locator('[data-journal-candidate]')).toContainText('Deal: Project');
|
||||
await expect(journal.locator('[data-journal-candidate]')).toContainText('Estimated duration: 10 min');
|
||||
await expect(journal.locator('[data-journal-candidate]')).toContainText('Workspace: Project');
|
||||
await expect(journal.locator('[data-journal-candidate]')).toContainText('Estimated duration: 20 min');
|
||||
await expect(journal.locator('[data-journal-input="title"]')).toHaveValue('');
|
||||
await expect(journal.locator('[data-journal-input="summary"]')).toHaveValue('');
|
||||
await expect(journal.locator('[data-journal-input="minutes"]')).toHaveValue('10');
|
||||
await expect(journal.locator('[data-journal-input="minutes"]')).toHaveValue('20');
|
||||
|
||||
const activityInputs = journal.locator('[data-journal-candidate-activity]');
|
||||
await expect(activityInputs).toHaveCount(2);
|
||||
|
|
@ -158,7 +126,7 @@ test.describe('Activity workflow', () => {
|
|||
await journal.locator('[data-journal-action="save-entry"]').click();
|
||||
|
||||
await expect(journal).toContainText('Review research capture');
|
||||
await expect(journal).toContainText('10 min');
|
||||
await expect(journal).toContainText('20 min');
|
||||
const stored = await page.evaluate(async () => {
|
||||
const result = await window.go.api.App.ReadPluginSettings('verstak.journal');
|
||||
return Array.isArray(result) ? result[0]['worklog:workspace:Project'] : result['worklog:workspace:Project'];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { test, expect } from '@playwright/test';
|
||||
import { waitForAppReady, setupConsoleCollector, resetMockState } from './helpers.js';
|
||||
|
||||
test.describe('Browser workflow', () => {
|
||||
test.describe('Browser Inbox workflow', () => {
|
||||
let consoleCollector;
|
||||
|
||||
test.beforeEach(async ({ page }) => {
|
||||
|
|
@ -16,14 +16,14 @@ test.describe('Browser workflow', () => {
|
|||
});
|
||||
|
||||
test('global inbox explains empty capture flow and exposes assignment filters', async ({ page }) => {
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser' }).click();
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser Inbox' }).click();
|
||||
|
||||
const inbox = page.locator('.browser-inbox-root');
|
||||
await expect(inbox).toBeVisible({ timeout: 10000 });
|
||||
await expect(inbox.locator('.browser-inbox-title')).toHaveText('Browser');
|
||||
await expect(inbox.locator('.browser-inbox-title')).toContainText('Browser Inbox');
|
||||
await expect(inbox.locator('.browser-inbox-count')).toHaveText('0 items');
|
||||
await expect(inbox.locator('.browser-inbox-empty')).toContainText('No browser materials yet');
|
||||
await expect(inbox.locator('.browser-inbox-empty')).toContainText('Send a page, selection, or link from the extension');
|
||||
await expect(inbox.locator('.browser-inbox-empty')).toContainText('No browser captures yet');
|
||||
await expect(inbox.locator('.browser-inbox-empty')).toContainText('send a page, selection, link, or file from the browser extension');
|
||||
await expect(inbox.locator('[data-browser-inbox-filter="status"]')).toBeVisible();
|
||||
await expect(inbox.locator('[data-browser-inbox-filter="workspace"]')).toBeVisible();
|
||||
await expect(inbox.locator('[data-browser-inbox-action="clear"]')).toBeDisabled();
|
||||
|
|
@ -47,7 +47,7 @@ test.describe('Browser workflow', () => {
|
|||
}],
|
||||
});
|
||||
});
|
||||
await page.getByRole('tab', { name: 'Browser' }).click();
|
||||
await page.getByRole('tab', { name: 'Browser Inbox' }).click();
|
||||
|
||||
const inbox = page.locator('.browser-inbox-root');
|
||||
await expect(inbox.locator('.browser-inbox-count')).toHaveText('1 item');
|
||||
|
|
@ -94,7 +94,7 @@ test.describe('Browser workflow', () => {
|
|||
],
|
||||
});
|
||||
});
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser' }).click();
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser Inbox' }).click();
|
||||
|
||||
const inbox = page.locator('.browser-inbox-root');
|
||||
await expect(inbox.locator('.browser-inbox-count')).toHaveText('3 items');
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ test.describe('Command Palette', () => {
|
|||
|
||||
test('runs sync workflow commands', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
const err = await window.go.api.App.PluginSyncConfigure('verstak.sync', 'https://sync.example.test', 'alice', 'secret', '');
|
||||
const err = await window.go.api.App.PluginSyncConfigure('verstak.sync', 'https://sync.example.test', 'alice', 'secret');
|
||||
if (err) throw new Error(err);
|
||||
});
|
||||
|
||||
|
|
@ -124,20 +124,4 @@ test.describe('Command Palette', () => {
|
|||
await expect(page.locator('.modal[aria-label="Plugin Settings"]')).toBeVisible({ timeout: 10000 });
|
||||
await expect(page.locator('.modal-header h3')).toContainText('Sync');
|
||||
});
|
||||
|
||||
test('keeps technical command failures out of the palette status', async ({ page }) => {
|
||||
await page.evaluate(() => {
|
||||
window.go.api.App.PluginSyncNow = () => Promise.resolve('[plugin:verstak.sync] sync.now failed: internal service code 42');
|
||||
});
|
||||
|
||||
await page.keyboard.press(process.platform === 'darwin' ? 'Meta+K' : 'Control+K');
|
||||
const palette = page.locator('.command-palette');
|
||||
await palette.locator('[data-command-palette-input]').fill('sync now');
|
||||
await page.keyboard.press('Enter');
|
||||
|
||||
const status = page.locator('[data-command-palette-status="error"]');
|
||||
await expect(status).toContainText('Could not run Sync Now. Please try again.');
|
||||
await expect(status).not.toContainText('[plugin:');
|
||||
await expect(status).not.toContainText('sync.now');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -36,69 +36,6 @@ test.describe('F: Default Editor Plugin', () => {
|
|||
await expect(textarea).toHaveValue('Buy groceries\nWrite tests');
|
||||
});
|
||||
|
||||
test('secret link opens its exact secret and closing it restores the note preview', async ({ page }) => {
|
||||
const notePath = 'Notes/Secret Link.md';
|
||||
const noteContent = '# Secret link\n\n[Target secret](verstak-secret://target.secret)';
|
||||
|
||||
await page.evaluate(async ({ notePath, noteContent }) => {
|
||||
const writeError = await window.go.api.App.WriteVaultTextFile(
|
||||
'verstak.platform-test',
|
||||
notePath,
|
||||
noteContent,
|
||||
{ createIfMissing: true, overwrite: true },
|
||||
);
|
||||
if (writeError) throw new Error(writeError);
|
||||
const [result, openError] = await window.go.api.App.OpenWorkbenchResource('verstak.platform-test', {
|
||||
kind: 'vault-file',
|
||||
path: notePath,
|
||||
extension: '.md',
|
||||
context: { sourceView: 'notes', isInsideNotesFolder: true, notesMode: true },
|
||||
});
|
||||
if (openError) throw new Error(openError);
|
||||
window.dispatchEvent(new CustomEvent('verstak:workbench-opened', { detail: result }));
|
||||
}, { notePath, noteContent });
|
||||
|
||||
const note = page.locator('[data-editor-mode="notes-markdown"]');
|
||||
await expect(note).toBeVisible({ timeout: 10000 });
|
||||
await expect(note.locator('[data-preview]')).toContainText('Target secret');
|
||||
await note.locator('.secret-link').click();
|
||||
|
||||
const secrets = page.locator('.secrets-root');
|
||||
await expect(secrets).toBeVisible({ timeout: 10000 });
|
||||
await expect(secrets.locator('.secrets-item.active .secrets-item-title')).toHaveText('Target secret');
|
||||
await expect(secrets.locator('.secrets-card h2')).toHaveText('Target secret');
|
||||
|
||||
await page.locator('.workbench-host .close-btn').click();
|
||||
await expect(note).toBeVisible({ timeout: 10000 });
|
||||
await expect(note.locator('[data-preview]')).toContainText('Target secret');
|
||||
await expect(note.locator('[data-editor-textarea]')).toHaveCount(0);
|
||||
await expect(note.locator('[data-save-state]')).toHaveText('');
|
||||
|
||||
const storedContent = await page.evaluate(async ({ notePath }) => {
|
||||
const [content, readError] = await window.go.api.App.ReadVaultTextFile('verstak.platform-test', notePath);
|
||||
if (readError) throw new Error(readError);
|
||||
return content;
|
||||
}, { notePath });
|
||||
expect(storedContent).toBe(noteContent);
|
||||
});
|
||||
|
||||
test('unavailable secret does not fall back to the first secret', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
const [result, openError] = await window.go.api.App.OpenWorkbenchResource('verstak.default-editor', {
|
||||
kind: 'secret',
|
||||
path: 'missing.secret',
|
||||
mode: 'view',
|
||||
});
|
||||
if (openError) throw new Error(openError);
|
||||
window.dispatchEvent(new CustomEvent('verstak:workbench-opened', { detail: result }));
|
||||
});
|
||||
|
||||
const secrets = page.locator('.secrets-root');
|
||||
await expect(secrets).toBeVisible({ timeout: 10000 });
|
||||
await expect(secrets.locator('.secrets-item.active')).toHaveCount(0);
|
||||
await expect(secrets.locator('.secrets-status.error')).toContainText(/unavailable|недоступен/i);
|
||||
});
|
||||
|
||||
test('editor supports markdown toolbar split save reopen and revert', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
const err = await window.go.api.App.WriteVaultTextFile(
|
||||
|
|
@ -175,10 +112,10 @@ test.describe('F: Default Editor Plugin', () => {
|
|||
const workbench = page.locator('.workbench-host');
|
||||
await expect(workbench).toBeVisible({ timeout: 10000 });
|
||||
const title = workbench.locator('.workbench-title');
|
||||
await expect(title).toHaveText('readme.md');
|
||||
await expect(title).toHaveText('Docs/readme.md');
|
||||
});
|
||||
|
||||
test('opening a note uses its title rather than its technical path', async ({ page }) => {
|
||||
test('open .md with notes context routes to highest-priority provider', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
const [result, err] = await window.go.api.App.OpenWorkbenchResource('verstak.platform-test', {
|
||||
kind: 'vault-file',
|
||||
|
|
@ -193,7 +130,7 @@ test.describe('F: Default Editor Plugin', () => {
|
|||
const workbench = page.locator('.workbench-host');
|
||||
await expect(workbench).toBeVisible({ timeout: 10000 });
|
||||
const title = workbench.locator('.workbench-title');
|
||||
await expect(title).toHaveText('Overview');
|
||||
await expect(title).toHaveText('Notes/Overview.md');
|
||||
});
|
||||
|
||||
test('default-editor plugin is listed as loaded in plugin manager', async ({ page }) => {
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ test.describe('G: Files Plugin', () => {
|
|||
|
||||
const workbench = page.locator('.workbench-host');
|
||||
await expect(workbench).toBeVisible({ timeout: 10000 });
|
||||
await expect(workbench.locator('.workbench-title')).toHaveText('readme.md');
|
||||
await expect(workbench.locator('.workbench-title')).toHaveText('Docs/readme.md');
|
||||
|
||||
const preview = page.locator('.de-preview');
|
||||
await expect(preview).toBeVisible({ timeout: 10000 });
|
||||
|
|
@ -535,7 +535,7 @@ test.describe('G: Files Plugin', () => {
|
|||
|
||||
const workbench = page.locator('.workbench-host');
|
||||
await expect(workbench).toBeVisible({ timeout: 10000 });
|
||||
await expect(workbench.locator('.workbench-title')).toHaveText('Overview');
|
||||
await expect(workbench.locator('.workbench-title')).toHaveText('Notes/Overview.md');
|
||||
});
|
||||
|
||||
test('files plugin card shows openProviders in contributions', async ({ page }) => {
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
import { test, expect } from '@playwright/test';
|
||||
import { waitForAppReady, setupConsoleCollector, resetMockState } from './helpers.js';
|
||||
|
||||
test('global Journal creates an entry in the selected Deal', async ({ page }) => {
|
||||
const consoleCollector = setupConsoleCollector(page);
|
||||
await resetMockState(page);
|
||||
await page.goto('/');
|
||||
await waitForAppReady(page);
|
||||
await page.evaluate(async () => {
|
||||
await window.go.api.App.WritePluginSettings('verstak.journal', {
|
||||
'worklog:workspace:Project': [{ entryId: 'existing-project-entry', workspaceRootPath: 'Project', date: '2026-07-14', title: 'Existing entry', minutes: 5 }],
|
||||
});
|
||||
});
|
||||
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Journal' }).click();
|
||||
const journal = page.locator('.journal-root');
|
||||
await expect(journal.locator('.journal-title')).toHaveText('Journal');
|
||||
await journal.locator('[data-journal-action="add"]').click();
|
||||
await journal.locator('[data-journal-input="workspaceRootPath"]').selectOption('Project');
|
||||
await journal.locator('[data-journal-input="title"]').fill('Prepare project handoff');
|
||||
await journal.locator('[data-journal-input="minutes"]').fill('30');
|
||||
await journal.locator('[data-journal-action="save-entry"]').click();
|
||||
|
||||
await expect.poll(async () => page.evaluate(async () => {
|
||||
const result = await window.go.api.App.ReadPluginSettings('verstak.journal');
|
||||
const settings = Array.isArray(result) ? result[0] : result;
|
||||
return settings['worklog:workspace:Project']?.[0]?.title;
|
||||
})).toBe('Prepare project handoff');
|
||||
await expect(journal).toContainText('Prepare project handoff');
|
||||
|
||||
await page.locator('.wt-label').filter({ hasText: 'Project' }).click();
|
||||
await page.getByRole('tab', { name: 'Journal' }).click();
|
||||
await expect(page.locator('.journal-root')).toContainText('Prepare project handoff');
|
||||
consoleCollector.assertNoErrors();
|
||||
});
|
||||
|
|
@ -25,23 +25,9 @@ test.describe('Desktop localization', () => {
|
|||
await expect(page.locator('.sidebar .plugin-item').filter({ hasText: 'Тест платформы' })).toBeVisible();
|
||||
await expect(page.locator('[data-status-item-id="verstak.platform-test.status"]')).toContainText('Все тесты пройдены');
|
||||
|
||||
const project = page.locator('.wt-node').filter({ hasText: 'Project' });
|
||||
await project.locator('button[title="Переименовать Дело"]').click();
|
||||
await expect(page.locator('button[title="Сохранить новое название"]')).toHaveText('Сохранить');
|
||||
await page.locator('.wt-rename').press('Escape');
|
||||
|
||||
await page.locator('[data-settings-menu-button]').click();
|
||||
await expect(page.locator('[data-settings-action="plugin-manager"]')).toContainText('Менеджер плагинов');
|
||||
await expect(page.locator('[data-settings-language="ru"]')).toHaveAttribute('aria-checked', 'true');
|
||||
await page.locator('[data-settings-action="plugin-manager"]').click();
|
||||
const pluginManager = page.locator('.plugin-manager');
|
||||
await expect(pluginManager).toContainText('Зарегистрировано возможностей:');
|
||||
await expect(pluginManager.locator('.registry-section')).toContainText('Реестр возможностей');
|
||||
await expect(pluginManager.locator('.registry-section')).toContainText('Возможность');
|
||||
await expect(pluginManager.locator('.plugin-filters')).toContainText('Фильтры');
|
||||
await expect(pluginManager.locator('[data-plugin-filter-results]')).toContainText('Показано плагинов:');
|
||||
await expect(pluginManager.locator('[data-plugin-filter="status"]')).toContainText('Выключенные');
|
||||
await expect(pluginManager).not.toContainText('Workspace-scoped');
|
||||
|
||||
await page.reload();
|
||||
await waitForAppReady(page);
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ test.describe('D: Plugin API bridge', () => {
|
|||
|
||||
const workbench = page.locator('.workbench-host');
|
||||
await expect(workbench).toBeVisible({ timeout: 10000 });
|
||||
await expect(workbench.locator('.workbench-title')).toHaveText('Overview');
|
||||
await expect(workbench.locator('.workbench-title')).toHaveText('Notes/Overview.md');
|
||||
});
|
||||
|
||||
test('workbench routes markdown files to default-editor provider', async ({ page }) => {
|
||||
|
|
@ -76,7 +76,7 @@ test.describe('D: Plugin API bridge', () => {
|
|||
const workbench = page.locator('.workbench-host');
|
||||
await expect(workbench).toBeVisible({ timeout: 10000 });
|
||||
const title = workbench.locator('.workbench-title');
|
||||
await expect(title).toHaveText('readme.md');
|
||||
await expect(title).toHaveText('Docs/readme.md');
|
||||
});
|
||||
|
||||
test('workbench shows no-provider fallback when no provider matches', async ({ page }) => {
|
||||
|
|
@ -91,10 +91,8 @@ test.describe('D: Plugin API bridge', () => {
|
|||
window.dispatchEvent(new CustomEvent('verstak:workbench-opened', { detail: result }));
|
||||
});
|
||||
|
||||
const fallback = page.locator('[data-workbench-status="no-provider"]');
|
||||
await expect(fallback).toBeVisible();
|
||||
await expect(fallback).toContainText('No viewer/editor available');
|
||||
await expect(fallback).not.toContainText('generic-text');
|
||||
await expect(page.locator('[data-workbench-status="no-provider"]')).toBeVisible();
|
||||
await expect(page.locator('[data-workbench-status="no-provider"]')).toContainText('No viewer/editor available');
|
||||
});
|
||||
|
||||
test('sync plugin API routes through mocked Wails bridge', async ({ page }) => {
|
||||
|
|
@ -102,7 +100,7 @@ test.describe('D: Plugin API bridge', () => {
|
|||
const api = window.createPluginAPI('verstak.sync');
|
||||
const initial = await api.sync.status();
|
||||
await api.sync.testConnection('https://sync.example.test', 'alice', 'secret');
|
||||
await api.sync.configure('https://sync.example.test', 'alice', 'secret', 'existing-remote-vault');
|
||||
await api.sync.configure('https://sync.example.test', 'alice', 'secret');
|
||||
await api.sync.setInterval(15);
|
||||
const configured = await api.sync.status();
|
||||
const syncNow = await api.sync.now();
|
||||
|
|
@ -117,8 +115,6 @@ test.describe('D: Plugin API bridge', () => {
|
|||
expect(result.initial.statusLabel).toBe('disabled');
|
||||
expect(result.configured.configured).toBe(true);
|
||||
expect(result.configured.serverUrl).toBe('https://sync.example.test');
|
||||
expect(result.configured.vaultId).toBe('existing-remote-vault');
|
||||
expect(result.configured.lastWarning).toBe('');
|
||||
expect(result.configured.syncInterval).toBe(15);
|
||||
expect(result.syncNow).toEqual({ pushed: 0, pulled: 0, serverSequence: 0 });
|
||||
expect(result.reset.configured).toBe(false);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { test, expect } from '@playwright/test';
|
||||
import { waitForAppReady, setupConsoleCollector, resetMockState, openPluginManager, setPluginStatus } from './helpers.js';
|
||||
import { waitForAppReady, setupConsoleCollector, resetMockState, openPluginManager } from './helpers.js';
|
||||
|
||||
test.describe('E: Plugin Manager layout', () => {
|
||||
let consoleCollector;
|
||||
|
|
@ -88,56 +88,6 @@ test.describe('E: Plugin Manager layout', () => {
|
|||
await expect(risk).toContainText('elevated permissions');
|
||||
});
|
||||
|
||||
test('plugin manager filters by state, declared permissions, capabilities, settings and source', async ({ page }) => {
|
||||
await setPluginStatus(page, 'verstak.todo', 'disabled', false);
|
||||
await page.evaluate(() => window.__wailsMock.addSyntheticPlugins(1, 'third-party'));
|
||||
await openPluginManager(page);
|
||||
|
||||
const results = page.locator('[data-plugin-filter-results]');
|
||||
await expect(results).toContainText('Showing');
|
||||
const filterSelectStyle = await page.locator('[data-plugin-filter="status"]').evaluate((node) => {
|
||||
const style = getComputedStyle(node);
|
||||
return { appearance: style.appearance, backgroundImage: style.backgroundImage };
|
||||
});
|
||||
expect(filterSelectStyle.appearance).toBe('none');
|
||||
expect(filterSelectStyle.backgroundImage).not.toBe('none');
|
||||
|
||||
await page.locator('[data-plugin-filter="status"]').selectOption('disabled');
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(1);
|
||||
await expect(page.locator('.plugin-card')).toContainText('Todos');
|
||||
await page.locator('button.reload-btn').click();
|
||||
await expect(page.locator('[data-plugin-filter="status"]')).toHaveValue('disabled');
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(1);
|
||||
|
||||
await page.locator('[data-plugin-filter-reset]').click();
|
||||
await page.locator('[data-plugin-filter-permission="notifications.schedule"]').check();
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(1);
|
||||
await expect(page.locator('.plugin-card')).toContainText('Todos');
|
||||
await page.locator('[data-plugin-filter-permission="secrets.read"]').check();
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(2);
|
||||
await page.locator('[data-plugin-filter-permission="secrets.read"]').uncheck();
|
||||
|
||||
await page.locator('[data-plugin-filter-reset]').click();
|
||||
await page.locator('[data-plugin-filter-capability="verstak/core/notifications/v1"]').check();
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(1);
|
||||
await expect(page.locator('.plugin-card')).toContainText('Todos');
|
||||
await page.locator('[data-plugin-filter-capability="secret-store"]').check();
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(2);
|
||||
await page.locator('[data-plugin-filter-capability="secret-store"]').uncheck();
|
||||
|
||||
await page.locator('[data-plugin-filter-reset]').click();
|
||||
await page.locator('[data-plugin-filter="settings"]').selectOption('with');
|
||||
await expect(page.locator('.plugin-card').filter({ hasText: 'Platform Test' })).toBeVisible();
|
||||
await expect(page.locator('.plugin-card').filter({ hasText: 'Default Editor' })).toHaveCount(0);
|
||||
|
||||
await page.locator('[data-plugin-filter="source"]').selectOption('third-party');
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(0);
|
||||
await expect(page.locator('[data-plugin-filter-empty]')).toBeVisible();
|
||||
|
||||
await page.locator('[data-plugin-filter-reset]').click();
|
||||
await expect(page.locator('.plugin-card')).toHaveCount(13);
|
||||
});
|
||||
|
||||
test('workspace selection keeps exactly one active node', async ({ page }) => {
|
||||
const selected = page.locator('.wt-node.selected .wt-label');
|
||||
await expect(selected).toHaveCount(1);
|
||||
|
|
@ -168,15 +118,15 @@ test.describe('E: Plugin Manager layout', () => {
|
|||
});
|
||||
|
||||
test('workspace sidebar creates renames and trashes top-level workspaces', async ({ page }) => {
|
||||
await page.locator('button[title="New Deal"]').click();
|
||||
await page.locator('button[title="New workspace"]').click();
|
||||
const modal = page.locator('[data-workspace-create-modal]');
|
||||
await modal.locator('[data-workspace-name]').fill('ClientA');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await modal.getByRole('button', { name: 'Create workspace' }).click();
|
||||
|
||||
await expect(page.locator('.wt-label').filter({ hasText: 'ClientA' })).toBeVisible();
|
||||
|
||||
const client = page.locator('.wt-node').filter({ hasText: 'ClientA' });
|
||||
await client.locator('button[title="Rename Deal"]').click();
|
||||
await client.locator('button[title="Rename workspace"]').click();
|
||||
await page.locator('.wt-rename').fill('ClientB');
|
||||
await page.locator('button[title="Save rename"]').click();
|
||||
|
||||
|
|
@ -184,7 +134,7 @@ test.describe('E: Plugin Manager layout', () => {
|
|||
await expect(page.locator('.wt-label').filter({ hasText: 'ClientA' })).toHaveCount(0);
|
||||
|
||||
const renamed = page.locator('.wt-node').filter({ hasText: 'ClientB' });
|
||||
await renamed.locator('button[title="Move Deal to trash"]').click();
|
||||
await renamed.locator('button[title="Trash workspace"]').click();
|
||||
|
||||
await expect(page.locator('.wt-label').filter({ hasText: 'ClientB' })).toHaveCount(0);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
import { test, expect } from '@playwright/test';
|
||||
import { waitForAppReady, setupConsoleCollector, resetMockState } from './helpers.js';
|
||||
|
||||
test('global Secrets lists, filters, and creates Deal-scoped secrets', async ({ page }) => {
|
||||
const consoleCollector = setupConsoleCollector(page);
|
||||
await resetMockState(page);
|
||||
await page.goto('/');
|
||||
await waitForAppReady(page);
|
||||
|
||||
await page.evaluate(async () => {
|
||||
const [record, error] = await window.go.api.App.PluginSecretsWrite('verstak.secrets', {
|
||||
id: 'project.global-secret',
|
||||
title: 'Project API',
|
||||
username: 'project-user',
|
||||
value: 'project-value',
|
||||
scope: { kind: 'workspace', workspaceRootPath: 'Project' },
|
||||
});
|
||||
if (error || !record?.id) throw new Error(error || 'could not create a project secret');
|
||||
});
|
||||
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Secrets' }).click();
|
||||
const secrets = page.locator('.secrets-root');
|
||||
await expect(secrets).toBeVisible({ timeout: 10000 });
|
||||
await expect(secrets).toContainText('First secret');
|
||||
await expect(secrets).toContainText('Project API');
|
||||
|
||||
await secrets.locator('[data-secret-scope-filter]').selectOption('workspace:Project');
|
||||
await expect(secrets).toContainText('Project API');
|
||||
await expect(secrets).not.toContainText('First secret');
|
||||
|
||||
await secrets.locator('[data-secret-search]').fill('no matching secret');
|
||||
await expect(secrets).toContainText('No secrets');
|
||||
await secrets.locator('[data-secret-search]').fill('');
|
||||
|
||||
await secrets.locator('[data-secret-scope-filter]').selectOption('all');
|
||||
await secrets.getByRole('button', { name: 'New' }).click();
|
||||
await secrets.locator('[data-secret-title]').fill('Project deployment token');
|
||||
await secrets.locator('[data-secret-value]').fill('deployment-token-value');
|
||||
await secrets.locator('[data-secret-scope]').selectOption('workspace');
|
||||
await secrets.locator('[data-secret-workspace]').selectOption('Project');
|
||||
await secrets.locator('[data-secret-save]').click();
|
||||
|
||||
await expect.poll(async () => page.evaluate(async () => {
|
||||
const [records, error] = await window.go.api.App.PluginSecretsList('verstak.secrets');
|
||||
if (error) throw new Error(error);
|
||||
const record = records.find((item) => item.title === 'Project deployment token');
|
||||
return record && [record.scope?.kind, record.scope?.workspaceRootPath].join('|');
|
||||
})).toBe('workspace|Project');
|
||||
consoleCollector.assertNoErrors();
|
||||
});
|
||||
|
|
@ -30,45 +30,18 @@ test.describe('B: Sidebar opens plugin view by item.view', () => {
|
|||
test('Sidebar item exists with correct label', async ({ page }) => {
|
||||
await expect(page.locator('.sidebar .nav-item').filter({ hasText: 'Plugin Manager' })).not.toBeVisible();
|
||||
await expect(page.locator('.sidebar .plugin-item').filter({ hasText: 'Activity' })).toBeVisible();
|
||||
await expect(page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser' })).toBeVisible();
|
||||
await expect(page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser Inbox' })).toBeVisible();
|
||||
|
||||
const sidebarItem = page.locator('.sidebar .plugin-item').filter({ hasText: 'Platform Test' });
|
||||
await expect(sidebarItem).toBeVisible();
|
||||
});
|
||||
|
||||
test('Global Activity and Browser sidebar items open plugin views', async ({ page }) => {
|
||||
test('Global Activity and Browser Inbox sidebar items open plugin views', async ({ page }) => {
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Activity' }).click();
|
||||
await expect(page.locator('.view-container .view-header h2')).toHaveText('Activity', { timeout: 10000 });
|
||||
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser' }).click();
|
||||
await expect(page.locator('.view-container .view-header h2')).toHaveText('Browser', { timeout: 10000 });
|
||||
});
|
||||
|
||||
test('selected global tool remains visibly active through navigation and sidebar reloads', async ({ page }) => {
|
||||
const activity = page.locator('.sidebar .plugin-item').filter({ hasText: 'Activity' });
|
||||
const browserInbox = page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser' });
|
||||
|
||||
await activity.click();
|
||||
await expect(activity).toHaveAttribute('aria-current', 'page');
|
||||
await expect(activity).toHaveClass(/is-active/);
|
||||
|
||||
await page.evaluate(() => {
|
||||
window.dispatchEvent(new CustomEvent('verstak:plugins-changed'));
|
||||
});
|
||||
await expect(activity).toHaveAttribute('aria-current', 'page');
|
||||
|
||||
await page.evaluate(() => {
|
||||
window.dispatchEvent(new CustomEvent('verstak:open-view', {
|
||||
detail: { viewId: 'verstak.browser-inbox.view', pluginId: 'verstak.browser-inbox' },
|
||||
}));
|
||||
});
|
||||
await expect(page.locator('.view-container .view-header h2')).toHaveText('Browser', { timeout: 10000 });
|
||||
await expect(browserInbox).toHaveAttribute('aria-current', 'page');
|
||||
await expect(browserInbox).toHaveClass(/is-active/);
|
||||
await expect(activity).not.toHaveAttribute('aria-current', 'page');
|
||||
|
||||
await page.locator('.wt-label').filter({ hasText: 'Project' }).click();
|
||||
await expect(browserInbox).not.toHaveAttribute('aria-current', 'page');
|
||||
await page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser Inbox' }).click();
|
||||
await expect(page.locator('.view-container .view-header h2')).toHaveText('Browser Inbox', { timeout: 10000 });
|
||||
});
|
||||
|
||||
test('Click sidebar item opens diagnostics view by view ID, not sidebar ID', async ({ page }) => {
|
||||
|
|
|
|||
|
|
@ -27,10 +27,7 @@ test.describe('Todo plugin workflow', () => {
|
|||
await todos.locator('[data-todo-input="description"]').fill('Collect factual review notes.');
|
||||
await todos.locator('[data-todo-input="priority"]').selectOption('high');
|
||||
await todos.locator('[data-todo-input="dueAt"]').fill('2000-01-01');
|
||||
await todos.locator('[data-todo-input="reminderDate"]').fill('2000-01-01');
|
||||
const reminderTime = todos.locator('[data-todo-input="reminderTime"]');
|
||||
await expect(reminderTime).toHaveAttribute('type', 'text');
|
||||
await reminderTime.fill('09:30');
|
||||
await todos.locator('[data-todo-input="reminderAt"]').fill('2000-01-01T09:00');
|
||||
await todos.locator('[data-todo-action="save"]').click();
|
||||
|
||||
await expect(todos).toContainText('Overdue');
|
||||
|
|
@ -39,23 +36,13 @@ test.describe('Todo plugin workflow', () => {
|
|||
const result = await window.go.api.App.ReadPluginSettings('verstak.todo');
|
||||
const settings = Array.isArray(result) ? result[0] : result;
|
||||
const todo = settings['todos:global'].find((item) => item.title === 'Prepare project review');
|
||||
return todo && [todo.workspaceRootPath, todo.priority, todo.dueAt, todo.reminderDate, todo.reminderAt].join('|');
|
||||
})).toBe('Project|high|2000-01-01|2000-01-01|2000-01-01T09:30');
|
||||
return todo && [todo.workspaceRootPath, todo.priority, todo.dueAt, todo.reminderAt].join('|');
|
||||
})).toBe('Project|high|2000-01-01|2000-01-01T09:00');
|
||||
|
||||
await todos.locator('[data-todo-action="edit"]').click();
|
||||
await todos.locator('[data-todo-input="title"]').fill('Prepare project review updated');
|
||||
await todos.locator('[data-todo-input="reminderTime"]').fill('not-a-time');
|
||||
await todos.locator('[data-todo-action="save"]').click();
|
||||
await expect(todos).toContainText('Enter a valid reminder time');
|
||||
await todos.locator('[data-todo-input="reminderTime"]').fill('');
|
||||
await todos.locator('[data-todo-action="save"]').click();
|
||||
await expect(todos).toContainText('Prepare project review updated');
|
||||
await expect.poll(async () => page.evaluate(async () => {
|
||||
const result = await window.go.api.App.ReadPluginSettings('verstak.todo');
|
||||
const settings = Array.isArray(result) ? result[0] : result;
|
||||
const todo = settings['todos:global'].find((item) => item.title === 'Prepare project review updated');
|
||||
return todo && [todo.reminderDate, todo.reminderAt].join('|');
|
||||
})).toBe('2000-01-01|');
|
||||
|
||||
await todos.locator('[data-todo-action="mark-done"]').click();
|
||||
await expect(todos.locator('[data-todo-action="create-journal-entry"]')).toBeVisible();
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ test.describe('UX follow-up fixes', () => {
|
|||
await expect(search).toBeVisible();
|
||||
await expect(page.locator('.sidebar [data-global-search-input]')).toBeVisible();
|
||||
|
||||
await page.locator('.sidebar .nav-item').filter({ hasText: 'Browser' }).click();
|
||||
await page.locator('.sidebar .nav-item').filter({ hasText: 'Browser Inbox' }).click();
|
||||
await expect(page.locator('.browser-inbox-root')).toBeVisible({ timeout: 10000 });
|
||||
await expect(search).toBeVisible();
|
||||
});
|
||||
|
|
@ -67,7 +67,7 @@ test.describe('UX follow-up fixes', () => {
|
|||
|
||||
const search = page.locator('[data-global-search-input]');
|
||||
await search.fill('Research Search Result');
|
||||
const result = page.locator('[data-global-search-result-type="Browser"]').filter({ hasText: 'Research Search Result' });
|
||||
const result = page.locator('[data-global-search-result-type="Browser Inbox"]').filter({ hasText: 'Research Search Result' });
|
||||
await expect(result).toBeVisible({ timeout: 10000 });
|
||||
await result.click();
|
||||
|
||||
|
|
|
|||
|
|
@ -38,11 +38,6 @@ test.describe('UX P0 shell flow', () => {
|
|||
await expect(page.locator('.plugin-manager')).toHaveCount(0);
|
||||
});
|
||||
|
||||
test('Deal header does not expose the internal workspace type badge', async ({ page }) => {
|
||||
await expect(page.locator('.workspace-host')).toBeVisible({ timeout: 10000 });
|
||||
await expect(page.locator('.workspace-type')).toHaveCount(0);
|
||||
});
|
||||
|
||||
test('status bar plugin contribution failures do not render large error panels', async ({ page }) => {
|
||||
await expect(page.locator('.workspace-host')).toBeVisible({ timeout: 10000 });
|
||||
await expect(page.getByText('Plugin View Error')).toHaveCount(0);
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ test.describe('UX Overview workspace flow', () => {
|
|||
await page.getByRole('tab', { name: 'Overview' }).click();
|
||||
await overview.locator('[data-overview-summary="captures"]').click();
|
||||
|
||||
await expect(page.getByRole('tab', { name: 'Browser' })).toHaveAttribute('aria-selected', 'true');
|
||||
await expect(page.getByRole('tab', { name: 'Browser Inbox' })).toHaveAttribute('aria-selected', 'true');
|
||||
await expect(page.locator('.browser-inbox-root')).toBeVisible({ timeout: 10000 });
|
||||
|
||||
await page.getByRole('tab', { name: 'Overview' }).click();
|
||||
|
|
@ -70,7 +70,7 @@ test.describe('UX Overview workspace flow', () => {
|
|||
|
||||
await page.getByRole('tab', { name: 'Overview' }).click();
|
||||
await overview.locator('[data-overview-summary="attention"]').click();
|
||||
await expect(page.getByRole('tab', { name: 'Browser' })).toHaveAttribute('aria-selected', 'true');
|
||||
await expect(page.getByRole('tab', { name: 'Browser Inbox' })).toHaveAttribute('aria-selected', 'true');
|
||||
});
|
||||
|
||||
test('Overview keeps the Notes total factual when the Files plugin is unavailable', async ({ page }) => {
|
||||
|
|
@ -80,54 +80,6 @@ test.describe('UX Overview workspace flow', () => {
|
|||
await expect(page.locator('[data-overview-summary="notes"]')).toContainText('1 total');
|
||||
});
|
||||
|
||||
test('Overview hides Browser cards and actions when the current Deal does not include it', async ({ page }) => {
|
||||
await page.locator('button[title="New Deal"]').click();
|
||||
const modal = page.locator('[data-workspace-create-modal]');
|
||||
await modal.locator('[data-workspace-name]').fill('MinimalOverview');
|
||||
await modal.locator('[data-workspace-template]').selectOption('minimal');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await expect(page.getByRole('tab', { name: 'Browser' })).toHaveCount(0);
|
||||
|
||||
await page.evaluate(async () => {
|
||||
await window.go.api.App.WritePluginSettings('verstak.browser-inbox', {
|
||||
'captures:global': [{
|
||||
captureId: 'hidden-browser-capture',
|
||||
capturedAt: '2026-07-14T08:00:00.000Z',
|
||||
kind: 'page',
|
||||
title: 'Inbox material must stay hidden',
|
||||
workspaceRootPath: 'MinimalOverview',
|
||||
}],
|
||||
});
|
||||
});
|
||||
const overview = page.locator('[data-overview-root]');
|
||||
await overview.locator('[data-overview-action="refresh"]').click();
|
||||
|
||||
await expect(overview.locator('[data-overview-summary="captures"]')).toHaveCount(0);
|
||||
await expect(overview.locator('[data-overview-action="browser-inbox"]')).toHaveCount(0);
|
||||
await expect(overview).not.toContainText('Inbox material must stay hidden');
|
||||
});
|
||||
|
||||
test('Overview refreshes when Browser is disabled through plugin state changes', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
await window.go.api.App.WritePluginSettings('verstak.browser-inbox', {
|
||||
'captures:global': [{
|
||||
captureId: 'disabled-browser-capture',
|
||||
capturedAt: '2026-07-14T08:00:00.000Z',
|
||||
kind: 'page',
|
||||
title: 'Disabled inbox material',
|
||||
workspaceRootPath: 'Project',
|
||||
}],
|
||||
});
|
||||
window.__wailsMock.setPluginStatus('verstak.browser-inbox', 'disabled', false);
|
||||
window.dispatchEvent(new CustomEvent('verstak:plugins-changed'));
|
||||
});
|
||||
|
||||
const overview = page.locator('[data-overview-root]');
|
||||
await expect(page.getByRole('tab', { name: 'Browser' })).toHaveCount(0);
|
||||
await expect(overview.locator('[data-overview-summary="captures"]')).toHaveCount(0);
|
||||
await expect(overview.locator('[data-overview-action="browser-inbox"]')).toHaveCount(0);
|
||||
});
|
||||
|
||||
test('Overview prioritizes resume work and filters meaningful recent changes', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
await window.go.api.App.WritePluginSettings('verstak.browser-inbox', {
|
||||
|
|
@ -248,10 +200,10 @@ test.describe('UX Overview workspace flow', () => {
|
|||
await expect(overview.locator('[data-overview-summary="attention"]')).toContainText('3');
|
||||
const attention = overview.locator('[data-overview-section="attention"]');
|
||||
await expect(attention).toContainText('Possible journal entry');
|
||||
await expect(attention).toContainText('Deal: Project · 10 min · 2 activities');
|
||||
await expect(attention).toContainText('Workspace: Project · 10 min · 2 activities');
|
||||
await attention.locator('.overview-attention-row', { hasText: 'Possible journal entry' }).getByRole('button', { name: 'Review candidate' }).click();
|
||||
await expect(page.getByRole('tab', { name: 'Journal' })).toHaveAttribute('aria-selected', 'true');
|
||||
await expect(page.locator('.journal-root [data-journal-candidate]')).toContainText('Deal: Project');
|
||||
await expect(page.locator('.journal-root [data-journal-candidate]')).toContainText('Workspace: Project');
|
||||
await page.locator('.journal-modal-actions').getByRole('button', { name: 'Cancel' }).click();
|
||||
await page.getByRole('tab', { name: 'Overview' }).click();
|
||||
|
||||
|
|
@ -264,7 +216,7 @@ test.describe('UX Overview workspace flow', () => {
|
|||
await expect(candidates.nth(3)).toContainText('Changed file "draft.md"');
|
||||
await candidates.nth(0).click();
|
||||
|
||||
await expect(page.getByRole('tab', { name: 'Browser' })).toHaveAttribute('aria-selected', 'true');
|
||||
await expect(page.getByRole('tab', { name: 'Browser Inbox' })).toHaveAttribute('aria-selected', 'true');
|
||||
await expect(page.locator('.browser-inbox-root')).toBeVisible({ timeout: 10000 });
|
||||
|
||||
await page.getByRole('tab', { name: 'Overview' }).click();
|
||||
|
|
@ -295,28 +247,4 @@ test.describe('UX Overview workspace flow', () => {
|
|||
await expect(recent).toContainText('Added journal entry "Write project summary"');
|
||||
await expect(recent).not.toContainText('Changed file "draft.md"');
|
||||
});
|
||||
|
||||
test('Overview localizes activity labels without exposing internal event names', async ({ page }) => {
|
||||
await page.evaluate(async () => {
|
||||
await window.go.api.App.WritePluginSettings('verstak.activity', {
|
||||
'events:workspace:Project': [{
|
||||
activityId: 'overview-russian-note',
|
||||
occurredAt: '2026-06-30T08:25:00.000Z',
|
||||
type: 'note.saved',
|
||||
title: 'Локализация',
|
||||
summary: 'Project/Notes/Localization.md',
|
||||
workspaceRootPath: 'Project',
|
||||
}],
|
||||
});
|
||||
});
|
||||
await page.locator('[data-settings-menu-button]').click();
|
||||
await page.locator('[data-settings-language="ru"]').click();
|
||||
|
||||
const overview = page.locator('[data-overview-root]');
|
||||
await overview.locator('[data-overview-action="refresh"]').click();
|
||||
const recent = overview.locator('[data-overview-section="recent"]');
|
||||
await expect(recent).toContainText('Изменена заметка «Локализация»');
|
||||
await expect(recent).not.toContainText('note.saved');
|
||||
await expect(recent).not.toContainText('Edited note');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ test.describe('Workspace templates', () => {
|
|||
});
|
||||
|
||||
async function openCreateModal(page) {
|
||||
await page.locator('button[title="New Deal"]').click();
|
||||
await page.locator('button[title="New workspace"]').click();
|
||||
const modal = page.locator('[data-workspace-create-modal]');
|
||||
await expect(modal).toBeVisible();
|
||||
return modal;
|
||||
|
|
@ -24,24 +24,22 @@ test.describe('Workspace templates', () => {
|
|||
|
||||
test('creation modal validates names, shows template tools, and persists the selected snapshot', async ({ page }) => {
|
||||
const modal = await openCreateModal(page);
|
||||
const templateSelect = modal.locator('[data-workspace-template]');
|
||||
await expect(templateSelect).toHaveValue('default');
|
||||
await expect(templateSelect).toHaveCSS('appearance', 'none');
|
||||
await expect(modal.locator('[data-workspace-template]')).toHaveValue('default');
|
||||
await expect(modal.locator('[data-workspace-template-tools]')).toContainText('Notes');
|
||||
await expect(modal.locator('[data-workspace-template-tools]')).toContainText('Browser');
|
||||
await expect(modal.locator('[data-workspace-template-tools]')).toContainText('Browser Inbox');
|
||||
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await modal.getByRole('button', { name: 'Create workspace' }).click();
|
||||
await expect(modal.locator('[data-workspace-create-error]')).toContainText('Name is required');
|
||||
|
||||
await modal.locator('[data-workspace-name]').fill('bad/name');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await expect(modal.locator('[data-workspace-create-error]')).toContainText('Could not create the Deal. Please try again.');
|
||||
await modal.getByRole('button', { name: 'Create workspace' }).click();
|
||||
await expect(modal.locator('[data-workspace-create-error]')).toContainText('invalid-workspace-name');
|
||||
|
||||
await modal.locator('[data-workspace-name]').fill('ProjectPlan');
|
||||
await modal.locator('[data-workspace-template]').selectOption('project');
|
||||
await expect(modal.locator('[data-workspace-template-description]')).toContainText('Project planning');
|
||||
await expect(modal.locator('[data-workspace-template-tools]')).toContainText('Todos');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await modal.getByRole('button', { name: 'Create workspace' }).click();
|
||||
|
||||
await expect(page.locator('.wt-label').filter({ hasText: 'ProjectPlan' })).toBeVisible();
|
||||
await expect.poll(async () => page.evaluate(async () => {
|
||||
|
|
@ -65,7 +63,7 @@ test.describe('Workspace templates', () => {
|
|||
const modal = await openCreateModal(page);
|
||||
await modal.locator('[data-workspace-name]').fill('MinimalSpace');
|
||||
await modal.locator('[data-workspace-template]').selectOption('minimal');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await modal.getByRole('button', { name: 'Create workspace' }).click();
|
||||
|
||||
await expect(page.getByRole('tab', { name: 'Overview' })).toBeVisible();
|
||||
await expect(page.getByRole('tab', { name: 'Notes' })).toBeVisible();
|
||||
|
|
@ -74,40 +72,21 @@ test.describe('Workspace templates', () => {
|
|||
await expect(page.getByRole('tab', { name: 'Journal' })).toHaveCount(0);
|
||||
await expect(page.getByRole('tab', { name: 'Secrets' })).toHaveCount(0);
|
||||
await expect(page.locator('.sidebar .plugin-item').filter({ hasText: 'Todos' })).toBeVisible();
|
||||
await expect(page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser' })).toBeVisible();
|
||||
});
|
||||
|
||||
test('template explains an unavailable plugin and warns after incomplete creation', async ({ page }) => {
|
||||
await page.evaluate(() => window.__wailsMock.setPluginStatus('verstak.todo', 'disabled', false));
|
||||
const modal = await openCreateModal(page);
|
||||
await modal.locator('[data-workspace-template]').selectOption('project');
|
||||
|
||||
const todo = modal.locator('[data-workspace-template-tool="verstak.todo"]');
|
||||
await expect(todo).toContainText('Todos');
|
||||
await expect(todo).toContainText('Plugin is disabled');
|
||||
await expect(todo).toHaveAttribute('data-template-tool-status', 'unavailable');
|
||||
|
||||
await modal.locator('[data-workspace-name]').fill('ProjectWithWarning');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
|
||||
const warning = page.locator('[data-workspace-template-warning]');
|
||||
await expect(warning).toContainText('ProjectWithWarning');
|
||||
await expect(warning).toContainText('Todos');
|
||||
await expect(warning).toContainText('Plugin is disabled');
|
||||
await expect(page.locator('.sidebar .plugin-item').filter({ hasText: 'Browser Inbox' })).toBeVisible();
|
||||
});
|
||||
|
||||
test('Admin shows Secrets when available and missing workspace plugins degrade without breaking tabs', async ({ page }) => {
|
||||
let modal = await openCreateModal(page);
|
||||
await modal.locator('[data-workspace-name]').fill('AdminSpace');
|
||||
await modal.locator('[data-workspace-template]').selectOption('admin');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await modal.getByRole('button', { name: 'Create workspace' }).click();
|
||||
await expect(page.getByRole('tab', { name: 'Secrets' })).toBeVisible();
|
||||
|
||||
await page.evaluate(() => window.__wailsMock.setPluginStatus('verstak.todo', 'disabled', false));
|
||||
modal = await openCreateModal(page);
|
||||
await modal.locator('[data-workspace-name]').fill('ProjectWithoutTodo');
|
||||
await modal.locator('[data-workspace-template]').selectOption('project');
|
||||
await modal.getByRole('button', { name: 'Create Deal' }).click();
|
||||
await modal.getByRole('button', { name: 'Create workspace' }).click();
|
||||
|
||||
await expect(page.getByRole('tab', { name: 'Notes' })).toBeVisible();
|
||||
await expect(page.getByRole('tab', { name: 'Files' })).toBeVisible();
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@
|
|||
const settings = await App.GetAppSettings();
|
||||
debug.log('[App] checkVault: GetAppSettings returned', settings);
|
||||
flog('checkVault: GetAppSettings returned');
|
||||
if (settings?.debug) debug.enable({ persist: false });
|
||||
if (settings?.debug) debug.enable();
|
||||
|
||||
debug.log('[App] checkVault: calling GetVaultStatus...');
|
||||
vaultStatus = await App.GetVaultStatus() || { status: 'unknown', path: '', vaultId: '' };
|
||||
|
|
@ -395,11 +395,7 @@
|
|||
<VaultSelection />
|
||||
{:else}
|
||||
<main>
|
||||
<Sidebar
|
||||
showGlobalSearch={currentView !== 'workspace' && currentView !== 'workspace-empty'}
|
||||
{activeView}
|
||||
{activeViewPluginId}
|
||||
/>
|
||||
<Sidebar showGlobalSearch={currentView !== 'workspace' && currentView !== 'workspace-empty'} />
|
||||
<CommandPalette />
|
||||
|
||||
<section class="content-shell">
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ export default {
|
|||
'sidebar.error.load': 'Failed to load sidebar',
|
||||
'sidebar.error.ui': 'Plugin UI error',
|
||||
'workspace.overview': 'Overview',
|
||||
'workspace.search': 'Search in this Deal',
|
||||
'workspace.tools': 'Deal tools',
|
||||
'workspace.tool': 'Deal tool',
|
||||
'workspace.emptyTools': 'No Deal tools available',
|
||||
'workspace.emptyToolsHint': 'Enable plugins with Deal tools or open Plugin Manager from settings.',
|
||||
'workspace.select': 'Select a Deal',
|
||||
'workspace.selectHint': 'Use the + button in Deals to add your first project.',
|
||||
'workspace.search': 'Workspace search',
|
||||
'workspace.tools': 'Workspace tools',
|
||||
'workspace.tool': 'Workspace tool',
|
||||
'workspace.emptyTools': 'No workspace tools available',
|
||||
'workspace.emptyToolsHint': 'Enable plugins with workspace tools or open Plugin Manager from settings.',
|
||||
'workspace.select': 'Select a workspace',
|
||||
'workspace.selectHint': 'Use the + button in Workspaces to add your first project.',
|
||||
'common.details': 'Details',
|
||||
'common.plugin': 'Plugin',
|
||||
'common.component': 'Component',
|
||||
|
|
@ -35,7 +35,6 @@ export default {
|
|||
'pluginView.select': 'Select a plugin view from the sidebar',
|
||||
'pluginView.selectHint': 'Plugin views will appear here',
|
||||
'common.retry': '⟳ Retry',
|
||||
'common.save': 'Save',
|
||||
'common.source': 'Source',
|
||||
'common.status': 'Status',
|
||||
'common.capability': 'Capability',
|
||||
|
|
@ -55,24 +54,6 @@ export default {
|
|||
'pluginManager.health': 'Plugin Health',
|
||||
'pluginManager.permissionRisk': 'Permission Risk',
|
||||
'pluginManager.elevatedPermissions': '{count} plugins request elevated permissions',
|
||||
'pluginManager.filters': 'Filters',
|
||||
'pluginManager.filterResults': 'Showing {visible} of {total} plugins',
|
||||
'pluginManager.filterReset': 'Reset filters',
|
||||
'pluginManager.filterState': 'State',
|
||||
'pluginManager.filterAll': 'All',
|
||||
'pluginManager.filterEnabled': 'Enabled',
|
||||
'pluginManager.filterDisabled': 'Disabled',
|
||||
'pluginManager.filterFailed': 'Problem',
|
||||
'pluginManager.filterDegraded': 'Degraded',
|
||||
'pluginManager.filterPermissions': 'Permissions',
|
||||
'pluginManager.filterCapabilities': 'Capabilities',
|
||||
'pluginManager.filterSettings': 'Settings',
|
||||
'pluginManager.filterWithSettings': 'With settings',
|
||||
'pluginManager.filterWithoutSettings': 'Without settings',
|
||||
'pluginManager.filterSource': 'Source',
|
||||
'pluginManager.filterOfficial': 'Official',
|
||||
'pluginManager.filterThirdParty': 'Third-party or local',
|
||||
'pluginManager.filterEmpty': 'No plugins match the selected filters.',
|
||||
'pluginManager.none': 'No plugins found',
|
||||
'pluginManager.scannedDirs': 'Plugin directories scanned:',
|
||||
'pluginManager.userPlugins': 'user plugins',
|
||||
|
|
@ -93,7 +74,7 @@ export default {
|
|||
'pluginCard.count.sidebar': '{count} sidebar item(s)',
|
||||
'pluginCard.count.statusbar': '{count} status bar item(s)',
|
||||
'pluginCard.count.openProviders': '{count} openProviders',
|
||||
'pluginCard.count.workspace': '{count} Deal tool(s)',
|
||||
'pluginCard.count.workspace': '{count} workspace item(s)',
|
||||
'pluginCard.degraded': 'Plugin is usable, but some optional capabilities are unavailable.',
|
||||
'pluginCard.name': 'Name',
|
||||
'pluginCard.contributions': 'Contributions',
|
||||
|
|
@ -115,12 +96,12 @@ export default {
|
|||
'common.loading': 'Loading...',
|
||||
'common.browse': 'Browse...',
|
||||
'vaultSelection.chooseNew': 'Choose or enter a folder for the new vault.',
|
||||
'vaultSelection.createError': 'Could not create the vault. Please try again.',
|
||||
'vaultSelection.openError': 'Could not open the vault. Please try again.',
|
||||
'vaultSelection.createError': 'Could not create vault: {error}',
|
||||
'vaultSelection.openError': 'Could not open vault: {error}',
|
||||
'vaultSelection.chooseExisting': 'Choose or enter an existing vault.',
|
||||
'vaultSelection.subtitle': 'Choose a vault to start working',
|
||||
'vaultSelection.createTitle': 'Create a new vault',
|
||||
'vaultSelection.createHint': 'Create a local vault folder for Deals and projects.',
|
||||
'vaultSelection.createHint': 'Create a local vault folder for workspaces and projects.',
|
||||
'vaultSelection.pathPlaceholder': 'Choose or enter a path...',
|
||||
'vaultSelection.creating': 'Creating...',
|
||||
'vaultSelection.create': 'Create vault',
|
||||
|
|
@ -131,54 +112,21 @@ export default {
|
|||
'vaultSelection.recent': 'Recent vaults',
|
||||
'common.cancel': 'Cancel',
|
||||
'common.close': 'Close',
|
||||
'workspaceTree.title': 'Deals',
|
||||
'workspaceTree.new': 'New Deal',
|
||||
'workspaceTree.title': 'Workspaces',
|
||||
'workspaceTree.new': 'New workspace',
|
||||
'workspaceTree.nameRequired': 'Name is required',
|
||||
'workspaceTree.chooseTemplate': 'Choose a Deal template',
|
||||
'workspaceTree.chooseTemplate': 'Choose a workspace template',
|
||||
'workspaceTree.saveRename': 'Save rename',
|
||||
'workspaceTree.rename': 'Rename Deal',
|
||||
'workspaceTree.trash': 'Move Deal to trash',
|
||||
'workspaceTree.create': 'Create Deal',
|
||||
'workspaceTree.namePlaceholder': 'Deal name',
|
||||
'workspaceTree.rename': 'Rename workspace',
|
||||
'workspaceTree.trash': 'Trash workspace',
|
||||
'workspaceTree.create': 'Create workspace',
|
||||
'workspaceTree.namePlaceholder': 'Workspace name',
|
||||
'workspaceTree.template': 'Template',
|
||||
'workspaceTree.creating': 'Creating...',
|
||||
'workspaceTree.templateAvailable': 'Available',
|
||||
'workspaceTree.templateLimited': 'Available with limitations',
|
||||
'workspaceTree.templateMissingPlugin': 'Plugin is not installed',
|
||||
'workspaceTree.templatePluginDisabled': 'Plugin is disabled',
|
||||
'workspaceTree.templateCapabilityUnavailable': 'A required capability is unavailable',
|
||||
'workspaceTree.templateIncompatible': 'Plugin is incompatible with this version of Verstak',
|
||||
'workspaceTree.templateLoadFailed': 'Plugin failed to load',
|
||||
'workspaceTree.templateNotReady': 'Plugin is not ready',
|
||||
'workspaceTree.templateToolTabs': 'Creates: {tabs}',
|
||||
'workspaceTree.templateToolNoTabs': 'No Deal tab provided',
|
||||
'workspaceTree.templateWillBeIncomplete': 'This Deal will be created without the unavailable components.',
|
||||
'workspaceTree.templateIncompleteCreated': '«{name}» was created with unavailable components.',
|
||||
'workspaceTree.templatesError': 'Could not load Deal templates. Please try again.',
|
||||
'workspaceTree.loadError': 'Could not load Deals. Please try again.',
|
||||
'workspaceTree.selectError': 'Could not select this Deal. Please try again.',
|
||||
'workspaceTree.createError': 'Could not create the Deal. Please try again.',
|
||||
'workspaceTree.renameError': 'Could not rename the Deal. Please try again.',
|
||||
'workspaceTree.trashError': 'Could not move the Deal to trash. Please try again.',
|
||||
'workspaceTree.parentFolder': 'Parent folder',
|
||||
'workspaceTree.rootFolder': '(vault root)',
|
||||
'workspaceTree.folderTitle': 'Folders',
|
||||
'workspaceTree.folderEmpty': 'No Deals here',
|
||||
'workspaceTree.createFolder': 'Create Folder',
|
||||
'workspaceTree.folderNamePlaceholder': 'Folder name',
|
||||
'workspaceTree.folderIcon': 'Icon',
|
||||
'workspaceTree.folderColor': 'Color',
|
||||
'workspaceTree.folderCreateError': 'Could not create the folder. Please try again.',
|
||||
'pluginManager.loadError': 'Could not load plugins. Please try again.',
|
||||
'pluginManager.reloadError': 'Could not reload plugins. Please try again.',
|
||||
'pluginManager.enableError': 'Could not enable the plugin. Please try again.',
|
||||
'pluginManager.disableError': 'Could not disable the plugin. Please try again.',
|
||||
'pluginManager.settingsLoadError': 'Could not load plugin settings. Please try again.',
|
||||
'pluginManager.settingsUnavailable': 'Plugin settings are unavailable.',
|
||||
'command.openOverview': 'Open Overview',
|
||||
'command.openFiles': 'Open Files',
|
||||
'command.openActivity': 'Open Activity',
|
||||
'command.openBrowserInbox': 'Open Browser',
|
||||
'command.openBrowserInbox': 'Open Browser Inbox',
|
||||
'command.createMarkdown': 'Create Markdown File',
|
||||
'command.createText': 'Create Text File',
|
||||
'command.syncNow': 'Sync Now',
|
||||
|
|
@ -186,7 +134,6 @@ export default {
|
|||
'command.openPluginManager': 'Open Plugin Manager',
|
||||
'command.handled': '{title} handled',
|
||||
'command.result': '{title} {status}',
|
||||
'command.failed': 'Could not run {title}. Please try again.',
|
||||
'command.statusHandled': 'handled',
|
||||
'command.palette': 'Command Palette',
|
||||
'command.run': 'Run command',
|
||||
|
|
@ -195,26 +142,26 @@ export default {
|
|||
'search.placeholder': 'Search',
|
||||
'search.global': 'Global search',
|
||||
'search.noResults': 'No results',
|
||||
'search.type.workspace': 'Deal',
|
||||
'search.type.workspace': 'Workspace',
|
||||
'search.type.tool': 'Tool',
|
||||
'search.type.folder': 'Folder',
|
||||
'search.type.file': 'File',
|
||||
'search.type.journal': 'Journal',
|
||||
'search.type.browserInbox': 'Browser',
|
||||
'search.type.browserInbox': 'Browser Inbox',
|
||||
'search.type.activity': 'Activity',
|
||||
'workbench.noProvider': 'No provider',
|
||||
'workbench.noViewer': 'No viewer/editor available',
|
||||
'workbench.noResource': 'No resource opened',
|
||||
'bundle.noFrontend': 'Plugin has no frontend bundle',
|
||||
'bundle.notFound': 'Plugin not found',
|
||||
'bundle.loadFailed': 'Could not load the plugin interface. Please try again.',
|
||||
'bundle.loadFailed': 'Failed to load bundle: {error}',
|
||||
'bundle.emptyContent': 'empty content',
|
||||
'bundle.executionError': 'Could not start the plugin interface. Please try again.',
|
||||
'bundle.executionError': 'Bundle execution error: {error}',
|
||||
'bundle.registrationMissing': 'Bundle loaded but no VerstakPluginRegister call detected',
|
||||
'bundle.componentMissing': 'The requested plugin interface is unavailable.',
|
||||
'bundle.mountError': 'Could not open the plugin interface. Please try again.',
|
||||
'bundle.componentMissing': 'Component "{component}" not found in bundle. Available: {available}',
|
||||
'bundle.mountError': 'Component mount error: {error}',
|
||||
'bundle.mountUnavailable': 'Mount container not available',
|
||||
'bundle.unexpectedError': 'Could not open the plugin interface. Please try again.',
|
||||
'bundle.unexpectedError': 'Unexpected error: {error}',
|
||||
'bundle.unknownError': 'Unknown error',
|
||||
'bundle.frontendEntry': 'Frontend entry',
|
||||
'bundle.availableComponents': 'Available components',
|
||||
|
|
@ -250,57 +197,18 @@ export default {
|
|||
'overview.count.journal.many': '{count} journal entries',
|
||||
'overview.count.pending.one': '{count} pending item',
|
||||
'overview.count.pending.many': '{count} pending items',
|
||||
'overview.loadingContext': 'Loading Deal context...',
|
||||
'overview.loadingContext': 'Loading workspace context...',
|
||||
'overview.lastActive': 'Last active {time}',
|
||||
'overview.noRecentActivity': 'No recent Deal activity',
|
||||
'overview.noRecentActivity': 'No recent workspace activity',
|
||||
'overview.refresh': 'Refresh',
|
||||
'overview.summary': 'Deal overview summary',
|
||||
'overview.summary': 'Workspace overview summary',
|
||||
'overview.continue': 'Continue working',
|
||||
'overview.continueHint': 'Pick up the next useful item in this Deal.',
|
||||
'overview.loadingSignals': 'Loading Deal signals...',
|
||||
'overview.continueHint': 'Pick up the next useful item in this workspace.',
|
||||
'overview.loadingSignals': 'Loading workspace signals...',
|
||||
'overview.noResume': 'No clear resume point yet',
|
||||
'overview.noResumeHint': 'Recent notes, files, captures, and journal entries will appear here.',
|
||||
'overview.recentChanges': 'Recent changes',
|
||||
'overview.recentChangesHint': 'Latest meaningful activity in this Deal.',
|
||||
'overview.event.workspaceOpened': 'Opened Deal',
|
||||
'overview.event.activity': 'Deal activity',
|
||||
'overview.event.noteEdited': 'Edited note "{name}"',
|
||||
'overview.event.noteOpened': 'Opened note "{name}"',
|
||||
'overview.event.noteCreated': 'Created note "{name}"',
|
||||
'overview.event.fileOpened': 'Opened file "{name}"',
|
||||
'overview.event.fileChanged': 'Changed file "{name}"',
|
||||
'overview.event.fileCreated': 'Created file "{name}"',
|
||||
'overview.event.fileRemoved': 'Removed file "{name}"',
|
||||
'overview.event.capturePage': 'Captured page "{name}"',
|
||||
'overview.event.captureSelection': 'Captured selection "{name}"',
|
||||
'overview.event.captureLink': 'Captured link "{name}"',
|
||||
'overview.event.captureFile': 'Captured file "{name}"',
|
||||
'overview.event.captureConverted': 'Converted capture "{name}"',
|
||||
'overview.event.capture': 'Captured {kind} "{title}"',
|
||||
'overview.event.journalAdded': 'Added journal entry "{name}"',
|
||||
'overview.event.workSessionDetected': 'Work session detected',
|
||||
'overview.event.todo': 'Todo "{title}"',
|
||||
'overview.event.reviewCapture': 'Review capture "{title}"',
|
||||
'overview.event.continueJournal': 'Continue journal entry "{title}"',
|
||||
'overview.event.possibleJournalEntry': 'Possible journal entry',
|
||||
'overview.captureKind.page': 'page',
|
||||
'overview.captureKind.selection': 'selection',
|
||||
'overview.captureKind.link': 'link',
|
||||
'overview.captureKind.file': 'file',
|
||||
'overview.captureKind.item': 'item',
|
||||
'overview.todo.reminderDue': 'Reminder due',
|
||||
'overview.todo.overdue': 'Overdue',
|
||||
'overview.todo.dueSoon': 'Due soon',
|
||||
'overview.todo.due': 'Due {date}',
|
||||
'overview.candidateMeta': 'Deal: {deal} · {minutes} min · {activities} activities',
|
||||
'overview.minutes': '{count} min',
|
||||
'overview.browserCapture': 'Browser capture',
|
||||
'overview.untitledTodo': 'Untitled todo',
|
||||
'overview.untitledCapture': 'Untitled capture',
|
||||
'overview.untitledJournal': 'Journal entry',
|
||||
'overview.unknownDeal': 'Unknown Deal',
|
||||
'overview.item': 'item',
|
||||
'overview.overviewNote': 'Deal overview note',
|
||||
'overview.recentChangesHint': 'Latest meaningful activity in this workspace.',
|
||||
'overview.recentFilter': 'Recent changes filter',
|
||||
'overview.loadingRecent': 'Loading recent changes...',
|
||||
'overview.noChanges': 'No meaningful changes for this filter yet.',
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ export default {
|
|||
'sidebar.error.load': 'Не удалось загрузить боковую панель',
|
||||
'sidebar.error.ui': 'Ошибка интерфейса плагина',
|
||||
'workspace.overview': 'Обзор',
|
||||
'workspace.search': 'Поиск в Деле',
|
||||
'workspace.tools': 'Инструменты Дела',
|
||||
'workspace.tool': 'Инструмент Дела',
|
||||
'workspace.search': 'Поиск в рабочем пространстве',
|
||||
'workspace.tools': 'Инструменты рабочего пространства',
|
||||
'workspace.tool': 'Инструмент рабочего пространства',
|
||||
'workspace.emptyTools': 'Нет доступных инструментов',
|
||||
'workspace.emptyToolsHint': 'Включите плагины с инструментами Дела или откройте Менеджер плагинов в настройках.',
|
||||
'workspace.select': 'Выберите Дело',
|
||||
'workspace.selectHint': 'Используйте кнопку + в разделе Дел, чтобы добавить первый проект.',
|
||||
'workspace.emptyToolsHint': 'Включите плагины с инструментами рабочего пространства или откройте Менеджер плагинов в настройках.',
|
||||
'workspace.select': 'Выберите рабочее пространство',
|
||||
'workspace.selectHint': 'Используйте кнопку + в разделе рабочих пространств, чтобы добавить первый проект.',
|
||||
'common.details': 'Подробнее',
|
||||
'common.plugin': 'Плагин',
|
||||
'common.component': 'Компонент',
|
||||
|
|
@ -35,10 +35,9 @@ export default {
|
|||
'pluginView.select': 'Выберите представление плагина на боковой панели',
|
||||
'pluginView.selectHint': 'Представления плагинов появятся здесь',
|
||||
'common.retry': '⟳ Повторить',
|
||||
'common.save': 'Сохранить',
|
||||
'common.source': 'Источник',
|
||||
'common.status': 'Состояние',
|
||||
'common.capability': 'Возможность',
|
||||
'common.capability': 'Capability',
|
||||
'common.provider': 'Поставщик',
|
||||
'status.loaded': 'загружено',
|
||||
'status.degraded': 'ограничено',
|
||||
|
|
@ -49,30 +48,12 @@ export default {
|
|||
'pluginManager.reload': '⟳ Обновить',
|
||||
'pluginManager.scanning': 'Сканирование каталогов плагинов...',
|
||||
'pluginManager.summary.plugins': 'Обнаружено плагинов: {count}',
|
||||
'pluginManager.summary.capabilities': 'Зарегистрировано возможностей: {count}',
|
||||
'pluginManager.summary.capabilities': 'Зарегистрировано capabilities: {count}',
|
||||
'pluginManager.summary.permissions': 'Известно разрешений: {count}',
|
||||
'pluginManager.scanSummary': 'Сводка проверки плагинов',
|
||||
'pluginManager.health': 'Состояние плагинов',
|
||||
'pluginManager.permissionRisk': 'Риск разрешений',
|
||||
'pluginManager.elevatedPermissions': 'Плагинов с повышенными разрешениями: {count}',
|
||||
'pluginManager.filters': 'Фильтры',
|
||||
'pluginManager.filterResults': 'Показано плагинов: {visible} из {total}',
|
||||
'pluginManager.filterReset': 'Сбросить фильтры',
|
||||
'pluginManager.filterState': 'Состояние',
|
||||
'pluginManager.filterAll': 'Все',
|
||||
'pluginManager.filterEnabled': 'Включённые',
|
||||
'pluginManager.filterDisabled': 'Выключенные',
|
||||
'pluginManager.filterFailed': 'С проблемами',
|
||||
'pluginManager.filterDegraded': 'Ограниченные',
|
||||
'pluginManager.filterPermissions': 'Разрешения',
|
||||
'pluginManager.filterCapabilities': 'Возможности',
|
||||
'pluginManager.filterSettings': 'Настройки',
|
||||
'pluginManager.filterWithSettings': 'С настройками',
|
||||
'pluginManager.filterWithoutSettings': 'Без настроек',
|
||||
'pluginManager.filterSource': 'Источник',
|
||||
'pluginManager.filterOfficial': 'Официальные',
|
||||
'pluginManager.filterThirdParty': 'Сторонние или локальные',
|
||||
'pluginManager.filterEmpty': 'Нет плагинов, соответствующих выбранным фильтрам.',
|
||||
'pluginManager.none': 'Плагины не найдены',
|
||||
'pluginManager.scannedDirs': 'Проверенные каталоги плагинов:',
|
||||
'pluginManager.userPlugins': 'пользовательские плагины',
|
||||
|
|
@ -81,7 +62,7 @@ export default {
|
|||
'pluginManager.missingTitle': 'Отсутствующие установленные плагины',
|
||||
'pluginManager.missingHint': 'Эти плагины требуются хранилищу, но их пакеты не установлены на этом устройстве.',
|
||||
'pluginManager.missingPackage': 'Плагин указан среди желаемых плагинов хранилища, но его пакет не установлен.',
|
||||
'pluginManager.capabilityRegistry': 'Реестр возможностей ({count})',
|
||||
'pluginManager.capabilityRegistry': 'Реестр capabilities ({count})',
|
||||
'pluginManager.settingsError': 'Ошибка настроек',
|
||||
'pluginManager.pluginSettings': 'Настройки плагина',
|
||||
'pluginManager.settingsBundleUnavailable': 'Frontend bundle панели настроек недоступен',
|
||||
|
|
@ -93,8 +74,8 @@ export default {
|
|||
'pluginCard.count.sidebar': 'элементов боковой панели: {count}',
|
||||
'pluginCard.count.statusbar': 'элементов строки состояния: {count}',
|
||||
'pluginCard.count.openProviders': 'обработчиков открытия: {count}',
|
||||
'pluginCard.count.workspace': 'инструментов Дела: {count}',
|
||||
'pluginCard.degraded': 'Плагин работает, но некоторые необязательные возможности недоступны.',
|
||||
'pluginCard.count.workspace': 'инструментов рабочего пространства: {count}',
|
||||
'pluginCard.degraded': 'Плагин работает, но некоторые необязательные capabilities недоступны.',
|
||||
'pluginCard.name': 'Название',
|
||||
'pluginCard.contributions': 'Элементы интерфейса',
|
||||
'pluginCard.technicalDetails': 'Технические сведения',
|
||||
|
|
@ -102,9 +83,9 @@ export default {
|
|||
'pluginCard.root': 'Корневой каталог',
|
||||
'pluginCard.provides': 'Предоставляет',
|
||||
'pluginCard.requires': 'Требует',
|
||||
'pluginCard.missingRequired': 'Отсутствуют обязательные возможности',
|
||||
'pluginCard.missingRequired': 'Отсутствуют обязательные capabilities',
|
||||
'pluginCard.optionalRequires': 'Необязательные зависимости',
|
||||
'pluginCard.optionalUnavailable': 'Необязательные возможности недоступны — плагин работает в ограниченном режиме',
|
||||
'pluginCard.optionalUnavailable': 'Необязательные capabilities недоступны — плагин работает в ограниченном режиме',
|
||||
'pluginCard.permissions': 'Разрешения',
|
||||
'pluginCard.enabling': '⟳ Включение...',
|
||||
'pluginCard.enable': '▶ Включить',
|
||||
|
|
@ -115,12 +96,12 @@ export default {
|
|||
'common.loading': 'Загрузка...',
|
||||
'common.browse': 'Обзор...',
|
||||
'vaultSelection.chooseNew': 'Выберите или введите папку для нового хранилища.',
|
||||
'vaultSelection.createError': 'Не удалось создать хранилище. Повторите попытку.',
|
||||
'vaultSelection.openError': 'Не удалось открыть хранилище. Повторите попытку.',
|
||||
'vaultSelection.createError': 'Не удалось создать хранилище: {error}',
|
||||
'vaultSelection.openError': 'Не удалось открыть хранилище: {error}',
|
||||
'vaultSelection.chooseExisting': 'Выберите или введите существующее хранилище.',
|
||||
'vaultSelection.subtitle': 'Выберите хранилище, чтобы начать работу',
|
||||
'vaultSelection.createTitle': 'Создать новое хранилище',
|
||||
'vaultSelection.createHint': 'Создайте локальную папку хранилища для Дел и проектов.',
|
||||
'vaultSelection.createHint': 'Создайте локальную папку хранилища для рабочих пространств и проектов.',
|
||||
'vaultSelection.pathPlaceholder': 'Выберите или введите путь...',
|
||||
'vaultSelection.creating': 'Создание...',
|
||||
'vaultSelection.create': 'Создать хранилище',
|
||||
|
|
@ -131,54 +112,21 @@ export default {
|
|||
'vaultSelection.recent': 'Недавние хранилища',
|
||||
'common.cancel': 'Отмена',
|
||||
'common.close': 'Закрыть',
|
||||
'workspaceTree.title': 'Дела',
|
||||
'workspaceTree.new': 'Новое Дело',
|
||||
'workspaceTree.title': 'Рабочие пространства',
|
||||
'workspaceTree.new': 'Новое рабочее пространство',
|
||||
'workspaceTree.nameRequired': 'Введите название',
|
||||
'workspaceTree.chooseTemplate': 'Выберите шаблон Дела',
|
||||
'workspaceTree.chooseTemplate': 'Выберите шаблон рабочего пространства',
|
||||
'workspaceTree.saveRename': 'Сохранить новое название',
|
||||
'workspaceTree.rename': 'Переименовать Дело',
|
||||
'workspaceTree.trash': 'Переместить Дело в корзину',
|
||||
'workspaceTree.create': 'Создать Дело',
|
||||
'workspaceTree.namePlaceholder': 'Название Дела',
|
||||
'workspaceTree.rename': 'Переименовать рабочее пространство',
|
||||
'workspaceTree.trash': 'Переместить рабочее пространство в корзину',
|
||||
'workspaceTree.create': 'Создать рабочее пространство',
|
||||
'workspaceTree.namePlaceholder': 'Название рабочего пространства',
|
||||
'workspaceTree.template': 'Шаблон',
|
||||
'workspaceTree.creating': 'Создание...',
|
||||
'workspaceTree.templateAvailable': 'Доступен',
|
||||
'workspaceTree.templateLimited': 'Доступен с ограничениями',
|
||||
'workspaceTree.templateMissingPlugin': 'Плагин не установлен',
|
||||
'workspaceTree.templatePluginDisabled': 'Плагин выключен',
|
||||
'workspaceTree.templateCapabilityUnavailable': 'Не хватает обязательной возможности',
|
||||
'workspaceTree.templateIncompatible': 'Плагин несовместим с этой версией Верстака',
|
||||
'workspaceTree.templateLoadFailed': 'Плагин не удалось загрузить',
|
||||
'workspaceTree.templateNotReady': 'Плагин ещё не готов к работе',
|
||||
'workspaceTree.templateToolTabs': 'Создаёт вкладки: {tabs}',
|
||||
'workspaceTree.templateToolNoTabs': 'Не предоставляет вкладку Дела',
|
||||
'workspaceTree.templateWillBeIncomplete': 'Дело будет создано без недоступных компонентов.',
|
||||
'workspaceTree.templateIncompleteCreated': 'Дело «{name}» создано с недоступными компонентами.',
|
||||
'workspaceTree.templatesError': 'Не удалось загрузить шаблоны Дел. Повторите попытку.',
|
||||
'workspaceTree.loadError': 'Не удалось загрузить Дела. Повторите попытку.',
|
||||
'workspaceTree.selectError': 'Не удалось выбрать это Дело. Повторите попытку.',
|
||||
'workspaceTree.createError': 'Не удалось создать Дело. Повторите попытку.',
|
||||
'workspaceTree.renameError': 'Не удалось переименовать Дело. Повторите попытку.',
|
||||
'workspaceTree.trashError': 'Не удалось переместить Дело в корзину. Повторите попытку.',
|
||||
'workspaceTree.parentFolder': 'Родительская папка',
|
||||
'workspaceTree.rootFolder': '(корень vault)',
|
||||
'workspaceTree.folderTitle': 'Папки',
|
||||
'workspaceTree.folderEmpty': 'Здесь нет Дел',
|
||||
'workspaceTree.createFolder': 'Создать папку',
|
||||
'workspaceTree.folderNamePlaceholder': 'Название папки',
|
||||
'workspaceTree.folderIcon': 'Иконка',
|
||||
'workspaceTree.folderColor': 'Цвет',
|
||||
'workspaceTree.folderCreateError': 'Не удалось создать папку. Повторите попытку.',
|
||||
'pluginManager.loadError': 'Не удалось загрузить плагины. Повторите попытку.',
|
||||
'pluginManager.reloadError': 'Не удалось перезагрузить плагины. Повторите попытку.',
|
||||
'pluginManager.enableError': 'Не удалось включить плагин. Повторите попытку.',
|
||||
'pluginManager.disableError': 'Не удалось выключить плагин. Повторите попытку.',
|
||||
'pluginManager.settingsLoadError': 'Не удалось загрузить настройки плагина. Повторите попытку.',
|
||||
'pluginManager.settingsUnavailable': 'Настройки плагина недоступны.',
|
||||
'command.openOverview': 'Открыть обзор',
|
||||
'command.openFiles': 'Открыть файлы',
|
||||
'command.openActivity': 'Открыть активность',
|
||||
'command.openBrowserInbox': 'Открыть Браузер',
|
||||
'command.openBrowserInbox': 'Открыть входящие из браузера',
|
||||
'command.createMarkdown': 'Создать файл Markdown',
|
||||
'command.createText': 'Создать текстовый файл',
|
||||
'command.syncNow': 'Синхронизировать сейчас',
|
||||
|
|
@ -186,7 +134,6 @@ export default {
|
|||
'command.openPluginManager': 'Открыть менеджер плагинов',
|
||||
'command.handled': 'Выполнено: {title}',
|
||||
'command.result': '{title}: {status}',
|
||||
'command.failed': 'Не удалось выполнить команду «{title}». Повторите попытку.',
|
||||
'command.statusHandled': 'выполнено',
|
||||
'command.palette': 'Палитра команд',
|
||||
'command.run': 'Выполнить команду',
|
||||
|
|
@ -195,26 +142,26 @@ export default {
|
|||
'search.placeholder': 'Поиск',
|
||||
'search.global': 'Глобальный поиск',
|
||||
'search.noResults': 'Ничего не найдено',
|
||||
'search.type.workspace': 'Дело',
|
||||
'search.type.workspace': 'Рабочее пространство',
|
||||
'search.type.tool': 'Инструмент',
|
||||
'search.type.folder': 'Папка',
|
||||
'search.type.file': 'Файл',
|
||||
'search.type.journal': 'Журнал',
|
||||
'search.type.browserInbox': 'Браузер',
|
||||
'search.type.browserInbox': 'Входящие из браузера',
|
||||
'search.type.activity': 'Активность',
|
||||
'workbench.noProvider': 'Нет обработчика',
|
||||
'workbench.noViewer': 'Нет доступного средства просмотра или редактора',
|
||||
'workbench.noResource': 'Ресурс не открыт',
|
||||
'bundle.noFrontend': 'У плагина нет frontend bundle',
|
||||
'bundle.notFound': 'Плагин не найден',
|
||||
'bundle.loadFailed': 'Не удалось загрузить интерфейс плагина. Повторите попытку.',
|
||||
'bundle.loadFailed': 'Не удалось загрузить bundle: {error}',
|
||||
'bundle.emptyContent': 'пустое содержимое',
|
||||
'bundle.executionError': 'Не удалось запустить интерфейс плагина. Повторите попытку.',
|
||||
'bundle.executionError': 'Ошибка выполнения bundle: {error}',
|
||||
'bundle.registrationMissing': 'Bundle загружен, но вызов VerstakPluginRegister не обнаружен',
|
||||
'bundle.componentMissing': 'Запрошенный интерфейс плагина недоступен.',
|
||||
'bundle.mountError': 'Не удалось открыть интерфейс плагина. Повторите попытку.',
|
||||
'bundle.componentMissing': 'Компонент «{component}» не найден в bundle. Доступны: {available}',
|
||||
'bundle.mountError': 'Ошибка подключения компонента: {error}',
|
||||
'bundle.mountUnavailable': 'Контейнер для подключения недоступен',
|
||||
'bundle.unexpectedError': 'Не удалось открыть интерфейс плагина. Повторите попытку.',
|
||||
'bundle.unexpectedError': 'Непредвиденная ошибка: {error}',
|
||||
'bundle.unknownError': 'Неизвестная ошибка',
|
||||
'bundle.frontendEntry': 'Точка входа frontend',
|
||||
'bundle.availableComponents': 'Доступные компоненты',
|
||||
|
|
@ -250,57 +197,18 @@ export default {
|
|||
'overview.count.journal.many': 'Записей журнала: {count}',
|
||||
'overview.count.pending.one': 'Ожидают: {count}',
|
||||
'overview.count.pending.many': 'Ожидают: {count}',
|
||||
'overview.loadingContext': 'Загрузка данных Дела...',
|
||||
'overview.loadingContext': 'Загрузка данных рабочего пространства...',
|
||||
'overview.lastActive': 'Последняя активность: {time}',
|
||||
'overview.noRecentActivity': 'В Деле пока нет недавней активности',
|
||||
'overview.noRecentActivity': 'В рабочем пространстве пока нет недавней активности',
|
||||
'overview.refresh': 'Обновить',
|
||||
'overview.summary': 'Сводка Дела',
|
||||
'overview.summary': 'Сводка рабочего пространства',
|
||||
'overview.continue': 'Продолжить работу',
|
||||
'overview.continueHint': 'Вернитесь к следующему полезному делу в этом Деле.',
|
||||
'overview.loadingSignals': 'Загрузка данных Дела...',
|
||||
'overview.continueHint': 'Вернитесь к следующему полезному делу в этом рабочем пространстве.',
|
||||
'overview.loadingSignals': 'Загрузка рабочих данных...',
|
||||
'overview.noResume': 'Пока неясно, с чего продолжить',
|
||||
'overview.noResumeHint': 'Здесь появятся недавние заметки, файлы, сохранённое и записи журнала.',
|
||||
'overview.recentChanges': 'Недавние изменения',
|
||||
'overview.recentChangesHint': 'Последняя важная активность в этом Деле.',
|
||||
'overview.event.workspaceOpened': 'Открыто Дело',
|
||||
'overview.event.activity': 'Активность Дела',
|
||||
'overview.event.noteEdited': 'Изменена заметка «{name}»',
|
||||
'overview.event.noteOpened': 'Открыта заметка «{name}»',
|
||||
'overview.event.noteCreated': 'Создана заметка «{name}»',
|
||||
'overview.event.fileOpened': 'Открыт файл «{name}»',
|
||||
'overview.event.fileChanged': 'Изменён файл «{name}»',
|
||||
'overview.event.fileCreated': 'Создан файл «{name}»',
|
||||
'overview.event.fileRemoved': 'Удалён файл «{name}»',
|
||||
'overview.event.capturePage': 'Сохранена страница «{name}»',
|
||||
'overview.event.captureSelection': 'Сохранено выделение «{name}»',
|
||||
'overview.event.captureLink': 'Сохранена ссылка «{name}»',
|
||||
'overview.event.captureFile': 'Сохранён файл «{name}»',
|
||||
'overview.event.captureConverted': 'Сохранённое преобразовано: «{name}»',
|
||||
'overview.event.capture': 'Сохранено: {kind} «{title}»',
|
||||
'overview.event.journalAdded': 'Добавлена запись в журнал «{name}»',
|
||||
'overview.event.workSessionDetected': 'Обнаружена рабочая сессия',
|
||||
'overview.event.todo': 'Задача «{title}»',
|
||||
'overview.event.reviewCapture': 'Разобрать сохранённое «{title}»',
|
||||
'overview.event.continueJournal': 'Продолжить запись журнала «{title}»',
|
||||
'overview.event.possibleJournalEntry': 'Возможная запись в журнал',
|
||||
'overview.captureKind.page': 'страница',
|
||||
'overview.captureKind.selection': 'выделение',
|
||||
'overview.captureKind.link': 'ссылка',
|
||||
'overview.captureKind.file': 'файл',
|
||||
'overview.captureKind.item': 'элемент',
|
||||
'overview.todo.reminderDue': 'Пора напомнить',
|
||||
'overview.todo.overdue': 'Просрочено',
|
||||
'overview.todo.dueSoon': 'Скоро срок',
|
||||
'overview.todo.due': 'Срок: {date}',
|
||||
'overview.candidateMeta': 'Дело: {deal} · {minutes} мин. · активностей: {activities}',
|
||||
'overview.minutes': '{count} мин.',
|
||||
'overview.browserCapture': 'Сохранённое из браузера',
|
||||
'overview.untitledTodo': 'Задача без названия',
|
||||
'overview.untitledCapture': 'Сохранённое без названия',
|
||||
'overview.untitledJournal': 'Запись журнала',
|
||||
'overview.unknownDeal': 'Неизвестное Дело',
|
||||
'overview.item': 'элемент',
|
||||
'overview.overviewNote': 'Обзорная заметка Дела',
|
||||
'overview.recentChangesHint': 'Последняя важная активность в этом рабочем пространстве.',
|
||||
'overview.recentFilter': 'Фильтр недавних изменений',
|
||||
'overview.loadingRecent': 'Загрузка недавних изменений...',
|
||||
'overview.noChanges': 'Для этого фильтра пока нет важных изменений.',
|
||||
|
|
|
|||
|
|
@ -127,11 +127,9 @@ export var debug = {
|
|||
log: log,
|
||||
logf: logf,
|
||||
isEnabled: function () { return ENABLED; },
|
||||
enable: function (options) {
|
||||
enable: function () {
|
||||
ENABLED = true;
|
||||
if (!options || options.persist !== false) {
|
||||
try { localStorage.setItem('verstak-debug', 'true'); } catch (e) {}
|
||||
}
|
||||
try { localStorage.setItem('verstak-debug', 'true'); } catch (e) {}
|
||||
},
|
||||
disable: function () {
|
||||
ENABLED = false;
|
||||
|
|
|
|||
|
|
@ -83,11 +83,6 @@
|
|||
return { value: result, error: '' };
|
||||
}
|
||||
|
||||
function reportError(key, fallback, details) {
|
||||
console.warn('[PluginBundleHost] ' + key + ':', details);
|
||||
return tr(key, undefined, fallback);
|
||||
}
|
||||
|
||||
async function loadAndMount(pId, compId, nextPropsKey) {
|
||||
// If same plugin+component and already mounted, skip
|
||||
if (currentPluginId === pId && currentComponent === compId && currentPropsKey === nextPropsKey && loadState === 'loaded') {
|
||||
|
|
@ -130,7 +125,7 @@
|
|||
const content = assetResult.value;
|
||||
if (assetResult.error || !content) {
|
||||
loadState = 'error';
|
||||
errorText = reportError('bundle.loadFailed', 'Could not load the plugin interface. Please try again.', assetResult.error || tr('bundle.emptyContent'));
|
||||
errorText = tr('bundle.loadFailed', { error: assetResult.error || tr('bundle.emptyContent') });
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -141,7 +136,8 @@
|
|||
fn();
|
||||
} catch (e) {
|
||||
loadState = 'error';
|
||||
errorText = reportError('bundle.executionError', 'Could not start the plugin interface. Please try again.', e);
|
||||
errorText = tr('bundle.executionError', { error: e.message });
|
||||
console.error('[PluginBundleHost] bundle exec error:', e);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -158,7 +154,10 @@
|
|||
const comp = components[compId];
|
||||
if (!comp || !comp.mount) {
|
||||
loadState = 'error';
|
||||
errorText = tr('bundle.componentMissing', undefined, 'The requested plugin interface is unavailable.');
|
||||
errorText = tr('bundle.componentMissing', {
|
||||
component: compId,
|
||||
available: Object.keys(components).join(', ') || tr('common.none'),
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -178,7 +177,8 @@
|
|||
errorText = '';
|
||||
} catch (e) {
|
||||
loadState = 'error';
|
||||
errorText = reportError('bundle.mountError', 'Could not open the plugin interface. Please try again.', e);
|
||||
errorText = tr('bundle.mountError', { error: e.message });
|
||||
console.error('[PluginBundleHost] mount error:', e);
|
||||
}
|
||||
} else {
|
||||
loadState = 'error';
|
||||
|
|
@ -186,7 +186,8 @@
|
|||
}
|
||||
} catch (e) {
|
||||
loadState = 'error';
|
||||
errorText = reportError('bundle.unexpectedError', 'Could not open the plugin interface. Please try again.', e);
|
||||
errorText = tr('bundle.unexpectedError', { error: e.message || e });
|
||||
console.error('[PluginBundleHost] error:', e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -207,18 +208,17 @@
|
|||
<div class="host-state error">
|
||||
<Icon name="warning" size={24} class="error-icon" />
|
||||
<p class="error-title">{tr('pluginView.error')}</p>
|
||||
<p class="error-message">{errorText || tr('bundle.unknownError')}</p>
|
||||
<details class="error-details">
|
||||
<summary>{tr('common.details')}</summary>
|
||||
<div class="error-details">
|
||||
<p><strong>{tr('common.plugin')}:</strong> {currentPluginId || tr('common.unknown')}</p>
|
||||
<p><strong>{tr('common.component')}:</strong> {currentComponent || tr('common.unknown')}</p>
|
||||
<p class="error-message">{errorText || tr('bundle.unknownError')}</p>
|
||||
{#if pluginInfo}
|
||||
<p class="error-meta">{tr('bundle.frontendEntry')}: {pluginInfo.entry || tr('common.none')}</p>
|
||||
{/if}
|
||||
{#if getComponentList().length > 0}
|
||||
<p class="error-meta">{tr('bundle.availableComponents')}: {getComponentList().join(', ')}</p>
|
||||
{/if}
|
||||
</details>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{:else}
|
||||
|
|
@ -303,21 +303,11 @@
|
|||
max-width: 400px;
|
||||
text-align: left;
|
||||
background: #16213e;
|
||||
padding: 0.5rem 0.75rem;
|
||||
padding: 1rem;
|
||||
border-radius: 6px;
|
||||
border: 1px solid #0f3460;
|
||||
}
|
||||
|
||||
.error-details[open] {
|
||||
padding: 0.75rem 1rem;
|
||||
}
|
||||
|
||||
.error-details summary {
|
||||
cursor: pointer;
|
||||
color: #e0e0f0;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.error-details p {
|
||||
margin: 0.3rem 0;
|
||||
}
|
||||
|
|
@ -328,8 +318,12 @@
|
|||
|
||||
.error-message {
|
||||
color: #e94560;
|
||||
max-width: 400px;
|
||||
margin: 0 0 0.75rem;
|
||||
font-family: monospace;
|
||||
font-size: 0.8rem;
|
||||
margin-top: 0.5rem !important;
|
||||
padding: 0.5rem;
|
||||
background: rgba(233, 69, 96, 0.1);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.error-meta {
|
||||
|
|
|
|||
|
|
@ -220,24 +220,6 @@ export function createPluginAPI(pluginId) {
|
|||
}
|
||||
},
|
||||
|
||||
notifications: {
|
||||
replace: function(items) {
|
||||
assertActive('notifications.replace');
|
||||
if (!Array.isArray(items)) {
|
||||
throw new Error('notifications.replace requires an array');
|
||||
}
|
||||
return callBackendErrorString(pluginId, 'notifications.replace', function() {
|
||||
return App.ReplacePluginNotifications(pluginId, items);
|
||||
});
|
||||
},
|
||||
clear: function() {
|
||||
assertActive('notifications.clear');
|
||||
return callBackendErrorString(pluginId, 'notifications.clear', function() {
|
||||
return App.ClearPluginNotifications(pluginId);
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
settings: {
|
||||
read: async function(key) {
|
||||
assertActive('settings.read');
|
||||
|
|
@ -468,10 +450,10 @@ export function createPluginAPI(pluginId) {
|
|||
return App.PluginSyncStatus(pluginId);
|
||||
});
|
||||
},
|
||||
configure: function(serverURL, username, password, vaultId) {
|
||||
configure: function(serverURL, username, password) {
|
||||
assertActive('sync.configure');
|
||||
return callBackendErrorString(pluginId, 'sync.configure', function() {
|
||||
return App.PluginSyncConfigure(pluginId, serverURL || '', username || '', password || '', vaultId || '');
|
||||
return App.PluginSyncConfigure(pluginId, serverURL || '', username || '', password || '');
|
||||
});
|
||||
},
|
||||
disconnect: function() {
|
||||
|
|
@ -584,48 +566,6 @@ export function createPluginAPI(pluginId) {
|
|||
}
|
||||
},
|
||||
|
||||
workspaces: {
|
||||
list: async function() {
|
||||
assertActive('workspaces.list');
|
||||
return callBackend(pluginId, 'workspaces.list', () => App.ListWorkspaces());
|
||||
},
|
||||
getCurrent: async function() {
|
||||
assertActive('workspaces.getCurrent');
|
||||
return callBackend(pluginId, 'workspaces.getCurrent', () => App.GetCurrentWorkspace());
|
||||
},
|
||||
getTree: async function() {
|
||||
assertActive('workspaces.getTree');
|
||||
return callBackend(pluginId, 'workspaces.getTree', () => App.GetWorkspaceTree());
|
||||
},
|
||||
select: async function(path) {
|
||||
assertActive('workspaces.select');
|
||||
return callBackendErrorString(pluginId, 'workspaces.select', () => App.SetCurrentWorkspace(path));
|
||||
},
|
||||
create: async function(path, templateId) {
|
||||
assertActive('workspaces.create');
|
||||
return callBackend(pluginId, 'workspaces.create', () => App.CreateWorkspace(path, templateId || 'default'));
|
||||
},
|
||||
trash: async function(path) {
|
||||
assertActive('workspaces.trash');
|
||||
return callBackend(pluginId, 'workspaces.trash', () => App.TrashWorkspace(path));
|
||||
},
|
||||
move: async function(id, newParentId) {
|
||||
assertActive('workspaces.move');
|
||||
return callBackendErrorString(pluginId, 'workspaces.move', () => App.MoveWorkspace(id, newParentId));
|
||||
}
|
||||
},
|
||||
|
||||
folders: {
|
||||
getMetadata: async function(path) {
|
||||
assertActive('folders.getMetadata');
|
||||
return callBackend(pluginId, 'folders.getMetadata', () => App.GetFolderMetadata(path));
|
||||
},
|
||||
setMetadata: async function(path, meta) {
|
||||
assertActive('folders.setMetadata');
|
||||
return callBackendErrorString(pluginId, 'folders.setMetadata', () => App.SetFolderMetadata(path, meta));
|
||||
}
|
||||
},
|
||||
|
||||
dispose: function() {
|
||||
if (disposed) return;
|
||||
disposed = true;
|
||||
|
|
|
|||
|
|
@ -33,11 +33,6 @@
|
|||
let reloading = false;
|
||||
let toastMessage = '';
|
||||
let toastType = 'success'; // 'success' | 'error' | 'info'
|
||||
let statusFilter = 'all';
|
||||
let permissionFilters = [];
|
||||
let capabilityFilters = [];
|
||||
let settingsFilter = 'all';
|
||||
let sourceFilter = 'all';
|
||||
|
||||
export let activeSettingsPluginId = '';
|
||||
export let activeSettingsPanelId = '';
|
||||
|
|
@ -58,12 +53,6 @@
|
|||
}, 4000);
|
||||
}
|
||||
|
||||
function reportError(key, fallback, details) {
|
||||
debug.log('[PluginManager] ' + key + ':', String(details));
|
||||
WriteFrontendLog('PluginManager', key + ': ' + String(details)).catch(() => {});
|
||||
return tr(key, undefined, fallback);
|
||||
}
|
||||
|
||||
function notifyPluginsChanged() {
|
||||
window.dispatchEvent(new CustomEvent('verstak:plugins-changed'));
|
||||
}
|
||||
|
|
@ -100,14 +89,14 @@
|
|||
ReadPluginSettings(pluginId).then(result => {
|
||||
const unpacked = unpackBackendResult(result);
|
||||
if (unpacked.error) {
|
||||
settingsError = reportError('pluginManager.settingsLoadError', 'Could not load plugin settings. Please try again.', unpacked.error);
|
||||
settingsError = unpacked.error;
|
||||
settingsData = {};
|
||||
return;
|
||||
}
|
||||
settingsData = unpacked.value || {};
|
||||
}).catch(() => { settingsData = {}; });
|
||||
} else {
|
||||
settingsError = tr('pluginManager.settingsUnavailable', undefined, 'Plugin settings are unavailable.');
|
||||
settingsError = `Settings panel not found for plugin "${pluginId}". Check that the plugin is enabled and has settingsPanels in its manifest.`;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -138,7 +127,7 @@
|
|||
} catch (e) {
|
||||
debug.log('[PluginManager] loadAll: GetPlugins ERROR:', String(e));
|
||||
WriteFrontendLog('PluginManager', 'loadAll: GetPlugins ERROR: ' + String(e));
|
||||
error = reportError('pluginManager.loadError', 'Could not load plugins. Please try again.', e);
|
||||
error = 'GetPlugins: ' + String(e);
|
||||
loading = false;
|
||||
return;
|
||||
}
|
||||
|
|
@ -202,7 +191,7 @@
|
|||
resultMsg = `Reloaded ${count} plugin(s). ${summary}`;
|
||||
} catch (e) {
|
||||
debug.log('[PluginManager] reload: ReloadPlugins ERROR:', String(e));
|
||||
error = reportError('pluginManager.reloadError', 'Could not reload plugins. Please try again.', e);
|
||||
error = 'Reload: ' + String(e);
|
||||
reloading = false;
|
||||
return;
|
||||
}
|
||||
|
|
@ -222,7 +211,7 @@
|
|||
if (err) {
|
||||
debug.log('[PluginManager] enablePlugin: ERROR:', err);
|
||||
actionFeedback = { ...actionFeedback, [pluginId]: null };
|
||||
error = reportError('pluginManager.enableError', 'Could not enable the plugin. Please try again.', err);
|
||||
error = 'Enable: ' + err;
|
||||
return;
|
||||
}
|
||||
debug.log('[PluginManager] enablePlugin: success, reloading...');
|
||||
|
|
@ -243,7 +232,7 @@
|
|||
if (err) {
|
||||
debug.log('[PluginManager] disablePlugin: ERROR:', err);
|
||||
actionFeedback = { ...actionFeedback, [pluginId]: null };
|
||||
error = reportError('pluginManager.disableError', 'Could not disable the plugin. Please try again.', err);
|
||||
error = 'Disable: ' + err;
|
||||
return;
|
||||
}
|
||||
debug.log('[PluginManager] disablePlugin: success, reloading...');
|
||||
|
|
@ -261,11 +250,6 @@
|
|||
$: totalPerms = permissions.length;
|
||||
$: statusSummary = computeStatusSummary(plugins);
|
||||
$: elevatedPermissionPluginCount = computeElevatedPermissionPluginCount(plugins, permissions);
|
||||
$: filterPermissions = collectManifestValues(plugins, 'permissions');
|
||||
$: filterCapabilities = collectCapabilities(plugins);
|
||||
$: hasReliableSourceMetadata = plugins.some((plugin) => sourceGroup(plugin) !== '');
|
||||
$: visiblePlugins = filterPlugins(plugins, statusFilter, permissionFilters, capabilityFilters, settingsFilter, sourceFilter, contributions);
|
||||
$: filtersActive = statusFilter !== 'all' || permissionFilters.length > 0 || capabilityFilters.length > 0 || settingsFilter !== 'all' || sourceFilter !== 'all';
|
||||
|
||||
function computeStatusSummary(pluginRows) {
|
||||
return pluginRows.reduce((summary, plugin) => {
|
||||
|
|
@ -284,69 +268,6 @@
|
|||
return (pluginRows || []).filter(plugin => (plugin?.manifest?.permissions || []).some(permission => dangerous.has(permission))).length;
|
||||
}
|
||||
|
||||
function collectManifestValues(pluginRows, key) {
|
||||
return Array.from(new Set((pluginRows || []).flatMap((plugin) => plugin?.manifest?.[key] || [])))
|
||||
.sort((left, right) => left.localeCompare(right));
|
||||
}
|
||||
|
||||
function collectCapabilities(pluginRows) {
|
||||
return Array.from(new Set((pluginRows || []).flatMap((plugin) => [
|
||||
...(plugin?.manifest?.provides || []),
|
||||
...(plugin?.manifest?.requires || []),
|
||||
...(plugin?.manifest?.optionalRequires || []),
|
||||
]))).sort((left, right) => left.localeCompare(right));
|
||||
}
|
||||
|
||||
function pluginStatusGroup(plugin) {
|
||||
const status = plugin?.status || '';
|
||||
if (status === 'failed' || status === 'incompatible' || status === 'missing-required-capability') return 'failed';
|
||||
if (status === 'degraded') return 'degraded';
|
||||
if (status === 'disabled' || plugin?.enabled === false) return 'disabled';
|
||||
return 'enabled';
|
||||
}
|
||||
|
||||
function sourceGroup(plugin) {
|
||||
const source = plugin?.manifest?.source;
|
||||
if (source === 'official') return 'official';
|
||||
if (source === 'local' || source === 'third-party') return 'third-party';
|
||||
return '';
|
||||
}
|
||||
|
||||
function hasSettings(plugin, activeContributions) {
|
||||
const pluginId = plugin?.manifest?.id;
|
||||
return Boolean(pluginId && (activeContributions.settingsPanels || []).some((panel) => panel.pluginId === pluginId));
|
||||
}
|
||||
|
||||
function includesAny(values, expected) {
|
||||
return expected.length === 0 || expected.some((value) => values.includes(value));
|
||||
}
|
||||
|
||||
function filterPlugins(pluginRows, activeStatusFilter, activePermissionFilters, activeCapabilityFilters, activeSettingsFilter, activeSourceFilter, activeContributions) {
|
||||
return pluginRows.filter((plugin) => matchesFilters(plugin, activeStatusFilter, activePermissionFilters, activeCapabilityFilters, activeSettingsFilter, activeSourceFilter, activeContributions));
|
||||
}
|
||||
|
||||
function matchesFilters(plugin, activeStatusFilter, activePermissionFilters, activeCapabilityFilters, activeSettingsFilter, activeSourceFilter, activeContributions) {
|
||||
if (activeStatusFilter !== 'all' && pluginStatusGroup(plugin) !== activeStatusFilter) return false;
|
||||
if (!includesAny(plugin?.manifest?.permissions || [], activePermissionFilters)) return false;
|
||||
const declaredCapabilities = [
|
||||
...(plugin?.manifest?.provides || []),
|
||||
...(plugin?.manifest?.requires || []),
|
||||
...(plugin?.manifest?.optionalRequires || []),
|
||||
];
|
||||
if (!includesAny(declaredCapabilities, activeCapabilityFilters)) return false;
|
||||
if (activeSettingsFilter === 'with' && !hasSettings(plugin, activeContributions)) return false;
|
||||
if (activeSettingsFilter === 'without' && hasSettings(plugin, activeContributions)) return false;
|
||||
return activeSourceFilter === 'all' || sourceGroup(plugin) === activeSourceFilter;
|
||||
}
|
||||
|
||||
function resetFilters() {
|
||||
statusFilter = 'all';
|
||||
permissionFilters = [];
|
||||
capabilityFilters = [];
|
||||
settingsFilter = 'all';
|
||||
sourceFilter = 'all';
|
||||
}
|
||||
|
||||
function closeSettings() {
|
||||
settingsPanel = null;
|
||||
settingsPluginId = '';
|
||||
|
|
@ -418,70 +339,6 @@
|
|||
</section>
|
||||
</div>
|
||||
|
||||
<section class="plugin-filters" aria-label={tr('pluginManager.filters')}>
|
||||
<div class="filter-header">
|
||||
<div>
|
||||
<h3>{tr('pluginManager.filters')}</h3>
|
||||
<p data-plugin-filter-results>{tr('pluginManager.filterResults', { visible: visiblePlugins.length, total: totalPlugins })}</p>
|
||||
</div>
|
||||
<button class="filter-reset" data-plugin-filter-reset type="button" on:click={resetFilters} disabled={!filtersActive}>{tr('pluginManager.filterReset')}</button>
|
||||
</div>
|
||||
<div class="filter-grid">
|
||||
<label class="filter-select-label">
|
||||
<span>{tr('pluginManager.filterState')}</span>
|
||||
<select class="filter-select" data-plugin-filter="status" bind:value={statusFilter}>
|
||||
<option value="all">{tr('pluginManager.filterAll')}</option>
|
||||
<option value="enabled">{tr('pluginManager.filterEnabled')}</option>
|
||||
<option value="disabled">{tr('pluginManager.filterDisabled')}</option>
|
||||
<option value="failed">{tr('pluginManager.filterFailed')}</option>
|
||||
<option value="degraded">{tr('pluginManager.filterDegraded')}</option>
|
||||
</select>
|
||||
</label>
|
||||
|
||||
<label class="filter-select-label">
|
||||
<span>{tr('pluginManager.filterSettings')}</span>
|
||||
<select class="filter-select" data-plugin-filter="settings" bind:value={settingsFilter}>
|
||||
<option value="all">{tr('pluginManager.filterAll')}</option>
|
||||
<option value="with">{tr('pluginManager.filterWithSettings')}</option>
|
||||
<option value="without">{tr('pluginManager.filterWithoutSettings')}</option>
|
||||
</select>
|
||||
</label>
|
||||
|
||||
{#if hasReliableSourceMetadata}
|
||||
<label class="filter-select-label">
|
||||
<span>{tr('pluginManager.filterSource')}</span>
|
||||
<select class="filter-select" data-plugin-filter="source" bind:value={sourceFilter}>
|
||||
<option value="all">{tr('pluginManager.filterAll')}</option>
|
||||
<option value="official">{tr('pluginManager.filterOfficial')}</option>
|
||||
<option value="third-party">{tr('pluginManager.filterThirdParty')}</option>
|
||||
</select>
|
||||
</label>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#if filterPermissions.length > 0}
|
||||
<fieldset class="filter-options">
|
||||
<legend>{tr('pluginManager.filterPermissions')}</legend>
|
||||
<div class="filter-option-list">
|
||||
{#each filterPermissions as permission}
|
||||
<label><input data-plugin-filter-permission={permission} type="checkbox" bind:group={permissionFilters} value={permission} /> <code>{permission}</code></label>
|
||||
{/each}
|
||||
</div>
|
||||
</fieldset>
|
||||
{/if}
|
||||
|
||||
{#if filterCapabilities.length > 0}
|
||||
<fieldset class="filter-options">
|
||||
<legend>{tr('pluginManager.filterCapabilities')}</legend>
|
||||
<div class="filter-option-list">
|
||||
{#each filterCapabilities as capability}
|
||||
<label><input data-plugin-filter-capability={capability} type="checkbox" bind:group={capabilityFilters} value={capability} /> <code>{capability}</code></label>
|
||||
{/each}
|
||||
</div>
|
||||
</fieldset>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
{#if plugins.length === 0 && missingInstalled.length === 0}
|
||||
<div class="empty">
|
||||
<div class="empty-icon">
|
||||
|
|
@ -497,13 +354,9 @@
|
|||
</ul>
|
||||
<p class="hint">{tr('pluginManager.installHint')}</p>
|
||||
</div>
|
||||
{:else if visiblePlugins.length === 0}
|
||||
<div class="empty filter-empty" data-plugin-filter-empty>
|
||||
<p>{tr('pluginManager.filterEmpty')}</p>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="plugin-list">
|
||||
{#each visiblePlugins as p}
|
||||
{#each plugins as p}
|
||||
<PluginCard {p} {capabilities} {permissions} {contributions} {vaultOpen} {actionFeedback} settingsPanels={(contributions.settingsPanels || []).filter(sp => sp.pluginId === p.manifest?.id)} onEnable={enablePlugin} onDisable={disablePlugin} />
|
||||
{/each}
|
||||
</div>
|
||||
|
|
@ -718,105 +571,6 @@
|
|||
color: #f4f7fb;
|
||||
font-size: 0.88rem;
|
||||
}
|
||||
.plugin-filters {
|
||||
margin-bottom: 1rem;
|
||||
padding: 0.75rem;
|
||||
border: 1px solid #0f3460;
|
||||
border-radius: 8px;
|
||||
background: #121a2c;
|
||||
}
|
||||
.filter-header {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 0.75rem;
|
||||
}
|
||||
.filter-header h3 {
|
||||
margin: 0;
|
||||
color: #e0e0f0;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
.filter-header p {
|
||||
margin: 0.2rem 0 0;
|
||||
color: #a0a0b8;
|
||||
font-size: 0.78rem;
|
||||
}
|
||||
.filter-reset {
|
||||
flex: 0 0 auto;
|
||||
padding: 0.35rem 0.65rem;
|
||||
border: 1px solid #533483;
|
||||
border-radius: 5px;
|
||||
background: #16213e;
|
||||
color: #e0e0e0;
|
||||
cursor: pointer;
|
||||
font-size: 0.78rem;
|
||||
}
|
||||
.filter-reset:hover:not(:disabled) { background: #0f3460; }
|
||||
.filter-reset:disabled { cursor: not-allowed; opacity: 0.5; }
|
||||
.filter-grid {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.65rem;
|
||||
}
|
||||
.filter-select-label {
|
||||
display: grid;
|
||||
gap: 0.28rem;
|
||||
min-width: 10rem;
|
||||
color: #a0a0b8;
|
||||
font-size: 0.76rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
.filter-select {
|
||||
min-height: 2rem;
|
||||
padding: 0.3rem 1.9rem 0.3rem 0.55rem;
|
||||
border: 1px solid #0f3460;
|
||||
border-radius: 5px;
|
||||
background: #16213e;
|
||||
background-image: linear-gradient(45deg, transparent 50%, #a0a0b8 50%), linear-gradient(135deg, #a0a0b8 50%, transparent 50%);
|
||||
background-position: calc(100% - 14px) 50%, calc(100% - 9px) 50%;
|
||||
background-size: 5px 5px, 5px 5px;
|
||||
background-repeat: no-repeat;
|
||||
color: #e0e0e0;
|
||||
font: inherit;
|
||||
appearance: none;
|
||||
}
|
||||
.filter-select option { background: #16213e; color: #e0e0e0; }
|
||||
.filter-select:focus { outline: 2px solid #533483; outline-offset: 1px; }
|
||||
.filter-options {
|
||||
min-width: 0;
|
||||
margin: 0.75rem 0 0;
|
||||
padding: 0.55rem 0.65rem 0.65rem;
|
||||
border: 1px solid rgba(15, 52, 96, 0.85);
|
||||
border-radius: 6px;
|
||||
}
|
||||
.filter-options legend {
|
||||
padding: 0 0.25rem;
|
||||
color: #a0a0b8;
|
||||
font-size: 0.76rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
.filter-option-list {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.4rem 0.75rem;
|
||||
}
|
||||
.filter-option-list label {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.28rem;
|
||||
min-width: 0;
|
||||
color: #c6c6d8;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
.filter-option-list input { accent-color: #6c4fa3; }
|
||||
.filter-option-list code {
|
||||
max-width: min(31rem, 72vw);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.filter-empty { margin-bottom: 1.5rem; }
|
||||
.empty {
|
||||
padding: 2rem; text-align: center; color: #a0a0b8;
|
||||
background: #16213e; border-radius: 8px; border: 1px dashed #0f3460;
|
||||
|
|
@ -825,6 +579,7 @@
|
|||
.hint { font-size: 0.85rem; margin-top: 0.5rem; opacity: 0.7; }
|
||||
.hint-list { list-style: none; padding: 0; margin: 0.5rem 0; font-size: 0.8rem; opacity: 0.7; }
|
||||
.hint-list li { margin: 0.25rem 0; }
|
||||
.hint code { background: #0f3460; padding: 0.1rem 0.3rem; border-radius: 3px; }
|
||||
.plugin-list { display: flex; flex-direction: column; gap: 0.75rem; margin-bottom: 1.5rem; min-width: 0; }
|
||||
|
||||
.missing-section { margin-bottom: 1.5rem; }
|
||||
|
|
@ -891,19 +646,6 @@
|
|||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.filter-header {
|
||||
align-items: stretch;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.filter-reset {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.filter-select-label {
|
||||
flex: 1 1 10rem;
|
||||
}
|
||||
|
||||
.modal {
|
||||
width: min(880px, calc(100vw - 2rem));
|
||||
height: min(680px, calc(100vh - 2rem));
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
import * as App from '../../../wailsjs/go/api/App';
|
||||
import { executePluginCommand } from '../plugin-host/VerstakPluginAPI.js';
|
||||
import { i18n } from '../i18n/index.js';
|
||||
import { debug } from '../log/debug.js';
|
||||
|
||||
let open = false;
|
||||
let query = '';
|
||||
|
|
@ -195,12 +194,7 @@
|
|||
closePalette();
|
||||
setStatus('success', tr('command.result', { title: command.title || command.id, status: result.status || tr('command.statusHandled') }));
|
||||
} catch (err) {
|
||||
const details = err?.message || String(err);
|
||||
debug.log('[CommandPalette] command failed:', details);
|
||||
App.WriteFrontendLog('CommandPalette', `command failed: ${details}`).catch(() => {});
|
||||
setStatus('error', tr('command.failed', {
|
||||
title: command.title || command.id,
|
||||
}, `Could not run ${command.title || command.id}. Please try again.`));
|
||||
setStatus('error', `${command.title || command.id}: ${err?.message || String(err)}`);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,12 @@
|
|||
import { onDestroy, onMount } from 'svelte';
|
||||
import * as App from '../../../wailsjs/go/api/App';
|
||||
import WorkspaceTree from './WorkspaceTree.svelte';
|
||||
import PluginBundleHost from '../plugin-host/PluginBundleHost.svelte';
|
||||
import GlobalSearch from './GlobalSearch.svelte';
|
||||
import Icon from '../ui/Icon.svelte';
|
||||
import { debug } from '../log/debug.js';
|
||||
import { i18n } from '../i18n/index.js';
|
||||
|
||||
export let showGlobalSearch = true;
|
||||
export let activeView = null;
|
||||
export let activeViewPluginId = '';
|
||||
|
||||
function flog(msg) {
|
||||
App.WriteFrontendLog('Sidebar', msg);
|
||||
|
|
@ -19,7 +16,6 @@
|
|||
let plugins = [];
|
||||
let vaultStatus = { status: 'unknown', path: '', vaultId: '' };
|
||||
let sidebarItems = [];
|
||||
let workspaceTreeProvider = null;
|
||||
let errorMessage = '';
|
||||
let locale = i18n.getLocale();
|
||||
let unsubscribeLocale = null;
|
||||
|
|
@ -30,7 +26,6 @@
|
|||
})(locale);
|
||||
|
||||
$: vaultOpen = vaultStatus.status === 'open';
|
||||
$: activeSidebarKey = activeView ? `${activeViewPluginId}:${activeView}` : '';
|
||||
|
||||
async function loadSidebar() {
|
||||
debug.log('[Sidebar] onMount: START');
|
||||
|
|
@ -61,19 +56,6 @@
|
|||
return plugin.status !== 'disabled' && plugin.status !== 'failed' && plugin.status !== 'incompatible' && plugin.status !== 'missing-required-capability';
|
||||
});
|
||||
sidebarItems.sort((a, b) => (a.position || 100) - (b.position || 100));
|
||||
|
||||
// Check for workspaceTree contribution
|
||||
const wtContrib = (localizedContributions.workspaceTree || null);
|
||||
if (wtContrib && wtContrib.pluginId && wtContrib.component) {
|
||||
const wtPlugin = plugins.find(p => p.manifest?.id === wtContrib.pluginId);
|
||||
if (wtPlugin && wtPlugin.status !== 'disabled' && wtPlugin.status !== 'failed' && wtPlugin.status !== 'incompatible' && wtPlugin.status !== 'missing-required-capability') {
|
||||
workspaceTreeProvider = { pluginId: wtContrib.pluginId, component: wtContrib.component };
|
||||
} else {
|
||||
workspaceTreeProvider = null;
|
||||
}
|
||||
} else {
|
||||
workspaceTreeProvider = null;
|
||||
}
|
||||
debug.log('[Sidebar] onMount: sidebarItems=' + sidebarItems.length);
|
||||
flog('onMount: sidebarItems=' + sidebarItems.length);
|
||||
} catch (e) {
|
||||
|
|
@ -125,8 +107,6 @@
|
|||
{#each sidebarItems as item}
|
||||
<button
|
||||
class="nav-item plugin-item vt-list-row"
|
||||
class:is-active={activeSidebarKey === `${item.pluginId || ''}:${item.view || item.id}`}
|
||||
aria-current={activeSidebarKey === `${item.pluginId || ''}:${item.view || item.id}` ? 'page' : undefined}
|
||||
on:click={() => handleSidebarItem(item)}
|
||||
type="button"
|
||||
>
|
||||
|
|
@ -138,11 +118,7 @@
|
|||
{/if}
|
||||
|
||||
{#if vaultOpen}
|
||||
{#if workspaceTreeProvider}
|
||||
<PluginBundleHost pluginId={workspaceTreeProvider.pluginId} componentId={workspaceTreeProvider.component} />
|
||||
{:else}
|
||||
<WorkspaceTree />
|
||||
{/if}
|
||||
<WorkspaceTree />
|
||||
{/if}
|
||||
|
||||
<div class="sidebar-footer">
|
||||
|
|
@ -234,16 +210,6 @@
|
|||
color: var(--vt-color-text-primary);
|
||||
}
|
||||
|
||||
.nav-item.is-active {
|
||||
background: var(--vt-color-surface-selected);
|
||||
color: var(--vt-color-accent);
|
||||
}
|
||||
|
||||
.nav-item.is-active :global(.nav-icon.icon-plugin) {
|
||||
color: currentColor;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
:global(.nav-icon) {
|
||||
width: 0.9rem;
|
||||
height: 0.9rem;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
let keyResources = [];
|
||||
let totalNotes = 0;
|
||||
let loadedWorkspaceRoot = '';
|
||||
let loadedToolKey = '';
|
||||
let toolProbe = 0;
|
||||
let locale = i18n.getLocale();
|
||||
let unsubscribeLocale = null;
|
||||
|
|
@ -39,25 +38,17 @@
|
|||
void activeLocale;
|
||||
return i18n.t(key, params, fallback);
|
||||
})(locale);
|
||||
$: FILTERS = ['all', 'notes', 'files', 'captures', 'journal'].map((key) => ({
|
||||
key,
|
||||
label: tr(`overview.filter.${key}`),
|
||||
}));
|
||||
function countText(key, count, params = {}) {
|
||||
return tr(`${key}.${count === 1 ? 'one' : 'many'}`, { count, ...params });
|
||||
}
|
||||
|
||||
$: hasNotes = hasTool('notes', availableTools);
|
||||
$: hasFiles = hasTool('files', availableTools);
|
||||
$: hasBrowserInbox = hasTool('browser-inbox', availableTools);
|
||||
$: hasActivity = hasTool('activity', availableTools);
|
||||
$: hasJournal = hasTool('journal', availableTools);
|
||||
$: hasTodos = hasTool('todo', availableTools);
|
||||
$: overviewToolKey = [hasNotes, hasFiles, hasBrowserInbox, hasActivity, hasJournal, hasTodos].join('|');
|
||||
$: FILTERS = ['all']
|
||||
.concat(hasNotes ? ['notes'] : [])
|
||||
.concat(hasFiles ? ['files'] : [])
|
||||
.concat(hasBrowserInbox ? ['captures'] : [])
|
||||
.concat(hasJournal ? ['journal'] : [])
|
||||
.map((key) => ({ key, label: tr(`overview.filter.${key}`) }));
|
||||
$: if (!FILTERS.some(filter => filter.key === activeFilter)) activeFilter = 'all';
|
||||
$: recentChanges = filterAvailableItems(buildRecentChanges(activityEvents, captures, journalEntries), overviewToolKey);
|
||||
$: recentChanges = buildRecentChanges(activityEvents, captures, journalEntries);
|
||||
$: filteredRecentChanges = activeFilter === 'all'
|
||||
? recentChanges
|
||||
: recentChanges.filter(item => item.category === activeFilter);
|
||||
|
|
@ -67,19 +58,18 @@
|
|||
$: linkedCandidateIds = new Set(journalEntries.map(item => String(item?.sourceCandidateId || '')).filter(Boolean));
|
||||
$: pendingWorkSessionCandidates = workSessionCandidates.filter(item => !linkedCandidateIds.has(String(item?.candidateId || '')));
|
||||
$: urgentTodos = hasTodos ? todos.filter(item => todoAttentionState(item)) : [];
|
||||
$: needsAttention = filterAvailableItems(buildNeedsAttention(unprocessedCaptures, pendingWorkSessionCandidates, urgentTodos), overviewToolKey);
|
||||
$: continueItems = filterAvailableItems(buildContinueItems(activityEvents, unprocessedCaptures, journalEntries, urgentTodos), overviewToolKey);
|
||||
$: hasAttentionTools = hasBrowserInbox || hasTodos || (hasActivity && hasJournal);
|
||||
$: attentionActionKind = needsAttention[0]?.actionKind || fallbackAttentionAction();
|
||||
$: needsAttention = buildNeedsAttention(unprocessedCaptures, pendingWorkSessionCandidates, urgentTodos);
|
||||
$: continueItems = buildContinueItems(activityEvents, unprocessedCaptures, journalEntries, urgentTodos);
|
||||
$: attentionActionKind = needsAttention[0]?.actionKind || 'browser-inbox';
|
||||
$: lastActive = lastActiveDate([...recentChanges, ...continueItems], captures, journalEntries, todos);
|
||||
$: summaryItems = [
|
||||
hasNotes ? { key: 'notes', label: tr('overview.notes'), count: totalNotes, detail: countText('overview.count.totalRecent', noteRecentChanges, { total: totalNotes, recent: noteRecentChanges }), actionKind: 'notes', actionLabel: tr('overview.openNotes') } : null,
|
||||
hasFiles ? { key: 'files', label: tr('overview.files'), count: fileRecentChanges, detail: countText('overview.count.recentChanges', fileRecentChanges), actionKind: 'files', actionLabel: tr('overview.openFiles') } : null,
|
||||
hasBrowserInbox ? { key: 'captures', label: tr('overview.captures'), count: unprocessedCaptures.length, detail: countText('overview.count.captures', unprocessedCaptures.length), actionKind: 'browser-inbox', actionLabel: tr('overview.reviewInbox') } : null,
|
||||
hasActivity ? { key: 'activity', label: tr('overview.activity'), count: activityEvents.length, detail: countText('overview.count.events', activityEvents.length), actionKind: 'activity', actionLabel: tr('overview.viewActivity') } : null,
|
||||
hasJournal ? { key: 'journal', label: tr('overview.journal'), count: journalEntries.length, detail: countText('overview.count.journal', journalEntries.length), actionKind: 'journal', actionLabel: tr('overview.openJournal') } : null,
|
||||
hasAttentionTools ? { key: 'attention', label: tr('overview.attention'), count: needsAttention.length, detail: countText('overview.count.pending', needsAttention.length), actionKind: attentionActionKind, actionLabel: tr('overview.reviewPending') } : null,
|
||||
].filter(Boolean);
|
||||
{ key: 'notes', label: tr('overview.notes'), count: totalNotes, detail: countText('overview.count.totalRecent', noteRecentChanges, { total: totalNotes, recent: noteRecentChanges }), actionKind: 'notes', actionLabel: tr('overview.openNotes') },
|
||||
{ key: 'files', label: tr('overview.files'), count: fileRecentChanges, detail: countText('overview.count.recentChanges', fileRecentChanges), actionKind: 'files', actionLabel: tr('overview.openFiles') },
|
||||
{ key: 'captures', label: tr('overview.captures'), count: unprocessedCaptures.length, detail: countText('overview.count.captures', unprocessedCaptures.length), actionKind: 'browser-inbox', actionLabel: tr('overview.reviewInbox') },
|
||||
{ key: 'activity', label: tr('overview.activity'), count: activityEvents.length, detail: countText('overview.count.events', activityEvents.length), actionKind: 'activity', actionLabel: tr('overview.viewActivity') },
|
||||
{ key: 'journal', label: tr('overview.journal'), count: journalEntries.length, detail: countText('overview.count.journal', journalEntries.length), actionKind: 'journal', actionLabel: tr('overview.openJournal') },
|
||||
{ key: 'attention', label: tr('overview.attention'), count: needsAttention.length, detail: countText('overview.count.pending', needsAttention.length), actionKind: attentionActionKind, actionLabel: tr('overview.reviewPending') },
|
||||
];
|
||||
|
||||
onMount(() => {
|
||||
unsubscribeLocale = i18n.subscribe((nextLocale) => locale = nextLocale);
|
||||
|
|
@ -88,7 +78,7 @@
|
|||
|
||||
onDestroy(() => unsubscribeLocale?.());
|
||||
|
||||
$: if (workspaceRootPath && (workspaceRootPath !== loadedWorkspaceRoot || overviewToolKey !== loadedToolKey)) {
|
||||
$: if (workspaceRootPath && workspaceRootPath !== loadedWorkspaceRoot) {
|
||||
loadOverview();
|
||||
}
|
||||
|
||||
|
|
@ -99,29 +89,11 @@
|
|||
const label = `${tool?.title || ''} ${tool?.id || ''} ${tool?.pluginId || ''}`.toLowerCase();
|
||||
return label.includes(name);
|
||||
});
|
||||
return fromProps;
|
||||
}
|
||||
|
||||
function actionIsAvailable(kind) {
|
||||
if (kind === 'notes') return hasNotes;
|
||||
if (kind === 'files') return hasFiles;
|
||||
if (kind === 'browser-inbox') return hasBrowserInbox;
|
||||
if (kind === 'activity') return hasActivity;
|
||||
if (kind === 'journal') return hasJournal;
|
||||
if (kind === 'todo') return hasTodos;
|
||||
return false;
|
||||
}
|
||||
|
||||
function filterAvailableItems(items, _toolKey) {
|
||||
void _toolKey;
|
||||
return (items || []).filter(item => actionIsAvailable(item?.actionKind));
|
||||
}
|
||||
|
||||
function fallbackAttentionAction() {
|
||||
if (hasBrowserInbox) return 'browser-inbox';
|
||||
if (hasTodos) return 'todo';
|
||||
if (hasActivity && hasJournal) return 'journal';
|
||||
return '';
|
||||
if (fromProps) return true;
|
||||
if (typeof document === 'undefined') return false;
|
||||
return Array.from(document.querySelectorAll('.workspace-tabs [role="tab"]')).some(tab => {
|
||||
return String(tab.textContent || '').trim().toLowerCase().includes(name);
|
||||
});
|
||||
}
|
||||
|
||||
function decodeTuple(response, fallback) {
|
||||
|
|
@ -195,7 +167,7 @@
|
|||
}
|
||||
|
||||
function todoTitle(item) {
|
||||
return String(item?.title || item?.name || tr('overview.untitledTodo')).trim() || tr('overview.untitledTodo');
|
||||
return String(item?.title || item?.name || 'Untitled todo').trim() || 'Untitled todo';
|
||||
}
|
||||
|
||||
function todoAttentionState(item) {
|
||||
|
|
@ -203,9 +175,9 @@
|
|||
const now = Date.now();
|
||||
const dueAt = todoDateMs(item?.dueAt);
|
||||
const reminderAt = todoDateMs(item?.reminderAt);
|
||||
if (reminderAt && reminderAt <= now) return tr('overview.todo.reminderDue');
|
||||
if (dueAt && dueAt < now) return tr('overview.todo.overdue');
|
||||
if (dueAt && dueAt <= now + 3 * 24 * 60 * 60 * 1000) return tr('overview.todo.dueSoon');
|
||||
if (reminderAt && reminderAt <= now) return 'Reminder due';
|
||||
if (dueAt && dueAt < now) return 'Overdue';
|
||||
if (dueAt && dueAt <= now + 3 * 24 * 60 * 60 * 1000) return 'Due soon';
|
||||
return '';
|
||||
}
|
||||
|
||||
|
|
@ -238,12 +210,17 @@
|
|||
return fileName(path).replace(/\.(md|markdown|txt)$/i, '').replace(/_/g, ' ') || 'Untitled';
|
||||
}
|
||||
|
||||
function quoted(value) {
|
||||
const clean = String(value || '').trim();
|
||||
return clean ? `"${clean}"` : '';
|
||||
}
|
||||
|
||||
function entityName(item) {
|
||||
const payload = item?.payload && typeof item.payload === 'object' ? item.payload : {};
|
||||
const path = payload.path || payload.notePath || item?.path || item?.relativePath || looksLikePath(item?.summary);
|
||||
const title = String(item?.title || payload.title || '').trim();
|
||||
if (path && (!title || /^(saved note|file opened|file changed|activity event)$/i.test(title))) return titleFromPath(path);
|
||||
return title || titleFromPath(path) || String(item?.summary || item?.activityId || tr('overview.item'));
|
||||
return title || titleFromPath(path) || String(item?.summary || item?.activityId || 'item');
|
||||
}
|
||||
|
||||
function looksLikePath(value) {
|
||||
|
|
@ -253,11 +230,11 @@
|
|||
}
|
||||
|
||||
function captureTitle(capture) {
|
||||
return capture?.title || capture?.fileName || capture?.url || capture?.captureId || tr('overview.untitledCapture');
|
||||
return capture?.title || capture?.fileName || capture?.url || capture?.captureId || 'Untitled capture';
|
||||
}
|
||||
|
||||
function journalTitle(entry) {
|
||||
return entry?.title || entry?.summary || entry?.date || entry?.entryId || tr('overview.untitledJournal');
|
||||
return entry?.title || entry?.summary || entry?.date || entry?.entryId || 'Journal entry';
|
||||
}
|
||||
|
||||
function itemTimeLabel(item) {
|
||||
|
|
@ -307,31 +284,22 @@
|
|||
function activityTitle(item) {
|
||||
const type = String(item?.type || '').toLowerCase();
|
||||
const name = entityName(item);
|
||||
if (type === 'note.saved' || type === 'note.edited') return tr('overview.event.noteEdited', { name });
|
||||
if (type === 'note.opened') return tr('overview.event.noteOpened', { name });
|
||||
if (type === 'note.created') return tr('overview.event.noteCreated', { name });
|
||||
if (type === 'file.opened') return tr('overview.event.fileOpened', { name });
|
||||
if (type === 'file.changed') return tr('overview.event.fileChanged', { name });
|
||||
if (type === 'file.created') return tr('overview.event.fileCreated', { name });
|
||||
if (type === 'file.deleted' || type === 'file.trashed') return tr('overview.event.fileRemoved', { name });
|
||||
if (type === 'browser.capture.page') return tr('overview.event.capturePage', { name });
|
||||
if (type === 'browser.capture.selection') return tr('overview.event.captureSelection', { name });
|
||||
if (type === 'browser.capture.link') return tr('overview.event.captureLink', { name });
|
||||
if (type === 'browser.capture.file') return tr('overview.event.captureFile', { name });
|
||||
if (type === 'browser.capture.converted') return tr('overview.event.captureConverted', { name });
|
||||
if (type === 'journal.entry.added' || type === 'worklog.entry.added') return tr('overview.event.journalAdded', { name });
|
||||
if (type === 'action.started') return tr('overview.event.workSessionDetected');
|
||||
if (type === 'workspace.opened') return tr('overview.event.workspaceOpened');
|
||||
return item?.title || item?.summary || tr('overview.event.activity');
|
||||
}
|
||||
|
||||
function captureKindLabel(capture) {
|
||||
const kind = String(capture?.kind || '').toLowerCase();
|
||||
if (kind === 'page') return tr('overview.captureKind.page');
|
||||
if (kind === 'selection') return tr('overview.captureKind.selection');
|
||||
if (kind === 'link') return tr('overview.captureKind.link');
|
||||
if (kind === 'file') return tr('overview.captureKind.file');
|
||||
return tr('overview.captureKind.item');
|
||||
if (type === 'note.saved' || type === 'note.edited') return `Edited note ${quoted(name)}`;
|
||||
if (type === 'note.opened') return `Opened note ${quoted(name)}`;
|
||||
if (type === 'note.created') return `Created note ${quoted(name)}`;
|
||||
if (type === 'file.opened') return `Opened file ${quoted(name)}`;
|
||||
if (type === 'file.changed') return `Changed file ${quoted(name)}`;
|
||||
if (type === 'file.created') return `Created file ${quoted(name)}`;
|
||||
if (type === 'file.deleted' || type === 'file.trashed') return `Removed file ${quoted(name)}`;
|
||||
if (type === 'browser.capture.page') return `Captured page ${quoted(name)}`;
|
||||
if (type === 'browser.capture.selection') return `Captured selection ${quoted(name)}`;
|
||||
if (type === 'browser.capture.link') return `Captured link ${quoted(name)}`;
|
||||
if (type === 'browser.capture.file') return `Captured file ${quoted(name)}`;
|
||||
if (type === 'browser.capture.converted') return `Converted capture ${quoted(name)}`;
|
||||
if (type === 'journal.entry.added' || type === 'worklog.entry.added') return `Added journal entry ${quoted(name)}`;
|
||||
if (type === 'action.started') return 'Work session detected';
|
||||
if (type === 'workspace.opened') return 'Workspace opened';
|
||||
return item?.title || item?.summary || 'Workspace activity';
|
||||
}
|
||||
|
||||
function actionForCategory(category) {
|
||||
|
|
@ -352,7 +320,7 @@
|
|||
id: item.activityId || `${item.type}:${timeValue(item)}`,
|
||||
category,
|
||||
title: activityTitle(item),
|
||||
meta: itemTimeLabel(item),
|
||||
meta: `${itemTimeLabel(item)}${item.sourcePluginId ? ' · ' + item.sourcePluginId.replace('verstak.', '') : ''}`,
|
||||
time: timeValue(item),
|
||||
absolute: absoluteTime(timeValue(item)),
|
||||
actionKind: action.kind,
|
||||
|
|
@ -362,8 +330,8 @@
|
|||
const captureItems = captureRows.map(item => ({
|
||||
id: item.captureId || `capture:${timeValue(item)}`,
|
||||
category: 'captures',
|
||||
title: tr('overview.event.capture', { kind: captureKindLabel(item), title: captureTitle(item) }),
|
||||
meta: `${itemTimeLabel(item)} · ${item.domain || item.url || tr('overview.browserCapture')}`,
|
||||
title: `Captured ${item.kind || 'item'} ${quoted(captureTitle(item))}`,
|
||||
meta: `${itemTimeLabel(item)} · ${item.domain || item.url || 'Browser capture'}`,
|
||||
time: timeValue(item),
|
||||
absolute: absoluteTime(timeValue(item)),
|
||||
actionKind: 'browser-inbox',
|
||||
|
|
@ -372,8 +340,8 @@
|
|||
const journalItems = journalRows.map(item => ({
|
||||
id: item.entryId || `journal:${timeValue(item)}`,
|
||||
category: 'journal',
|
||||
title: tr('overview.event.journalAdded', { name: journalTitle(item) }),
|
||||
meta: `${itemTimeLabel(item)}${item.minutes ? ' · ' + tr('overview.minutes', { count: item.minutes }) : ''}`,
|
||||
title: `Added journal entry ${quoted(journalTitle(item))}`,
|
||||
meta: `${itemTimeLabel(item)}${item.minutes ? ' · ' + item.minutes + ' min' : ''}`,
|
||||
time: timeValue(item),
|
||||
absolute: absoluteTime(timeValue(item)),
|
||||
actionKind: 'journal',
|
||||
|
|
@ -413,8 +381,8 @@
|
|||
const todoCandidates = [...todoRows].sort((a, b) => todoDateMs(todoTimeValue(a)) - todoDateMs(todoTimeValue(b))).map(item => ({
|
||||
id: item.id || `todo:${todoTitle(item)}`,
|
||||
category: 'todo',
|
||||
title: tr('overview.event.todo', { title: todoTitle(item) }),
|
||||
meta: `${todoAttentionState(item)}${item.dueAt ? ` · ${tr('overview.todo.due', { date: item.dueAt })}` : ''}`,
|
||||
title: `Todo ${quoted(todoTitle(item))}`,
|
||||
meta: `${todoAttentionState(item)}${item.dueAt ? ` · Due ${item.dueAt}` : ''}`,
|
||||
time: todoTimeValue(item),
|
||||
absolute: absoluteTime(todoTimeValue(item)),
|
||||
actionKind: 'todo',
|
||||
|
|
@ -423,8 +391,8 @@
|
|||
const captureCandidates = sortByTime(captureRows).map(item => ({
|
||||
id: item.captureId || `capture:${timeValue(item)}`,
|
||||
category: 'captures',
|
||||
title: tr('overview.event.reviewCapture', { title: captureTitle(item) }),
|
||||
meta: `${itemTimeLabel(item)} · ${item.domain || captureKindLabel(item) || tr('overview.browserCapture')}`,
|
||||
title: `Review capture ${quoted(captureTitle(item))}`,
|
||||
meta: `${itemTimeLabel(item)} · ${item.domain || item.kind || 'Browser capture'}`,
|
||||
time: timeValue(item),
|
||||
absolute: absoluteTime(timeValue(item)),
|
||||
actionKind: 'browser-inbox',
|
||||
|
|
@ -439,7 +407,7 @@
|
|||
const journalCandidates = sortByTime(journalRows).map(item => ({
|
||||
id: item.entryId || `journal:${timeValue(item)}`,
|
||||
category: 'journal',
|
||||
title: tr('overview.event.continueJournal', { title: journalTitle(item) }),
|
||||
title: `Continue journal entry ${quoted(journalTitle(item))}`,
|
||||
meta: itemTimeLabel(item),
|
||||
time: timeValue(item),
|
||||
absolute: absoluteTime(timeValue(item)),
|
||||
|
|
@ -453,18 +421,14 @@
|
|||
const captureItems = sortByTime(captureRows).slice(0, 4).map(item => ({
|
||||
id: item.captureId || `capture:${timeValue(item)}`,
|
||||
title: captureTitle(item),
|
||||
meta: `${captureKindLabel(item)} · ${itemTimeLabel(item)}`,
|
||||
meta: `${item.kind || 'capture'} · ${itemTimeLabel(item)}`,
|
||||
actionKind: 'browser-inbox',
|
||||
actionLabel: tr('overview.reviewInbox'),
|
||||
}));
|
||||
const candidateItems = sortByTime(candidates).slice(0, 4).map(item => ({
|
||||
id: item.candidateId || `work-session:${timeValue(item)}`,
|
||||
title: tr('overview.event.possibleJournalEntry'),
|
||||
meta: tr('overview.candidateMeta', {
|
||||
deal: item.workspaceRootPath || workspaceRootPath || tr('overview.unknownDeal'),
|
||||
minutes: item.estimatedMinutes || 0,
|
||||
activities: item.activityCount || (item.activityIds || []).length || 0,
|
||||
}),
|
||||
title: 'Possible journal entry',
|
||||
meta: `Workspace: ${item.workspaceRootPath || workspaceRootPath || 'Unknown'} · ${item.estimatedMinutes || 0} min · ${item.activityCount || (item.activityIds || []).length || 0} activities`,
|
||||
actionKind: 'journal',
|
||||
actionLabel: tr('overview.reviewCandidate'),
|
||||
toolRequest: { type: 'work-session-candidate', candidate: item },
|
||||
|
|
@ -472,7 +436,7 @@
|
|||
const todoItems = [...todoRows].sort((a, b) => todoDateMs(todoTimeValue(a)) - todoDateMs(todoTimeValue(b))).slice(0, 4).map(item => ({
|
||||
id: item.id || `todo:${todoTitle(item)}`,
|
||||
title: todoTitle(item),
|
||||
meta: `${todoAttentionState(item)}${item.dueAt ? ` · ${tr('overview.todo.due', { date: item.dueAt })}` : ''}`,
|
||||
meta: `${todoAttentionState(item)}${item.dueAt ? ` · Due ${item.dueAt}` : ''}`,
|
||||
actionKind: 'todo',
|
||||
actionLabel: tr('overview.openTodos'),
|
||||
}));
|
||||
|
|
@ -513,12 +477,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
async function loadWorkspaceResources(toolState) {
|
||||
async function loadWorkspaceResources() {
|
||||
const workspace = String(workspaceRootPath || '').trim();
|
||||
if (!workspace) return { keyResources: [], totalNotes: 0 };
|
||||
const [rootEntries, notesEntries] = await Promise.all([
|
||||
toolState.files ? listFiles('verstak.files', workspace) : Promise.resolve([]),
|
||||
toolState.notes ? listFiles('verstak.notes', `${workspace}/Notes`) : Promise.resolve([]),
|
||||
listFiles('verstak.files', workspace),
|
||||
listFiles('verstak.notes', `${workspace}/Notes`),
|
||||
]);
|
||||
const noteFiles = notesEntries.filter(item => item?.type === 'file');
|
||||
const overview = [...notesEntries, ...rootEntries].find(item => /(^|\/)overview\.md$/i.test(String(item.relativePath || item.name || '')));
|
||||
|
|
@ -527,54 +491,44 @@
|
|||
keyResources: overview ? [{
|
||||
id: overview.relativePath || overview.name,
|
||||
title: overview.name || fileName(overview.relativePath) || 'Overview.md',
|
||||
meta: overview.relativePath || tr('overview.overviewNote'),
|
||||
actionKind: toolState.notes ? 'notes' : 'files',
|
||||
actionLabel: toolState.notes ? tr('overview.openNotes') : tr('overview.openFiles'),
|
||||
meta: overview.relativePath || 'Workspace overview note',
|
||||
actionKind: hasNotes ? 'notes' : 'files',
|
||||
actionLabel: hasNotes ? tr('overview.openNotes') : tr('overview.openFiles'),
|
||||
}] : [],
|
||||
};
|
||||
}
|
||||
|
||||
async function loadOverview() {
|
||||
const workspaceAtStart = String(workspaceRootPath || '').trim();
|
||||
const toolKeyAtStart = overviewToolKey;
|
||||
const toolState = {
|
||||
notes: hasNotes,
|
||||
files: hasFiles,
|
||||
browserInbox: hasBrowserInbox,
|
||||
activity: hasActivity,
|
||||
journal: hasJournal,
|
||||
todos: hasTodos,
|
||||
};
|
||||
loadedWorkspaceRoot = workspaceAtStart;
|
||||
loadedToolKey = toolKeyAtStart;
|
||||
loading = true;
|
||||
const [browserSettings, activitySettings, activityRecords, journalSettings, todoSettings, resources] = await Promise.all([
|
||||
toolState.browserInbox ? readPluginSettings('verstak.browser-inbox') : Promise.resolve({}),
|
||||
toolState.activity ? readPluginSettings('verstak.activity') : Promise.resolve({}),
|
||||
toolState.activity && App.ReadPluginDataNDJSON
|
||||
readPluginSettings('verstak.browser-inbox'),
|
||||
readPluginSettings('verstak.activity'),
|
||||
App.ReadPluginDataNDJSON
|
||||
? App.ReadPluginDataNDJSON('verstak.activity', 'activity-events')
|
||||
.then(value => decodeTuple(value, []))
|
||||
.catch(() => [])
|
||||
: Promise.resolve([]),
|
||||
toolState.journal ? readPluginSettings('verstak.journal') : Promise.resolve({}),
|
||||
toolState.todos ? readPluginSettings('verstak.todo') : Promise.resolve({}),
|
||||
loadWorkspaceResources(toolState),
|
||||
readPluginSettings('verstak.journal'),
|
||||
readPluginSettings('verstak.todo'),
|
||||
loadWorkspaceResources(),
|
||||
]);
|
||||
if (workspaceAtStart !== String(workspaceRootPath || '').trim() || toolKeyAtStart !== overviewToolKey) return;
|
||||
if (workspaceAtStart !== String(workspaceRootPath || '').trim()) return;
|
||||
|
||||
captures = toolState.browserInbox ? browserCaptureRowsForWorkspace(browserSettings) : [];
|
||||
activityEvents = toolState.activity ? normalizeRows(activityRecords).filter(item => {
|
||||
captures = browserCaptureRowsForWorkspace(browserSettings);
|
||||
activityEvents = normalizeRows(activityRecords).filter(item => {
|
||||
const tagged = String(item.workspaceRootPath || item.workspaceName || item.workspaceNodeId || '').trim();
|
||||
return !tagged || tagged === workspaceAtStart;
|
||||
}) : [];
|
||||
journalEntries = toolState.journal ? rowsFor(journalSettings, [
|
||||
});
|
||||
journalEntries = rowsFor(journalSettings, [
|
||||
workspaceKey('worklog:workspace:'),
|
||||
'worklog',
|
||||
]) : [];
|
||||
todos = toolState.todos ? todoRowsForWorkspace(todoSettings) : [];
|
||||
workSessionCandidates = toolState.activity && toolState.journal ? rowsFor(activitySettings, [
|
||||
]);
|
||||
todos = todoRowsForWorkspace(todoSettings);
|
||||
workSessionCandidates = rowsFor(activitySettings, [
|
||||
workspaceKey('work-session-candidates:workspace:'),
|
||||
]) : [];
|
||||
]);
|
||||
keyResources = resources.keyResources;
|
||||
totalNotes = resources.totalNotes;
|
||||
loading = false;
|
||||
|
|
@ -703,7 +657,7 @@
|
|||
</main>
|
||||
|
||||
<aside class="overview-side">
|
||||
{#if hasAttentionTools && (needsAttention.length || !loading)}
|
||||
{#if needsAttention.length || !loading}
|
||||
<section class="today-panel overview-panel" data-overview-section="attention">
|
||||
<div class="today-panel-head overview-panel-head">
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -18,12 +18,6 @@
|
|||
void activeLocale;
|
||||
return i18n.t(key, params, fallback);
|
||||
})(locale);
|
||||
|
||||
function reportError(key, fallback, details) {
|
||||
console.warn('[VaultSelection] operation failed:', details);
|
||||
return tr(key, undefined, fallback);
|
||||
}
|
||||
|
||||
onDestroy(unsubscribeLocale);
|
||||
|
||||
onMount(async () => {
|
||||
|
|
@ -60,13 +54,13 @@
|
|||
try {
|
||||
const createErr = await App.CreateVault(newVaultPath.trim());
|
||||
if (createErr) {
|
||||
error = reportError('vaultSelection.createError', 'Could not create the vault. Please try again.', createErr);
|
||||
error = tr('vaultSelection.createError', { error: createErr });
|
||||
creating = false;
|
||||
return;
|
||||
}
|
||||
const openErr = await App.OpenVault(newVaultPath.trim());
|
||||
if (openErr) {
|
||||
error = reportError('vaultSelection.openError', 'Could not open the vault. Please try again.', openErr);
|
||||
error = tr('vaultSelection.openError', { error: openErr });
|
||||
creating = false;
|
||||
return;
|
||||
}
|
||||
|
|
@ -76,7 +70,7 @@
|
|||
}
|
||||
window.dispatchEvent(new CustomEvent('verstak:vault-opened'));
|
||||
} catch (e) {
|
||||
error = reportError('vaultSelection.createError', 'Could not create the vault. Please try again.', e);
|
||||
error = String(e);
|
||||
creating = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -91,7 +85,7 @@
|
|||
try {
|
||||
const openErr = await App.OpenVault(openVaultPath.trim());
|
||||
if (openErr) {
|
||||
error = reportError('vaultSelection.openError', 'Could not open the vault. Please try again.', openErr);
|
||||
error = tr('vaultSelection.openError', { error: openErr });
|
||||
opening = false;
|
||||
return;
|
||||
}
|
||||
|
|
@ -101,7 +95,7 @@
|
|||
}
|
||||
window.dispatchEvent(new CustomEvent('verstak:vault-opened'));
|
||||
} catch (e) {
|
||||
error = reportError('vaultSelection.openError', 'Could not open the vault. Please try again.', e);
|
||||
error = String(e);
|
||||
opening = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -112,7 +106,7 @@
|
|||
try {
|
||||
const openErr = await App.OpenVault(path);
|
||||
if (openErr) {
|
||||
error = reportError('vaultSelection.openError', 'Could not open the vault. Please try again.', openErr);
|
||||
error = tr('vaultSelection.openError', { error: openErr });
|
||||
opening = false;
|
||||
return;
|
||||
}
|
||||
|
|
@ -122,7 +116,7 @@
|
|||
}
|
||||
window.dispatchEvent(new CustomEvent('verstak:vault-opened'));
|
||||
} catch (e) {
|
||||
error = reportError('vaultSelection.openError', 'Could not open the vault. Please try again.', e);
|
||||
error = String(e);
|
||||
opening = false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
$: requestContext = openedResource?.request?.context?.notesMode || openedResource?.request?.context?.isInsideNotesFolder
|
||||
? 'notes-markdown'
|
||||
: ((openedResource?.request?.extension === '.md' || openedResource?.request?.extension === '.markdown') ? 'generic-markdown' : 'generic-text');
|
||||
$: resourceTitle = resourceDisplayTitle(resourcePath, requestContext);
|
||||
$: componentProps = openedResource || {};
|
||||
$: mountKey = [
|
||||
providerPluginId,
|
||||
|
|
@ -32,11 +31,6 @@
|
|||
requestContext,
|
||||
].join(':');
|
||||
|
||||
function resourceDisplayTitle(path, context) {
|
||||
const fileName = String(path || '').split('/').filter(Boolean).pop() || String(path || '');
|
||||
return context === 'notes-markdown' ? fileName.replace(/\.(md|markdown)$/i, '') : fileName;
|
||||
}
|
||||
|
||||
function closeWorkbench() {
|
||||
window.dispatchEvent(new CustomEvent('verstak:close-workbench', { cancelable: true }));
|
||||
}
|
||||
|
|
@ -47,7 +41,7 @@
|
|||
<div class="workbench-host vt-page">
|
||||
{#if openedResource?.status === 'no-provider'}
|
||||
<div class="workbench-header vt-page-header">
|
||||
<span class="workbench-title vt-page-title">{resourceTitle}</span>
|
||||
<span class="workbench-title vt-page-title">{resourcePath}</span>
|
||||
<span class="workbench-provider vt-badge">{tr('workbench.noProvider')}</span>
|
||||
<button class="close-btn btn-ghost btn-icon" type="button" title={tr('common.close')} aria-label={tr('common.close')} on:click={closeWorkbench}>
|
||||
<Icon name="x" size={18} />
|
||||
|
|
@ -55,13 +49,11 @@
|
|||
</div>
|
||||
<div class="workbench-empty no-provider vt-empty-state" data-workbench-status="no-provider">
|
||||
<p class="vt-empty-title">{tr('workbench.noViewer')}</p>
|
||||
{#if debug.isEnabled()}
|
||||
<p class="workbench-meta">{requestMode} · {requestContext}</p>
|
||||
{/if}
|
||||
<p class="workbench-meta">{requestMode} · {requestContext}</p>
|
||||
</div>
|
||||
{:else if openedResource}
|
||||
<div class="workbench-header vt-page-header">
|
||||
<span class="workbench-title vt-page-title">{resourceTitle}</span>
|
||||
<span class="workbench-title vt-page-title">{resourcePath}</span>
|
||||
{#if debug.isEnabled() && providerId}
|
||||
<span class="workbench-provider vt-badge accent" data-debug-provider>{providerId}</span>
|
||||
{/if}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
$: workspaceRootPath = selectedWorkspace?.rootPath || selectedWorkspace?.name || selectedWorkspace?.id || '';
|
||||
$: workspaceId = selectedWorkspace?.workspaceId || '';
|
||||
$: workspaceTitle = selectedWorkspace?.title || selectedWorkspace?.name || selectedWorkspace?.id || selectedWorkspaceName;
|
||||
$: workspaceType = selectedWorkspace?.type || 'workspace';
|
||||
$: if (workspaceRootPath !== metadataWorkspaceRoot) {
|
||||
metadataWorkspaceRoot = workspaceRootPath;
|
||||
workspaceMetadata = null;
|
||||
|
|
@ -79,13 +80,11 @@
|
|||
if (changed && selectedWorkspaceName) loadTools();
|
||||
});
|
||||
window.addEventListener('verstak:workspace-open-tool', handleWorkspaceOpenTool);
|
||||
window.addEventListener('verstak:plugins-changed', handlePluginsChanged);
|
||||
});
|
||||
|
||||
onDestroy(() => {
|
||||
if (unsubscribeLocale) unsubscribeLocale();
|
||||
window.removeEventListener('verstak:workspace-open-tool', handleWorkspaceOpenTool);
|
||||
window.removeEventListener('verstak:plugins-changed', handlePluginsChanged);
|
||||
});
|
||||
|
||||
function toolKey(tool) {
|
||||
|
|
@ -171,10 +170,6 @@
|
|||
requestWorkspaceTool(event?.detail?.kind, event?.detail?.toolRequest || null);
|
||||
}
|
||||
|
||||
function handlePluginsChanged() {
|
||||
if (selectedWorkspaceName) loadTools();
|
||||
}
|
||||
|
||||
async function loadTools() {
|
||||
try {
|
||||
toolsLoaded = false;
|
||||
|
|
@ -206,6 +201,7 @@
|
|||
<div class="workspace-header vt-page-header">
|
||||
<div class="workspace-title-group">
|
||||
<span class="workspace-title vt-page-title">{workspaceTitle}</span>
|
||||
<span class="workspace-type vt-badge accent">{workspaceType}</span>
|
||||
</div>
|
||||
<div class="workspace-search" aria-label={tr('workspace.search')}>
|
||||
<GlobalSearch />
|
||||
|
|
@ -292,6 +288,14 @@
|
|||
font-weight: 600;
|
||||
}
|
||||
|
||||
.workspace-type {
|
||||
color: var(--vt-color-accent);
|
||||
font-size: 0.75rem;
|
||||
padding: 0.1rem 0.4rem;
|
||||
border-radius: var(--vt-radius-sm);
|
||||
background: var(--vt-color-accent-muted);
|
||||
}
|
||||
|
||||
.workspace-search {
|
||||
width: min(27rem, 46vw);
|
||||
min-width: 16rem;
|
||||
|
|
|
|||
|
|
@ -13,35 +13,25 @@
|
|||
let loading = true;
|
||||
let localError = '';
|
||||
let workspaces = [];
|
||||
let treeNodes = [];
|
||||
let currentWorkspaceId = '';
|
||||
let showCreate = false;
|
||||
let newWorkspaceName = '';
|
||||
let workspaceTemplates = [];
|
||||
let templatePluginNames = {};
|
||||
let templatePlugins = {};
|
||||
let templateCapabilities = new Set();
|
||||
let selectedTemplateId = 'default';
|
||||
let createError = '';
|
||||
let templateWarning = null;
|
||||
let templatesLoading = false;
|
||||
let creating = false;
|
||||
let renamingId = '';
|
||||
let renameValue = '';
|
||||
let busyId = '';
|
||||
let expandedFolders = {};
|
||||
let parentFolderPath = '';
|
||||
let locale = i18n.getLocale();
|
||||
let unsubscribeLocale = null;
|
||||
|
||||
$: tr = ((activeLocale) => (key, params, fallback) => {
|
||||
void activeLocale;
|
||||
return i18n.t(key, params, fallback);
|
||||
})(locale);
|
||||
|
||||
function reportError(key, fallback, details) {
|
||||
console.warn('[WorkspaceTree] operation failed:', details);
|
||||
return tr(key, undefined, fallback);
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
unsubscribeLocale = i18n.subscribe((nextLocale) => {
|
||||
const changed = locale !== nextLocale;
|
||||
|
|
@ -71,167 +61,64 @@
|
|||
}
|
||||
|
||||
$: selectedTemplate = workspaceTemplates.find(template => template.id === selectedTemplateId) || workspaceTemplates[0] || null;
|
||||
$: selectedTemplateTools = (selectedTemplate?.workspaceTools || []).map((pluginId) => (
|
||||
templateToolState(pluginId, templatePlugins, templateCapabilities, templatePluginNames, tr)
|
||||
));
|
||||
$: selectedTemplateIssues = selectedTemplateTools.filter(tool => tool.status !== 'available');
|
||||
|
||||
function toolLabel(pluginId, names = templatePluginNames) {
|
||||
return names[pluginId] || String(pluginId || '').replace(/^verstak\./, '');
|
||||
}
|
||||
|
||||
function templateToolState(pluginId, plugins, capabilities, names, translate) {
|
||||
const plugin = plugins[pluginId];
|
||||
if (!plugin) {
|
||||
return { pluginId, name: toolLabel(pluginId, names), tabs: [], status: 'unavailable', reason: translate('workspaceTree.templateMissingPlugin') };
|
||||
}
|
||||
const manifest = plugin.manifest || {};
|
||||
const tabs = Array.isArray(manifest.contributes?.workspaceItems) ? manifest.contributes.workspaceItems.map(item => item?.title || item?.id).filter(Boolean) : [];
|
||||
const pluginStatus = String(plugin.status || '').toLowerCase();
|
||||
const missingCapability = Array.isArray(manifest.requires) && manifest.requires.some(capabilityId => !capabilities.has(capabilityId));
|
||||
let status = 'available';
|
||||
let reason = translate('workspaceTree.templateAvailable');
|
||||
if (!plugin.enabled || pluginStatus === 'disabled') { status = 'unavailable'; reason = translate('workspaceTree.templatePluginDisabled'); }
|
||||
else if (pluginStatus === 'missing-required-capability' || missingCapability) { status = 'unavailable'; reason = translate('workspaceTree.templateCapabilityUnavailable'); }
|
||||
else if (pluginStatus === 'incompatible') { status = 'unavailable'; reason = translate('workspaceTree.templateIncompatible'); }
|
||||
else if (pluginStatus === 'failed') { status = 'unavailable'; reason = translate('workspaceTree.templateLoadFailed'); }
|
||||
else if (pluginStatus === 'degraded') { status = 'limited'; reason = translate('workspaceTree.templateLimited'); }
|
||||
else if (pluginStatus !== 'loaded') { status = 'unavailable'; reason = translate('workspaceTree.templateNotReady'); }
|
||||
return { pluginId, name: manifest.name || toolLabel(pluginId, names), tabs, status, reason };
|
||||
function toolLabel(pluginId) {
|
||||
return templatePluginNames[pluginId] || String(pluginId || '').replace(/^verstak\./, '');
|
||||
}
|
||||
|
||||
async function loadWorkspaceTemplates() {
|
||||
templatesLoading = true;
|
||||
try {
|
||||
const [templates, plugins, capabilities] = await Promise.all([
|
||||
const [templates, plugins] = await Promise.all([
|
||||
App.ListWorkspaceTemplates ? App.ListWorkspaceTemplates() : [],
|
||||
App.GetPlugins ? App.GetPlugins() : [],
|
||||
App.GetCapabilities ? App.GetCapabilities() : [],
|
||||
]);
|
||||
const [list, err] = resultOrError(templates, []);
|
||||
if (err) { createError = reportError('workspaceTree.templatesError', 'Could not load Deal templates.', err); workspaceTemplates = []; return; }
|
||||
if (err) {
|
||||
createError = err;
|
||||
workspaceTemplates = [];
|
||||
return;
|
||||
}
|
||||
workspaceTemplates = Array.isArray(list) ? list : [];
|
||||
await Promise.all((Array.isArray(plugins) ? plugins : []).map((plugin) => i18n.loadPlugin(plugin.manifest?.id, plugin.manifest?.localization).catch(() => {})));
|
||||
const localizedPlugins = (Array.isArray(plugins) ? plugins : []).map((plugin) => i18n.localizePlugin(plugin));
|
||||
templatePluginNames = localizedPlugins.reduce((names, plugin) => { const id = plugin?.manifest?.id; const name = plugin?.manifest?.name; if (id && name) names[id] = name; return names; }, {});
|
||||
templatePlugins = localizedPlugins.reduce((result, plugin) => { const id = plugin?.manifest?.id; if (id) result[id] = plugin; return result; }, {});
|
||||
const [capabilityList] = resultOrError(capabilities, []);
|
||||
templateCapabilities = new Set((Array.isArray(capabilityList) ? capabilityList : []).map(capability => capability?.name).filter(Boolean));
|
||||
if (!workspaceTemplates.some(template => template.id === selectedTemplateId)) selectedTemplateId = workspaceTemplates[0]?.id || '';
|
||||
} catch (error) { createError = reportError('workspaceTree.templatesError', 'Could not load Deal templates.', error); workspaceTemplates = []; }
|
||||
finally { templatesLoading = false; }
|
||||
await Promise.all((Array.isArray(plugins) ? plugins : []).map((plugin) => (
|
||||
i18n.loadPlugin(plugin.manifest?.id, plugin.manifest?.localization).catch(() => {})
|
||||
)));
|
||||
templatePluginNames = (Array.isArray(plugins) ? plugins : []).map((plugin) => i18n.localizePlugin(plugin)).reduce((names, plugin) => {
|
||||
const id = plugin?.manifest?.id;
|
||||
const name = plugin?.manifest?.name;
|
||||
if (id && name) names[id] = name;
|
||||
return names;
|
||||
}, {});
|
||||
if (!workspaceTemplates.some(template => template.id === selectedTemplateId)) {
|
||||
selectedTemplateId = workspaceTemplates[0]?.id || '';
|
||||
}
|
||||
} catch (error) {
|
||||
createError = String(error);
|
||||
workspaceTemplates = [];
|
||||
} finally {
|
||||
templatesLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
function wsName(workspace) {
|
||||
return String(workspace?.name || workspace?.path || '');
|
||||
return String(workspace?.name || workspace?.rootPath || '');
|
||||
}
|
||||
|
||||
function wsPath(workspace) {
|
||||
return String(workspace?.path || workspace?.rootPath || '');
|
||||
}
|
||||
|
||||
function buildTreeNodes(list) {
|
||||
const nodes = [];
|
||||
const nodeMap = {};
|
||||
const folders = [];
|
||||
|
||||
// Collect all nodes: workspaces + folder nodes from GetTree
|
||||
// First try the tree from GetTree if available
|
||||
if (treeNodes.length > 0) {
|
||||
const folderMap = {};
|
||||
const wsMap = {};
|
||||
for (const node of treeNodes) {
|
||||
if (node.type === 'folder') {
|
||||
folders.push(node);
|
||||
folderMap[node.id] = node;
|
||||
} else if (node.type === 'space') {
|
||||
wsMap[node.id] = node;
|
||||
}
|
||||
}
|
||||
// Match workspaces to their parent folders
|
||||
const result = [];
|
||||
for (const ws of list) {
|
||||
const path = wsPath(ws);
|
||||
const tn = wsMap[path];
|
||||
result.push({
|
||||
id: path,
|
||||
type: 'space',
|
||||
title: wsName(ws),
|
||||
name: wsName(ws),
|
||||
path: path,
|
||||
rootPath: path,
|
||||
parentId: tn?.parentId || null,
|
||||
status: 'active',
|
||||
order: tn?.order || 0,
|
||||
workspace: ws,
|
||||
});
|
||||
}
|
||||
for (const folder of folders) {
|
||||
result.push({
|
||||
id: folder.id,
|
||||
type: 'folder',
|
||||
title: folder.title,
|
||||
name: folder.title,
|
||||
path: folder.path || folder.id,
|
||||
parentId: folder.parentId || null,
|
||||
status: 'active',
|
||||
order: folder.order || 0,
|
||||
folder: folder,
|
||||
});
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Fallback: build flat tree from workspace paths
|
||||
const visibleFolders = new Set();
|
||||
for (const ws of list) {
|
||||
const path = wsPath(ws);
|
||||
const parts = path.split('/');
|
||||
const name = parts[parts.length - 1];
|
||||
const parentId = parts.length > 1 ? parts.slice(0, -1).join('/') : null;
|
||||
|
||||
// Ensure all parent folders exist
|
||||
if (parentId) {
|
||||
let current = '';
|
||||
for (let i = 0; i < parts.length - 1; i++) {
|
||||
current = current ? current + '/' + parts[i] : parts[i];
|
||||
if (!visibleFolders.has(current)) {
|
||||
visibleFolders.add(current);
|
||||
nodes.push({
|
||||
id: current,
|
||||
type: 'folder',
|
||||
title: parts[i],
|
||||
name: parts[i],
|
||||
path: current,
|
||||
parentId: i > 0 ? parts.slice(0, i).join('/') : null,
|
||||
status: 'active',
|
||||
order: 0,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nodes.push({
|
||||
id: path,
|
||||
type: 'space',
|
||||
title: name,
|
||||
name: name,
|
||||
path: path,
|
||||
rootPath: path,
|
||||
parentId: parentId,
|
||||
status: 'active',
|
||||
order: nodes.length,
|
||||
workspace: ws,
|
||||
});
|
||||
}
|
||||
return nodes;
|
||||
function asNode(workspace, order) {
|
||||
const name = wsName(workspace);
|
||||
return {
|
||||
id: name,
|
||||
type: 'space',
|
||||
title: name,
|
||||
name,
|
||||
rootPath: workspace.rootPath || name,
|
||||
status: 'active',
|
||||
order,
|
||||
};
|
||||
}
|
||||
|
||||
function nodesForEvent() {
|
||||
return workspaces.map((ws, i) => ({
|
||||
id: wsPath(ws), type: 'space', title: wsName(ws),
|
||||
name: wsName(ws), rootPath: wsPath(ws), status: 'active', order: i,
|
||||
}));
|
||||
return workspaces.map(asNode);
|
||||
}
|
||||
|
||||
async function loadWorkspaces() {
|
||||
|
|
@ -239,142 +126,138 @@
|
|||
localError = '';
|
||||
try {
|
||||
const [list, err] = resultOrError(await App.ListWorkspaces(), []);
|
||||
if (err) { localError = reportError('workspaceTree.loadError', 'Could not load Deals.', err); workspaces = []; }
|
||||
else { workspaces = list || []; }
|
||||
|
||||
// Try to get tree nodes
|
||||
try {
|
||||
const tree = await App.GetWorkspaceTree();
|
||||
if (tree && tree.nodes) treeNodes = tree.nodes;
|
||||
} catch { treeNodes = []; }
|
||||
|
||||
const allNodes = buildTreeNodes(workspaces);
|
||||
|
||||
if (!currentWorkspaceId) {
|
||||
let currentWorkspace = null;
|
||||
try { currentWorkspace = await App.GetCurrentWorkspace(); } catch { currentWorkspace = null; }
|
||||
const currentPath = currentWorkspace?.path || currentWorkspace?.rootPath || '';
|
||||
if (allNodes.some(n => n.id === currentPath)) currentWorkspaceId = currentPath;
|
||||
} else if (!allNodes.some(n => n.id === currentWorkspaceId)) {
|
||||
currentWorkspaceId = '';
|
||||
if (err) {
|
||||
localError = err;
|
||||
workspaces = [];
|
||||
} else {
|
||||
workspaces = list || [];
|
||||
if (!currentWorkspaceId) {
|
||||
let currentWorkspace = null;
|
||||
try {
|
||||
currentWorkspace = await App.GetCurrentWorkspace();
|
||||
} catch {
|
||||
currentWorkspace = null;
|
||||
}
|
||||
const currentName = wsName(currentWorkspace);
|
||||
if (workspaces.some((ws) => wsName(ws) === currentName)) {
|
||||
currentWorkspaceId = currentName;
|
||||
}
|
||||
} else if (!workspaces.some((ws) => wsName(ws) === currentWorkspaceId)) {
|
||||
currentWorkspaceId = '';
|
||||
}
|
||||
activeWorkspaceId.set(currentWorkspaceId);
|
||||
}
|
||||
activeWorkspaceId.set(currentWorkspaceId);
|
||||
workspaces = allNodes;
|
||||
} catch (e) { localError = reportError('workspaceTree.loadError', 'Could not load Deals.', e); }
|
||||
} catch (e) {
|
||||
localError = String(e);
|
||||
}
|
||||
loading = false;
|
||||
}
|
||||
|
||||
function getChildren(parentId) {
|
||||
const id = parentId || null;
|
||||
return workspaces.filter(n => (n.parentId || null) === id).sort((a, b) => {
|
||||
if (a.type === 'folder' && b.type !== 'folder') return -1;
|
||||
if (a.type !== 'folder' && b.type === 'folder') return 1;
|
||||
return (a.order || 0) - (b.order || 0) || a.title.localeCompare(b.title);
|
||||
});
|
||||
}
|
||||
|
||||
function isExpanded(node) {
|
||||
if (node.type !== 'folder') return false;
|
||||
if (expandedFolders[node.id] !== undefined) return expandedFolders[node.id];
|
||||
return true; // default expanded
|
||||
}
|
||||
|
||||
function toggleFolder(node) {
|
||||
expandedFolders[node.id] = !isExpanded(node);
|
||||
expandedFolders = expandedFolders; // trigger reactivity
|
||||
}
|
||||
|
||||
async function selectWorkspace(node) {
|
||||
const id = node.id;
|
||||
async function selectWorkspace(workspace) {
|
||||
const id = wsName(workspace);
|
||||
const err = await App.SetCurrentWorkspace(id);
|
||||
if (err) { localError = reportError('workspaceTree.selectError', 'Could not select this Deal.', err); return; }
|
||||
if (err) {
|
||||
localError = err;
|
||||
return;
|
||||
}
|
||||
currentWorkspaceId = id;
|
||||
activeWorkspaceId.set(id);
|
||||
window.dispatchEvent(new CustomEvent('verstak:workspace-selected', {
|
||||
detail: { workspaceName: id, workspacePath: id, nodes: nodesForEvent() }
|
||||
detail: { workspaceName: id, nodes: nodesForEvent() }
|
||||
}));
|
||||
}
|
||||
|
||||
function buildCreatePath() {
|
||||
const name = newWorkspaceName.trim();
|
||||
if (parentFolderPath) return parentFolderPath + '/' + name;
|
||||
return name;
|
||||
}
|
||||
|
||||
async function doCreate() {
|
||||
const name = newWorkspaceName.trim();
|
||||
if (!name) { createError = tr('workspaceTree.nameRequired'); return; }
|
||||
if (!selectedTemplate) { createError = tr('workspaceTree.chooseTemplate'); return; }
|
||||
const path = buildCreatePath();
|
||||
if (!name) {
|
||||
createError = tr('workspaceTree.nameRequired');
|
||||
return;
|
||||
}
|
||||
if (!selectedTemplate) {
|
||||
createError = tr('workspaceTree.chooseTemplate');
|
||||
return;
|
||||
}
|
||||
creating = true;
|
||||
createError = '';
|
||||
const [, err] = resultOrError(await App.CreateWorkspace(path, selectedTemplate.id), null);
|
||||
if (err) { createError = reportError('workspaceTree.createError', 'Could not create the Deal.', err); creating = false; return; }
|
||||
const [, err] = resultOrError(await App.CreateWorkspace(name, selectedTemplate.id), null);
|
||||
if (err) {
|
||||
createError = err;
|
||||
creating = false;
|
||||
return;
|
||||
}
|
||||
showCreate = false;
|
||||
newWorkspaceName = '';
|
||||
parentFolderPath = '';
|
||||
creating = false;
|
||||
await loadWorkspaces();
|
||||
const created = workspaces.find((ws) => ws.id === path);
|
||||
const created = workspaces.find((ws) => wsName(ws) === name);
|
||||
if (created) await selectWorkspace(created);
|
||||
const creationIssues = selectedTemplateIssues.map(tool => ({ pluginId: tool.pluginId, name: tool.name, reason: tool.reason }));
|
||||
templateWarning = creationIssues.length > 0 ? { workspaceName: name, issues: creationIssues } : null;
|
||||
}
|
||||
|
||||
async function openCreateDialog() {
|
||||
function openCreateDialog() {
|
||||
showCreate = true;
|
||||
newWorkspaceName = '';
|
||||
parentFolderPath = '';
|
||||
createError = '';
|
||||
await loadWorkspaceTemplates();
|
||||
if (!workspaceTemplates.length && !templatesLoading) loadWorkspaceTemplates();
|
||||
}
|
||||
|
||||
function closeCreateDialog() {
|
||||
if (creating) return;
|
||||
showCreate = false;
|
||||
newWorkspaceName = '';
|
||||
parentFolderPath = '';
|
||||
createError = '';
|
||||
}
|
||||
|
||||
function dismissTemplateWarning() { templateWarning = null; }
|
||||
|
||||
function startRename(node) {
|
||||
busyId = node.id;
|
||||
// For rename, we store the full path but edit just the name part
|
||||
// Actually, let's keep rename simple: edit the last segment
|
||||
function startRename(workspace) {
|
||||
renamingId = wsName(workspace);
|
||||
renameValue = renamingId;
|
||||
localError = '';
|
||||
}
|
||||
|
||||
function cancelRename() { }
|
||||
function cancelRename() {
|
||||
renamingId = '';
|
||||
renameValue = '';
|
||||
}
|
||||
|
||||
async function commitRename() { }
|
||||
async function commitRename(workspace) {
|
||||
const oldName = wsName(workspace);
|
||||
const newName = renameValue.trim();
|
||||
if (!newName || newName === oldName) {
|
||||
cancelRename();
|
||||
return;
|
||||
}
|
||||
busyId = oldName;
|
||||
const err = await App.RenameWorkspace(oldName, newName);
|
||||
if (err) {
|
||||
localError = err;
|
||||
busyId = '';
|
||||
return;
|
||||
}
|
||||
renamingId = '';
|
||||
renameValue = '';
|
||||
busyId = '';
|
||||
currentWorkspaceId = newName;
|
||||
await loadWorkspaces();
|
||||
const renamed = workspaces.find((ws) => wsName(ws) === newName);
|
||||
if (renamed) await selectWorkspace(renamed);
|
||||
}
|
||||
|
||||
async function trashWorkspace(node) {
|
||||
const path = node.id;
|
||||
busyId = path;
|
||||
const [, err] = resultOrError(await App.TrashWorkspace(path), null);
|
||||
if (err) { localError = reportError('workspaceTree.trashError', 'Could not move to trash.', err); busyId = ''; return; }
|
||||
if (currentWorkspaceId === path) currentWorkspaceId = '';
|
||||
async function trashWorkspace(workspace) {
|
||||
const name = wsName(workspace);
|
||||
busyId = name;
|
||||
const [, err] = resultOrError(await App.TrashWorkspace(name), null);
|
||||
if (err) {
|
||||
localError = err;
|
||||
busyId = '';
|
||||
return;
|
||||
}
|
||||
if (currentWorkspaceId === name) currentWorkspaceId = '';
|
||||
busyId = '';
|
||||
await loadWorkspaces();
|
||||
if (currentWorkspaceId) {
|
||||
const selected = workspaces.find((ws) => ws.id === currentWorkspaceId);
|
||||
const selected = workspaces.find((ws) => wsName(ws) === currentWorkspaceId);
|
||||
if (selected) await selectWorkspace(selected);
|
||||
}
|
||||
}
|
||||
|
||||
// Available parent folders for create dialog
|
||||
$: parentFolderOptions = getFolderOptions();
|
||||
|
||||
function getFolderOptions() {
|
||||
const opts = [{ id: '', name: tr('workspaceTree.rootFolder') || '(root)' }];
|
||||
for (const node of workspaces) {
|
||||
if (node.type === 'folder') {
|
||||
opts.push({ id: node.id, name: node.id });
|
||||
}
|
||||
}
|
||||
return opts;
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="wt">
|
||||
|
|
@ -390,74 +273,50 @@
|
|||
{/if}
|
||||
|
||||
<div class="wt-list">
|
||||
{#each getChildren(null) as node (node.id)}
|
||||
{#if node.type === 'folder'}
|
||||
{@const expanded = isExpanded(node)}
|
||||
<div class="wt-folder">
|
||||
<div class="wt-row wt-folder-row" on:click={() => toggleFolder(node)}>
|
||||
<span class="wt-chevron">{expanded ? '▾' : '▸'}</span>
|
||||
<span class="wt-icon"><Icon name="folder" size={13} /></span>
|
||||
<span class="wt-label wt-folder-label">{node.title}</span>
|
||||
</div>
|
||||
{#if expanded}
|
||||
{#each getChildren(node.id) as child (child.id)}
|
||||
<div class="wt-node vt-list-row" class:selected={child.id === $activeWorkspaceId} style="padding-left: 1.2rem;">
|
||||
<div class="wt-row">
|
||||
<span class="wt-icon"><Icon name="space" size={13} class="wt-node-icon" /></span>
|
||||
<button class="wt-label" on:click={() => selectWorkspace(child)} type="button">{child.title}</button>
|
||||
<button class="wt-icon-btn danger" on:click={() => trashWorkspace(child)} title={tr('workspaceTree.trash')} type="button" disabled={busyId === child.id}>
|
||||
<Icon name="trash" size={12} />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
{/if}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="wt-node vt-list-row" class:selected={node.id === $activeWorkspaceId}>
|
||||
<div class="wt-row">
|
||||
<span class="wt-icon"><Icon name="space" size={13} class="wt-node-icon" /></span>
|
||||
<button class="wt-label" on:click={() => selectWorkspace(node)} type="button">{node.title}</button>
|
||||
<button class="wt-icon-btn danger" on:click={() => trashWorkspace(node)} title={tr('workspaceTree.trash')} type="button" disabled={busyId === node.id}>
|
||||
{#each workspaces as workspace (wsName(workspace))}
|
||||
{@const id = wsName(workspace)}
|
||||
<div class="wt-node vt-list-row" class:selected={id === $activeWorkspaceId}>
|
||||
<div class="wt-row">
|
||||
<span class="wt-icon"><Icon name="space" size={13} class="wt-node-icon" /></span>
|
||||
{#if renamingId === id}
|
||||
<input
|
||||
class="wt-rename"
|
||||
bind:value={renameValue}
|
||||
disabled={busyId === id}
|
||||
on:keydown={(e) => {
|
||||
if (e.key === 'Enter') commitRename(workspace);
|
||||
if (e.key === 'Escape') cancelRename();
|
||||
}}
|
||||
/>
|
||||
<button class="wt-btn wt-btn-small wt-always" on:click={() => commitRename(workspace)} title={tr('workspaceTree.saveRename')} type="button" disabled={busyId === id}>OK</button>
|
||||
<button class="wt-btn wt-btn-small wt-always" on:click={cancelRename} title={tr('common.cancel')} type="button" disabled={busyId === id}>{tr('common.cancel')}</button>
|
||||
{:else}
|
||||
<button class="wt-label" on:click={() => selectWorkspace(workspace)} type="button">{id}</button>
|
||||
<button class="wt-icon-btn" on:click={() => startRename(workspace)} title={tr('workspaceTree.rename')} type="button" disabled={busyId === id}>
|
||||
<Icon name="edit" size={12} />
|
||||
</button>
|
||||
<button class="wt-icon-btn danger" on:click={() => trashWorkspace(workspace)} title={tr('workspaceTree.trash')} type="button" disabled={busyId === id}>
|
||||
<Icon name="trash" size={12} />
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
{#if templateWarning}
|
||||
<section class="workspace-template-warning" data-workspace-template-warning role="alert">
|
||||
<div>
|
||||
<strong>{tr('workspaceTree.templateIncompleteCreated', { name: templateWarning.workspaceName })}</strong>
|
||||
{#each templateWarning.issues as issue (issue.pluginId)}
|
||||
<div class="workspace-template-warning-item">{issue.name}: {issue.reason}</div>
|
||||
{/each}
|
||||
</div>
|
||||
<button class="wt-btn" type="button" on:click={dismissTemplateWarning} title={tr('common.close')}>{tr('common.close')}</button>
|
||||
</section>
|
||||
{/if}
|
||||
|
||||
{#if showCreate}
|
||||
<div class="workspace-create-overlay" data-workspace-create-modal role="dialog" aria-modal="true" aria-label={tr('workspaceTree.create')}>
|
||||
<div class="workspace-create-modal">
|
||||
<div class="workspace-create-header">
|
||||
<div><h2>{tr('workspaceTree.new')}</h2></div>
|
||||
<div>
|
||||
<h2>{tr('workspaceTree.new')}</h2>
|
||||
</div>
|
||||
<button class="wt-btn" on:click={closeCreateDialog} type="button" disabled={creating}>{tr('common.close')}</button>
|
||||
</div>
|
||||
<label class="workspace-create-field">
|
||||
<span>{tr('pluginCard.name')}</span>
|
||||
<input data-workspace-name type="text" bind:value={newWorkspaceName} placeholder={tr('workspaceTree.namePlaceholder')} disabled={creating} on:keydown={(event) => event.key === 'Enter' && doCreate()} />
|
||||
</label>
|
||||
<label class="workspace-create-field">
|
||||
<span>{tr('workspaceTree.parentFolder') || 'Parent folder'}</span>
|
||||
<select data-workspace-parent bind:value={parentFolderPath} disabled={creating}>
|
||||
{#each parentFolderOptions as opt (opt.id)}
|
||||
<option value={opt.id}>{opt.name}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</label>
|
||||
<label class="workspace-create-field">
|
||||
<span>{tr('workspaceTree.template')}</span>
|
||||
<select data-workspace-template bind:value={selectedTemplateId} disabled={creating || templatesLoading || !workspaceTemplates.length}>
|
||||
|
|
@ -470,17 +329,10 @@
|
|||
<div class="workspace-template-summary">
|
||||
<p data-workspace-template-description>{selectedTemplate.description}</p>
|
||||
<div class="workspace-template-tools" data-workspace-template-tools>
|
||||
{#each selectedTemplateTools as tool (tool.pluginId)}
|
||||
<div class="workspace-template-tool" class:limited={tool.status === 'limited'} class:unavailable={tool.status === 'unavailable'} data-workspace-template-tool={tool.pluginId} data-template-tool-status={tool.status}>
|
||||
<span class="workspace-template-tool-name">{tool.name}</span>
|
||||
<span class="workspace-template-tool-tabs">{tool.tabs.length ? tr('workspaceTree.templateToolTabs', { tabs: tool.tabs.join(', ') }) : tr('workspaceTree.templateToolNoTabs')}</span>
|
||||
<span class="workspace-template-tool-reason">{tool.reason}</span>
|
||||
</div>
|
||||
{#each selectedTemplate.workspaceTools || [] as pluginId (pluginId)}
|
||||
<span>{toolLabel(pluginId)}</span>
|
||||
{/each}
|
||||
</div>
|
||||
{#if selectedTemplateIssues.length > 0}
|
||||
<p class="workspace-template-incomplete" data-workspace-template-incomplete>{tr('workspaceTree.templateWillBeIncomplete')}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{#if createError}
|
||||
|
|
@ -502,48 +354,35 @@
|
|||
.wt-list { min-height: 0; overflow-y: auto; padding: 0.2rem 0.6rem; }
|
||||
.wt-btn { min-height: 1.55rem; background: transparent; border: 1px solid transparent; color: var(--vt-color-text-muted); cursor: pointer; font-size: 0.78rem; padding: 0.12rem 0.38rem; border-radius: var(--vt-radius-sm); }
|
||||
.wt-btn:hover:not(:disabled) { color: var(--vt-color-accent); background: var(--vt-color-accent-muted); border-color: rgba(78,204,163,0.25); }
|
||||
.wt-btn-small { font-size: 0.7rem; opacity: 0; }
|
||||
.wt-always { opacity: 1; }
|
||||
.wt-row:hover .wt-btn-small { opacity: 1; }
|
||||
.wt-loading, .wt-error { padding: 0.5rem; font-size: 0.75rem; color: var(--vt-color-text-muted); }
|
||||
.wt-error { color: var(--vt-color-danger); }
|
||||
.wt-row { display: flex; align-items: center; gap: 0.45rem; padding: 0.18rem 0.45rem; min-height: 1.85rem; border-radius: var(--vt-radius-sm); }
|
||||
.wt-row:hover { background: var(--vt-color-surface-hover); }
|
||||
.wt-folder-row { cursor: pointer; }
|
||||
.wt-folder-row:hover { color: var(--vt-color-accent); }
|
||||
.wt-chevron { width: 0.8rem; font-size: 0.65rem; color: var(--vt-color-text-muted); flex-shrink: 0; user-select: none; }
|
||||
.wt-folder-label { color: var(--vt-color-text-secondary); font-weight: 500; }
|
||||
.wt-node.selected > .wt-row { background: var(--vt-color-surface-selected); box-shadow: inset 2px 0 0 var(--vt-color-accent); }
|
||||
.wt-icon { width: 0.95rem; height: 0.95rem; display: inline-flex; align-items: center; justify-content: center; flex-shrink: 0; color: var(--vt-color-text-muted); }
|
||||
:global(.wt-node-icon) { display: block; }
|
||||
.wt-label { flex: 1; min-width: 0; min-height: 0; justify-content: flex-start; background: none; border: none; color: var(--vt-color-text-secondary); font-size: 0.78rem; text-align: left; cursor: pointer; padding: 0.1rem 0; border-radius: var(--vt-radius-sm); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.wt-label:hover { color: var(--vt-color-accent); }
|
||||
.wt-icon-btn { width: 1.45rem; height: 1.45rem; min-height: 0; padding: 0; border: 1px solid transparent; background: transparent; color: var(--vt-color-text-muted); opacity: 0; flex-shrink: 0; cursor: pointer; border-radius: var(--vt-radius-sm); }
|
||||
.wt-icon-btn { width: 1.45rem; height: 1.45rem; min-height: 0; padding: 0; border: 1px solid transparent; background: transparent; color: var(--vt-color-text-muted); opacity: 0.75; flex-shrink: 0; cursor: pointer; border-radius: var(--vt-radius-sm); }
|
||||
.wt-row:hover .wt-icon-btn { opacity: 1; }
|
||||
.wt-icon-btn:hover:not(:disabled) { color: var(--vt-color-accent); background: var(--vt-color-accent-muted); border-color: rgba(78,204,163,0.25); }
|
||||
.wt-icon-btn.danger:hover:not(:disabled) { color: var(--vt-color-danger); background: var(--vt-color-danger-muted); border-color: rgba(233,69,96,0.35); }
|
||||
.wt-rename { flex: 1; min-width: 0; background: #0f1424; border: 1px solid var(--vt-color-border-strong); color: var(--vt-color-text-primary); padding: 0.2rem 0.35rem; border-radius: var(--vt-radius-sm); font-size: 0.78rem; }
|
||||
.wt-rename:focus { outline: none; border-color: var(--vt-color-accent); box-shadow: var(--vt-focus-ring); }
|
||||
.workspace-create-overlay { position: fixed; inset: 0; z-index: 10000; display: flex; align-items: center; justify-content: center; padding: 1rem; background: rgba(4, 8, 18, 0.7); }
|
||||
.workspace-create-modal { width: min(34rem, 100%); display: grid; gap: 0.85rem; padding: 1rem; border: 1px solid var(--vt-color-border-strong); border-radius: var(--vt-radius-lg); background: var(--vt-color-surface); box-shadow: 0 18px 44px rgba(0, 0, 0, 0.38); }
|
||||
.workspace-create-header { display: flex; align-items: flex-start; justify-content: space-between; gap: 1rem; }
|
||||
.workspace-create-header h2 { margin: 0; font-size: 1rem; }
|
||||
.workspace-create-field { display: grid; gap: 0.35rem; color: var(--vt-color-text-muted); font-size: 0.75rem; }
|
||||
.workspace-create-field input, .workspace-create-field select { width: 100%; min-height: 2rem; box-sizing: border-box; border: 1px solid var(--vt-color-border-strong); border-radius: var(--vt-radius-sm); background: #0f1424; color: var(--vt-color-text-primary); padding: 0.35rem 0.5rem; font: inherit; font-size: 0.84rem; }
|
||||
.workspace-create-field select { appearance: none; background-color: #0f1424; background-image: linear-gradient(45deg, transparent 50%, var(--vt-color-text-muted) 50%), linear-gradient(135deg, var(--vt-color-text-muted) 50%, transparent 50%); background-position: calc(100% - 14px) 50%, calc(100% - 9px) 50%; background-size: 5px 5px, 5px 5px; background-repeat: no-repeat; padding-right: 1.7rem; }
|
||||
.workspace-create-field select option { background: #0f1424; color: var(--vt-color-text-primary); }
|
||||
.workspace-create-field input:focus, .workspace-create-field select:focus { outline: none; border-color: var(--vt-color-accent); box-shadow: var(--vt-focus-ring); }
|
||||
.workspace-template-summary { display: grid; gap: 0.55rem; padding: 0.75rem; border: 1px solid var(--vt-color-border); border-radius: var(--vt-radius-md); background: var(--vt-color-surface-muted); }
|
||||
.workspace-template-summary p { margin: 0; color: var(--vt-color-text-secondary); font-size: 0.8rem; line-height: 1.45; }
|
||||
.workspace-template-tools { display: grid; gap: 0.4rem; }
|
||||
.workspace-template-tool { display: grid; grid-template-columns: minmax(7rem, 1fr) minmax(0, 1.4fr) minmax(0, 1.2fr); gap: 0.5rem; align-items: center; padding: 0.45rem 0.55rem; border: 1px solid var(--vt-color-border-strong); border-radius: var(--vt-radius-sm); color: var(--vt-color-text-secondary); font-size: 0.72rem; }
|
||||
.workspace-template-tool-name { color: var(--vt-color-text-primary); font-weight: 600; }
|
||||
.workspace-template-tool-tabs { color: var(--vt-color-text-muted); }
|
||||
.workspace-template-tool-reason { color: var(--vt-color-accent); }
|
||||
.workspace-template-tool.limited { border-color: rgba(220, 164, 57, 0.58); background: rgba(220, 164, 57, 0.08); }
|
||||
.workspace-template-tool.limited .workspace-template-tool-reason { color: #e8bc63; }
|
||||
.workspace-template-tool.unavailable { border-color: rgba(233, 69, 96, 0.58); background: var(--vt-color-danger-muted); }
|
||||
.workspace-template-tool.unavailable .workspace-template-tool-reason { color: var(--vt-color-danger); }
|
||||
.workspace-template-incomplete { color: var(--vt-color-danger) !important; }
|
||||
.workspace-template-warning { display: flex; gap: 0.5rem; align-items: flex-start; justify-content: space-between; margin: 0.25rem 0.6rem 0.5rem; padding: 0.6rem; border: 1px solid rgba(233, 69, 96, 0.58); border-radius: var(--vt-radius-md); background: var(--vt-color-danger-muted); color: var(--vt-color-text-secondary); font-size: 0.73rem; line-height: 1.4; }
|
||||
.workspace-template-warning strong { color: var(--vt-color-danger); }
|
||||
.workspace-template-warning-item { margin-top: 0.2rem; }
|
||||
@media (max-width: 700px) { .workspace-template-tool { grid-template-columns: 1fr; gap: 0.18rem; } }
|
||||
.workspace-template-tools { display: flex; flex-wrap: wrap; gap: 0.35rem; }
|
||||
.workspace-template-tools span { min-height: 1.35rem; display: inline-flex; align-items: center; padding: 0 0.35rem; border: 1px solid var(--vt-color-border-strong); border-radius: var(--vt-radius-sm); color: var(--vt-color-text-secondary); font-size: 0.72rem; }
|
||||
.workspace-create-error { margin: 0; color: var(--vt-color-danger); font-size: 0.78rem; line-height: 1.4; }
|
||||
.workspace-create-actions { display: flex; gap: 0.4rem; justify-content: flex-end; }
|
||||
.wt-btn-primary { background: var(--vt-color-accent); color: #101827; border: none; padding: 0.3rem 0.6rem; border-radius: var(--vt-radius-sm); cursor: pointer; font-size: 0.75rem; font-weight: 600; }
|
||||
|
|
|
|||
|
|
@ -4,12 +4,6 @@
|
|||
* Каждый метод возвращает Promise с данными, совместимыми с Wails-контрактом.
|
||||
* Состояние мутабельно — тесты могут менять его между сценариями.
|
||||
*/
|
||||
import defaultEditorSource from '../../../../../verstak-official-plugins/plugins/default-editor/frontend/src/index.js?raw';
|
||||
import secretsSource from '../../../../../verstak-official-plugins/plugins/secrets/frontend/src/index.js?raw';
|
||||
import activitySource from '../../../../../verstak-official-plugins/plugins/activity/frontend/src/index.js?raw';
|
||||
import todoSource from '../../../../../verstak-official-plugins/plugins/todo/frontend/src/index.js?raw';
|
||||
import journalSource from '../../../../../verstak-official-plugins/plugins/journal/frontend/src/index.js?raw';
|
||||
|
||||
(function () {
|
||||
if (window.__wailsMockReady) return;
|
||||
|
||||
|
|
@ -150,7 +144,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Notes',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped notes manager.',
|
||||
description: 'Workspace-scoped notes manager.',
|
||||
source: 'official',
|
||||
icon: 'edit',
|
||||
provides: ['verstak/notes/v1'],
|
||||
|
|
@ -197,7 +191,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Activity',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped activity log for public plugin events.',
|
||||
description: 'Workspace-scoped activity log for public plugin events.',
|
||||
source: 'official',
|
||||
icon: 'activity',
|
||||
provides: ['activity.log', 'activity.provider', 'activity.reconstruction'],
|
||||
|
|
@ -221,11 +215,11 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Journal',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped journal with user-authored entries and optional Activity links.',
|
||||
description: 'Workspace-scoped journal with user-authored entries and optional Activity links.',
|
||||
source: 'official',
|
||||
icon: 'book-open',
|
||||
provides: ['worklog', 'journal', 'report.worklog'],
|
||||
permissions: ['events.publish', 'files.read', 'storage.namespace', 'ui.register'],
|
||||
permissions: ['storage.namespace', 'ui.register'],
|
||||
frontend: { entry: 'frontend/dist/index.js' },
|
||||
contributes: {
|
||||
views: [{ id: 'verstak.journal.view', title: 'Journal', icon: 'book-open', component: 'JournalView' }],
|
||||
|
|
@ -242,19 +236,19 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
manifest: {
|
||||
schemaVersion: 1,
|
||||
id: 'verstak.browser-inbox',
|
||||
name: 'Browser',
|
||||
name: 'Browser Inbox',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Global browser materials with explicit Deal assignment.',
|
||||
description: 'Global browser capture queue with explicit workspace assignment.',
|
||||
source: 'official',
|
||||
icon: 'inbox',
|
||||
provides: ['browser.inbox'],
|
||||
permissions: ['events.subscribe', 'files.read', 'storage.namespace', 'ui.register'],
|
||||
frontend: { entry: 'frontend/dist/index.js' },
|
||||
contributes: {
|
||||
views: [{ id: 'verstak.browser-inbox.view', title: 'Browser', icon: 'inbox', component: 'BrowserInboxView' }],
|
||||
sidebarItems: [{ id: 'verstak.browser-inbox.sidebar', title: 'Browser', icon: 'inbox', view: 'verstak.browser-inbox.view', position: 30 }],
|
||||
workspaceItems: [{ id: 'verstak.browser-inbox.workspace', title: 'Browser', icon: 'inbox', component: 'BrowserInboxView' }]
|
||||
views: [{ id: 'verstak.browser-inbox.view', title: 'Browser Inbox', icon: 'inbox', component: 'BrowserInboxView' }],
|
||||
sidebarItems: [{ id: 'verstak.browser-inbox.sidebar', title: 'Browser Inbox', icon: 'inbox', view: 'verstak.browser-inbox.view', position: 30 }],
|
||||
workspaceItems: [{ id: 'verstak.browser-inbox.workspace', title: 'Browser Inbox', icon: 'inbox', component: 'BrowserInboxView' }]
|
||||
}
|
||||
},
|
||||
rootPath: '/tmp/verstak-test/plugins/browser-inbox',
|
||||
|
|
@ -271,7 +265,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Search',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped vault text search provider.',
|
||||
description: 'Workspace-scoped vault text search provider.',
|
||||
source: 'official',
|
||||
icon: 'search',
|
||||
provides: ['verstak/search/v1', 'search.provider'],
|
||||
|
|
@ -297,7 +291,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
'verstak.sync': 'Синхронизация',
|
||||
'verstak.activity': 'Активность',
|
||||
'verstak.journal': 'Журнал',
|
||||
'verstak.browser-inbox': 'Браузер',
|
||||
'verstak.browser-inbox': 'Входящие из браузера',
|
||||
'verstak.search': 'Поиск',
|
||||
'verstak.trash': 'Корзина',
|
||||
'verstak.todo': 'Задачи',
|
||||
|
|
@ -365,9 +359,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
var pluginSettings = {
|
||||
'verstak.platform-test': { savedText: 'initial value' }
|
||||
};
|
||||
var pluginNotifications = {};
|
||||
var pluginData = {};
|
||||
var secretRecords = makeDefaultSecretRecords();
|
||||
var vaultFiles = makeDefaultVaultFiles();
|
||||
var externalOpens = [];
|
||||
var trashEntries = [];
|
||||
|
|
@ -412,33 +404,12 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
return JSON.parse(JSON.stringify(value));
|
||||
}
|
||||
|
||||
function makeDefaultSecretRecords() {
|
||||
return [
|
||||
{
|
||||
id: 'first.secret',
|
||||
title: 'First secret',
|
||||
username: 'first-user',
|
||||
value: 'first-value',
|
||||
scope: { kind: 'global' },
|
||||
updatedAt: '2026-07-14T00:00:00Z'
|
||||
},
|
||||
{
|
||||
id: 'target.secret',
|
||||
title: 'Target secret',
|
||||
username: 'target-user',
|
||||
value: 'target-value',
|
||||
scope: { kind: 'global' },
|
||||
updatedAt: '2026-07-14T00:00:00Z'
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
function builtInWorkspaceTemplates() {
|
||||
return [
|
||||
{
|
||||
id: 'default',
|
||||
name: 'General',
|
||||
description: 'Everyday Deal with notes, files, journal, activity, and browser captures.',
|
||||
description: 'Everyday workspace with notes, files, journal, activity, and browser captures.',
|
||||
version: 2,
|
||||
workspaceTools: ['verstak.notes', 'verstak.files', 'verstak.journal', 'verstak.activity', 'verstak.browser-inbox'],
|
||||
folders: ['Notes', 'Files'],
|
||||
|
|
@ -456,7 +427,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
{
|
||||
id: 'writing',
|
||||
name: 'Writing',
|
||||
description: 'Focused notes, files, and journal Deal for documentation and writing.',
|
||||
description: 'Focused notes, files, and journal workspace for documentation and writing.',
|
||||
version: 1,
|
||||
workspaceTools: ['verstak.notes', 'verstak.files', 'verstak.journal'],
|
||||
folders: ['Notes', 'Files'],
|
||||
|
|
@ -465,7 +436,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
{
|
||||
id: 'admin',
|
||||
name: 'Admin',
|
||||
description: 'Infrastructure Deal with secrets, todos, and journal.',
|
||||
description: 'Infrastructure workspace with secrets, todos, and journal.',
|
||||
version: 1,
|
||||
workspaceTools: ['verstak.notes', 'verstak.files', 'verstak.secrets', 'verstak.todo', 'verstak.journal'],
|
||||
folders: ['Notes', 'Files', 'Secrets'],
|
||||
|
|
@ -474,7 +445,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
{
|
||||
id: 'minimal',
|
||||
name: 'Minimal',
|
||||
description: 'Only notes and files for a lightweight Deal.',
|
||||
description: 'Only notes and files for a lightweight workspace.',
|
||||
version: 1,
|
||||
workspaceTools: ['verstak.notes', 'verstak.files'],
|
||||
folders: ['Notes', 'Files'],
|
||||
|
|
@ -570,12 +541,11 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Todos',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Global and Deal-scoped todo tracking with due and reminder metadata.',
|
||||
description: 'Global and workspace todo tracking with due and reminder metadata.',
|
||||
source: 'official',
|
||||
icon: 'list-todo',
|
||||
provides: ['todo.list', 'todo.workspace'],
|
||||
requires: ['verstak/core/notifications/v1'],
|
||||
permissions: ['files.read', 'storage.namespace', 'ui.register', 'notifications.schedule'],
|
||||
permissions: ['files.read', 'storage.namespace', 'ui.register'],
|
||||
frontend: { entry: 'frontend/dist/index.js' },
|
||||
contributes: {
|
||||
views: [{ id: 'verstak.todo.view', title: 'Todos', icon: 'list-todo', component: 'TodoView' }],
|
||||
|
|
@ -598,22 +568,13 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Secrets',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Encrypted global and Deal-scoped secret manager.',
|
||||
description: 'Encrypted global and workspace-scoped secret manager.',
|
||||
source: 'official',
|
||||
icon: 'key-round',
|
||||
provides: ['secret-store', 'secrets.read-ui', 'secrets.write-ui'],
|
||||
permissions: ['files.read', 'secrets.read', 'secrets.write', 'ui.register'],
|
||||
frontend: { entry: 'frontend/src/index.js' },
|
||||
permissions: ['secrets.read', 'secrets.write', 'ui.register'],
|
||||
frontend: { entry: 'frontend/dist/index.js' },
|
||||
contributes: {
|
||||
views: [{ id: 'verstak.secrets.view', title: 'Secrets', icon: 'key-round', component: 'SecretsView' }],
|
||||
sidebarItems: [{ id: 'verstak.secrets.sidebar', title: 'Secrets', icon: 'key-round', view: 'verstak.secrets.view', position: 45 }],
|
||||
openProviders: [{
|
||||
id: 'verstak.secrets.secret',
|
||||
title: 'Secrets',
|
||||
priority: 100,
|
||||
component: 'SecretsView',
|
||||
supports: [{ kind: 'secret', modes: ['view'] }]
|
||||
}],
|
||||
workspaceItems: [{ id: 'verstak.secrets.workspace', title: 'Secrets', icon: 'key-round', component: 'SecretsView' }]
|
||||
}
|
||||
},
|
||||
|
|
@ -626,7 +587,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
return {
|
||||
configured: false,
|
||||
serverUrl: '',
|
||||
vaultId: '',
|
||||
deviceId: 'mock-device',
|
||||
deviceName: '',
|
||||
connected: false,
|
||||
|
|
@ -636,7 +596,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
lastSyncAt: '',
|
||||
syncInterval: 0,
|
||||
lastError: '',
|
||||
lastWarning: '',
|
||||
statusLabel: 'disabled',
|
||||
serverSequence: 0
|
||||
};
|
||||
|
|
@ -651,7 +610,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
if (p.charAt(0) === '/' || /^[A-Za-z]:/.test(p)) return { error: 'invalid-path: absolute path rejected' };
|
||||
var parts = p.split('/').filter(Boolean);
|
||||
if (parts.indexOf('..') !== -1) return { error: 'invalid-path: path-traversal' };
|
||||
if (parts.some(function(part) { return part.toLowerCase() === '.verstak'; })) return { error: 'reserved-path: .verstak is internal' };
|
||||
if (parts[0] && parts[0].toLowerCase() === '.verstak') return { error: 'reserved-path: .verstak is internal' };
|
||||
return { path: parts.join('/') };
|
||||
}
|
||||
|
||||
|
|
@ -719,7 +678,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
caps.push({ name: 'verstak/core/files/v1', description: 'Files API', pluginId: 'verstak-desktop', status: 'stable' });
|
||||
caps.push({ name: 'verstak/core/workbench/v1', description: 'Workbench routing', pluginId: 'verstak-desktop', status: 'stable' });
|
||||
caps.push({ name: 'verstak/core/sync/v1', description: 'Sync API', pluginId: 'verstak-desktop', status: 'stable' });
|
||||
caps.push({ name: 'verstak/core/notifications/v1', description: 'Native notifications', pluginId: 'verstak-desktop', status: 'stable' });
|
||||
for (var id in pluginStates) {
|
||||
var s = pluginStates[id];
|
||||
if (s.status === 'loaded' && s.enabled && s.manifest && s.manifest.provides) {
|
||||
|
|
@ -753,7 +711,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
return {
|
||||
configured: syncState.configured,
|
||||
serverUrl: syncState.serverUrl,
|
||||
vaultId: syncState.vaultId,
|
||||
deviceId: syncState.deviceId,
|
||||
deviceName: syncState.deviceName,
|
||||
connected: syncState.connected,
|
||||
|
|
@ -763,7 +720,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
lastSyncAt: syncState.lastSyncAt,
|
||||
syncInterval: syncState.syncInterval,
|
||||
lastError: syncState.lastError,
|
||||
lastWarning: syncState.lastWarning,
|
||||
statusLabel: syncState.statusLabel
|
||||
};
|
||||
}
|
||||
|
|
@ -2460,7 +2416,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
}
|
||||
|
||||
function title(capture) {
|
||||
return capture.title || capture.fileName || capture.url || capture.captureId || 'Untitled material';
|
||||
return capture.title || capture.fileName || capture.url || capture.captureId || 'Untitled capture';
|
||||
}
|
||||
|
||||
function renderBrowserInbox(containerEl, props, api) {
|
||||
|
|
@ -2477,7 +2433,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
containerEl.innerHTML = '';
|
||||
var root = el('div', { className: 'browser-inbox-root', 'data-plugin-id': PLUGIN_ID });
|
||||
var toolbar = el('div', { className: 'browser-inbox-toolbar' });
|
||||
var titleEl = el('span', { className: 'browser-inbox-title', textContent: rootPath ? 'Browser · ' + rootPath : 'Browser' });
|
||||
var titleEl = el('span', { className: 'browser-inbox-title', textContent: rootPath ? 'Browser Inbox · ' + rootPath : 'Browser Inbox' });
|
||||
var countEl = el('span', { className: 'browser-inbox-count' });
|
||||
var statusEl = el('span', { className: 'browser-inbox-status' });
|
||||
var filtersEl = el('div', { className: 'browser-inbox-filters' });
|
||||
|
|
@ -2561,7 +2517,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
function renderWorkspaceFilterOptions() {
|
||||
if (rootPath) return;
|
||||
workspaceFilterEl.innerHTML = '';
|
||||
workspaceFilterEl.appendChild(option('', 'All Deals'));
|
||||
workspaceFilterEl.appendChild(option('', 'All workspaces'));
|
||||
workspaceRoots().forEach(function (workspace) {
|
||||
workspaceFilterEl.appendChild(option(workspace, workspace));
|
||||
});
|
||||
|
|
@ -2634,7 +2590,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
}) : captures).map(function (capture) { return capture.captureId; });
|
||||
captures = captures.filter(function (capture) { return ids.indexOf(capture.captureId) === -1; });
|
||||
selectedId = '';
|
||||
statusText = rootPath ? 'Deal materials cleared' : 'Inbox cleared';
|
||||
statusText = rootPath ? 'Workspace captures cleared' : 'Inbox cleared';
|
||||
return persist();
|
||||
}
|
||||
|
||||
|
|
@ -2676,7 +2632,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
listEl.appendChild(el('div', {
|
||||
className: 'browser-inbox-empty',
|
||||
textContent: captures.length === 0
|
||||
? 'No browser materials yet. Send a page, selection, or link from the extension.'
|
||||
? 'No browser captures yet. Keep this view open, then send a page, selection, link, or file from the browser extension.'
|
||||
: 'No captures match the current filters.'
|
||||
}));
|
||||
return;
|
||||
|
|
@ -2721,7 +2677,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
el('div', { className: 'browser-inbox-meta-value', textContent: capture.domain || '-' }),
|
||||
el('div', { className: 'browser-inbox-meta-label', textContent: 'Browser' }),
|
||||
el('div', { className: 'browser-inbox-meta-value', textContent: capture.browserName || capture.source || '-' }),
|
||||
el('div', { className: 'browser-inbox-meta-label', textContent: 'Deal' }),
|
||||
el('div', { className: 'browser-inbox-meta-label', textContent: 'Workspace' }),
|
||||
el('div', { className: 'browser-inbox-meta-value', textContent: capture.workspaceRootPath || 'Unassigned' }),
|
||||
el('div', { className: 'browser-inbox-meta-label', textContent: 'Status' }),
|
||||
el('div', { className: 'browser-inbox-meta-value', textContent: capture.processed ? 'Processed' : 'Unprocessed' })
|
||||
|
|
@ -3372,43 +3328,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
GetPluginLocalization: function (pluginId, locale) {
|
||||
return Promise.resolve([mockPluginCatalog(pluginId, locale), '']);
|
||||
},
|
||||
PluginSecretsStatus: function () {
|
||||
return Promise.resolve([{ initialized: true, unlocked: true }, '']);
|
||||
},
|
||||
PluginSecretsUnlock: function () {
|
||||
return Promise.resolve('');
|
||||
},
|
||||
PluginSecretsList: function () {
|
||||
return Promise.resolve([secretRecords.map(function (record) {
|
||||
var listed = cloneJson(record);
|
||||
delete listed.value;
|
||||
return listed;
|
||||
}), '']);
|
||||
},
|
||||
PluginSecretsRead: function (_pluginId, secretID) {
|
||||
var record = secretRecords.find(function (item) { return item.id === secretID; });
|
||||
if (!record) return Promise.resolve([{}, 'not-found: secret ' + secretID]);
|
||||
return Promise.resolve([cloneJson(record), '']);
|
||||
},
|
||||
PluginSecretsWrite: function (_pluginId, nextRecord) {
|
||||
var record = Object.assign({}, nextRecord || {});
|
||||
if (!record.id) return Promise.resolve([{}, 'secret id is required']);
|
||||
record.scope = record.scope || { kind: 'global' };
|
||||
record.updatedAt = new Date().toISOString();
|
||||
var index = secretRecords.findIndex(function (item) { return item.id === record.id; });
|
||||
if (index === -1) secretRecords.push(record);
|
||||
else secretRecords[index] = record;
|
||||
return Promise.resolve([cloneJson(record), '']);
|
||||
},
|
||||
PluginSecretsDelete: function (_pluginId, secretID) {
|
||||
secretRecords = secretRecords.filter(function (record) { return record.id !== secretID; });
|
||||
return Promise.resolve('');
|
||||
},
|
||||
PluginSecretsCopyLink: function (_pluginId, secretID) {
|
||||
var record = secretRecords.find(function (item) { return item.id === secretID; });
|
||||
if (!record) return Promise.resolve(['', 'not-found: secret ' + secretID]);
|
||||
return Promise.resolve(['[' + (record.title || record.id) + '](verstak-secret://' + encodeURIComponent(record.id) + ')', '']);
|
||||
},
|
||||
ReadPluginSettings: function (pluginId) {
|
||||
return Promise.resolve([Object.assign({}, pluginSettings[pluginId] || {}), '']);
|
||||
},
|
||||
|
|
@ -3416,22 +3335,8 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
pluginSettings[pluginId] = Object.assign({}, settings || {});
|
||||
return Promise.resolve('');
|
||||
},
|
||||
ReadPluginSetting: function (pluginId, key) {
|
||||
return Promise.resolve([pluginSettings[pluginId] && pluginSettings[pluginId][key], '']);
|
||||
},
|
||||
WritePluginSetting: function (pluginId, key, value) {
|
||||
pluginSettings[pluginId] = pluginSettings[pluginId] || {};
|
||||
pluginSettings[pluginId][key] = value;
|
||||
return Promise.resolve('');
|
||||
},
|
||||
ReplacePluginNotifications: function (pluginId, items) {
|
||||
pluginNotifications[pluginId] = Array.isArray(items) ? items.slice() : [];
|
||||
return Promise.resolve('');
|
||||
},
|
||||
ClearPluginNotifications: function (pluginId) {
|
||||
delete pluginNotifications[pluginId];
|
||||
return Promise.resolve('');
|
||||
},
|
||||
ReadPluginSetting: function () { return Promise.resolve(null); },
|
||||
WritePluginSetting: function () { return Promise.resolve(null); },
|
||||
ReadPluginDataJSON: function (pluginId, name) {
|
||||
var data = (pluginData[pluginId] && pluginData[pluginId][name]) || {};
|
||||
return Promise.resolve([Object.assign({}, data), '']);
|
||||
|
|
@ -3481,12 +3386,11 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
if (err) return Promise.resolve([{}, err]);
|
||||
return Promise.resolve([syncStatusDTO(), '']);
|
||||
},
|
||||
PluginSyncConfigure: function (pluginId, serverUrl, username, password, vaultId) {
|
||||
PluginSyncConfigure: function (pluginId, serverUrl) {
|
||||
var err = requirePluginSyncPermission(pluginId, true);
|
||||
if (err) return Promise.resolve(err);
|
||||
syncState.configured = true;
|
||||
syncState.serverUrl = serverUrl || '';
|
||||
syncState.vaultId = vaultId || 'test-vault-001';
|
||||
syncState.deviceId = 'mock-device';
|
||||
syncState.deviceName = 'mock-device';
|
||||
syncState.connected = true;
|
||||
|
|
@ -3496,7 +3400,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
syncState.statusLabel = 'connected';
|
||||
pluginSettings[pluginId] = Object.assign({}, pluginSettings[pluginId] || {}, {
|
||||
serverUrl: syncState.serverUrl,
|
||||
vaultId: syncState.vaultId,
|
||||
syncStatus: syncState.statusLabel
|
||||
});
|
||||
return Promise.resolve('');
|
||||
|
|
@ -3552,8 +3455,8 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
if (pluginId === 'verstak.platform-test' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(platformTestBundle());
|
||||
}
|
||||
if (pluginId === 'verstak.default-editor') {
|
||||
return Promise.resolve(defaultEditorSource);
|
||||
if (pluginId === 'verstak.default-editor' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(defaultEditorBundle());
|
||||
}
|
||||
if (pluginId === 'verstak.files' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(filesPluginBundle());
|
||||
|
|
@ -3564,20 +3467,20 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
if (pluginId === 'verstak.notes' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(simplePluginBundle('verstak.notes', 'NotesView', 'notes-root', 'Notes'));
|
||||
}
|
||||
if (pluginId === 'verstak.activity') {
|
||||
return Promise.resolve(activitySource);
|
||||
if (pluginId === 'verstak.activity' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(activityBundle());
|
||||
}
|
||||
if (pluginId === 'verstak.journal' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(journalSource);
|
||||
return Promise.resolve(journalBundle());
|
||||
}
|
||||
if (pluginId === 'verstak.browser-inbox' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(browserInboxBundle());
|
||||
}
|
||||
if (pluginId === 'verstak.todo' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(todoSource);
|
||||
return Promise.resolve(todoBundle());
|
||||
}
|
||||
if (pluginId === 'verstak.secrets') {
|
||||
return Promise.resolve(secretsSource);
|
||||
if (pluginId === 'verstak.secrets' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(simplePluginBundle('verstak.secrets', 'SecretsView', 'secrets-root', 'Secrets'));
|
||||
}
|
||||
if (pluginId === 'verstak.search' && assetPath === 'frontend/dist/index.js') {
|
||||
return Promise.resolve(searchPluginBundle());
|
||||
|
|
@ -4110,7 +4013,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Notes',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped notes manager.',
|
||||
description: 'Workspace-scoped notes manager.',
|
||||
source: 'official',
|
||||
icon: 'edit',
|
||||
provides: ['verstak/notes/v1'],
|
||||
|
|
@ -4157,7 +4060,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Activity',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped activity log for public plugin events.',
|
||||
description: 'Workspace-scoped activity log for public plugin events.',
|
||||
source: 'official',
|
||||
icon: 'activity',
|
||||
provides: ['activity.log', 'activity.provider', 'activity.reconstruction'],
|
||||
|
|
@ -4181,11 +4084,11 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Journal',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped journal with user-authored entries and optional Activity links.',
|
||||
description: 'Workspace-scoped journal with user-authored entries and optional Activity links.',
|
||||
source: 'official',
|
||||
icon: 'book-open',
|
||||
provides: ['worklog', 'journal', 'report.worklog'],
|
||||
permissions: ['events.publish', 'files.read', 'storage.namespace', 'ui.register'],
|
||||
permissions: ['storage.namespace', 'ui.register'],
|
||||
frontend: { entry: 'frontend/dist/index.js' },
|
||||
contributes: {
|
||||
views: [{ id: 'verstak.journal.view', title: 'Journal', icon: 'book-open', component: 'JournalView' }],
|
||||
|
|
@ -4202,19 +4105,19 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
manifest: {
|
||||
schemaVersion: 1,
|
||||
id: 'verstak.browser-inbox',
|
||||
name: 'Browser',
|
||||
name: 'Browser Inbox',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Global browser materials with explicit Deal assignment.',
|
||||
description: 'Global browser capture queue with explicit workspace assignment.',
|
||||
source: 'official',
|
||||
icon: 'inbox',
|
||||
provides: ['browser.inbox'],
|
||||
permissions: ['events.subscribe', 'files.read', 'storage.namespace', 'ui.register'],
|
||||
frontend: { entry: 'frontend/dist/index.js' },
|
||||
contributes: {
|
||||
views: [{ id: 'verstak.browser-inbox.view', title: 'Browser', icon: 'inbox', component: 'BrowserInboxView' }],
|
||||
sidebarItems: [{ id: 'verstak.browser-inbox.sidebar', title: 'Browser', icon: 'inbox', view: 'verstak.browser-inbox.view', position: 30 }],
|
||||
workspaceItems: [{ id: 'verstak.browser-inbox.workspace', title: 'Browser', icon: 'inbox', component: 'BrowserInboxView' }]
|
||||
views: [{ id: 'verstak.browser-inbox.view', title: 'Browser Inbox', icon: 'inbox', component: 'BrowserInboxView' }],
|
||||
sidebarItems: [{ id: 'verstak.browser-inbox.sidebar', title: 'Browser Inbox', icon: 'inbox', view: 'verstak.browser-inbox.view', position: 30 }],
|
||||
workspaceItems: [{ id: 'verstak.browser-inbox.workspace', title: 'Browser Inbox', icon: 'inbox', component: 'BrowserInboxView' }]
|
||||
}
|
||||
},
|
||||
rootPath: '/tmp/verstak-test/plugins/browser-inbox',
|
||||
|
|
@ -4231,7 +4134,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
name: 'Search',
|
||||
version: '0.1.0',
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Deal-scoped vault text search provider.',
|
||||
description: 'Workspace-scoped vault text search provider.',
|
||||
source: 'official',
|
||||
icon: 'search',
|
||||
provides: ['verstak/search/v1', 'search.provider'],
|
||||
|
|
@ -4261,8 +4164,6 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
workbenchPreferences = {};
|
||||
openedResources = [];
|
||||
pluginSettings = { 'verstak.platform-test': { savedText: 'initial value' } };
|
||||
pluginNotifications = {};
|
||||
secretRecords = makeDefaultSecretRecords();
|
||||
vaultFiles = makeDefaultVaultFiles();
|
||||
externalOpens = [];
|
||||
trashEntries = [];
|
||||
|
|
@ -4282,9 +4183,8 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
getPluginState: function (pluginId) {
|
||||
return pluginStates[pluginId] ? Object.assign({}, pluginStates[pluginId]) : null;
|
||||
},
|
||||
addSyntheticPlugins: function (count, source) {
|
||||
addSyntheticPlugins: function (count) {
|
||||
var total = Number(count || 0);
|
||||
var pluginSource = source === 'official' || source === 'local' || source === 'third-party' ? source : 'third-party';
|
||||
for (var i = 1; i <= total; i++) {
|
||||
var id = 'verstak.synthetic-layout-' + String(i).padStart(2, '0');
|
||||
pluginStates[id] = {
|
||||
|
|
@ -4297,7 +4197,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
version: '0.0.' + i,
|
||||
apiVersion: '0.1.0',
|
||||
description: 'Synthetic plugin used by frontend layout tests.',
|
||||
source: pluginSource,
|
||||
source: 'test',
|
||||
provides: ['verstak/synthetic-layout-' + i + '/v1'],
|
||||
requires: [],
|
||||
optionalRequires: [],
|
||||
|
|
@ -4317,7 +4217,7 @@ import journalSource from '../../../../../verstak-official-plugins/plugins/journ
|
|||
vaultPluginState.enabledPlugins.push(id);
|
||||
}
|
||||
if (!vaultPluginState.desiredPlugins.some(function (p) { return p.id === id; })) {
|
||||
vaultPluginState.desiredPlugins.push({ id: id, version: '0.0.' + i, source: pluginSource });
|
||||
vaultPluginState.desiredPlugins.push({ id: id, version: '0.0.' + i, source: 'test' });
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import vm from 'node:vm';
|
||||
|
||||
const source = fs.readFileSync(path.resolve('frontend/src/lib/log/debug.js'), 'utf8');
|
||||
const values = new Map();
|
||||
const localStorage = {
|
||||
getItem(key) { return values.has(key) ? values.get(key) : null; },
|
||||
setItem(key, value) { values.set(key, String(value)); },
|
||||
removeItem(key) { values.delete(key); },
|
||||
};
|
||||
const context = vm.createContext({
|
||||
console: { log() {} },
|
||||
localStorage,
|
||||
window: { location: { search: '' } },
|
||||
});
|
||||
const module = new vm.SourceTextModule(source, { context, identifier: 'debug.js' });
|
||||
await module.link(() => { throw new Error('debug.js must not import modules'); });
|
||||
await module.evaluate();
|
||||
|
||||
const { debug } = module.namespace;
|
||||
debug.enable({ persist: false });
|
||||
|
||||
assert.equal(debug.isEnabled(), true, 'session debug should enable diagnostics');
|
||||
assert.equal(
|
||||
localStorage.getItem('verstak-debug'),
|
||||
null,
|
||||
'a --debug session must not make diagnostics persist into ordinary launches',
|
||||
);
|
||||
|
||||
console.log('debug mode smoke passed');
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||
const files = [
|
||||
'src/lib/shell/CommandPalette.svelte',
|
||||
'src/lib/plugin-manager/PluginManager.svelte',
|
||||
'src/lib/shell/VaultSelection.svelte',
|
||||
'src/lib/shell/WorkspaceTree.svelte',
|
||||
'src/lib/plugin-host/PluginBundleHost.svelte',
|
||||
];
|
||||
const patterns = [
|
||||
/(?:^|\n)\s*(?:error|localError|createError)\s*=\s*(?:err|String\()/,
|
||||
/(?:^|\n)\s*error\s*=\s*['"].*['"]\s*\+\s*(?:err|String\()/,
|
||||
/tr\([^\n]*\{\s*error\s*:/,
|
||||
];
|
||||
const violations = [];
|
||||
|
||||
for (const relativePath of files) {
|
||||
const source = fs.readFileSync(path.join(root, relativePath), 'utf8');
|
||||
for (const pattern of patterns) {
|
||||
if (pattern.test(source)) violations.push(relativePath);
|
||||
}
|
||||
}
|
||||
|
||||
if (violations.length) {
|
||||
throw new Error(`Technical backend errors reach desktop UI in: ${[...new Set(violations)].join(', ')}`);
|
||||
}
|
||||
|
||||
const bundleHost = fs.readFileSync(path.join(root, 'src/lib/plugin-host/PluginBundleHost.svelte'), 'utf8');
|
||||
if (!/<p class="error-message">\{errorText \|\| tr\('bundle\.unknownError'\)\}<\/p>\s*<details class="error-details">/.test(bundleHost)) {
|
||||
throw new Error('Plugin bundle errors must keep the user-facing message outside expandable technical details');
|
||||
}
|
||||
|
||||
console.log('desktop UI does not interpolate raw backend errors');
|
||||
|
|
@ -3,7 +3,6 @@ import path from 'node:path';
|
|||
import { pathToFileURL } from 'node:url';
|
||||
|
||||
const pluginData = {};
|
||||
const scheduledNotifications = [];
|
||||
|
||||
globalThis.window = {
|
||||
__VERSTAK_PLUGIN_REGISTRY__: {},
|
||||
|
|
@ -39,14 +38,6 @@ globalThis.window = {
|
|||
pluginData[pluginId][name] = Object.assign({}, data || {});
|
||||
return Promise.resolve('');
|
||||
},
|
||||
ReplacePluginNotifications: (pluginId, items) => {
|
||||
scheduledNotifications.push({ pluginId, items });
|
||||
return Promise.resolve(items[0]?.id === 'rejected' ? 'notification permission denied' : '');
|
||||
},
|
||||
ClearPluginNotifications: (pluginId) => {
|
||||
scheduledNotifications.push({ pluginId, clear: true });
|
||||
return Promise.resolve('');
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -125,28 +116,6 @@ if (stored.version !== 1 || stored.workspaceRootPath !== 'Project') {
|
|||
throw new Error(`unexpected storage data: ${JSON.stringify(stored)}`);
|
||||
}
|
||||
|
||||
if (!api.notifications || typeof api.notifications.replace !== 'function' || typeof api.notifications.clear !== 'function') {
|
||||
throw new Error('api.notifications replace/clear contract is missing');
|
||||
}
|
||||
await api.notifications.replace([{ id: 'reminder-1', dueAt: '2026-07-14T10:00:00Z', title: 'Reminder' }]);
|
||||
await api.notifications.clear();
|
||||
if (scheduledNotifications.length !== 2
|
||||
|| scheduledNotifications[0].pluginId !== 'verstak.files'
|
||||
|| scheduledNotifications[0].items[0].id !== 'reminder-1'
|
||||
|| scheduledNotifications[1].pluginId !== 'verstak.files'
|
||||
|| !scheduledNotifications[1].clear) {
|
||||
throw new Error(`unexpected notification calls: ${JSON.stringify(scheduledNotifications)}`);
|
||||
}
|
||||
let rejected = false;
|
||||
try {
|
||||
await api.notifications.replace([{ id: 'rejected', dueAt: '2026-07-14T10:00:00Z', title: 'Reminder' }]);
|
||||
} catch (err) {
|
||||
rejected = String(err.message || err).includes('[plugin:verstak.files] notifications.replace failed: notification permission denied');
|
||||
}
|
||||
if (!rejected) {
|
||||
throw new Error('notification backend errors must be plugin-scoped rejections');
|
||||
}
|
||||
|
||||
api.dispose();
|
||||
if (localeListeners.size !== 0) {
|
||||
throw new Error('api.i18n locale subscription was not disposed');
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
import assert from 'node:assert/strict';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
|
||||
const source = await readFile(new URL('../src/lib/shell/WorkspaceTree.svelte', import.meta.url), 'utf8');
|
||||
|
||||
assert.match(source, /\.workspace-create-field select\s*\{[^}]*appearance:\s*none/, 'workspace template select must hide the native arrow');
|
||||
assert.match(source, /\.workspace-create-field select option\s*\{[^}]*background/, 'workspace template options must use the application surface');
|
||||
|
||||
console.log('workspace select style contract passed');
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
import en from '../src/lib/i18n/catalogs/en.js';
|
||||
import ru from '../src/lib/i18n/catalogs/ru.js';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const forbidden = [
|
||||
['English catalog', /\bworkspace(?:s)?\b/i],
|
||||
['Russian catalog', /рабоч(?:ее|ие|ем|его|их)\s+пространств(?:о|а|е)?/i],
|
||||
];
|
||||
|
||||
for (const [name, pattern] of forbidden) {
|
||||
const violations = Object.entries(name === 'English catalog' ? en : ru)
|
||||
.filter(([, value]) => pattern.test(value));
|
||||
if (violations.length) {
|
||||
throw new Error(`${name} still exposes workspace terminology: ${violations.map(([key]) => key).join(', ')}`);
|
||||
}
|
||||
}
|
||||
|
||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||
const overview = fs.readFileSync(path.join(root, 'src/lib/shell/TodaySurface.svelte'), 'utf8');
|
||||
for (const phrase of ['Workspace opened', 'Workspace activity', 'Workspace overview note']) {
|
||||
if (overview.includes(phrase)) {
|
||||
throw new Error(`Overview exposes workspace terminology: ${phrase}`);
|
||||
}
|
||||
}
|
||||
|
||||
console.log('desktop user terminology uses Deal/Дело');
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
|
||||
const bindingsPath = path.resolve('frontend/wailsjs/go/api/App.js');
|
||||
const bindings = fs.readFileSync(bindingsPath, 'utf8');
|
||||
|
||||
for (const method of ['ReplacePluginNotifications', 'ClearPluginNotifications']) {
|
||||
if (!bindings.includes(`export function ${method}(`)) {
|
||||
throw new Error(`Wails binding does not export ${method}`);
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Wails notification bindings are present');
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
import { resolve } from 'node:path';
|
||||
import { defineConfig } from 'vite';
|
||||
import { svelte } from '@sveltejs/vite-plugin-svelte';
|
||||
|
||||
|
|
@ -14,9 +13,6 @@ export default defineConfig(({ mode }) => {
|
|||
server: {
|
||||
port: isTest ? 5174 : 5173,
|
||||
strictPort: true,
|
||||
fs: {
|
||||
allow: [resolve(__dirname, '..', '..')],
|
||||
},
|
||||
},
|
||||
optimizeDeps: {
|
||||
include: [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,15 @@
|
|||
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
|
||||
// This file is automatically generated. DO NOT EDIT
|
||||
import {workspace} from '../models';
|
||||
import {context} from '../models';
|
||||
import {workbench} from '../models';
|
||||
import {capability} from '../models';
|
||||
import {api} from '../models';
|
||||
import {permissions} from '../models';
|
||||
import {plugin} from '../models';
|
||||
import {files} from '../models';
|
||||
import {notifications} from '../models';
|
||||
|
||||
export function ArchiveWorkspaceNode(arg1:string):Promise<string>;
|
||||
|
||||
export function ClearPluginNotifications(arg1:string):Promise<string>;
|
||||
|
||||
export function CloseVault():Promise<void>;
|
||||
|
||||
export function CreateVault(arg1:string):Promise<void>;
|
||||
|
|
@ -28,8 +24,6 @@ export function DeleteVaultTrash(arg1:string,arg2:string):Promise<string>;
|
|||
|
||||
export function DisablePlugin(arg1:string):Promise<string>;
|
||||
|
||||
export function DomReady(arg1:context.Context):Promise<void>;
|
||||
|
||||
export function EditWorkbenchResource(arg1:string,arg2:Record<string, any>):Promise<workbench.OpenResourceResult|string>;
|
||||
|
||||
export function EnablePlugin(arg1:string):Promise<string>;
|
||||
|
|
@ -78,22 +72,22 @@ export function ListVaultFiles(arg1:string,arg2:string):Promise<Array<files.File
|
|||
|
||||
export function ListVaultTrash(arg1:string):Promise<Array<files.TrashEntry>|string>;
|
||||
|
||||
export function ListWorkspaces():Promise<Array<workspace.Workspace>|string>;
|
||||
|
||||
export function ListWorkspaceIdentities():Promise<Array<workspace.WorkspaceIdentity>|string>;
|
||||
|
||||
export function ListWorkspaceTemplates():Promise<Array<workspace.WorkspaceTemplate>|string>;
|
||||
|
||||
export function ListWorkspaces():Promise<Array<workspace.Workspace>|string>;
|
||||
|
||||
export function MoveVaultPath(arg1:string,arg2:string,arg3:string,arg4:files.MoveOptions):Promise<string>;
|
||||
|
||||
export function MoveWorkspaceNode(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function OpenExternalURL(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function OpenVault(arg1:string):Promise<void>;
|
||||
|
||||
export function OpenVaultPathExternal(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function OpenExternalURL(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function OpenWorkbenchResource(arg1:string,arg2:Record<string, any>):Promise<workbench.OpenResourceResult|string>;
|
||||
|
||||
export function PluginBrowserReceiverPairing(arg1:string):Promise<Record<string, string>|string>;
|
||||
|
|
@ -114,7 +108,7 @@ export function PluginSecretsUnlock(arg1:string,arg2:string):Promise<string>;
|
|||
|
||||
export function PluginSecretsWrite(arg1:string,arg2:Record<string, any>):Promise<Record<string, any>|string>;
|
||||
|
||||
export function PluginSyncConfigure(arg1:string,arg2:string,arg3:string,arg4:string,arg5:string):Promise<string>;
|
||||
export function PluginSyncConfigure(arg1:string,arg2:string,arg3:string,arg4:string):Promise<string>;
|
||||
|
||||
export function PluginSyncDisconnect(arg1:string):Promise<string>;
|
||||
|
||||
|
|
@ -130,10 +124,6 @@ export function PluginSyncTestConnection(arg1:string,arg2:string,arg3:string,arg
|
|||
|
||||
export function PublishPluginEvent(arg1:string,arg2:string,arg3:Record<string, any>):Promise<string>;
|
||||
|
||||
export function PurgeWorkspaceTrash(arg1:string):Promise<string>;
|
||||
|
||||
export function Quit():Promise<void>;
|
||||
|
||||
export function ReadPluginDataJSON(arg1:string,arg2:string):Promise<Record<string, any>>;
|
||||
|
||||
export function ReadPluginDataNDJSON(arg1:string,arg2:string):Promise<Array<Record<string, any>>>;
|
||||
|
|
@ -152,11 +142,9 @@ export function ReloadPlugins():Promise<number|string>;
|
|||
|
||||
export function RenameWorkspace(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function RenameWorkspaceNode(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function RepairWorkspaceIdentity(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function ReplacePluginNotifications(arg1:string,arg2:Array<notifications.Request>):Promise<string>;
|
||||
export function RenameWorkspaceNode(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function RestoreVaultTrash(arg1:string,arg2:string,arg3:files.RestoreOptions):Promise<string|string>;
|
||||
|
||||
|
|
@ -164,6 +152,8 @@ export function RestoreWorkspaceTrash(arg1:string,arg2:string):Promise<workspace
|
|||
|
||||
export function SelectDirectory():Promise<string>;
|
||||
|
||||
export function PurgeWorkspaceTrash(arg1:string):Promise<string>;
|
||||
|
||||
export function SelectVaultForOpen():Promise<string>;
|
||||
|
||||
export function SetCurrentVault(arg1:string):Promise<string>;
|
||||
|
|
@ -172,14 +162,8 @@ export function SetCurrentWorkspace(arg1:string):Promise<string>;
|
|||
|
||||
export function SetCurrentWorkspaceNode(arg1:string):Promise<string>;
|
||||
|
||||
export function SetNotificationService(arg1:api.notificationService):Promise<void>;
|
||||
|
||||
export function ShowVaultPathInFolder(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function ShowWindow():Promise<void>;
|
||||
|
||||
export function Shutdown(arg1:context.Context):Promise<void>;
|
||||
|
||||
export function SubscribePluginEvent(arg1:string,arg2:string):Promise<string>;
|
||||
|
||||
export function TrashVaultPath(arg1:string,arg2:string):Promise<files.TrashResult|string>;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,6 @@ export function ArchiveWorkspaceNode(arg1) {
|
|||
return window['go']['api']['App']['ArchiveWorkspaceNode'](arg1);
|
||||
}
|
||||
|
||||
export function ClearPluginNotifications(arg1) {
|
||||
return window['go']['api']['App']['ClearPluginNotifications'](arg1);
|
||||
}
|
||||
|
||||
export function CloseVault() {
|
||||
return window['go']['api']['App']['CloseVault']();
|
||||
}
|
||||
|
|
@ -38,10 +34,6 @@ export function DisablePlugin(arg1) {
|
|||
return window['go']['api']['App']['DisablePlugin'](arg1);
|
||||
}
|
||||
|
||||
export function DomReady(arg1) {
|
||||
return window['go']['api']['App']['DomReady'](arg1);
|
||||
}
|
||||
|
||||
export function EditWorkbenchResource(arg1, arg2) {
|
||||
return window['go']['api']['App']['EditWorkbenchResource'](arg1, arg2);
|
||||
}
|
||||
|
|
@ -138,6 +130,10 @@ export function ListVaultTrash(arg1) {
|
|||
return window['go']['api']['App']['ListVaultTrash'](arg1);
|
||||
}
|
||||
|
||||
export function ListWorkspaces() {
|
||||
return window['go']['api']['App']['ListWorkspaces']();
|
||||
}
|
||||
|
||||
export function ListWorkspaceIdentities() {
|
||||
return window['go']['api']['App']['ListWorkspaceIdentities']();
|
||||
}
|
||||
|
|
@ -146,10 +142,6 @@ export function ListWorkspaceTemplates() {
|
|||
return window['go']['api']['App']['ListWorkspaceTemplates']();
|
||||
}
|
||||
|
||||
export function ListWorkspaces() {
|
||||
return window['go']['api']['App']['ListWorkspaces']();
|
||||
}
|
||||
|
||||
export function MoveVaultPath(arg1, arg2, arg3, arg4) {
|
||||
return window['go']['api']['App']['MoveVaultPath'](arg1, arg2, arg3, arg4);
|
||||
}
|
||||
|
|
@ -158,10 +150,6 @@ export function MoveWorkspaceNode(arg1, arg2) {
|
|||
return window['go']['api']['App']['MoveWorkspaceNode'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function OpenExternalURL(arg1, arg2) {
|
||||
return window['go']['api']['App']['OpenExternalURL'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function OpenVault(arg1) {
|
||||
return window['go']['api']['App']['OpenVault'](arg1);
|
||||
}
|
||||
|
|
@ -170,6 +158,10 @@ export function OpenVaultPathExternal(arg1, arg2) {
|
|||
return window['go']['api']['App']['OpenVaultPathExternal'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function OpenExternalURL(arg1, arg2) {
|
||||
return window['go']['api']['App']['OpenExternalURL'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function OpenWorkbenchResource(arg1, arg2) {
|
||||
return window['go']['api']['App']['OpenWorkbenchResource'](arg1, arg2);
|
||||
}
|
||||
|
|
@ -210,8 +202,8 @@ export function PluginSecretsWrite(arg1, arg2) {
|
|||
return window['go']['api']['App']['PluginSecretsWrite'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function PluginSyncConfigure(arg1, arg2, arg3, arg4, arg5) {
|
||||
return window['go']['api']['App']['PluginSyncConfigure'](arg1, arg2, arg3, arg4, arg5);
|
||||
export function PluginSyncConfigure(arg1, arg2, arg3, arg4) {
|
||||
return window['go']['api']['App']['PluginSyncConfigure'](arg1, arg2, arg3, arg4);
|
||||
}
|
||||
|
||||
export function PluginSyncDisconnect(arg1) {
|
||||
|
|
@ -242,14 +234,6 @@ export function PublishPluginEvent(arg1, arg2, arg3) {
|
|||
return window['go']['api']['App']['PublishPluginEvent'](arg1, arg2, arg3);
|
||||
}
|
||||
|
||||
export function PurgeWorkspaceTrash(arg1) {
|
||||
return window['go']['api']['App']['PurgeWorkspaceTrash'](arg1);
|
||||
}
|
||||
|
||||
export function Quit() {
|
||||
return window['go']['api']['App']['Quit']();
|
||||
}
|
||||
|
||||
export function ReadPluginDataJSON(arg1, arg2) {
|
||||
return window['go']['api']['App']['ReadPluginDataJSON'](arg1, arg2);
|
||||
}
|
||||
|
|
@ -286,16 +270,12 @@ export function RenameWorkspace(arg1, arg2) {
|
|||
return window['go']['api']['App']['RenameWorkspace'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function RenameWorkspaceNode(arg1, arg2) {
|
||||
return window['go']['api']['App']['RenameWorkspaceNode'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function RepairWorkspaceIdentity(arg1, arg2) {
|
||||
return window['go']['api']['App']['RepairWorkspaceIdentity'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function ReplacePluginNotifications(arg1, arg2) {
|
||||
return window['go']['api']['App']['ReplacePluginNotifications'](arg1, arg2);
|
||||
export function RenameWorkspaceNode(arg1, arg2) {
|
||||
return window['go']['api']['App']['RenameWorkspaceNode'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function RestoreVaultTrash(arg1, arg2, arg3) {
|
||||
|
|
@ -310,6 +290,10 @@ export function SelectDirectory() {
|
|||
return window['go']['api']['App']['SelectDirectory']();
|
||||
}
|
||||
|
||||
export function PurgeWorkspaceTrash(arg1) {
|
||||
return window['go']['api']['App']['PurgeWorkspaceTrash'](arg1);
|
||||
}
|
||||
|
||||
export function SelectVaultForOpen() {
|
||||
return window['go']['api']['App']['SelectVaultForOpen']();
|
||||
}
|
||||
|
|
@ -326,22 +310,10 @@ export function SetCurrentWorkspaceNode(arg1) {
|
|||
return window['go']['api']['App']['SetCurrentWorkspaceNode'](arg1);
|
||||
}
|
||||
|
||||
export function SetNotificationService(arg1) {
|
||||
return window['go']['api']['App']['SetNotificationService'](arg1);
|
||||
}
|
||||
|
||||
export function ShowVaultPathInFolder(arg1, arg2) {
|
||||
return window['go']['api']['App']['ShowVaultPathInFolder'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function ShowWindow() {
|
||||
return window['go']['api']['App']['ShowWindow']();
|
||||
}
|
||||
|
||||
export function Shutdown(arg1) {
|
||||
return window['go']['api']['App']['Shutdown'](arg1);
|
||||
}
|
||||
|
||||
export function SubscribePluginEvent(arg1, arg2) {
|
||||
return window['go']['api']['App']['SubscribePluginEvent'](arg1, arg2);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
export namespace api {
|
||||
|
||||
|
||||
export class FlatContextMenuEntry {
|
||||
pluginId: string;
|
||||
id: string;
|
||||
|
|
@ -8,11 +8,11 @@ export namespace api {
|
|||
group?: string;
|
||||
capability?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatContextMenuEntry(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -31,11 +31,11 @@ export namespace api {
|
|||
icon?: string;
|
||||
capability?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatAction(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -52,11 +52,11 @@ export namespace api {
|
|||
title: string;
|
||||
icon?: string;
|
||||
component: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatWorkspaceItem(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -72,11 +72,11 @@ export namespace api {
|
|||
extensions?: string[];
|
||||
contexts?: string[];
|
||||
modes?: string[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatOpenProviderSupport(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.kind = source["kind"];
|
||||
|
|
@ -93,11 +93,11 @@ export namespace api {
|
|||
priority?: number;
|
||||
component: string;
|
||||
supports: FlatOpenProviderSupport[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatOpenProvider(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -107,7 +107,7 @@ export namespace api {
|
|||
this.component = source["component"];
|
||||
this.supports = this.convertValues(source["supports"], FlatOpenProviderSupport);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -132,11 +132,11 @@ export namespace api {
|
|||
label: string;
|
||||
position?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatStatusBarItem(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -153,11 +153,11 @@ export namespace api {
|
|||
icon?: string;
|
||||
view: string;
|
||||
position?: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatSidebarItem(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -174,11 +174,11 @@ export namespace api {
|
|||
title: string;
|
||||
icon?: string;
|
||||
component: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatSettingsPanel(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -193,11 +193,11 @@ export namespace api {
|
|||
id: string;
|
||||
label: string;
|
||||
handler: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatSearchProvider(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -212,11 +212,11 @@ export namespace api {
|
|||
title: string;
|
||||
icon?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatCommand(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -232,11 +232,11 @@ export namespace api {
|
|||
title: string;
|
||||
icon?: string;
|
||||
component: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FlatView(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.pluginId = source["pluginId"];
|
||||
|
|
@ -258,11 +258,11 @@ export namespace api {
|
|||
fileActions: FlatAction[];
|
||||
noteActions: FlatAction[];
|
||||
contextMenuEntries: FlatContextMenuEntry[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionSummary(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.views = this.convertValues(source["views"], FlatView);
|
||||
|
|
@ -277,7 +277,7 @@ export namespace api {
|
|||
this.noteActions = this.convertValues(source["noteActions"], FlatAction);
|
||||
this.contextMenuEntries = this.convertValues(source["contextMenuEntries"], FlatContextMenuEntry);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -296,21 +296,20 @@ export namespace api {
|
|||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
export class SyncStatusDTO {
|
||||
configured: boolean;
|
||||
serverUrl: string;
|
||||
vaultId: string;
|
||||
deviceId: string;
|
||||
deviceName: string;
|
||||
connected: boolean;
|
||||
|
|
@ -320,18 +319,16 @@ export namespace api {
|
|||
lastSyncAt: string;
|
||||
syncInterval: number;
|
||||
lastError: string;
|
||||
lastWarning: string;
|
||||
statusLabel: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new SyncStatusDTO(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.configured = source["configured"];
|
||||
this.serverUrl = source["serverUrl"];
|
||||
this.vaultId = source["vaultId"];
|
||||
this.deviceId = source["deviceId"];
|
||||
this.deviceName = source["deviceName"];
|
||||
this.connected = source["connected"];
|
||||
|
|
@ -341,7 +338,6 @@ export namespace api {
|
|||
this.lastSyncAt = source["lastSyncAt"];
|
||||
this.syncInterval = source["syncInterval"];
|
||||
this.lastError = source["lastError"];
|
||||
this.lastWarning = source["lastWarning"];
|
||||
this.statusLabel = source["statusLabel"];
|
||||
}
|
||||
}
|
||||
|
|
@ -349,17 +345,17 @@ export namespace api {
|
|||
}
|
||||
|
||||
export namespace capability {
|
||||
|
||||
|
||||
export class Entry {
|
||||
name: string;
|
||||
description?: string;
|
||||
pluginId: string;
|
||||
status: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Entry(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.name = source["name"];
|
||||
|
|
@ -372,17 +368,17 @@ export namespace capability {
|
|||
}
|
||||
|
||||
export namespace files {
|
||||
|
||||
|
||||
export class FileBytes {
|
||||
relativePath: string;
|
||||
size: number;
|
||||
mimeHint: string;
|
||||
dataBase64: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FileBytes(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.relativePath = source["relativePath"];
|
||||
|
|
@ -402,11 +398,11 @@ export namespace files {
|
|||
isReserved: boolean;
|
||||
canRead: boolean;
|
||||
canWrite: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FileEntry(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.name = source["name"];
|
||||
|
|
@ -434,11 +430,11 @@ export namespace files {
|
|||
isReserved: boolean;
|
||||
canRead: boolean;
|
||||
canWrite: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FileMetadata(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.relativePath = source["relativePath"];
|
||||
|
|
@ -457,11 +453,11 @@ export namespace files {
|
|||
}
|
||||
export class MoveOptions {
|
||||
overwrite: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new MoveOptions(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.overwrite = source["overwrite"];
|
||||
|
|
@ -470,11 +466,11 @@ export namespace files {
|
|||
export class RestoreOptions {
|
||||
targetPath?: string;
|
||||
overwrite: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new RestoreOptions(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.targetPath = source["targetPath"];
|
||||
|
|
@ -489,11 +485,11 @@ export namespace files {
|
|||
originalType: string;
|
||||
basename: string;
|
||||
size: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new TrashEntry(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.originalPath = source["originalPath"];
|
||||
|
|
@ -511,11 +507,11 @@ export namespace files {
|
|||
trashId: string;
|
||||
deletedAt: string;
|
||||
size: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new TrashResult(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.originalPath = source["originalPath"];
|
||||
|
|
@ -528,11 +524,11 @@ export namespace files {
|
|||
export class WriteOptions {
|
||||
createIfMissing: boolean;
|
||||
overwrite: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new WriteOptions(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.createIfMissing = source["createIfMissing"];
|
||||
|
|
@ -542,40 +538,17 @@ export namespace files {
|
|||
|
||||
}
|
||||
|
||||
export namespace notifications {
|
||||
|
||||
export class Request {
|
||||
id: string;
|
||||
dueAt: string;
|
||||
title: string;
|
||||
body?: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Request(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.dueAt = source["dueAt"];
|
||||
this.title = source["title"];
|
||||
this.body = source["body"];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace permissions {
|
||||
|
||||
|
||||
export class Entry {
|
||||
name: string;
|
||||
description: string;
|
||||
dangerous: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Entry(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.name = source["name"];
|
||||
|
|
@ -587,15 +560,15 @@ export namespace permissions {
|
|||
}
|
||||
|
||||
export namespace plugin {
|
||||
|
||||
|
||||
export class HealthCheckConfig {
|
||||
type?: string;
|
||||
timeout?: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new HealthCheckConfig(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.type = source["type"];
|
||||
|
|
@ -606,18 +579,18 @@ export namespace plugin {
|
|||
type: string;
|
||||
entry: Record<string, string>;
|
||||
healthCheck?: HealthCheckConfig;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new BackendConfig(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.type = source["type"];
|
||||
this.entry = source["entry"];
|
||||
this.healthCheck = this.convertValues(source["healthCheck"], HealthCheckConfig);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -642,11 +615,11 @@ export namespace plugin {
|
|||
icon?: string;
|
||||
capability?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionAction(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -660,11 +633,11 @@ export namespace plugin {
|
|||
id: string;
|
||||
events?: string[];
|
||||
handler: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionActivityProvider(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -678,11 +651,11 @@ export namespace plugin {
|
|||
keybinding?: string;
|
||||
icon?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionCommand(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -699,11 +672,11 @@ export namespace plugin {
|
|||
group?: string;
|
||||
capability?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionContextMenuEntry(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -720,11 +693,11 @@ export namespace plugin {
|
|||
extensions?: string[];
|
||||
contexts?: string[];
|
||||
modes?: string[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new OpenProviderSupport(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.kind = source["kind"];
|
||||
|
|
@ -740,11 +713,11 @@ export namespace plugin {
|
|||
priority?: number;
|
||||
component: string;
|
||||
supports: OpenProviderSupport[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionOpenProvider(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -753,7 +726,7 @@ export namespace plugin {
|
|||
this.component = source["component"];
|
||||
this.supports = this.convertValues(source["supports"], OpenProviderSupport);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -776,11 +749,11 @@ export namespace plugin {
|
|||
id: string;
|
||||
label: string;
|
||||
handler: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionSearchProvider(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -793,11 +766,11 @@ export namespace plugin {
|
|||
title: string;
|
||||
component: string;
|
||||
icon?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionSettingsPanel(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -812,11 +785,11 @@ export namespace plugin {
|
|||
icon?: string;
|
||||
view: string;
|
||||
position?: number;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionSidebarItem(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -831,11 +804,11 @@ export namespace plugin {
|
|||
label: string;
|
||||
position?: string;
|
||||
handler?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionStatusBarItem(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -849,11 +822,11 @@ export namespace plugin {
|
|||
title: string;
|
||||
icon?: string;
|
||||
component: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionView(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -867,11 +840,11 @@ export namespace plugin {
|
|||
title: string;
|
||||
icon?: string;
|
||||
component: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new ContributionWorkspaceItem(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -893,11 +866,11 @@ export namespace plugin {
|
|||
statusBarItems?: ContributionStatusBarItem[];
|
||||
openProviders?: ContributionOpenProvider[];
|
||||
workspaceItems?: ContributionWorkspaceItem[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Contributions(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.views = this.convertValues(source["views"], ContributionView);
|
||||
|
|
@ -913,7 +886,7 @@ export namespace plugin {
|
|||
this.openProviders = this.convertValues(source["openProviders"], ContributionOpenProvider);
|
||||
this.workspaceItems = this.convertValues(source["workspaceItems"], ContributionWorkspaceItem);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -935,18 +908,18 @@ export namespace plugin {
|
|||
export class FrontendConfig {
|
||||
entry: string;
|
||||
style?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new FrontendConfig(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.entry = source["entry"];
|
||||
this.style = source["style"];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export class LocalizationConfig {
|
||||
defaultLocale: string;
|
||||
locales: Record<string, string>;
|
||||
|
|
@ -964,11 +937,11 @@ export namespace plugin {
|
|||
export class SyncConfig {
|
||||
namespaces?: string[];
|
||||
participate?: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new SyncConfig(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.namespaces = source["namespaces"];
|
||||
|
|
@ -977,11 +950,11 @@ export namespace plugin {
|
|||
}
|
||||
export class MigrationConfig {
|
||||
path?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new MigrationConfig(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.path = source["path"];
|
||||
|
|
@ -1006,11 +979,11 @@ export namespace plugin {
|
|||
migrations?: MigrationConfig;
|
||||
contributes?: Contributions;
|
||||
sync?: SyncConfig;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Manifest(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.schemaVersion = source["schemaVersion"];
|
||||
|
|
@ -1032,7 +1005,7 @@ export namespace plugin {
|
|||
this.contributes = this.convertValues(source["contributes"], Contributions);
|
||||
this.sync = this.convertValues(source["sync"], SyncConfig);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -1051,19 +1024,19 @@ export namespace plugin {
|
|||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
export class Plugin {
|
||||
manifest: Manifest;
|
||||
status: string;
|
||||
error?: string;
|
||||
enabled: boolean;
|
||||
rootPath: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Plugin(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.manifest = this.convertValues(source["manifest"], Manifest);
|
||||
|
|
@ -1072,7 +1045,7 @@ export namespace plugin {
|
|||
this.enabled = source["enabled"];
|
||||
this.rootPath = source["rootPath"];
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -1095,18 +1068,18 @@ export namespace plugin {
|
|||
}
|
||||
|
||||
export namespace workbench {
|
||||
|
||||
|
||||
export class OpenResourceContext {
|
||||
sourcePluginId?: string;
|
||||
sourceView?: string;
|
||||
isInsideNotesFolder?: boolean;
|
||||
notesScopePath?: string;
|
||||
notesMode?: boolean;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new OpenResourceContext(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.sourcePluginId = source["sourcePluginId"];
|
||||
|
|
@ -1123,11 +1096,11 @@ export namespace workbench {
|
|||
mime?: string;
|
||||
extension?: string;
|
||||
context?: OpenResourceContext;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new OpenResourceRequest(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.kind = source["kind"];
|
||||
|
|
@ -1137,7 +1110,7 @@ export namespace workbench {
|
|||
this.extension = source["extension"];
|
||||
this.context = this.convertValues(source["context"], OpenResourceContext);
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -1163,11 +1136,11 @@ export namespace workbench {
|
|||
providerComponent?: string;
|
||||
request: OpenResourceRequest;
|
||||
message?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new OpenResourceResult(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.status = source["status"];
|
||||
|
|
@ -1177,7 +1150,7 @@ export namespace workbench {
|
|||
this.request = this.convertValues(source["request"], OpenResourceRequest);
|
||||
this.message = source["message"];
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -1203,11 +1176,11 @@ export namespace workbench {
|
|||
providerComponent: string;
|
||||
request: OpenResourceRequest;
|
||||
openedAt: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new OpenedResource(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -1217,7 +1190,7 @@ export namespace workbench {
|
|||
this.request = this.convertValues(source["request"], OpenResourceRequest);
|
||||
this.openedAt = source["openedAt"];
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -1240,11 +1213,11 @@ export namespace workbench {
|
|||
defaultTextEditorProvider?: string;
|
||||
defaultMarkdownEditorProvider?: string;
|
||||
defaultNotesMarkdownEditorProvider?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Preferences(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.defaultTextEditorProvider = source["defaultTextEditorProvider"];
|
||||
|
|
@ -1257,17 +1230,38 @@ export namespace workbench {
|
|||
|
||||
export namespace workspace {
|
||||
|
||||
export class WorkspaceTemplate {
|
||||
id: string;
|
||||
name: string;
|
||||
description: string;
|
||||
version: number;
|
||||
workspaceTools: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new WorkspaceTemplate(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.name = source["name"];
|
||||
this.description = source["description"];
|
||||
this.version = source["version"];
|
||||
this.workspaceTools = source["workspaceTools"];
|
||||
}
|
||||
}
|
||||
|
||||
export class TemplateSnapshot {
|
||||
templateId: string;
|
||||
templateName: string;
|
||||
templateVersion: number;
|
||||
appliedAt: string;
|
||||
workspaceTools?: string[];
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new TemplateSnapshot(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.templateId = source["templateId"];
|
||||
|
|
@ -1285,11 +1279,11 @@ export namespace workspace {
|
|||
folders?: Record<string, string>;
|
||||
workspaceTools?: string[];
|
||||
updatedAt?: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Metadata(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.workspaceId = source["workspaceId"];
|
||||
|
|
@ -1300,7 +1294,7 @@ export namespace workspace {
|
|||
this.workspaceTools = source["workspaceTools"];
|
||||
this.updatedAt = source["updatedAt"];
|
||||
}
|
||||
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
|
|
@ -1322,29 +1316,29 @@ export namespace workspace {
|
|||
export class MetadataPatch {
|
||||
features?: Record<string, boolean>;
|
||||
folders?: Record<string, string>;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new MetadataPatch(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.features = source["features"];
|
||||
this.folders = source["folders"];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export class TrashResult {
|
||||
workspaceId: string;
|
||||
originalPath: string;
|
||||
trashPath: string;
|
||||
trashId: string;
|
||||
deletedAt: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new TrashResult(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.workspaceId = source["workspaceId"];
|
||||
|
|
@ -1358,11 +1352,11 @@ export namespace workspace {
|
|||
id: string;
|
||||
name: string;
|
||||
rootPath: string;
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Workspace(source);
|
||||
}
|
||||
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
|
|
@ -1370,6 +1364,7 @@ export namespace workspace {
|
|||
this.rootPath = source["rootPath"];
|
||||
}
|
||||
}
|
||||
|
||||
export class WorkspaceIdentity {
|
||||
workspaceId: string;
|
||||
rootPath: string;
|
||||
|
|
@ -1386,25 +1381,5 @@ export namespace workspace {
|
|||
this.state = source["state"];
|
||||
}
|
||||
}
|
||||
export class WorkspaceTemplate {
|
||||
id: string;
|
||||
name: string;
|
||||
description: string;
|
||||
version: number;
|
||||
workspaceTools: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new WorkspaceTemplate(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.name = source["name"];
|
||||
this.description = source["description"];
|
||||
this.version = source["version"];
|
||||
this.workspaceTools = source["workspaceTools"];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
1
go.mod
1
go.mod
|
|
@ -3,7 +3,6 @@ module github.com/verstak/verstak-desktop
|
|||
go 1.24.4
|
||||
|
||||
require (
|
||||
fyne.io/systray v1.12.2
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/wailsapp/wails/v2 v2.12.0
|
||||
golang.org/x/net v0.35.0
|
||||
|
|
|
|||
2
go.sum
2
go.sum
|
|
@ -1,5 +1,3 @@
|
|||
fyne.io/systray v1.12.2 h1:Y8DZxgLHsVQt6rY9Zrkkg+j67S7vv/1F2viOWKPpVeA=
|
||||
fyne.io/systray v1.12.2/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
|
||||
git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 h1:N3IGoHHp9pb6mj1cbXbuaSXV/UMKwmbKLf53nQmtqMA=
|
||||
git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3/go.mod h1:QtOLZGz8olr4qH2vWK0QH0w0O4T9fEIjMuWpKUsH7nc=
|
||||
github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -14,15 +14,12 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
|
||||
"github.com/verstak/verstak-desktop/internal/core/appsettings"
|
||||
"github.com/verstak/verstak-desktop/internal/core/browserreceiver"
|
||||
"github.com/verstak/verstak-desktop/internal/core/capability"
|
||||
"github.com/verstak/verstak-desktop/internal/core/contribution"
|
||||
"github.com/verstak/verstak-desktop/internal/core/events"
|
||||
corefiles "github.com/verstak/verstak-desktop/internal/core/files"
|
||||
"github.com/verstak/verstak-desktop/internal/core/notifications"
|
||||
"github.com/verstak/verstak-desktop/internal/core/plugin"
|
||||
"github.com/verstak/verstak-desktop/internal/core/storage"
|
||||
syncsvc "github.com/verstak/verstak-desktop/internal/core/sync"
|
||||
|
|
@ -30,44 +27,6 @@ import (
|
|||
"github.com/verstak/verstak-desktop/internal/core/workspace"
|
||||
)
|
||||
|
||||
type fakeNotificationScheduler struct {
|
||||
replaceCalls int
|
||||
clearCalls int
|
||||
startCalls int
|
||||
stopCalls int
|
||||
pluginID string
|
||||
requests []notifications.Request
|
||||
onStart func()
|
||||
onStop func()
|
||||
}
|
||||
|
||||
func (s *fakeNotificationScheduler) Replace(pluginID string, requests []notifications.Request) error {
|
||||
s.replaceCalls++
|
||||
s.pluginID = pluginID
|
||||
s.requests = append([]notifications.Request(nil), requests...)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *fakeNotificationScheduler) Clear(pluginID string) error {
|
||||
s.clearCalls++
|
||||
s.pluginID = pluginID
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *fakeNotificationScheduler) Start(context.Context) {
|
||||
s.startCalls++
|
||||
if s.onStart != nil {
|
||||
s.onStart()
|
||||
}
|
||||
}
|
||||
|
||||
func (s *fakeNotificationScheduler) Stop() {
|
||||
s.stopCalls++
|
||||
if s.onStop != nil {
|
||||
s.onStop()
|
||||
}
|
||||
}
|
||||
|
||||
func newLocalHTTPTestServer(t *testing.T, handler http.Handler) *httptest.Server {
|
||||
t.Helper()
|
||||
|
||||
|
|
@ -118,18 +77,6 @@ func newTestApp(tmpRoot string) *App {
|
|||
}
|
||||
}
|
||||
|
||||
func newNotificationsTestApp(manifest plugin.Manifest) (*App, *fakeNotificationScheduler) {
|
||||
scheduler := &fakeNotificationScheduler{}
|
||||
return &App{
|
||||
plugins: []plugin.Plugin{{
|
||||
Manifest: manifest,
|
||||
Status: plugin.StatusLoaded,
|
||||
Enabled: true,
|
||||
}},
|
||||
notifications: scheduler,
|
||||
}, scheduler
|
||||
}
|
||||
|
||||
func newFilesTestApp(t *testing.T, perms []string) (*App, string) {
|
||||
t.Helper()
|
||||
v := vault.NewVault(nil)
|
||||
|
|
@ -175,12 +122,6 @@ func newSyncFilesTestApp(t *testing.T, perms []string, deviceID string) (*App, s
|
|||
t.Helper()
|
||||
app, root := newFilesTestApp(t, perms)
|
||||
app.syncSvc = syncsvc.NewService(root, deviceID)
|
||||
if _, err := app.syncSvc.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("initial sync snapshot: %v", err)
|
||||
}
|
||||
if err := app.syncSvc.SetBootstrapComplete(true); err != nil {
|
||||
t.Fatalf("mark test sync bootstrap complete: %v", err)
|
||||
}
|
||||
app.appSettings = appsettings.NewManager(filepath.Join(t.TempDir(), "config.json"))
|
||||
if err := app.appSettings.Load(); err != nil {
|
||||
t.Fatalf("settings Load: %v", err)
|
||||
|
|
@ -193,220 +134,6 @@ func newSyncFilesTestApp(t *testing.T, perms []string, deviceID string) (*App, s
|
|||
return app, root
|
||||
}
|
||||
|
||||
func TestReplacePluginNotificationsRequiresCapabilityAndPermission(t *testing.T) {
|
||||
requests := []notifications.Request{{ID: "reminder", DueAt: "2026-07-14T10:00:00Z", Title: "Reminder"}}
|
||||
for _, manifest := range []plugin.Manifest{
|
||||
{ID: "notifications.test", Permissions: []string{"notifications.schedule"}},
|
||||
{ID: "notifications.test", Requires: []string{"verstak/core/notifications/v1"}},
|
||||
} {
|
||||
app, scheduler := newNotificationsTestApp(manifest)
|
||||
if got := app.ReplacePluginNotifications(manifest.ID, requests); got == "" {
|
||||
t.Fatalf("manifest %#v unexpectedly scheduled notifications", manifest)
|
||||
}
|
||||
if scheduler.replaceCalls != 0 {
|
||||
t.Fatalf("rejected request called scheduler %d times", scheduler.replaceCalls)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplaceAndClearPluginNotificationsStayWithinPluginNamespace(t *testing.T) {
|
||||
manifest := plugin.Manifest{
|
||||
ID: "notifications.test",
|
||||
Permissions: []string{"notifications.schedule"},
|
||||
Requires: []string{"verstak/core/notifications/v1"},
|
||||
}
|
||||
app, scheduler := newNotificationsTestApp(manifest)
|
||||
requests := []notifications.Request{{ID: "reminder", DueAt: "2026-07-14T10:00:00Z", Title: "Reminder"}}
|
||||
if got := app.ReplacePluginNotifications(manifest.ID, requests); got != "" {
|
||||
t.Fatalf("ReplacePluginNotifications error = %q", got)
|
||||
}
|
||||
if scheduler.replaceCalls != 1 || scheduler.pluginID != manifest.ID || len(scheduler.requests) != 1 {
|
||||
t.Fatalf("scheduler state = %#v", scheduler)
|
||||
}
|
||||
if got := app.ClearPluginNotifications(manifest.ID); got != "" {
|
||||
t.Fatalf("ClearPluginNotifications error = %q", got)
|
||||
}
|
||||
if scheduler.clearCalls != 1 || scheduler.pluginID != manifest.ID {
|
||||
t.Fatalf("clear state = %#v", scheduler)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReloadPluginsRestoresNotificationCoreCapability(t *testing.T) {
|
||||
app := &App{
|
||||
capRegistry: capability.NewRegistry(),
|
||||
contribRegistry: contribution.NewRegistry(),
|
||||
}
|
||||
|
||||
app.ReloadPlugins()
|
||||
|
||||
if !app.capRegistry.Has("verstak/core/notifications/v1") {
|
||||
t.Fatal("ReloadPlugins did not restore verstak/core/notifications/v1")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDomReadyInitializesNotificationsBeforeScheduler(t *testing.T) {
|
||||
oldInitialize := initializeNativeNotifications
|
||||
defer func() { initializeNativeNotifications = oldInitialize }()
|
||||
|
||||
order := []string{}
|
||||
initializeNativeNotifications = func(context.Context) error {
|
||||
order = append(order, "initialize")
|
||||
return nil
|
||||
}
|
||||
app, scheduler := newNotificationsTestApp(plugin.Manifest{ID: "notifications.test"})
|
||||
scheduler.onStart = func() { order = append(order, "start") }
|
||||
|
||||
app.DomReady(context.Background())
|
||||
|
||||
if got, want := strings.Join(order, ","), "initialize,start"; got != want {
|
||||
t.Fatalf("notification startup order = %q, want %q", got, want)
|
||||
}
|
||||
if scheduler.startCalls != 1 {
|
||||
t.Fatalf("scheduler start calls = %d, want 1", scheduler.startCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDomReadyDoesNotStartSchedulerWhenNotificationInitializationFails(t *testing.T) {
|
||||
oldInitialize := initializeNativeNotifications
|
||||
defer func() { initializeNativeNotifications = oldInitialize }()
|
||||
|
||||
initializeNativeNotifications = func(context.Context) error { return fmt.Errorf("unavailable") }
|
||||
app, scheduler := newNotificationsTestApp(plugin.Manifest{ID: "notifications.test"})
|
||||
|
||||
app.DomReady(context.Background())
|
||||
|
||||
if scheduler.startCalls != 0 {
|
||||
t.Fatalf("scheduler start calls = %d, want 0 when native notifications are unavailable", scheduler.startCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestShutdownStopsSchedulerBeforeCleaningUpNotifications(t *testing.T) {
|
||||
oldCleanup := cleanupNativeNotifications
|
||||
defer func() { cleanupNativeNotifications = oldCleanup }()
|
||||
|
||||
order := []string{}
|
||||
cleanupNativeNotifications = func(context.Context) { order = append(order, "cleanup") }
|
||||
app, scheduler := newNotificationsTestApp(plugin.Manifest{ID: "notifications.test"})
|
||||
scheduler.onStop = func() { order = append(order, "stop") }
|
||||
|
||||
app.Shutdown(context.Background())
|
||||
|
||||
if got, want := strings.Join(order, ","), "stop,cleanup"; got != want {
|
||||
t.Fatalf("notification shutdown order = %q, want %q", got, want)
|
||||
}
|
||||
if scheduler.stopCalls != 1 {
|
||||
t.Fatalf("scheduler stop calls = %d, want 1", scheduler.stopCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNativeNotificationSenderUsesStablePluginScopedID(t *testing.T) {
|
||||
oldSend := sendNativeNotification
|
||||
defer func() { sendNativeNotification = oldSend }()
|
||||
|
||||
var gotTitle, gotBody, gotID string
|
||||
sendNativeNotification = func(_ context.Context, options runtime.NotificationOptions) error {
|
||||
gotID = options.ID
|
||||
gotTitle = options.Title
|
||||
gotBody = options.Body
|
||||
return nil
|
||||
}
|
||||
|
||||
err := NewNativeNotificationSender().Send(context.Background(), notifications.Item{
|
||||
PluginID: "verstak.todo",
|
||||
ID: "task-42",
|
||||
Title: "Todo reminder",
|
||||
Body: "Prepare alpha release",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Send() error = %v", err)
|
||||
}
|
||||
if gotID != "verstak:verstak.todo:task-42" || gotTitle != "Todo reminder" || gotBody != "Prepare alpha release" {
|
||||
t.Fatalf("native notification = id=%q title=%q body=%q", gotID, gotTitle, gotBody)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBeforeCloseAllowsExitUntilTrayIsReady(t *testing.T) {
|
||||
oldHide := hideNativeWindow
|
||||
defer func() { hideNativeWindow = oldHide }()
|
||||
|
||||
hideCalls := 0
|
||||
hideNativeWindow = func(context.Context) { hideCalls++ }
|
||||
app := &App{}
|
||||
|
||||
if prevent := app.BeforeClose(context.Background()); prevent {
|
||||
t.Fatal("BeforeClose() = true, want false while tray is unavailable")
|
||||
}
|
||||
if hideCalls != 0 {
|
||||
t.Fatalf("hide calls = %d, want 0", hideCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBeforeCloseHidesWindowAfterTrayIsReady(t *testing.T) {
|
||||
oldHide := hideNativeWindow
|
||||
defer func() { hideNativeWindow = oldHide }()
|
||||
|
||||
hideCalls := 0
|
||||
hideNativeWindow = func(context.Context) { hideCalls++ }
|
||||
app := &App{}
|
||||
app.SetTrayReady(true)
|
||||
|
||||
if prevent := app.BeforeClose(context.Background()); !prevent {
|
||||
t.Fatal("BeforeClose() = false, want true while tray is ready")
|
||||
}
|
||||
if hideCalls != 1 {
|
||||
t.Fatalf("hide calls = %d, want 1", hideCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTrayQuitAllowsWindowCloseAndQuitsApplication(t *testing.T) {
|
||||
oldQuit := quitNativeApplication
|
||||
defer func() { quitNativeApplication = oldQuit }()
|
||||
|
||||
quitCalls := 0
|
||||
quitNativeApplication = func(context.Context) { quitCalls++ }
|
||||
app := &App{ctx: context.Background()}
|
||||
|
||||
app.Quit()
|
||||
|
||||
if quitCalls != 1 {
|
||||
t.Fatalf("quit calls = %d, want 1", quitCalls)
|
||||
}
|
||||
if prevent := app.BeforeClose(context.Background()); prevent {
|
||||
t.Fatal("BeforeClose() = true after Quit(), want false")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTrayQuitRequestsNativeShutdownOnlyOnce(t *testing.T) {
|
||||
oldQuit := quitNativeApplication
|
||||
defer func() { quitNativeApplication = oldQuit }()
|
||||
|
||||
quitCalls := 0
|
||||
quitNativeApplication = func(context.Context) { quitCalls++ }
|
||||
app := &App{ctx: context.Background()}
|
||||
|
||||
app.Quit()
|
||||
app.Quit()
|
||||
|
||||
if quitCalls != 1 {
|
||||
t.Fatalf("native quit calls = %d, want 1", quitCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestShowWindowUsesWailsContext(t *testing.T) {
|
||||
oldShow := showNativeWindow
|
||||
defer func() { showNativeWindow = oldShow }()
|
||||
|
||||
showCalls := 0
|
||||
showNativeWindow = func(context.Context) { showCalls++ }
|
||||
app := &App{ctx: context.Background()}
|
||||
|
||||
app.ShowWindow()
|
||||
|
||||
if showCalls != 1 {
|
||||
t.Fatalf("show calls = %d, want 1", showCalls)
|
||||
}
|
||||
}
|
||||
|
||||
// TestGetPluginFrontendInfo_KnownPluginWithFrontend verifies that
|
||||
// GetPluginFrontendInfo returns correct metadata for a plugin with a frontend.
|
||||
func TestGetPluginFrontendInfo_KnownPluginWithFrontend(t *testing.T) {
|
||||
|
|
@ -1698,63 +1425,6 @@ func TestApplyRemoteOpSkipsLocalDevice(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestApplyRemoteWorkspaceLifecyclePreservesDurableIdentity(t *testing.T) {
|
||||
app, root := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
app.workspace = workspace.NewManager(root)
|
||||
if err := app.workspace.Load(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
workspaceID := "5f0f96d9-61c8-4b6b-8c3a-a1b9a0f40002"
|
||||
payload := syncWorkspacePayload{
|
||||
WorkspaceID: workspaceID,
|
||||
Path: "Remote",
|
||||
Name: "Remote",
|
||||
Metadata: workspace.Metadata{
|
||||
WorkspaceID: workspaceID,
|
||||
WorkspaceName: "Remote",
|
||||
Folders: map[string]string{"notes": "Notes"},
|
||||
Features: map[string]bool{"files": true},
|
||||
},
|
||||
}
|
||||
encoded, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
create := syncsvc.Op{OpID: "workspace-create", DeviceID: "remote-device", EntityType: syncsvc.EntityWorkspace, EntityID: workspaceID, OpType: syncsvc.OpCreate, PayloadJSON: string(encoded)}
|
||||
if err := app.applyRemoteOp(create); err != nil {
|
||||
t.Fatalf("apply workspace create: %v", err)
|
||||
}
|
||||
if err := app.applyRemoteOp(create); err != nil {
|
||||
t.Fatalf("replay workspace create: %v", err)
|
||||
}
|
||||
if identity, err := app.workspace.GetWorkspaceIdentity("Remote"); err != nil || identity.WorkspaceID != workspaceID {
|
||||
t.Fatalf("remote workspace identity = %+v err=%v", identity, err)
|
||||
}
|
||||
|
||||
payload.PreviousPath = "Remote"
|
||||
payload.Path = "Remote-Renamed"
|
||||
payload.Name = "Remote-Renamed"
|
||||
encoded, _ = json.Marshal(payload)
|
||||
rename := syncsvc.Op{OpID: "workspace-rename", DeviceID: "remote-device", EntityType: syncsvc.EntityWorkspace, EntityID: workspaceID, OpType: syncsvc.OpRename, PayloadJSON: string(encoded)}
|
||||
if err := app.applyRemoteOp(rename); err != nil {
|
||||
t.Fatalf("apply workspace rename: %v", err)
|
||||
}
|
||||
trash := syncsvc.Op{OpID: "workspace-trash", DeviceID: "remote-device", EntityType: syncsvc.EntityWorkspace, EntityID: workspaceID, OpType: syncsvc.OpTrash, PayloadJSON: string(encoded)}
|
||||
if err := app.applyRemoteOp(trash); err != nil {
|
||||
t.Fatalf("apply workspace trash: %v", err)
|
||||
}
|
||||
payload.Path = "Remote-Restored"
|
||||
payload.Name = "Remote-Restored"
|
||||
encoded, _ = json.Marshal(payload)
|
||||
restore := syncsvc.Op{OpID: "workspace-restore", DeviceID: "remote-device", EntityType: syncsvc.EntityWorkspace, EntityID: workspaceID, OpType: syncsvc.OpRestore, PayloadJSON: string(encoded)}
|
||||
if err := app.applyRemoteOp(restore); err != nil {
|
||||
t.Fatalf("apply workspace restore: %v", err)
|
||||
}
|
||||
if identity, err := app.workspace.GetWorkspaceIdentity("Remote-Restored"); err != nil || identity.WorkspaceID != workspaceID {
|
||||
t.Fatalf("restored workspace identity = %+v err=%v", identity, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFileBridgeRecordsSyncOps(t *testing.T) {
|
||||
app, _ := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
|
||||
|
|
@ -1781,8 +1451,8 @@ func TestFileBridgeRecordsSyncOps(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatalf("GetUnpushedOps: %v", err)
|
||||
}
|
||||
if len(ops) != 7 {
|
||||
t.Fatalf("ops len = %d, want 7: %#v", len(ops), ops)
|
||||
if len(ops) != 6 {
|
||||
t.Fatalf("ops len = %d, want 6: %#v", len(ops), ops)
|
||||
}
|
||||
|
||||
want := []struct {
|
||||
|
|
@ -1794,11 +1464,8 @@ func TestFileBridgeRecordsSyncOps(t *testing.T) {
|
|||
{syncsvc.EntityFolder, "Docs", syncsvc.OpCreate, `"path":"Docs"`},
|
||||
{syncsvc.EntityFile, "Docs/one.txt", syncsvc.OpCreate, `"content":"hello"`},
|
||||
{syncsvc.EntityFile, "Docs/one.txt", syncsvc.OpUpdate, `"content":"updated"`},
|
||||
{syncsvc.EntityFile, "Docs/image.bin", syncsvc.OpCreate, `"blob":{"sha256":`},
|
||||
// Snapshot reconciliation represents external and API renames uniformly
|
||||
// as a create at the destination followed by a delete at the source.
|
||||
{syncsvc.EntityFile, "Docs/two.txt", syncsvc.OpCreate, `"content":"updated"`},
|
||||
{syncsvc.EntityFile, "Docs/one.txt", syncsvc.OpDelete, `"path":"Docs/one.txt"`},
|
||||
{syncsvc.EntityFile, "Docs/image.bin", syncsvc.OpCreate, `"dataBase64":"AQID"`},
|
||||
{syncsvc.EntityFile, "Docs/one.txt", syncsvc.OpMove, `"toPath":"Docs/two.txt"`},
|
||||
{syncsvc.EntityFile, "Docs/two.txt", syncsvc.OpDelete, `"path":"Docs/two.txt"`},
|
||||
}
|
||||
for i, w := range want {
|
||||
|
|
@ -1920,8 +1587,8 @@ func TestSyncNowPushesLocalOpsAndAppliesPulledFileOps(t *testing.T) {
|
|||
t.Fatalf("pushed ops len = %d, want 2", len(pushedOps))
|
||||
}
|
||||
for i, op := range pushedOps {
|
||||
if op.LastSeenServerSeq != 2 {
|
||||
t.Fatalf("pushed op[%d] last seen = %d, want 2 after initial pull", i, op.LastSeenServerSeq)
|
||||
if op.LastSeenServerSeq != 0 {
|
||||
t.Fatalf("pushed op[%d] last seen = %d, want 0", i, op.LastSeenServerSeq)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1948,369 +1615,6 @@ func TestSyncNowPushesLocalOpsAndAppliesPulledFileOps(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestSyncNowAppliesEveryPullPageInOrder(t *testing.T) {
|
||||
app, root := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
server := newLocalHTTPTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != "Bearer device-token" {
|
||||
http.Error(w, "missing auth", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
switch r.URL.Path {
|
||||
case "/api/v1/sync/pull":
|
||||
var request syncsvc.PullRequest
|
||||
if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
pages := map[int]map[string]interface{}{
|
||||
0: {"server_sequence": 3, "page_last_sequence": 1, "has_more": true, "ops": []map[string]interface{}{{"op_id": "folder", "server_sequence": 1, "device_id": "remote", "entity_type": syncsvc.EntityFolder, "entity_id": "Remote", "op_type": syncsvc.OpCreate, "payload_json": `{"path":"Remote"}`}}},
|
||||
1: {"server_sequence": 3, "page_last_sequence": 2, "has_more": true, "ops": []map[string]interface{}{{"op_id": "one", "server_sequence": 2, "device_id": "remote", "entity_type": syncsvc.EntityFile, "entity_id": "Remote/one.txt", "op_type": syncsvc.OpCreate, "payload_json": `{"path":"Remote/one.txt","content":"one"}`}}},
|
||||
2: {"server_sequence": 3, "page_last_sequence": 3, "has_more": false, "ops": []map[string]interface{}{{"op_id": "two", "server_sequence": 3, "device_id": "remote", "entity_type": syncsvc.EntityFile, "entity_id": "Remote/two.txt", "op_type": syncsvc.OpCreate, "payload_json": `{"path":"Remote/two.txt","content":"two"}`}}},
|
||||
3: {"server_sequence": 3, "page_last_sequence": 3, "has_more": false, "ops": []map[string]interface{}{}},
|
||||
}
|
||||
_ = json.NewEncoder(w).Encode(pages[request.SinceSequence])
|
||||
case "/api/v1/sync/push":
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{"accepted": []string{}, "count": 0, "conflicts": []map[string]interface{}{}})
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
if err := app.syncSvc.SetState(server.URL, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := syncsvc.SaveDeviceToken(root, "device-token"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
result, err := app.syncNow()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result["pulled"] != 3 {
|
||||
t.Fatalf("pull result = %#v, want three operations", result)
|
||||
}
|
||||
expectText(t, app, "Remote/one.txt", "one")
|
||||
expectText(t, app, "Remote/two.txt", "two")
|
||||
assertLastPullSequence(t, app.syncSvc, 3)
|
||||
}
|
||||
|
||||
func TestSyncNowStopsAtFailedRemoteOperationAndRetriesAfterRestart(t *testing.T) {
|
||||
app, root := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
pullCalls := 0
|
||||
server := newLocalHTTPTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != "Bearer device-token" {
|
||||
http.Error(w, "missing auth", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
switch r.URL.Path {
|
||||
case "/api/v1/sync/pull":
|
||||
pullCalls++
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{
|
||||
"server_sequence": 3,
|
||||
"ops": []map[string]interface{}{
|
||||
{
|
||||
"op_id": "remote-folder",
|
||||
"server_sequence": 1,
|
||||
"device_id": "remote-device",
|
||||
"entity_type": syncsvc.EntityFolder,
|
||||
"entity_id": "Remote",
|
||||
"op_type": syncsvc.OpCreate,
|
||||
"payload_json": `{"path":"Remote"}`,
|
||||
},
|
||||
{
|
||||
"op_id": "blocked-file",
|
||||
"server_sequence": 2,
|
||||
"device_id": "remote-device",
|
||||
"entity_type": syncsvc.EntityFile,
|
||||
"entity_id": "Missing/blocked.txt",
|
||||
"op_type": syncsvc.OpCreate,
|
||||
"payload_json": `{"path":"Missing/blocked.txt","content":"blocked"}`,
|
||||
},
|
||||
{
|
||||
"op_id": "after-failure",
|
||||
"server_sequence": 3,
|
||||
"device_id": "remote-device",
|
||||
"entity_type": syncsvc.EntityFile,
|
||||
"entity_id": "Remote/after.txt",
|
||||
"op_type": syncsvc.OpCreate,
|
||||
"payload_json": `{"path":"Remote/after.txt","content":"must wait"}`,
|
||||
},
|
||||
},
|
||||
})
|
||||
case "/api/v1/sync/push":
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{"accepted": []string{}, "count": 0, "conflicts": []map[string]interface{}{}})
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
if err := app.syncSvc.SetState(server.URL, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := syncsvc.SaveDeviceToken(root, "device-token"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if _, err := app.syncNow(); err == nil || !strings.Contains(err.Error(), "sequence 2") {
|
||||
t.Fatalf("first sync error = %v, want failed sequence", err)
|
||||
}
|
||||
assertLastPullSequence(t, app.syncSvc, 1)
|
||||
if _, errStr := app.GetVaultFileMetadata("files.plugin", "Remote/after.txt"); !strings.Contains(errStr, "not-found") {
|
||||
t.Fatalf("operation after failure applied early: %q", errStr)
|
||||
}
|
||||
cfg := app.appSettings.Get()
|
||||
if cfg.Sync.LastError == "" || !strings.Contains(cfg.Sync.LastError, "sequence 2") || !strings.Contains(cfg.Sync.LastError, "Missing/blocked.txt") {
|
||||
t.Fatalf("sync status after failed apply = %#v", cfg.Sync)
|
||||
}
|
||||
|
||||
if err := os.Mkdir(filepath.Join(root, "Missing"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
restarted := &App{
|
||||
vault: app.vault,
|
||||
files: app.files,
|
||||
plugins: app.plugins,
|
||||
appSettings: app.appSettings,
|
||||
syncSvc: syncsvc.NewService(root, ""),
|
||||
}
|
||||
if _, err := restarted.syncNow(); err != nil {
|
||||
t.Fatalf("retry after restart: %v", err)
|
||||
}
|
||||
if pullCalls < 2 {
|
||||
t.Fatalf("pull calls = %d, want retry", pullCalls)
|
||||
}
|
||||
assertLastPullSequence(t, restarted.syncSvc, 3)
|
||||
expectText(t, restarted, "Missing/blocked.txt", "blocked")
|
||||
expectText(t, restarted, "Remote/after.txt", "must wait")
|
||||
}
|
||||
|
||||
func TestSyncNowBootstrapsExistingLocalSnapshotAfterInitialPull(t *testing.T) {
|
||||
app, root := newFilesTestApp(t, []string{"files.read", "files.write", "files.delete"})
|
||||
if err := os.Mkdir(filepath.Join(root, "Existing"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "Existing", "before-connect.txt"), []byte("local before connect"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
app.syncSvc = syncsvc.NewService(root, "local-device")
|
||||
if _, err := app.syncSvc.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("initial baseline scan: %v", err)
|
||||
}
|
||||
app.appSettings = appsettings.NewManager(filepath.Join(t.TempDir(), "config.json"))
|
||||
if err := app.appSettings.Load(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var pushed []syncsvc.PushOp
|
||||
server := newLocalHTTPTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != "Bearer device-token" {
|
||||
http.Error(w, "missing auth", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
switch r.URL.Path {
|
||||
case "/api/v1/sync/pull":
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{"server_sequence": 0, "ops": []map[string]interface{}{}})
|
||||
case "/api/v1/sync/push":
|
||||
var request struct {
|
||||
Ops []syncsvc.PushOp `json:"ops"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
pushed = request.Ops
|
||||
accepted := make([]string, 0, len(request.Ops))
|
||||
for _, op := range request.Ops {
|
||||
accepted = append(accepted, op.OpID)
|
||||
}
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{"accepted": accepted, "count": len(accepted), "conflicts": []map[string]interface{}{}})
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
if err := app.syncSvc.SetState(server.URL, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := syncsvc.SaveDeviceToken(root, "device-token"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
result, err := app.syncNow()
|
||||
if err != nil {
|
||||
t.Fatalf("syncNow: %v", err)
|
||||
}
|
||||
if result["pushed"] != len(pushed) || len(pushed) < 2 {
|
||||
t.Fatalf("result=%#v pushed=%#v, want initial entries", result, pushed)
|
||||
}
|
||||
foundFolder, foundFile := false, false
|
||||
for _, op := range pushed {
|
||||
if op.EntityID == "Existing" && op.EntityType == syncsvc.EntityFolder && op.OpType == syncsvc.OpCreate {
|
||||
foundFolder = true
|
||||
}
|
||||
if op.EntityID == "Existing/before-connect.txt" && op.EntityType == syncsvc.EntityFile && op.OpType == syncsvc.OpCreate {
|
||||
foundFile = true
|
||||
}
|
||||
if strings.Contains(op.EntityID, "/.verstak/") {
|
||||
t.Fatalf("ordinary bootstrap operation leaked internal path: %+v", op)
|
||||
}
|
||||
}
|
||||
if !foundFolder || !foundFile {
|
||||
t.Fatalf("bootstrap push = %#v, missing existing file or folder", pushed)
|
||||
}
|
||||
bootstrapped, err := app.syncSvc.BootstrapComplete()
|
||||
if err != nil || !bootstrapped {
|
||||
t.Fatalf("bootstrap complete = %v err=%v", bootstrapped, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInitialSyncConflictDoesNotOverwriteLocalFileOrAdvanceCursor(t *testing.T) {
|
||||
app, root := newFilesTestApp(t, []string{"files.read", "files.write", "files.delete"})
|
||||
if err := os.WriteFile(filepath.Join(root, "same-name.txt"), []byte("local value"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
app.syncSvc = syncsvc.NewService(root, "local-device")
|
||||
if _, err := app.syncSvc.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("initial baseline scan: %v", err)
|
||||
}
|
||||
app.appSettings = appsettings.NewManager(filepath.Join(t.TempDir(), "config.json"))
|
||||
if err := app.appSettings.Load(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
pushCalls := 0
|
||||
server := newLocalHTTPTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != "Bearer device-token" {
|
||||
http.Error(w, "missing auth", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
switch r.URL.Path {
|
||||
case "/api/v1/sync/pull":
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{
|
||||
"server_sequence": 1,
|
||||
"ops": []map[string]interface{}{{
|
||||
"op_id": "remote-update",
|
||||
"server_sequence": 1,
|
||||
"device_id": "remote-device",
|
||||
"entity_type": syncsvc.EntityFile,
|
||||
"entity_id": "same-name.txt",
|
||||
"op_type": syncsvc.OpUpdate,
|
||||
"payload_json": `{"path":"same-name.txt","content":"remote value"}`,
|
||||
}},
|
||||
})
|
||||
case "/api/v1/sync/push":
|
||||
pushCalls++
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{"accepted": []string{}, "count": 0, "conflicts": []map[string]interface{}{}})
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
if err := app.syncSvc.SetState(server.URL, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := syncsvc.SaveDeviceToken(root, "device-token"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if _, err := app.syncNow(); err == nil || !strings.Contains(err.Error(), "initial reconciliation") || !strings.Contains(err.Error(), "same-name.txt") {
|
||||
t.Fatalf("sync error = %v, want explicit initial conflict", err)
|
||||
}
|
||||
expectText(t, app, "same-name.txt", "local value")
|
||||
assertLastPullSequence(t, app.syncSvc, 0)
|
||||
if pushCalls != 0 {
|
||||
t.Fatalf("push calls = %d, conflict must not overwrite remote state", pushCalls)
|
||||
}
|
||||
bootstrapped, err := app.syncSvc.BootstrapComplete()
|
||||
if err != nil || bootstrapped {
|
||||
t.Fatalf("bootstrap state = %v err=%v, conflict must remain unresolved", bootstrapped, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInitialSyncEmptyVaultRestoresRemoteDataWithoutDeletePush(t *testing.T) {
|
||||
app, root := newFilesTestApp(t, []string{"files.read", "files.write", "files.delete"})
|
||||
app.syncSvc = syncsvc.NewService(root, "empty-device")
|
||||
if _, err := app.syncSvc.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("initial empty baseline: %v", err)
|
||||
}
|
||||
app.appSettings = appsettings.NewManager(filepath.Join(t.TempDir(), "config.json"))
|
||||
if err := app.appSettings.Load(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var pushed []syncsvc.PushOp
|
||||
server := newLocalHTTPTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != "Bearer device-token" {
|
||||
http.Error(w, "missing auth", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
switch r.URL.Path {
|
||||
case "/api/v1/sync/pull":
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{
|
||||
"server_sequence": 1,
|
||||
"ops": []map[string]interface{}{{
|
||||
"op_id": "remote-file",
|
||||
"server_sequence": 1,
|
||||
"device_id": "remote-device",
|
||||
"entity_type": syncsvc.EntityFile,
|
||||
"entity_id": "restored.txt",
|
||||
"op_type": syncsvc.OpCreate,
|
||||
"payload_json": `{"path":"restored.txt","content":"from remote"}`,
|
||||
}},
|
||||
})
|
||||
case "/api/v1/sync/push":
|
||||
var request struct {
|
||||
Ops []syncsvc.PushOp `json:"ops"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
pushed = append(pushed, request.Ops...)
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{"accepted": []string{}, "count": 0, "conflicts": []map[string]interface{}{}})
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
if err := app.syncSvc.SetState(server.URL, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := syncsvc.SaveDeviceToken(root, "device-token"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
result, err := app.syncNow()
|
||||
if err != nil {
|
||||
t.Fatalf("sync empty vault: %v", err)
|
||||
}
|
||||
expectText(t, app, "restored.txt", "from remote")
|
||||
for _, op := range pushed {
|
||||
if op.OpType == syncsvc.OpDelete {
|
||||
t.Fatalf("empty vault published delete operation: %+v", op)
|
||||
}
|
||||
}
|
||||
if result["pushed"] != 0 && len(pushed) == 0 {
|
||||
t.Fatalf("result reports pushed operations without a push payload: %#v", result)
|
||||
}
|
||||
assertLastPullSequence(t, app.syncSvc, 1)
|
||||
}
|
||||
|
||||
func assertLastPullSequence(t *testing.T, service *syncsvc.Service, want int) {
|
||||
t.Helper()
|
||||
_, _, got, _, err := service.GetState()
|
||||
if err != nil {
|
||||
t.Fatalf("GetState: %v", err)
|
||||
}
|
||||
if got != want {
|
||||
t.Fatalf("last pull sequence = %d, want %d", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSyncConfigurePairsCurrentVaultID(t *testing.T) {
|
||||
app, _ := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
meta := app.vault.GetVaultMeta()
|
||||
|
|
@ -2340,7 +1644,7 @@ func TestSyncConfigurePairsCurrentVaultID(t *testing.T) {
|
|||
}))
|
||||
defer server.Close()
|
||||
|
||||
if err := app.syncConfigure(server.URL, "alice", "secret", ""); err != nil {
|
||||
if err := app.syncConfigure(server.URL, "alice", "secret"); err != nil {
|
||||
t.Fatalf("syncConfigure: %v", err)
|
||||
}
|
||||
if pairedVaultID != meta.VaultID {
|
||||
|
|
@ -2348,79 +1652,6 @@ func TestSyncConfigurePairsCurrentVaultID(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestSyncConfigurePairsSpecifiedRemoteVaultID(t *testing.T) {
|
||||
app, _ := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
const remoteVaultID = "existing-remote-vault"
|
||||
var pairedVaultID string
|
||||
server := newLocalHTTPTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path != "/api/client/pair" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
var request struct {
|
||||
VaultID string `json:"vault_id"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
pairedVaultID = request.VaultID
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_ = json.NewEncoder(w).Encode(map[string]string{
|
||||
"device_id": "paired-device",
|
||||
"device_token": "paired-token",
|
||||
})
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
if err := app.syncConfigure(server.URL, "alice", "secret", remoteVaultID); err != nil {
|
||||
t.Fatalf("syncConfigure: %v", err)
|
||||
}
|
||||
if pairedVaultID != remoteVaultID {
|
||||
t.Fatalf("paired vault ID = %q, want %q", pairedVaultID, remoteVaultID)
|
||||
}
|
||||
storedRemoteVaultID, err := app.syncSvc.RemoteVaultID()
|
||||
if err != nil || storedRemoteVaultID != remoteVaultID {
|
||||
t.Fatalf("stored remote vault ID = %q err=%v, want %q", storedRemoteVaultID, err, remoteVaultID)
|
||||
}
|
||||
bootstrapped, err := app.syncSvc.BootstrapComplete()
|
||||
if err != nil || bootstrapped {
|
||||
t.Fatalf("bootstrap state after new pairing = %v err=%v, want false", bootstrapped, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSyncConfigureRefusesRemoteScopeChangeWithUnpushedOperations(t *testing.T) {
|
||||
app, _ := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
if err := app.syncSvc.SetState("https://old-sync.example.test", ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := app.syncSvc.SetRemoteVaultID("old-remote-vault"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := app.syncSvc.RecordOp(syncsvc.EntityFile, "pending.txt", syncsvc.OpCreate, map[string]string{"path": "pending.txt", "content": "local"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
err := app.syncConfigure("https://new-sync.example.test", "alice", "secret", "new-remote-vault")
|
||||
if err == nil || !strings.Contains(err.Error(), "unpushed local operation") {
|
||||
t.Fatalf("scope-change error = %v, want pending-operation refusal", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSyncStatusExposesPersistentScannerWarning(t *testing.T) {
|
||||
app, _ := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "local-device")
|
||||
if err := app.syncSvc.SetLastWarning("file-too-large: archive.bin"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
status, err := app.syncStatus()
|
||||
if err != nil {
|
||||
t.Fatalf("syncStatus: %v", err)
|
||||
}
|
||||
if status.LastWarning != "file-too-large: archive.bin" {
|
||||
t.Fatalf("last warning = %q", status.LastWarning)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSyncNowHydratesLegacyVaultDeviceID(t *testing.T) {
|
||||
app, root := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, "wrong-global-device")
|
||||
var pushedDeviceID string
|
||||
|
|
@ -2624,6 +1855,9 @@ func TestSetCurrentVaultInitializesWorkspaceWhenMissingAtStartup(t *testing.T) {
|
|||
if len(nodes) == 0 {
|
||||
t.Fatal("workspace nodes should not be empty")
|
||||
}
|
||||
if nodes[0].Path != "" {
|
||||
t.Fatalf("compatibility node should not expose workspace path mapping: %+v", nodes[0])
|
||||
}
|
||||
if !app.capRegistry.Has("verstak/core/workspace/v1") {
|
||||
t.Fatal("workspace capability should be registered after SetCurrentVault")
|
||||
}
|
||||
|
|
@ -2902,11 +2136,11 @@ func TestMoveWorkspaceNodeCompatibilityIsUnsupported(t *testing.T) {
|
|||
}
|
||||
|
||||
errStr := app.MoveWorkspaceNode("Project", "Test")
|
||||
if errStr == "" || !strings.Contains(errStr, "parent-is-workspace") {
|
||||
t.Fatalf("MoveWorkspaceNode error = %q, want parent-is-workspace", errStr)
|
||||
if errStr == "" || !strings.Contains(errStr, "top-level only") {
|
||||
t.Fatalf("MoveWorkspaceNode error = %q, want top-level only", errStr)
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(vaultDir, "Test", "Project")); !os.IsNotExist(err) {
|
||||
t.Fatalf("MoveWorkspaceNode created nested workspace inside another workspace, stat err=%v", err)
|
||||
t.Fatalf("MoveWorkspaceNode created nested mapped workspace, stat err=%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
corefiles "github.com/verstak/verstak-desktop/internal/core/files"
|
||||
"github.com/verstak/verstak-desktop/internal/core/workspace"
|
||||
)
|
||||
|
||||
func TestSyncNowAgainstRealServerTwoVaults(t *testing.T) {
|
||||
|
|
@ -21,16 +18,8 @@ func TestSyncNowAgainstRealServerTwoVaults(t *testing.T) {
|
|||
t.Skip("set VERSTAK_SYNC_SMOKE_* env vars to run the real sync-server smoke test")
|
||||
}
|
||||
|
||||
appA, rootA := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, deviceA)
|
||||
appB, rootB := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, deviceB)
|
||||
appA.workspace = workspace.NewManager(rootA)
|
||||
appB.workspace = workspace.NewManager(rootB)
|
||||
if err := appA.workspace.Load(); err != nil {
|
||||
t.Fatalf("load workspace A: %v", err)
|
||||
}
|
||||
if err := appB.workspace.Load(); err != nil {
|
||||
t.Fatalf("load workspace B: %v", err)
|
||||
}
|
||||
appA, _ := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, deviceA)
|
||||
appB, _ := newSyncFilesTestApp(t, []string{"files.read", "files.write", "files.delete"}, deviceB)
|
||||
if err := appA.syncSvc.SetState(serverURL, apiKeyA); err != nil {
|
||||
t.Fatalf("appA SetState: %v", err)
|
||||
}
|
||||
|
|
@ -54,8 +43,8 @@ func TestSyncNowAgainstRealServerTwoVaults(t *testing.T) {
|
|||
if errStr := appB.MoveVaultPath("files.plugin", "Shared/one.txt", "Shared/two.txt", corefiles.MoveOptions{}); errStr != "" {
|
||||
t.Fatalf("appB move: %s", errStr)
|
||||
}
|
||||
expectSyncCounts(t, appB, 3, 3)
|
||||
expectSyncCounts(t, appA, 0, 3)
|
||||
expectSyncCounts(t, appB, 2, 2)
|
||||
expectSyncCounts(t, appA, 0, 2)
|
||||
expectText(t, appA, "Shared/two.txt", "from B")
|
||||
|
||||
if _, errStr := appA.TrashVaultPath("files.plugin", "Shared/two.txt"); errStr != "" {
|
||||
|
|
@ -79,8 +68,8 @@ func TestSyncNowAgainstRealServerTwoVaults(t *testing.T) {
|
|||
if errStr := appA.MoveVaultPath("files.plugin", "Shared/Folder", "Shared/Archive", corefiles.MoveOptions{}); errStr != "" {
|
||||
t.Fatalf("appA move folder: %s", errStr)
|
||||
}
|
||||
expectSyncCounts(t, appA, 2, 2)
|
||||
expectSyncCounts(t, appB, 0, 2)
|
||||
expectSyncCounts(t, appA, 1, 1)
|
||||
expectSyncCounts(t, appB, 0, 1)
|
||||
if _, errStr := appB.GetVaultFileMetadata("files.plugin", "Shared/Folder"); !strings.Contains(errStr, "not-found") {
|
||||
t.Fatalf("appB moved folder old metadata err = %q, want not-found", errStr)
|
||||
}
|
||||
|
|
@ -96,83 +85,6 @@ func TestSyncNowAgainstRealServerTwoVaults(t *testing.T) {
|
|||
if _, errStr := appA.GetVaultFileMetadata("files.plugin", "Shared/Archive"); !strings.Contains(errStr, "not-found") {
|
||||
t.Fatalf("appA deleted folder metadata err = %q, want not-found", errStr)
|
||||
}
|
||||
|
||||
if err := os.WriteFile(filepath.Join(rootA, "Shared", "external.txt"), []byte("external while running"), 0o644); err != nil {
|
||||
t.Fatalf("external create: %v", err)
|
||||
}
|
||||
expectSyncCounts(t, appA, 1, 1)
|
||||
expectSyncCounts(t, appB, 0, 1)
|
||||
expectText(t, appB, "Shared/external.txt", "external while running")
|
||||
assertNoUnpushedOps(t, appB)
|
||||
|
||||
// This exceeds the former 8 MiB inline/base64 ceiling. The operation must
|
||||
// contain only a blob reference; the actual bytes travel through Blob API.
|
||||
binary := make([]byte, corefiles.MaxBinaryReadBytes+1)
|
||||
for i := range binary {
|
||||
binary[i] = byte(i % 251)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(rootA, "Shared", "large.bin"), binary, 0o644); err != nil {
|
||||
t.Fatalf("write large binary: %v", err)
|
||||
}
|
||||
expectSyncCounts(t, appA, 1, 1)
|
||||
expectSyncCounts(t, appB, 0, 1)
|
||||
received, err := os.ReadFile(filepath.Join(rootB, "Shared", "large.bin"))
|
||||
if err != nil {
|
||||
t.Fatalf("read synced large binary: %v", err)
|
||||
}
|
||||
if !bytes.Equal(received, binary) {
|
||||
t.Fatal("large binary content differs after blob sync")
|
||||
}
|
||||
assertNoUnpushedOps(t, appB)
|
||||
|
||||
if err := os.WriteFile(filepath.Join(rootB, "Shared", "external.txt"), []byte("external while closed"), 0o644); err != nil {
|
||||
t.Fatalf("offline external update: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(rootB, "Shared", "offline-created.txt"), []byte("created while closed"), 0o644); err != nil {
|
||||
t.Fatalf("offline external create: %v", err)
|
||||
}
|
||||
if err := os.Remove(filepath.Join(rootB, "Shared", "external.txt")); err != nil {
|
||||
t.Fatalf("offline external delete: %v", err)
|
||||
}
|
||||
expectSyncCounts(t, appB, 2, 2)
|
||||
expectSyncCounts(t, appA, 0, 2)
|
||||
if _, errStr := appA.GetVaultFileMetadata("files.plugin", "Shared/external.txt"); !strings.Contains(errStr, "not-found") {
|
||||
t.Fatalf("offline deleted file remained on appA: %q", errStr)
|
||||
}
|
||||
expectText(t, appA, "Shared/offline-created.txt", "created while closed")
|
||||
assertNoUnpushedOps(t, appA)
|
||||
|
||||
deal, errStr := appA.CreateWorkspace("Synced Deal", "minimal")
|
||||
if errStr != "" {
|
||||
t.Fatalf("appA CreateWorkspace: %s", errStr)
|
||||
}
|
||||
expectSyncCounts(t, appA, 1, 1)
|
||||
expectSyncCounts(t, appB, 0, 1)
|
||||
assertWorkspaceIdentity(t, appB, "Synced Deal", deal.ID)
|
||||
|
||||
if errStr := appA.RenameWorkspace("Synced Deal", "Renamed Deal"); errStr != "" {
|
||||
t.Fatalf("appA RenameWorkspace: %s", errStr)
|
||||
}
|
||||
expectSyncCounts(t, appA, 1, 1)
|
||||
expectSyncCounts(t, appB, 0, 1)
|
||||
assertWorkspaceIdentity(t, appB, "Renamed Deal", deal.ID)
|
||||
|
||||
trash, errStr := appA.TrashWorkspace("Renamed Deal")
|
||||
if errStr != "" {
|
||||
t.Fatalf("appA TrashWorkspace: %s", errStr)
|
||||
}
|
||||
expectSyncCounts(t, appA, 1, 1)
|
||||
expectSyncCounts(t, appB, 0, 1)
|
||||
if _, err := appB.workspace.GetWorkspaceIdentity("Renamed Deal"); err == nil {
|
||||
t.Fatal("trashed workspace is still active on appB")
|
||||
}
|
||||
|
||||
if _, errStr := appA.RestoreWorkspaceTrash(trash.TrashID, "Restored Deal"); errStr != "" {
|
||||
t.Fatalf("appA RestoreWorkspaceTrash: %s", errStr)
|
||||
}
|
||||
expectSyncCounts(t, appA, 1, 1)
|
||||
expectSyncCounts(t, appB, 0, 1)
|
||||
assertWorkspaceIdentity(t, appB, "Restored Deal", deal.ID)
|
||||
}
|
||||
|
||||
func expectSyncCounts(t *testing.T, app *App, pushed, pulled int) {
|
||||
|
|
@ -196,25 +108,3 @@ func expectText(t *testing.T, app *App, path, want string) {
|
|||
t.Fatalf("ReadVaultTextFile(%s) = %q, want %q", path, text, want)
|
||||
}
|
||||
}
|
||||
|
||||
func assertNoUnpushedOps(t *testing.T, app *App) {
|
||||
t.Helper()
|
||||
ops, err := app.syncSvc.GetUnpushedOps()
|
||||
if err != nil {
|
||||
t.Fatalf("GetUnpushedOps: %v", err)
|
||||
}
|
||||
if len(ops) != 0 {
|
||||
t.Fatalf("remote operations were echoed as local operations: %#v", ops)
|
||||
}
|
||||
}
|
||||
|
||||
func assertWorkspaceIdentity(t *testing.T, app *App, name, wantID string) {
|
||||
t.Helper()
|
||||
identity, err := app.workspace.GetWorkspaceIdentity(name)
|
||||
if err != nil {
|
||||
t.Fatalf("GetWorkspaceIdentity(%s): %v", name, err)
|
||||
}
|
||||
if identity.WorkspaceID != wantID {
|
||||
t.Fatalf("workspace %s ID = %s, want %s", name, identity.WorkspaceID, wantID)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,10 +78,9 @@ type WindowState struct {
|
|||
|
||||
// Manager provides thread-safe access to app settings.
|
||||
type Manager struct {
|
||||
mu sync.RWMutex
|
||||
config *Config
|
||||
configPath string
|
||||
onLanguageChanged func(string)
|
||||
mu sync.RWMutex
|
||||
config *Config
|
||||
configPath string
|
||||
}
|
||||
|
||||
// DefaultConfigPath returns the default path for app settings.
|
||||
|
|
@ -231,32 +230,13 @@ func (m *Manager) UpdateLanguage(language string) error {
|
|||
}
|
||||
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if m.config == nil {
|
||||
m.config = defaultConfig()
|
||||
}
|
||||
m.config.Language = language
|
||||
m.config.LastOpenedAt = time.Now().UTC().Format(time.RFC3339)
|
||||
err := m.saveLocked()
|
||||
handler := m.onLanguageChanged
|
||||
m.mu.Unlock()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if handler != nil {
|
||||
handler(language)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetLanguageChangedHandler registers the shell callback invoked after a
|
||||
// language preference has been durably updated.
|
||||
func (m *Manager) SetLanguageChangedHandler(handler func(string)) {
|
||||
if m == nil {
|
||||
return
|
||||
}
|
||||
m.mu.Lock()
|
||||
m.onLanguageChanged = handler
|
||||
m.mu.Unlock()
|
||||
return m.saveLocked()
|
||||
}
|
||||
|
||||
// UpdateSync replaces sync settings without changing unrelated app settings.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package appsettings
|
|||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
|
|
@ -75,34 +74,6 @@ func TestUpdateLanguagePersistsAndPreservesUnrelatedSettings(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestUpdateLanguageNotifiesTheDesktopShellAfterPersisting(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "config.json")
|
||||
manager := NewManager(path)
|
||||
if err := manager.Load(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var received []string
|
||||
manager.SetLanguageChangedHandler(func(language string) {
|
||||
received = append(received, language)
|
||||
})
|
||||
if err := manager.UpdateLanguage(LanguageRussian); err != nil {
|
||||
t.Fatalf("UpdateLanguage: %v", err)
|
||||
}
|
||||
if got := manager.Get().Language; got != LanguageRussian {
|
||||
t.Fatalf("persisted language = %q, want %q", got, LanguageRussian)
|
||||
}
|
||||
if !reflect.DeepEqual(received, []string{LanguageRussian}) {
|
||||
t.Fatalf("language notifications = %#v, want [%q]", received, LanguageRussian)
|
||||
}
|
||||
if err := manager.UpdateLanguage("de"); err == nil {
|
||||
t.Fatal("UpdateLanguage(de) succeeded, want validation failure")
|
||||
}
|
||||
if !reflect.DeepEqual(received, []string{LanguageRussian}) {
|
||||
t.Fatalf("language notification fired after rejected update: %#v", received)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoad_CorruptConfig(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
path := filepath.Join(dir, "config.json")
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
package capability
|
||||
|
||||
const CorePluginID = "verstak-desktop"
|
||||
|
||||
var platformCapabilities = []string{
|
||||
"verstak/core/plugin-manager/v1",
|
||||
"verstak/core/capability-registry/v1",
|
||||
"verstak/core/contribution-registry/v1",
|
||||
"verstak/core/permissions/v1",
|
||||
"verstak/core/events/v1",
|
||||
"verstak/core/files/v1",
|
||||
"verstak/core/workbench/v1",
|
||||
"verstak/core/notifications/v1",
|
||||
"verstak/core/workspace/v1",
|
||||
}
|
||||
|
||||
// CorePlatformCapabilities returns a copy of the capabilities registered by
|
||||
// the desktop before dynamic plugins are resolved.
|
||||
func CorePlatformCapabilities() []string {
|
||||
return append([]string(nil), platformCapabilities...)
|
||||
}
|
||||
|
|
@ -24,13 +24,6 @@ type Registry struct {
|
|||
statusBarItems []ContributionStatusBarItem
|
||||
openProviders []ContributionOpenProvider
|
||||
workspaceItems []ContributionWorkspaceItem
|
||||
workspaceTree *ContributionWorkspaceTree
|
||||
}
|
||||
|
||||
// ContributionWorkspaceTree is a singleton contribution for replacing the Deal tree.
|
||||
type ContributionWorkspaceTree struct {
|
||||
PluginID string `json:"pluginId"`
|
||||
Component string `json:"component"`
|
||||
}
|
||||
|
||||
// ContributionPointType defines the type of contribution point.
|
||||
|
|
@ -49,7 +42,6 @@ const (
|
|||
PointStatusBar ContributionPointType = "statusBarItems"
|
||||
PointOpenProviders ContributionPointType = "openProviders"
|
||||
PointWorkspaceItems ContributionPointType = "workspaceItems"
|
||||
PointWorkspaceTree ContributionPointType = "workspaceTree"
|
||||
)
|
||||
|
||||
// ListByPoint returns all contributions for a given point type.
|
||||
|
|
@ -192,7 +184,6 @@ func (r *Registry) Register(pluginID string, c *plugin.Contributions) {
|
|||
r.statusBarItems = removeStatusBarItems(r.statusBarItems, pluginID)
|
||||
r.openProviders = removeOpenProviders(r.openProviders, pluginID)
|
||||
r.workspaceItems = removeWorkspaceItems(r.workspaceItems, pluginID)
|
||||
r.workspaceTree = nil
|
||||
|
||||
for _, item := range c.Views {
|
||||
r.views = append(r.views, ContributionView{PluginID: pluginID, Item: item})
|
||||
|
|
@ -230,9 +221,6 @@ func (r *Registry) Register(pluginID string, c *plugin.Contributions) {
|
|||
for _, item := range c.WorkspaceItems {
|
||||
r.workspaceItems = append(r.workspaceItems, ContributionWorkspaceItem{PluginID: pluginID, Item: item})
|
||||
}
|
||||
if c.WorkspaceTree != nil && r.workspaceTree == nil {
|
||||
r.workspaceTree = &ContributionWorkspaceTree{PluginID: pluginID, Component: c.WorkspaceTree.Component}
|
||||
}
|
||||
}
|
||||
|
||||
// Unregister removes all contributions from a plugin.
|
||||
|
|
@ -252,9 +240,6 @@ func (r *Registry) Unregister(pluginID string) {
|
|||
r.statusBarItems = removeStatusBarItems(r.statusBarItems, pluginID)
|
||||
r.openProviders = removeOpenProviders(r.openProviders, pluginID)
|
||||
r.workspaceItems = removeWorkspaceItems(r.workspaceItems, pluginID)
|
||||
if r.workspaceTree != nil && r.workspaceTree.PluginID == pluginID {
|
||||
r.workspaceTree = nil
|
||||
}
|
||||
}
|
||||
|
||||
// Getters — sorted for deterministic display.
|
||||
|
|
@ -382,13 +367,6 @@ func (r *Registry) WorkspaceItems() []ContributionWorkspaceItem {
|
|||
return result
|
||||
}
|
||||
|
||||
// WorkspaceTree returns the singleton workspaceTree contribution, or nil.
|
||||
func (r *Registry) WorkspaceTree() *ContributionWorkspaceTree {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
return r.workspaceTree
|
||||
}
|
||||
|
||||
// ─── Remove helpers ─────────────────────────────────────────
|
||||
|
||||
func removeViews(items []ContributionView, pluginID string) []ContributionView {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ func IsReservedPath(relativePath string) bool {
|
|||
if cleaned == "" {
|
||||
return false
|
||||
}
|
||||
return containsReservedSegment(cleaned)
|
||||
first := strings.Split(cleaned, "/")[0]
|
||||
return strings.EqualFold(first, ".verstak")
|
||||
}
|
||||
|
||||
func normalizeRelativePath(input string, allowRoot bool) (string, error) {
|
||||
|
|
@ -66,16 +67,8 @@ func IsReservedPathNoNormalize(cleaned string) bool {
|
|||
if cleaned == "" {
|
||||
return false
|
||||
}
|
||||
return containsReservedSegment(cleaned)
|
||||
}
|
||||
|
||||
func containsReservedSegment(cleaned string) bool {
|
||||
for _, segment := range strings.Split(cleaned, "/") {
|
||||
if strings.EqualFold(segment, ".verstak") {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
first := strings.Split(cleaned, "/")[0]
|
||||
return strings.EqualFold(first, ".verstak")
|
||||
}
|
||||
|
||||
func looksAbsolute(input string) bool {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ func TestNormalizeRelativeFileRejectsUnsafePaths(t *testing.T) {
|
|||
".verstak/vault.json",
|
||||
"./.verstak",
|
||||
".verstak/trash",
|
||||
"Workspace/.verstak/workspace.json",
|
||||
"folder/../.verstak",
|
||||
".Verstak",
|
||||
}
|
||||
|
|
@ -71,9 +70,6 @@ func TestReservedPathPolicy(t *testing.T) {
|
|||
if IsReservedPath("Notes/.verstak.md") {
|
||||
t.Fatal("Notes/.verstak.md should not be reserved")
|
||||
}
|
||||
if !IsReservedPath("Workspace/.verstak/workspace.json") {
|
||||
t.Fatal("nested .verstak should be reserved")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNormalizeRelativeFileAcceptsOnlySlashSeparatedRelativePaths(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import (
|
|||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"mime"
|
||||
"os"
|
||||
|
|
@ -202,85 +201,6 @@ func (s *Service) WriteVaultFileBytes(relativePath string, dataBase64 string, op
|
|||
return s.writeVaultFileData(relativePath, data, options)
|
||||
}
|
||||
|
||||
// WriteVaultFileFromPath streams a verified temporary file into the vault and
|
||||
// replaces the destination atomically. It is used by core sync so a Blob never
|
||||
// needs to be base64-decoded or held in memory.
|
||||
func (s *Service) WriteVaultFileFromPath(relativePath, sourcePath string, options WriteOptions) error {
|
||||
source, err := os.Open(sourcePath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer source.Close()
|
||||
info, err := source.Stat()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !info.Mode().IsRegular() {
|
||||
return fmt.Errorf("blob source is not a regular file")
|
||||
}
|
||||
root, rel, full, err := s.resolveFile(relativePath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := rejectSymlinkPath(root, rel, true); err != nil {
|
||||
return err
|
||||
}
|
||||
parent := filepath.Dir(full)
|
||||
if info, err := os.Stat(parent); err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return fmt.Errorf("parent-not-found: %s", pathDir(rel))
|
||||
}
|
||||
return err
|
||||
} else if !info.IsDir() {
|
||||
return fmt.Errorf("parent-not-directory: %s", pathDir(rel))
|
||||
}
|
||||
existing, err := os.Lstat(full)
|
||||
if err == nil {
|
||||
if existing.Mode()&os.ModeSymlink != 0 {
|
||||
return fmt.Errorf("symlink-not-allowed: %s", rel)
|
||||
}
|
||||
if !existing.Mode().IsRegular() {
|
||||
return fmt.Errorf("not-regular-file: %s", rel)
|
||||
}
|
||||
if !options.Overwrite {
|
||||
return fmt.Errorf("conflict: %s", rel)
|
||||
}
|
||||
} else if os.IsNotExist(err) {
|
||||
if !options.CreateIfMissing {
|
||||
return fmt.Errorf("not-found: %s", rel)
|
||||
}
|
||||
} else {
|
||||
return err
|
||||
}
|
||||
tmp, err := os.CreateTemp(parent, ".verstak-write-*")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tmpPath := tmp.Name()
|
||||
cleanup := true
|
||||
defer func() {
|
||||
if cleanup {
|
||||
_ = os.Remove(tmpPath)
|
||||
}
|
||||
}()
|
||||
if _, err := io.Copy(tmp, source); err != nil {
|
||||
_ = tmp.Close()
|
||||
return err
|
||||
}
|
||||
if err := tmp.Sync(); err != nil {
|
||||
_ = tmp.Close()
|
||||
return err
|
||||
}
|
||||
if err := tmp.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.Rename(tmpPath, full); err != nil {
|
||||
return err
|
||||
}
|
||||
cleanup = false
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Service) writeVaultFileData(relativePath string, data []byte, options WriteOptions) error {
|
||||
root, rel, full, err := s.resolveFile(relativePath)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -35,23 +35,11 @@ type Service struct {
|
|||
bus *events.Bus
|
||||
interval time.Duration
|
||||
|
||||
mu sync.Mutex
|
||||
root string
|
||||
cancel chan struct{}
|
||||
done chan struct{}
|
||||
current map[string]snapshotEntry
|
||||
onChange func()
|
||||
}
|
||||
|
||||
// SetOnChange installs a lightweight notification used by core services that
|
||||
// need a debounced reconciliation after the watcher has observed a change.
|
||||
func (s *Service) SetOnChange(callback func()) {
|
||||
if s == nil {
|
||||
return
|
||||
}
|
||||
s.mu.Lock()
|
||||
s.onChange = callback
|
||||
s.mu.Unlock()
|
||||
mu sync.Mutex
|
||||
root string
|
||||
cancel chan struct{}
|
||||
done chan struct{}
|
||||
current map[string]snapshotEntry
|
||||
}
|
||||
|
||||
// NewService creates a watcher. The interval parameter is mainly for tests.
|
||||
|
|
@ -145,30 +133,22 @@ func (s *Service) poll(root string) {
|
|||
s.mu.Lock()
|
||||
prev := s.current
|
||||
s.current = next
|
||||
callback := s.onChange
|
||||
s.mu.Unlock()
|
||||
changed := false
|
||||
for path, entry := range next {
|
||||
old, ok := prev[path]
|
||||
if !ok {
|
||||
s.publish(path, "external.create", entry.kind)
|
||||
changed = true
|
||||
continue
|
||||
}
|
||||
if entry.kind == entryFile && (entry.size != old.size || !entry.modTime.Equal(old.modTime)) {
|
||||
s.publish(path, "external.update", entry.kind)
|
||||
changed = true
|
||||
}
|
||||
}
|
||||
for path, entry := range prev {
|
||||
if _, ok := next[path]; !ok {
|
||||
s.publish(path, "external.delete", entry.kind)
|
||||
changed = true
|
||||
}
|
||||
}
|
||||
if changed && callback != nil {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) publish(path, operation string, kind entryKind) {
|
||||
|
|
@ -237,12 +217,8 @@ func kindFromInfo(info fs.FileInfo) entryKind {
|
|||
}
|
||||
|
||||
func isReserved(rel string) bool {
|
||||
for _, segment := range strings.Split(filepath.ToSlash(rel), "/") {
|
||||
if strings.EqualFold(segment, ".verstak") {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
first := strings.Split(filepath.ToSlash(rel), "/")[0]
|
||||
return strings.EqualFold(first, ".verstak")
|
||||
}
|
||||
|
||||
func workspaceRoot(path string) string {
|
||||
|
|
|
|||
|
|
@ -74,26 +74,6 @@ func TestServiceIgnoresReservedVerstakPaths(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestServiceCallsChangeCallbackForExternalChanges(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
service := NewService(events.NewBus(), 10*time.Millisecond)
|
||||
changed := make(chan struct{}, 1)
|
||||
service.SetOnChange(func() { changed <- struct{}{} })
|
||||
if err := service.Start(root); err != nil {
|
||||
t.Fatalf("Start: %v", err)
|
||||
}
|
||||
t.Cleanup(service.Stop)
|
||||
|
||||
if err := os.WriteFile(filepath.Join(root, "external.txt"), []byte("change"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
select {
|
||||
case <-changed:
|
||||
case <-time.After(500 * time.Millisecond):
|
||||
t.Fatal("timed out waiting for watcher callback")
|
||||
}
|
||||
}
|
||||
|
||||
func waitForEvent(t *testing.T, eventCh <-chan events.Event) events.Event {
|
||||
t.Helper()
|
||||
select {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"$id": "https://raw.githubusercontent.com/mirivlad/verstak-sdk/main/schemas/hostname-normalization-v1.json",
|
||||
"$id": "https://git.mirv.top/verstak/verstak-sdk/schemas/hostname-normalization-v1.json",
|
||||
"title": "Verstak canonical hostname normalization v1 test vectors",
|
||||
"description": "Canonical hostnames are lowercase ASCII A-labels without a port or trailing DNS dot. Bare hostnames accept DNS names, IPv4, bracketed IPv6, localhost, and internal single-label names. URL inputs accept only HTTP(S). Invalid or excessively long input normalizes to an empty string.",
|
||||
"version": 1,
|
||||
|
|
|
|||
|
|
@ -1,254 +0,0 @@
|
|||
// Package notifications persists plugin-owned reminder schedules and delivers
|
||||
// due entries through a desktop-native sender.
|
||||
package notifications
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
maxRequestsPerPlugin = 500
|
||||
maxIDLength = 256
|
||||
maxTitleLength = 512
|
||||
maxBodyLength = 4096
|
||||
)
|
||||
|
||||
// VaultPath provides a stable operation while a vault is open.
|
||||
type VaultPath interface {
|
||||
WithOpenPath(func(string) error) error
|
||||
}
|
||||
|
||||
// Request is a desired scheduled notification in a plugin's own namespace.
|
||||
type Request struct {
|
||||
ID string `json:"id"`
|
||||
DueAt string `json:"dueAt"`
|
||||
Title string `json:"title"`
|
||||
Body string `json:"body,omitempty"`
|
||||
}
|
||||
|
||||
// Item is the persisted form of a plugin notification schedule.
|
||||
type Item struct {
|
||||
PluginID string `json:"pluginId"`
|
||||
ID string `json:"id"`
|
||||
DueAt string `json:"dueAt"`
|
||||
Title string `json:"title"`
|
||||
Body string `json:"body,omitempty"`
|
||||
SentForDueAt string `json:"sentForDueAt,omitempty"`
|
||||
}
|
||||
|
||||
// Sender delivers one native desktop notification.
|
||||
type Sender interface {
|
||||
Send(context.Context, Item) error
|
||||
}
|
||||
|
||||
// Manager owns canonical schedules for every authorized plugin.
|
||||
type Manager struct {
|
||||
mu sync.Mutex
|
||||
vault VaultPath
|
||||
sender Sender
|
||||
now func() time.Time
|
||||
|
||||
items []Item
|
||||
loaded bool
|
||||
stop chan struct{}
|
||||
}
|
||||
|
||||
// New creates a notification manager. The supplied clock is used by tests; a
|
||||
// nil clock uses the current time.
|
||||
func New(vault VaultPath, sender Sender, now func() time.Time) *Manager {
|
||||
if now == nil {
|
||||
now = time.Now
|
||||
}
|
||||
return &Manager{vault: vault, sender: sender, now: now}
|
||||
}
|
||||
|
||||
// Replace atomically replaces one plugin's desired schedules.
|
||||
func (m *Manager) Replace(pluginID string, requests []Request) error {
|
||||
if err := validateRequests(pluginID, requests); err != nil {
|
||||
return err
|
||||
}
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if err := m.loadLocked(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
previous := make(map[string]Item)
|
||||
kept := make([]Item, 0, len(m.items)+len(requests))
|
||||
for _, item := range m.items {
|
||||
if item.PluginID == pluginID {
|
||||
previous[item.ID] = item
|
||||
continue
|
||||
}
|
||||
kept = append(kept, item)
|
||||
}
|
||||
for _, request := range requests {
|
||||
item := Item{
|
||||
PluginID: pluginID,
|
||||
ID: request.ID,
|
||||
DueAt: request.DueAt,
|
||||
Title: request.Title,
|
||||
Body: request.Body,
|
||||
}
|
||||
if old, ok := previous[request.ID]; ok && old.DueAt == request.DueAt {
|
||||
item.SentForDueAt = old.SentForDueAt
|
||||
}
|
||||
kept = append(kept, item)
|
||||
}
|
||||
sortItems(kept)
|
||||
if err := m.writeLocked(kept); err != nil {
|
||||
return err
|
||||
}
|
||||
m.items = kept
|
||||
return nil
|
||||
}
|
||||
|
||||
// Clear removes every schedule owned by a plugin.
|
||||
func (m *Manager) Clear(pluginID string) error {
|
||||
return m.Replace(pluginID, nil)
|
||||
}
|
||||
|
||||
// Items returns a snapshot of the current schedule state.
|
||||
func (m *Manager) Items() []Item {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if err := m.loadLocked(); err != nil {
|
||||
return nil
|
||||
}
|
||||
return append([]Item(nil), m.items...)
|
||||
}
|
||||
|
||||
// Path reports the canonical schedule path while the vault is open.
|
||||
func (m *Manager) Path() string {
|
||||
if m == nil || m.vault == nil {
|
||||
return ""
|
||||
}
|
||||
var path string
|
||||
if err := m.vault.WithOpenPath(func(vaultPath string) error {
|
||||
path = schedulePath(vaultPath)
|
||||
return nil
|
||||
}); err != nil {
|
||||
return ""
|
||||
}
|
||||
return path
|
||||
}
|
||||
|
||||
// Start immediately checks due schedules, then repeats every 30 seconds.
|
||||
func (m *Manager) Start(ctx context.Context) {
|
||||
if m == nil {
|
||||
return
|
||||
}
|
||||
m.mu.Lock()
|
||||
if m.stop != nil {
|
||||
m.mu.Unlock()
|
||||
return
|
||||
}
|
||||
stop := make(chan struct{})
|
||||
m.stop = stop
|
||||
m.mu.Unlock()
|
||||
|
||||
go func() {
|
||||
m.Tick(ctx)
|
||||
ticker := time.NewTicker(30 * time.Second)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
m.Tick(ctx)
|
||||
case <-stop:
|
||||
return
|
||||
case <-ctx.Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
// Stop stops a running scheduler. It is safe to call repeatedly.
|
||||
func (m *Manager) Stop() {
|
||||
if m == nil {
|
||||
return
|
||||
}
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if m.stop == nil {
|
||||
return
|
||||
}
|
||||
close(m.stop)
|
||||
m.stop = nil
|
||||
}
|
||||
|
||||
// Tick delivers each overdue schedule once. A sender failure leaves the item
|
||||
// pending for a later tick.
|
||||
func (m *Manager) Tick(ctx context.Context) {
|
||||
if m == nil || m.sender == nil {
|
||||
return
|
||||
}
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if err := m.loadLocked(); err != nil {
|
||||
return
|
||||
}
|
||||
now := m.now().UTC()
|
||||
for index, item := range m.items {
|
||||
dueAt, err := time.Parse(time.RFC3339, item.DueAt)
|
||||
if err != nil || dueAt.After(now) || item.SentForDueAt == item.DueAt {
|
||||
continue
|
||||
}
|
||||
if err := m.sender.Send(ctx, item); err != nil {
|
||||
continue
|
||||
}
|
||||
updated := append([]Item(nil), m.items...)
|
||||
updated[index].SentForDueAt = item.DueAt
|
||||
if err := m.writeLocked(updated); err != nil {
|
||||
continue
|
||||
}
|
||||
m.items = updated
|
||||
}
|
||||
}
|
||||
|
||||
func validateRequests(pluginID string, requests []Request) error {
|
||||
if strings.TrimSpace(pluginID) == "" || strings.ContainsAny(pluginID, "/\\") {
|
||||
return fmt.Errorf("invalid plugin ID %q", pluginID)
|
||||
}
|
||||
if len(requests) > maxRequestsPerPlugin {
|
||||
return fmt.Errorf("plugin %q has more than %d notification schedules", pluginID, maxRequestsPerPlugin)
|
||||
}
|
||||
seen := make(map[string]bool, len(requests))
|
||||
for _, request := range requests {
|
||||
if request.ID == "" || len(request.ID) > maxIDLength {
|
||||
return fmt.Errorf("notification ID is empty or too long")
|
||||
}
|
||||
if seen[request.ID] {
|
||||
return fmt.Errorf("duplicate notification ID %q", request.ID)
|
||||
}
|
||||
seen[request.ID] = true
|
||||
if !strings.HasSuffix(request.DueAt, "Z") {
|
||||
return fmt.Errorf("notification %q dueAt must be UTC RFC3339", request.ID)
|
||||
}
|
||||
if _, err := time.Parse(time.RFC3339, request.DueAt); err != nil {
|
||||
return fmt.Errorf("notification %q has invalid dueAt: %w", request.ID, err)
|
||||
}
|
||||
if strings.TrimSpace(request.Title) == "" || len(request.Title) > maxTitleLength {
|
||||
return fmt.Errorf("notification %q title is empty or too long", request.ID)
|
||||
}
|
||||
if len(request.Body) > maxBodyLength {
|
||||
return fmt.Errorf("notification %q body is too long", request.ID)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func sortItems(items []Item) {
|
||||
sort.Slice(items, func(left, right int) bool {
|
||||
if items[left].PluginID != items[right].PluginID {
|
||||
return items[left].PluginID < items[right].PluginID
|
||||
}
|
||||
return items[left].ID < items[right].ID
|
||||
})
|
||||
}
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
package notifications
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
type testVault struct {
|
||||
path string
|
||||
}
|
||||
|
||||
func (v testVault) WithOpenPath(operation func(string) error) error {
|
||||
return operation(v.path)
|
||||
}
|
||||
|
||||
type fakeSender struct {
|
||||
err error
|
||||
items []Item
|
||||
}
|
||||
|
||||
func (s *fakeSender) Send(_ context.Context, item Item) error {
|
||||
s.items = append(s.items, item)
|
||||
return s.err
|
||||
}
|
||||
|
||||
func testManager(t *testing.T, sender *fakeSender, now time.Time) *Manager {
|
||||
t.Helper()
|
||||
return New(testVault{path: t.TempDir()}, sender, func() time.Time { return now })
|
||||
}
|
||||
|
||||
func request(id, dueAt string) Request {
|
||||
return Request{ID: id, DueAt: dueAt, Title: "Reminder " + id, Body: "Todo " + id}
|
||||
}
|
||||
|
||||
func TestReplaceRemovesStalePluginSchedules(t *testing.T) {
|
||||
manager := testManager(t, &fakeSender{}, time.Date(2026, 7, 14, 9, 0, 0, 0, time.UTC))
|
||||
if err := manager.Replace("verstak.todo", []Request{
|
||||
request("first", "2026-07-14T10:00:00Z"),
|
||||
request("second", "2026-07-14T11:00:00Z"),
|
||||
}); err != nil {
|
||||
t.Fatalf("initial replace: %v", err)
|
||||
}
|
||||
if err := manager.Replace("verstak.todo", []Request{request("second", "2026-07-14T11:00:00Z")}); err != nil {
|
||||
t.Fatalf("stale-item replace: %v", err)
|
||||
}
|
||||
|
||||
items := manager.Items()
|
||||
if len(items) != 1 || items[0].PluginID != "verstak.todo" || items[0].ID != "second" {
|
||||
t.Fatalf("items = %#v, want only second Todo reminder", items)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplaceReschedulesDeliveredItem(t *testing.T) {
|
||||
now := time.Date(2026, 7, 14, 12, 0, 0, 0, time.UTC)
|
||||
sender := &fakeSender{}
|
||||
manager := testManager(t, sender, now)
|
||||
if err := manager.Replace("verstak.todo", []Request{request("todo-1", "2026-07-14T11:00:00Z")}); err != nil {
|
||||
t.Fatalf("initial replace: %v", err)
|
||||
}
|
||||
manager.Tick(context.Background())
|
||||
if len(sender.items) != 1 || manager.Items()[0].SentForDueAt == "" {
|
||||
t.Fatalf("first delivery = %#v, state = %#v", sender.items, manager.Items())
|
||||
}
|
||||
|
||||
if err := manager.Replace("verstak.todo", []Request{request("todo-1", "2026-07-14T13:00:00Z")}); err != nil {
|
||||
t.Fatalf("reschedule: %v", err)
|
||||
}
|
||||
if got := manager.Items()[0].SentForDueAt; got != "" {
|
||||
t.Fatalf("rescheduled item kept old acknowledgment %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTickRetriesFailedSendAndAcknowledgesOneDelivery(t *testing.T) {
|
||||
now := time.Date(2026, 7, 14, 12, 0, 0, 0, time.UTC)
|
||||
sender := &fakeSender{err: errors.New("notification unavailable")}
|
||||
manager := testManager(t, sender, now)
|
||||
if err := manager.Replace("verstak.todo", []Request{request("todo-1", "2026-07-14T11:00:00Z")}); err != nil {
|
||||
t.Fatalf("replace: %v", err)
|
||||
}
|
||||
|
||||
manager.Tick(context.Background())
|
||||
if len(sender.items) != 1 || manager.Items()[0].SentForDueAt != "" {
|
||||
t.Fatalf("failed send was acknowledged: sent=%d items=%#v", len(sender.items), manager.Items())
|
||||
}
|
||||
|
||||
sender.err = nil
|
||||
manager.Tick(context.Background())
|
||||
manager.Tick(context.Background())
|
||||
if len(sender.items) != 2 {
|
||||
t.Fatalf("send attempts = %d, want 2", len(sender.items))
|
||||
}
|
||||
if got := manager.Items()[0].SentForDueAt; got != "2026-07-14T11:00:00Z" {
|
||||
t.Fatalf("sent acknowledgment = %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPersistentSchedulesReloadAndDeliverOverdueOnlyOnce(t *testing.T) {
|
||||
path := t.TempDir()
|
||||
now := time.Date(2026, 7, 14, 12, 0, 0, 0, time.UTC)
|
||||
first := New(testVault{path: path}, &fakeSender{}, func() time.Time { return now })
|
||||
if err := first.Replace("verstak.todo", []Request{request("todo-1", "2026-07-14T11:00:00Z")}); err != nil {
|
||||
t.Fatalf("replace: %v", err)
|
||||
}
|
||||
if got, want := filepath.Join(path, ".verstak", "notifications", "schedules.json"), first.Path(); got != want {
|
||||
t.Fatalf("schedule path = %q, want %q", got, want)
|
||||
}
|
||||
|
||||
sender := &fakeSender{}
|
||||
restarted := New(testVault{path: path}, sender, func() time.Time { return now })
|
||||
restarted.Tick(context.Background())
|
||||
restarted.Tick(context.Background())
|
||||
if len(sender.items) != 1 || sender.items[0].ID != "todo-1" {
|
||||
t.Fatalf("overdue delivery = %#v", sender.items)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplaceRejectsInvalidRequests(t *testing.T) {
|
||||
manager := testManager(t, &fakeSender{}, time.Now().UTC())
|
||||
for _, requests := range [][]Request{
|
||||
{{ID: "", DueAt: "2026-07-14T10:00:00Z", Title: "title"}},
|
||||
{{ID: "same", DueAt: "2026-07-14T10:00:00Z", Title: "title"}, {ID: "same", DueAt: "2026-07-14T11:00:00Z", Title: "title"}},
|
||||
{{ID: "bad-date", DueAt: "not-a-date", Title: "title"}},
|
||||
} {
|
||||
if err := manager.Replace("verstak.todo", requests); err == nil {
|
||||
t.Fatalf("Replace(%#v) succeeded", requests)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
package notifications
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"time"
|
||||
)
|
||||
|
||||
type storedSchedules struct {
|
||||
Items []Item `json:"items"`
|
||||
}
|
||||
|
||||
func schedulePath(vaultPath string) string {
|
||||
return filepath.Join(vaultPath, ".verstak", "notifications", "schedules.json")
|
||||
}
|
||||
|
||||
func (m *Manager) loadLocked() error {
|
||||
if m.loaded {
|
||||
return nil
|
||||
}
|
||||
if m.vault == nil {
|
||||
return fmt.Errorf("notification vault is not initialized")
|
||||
}
|
||||
var loaded []Item
|
||||
if err := m.vault.WithOpenPath(func(vaultPath string) error {
|
||||
path := schedulePath(vaultPath)
|
||||
data, err := os.ReadFile(path)
|
||||
if os.IsNotExist(err) {
|
||||
loaded = []Item{}
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return fmt.Errorf("read notification schedules: %w", err)
|
||||
}
|
||||
var stored storedSchedules
|
||||
if err := json.Unmarshal(data, &stored); err != nil {
|
||||
return fmt.Errorf("decode notification schedules: %w", err)
|
||||
}
|
||||
for _, item := range stored.Items {
|
||||
if err := validateRequests(item.PluginID, []Request{{ID: item.ID, DueAt: item.DueAt, Title: item.Title, Body: item.Body}}); err != nil {
|
||||
return fmt.Errorf("invalid stored notification schedule: %w", err)
|
||||
}
|
||||
loaded = append(loaded, item)
|
||||
}
|
||||
sortItems(loaded)
|
||||
return nil
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
m.items = loaded
|
||||
m.loaded = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *Manager) writeLocked(items []Item) error {
|
||||
if m.vault == nil {
|
||||
return fmt.Errorf("notification vault is not initialized")
|
||||
}
|
||||
return m.vault.WithOpenPath(func(vaultPath string) error {
|
||||
data, err := json.MarshalIndent(storedSchedules{Items: items}, "", " ")
|
||||
if err != nil {
|
||||
return fmt.Errorf("encode notification schedules: %w", err)
|
||||
}
|
||||
path := schedulePath(vaultPath)
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
|
||||
return fmt.Errorf("create notification schedule directory: %w", err)
|
||||
}
|
||||
temporary := filepath.Join(filepath.Dir(path), fmt.Sprintf(".schedules.%d.tmp", time.Now().UnixNano()))
|
||||
if err := os.WriteFile(temporary, data, 0o644); err != nil {
|
||||
return fmt.Errorf("write notification schedules: %w", err)
|
||||
}
|
||||
if err := os.Rename(temporary, path); err != nil {
|
||||
_ = os.Remove(temporary)
|
||||
return fmt.Errorf("replace notification schedules: %w", err)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
|
@ -39,7 +39,6 @@ func (r *Registry) registerDefaults() {
|
|||
{Name: "files.openExternal", Description: "Open vault files and folders in external OS applications", Dangerous: true},
|
||||
{Name: "storage.namespace", Description: "Read/write plugin's own storage namespace", Dangerous: false},
|
||||
{Name: "storage.migrations", Description: "Run database migrations in plugin namespace", Dangerous: false},
|
||||
{Name: "notifications.schedule", Description: "Schedule native notifications in the plugin's own namespace", Dangerous: false},
|
||||
{Name: "events.publish", Description: "Publish events to the event bus", Dangerous: false},
|
||||
{Name: "events.subscribe", Description: "Subscribe to events on the event bus", Dangerous: false},
|
||||
{Name: "ui.register", Description: "Register UI components and contributions", Dangerous: false},
|
||||
|
|
|
|||
|
|
@ -3,16 +3,25 @@ package plugin
|
|||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"testing"
|
||||
|
||||
"github.com/verstak/verstak-desktop/internal/core/capability"
|
||||
)
|
||||
|
||||
// registerCoreCapabilities registers the desktop's core capabilities on a registry.
|
||||
// coreCapabilities lists the 5 core capabilities that the platform registers
|
||||
// before any plugins are loaded.
|
||||
var coreCapabilities = []string{
|
||||
"verstak/core/plugin-manager/v1",
|
||||
"verstak/core/capability-registry/v1",
|
||||
"verstak/core/contribution-registry/v1",
|
||||
"verstak/core/permissions/v1",
|
||||
"verstak/core/events/v1",
|
||||
}
|
||||
|
||||
// registerCoreCapabilities registers the 5 core capabilities on a registry.
|
||||
func registerCoreCapabilities(t *testing.T, reg *capability.Registry) {
|
||||
t.Helper()
|
||||
if err := reg.Register(capability.CorePluginID, capability.CorePlatformCapabilities()); err != nil {
|
||||
if err := reg.Register("verstak-core", coreCapabilities); err != nil {
|
||||
t.Fatalf("failed to register core capabilities: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
@ -67,43 +76,6 @@ func TestLifecycle_CoreCapabilitiesRegisteredBeforePlugins(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestBundledOfficialPluginRequirementsResolve(t *testing.T) {
|
||||
plugins, errs := DiscoverPlugins([]string{bundledPluginDir(t)})
|
||||
if len(errs) > 0 {
|
||||
t.Fatalf("discover bundled plugins: %v", errs)
|
||||
}
|
||||
|
||||
reg := capability.NewRegistry()
|
||||
registerCoreCapabilities(t, reg)
|
||||
ResolveLifecycle(plugins, reg, nil)
|
||||
|
||||
foundTodo := false
|
||||
for _, loaded := range plugins {
|
||||
if loaded.Manifest.ID == "verstak.todo" {
|
||||
foundTodo = true
|
||||
}
|
||||
if loaded.Status == StatusMissingRequiredCapability {
|
||||
t.Fatalf("bundled plugin %q is missing required capabilities: %s", loaded.Manifest.ID, loaded.Error)
|
||||
}
|
||||
}
|
||||
|
||||
if !foundTodo {
|
||||
t.Fatal("bundled Todo manifest was not discovered")
|
||||
}
|
||||
}
|
||||
|
||||
func bundledPluginDir(t *testing.T) string {
|
||||
t.Helper()
|
||||
if configured := os.Getenv("VERSTAK_RELEASE_PLUGIN_DIR"); configured != "" {
|
||||
return configured
|
||||
}
|
||||
_, sourceFile, _, ok := runtime.Caller(0)
|
||||
if !ok {
|
||||
t.Fatal("could not resolve lifecycle test path")
|
||||
}
|
||||
return filepath.Join(filepath.Dir(sourceFile), "../../../plugins")
|
||||
}
|
||||
|
||||
// TestLifecycle_MissingRequiredCapability verifies that when the required
|
||||
// capability is NOT registered, CheckRequired reports it as missing and the
|
||||
// plugin status should be set to StatusMissingRequiredCapability.
|
||||
|
|
|
|||
|
|
@ -77,12 +77,6 @@ type Contributions struct {
|
|||
StatusBarItems []ContributionStatusBarItem `json:"statusBarItems,omitempty"`
|
||||
OpenProviders []ContributionOpenProvider `json:"openProviders,omitempty"`
|
||||
WorkspaceItems []ContributionWorkspaceItem `json:"workspaceItems,omitempty"`
|
||||
WorkspaceTree *ContributionWorkspaceTree `json:"workspaceTree,omitempty"`
|
||||
}
|
||||
|
||||
// ContributionWorkspaceTree represents a singleton workspaceTree contribution.
|
||||
type ContributionWorkspaceTree struct {
|
||||
Component string `json:"component"`
|
||||
}
|
||||
|
||||
// ContributionView represents a view contribution.
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ package sync
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
|
|
@ -218,147 +216,68 @@ func (c *Client) Push(ops []Op) (*PushResponse, error) {
|
|||
// PullRequest is the payload for POST /sync/pull.
|
||||
type PullRequest struct {
|
||||
SinceSequence int `json:"since_sequence"`
|
||||
PageLimit int `json:"page_limit,omitempty"`
|
||||
}
|
||||
|
||||
// PullResponse is the response from POST /sync/pull.
|
||||
type PullResponse struct {
|
||||
ServerSequence int `json:"server_sequence"`
|
||||
PageLastSequence int `json:"page_last_sequence"`
|
||||
HasMore bool `json:"has_more"`
|
||||
Ops []Op `json:"ops"`
|
||||
}
|
||||
|
||||
// BlobReference is the only binary content representation permitted inside a
|
||||
// sync operation. The bytes travel via the Blob API, never payload_json.
|
||||
type BlobReference struct {
|
||||
SHA256 string `json:"sha256"`
|
||||
Size int64 `json:"size"`
|
||||
}
|
||||
|
||||
// ServerError carries a public stable error code. UI layers map Code to their
|
||||
// own localized wording and must not rely on a server diagnostic string.
|
||||
type ServerError struct {
|
||||
Status int
|
||||
Code string
|
||||
}
|
||||
|
||||
func (e *ServerError) Error() string {
|
||||
if e.Code == "" {
|
||||
return fmt.Sprintf("sync-server:request_failed (HTTP %d)", e.Status)
|
||||
}
|
||||
return fmt.Sprintf("sync-server:%s (HTTP %d)", e.Code, e.Status)
|
||||
ServerSequence int `json:"server_sequence"`
|
||||
Ops []Op `json:"ops"`
|
||||
}
|
||||
|
||||
// Pull fetches remote operations since a given sequence.
|
||||
func (c *Client) Pull(sinceSequence int) (*PullResponse, error) {
|
||||
return c.PullPage(sinceSequence, 0)
|
||||
}
|
||||
|
||||
// PullPage fetches one bounded ordered page. The caller advances its durable
|
||||
// cursor only after every returned operation has applied successfully.
|
||||
func (c *Client) PullPage(sinceSequence, pageLimit int) (*PullResponse, error) {
|
||||
req := PullRequest{SinceSequence: sinceSequence, PageLimit: pageLimit}
|
||||
req := PullRequest{SinceSequence: sinceSequence}
|
||||
var resp PullResponse
|
||||
if err := c.post("/api/v1/sync/pull", req, &resp); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// Servers before pull pagination did not include page_last_sequence. Keep
|
||||
// the desktop compatible during rolling upgrades without ever advancing
|
||||
// beyond an operation actually present in the response.
|
||||
if resp.PageLastSequence == 0 && len(resp.Ops) > 0 {
|
||||
resp.PageLastSequence = resp.Ops[len(resp.Ops)-1].ServerSequence
|
||||
}
|
||||
return &resp, nil
|
||||
}
|
||||
|
||||
// UploadBlob streams a local file through a multipart pipe. It keeps the
|
||||
// process memory bounded even when the file is many times larger than an
|
||||
// inline sync payload.
|
||||
func (c *Client) UploadBlob(localPath string) (BlobReference, error) {
|
||||
info, err := os.Stat(localPath)
|
||||
// UploadBlob uploads a file to the server and returns its SHA-256.
|
||||
func (c *Client) UploadBlob(localPath string) (sha256 string, err error) {
|
||||
var b bytes.Buffer
|
||||
w := multipart.NewWriter(&b)
|
||||
fw, err := w.CreateFormFile("file", filepath.Base(localPath))
|
||||
if err != nil {
|
||||
return BlobReference{}, err
|
||||
return "", err
|
||||
}
|
||||
if !info.Mode().IsRegular() {
|
||||
return BlobReference{}, fmt.Errorf("blob source is not a regular file")
|
||||
f, err := os.Open(localPath)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
reader, writer := io.Pipe()
|
||||
multipartWriter := multipart.NewWriter(writer)
|
||||
writeDone := make(chan error, 1)
|
||||
go func() {
|
||||
defer func() {
|
||||
_ = writer.Close()
|
||||
}()
|
||||
part, err := multipartWriter.CreateFormFile("file", filepath.Base(localPath))
|
||||
if err == nil {
|
||||
file, openErr := os.Open(localPath)
|
||||
if openErr != nil {
|
||||
err = openErr
|
||||
} else {
|
||||
_, err = io.Copy(part, file)
|
||||
closeErr := file.Close()
|
||||
if err == nil {
|
||||
err = closeErr
|
||||
}
|
||||
}
|
||||
}
|
||||
if closeErr := multipartWriter.Close(); err == nil {
|
||||
err = closeErr
|
||||
}
|
||||
if err != nil {
|
||||
_ = writer.CloseWithError(err)
|
||||
}
|
||||
writeDone <- err
|
||||
}()
|
||||
defer f.Close()
|
||||
if _, err := io.Copy(fw, f); err != nil {
|
||||
return "", err
|
||||
}
|
||||
w.Close()
|
||||
|
||||
req, err := http.NewRequest("POST", c.ServerURL+"/api/v1/blobs/", reader)
|
||||
req, err := http.NewRequest("POST", c.ServerURL+"/api/v1/blobs/", &b)
|
||||
if err != nil {
|
||||
_ = reader.Close()
|
||||
return BlobReference{}, err
|
||||
return "", err
|
||||
}
|
||||
req.Header.Set("Content-Type", multipartWriter.FormDataContentType())
|
||||
req.Header.Set("Content-Type", w.FormDataContentType())
|
||||
req.Header.Set("Authorization", "Bearer "+c.bearerToken())
|
||||
|
||||
resp, err := c.HTTP.Do(req)
|
||||
if err != nil {
|
||||
_ = reader.Close()
|
||||
<-writeDone
|
||||
return BlobReference{}, err
|
||||
return "", err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode >= http.StatusBadRequest {
|
||||
writeErr := <-writeDone
|
||||
if writeErr != nil {
|
||||
return BlobReference{}, writeErr
|
||||
}
|
||||
return BlobReference{}, c.readErrorBody(resp, resp.StatusCode)
|
||||
|
||||
var result struct {
|
||||
SHA256 string `json:"sha256"`
|
||||
Size int `json:"size"`
|
||||
}
|
||||
var result BlobReference
|
||||
if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
|
||||
return BlobReference{}, err
|
||||
return "", err
|
||||
}
|
||||
if err := <-writeDone; err != nil {
|
||||
return BlobReference{}, err
|
||||
}
|
||||
if result.Size != info.Size() || !validBlobSHA256(result.SHA256) {
|
||||
return BlobReference{}, fmt.Errorf("invalid blob upload response")
|
||||
}
|
||||
return result, nil
|
||||
return result.SHA256, nil
|
||||
}
|
||||
|
||||
// DownloadBlob downloads a blob by SHA-256 hash.
|
||||
func (c *Client) DownloadBlob(shaHex, destPath string) error {
|
||||
return c.DownloadBlobVerified(shaHex, -1, destPath)
|
||||
}
|
||||
|
||||
// DownloadBlobVerified streams to a temporary file, verifies the announced
|
||||
// hash and size, and only then atomically makes the file visible to the vault.
|
||||
func (c *Client) DownloadBlobVerified(shaHex string, expectedSize int64, destPath string) error {
|
||||
if !validBlobSHA256(shaHex) || expectedSize < -1 {
|
||||
return fmt.Errorf("invalid blob reference")
|
||||
}
|
||||
req, err := http.NewRequest("GET", c.ServerURL+"/api/v1/blobs/"+shaHex, nil)
|
||||
func (c *Client) DownloadBlob(sha256, destPath string) error {
|
||||
req, err := http.NewRequest("GET", c.ServerURL+"/api/v1/blobs/"+sha256, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -370,65 +289,17 @@ func (c *Client) DownloadBlobVerified(shaHex string, expectedSize int64, destPat
|
|||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return c.readErrorBody(resp, resp.StatusCode)
|
||||
if resp.StatusCode != 200 {
|
||||
return fmt.Errorf("download blob: HTTP %d", resp.StatusCode)
|
||||
}
|
||||
|
||||
if expectedSize >= 0 && resp.ContentLength >= 0 && resp.ContentLength != expectedSize {
|
||||
return fmt.Errorf("download blob: size mismatch")
|
||||
}
|
||||
if err := os.MkdirAll(filepath.Dir(destPath), 0o750); err != nil {
|
||||
return err
|
||||
}
|
||||
out, err := os.CreateTemp(filepath.Dir(destPath), ".verstak-blob-*")
|
||||
out, err := os.Create(destPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tmpPath := out.Name()
|
||||
cleanup := true
|
||||
defer func() {
|
||||
if cleanup {
|
||||
_ = os.Remove(tmpPath)
|
||||
}
|
||||
}()
|
||||
hash := sha256.New()
|
||||
limit := int64(1<<63 - 1)
|
||||
if expectedSize >= 0 {
|
||||
limit = expectedSize + 1
|
||||
}
|
||||
written, err := io.Copy(io.MultiWriter(out, hash), io.LimitReader(resp.Body, limit))
|
||||
if err != nil {
|
||||
_ = out.Close()
|
||||
return err
|
||||
}
|
||||
if expectedSize >= 0 && written != expectedSize {
|
||||
_ = out.Close()
|
||||
return fmt.Errorf("download blob: size mismatch")
|
||||
}
|
||||
if actual := hex.EncodeToString(hash.Sum(nil)); actual != shaHex {
|
||||
_ = out.Close()
|
||||
return fmt.Errorf("download blob: SHA-256 mismatch")
|
||||
}
|
||||
if err := out.Sync(); err != nil {
|
||||
_ = out.Close()
|
||||
return err
|
||||
}
|
||||
if err := out.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.Rename(tmpPath, destPath); err != nil {
|
||||
return err
|
||||
}
|
||||
cleanup = false
|
||||
return nil
|
||||
}
|
||||
|
||||
func validBlobSHA256(value string) bool {
|
||||
if len(value) != sha256.Size*2 {
|
||||
return false
|
||||
}
|
||||
_, err := hex.DecodeString(value)
|
||||
return err == nil
|
||||
defer out.Close()
|
||||
_, err = io.Copy(out, resp.Body)
|
||||
return err
|
||||
}
|
||||
|
||||
func minInt(a, b int) int {
|
||||
|
|
@ -559,11 +430,5 @@ func (c *Client) readErrorBody(resp *http.Response, statusCode int) error {
|
|||
if strings.Contains(lower, "<html") || strings.Contains(lower, "<!doctype") {
|
||||
return fmt.Errorf("not a Verstak Sync server (HTTP %d)", statusCode)
|
||||
}
|
||||
var payload struct {
|
||||
Code string `json:"code"`
|
||||
}
|
||||
if err := json.Unmarshal([]byte(body), &payload); err == nil && payload.Code != "" {
|
||||
return &ServerError{Status: statusCode, Code: payload.Code}
|
||||
}
|
||||
return &ServerError{Status: statusCode, Code: "request_failed"}
|
||||
return fmt.Errorf("server error (HTTP %d)", statusCode)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
package sync
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
|
@ -124,95 +119,3 @@ func TestPairDeviceSendsVaultID(t *testing.T) {
|
|||
t.Fatalf("paired vault ID = %q, want vault-123", pairedVaultID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPullPageReadsPaginationMetadata(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path != "/api/v1/sync/pull" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{
|
||||
"server_sequence": 9, "page_last_sequence": 4, "has_more": true,
|
||||
"ops": []map[string]interface{}{{"op_id": "op-4", "server_sequence": 4, "device_id": "other", "entity_type": "file", "entity_id": "a.bin", "op_type": "update", "payload_json": `{}`, "created_at": "2026-01-01T00:00:00Z"}},
|
||||
})
|
||||
}))
|
||||
defer server.Close()
|
||||
client := NewClient(server.URL, "", "device", t.TempDir())
|
||||
client.DeviceToken = "token"
|
||||
response, err := client.PullPage(2, 2)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if response.PageLastSequence != 4 || !response.HasMore || response.ServerSequence != 9 {
|
||||
t.Fatalf("pagination response = %+v", response)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUploadBlobStreamsMultipartAndChecksReturnedSize(t *testing.T) {
|
||||
data := []byte("streamed binary payload")
|
||||
path := filepath.Join(t.TempDir(), "blob.bin")
|
||||
if err := os.WriteFile(path, data, 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseMultipartForm(1024); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
file, _, err := r.FormFile("file")
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
received, err := io.ReadAll(file)
|
||||
if err != nil || string(received) != string(data) {
|
||||
http.Error(w, "bad upload", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
hash := sha256.Sum256(data)
|
||||
_ = json.NewEncoder(w).Encode(map[string]interface{}{"sha256": fmt.Sprintf("%x", hash[:]), "size": len(data)})
|
||||
}))
|
||||
defer server.Close()
|
||||
client := NewClient(server.URL, "", "device", t.TempDir())
|
||||
client.DeviceToken = "token"
|
||||
ref, err := client.UploadBlob(path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if ref.Size != int64(len(data)) {
|
||||
t.Fatalf("uploaded reference = %+v", ref)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDownloadBlobVerifiesHashAndLeavesNoCorruptDestination(t *testing.T) {
|
||||
dest := filepath.Join(t.TempDir(), "received.bin")
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Length", "7")
|
||||
_, _ = w.Write([]byte("corrupt"))
|
||||
}))
|
||||
defer server.Close()
|
||||
client := NewClient(server.URL, "", "device", t.TempDir())
|
||||
client.DeviceToken = "token"
|
||||
err := client.DownloadBlobVerified("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 7, dest)
|
||||
if err == nil {
|
||||
t.Fatal("corrupt blob was accepted")
|
||||
}
|
||||
if _, err := os.Stat(dest); !os.IsNotExist(err) {
|
||||
t.Fatalf("corrupt destination remains: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestClientPreservesStableServerErrorCode(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusRequestEntityTooLarge)
|
||||
_, _ = w.Write([]byte(`{"error":"internal wording must not reach UI","code":"quota_exceeded"}`))
|
||||
}))
|
||||
defer server.Close()
|
||||
client := NewClient(server.URL, "token", "device", t.TempDir())
|
||||
err := client.post("/api/v1/sync/push", map[string]string{}, nil)
|
||||
serverErr, ok := err.(*ServerError)
|
||||
if !ok || serverErr.Code != "quota_exceeded" || serverErr.Status != http.StatusRequestEntityTooLarge {
|
||||
t.Fatalf("error = %#v, want quota server error", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,30 +5,25 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
const (
|
||||
EntityNode = "node"
|
||||
EntityNote = "note"
|
||||
EntityFile = "file"
|
||||
EntityFolder = "folder"
|
||||
EntityWorkspace = "workspace"
|
||||
EntityAction = "action"
|
||||
EntityWorklog = "worklog"
|
||||
EntityNode = "node"
|
||||
EntityNote = "note"
|
||||
EntityFile = "file"
|
||||
EntityFolder = "folder"
|
||||
EntityAction = "action"
|
||||
EntityWorklog = "worklog"
|
||||
)
|
||||
|
||||
const (
|
||||
OpCreate = "create"
|
||||
OpUpdate = "update"
|
||||
OpDelete = "delete"
|
||||
OpMove = "move"
|
||||
OpRename = "rename"
|
||||
OpTrash = "trash"
|
||||
OpRestore = "restore"
|
||||
OpCreate = "create"
|
||||
OpUpdate = "update"
|
||||
OpDelete = "delete"
|
||||
OpMove = "move"
|
||||
)
|
||||
|
||||
// Op represents a sync operation.
|
||||
|
|
@ -50,14 +45,11 @@ type Op struct {
|
|||
|
||||
// syncState persists connection state to JSON file.
|
||||
type syncState struct {
|
||||
ServerURL string `json:"server_url"`
|
||||
APIKey string `json:"api_key"`
|
||||
DeviceID string `json:"device_id"`
|
||||
LastPullSeq int `json:"last_pull_seq"`
|
||||
LastSyncAt string `json:"last_sync_at"`
|
||||
BootstrapComplete bool `json:"bootstrap_complete"`
|
||||
LastWarning string `json:"last_warning"`
|
||||
RemoteVaultID string `json:"remote_vault_id"`
|
||||
ServerURL string `json:"server_url"`
|
||||
APIKey string `json:"api_key"`
|
||||
DeviceID string `json:"device_id"`
|
||||
LastPullSeq int `json:"last_pull_seq"`
|
||||
LastSyncAt string `json:"last_sync_at"`
|
||||
}
|
||||
|
||||
// Service records and manages sync operations using JSON file storage.
|
||||
|
|
@ -89,14 +81,6 @@ func (s *Service) statePath() string {
|
|||
return filepath.Join(s.syncDir(), "state.json")
|
||||
}
|
||||
|
||||
func (s *Service) snapshotPath() string {
|
||||
return filepath.Join(s.syncDir(), "snapshot.json")
|
||||
}
|
||||
|
||||
func (s *Service) scanJournalPath() string {
|
||||
return filepath.Join(s.syncDir(), "scan-journal.json")
|
||||
}
|
||||
|
||||
func (s *Service) ensureDir() error {
|
||||
return os.MkdirAll(s.syncDir(), 0o755)
|
||||
}
|
||||
|
|
@ -129,33 +113,11 @@ func (s *Service) RecordOp(entityType, entityID, opType string, payload interfac
|
|||
CreatedAt: now,
|
||||
}
|
||||
|
||||
return s.recordOps([]Op{op})
|
||||
}
|
||||
|
||||
// recordOps is idempotent by op ID so a scanner recovery journal can safely
|
||||
// resume after a crash between recording operations and replacing its snapshot.
|
||||
func (s *Service) recordOps(newOps []Op) error {
|
||||
if err := s.ensureDir(); err != nil {
|
||||
return err
|
||||
}
|
||||
ops, err := s.loadOps()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
existing := make(map[string]bool, len(ops))
|
||||
for _, op := range ops {
|
||||
existing[op.OpID] = true
|
||||
}
|
||||
for _, op := range newOps {
|
||||
if op.OpID == "" || existing[op.OpID] {
|
||||
continue
|
||||
}
|
||||
if op.ID == "" {
|
||||
op.ID = op.OpID
|
||||
}
|
||||
ops = append(ops, op)
|
||||
existing[op.OpID] = true
|
||||
}
|
||||
ops = append(ops, op)
|
||||
return s.saveOps(ops)
|
||||
}
|
||||
|
||||
|
|
@ -198,42 +160,6 @@ func (s *Service) GetUnpushedOps() ([]Op, error) {
|
|||
return unpushed, nil
|
||||
}
|
||||
|
||||
// HasUnpushedPath reports whether a local operation still owns a path (or one
|
||||
// of its descendants). Pull uses it to turn an incoming overwrite/delete into
|
||||
// a visible conflict instead of silently replacing a local external edit.
|
||||
func (s *Service) HasUnpushedPath(path string) (bool, error) {
|
||||
ops, err := s.GetUnpushedOps()
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
for _, op := range ops {
|
||||
if syncPathsOverlap(path, op.EntityID) {
|
||||
return true, nil
|
||||
}
|
||||
var payload struct {
|
||||
Path string `json:"path"`
|
||||
FromPath string `json:"fromPath"`
|
||||
ToPath string `json:"toPath"`
|
||||
}
|
||||
if op.PayloadJSON == "" || json.Unmarshal([]byte(op.PayloadJSON), &payload) != nil {
|
||||
continue
|
||||
}
|
||||
if syncPathsOverlap(path, payload.Path) || syncPathsOverlap(path, payload.FromPath) || syncPathsOverlap(path, payload.ToPath) {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func syncPathsOverlap(left, right string) bool {
|
||||
left = strings.Trim(left, "/")
|
||||
right = strings.Trim(right, "/")
|
||||
if left == "" || right == "" {
|
||||
return false
|
||||
}
|
||||
return left == right || strings.HasPrefix(left, right+"/") || strings.HasPrefix(right, left+"/")
|
||||
}
|
||||
|
||||
// MarkPushed marks ops as pushed to server.
|
||||
func (s *Service) MarkPushed(opIDs []string) error {
|
||||
ops, err := s.loadOps()
|
||||
|
|
@ -318,66 +244,6 @@ func (s *Service) SetLastSyncAt(t string) error {
|
|||
return s.saveState(st)
|
||||
}
|
||||
|
||||
// BootstrapComplete reports whether the initial pull/reconcile/bootstrap cycle
|
||||
// finished successfully for this vault connection.
|
||||
func (s *Service) BootstrapComplete() (bool, error) {
|
||||
st, err := s.loadState()
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return st.BootstrapComplete, nil
|
||||
}
|
||||
|
||||
// SetBootstrapComplete marks the initial reconciliation as complete only after
|
||||
// all remote operations were applied and the local initial snapshot was queued.
|
||||
func (s *Service) SetBootstrapComplete(done bool) error {
|
||||
st, err := s.loadState()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
st.BootstrapComplete = done
|
||||
return s.saveState(st)
|
||||
}
|
||||
|
||||
// LastWarning returns the persistent scanner warning shown by sync status.
|
||||
func (s *Service) LastWarning() (string, error) {
|
||||
st, err := s.loadState()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return st.LastWarning, nil
|
||||
}
|
||||
|
||||
// SetLastWarning persists an unresolved scanner condition. An empty string
|
||||
// clears the warning once a later complete scan no longer reports it.
|
||||
func (s *Service) SetLastWarning(message string) error {
|
||||
st, err := s.loadState()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
st.LastWarning = message
|
||||
return s.saveState(st)
|
||||
}
|
||||
|
||||
// RemoteVaultID returns the optional target vault chosen while pairing a new
|
||||
// local vault for restore. Empty means this vault's own durable ID was used.
|
||||
func (s *Service) RemoteVaultID() (string, error) {
|
||||
st, err := s.loadState()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return st.RemoteVaultID, nil
|
||||
}
|
||||
|
||||
func (s *Service) SetRemoteVaultID(vaultID string) error {
|
||||
st, err := s.loadState()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
st.RemoteVaultID = vaultID
|
||||
return s.saveState(st)
|
||||
}
|
||||
|
||||
// GetDeviceID returns the device ID used by this service.
|
||||
func (s *Service) GetDeviceID() string {
|
||||
return s.deviceID
|
||||
|
|
@ -422,7 +288,7 @@ func (s *Service) saveOps(ops []Op) error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("marshal ops: %w", err)
|
||||
}
|
||||
return atomicWriteFile(s.opsPath(), data, 0o600)
|
||||
return os.WriteFile(s.opsPath(), data, 0o644)
|
||||
}
|
||||
|
||||
func (s *Service) loadState() (*syncState, error) {
|
||||
|
|
@ -445,42 +311,5 @@ func (s *Service) saveState(st *syncState) error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("marshal state: %w", err)
|
||||
}
|
||||
return atomicWriteFile(s.statePath(), data, 0o600)
|
||||
}
|
||||
|
||||
func atomicWriteFile(path string, data []byte, perm os.FileMode) error {
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
|
||||
return err
|
||||
}
|
||||
tmp, err := os.CreateTemp(filepath.Dir(path), ".verstak-sync-*")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tmpPath := tmp.Name()
|
||||
cleanup := true
|
||||
defer func() {
|
||||
if cleanup {
|
||||
_ = os.Remove(tmpPath)
|
||||
}
|
||||
}()
|
||||
if err := tmp.Chmod(perm); err != nil {
|
||||
_ = tmp.Close()
|
||||
return err
|
||||
}
|
||||
if _, err := tmp.Write(data); err != nil {
|
||||
_ = tmp.Close()
|
||||
return err
|
||||
}
|
||||
if err := tmp.Sync(); err != nil {
|
||||
_ = tmp.Close()
|
||||
return err
|
||||
}
|
||||
if err := tmp.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.Rename(tmpPath, path); err != nil {
|
||||
return err
|
||||
}
|
||||
cleanup = false
|
||||
return nil
|
||||
return os.WriteFile(s.statePath(), data, 0o644)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,854 +0,0 @@
|
|||
package sync
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/google/uuid"
|
||||
corefiles "github.com/verstak/verstak-desktop/internal/core/files"
|
||||
)
|
||||
|
||||
const snapshotVersion = 1
|
||||
|
||||
// maxOperationFileBytes is an explicit desktop-side safety ceiling. Binary
|
||||
// content is streamed through the Blob API rather than embedded in operations,
|
||||
// so it is intentionally higher than the plugin Files API read limit.
|
||||
const maxOperationFileBytes int64 = 256 * 1024 * 1024
|
||||
|
||||
// BlobCachePath is core-private durable staging for a local operation's
|
||||
// immutable binary content. It remains excluded from ordinary file sync.
|
||||
func BlobCachePath(vaultRoot, hash string) string {
|
||||
return filepath.Join(vaultRoot, ".verstak", "sync", "blobs", hash)
|
||||
}
|
||||
|
||||
// Snapshot is the durable local view of the synchronizable part of a vault.
|
||||
// Its entries are only files and folders whose latest state was successfully
|
||||
// represented by an operation or intentionally accepted as an initial baseline.
|
||||
type Snapshot struct {
|
||||
Version int `json:"version"`
|
||||
Entries map[string]SnapshotEntry `json:"entries"`
|
||||
Workspaces map[string]WorkspaceSnapshot `json:"workspaces,omitempty"`
|
||||
TrashedWorkspaces map[string]WorkspaceSnapshot `json:"trashedWorkspaces,omitempty"`
|
||||
WorkspacesInitialized bool `json:"workspacesInitialized,omitempty"`
|
||||
Unresolved map[string]string `json:"unresolved,omitempty"`
|
||||
}
|
||||
|
||||
// SnapshotEntry stores only stable filesystem facts needed for reconciliation.
|
||||
type SnapshotEntry struct {
|
||||
Path string `json:"path"`
|
||||
Type string `json:"type"`
|
||||
Size int64 `json:"size"`
|
||||
ModifiedAt string `json:"modifiedAt"`
|
||||
Hash string `json:"hash,omitempty"`
|
||||
}
|
||||
|
||||
// WorkspaceSnapshot keeps the core-owned identity and creation metadata of a
|
||||
// top-level workspace. The marker itself remains excluded from normal file
|
||||
// sync and is never exposed through the Files API.
|
||||
type WorkspaceSnapshot struct {
|
||||
WorkspaceID string `json:"workspaceId"`
|
||||
Path string `json:"path"`
|
||||
Metadata json.RawMessage `json:"metadata,omitempty"`
|
||||
Entries map[string]SnapshotEntry `json:"entries,omitempty"`
|
||||
}
|
||||
|
||||
type scanJournal struct {
|
||||
Snapshot Snapshot `json:"snapshot"`
|
||||
Ops []Op `json:"ops"`
|
||||
}
|
||||
|
||||
type scannedVault struct {
|
||||
Entries map[string]SnapshotEntry
|
||||
Workspaces map[string]WorkspaceSnapshot
|
||||
Unresolved map[string]string
|
||||
}
|
||||
|
||||
// LoadSnapshot returns the current durable scanner snapshot. A missing
|
||||
// snapshot is represented by an empty snapshot, which is useful to callers
|
||||
// that only need to inspect it.
|
||||
func (s *Service) LoadSnapshot() (Snapshot, error) {
|
||||
snapshot, exists, err := s.loadSnapshot()
|
||||
if err != nil {
|
||||
return Snapshot{}, err
|
||||
}
|
||||
if !exists {
|
||||
return newSnapshot(), nil
|
||||
}
|
||||
return snapshot, nil
|
||||
}
|
||||
|
||||
// ScanAndRecord scans the whole synchronizable vault and records exactly the
|
||||
// detected local changes. On its first run it writes a baseline and deliberately
|
||||
// produces no operations; bootstrap decides what can safely be published.
|
||||
func (s *Service) ScanAndRecord() ([]string, error) {
|
||||
if err := s.recoverScanJournal(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
previous, exists, err := s.loadSnapshot()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
current, warnings, err := scanVault(s.vaultRoot, previous)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
next := snapshotFromScan(current, previous, exists)
|
||||
if !exists {
|
||||
if err := s.saveSnapshot(next); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return warnings, nil
|
||||
}
|
||||
|
||||
ops, next, err := diffSnapshots(previous, next, s.deviceID, s.vaultRoot)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(ops) == 0 {
|
||||
if err := s.saveSnapshot(next); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return warnings, nil
|
||||
}
|
||||
if err := s.commitScanTransaction(next, ops); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return warnings, nil
|
||||
}
|
||||
|
||||
// RecordBootstrapOps records creates for a pre-pull local snapshot. It is used
|
||||
// only after a successful initial pull, so an empty new vault never turns into
|
||||
// remote delete operations. Callers may pass the snapshot captured before the
|
||||
// pull; remote-only entries added during reconciliation are therefore not
|
||||
// reflected back to the server as local creates.
|
||||
func (s *Service) RecordBootstrapOps(initial Snapshot) error {
|
||||
if err := s.recoverScanJournal(); err != nil {
|
||||
return err
|
||||
}
|
||||
current, exists, err := s.loadSnapshot()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !exists {
|
||||
return fmt.Errorf("bootstrap requires an initial snapshot")
|
||||
}
|
||||
ops, _, err := diffSnapshots(newSnapshot(), initial, s.deviceID, s.vaultRoot)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
existing, err := s.GetUnpushedOps()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
existingCreates := make(map[string]bool, len(existing))
|
||||
for _, op := range existing {
|
||||
if op.OpType == OpCreate {
|
||||
existingCreates[op.EntityType+"\x00"+op.EntityID] = true
|
||||
}
|
||||
}
|
||||
filtered := ops[:0]
|
||||
for _, op := range ops {
|
||||
if op.OpType == OpCreate && existingCreates[op.EntityType+"\x00"+op.EntityID] {
|
||||
continue
|
||||
}
|
||||
filtered = append(filtered, op)
|
||||
}
|
||||
ops = filtered
|
||||
if len(ops) == 0 {
|
||||
return nil
|
||||
}
|
||||
return s.commitScanTransaction(current, ops)
|
||||
}
|
||||
|
||||
// RebaseSnapshot accepts filesystem changes that were applied from a remote
|
||||
// operation without producing any outgoing operation for them.
|
||||
func (s *Service) RebaseSnapshot() ([]string, error) {
|
||||
if err := s.recoverScanJournal(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
previous, exists, err := s.loadSnapshot()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
current, warnings, err := scanVault(s.vaultRoot, previous)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
next := snapshotFromScan(current, previous, exists)
|
||||
acceptWorkspaceLifecycle(previous, &next)
|
||||
if err := s.saveSnapshot(next); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return warnings, nil
|
||||
}
|
||||
|
||||
func newSnapshot() Snapshot {
|
||||
return Snapshot{
|
||||
Version: snapshotVersion,
|
||||
Entries: make(map[string]SnapshotEntry),
|
||||
Workspaces: make(map[string]WorkspaceSnapshot),
|
||||
TrashedWorkspaces: make(map[string]WorkspaceSnapshot),
|
||||
WorkspacesInitialized: true,
|
||||
Unresolved: make(map[string]string),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) loadSnapshot() (Snapshot, bool, error) {
|
||||
data, err := os.ReadFile(s.snapshotPath())
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return Snapshot{}, false, nil
|
||||
}
|
||||
return Snapshot{}, false, fmt.Errorf("read snapshot: %w", err)
|
||||
}
|
||||
var snapshot Snapshot
|
||||
if err := json.Unmarshal(data, &snapshot); err != nil {
|
||||
return Snapshot{}, false, fmt.Errorf("parse snapshot: %w", err)
|
||||
}
|
||||
if snapshot.Version != snapshotVersion {
|
||||
return Snapshot{}, false, fmt.Errorf("unsupported snapshot version: %d", snapshot.Version)
|
||||
}
|
||||
if snapshot.Entries == nil {
|
||||
snapshot.Entries = make(map[string]SnapshotEntry)
|
||||
}
|
||||
if snapshot.Workspaces == nil {
|
||||
snapshot.Workspaces = make(map[string]WorkspaceSnapshot)
|
||||
}
|
||||
if snapshot.TrashedWorkspaces == nil {
|
||||
snapshot.TrashedWorkspaces = make(map[string]WorkspaceSnapshot)
|
||||
}
|
||||
if snapshot.Unresolved == nil {
|
||||
snapshot.Unresolved = make(map[string]string)
|
||||
}
|
||||
return snapshot, true, nil
|
||||
}
|
||||
|
||||
func (s *Service) saveSnapshot(snapshot Snapshot) error {
|
||||
data, err := json.MarshalIndent(snapshot, "", " ")
|
||||
if err != nil {
|
||||
return fmt.Errorf("marshal snapshot: %w", err)
|
||||
}
|
||||
return atomicWriteFile(s.snapshotPath(), data, 0o600)
|
||||
}
|
||||
|
||||
func (s *Service) loadScanJournal() (scanJournal, bool, error) {
|
||||
data, err := os.ReadFile(s.scanJournalPath())
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return scanJournal{}, false, nil
|
||||
}
|
||||
return scanJournal{}, false, fmt.Errorf("read scan journal: %w", err)
|
||||
}
|
||||
var journal scanJournal
|
||||
if err := json.Unmarshal(data, &journal); err != nil {
|
||||
return scanJournal{}, false, fmt.Errorf("parse scan journal: %w", err)
|
||||
}
|
||||
return journal, true, nil
|
||||
}
|
||||
|
||||
func (s *Service) saveScanJournal(journal scanJournal) error {
|
||||
data, err := json.MarshalIndent(journal, "", " ")
|
||||
if err != nil {
|
||||
return fmt.Errorf("marshal scan journal: %w", err)
|
||||
}
|
||||
return atomicWriteFile(s.scanJournalPath(), data, 0o600)
|
||||
}
|
||||
|
||||
func (s *Service) recoverScanJournal() error {
|
||||
journal, exists, err := s.loadScanJournal()
|
||||
if err != nil || !exists {
|
||||
return err
|
||||
}
|
||||
if err := s.recordOps(journal.Ops); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := s.saveSnapshot(journal.Snapshot); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.Remove(s.scanJournalPath()); err != nil && !os.IsNotExist(err) {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Service) commitScanTransaction(snapshot Snapshot, ops []Op) error {
|
||||
journal := scanJournal{Snapshot: snapshot, Ops: ops}
|
||||
if err := s.saveScanJournal(journal); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := s.recordOps(ops); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := s.saveSnapshot(snapshot); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.Remove(s.scanJournalPath()); err != nil && !os.IsNotExist(err) {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func scanVault(root string, previous Snapshot) (scannedVault, []string, error) {
|
||||
result := scannedVault{
|
||||
Entries: make(map[string]SnapshotEntry),
|
||||
Workspaces: make(map[string]WorkspaceSnapshot),
|
||||
Unresolved: make(map[string]string),
|
||||
}
|
||||
var warnings []string
|
||||
err := filepath.WalkDir(root, func(path string, entry fs.DirEntry, walkErr error) error {
|
||||
if walkErr != nil {
|
||||
return walkErr
|
||||
}
|
||||
if path == root {
|
||||
return nil
|
||||
}
|
||||
rel, err := filepath.Rel(root, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
rel = filepath.ToSlash(rel)
|
||||
if excludedFromSync(rel) {
|
||||
if entry.IsDir() {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if entry.Type()&os.ModeSymlink != 0 {
|
||||
if entry.IsDir() {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
return nil
|
||||
}
|
||||
info, err := entry.Info()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if info.IsDir() {
|
||||
result.Entries[rel] = SnapshotEntry{
|
||||
Path: rel,
|
||||
Type: EntityFolder,
|
||||
ModifiedAt: info.ModTime().UTC().Format(time.RFC3339Nano),
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if !info.Mode().IsRegular() {
|
||||
return nil
|
||||
}
|
||||
if info.Size() > maxOperationFileBytes {
|
||||
message := fmt.Sprintf("file-too-large: %s (%d bytes exceeds %d bytes)", rel, info.Size(), maxOperationFileBytes)
|
||||
result.Unresolved[rel] = message
|
||||
warnings = append(warnings, message)
|
||||
return nil
|
||||
}
|
||||
hash, err := sha256File(path)
|
||||
if err != nil {
|
||||
return fmt.Errorf("hash %s: %w", rel, err)
|
||||
}
|
||||
result.Entries[rel] = SnapshotEntry{
|
||||
Path: rel,
|
||||
Type: EntityFile,
|
||||
Size: info.Size(),
|
||||
ModifiedAt: info.ModTime().UTC().Format(time.RFC3339Nano),
|
||||
Hash: hash,
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return scannedVault{}, nil, err
|
||||
}
|
||||
workspaces, workspaceWarnings, err := scanWorkspaceSnapshots(root, previous.Workspaces)
|
||||
if err != nil {
|
||||
return scannedVault{}, nil, err
|
||||
}
|
||||
for workspaceID, workspace := range workspaces {
|
||||
result.Workspaces[workspaceID] = workspace
|
||||
}
|
||||
for _, warning := range workspaceWarnings {
|
||||
warnings = append(warnings, warning)
|
||||
if strings.HasPrefix(warning, "duplicate-workspace-id: ") {
|
||||
path := strings.TrimPrefix(warning, "duplicate-workspace-id: ")
|
||||
result.Unresolved[path] = warning
|
||||
removeEntriesUnder(result.Entries, path)
|
||||
}
|
||||
}
|
||||
sort.Strings(warnings)
|
||||
return result, warnings, nil
|
||||
}
|
||||
|
||||
func scanWorkspaceSnapshots(root string, preferred map[string]WorkspaceSnapshot) (map[string]WorkspaceSnapshot, []string, error) {
|
||||
entries, err := os.ReadDir(root)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
candidates := make(map[string][]WorkspaceSnapshot)
|
||||
var warnings []string
|
||||
for _, entry := range entries {
|
||||
if !entry.IsDir() || entry.Type()&os.ModeSymlink != 0 || strings.EqualFold(entry.Name(), ".verstak") {
|
||||
continue
|
||||
}
|
||||
path := filepath.Join(root, entry.Name(), ".verstak", "workspace.json")
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
continue
|
||||
}
|
||||
return nil, nil, fmt.Errorf("read workspace marker %s: %w", entry.Name(), err)
|
||||
}
|
||||
var marker struct {
|
||||
WorkspaceID string `json:"workspaceId"`
|
||||
}
|
||||
if err := json.Unmarshal(data, &marker); err != nil {
|
||||
warnings = append(warnings, fmt.Sprintf("invalid-workspace-id: %s", entry.Name()))
|
||||
continue
|
||||
}
|
||||
if _, err := uuid.Parse(marker.WorkspaceID); err != nil {
|
||||
warnings = append(warnings, fmt.Sprintf("invalid-workspace-id: %s", entry.Name()))
|
||||
continue
|
||||
}
|
||||
metadata, err := readWorkspaceMetadataSnapshot(root, entry.Name())
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
candidates[marker.WorkspaceID] = append(candidates[marker.WorkspaceID], WorkspaceSnapshot{
|
||||
WorkspaceID: marker.WorkspaceID,
|
||||
Path: entry.Name(),
|
||||
Metadata: metadata,
|
||||
})
|
||||
}
|
||||
workspaces := make(map[string]WorkspaceSnapshot, len(candidates))
|
||||
for workspaceID, choices := range candidates {
|
||||
sort.Slice(choices, func(i, j int) bool { return choices[i].Path < choices[j].Path })
|
||||
selected := choices[0]
|
||||
if old, ok := preferred[workspaceID]; ok {
|
||||
for _, choice := range choices {
|
||||
if choice.Path == old.Path {
|
||||
selected = choice
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
workspaces[workspaceID] = selected
|
||||
for _, choice := range choices {
|
||||
if choice.Path != selected.Path {
|
||||
warnings = append(warnings, "duplicate-workspace-id: "+choice.Path)
|
||||
}
|
||||
}
|
||||
}
|
||||
return workspaces, warnings, nil
|
||||
}
|
||||
|
||||
func readWorkspaceMetadataSnapshot(root, name string) (json.RawMessage, error) {
|
||||
path := filepath.Join(root, ".verstak", "workspaces", name, "metadata.json")
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, fmt.Errorf("read workspace metadata %s: %w", name, err)
|
||||
}
|
||||
if !json.Valid(data) {
|
||||
return nil, fmt.Errorf("invalid workspace metadata: %s", name)
|
||||
}
|
||||
return json.RawMessage(append([]byte(nil), data...)), nil
|
||||
}
|
||||
|
||||
func excludedFromSync(rel string) bool {
|
||||
rel = filepath.ToSlash(rel)
|
||||
for _, segment := range strings.Split(rel, "/") {
|
||||
if strings.EqualFold(segment, ".verstak") {
|
||||
return true
|
||||
}
|
||||
}
|
||||
base := filepath.Base(rel)
|
||||
return strings.HasPrefix(base, ".verstak-write-") || strings.HasSuffix(base, ".tmp") || strings.HasSuffix(base, ".swp") || strings.HasSuffix(base, "~")
|
||||
}
|
||||
|
||||
func sha256File(path string) (string, error) {
|
||||
file, err := os.Open(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer file.Close()
|
||||
hash := sha256.New()
|
||||
if _, err := io.Copy(hash, file); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(hash.Sum(nil)), nil
|
||||
}
|
||||
|
||||
func snapshotFromScan(current scannedVault, previous Snapshot, previousExists bool) Snapshot {
|
||||
next := newSnapshot()
|
||||
for path, entry := range current.Entries {
|
||||
next.Entries[path] = entry
|
||||
}
|
||||
for workspaceID, workspace := range current.Workspaces {
|
||||
next.Workspaces[workspaceID] = workspace
|
||||
}
|
||||
for workspaceID, workspace := range previous.TrashedWorkspaces {
|
||||
next.TrashedWorkspaces[workspaceID] = workspace
|
||||
}
|
||||
for path, message := range current.Unresolved {
|
||||
next.Unresolved[path] = message
|
||||
copyEntriesUnder(next.Entries, previous.Entries, path)
|
||||
}
|
||||
if !previousExists {
|
||||
return next
|
||||
}
|
||||
for path, message := range previous.Unresolved {
|
||||
if _, supported := current.Entries[path]; supported {
|
||||
continue
|
||||
}
|
||||
if _, stillUnsupported := current.Unresolved[path]; stillUnsupported {
|
||||
continue
|
||||
}
|
||||
next.Unresolved[path] = "unresolved sync file disappeared before it could be synchronized: " + message
|
||||
copyEntriesUnder(next.Entries, previous.Entries, path)
|
||||
}
|
||||
return next
|
||||
}
|
||||
|
||||
func diffSnapshots(previous, next Snapshot, deviceID, vaultRoot string) ([]Op, Snapshot, error) {
|
||||
workspaceOps, err := diffWorkspaceSnapshots(&previous, &next, deviceID)
|
||||
if err != nil {
|
||||
return nil, next, err
|
||||
}
|
||||
var createsOrUpdates []Op
|
||||
var deletes []Op
|
||||
for path, entry := range next.Entries {
|
||||
old, existed := previous.Entries[path]
|
||||
if existed && entriesEqual(old, entry) {
|
||||
continue
|
||||
}
|
||||
if unresolvedPath(next.Unresolved, path) {
|
||||
continue
|
||||
}
|
||||
opType := OpCreate
|
||||
if existed {
|
||||
opType = OpUpdate
|
||||
}
|
||||
payload, err := payloadForEntry(vaultRoot, entry)
|
||||
if err != nil {
|
||||
return nil, next, err
|
||||
}
|
||||
createsOrUpdates = append(createsOrUpdates, newSnapshotOp(deviceID, entry.Type, path, opType, payload))
|
||||
}
|
||||
for path, old := range previous.Entries {
|
||||
if _, exists := next.Entries[path]; exists {
|
||||
continue
|
||||
}
|
||||
if unresolvedPath(previous.Unresolved, path) {
|
||||
continue
|
||||
}
|
||||
deletes = append(deletes, newSnapshotOp(deviceID, old.Type, path, OpDelete, map[string]string{"path": path}))
|
||||
}
|
||||
sort.Slice(createsOrUpdates, func(i, j int) bool {
|
||||
left, right := createsOrUpdates[i], createsOrUpdates[j]
|
||||
leftDepth, rightDepth := pathDepth(left.EntityID), pathDepth(right.EntityID)
|
||||
if leftDepth != rightDepth {
|
||||
return leftDepth < rightDepth
|
||||
}
|
||||
if left.EntityType != right.EntityType {
|
||||
return left.EntityType == EntityFolder
|
||||
}
|
||||
return left.EntityID < right.EntityID
|
||||
})
|
||||
sort.Slice(deletes, func(i, j int) bool {
|
||||
left, right := deletes[i], deletes[j]
|
||||
leftDepth, rightDepth := pathDepth(left.EntityID), pathDepth(right.EntityID)
|
||||
if leftDepth != rightDepth {
|
||||
return leftDepth > rightDepth
|
||||
}
|
||||
if left.EntityType != right.EntityType {
|
||||
return left.EntityType == EntityFile
|
||||
}
|
||||
return left.EntityID < right.EntityID
|
||||
})
|
||||
return append(workspaceOps, append(createsOrUpdates, deletes...)...), next, nil
|
||||
}
|
||||
|
||||
func diffWorkspaceSnapshots(previous, next *Snapshot, deviceID string) ([]Op, error) {
|
||||
var ops []Op
|
||||
if !previous.WorkspacesInitialized {
|
||||
return ops, nil
|
||||
}
|
||||
for workspaceID, oldWorkspace := range previous.Workspaces {
|
||||
currentWorkspace, active := next.Workspaces[workspaceID]
|
||||
if active {
|
||||
if currentWorkspace.Path != oldWorkspace.Path {
|
||||
ops = append(ops, newWorkspaceSnapshotOp(deviceID, workspaceID, OpRename, currentWorkspace, oldWorkspace.Path))
|
||||
remapEntriesPrefix(previous.Entries, oldWorkspace.Path, currentWorkspace.Path)
|
||||
}
|
||||
continue
|
||||
}
|
||||
ops = append(ops, newWorkspaceSnapshotOp(deviceID, workspaceID, OpTrash, oldWorkspace, ""))
|
||||
oldWorkspace.Entries = entriesUnder(previous.Entries, oldWorkspace.Path)
|
||||
removeEntriesUnder(previous.Entries, oldWorkspace.Path)
|
||||
next.TrashedWorkspaces[workspaceID] = oldWorkspace
|
||||
}
|
||||
for workspaceID, currentWorkspace := range next.Workspaces {
|
||||
if _, alreadyActive := previous.Workspaces[workspaceID]; alreadyActive {
|
||||
continue
|
||||
}
|
||||
if trashedWorkspace, wasTrashed := previous.TrashedWorkspaces[workspaceID]; wasTrashed {
|
||||
ops = append(ops, newWorkspaceSnapshotOp(deviceID, workspaceID, OpRestore, currentWorkspace, ""))
|
||||
copyRemappedEntries(previous.Entries, trashedWorkspace.Entries, trashedWorkspace.Path, currentWorkspace.Path)
|
||||
delete(next.TrashedWorkspaces, workspaceID)
|
||||
continue
|
||||
}
|
||||
ops = append(ops, newWorkspaceSnapshotOp(deviceID, workspaceID, OpCreate, currentWorkspace, ""))
|
||||
delete(next.Entries, currentWorkspace.Path)
|
||||
}
|
||||
sort.Slice(ops, func(i, j int) bool {
|
||||
if ops[i].OpType != ops[j].OpType {
|
||||
return workspaceOpOrder(ops[i].OpType) < workspaceOpOrder(ops[j].OpType)
|
||||
}
|
||||
return ops[i].EntityID < ops[j].EntityID
|
||||
})
|
||||
return ops, nil
|
||||
}
|
||||
|
||||
func workspaceOpOrder(opType string) int {
|
||||
switch opType {
|
||||
case OpCreate:
|
||||
return 0
|
||||
case OpRename:
|
||||
return 1
|
||||
case OpRestore:
|
||||
return 2
|
||||
case OpTrash:
|
||||
return 3
|
||||
default:
|
||||
return 4
|
||||
}
|
||||
}
|
||||
|
||||
type snapshotWorkspacePayload struct {
|
||||
WorkspaceID string `json:"workspaceId"`
|
||||
Path string `json:"path"`
|
||||
PreviousPath string `json:"previousPath,omitempty"`
|
||||
Name string `json:"name"`
|
||||
Metadata json.RawMessage `json:"metadata,omitempty"`
|
||||
}
|
||||
|
||||
func newWorkspaceSnapshotOp(deviceID, workspaceID, opType string, workspace WorkspaceSnapshot, previousPath string) Op {
|
||||
payload, _ := json.Marshal(snapshotWorkspacePayload{
|
||||
WorkspaceID: workspaceID,
|
||||
Path: workspace.Path,
|
||||
PreviousPath: previousPath,
|
||||
Name: workspace.Path,
|
||||
Metadata: workspace.Metadata,
|
||||
})
|
||||
return newSnapshotOp(deviceID, EntityWorkspace, workspaceID, opType, json.RawMessage(payload))
|
||||
}
|
||||
|
||||
func acceptWorkspaceLifecycle(previous Snapshot, next *Snapshot) {
|
||||
for workspaceID, oldWorkspace := range previous.Workspaces {
|
||||
if _, stillActive := next.Workspaces[workspaceID]; !stillActive {
|
||||
oldWorkspace.Entries = entriesUnder(previous.Entries, oldWorkspace.Path)
|
||||
next.TrashedWorkspaces[workspaceID] = oldWorkspace
|
||||
}
|
||||
}
|
||||
for workspaceID := range next.Workspaces {
|
||||
delete(next.TrashedWorkspaces, workspaceID)
|
||||
}
|
||||
}
|
||||
|
||||
func unresolvedPath(unresolved map[string]string, path string) bool {
|
||||
for unresolvedPath := range unresolved {
|
||||
if path == unresolvedPath || strings.HasPrefix(path, unresolvedPath+"/") {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func copyEntriesUnder(destination, source map[string]SnapshotEntry, root string) {
|
||||
for path, entry := range source {
|
||||
if path == root || strings.HasPrefix(path, root+"/") {
|
||||
destination[path] = entry
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func removeEntriesUnder(entries map[string]SnapshotEntry, root string) {
|
||||
for path := range entries {
|
||||
if path == root || strings.HasPrefix(path, root+"/") {
|
||||
delete(entries, path)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func remapEntriesPrefix(entries map[string]SnapshotEntry, oldPrefix, newPrefix string) {
|
||||
type remappedEntry struct {
|
||||
oldPath string
|
||||
entry SnapshotEntry
|
||||
}
|
||||
var remapped []remappedEntry
|
||||
for path, entry := range entries {
|
||||
if path != oldPrefix && !strings.HasPrefix(path, oldPrefix+"/") {
|
||||
continue
|
||||
}
|
||||
suffix := strings.TrimPrefix(path, oldPrefix)
|
||||
entry.Path = newPrefix + suffix
|
||||
remapped = append(remapped, remappedEntry{oldPath: path, entry: entry})
|
||||
}
|
||||
for _, item := range remapped {
|
||||
delete(entries, item.oldPath)
|
||||
entries[item.entry.Path] = item.entry
|
||||
}
|
||||
}
|
||||
|
||||
func entriesUnder(entries map[string]SnapshotEntry, root string) map[string]SnapshotEntry {
|
||||
result := make(map[string]SnapshotEntry)
|
||||
copyEntriesUnder(result, entries, root)
|
||||
return result
|
||||
}
|
||||
|
||||
func copyRemappedEntries(destination, source map[string]SnapshotEntry, oldPrefix, newPrefix string) {
|
||||
for path, entry := range source {
|
||||
if path != oldPrefix && !strings.HasPrefix(path, oldPrefix+"/") {
|
||||
continue
|
||||
}
|
||||
suffix := strings.TrimPrefix(path, oldPrefix)
|
||||
entry.Path = newPrefix + suffix
|
||||
destination[entry.Path] = entry
|
||||
}
|
||||
}
|
||||
|
||||
func entriesEqual(left, right SnapshotEntry) bool {
|
||||
return left.Type == right.Type && left.Size == right.Size && left.Hash == right.Hash
|
||||
}
|
||||
|
||||
func payloadForEntry(vaultRoot string, entry SnapshotEntry) (map[string]interface{}, error) {
|
||||
payload := map[string]interface{}{"path": entry.Path, "contentHash": entry.Hash}
|
||||
if entry.Type == EntityFolder {
|
||||
return payload, nil
|
||||
}
|
||||
path := filepath.Join(vaultRoot, filepath.FromSlash(entry.Path))
|
||||
if hash, err := sha256File(path); err != nil {
|
||||
return nil, err
|
||||
} else if hash != entry.Hash {
|
||||
return nil, fmt.Errorf("file changed during scan: %s", entry.Path)
|
||||
}
|
||||
if entry.Size > corefiles.MaxTextFileBytes {
|
||||
if err := cacheBlob(path, BlobCachePath(vaultRoot, entry.Hash), entry.Hash); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
payload["blob"] = map[string]interface{}{"sha256": entry.Hash, "size": entry.Size}
|
||||
return payload, nil
|
||||
}
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if isSyncText(data) {
|
||||
payload["content"] = string(data)
|
||||
return payload, nil
|
||||
}
|
||||
if err := cacheBlob(path, BlobCachePath(vaultRoot, entry.Hash), entry.Hash); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
payload["blob"] = map[string]interface{}{"sha256": entry.Hash, "size": entry.Size}
|
||||
return payload, nil
|
||||
}
|
||||
|
||||
func cacheBlob(source, destination, wantHash string) error {
|
||||
if info, err := os.Lstat(destination); err == nil {
|
||||
if !info.Mode().IsRegular() {
|
||||
return fmt.Errorf("blob cache target is not a regular file")
|
||||
}
|
||||
if hash, err := sha256File(destination); err == nil && hash == wantHash {
|
||||
return nil
|
||||
}
|
||||
if err := os.Remove(destination); err != nil {
|
||||
return err
|
||||
}
|
||||
} else if !os.IsNotExist(err) {
|
||||
return err
|
||||
}
|
||||
if err := os.MkdirAll(filepath.Dir(destination), 0o750); err != nil {
|
||||
return err
|
||||
}
|
||||
in, err := os.Open(source)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer in.Close()
|
||||
tmp, err := os.CreateTemp(filepath.Dir(destination), ".blob-*")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tmpPath := tmp.Name()
|
||||
cleanup := true
|
||||
defer func() {
|
||||
if cleanup {
|
||||
_ = os.Remove(tmpPath)
|
||||
}
|
||||
}()
|
||||
hash := sha256.New()
|
||||
if _, err := io.Copy(io.MultiWriter(tmp, hash), in); err != nil {
|
||||
_ = tmp.Close()
|
||||
return err
|
||||
}
|
||||
if actual := hex.EncodeToString(hash.Sum(nil)); actual != wantHash {
|
||||
_ = tmp.Close()
|
||||
return fmt.Errorf("file changed during blob staging")
|
||||
}
|
||||
if err := tmp.Sync(); err != nil {
|
||||
_ = tmp.Close()
|
||||
return err
|
||||
}
|
||||
if err := tmp.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := os.Rename(tmpPath, destination); err != nil {
|
||||
return err
|
||||
}
|
||||
cleanup = false
|
||||
return nil
|
||||
}
|
||||
|
||||
func newSnapshotOp(deviceID, entityType, entityID, opType string, payload interface{}) Op {
|
||||
data, _ := json.Marshal(payload)
|
||||
id := uuid.NewString()
|
||||
return Op{
|
||||
ID: id,
|
||||
OpID: id,
|
||||
DeviceID: deviceID,
|
||||
EntityType: entityType,
|
||||
EntityID: entityID,
|
||||
OpType: opType,
|
||||
PayloadJSON: string(data),
|
||||
CreatedAt: time.Now().UTC().Format(time.RFC3339Nano),
|
||||
}
|
||||
}
|
||||
|
||||
func pathDepth(path string) int {
|
||||
if path == "" {
|
||||
return 0
|
||||
}
|
||||
return strings.Count(path, "/") + 1
|
||||
}
|
||||
|
||||
func isSyncText(data []byte) bool {
|
||||
if !utf8.Valid(data) {
|
||||
return false
|
||||
}
|
||||
for _, r := range string(data) {
|
||||
if unicode.IsControl(r) && r != '\n' && r != '\r' && r != '\t' {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
|
@ -1,445 +0,0 @@
|
|||
package sync
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/google/uuid"
|
||||
corefiles "github.com/verstak/verstak-desktop/internal/core/files"
|
||||
)
|
||||
|
||||
func TestScanAndRecordTracksExternalWorkspaceLifecycleByIdentity(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
workspaceID := uuid.NewString()
|
||||
createSnapshotWorkspace(t, root, "Project", workspaceID)
|
||||
if err := os.Mkdir(filepath.Join(root, "Project", "Files"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "Project", "Files", "note.txt"), []byte("one"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
service := NewService(root, "device-a")
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("baseline: %v", err)
|
||||
}
|
||||
|
||||
if err := os.Rename(filepath.Join(root, "Project"), filepath.Join(root, "Renamed")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan rename: %v", err)
|
||||
}
|
||||
assertWorkspaceSnapshotOp(t, unpushedOps(t, service), 0, OpRename, workspaceID, "Renamed", "Project")
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("unchanged renamed scan: %v", err)
|
||||
}
|
||||
if got := len(unpushedOps(t, service)); got != 1 {
|
||||
t.Fatalf("unchanged rename produced %d operations, want 1", got)
|
||||
}
|
||||
|
||||
trashPath := filepath.Join(root, ".verstak", "trash", "workspaces", "external-trash", "Renamed")
|
||||
if err := os.MkdirAll(filepath.Dir(trashPath), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Rename(filepath.Join(root, "Renamed"), trashPath); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan trash: %v", err)
|
||||
}
|
||||
assertWorkspaceSnapshotOp(t, unpushedOps(t, service), 1, OpTrash, workspaceID, "Renamed", "")
|
||||
|
||||
if err := os.Rename(trashPath, filepath.Join(root, "Restored")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan restore: %v", err)
|
||||
}
|
||||
assertWorkspaceSnapshotOp(t, unpushedOps(t, service), 2, OpRestore, workspaceID, "Restored", "")
|
||||
|
||||
createSnapshotWorkspace(t, root, "Copied", workspaceID)
|
||||
warnings, err := service.ScanAndRecord()
|
||||
if err != nil {
|
||||
t.Fatalf("scan duplicate identity: %v", err)
|
||||
}
|
||||
if len(warnings) != 1 || !strings.Contains(warnings[0], "duplicate-workspace-id: Copied") {
|
||||
t.Fatalf("duplicate identity warnings = %v", warnings)
|
||||
}
|
||||
if got := len(unpushedOps(t, service)); got != 3 {
|
||||
t.Fatalf("duplicate identity created operations: %d, want 3", got)
|
||||
}
|
||||
}
|
||||
|
||||
func createSnapshotWorkspace(t *testing.T, root, name, workspaceID string) {
|
||||
t.Helper()
|
||||
if err := os.MkdirAll(filepath.Join(root, name, ".verstak"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
marker, err := json.Marshal(map[string]string{"workspaceId": workspaceID})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, name, ".verstak", "workspace.json"), marker, 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
metadataPath := filepath.Join(root, ".verstak", "workspaces", name, "metadata.json")
|
||||
if err := os.MkdirAll(filepath.Dir(metadataPath), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(metadataPath, []byte(`{"workspaceId":"`+workspaceID+`","workspaceName":"`+name+`"}`), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func assertWorkspaceSnapshotOp(t *testing.T, ops []Op, index int, opType, workspaceID, path, previousPath string) {
|
||||
t.Helper()
|
||||
if len(ops) <= index {
|
||||
t.Fatalf("operations = %#v, want index %d", ops, index)
|
||||
}
|
||||
op := ops[index]
|
||||
if op.EntityType != EntityWorkspace || op.EntityID != workspaceID || op.OpType != opType {
|
||||
t.Fatalf("workspace operation = %+v", op)
|
||||
}
|
||||
var payload snapshotWorkspacePayload
|
||||
if err := json.Unmarshal([]byte(op.PayloadJSON), &payload); err != nil {
|
||||
t.Fatalf("decode workspace payload: %v", err)
|
||||
}
|
||||
if payload.Path != path || payload.PreviousPath != previousPath || payload.WorkspaceID != workspaceID {
|
||||
t.Fatalf("workspace payload = %+v", payload)
|
||||
}
|
||||
}
|
||||
|
||||
func TestScanAndRecordBaselinesThenRecordsExternalChanges(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
service := NewService(root, "device-a")
|
||||
|
||||
warnings, err := service.ScanAndRecord()
|
||||
if err != nil {
|
||||
t.Fatalf("initial ScanAndRecord: %v", err)
|
||||
}
|
||||
if len(warnings) != 0 {
|
||||
t.Fatalf("initial warnings = %v, want none", warnings)
|
||||
}
|
||||
assertUnpushedCount(t, service, 0)
|
||||
|
||||
if err := os.Mkdir(filepath.Join(root, "Docs"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "Docs", "note.txt"), []byte("one"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
warnings, err = service.ScanAndRecord()
|
||||
if err != nil {
|
||||
t.Fatalf("scan create: %v", err)
|
||||
}
|
||||
if len(warnings) != 0 {
|
||||
t.Fatalf("create warnings = %v", warnings)
|
||||
}
|
||||
ops := unpushedOps(t, service)
|
||||
if len(ops) != 2 {
|
||||
t.Fatalf("create ops = %#v, want folder and file", ops)
|
||||
}
|
||||
if ops[0].EntityType != EntityFolder || ops[0].EntityID != "Docs" || ops[0].OpType != OpCreate {
|
||||
t.Fatalf("folder op = %+v", ops[0])
|
||||
}
|
||||
if ops[1].EntityType != EntityFile || ops[1].EntityID != "Docs/note.txt" || ops[1].OpType != OpCreate {
|
||||
t.Fatalf("file op = %+v", ops[1])
|
||||
}
|
||||
var createPayload map[string]interface{}
|
||||
if err := json.Unmarshal([]byte(ops[1].PayloadJSON), &createPayload); err != nil {
|
||||
t.Fatalf("decode file payload: %v", err)
|
||||
}
|
||||
if createPayload["content"] != "one" || createPayload["contentHash"] == "" {
|
||||
t.Fatalf("file payload = %#v", createPayload)
|
||||
}
|
||||
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("unchanged scan: %v", err)
|
||||
}
|
||||
assertUnpushedCount(t, service, 2)
|
||||
|
||||
if err := os.WriteFile(filepath.Join(root, "Docs", "note.txt"), []byte("two"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan update: %v", err)
|
||||
}
|
||||
ops = unpushedOps(t, service)
|
||||
if len(ops) != 3 || ops[2].EntityType != EntityFile || ops[2].OpType != OpUpdate {
|
||||
t.Fatalf("update ops = %#v", ops)
|
||||
}
|
||||
|
||||
if err := os.Remove(filepath.Join(root, "Docs", "note.txt")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Remove(filepath.Join(root, "Docs")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan delete: %v", err)
|
||||
}
|
||||
ops = unpushedOps(t, service)
|
||||
if len(ops) != 5 {
|
||||
t.Fatalf("delete ops = %#v", ops)
|
||||
}
|
||||
if ops[3].EntityType != EntityFile || ops[3].OpType != OpDelete || ops[4].EntityType != EntityFolder || ops[4].OpType != OpDelete {
|
||||
t.Fatalf("delete ordering = %#v", ops[3:])
|
||||
}
|
||||
}
|
||||
|
||||
func TestSnapshotUsesBlobReferenceForBinaryFileBeyondInlineLimit(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
service := NewService(root, "device-a")
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("baseline: %v", err)
|
||||
}
|
||||
data := make([]byte, corefiles.MaxBinaryReadBytes+1)
|
||||
for i := range data {
|
||||
data[i] = byte(i % 251)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "large.bin"), data, 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan binary: %v", err)
|
||||
}
|
||||
ops := unpushedOps(t, service)
|
||||
if len(ops) != 1 {
|
||||
t.Fatalf("operations = %#v, want one file create", ops)
|
||||
}
|
||||
var payload struct {
|
||||
DataBase64 *string `json:"dataBase64"`
|
||||
Blob *struct {
|
||||
SHA256 string `json:"sha256"`
|
||||
Size int64 `json:"size"`
|
||||
} `json:"blob"`
|
||||
}
|
||||
if err := json.Unmarshal([]byte(ops[0].PayloadJSON), &payload); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if payload.DataBase64 != nil || payload.Blob == nil || payload.Blob.Size != int64(len(data)) || payload.Blob.SHA256 == "" {
|
||||
t.Fatalf("binary sync payload = %s, want blob reference without base64", ops[0].PayloadJSON)
|
||||
}
|
||||
}
|
||||
|
||||
func TestScanAndRecordNeverTreatsInitialFilesAsDeletes(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.Mkdir(filepath.Join(root, "Existing"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "Existing", "before-sync.txt"), []byte("local"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
service := NewService(root, "device-a")
|
||||
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("initial ScanAndRecord: %v", err)
|
||||
}
|
||||
assertUnpushedCount(t, service, 0)
|
||||
snapshot, err := service.LoadSnapshot()
|
||||
if err != nil {
|
||||
t.Fatalf("LoadSnapshot: %v", err)
|
||||
}
|
||||
if snapshot.Entries["Existing/before-sync.txt"].Hash == "" {
|
||||
t.Fatalf("snapshot = %#v, expected content hash", snapshot.Entries)
|
||||
}
|
||||
}
|
||||
|
||||
func TestScanAndRecordFindsChangesMadeWhileDesktopWasClosed(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
initial := NewService(root, "device-a")
|
||||
if _, err := initial.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("initial baseline: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "offline.txt"), []byte("created while closed"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
restarted := NewService(root, "device-a")
|
||||
if _, err := restarted.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan after offline create: %v", err)
|
||||
}
|
||||
ops := unpushedOps(t, restarted)
|
||||
if len(ops) != 1 || ops[0].OpType != OpCreate || ops[0].EntityID != "offline.txt" {
|
||||
t.Fatalf("offline create operations = %#v", ops)
|
||||
}
|
||||
|
||||
if err := os.WriteFile(filepath.Join(root, "offline.txt"), []byte("updated while closed"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
restarted = NewService(root, "device-a")
|
||||
if _, err := restarted.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan after offline update: %v", err)
|
||||
}
|
||||
if err := os.Remove(filepath.Join(root, "offline.txt")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
restarted = NewService(root, "device-a")
|
||||
if _, err := restarted.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("scan after offline delete: %v", err)
|
||||
}
|
||||
ops = unpushedOps(t, restarted)
|
||||
if len(ops) != 3 || ops[1].OpType != OpUpdate || ops[2].OpType != OpDelete {
|
||||
t.Fatalf("offline lifecycle operations = %#v", ops)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordBootstrapOpsPublishesExistingFilesWithoutDeletes(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.Mkdir(filepath.Join(root, "Existing"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "Existing", "before-sync.txt"), []byte("local"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
service := NewService(root, "device-a")
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
initial, err := service.LoadSnapshot()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := service.RecordBootstrapOps(initial); err != nil {
|
||||
t.Fatalf("RecordBootstrapOps: %v", err)
|
||||
}
|
||||
ops := unpushedOps(t, service)
|
||||
if len(ops) != 2 {
|
||||
t.Fatalf("bootstrap ops = %#v, want create folder and file", ops)
|
||||
}
|
||||
for _, op := range ops {
|
||||
if op.OpType != OpCreate {
|
||||
t.Fatalf("bootstrap op = %+v, initial scan must not create delete", op)
|
||||
}
|
||||
}
|
||||
|
||||
empty := newSnapshot()
|
||||
if err := service.RecordBootstrapOps(empty); err != nil {
|
||||
t.Fatalf("empty bootstrap: %v", err)
|
||||
}
|
||||
if got := len(unpushedOps(t, service)); got != 2 {
|
||||
t.Fatalf("empty bootstrap added operations = %d, want 2", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSyncBootstrapAndWarningStateSurviveRestart(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
service := NewService(root, "device-a")
|
||||
if err := service.SetBootstrapComplete(true); err != nil {
|
||||
t.Fatalf("SetBootstrapComplete: %v", err)
|
||||
}
|
||||
if err := service.SetLastWarning("file-too-large: archive.bin"); err != nil {
|
||||
t.Fatalf("SetLastWarning: %v", err)
|
||||
}
|
||||
|
||||
restarted := NewService(root, "")
|
||||
bootstrapped, err := restarted.BootstrapComplete()
|
||||
if err != nil {
|
||||
t.Fatalf("BootstrapComplete: %v", err)
|
||||
}
|
||||
if !bootstrapped {
|
||||
t.Fatal("bootstrap state was lost after restart")
|
||||
}
|
||||
warning, err := restarted.LastWarning()
|
||||
if err != nil {
|
||||
t.Fatalf("LastWarning: %v", err)
|
||||
}
|
||||
if warning != "file-too-large: archive.bin" {
|
||||
t.Fatalf("warning = %q", warning)
|
||||
}
|
||||
}
|
||||
|
||||
func TestScanAndRecordSkipsReservedTemporaryAndSymlinkPaths(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.MkdirAll(filepath.Join(root, ".verstak", "sync"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, ".verstak", "sync", "state.json"), []byte("{}"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, ".verstak-write-local"), []byte("temporary"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "draft.tmp"), []byte("temporary"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "normal.txt"), []byte("normal"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if runtime.GOOS != "windows" {
|
||||
if err := os.Symlink(filepath.Join(root, "normal.txt"), filepath.Join(root, "normal-link.txt")); err != nil {
|
||||
t.Skipf("symlink unavailable: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
service := NewService(root, "device-a")
|
||||
if _, err := service.ScanAndRecord(); err != nil {
|
||||
t.Fatalf("baseline: %v", err)
|
||||
}
|
||||
snapshot, err := service.LoadSnapshot()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, path := range []string{".verstak/sync/state.json", ".verstak-write-local", "draft.tmp", "normal-link.txt"} {
|
||||
if _, ok := snapshot.Entries[path]; ok {
|
||||
t.Fatalf("reserved path %q was included in snapshot %#v", path, snapshot.Entries)
|
||||
}
|
||||
}
|
||||
if _, ok := snapshot.Entries["normal.txt"]; !ok {
|
||||
t.Fatalf("normal file missing from snapshot %#v", snapshot.Entries)
|
||||
}
|
||||
}
|
||||
|
||||
func TestScanAndRecordKeepsUnsupportedFileUnresolved(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
path := filepath.Join(root, "too-large.bin")
|
||||
if err := os.WriteFile(path, nil, 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Truncate(path, maxOperationFileBytes+1); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
service := NewService(root, "device-a")
|
||||
|
||||
warnings, err := service.ScanAndRecord()
|
||||
if err != nil {
|
||||
t.Fatalf("scan unsupported file: %v", err)
|
||||
}
|
||||
if len(warnings) != 1 || !strings.Contains(warnings[0], "too-large.bin") || !strings.Contains(warnings[0], "file-too-large") {
|
||||
t.Fatalf("warnings = %v", warnings)
|
||||
}
|
||||
assertUnpushedCount(t, service, 0)
|
||||
snapshot, err := service.LoadSnapshot()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, ok := snapshot.Entries["too-large.bin"]; ok {
|
||||
t.Fatalf("unsupported file was marked synchronized: %#v", snapshot.Entries)
|
||||
}
|
||||
|
||||
warnings, err = service.ScanAndRecord()
|
||||
if err != nil || len(warnings) != 1 {
|
||||
t.Fatalf("second scan warnings=%v err=%v, unresolved file must remain visible", warnings, err)
|
||||
}
|
||||
}
|
||||
|
||||
func unpushedOps(t *testing.T, service *Service) []Op {
|
||||
t.Helper()
|
||||
ops, err := service.GetUnpushedOps()
|
||||
if err != nil {
|
||||
t.Fatalf("GetUnpushedOps: %v", err)
|
||||
}
|
||||
return ops
|
||||
}
|
||||
|
||||
func assertUnpushedCount(t *testing.T, service *Service, want int) {
|
||||
t.Helper()
|
||||
if got := len(unpushedOps(t, service)); got != want {
|
||||
t.Fatalf("unpushed ops = %d, want %d", got, want)
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -7,16 +7,12 @@ import (
|
|||
"runtime"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
func TestListWorkspacesReadsTopLevelPhysicalFolders(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Project"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Project"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Test"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Test"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, ".verstak"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, ".git"))
|
||||
mustWrite(t, filepath.Join(vaultDir, "readme.md"), "not a workspace")
|
||||
|
|
@ -38,61 +34,6 @@ func TestListWorkspacesReadsTopLevelPhysicalFolders(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestListWorkspacesIncludesNestedWorkspaces(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Clients"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Clients", "Romashka"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Clients", "Romashka"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Clients", "Alpha"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Clients", "Alpha"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Personal"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Personal"))
|
||||
|
||||
m := NewManager(vaultDir)
|
||||
if err := m.Load(); err != nil {
|
||||
t.Fatalf("Load: %v", err)
|
||||
}
|
||||
|
||||
workspaces, err := m.ListWorkspaces()
|
||||
if err != nil {
|
||||
t.Fatalf("ListWorkspaces: %v", err)
|
||||
}
|
||||
|
||||
if len(workspaces) != 3 {
|
||||
t.Fatalf("workspaces = %d, want 3", len(workspaces))
|
||||
}
|
||||
paths := make([]string, len(workspaces))
|
||||
for i, ws := range workspaces {
|
||||
paths[i] = ws.Path
|
||||
}
|
||||
wantPaths := []string{"Clients/Alpha", "Clients/Romashka", "Personal"}
|
||||
if strings.Join(paths, ",") != strings.Join(wantPaths, ",") {
|
||||
t.Fatalf("paths = %v, want %v", paths, wantPaths)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateWorkspaceNested(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
m := NewManager(vaultDir)
|
||||
|
||||
// Create parent folder first
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Clients"))
|
||||
ws, err := m.CreateWorkspace("Clients/Project", "")
|
||||
if err != nil {
|
||||
t.Fatalf("CreateWorkspace nested: %v", err)
|
||||
}
|
||||
if ws.Path != "Clients/Project" {
|
||||
t.Fatalf("workspace path = %q, want Clients/Project", ws.Path)
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(vaultDir, "Clients", "Project")); err != nil {
|
||||
t.Fatalf("workspace folder missing: %v", err)
|
||||
}
|
||||
// Verify marker
|
||||
if _, err := os.Stat(filepath.Join(vaultDir, "Clients", "Project", ".verstak", "workspace.json")); err != nil {
|
||||
t.Fatalf("marker missing: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestListWorkspacesExcludesTopLevelSymlink(t *testing.T) {
|
||||
if runtime.GOOS == "windows" {
|
||||
t.Skip("symlink creation needs extra privileges on Windows")
|
||||
|
|
@ -494,93 +435,6 @@ func TestRestoreWorkspaceTrashPreservesIdentity(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestApplySyncedWorkspaceLifecycleKeepsIdentityAndRejectsNameConflict(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
m := NewManager(vaultDir)
|
||||
workspaceID := "5f0f96d9-61c8-4b6b-8c3a-a1b9a0f40001"
|
||||
meta := Metadata{
|
||||
WorkspaceID: workspaceID,
|
||||
WorkspaceName: "Remote",
|
||||
CreatedFromTemplate: &TemplateSnapshot{
|
||||
TemplateID: "minimal",
|
||||
TemplateName: "Minimal",
|
||||
TemplateVersion: 1,
|
||||
AppliedAt: "2026-07-17T00:00:00Z",
|
||||
},
|
||||
Features: map[string]bool{"files": true},
|
||||
Folders: map[string]string{"notes": "Notes"},
|
||||
}
|
||||
|
||||
created, err := m.CreateWorkspaceFromSync("Remote", workspaceID, meta)
|
||||
if err != nil {
|
||||
t.Fatalf("CreateWorkspaceFromSync: %v", err)
|
||||
}
|
||||
if created.ID != workspaceID || created.Name != "Remote" {
|
||||
t.Fatalf("created = %+v", created)
|
||||
}
|
||||
if _, err := m.CreateWorkspaceFromSync("Remote", workspaceID, meta); err != nil {
|
||||
t.Fatalf("replayed create: %v", err)
|
||||
}
|
||||
|
||||
if err := m.RenameWorkspaceFromSync(workspaceID, "Remote", "Remote-Renamed"); err != nil {
|
||||
t.Fatalf("RenameWorkspaceFromSync: %v", err)
|
||||
}
|
||||
if err := m.RenameWorkspaceFromSync(workspaceID, "Remote", "Remote-Renamed"); err != nil {
|
||||
t.Fatalf("replayed rename: %v", err)
|
||||
}
|
||||
trashed, err := m.TrashWorkspaceFromSync(workspaceID, "Remote-Renamed")
|
||||
if err != nil {
|
||||
t.Fatalf("TrashWorkspaceFromSync: %v", err)
|
||||
}
|
||||
if trashed.WorkspaceID != workspaceID {
|
||||
t.Fatalf("trashed = %+v", trashed)
|
||||
}
|
||||
if _, err := m.TrashWorkspaceFromSync(workspaceID, "Remote-Renamed"); err != nil {
|
||||
t.Fatalf("replayed trash: %v", err)
|
||||
}
|
||||
restored, err := m.RestoreWorkspaceFromSync(workspaceID, "Remote-Restored")
|
||||
if err != nil {
|
||||
t.Fatalf("RestoreWorkspaceFromSync: %v", err)
|
||||
}
|
||||
if restored.ID != workspaceID || restored.Name != "Remote-Restored" {
|
||||
t.Fatalf("restored = %+v", restored)
|
||||
}
|
||||
if _, err := m.RestoreWorkspaceFromSync(workspaceID, "Remote-Restored"); err != nil {
|
||||
t.Fatalf("replayed restore: %v", err)
|
||||
}
|
||||
|
||||
if _, err := m.CreateWorkspace("Taken", "minimal"); err != nil {
|
||||
t.Fatalf("CreateWorkspace Taken: %v", err)
|
||||
}
|
||||
if err := m.RenameWorkspaceFromSync(workspaceID, "Remote-Restored", "Taken"); err == nil || !strings.Contains(err.Error(), "conflict") {
|
||||
t.Fatalf("rename conflict error = %v, want conflict", err)
|
||||
}
|
||||
if _, err := m.CreateWorkspaceFromSync("Copied", workspaceID, meta); err == nil || !strings.Contains(err.Error(), "conflict") {
|
||||
t.Fatalf("duplicate workspace ID error = %v, want conflict", err)
|
||||
}
|
||||
|
||||
stored, err := m.GetWorkspaceMetadata("Remote-Restored")
|
||||
if err != nil {
|
||||
t.Fatalf("GetWorkspaceMetadata: %v", err)
|
||||
}
|
||||
if stored.WorkspaceID != workspaceID || stored.CreatedFromTemplate == nil || stored.CreatedFromTemplate.TemplateID != "minimal" {
|
||||
t.Fatalf("stored metadata = %+v", stored)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateWorkspaceFromSyncRejectsUnsafeMetadataFolder(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
m := NewManager(vaultDir)
|
||||
if _, err := m.CreateWorkspaceFromSync("Remote", uuid.NewString(), Metadata{
|
||||
Folders: map[string]string{"files": "../escaped"},
|
||||
}); err == nil || !strings.Contains(err.Error(), "invalid workspace folder") {
|
||||
t.Fatalf("unsafe synced metadata error = %v", err)
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(vaultDir, "escaped")); !os.IsNotExist(err) {
|
||||
t.Fatalf("unsafe synced metadata created path outside workspace: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPurgeWorkspaceTrashRemovesPayload(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
m := NewManager(vaultDir)
|
||||
|
|
@ -613,24 +467,23 @@ func TestCreateAndRenameConflictsAreExplicit(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestInvalidWorkspacePathsRejected(t *testing.T) {
|
||||
func TestInvalidWorkspaceNamesRejected(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
m := NewManager(vaultDir)
|
||||
|
||||
paths := []string{"", " ", `A\B`, "/abs", `C:\abs`, "..", "a/../b", "bad\x00name", ".verstak", ".Verstak", ".git"}
|
||||
for _, path := range paths {
|
||||
if _, err := m.CreateWorkspace(path, ""); err == nil {
|
||||
t.Fatalf("CreateWorkspace(%q) succeeded, want invalid path error", path)
|
||||
names := []string{"", " ", "A/B", `A\B`, "/abs", `C:\abs`, "..", "a..b", "bad\x00name", ".verstak", ".Verstak", ".git"}
|
||||
for _, name := range names {
|
||||
if _, err := m.CreateWorkspace(name, ""); err == nil {
|
||||
t.Fatalf("CreateWorkspace(%q) succeeded, want invalid name error", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCompatibilityTreeIncludesFoldersAndNestedWorkspaces(t *testing.T) {
|
||||
func TestCompatibilityTreeIsDerivedFromTopLevelFolders(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Project"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Project"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Project", "Nested"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Test"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Test"))
|
||||
|
||||
m := NewManager(vaultDir)
|
||||
if err := m.Load(); err != nil {
|
||||
|
|
@ -640,43 +493,34 @@ func TestCompatibilityTreeIncludesFoldersAndNestedWorkspaces(t *testing.T) {
|
|||
if len(tree.Nodes) != 2 {
|
||||
t.Fatalf("nodes = %+v, want 2 top-level workspaces", tree.Nodes)
|
||||
}
|
||||
if tree.Nodes[0].ID != "Project" || tree.Nodes[0].Title != "Project" {
|
||||
t.Fatalf("first compatibility node = %+v, want workspace node", tree.Nodes[0])
|
||||
if tree.Nodes[0].ID != "Project" || tree.Nodes[0].Title != "Project" || tree.Nodes[0].Path != "" {
|
||||
t.Fatalf("first compatibility node = %+v, want derived workspace without persisted path mapping", tree.Nodes[0])
|
||||
}
|
||||
for _, node := range tree.Nodes {
|
||||
if node.ID == "Nested" || node.Title == "Nested" {
|
||||
t.Fatalf("nested folders without markers must not become workspace nodes: %+v", tree.Nodes)
|
||||
if node.ParentID != "" {
|
||||
t.Fatalf("compatibility tree should be flat, got child node %+v", node)
|
||||
}
|
||||
}
|
||||
// Workspace nodes should NOT have ParentID for root-level ones
|
||||
for _, node := range tree.Nodes {
|
||||
if node.Type == TypeSpace && node.ID == "Project" && node.ParentID != "" {
|
||||
t.Fatalf("root workspace should have empty ParentID: %+v", node)
|
||||
if node.ID == "Nested" || node.Title == "Nested" {
|
||||
t.Fatalf("nested folders must not become workspace nodes: %+v", tree.Nodes)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMoveNodeCreatesNestedWorkspaceModel(t *testing.T) {
|
||||
func TestMoveNodeCompatibilityDoesNotCreateNestedWorkspaceModel(t *testing.T) {
|
||||
vaultDir := newVaultDir(t)
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Project"))
|
||||
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Project"))
|
||||
mustMkdir(t, filepath.Join(vaultDir, "Test"))
|
||||
|
||||
m := NewManager(vaultDir)
|
||||
if err := m.Load(); err != nil {
|
||||
t.Fatalf("Load: %v", err)
|
||||
}
|
||||
// Move workspace into Test folder (which is a plain folder without marker)
|
||||
err := m.MoveNode("Project", "Test")
|
||||
if err != nil {
|
||||
t.Fatalf("MoveNode error = %v, want success", err)
|
||||
if err == nil || !strings.Contains(err.Error(), "top-level only") {
|
||||
t.Fatalf("MoveNode error = %v, want top-level only", err)
|
||||
}
|
||||
if _, statErr := os.Stat(filepath.Join(vaultDir, "Test", "Project")); statErr != nil {
|
||||
t.Fatalf("MoveNode did not create nested folder, stat err=%v", statErr)
|
||||
}
|
||||
// Verify marker moved
|
||||
if _, statErr := os.Stat(filepath.Join(vaultDir, "Test", "Project", ".verstak", "workspace.json")); statErr != nil {
|
||||
t.Fatalf("marker not in new location: %v", statErr)
|
||||
if _, statErr := os.Stat(filepath.Join(vaultDir, "Test", "Project")); !os.IsNotExist(statErr) {
|
||||
t.Fatalf("MoveNode created nested mapped workspace, stat err=%v", statErr)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -703,22 +547,6 @@ func TestMetadataFileShape(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func mustWriteWorkspaceMarker(t *testing.T, dir string) {
|
||||
t.Helper()
|
||||
markerPath := filepath.Join(dir, ".verstak", "workspace.json")
|
||||
if err := os.MkdirAll(filepath.Dir(markerPath), 0o755); err != nil {
|
||||
t.Fatalf("MkdirAll(%s): %v", filepath.Dir(markerPath), err)
|
||||
}
|
||||
marker := workspaceIdentityMarker{WorkspaceID: uuid.NewString()}
|
||||
data, err := json.Marshal(marker)
|
||||
if err != nil {
|
||||
t.Fatalf("marshal marker: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(markerPath, data, 0o644); err != nil {
|
||||
t.Fatalf("WriteFile(%s): %v", markerPath, err)
|
||||
}
|
||||
}
|
||||
|
||||
func newVaultDir(t *testing.T) string {
|
||||
t.Helper()
|
||||
vaultDir := filepath.Join(t.TempDir(), "vault")
|
||||
|
|
|
|||
|
|
@ -1,314 +0,0 @@
|
|||
// Package tray owns the native tray menu wiring for the desktop shell.
|
||||
package tray
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"log"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
)
|
||||
|
||||
var errBackendUnavailable = errors.New("tray backend is unavailable")
|
||||
|
||||
// MenuItem exposes click events from a native tray menu item.
|
||||
type MenuItem interface {
|
||||
Clicked() <-chan struct{}
|
||||
SetTitle(title string)
|
||||
SetTooltip(tooltip string)
|
||||
}
|
||||
|
||||
// BackendCallbacks are invoked by the native tray implementation.
|
||||
// A backend keeps the platform-native secondary-click handler enabled so the
|
||||
// operating system opens the menu on a right click.
|
||||
type BackendCallbacks struct {
|
||||
Ready func()
|
||||
Exit func()
|
||||
LeftClick func()
|
||||
}
|
||||
|
||||
// Backend is the platform tray implementation.
|
||||
type Backend interface {
|
||||
Start(callbacks BackendCallbacks) error
|
||||
SetIcon(icon []byte) error
|
||||
SetTooltip(tooltip string) error
|
||||
AddMenuItem(title, tooltip string) (MenuItem, error)
|
||||
Stop()
|
||||
}
|
||||
|
||||
// Actions are executed from the native tray menu.
|
||||
type Actions struct {
|
||||
Show func()
|
||||
Quit func()
|
||||
}
|
||||
|
||||
// Labels contains the user-visible text for one tray menu locale.
|
||||
type Labels struct {
|
||||
ShowTitle string
|
||||
ShowTooltip string
|
||||
QuitTitle string
|
||||
QuitTooltip string
|
||||
}
|
||||
|
||||
func englishLabels() Labels {
|
||||
return Labels{
|
||||
ShowTitle: "Show Verstak",
|
||||
ShowTooltip: "Show the Verstak window",
|
||||
QuitTitle: "Quit",
|
||||
QuitTooltip: "Quit Verstak",
|
||||
}
|
||||
}
|
||||
|
||||
func russianLabels() Labels {
|
||||
return Labels{
|
||||
ShowTitle: "Показать Верстак",
|
||||
ShowTooltip: "Показать окно Верстака",
|
||||
QuitTitle: "Выйти",
|
||||
QuitTooltip: "Завершить Верстак",
|
||||
}
|
||||
}
|
||||
|
||||
// LabelsForPreference resolves the saved language preference for native tray UI.
|
||||
// System locale values are intentionally passed in by the shell so this package
|
||||
// stays independent of process environment and is deterministic in tests.
|
||||
func LabelsForPreference(preference string, systemLocales ...string) Labels {
|
||||
if strings.EqualFold(strings.TrimSpace(preference), "ru") {
|
||||
return russianLabels()
|
||||
}
|
||||
if strings.EqualFold(strings.TrimSpace(preference), "system") {
|
||||
for _, locale := range systemLocales {
|
||||
locale = strings.ToLower(strings.TrimSpace(locale))
|
||||
if locale == "" {
|
||||
continue
|
||||
}
|
||||
if strings.HasPrefix(locale, "ru") {
|
||||
return russianLabels()
|
||||
}
|
||||
return englishLabels()
|
||||
}
|
||||
}
|
||||
return englishLabels()
|
||||
}
|
||||
|
||||
// Controller initializes one native tray and routes its menu actions.
|
||||
type Controller struct {
|
||||
backend Backend
|
||||
icon []byte
|
||||
|
||||
startOnce sync.Once
|
||||
readyOnce sync.Once
|
||||
stopOnce sync.Once
|
||||
started atomic.Bool
|
||||
ready atomic.Bool
|
||||
|
||||
mu sync.RWMutex
|
||||
labels Labels
|
||||
actions Actions
|
||||
show MenuItem
|
||||
quit MenuItem
|
||||
startErr error
|
||||
readyChanged func(bool)
|
||||
}
|
||||
|
||||
// New creates a tray controller for one application process.
|
||||
func New(backend Backend, icon []byte) *Controller {
|
||||
return &Controller{
|
||||
backend: backend,
|
||||
icon: append([]byte(nil), icon...),
|
||||
labels: englishLabels(),
|
||||
}
|
||||
}
|
||||
|
||||
// SetReadyChangedHandler receives readiness changes after native initialization
|
||||
// has either completed or ended. It lets the Wails close policy avoid hiding a
|
||||
// window before the tray can bring it back.
|
||||
func (c *Controller) SetReadyChangedHandler(handler func(bool)) {
|
||||
if c == nil {
|
||||
return
|
||||
}
|
||||
c.mu.Lock()
|
||||
c.readyChanged = handler
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// Ready reports whether the tray has completed icon and menu initialization.
|
||||
func (c *Controller) Ready() bool {
|
||||
return c != nil && c.ready.Load()
|
||||
}
|
||||
|
||||
// SetLabels updates the current and future native tray menu labels.
|
||||
func (c *Controller) SetLabels(labels Labels) {
|
||||
if c == nil {
|
||||
return
|
||||
}
|
||||
c.mu.Lock()
|
||||
c.labels = labels
|
||||
show, quit := c.show, c.quit
|
||||
c.mu.Unlock()
|
||||
applyLabels(show, quit, labels)
|
||||
}
|
||||
|
||||
// Start connects the tray to Wails without taking over Wails' GUI event loop.
|
||||
// Ready remains false until the backend callback and all required menu setup
|
||||
// finish successfully.
|
||||
func (c *Controller) Start(actions Actions) error {
|
||||
if c == nil || c.backend == nil {
|
||||
return errBackendUnavailable
|
||||
}
|
||||
c.startOnce.Do(func() {
|
||||
c.mu.Lock()
|
||||
c.actions = actions
|
||||
c.mu.Unlock()
|
||||
c.started.Store(true)
|
||||
log.Printf("[tray] starting native backend")
|
||||
err := c.backend.Start(BackendCallbacks{
|
||||
Ready: c.onReady,
|
||||
Exit: c.onExit,
|
||||
LeftClick: c.onLeftClick,
|
||||
})
|
||||
if err != nil {
|
||||
c.mu.Lock()
|
||||
c.startErr = err
|
||||
c.mu.Unlock()
|
||||
c.started.Store(false)
|
||||
c.setReady(false)
|
||||
log.Printf("[tray] backend start failed: %v; falling back to normal window close", err)
|
||||
}
|
||||
})
|
||||
c.mu.RLock()
|
||||
err := c.startErr
|
||||
c.mu.RUnlock()
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *Controller) onReady() {
|
||||
if c == nil {
|
||||
return
|
||||
}
|
||||
if !c.started.Load() {
|
||||
log.Printf("[tray] ready callback ignored after backend startup failed")
|
||||
return
|
||||
}
|
||||
c.readyOnce.Do(func() {
|
||||
log.Printf("[tray] native backend reported ready")
|
||||
if err := c.backend.SetIcon(c.icon); err != nil {
|
||||
c.fail("icon setup", err)
|
||||
return
|
||||
}
|
||||
if err := c.backend.SetTooltip("Verstak"); err != nil {
|
||||
c.fail("tooltip setup", err)
|
||||
return
|
||||
}
|
||||
c.mu.RLock()
|
||||
labels := c.labels
|
||||
actions := c.actions
|
||||
c.mu.RUnlock()
|
||||
show, err := c.backend.AddMenuItem(labels.ShowTitle, labels.ShowTooltip)
|
||||
if err != nil || show == nil {
|
||||
if err == nil {
|
||||
err = errors.New("show menu item is nil")
|
||||
}
|
||||
c.fail("show menu creation", err)
|
||||
return
|
||||
}
|
||||
quit, err := c.backend.AddMenuItem(labels.QuitTitle, labels.QuitTooltip)
|
||||
if err != nil || quit == nil {
|
||||
if err == nil {
|
||||
err = errors.New("quit menu item is nil")
|
||||
}
|
||||
c.fail("quit menu creation", err)
|
||||
return
|
||||
}
|
||||
c.mu.Lock()
|
||||
c.show, c.quit = show, quit
|
||||
labels = c.labels
|
||||
c.mu.Unlock()
|
||||
applyLabels(show, quit, labels)
|
||||
if actions.Show != nil {
|
||||
go routeClicks(show.Clicked(), func() {
|
||||
log.Printf("[tray] Show command")
|
||||
actions.Show()
|
||||
})
|
||||
}
|
||||
if actions.Quit != nil {
|
||||
go routeClicks(quit.Clicked(), func() {
|
||||
log.Printf("[tray] Quit command")
|
||||
actions.Quit()
|
||||
})
|
||||
}
|
||||
c.setReady(true)
|
||||
log.Printf("[tray] native tray is ready")
|
||||
})
|
||||
}
|
||||
|
||||
func (c *Controller) onLeftClick() {
|
||||
if c == nil {
|
||||
return
|
||||
}
|
||||
log.Printf("[tray] left click")
|
||||
if !c.Ready() {
|
||||
log.Printf("[tray] left click ignored while tray is not ready")
|
||||
return
|
||||
}
|
||||
c.mu.RLock()
|
||||
show := c.actions.Show
|
||||
c.mu.RUnlock()
|
||||
if show != nil {
|
||||
show()
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Controller) onExit() {
|
||||
if c == nil {
|
||||
return
|
||||
}
|
||||
c.setReady(false)
|
||||
log.Printf("[tray] native message loop ended; falling back to normal window close")
|
||||
}
|
||||
|
||||
func (c *Controller) fail(stage string, err error) {
|
||||
c.setReady(false)
|
||||
log.Printf("[tray] %s failed: %v; falling back to normal window close", stage, err)
|
||||
c.Stop()
|
||||
}
|
||||
|
||||
func (c *Controller) setReady(ready bool) {
|
||||
if c == nil || c.ready.Swap(ready) == ready {
|
||||
return
|
||||
}
|
||||
c.mu.RLock()
|
||||
handler := c.readyChanged
|
||||
c.mu.RUnlock()
|
||||
if handler != nil {
|
||||
handler(ready)
|
||||
}
|
||||
}
|
||||
|
||||
func applyLabels(show, quit MenuItem, labels Labels) {
|
||||
if show != nil {
|
||||
show.SetTitle(labels.ShowTitle)
|
||||
show.SetTooltip(labels.ShowTooltip)
|
||||
}
|
||||
if quit != nil {
|
||||
quit.SetTitle(labels.QuitTitle)
|
||||
quit.SetTooltip(labels.QuitTooltip)
|
||||
}
|
||||
}
|
||||
|
||||
// Stop releases the native tray after Wails has begun application shutdown.
|
||||
func (c *Controller) Stop() {
|
||||
if c == nil || c.backend == nil || !c.started.Load() {
|
||||
return
|
||||
}
|
||||
c.stopOnce.Do(func() {
|
||||
c.setReady(false)
|
||||
log.Printf("[tray] stopping native backend")
|
||||
c.backend.Stop()
|
||||
})
|
||||
}
|
||||
|
||||
func routeClicks(clicked <-chan struct{}, action func()) {
|
||||
for range clicked {
|
||||
action()
|
||||
}
|
||||
}
|
||||
|
|
@ -1,227 +0,0 @@
|
|||
package tray
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
type fakeMenuItem struct {
|
||||
clicked chan struct{}
|
||||
title string
|
||||
tooltip string
|
||||
}
|
||||
|
||||
func (i *fakeMenuItem) Clicked() <-chan struct{} { return i.clicked }
|
||||
func (i *fakeMenuItem) SetTitle(title string) { i.title = title }
|
||||
func (i *fakeMenuItem) SetTooltip(tooltip string) { i.tooltip = tooltip }
|
||||
|
||||
type fakeBackend struct {
|
||||
callbacks BackendCallbacks
|
||||
icon []byte
|
||||
tooltip string
|
||||
items map[string]*fakeMenuItem
|
||||
startErr error
|
||||
iconErr error
|
||||
menuErr error
|
||||
starts int
|
||||
stops int
|
||||
}
|
||||
|
||||
func (b *fakeBackend) Start(callbacks BackendCallbacks) error {
|
||||
b.starts++
|
||||
b.callbacks = callbacks
|
||||
return b.startErr
|
||||
}
|
||||
|
||||
func (b *fakeBackend) SetIcon(icon []byte) error {
|
||||
b.icon = append([]byte(nil), icon...)
|
||||
return b.iconErr
|
||||
}
|
||||
|
||||
func (b *fakeBackend) SetTooltip(tooltip string) error {
|
||||
b.tooltip = tooltip
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *fakeBackend) AddMenuItem(title, tooltip string) (MenuItem, error) {
|
||||
if b.menuErr != nil {
|
||||
return nil, b.menuErr
|
||||
}
|
||||
item := &fakeMenuItem{clicked: make(chan struct{}, 1), title: title, tooltip: tooltip}
|
||||
b.items[title] = item
|
||||
return item, nil
|
||||
}
|
||||
|
||||
func (b *fakeBackend) Stop() { b.stops++ }
|
||||
|
||||
func (b *fakeBackend) ready() {
|
||||
if b.callbacks.Ready != nil {
|
||||
b.callbacks.Ready()
|
||||
}
|
||||
}
|
||||
|
||||
func (b *fakeBackend) exited() {
|
||||
if b.callbacks.Exit != nil {
|
||||
b.callbacks.Exit()
|
||||
}
|
||||
}
|
||||
|
||||
func (b *fakeBackend) leftClick() {
|
||||
if b.callbacks.LeftClick != nil {
|
||||
b.callbacks.LeftClick()
|
||||
}
|
||||
}
|
||||
|
||||
func waitFor(t *testing.T, signal <-chan struct{}) {
|
||||
t.Helper()
|
||||
select {
|
||||
case <-signal:
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("timed out waiting for tray action")
|
||||
}
|
||||
}
|
||||
|
||||
func TestControllerBecomesReadyOnlyAfterBackendCallback(t *testing.T) {
|
||||
backend := &fakeBackend{items: make(map[string]*fakeMenuItem)}
|
||||
controller := New(backend, []byte{1, 2, 3})
|
||||
|
||||
if err := controller.Start(Actions{}); err != nil {
|
||||
t.Fatalf("Start() error = %v", err)
|
||||
}
|
||||
if controller.Ready() {
|
||||
t.Fatal("tray became ready before backend callback")
|
||||
}
|
||||
|
||||
backend.ready()
|
||||
if !controller.Ready() {
|
||||
t.Fatal("tray did not become ready after backend callback")
|
||||
}
|
||||
if string(backend.icon) != string([]byte{1, 2, 3}) || backend.tooltip != "Verstak" {
|
||||
t.Fatalf("tray initialization = icon:%v tooltip:%q", backend.icon, backend.tooltip)
|
||||
}
|
||||
}
|
||||
|
||||
func TestControllerRoutesLeftClickAndMenuActionsToShowAndQuit(t *testing.T) {
|
||||
backend := &fakeBackend{items: make(map[string]*fakeMenuItem)}
|
||||
showCalls := make(chan struct{}, 2)
|
||||
quitCalls := make(chan struct{}, 1)
|
||||
controller := New(backend, []byte{1})
|
||||
|
||||
if err := controller.Start(Actions{
|
||||
Show: func() { showCalls <- struct{}{} },
|
||||
Quit: func() { quitCalls <- struct{}{} },
|
||||
}); err != nil {
|
||||
t.Fatalf("Start() error = %v", err)
|
||||
}
|
||||
backend.ready()
|
||||
|
||||
backend.leftClick()
|
||||
waitFor(t, showCalls)
|
||||
showItem := backend.items["Show Verstak"]
|
||||
quitItem := backend.items["Quit"]
|
||||
if showItem == nil || quitItem == nil {
|
||||
t.Fatalf("tray menu = %#v, want Show Verstak and Quit", backend.items)
|
||||
}
|
||||
showItem.clicked <- struct{}{}
|
||||
waitFor(t, showCalls)
|
||||
quitItem.clicked <- struct{}{}
|
||||
waitFor(t, quitCalls)
|
||||
}
|
||||
|
||||
func TestControllerStopCallsBackendOnce(t *testing.T) {
|
||||
backend := &fakeBackend{items: make(map[string]*fakeMenuItem)}
|
||||
controller := New(backend, []byte{1})
|
||||
if err := controller.Start(Actions{}); err != nil {
|
||||
t.Fatalf("Start() error = %v", err)
|
||||
}
|
||||
|
||||
controller.Stop()
|
||||
controller.Stop()
|
||||
|
||||
if backend.stops != 1 {
|
||||
t.Fatalf("backend stop calls = %d, want 1", backend.stops)
|
||||
}
|
||||
}
|
||||
|
||||
func TestControllerStartupAndSetupFailuresNeverBecomeReady(t *testing.T) {
|
||||
for name, backend := range map[string]*fakeBackend{
|
||||
"start": {items: make(map[string]*fakeMenuItem), startErr: errors.New("start failed")},
|
||||
"icon": {items: make(map[string]*fakeMenuItem), iconErr: errors.New("icon failed")},
|
||||
"menu": {items: make(map[string]*fakeMenuItem), menuErr: errors.New("menu failed")},
|
||||
} {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
controller := New(backend, []byte{1})
|
||||
err := controller.Start(Actions{})
|
||||
if name == "start" && err == nil {
|
||||
t.Fatal("Start() error = nil, want startup failure")
|
||||
}
|
||||
if name != "start" && err != nil {
|
||||
t.Fatalf("Start() error = %v, want nil before ready callback", err)
|
||||
}
|
||||
backend.ready()
|
||||
if controller.Ready() {
|
||||
t.Fatal("failed tray became ready")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestControllerExitRevokesReadinessAndKeepsLocalizedMenuItems(t *testing.T) {
|
||||
backend := &fakeBackend{items: make(map[string]*fakeMenuItem)}
|
||||
controller := New(backend, []byte{1})
|
||||
controller.SetLabels(LabelsForPreference("ru"))
|
||||
if err := controller.Start(Actions{}); err != nil {
|
||||
t.Fatalf("Start() error = %v", err)
|
||||
}
|
||||
backend.ready()
|
||||
|
||||
show := backend.items["Показать Верстак"]
|
||||
quit := backend.items["Выйти"]
|
||||
if show == nil || quit == nil {
|
||||
t.Fatalf("Russian tray menu = %#v", backend.items)
|
||||
}
|
||||
controller.SetLabels(LabelsForPreference("en"))
|
||||
if show.title != "Show Verstak" || quit.title != "Quit" {
|
||||
t.Fatalf("English tray menu after update = show:%q quit:%q", show.title, quit.title)
|
||||
}
|
||||
backend.exited()
|
||||
if controller.Ready() {
|
||||
t.Fatal("tray stayed ready after backend exit")
|
||||
}
|
||||
}
|
||||
|
||||
func TestLabelsForSystemRussianLocale(t *testing.T) {
|
||||
labels := LabelsForPreference("system", "", "ru_RU.UTF-8", "en_US.UTF-8")
|
||||
if labels.ShowTitle != "Показать Верстак" || labels.QuitTitle != "Выйти" {
|
||||
t.Fatalf("system Russian labels = %#v", labels)
|
||||
}
|
||||
labels = LabelsForPreference("system", "C.UTF-8", "", "ru_RU.UTF-8")
|
||||
if labels.ShowTitle != "Show Verstak" || labels.QuitTitle != "Quit" {
|
||||
t.Fatalf("higher-priority system locale must win, got %#v", labels)
|
||||
}
|
||||
}
|
||||
|
||||
func TestControllerReadyNotificationIsSafeAcrossCallbacks(t *testing.T) {
|
||||
backend := &fakeBackend{items: make(map[string]*fakeMenuItem)}
|
||||
controller := New(backend, []byte{1})
|
||||
var changes []bool
|
||||
var mu sync.Mutex
|
||||
controller.SetReadyChangedHandler(func(ready bool) {
|
||||
mu.Lock()
|
||||
changes = append(changes, ready)
|
||||
mu.Unlock()
|
||||
})
|
||||
if err := controller.Start(Actions{}); err != nil {
|
||||
t.Fatalf("Start() error = %v", err)
|
||||
}
|
||||
backend.ready()
|
||||
backend.exited()
|
||||
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if len(changes) != 2 || !changes[0] || changes[1] {
|
||||
t.Fatalf("ready changes = %#v, want [true false]", changes)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
//go:build linux
|
||||
|
||||
package tray
|
||||
|
||||
import _ "embed"
|
||||
|
||||
//go:embed verstak.png
|
||||
var defaultIcon []byte
|
||||
|
||||
// DefaultIcon returns the Linux PNG tray icon embedded in the binary.
|
||||
func DefaultIcon() []byte {
|
||||
return append([]byte(nil), defaultIcon...)
|
||||
}
|
||||
|
||||
// IconFileExtension is used when the backend materializes the embedded icon.
|
||||
func IconFileExtension() string { return ".png" }
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
//go:build linux
|
||||
|
||||
package tray
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"image"
|
||||
"image/color"
|
||||
_ "image/png"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestDefaultIconUsesPlatformResource(t *testing.T) {
|
||||
icon := DefaultIcon()
|
||||
if len(icon) == 0 {
|
||||
t.Fatal("DefaultIcon() returned no data")
|
||||
}
|
||||
if IconFileExtension() != ".png" {
|
||||
t.Fatalf("IconFileExtension() = %q, want .png on Linux", IconFileExtension())
|
||||
}
|
||||
if string(icon[:8]) != "\x89PNG\r\n\x1a\n" {
|
||||
t.Fatal("DefaultIcon() is not PNG data on Linux")
|
||||
}
|
||||
assertVerstakBrand(t, icon)
|
||||
}
|
||||
|
||||
func assertVerstakBrand(t *testing.T, icon []byte) {
|
||||
t.Helper()
|
||||
image, _, err := image.Decode(bytes.NewReader(icon))
|
||||
if err != nil {
|
||||
t.Fatalf("decode tray icon: %v", err)
|
||||
}
|
||||
|
||||
want := color.NRGBA{R: 0x1c, G: 0x2f, B: 0x4a, A: 0xff}
|
||||
for y := image.Bounds().Min.Y; y < image.Bounds().Max.Y; y++ {
|
||||
for x := image.Bounds().Min.X; x < image.Bounds().Max.X; x++ {
|
||||
if color.NRGBAModel.Convert(image.At(x, y)) == want {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
t.Fatal("tray icon does not contain the Verstak navy brand color")
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
//go:build windows
|
||||
|
||||
package tray
|
||||
|
||||
import _ "embed"
|
||||
|
||||
//go:embed verstak.ico
|
||||
var defaultIcon []byte
|
||||
|
||||
// DefaultIcon returns the multi-resolution Windows ICO embedded in the binary.
|
||||
func DefaultIcon() []byte {
|
||||
return append([]byte(nil), defaultIcon...)
|
||||
}
|
||||
|
||||
// IconFileExtension is used when the backend materializes the embedded icon.
|
||||
func IconFileExtension() string { return ".ico" }
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
//go:build windows
|
||||
|
||||
package tray
|
||||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestDefaultIconIsMultiResolutionICO(t *testing.T) {
|
||||
icon := DefaultIcon()
|
||||
if IconFileExtension() != ".ico" || len(icon) < 6 {
|
||||
t.Fatalf("Windows tray icon is not ICO data")
|
||||
}
|
||||
if binary.LittleEndian.Uint16(icon[0:2]) != 0 || binary.LittleEndian.Uint16(icon[2:4]) != 1 {
|
||||
t.Fatal("Windows tray icon has an invalid ICO header")
|
||||
}
|
||||
count := int(binary.LittleEndian.Uint16(icon[4:6]))
|
||||
if count < 6 {
|
||||
t.Fatalf("ICO image count = %d, want at least 6", count)
|
||||
}
|
||||
want := map[int]bool{16: false, 20: false, 24: false, 32: false, 48: false, 256: false}
|
||||
for offset := 6; offset+16 <= len(icon) && offset < 6+count*16; offset += 16 {
|
||||
size := int(icon[offset])
|
||||
if size == 0 {
|
||||
size = 256
|
||||
}
|
||||
if _, ok := want[size]; ok {
|
||||
want[size] = true
|
||||
}
|
||||
}
|
||||
for size, found := range want {
|
||||
if !found {
|
||||
t.Errorf("ICO is missing %dx%d image", size, size)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
package tray
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"fyne.io/systray"
|
||||
)
|
||||
|
||||
var (
|
||||
runWithExternalLoop = systray.RunWithExternalLoop
|
||||
setOnTapped = systray.SetOnTapped
|
||||
)
|
||||
|
||||
type systrayBackend struct {
|
||||
mu sync.Mutex
|
||||
end func()
|
||||
iconPath string
|
||||
started bool
|
||||
stopRequested bool
|
||||
}
|
||||
|
||||
type systrayMenuItem struct {
|
||||
item *systray.MenuItem
|
||||
}
|
||||
|
||||
// NewNativeBackend creates the cross-platform tray backend. It uses
|
||||
// RunWithExternalLoop so the native tray message loop runs alongside Wails.
|
||||
func NewNativeBackend() Backend {
|
||||
return &systrayBackend{}
|
||||
}
|
||||
|
||||
func (b *systrayBackend) Start(callbacks BackendCallbacks) (err error) {
|
||||
if b == nil {
|
||||
return errBackendUnavailable
|
||||
}
|
||||
b.mu.Lock()
|
||||
if b.started {
|
||||
b.mu.Unlock()
|
||||
return errors.New("native tray backend was already started")
|
||||
}
|
||||
b.started = true
|
||||
b.mu.Unlock()
|
||||
defer func() {
|
||||
if recovered := recover(); recovered != nil {
|
||||
err = fmt.Errorf("native tray startup panic: %v", recovered)
|
||||
}
|
||||
}()
|
||||
start, end := runWithExternalLoop(callbacks.Ready, callbacks.Exit)
|
||||
if callbacks.LeftClick != nil {
|
||||
setOnTapped(callbacks.LeftClick)
|
||||
}
|
||||
// The Ready callback is asynchronous on Windows and can synchronously
|
||||
// decide that startup failed. Start the native loop before publishing the
|
||||
// end function so a concurrent Stop is never left with a half-started loop.
|
||||
start()
|
||||
b.mu.Lock()
|
||||
stopRequested := b.stopRequested
|
||||
if !stopRequested {
|
||||
b.end = end
|
||||
}
|
||||
b.mu.Unlock()
|
||||
if stopRequested {
|
||||
end()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *systrayBackend) SetIcon(icon []byte) error {
|
||||
if b == nil || len(icon) == 0 {
|
||||
return errors.New("tray icon is empty")
|
||||
}
|
||||
file, err := os.CreateTemp("", "verstak-tray-*"+IconFileExtension())
|
||||
if err != nil {
|
||||
return fmt.Errorf("create tray icon file: %w", err)
|
||||
}
|
||||
path := file.Name()
|
||||
if _, err := file.Write(icon); err != nil {
|
||||
file.Close()
|
||||
os.Remove(path)
|
||||
return fmt.Errorf("write tray icon file: %w", err)
|
||||
}
|
||||
if err := file.Close(); err != nil {
|
||||
os.Remove(path)
|
||||
return fmt.Errorf("close tray icon file: %w", err)
|
||||
}
|
||||
if err := systray.SetIconFromFilePath(path); err != nil {
|
||||
os.Remove(path)
|
||||
return fmt.Errorf("set native tray icon: %w", err)
|
||||
}
|
||||
b.mu.Lock()
|
||||
previous := b.iconPath
|
||||
b.iconPath = path
|
||||
b.mu.Unlock()
|
||||
if previous != "" && previous != path {
|
||||
_ = os.Remove(previous)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *systrayBackend) SetTooltip(tooltip string) error {
|
||||
if strings.TrimSpace(tooltip) == "" {
|
||||
return errors.New("tray tooltip is empty")
|
||||
}
|
||||
systray.SetTooltip(tooltip)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *systrayBackend) AddMenuItem(title, tooltip string) (MenuItem, error) {
|
||||
if strings.TrimSpace(title) == "" {
|
||||
return nil, errors.New("tray menu title is empty")
|
||||
}
|
||||
item := systray.AddMenuItem(title, tooltip)
|
||||
if item == nil {
|
||||
return nil, errors.New("native tray menu item is nil")
|
||||
}
|
||||
return systrayMenuItem{item: item}, nil
|
||||
}
|
||||
|
||||
func (b *systrayBackend) Stop() {
|
||||
if b == nil {
|
||||
return
|
||||
}
|
||||
b.mu.Lock()
|
||||
end, iconPath := b.end, b.iconPath
|
||||
b.end = nil
|
||||
b.iconPath = ""
|
||||
b.stopRequested = true
|
||||
b.mu.Unlock()
|
||||
if end != nil {
|
||||
end()
|
||||
}
|
||||
if iconPath != "" {
|
||||
_ = os.Remove(iconPath)
|
||||
}
|
||||
}
|
||||
|
||||
func (item systrayMenuItem) Clicked() <-chan struct{} {
|
||||
if item.item == nil {
|
||||
return nil
|
||||
}
|
||||
return item.item.ClickedCh
|
||||
}
|
||||
|
||||
func (item systrayMenuItem) SetTitle(title string) {
|
||||
if item.item != nil {
|
||||
item.item.SetTitle(title)
|
||||
}
|
||||
}
|
||||
|
||||
func (item systrayMenuItem) SetTooltip(tooltip string) {
|
||||
if item.item != nil {
|
||||
item.item.SetTooltip(tooltip)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
package tray
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestBackendStopsWhenReadyCallbackStopsDuringStartup(t *testing.T) {
|
||||
originalRun := runWithExternalLoop
|
||||
originalSetOnTapped := setOnTapped
|
||||
defer func() {
|
||||
runWithExternalLoop = originalRun
|
||||
setOnTapped = originalSetOnTapped
|
||||
}()
|
||||
|
||||
var startCalls, endCalls int
|
||||
runWithExternalLoop = func(onReady, _ func()) (func(), func()) {
|
||||
onReady()
|
||||
return func() { startCalls++ }, func() { endCalls++ }
|
||||
}
|
||||
setOnTapped = func(func()) {}
|
||||
|
||||
backend := &systrayBackend{}
|
||||
if err := backend.Start(BackendCallbacks{Ready: backend.Stop}); err != nil {
|
||||
t.Fatalf("Start: %v", err)
|
||||
}
|
||||
if startCalls != 1 {
|
||||
t.Fatalf("start calls = %d, want 1", startCalls)
|
||||
}
|
||||
if endCalls != 1 {
|
||||
t.Fatalf("end calls = %d, want 1", endCalls)
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue