[Graphite MQ] Draft PR GROUP:spec_cefa9a (PRs 2486, 2488, 2489, 2490, 2491, 2492, 2493)

.github/actions/desktop-e2e-linux/action.yml

@@ -40,7 +40,7 @@ runs:
       id: e2e-test
       run: |
         # Run tests and capture output to log file
-        pnpm -F e2e-blackbox test 2>&1 | tee "${{ env.E2E_LOGS_DIR }}/e2e-test-output.log"
+        pnpm -F e2e-blackbox e2e 2>&1 | tee "${{ env.E2E_LOGS_DIR }}/e2e-test-output.log"
         exit ${PIPESTATUS[0]}
       env:
         APP_BINARY_PATH: ${{ env.APP_BINARY_PATH }}

Cargo.toml

@@ -138,6 +138,7 @@ tauri-plugin-local-stt = { path = "plugins/local-stt" }
 tauri-plugin-misc = { path = "plugins/misc" }
 tauri-plugin-network = { path = "plugins/network" }
 tauri-plugin-notification = { path = "plugins/notification" }
+tauri-plugin-path2 = { path = "plugins/path2" }
 tauri-plugin-pdf = { path = "plugins/pdf" }
 tauri-plugin-permissions = { path = "plugins/permissions" }
 tauri-plugin-settings = { path = "plugins/settings" }

apps/desktop/package.json

@@ -48,6 +48,7 @@
     "@hypr/plugin-misc": "workspace:*",
     "@hypr/plugin-network": "workspace:*",
     "@hypr/plugin-notification": "workspace:*",
+    "@hypr/plugin-path2": "workspace:*",
     "@hypr/plugin-pdf": "workspace:*",
     "@hypr/plugin-permissions": "workspace:*",
     "@hypr/plugin-settings": "workspace:*",

apps/desktop/src-tauri/Cargo.toml

@@ -49,6 +49,7 @@ tauri-plugin-network = { workspace = true }
 tauri-plugin-notification = { workspace = true }
 tauri-plugin-opener = { workspace = true }
 tauri-plugin-os = { workspace = true }
+tauri-plugin-path2 = { workspace = true }
 tauri-plugin-pdf = { workspace = true }
 tauri-plugin-permissions = { workspace = true }
 tauri-plugin-prevent-default = { workspace = true }

apps/desktop/src-tauri/capabilities/default.json

@@ -158,6 +158,7 @@
     "permissions:default",
     "settings:default",
     "sfx:default",
+    "path2:default",
     "pdf:default",
     "autostart:default",
     {

apps/desktop/src-tauri/src/lib.rs

@@ -77,6 +77,7 @@ pub async fn main() {
         .plugin(tauri_plugin_export::init())
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_fs::init())
+        .plugin(tauri_plugin_path2::init())
         .plugin(tauri_plugin_pdf::init())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_misc::init())

apps/desktop/src/store/tinybase/localPersister2.test.ts

@@ -5,8 +5,10 @@ import { SCHEMA, type Schemas } from "@hypr/store";
 
 import { createLocalPersister2 } from "./localPersister2";
 
-vi.mock("@tauri-apps/api/path", () => ({
-  appDataDir: vi.fn().mockResolvedValue("/mock/data/dir/"),
+vi.mock("@hypr/plugin-path2", () => ({
+  commands: {
+    base: vi.fn().mockResolvedValue("/mock/data/dir/"),
+  },
 }));
 
 vi.mock("@tauri-apps/plugin-fs", () => ({

apps/desktop/src/store/tinybase/localPersister2.ts

@@ -1,9 +1,9 @@
-import { appDataDir } from "@tauri-apps/api/path";
 import { exists, mkdir } from "@tauri-apps/plugin-fs";
 import { createCustomPersister } from "tinybase/persisters/with-schemas";
 import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";
 
 import { commands, type JsonValue } from "@hypr/plugin-export";
+import { commands as path2Commands } from "@hypr/plugin-path2";
 import { type EnhancedNote, type Session } from "@hypr/store";
 import { isValidTiptapContent } from "@hypr/tiptap/shared";
 
@@ -28,7 +28,7 @@ export function createLocalPersister2<Schemas extends OptionalSchemas>(
       const batchItems: [JsonValue, string][] = [];
       const dirsToCreate = new Set<string>();
 
-      const dataDir = await appDataDir();
+      const dataDir = await path2Commands.base();
 
       for (const [id, row] of Object.entries(tables?.enhanced_notes ?? {})) {
         // @ts-ignore