haltija 1.3.0-beta.8 → 1.3.0-beta.9

package/apps/desktop/main.js

@@ -1387,6 +1387,13 @@ if (!gotTheLock) {
   // App lifecycle
   app.whenReady().then(async () => {
     console.log('[Haltija Desktop] App ready, starting initialization...')
+
+    // Clear the "manually quit" marker — user is explicitly starting Haltija,
+    // so hj should resume auto-launching when needed.
+    try {
+      const quitMarker = path.join(os.homedir(), '.haltija', 'last-quit')
+      if (fs.existsSync(quitMarker)) fs.rmSync(quitMarker, { force: true })
+    } catch {}
     
     try {
       // Start or connect to server first
@@ -1444,6 +1451,13 @@ if (!gotTheLock) {
       }
       embeddedServers.length = 0
     }
+    // Drop a marker so hj's auto-launch knows the user explicitly quit.
+    // Cleared next time the user manually starts Haltija.
+    try {
+      const dir = path.join(os.homedir(), '.haltija')
+      fs.mkdirSync(dir, { recursive: true })
+      fs.writeFileSync(path.join(dir, 'last-quit'), String(Date.now()))
+    } catch {}
   })
 
   // Handle certificate errors (for self-signed certs in dev)

package/apps/desktop/package.json

@@ -1,6 +1,7 @@
 {
   "name": "haltija-desktop",
-  "version": "1.3.0-beta.8",
+  "version": "1.3.0-beta.9",
+  "private": true,
   "description": "Haltija Desktop - God Mode Browser for AI Agents",
   "homepage": "https://github.com/tonioloewald/haltija",
   "author": {

package/apps/desktop/resources/component.js

@@ -46,7 +46,7 @@
   });
 
   // src/version.ts
-  var VERSION = "1.3.0-beta.8";
+  var VERSION = "1.3.0-beta.9";
 
   // src/text-selector.ts
   var TEXT_PSEUDO_RE = /:(?:text-is|has-text|text)\(/;
@@ -6113,7 +6113,7 @@ ${elementSummary}${moreText}`;
           }
         } else if (isContentEditable) {
           document.execCommand("insertText", false, char);
-        } else {}
+        }
         el.dispatchEvent(new InputEvent("input", {
           bubbles: true,
           inputType: "insertText",

package/bin/cli-subcommand.mjs

@@ -18,6 +18,7 @@
 
 import { spawn } from 'child_process'
 import { existsSync, readFileSync, readdirSync, statSync } from 'fs'
+import { homedir } from 'os'
 import { dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 import { formatTree } from './format-tree.mjs'
@@ -455,28 +456,39 @@ async function isServerRunning(port) {
 }
 
 /**
- * Resolve the server path - checks for bundled binary first, then dev server.
+ * Resolve the server path. Search order:
+ *   1. Next to the hj binary (compiled distribution).
+ *   2. `../dist/server.js` (running from a source checkout).
+ *   3. Inside an installed `/Applications/Haltija.app` (the bundled
+ *      server binary lives in Contents/Resources/haltija-server-<arch>).
+ *   4. Same under `~/Applications/`.
  * Exported for testing.
  */
 export function resolveServerPath() {
   const arch = process.arch === 'arm64' ? 'arm64' : 'x64'
   const execDir = dirname(process.execPath)
-  const bundledServerPath = join(execDir, `haltija-server-${arch}`)
-  const devServerPath = join(__dirname, '../dist/server.js')
-  
-  if (existsSync(bundledServerPath)) {
-    return { type: 'bundled', path: bundledServerPath }
-  } else if (existsSync(devServerPath)) {
-    return { type: 'dev', path: devServerPath }
+  const candidates = [
+    { type: 'bundled', path: join(execDir, `haltija-server-${arch}`) },
+    { type: 'dev', path: join(__dirname, '../dist/server.js') },
+    { type: 'app', path: `/Applications/Haltija.app/Contents/Resources/haltija-server-${arch}` },
+    { type: 'app', path: join(homedir(), `Applications/Haltija.app/Contents/Resources/haltija-server-${arch}`) },
+  ]
+  for (const c of candidates) {
+    if (existsSync(c.path)) return c
   }
   return null
 }
 
 async function startServerInBackground(port) {
   const resolved = resolveServerPath()
-  
+
   if (!resolved) {
-    console.error('Error: Server not found. Run `bun run build` first.')
+    console.error('Error: no haltija server found.')
+    console.error('')
+    console.error('Install one of these:')
+    console.error('  • Haltija desktop app: https://github.com/tonioloewald/haltija/releases')
+    console.error('  • Or run a server in another shell: bunx haltija --server')
+    console.error('  • Or, if you are developing haltija from source: bun run build')
     process.exit(1)
   }
   
@@ -551,14 +563,31 @@ async function launchElectronApp() {
 }
 
 async function ensureBrowserConnected(port) {
+  let status
   try {
     const resp = await fetch(`http://localhost:${port}/status`, {
       signal: AbortSignal.timeout(2000)
     })
