haltija 1.2.5 → 1.2.7

package/apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haltija-desktop",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "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.2.5";
+  var VERSION = "1.2.7";
 
   // src/text-selector.ts
   var TEXT_PSEUDO_RE = /:(?:text-is|has-text|text)\(/;
@@ -1310,9 +1310,22 @@
     }
     return summary;
   }
+  function pruneNonInteractive(node) {
+    const isInteractive = node.flags?.interactive || node.flags?.hasEvents;
+    const children = node.children?.map((c) => pruneNonInteractive(c)).filter((c) => c !== null);
+    const shadowChildren = node.shadowChildren?.map((c) => pruneNonInteractive(c)).filter((c) => c !== null);
+    const hasInteractiveDescendant = children && children.length > 0 || shadowChildren && shadowChildren.length > 0;
+    if (!isInteractive && !hasInteractiveDescendant)
+      return null;
+    return {
+      ...node,
+      children: children?.length ? children : undefined,
+      shadowChildren: shadowChildren?.length ? shadowChildren : undefined
+    };
+  }
   function buildDomTree(el, options, currentDepth = 0) {
     const {
-      depth = 5,
+      depth = -1,
       includeText = true,
       allAttributes = false,
       includeStyles = false,
@@ -5529,7 +5542,10 @@ ${elementSummary}${moreText}`;
             const summary = buildActionableSummary(el);
             this.respond(msg2.id, true, summary);
           } else {
-            const tree = buildDomTree(el, request);
+            let tree = buildDomTree(el, request);
+            if (request.interactiveOnly && tree) {
+              tree = pruneNonInteractive(tree);
+            }
             if (request.ancestors && tree) {
               const ancestors = [];
               let parent = el.parentElement;

package/bin/cli-subcommand.mjs

@@ -202,10 +202,10 @@ export function parseTreeArgs(args) {
   for (let i = 0; i < args.length; i++) {
     const a = args[i]
     if (a === '--depth' || a === '-d') { body.depth = num(args[++i]); continue }
-    if (a === '--all' || a === '-a') { body.depth = -1; continue }
     if (a === '--selector' || a === '-s') { body.selector = args[++i]; continue }
     if (a === '--compact' || a === '-c') { body.compact = true; continue }
-    if (a === '--visible') { body.visibleOnly = true; continue }
+    if (a === '--interactive' || a === '-i') { body.interactiveOnly = true; continue }
+    if (a === '--visible' || a === '-v') { body.visibleOnly = true; continue }
     if (a === '--text') { body.includeText = true; continue }
     if (a === '--no-text') { body.includeText = false; continue }
     if (a === '--shadow') { body.pierceShadow = true; continue }
@@ -832,7 +832,7 @@ export function listSubcommands() {
   return `
 Subcommands (replace curl with simple commands):
   ${bold('Inspect')}
-    tree [selector] [-d N] [-a]    DOM tree with ref IDs (default depth 5, -a = all)
+    tree [selector] [-d N] [-i] [-v] DOM tree (full depth, -i=interactive, -v=visible)
     query <selector>               Find elements matching selector
     inspect <@ref|selector>        Detailed element info
     inspectAll <selector>          Deep inspect all matches

package/bin/format-tree.mjs

@@ -33,11 +33,11 @@ export function formatTree(node, indent = 0, { depth } = {}) {
   const lines = []
   formatNode(node, indent, lines)
 
-  // Footer: depth and options hint
-  const d = depth ?? 5
-  const isDefault = depth === undefined || depth === null
+  // Footer: options hint
+  const d = depth ?? -1
+  const depthLabel = d === -1 ? 'unlimited' : String(d)
   lines.push('---')
-  lines.push(`depth=${d}${isDefault ? ' (default)' : d === -1 ? ' (unlimited)' : ''} | -d N | --all | --json`)
+  lines.push(`depth=${depthLabel} | -d N | -i (interactive) | --visible | --json`)
 
   return lines.join('\n')
 }

package/bin/hints.json

@@ -1,5 +1,5 @@
 {
-  "tree": "-d 5 (deeper), --compact, \"#selector\" | see: inspect, query, click",
+  "tree": "-d 3 (shallow), -i (interactive only), --visible, --compact | see: inspect, query, click",
   "query": "@ref or \"selector\", --all | see: tree, inspect",
   "inspect": "@ref or \"selector\", --styles, --rules, --ancestors | see: tree, query",
   "click": "@ref or \"selector\", :text(Button), --diff | see: tree, wait, type",

package/dist/component.js

@@ -46,7 +46,7 @@
   });
 
   // src/version.ts
-  var VERSION = "1.2.5";
+  var VERSION = "1.2.7";
 
   // src/text-selector.ts
   var TEXT_PSEUDO_RE = /:(?:text-is|has-text|text)\(/;
@@ -1310,9 +1310,22 @@
     }
     return summary;
   }
