From 1c02dc243f8bf86bbe257807e97ca9e98c202d32 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 3 Nov 2025 09:30:11 -0500
Subject: [PATCH] fix: reconnect disconnect deriveds after batch processing

---
 .../src/internal/client/reactivity/batch.js   | 27 +++++++++++++++--
 .../async-derived-unowned/Component.svelte    |  6 ++++
 .../samples/async-derived-unowned/_config.js  | 30 +++++++++++++++++++
 .../samples/async-derived-unowned/main.svelte | 19 ++++++++++++
 4 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte

diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 27c90d770843..75d0c0b28032 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -15,7 +15,9 @@ import {
 	DERIVED,
 	BOUNDARY_EFFECT,
 	EAGER_EFFECT,
-	HEAD_EFFECT
+	HEAD_EFFECT,
+	DISCONNECTED,
+	UNOWNED
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
@@ -189,7 +191,28 @@ export class Batch {
 			this.#deferred?.resolve();
 		}
 
-		batch_values = null;
+		if (batch_values !== null) {
+			for (const value of batch_values.keys()) {
+				// reconnect any deriveds that were disconnected from the graph
+				if ((value.f & UNOWNED) !== 0) {
+					var derived = /** @type {Derived} */ (value);
+
+					if (derived.deps !== null) {
+						for (var i = 0; i < derived.deps.length; i++) {
+							var dep = /** @type {Value} */ (derived.deps[i]);
+
+							if (!dep?.reactions?.includes(derived)) {
+								(dep.reactions ??= []).push(derived);
+							}
+						}
+					}
+
+					derived.f ^= UNOWNED;
+				}
+			}
+
+			batch_values = null;
+		}
 	}
 
 	/**
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte
new file mode 100644
index 000000000000..36ad0dfaea28
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte
@@ -0,0 +1,6 @@
+<script>
+	let { double } = $props();
+	double; // forces derived into UNOWNED mode
+</script>
+
+<p>{double}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js
new file mode 100644
index 000000000000..fc0135623d7a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js
@@ -0,0 +1,30 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const button = target.querySelector('button');
+
+		button?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>1</button>
+				<p>2</p>
+			`
+		);
+
+		button?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>2</button>
+				<p>4</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte
new file mode 100644
index 000000000000..bd82e35a3bc3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	import Component from './Component.svelte';
+	let count = $state(0);
+	const double = $derived(count * 2);
+</script>
+
+<svelte:boundary>
+	{await new Promise((r) => {
+		// long enough for the test to do all its other stuff while this is pending
+		setTimeout(r, 10);
+	})}
+	{#snippet pending()}{/snippet}
+</svelte:boundary>
+
+<button onclick={() => count += 1}>{count}</button>
+
+{#if count > 0}
+	<Component {double} />
+{/if}