@effect-app/vue 4.0.0-beta.312 → 4.0.0-beta.313

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @effect-app/vue
 
+## 4.0.0-beta.313
+
+### Minor Changes
+
+- eddda2e: Invalidate only mounted queries (TanStack `refetchType: "active"`). Idle `gcTime` entries are marked stale and refetch on remount. `invalidateAndAwait` still waits for observed refetches to finish.
+
+### Patch Changes
+
+- effect-app@4.0.0-beta.313
+
 ## 4.0.0-beta.312
 
 ### Patch Changes

package/dist/atomQuery.d.ts

@@ -9,7 +9,7 @@ import * as Atom from "effect/unstable/reactivity/Atom";
 import * as AtomRegistry from "effect/unstable/reactivity/AtomRegistry";
 import { type QueryInvalidationMode } from "./dependencyMetadata.js";
 import { type LiveQueryOptions } from "./liveQueryInvalidation.js";
-/** Refresh registered query atoms without making the triggering mutation await them. */
+/** Refresh observed query atoms without making the triggering mutation await them. */
 export declare const invalidateSoft: (keys: ReadonlyArray<unknown>) => Effect.Effect<void>;
 /**
  * Invalidate the given keys and AWAIT the result. `keyAtoms` resolves all matching hierarchical
@@ -17,9 +17,10 @@ export declare const invalidateSoft: (keys: ReadonlyArray<unknown>) => Effect.Ef
  * through `Reactivity.invalidate` invokes one atom's registered callback once per matching key,
  * repeatedly superseding the same fetch when a mutation carries many row/prefix keys.
  *
- * Resolves once the affected queries have settled, so a mutation can `yield*` this and know the
- * affected queries are fresh. (The await reads via the module-global default registry — the one the
- * vue composables resolve via `injectRegistry`'s fallback.)
+ * Resolves once every **observed** matching query has settled, so a mutation can
+ * `yield*` this and know the on-screen data is fresh. Idle (observers === 0)
+ * matches are only marked stale — they do not block the mutation. Soft
+ * invalidation (`invalidateSoft`) still fires without awaiting.
  */
 export declare const invalidateAndAwait: (keys: ReadonlyArray<unknown>) => Effect.Effect<void>;
 /**

package/dist/atomQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atomQuery.d.ts","sourceRoot":"","sources":["../src/atomQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"atomQuery.d.ts","sourceRoot":"","sources":["../src/atomQuery.ts"],"names":[],"mappings":"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"}

package/dist/atomQuery.js

@@ -32,6 +32,7 @@ import * as AtomRegistry from "effect/unstable/reactivity/AtomRegistry";
 import { clearQueryReadDependencies, getQueryReadDependencies, registerQueryInvalidationMode, setQueryReadDependencies } from "./dependencyMetadata.js";
 import { reportRuntimeError } from "./lib.js";
 import { beginLiveQueryFetch, endLiveQueryFetch, registerLiveQuery } from "./liveQueryInvalidation.js";
+import { atomsToRefetch, observeQueryAtom } from "./queryLifetime.js";
 /** All non-empty prefixes of a key, longest last. `[a,b,c]` -> `[[a],[a,b],[a,b,c]]`. */
 const prefixesOf = (key) => key.map((_, i) => key.slice(0, i + 1));
 const uniqueKeys = (keys) => {
@@ -47,9 +48,10 @@ const uniqueKeys = (keys) => {
     return out;
 };
 // --- awaitable invalidation -------------------------------------------------------------------
-// keyHash -> live query atoms registered under that key. A query atom is tracked while it is alive
-// in the registry (mounted OR cached within idle-ttl) and removed on GC, so invalidation reaches
-// cached-but-unmounted queries too (e.g. a list you navigated away from).
+// keyHash -> query atoms registered under that key. A query atom stays in the map while it is
+// alive in the registry (mounted OR cached within idle-ttl). Invalidation *marks* every matching
+// atom stale; it only *refetches* atoms that currently have observers (TanStack refetchType:
+// "active"). Idle cache entries refetch on the next mount.
 const keyAtoms = new Map();
 const trackByKeys = (keys) => (atom) => Atom.transform(atom, (get) => {
     for (const key of keys) {
@@ -98,10 +100,10 @@ const atomsForKeys = (keys) => {
     }
     return [...atoms];
 };
-/** Refresh registered query atoms without making the triggering mutation await them. */
+/** Refresh observed query atoms without making the triggering mutation await them. */
 export const invalidateSoft = (keys) => Effect
     .gen(function* () {
-    const atoms = atomsForKeys(keys);
+    const atoms = atomsToRefetch(atomsForKeys(keys));
     yield* Effect.forEach(atoms, captureAtomQueryParentSpan, { discard: true, concurrency: "unbounded" });
     if (atoms.length === 0)
         return;
@@ -116,19 +118,21 @@ export const invalidateSoft = (keys) => Effect
  * through `Reactivity.invalidate` invokes one atom's registered callback once per matching key,
  * repeatedly superseding the same fetch when a mutation carries many row/prefix keys.
  *
- * Resolves once the affected queries have settled, so a mutation can `yield*` this and know the
- * affected queries are fresh. (The await reads via the module-global default registry — the one the
- * vue composables resolve via `injectRegistry`'s fallback.)
+ * Resolves once every **observed** matching query has settled, so a mutation can
+ * `yield*` this and know the on-screen data is fresh. Idle (observers === 0)
+ * matches are only marked stale — they do not block the mutation. Soft
+ * invalidation (`invalidateSoft`) still fires without awaiting.
  */
 export const invalidateAndAwait = (keys) => Effect
     .gen(function* () {
-    const atoms = atomsForKeys(keys);
+    const atoms = atomsToRefetch(atomsForKeys(keys));
     yield* Effect.forEach(atoms, captureAtomQueryParentSpan, { discard: true, concurrency: "unbounded" });
     if (atoms.length === 0)
         return;
     yield* Effect.forEach(atoms, (atom) => Effect.sync(() => defaultRegistry.refresh(atom)), {
         discard: true
     });
+    // Contract: observers > 0 ⇒ wait for this refresh to finish.
     yield* Effect.forEach(atoms, (a) => awaitAtomResult(defaultRegistry, a).pipe(Effect.exit));
 })
     .pipe(Effect.orDie);
@@ -390,7 +394,8 @@ export const buildQueryFamily = (rt, self) => {
         atom = trackByKeys(reactivityKeys)(atom);
         atom = trackReadDependencies(fullKey, () => lastReads)(atom);
         // gcTime LAST so the whole chain (incl. the registration + tracking) stays alive through the
-        // idle window, letting invalidation reach a cached-but-unmounted query.
+        // idle window. Invalidation still finds the cached atom and marks it stale; it does not
+        // refetch until an observer remounts (TanStack refetchType: "active").
         atom = Atom.setIdleTTL(atom, defaults.gcTime);
         const registered = setAtomQueryMetadata(Atom.withLabel(`query:${self.id}`)(atom));
         const writable = Atom.writable((get) => {
@@ -401,9 +406,12 @@ export const buildQueryFamily = (rt, self) => {
         const writableWithTarget = Object.assign(writable, { initialValueTarget: registered });
         const result = setAtomQueryMetadata(Atom.withLabel(`query-cache:${self.id}`)(writableWithTarget));
         // Key the fetch state by the atom `withQueryOptions` receives, so its mount hook can find it.
+        const observed = observeQueryAtom(result);
         queryFetchStates.set(result, fetchState);
+        queryFetchStates.set(observed, fetchState);
         atomQueryKeys.set(result, fullKey);
-        return result;
+        atomQueryKeys.set(observed, fullKey);
+        return observed;
     });
 };
 export const buildStreamQueryFamily = (rt, self) => {
@@ -418,9 +426,9 @@ export const buildStreamQueryFamily = (rt, self) => {
         atom = rt.factory.withReactivity(reactivityKeys)(atom);
         atom = trackWritableByKeys(reactivityKeys)(atom);
         atom = Atom.setIdleTTL(atom, defaults.gcTime);
-        return setAtomQueryMetadata(Atom.withLabel(`stream-query:${self.id}`)(atom));
+        return observeQueryAtom(setAtomQueryMetadata(Atom.withLabel(`stream-query:${self.id}`)(atom)));
     });
 };
 /** Await the first resolved (non-Waiting) result of an atom. Failing query results fail the Effect. */
 export const awaitAtomResult = (registry, atom) => AtomRegistry.getResult(registry, atom, { suspendOnWaiting: true });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"atomQuery.js","sourceRoot":"","sources":["../src/atomQuery.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"atomQuery.js","sourceRoot":"","sources":["../src/atomQuery.ts"],"names":[],"mappings":"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"}

package/dist/queryLifetime.d.ts

@@ -0,0 +1,25 @@
+import type * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
+import * as Atom from "effect/unstable/reactivity/Atom";
+/**
+ * Per-query observer count + invalidation flag. Lives on the family atom so
+ * invalidate can mark stale and refetch only when someone is looking
+ * (TanStack refetchType: "active").
+ */
+export interface QueryLifetime {
+    observers: number;
+    invalidated: boolean;
+}
+export declare const queryLifetimeOf: (atom: Atom.Atom<any>) => QueryLifetime | undefined;
+export declare const attachQueryLifetime: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => QueryLifetime;
+/**
+ * Count this subscription as an observer of `family`. On remount, consume a
+ * pending invalidation and refresh the family atom.
+ */
+export declare const observeQueryAtom: <A, E>(family: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
+/**
+ * Idle queries with a lifetime are marked stale. Queries that still have
+ * observers (or have no lifetime, e.g. ad-hoc registry mounts of a raw
+ * effect atom) are refetched now.
+ */
+export declare const atomsToRefetch: <A, E>(atoms: ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<A, E>>>) => ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<A, E>>>;
+//# sourceMappingURL=queryLifetime.d.ts.map

package/dist/queryLifetime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryLifetime.d.ts","sourceRoot":"","sources":["../src/queryLifetime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,WAAW,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,IAAI,MAAM,iCAAiC,CAAA;AAEvD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,OAAO,CAAA;CACrB;AAYD,eAAO,MAAM,eAAe,SAAU,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAG,aAAa,GAAG,SACnB,CAAA;AAEpD,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,CAAC,QAChC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAC7C,aAOF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,EAAE,CAAC,UAC3B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAC/C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAazC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,EAAE,CAAC,SAC1B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAC7D,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAQxD,CAAA"}

package/dist/queryLifetime.js

@@ -0,0 +1,54 @@
+import * as Atom from "effect/unstable/reactivity/Atom";
+const lifetimes = new WeakMap();
+const rootOf = (atom) => {
+    let target = atom;
+    while (target.initialValueTarget !== undefined) {
+        target = target.initialValueTarget;
+    }
+    return target;
+};
+export const queryLifetimeOf = (atom) => lifetimes.get(rootOf(atom)) ?? lifetimes.get(atom);
+export const attachQueryLifetime = (atom) => {
+    const existing = queryLifetimeOf(atom);
+    if (existing !== undefined)
+        return existing;
+    const created = { observers: 0, invalidated: false };
+    lifetimes.set(rootOf(atom), created);
+    lifetimes.set(atom, created);
+    return created;
+};
+/**
+ * Count this subscription as an observer of `family`. On remount, consume a
+ * pending invalidation and refresh the family atom.
+ */
+export const observeQueryAtom = (family) => {
+    const life = attachQueryLifetime(family);
+    return Atom.transform(family, (get) => {
+        life.observers++;
+        get.addFinalizer(() => {
+            life.observers = Math.max(0, life.observers - 1);
+        });
+        if (life.invalidated) {
+            life.invalidated = false;
+            get.refresh(family);
+        }
+        return get(family);
+    }, { initialValueTarget: family });
+};
+/**
+ * Idle queries with a lifetime are marked stale. Queries that still have
+ * observers (or have no lifetime, e.g. ad-hoc registry mounts of a raw
+ * effect atom) are refetched now.
+ */
+export const atomsToRefetch = (atoms) => {
+    const active = [];
+    for (const atom of atoms) {
+        const life = queryLifetimeOf(atom);
+        if (life === undefined || life.observers > 0)
+            active.push(atom);
+        else
+            life.invalidated = true;
+    }
+    return active;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnlMaWZldGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9xdWVyeUxpZmV0aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxJQUFJLE1BQU0saUNBQWlDLENBQUE7QUFZdkQsTUFBTSxTQUFTLEdBQUcsSUFBSSxPQUFPLEVBQWlDLENBQUE7QUFFOUQsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFvQixFQUFrQixFQUFFO0lBQ3RELElBQUksTUFBTSxHQUFHLElBQUksQ0FBQTtJQUNqQixPQUFPLE1BQU0sQ0FBQyxrQkFBa0IsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUMvQyxNQUFNLEdBQUcsTUFBTSxDQUFDLGtCQUFrQixDQUFBO0lBQ3BDLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxDQUFDLElBQW9CLEVBQTZCLEVBQUUsQ0FDakYsU0FBUyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO0FBRXBELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQ2pDLElBQThDLEVBQy9CLEVBQUU7SUFDakIsTUFBTSxRQUFRLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3RDLElBQUksUUFBUSxLQUFLLFNBQVM7UUFBRSxPQUFPLFFBQVEsQ0FBQTtJQUMzQyxNQUFNLE9BQU8sR0FBa0IsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsQ0FBQTtJQUNuRSxTQUFTLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUNwQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUM1QixPQUFPLE9BQU8sQ0FBQTtBQUNoQixDQUFDLENBQUE7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxDQUM5QixNQUFnRCxFQUNOLEVBQUU7SUFDNUMsTUFBTSxJQUFJLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDeEMsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQ3BDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQTtRQUNoQixHQUFHLENBQUMsWUFBWSxDQUFDLEdBQUcsRUFBRTtZQUNwQixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUE7UUFDbEQsQ0FBQyxDQUFDLENBQUE7UUFDRixJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNyQixJQUFJLENBQUMsV0FBVyxHQUFHLEtBQUssQ0FBQTtZQUN4QixHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQ3JCLENBQUM7UUFDRCxPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNwQixDQUFDLEVBQUUsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO0FBQ3BDLENBQUMsQ0FBQTtBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsQ0FDNUIsS0FBOEQsRUFDTCxFQUFFO0lBQzNELE1BQU0sTUFBTSxHQUFvRCxFQUFFLENBQUE7SUFDbEUsS0FBSyxNQUFNLElBQUksSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUN6QixNQUFNLElBQUksR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDbEMsSUFBSSxJQUFJLEtBQUssU0FBUyxJQUFJLElBQUksQ0FBQyxTQUFTLEdBQUcsQ0FBQztZQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7O1lBQzFELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFBO0lBQzlCLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQSJ9

package/docs/query-key-invalidation.md

@@ -95,9 +95,10 @@ The await-tracking map (`keyAtoms` in `atomQuery.ts`) keys on the same `Hash.has
 3. **O(depth) registrations per live query** (depth+1 prefixes, in both the reactivity
    handler map and `keyAtoms`). Negligible at typical depths of 2-4.
 4. **Reaches only "alive" atoms** (mounted, or cached within `idleTTL`). `setIdleTTL` is
-   applied last in the atom chain so cached-but-unmounted queries stay registered and are
-   still hit; a query GC'd past idle TTL is gone and refetches fresh on next mount anyway —
-   matching TanStack `gcTime` semantics.
+   applied last in the atom chain so cached-but-unmounted queries stay registered.
+   Invalidation **marks** those idle entries stale (TanStack `refetchType: "active"`) and
+   **awaits** the refetch of any atom that still has observers. A query GC'd past idle TTL
+   is gone and refetches fresh on next mount — matching TanStack `gcTime` semantics.
 
 ## Verdict
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "4.0.0-beta.312",
+  "version": "4.0.0-beta.313",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -15,7 +15,7 @@
     "@vueuse/core": "^14.3.0",
     "change-case": "^5.4.4",
     "query-string": "^9.4.0",
-    "effect-app": "4.0.0-beta.312"
+    "effect-app": "4.0.0-beta.313"
   },
   "peerDependencies": {
     "@effect/atom-vue": "^4.0.0-beta.107",

package/src/atomQuery.ts

@@ -35,6 +35,7 @@ import * as AtomRegistry from "effect/unstable/reactivity/AtomRegistry"
 import { clearQueryReadDependencies, getQueryReadDependencies, type QueryInvalidationMode, registerQueryInvalidationMode, setQueryReadDependencies } from "./dependencyMetadata.ts"
 import { reportRuntimeError } from "./lib.ts"
 import { beginLiveQueryFetch, endLiveQueryFetch, type LiveQueryOptions, registerLiveQuery } from "./liveQueryInvalidation.ts"
+import { atomsToRefetch, observeQueryAtom } from "./queryLifetime.ts"
 
 /** All non-empty prefixes of a key, longest last. `[a,b,c]` -> `[[a],[a,b],[a,b,c]]`. */
 const prefixesOf = (key: ReadonlyArray<unknown>): ReadonlyArray<ReadonlyArray<unknown>> =>
@@ -53,9 +54,10 @@ const uniqueKeys = (keys: ReadonlyArray<ReadonlyArray<unknown>>): ReadonlyArray<
 }
 
 // --- awaitable invalidation -------------------------------------------------------------------
-// keyHash -> live query atoms registered under that key. A query atom is tracked while it is alive
-// in the registry (mounted OR cached within idle-ttl) and removed on GC, so invalidation reaches
-// cached-but-unmounted queries too (e.g. a list you navigated away from).
+// keyHash -> query atoms registered under that key. A query atom stays in the map while it is
+// alive in the registry (mounted OR cached within idle-ttl). Invalidation *marks* every matching
+// atom stale; it only *refetches* atoms that currently have observers (TanStack refetchType:
+// "active"). Idle cache entries refetch on the next mount.
 const keyAtoms = new Map<number, Set<Atom.Atom<AsyncResult.AsyncResult<any, any>>>>()
 
 const trackByKeys =
@@ -115,11 +117,11 @@ const atomsForKeys = (keys: ReadonlyArray<unknown>): ReadonlyArray<Atom.Atom<Asy
   return [...atoms]
 }
 
-/** Refresh registered query atoms without making the triggering mutation await them. */
+/** Refresh observed query atoms without making the triggering mutation await them. */
 export const invalidateSoft = (keys: ReadonlyArray<unknown>): Effect.Effect<void> =>
   Effect
     .gen(function*() {
-      const atoms = atomsForKeys(keys)
+      const atoms = atomsToRefetch(atomsForKeys(keys))
       yield* Effect.forEach(atoms, captureAtomQueryParentSpan, { discard: true, concurrency: "unbounded" })
       if (atoms.length === 0) return
       yield* Effect.forEach(atoms, (atom) => Effect.sync(() => defaultRegistry.refresh(atom)), {
@@ -134,19 +136,21 @@ export const invalidateSoft = (keys: ReadonlyArray<unknown>): Effect.Effect<void
  * through `Reactivity.invalidate` invokes one atom's registered callback once per matching key,
  * repeatedly superseding the same fetch when a mutation carries many row/prefix keys.
  *
- * Resolves once the affected queries have settled, so a mutation can `yield*` this and know the
- * affected queries are fresh. (The await reads via the module-global default registry — the one the
- * vue composables resolve via `injectRegistry`'s fallback.)
+ * Resolves once every **observed** matching query has settled, so a mutation can
+ * `yield*` this and know the on-screen data is fresh. Idle (observers === 0)
+ * matches are only marked stale — they do not block the mutation. Soft
+ * invalidation (`invalidateSoft`) still fires without awaiting.
  */
 export const invalidateAndAwait = (keys: ReadonlyArray<unknown>): Effect.Effect<void> =>
   Effect
     .gen(function*() {
-      const atoms = atomsForKeys(keys)
+      const atoms = atomsToRefetch(atomsForKeys(keys))
       yield* Effect.forEach(atoms, captureAtomQueryParentSpan, { discard: true, concurrency: "unbounded" })
       if (atoms.length === 0) return
       yield* Effect.forEach(atoms, (atom) => Effect.sync(() => defaultRegistry.refresh(atom)), {
         discard: true
       })
+      // Contract: observers > 0 ⇒ wait for this refresh to finish.
       yield* Effect.forEach(atoms, (a) => awaitAtomResult(defaultRegistry, a).pipe(Effect.exit))
     })
     .pipe(Effect.orDie)
@@ -535,7 +539,8 @@ export const buildQueryFamily = <I, A, E>(
     atom = trackByKeys(reactivityKeys)(atom)
     atom = trackReadDependencies(fullKey, () => lastReads)(atom)
     // gcTime LAST so the whole chain (incl. the registration + tracking) stays alive through the
-    // idle window, letting invalidation reach a cached-but-unmounted query.
+    // idle window. Invalidation still finds the cached atom and marks it stale; it does not
+    // refetch until an observer remounts (TanStack refetchType: "active").
     atom = Atom.setIdleTTL(atom, defaults.gcTime)
     const registered = setAtomQueryMetadata(Atom.withLabel(`query:${self.id}`)(atom))
     const writable = Atom.writable(
@@ -550,9 +555,12 @@ export const buildQueryFamily = <I, A, E>(
     const writableWithTarget = Object.assign(writable, { initialValueTarget: registered })
     const result = setAtomQueryMetadata(Atom.withLabel(`query-cache:${self.id}`)(writableWithTarget))
     // Key the fetch state by the atom `withQueryOptions` receives, so its mount hook can find it.
+    const observed = observeQueryAtom(result)
     queryFetchStates.set(result, fetchState)
+    queryFetchStates.set(observed, fetchState)
     atomQueryKeys.set(result, fullKey)
-    return result
+    atomQueryKeys.set(observed, fullKey)
+    return observed
   })
 }
 
@@ -581,7 +589,7 @@ export const buildStreamQueryFamily = <I, A, E>(
     atom = rt.factory.withReactivity(reactivityKeys)(atom)
     atom = trackWritableByKeys(reactivityKeys)(atom)
     atom = Atom.setIdleTTL(atom, defaults.gcTime)
-    return setAtomQueryMetadata(Atom.withLabel(`stream-query:${self.id}`)(atom))
+    return observeQueryAtom(setAtomQueryMetadata(Atom.withLabel(`stream-query:${self.id}`)(atom)))
   })
 }
 

package/src/queryLifetime.ts

@@ -0,0 +1,74 @@
+import type * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
+import * as Atom from "effect/unstable/reactivity/Atom"
+
+/**
+ * Per-query observer count + invalidation flag. Lives on the family atom so
+ * invalidate can mark stale and refetch only when someone is looking
+ * (TanStack refetchType: "active").
+ */
+export interface QueryLifetime {
+  observers: number
+  invalidated: boolean
+}
+
+const lifetimes = new WeakMap<Atom.Atom<any>, QueryLifetime>()
+
+const rootOf = (atom: Atom.Atom<any>): Atom.Atom<any> => {
+  let target = atom
+  while (target.initialValueTarget !== undefined) {
+    target = target.initialValueTarget
+  }
+  return target
+}
+
+export const queryLifetimeOf = (atom: Atom.Atom<any>): QueryLifetime | undefined =>
+  lifetimes.get(rootOf(atom)) ?? lifetimes.get(atom)
+
+export const attachQueryLifetime = <A, E>(
+  atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>
+): QueryLifetime => {
+  const existing = queryLifetimeOf(atom)
+  if (existing !== undefined) return existing
+  const created: QueryLifetime = { observers: 0, invalidated: false }
+  lifetimes.set(rootOf(atom), created)
+  lifetimes.set(atom, created)
+  return created
+}
+
+/**
+ * Count this subscription as an observer of `family`. On remount, consume a
+ * pending invalidation and refresh the family atom.
+ */
+export const observeQueryAtom = <A, E>(
+  family: Atom.Atom<AsyncResult.AsyncResult<A, E>>
+): Atom.Atom<AsyncResult.AsyncResult<A, E>> => {
+  const life = attachQueryLifetime(family)
+  return Atom.transform(family, (get) => {
+    life.observers++
+    get.addFinalizer(() => {
+      life.observers = Math.max(0, life.observers - 1)
+    })
+    if (life.invalidated) {
+      life.invalidated = false
+      get.refresh(family)
+    }
+    return get(family)
+  }, { initialValueTarget: family })
+}
+
+/**
+ * Idle queries with a lifetime are marked stale. Queries that still have
+ * observers (or have no lifetime, e.g. ad-hoc registry mounts of a raw
+ * effect atom) are refetched now.
+ */
+export const atomsToRefetch = <A, E>(
+  atoms: ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<A, E>>>
+): ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<A, E>>> => {
+  const active: Array<Atom.Atom<AsyncResult.AsyncResult<A, E>>> = []
+  for (const atom of atoms) {
+    const life = queryLifetimeOf(atom)
+    if (life === undefined || life.observers > 0) active.push(atom)
+    else life.invalidated = true
+  }
+  return active
+}

package/test/dist/inactiveInvalidation.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inactiveInvalidation.test.d.ts","sourceRoot":"","sources":["../inactiveInvalidation.test.ts"],"names":[],"mappings":""}

package/test/inactiveInvalidation.test.ts

@@ -0,0 +1,172 @@
+import { defaultRegistry, registryKey } from "@effect/atom-vue"
+import { DataDependencies, makeQueryKey } from "effect-app/client"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Option from "effect-app/Option"
+import * as Latch from "effect/Latch"
+import * as Layer from "effect/Layer"
+import * as ManagedRuntime from "effect/ManagedRuntime"
+import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
+import * as Reactivity from "effect/unstable/reactivity/Reactivity"
+import { describe, expect, it } from "vitest"
+import { createApp, nextTick } from "vue"
+import { buildQueryFamily, invalidateAndAwait, makeAtomClientRuntime, withQueryOptions } from "../src/atomQuery.js"
+import { useAtomSuspense } from "../src/query.js"
+
+const tick = () => new Promise((resolve) => setTimeout(resolve, 0))
+const ticks = async (n: number) => {
+  for (let i = 0; i < n; i++) {
+    await nextTick()
+    await tick()
+  }
+}
+
+const makeEnv = () => {
+  const mrt = ManagedRuntime.make(Reactivity.layer)
+  const baseContext = mrt.runSync(Effect.context<Reactivity.Reactivity>())
+  const reactivity = Context.get(baseContext, Reactivity.Reactivity)
+  const rt = makeAtomClientRuntime(
+    () => Layer.succeedContext(baseContext) as Layer.Layer<any, never, never>,
+    mrt.memoMap
+  )
+  return {
+    rt,
+    invalidate: (keys: ReadonlyArray<ReadonlyArray<unknown>>) =>
+      invalidateAndAwait(keys).pipe(Effect.provideService(Reactivity.Reactivity, reactivity))
+  }
+}
+
+const makeCounted = (id: string, repo: DataDependencies.DataDependency) => {
+  let starts = 0
+  const self = {
+    id,
+    handler: () =>
+      Effect.gen(function*() {
+        yield* DataDependencies.read(repo)
+        return ++starts
+      })
+  }
+  return { self, starts: () => starts }
+}
+
+const result = (atom: any): AsyncResult.AsyncResult<number, never> => defaultRegistry.get(atom)
+const served = (atom: any): number | undefined => Option.getOrUndefined(AsyncResult.value(result(atom)))
+
+const queryAtom = (rt: any, self: any) =>
+  withQueryOptions(buildQueryFamily(rt, self)(undefined), { gcTime: "infinity", revalidateOnFocus: false })
+
+const mountSuspense = (atom: any) => {
+  let promise: Promise<any> | undefined
+  const host = document.createElement("div")
+  const app = createApp({
+    setup() {
+      promise = useAtomSuspense(() => atom)
+      return () => null
+    }
+  })
+  app.provide(registryKey, defaultRegistry)
+  app.mount(host)
+  return { app, getPromise: () => promise }
+}
+
+const settle = (p: Promise<any> | undefined) =>
+  Promise.race([
+    Promise.resolve(p).then(() => "resolved" as const, () => "rejected" as const),
+    new Promise<"pending">((resolve) => setTimeout(() => resolve("pending"), 40))
+  ])
+
+const fullKeyOf = (self: { id: string }) => [...makeQueryKey(self), undefined]
+
+describe("inactive invalidation (refetchType: active)", () => {
+  it("does not refetch an unmounted query; remount does", async () => {
+    defaultRegistry.reset()
+    const { rt, invalidate } = makeEnv()
+    const repo = DataDependencies.repo("IdleRepo")
+    const g = makeCounted("Idle.List", repo)
+    const atom = queryAtom(rt, g.self)
+
+    const m1 = mountSuspense(atom)
+    await settle(m1.getPromise())
+    await ticks(2)
+    expect(served(atom)).toBe(1)
+
+    m1.app.unmount()
+    await ticks(2)
+
+    await Effect.runPromise(invalidate([fullKeyOf(g.self)]))
+    await ticks(2)
+    expect(g.starts()).toBe(1)
+
+    const m2 = mountSuspense(atom)
+    await settle(m2.getPromise())
+    await ticks(2)
+    expect(g.starts()).toBeGreaterThanOrEqual(2)
+    expect(served(atom)).not.toBe(1)
+    m2.app.unmount()
+    defaultRegistry.reset()
+  })
+
+  it("still refetches a mounted query immediately", async () => {
+    defaultRegistry.reset()
+    const { rt, invalidate } = makeEnv()
+    const repo = DataDependencies.repo("ActiveRepo")
+    const g = makeCounted("Active.List", repo)
+    const atom = queryAtom(rt, g.self)
+
+    const mounted = mountSuspense(atom)
+    await settle(mounted.getPromise())
+    await ticks(2)
+    expect(g.starts()).toBe(1)
+
+    await Effect.runPromise(invalidate([fullKeyOf(g.self)]))
+    await ticks(2)
+    expect(g.starts()).toBeGreaterThanOrEqual(2)
+    mounted.app.unmount()
+    defaultRegistry.reset()
+  })
+
+  it("waits for a mounted refetch to finish before invalidateAndAwait resolves", async () => {
+    defaultRegistry.reset()
+    const { rt, invalidate } = makeEnv()
+    const repo = DataDependencies.repo("AwaitRepo")
+    let starts = 0
+    let completes = 0
+    const latches: Array<Latch.Latch> = []
+    const self = {
+      id: "Await.List",
+      handler: () =>
+        Effect.gen(function*() {
+          yield* DataDependencies.read(repo)
+          const n = ++starts
+          if (n > 1) {
+            const latch = Latch.makeUnsafe(false)
+            latches.push(latch)
+            yield* latch.await
+          }
+          completes++
+          return n
+        })
+    }
+    const atom = queryAtom(rt, self)
+
+    const mounted = mountSuspense(atom)
+    await settle(mounted.getPromise())
+    await ticks(2)
+    expect(completes).toBe(1)
+
+    let settled = false
+    const waiting = Effect.runPromise(invalidate([fullKeyOf(self)])).then(() => {
+      settled = true
+    })
+    await ticks(4)
+    expect(starts).toBeGreaterThanOrEqual(2)
+    expect(settled, "must not resolve while the mounted refetch is in flight").toBe(false)
+
+    latches.splice(0).forEach((latch) => latch.openUnsafe())
+    await waiting
+    expect(settled).toBe(true)
+    expect(completes).toBeGreaterThanOrEqual(2)
+    mounted.app.unmount()
+    defaultRegistry.reset()
+  })
+})

package/test/interrupt-refetch-repro.test.ts

@@ -225,12 +225,12 @@ it("B1 — mutation fiber interrupted while its onExit invalidation-refetch runs
   const atom = buildQueryFamily(rt as any, g.self as any)(undefined)
   const unmount = defaultRegistry.mount(atom)
 
-  await Effect.runPromise(awaitAtomResult(defaultRegistry, atom) as any) // fetch #1
+  await Effect.runPromise(awaitAtomResult(defaultRegistry, atom)) // fetch #1
   expect(g.completes()).toBe(1)
 
   g.setBlocking(true)
   const mutation = invalidateQueries({ id: "Repro.B1.Save" }, undefined, invalidator)(writeCommand(repo), { id: "x" })
-  const fiber = Effect.runFork(mutation as any)
+  const fiber = Effect.runFork(mutation)
   await ticks(2)
   expect(g.starts(), "invalidation should have started the refetch").toBe(2)
 
@@ -239,7 +239,7 @@ it("B1 — mutation fiber interrupted while its onExit invalidation-refetch runs
   const interrupting = drain(fiber)
   g.releaseAll()
   await interrupting
-  await Effect.runPromise(awaitAtomResult(defaultRegistry, atom) as any)
+  await Effect.runPromise(awaitAtomResult(defaultRegistry, atom))
 
   expect(g.completes(), "onExit invalidation must complete the refetch despite fiber interrupt").toBe(2)
   expect(served(atom)).toBe(2)
@@ -266,7 +266,7 @@ it("B2 — query unmounts DURING a mutation-triggered refetch, then remounts: re
 
   g.setBlocking(true)
   const mutation = invalidateQueries({ id: "Repro.B2.Save" }, undefined, invalidator)(writeCommand(repo), { id: "x" })
-  const fiber = Effect.runFork(mutation as any)
+  const fiber = Effect.runFork(mutation)
   await ticks(2)
   expect(g.starts(), "mutation should have started the refetch").toBe(2)
 
@@ -301,10 +301,12 @@ it("B3 — query UNMOUNTED when the mutation invalidation lands, then remounts:
   m1.app.unmount() // navigate away: query is unmounted (cached)
   await ticks(2)
 
-  // Command writes the repo; invalidation marks the (unmounted) query dirty.
+  // Command writes the repo; invalidation marks the (unmounted) query dirty
+  // without refetching it (TanStack refetchType: "active").
   const mutation = invalidateQueries({ id: "Repro.B3.Save" }, undefined, invalidator)(writeCommand(repo), { id: "x" })
   await Effect.runPromise(mutation as any).then(() => {}, () => {})
   await ticks(2)
+  expect(g.starts(), "unmounted invalidation must not refetch").toBe(1)
 
   const m2 = mountSuspense(atom) // remount: an invalidated query refetches on mount
   await settle(m2.getPromise())
@@ -495,7 +497,7 @@ it("SUP — invalidation supersedes a stale in-flight fetch; remaining listeners
 
   // A mutation invalidates the query while fetch #2 is still in-flight (stale) -> must supersede it.
   const mutation = invalidateQueries({ id: "Repro.SUP.Save" }, undefined, invalidator)(writeCommand(repo), { id: "x" })
-  const fiber = Effect.runFork(mutation as any)
+  const fiber = Effect.runFork(mutation)
   await ticks(2)
   const superseded = g.starts()