@timber-js/app 0.1.28 → 0.1.30

package/dist/cli.d.ts

@@ -13,17 +13,23 @@ export interface CommandOptions {
  * Accepts: timber <command> [--config|-c <path>]
  */
 export declare function parseArgs(args: string[]): ParsedArgs;
+/** @internal Dependency injection for testing. */
+export interface ViteDeps {
+    createServer?: typeof import('vite').createServer;
+    createBuilder?: typeof import('vite').createBuilder;
+    preview?: typeof import('vite').preview;
+}
 /**
  * Start the Vite dev server.
  * Middleware re-runs on file change via HMR wiring in timber-routing.
  */
-export declare function runDev(options: CommandOptions): Promise<void>;
+export declare function runDev(options: CommandOptions, _deps?: ViteDeps): Promise<void>;
 /**
  * Run the production build using createBuilder + buildApp.
  * Direct build() calls do NOT trigger the RSC plugin's multi-environment
  * pipeline — createBuilder/buildApp is required.
  */
-export declare function runBuild(options: CommandOptions): Promise<void>;
+export declare function runBuild(options: CommandOptions, _deps?: ViteDeps): Promise<void>;
 /**
  * Determine whether to use the adapter's preview or Vite's built-in preview.
  * Exported for testing — the actual runPreview function uses this internally.
@@ -34,7 +40,7 @@ export declare function resolvePreviewStrategy(adapter: import('./adapters/types
  * If the adapter provides a preview() method, it takes priority.
  * Otherwise falls back to Vite's built-in preview server.
  */
-export declare function runPreview(options: CommandOptions): Promise<void>;
+export declare function runPreview(options: CommandOptions, _deps?: ViteDeps): Promise<void>;
 /**
  * Validate types and routes without producing build output.
  * Runs tsgo --noEmit for type checking.

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAaA,QAAA,MAAM,QAAQ,+CAAgD,CAAC;AAC/D,KAAK,OAAO,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAEzC,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAuBpD;AAID;;;GAGG;AACH,wBAAsB,MAAM,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAOnE;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,kBAAkB,EAAE,qBAAqB,GAAG,SAAS,GACpE,SAAS,GAAG,MAAM,CAKpB;AA2BD;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBvE;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAerE"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAaA,QAAA,MAAM,QAAQ,+CAAgD,CAAC;AAC/D,KAAK,OAAO,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAEzC,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAuBpD;AAID,kDAAkD;AAClD,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,EAAE,cAAc,MAAM,EAAE,YAAY,CAAC;IAClD,aAAa,CAAC,EAAE,cAAc,MAAM,EAAE,aAAa,CAAC;IACpD,OAAO,CAAC,EAAE,cAAc,MAAM,EAAE,OAAO,CAAC;CACzC;AAED;;;GAGG;AACH,wBAAsB,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOrF;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAMvF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,kBAAkB,EAAE,qBAAqB,GAAG,SAAS,GACpE,SAAS,GAAG,MAAM,CAKpB;AA2BD;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBzF;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAerE"}

package/dist/cli.js

@@ -28,9 +28,8 @@ function parseArgs(args) {
 * Start the Vite dev server.
 * Middleware re-runs on file change via HMR wiring in timber-routing.
 */
-async function runDev(options) {
-	const { createServer } = await import("vite");
-	const server = await createServer({ configFile: options.config });
+async function runDev(options, _deps) {
+	const server = await (_deps?.createServer ?? (await import("vite")).createServer)({ configFile: options.config });
 	await server.listen();
 	server.printUrls();
 }
@@ -39,9 +38,8 @@ async function runDev(options) {
 * Direct build() calls do NOT trigger the RSC plugin's multi-environment
 * pipeline — createBuilder/buildApp is required.
 */
-async function runBuild(options) {
-	const { createBuilder } = await import("vite");
-	await (await createBuilder({ configFile: options.config })).buildApp();
+async function runBuild(options, _deps) {
+	await (await (_deps?.createBuilder ?? (await import("vite")).createBuilder)({ configFile: options.config })).buildApp();
 }
 /**
 * Determine whether to use the adapter's preview or Vite's built-in preview.
@@ -78,7 +76,7 @@ async function loadTimberConfig(root) {
 * If the adapter provides a preview() method, it takes priority.
 * Otherwise falls back to Vite's built-in preview server.
 */
-async function runPreview(options) {
+async function runPreview(options, _deps) {
 	const { join } = await import("node:path");
 	const root = process.cwd();
 	const config = await loadTimberConfig(root).catch(() => null);
@@ -89,8 +87,7 @@ async function runPreview(options) {
 		await adapter.preview(timberConfig, buildDir);
 		return;
 	}
-	const { preview } = await import("vite");
-	(await preview({ configFile: options.config })).printUrls();
+	(await (_deps?.preview ?? (await import("vite")).preview)({ configFile: options.config })).printUrls();
 }
 /**
 * Validate types and routes without producing build output.

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","names":[],"sources":["../src/cli.ts"],"sourcesContent":["#!/usr/bin/env node\n\n// timber.js CLI\n//\n// Wraps Vite commands with timber-specific behavior.\n// See design/18-build-system.md §\"CLI\".\n//\n// Commands:\n//   timber dev      — Start Vite dev server with HMR\n//   timber build    — Run multi-environment build via createBuilder/buildApp\n//   timber preview  — Serve the production build\n//   timber check    — Validate types + routes without building\n\nconst COMMANDS = ['dev', 'build', 'preview', 'check'] as const;\ntype Command = (typeof COMMANDS)[number];\n\nexport interface ParsedArgs {\n  command: Command;\n  config: string | undefined;\n}\n\nexport interface CommandOptions {\n  config?: string;\n}\n\n/**\n * Parse CLI arguments into a structured command + options.\n * Accepts: timber <command> [--config|-c <path>]\n */\nexport function parseArgs(args: string[]): ParsedArgs {\n  if (args.length === 0) {\n    throw new Error(\n      'No command provided. Usage: timber <dev|build|preview|check> [--config <path>]'\n    );\n  }\n\n  const command = args[0];\n  if (!COMMANDS.includes(command as Command)) {\n    throw new Error(`Unknown command: ${command}. Available commands: ${COMMANDS.join(', ')}`);\n  }\n\n  let config: string | undefined;\n  for (let i = 1; i < args.length; i++) {\n    if (args[i] === '--config' || args[i] === '-c') {\n      config = args[++i];\n      if (!config) {\n        throw new Error('--config requires a path argument');\n      }\n    }\n  }\n\n  return { command: command as Command, config };\n}\n\n// ─── Command Implementations ─────────────────────────────────────────────────\n\n/**\n * Start the Vite dev server.\n * Middleware re-runs on file change via HMR wiring in timber-routing.\n */\nexport async function runDev(options: CommandOptions): Promise<void> {\n  const { createServer } = await import('vite');\n  const server = await createServer({\n    configFile: options.config,\n  });\n  await server.listen();\n  server.printUrls();\n}\n\n/**\n * Run the production build using createBuilder + buildApp.\n * Direct build() calls do NOT trigger the RSC plugin's multi-environment\n * pipeline — createBuilder/buildApp is required.\n */\nexport async function runBuild(options: CommandOptions): Promise<void> {\n  const { createBuilder } = await import('vite');\n  const builder = await createBuilder({\n    configFile: options.config,\n  });\n  await builder.buildApp();\n}\n\n/**\n * Determine whether to use the adapter's preview or Vite's built-in preview.\n * Exported for testing — the actual runPreview function uses this internally.\n */\nexport function resolvePreviewStrategy(\n  adapter: import('./adapters/types').TimberPlatformAdapter | undefined\n): 'adapter' | 'vite' {\n  if (adapter && typeof adapter.preview === 'function') {\n    return 'adapter';\n  }\n  return 'vite';\n}\n\n/**\n * Load timber.config.ts from the project root.\n * Returns the config object with adapter, output, etc.\n * Returns null if no config file is found.\n */\nasync function loadTimberConfig(\n  root: string\n): Promise<{ adapter?: import('./adapters/types').TimberPlatformAdapter; output?: string } | null> {\n  const { existsSync } = await import('node:fs');\n  const { join } = await import('node:path');\n  const { pathToFileURL } = await import('node:url');\n\n  const configNames = ['timber.config.ts', 'timber.config.js', 'timber.config.mjs'];\n\n  for (const name of configNames) {\n    const configPath = join(root, name);\n    if (existsSync(configPath)) {\n      // Use Vite's built-in config loading to handle TypeScript\n      const mod = await import(pathToFileURL(configPath).href);\n      return mod.default ?? mod;\n    }\n  }\n  return null;\n}\n\n/**\n * Serve the production build for local testing.\n * If the adapter provides a preview() method, it takes priority.\n * Otherwise falls back to Vite's built-in preview server.\n */\nexport async function runPreview(options: CommandOptions): Promise<void> {\n  const { join } = await import('node:path');\n\n  // Try to load timber config for adapter-specific preview\n  const root = process.cwd();\n  const config = await loadTimberConfig(root).catch(() => null);\n  const adapter = config?.adapter as import('./adapters/types').TimberPlatformAdapter | undefined;\n\n  if (resolvePreviewStrategy(adapter) === 'adapter') {\n    const buildDir = join(root, 'dist');\n    const timberConfig = { output: (config?.output ?? 'server') as 'server' | 'static' };\n    await adapter!.preview!(timberConfig, buildDir);\n    return;\n  }\n\n  // Fallback: Vite's built-in preview server\n  const { preview } = await import('vite');\n  const server = await preview({\n    configFile: options.config,\n  });\n  server.printUrls();\n}\n\n/**\n * Validate types and routes without producing build output.\n * Runs tsgo --noEmit for type checking.\n */\nexport async function runCheck(options: CommandOptions): Promise<void> {\n  const { execFile } = await import('node:child_process');\n\n  await new Promise<void>((resolve, reject) => {\n    const configArgs = options.config ? ['--project', options.config] : [];\n    execFile('tsgo', ['--noEmit', ...configArgs], (err, stdout, stderr) => {\n      if (stdout) process.stdout.write(stdout);\n      if (stderr) process.stderr.write(stderr);\n      if (err) {\n        reject(new Error(`Type check failed with exit code ${err.code}`));\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n// ─── Main Entry Point ────────────────────────────────────────────────────────\n\nasync function main(): Promise<void> {\n  const parsed = parseArgs(process.argv.slice(2));\n  const options: CommandOptions = { config: parsed.config };\n\n  switch (parsed.command) {\n    case 'dev':\n      await runDev(options);\n      break;\n    case 'build':\n      await runBuild(options);\n      break;\n    case 'preview':\n      await runPreview(options);\n      break;\n    case 'check':\n      await runCheck(options);\n      break;\n  }\n}\n\n// Run main when executed as a CLI (not imported in tests).\n// The bin shim (bin/timber.mjs) does `import '../dist/cli.js'`, so\n// process.argv[1] points to the shim, not this file. We check both:\n// direct execution AND being imported by the timber bin shim.\nconst isDirectExecution =\n  typeof process !== 'undefined' &&\n  process.argv[1] &&\n  (import.meta.url.endsWith(process.argv[1]) ||\n    process.argv[1].endsWith('bin/timber.mjs') ||\n    process.argv[1].endsWith('bin/timber'));\n\nif (isDirectExecution) {\n  main().catch((err) => {\n    console.error(err.message);\n    process.exit(1);\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"cli.js","names":[],"sources":["../src/cli.ts"],"sourcesContent":["#!/usr/bin/env node\n\n// timber.js CLI\n//\n// Wraps Vite commands with timber-specific behavior.\n// See design/18-build-system.md §\"CLI\".\n//\n// Commands:\n//   timber dev      — Start Vite dev server with HMR\n//   timber build    — Run multi-environment build via createBuilder/buildApp\n//   timber preview  — Serve the production build\n//   timber check    — Validate types + routes without building\n\nconst COMMANDS = ['dev', 'build', 'preview', 'check'] as const;\ntype Command = (typeof COMMANDS)[number];\n\nexport interface ParsedArgs {\n  command: Command;\n  config: string | undefined;\n}\n\nexport interface CommandOptions {\n  config?: string;\n}\n\n/**\n * Parse CLI arguments into a structured command + options.\n * Accepts: timber <command> [--config|-c <path>]\n */\nexport function parseArgs(args: string[]): ParsedArgs {\n  if (args.length === 0) {\n    throw new Error(\n      'No command provided. Usage: timber <dev|build|preview|check> [--config <path>]'\n    );\n  }\n\n  const command = args[0];\n  if (!COMMANDS.includes(command as Command)) {\n    throw new Error(`Unknown command: ${command}. Available commands: ${COMMANDS.join(', ')}`);\n  }\n\n  let config: string | undefined;\n  for (let i = 1; i < args.length; i++) {\n    if (args[i] === '--config' || args[i] === '-c') {\n      config = args[++i];\n      if (!config) {\n        throw new Error('--config requires a path argument');\n      }\n    }\n  }\n\n  return { command: command as Command, config };\n}\n\n// ─── Command Implementations ─────────────────────────────────────────────────\n\n/** @internal Dependency injection for testing. */\nexport interface ViteDeps {\n  createServer?: typeof import('vite').createServer;\n  createBuilder?: typeof import('vite').createBuilder;\n  preview?: typeof import('vite').preview;\n}\n\n/**\n * Start the Vite dev server.\n * Middleware re-runs on file change via HMR wiring in timber-routing.\n */\nexport async function runDev(options: CommandOptions, _deps?: ViteDeps): Promise<void> {\n  const createServer = _deps?.createServer ?? (await import('vite')).createServer;\n  const server = await createServer({\n    configFile: options.config,\n  });\n  await server.listen();\n  server.printUrls();\n}\n\n/**\n * Run the production build using createBuilder + buildApp.\n * Direct build() calls do NOT trigger the RSC plugin's multi-environment\n * pipeline — createBuilder/buildApp is required.\n */\nexport async function runBuild(options: CommandOptions, _deps?: ViteDeps): Promise<void> {\n  const createBuilder = _deps?.createBuilder ?? (await import('vite')).createBuilder;\n  const builder = await createBuilder({\n    configFile: options.config,\n  });\n  await builder.buildApp();\n}\n\n/**\n * Determine whether to use the adapter's preview or Vite's built-in preview.\n * Exported for testing — the actual runPreview function uses this internally.\n */\nexport function resolvePreviewStrategy(\n  adapter: import('./adapters/types').TimberPlatformAdapter | undefined\n): 'adapter' | 'vite' {\n  if (adapter && typeof adapter.preview === 'function') {\n    return 'adapter';\n  }\n  return 'vite';\n}\n\n/**\n * Load timber.config.ts from the project root.\n * Returns the config object with adapter, output, etc.\n * Returns null if no config file is found.\n */\nasync function loadTimberConfig(\n  root: string\n): Promise<{ adapter?: import('./adapters/types').TimberPlatformAdapter; output?: string } | null> {\n  const { existsSync } = await import('node:fs');\n  const { join } = await import('node:path');\n  const { pathToFileURL } = await import('node:url');\n\n  const configNames = ['timber.config.ts', 'timber.config.js', 'timber.config.mjs'];\n\n  for (const name of configNames) {\n    const configPath = join(root, name);\n    if (existsSync(configPath)) {\n      // Use Vite's built-in config loading to handle TypeScript\n      const mod = await import(pathToFileURL(configPath).href);\n      return mod.default ?? mod;\n    }\n  }\n  return null;\n}\n\n/**\n * Serve the production build for local testing.\n * If the adapter provides a preview() method, it takes priority.\n * Otherwise falls back to Vite's built-in preview server.\n */\nexport async function runPreview(options: CommandOptions, _deps?: ViteDeps): Promise<void> {\n  const { join } = await import('node:path');\n\n  // Try to load timber config for adapter-specific preview\n  const root = process.cwd();\n  const config = await loadTimberConfig(root).catch(() => null);\n  const adapter = config?.adapter as import('./adapters/types').TimberPlatformAdapter | undefined;\n\n  if (resolvePreviewStrategy(adapter) === 'adapter') {\n    const buildDir = join(root, 'dist');\n    const timberConfig = { output: (config?.output ?? 'server') as 'server' | 'static' };\n    await adapter!.preview!(timberConfig, buildDir);\n    return;\n  }\n\n  // Fallback: Vite's built-in preview server\n  const preview = _deps?.preview ?? (await import('vite')).preview;\n  const server = await preview({\n    configFile: options.config,\n  });\n  server.printUrls();\n}\n\n/**\n * Validate types and routes without producing build output.\n * Runs tsgo --noEmit for type checking.\n */\nexport async function runCheck(options: CommandOptions): Promise<void> {\n  const { execFile } = await import('node:child_process');\n\n  await new Promise<void>((resolve, reject) => {\n    const configArgs = options.config ? ['--project', options.config] : [];\n    execFile('tsgo', ['--noEmit', ...configArgs], (err, stdout, stderr) => {\n      if (stdout) process.stdout.write(stdout);\n      if (stderr) process.stderr.write(stderr);\n      if (err) {\n        reject(new Error(`Type check failed with exit code ${err.code}`));\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n// ─── Main Entry Point ────────────────────────────────────────────────────────\n\nasync function main(): Promise<void> {\n  const parsed = parseArgs(process.argv.slice(2));\n  const options: CommandOptions = { config: parsed.config };\n\n  switch (parsed.command) {\n    case 'dev':\n      await runDev(options);\n      break;\n    case 'build':\n      await runBuild(options);\n      break;\n    case 'preview':\n      await runPreview(options);\n      break;\n    case 'check':\n      await runCheck(options);\n      break;\n  }\n}\n\n// Run main when executed as a CLI (not imported in tests).\n// The bin shim (bin/timber.mjs) does `import '../dist/cli.js'`, so\n// process.argv[1] points to the shim, not this file. We check both:\n// direct execution AND being imported by the timber bin shim.\nconst isDirectExecution =\n  typeof process !== 'undefined' &&\n  process.argv[1] &&\n  (import.meta.url.endsWith(process.argv[1]) ||\n    process.argv[1].endsWith('bin/timber.mjs') ||\n    process.argv[1].endsWith('bin/timber'));\n\nif (isDirectExecution) {\n  main().catch((err) => {\n    console.error(err.message);\n    process.exit(1);\n  });\n}\n"],"mappings":"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"}

package/dist/client/index.js

@@ -4,9 +4,8 @@ import { n as useQueryStates, t as bindUseQueryStates } from "../_chunks/use-que
 import { t as useCookie } from "../_chunks/use-cookie-dDbpCTx-.js";
 import { TimberErrorBoundary } from "./error-boundary.js";
 import React, { createContext, createElement, useActionState as useActionState$1, useContext, useEffect, useMemo, useRef, useSyncExternalStore, useTransition } from "react";
-import { jsxDEV } from "react/jsx-dev-runtime";
+import { jsx } from "react/jsx-runtime";
 //#region src/client/link-navigate-interceptor.tsx
-var _jsxFileName$2 = "/Users/dsaewitz/y/timber-js-fresh/packages/timber-app/src/client/link-navigate-interceptor.tsx";
 /** Symbol used to store the onNavigate callback on anchor elements. */
 var ON_NAVIGATE_KEY = "__timberOnNavigate";
 /**
@@ -26,15 +25,11 @@ function LinkNavigateInterceptor({ onNavigate, children }) {
 			delete anchor[ON_NAVIGATE_KEY];
 		};
 	}, [onNavigate]);
-	return /* @__PURE__ */ jsxDEV("span", {
+	return /* @__PURE__ */ jsx("span", {
 		ref,
 		style: { display: "contents" },
 		children
-	}, void 0, false, {
-		fileName: _jsxFileName$2,
-		lineNumber: 58,
-		columnNumber: 5
-	}, this);
+	});
 }
 //#endregion
 //#region src/client/use-link-status.ts
@@ -72,66 +67,111 @@ function useLinkStatus() {
 	return useContext(LinkStatusContext);
 }
 //#endregion
-//#region src/client/router-ref.ts
+//#region src/client/navigation-context.ts
 /**
-* Set the global router instance. Called once during bootstrap.
+* NavigationContext — React context for navigation state.
+*
+* Holds the current route params and pathname, updated atomically
+* with the RSC tree on each navigation. This replaces the previous
+* useSyncExternalStore approach for useParams() and usePathname(),
+* which suffered from a timing gap: the new tree could commit before
+* the external store re-renders fired, causing a frame where both
+* old and new active states were visible simultaneously.
+*
+* By wrapping the RSC payload element in NavigationProvider inside
+* renderRoot(), the context value and the element tree are passed to
+* reactRoot.render() in the same call — atomic by construction.
+* All consumers (useParams, usePathname) see the new values in the
+* same render pass as the new tree.
+*
+* During SSR, no NavigationProvider is mounted. Hooks fall back to
+* the ALS-backed getSsrData() for per-request isolation.
+*
+* IMPORTANT: createContext and useContext are NOT available in the RSC
+* environment (React Server Components use a stripped-down React).
+* The context is lazily initialized on first access, and all functions
+* that depend on these APIs are safe to call from any environment —
+* they return null or no-op when the APIs aren't available.
+*
+* See design/19-client-navigation.md §"NavigationContext"
 */
-function setGlobalRouter(router) {
-	_setGlobalRouter(router);
+/**
+* The context is created lazily to avoid calling createContext at module
+* level. In the RSC environment, React.createContext doesn't exist —
+* calling it at import time would crash the server.
+*/
+var _context;
+function getOrCreateContext() {
+	if (_context !== void 0) return _context;
+	if (typeof React.createContext === "function") _context = React.createContext(null);
+	return _context;
 }
 /**
-* Get the global router instance. Throws if called before bootstrap.
-* Used by client-side hooks (useNavigationPending, etc.)
+* Read the navigation context. Returns null during SSR (no provider)
+* or in the RSC environment (no context available).
+* Internal — used by useParams() and usePathname().
 */
-function getRouter() {
-	if (!globalRouter) throw new Error("[timber] Router not initialized. getRouter() was called before bootstrap().");
-	return globalRouter;
+function useNavigationContext() {
+	const ctx = getOrCreateContext();
+	if (!ctx) return null;
+	if (typeof React.useContext !== "function") return null;
+	return React.useContext(ctx);
 }
 /**
-* Get the global router instance or null if not yet initialized.
-* Used by useRouter() methods to avoid silent failures — callers
-* can log a meaningful warning instead of silently no-oping.
+* Wraps children with NavigationContext.Provider.
+*
+* Used in browser-entry.ts renderRoot to wrap the RSC payload element
+* so that navigation state updates atomically with the tree render.
 */
-function getRouterOrNull() {
-	return globalRouter;
+function NavigationProvider({ value, children }) {
+	const ctx = getOrCreateContext();
+	if (!ctx) return children;
+	return createElement(ctx.Provider, { value }, children);
+}
+/**
+* Module-level navigation state. Updated by the router before calling
+* renderRoot(). The renderRoot callback reads this to create the
+* NavigationProvider with the correct values.
+*
+* This is NOT used by hooks directly — hooks read from React context.
+* This exists only as a communication channel between the router
+* (which knows the new nav state) and renderRoot (which wraps the element).
+*/
+var _currentNavState = {
+	params: {},
+	pathname: "/",
+	pendingUrl: null
+};
+function setNavigationState(state) {
+	_currentNavState = state;
+}
+function getNavigationState() {
+	return _currentNavState;
 }
 //#endregion
 //#region src/client/link-status-provider.tsx
-var _jsxFileName$1 = "/Users/dsaewitz/y/timber-js-fresh/packages/timber-app/src/client/link-status-provider.tsx";
 var NOT_PENDING = { pending: false };
 var IS_PENDING = { pending: true };
 /**
-* Client component that subscribes to the router's pending URL and provides
-* a scoped LinkStatusContext to children. Renders no extra DOM — just a
-* context provider around children.
+* Client component that reads the pending URL from NavigationContext and
+* provides a scoped LinkStatusContext to children. Renders no extra DOM —
+* just a context provider around children.
+*
+* Because pendingUrl lives in NavigationContext alongside params and pathname,
+* all three update in the same React commit via renderRoot(). This eliminates
+* the two-commit timing gap that existed when pendingUrl was read via
+* useSyncExternalStore (external module-level state) while params came from
+* NavigationContext (React context).
 */
 function LinkStatusProvider({ href, children }) {
-	const status = useSyncExternalStore((callback) => {
-		try {
-			return getRouter().onPendingChange(callback);
-		} catch {
-			return () => {};
-		}
-	}, () => {
-		try {
-			if (getRouter().getPendingUrl() === href) return IS_PENDING;
-			return NOT_PENDING;
-		} catch {
-			return NOT_PENDING;
-		}
-	}, () => NOT_PENDING);
-	return /* @__PURE__ */ jsxDEV(LinkStatusContext.Provider, {
+	const status = useNavigationContext()?.pendingUrl === href ? IS_PENDING : NOT_PENDING;
+	return /* @__PURE__ */ jsx(LinkStatusContext.Provider, {
 		value: status,
 		children
-	}, void 0, false, {
-		fileName: _jsxFileName$1,
-		lineNumber: 39,
-		columnNumber: 10
-	}, this);
+	});
 }
 //#endregion
 //#region src/client/link.tsx
-var _jsxFileName = "/Users/dsaewitz/y/timber-js-fresh/packages/timber-app/src/client/link.tsx";
 /**
 * Reject dangerous URL schemes that could execute script.
 * Security: design/13-security.md § Link scheme injection (test #9)
@@ -227,30 +267,18 @@ function Link({ href, prefetch, scroll, params, searchParams, onNavigate, childr
 		params,
 		searchParams
 	});
-	const inner = /* @__PURE__ */ jsxDEV(LinkStatusProvider, {
+	const inner = /* @__PURE__ */ jsx(LinkStatusProvider, {
 		href: linkProps.href,
 		children
-	}, void 0, false, {
-		fileName: _jsxFileName,
-		lineNumber: 301,
-		columnNumber: 17
-	}, this);
-	return /* @__PURE__ */ jsxDEV("a", {
+	});
+	return /* @__PURE__ */ jsx("a", {
 		...rest,
 		...linkProps,
-		children: onNavigate ? /* @__PURE__ */ jsxDEV(LinkNavigateInterceptor, {
+		children: onNavigate ? /* @__PURE__ */ jsx(LinkNavigateInterceptor, {
 			onNavigate,
 			children: inner
-		}, void 0, false, {
-			fileName: _jsxFileName,
-			lineNumber: 306,
-			columnNumber: 9
-		}, this) : inner
-	}, void 0, false, {
-		fileName: _jsxFileName,
-		lineNumber: 304,
-		columnNumber: 5
-	}, this);
+		}) : inner
+	});
 }
 //#endregion
 //#region src/client/segment-cache.ts
@@ -379,87 +407,6 @@ var HistoryStack = class {
 	}
 };
 //#endregion
-//#region src/client/navigation-context.ts
-/**
-* NavigationContext — React context for navigation state.
-*
-* Holds the current route params and pathname, updated atomically
-* with the RSC tree on each navigation. This replaces the previous
-* useSyncExternalStore approach for useParams() and usePathname(),
-* which suffered from a timing gap: the new tree could commit before
-* the external store re-renders fired, causing a frame where both
-* old and new active states were visible simultaneously.
-*
-* By wrapping the RSC payload element in NavigationProvider inside
-* renderRoot(), the context value and the element tree are passed to
-* reactRoot.render() in the same call — atomic by construction.
-* All consumers (useParams, usePathname) see the new values in the
-* same render pass as the new tree.
-*
-* During SSR, no NavigationProvider is mounted. Hooks fall back to
-* the ALS-backed getSsrData() for per-request isolation.
-*
-* IMPORTANT: createContext and useContext are NOT available in the RSC
-* environment (React Server Components use a stripped-down React).
-* The context is lazily initialized on first access, and all functions
-* that depend on these APIs are safe to call from any environment —
-* they return null or no-op when the APIs aren't available.
-*
-* See design/19-client-navigation.md §"NavigationContext"
-*/
-/**
-* The context is created lazily to avoid calling createContext at module
-* level. In the RSC environment, React.createContext doesn't exist —
-* calling it at import time would crash the server.
-*/
-var _context;
-function getOrCreateContext() {
-	if (_context !== void 0) return _context;
-	if (typeof React.createContext === "function") _context = React.createContext(null);
-	return _context;
-}
-/**
-* Read the navigation context. Returns null during SSR (no provider)
-* or in the RSC environment (no context available).
-* Internal — used by useParams() and usePathname().
-*/
-function useNavigationContext() {
-	const ctx = getOrCreateContext();
-	if (!ctx) return null;
-	if (typeof React.useContext !== "function") return null;
-	return React.useContext(ctx);
-}
-/**
-* Wraps children with NavigationContext.Provider.
-*
-* Used in browser-entry.ts renderRoot to wrap the RSC payload element
-* so that navigation state updates atomically with the tree render.
-*/
-function NavigationProvider({ value, children }) {
-	const ctx = getOrCreateContext();
-	if (!ctx) return children;
-	return createElement(ctx.Provider, { value }, children);
-}
-/**
-* Module-level navigation state. Updated by the router before calling
-* renderRoot(). The renderRoot callback reads this to create the
-* NavigationProvider with the correct values.
-*
-* This is NOT used by hooks directly — hooks read from React context.
-* This exists only as a communication channel between the router
-* (which knows the new nav state) and renderRoot (which wraps the element).
-*/
-var _currentNavState = {
-	params: {},
-	pathname: "/"
-};
-function setNavigationState(state) {
-	_currentNavState = state;
-}
-function getNavigationState() {
-	return _currentNavState;
-}
-//#endregion
 //#region src/client/use-params.ts
 /**
 * Set the current route params in the module-level store.
@@ -639,12 +586,21 @@ function createRouter(deps) {
 	let pending = false;
 	let pendingUrl = null;
 	const pendingListeners = /* @__PURE__ */ new Set();
+	/** Last rendered payload — used to re-render at navigation start with pendingUrl set. */
+	let lastRenderedPayload = null;
 	function setPending(value, url) {
 		const newPendingUrl = value && url ? url : null;
 		if (pending === value && pendingUrl === newPendingUrl) return;
 		pending = value;
 		pendingUrl = newPendingUrl;
 		for (const listener of pendingListeners) listener(value);
+		if (value && lastRenderedPayload !== null) {
+			setNavigationState({
+				...getNavigationState(),
+				pendingUrl: newPendingUrl
+			});
+			renderPayload(lastRenderedPayload);
+		}
 	}
 	/** Update the segment cache from server-provided segment metadata. */
 	function updateSegmentCache(segmentInfo) {
@@ -654,22 +610,29 @@ function createRouter(deps) {
 	}
 	/** Render a decoded RSC payload into the DOM if a renderer is available. */
 	function renderPayload(payload) {
+		lastRenderedPayload = payload;
 		if (deps.renderRoot) deps.renderRoot(payload);
 	}
 	/**
-	* Update navigation state (params + pathname) for the next render.
+	* Update navigation state (params + pathname + pendingUrl) for the next render.
 	*
 	* Sets both the module-level fallback (for tests and SSR) and the
 	* navigation context state (read by renderRoot to wrap the element
 	* in NavigationProvider). The context update is atomic with the tree
 	* render — both are passed to reactRoot.render() in the same call.
+	*
+	* pendingUrl is included so that LinkStatusProvider (which reads from
+	* NavigationContext) sees the pending state change in the same React
+	* commit as params/pathname — preventing the gap where the spinner
+	* disappears before the active state updates.
 	*/
-	function updateNavigationState(params, url) {
+	function updateNavigationState(params, url, navPendingUrl = null) {
 		const resolvedParams = params ?? {};
 		setCurrentParams(resolvedParams);
 		setNavigationState({
 			params: resolvedParams,
-			pathname: url.startsWith("http") ? new URL(url).pathname : url.split("?")[0] || "/"
+			pathname: url.startsWith("http") ? new URL(url).pathname : url.split("?")[0] || "/",
+			pendingUrl: navPendingUrl
 		});
 	}
 	/** Apply head elements (title, meta tags) to the DOM if available. */
@@ -846,15 +809,33 @@ function createRouter(deps) {
 * ```
 */
 function useNavigationPending() {
-	return useSyncExternalStore((callback) => {
-		return getRouter().onPendingChange(callback);
-	}, () => {
-		try {
-			return getRouter().isPending();
-		} catch {
-			return false;
-		}
-	}, () => false);
+	const navState = useNavigationContext();
+	if (!navState) return false;
+	return navState.pendingUrl !== null;
+}
+//#endregion
+//#region src/client/router-ref.ts
+/**
+* Set the global router instance. Called once during bootstrap.
+*/
+function setGlobalRouter(router) {
+	_setGlobalRouter(router);
+}
+/**
+* Get the global router instance. Throws if called before bootstrap.
+* Used by client-side hooks (useNavigationPending, etc.)
+*/
+function getRouter() {
+	if (!globalRouter) throw new Error("[timber] Router not initialized. getRouter() was called before bootstrap().");
+	return globalRouter;
+}
+/**
+* Get the global router instance or null if not yet initialized.
+* Used by useRouter() methods to avoid silent failures — callers
+* can log a meaningful warning instead of silently no-oping.
+*/
+function getRouterOrNull() {
+	return globalRouter;
 }
 //#endregion
 //#region src/client/use-router.ts