beatrina 0.8.6 → 0.8.7

package/bin/beatrina.mjs

@@ -147,10 +147,12 @@ if (args.fromApp) {
     }
     // A page already shows the session: the document went there. No page (the
     // browser was closed): open the session's notebook, which collects it.
-    if (delivered !== "page" && args.open && live.file) {
-      // BEATRINA_OPENER substitutes the program that opens it (test/beatrina-sessions.test.mjs).
-      const opener = process.env.BEATRINA_OPENER ? [process.env.BEATRINA_OPENER, [live.file]]
-        : process.platform === "darwin" ? ["open", [live.file]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", live.file]] : ["xdg-open", [live.file]];
+    if (delivered !== "page" && args.open && live.url) {
+      // The page the session SERVES (http://127.0.0.1:<port>/), never the file: macOS `open` drops a
+      // file URL's #kernel=…&pair=… fragment and the page then cannot find its kernel. The served
+      // origin needs no pairing. BEATRINA_OPENER substitutes the program (test/beatrina-sessions.test.mjs).
+      const opener = process.env.BEATRINA_OPENER ? [process.env.BEATRINA_OPENER, [live.url]]
+        : process.platform === "darwin" ? ["open", [live.url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", live.url]] : ["xdg-open", [live.url]];
       spawnSync(opener[0], opener[1]);
     }
     if (delivered === "refused") alert(`The running Beatrina session could not open ${file}.`);
@@ -201,7 +203,7 @@ const forced = process.env.BEATRINA_FORCE_FAILSAFE === "1";
 const deadlineS = Number(process.env.BEATRINA_HOST_DEADLINE || 60);
 let started = forced
   ? { announced: false, refused: false, reason: "BEATRINA_FORCE_FAILSAFE=1 asked for it", code: null }
-  : await runUntilAnnounced({ cmd: process.execPath, args: [path.join(root, "host", "main.mjs"), ...(open ? ["--open"] : [])], env: process.env,
+  : await runUntilAnnounced({ cmd: process.execPath, args: [path.join(root, "host", "main.mjs"), ...(open ? ["--open=url"] : [])], env: process.env,
     deadlineMs: (Number.isFinite(deadlineS) && deadlineS > 0 ? deadlineS : 60) * 1000 });
 if (started.announced) followChild(started.child);
 else {

package/bin/shortcut.mjs

@@ -22,9 +22,20 @@ import os from "node:os";
 import path from "node:path";
 
 export const BUNDLE_ID = "me.saqr.beatrina";
+// Each type is EXPORTED by Beatrina.app as its own UTI (UTExportedTypeDeclarations) and named in its
+// document types (LSItemContentTypes): Launch Services sets a default handler per UTI, and an app that
+// only lists an extension has no UTI of its own to be the default FOR — the first --default answered
+// -50 (paramErr) for exactly that reason, and .qmd stayed with the app that had declared it (CarmaR).
+// `legacy` is the type CarmaR.app declared for the same extension. A CarmaR bundle anywhere on the
+// disk re-registers itself the moment Finder or Launch Services meets it again, and its declaration
+// then wins the extension back, so a .qmd is typed as CarmaR's type and Beatrina — claiming only its
+// own — is not even a handler of it (2026-09-16: a double-click opened CarmaR out of a dev build
+// folder). Claiming the legacy type too, and being made the default for it, keeps Beatrina the app
+// that opens the file whichever type the system pins on it.
 export const DOC_TYPES = Object.freeze([
-  { ext: "qmd", name: "Quarto document", mime: "text/x-quarto-markdown" },
-  { ext: "Rmd", name: "R Markdown document", mime: "text/x-r-markdown" },
+  { ext: "qmd", name: "Quarto document", mime: "text/x-quarto-markdown", uti: "me.saqr.beatrina.qmd", legacy: "me.saqr.carmar.qmd" },
+  { ext: "Rmd", name: "R Markdown document", mime: "text/x-r-markdown", uti: "me.saqr.beatrina.rmd", legacy: "me.saqr.carmar.rmd" },
+  { ext: "carmd", name: "Beatrina notebook document", mime: "text/markdown", uti: "me.saqr.beatrina.carmd", legacy: "me.saqr.carmar.carmd" },
 ]);
 
 const q = (s) => `'${String(s).replace(/'/g, "'\\''")}'`;           // POSIX single-quote
@@ -48,9 +59,19 @@ end open
 export function documentTypesXml() {
   return `<array>${DOC_TYPES.map((t) => `<dict><key>CFBundleTypeName</key><string>${t.name}</string>`
     + `<key>CFBundleTypeRole</key><string>Editor</string><key>LSHandlerRank</key><string>Alternate</string>`
+    + `<key>LSItemContentTypes</key><array><string>${t.uti}</string><string>${t.legacy}</string></array>`
     + `<key>CFBundleTypeExtensions</key><array><string>${t.ext}</string><string>${t.ext.toLowerCase()}</string></array></dict>`).join("")}</array>`;
 }
 
+/** The UTIs Beatrina.app exports for those types (UTExportedTypeDeclarations), as plutil-insertable XML. */
+export function exportedTypesXml() {
+  return `<array>${DOC_TYPES.map((t) => `<dict><key>UTTypeIdentifier</key><string>${t.uti}</string>`
+    + `<key>UTTypeDescription</key><string>${t.name}</string>`
+    + `<key>UTTypeConformsTo</key><array><string>public.plain-text</string></array>`
+    + `<key>UTTypeTagSpecification</key><dict><key>public.filename-extension</key><array><string>${t.ext}</string><string>${t.ext.toLowerCase()}</string></array>`
+    + `<key>public.mime-type</key><array><string>${t.mime}</string></array></dict></dict>`).join("")}</array>`;
+}
+
 /** How to start Beatrina from an icon: this Node, this command, and any baked options. */
 export function launchCommand({ node = process.execPath, cli, port = "", noOpen = false }) {
   return `${q(node)} ${q(cli)}${port ? ` --port ${port}` : ""}${noOpen ? " --no-open" : ""}`;
@@ -75,16 +96,23 @@ function macShortcut({ cli, dir, port, makeDefault, noOpen }) {
   run("plutil", ["-replace", "CFBundleIdentifier", "-string", BUNDLE_ID, plist]);
   run("plutil", ["-replace", "CFBundleName", "-string", "Beatrina", plist]);
   run("plutil", ["-replace", "CFBundleDocumentTypes", "-xml", documentTypesXml(), plist]);
+  run("plutil", ["-replace", "UTExportedTypeDeclarations", "-xml", exportedTypesXml(), plist]);
   run("codesign", ["--force", "--sign", "-", app]);        // the plist changed after osacompile signed it
   if (fs.existsSync(LSREGISTER)) run(LSREGISTER, ["-f", app]);
   const said = [`Beatrina.app is in ${path.dirname(app)}. Double-click it, or right-click a .qmd and choose Open With ▸ Beatrina.`];
   if (makeDefault) {
+    // Beatrina's own UTI for each type, and whatever UTI Launch Services currently resolves the
+    // extension to (another app's declaration, or a dynamic one) — both are pointed at Beatrina, so
+    // a .qmd opens here whichever identity the system had attached to it. 0 is success.
     const js = `ObjC.import("CoreServices");
-      const exts = ${JSON.stringify(DOC_TYPES.map((t) => t.ext))};
-      exts.map((ext) => { const uti = $.UTTypeCreatePreferredIdentifierForTag($.kUTTagClassFilenameExtension, $(ext), $()).js;
-        return ext + "=" + $.LSSetDefaultRoleHandlerForContentType($(uti), $.kLSRolesAll, $(${JSON.stringify(BUNDLE_ID)})); }).join(" ");`;
+      const types = ${JSON.stringify(DOC_TYPES.map((t) => ({ ext: t.ext, uti: t.uti, legacy: t.legacy })))};
+      types.map((t) => { const tagged = $.UTTypeCreatePreferredIdentifierForTag($.kUTTagClassFilenameExtension, $(t.ext), $()).js;
+        const utis = [...new Set([t.uti, t.legacy, tagged])];
+        return t.ext + "=" + utis.map((u) => $.LSSetDefaultRoleHandlerForContentType($(u), $.kLSRolesAll, $(${JSON.stringify(BUNDLE_ID)}))).join("/"); }).join(" ");`;
     const out = run("osascript", ["-l", "JavaScript", "-e", js]).trim();
-    said.push(`Beatrina is now the default app for .qmd and .Rmd (${out}).`);
+    const failed = /=(?:[^0 /]|-\d)/.test(out);
+    said.push(failed ? `Beatrina could not be made the default for every type (${out}; 0 means done).`
+      : `Beatrina is now the default app for ${DOC_TYPES.map((t) => `.${t.ext}`).join(", ")}.`);
   }
   return { app, said };
 }

package/build-info.json

@@ -1 +1 @@
-{"version":"0.8.6","commit":"eb036e63b7b3f0e0e1f696d357d701d43235ce6c","dirty":false}
+{"version":"0.8.7","commit":"b7aa1255558293d1e2b47a4799a344fde0846b2e","dirty":false}