@aexol/spectral 0.9.43 → 0.9.44

package/dist/server/handlers/paths-pick-directory.js

@@ -1,30 +1,18 @@
-/**
- * Native OS folder picker dialog for project path selection.
- *
- * The "New Project" form in the browser has a "Browse..." button next to
- * the typed-path autocomplete. When clicked, it sends
- * `POST /api/paths/pick-directory` to this handler, which launches a
- * native OS folder picker dialog on the user's machine and returns the
- * absolute path of the selected directory (or `null` when cancelled).
- *
- * Platform strategy (tried in order):
- *   1. macOS  — osascript (built-in, zero deps, native look)
- *   2. Linux  — zenity (GTK), kdialog (KDE), then Python tkinter
- *   3. Windows — PowerShell (COM object)
- *   4. Fallback — Python tkinter (bundled with most Python installs)
- *
- * The first available tool wins; if none work, we return an error.
- * All child processes are synchronous — the browser is waiting anyway.
- */
 import { execSync } from "node:child_process";
 import { platform } from "node:os";
-// ---------------------------------------------------------------------------
-// Platform pickers
-// ---------------------------------------------------------------------------
-/**
- * macOS: Use `osascript` with AppleScript to show a native folder chooser.
- * Returns the POSIX path or empty string on cancel.
- */
+function execErrMsg(err) {
+    if (err && typeof err === "object" && "message" in err) {
+        return String(err.message);
+    }
+    return String(err);
+}
+function execErrStatus(err) {
+    if (err && typeof err === "object" && "status" in err) {
+        const s = err.status;
+        return typeof s === "number" ? s : undefined;
+    }
+    return undefined;
+}
 function pickMacOS() {
     const script = `
     set folderPath to POSIX path of (choose folder with prompt "Select project directory")
@@ -36,75 +24,95 @@ function pickMacOS() {
             timeout: 180_000, // 3 min — user might take time to browse
         });
         const trimmed = result.trim();
-        return trimmed || null;
+        if (!trimmed) {
+            return { path: null };
+        }
+        return { path: trimmed };
     }
-    catch {
-        // osascript exits non-zero on user cancel (error -128) — treat as silent cancel
-        return null;
+    catch (err) {
+        if (execErrStatus(err) === 1) {
+            return { path: null }; // user cancelled
+        }
+        return {
+            path: null,
+            error: `Could not open folder picker (macOS): ${execErrMsg(err)}`,
+        };
     }
 }
-/**
- * Run a command that shows a folder picker dialog. Returns `null` on user
- * cancellation, and falls through (re-throws) if the tool is not installed.
- */
 function tryDialog(cmd) {
     try {
         const result = execSync(cmd, { encoding: "utf-8", timeout: 180_000 });
         return result.trim() || null;
     }
     catch (err) {
-        // exit code 1 = user cancelled the dialog → stop here, return null
-        // exit code 127 = command not found → re-throw so the next picker tries
-        const status = err && typeof err === "object" && "status" in err
-            ? err.status
-            : undefined;
-        if (status === 1)
-            return null;
+        if (execErrStatus(err) === 1)
+            return null; // user cancelled
         throw err;
     }
 }
-/**
- * Linux: Try zenity (GTK), then kdialog (KDE), then Python tkinter.
- */
 function pickLinux() {
     try {
-        return tryDialog(`zenity --file-selection --directory --title="Select project directory"`);
+        const p = tryDialog(`zenity --file-selection --directory --title="Select project directory"`);
+        return p ? { path: p } : { path: null };
     }
     catch {
-        // zenity not available
     }
     try {
-        return tryDialog(`kdialog --getexistingdirectory "${process.env.HOME ?? "/"}" --title "Select project directory"`);
+        const p = tryDialog(`kdialog --getexistingdirectory "${process.env.HOME ?? "/"}" --title "Select project directory"`);
+        return p ? { path: p } : { path: null };
     }
     catch {
-        // kdialog not available
     }
-    // Try Python tkinter
-    return pickTkinter();
+    const tkResult = pickTkinter();
+    if (tkResult.path === null && !tkResult.error) {
+        return {
+            path: null,
+            error: "No folder picker available. Install zenity, kdialog, or python3-tk.",
+        };
+    }
+    return tkResult;
 }
-/**
- * Windows: Use PowerShell to invoke the COM Shell.Application folder picker.
- */
 function pickWindows() {
     const script = `
-    Add-Type -AssemblyName System.Windows.Forms
-    $f = New-Object System.Windows.Forms.FolderBrowserDialog
-    $f.Description = "Select project directory"
-    $f.ShowNewFolderButton = $true
-    if ($f.ShowDialog() -eq "OK") { $f.SelectedPath } else { "" }
+    try {
+      Add-Type -AssemblyName System.Windows.Forms -ErrorAction Stop
+      $f = New-Object System.Windows.Forms.FolderBrowserDialog
+      $f.Description = "Select project directory"
+      $f.ShowNewFolderButton = $true
+      if ($f.ShowDialog() -eq "OK") { Write-Output $f.SelectedPath } else { Write-Output "__CANCELLED__" }
+    } catch {
+      Write-Error $_.Exception.Message
+      [Environment]::Exit(99)
+    }
   `.trim();
+    // -EncodedCommand (UTF-16LE base64) avoids cmd.exe quote-escaping bugs
+    // that would corrupt -Command strings containing nested double-quotes.
+    const encoded = Buffer.from(script, "utf-16le").toString("base64");
     try {
-        const result = execSync(`powershell -NoProfile -Command "${script.replace(/"/g, '\\"')}"`, { encoding: "utf-8", timeout: 180_000 });
-        return result.trim() || null;
+        const result = execSync(`powershell -STA -NoProfile -EncodedCommand ${encoded}`, { encoding: "utf-8", timeout: 180_000 });
+        const trimmed = result.trim();
+        if (!trimmed || trimmed === "__CANCELLED__") {
+            return { path: null };
+        }
+        return { path: trimmed };
     }
