From f1f0e8f434083cdb3189b5dff24166a3a851ff6a Mon Sep 17 00:00:00 2001
From: "PC-JASPER\\jasper" <jasper@maris.nl>
Date: Fri, 4 Sep 2026 14:00:30 +0200
Subject: [PATCH 1/5] rename workbench -> query builder in saved queries

---
 src/routes/queries/saved/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/queries/saved/+page.svelte b/src/routes/queries/saved/+page.svelte
index 5762d45..d4cfe8f 100644
--- a/src/routes/queries/saved/+page.svelte
+++ b/src/routes/queries/saved/+page.svelte
@@ -163,10 +163,10 @@
 										size="sm"
 										variant="outline"
 										onclick={() => openInWorkbench(entry)}
-										title="Open in Query Workbench"
+										title="Open in Query Builder"
 									>
 										<WorkbenchIcon />
-										Workbench
+										Query Builder
 									</Button>
 									<Button
 										size="sm"

From 9931b02f4f50461564a5c26e4821055343b93921 Mon Sep 17 00:00:00 2001
From: "PC-JASPER\\jasper" <jasper@maris.nl>
Date: Fri, 4 Sep 2026 14:44:34 +0200
Subject: [PATCH 2/5] fix: update beacon instance status on add new instance

---
 src/lib/components/modals/AddBeaconModal.svelte | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/modals/AddBeaconModal.svelte b/src/lib/components/modals/AddBeaconModal.svelte
index e0d1f99..107f600 100644
--- a/src/lib/components/modals/AddBeaconModal.svelte
+++ b/src/lib/components/modals/AddBeaconModal.svelte
@@ -4,7 +4,7 @@
 	import { onMount } from 'svelte';
 	import type { BeaconInstance } from '@/beacon-api/types';
 	import { addInstance, updateInstance, removeInstance } from '@/services/beacon-instance';
-	import { testInstance } from '@/services/beacon-instance-connect';
+	import { checkInstance, testInstance } from '@/services/beacon-instance-connect';
 	import Button from '$lib/components/buttons/Button.svelte';
 	import { Utils } from '@/utils';
 	import SaveIcon from '@lucide/svelte/icons/save';
@@ -95,6 +95,10 @@
 			addInstance(values);
 		}
 
+		// The table shows this instance right away. Without this, its status stays
+		// "unknown" until the next sweep or page reload.
+		void checkInstance({ url, token });
+
 		onSave();
 	}
 

From 79f43f79263ac46e20f66b8a4d00066e7adf71f7 Mon Sep 17 00:00:00 2001
From: "PC-JASPER\\jasper" <jasper@maris.nl>
Date: Fri, 4 Sep 2026 15:01:29 +0200
Subject: [PATCH 3/5] auto scroll to selected query block on page change

---
 .../query-builder/QueryBuilderSelectorBlock.svelte | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte b/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
index 2ad6e3b..ad6878c 100644
--- a/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
+++ b/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
@@ -137,11 +137,21 @@ add new query blocks, duplicate blocks, close clocks, select active blocks
 		});
 	}
 
+	let rowEl: HTMLDivElement | undefined = $state();
+
+	// Keep the active block fully in view, including right after a page load/reload.
+	$effect(() => {
+		const activeId = workspace.activeBlockId;
+		if (!rowEl || !activeId) return;
+
+		const activeEl = rowEl.querySelector<HTMLElement>(`[data-block-id="${CSS.escape(activeId)}"]`);
+		activeEl?.scrollIntoView({ block: 'nearest', inline: 'nearest'});
+	});
 
 </script>
 
 <div class="query-blocks">
-	<div class="query-blocks-row" onwheel={handleQueryBlocksWheel}>
+	<div class="query-blocks-row" bind:this={rowEl} onwheel={handleQueryBlocksWheel}>
 		{#each workspace.blocks as block (block.id)}
 			<!-- Derive display data for this block from the workspace. -->
 			{@const status = QueryWorkspace.getStatus(block)}
@@ -156,7 +166,7 @@ add new query blocks, duplicate blocks, close clocks, select active blocks
 			{@const missingUrl = workspace.missingInstanceUrlFor(block)}
 			{@const blockReason = blockReasonFor(block)}
 			<div
-				
+				data-block-id={block.id}
 				class="query-block-wrapper"
 				class:query-block-wrapper--active={block.id === workspace.activeBlockId}
 				role="button"

From dd27320f33a1b14b612378ddf23c3f69d9890d90 Mon Sep 17 00:00:00 2001
From: "PC-JASPER\\jasper" <jasper@maris.nl>
Date: Fri, 4 Sep 2026 15:15:53 +0200
Subject: [PATCH 4/5] fix: recalc query blocks scroll value on resize parent

---
 .../QueryBuilderSelectorBlock.svelte          | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte b/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
index ad6878c..6da1475 100644
--- a/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
+++ b/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
@@ -139,13 +139,29 @@ add new query blocks, duplicate blocks, close clocks, select active blocks
 
 	let rowEl: HTMLDivElement | undefined = $state();
 
-	// Keep the active block fully in view, including right after a page load/reload.
-	$effect(() => {
+	function scrollActiveBlockIntoView(): void {
 		const activeId = workspace.activeBlockId;
 		if (!rowEl || !activeId) return;
 
 		const activeEl = rowEl.querySelector<HTMLElement>(`[data-block-id="${CSS.escape(activeId)}"]`);
-		activeEl?.scrollIntoView({ block: 'nearest', inline: 'nearest'});
+		activeEl?.scrollIntoView({ block: 'nearest', inline: 'nearest' });
+	}
+
+	// Keep the active block fully in view, including right after a page load/reload.
+	$effect(() => {
+		scrollActiveBlockIntoView();
+	});
+
+	// Re-correct on width changes, e.g. the page scrollbar appearing/disappearing
+	// shrinks this row without changing activeBlockId, which would otherwise leave
+	// an edge block clipped.
+	$effect(() => {
+		if (!rowEl) return;
+
+		const observer = new ResizeObserver(() => scrollActiveBlockIntoView());
+		observer.observe(rowEl);
+
+		return () => observer.disconnect();
 	});
 
 </script>

From 99ca9790a6c35a916e727ba4083163bb1eae8a03 Mon Sep 17 00:00:00 2001
From: "PC-JASPER\\jasper" <jasper@maris.nl>
Date: Fri, 4 Sep 2026 15:47:31 +0200
Subject: [PATCH 5/5] thin scrollbar for query blocks

---
 .../components/query-builder/QueryBuilderSelectorBlock.svelte    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte b/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
index 6da1475..9488f20 100644
--- a/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
+++ b/src/lib/components/query-builder/QueryBuilderSelectorBlock.svelte
@@ -432,6 +432,7 @@ add new query blocks, duplicate blocks, close clocks, select active blocks
 			overflow-x: auto;
 			overflow-y: hidden;
 			padding-bottom: 0.25rem;
+			scrollbar-width: thin;
 		}
 	}