-    const status = await resp.json()
+    status = await resp.json()
     if (status.ok) return true
   } catch { return false }
-  
+
+  // Server is up but no tabs yet. If this server is hosted by the Haltija
+  // desktop app, it will open a tab itself when the agent's command hits
+  // (via __NEED_WINDOW__). Launching /Applications/Haltija.app on top would
+  // produce two app instances side by side — skip the launch.
+  if (status?.desktopApp) return true
+
+  // Respect "user explicitly quit" — don't auto-relaunch on every agent
+  // call. Cleared when the user starts Haltija manually.
+  try {
+    const quitMarker = join(homedir(), '.haltija', 'last-quit')
+    if (existsSync(quitMarker)) {
+      process.stderr.write('\x1b[2m(Haltija was quit by user; not auto-launching. Open Haltija manually to resume.)\x1b[0m\n')
+      return false
+    }
+  } catch {}
+
   // No windows connected — try to launch Electron app (macOS only)
   if (process.platform !== 'darwin') return false
   
@@ -611,6 +640,18 @@ export async function runSubcommand(subcommand, subArgs, port = '8700', options
 
   // Check if server is running, auto-start if not
   if (!(await isServerRunning(port))) {
+    // Respect "user manually quit Haltija" before we try to spawn anything.
+    // The marker is dropped by the desktop app on will-quit and cleared on
+    // its next launch — agent calls in between should not bring it back.
+    try {
+      const quitMarker = join(homedir(), '.haltija', 'last-quit')
+      if (!noLaunch && existsSync(quitMarker)) {
+        console.error('Haltija was quit by user; not auto-launching.')
+        console.error('Open Haltija manually to resume — or run `hj --no-launch` to bypass this check.')
+        process.exit(1)
+      }
+    } catch {}
+
     process.stderr.write('\x1b[2mStarting Haltija server...\x1b[0m')
     const started = await startServerInBackground(port)
     if (started) {

package/dist/component.js

@@ -46,7 +46,7 @@
   });
 
   // src/version.ts
-  var VERSION = "1.3.0-beta.8";
+  var VERSION = "1.3.0-beta.9";
 
   // src/text-selector.ts
   var TEXT_PSEUDO_RE = /:(?:text-is|has-text|text)\(/;
@@ -6113,7 +6113,7 @@ ${elementSummary}${moreText}`;
           }
         } else if (isContentEditable) {
           document.execCommand("insertText", false, char);
-        } else {}
+        }
         el.dispatchEvent(new InputEvent("input", {
           bubbles: true,
           inputType: "insertText",

package/dist/hj.js

@@ -5,6 +5,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 // bin/cli-subcommand.mjs
 import { spawn } from "child_process";
 import { existsSync, readFileSync, readdirSync, statSync } from "fs";
+import { homedir } from "os";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 
@@ -1235,19 +1236,27 @@ async function isServerRunning(port) {
 function resolveServerPath() {
   const arch = process.arch === "arm64" ? "arm64" : "x64";
   const execDir = dirname(process.execPath);
-  const bundledServerPath = join(execDir, `haltija-server-${arch}`);
-  const devServerPath = join(__dirname2, "../dist/server.js");
-  if (existsSync(bundledServerPath)) {
-    return { type: "bundled", path: bundledServerPath };
-  } else if (existsSync(devServerPath)) {
-    return { type: "dev", path: devServerPath };
+  const candidates = [
+    { type: "bundled", path: join(execDir, `haltija-server-${arch}`) },
+    { type: "dev", path: join(__dirname2, "../dist/server.js") },
+    { type: "app", path: `/Applications/Haltija.app/Contents/Resources/haltija-server-${arch}` },
+    { type: "app", path: join(homedir(), `Applications/Haltija.app/Contents/Resources/haltija-server-${arch}`) }
+  ];
+  for (const c of candidates) {
+    if (existsSync(c.path))
+      return c;
   }
   return null;
 }
 async function startServerInBackground(port) {
   const resolved = resolveServerPath();
   if (!resolved) {
-    console.error("Error: Server not found. Run `bun run build` first.");
+    console.error("Error: no haltija server found.");
+    console.error("");
+    console.error("Install one of these:");
+    console.error("  • Haltija desktop app: https://github.com/tonioloewald/haltija/releases");
+    console.error("  • Or run a server in another shell: bunx haltija --server");
+    console.error("  • Or, if you are developing haltija from source: bun run build");
     process.exit(1);
   }
   let command, cmdArgs;
@@ -1305,16 +1314,27 @@ async function launchElectronApp() {
   return false;
 }
 async function ensureBrowserConnected(port) {
+  let status;
   try {
     const resp = await fetch(`http://localhost:${port}/status`, {
       signal: AbortSignal.timeout(2000)
     });
