Merge main into refactor modules checkpoint

Keep the refactor_modules branch current with main and preserve the real Obsidian E2E progress. Build and unit tests pass; real Obsidian hidden-file create/delete now pass, while hidden JSON conflict round-trip still needs follow-up.
2026-10-04 16:32:31 +00:00 · 2026-07-03 08:35:48 +00:00
parent 559c3f351b 06bba49aad
commit 92d10f509f
451 changed files with 5429 additions and 502 deletions
@@ -0,0 +1,48 @@
+import { evalObsidianJson } from "./cli.ts";
+
+export type PluginReadiness = {
+    status: "ready" | "pending";
+    pluginId: string;
+    pluginVersion: string;
+    vaultName: string;
+    enabled?: boolean;
+    pluginKeys?: string[];
+    loadingPluginId?: string;
+};
+
+export async function waitForPluginReady(
+    cliBinary: string,
+    env: NodeJS.ProcessEnv,
+    timeoutMs = Number(process.env.E2E_OBSIDIAN_READY_TIMEOUT_MS ?? 20000)
+): Promise<PluginReadiness> {
+    const deadline = Date.now() + timeoutMs;
+    let lastOutput = "";
+    while (Date.now() < deadline) {
+        try {
+            const readiness = await evalObsidianJson<PluginReadiness>(
+                cliBinary,
+                [
+                    "(async()=>JSON.stringify({",
+                    "status:!!app.plugins.plugins['obsidian-livesync']?'ready':'pending',",
+                    "pluginId:'obsidian-livesync',",
+                    "pluginVersion:app.plugins.manifests['obsidian-livesync']?.version,",
+                    "vaultName:app.vault.getName(),",
+                    "enabled:app.plugins.enabledPlugins?.has?.('obsidian-livesync'),",
+                    "pluginKeys:Object.keys(app.plugins.plugins),",
+                    "loadingPluginId:app.plugins.loadingPluginId",
+                    "}))()",
+                ].join(""),
+                env
+            );
+            lastOutput = JSON.stringify(readiness);
+            if (readiness.status === "ready") {
+                return readiness as PluginReadiness & { status: "ready" };
+            }
+        } catch (error) {
+            lastOutput = error instanceof Error ? error.message : String(error);
+            // Keep polling until Obsidian exposes the vault-side CLI and plug-in state.
+        }
+        await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    throw new Error(`Timed out waiting for Self-hosted LiveSync readiness through Obsidian CLI.\n${lastOutput}`);
+}