@assistant-ui/tap 0.6.0 → 0.7.1

package/dist/react-shim/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/react-shim/index.ts"],"mappings":";;;;;;cAuBa,QAAA,GAAY,YAAA,kBAAkB,OAAA;AAAA,cAG9B,UAAA,GAAc,OAAA,OAAc,UAAA,OAAiB,IAAA,sBAAU,MAAA,gCAAA,KAAA,CAAA,cAAA,CAAA,KAAA,CAAA,YAAA;AAAA,cAKvD,MAAA,GAAU,YAAA,WAC4C,QAAA,CAD1B,SAAA;AAAA,cAG5B,OAAA,GAAW,OAAA,OAAc,IAAS;AAAA,cAGlC,WAAA,GAAe,QAAA,OAAe,IAAS;AAAA,cAKvC,SAAA,GAAa,MAAA,OAAa,IAAU;AAAA,cAIpC,eAAA,GAAmB,MAAA,OAAa,IAAU;AAAA,cAG1C,cAAA,GAAkB,QAAa;AAAA,cAM/B,GAAA,GAAO,MAAW;AAAA,cAKlB,UAAA,GAAc,OAAY"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/react-shim/index.ts"],"mappings":";;;;cAwBa,QAAA,GAAY,YAAkB;AAAA,cAG9B,UAAA,GAAc,OAAA,OAAc,UAAA,OAAiB,IAAA;AAAA,cAK7C,MAAA,GAAU,YAAkB;AAAA,cAG5B,OAAA,GAAW,OAAA,OAAc,IAAS;AAAA,cAGlC,WAAA,GAAe,QAAA,OAAe,IAAS;AAAA,cAKvC,SAAA,GAAa,MAAA,OAAa,IAAU;AAAA,cAMpC,eAAA,GAAmB,MAAA,OAAa,IAAU;AAAA,cAM1C,cAAA,GAAkB,QAAa;AAAA,cAS/B,GAAA,GAAO,MAAW;AAAA,cAOlB,UAAA,GAAc,OAAY"}

package/dist/react-shim/index.js

@@ -1,27 +1,27 @@
 import { peekResourceFiber } from "../core/helpers/execution-context.js";
-import { useReducer as useReducer$2 } from "../hooks/useReducer.js";
-import { useState as useState$2 } from "../hooks/useState.js";
-import { useRef as useRef$2 } from "../hooks/useRef.js";
-import { useMemo as useMemo$2 } from "../hooks/useMemo.js";
-import { useCallback as useCallback$1 } from "../hooks/useCallback.js";
-import { useEffect as useEffect$1 } from "../hooks/useEffect.js";
-import { useEffectEvent as useEffectEvent$1 } from "../hooks/useEffectEvent.js";
+import { useReducer as useReducer$2 } from "../react-hooks/useReducer.js";
+import { useState as useState$2 } from "../react-hooks/useState.js";
+import { useRef as useRef$2 } from "../react-hooks/useRef.js";
+import { useMemo as useMemo$2 } from "../react-hooks/useMemo.js";
+import { useCallback as useCallback$2 } from "../react-hooks/useCallback.js";
+import { useEffect as useEffect$2 } from "../react-hooks/useEffect.js";
+import { useEffectEvent as useEffectEvent$2 } from "../react-hooks/useEffectEvent.js";
 import { isResourceContext, useResourceContext } from "../core/context.js";
-import * as React from "react";
-import react_default from "react";
+import React, { default as react_default } from "react";
 export * from "react";
 //#region src/react-shim/index.ts
 const inTap = () => peekResourceFiber() !== null;
