@melaya/runner 1.1.62 → 1.1.64

package/dist/folderPicker.d.ts

@@ -3,9 +3,18 @@
  * folders) and runner:vault-pick-folder (Obsidian vaults).
  *
  * Browsers can't reveal absolute paths for security, so the runner — which
- * lives on the user's box — pops the dialog. Mac: osascript. Windows:
- * PowerShell WinForms. Linux: zenity. Fixed argv; the prompt is a constant
- * chosen by the caller, never user or model input.
+ * lives on the user's box — pops the dialog. Fixed argv; the prompt is a
+ * constant chosen by the caller, never user or model input.
+ *
+ *   - Windows: the Explorer folder dialog (IFileOpenDialog + FOS_PICKFOLDERS)
+ *     through PowerShell. WinForms' FolderBrowserDialog is the old tree view
+ *     on Windows PowerShell (.NET Framework), so it is only the fallback. The
+ *     dialog is owned by a small topmost window so it opens in front of the
+ *     browser instead of behind it.
+ *   - macOS: AppleScript `choose folder` run by osascript itself. Wrapping it
+ *     in `tell application "System Events"` needs the Automation permission
+ *     and fails (-1743) or hides the dialog when it is not granted.
+ *   - Linux: zenity, then kdialog.
  */
 export type FolderPickResult = {
     path: string;

package/dist/folderPicker.js

@@ -3,64 +3,134 @@
  * folders) and runner:vault-pick-folder (Obsidian vaults).
  *
  * Browsers can't reveal absolute paths for security, so the runner — which
- * lives on the user's box — pops the dialog. Mac: osascript. Windows:
- * PowerShell WinForms. Linux: zenity. Fixed argv; the prompt is a constant
- * chosen by the caller, never user or model input.
+ * lives on the user's box — pops the dialog. Fixed argv; the prompt is a
+ * constant chosen by the caller, never user or model input.
+ *
+ *   - Windows: the Explorer folder dialog (IFileOpenDialog + FOS_PICKFOLDERS)
+ *     through PowerShell. WinForms' FolderBrowserDialog is the old tree view
+ *     on Windows PowerShell (.NET Framework), so it is only the fallback. The
+ *     dialog is owned by a small topmost window so it opens in front of the
+ *     browser instead of behind it.
+ *   - macOS: AppleScript `choose folder` run by osascript itself. Wrapping it
+ *     in `tell application "System Events"` needs the Automation permission
+ *     and fails (-1743) or hides the dialog when it is not granted.
+ *   - Linux: zenity, then kdialog.
  */
 import { execFile } from "child_process";