-    catch {
-        return null;
+    catch (err) {
+        const status = execErrStatus(err);
+        if (status === 99) {
+            const stderr = err && typeof err === "object" && "stderr" in err
+                ? String(err.stderr).trim()
+                : "";
+            return {
+                path: null,
+                error: stderr || "Folder picker could not be displayed.",
+            };
+        }
+        return {
+            path: null,
+            error: `Could not open folder picker (Windows): ${execErrMsg(err)}`,
+        };
     }
 }
-/**
- * Python tkinter fallback — works on any OS with Python + tkinter installed.
- * tkinter is bundled with macOS Python from python.org and most Linux distros.
- */
 function pickTkinter() {
     const script = `import tkinter as tk
 from tkinter import filedialog
@@ -120,61 +128,47 @@ print(d if d else "")
             encoding: "utf-8",
             timeout: 180_000,
         });
-        return result.trim() || null;
+        const trimmed = result.trim();
+        return trimmed ? { path: trimmed } : { path: null };
     }
     catch {
-        // python3 not found — try 'python' (Windows)
         try {
             const result = execSync(`python -c "${script}"`, {
                 encoding: "utf-8",
                 timeout: 180_000,
             });
-            return result.trim() || null;
+            const trimmed = result.trim();
+            return trimmed ? { path: trimmed } : { path: null };
         }
         catch {
-            return null;
+            return {
+                path: null,
+                error: "Python/tkinter not available for folder picker. Type the path manually.",
+            };
         }
     }
 }
-// ---------------------------------------------------------------------------
-// Public handler
-// ---------------------------------------------------------------------------
-/**
- * Attempt to open a native folder picker dialog and return the selected path.
- *
- * Synchronous and blocking by design — the browser form is waiting for a
- * response and the user is interacting with the dialog.
- */
 export function handlePickDirectory() {
     const os = platform();
     try {
-        let path = null;
         if (os === "darwin") {
-            path = pickMacOS();
+            return pickMacOS();
         }
         else if (os === "linux") {
-            path = pickLinux();
+            return pickLinux();
         }
         else if (os === "win32") {
-            path = pickWindows();
+            return pickWindows();
         }
         else {
-            // Unknown platform — try Python tkinter as universal fallback
-            path = pickTkinter();
-        }
-        if (path === null) {
-            // User cancelled or no picker available. Distinguish:
-            // When no path AND no error in the platform pickers, it's a cancel.
-            return { path: null };
+            return pickTkinter();
         }
-        return { path };
     }
     catch (err) {
-        // The platform picker failed entirely (not cancelled — process error).
         const msg = err instanceof Error ? err.message : String(err);
         return {
             path: null,
-            error: `Could not open folder picker: ${msg}`,
+            error: `Could not open folder picker (${os}): ${msg}`,
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aexol/spectral",
-  "version": "0.9.43",
+  "version": "0.9.44",
   "description": "AI coding agent for Aexol with relay-based browser access.",
   "type": "module",
   "private": false,