-const useState = (initialState) => inTap() ? useState$2(initialState) : React.useState(initialState);
-const useReducer = (reducer, initialArg, init) => inTap() ? useReducer$2(reducer, initialArg, init) : React.useReducer(reducer, initialArg, init);
-const useRef = (initialValue) => inTap() ? useRef$2(initialValue) : React.useRef(initialValue);
-const useMemo = (factory, deps) => inTap() ? useMemo$2(factory, deps) : React.useMemo(factory, deps);
-const useCallback = (callback, deps) => inTap() ? useCallback$1(callback, deps) : React.useCallback(callback, deps);
-const useEffect = (effect, deps) => inTap() ? useEffect$1(effect, deps) : React.useEffect(effect, deps);
-const useLayoutEffect = (effect, deps) => inTap() ? useEffect$1(effect, deps) : React.useLayoutEffect(effect, deps);
-const useEffectEvent = (callback) => inTap() ? useEffectEvent$1(callback) : React.useEffectEvent(callback);
-const use = (usable) => isResourceContext(usable) ? useResourceContext(usable) : React.use(usable);
-const useContext = (context) => isResourceContext(context) ? useResourceContext(context) : React.useContext(context);
+const ReactRuntime = React;
+const useState = (initialState) => inTap() ? useState$2(initialState) : ReactRuntime.useState(initialState);
+const useReducer = (reducer, initialArg, init) => inTap() ? useReducer$2(reducer, initialArg, init) : ReactRuntime.useReducer(reducer, initialArg, init);
+const useRef = (initialValue) => inTap() ? useRef$2(initialValue) : ReactRuntime.useRef(initialValue);
+const useMemo = (factory, deps) => inTap() ? useMemo$2(factory, deps) : ReactRuntime.useMemo(factory, deps);
+const useCallback = (callback, deps) => inTap() ? useCallback$2(callback, deps) : ReactRuntime.useCallback(callback, deps);
+const useEffect = (effect, deps) => inTap() ? useEffect$2(effect, deps) : ReactRuntime.useEffect(effect, deps);
+const useLayoutEffect = (effect, deps) => inTap() ? useEffect$2(effect, deps) : ReactRuntime.useLayoutEffect(effect, deps);
+const useEffectEvent = (callback) => inTap() ? useEffectEvent$2(callback) : ReactRuntime.useEffectEvent(callback);
+const use = (usable) => isResourceContext(usable) ? useResourceContext(usable) : ReactRuntime.use(usable);
+const useContext = (context) => isResourceContext(context) ? useResourceContext(context) : ReactRuntime.useContext(context);
 //#endregion
 export { react_default as default, use, useCallback, useContext, useEffect, useEffectEvent, useLayoutEffect, useMemo, useReducer, useRef, useState };
 

