@timber-js/app 0.2.0-alpha.100 → 0.2.0-alpha.102

package/dist/plugins/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiC,MAAM,MAAM,CAAC;AAGlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA8C1D;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAkE1D"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiC,MAAM,MAAM,CAAC;AAGlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA8C1D;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAiE1D"}

package/dist/plugins/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/plugins/routing.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAiBlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA0E1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAmLxD"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/plugins/routing.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAclD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA0E1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA2KxD"}

package/dist/plugins/static-build.d.ts

@@ -3,22 +3,18 @@
  *
  * When `output: 'static'` is set in timber.config.ts, this plugin:
  * 1. Validates that no dynamic APIs (getCookies(), getHeaders()) are used
- * 2. When client JavaScript is disabled, rejects 'use client' and 'use server' directives
- * 3. Coordinates build-time rendering of all pages
+ * 2. Coordinates build-time rendering of all pages
  *
  * Design doc: design/15-future-prerendering.md
  */
 import type { Plugin } from 'vite';
 import type { PluginContext } from '../plugin-context.js';
 export interface StaticValidationError {
-    type: 'dynamic-api' | 'nojs-directive';
+    type: 'dynamic-api';
     file: string;
     message: string;
     line?: number;
 }
-export interface StaticOptions {
-    clientJavascriptDisabled: boolean;
-}
 /**
  * Detect usage of dynamic per-request APIs (getCookies(), getHeaders())
  * that cannot work at build time in static mode.
@@ -26,23 +22,6 @@ export interface StaticOptions {
  * Returns an array of validation errors.
  */
 export declare function detectDynamicApis(code: string, fileId: string): StaticValidationError[];