+  function pruneNonInteractive(node) {
+    const isInteractive = node.flags?.interactive || node.flags?.hasEvents;
+    const children = node.children?.map((c) => pruneNonInteractive(c)).filter((c) => c !== null);
+    const shadowChildren = node.shadowChildren?.map((c) => pruneNonInteractive(c)).filter((c) => c !== null);
+    const hasInteractiveDescendant = children && children.length > 0 || shadowChildren && shadowChildren.length > 0;
+    if (!isInteractive && !hasInteractiveDescendant)
+      return null;
+    return {
+      ...node,
+      children: children?.length ? children : undefined,
+      shadowChildren: shadowChildren?.length ? shadowChildren : undefined
+    };
+  }
   function buildDomTree(el, options, currentDepth = 0) {
     const {
-      depth = 5,
+      depth = -1,
       includeText = true,
       allAttributes = false,
       includeStyles = false,
@@ -5529,7 +5542,10 @@ ${elementSummary}${moreText}`;
             const summary = buildActionableSummary(el);
             this.respond(msg2.id, true, summary);
           } else {
-            const tree = buildDomTree(el, request);
+            let tree = buildDomTree(el, request);
+            if (request.interactiveOnly && tree) {
+              tree = pruneNonInteractive(tree);
+            }
             if (request.ancestors && tree) {
               const ancestors = [];
               let parent = el.parentElement;

package/dist/hj.js

@@ -15,10 +15,10 @@ function formatTree(node, indent = 0, { depth } = {}) {
     return "";
   const lines = [];
   formatNode(node, indent, lines);
-  const d = depth ?? 5;
-  const isDefault = depth === undefined || depth === null;
+  const d = depth ?? -1;
+  const depthLabel = d === -1 ? "unlimited" : String(d);
   lines.push("---");
-  lines.push(`depth=${d}${isDefault ? " (default)" : d === -1 ? " (unlimited)" : ""} | -d N | --all | --json`);
+  lines.push(`depth=${depthLabel} | -d N | -i (interactive) | --visible | --json`);
   return lines.join(`
 `);
 }
@@ -892,10 +892,6 @@ function parseTreeArgs(args) {
       body.depth = num(args[++i]);
       continue;
     }
-    if (a === "--all" || a === "-a") {
-      body.depth = -1;
-      continue;
-    }
     if (a === "--selector" || a === "-s") {
       body.selector = args[++i];
       continue;
@@ -904,7 +900,11 @@ function parseTreeArgs(args) {
       body.compact = true;
       continue;
     }
-    if (a === "--visible") {
+    if (a === "--interactive" || a === "-i") {
+      body.interactiveOnly = true;
+      continue;
+    }
+    if (a === "--visible" || a === "-v") {
       body.visibleOnly = true;
       continue;
     }
@@ -1516,7 +1516,7 @@ function listSubcommands() {
   return `
 Subcommands (replace curl with simple commands):
   ${bold("Inspect")}
-    tree [selector] [-d N] [-a]    DOM tree with ref IDs (default depth 5, -a = all)
+    tree [selector] [-d N] [-i] [-v] DOM tree (full depth, -i=interactive, -v=visible)
     query <selector>               Find elements matching selector
     inspect <@ref|selector>        Detailed element info
     inspectAll <selector>          Deep inspect all matches

package/dist/index.js

@@ -674,7 +674,7 @@ var injectorCode = `
 `;
 
 // src/version.ts
-var VERSION = "1.2.5";
+var VERSION = "1.2.7";
 
 // src/embedded-assets.ts
 var APP_MD = `# Haltija App
@@ -1078,9 +1078,10 @@ Use ancestors:true to see parent elements when inspecting deep elements.
 | Name | Type | Description |
 |------|------|-------------|
 | \`selector\` | string,null | Root element selector |
-| \`depth\` | number,null | Max depth (-1 = unlimited, default 5) |
+| \`depth\` | number,null | Max depth (-1 = unlimited). Default: unlimited |
 | \`includeText\` | boolean,null | Include text content (default true) |
 | \`visibleOnly\` | boolean,null | Only visible elements (default false) |
+| \`interactiveOnly\` | boolean,null | Only interactive elements and their ancestors (default false) |
 | \`pierceShadow\` | boolean,null | Pierce shadow DOM (default true) |
 | \`pierceFrames\` | boolean,null | Pierce same-origin iframes (default true) |
 | \`compact\` | boolean,null | Minimal output (default false) |
@@ -1089,17 +1090,17 @@ Use ancestors:true to see parent elements when inspecting deep elements.
 
 **Examples:**
 
-- **overview**: Quick page overview
+- **overview**: Quick page overview (shallow)
   \`\`\`json
-  {"depth":2}
+  {"depth":3}
   \`\`\`
 - **form-only**: Full form structure
   \`\`\`json
-  {"selector":"form","depth":-1}
+  {"selector":"form"}
   \`\`\`
-- **visible-buttons**: Find visible interactive elements
+- **interactive**: Only buttons, inputs, links, and their containers
   \`\`\`json
-  {"selector":"body","visibleOnly":true,"depth":4}
+  {"interactiveOnly":true}
   \`\`\`
 - **with-context**: See element with parent context
   \`\`\`json
@@ -3702,9 +3703,10 @@ Use ancestors:true to see parent elements when inspecting deep elements.`,
   category: "dom",
   input: L.object({
     selector: L.string.describe("Root element selector").optional,
-    depth: L.number.describe("Max depth (-1 = unlimited, default 5)").optional,
+    depth: L.number.describe("Max depth (-1 = unlimited). Default: unlimited").optional,
     includeText: L.boolean.describe("Include text content (default true)").optional,
     visibleOnly: L.boolean.describe("Only visible elements (default false)").optional,
+    interactiveOnly: L.boolean.describe("Only interactive elements and their ancestors (default false)").optional,
     pierceShadow: L.boolean.describe("Pierce shadow DOM (default true)").optional,
     pierceFrames: L.boolean.describe("Pierce same-origin iframes (default true)").optional,
     compact: L.boolean.describe("Minimal output (default false)").optional,
@@ -3714,18 +3716,18 @@ Use ancestors:true to see parent elements when inspecting deep elements.`,
   examples: [
     {
       name: "overview",
-      input: { depth: 2 },
-      description: "Quick page overview"
+      input: { depth: 3 },
+      description: "Quick page overview (shallow)"
     },
     {
       name: "form-only",
-      input: { selector: "form", depth: -1 },
+      input: { selector: "form" },
       description: "Full form structure"
     },
     {
-      name: "visible-buttons",
-      input: { selector: "body", visibleOnly: true, depth: 4 },
-      description: "Find visible interactive elements"
+      name: "interactive",
+      input: { interactiveOnly: true },
+      description: "Only buttons, inputs, links, and their containers"
     },
     {
       name: "with-context",
@@ -3733,7 +3735,7 @@ Use ancestors:true to see parent elements when inspecting deep elements.`,
       description: "See element with parent context"
     }
   ],
-  hints: '-d 5 (deeper), --compact, "#selector" | see: inspect, query, click'
+  hints: "-d 3 (shallow), -i (interactive only), --visible, --compact | see: inspect, query, click"
 });
 var query = endpoint({
   path: "/query",
@@ -6326,34 +6328,12 @@ registerHandler(unhighlight, async (_body, ctx) => {
 registerHandler(navigate, async (body, ctx) => {
   const windowId = body.window || ctx.targetWindowId;
   const response = await ctx.requestFromBrowser("navigation", "goto", { url: body.url }, 5000, windowId);
-  if (!response.success) {
-    return Response.json(response, { headers: ctx.headers });
-  }
-  const reconnected = await ctx.waitForReconnect(windowId, 1e4);
-  if (!reconnected) {
-    return Response.json({
-      ...response,
-      success: false,
-      error: `Navigation sent but page did not reconnect within 10s. The page may have loaded without the Haltija widget.`
-    }, { headers: ctx.headers });
-  }
   return Response.json(response, { headers: ctx.headers });
 });
 registerHandler(refresh, async (body, ctx) => {
   const soft = body.soft ?? false;
   const windowId = body.window || ctx.targetWindowId;
   const response = await ctx.requestFromBrowser("navigation", "refresh", { soft }, 5000, windowId);
-  if (!response.success) {
-    return Response.json(response, { headers: ctx.headers });
-  }
-  const reconnected = await ctx.waitForReconnect(windowId, 8000);
-  if (!reconnected) {
-    return Response.json({
-      ...response,
-      success: false,
-      error: `Refresh sent but page did not reconnect within 8s. The page may have loaded without the Haltija widget.`
-    }, { headers: ctx.headers });
-  }
   return Response.json(response, { headers: ctx.headers });
 });
 registerHandler(tree, async (body, ctx) => {
@@ -6976,7 +6956,7 @@ async function wrapWithDeprecation(response, endpoint2) {
   }
 }
 var GET_DEFAULTS = {
-  "/tree": { selector: "body", depth: 5 },
+  "/tree": { selector: "body", depth: -1 },
   "/screenshot": {},
   "/click": {},
   "/type": {},
@@ -8310,12 +8290,12 @@ var createHandlerContext = (req, url) => {
     return recordings2.get(id);
   };
   const sessionFilteredRequest = async (channel, action, payload, timeoutMs, windowId) => {
-    if (sessionId && browsers.size === 0) {
+    if (sessionId && (browsers.size === 0 || windows2.size === 0)) {
       const waitStart = Date.now();
       while (Date.now() - waitStart < 5000) {
-        await new Promise((r) => setTimeout(r, 250));
-        if (browsers.size > 0)
+        if (browsers.size > 0 && windows2.size > 0)
           break;
+        await new Promise((r) => setTimeout(r, 250));
       }
     }
     const effectiveWindowId = windowId || targetWindowId;
@@ -8325,7 +8305,8 @@ var createHandlerContext = (req, url) => {
       return requestFromBrowser(channel, action, payload, timeoutMs, effectiveWindowId);
     }
     if (sessionId) {
-      const matching = Array.from(windows2.values()).filter((w) => w.session === sessionId).sort((a, b) => {
+      const allWins = Array.from(windows2.values());
+      const matching = allWins.filter((w) => w.session === sessionId).sort((a, b) => {
         if (a.id === focusedWindowId)
           return -1;
         if (b.id === focusedWindowId)
@@ -8336,8 +8317,22 @@ var createHandlerContext = (req, url) => {
         agentWindowAffinity.set(sessionId, matching[0].id);
         return requestFromBrowser(channel, action, payload, timeoutMs, matching[0].id);
       }
+      const distinctSessions = new Set(allWins.map((w) => w.session).filter(Boolean));
+      if (distinctSessions.size <= 1 && !isSecureMode) {
+        const best = allWins.sort((a, b) => {
+          if (a.id === focusedWindowId)
+            return -1;
+          if (b.id === focusedWindowId)
+            return 1;
+          return b.lastSeen - a.lastSeen;
+        })[0];
+        if (best) {
+          agentWindowAffinity.set(sessionId, best.id);
+          return requestFromBrowser(channel, action, payload, timeoutMs, best.id);
+        }
+      }
       if (windows2.size > 0) {
-        const anyWindow = Array.from(windows2.values())[0];
+        const anyWindow = allWins[0];
         try {
           const openResult = await requestFromBrowser("tabs", "open", { url: undefined, session: sessionId }, 5000, anyWindow.id);
           if (openResult.success) {
@@ -8353,8 +8348,7 @@ var createHandlerContext = (req, url) => {
           }
         } catch {}
       }
-      const allSessions = new Set(Array.from(windows2.values()).map((w) => w.session).filter(Boolean));
-      const hint = allSessions.size > 0 ? `Available sessions: ${[...allSessions].map((s) => s.slice(0, 8) + "\u2026").join(", ")}. Check the widget UI for the full token.` : "No widgets have session tokens. Connect a browser tab first.";
+      const hint = distinctSessions.size > 0 ? `Available sessions: ${[...distinctSessions].map((s) => s.slice(0, 8) + "\u2026").join(", ")}. Check the widget UI for the full token.` : "No widgets have session tokens. Connect a browser tab first.";
       return { id: "", success: false, error: `No windows in session ${sessionId.slice(0, 8)}\u2026. ${hint}`, timestamp: Date.now() };
     }
     if (isSecureMode) {
@@ -8362,26 +8356,6 @@ var createHandlerContext = (req, url) => {
     }
     return requestFromBrowser(channel, action, payload, timeoutMs);
   };
-  const waitForReconnect = async (windowId, timeoutMs = 8000) => {
-    const id = windowId || targetWindowId || focusedWindowId;
-    const prevBrowserId = id ? windows2.get(id)?.browserId : undefined;
-    const start = Date.now();
-    await new Promise((r) => setTimeout(r, 100));
-    while (Date.now() - start < timeoutMs) {
-      if (id) {
-        const w = windows2.get(id);
-        if (w && w.browserId !== prevBrowserId) {
-          await new Promise((r) => setTimeout(r, 300));
-          return true;
-        }
-      } else if (browsers.size > 0) {
-        await new Promise((r) => setTimeout(r, 300));
-        return true;
-      }
-      await new Promise((r) => setTimeout(r, 100));
-    }
-    return false;
-  };
   return {
     requestFromBrowser: sessionFilteredRequest,
     targetWindowId,
@@ -8390,7 +8364,6 @@ var createHandlerContext = (req, url) => {
     sessionId,
     getWindowInfo,
     updateSessionAffinity,
-    waitForReconnect,
     startRecordingSession,
     stopRecordingSession,
     getRecordingSession,
@@ -8623,7 +8596,10 @@ async function handleRest(req) {
     const reqSession = req.headers.get("X-Haltija-Session") || undefined;
     let allWindows = Array.from(windows2.values());
     if (reqSession) {
-      allWindows = allWindows.filter((w) => w.session === reqSession);
+      const distinctSessions = new Set(allWindows.map((w) => w.session).filter(Boolean));
+      if (distinctSessions.size > 1) {
+        allWindows = allWindows.filter((w) => w.session === reqSession);
+      }
     } else if (isSecureMode) {
       return Response.json({
         ok: windows2.size > 0,
@@ -10326,7 +10302,10 @@ Type 'help <topic>' for details.`);
     const reqSession = req.headers.get("X-Haltija-Session") || undefined;
     let allWindows = Array.from(windows2.values());
     if (reqSession) {
-      allWindows = allWindows.filter((w) => w.session === reqSession);
+      const distinctSessions = new Set(allWindows.map((w) => w.session).filter(Boolean));
+      if (distinctSessions.size > 1) {
+        allWindows = allWindows.filter((w) => w.session === reqSession);
+      }
     } else if (isSecureMode) {
       const totalWindows = windows2.size;
       return Response.json({

package/dist/server.js

@@ -674,7 +674,7 @@ var injectorCode = `
 `;
 
 // src/version.ts
-var VERSION = "1.2.5";
+var VERSION = "1.2.7";
 
 // src/embedded-assets.ts
 var APP_MD = `# Haltija App
@@ -1078,9 +1078,10 @@ Use ancestors:true to see parent elements when inspecting deep elements.
 | Name | Type | Description |
 |------|------|-------------|
 | \`selector\` | string,null | Root element selector |
-| \`depth\` | number,null | Max depth (-1 = unlimited, default 5) |
+| \`depth\` | number,null | Max depth (-1 = unlimited). Default: unlimited |
 | \`includeText\` | boolean,null | Include text content (default true) |
 | \`visibleOnly\` | boolean,null | Only visible elements (default false) |
+| \`interactiveOnly\` | boolean,null | Only interactive elements and their ancestors (default false) |
 | \`pierceShadow\` | boolean,null | Pierce shadow DOM (default true) |
 | \`pierceFrames\` | boolean,null | Pierce same-origin iframes (default true) |
 | \`compact\` | boolean,null | Minimal output (default false) |
@@ -1089,17 +1090,17 @@ Use ancestors:true to see parent elements when inspecting deep elements.
 
 **Examples:**
 
-- **overview**: Quick page overview
+- **overview**: Quick page overview (shallow)
   \`\`\`json
-  {"depth":2}
+  {"depth":3}
   \`\`\`
 - **form-only**: Full form structure
   \`\`\`json
-  {"selector":"form","depth":-1}
+  {"selector":"form"}
   \`\`\`
-- **visible-buttons**: Find visible interactive elements
+- **interactive**: Only buttons, inputs, links, and their containers
   \`\`\`json
-  {"selector":"body","visibleOnly":true,"depth":4}
+  {"interactiveOnly":true}
   \`\`\`
 - **with-context**: See element with parent context
   \`\`\`json
@@ -3702,9 +3703,10 @@ Use ancestors:true to see parent elements when inspecting deep elements.`,
   category: "dom",
   input: L.object({
     selector: L.string.describe("Root element selector").optional,
-    depth: L.number.describe("Max depth (-1 = unlimited, default 5)").optional,
+    depth: L.number.describe("Max depth (-1 = unlimited). Default: unlimited").optional,
     includeText: L.boolean.describe("Include text content (default true)").optional,
     visibleOnly: L.boolean.describe("Only visible elements (default false)").optional,
+    interactiveOnly: L.boolean.describe("Only interactive elements and their ancestors (default false)").optional,
     pierceShadow: L.boolean.describe("Pierce shadow DOM (default true)").optional,
     pierceFrames: L.boolean.describe("Pierce same-origin iframes (default true)").optional,
     compact: L.boolean.describe("Minimal output (default false)").optional,
@@ -3714,18 +3716,18 @@ Use ancestors:true to see parent elements when inspecting deep elements.`,
   examples: [
     {
       name: "overview",
-      input: { depth: 2 },
-      description: "Quick page overview"
+      input: { depth: 3 },
+      description: "Quick page overview (shallow)"
     },
     {
       name: "form-only",
-      input: { selector: "form", depth: -1 },
+      input: { selector: "form" },
       description: "Full form structure"
     },
     {
-      name: "visible-buttons",
-      input: { selector: "body", visibleOnly: true, depth: 4 },
-      description: "Find visible interactive elements"
+      name: "interactive",
+      input: { interactiveOnly: true },
+      description: "Only buttons, inputs, links, and their containers"
     },
     {
       name: "with-context",
@@ -3733,7 +3735,7 @@ Use ancestors:true to see parent elements when inspecting deep elements.`,
       description: "See element with parent context"
     }
   ],
-  hints: '-d 5 (deeper), --compact, "#selector" | see: inspect, query, click'
+  hints: "-d 3 (shallow), -i (interactive only), --visible, --compact | see: inspect, query, click"
 });
 var query = endpoint({
   path: "/query",
@@ -6326,34 +6328,12 @@ registerHandler(unhighlight, async (_body, ctx) => {
 registerHandler(navigate, async (body, ctx) => {
   const windowId = body.window || ctx.targetWindowId;
   const response = await ctx.requestFromBrowser("navigation", "goto", { url: body.url }, 5000, windowId);
-  if (!response.success) {
-    return Response.json(response, { headers: ctx.headers });
-  }
-  const reconnected = await ctx.waitForReconnect(windowId, 1e4);
-  if (!reconnected) {
-    return Response.json({
-      ...response,
-      success: false,
-      error: `Navigation sent but page did not reconnect within 10s. The page may have loaded without the Haltija widget.`
-    }, { headers: ctx.headers });
-  }
   return Response.json(response, { headers: ctx.headers });
 });
 registerHandler(refresh, async (body, ctx) => {
   const soft = body.soft ?? false;
   const windowId = body.window || ctx.targetWindowId;
   const response = await ctx.requestFromBrowser("navigation", "refresh", { soft }, 5000, windowId);
-  if (!response.success) {
-    return Response.json(response, { headers: ctx.headers });
-  }
-  const reconnected = await ctx.waitForReconnect(windowId, 8000);
-  if (!reconnected) {
-    return Response.json({
-      ...response,
-      success: false,
-      error: `Refresh sent but page did not reconnect within 8s. The page may have loaded without the Haltija widget.`
-    }, { headers: ctx.headers });
-  }
   return Response.json(response, { headers: ctx.headers });
 });
 registerHandler(tree, async (body, ctx) => {
@@ -6976,7 +6956,7 @@ async function wrapWithDeprecation(response, endpoint2) {
   }
 }
 var GET_DEFAULTS = {
-  "/tree": { selector: "body", depth: 5 },
+  "/tree": { selector: "body", depth: -1 },
   "/screenshot": {},
   "/click": {},
   "/type": {},
@@ -8310,12 +8290,12 @@ var createHandlerContext = (req, url) => {
     return recordings2.get(id);
   };
   const sessionFilteredRequest = async (channel, action, payload, timeoutMs, windowId) => {
-    if (sessionId && browsers.size === 0) {
+    if (sessionId && (browsers.size === 0 || windows2.size === 0)) {
       const waitStart = Date.now();
       while (Date.now() - waitStart < 5000) {
-        await new Promise((r) => setTimeout(r, 250));
-        if (browsers.size > 0)
+        if (browsers.size > 0 && windows2.size > 0)
           break;
+        await new Promise((r) => setTimeout(r, 250));
       }
     }
     const effectiveWindowId = windowId || targetWindowId;
@@ -8325,7 +8305,8 @@ var createHandlerContext = (req, url) => {
       return requestFromBrowser(channel, action, payload, timeoutMs, effectiveWindowId);
     }
     if (sessionId) {
-      const matching = Array.from(windows2.values()).filter((w) => w.session === sessionId).sort((a, b) => {
+      const allWins = Array.from(windows2.values());
+      const matching = allWins.filter((w) => w.session === sessionId).sort((a, b) => {
         if (a.id === focusedWindowId)
           return -1;
         if (b.id === focusedWindowId)
@@ -8336,8 +8317,22 @@ var createHandlerContext = (req, url) => {
         agentWindowAffinity.set(sessionId, matching[0].id);
         return requestFromBrowser(channel, action, payload, timeoutMs, matching[0].id);
       }
+      const distinctSessions = new Set(allWins.map((w) => w.session).filter(Boolean));
+      if (distinctSessions.size <= 1 && !isSecureMode) {
+        const best = allWins.sort((a, b) => {
+          if (a.id === focusedWindowId)
+            return -1;
+          if (b.id === focusedWindowId)
+            return 1;
+          return b.lastSeen - a.lastSeen;
+        })[0];
+        if (best) {
+          agentWindowAffinity.set(sessionId, best.id);
+          return requestFromBrowser(channel, action, payload, timeoutMs, best.id);
+        }
+      }
       if (windows2.size > 0) {
-        const anyWindow = Array.from(windows2.values())[0];
+        const anyWindow = allWins[0];
         try {
           const openResult = await requestFromBrowser("tabs", "open", { url: undefined, session: sessionId }, 5000, anyWindow.id);
           if (openResult.success) {
@@ -8353,8 +8348,7 @@ var createHandlerContext = (req, url) => {
           }
         } catch {}
       }
-      const allSessions = new Set(Array.from(windows2.values()).map((w) => w.session).filter(Boolean));
-      const hint = allSessions.size > 0 ? `Available sessions: ${[...allSessions].map((s) => s.slice(0, 8) + "\u2026").join(", ")}. Check the widget UI for the full token.` : "No widgets have session tokens. Connect a browser tab first.";
+      const hint = distinctSessions.size > 0 ? `Available sessions: ${[...distinctSessions].map((s) => s.slice(0, 8) + "\u2026").join(", ")}. Check the widget UI for the full token.` : "No widgets have session tokens. Connect a browser tab first.";
       return { id: "", success: false, error: `No windows in session ${sessionId.slice(0, 8)}\u2026. ${hint}`, timestamp: Date.now() };
     }
     if (isSecureMode) {
@@ -8362,26 +8356,6 @@ var createHandlerContext = (req, url) => {
     }
     return requestFromBrowser(channel, action, payload, timeoutMs);
   };
-  const waitForReconnect = async (windowId, timeoutMs = 8000) => {
-    const id = windowId || targetWindowId || focusedWindowId;
-    const prevBrowserId = id ? windows2.get(id)?.browserId : undefined;
-    const start = Date.now();
-    await new Promise((r) => setTimeout(r, 100));
-    while (Date.now() - start < timeoutMs) {
-      if (id) {
-        const w = windows2.get(id);
-        if (w && w.browserId !== prevBrowserId) {
-          await new Promise((r) => setTimeout(r, 300));
-          return true;
-        }
-      } else if (browsers.size > 0) {
-        await new Promise((r) => setTimeout(r, 300));
-        return true;
-      }
-      await new Promise((r) => setTimeout(r, 100));
-    }
-    return false;
-  };
   return {
     requestFromBrowser: sessionFilteredRequest,
     targetWindowId,
@@ -8390,7 +8364,6 @@ var createHandlerContext = (req, url) => {
     sessionId,
     getWindowInfo,
     updateSessionAffinity,
-    waitForReconnect,
     startRecordingSession,
     stopRecordingSession,
     getRecordingSession,
@@ -8623,7 +8596,10 @@ async function handleRest(req) {
     const reqSession = req.headers.get("X-Haltija-Session") || undefined;
     let allWindows = Array.from(windows2.values());
     if (reqSession) {
-      allWindows = allWindows.filter((w) => w.session === reqSession);
+      const distinctSessions = new Set(allWindows.map((w) => w.session).filter(Boolean));
+      if (distinctSessions.size > 1) {
+        allWindows = allWindows.filter((w) => w.session === reqSession);
+      }
     } else if (isSecureMode) {
       return Response.json({
         ok: windows2.size > 0,
@@ -10326,7 +10302,10 @@ Type 'help <topic>' for details.`);
     const reqSession = req.headers.get("X-Haltija-Session") || undefined;
     let allWindows = Array.from(windows2.values());
     if (reqSession) {
-      allWindows = allWindows.filter((w) => w.session === reqSession);
+      const distinctSessions = new Set(allWindows.map((w) => w.session).filter(Boolean));
+      if (distinctSessions.size > 1) {
+        allWindows = allWindows.filter((w) => w.session === reqSession);
+      }
     } else if (isSecureMode) {
       const totalWindows = windows2.size;
       return Response.json({

package/package.json

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