package/dist/react-shim/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["hooks.useState","hooks.useReducer","hooks.useRef","hooks.useMemo","hooks.useCallback","hooks.useEffect","hooks.useEffectEvent"],"sources":["../../src/react-shim/index.ts"],"sourcesContent":["/* oxlint-disable react/rules-of-hooks -- this module deliberately routes hook calls between tap and React at runtime */\n/* oxlint-disable react/exhaustive-deps -- dependency arrays are forwarded verbatim from the caller */\n// Runtime drop-in for \"react\": forward everything from react, then override the\n// hooks that have a tap equivalent so they route to tap inside a resource render\n// and to React otherwise. Alias `react` to this module (build `output.paths` /\n// vitest resolver) in code that can run inside a tap resource.\n//\n// This subpath ships no type declarations: the build reverts the aliased\n// specifier back to `\"react\"` in emitted `.d.ts`, so consumer types resolve to\n// React's own. The source-level TS2498 from the `export *` below is suppressed.\nimport * as React from \"react\";\nimport { peekResourceFiber } from \"../core/helpers/execution-context\";\nimport * as hooks from \"../hooks\";\nimport { useResourceContext, isResourceContext } from \"../core/context\";\n\n// @ts-expect-error -- @types/react uses `export =`; this is valid at runtime.\nexport * from \"react\";\nexport { default } from \"react\";\n\nconst inTap = () => peekResourceFiber() !== null;\n\n// --- hooks with a tap equivalent: override the star-exported react hooks ---\n\nexport const useState = (initialState?: any) =>\n  inTap() ? hooks.useState(initialState) : React.useState(initialState);\n\nexport const useReducer = (reducer: any, initialArg: any, init?: any) =>\n  inTap()\n    ? hooks.useReducer(reducer, initialArg, init)\n    : React.useReducer(reducer, initialArg, init);\n\nexport const useRef = (initialValue?: any) =>\n  inTap() ? hooks.useRef(initialValue) : React.useRef(initialValue);\n\nexport const useMemo = (factory: any, deps: any) =>\n  inTap() ? hooks.useMemo(factory, deps) : React.useMemo(factory, deps);\n\nexport const useCallback = (callback: any, deps: any) =>\n  inTap()\n    ? hooks.useCallback(callback, deps)\n    : React.useCallback(callback, deps);\n\nexport const useEffect = (effect: any, deps?: any) =>\n  inTap() ? hooks.useEffect(effect, deps) : React.useEffect(effect, deps);\n\n// tap has a single effect primitive; layout effects collapse onto it\nexport const useLayoutEffect = (effect: any, deps?: any) =>\n  inTap() ? hooks.useEffect(effect, deps) : React.useLayoutEffect(effect, deps);\n\nexport const useEffectEvent = (callback: any) =>\n  inTap() ? hooks.useEffectEvent(callback) : React.useEffectEvent(callback);\n\n// `use(usable)` reads tap resource context when handed a tap context (routed by\n// its brand, not by ambient render state), and falls back to React's `use`\n// (promises / React context) for everything else.\nexport const use = (usable: any) =>\n  isResourceContext(usable) ? useResourceContext(usable) : React.use(usable);\n\n// `useContext(context)` reads tap resource context when handed a tap context\n// (routed by its brand), and falls back to React's `useContext` otherwise.\nexport const useContext = (context: any) =>\n  isResourceContext(context)\n    ? useResourceContext(context)\n    : React.useContext(context);\n"],"mappings":";;;;;;;;;;;;;AAmBA,MAAM,cAAc,kBAAkB,MAAM;AAI5C,MAAa,YAAY,iBACvB,MAAM,IAAIA,WAAe,YAAY,IAAI,MAAM,SAAS,YAAY;AAEtE,MAAa,cAAc,SAAc,YAAiB,SACxD,MAAM,IACFC,aAAiB,SAAS,YAAY,IAAI,IAC1C,MAAM,WAAW,SAAS,YAAY,IAAI;AAEhD,MAAa,UAAU,iBACrB,MAAM,IAAIC,SAAa,YAAY,IAAI,MAAM,OAAO,YAAY;AAElE,MAAa,WAAW,SAAc,SACpC,MAAM,IAAIC,UAAc,SAAS,IAAI,IAAI,MAAM,QAAQ,SAAS,IAAI;AAEtE,MAAa,eAAe,UAAe,SACzC,MAAM,IACFC,cAAkB,UAAU,IAAI,IAChC,MAAM,YAAY,UAAU,IAAI;AAEtC,MAAa,aAAa,QAAa,SACrC,MAAM,IAAIC,YAAgB,QAAQ,IAAI,IAAI,MAAM,UAAU,QAAQ,IAAI;AAGxE,MAAa,mBAAmB,QAAa,SAC3C,MAAM,IAAIA,YAAgB,QAAQ,IAAI,IAAI,MAAM,gBAAgB,QAAQ,IAAI;AAE9E,MAAa,kBAAkB,aAC7B,MAAM,IAAIC,iBAAqB,QAAQ,IAAI,MAAM,eAAe,QAAQ;AAK1E,MAAa,OAAO,WAClB,kBAAkB,MAAM,IAAI,mBAAmB,MAAM,IAAI,MAAM,IAAI,MAAM;AAI3E,MAAa,cAAc,YACzB,kBAAkB,OAAO,IACrB,mBAAmB,OAAO,IAC1B,MAAM,WAAW,OAAO"}
+{"version":3,"file":"index.js","names":["hooks.useState","hooks.useReducer","hooks.useRef","hooks.useMemo","hooks.useCallback","hooks.useEffect","hooks.useEffectEvent"],"sources":["../../src/react-shim/index.ts"],"sourcesContent":["/* oxlint-disable react/rules-of-hooks -- this module deliberately routes hook calls between tap and React at runtime */\n/* oxlint-disable react/exhaustive-deps -- dependency arrays are forwarded verbatim from the caller */\n// Runtime drop-in for \"react\": forward everything from react, then override the\n// hooks that have a tap equivalent so they route to tap inside a resource render\n// and to React otherwise. Alias `react` to this module (build `output.paths` /\n// vitest resolver) in code that can run inside a tap resource.\n//\n// This subpath ships no type declarations: the build reverts the aliased\n// specifier back to `\"react\"` in emitted `.d.ts`, so consumer types resolve to\n// React's own. The source-level TS2498 from the `export *` below is suppressed.\nimport React from \"react\";\nimport { peekResourceFiber } from \"../core/helpers/execution-context\";\nimport * as hooks from \"../react-hooks\";\nimport { useResourceContext, isResourceContext } from \"../core/context\";\n\n// @ts-expect-error -- @types/react uses `export =`; this is valid at runtime.\nexport * from \"react\";\nexport { default } from \"react\";\n\nconst inTap = () => peekResourceFiber() !== null;\nconst ReactRuntime = React as any;\n\n// --- hooks with a tap equivalent: override the star-exported react hooks ---\n\nexport const useState = (initialState?: any) =>\n  inTap() ? hooks.useState(initialState) : ReactRuntime.useState(initialState);\n\nexport const useReducer = (reducer: any, initialArg: any, init?: any) =>\n  inTap()\n    ? hooks.useReducer(reducer, initialArg, init)\n    : ReactRuntime.useReducer(reducer, initialArg, init);\n\nexport const useRef = (initialValue?: any) =>\n  inTap() ? hooks.useRef(initialValue) : ReactRuntime.useRef(initialValue);\n\nexport const useMemo = (factory: any, deps: any) =>\n  inTap() ? hooks.useMemo(factory, deps) : ReactRuntime.useMemo(factory, deps);\n\nexport const useCallback = (callback: any, deps: any) =>\n  inTap()\n    ? hooks.useCallback(callback, deps)\n    : ReactRuntime.useCallback(callback, deps);\n\nexport const useEffect = (effect: any, deps?: any) =>\n  inTap()\n    ? hooks.useEffect(effect, deps)\n    : ReactRuntime.useEffect(effect, deps);\n\n// tap has a single effect primitive; layout effects collapse onto it\nexport const useLayoutEffect = (effect: any, deps?: any) =>\n  inTap()\n    ? hooks.useEffect(effect, deps)\n    : ReactRuntime.useLayoutEffect(effect, deps);\n\n// The non-tap fallback requires a React version that provides useEffectEvent.\nexport const useEffectEvent = (callback: any) =>\n  inTap()\n    ? hooks.useEffectEvent(callback)\n    : ReactRuntime.useEffectEvent(callback);\n\n// `use(usable)` reads tap resource context when handed a tap context (routed by\n// its brand, not by ambient render state), and falls back to React's `use`\n// (promises / React context) for everything else. The non-tap fallback requires\n// React 19.\nexport const use = (usable: any) =>\n  isResourceContext(usable)\n    ? useResourceContext(usable)\n    : ReactRuntime.use(usable);\n\n// `useContext(context)` reads tap resource context when handed a tap context\n// (routed by its brand), and falls back to React's `useContext` otherwise.\nexport const useContext = (context: any) =>\n  isResourceContext(context)\n    ? useResourceContext(context)\n    : ReactRuntime.useContext(context);\n"],"mappings":";;;;;;;;;;;;AAmBA,MAAM,cAAc,kBAAkB,MAAM;AAC5C,MAAM,eAAe;AAIrB,MAAa,YAAY,iBACvB,MAAM,IAAIA,WAAe,YAAY,IAAI,aAAa,SAAS,YAAY;AAE7E,MAAa,cAAc,SAAc,YAAiB,SACxD,MAAM,IACFC,aAAiB,SAAS,YAAY,IAAI,IAC1C,aAAa,WAAW,SAAS,YAAY,IAAI;AAEvD,MAAa,UAAU,iBACrB,MAAM,IAAIC,SAAa,YAAY,IAAI,aAAa,OAAO,YAAY;AAEzE,MAAa,WAAW,SAAc,SACpC,MAAM,IAAIC,UAAc,SAAS,IAAI,IAAI,aAAa,QAAQ,SAAS,IAAI;AAE7E,MAAa,eAAe,UAAe,SACzC,MAAM,IACFC,cAAkB,UAAU,IAAI,IAChC,aAAa,YAAY,UAAU,IAAI;AAE7C,MAAa,aAAa,QAAa,SACrC,MAAM,IACFC,YAAgB,QAAQ,IAAI,IAC5B,aAAa,UAAU,QAAQ,IAAI;AAGzC,MAAa,mBAAmB,QAAa,SAC3C,MAAM,IACFA,YAAgB,QAAQ,IAAI,IAC5B,aAAa,gBAAgB,QAAQ,IAAI;AAG/C,MAAa,kBAAkB,aAC7B,MAAM,IACFC,iBAAqB,QAAQ,IAC7B,aAAa,eAAe,QAAQ;AAM1C,MAAa,OAAO,WAClB,kBAAkB,MAAM,IACpB,mBAAmB,MAAM,IACzB,aAAa,IAAI,MAAM;AAI7B,MAAa,cAAc,YACzB,kBAAkB,OAAO,IACrB,mBAAmB,OAAO,IAC1B,aAAa,WAAW,OAAO"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/tap",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Reactive state management inspired by React hooks",
   "keywords": [
     "state-management",

package/src/__tests__/basic/resourceHandle.test.ts

@@ -1,50 +1,60 @@
 import { describe, it, expect, vi } from "vitest";
-import { createResourceRoot } from "../../core/createResourceRoot";
-import { resource } from "../../core/resource";
+import { createTapRoot } from "../../core/createTapRoot";
+import { flushTapSync } from "../../core/scheduler";
+import { useState } from "../../react-hooks/useState";
 
 describe("ResourceHandle - Basic Usage", () => {
   it("should create a resource handle with const API", () => {
-    const TestResource = resource(function TestResource(props: number) {
+    const useTestResource = (props: number) => {
       return {
         value: props * 2,
         propsUsed: props,
       };
+    };
+
+    const sub = createTapRoot(function Root() {
+      return useTestResource(5);
     });
-    const root = createResourceRoot();
-    const sub = root.render(TestResource(5));
 
-    // The subscribable provides getValue and subscribe
+    // The root provides getValue, subscribe, and unmount
     expect(typeof sub.getValue).toBe("function");
     expect(typeof sub.subscribe).toBe("function");
-    expect(typeof root.render).toBe("function");
+    expect(typeof sub.unmount).toBe("function");
 
     // Initial state
     expect(sub.getValue().value).toBe(10);
     expect(sub.getValue().propsUsed).toBe(5);
   });
 
-  it("should allow updating props", () => {
-    const TestResource = resource(function TestResource(props: {
-      multiplier: number;
-    }) {
-      return { result: 10 * props.multiplier };
+  it("should re-render and notify on internal state change", () => {
+    const useTestResource = () => {
+      const [count, setCount] = useState(0);
+      return { count, increment: () => setCount((c) => c + 1) };
+    };
+
+    const sub = createTapRoot(function Root() {
+      return useTestResource();
     });
-    const root = createResourceRoot();
-    const sub = root.render(TestResource({ multiplier: 2 }));
 
-    // Initial state
-    expect(sub.getValue().result).toBe(20);
+    expect(sub.getValue().count).toBe(0);
 
-    // Can call render to update props
-    expect(() => root.render(TestResource({ multiplier: 3 }))).not.toThrow();
+    const listener = vi.fn();
+    sub.subscribe(listener);
+
+    flushTapSync(() => sub.getValue().increment());
+
+    expect(sub.getValue().count).toBe(1);
+    expect(listener).toHaveBeenCalled();
   });
 
   it("should support subscribing and unsubscribing", () => {
-    const TestResource = resource(function TestResource() {
-      return { timestamp: Date.now() };
+    const useTestResource = () => {
+      return { timestamp: 0 };
+    };
+
+    const sub = createTapRoot(function Root() {
+      return useTestResource();
     });
-    const root = createResourceRoot();
-    const sub = root.render(TestResource());
 
     const subscriber1 = vi.fn();
     const subscriber2 = vi.fn();

package/src/__tests__/basic/tapEffect.basic.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, afterEach } from "vitest";
-import { useEffect } from "../../hooks/useEffect";
-import { useState } from "../../hooks/useState";
+import { useEffect } from "../../react-hooks/useEffect";
+import { useState } from "../../react-hooks/useState";
 import {
   createTestResource,
   renderTest,
@@ -31,7 +31,7 @@ describe("useEffect - Basic Functionality", () => {
       const manager = new TestResourceManager(testFiber);
 
       // Mount and render
-      manager.renderAndMount(undefined);
+      manager.renderAndMount();
 
       // Effect should run after commit
       expect(executionOrder).toEqual(["render", "effect"]);
@@ -49,7 +49,7 @@ describe("useEffect - Basic Functionality", () => {
       });
 
       const manager = new TestResourceManager(testFiber);
-      manager.renderAndMount(undefined);
+      manager.renderAndMount();
 
       // Effect should be called, but not cleanup
       expect(effect).toHaveBeenCalledTimes(1);
@@ -80,7 +80,7 @@ describe("useEffect - Basic Functionality", () => {
       });
 
       const manager = new TestResourceManager(testFiber);
-      manager.renderAndMount(undefined);
+      manager.renderAndMount();
       manager.cleanup();
 
       // Cleanup should run in reverse order (LIFO)
@@ -111,7 +111,7 @@ describe("useEffect - Basic Functionality", () => {
         return null;
       });
 
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(executionOrder).toEqual(["effect1", "effect2", "effect3"]);
     });
 
@@ -173,7 +173,7 @@ describe("useEffect - Basic Functionality", () => {
       });
 
       // Initial render
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(effect).toHaveBeenCalledTimes(1);
 
       // Trigger re-render
@@ -234,7 +234,7 @@ describe("useEffect - Basic Functionality", () => {
       const manager = new TestResourceManager(testFiber);
 
       // Initial render
-      manager.renderAndMount(undefined);
+      manager.renderAndMount();
       // Without mount tracking, the effect runs immediately during commit
       // This triggers setState which causes a synchronous re-render
       expect(events).toEqual([

package/src/__tests__/basic/tapReducer.basic.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, afterEach } from "vitest";
-import { useReducer } from "../../hooks/useReducer";
-import { useEffect } from "../../hooks/useEffect";
+import { useReducer } from "../../react-hooks/useReducer";
+import { useEffect } from "../../react-hooks/useEffect";
 import {
   createTestResource,
   renderTest,
@@ -23,7 +23,7 @@ describe("useReducer - Basic Functionality", () => {
         return count;
       });
 
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toBe(0);
     });
 
@@ -39,12 +39,12 @@ describe("useReducer - Basic Functionality", () => {
         return count;
       });
 
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toBe(20);
       expect(initCalled).toBe(1);
 
       // Re-render should not call init again
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(initCalled).toBe(1);
     });
   });
@@ -73,7 +73,7 @@ describe("useReducer - Basic Functionality", () => {
         return count;
       });
 
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(getCommittedOutput(testFiber)).toBe(0);
 
       dispatchFn!({ type: "increment" });
@@ -91,7 +91,9 @@ describe("useReducer - Basic Functionality", () => {
   });
 
   describe("Same-state bailout", () => {
-    it("should not re-render when reducer returns same state (Object.is)", async () => {
+    it("re-renders once when the reducer returns the same state, like React", async () => {
+      // React computes user reducers during render (no eager dispatch-time
+      // bailout), so a same-state dispatch still renders once.
       let renderCount = 0;
       const reducer = (state: number, action: number) =>
         action === 0 ? state : state + action;
@@ -109,13 +111,13 @@ describe("useReducer - Basic Functionality", () => {
         return count;
       });
 
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(renderCount).toBe(1);
 
       // Dispatch action that returns same state
       dispatchFn!(0);
       await waitForNextTick();
-      expect(renderCount).toBe(1);
+      expect(renderCount).toBe(2);
     });
   });
 
@@ -136,7 +138,7 @@ describe("useReducer - Basic Functionality", () => {
         return count;
       });
 
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(getCommittedOutput(testFiber)).toBe(0);
 
       // Dispatch with multiplier=1
@@ -146,7 +148,7 @@ describe("useReducer - Basic Functionality", () => {
 
       // Change multiplier and dispatch
       multiplier = 10;
-      renderTest(testFiber, undefined); // re-render to update reducer
+      renderTest(testFiber); // re-render to update reducer
       dispatchFn!(5);
       await waitForNextTick();
       expect(getCommittedOutput(testFiber)).toBe(55); // 5 + 5*10
@@ -168,7 +170,7 @@ describe("useReducer - Basic Functionality", () => {
         return count;
       });
 
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(getCommittedOutput(testFiber)).toBe(0);
 
       // Multiple dispatches
@@ -191,8 +193,8 @@ describe("useReducer - Basic Functionality", () => {
         return count;
       });
 
-      renderTest(testFiber, undefined);
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
+      renderTest(testFiber);
 
       expect(dispatches[0]).toBe(dispatches[1]);
     });

package/src/__tests__/basic/tapResources.basic.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, afterEach } from "vitest";
 import { useResources } from "../../hooks/useResources";
-import { useState } from "../../hooks/useState";
+import { useState } from "../../react-hooks/useState";
 import { resource } from "../../core/resource";
 import { withKey } from "../../core/withKey";
 import {
@@ -13,25 +13,24 @@ import {
 const SimpleCounter = resource(createCounterResource());
 
 // Stateful counter that tracks its own count
-const StatefulCounter = resource(function StatefulCounter(props: {
-  initial: number;
-}) {
+const useStatefulCounter = (props: { initial: number }) => {
   const [count] = useState(props.initial);
   return { count };
-});
+};
+
+const StatefulCounter = resource(useStatefulCounter);
 
 // Display component for testing type changes
-const Display = resource(function Display(props: { text: string }) {
+const useDisplay = (props: { text: string }) => {
   return { type: "display", text: props.text };
-});
+};
+
+const Display = resource(useDisplay);
 
 // Counter with render tracking for testing instance preservation
 const renderCounts = new Map<string, number>();
 const instances = new Map<string, object>();
-const TrackingCounter = resource(function TrackingCounter(props: {
-  value: number;
-  id: string;
-}) {
+const useTrackingCounter = (props: { value: number; id: string }) => {
   const currentCount = (renderCounts.get(props.id) || 0) + 1;
   renderCounts.set(props.id, currentCount);
 
@@ -45,7 +44,9 @@ const TrackingCounter = resource(function TrackingCounter(props: {
     renderCount: currentCount,
     instance: instances.get(props.id),
   };
-});
+};
+
+const TrackingCounter = resource(useTrackingCounter);
 
 describe("useResources - Basic Functionality", () => {
   afterEach(() => {
@@ -67,15 +68,17 @@ describe("useResources - Basic Functionality", () => {
         return results;
       });
 
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toEqual([{ count: 10 }, { count: 20 }, { count: 30 }]);
     });
 
     it("should work with resource constructor syntax", () => {
-      const Counter = resource(function Counter(props: { value: number }) {
+      const useCounter = (props: { value: number }) => {
         const [count] = useState(props.value);
         return { count, double: count * 2 };
-      });
+      };
+
+      const Counter = resource(useCounter);
 
       const items = [
         { key: "first", value: 5 },
@@ -95,7 +98,7 @@ describe("useResources - Basic Functionality", () => {
         return results;
       });
 
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toEqual([
         { count: 5, double: 10 },
         { count: 10, double: 20 },

package/src/__tests__/basic/tapState.basic.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, afterEach } from "vitest";
-import { useState } from "../../hooks/useState";
-import { useEffect } from "../../hooks/useEffect";
+import { useState } from "../../react-hooks/useState";
+import { useEffect } from "../../react-hooks/useEffect";
 import {
   createTestResource,
   renderTest,
@@ -21,7 +21,7 @@ describe("useState - Basic Functionality", () => {
         return count;
       });
 
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toBe(42);
     });
 
@@ -37,12 +37,12 @@ describe("useState - Basic Functionality", () => {
       });
 
       // First render
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toBe(100);
       expect(initCalled).toBe(1);
 
       // Re-render should not call initializer again
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(initCalled).toBe(1);
     });
 
@@ -52,7 +52,7 @@ describe("useState - Basic Functionality", () => {
         return value;
       });
 
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toBeUndefined();
     });
   });
@@ -75,7 +75,7 @@ describe("useState - Basic Functionality", () => {
       });
 
       // Initial render
-      const result1 = renderTest(testFiber, undefined);
+      const result1 = renderTest(testFiber);
       expect(result1).toEqual({ count: 0, renderCount: 1 });
 
       // Update state
@@ -107,7 +107,7 @@ describe("useState - Basic Functionality", () => {
       });
 
       // Initial render
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(renderCount).toBe(1);
 
       // Set same value
@@ -135,7 +135,7 @@ describe("useState - Basic Functionality", () => {
       });
 
       // Initial render
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(getCommittedOutput(testFiber)).toBe(10);
 
       // Functional update
@@ -167,7 +167,7 @@ describe("useState - Basic Functionality", () => {
         };
       });
 
-      const result = renderTest(testFiber, undefined);
+      const result = renderTest(testFiber);
       expect(result).toMatchObject({
         count1: 1,
         count2: 2,
@@ -191,7 +191,7 @@ describe("useState - Basic Functionality", () => {
       });
 
       // Initial render
-      renderTest(testFiber, undefined);
+      renderTest(testFiber);
       expect(getCommittedOutput(testFiber)).toEqual({ a: "a", b: "b", c: "c" });
 
       // Update only B

package/src/__tests__/bench/hosts.bench.tsx

@@ -0,0 +1,124 @@
+/**
+ * Host-type benchmark: mount+unmount and update cost of a body with N
+ * hooks under each host. Runs against the BUILT package (dist), which the
+ * vitest config externalizes so tap and React both run as plain Node
+ * modules, outside vitest's module evaluator. Build first, then:
+ *
+ *   pnpm build
+ *   pnpm exec vitest bench --run --project prod src/__tests__/bench/hosts.bench.tsx
+ *
+ * Not part of the test suite; vitest only picks this up in bench mode.
+ */
+/* oxlint-disable react/rules-of-hooks -- fixed-count hook loop, benchmark only */
+import { bench, describe } from "vitest";
+import { createElement, useState } from "react";
+import { createRoot } from "react-dom/client";
+import { flushSync } from "react-dom";
+import {
+  createTapRoot,
+  flushTapSync,
+  resource,
+  useResource,
+  useTapRoot,
+} from "@assistant-ui/tap";
+
+(globalThis as any).IS_REACT_ACT_ENVIRONMENT = false;
+
+const N = 10_000;
+
+type Api = { sum: number; bump: () => void };
+
+const useManyHooks = (): Api => {
+  let sum = 0;
+  let lastSet!: (updater: (v: number) => number) => void;
+  for (let i = 0; i < N; i++) {
+    const [v, setV] = useState(0);
+    sum += v;
+    lastSet = setV;
+  }
+  return { sum, bump: () => lastSet((v) => v + 1) };
+};
+
+type Host = {
+  api: () => Api;
+  flush: (fn: () => void) => void;
+  unmount: () => void;
+};
+
+const mountReactHost = (useProbe: () => () => Api): Host => {
+  let api!: () => Api;
+  function Probe() {
+    api = useProbe();
+    return null;
+  }
+  const root = createRoot(document.createElement("div"));
+  flushSync(() => root.render(createElement(Probe)));
+  return {
+    api: () => api(),
+    flush: (fn) => flushSync(fn),
+    unmount: () => flushSync(() => root.unmount()),
+  };
+};
+
+const ManyHooks = resource(useManyHooks);
+
+const HOSTS: Record<string, () => Host> = {
+  react: () =>
+    mountReactHost(() => {
+      const value = useManyHooks();
+      return () => value;
+    }),
+  bridge: () =>
+    mountReactHost(() => {
+      const value = useResource(ManyHooks());
+      return () => value;
+    }),
+  tapRoot: () => {
+    const host = mountReactHost(() => {
+      const root = useTapRoot(function Root() {
+        return useManyHooks();
+      });
+      return () => root.getValue();
+    });
+    return { ...host, flush: (fn) => flushTapSync(fn) };
+  },
+  createTapRoot: () => {
+    const root = createTapRoot(function Root() {
+      return useManyHooks();
+    });
+    return {
+      api: () => root.getValue(),
+      flush: (fn) => flushTapSync(fn),
+      unmount: () => root.unmount(),
+    };
+  },
+};
+
+describe(`mount+unmount, ${N} useState hooks`, () => {
+  for (const [name, make] of Object.entries(HOSTS)) {
+    bench(name, () => {
+      const host = make();
+      host.unmount();
+    });
+  }
+});
+
+describe(`update (one dispatch, full re-render), ${N} useState hooks`, () => {
+  for (const [name, make] of Object.entries(HOSTS)) {
+    let host: Host;
+    bench(
+      name,
+      () => {
+        host.flush(() => host.api().bump());
+      },
+      {
+        setup: () => {
+          host = make();
+        },
+        teardown: () => {
+          host.unmount();
+        },
+      },
+    );
+  }
+});