-/**
- * Detect 'use client' and 'use server' directives using AST-based parsing.
- * When client JavaScript is disabled, both are hard build errors — no React
- * runtime or server actions are allowed in the output.
- *
- * When client JavaScript is enabled, these are allowed (client components
- * hydrate, server actions get extracted to API endpoints).
- */
-export declare function detectDirectives(code: string, fileId: string, options: StaticOptions): StaticValidationError[];
-/**
- * Run all static mode validations on a source file.
- *
- * Combines:
- * - Dynamic API detection (getCookies, getHeaders) — always in static mode
- * - Directive detection ('use client', 'use server') — only when client JS is disabled
- */
-export declare function validateStaticMode(code: string, fileId: string, options: StaticOptions): StaticValidationError[];
 /**
  * Create the timber-static-build Vite plugin.
  *

package/dist/plugins/static-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static-build.d.ts","sourceRoot":"","sources":["../../src/plugins/static-build.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAO1D,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,aAAa,GAAG,gBAAgB,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,aAAa;IAC5B,wBAAwB,EAAE,OAAO,CAAC;CACnC;AAmBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,CA2BvF;AAMD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,qBAAqB,EAAE,CA8BzB;AAMD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,qBAAqB,EAAE,CAOzB;AAMD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA8C5D"}
+{"version":3,"file":"static-build.d.ts","sourceRoot":"","sources":["../../src/plugins/static-build.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAM1D,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAmBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,CA2BvF;AAMD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA4C5D"}

package/dist/routing/index.js

@@ -1,3 +1,3 @@
-import { i as INTERCEPTION_MARKERS, n as classifyUrlSegment, r as DEFAULT_PAGE_EXTENSIONS, t as classifySegment } from "../_chunks/segment-classify-BjfuctV2.js";
-import { i as scanRoutes, n as collectInterceptionRewrites, r as generateRouteMap, t as collectLeafRoutes } from "../_chunks/walkers-Tg0Alwcg.js";
+import { i as INTERCEPTION_MARKERS, n as classifyUrlSegment, r as DEFAULT_PAGE_EXTENSIONS, t as classifySegment } from "../_chunks/segment-classify-CnfLLvir.js";
+import { i as scanRoutes, n as collectInterceptionRewrites, r as generateRouteMap, t as collectLeafRoutes } from "../_chunks/walkers-DQn5NNrf.js";
 export { DEFAULT_PAGE_EXTENSIONS, INTERCEPTION_MARKERS, classifySegment, classifyUrlSegment, collectInterceptionRewrites, collectLeafRoutes, generateRouteMap, scanRoutes };

package/dist/search-params/index.js

@@ -1,6 +1,6 @@
-import { n as registerSearchParams, t as getSearchParamsDefinition } from "../_chunks/registry-I2ss-lvy.js";
-import { i as isStandardSchema, n as fromSchema, r as isCodec } from "../_chunks/schema-bridge-Cxu4l-7p.js";
-import { n as defineSearchParams } from "../_chunks/define-B-Q_UMOD.js";
+import { n as registerSearchParams, t as getSearchParamsDefinition } from "../_chunks/registry-DB93kT5c.js";
+import { i as isStandardSchema, n as fromSchema, r as isCodec } from "../_chunks/schema-bridge-C3xl_vfb.js";
+import { n as defineSearchParams } from "../_chunks/define-Dn98bPbb.js";
 //#region src/search-params/wrappers.ts
 /**
 * Wrap a nullable codec with a default value. When the inner codec returns

package/dist/segment-params/index.js

@@ -1,2 +1,2 @@
-import { r as defineSegmentParams } from "../_chunks/define-CfBPoJb0.js";
+import { r as defineSegmentParams } from "../_chunks/define-Btmz9B20.js";
 export { defineSegmentParams };

package/dist/server/index.js

@@ -1,6 +1,6 @@
-import { a as getSpanId, d as withSpan, o as getTraceId, p as formFlashAls, t as addSpanEvent, v as isDebug, y as isDevMode } from "../_chunks/tracing-C8V-YGsP.js";
-import { t as formatSize } from "../_chunks/format-Bcn-Iv1x.js";
-import { E as getCookieJar, a as revalidateTag, b as getSegmentParams, c as DenySignal, f as deny, h as waitUntil, i as revalidatePath, l as RedirectSignal, m as redirectExternal, p as redirect, s as parseFormData, u as RedirectType, v as getHeaders } from "../_chunks/actions-CQ8Z8VGL.js";
+import { a as getSpanId, d as withSpan, o as getTraceId, p as formFlashAls, t as addSpanEvent, v as isDebug, y as isDevMode } from "../_chunks/tracing-DvKLzCFa.js";
+import { t as formatSize } from "../_chunks/format-CYBGxKtc.js";
+import { E as getCookieJar, a as revalidateTag, b as getSegmentParams, c as DenySignal, f as deny, h as waitUntil, i as revalidatePath, l as RedirectSignal, m as redirectExternal, p as redirect, s as parseFormData, u as RedirectType, v as getHeaders } from "../_chunks/actions-n9qTlpmY.js";
 //#region src/server/sensitive-fields.ts
 /**
 * Sensitive field stripping — removes password/token/CVV-style fields

package/dist/server/internal.js

@@ -1,11 +1,11 @@
-import { c as replaceTraceId, d as withSpan, f as earlyHintsSenderAls, g as timingAls, i as getOtelTraceId, l as runWithTraceId, m as requestContextAls, o as getTraceId, r as generateTraceId, u as setSpanAttribute, v as isDebug } from "../_chunks/tracing-C8V-YGsP.js";
-import { a as warnRedirectInSuspense, c as warnSuspenseWrappingChildren, i as warnRedirectInAccess, n as setViteServer, o as warnSlowSlotWithoutSuspense, r as warnDenyInSuspense, s as warnStaticRequestApi, t as WarningId } from "../_chunks/warnings-Cg47l5sk.js";
-import { n as classifyUrlSegment } from "../_chunks/segment-classify-BjfuctV2.js";
-import { i as getMetadataRouteServePath, n as classifyMetadataRoute, r as getMetadataRouteAutoLink, t as METADATA_ROUTE_CONVENTIONS } from "../_chunks/metadata-routes-BU684ls2.js";
-import { a as logProxyError, c as logRequestReceived, d as logSwrRefetchFailed, f as logWaitUntilRejected, h as swallow, i as logMiddlewareShortCircuit, l as logRouteError, m as setLogger, n as logCacheMiss, o as logRenderError, p as logWaitUntilUnsupported, r as logMiddlewareError, s as logRequestCompleted, t as getLogger, u as logSlowRequest } from "../_chunks/logger-0m8MsKdc.js";
-import { C as setMutableCookieContext, D as getSetCookieHeaders, S as runWithRequestContext, T as getCookie, _ as getHeader, b as getSegmentParams, c as DenySignal, d as RenderError, g as applyRequestHeaderOverlay, l as RedirectSignal, n as executeAction, o as coerce, r as isRscActionRequest, t as buildNoJsResponse, w as setSegmentParams, x as markResponseFlushed, y as getSearchParams } from "../_chunks/actions-CQ8Z8VGL.js";
+import { c as replaceTraceId, d as withSpan, f as earlyHintsSenderAls, g as timingAls, i as getOtelTraceId, l as runWithTraceId, m as requestContextAls, o as getTraceId, r as generateTraceId, u as setSpanAttribute, v as isDebug } from "../_chunks/tracing-DvKLzCFa.js";
+import { a as warnRedirectInSuspense, c as warnSuspenseWrappingChildren, i as warnRedirectInAccess, n as setViteServer, o as warnSlowSlotWithoutSuspense, r as warnDenyInSuspense, s as warnStaticRequestApi, t as WarningId } from "../_chunks/warnings-B30wpfaS.js";
+import { n as classifyUrlSegment } from "../_chunks/segment-classify-CnfLLvir.js";
+import { i as getMetadataRouteServePath, n as classifyMetadataRoute, r as getMetadataRouteAutoLink, t as METADATA_ROUTE_CONVENTIONS } from "../_chunks/metadata-routes-Cjmvi3rQ.js";
+import { a as logProxyError, c as logRequestReceived, d as logSwrRefetchFailed, f as logWaitUntilRejected, h as swallow, i as logMiddlewareShortCircuit, l as logRouteError, m as setLogger, n as logCacheMiss, o as logRenderError, p as logWaitUntilUnsupported, r as logMiddlewareError, s as logRequestCompleted, t as getLogger, u as logSlowRequest } from "../_chunks/logger-DDmK5skc.js";
+import { C as setMutableCookieContext, D as getSetCookieHeaders, S as runWithRequestContext, T as getCookie, _ as getHeader, b as getSegmentParams, c as DenySignal, d as RenderError, g as applyRequestHeaderOverlay, l as RedirectSignal, n as executeAction, o as coerce, r as isRscActionRequest, t as buildNoJsResponse, w as setSegmentParams, x as markResponseFlushed, y as getSearchParams } from "../_chunks/actions-n9qTlpmY.js";
 import "../client/error-boundary.js";
-import "../_chunks/segment-context-Dx_OizxD.js";
+import "../_chunks/segment-context-Dc-GbSTe.js";
 import { readFile } from "node:fs/promises";
 import { createElement } from "react";
 //#region src/server/server-timing.ts

package/dist/server/request-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-context.d.ts","sourceRoot":"","sources":["../../src/server/request-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mBAAmB,CAAC;AAQhF,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAQ7B;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,eAAe,CAS5C;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG1D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,IAAI,eAAe,CASjD;AAkBD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAepE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,CAMhF;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAG/C;AAID;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,OAAO,EACP,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,MAAM,CAAC,QAAQ,CACnF,CAAC;AAIF;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAmBrE;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAK9D;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmBhE"}
+{"version":3,"file":"request-context.d.ts","sourceRoot":"","sources":["../../src/server/request-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mBAAmB,CAAC;AAMhF,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAQ7B;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,eAAe,CAS5C;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG1D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,IAAI,eAAe,CASjD;AAaD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAepE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,CAMhF;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAG/C;AAID;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,OAAO,EACP,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,MAAM,CAAC,QAAQ,CACnF,CAAC;AAIF;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAmBrE;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAK9D;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmBhE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.2.0-alpha.100",
+  "version": "0.2.0-alpha.102",
   "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",
@@ -110,10 +110,16 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "vite build --config vite.lib.config.ts && tsc --emitDeclarationOnly --project tsconfig.json --outDir dist",
+    "typecheck": "tsgo --noEmit",
+    "prepublishOnly": "pnpm run build"
+  },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/context-async-hooks": "^2.6.1",
     "@opentelemetry/sdk-trace-base": "^2.6.1",
+    "magic-string": "^0.30.21",
     "nitro": "3.0.260311-beta"
   },
   "peerDependencies": {
@@ -152,9 +158,5 @@
   },
   "engines": {
     "node": ">=22.12.0"
-  },
-  "scripts": {
-    "build": "vite build --config vite.lib.config.ts && tsc --emitDeclarationOnly --project tsconfig.json --outDir dist",
-    "typecheck": "tsgo --noEmit"
   }
-}
+}

package/src/client/index.ts

@@ -83,15 +83,6 @@ export { useSegmentParams } from './use-segment-params';
 // Types still exported for advanced use.
 export type { ClientCookieOptions, CookieSetter } from './use-cookie';
 
-// Register the client cookie module with defineCookie's lazy reference.
-// This runs at module load time in the client/SSR environment, wiring up
-// the useCookie hook without a top-level import in define-cookie.ts.
-import * as _useCookieMod from './use-cookie.js';
-import { _registerUseCookieModule, _registerFromSchema } from '../cookies/define-cookie.js';
-import { fromSchema } from '../schema-bridge.js';
-_registerUseCookieModule(_useCookieMod);
-_registerFromSchema(fromSchema);
-
 // Register the client useSegmentParams hook with defineSegmentParams.
 import { useSegmentParams as _useSegmentParams } from './use-segment-params.js';
 import { _registerUseSegmentParams } from '../segment-params/define.js';

package/src/client/internal.ts

@@ -39,7 +39,7 @@ export { HistoryStack } from './history.js';
 export type { HistoryEntry } from './history.js';
 
 // ── Params (internal setter + raw hooks) ─────────────────────────────────
-export { setCurrentParams, useSegmentParams } from './use-segment-params.js';
+export { setCurrentParams } from './use-segment-params.js';
 export { useSearchParams } from './use-search-params.js';
 
 // ── Navigation context ───────────────────────────────────────────────────

package/src/client/use-cookie.ts

@@ -39,7 +39,7 @@ type Listener = () => void;
 const listeners = new Map<string, Set<Listener>>();
 
 /** Parse a cookie name from document.cookie. */