-    const status = await resp.json();
+    status = await resp.json();
     if (status.ok)
       return true;
   } catch {
     return false;
   }
+  if (status?.desktopApp)
+    return true;
+  try {
+    const quitMarker = join(homedir(), ".haltija", "last-quit");
+    if (existsSync(quitMarker)) {
+      process.stderr.write(`\x1B[2m(Haltija was quit by user; not auto-launching. Open Haltija manually to resume.)\x1B[0m
+`);
+      return false;
+    }
+  } catch {}
   if (process.platform !== "darwin")
     return false;
   process.stderr.write("\x1B[2mLaunching Haltija browser...\x1B[0m");
@@ -1331,8 +1351,8 @@ async function ensureBrowserConnected(port) {
       const resp = await fetch(`http://localhost:${port}/status`, {
         signal: AbortSignal.timeout(1000)
       });
-      const status = await resp.json();
-      if (status.ok) {
+      const status2 = await resp.json();
+      if (status2.ok) {
         process.stderr.write(`\x1B[2m ready\x1B[0m
 `);
         return true;
@@ -1357,6 +1377,14 @@ async function runSubcommand(subcommand, subArgs, port = "8700", options = {}) {
     filteredArgs = [...filteredArgs.slice(0, windowIdx), ...filteredArgs.slice(windowIdx + 2)];
   }
   if (!await isServerRunning(port)) {
+    try {
+      const quitMarker = join(homedir(), ".haltija", "last-quit");
+      if (!noLaunch && existsSync(quitMarker)) {
+        console.error("Haltija was quit by user; not auto-launching.");
+        console.error("Open Haltija manually to resume — or run `hj --no-launch` to bypass this check.");
+        process.exit(1);
+      }
+    } catch {}
     process.stderr.write("\x1B[2mStarting Haltija server...\x1B[0m");
     const started = await startServerInBackground(port);
     if (started) {
@@ -1687,11 +1715,11 @@ function dim2(s) {
 
 // bin/hj.mjs
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
 var args = process.argv.slice(2);
 function lookupNamedInstance(name) {
-  const path = join2(homedir(), ".haltija", "servers", `${name}.json`);
+  const path = join2(homedir2(), ".haltija", "servers", `${name}.json`);
   if (!existsSync2(path))
     return null;
   let entry;

package/dist/index.js

@@ -674,7 +674,7 @@ var injectorCode = `
 `;
 
 // src/version.ts
-var VERSION = "1.3.0-beta.8";
+var VERSION = "1.3.0-beta.9";
 
 // src/embedded-assets.ts
 var APP_MD = `# Haltija App
@@ -8736,6 +8736,7 @@ async function handleRest(req) {
       serverVersion: SERVER_VERSION,
       recording: activeRecordings > 0,
       activeRecordings,
+      desktopApp: isDesktopApp,
       browsers: browsers.size,
       agents: agents.size,
       mcp: {

package/dist/server.js

@@ -674,7 +674,7 @@ var injectorCode = `
 `;
 
 // src/version.ts
-var VERSION = "1.3.0-beta.8";
+var VERSION = "1.3.0-beta.9";
 
 // src/embedded-assets.ts
 var APP_MD = `# Haltija App
@@ -8736,6 +8736,7 @@ async function handleRest(req) {
       serverVersion: SERVER_VERSION,
       recording: activeRecordings > 0,
       activeRecordings,
+      desktopApp: isDesktopApp,
       browsers: browsers.size,
       agents: agents.size,
       mcp: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haltija",
-  "version": "1.3.0-beta.8",
+  "version": "1.3.0-beta.9",
   "description": "Browser control for AI agents - query DOM, click, type, run JS, watch mutations",
   "type": "module",
   "main": "dist/index.js",