-export async function pickNativeFolder(prompt) {
-    const platform = process.platform;
-    const run = (cmd, args) => new Promise((resolve, reject) => {
-        execFile(cmd, args, { maxBuffer: 1024 * 64 }, (err, stdout, stderr) => {
+// Selected path on stdout, nothing on cancel. Paths are written as UTF-8 so
+// non-ASCII folder names survive the console code page.
+const WINDOWS_PICKER = String.raw `
+$ErrorActionPreference = 'Stop'
+[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+$src = @"
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+public static class MelFolderPicker {
+  [ComImport, Guid("DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7")] class FileOpenDialogCoClass {}
+  [ComImport, Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+  interface IShellItem {
+    void BindToHandler(); void GetParent();
+    void GetDisplayName(uint sigdn, [MarshalAs(UnmanagedType.LPWStr)] out string name);
+    void GetAttributes(); void Compare();
+  }
+  [ComImport, Guid("D57C7288-D4AD-4768-BE02-9D969532D960"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+  interface IFileOpenDialog {
+    [PreserveSig] int Show(IntPtr owner);
+    void SetFileTypes(); void SetFileTypeIndex(); void GetFileTypeIndex(); void Advise(); void Unadvise();
+    void SetOptions(uint fos); void GetOptions(out uint fos);
+    void SetDefaultFolder(); void SetFolder(); void GetFolder(); void GetCurrentSelection();
+    void SetFileName(); void GetFileName();
+    void SetTitle([MarshalAs(UnmanagedType.LPWStr)] string title);
+    void SetOkButtonLabel(); void SetFileNameLabel();
+    void GetResult(out IShellItem item);
+  }
+  public static string Pick(string title) {
+    var owner = new Form {
+      TopMost = true, ShowInTaskbar = false, FormBorderStyle = FormBorderStyle.None,
+      StartPosition = FormStartPosition.CenterScreen, Size = new Size(1, 1), Opacity = 0,
+    };
+    owner.Show(); owner.Activate();
+    try {
+      var dlg = (IFileOpenDialog)new FileOpenDialogCoClass();
+      uint fos; dlg.GetOptions(out fos);
+      dlg.SetOptions(fos | 0x20 | 0x40 | 0x800);  // PICKFOLDERS | FORCEFILESYSTEM | PATHMUSTEXIST
+      dlg.SetTitle(title);
+      if (dlg.Show(owner.Handle) != 0) return "";  // cancelled
+      IShellItem item; dlg.GetResult(out item);
+      string path; item.GetDisplayName(0x80058000, out path);  // SIGDN_FILESYSPATH
+      return path ?? "";
+    } finally { owner.Close(); }
+  }
+}
+"@
+Add-Type -TypeDefinition $src -ReferencedAssemblies System.Windows.Forms, System.Drawing
+try {
+  [Console]::Out.Write([MelFolderPicker]::Pick($env:MEL_PICK_TITLE))
+} catch {
+  # Very old shells without the COM dialog: the WinForms tree dialog.
+  Add-Type -AssemblyName System.Windows.Forms
+  $f = New-Object System.Windows.Forms.FolderBrowserDialog
+  $f.Description = $env:MEL_PICK_TITLE
+  $f.ShowNewFolderButton = $true
+  if ($f.ShowDialog() -eq 'OK') { [Console]::Out.Write($f.SelectedPath) }
+}
+`;
+function run(cmd, args, env, exit1IsCancel = false) {
+    return new Promise((resolve, reject) => {
+        execFile(cmd, args, { maxBuffer: 1024 * 64, encoding: "utf8", windowsHide: false, env: env ?? process.env }, (err, stdout, stderr) => {
+            const out = (stdout || "").trim();
             if (err) {
-                const out = (stdout || "").trim();
                 const errMsg = (stderr || err.message || "").trim();
-                // osascript returns code 1 when user cancels — empty stdout
-                if (!out && /User canceled|cancelled/i.test(errMsg))
+                // osascript: "User canceled. (-128)"; zenity / kdialog: exit 1, no output.
+                if (!out && (/User cancel+ed|\(-128\)/i.test(errMsg) || (exit1IsCancel && err.code === 1)))
                     return resolve("");
                 return reject(new Error(errMsg || "pick failed"));
             }
-            resolve((stdout || "").trim());
+            resolve(out);
         });
     });
-    // Quotes would break out of the AppleScript / PowerShell string literal.
+}
+export async function pickNativeFolder(prompt) {
+    // Quotes and backslashes would break out of the AppleScript string literal.
     const safePrompt = prompt.replace(/["'`$\\]/g, "");
     let picked = "";
     try {
-        if (platform === "darwin") {
-            // osascript returns "Macintosh HD:Users:me:Documents" — convert to POSIX
-            const raw = await run("osascript", [
-                "-e", 'tell application "System Events"',
+        if (process.platform === "darwin") {
+            // `activate` brings osascript's own dialog to the front; the result is a
+            // POSIX path ("/Users/me/Vault/").
+            picked = await run("osascript", [
                 "-e", "activate",
-                "-e", `set p to choose folder with prompt "${safePrompt}"`,
-                "-e", "end tell",
-                "-e", "return POSIX path of p",
+                "-e", `POSIX path of (choose folder with prompt "${safePrompt}")`,
             ]);
-            picked = raw.replace(/\/$/, "");
+            picked = picked.replace(/\/$/, "");
         }
-        else if (platform === "win32") {
-            const ps = [
-                "Add-Type -AssemblyName System.Windows.Forms;",
-                "$f = New-Object System.Windows.Forms.FolderBrowserDialog;",
-                `$f.Description = '${safePrompt}';`,
-                "$f.ShowNewFolderButton = $true;",
-                "if ($f.ShowDialog() -eq 'OK') { [Console]::Out.Write($f.SelectedPath) }",
-            ].join(" ");
-            picked = await run("powershell", ["-NoProfile", "-STA", "-Command", ps]);
+        else if (process.platform === "win32") {
+            // The title goes through the environment, never into the script text.
+            const encoded = Buffer.from(WINDOWS_PICKER, "utf16le").toString("base64");
+            picked = await run("powershell.exe", ["-NoProfile", "-NonInteractive", "-STA", "-ExecutionPolicy", "Bypass", "-EncodedCommand", encoded], { ...process.env, MEL_PICK_TITLE: safePrompt });
         }
         else {
-            // Linux — try zenity, fall back to error if missing
-            picked = await run("zenity", [
-                "--file-selection", "--directory",
-                `--title=${safePrompt}`,
-            ]);
+            try {
+                picked = await run("zenity", ["--file-selection", "--directory", `--title=${safePrompt}`], undefined, true);
+            }
+            catch (e) {
+                if (!/ENOENT/i.test(String(e?.message)))
+                    throw e;
+                picked = await run("kdialog", ["--getexistingdirectory", process.env.HOME || "/", "--title", safePrompt], undefined, true);
+            }
         }
     }
     catch (e) {
         const msg = String(e?.message || "pick failed");
-        const hint = /ENOENT|not found|spawn/i.test(msg) && process.platform === "linux"
-            ? "Install 'zenity' (apt install zenity) or type the path manually."
-            : "";
+        let hint = "";
+        if (process.platform === "linux" && /ENOENT|not found|spawn/i.test(msg)) {
+            hint = "Install 'zenity' (apt install zenity) or type the path manually.";
+        }
+        else if (process.platform === "darwin" && /-1743|not allowed|No user interaction/i.test(msg)) {
+            hint = "macOS blocked the dialog: run the runner from a logged-in session (Terminal), or type the path manually.";
+        }
         throw new Error(hint ? `${msg} — ${hint}` : msg);
     }
     if (!picked)

package/dist/localVaultMirror.py

@@ -45,6 +45,20 @@ import urllib.request
 from pathlib import Path
 from typing import Any, Callable, Iterable
 
+
+def _runner_user_agent() -> str:
+    # Cloudflare's browser integrity check refuses urllib's default
+    # "Python-urllib/x.y" agent (403, error 1010) before the request reaches
+    # Melaya, so every upload must name the runner.
+    try:
+        pkg = json.loads((Path(__file__).resolve().parent / "package.json").read_text(encoding="utf-8"))
+        return f"melaya-runner/{pkg.get('version') or 'dev'} (vault-mirror)"
+    except Exception:
+        return "melaya-runner (vault-mirror)"
+
+
+_USER_AGENT = _runner_user_agent()
+
 CONFIG_FILES = (
     "app.json", "daily-notes.json", "templates.json", "zk-prefixer.json", "bookmarks.json",
     "types.json", "workspace.json", "workspaces.json", "core-plugins.json",
@@ -95,7 +109,7 @@ class HttpTransport:
         url = f"{self.base}/{rel}"
         if params:
             url += "?" + urllib.parse.urlencode(params)
-        h = {"Authorization": f"Mirror {self._token}", **(headers or {})}
+        h = {"Authorization": f"Mirror {self._token}", "User-Agent": _USER_AGENT, **(headers or {})}
         body = data
         if json_body is not None:
             body = json.dumps(json_body).encode("utf-8")

package/localVaultMirror.py

@@ -45,6 +45,20 @@ import urllib.request
 from pathlib import Path
 from typing import Any, Callable, Iterable
 
+
+def _runner_user_agent() -> str:
+    # Cloudflare's browser integrity check refuses urllib's default
+    # "Python-urllib/x.y" agent (403, error 1010) before the request reaches
+    # Melaya, so every upload must name the runner.
+    try:
+        pkg = json.loads((Path(__file__).resolve().parent / "package.json").read_text(encoding="utf-8"))
+        return f"melaya-runner/{pkg.get('version') or 'dev'} (vault-mirror)"
+    except Exception:
+        return "melaya-runner (vault-mirror)"
+
+
+_USER_AGENT = _runner_user_agent()
+
 CONFIG_FILES = (
     "app.json", "daily-notes.json", "templates.json", "zk-prefixer.json", "bookmarks.json",
     "types.json", "workspace.json", "workspaces.json", "core-plugins.json",
@@ -95,7 +109,7 @@ class HttpTransport:
         url = f"{self.base}/{rel}"
         if params:
             url += "?" + urllib.parse.urlencode(params)
-        h = {"Authorization": f"Mirror {self._token}", **(headers or {})}
+        h = {"Authorization": f"Mirror {self._token}", "User-Agent": _USER_AGENT, **(headers or {})}
         body = data
         if json_body is not None:
             body = json.dumps(json_body).encode("utf-8")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melaya/runner",
-  "version": "1.1.62",
+  "version": "1.1.64",
   "description": "Run Melaya AI pipelines locally with your own LM Studio or Ollama models",
   "license": "Apache-2.0",
   "author": "Melaya Labs LLC",