-function getCookieValue(name: string): string | undefined {
+export function getCookieValue(name: string): string | undefined {
   if (typeof document === 'undefined') return undefined;
   const match = document.cookie.match(
     new RegExp('(?:^|;\\s*)' + name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\s*=\\s*([^;]*)')
@@ -48,7 +48,7 @@ function getCookieValue(name: string): string | undefined {
 }
 
 /** Serialize options into a cookie string suffix. */
-function serializeOptions(options?: ClientCookieOptions): string {
+export function serializeOptions(options?: ClientCookieOptions): string {
   if (!options) return '; Path=/; SameSite=Lax';
   const parts: string[] = [];
   parts.push(`Path=${options.path ?? '/'}`);

package/src/cookies/define-cookie.ts

@@ -5,10 +5,11 @@
  * with sync .get(), .set(), .delete() isomorphic methods (server + client)
  * and a .useCookie() client hook.
  *
- * Uses the registration pattern: server entry registers serverCookieImpl,
- * client entry registers clientCookieImpl. This avoids top-level value
- * imports from either environment and makes defineCookie isomorphic
- * without `typeof window` checks.
+ * Environment detection is call-time: on the server, getCookieJar() is
+ * used directly (ALS-backed). On the client, document.cookie helpers
+ * and the useCookie hook are used. No registration pattern — imports
+ * resolve via the shims plugin (client bundle gets a stub for
+ * @timber-js/app/server).
  *
  * Standard Schema objects (Zod, Valibot, ArkType) are auto-detected in
  * the codec option — no explicit fromSchema() wrapper needed.
@@ -71,119 +72,76 @@ export interface CookieDefinition<T> extends ServerOnlyCookieDefinition<T> {
   useCookie(): [T, (value: T) => void, () => void];
 }
 
-// ─── Registration Pattern ─────────────────────────────────────────────────
+// ─── Direct Imports (no registration) ─────────────────────────────────────
 //
-// Server and client entries register their implementations at module load
-// time. This avoids dynamic imports (which lose ALS context) and typeof
-// window checks (which are fragile).
-
-/** Server-side cookie impl: reads from ALS-backed cookie jar. */
-export interface ServerCookieImpl {
-  getCookieJar(): {
-    get(name: string): string | undefined;
-    set(name: string, value: string, options?: CookieOptions): void;
-    delete(name: string, options?: Pick<CookieOptions, 'path' | 'domain'>): void;
-  };
-}
-
-/** Client-side cookie impl: reads/writes document.cookie via useCookie hook. */
-export interface ClientCookieImpl {
-  useCookie(
-    name: string,
-    options?: ClientCookieOptions
-  ): [string | undefined, (value: string, options?: ClientCookieOptions) => void, () => void];
-  getCookieValue(name: string): string | undefined;
-  setCookieValue(name: string, value: string, options?: ClientCookieOptions): void;
-  deleteCookieValue(name: string, options?: ClientCookieOptions): void;
-}
+// Server: getCookieJar is imported from @timber-js/app/server. In the client
+// bundle, the shims plugin replaces @timber-js/app/server with a stub module
+// where getCookieJar throws on call. We detect the environment at call time
+// by trying getCookieJar() — if it throws the stub error, we fall through
+// to the client path.
+//
+// Client: useCookie, getCookieValue, notifyCookieChange
+// are imported from use-cookie.ts. These are safe in all environments (no
+// node:async_hooks dependency).
+//
+// Schema: fromSchema is a pure function — safe in all environments.
 
-let _serverImpl: ServerCookieImpl | undefined;
-let _clientImpl: ClientCookieImpl | undefined;
-let _fromSchemaFn: ((schema: StandardSchemaV1<unknown>) => CookieCodec<unknown>) | undefined;
+import { getCookieJar } from '@timber-js/app/server';
+import { fromSchema } from '../schema-bridge.js';
+import {
+  useCookie as useRawCookie,
+  notifyCookieChange,
+  getCookieValue,
+} from '../client/use-cookie.js';
 
-/**
- * Register the server-side cookie implementation.
- * Called by server entry at module load time.
- * @internal
- */
-export function _registerServerCookieImpl(impl: ServerCookieImpl): void {
-  _serverImpl = impl;
-}
+// ─── Environment Detection ────────────────────────────────────────────────
 
 /**
- * Register the client-side cookie implementation.
- * Called by client entry at module load time.
- * @internal
+ * Try to get the server cookie jar. Returns null if we're in the client
+ * environment (stub throws) or if there's no request context.
+ *
+ * On the server, getCookieJar() throws "outside of a request context" if
+ * called without an ALS store — this is a real error and is re-thrown.
+ * The client stub throws a different message — that's caught and returns null.
  */
-export function _registerClientCookieImpl(impl: ClientCookieImpl): void {
-  _clientImpl = impl;
+function tryGetServerCookieJar(): ReturnType<typeof getCookieJar> | null {
+  try {
+    return getCookieJar();
+  } catch (e) {
+    // Server-side "no request context" error — re-throw as a real bug.
+    if (e instanceof Error && e.message.includes('outside of a request context')) {
+      throw e;
+    }
+    // Client stub error or other — fall through to client path.
+    return null;
+  }
 }
 
-/**
- * Register the fromSchema bridge function.
- * Called by server/client entry at module load time.
- * @internal
- */
-export function _registerFromSchema(
-  fn: (schema: StandardSchemaV1<unknown>) => CookieCodec<unknown>
-): void {
-  _fromSchemaFn = fn;
+// ─── Client Cookie Helpers ────────────────────────────────────────────────
+
+/** Write a cookie via document.cookie and notify useCookie subscribers. */
+function setClientCookie(name: string, value: string, options?: ClientCookieOptions): void {
+  const parts: string[] = [`${name}=${encodeURIComponent(value)}`];
+  const path = options?.path ?? '/';
+  parts.push(`Path=${path}`);
+  if (options?.domain) parts.push(`Domain=${options.domain}`);
+  if (options?.maxAge !== undefined) parts.push(`Max-Age=${options.maxAge}`);
+  if (options?.expires) parts.push(`Expires=${options.expires.toUTCString()}`);
+  const sameSite = options?.sameSite ?? 'lax';
+  parts.push(`SameSite=${sameSite.charAt(0).toUpperCase()}${sameSite.slice(1)}`);
+  if (options?.secure) parts.push('Secure');
+  document.cookie = parts.join('; ');
+  notifyCookieChange(name);
 }
 
-// Legacy registration for useCookie module — still used by client/index.ts
-let _useCookieModule: typeof import('../client/use-cookie.js') | undefined;
-
-function getUseCookieModule(): typeof import('../client/use-cookie.js') {
-  if (!_useCookieModule) {
-    throw new Error(
-      '[timber] defineCookie().useCookie() requires @timber-js/app/client to be loaded. ' +
-        'This hook can only be used in client components.'
-    );
-  }
-  return _useCookieModule;
-}
-
-/**
- * Register the client cookie module. Called by the client entry to wire
- * up the lazy reference without a top-level import.
- *
- * @internal — framework use only
- */
-export function _registerUseCookieModule(mod: typeof import('../client/use-cookie.js')): void {
-  _useCookieModule = mod;
-  // Also register the client impl from the module
-  _clientImpl = {
-    useCookie: mod.useCookie,
-    getCookieValue: (name: string) => {
-      if (typeof document === 'undefined') return undefined;
-      const match = document.cookie.match(
-        new RegExp('(?:^|;\\s*)' + name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\s*=\\s*([^;]*)')
-      );
-      return match ? decodeURIComponent(match[1]) : undefined;
-    },
-    setCookieValue: (name: string, value: string, options?: ClientCookieOptions) => {
-      const parts: string[] = [`${name}=${encodeURIComponent(value)}`];
-      const path = options?.path ?? '/';
-      parts.push(`Path=${path}`);
-      if (options?.domain) parts.push(`Domain=${options.domain}`);
-      if (options?.maxAge !== undefined) parts.push(`Max-Age=${options.maxAge}`);
-      if (options?.expires) parts.push(`Expires=${options.expires.toUTCString()}`);
-      const sameSite = options?.sameSite ?? 'lax';
-      parts.push(`SameSite=${sameSite.charAt(0).toUpperCase()}${sameSite.slice(1)}`);
-      if (options?.secure) parts.push('Secure');
-      document.cookie = parts.join('; ');
-      // Notify useCookie subscribers so mounted hooks re-render
-      mod.notifyCookieChange(name);
-    },
-    deleteCookieValue: (name: string, options?: ClientCookieOptions) => {
-      const path = options?.path ?? '/';
-      const domain = options?.domain;
-      let cookieStr = `${name}=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=${path}`;
-      if (domain) cookieStr += `; Domain=${domain}`;
-      document.cookie = cookieStr;
-      mod.notifyCookieChange(name);
-    },
-  };
+/** Delete a cookie via document.cookie and notify useCookie subscribers. */
+function deleteClientCookie(name: string, options?: ClientCookieOptions): void {
+  const path = options?.path ?? '/';
+  const domain = options?.domain;
+  let cookieStr = `${name}=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=${path}`;
+  if (domain) cookieStr += `; Domain=${domain}`;
+  document.cookie = cookieStr;
+  notifyCookieChange(name);
 }
 
 // ─── Standard Schema Auto-Detection ───────────────────────────────────────
@@ -199,14 +157,7 @@ function resolveCodec<T>(codecOrSchema: CookieCodec<T> | StandardSchemaV1<T>): C
 
   // Auto-detect Standard Schema
   if (typeof codecOrSchema === 'object' && codecOrSchema !== null && '~standard' in codecOrSchema) {
-    if (!_fromSchemaFn) {
-      throw new Error(
-        '[timber] defineCookie: Standard Schema auto-detection requires @timber-js/app/server or ' +
-          '@timber-js/app/client to be loaded. Pass an explicit Codec<T> with parse/serialize methods, ' +
-          'or ensure the framework entry module is imported.'
-      );
-    }
-    return _fromSchemaFn(codecOrSchema as StandardSchemaV1<unknown>) as CookieCodec<T>;
+    return fromSchema(codecOrSchema as StandardSchemaV1<unknown>) as CookieCodec<T>;
   }
 
   throw new Error(
@@ -266,88 +217,73 @@ export function defineCookie<T, HttpOnly extends boolean = true>(
     };
   }
 
-  function assertNotHttpOnlyClient(method: string): void {
-    if (isHttpOnly && !_serverImpl) {
-      throw new Error(
-        `[timber] defineCookie('${name}').${method}() cannot be used with httpOnly cookies — ` +
-          `the browser cannot access them. Set httpOnly: false to enable client access.`
-      );
-    }
-  }
-
   const base: ServerOnlyCookieDefinition<T> = {
     name,
     options: resolvedOptions,
     codec,
 
     get(): T {
-      if (_serverImpl) {
-        const jar = _serverImpl.getCookieJar();
-        const raw = jar.get(name);
-        return codec.parse(raw);
+      const serverJar = tryGetServerCookieJar();
+      if (serverJar) {
+        return codec.parse(serverJar.get(name));
       }
       // Client path
-      assertNotHttpOnlyClient('get');
-      if (_clientImpl) {
-        const raw = _clientImpl.getCookieValue(name);
-        return codec.parse(raw);
+      if (isHttpOnly) {
+        throw new Error(
+          `[timber] defineCookie('${name}').get() cannot be used with httpOnly cookies — ` +
+            `the browser cannot access them. Set httpOnly: false to enable client access.`
+        );
       }
-      throw new Error(
-        `[timber] defineCookie('${name}').get() — no environment registered. ` +
-          'Ensure @timber-js/app/server or @timber-js/app/client is imported.'
-      );
+      const raw = getCookieValue(name);
+      return codec.parse(raw);
     },
 
     set(value: T): void {
-      if (_serverImpl) {
-        const jar = _serverImpl.getCookieJar();
+      const serverJar = tryGetServerCookieJar();
+      if (serverJar) {
         const serialized = codec.serialize(value);
         if (serialized === null) {
-          jar.delete(name, {
+          serverJar.delete(name, {
             path: resolvedOptions.path,
             domain: resolvedOptions.domain,
           });
         } else {
-          jar.set(name, serialized, resolvedOptions);
+          serverJar.set(name, serialized, resolvedOptions);
         }
         return;
       }
       // Client path
-      assertNotHttpOnlyClient('set');
-      if (_clientImpl) {
-        const serialized = codec.serialize(value);
-        if (serialized === null) {
-          _clientImpl.deleteCookieValue(name, getClientOpts());
-        } else {
-          _clientImpl.setCookieValue(name, serialized, getClientOpts());
-        }
-        return;
+      if (isHttpOnly) {
+        throw new Error(
+          `[timber] defineCookie('${name}').set() cannot be used with httpOnly cookies — ` +
+            `the browser cannot access them. Set httpOnly: false to enable client access.`
+        );
+      }
+      const serialized = codec.serialize(value);
+      if (serialized === null) {
+        deleteClientCookie(name, getClientOpts());
+      } else {
+        setClientCookie(name, serialized, getClientOpts());
       }
-      throw new Error(
-        `[timber] defineCookie('${name}').set() — no environment registered. ` +
-          'Ensure @timber-js/app/server or @timber-js/app/client is imported.'
-      );
     },
 
     delete(): void {
-      if (_serverImpl) {
-        const jar = _serverImpl.getCookieJar();
-        jar.delete(name, {
+      const serverJar = tryGetServerCookieJar();
+      if (serverJar) {
+        serverJar.delete(name, {
           path: resolvedOptions.path,
           domain: resolvedOptions.domain,
         });
         return;
       }
       // Client path
-      assertNotHttpOnlyClient('delete');
-      if (_clientImpl) {
-        _clientImpl.deleteCookieValue(name, getClientOpts());
-        return;
+      if (isHttpOnly) {
+        throw new Error(
+          `[timber] defineCookie('${name}').delete() cannot be used with httpOnly cookies — ` +
+            `the browser cannot access them. Set httpOnly: false to enable client access.`
+        );
       }
-      throw new Error(
-        `[timber] defineCookie('${name}').delete() — no environment registered. ` +
-          'Ensure @timber-js/app/server or @timber-js/app/client is imported.'
-      );
+      deleteClientCookie(name, getClientOpts());
     },
   };
 
@@ -360,8 +296,6 @@ export function defineCookie<T, HttpOnly extends boolean = true>(
     ...base,
 
     useCookie(): [T, (value: T) => void, () => void] {
-      const { useCookie: useRawCookie } = getUseCookieModule();
-
       const clientOpts = getClientOpts();
       const [raw, setRaw, deleteRaw] = useRawCookie(name, clientOpts);
       const parsed = codec.parse(raw);