promethios-bridge 2.2.0 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promethios-bridge",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Run Promethios agent frameworks locally on your computer with full file, terminal, browser access, ambient context capture, and the always-on-top floating chat overlay. Native Framework Mode supports OpenClaw and other frameworks via the bridge.",
   "main": "src/index.js",
   "bin": {

package/src/bridge.js

@@ -39,7 +39,12 @@ const { initAndroidTools } = require('./tools/android');
 
 // Optional: Electron overlay window (bundled in src/overlay — gracefully skipped if Electron not available)
 let launchOverlay = null;
-try { launchOverlay = require('./overlay/launcher').launchOverlay; } catch { /* overlay launcher not found */ }
+let isDesktopInstalled = null;
+try {
+  const overlayLauncher = require('./overlay/launcher');
+  launchOverlay = overlayLauncher.launchOverlay;
+  isDesktopInstalled = overlayLauncher.isDesktopInstalled;
+} catch { /* overlay launcher not found */ }
 
 const HEARTBEAT_INTERVAL = 30_000; // 30s
 const POLL_INTERVAL = 1_000;       // 1s — poll for pending tool calls
@@ -1430,17 +1435,27 @@ h1{font-size:20px;font-weight:700;margin:0;}p{font-size:13px;color:rgba(255,255,
   overlayAuthToken = authToken;
   bridgeUsername = require('os').userInfo().username;
 
-  // Try Electron first (available when installed globally or via postinstall).
-  // Fall back to opening the browser-based overlay at http://localhost:<port>/overlay.
+  // ── Option C: Try Electron first; only fall back to browser overlay if not installed ──
+  // isDesktopInstalled() scans standard install paths (postinstall dir + OS program dirs).
+  // If the EXE is found, we launch it and skip the browser overlay entirely.
+  // If not found, we open the browser overlay as a fallback.
   let overlayLaunched = false;
+
+  const desktopInstalled = isDesktopInstalled && isDesktopInstalled();
+
   if (launchOverlay) {
     try {
       const overlayChild = launchOverlay({ authToken, apiBase, dev });
       if (overlayChild) {
         overlayLaunched = true;
-        console.log(chalk.cyan('  ⬡ Promethios overlay launched — floating chat is ready'));
+        console.log(chalk.cyan('  ⬡ Promethios Desktop launched — floating overlay is ready'));
         console.log(chalk.gray('    Hotkey: Ctrl+Shift+P (Win/Linux) or Cmd+Shift+P (Mac)'));
         console.log('');
+      } else if (desktopInstalled) {
+        // findDesktopBinary found a path but spawn returned null — EXE may already be running
+        overlayLaunched = true;
+        console.log(chalk.cyan('  ⬡ Promethios Desktop is running'));
+        console.log('');
       }
     } catch (err) {
       log('Electron overlay launch failed (non-critical):', err.message);
@@ -1448,8 +1463,8 @@ h1{font-size:20px;font-weight:700;margin:0;}p{font-size:13px;color:rgba(255,255,
   }
 
   if (!overlayLaunched) {
-    // Electron not available — open the lightweight browser overlay instead.
-    // This is a small chat UI served by the bridge's own Express server.
+    // Electron Desktop not installed — open the lightweight browser overlay instead.
+    // This is the full-featured chat + Providers UI served by the bridge's Express server.
     const overlayUrl = `http://127.0.0.1:${port}/overlay`;
     const openedInBrowser = await openInBrowser(overlayUrl, log);
     if (openedInBrowser) {

package/src/overlay/launcher.js

@@ -2,13 +2,15 @@
  * launcher.js — Promethios Bridge
  *
  * Called by bridge.js after successful authentication.
- * Finds the pre-built Promethios Desktop binary (downloaded by postinstall.js
- * into ~/.promethios/desktop/) and spawns it with auth credentials via env vars.
+ * Finds the pre-built Promethios Desktop binary and spawns it with auth
+ * credentials via env vars.
  *
  * Binary search order:
  *   1. PROMETHIOS_DESKTOP_BIN environment variable (dev override)
  *   2. ~/.promethios/desktop/  — where postinstall.js places the binary
- *   3. Electron source-mode fallback (dev only, requires electron in node_modules)
+ *   3. Standard OS install paths (Windows: %LOCALAPPDATA%\Programs\Promethios\,
+ *      macOS: /Applications/Promethios.app, Linux: /opt/Promethios/)
+ *   4. Electron source-mode fallback (dev only, requires electron in node_modules)
  *
  * The pre-built binary reads its config from env vars:
  *   PROMETHIOS_TOKEN, PROMETHIOS_API_BASE, PROMETHIOS_THREAD_ID, PROMETHIOS_DEV
@@ -30,18 +32,17 @@ function findDesktopBinary() {
     return process.env.PROMETHIOS_DESKTOP_BIN;
   }
 
-  // 2. Scan ~/.promethios/desktop/ for a matching binary
+  // 2. Scan ~/.promethios/desktop/ for a matching binary (postinstall download location)
   if (fs.existsSync(INSTALL_DIR)) {
     const files = fs.readdirSync(INSTALL_DIR);
     const exts  = process.platform === 'win32'  ? ['.exe']
-                : process.platform === 'darwin' ? ['.dmg', '.app']
+                : process.platform === 'darwin' ? ['.app']
                 : ['.AppImage'];
 
     for (const ext of exts) {
-      const match = files.find(f => f.endsWith(ext));
+      const match = files.find(f => f.endsWith(ext) && !f.includes('Setup'));
       if (match) {
         const full = path.join(INSTALL_DIR, match);
-        // Ensure executable bit is set on Unix
         try {
           if (process.platform !== 'win32') fs.chmodSync(full, 0o755);
         } catch {}
@@ -50,6 +51,67 @@ function findDesktopBinary() {
     }
   }
 
+  // 3. Standard OS install paths (when user installed via the installer EXE/DMG)
+  if (process.platform === 'win32') {
+    const localAppData = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
+    const programFiles = process.env.PROGRAMFILES || 'C:\\Program Files';
+    const programFilesX86 = process.env['PROGRAMFILES(X86)'] || 'C:\\Program Files (x86)';
+
+    const candidates = [
+      // Electron-builder default: %LOCALAPPDATA%\Programs\Promethios\Promethios.exe
+      path.join(localAppData, 'Programs', 'Promethios', 'Promethios.exe'),
+      path.join(localAppData, 'Programs', 'promethios', 'Promethios.exe'),
+      // Per-machine install
+      path.join(programFiles, 'Promethios', 'Promethios.exe'),
+      path.join(programFilesX86, 'Promethios', 'Promethios.exe'),
+      // Alternate casing
+      path.join(localAppData, 'Programs', 'Promethios Desktop', 'Promethios Desktop.exe'),
+      path.join(localAppData, 'Programs', 'Promethios', 'Promethios Desktop.exe'),
+    ];
+
+    for (const c of candidates) {
+      if (fs.existsSync(c)) return c;
+    }
+
+    // Scan %LOCALAPPDATA%\Programs\ for any Promethios*.exe
+    const programsDir = path.join(localAppData, 'Programs');
+    if (fs.existsSync(programsDir)) {
+      try {
+        const dirs = fs.readdirSync(programsDir);
+        for (const dir of dirs) {
+          if (dir.toLowerCase().includes('promethios')) {
+            const dirPath = path.join(programsDir, dir);
+            const files = fs.readdirSync(dirPath);
+            const exe = files.find(f => f.endsWith('.exe') && !f.includes('Uninstall') && !f.includes('Update'));
+            if (exe) return path.join(dirPath, exe);
+          }
+        }
+      } catch {}
+    }
+  } else if (process.platform === 'darwin') {
+    const candidates = [
+      '/Applications/Promethios.app/Contents/MacOS/Promethios',
+      '/Applications/Promethios Desktop.app/Contents/MacOS/Promethios Desktop',
+      path.join(os.homedir(), 'Applications', 'Promethios.app', 'Contents', 'MacOS', 'Promethios'),
+    ];
+    for (const c of candidates) {
+      if (fs.existsSync(c)) return c;
+    }
+  } else {
+    // Linux
+    const candidates = [
+      '/opt/Promethios/promethios',
+      '/usr/local/bin/promethios',
+      path.join(os.homedir(), '.local', 'share', 'promethios', 'promethios'),
+    ];
+    for (const c of candidates) {
+      if (fs.existsSync(c)) {
+        try { fs.chmodSync(c, 0o755); } catch {}
+        return c;
+      }
+    }
+  }
+
   return null;
 }
 
@@ -131,4 +193,9 @@ function launchOverlay({ authToken, apiBase = 'https://api.promethios.ai', threa
   return child;
 }
 
-module.exports = { launchOverlay };
+// ── Check if Electron is installed (without launching) ───────────────────────
+function isDesktopInstalled() {
+  return !!findDesktopBinary();
+}
+
+module.exports = { launchOverlay, isDesktopInstalled, findDesktopBinary };