@legendapp/spark 0.0.1-next.2 → 0.0.1-next.3

package/vendor/node_modules/@legendapp/spark-cli/dist/runner-install.js

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
-import { closeSync, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { closeSync, existsSync, ftruncateSync, lstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { spawn } from "node:child_process";
 import { open } from "node:fs/promises";
 import path from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
@@ -9,6 +10,142 @@ import { architecture } from "./platform.js";
 import { VERSION } from "./project.js";
 import { installedRelease } from "./release.js";
 const defaults = { fetch: globalThis.fetch, run };
+function readLegacyPid(lock) {
+    try {
+        const content = readFileSync(lock, "utf8").trim();
+        if (/^\d+$/.test(content))
+            return Number(content);
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+    }
+    return undefined;
+}
+/** The kernel releases this advisory lock if the installer exits, including on a crash. */
+export async function acquireRunnerLock(lock, waitMs = 600_000) {
+    const deadline = Date.now() + waitMs;
+    let child;
+    let exited;
+    while (true) {
+        if (Date.now() >= deadline)
+            throw new Error("Another process is installing Runner. Retry desktop launch when it finishes.");
+        const existingPid = readLegacyPid(lock);
+        if (existingPid) {
+            try {
+                process.kill(existingPid, 0);
+                if (Date.now() >= deadline)
+                    throw new Error("Another process is installing Runner. Retry desktop launch when it finishes.");
+                await sleep(Math.min(1000, deadline - Date.now()));
+                continue;
+            }
+            catch (error) {
+                if (error.code !== "ESRCH")
+                    throw error;
+            }
+        }
+        const existed = existsSync(lock);
+        const observed = existed ? lstatSync(lock) : undefined;
+        const remaining = Math.max(1, deadline - Date.now());
+        child = spawn("/usr/bin/lockf", ["-k", "-t", String(Math.max(1, Math.ceil(remaining / 1000))), lock, process.execPath, "-e", "process.stdout.write('locked\\n'); process.stdin.resume()"], { detached: true, stdio: ["pipe", "pipe", "pipe"] });
+        let stderr = "";
+        child.stderr.setEncoding("utf8").on("data", chunk => { stderr += chunk; });
+        exited = new Promise(resolve => child.once("close", (code, signal) => resolve({ code, signal })));
+        try {
+            await new Promise((resolve, reject) => {
+                let output = "";
+                child.stdout.setEncoding("utf8").on("data", chunk => {
+                    output += chunk;
+                    if (output.includes("locked\n"))
+                        resolve();
+                });
+                child.once("error", reject);
+                void exited.then(({ code }) => reject(new Error(`Could not acquire Runner install lock${stderr ? `: ${stderr.trim()}` : ` (lockf exited ${code})`}`)));
+            });
+        }
+        catch (error) {
+            try {
+                process.kill(-child.pid, "SIGTERM");
+            }
+            catch { }
+            await exited;
+            throw error;
+        }
+        const stopKeeper = async () => { child.stdin.end(); await exited; };
+        let fd;
+        try {
+            const acquired = lstatSync(lock);
+            if (observed && (acquired.dev !== observed.dev || acquired.ino !== observed.ino)) {
+                await stopKeeper();
+                continue;
+            }
+            const content = readFileSync(lock, "utf8").trim();
+            const legacyPid = readLegacyPid(lock);
+            if (legacyPid) {
+                let legacyLive = false;
+                try {
+                    process.kill(legacyPid, 0);
+                    legacyLive = true;
+                }
+                catch (error) {
+                    if (error.code !== "ESRCH")
+                        throw error;
+                }
+                if (legacyLive) {
+                    await stopKeeper();
+                    if (Date.now() >= deadline)
+                        throw new Error("Another process is installing Runner. Retry desktop launch when it finishes.");
+                    await sleep(Math.min(1000, deadline - Date.now()));
+                    continue;
+                }
+            }
+            else if (!content && existed) {
+                const age = Date.now() - statSync(lock).mtimeMs;
+                if (age < 30_000) {
+                    await stopKeeper();
+                    if (Date.now() >= deadline)
+                        throw new Error("Another process is installing Runner. Retry desktop launch when it finishes.");
+                    await sleep(Math.min(1000, deadline - Date.now()));
+                    continue;
+                }
+            }
+            fd = openSync(lock, "r+");
+            ftruncateSync(fd, 0);
+            writeFileSync(fd, `v2:${process.pid}`);
+            closeSync(fd);
+            fd = undefined;
+            break;
+        }
+        catch (error) {
+            if (fd !== undefined) {
+                try {
+                    closeSync(fd);
+                }
+                catch { }
+            }
+            await stopKeeper();
+            throw error;
+        }
+    }
+    let released = false;
+    let releasePromise;
+    let unexpectedExit;
+    void exited.then(result => { if (!released)
+        unexpectedExit = result; });
+    const release = () => releasePromise ??= (async () => {
+        released = true;
+        child.stdin.end();
+        const result = await exited;
+        if (result.code !== 0)
+            throw new Error(`Runner install lock process exited unexpectedly (${result.signal ?? result.code}).`);
+    })();
+    return Object.assign(release, {
+        assertAlive() {
+            if (unexpectedExit)
+                throw new Error(`Runner install lock process exited unexpectedly (${unexpectedExit.signal ?? unexpectedExit.code}).`);
+        },
+    });
+}
 export async function downloadAsset(asset, file, request = globalThis.fetch) {
     for (let attempt = 0; attempt < 3; attempt++) {
         let handle;
@@ -50,7 +187,7 @@ export async function downloadAsset(asset, file, request = globalThis.fetch) {
 }
 async function verify(app, asset, deps) {
     const runtime = readRuntime(app);
-    if (!runtime || runtime.mode !== "go" || runtime.platform !== "macos" || runtime.arch !== "arm64" || runtime.fingerprint !== asset.fingerprint)
+    if (!runtime || runtime.mode !== "go" || runtime.platform !== "macos" || runtime.arch !== architecture("macos") || runtime.fingerprint !== asset.fingerprint)
         throw new Error("Downloaded Runner has incompatible runtime metadata");
     await deps.run(path.dirname(app), ["codesign", "--verify", "--deep", "--strict", app], { capture: true });
     const signature = await deps.run(path.dirname(app), ["codesign", "-dvvv", app], { capture: true });
@@ -65,32 +202,7 @@ export async function installRunner(asset, cache = sparkHome(), deps = defaults)
     const app = path.join(destination, asset.app);
     mkdirSync(parent, { recursive: true });
     const lock = `${destination}.lock`;
-    let owned = false;
-    for (let attempt = 0; !owned && attempt < 600; attempt++) {
-        try {
-            const fd = openSync(lock, "wx");
-            writeFileSync(fd, String(process.pid));
-            closeSync(fd);
-            owned = true;
-        }
-        catch (error) {
-            if (error.code !== "EEXIST")
-                throw error;
-            const pid = Number(readFileSync(lock, "utf8"));
-            if (Number.isInteger(pid) && pid > 0) {
-                try {
-                    process.kill(pid, 0);
-                }
-                catch (probe) {
-                    if (probe.code === "ESRCH")
-                        rmSync(lock, { force: true });
-                }
-            }
-            await sleep(1000);
-        }
-    }
-    if (!owned)
-        throw new Error("Another process is installing Runner. Retry desktop launch when it finishes.");
+    const releaseLock = await acquireRunnerLock(lock);
     let staging;
     try {
         if (existsSync(app)) {
@@ -110,8 +222,10 @@ export async function installRunner(asset, cache = sparkHome(), deps = defaults)
             // Only publisher-pinned bytes reach the platform extractor.
             await deps.run(staging, ["ditto", "-x", "-k", archive, unpacked], { capture: true });
             await verify(path.join(unpacked, asset.app), asset, deps);
+            releaseLock.assertAlive();
             renameSync(unpacked, destination);
         }
+        releaseLock.assertAlive();
         registerRuntime(app);
         console.log("Spark Runner installed and verified.");
         return app;
@@ -119,7 +233,7 @@ export async function installRunner(asset, cache = sparkHome(), deps = defaults)
     finally {
         if (staging)
             rmSync(staging, { recursive: true, force: true });
-        rmSync(lock, { force: true });
+        await releaseLock();
     }
 }
 export async function acquireRunner(platform) {
@@ -130,8 +244,8 @@ export async function acquireRunner(platform) {
         const asset = release.runners[target];
         if (!asset)
             throw new Error(`This Spark release has no Runner for ${target}. Use a custom development build.`);
-        if (process.platform !== "darwin" || process.arch !== "arm64")
-            throw new Error("This release's Runner requires Apple Silicon macOS and arm64 Node.");
+        if (process.platform !== "darwin")
+            throw new Error("This release's macOS Runner requires macOS.");
         app = await installRunner(asset);
     }
     return app;

package/vendor/node_modules/@legendapp/spark-cli/dist/signing.js

@@ -134,7 +134,7 @@ export async function validateApp(root, app, credentials, expected, notarized, e
     app = realpathSync(app);
     if (expected.runner) {
         const runtime = readJson(path.join(app, "Contents/Resources/spark-runtime.json"));
-        if (runtime.mode !== "go" || runtime.platform !== "macos" || runtime.arch !== "arm64")
+        if (runtime.mode !== "go" || runtime.platform !== "macos" || runtime.arch !== expected.arch)
             throw new Error("Distribution app is not a macOS Spark Runner.");
     }
     else if (!existsSync(path.join(app, "Contents/Resources/main.jsbundle")))
@@ -145,8 +145,9 @@ export async function validateApp(root, app, credentials, expected, notarized, e
             throw new Error(`Packaged ${key} does not match the release build.`);
     }
     const arches = (await execute(root, ["lipo", "-archs", path.join(app, "Contents/MacOS", info.CFBundleExecutable)], { capture: true })).trim().split(/\s+/);
-    if (arches.length !== 1 || arches[0] !== "arm64")
-        throw new Error("The prototype package must contain an arm64 app.");
+    const expectedArch = expected.arch === "x64" ? "x86_64" : "arm64";
+    if (arches.length !== 1 || arches[0] !== expectedArch)
+        throw new Error(`The package must contain a ${expectedArch} app.`);
     await execute(root, ["codesign", "--verify", "--deep", "--strict", "--verbose=2", app], { capture: true });
     const order = signingOrder(app);
     const targets = await entitlementTargets(root, app, order, expected.entitlements, expected.byPath, execute);

package/vendor/node_modules/@legendapp/spark-cli/dist/updates.js

@@ -60,19 +60,56 @@ export function verifyUpdateSignature(archive, signature, publicKey) {
     if (!/^[A-Za-z0-9+/]{86}==$/.test(signature) || !verify(null, readFileSync(archive), key, Buffer.from(signature, "base64")))
         throw new Error("Update signature does not match the app's public key or archive");
 }
+const buildNumberPattern = /^[0-9]+(?:\.[0-9]+){0,2}$/;
+function buildNumberParts(version) { return version.split(".").map(part => part.replace(/^0+(?=\d)/, "")); }
+function canonicalBuildNumber(version) { return buildNumberParts(version).concat(["0", "0"]).slice(0, 3).join("."); }
+function compareBuildNumbers(left, right) {
+    const a = buildNumberParts(left), b = buildNumberParts(right);
+    for (let index = 0; index < 3; index++) {
+        const x = a[index] ?? "0", y = b[index] ?? "0";
+        if (x.length !== y.length)
+            return x.length < y.length ? -1 : 1;
+        if (x !== y)
+            return x < y ? -1 : 1;
+    }
+    return 0;
+}
+export function validateUpdateBuildVersion(buildVersion, records, archiveHash) {
+    if (!buildNumberPattern.test(buildVersion))
+        throw new Error("Updates require a numeric macOS buildNumber, increasing for every release");
+    const seen = new Map();
+    for (const version of Object.keys(records)) {
+        if (!buildNumberPattern.test(version))
+            throw new Error(`Invalid build number in Spark update history: ${version}`);
+        const canonical = canonicalBuildNumber(version);
+        const equivalent = seen.get(canonical);
+        if (equivalent && equivalent !== version)
+            throw new Error(`Spark update history reuses the numeric build number as both ${equivalent} and ${version}.`);
+        seen.set(canonical, version);
+        if (compareBuildNumbers(version, buildVersion) === 0 && version !== buildVersion)
+            throw new Error(`Build ${buildVersion} aliases the recorded build number ${version}; use a new increasing macos.buildNumber spelling.`);
+    }
+    const existing = records[buildVersion];
+    if (existing) {
+        if (existing.sha256 !== archiveHash)
+            throw new Error(`Build ${buildVersion} was already packaged with different bytes. Increase macos.buildNumber before publishing another update.`);
+        return;
+    }
+    for (const version of Object.keys(records)) {
+        if (compareBuildNumbers(buildVersion, version) <= 0)
+            throw new Error(`Build ${buildVersion} must be greater than every published build number. Increase macos.buildNumber before publishing another update.`);
+    }
+}
 export async function prepareUpdate(root, archive, buildVersion, dependencies = { run, tools: sparkleTools }) {
     const expo = readAppConfig(root).expo;
     const updates = updateConfiguration(expo);
     if (!updates)
         return undefined;
-    if (!/^[0-9]+(?:\.[0-9]+){0,2}$/.test(buildVersion))
-        throw new Error("Updates require a numeric macOS buildNumber, increasing for every release");
     const directory = path.join(root, "dist/updates");
     const recordsFile = path.join(directory, "releases.json");
     const records = existsSync(recordsFile) ? readJson(recordsFile) : {};
     const hash = createHash("sha256").update(readFileSync(archive)).digest("hex");
-    if (records[buildVersion] && records[buildVersion].sha256 !== hash)
-        throw new Error(`Build ${buildVersion} was already packaged with different bytes. Increase macos.buildNumber before publishing another update.`);
+    validateUpdateBuildVersion(buildVersion, records, hash);
     const bin = await dependencies.tools(root, dependencies.run);
     const keyArgs = dependencies.keyFile ? ["--ed-key-file", dependencies.keyFile] : ["--account", account(expo)];
     const signature = (await dependencies.run(root, [path.join(bin, "sign_update"), ...keyArgs, "-p", archive], { capture: true })).trim();

package/vendor/node_modules/@legendapp/spark-cli/dist/windows.js

@@ -8,6 +8,7 @@ import path from "node:path";
 import { createRequire } from "node:module";
 import { run } from "./commands.js";
 import { prepareConfig, nativePackages, runtimeFor, stateFile, readJson, writeJson, validateBuildModules, goConfigurationIssues, readAppConfig } from "./project.js";
+import { assertNativePatchPreflight } from "./native-patch-preflight.js";
 // Windows .cmd shims are shell programs; run the package's actual JS entry.
 export function nodeCommand(root, name, bin, args = []) {
     const req = createRequire(path.join(root, "package.json"));
@@ -54,6 +55,7 @@ export async function preserveWindowsBuildOutputs(root, prepare) {
     }
 }
 export async function prepareWindows(root, mode) {
+    assertNativePatchPreflight(root);
     await checkExpoDesktopNode(root);
     prepareConfig(root);
     prepareWindowsGeometry(root);
@@ -70,7 +72,7 @@ export async function prepareWindows(root, mode) {
     const manifest = readFileSync(path.join(root, "package.json"), "utf8");
     try {
         await preserveWindowsBuildOutputs(root, async () => {
-            await run(root, nodeCommand(root, "expo-desktop", "expo-desktop", ["prebuild", "--platform", "windows", "--template", "expo-desktop-template-bare-minimum@54.81.1-beta.6", "--no-install"]), { env: { CI: "1" }, capture: true });
+            await run(root, nodeCommand(root, "expo-desktop", "expo-desktop", ["prebuild", "--platform", "windows", "--template", "expo-desktop-template-bare-minimum@54.81.1", "--no-install"]), { env: { CI: "1" }, capture: true });
         });
         // The beta template expands all-platform dependencies. Keep the consumer's installed graph.
     }
@@ -82,6 +84,7 @@ export async function prepareWindows(root, mode) {
 export async function buildWindows(root, mode, force) {
     if (mode !== "go" && mode !== "dev")
         throw new Error("Windows currently supports Spark Runner runtimes and development builds. Use spark build --dev; production builds and packaging are not implemented.");
+    assertNativePatchPreflight(root);
     if (process.platform !== "win32")
         throw new Error("Windows native builds require Windows x64 or ARM64. Project generation and Metro bundle checks can run on macOS.");
     for (const tool of ["node", "pwsh.exe", "dotnet.exe"])

package/vendor/node_modules/@legendapp/spark-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/spark-cli",
-  "version": "0.0.1-next.2",
+  "version": "0.0.1-next.3",
   "license": "MIT",
   "type": "module",
   "files": [
@@ -11,12 +11,13 @@
     "node": ">=24.19.0"
   },
   "dependencies": {
-    "@legendapp/spark-desktop-config": "0.0.1-next.2",
-    "ws": "8.18.3",
-    "expo-desktop": "1.0.0-beta.6",
-    "npm": "11.11.0",
+    "@legendapp/spark-desktop-config": "0.0.1-next.3",
+    "ws": "8.21.0",
+    "expo-desktop": "1.0.0",
+    "npm": "11.21.0",
     "typescript": "5.9.3",
-    "cross-spawn": "7.0.6"
+    "cross-spawn": "7.0.6",
+    "@legendapp/spark-window-options": "0.0.1-next.3"
   },
   "private": true
 }

package/vendor/node_modules/@legendapp/spark-cli/templates/blank-typescript/App.tsx

@@ -1,22 +1,16 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { Button, StyleSheet, Text, View } from "react-native";
 import { openFileDialog } from "@legendapp/spark/dialogs";
-import { configureMenus, clearMenus, addNativeMenuActionListener } from "@legendapp/spark/menus";
+import { useMenu, type MenuRootItem } from "@legendapp/spark/menus";
 
-const menus = [{ id: "hello", title: "Hello", items: [{ id: "greet", title: "Say Hello" }] }];
+const menus: MenuRootItem[] = [{ type: "submenu", id: "hello", label: "Hello", items: [{ type: "action", id: "greet", label: "Say Hello" }] }];
 export default function App({ runtime }: { runtime?: { mode: string } }) {
   const [message, setMessage] = useState("Ready");
-  useEffect(() => {
-    configureMenus("hello-world", menus);
-    const subscription = addNativeMenuActionListener(action => {
-      if (action.ownerId === "hello-world" && action.itemId === "greet") setMessage("Hello from the native menu");
-    });
-    return () => { subscription.remove(); clearMenus("hello-world"); };
-  }, []);
+  useMenu({ id: "hello-world", items: menus, onAction: action => { if (action.itemId === "greet") setMessage("Hello from the native menu"); }, onError: error => setMessage(String(error)) });
   async function chooseFile() {
     try {
-      const files = await openFileDialog({ title: "Choose a file", allowsMultipleSelection: false });
-      setMessage(files?.join(", ") || "Dialog cancelled");
+      const files = await openFileDialog({ title: "Choose a file", multiple: false });
+      setMessage(files.canceled ? "Dialog cancelled" : files.paths.join(", "));
     } catch (error) { setMessage(String(error)); }
   }
   return <View style={styles.root}>

package/vendor/node_modules/@legendapp/spark-cli/templates/blank-typescript/desktop.config.json

@@ -3,9 +3,11 @@
   "name": "HelloWorld",
   "version": "0.0.1",
   "window": {
-    "width": 1000,
-    "height": 700,
-    "restoreFrame": true
+    "size": {
+      "width": 1000,
+      "height": 700
+    },
+    "restoreBounds": true
   },
   "macos": {
     "bundleIdentifier": "so.legend.spark.prototype.helloworld"

package/vendor/node_modules/@legendapp/spark-cli/templates/blank-typescript/package.json

@@ -13,13 +13,13 @@
     "postinstall": "node node_modules/@legendapp/spark/init-template.cjs"
   },
   "dependencies": {
-    "@legendapp/spark": "0.0.1-next.2",
+    "@legendapp/spark": "0.0.1-next.3",
     "expo": "54.0.37",
-    "expo-desktop": "1.0.0-beta.6",
-    "expo-desktop-prebuild-config": "1.1.0-beta.1",
-    "expo-desktop-config-plugins": "1.2.0-beta.1",
-    "expo-desktop-metro-config": "54.81.0-beta.3",
-    "expo-desktop-template-bare-minimum": "54.81.1-beta.6",
+    "expo-desktop": "1.0.0",
+    "expo-desktop-prebuild-config": "1.1.0",
+    "expo-desktop-config-plugins": "1.2.0",
+    "expo-desktop-metro-config": "54.81.0",
+    "expo-desktop-template-bare-minimum": "54.81.1",
     "react": "19.1.4",
     "react-native": "0.81.6",
     "react-native-macos": "0.81.7",
@@ -39,10 +39,12 @@
     "expo-font": "14.0.12",
     "expo-keep-awake": "15.0.8",
     "expo-modules-core": "3.0.30",
-    "expo-desktop-modules-core": "54.0.14-beta.0",
-    "expo-desktop-stubs": "54.0.14-beta.0",
+    "expo-desktop-modules-core": "54.0.14",
+    "expo-desktop-stubs": "54.0.14",
     "react": "19.1.4",
-    "react-native": "0.81.6"
+    "react-native": "0.81.6",
+    "react-native-macos": "0.81.7",
+    "react-native-windows": "0.81.35"
   },
   "expo": {
     "install": {

package/vendor/node_modules/@legendapp/spark-cli/templates/diff-lite/Git.macos.tsx

@@ -5,8 +5,8 @@ import { runCommand } from "@legendapp/spark/processes";
 export function Git({ onResult, onError }: { onResult(text: string): void; onError(message: string): void }) {
   const [busy, setBusy] = useState(false);
   return <Button disabled={busy} onPress={() => { setBusy(true); void (async () => {
-    const paths = await openFileDialog({ canChooseDirectories: true, canChooseFiles: false }); if (!paths?.[0]) return;
-    const result = await runCommand({ executable: "/usr/bin/git", args: ["--no-pager", "diff", "--no-ext-diff", "--no-textconv", "--", "."], cwd: paths[0], timeoutMs: 10_000 });
+    const paths = await openFileDialog({ selection: "directories" }); if (paths.canceled) return;
+    const result = await runCommand({ executable: "/usr/bin/git", args: ["--no-pager", "diff", "--no-ext-diff", "--no-textconv", "--", "."], cwd: paths.paths[0], timeoutMs: 10_000 });
     if (result.timedOut || result.outputTruncated || result.exitCode !== 0) throw new Error(result.stderr || "Git comparison failed or exceeded its output limit");
     onResult(result.stdout || "No unstaged changes.");
   })().catch(error => onError(String(error))).finally(() => setBusy(false)); }}>{busy ? "Reading Git…" : "Open Git changes"}</Button>;

package/vendor/node_modules/@legendapp/spark-cli/templates/document-editor/Integration.macos.tsx

@@ -1,17 +1,30 @@
 import { useEffect, useState } from "react";
 import { Text } from "react-native";
 import { Button } from "@legendapp/spark/ui";
-import { beforeWindowClose, openWindow, setWindowTitle, onWindowEvent } from "@legendapp/spark/windows";
+import { beforeWindowClose, openWindow, setWindowOptions, addWindowListener } from "@legendapp/spark/windows";
 import { beforeQuit } from "@legendapp/spark/app";
-import { configureMenus, clearMenus, addNativeMenuActionListener } from "@legendapp/spark/menus";
+import { useMenu, type MenuItem } from "@legendapp/spark/menus";
 import { registerShortcut } from "@legendapp/spark/shortcuts";
-import { onOpen } from "@legendapp/spark/links";
-import { readTextFile } from "@legendapp/spark/dialogs";
+import { subscribeToOpenRequests } from "@legendapp/spark/app/documents";
+import { readText } from "@legendapp/spark/files";
 import { sessions } from "./sessions";
 import type { DocumentSession } from "./document";
+const items: MenuItem[] = [{ type: "submenu", id: "file", target: { menu: "file" }, label: "File", items: [
+  { type: "action", id: "new", label: "New" }, { type: "action", id: "open", label: "Open…" }, { type: "action", id: "save", label: "Save" }, { type: "action", id: "saveAs", label: "Save As…" },
+] }];
 let nextWindow = 0;
 export function Integration({ session, windowId, documentId, onReady }: { session: DocumentSession; windowId: string; documentId: string; onReady: (ready: boolean) => void }) {
   const [error, setError] = useState<string | null>(null);
+  const menu = useMenu({ id: `editor-${windowId}`, items, onAction: event => {
+    const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
+    actions[event.itemId]?.();
+  }, onError: error => setError(String(error)) });
+  useEffect(() => {
+    if (menu.status !== "ready") return;
+    let disposed = false, focus: Awaited<ReturnType<typeof addWindowListener>> | undefined;
+    void addWindowListener(windowId, "focusChanged", event => { if (event.focused) void menu.menu.update({ items }).catch(error => setError(String(error))); }).then(value => { if (disposed) void value.remove(); else focus = value; }).catch(error => setError(String(error)));
+    return () => { disposed = true; void focus?.remove(); };
+  }, [menu, windowId]);
   useEffect(() => {
     let removed = false;
     const cleanups: (() => void | Promise<void>)[] = [];
@@ -19,17 +32,8 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       const subscription = await registration;
       if (removed) await subscription.remove(); else cleanups.push(() => subscription.remove());
     };
-    const owner = `editor-${windowId}`;
     const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
-    const menus = () => configureMenus(owner, [{ id: "file", title: "File", items: [
-      { id: "new", title: "New" }, { id: "open", title: "Open…" }, { id: "save", title: "Save" }, { id: "saveAs", title: "Save As…" },
-    ] }]);
-    menus(); cleanups.push(() => clearMenus(owner));
-    const menu = addNativeMenuActionListener(event => { if (event.ownerId === owner) actions[event.itemId]?.(); });
-    cleanups.push(() => menu.remove());
-    const focus = onWindowEvent(event => { if (event.type === "focus" && event.windowId === windowId) menus(); });
-    cleanups.push(() => focus.remove());
-    const title = () => { const state = session.getSnapshot(); void setWindowTitle(windowId, `${state.file.name}${session.dirty ? " •" : ""}`).catch(e => setError(String(e))); };
+    const title = () => { const state = session.getSnapshot(); void setWindowOptions(windowId, { title: `${state.file.name}${session.dirty ? " •" : ""}` }).catch(e => setError(String(e))); };
     title(); cleanups.push(session.subscribe(title));
     void (async () => {
       await retain(beforeWindowClose(windowId, session.canClose));
@@ -38,12 +42,10 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       }
       if (windowId === "main") {
         await retain(beforeQuit(async () => { for (const document of sessions.values()) if (!await document.canClose()) return false; return true; }));
-        await retain(onOpen(event => {
-          if (event.type !== "openFile") return;
-          const match = /^file:\/\/(?:localhost)?(\/.*)$/.exec(event.url);
-          if (!match) { setError("Unsupported file URL"); return; }
-          const location = decodeURIComponent(match[1]!);
-          void readTextFile(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
+        await retain(subscribeToOpenRequests(event => {
+          if (event.type !== "file") return;
+          const location = event.path;
+          void readText(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
         }));
       }
       if (!removed) onReady(true);
@@ -51,7 +53,7 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
     return () => { removed = true; for (const cleanup of cleanups.reverse()) void Promise.resolve().then(cleanup).catch(console.error); };
   }, [session, windowId, onReady]);
   return <>
-    <Button onPress={() => { void openWindow({ id: `document-${++nextWindow}`, title: session.getSnapshot().file.name, width: 800, height: 600, props: { documentId } }).catch(e => setError(String(e))); }}>Open another view</Button>
+    <Button onPress={() => { const id = `document-${++nextWindow}`; void openWindow({ id, title: session.getSnapshot().file.name, component: "main", size: { width: 800, height: 600 }, props: { windowId: id, windowProps: { documentId } } }).catch(e => setError(String(e))); }}>Open another view</Button>
     {error ? <Text accessibilityRole="alert">{error}</Text> : null}
   </>;
 }

package/vendor/node_modules/@legendapp/spark-cli/templates/document-editor/Integration.windows.tsx

@@ -1,17 +1,30 @@
 import { useEffect, useState } from "react";
 import { Text } from "react-native";
 import { Button } from "@legendapp/spark/ui";
-import { beforeWindowClose, openWindow, setWindowTitle, onWindowEvent } from "@legendapp/spark/windows";
+import { beforeWindowClose, openWindow, setWindowOptions, addWindowListener } from "@legendapp/spark/windows";
 import { beforeQuit } from "@legendapp/spark/app";
-import { configureMenus, clearMenus, addNativeMenuActionListener } from "@legendapp/spark/menus";
+import { useMenu, type MenuItem } from "@legendapp/spark/menus";
 import { registerShortcut } from "@legendapp/spark/shortcuts";
-import { onOpen } from "@legendapp/spark/links";
-import { readTextFile } from "@legendapp/spark/dialogs";
+import { subscribeToOpenRequests } from "@legendapp/spark/app/documents";
+import { readText } from "@legendapp/spark/files";
 import { sessions } from "./sessions";
 import type { DocumentSession } from "./document";
+const items: MenuItem[] = [{ type: "submenu", id: "file", target: { menu: "file" }, label: "File", items: [
+  { type: "action", id: "new", label: "New" }, { type: "action", id: "open", label: "Open…" }, { type: "action", id: "save", label: "Save" }, { type: "action", id: "saveAs", label: "Save As…" },
+] }];
 let nextWindow = 0;
 export function Integration({ session, windowId, documentId, onReady }: { session: DocumentSession; windowId: string; documentId: string; onReady: (ready: boolean) => void }) {
   const [error, setError] = useState<string | null>(null);
+  const menu = useMenu({ id: `editor-${windowId}`, items, onAction: event => {
+    const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
+    actions[event.itemId]?.();
+  }, onError: error => setError(String(error)) });
+  useEffect(() => {
+    if (menu.status !== "ready") return;
+    let disposed = false, focus: Awaited<ReturnType<typeof addWindowListener>> | undefined;
+    void addWindowListener(windowId, "focusChanged", event => { if (event.focused) void menu.menu.update({ items }).catch(error => setError(String(error))); }).then(value => { if (disposed) void value.remove(); else focus = value; }).catch(error => setError(String(error)));
+    return () => { disposed = true; void focus?.remove(); };
+  }, [menu, windowId]);
   useEffect(() => {
     let removed = false;
     const cleanups: (() => void | Promise<void>)[] = [];
@@ -19,17 +32,8 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       const subscription = await registration;
       if (removed) await subscription.remove(); else cleanups.push(() => subscription.remove());
     };
-    const owner = `editor-${windowId}`;
     const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
-    const menus = () => configureMenus(owner, [{ id: "file", title: "File", items: [
-      { id: "new", title: "New" }, { id: "open", title: "Open…" }, { id: "save", title: "Save" }, { id: "saveAs", title: "Save As…" },
-    ] }]);
-    menus(); cleanups.push(() => clearMenus(owner));
-    const menu = addNativeMenuActionListener(event => { if (event.ownerId === owner) actions[event.itemId]?.(); });
-    cleanups.push(() => menu.remove());
-    const focus = onWindowEvent(event => { if (event.type === "focus" && event.windowId === windowId) menus(); });
-    cleanups.push(() => focus.remove());
-    const title = () => { const state = session.getSnapshot(); void setWindowTitle(windowId, `${state.file.name}${session.dirty ? " •" : ""}`).catch(e => setError(String(e))); };
+    const title = () => { const state = session.getSnapshot(); void setWindowOptions(windowId, { title: `${state.file.name}${session.dirty ? " •" : ""}` }).catch(e => setError(String(e))); };
     title(); cleanups.push(session.subscribe(title));
     void (async () => {
       await retain(beforeWindowClose(windowId, session.canClose));
@@ -38,12 +42,10 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       }
       if (windowId === "main") {
         await retain(beforeQuit(async () => { for (const document of sessions.values()) if (!await document.canClose()) return false; return true; }));
-        await retain(onOpen(event => {
-          if (event.type !== "openFile") return;
-          const match = /^file:\/\/(?:localhost)?(\/.*)$/.exec(event.url);
-          if (!match) { setError("Unsupported file URL"); return; }
-          const location = decodeURIComponent(match[1]!).replace(/^\/([A-Za-z]:)/, "$1").replace(/\//g, "\\");
-          void readTextFile(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
+        await retain(subscribeToOpenRequests(event => {
+          if (event.type !== "file") return;
+          const location = event.path;
+          void readText(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
         }));
       }
       if (!removed) onReady(true);
@@ -51,7 +53,7 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
     return () => { removed = true; for (const cleanup of cleanups.reverse()) void Promise.resolve().then(cleanup).catch(console.error); };
   }, [session, windowId, onReady]);
   return <>
-    <Button onPress={() => { void openWindow({ id: `document-${++nextWindow}`, title: session.getSnapshot().file.name, width: 800, height: 600, props: { documentId } }).catch(e => setError(String(e))); }}>Open another view</Button>
+    <Button onPress={() => { const id = `document-${++nextWindow}`; void openWindow({ id, title: session.getSnapshot().file.name, component: "main", size: { width: 800, height: 600 }, props: { windowId: id, windowProps: { documentId } } }).catch(e => setError(String(e))); }}>Open another view</Button>
     {error ? <Text accessibilityRole="alert">{error}</Text> : null}
   </>;
 }