@timber-js/app 0.1.2 → 0.1.4

package/dist/server/route-element-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-element-builder.d.ts","sourceRoot":"","sources":["../../src/server/route-element-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAQ9D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAO7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAIzD,qDAAqD;AACrD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;CACvC;AAED,+CAA+C;AAC/C,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC3C,OAAO,EAAE,mBAAmB,CAAC;CAC9B;AAED,+CAA+C;AAC/C,MAAM,WAAW,kBAAkB;IACjC,wFAAwF;IACxF,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC;IAC5B,2CAA2C;IAC3C,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,wDAAwD;IACxD,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;IACzC,qCAAqC;IACrC,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,4DAA4D;IAC5D,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;aAE7B,MAAM,EAAE,UAAU,GAAG,cAAc;aACnC,gBAAgB,EAAE,oBAAoB,EAAE;aACxC,QAAQ,EAAE,mBAAmB,EAAE;gBAF/B,MAAM,EAAE,UAAU,GAAG,cAAc,EACnC,gBAAgB,EAAE,oBAAoB,EAAE,EACxC,QAAQ,EAAE,mBAAmB,EAAE;CAIlD;AAID;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,UAAU,EACjB,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,kBAAkB,CAAC,CAyS7B"}
+{"version":3,"file":"route-element-builder.d.ts","sourceRoot":"","sources":["../../src/server/route-element-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAK9D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAO7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAIzD,qDAAqD;AACrD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;CACvC;AAED,+CAA+C;AAC/C,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC3C,OAAO,EAAE,mBAAmB,CAAC;CAC9B;AAED,+CAA+C;AAC/C,MAAM,WAAW,kBAAkB;IACjC,wFAAwF;IACxF,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC;IAC5B,2CAA2C;IAC3C,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,wDAAwD;IACxD,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;IACzC,qCAAqC;IACrC,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,4DAA4D;IAC5D,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;aAE7B,MAAM,EAAE,UAAU,GAAG,cAAc;aACnC,gBAAgB,EAAE,oBAAoB,EAAE;aACxC,QAAQ,EAAE,mBAAmB,EAAE;gBAF/B,MAAM,EAAE,UAAU,GAAG,cAAc,EACnC,gBAAgB,EAAE,oBAAoB,EAAE,EACxC,QAAQ,EAAE,mBAAmB,EAAE;CAIlD;AAID;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,UAAU,EACjB,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,kBAAkB,CAAC,CAyS7B"}

package/dist/server/rsc-entry/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/rsc-entry/index.ts"],"names":[],"mappings":"AA0EA;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAE/F;AA2lBD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;8BA3epD,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC;AA6ehD,wBAAiE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/rsc-entry/index.ts"],"names":[],"mappings":"AA0EA;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAE/F;AA+lBD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;8BA3epD,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC;AA6ehD,wBAAiE"}

package/dist/shims/link.d.ts

@@ -1,5 +1,5 @@
 /**
- * Shim: next/link → @timber/app/client Link
+ * Shim: next/link → @timber-js/app/client Link
  *
  * Re-exports timber's Link component so libraries that import next/link
  * get the timber equivalent without modification.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Vite-native React framework for Cloudflare Workers — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",
@@ -90,15 +90,15 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "^2.6.0",
-    "@opentelemetry/sdk-trace-base": "^2.6.0",
-    "@vitejs/plugin-react": "^6.0.0",
-    "@vitejs/plugin-rsc": "~0.5.21"
+    "@opentelemetry/sdk-trace-base": "^2.6.0"
   },
   "peerDependencies": {
     "@content-collections/core": "^0.14.0",
     "@content-collections/mdx": "^0.2.0",
     "@content-collections/vite": "^0.2.0",
     "@mdx-js/rollup": "^3.0.0",
+    "@vitejs/plugin-react": "^6.0.0",
+    "@vitejs/plugin-rsc": ">=0.5.21",
     "nuqs": "^2.0.0",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",

package/src/adapters/cloudflare.ts

@@ -15,7 +15,7 @@ const IMMUTABLE_CACHE = 'public, max-age=31536000, immutable';
 const STATIC_CACHE = 'public, max-age=3600, must-revalidate';
 
 function generateHeadersFile(): string {
-  return `# Auto-generated by @timber/app — static asset cache headers.
+  return `# Auto-generated by @timber-js/app — static asset cache headers.
 # See design/25-production-deployments.md §"CDN / Edge Cache"
 
 /assets/*
@@ -46,7 +46,7 @@ const bindingsAls = new AsyncLocalStorage<Record<string, unknown>>();
  *
  * @example
  * ```ts
- * import { getCloudflareBindings } from '@timber/app/adapters/cloudflare'
+ * import { getCloudflareBindings } from '@timber-js/app/adapters/cloudflare'
  *
  * export default async function Page() {
  *   const { MY_KV, MY_DB } = getCloudflareBindings()
@@ -103,7 +103,7 @@ export interface CloudflareAdapterOptions {
  *
  * @example
  * ```ts
- * import { cloudflare } from '@timber/app/adapters/cloudflare'
+ * import { cloudflare } from '@timber-js/app/adapters/cloudflare'
  *
  * export default {
  *   output: 'server',
@@ -229,7 +229,7 @@ export function generateWorkerEntry(
   // ESM guarantees imports are evaluated in order.
   const manifestImport = hasManifestInit ? "import './_timber-manifest-init.js'\n" : '';
 
-  return `// Generated by @timber/app/adapters/cloudflare
+  return `// Generated by @timber-js/app/adapters/cloudflare
 // Do not edit — this file is regenerated on each build.
 
 ${manifestImport}import handler from '${rscEntryRelative}'

package/src/adapters/nitro.ts

@@ -16,7 +16,7 @@ const IMMUTABLE_CACHE = 'public, max-age=31536000, immutable';
 const STATIC_CACHE = 'public, max-age=3600, must-revalidate';
 
 function generateHeadersFile(): string {
-  return `# Auto-generated by @timber/app — static asset cache headers.
+  return `# Auto-generated by @timber-js/app — static asset cache headers.
 # See design/25-production-deployments.md §"CDN / Edge Cache"
 
 /assets/*
@@ -156,7 +156,7 @@ export interface NitroAdapterOptions {
  *
  * @example
  * ```ts
- * import { nitro } from '@timber/app/adapters/nitro'
+ * import { nitro } from '@timber-js/app/adapters/nitro'
  *
  * export default {
  *   output: 'server',
@@ -265,7 +265,7 @@ export function generateNitroEntry(
     : await handler(webRequest)`
     : `  const webResponse = await handler(webRequest)`;
 
-  return `// Generated by @timber/app/adapters/nitro
+  return `// Generated by @timber-js/app/adapters/nitro
 // Do not edit — this file is regenerated on each build.
 
 ${manifestImport}${earlyHintsImport}import { defineEventHandler, toWebRequest, sendWebResponse } from 'h3'
@@ -304,7 +304,7 @@ export function generateNitroConfig(
 
   const configJson = JSON.stringify(config, null, 2);
 
-  return `// Generated by @timber/app/adapters/nitro
+  return `// Generated by @timber-js/app/adapters/nitro
 // Do not edit — this file is regenerated on each build.
 
 import { defineNitroConfig } from 'nitropack/config'

package/src/cache/index.ts

@@ -1,4 +1,4 @@
-// @timber/app/cache — Caching primitives
+// @timber-js/app/cache — Caching primitives
 
 export interface CacheHandler {
   get(key: string): Promise<{ value: unknown; stale: boolean } | null>;

package/src/client/form.tsx

@@ -51,7 +51,7 @@ export type UseActionStateReturn<TData> = [
  * @example
  * ```tsx
  * 'use client'
- * import { useActionState } from '@timber/app/client'
+ * import { useActionState } from '@timber-js/app/client'
  * import { createTodo } from './actions'
  *
  * export function NewTodoForm({ flash }) {

package/src/client/index.ts

@@ -1,4 +1,4 @@
-// @timber/app/client — Client-side primitives
+// @timber-js/app/client — Client-side primitives
 // These are the primary imports for client components.
 
 export type { RenderErrorDigest } from './types';

package/src/client/use-link-status.ts

@@ -25,7 +25,7 @@ export const LinkStatusContext = createContext<LinkStatus>({ pending: false });
  *
  * ```tsx
  * 'use client'
- * import { Link, useLinkStatus } from '@timber/app/client'
+ * import { Link, useLinkStatus } from '@timber-js/app/client'
  *
  * function Hint() {
  *   const { pending } = useLinkStatus()

package/src/client/use-navigation-pending.ts

@@ -16,7 +16,7 @@ import { getRouter } from './router-ref.js';
  *
  * ```tsx
  * 'use client'
- * import { useNavigationPending } from '@timber/app/client'
+ * import { useNavigationPending } from '@timber-js/app/client'
  *
  * export function NavBar() {
  *   const isPending = useNavigationPending()

package/src/content/index.ts

@@ -1,5 +1,5 @@
 /**
- * @timber/app/content — Public API for content collections.
+ * @timber-js/app/content — Public API for content collections.
  *
  * Re-exports from content-collections and provides timber-specific utilities.
  * Users can import directly from 'content-collections' for generated types,

package/src/cookies/define-cookie.ts

@@ -60,8 +60,8 @@ export interface CookieDefinition<T> {
  * Define a typed cookie.
  *
  * ```ts
- * import { defineCookie } from '@timber/app/cookies';
- * import { fromSchema } from '@timber/app/search-params';
+ * import { defineCookie } from '@timber-js/app/cookies';
+ * import { fromSchema } from '@timber-js/app/search-params';
  * import { z } from 'zod/v4';
  *
  * export const themeCookie = defineCookie('theme', {

package/src/cookies/index.ts

@@ -1,9 +1,5 @@
-// @timber/app/cookies — Typed cookie definitions
+// @timber-js/app/cookies — Typed cookie definitions
 // See design/29-cookies.md §"Typed Cookies with Schema Validation"
 
 export { defineCookie } from './define-cookie.js';
-export type {
-  CookieDefinition,
-  CookieCodec,
-  DefineCookieOptions,
-} from './define-cookie.js';
+export type { CookieDefinition, CookieCodec, DefineCookieOptions } from './define-cookie.js';

package/src/index.ts

@@ -2,6 +2,7 @@ import type { Plugin, PluginOption } from 'vite';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { createRequire } from 'node:module';
 import react from '@vitejs/plugin-react';
 import { cacheTransformPlugin } from './plugins/cache-transform';
 import { timberContent } from './plugins/content';
@@ -353,8 +354,14 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
   // We do NOT set customBuildApp — the RSC plugin's orchestration is correct
   // and handles bundle ordering, asset manifest generation, and environment
   // imports manifest. See @vitejs/plugin-rsc's buildApp implementation.
+  // Resolve @vitejs/plugin-rsc from the consumer's project (process.cwd()),
+  // not from timber's own node_modules. This is critical for pnpm link:
+  // when linked, timber's node_modules has a separate vite instance, and
+  // the RSC plugin must use the same vite instance as the dev server.
+  const consumerRequire = createRequire(join(process.cwd(), 'package.json'));
+  const rscPluginPath = consumerRequire.resolve('@vitejs/plugin-rsc');
   ctx.timer.start('rsc-plugin-import');
-  const rscPluginsPromise = import('@vitejs/plugin-rsc').then(({ default: vitePluginRsc }) => {
+  const rscPluginsPromise = import(pathToFileURL(rscPluginPath).href).then(({ default: vitePluginRsc }) => {
     ctx.timer.end('rsc-plugin-import');
     return vitePluginRsc({
       serverHandler: false,

package/src/plugins/cache-transform.ts

@@ -162,7 +162,7 @@ export function transformUseCache(code: string, fileId: string): TransformResult
 
   if (needsImport) {
     // Add the import at the top of the file
-    result = `import { registerCachedFunction } from '@timber/app/cache';\n` + result;
+    result = `import { registerCachedFunction } from '@timber-js/app/cache';\n` + result;
   }
 
   return { code: result, map: null, warnings: warnings.length > 0 ? warnings : undefined };

package/src/plugins/dev-logs.ts

@@ -178,7 +178,7 @@ function extractCallerLocation(projectRoot: string): string | null {
  * (render errors, action errors, route handler errors, etc.).
  *
  * Handles both monorepo paths (timber-app/src/plugins/) and installed
- * package paths (@timber/app/dist/plugins/).
+ * package paths (@timber-js/app/dist/plugins/).
  */
 export function isFrameworkInternalCaller(): boolean {
   const err = new Error();
@@ -194,7 +194,7 @@ export function isFrameworkInternalCaller(): boolean {
     if (line.includes('node:')) continue;
 
     // Check if this first real frame is inside timber's own source
-    const isTimberPath = line.includes('timber-app/') || line.includes('@timber/app/');
+    const isTimberPath = line.includes('timber-app/') || line.includes('@timber-js/app/');
     if (!isTimberPath) return false;
 
     // Only filter plugin and adapter internals, not server/ runtime code

package/src/plugins/dev-server.ts

@@ -12,8 +12,7 @@
  * Design docs: 18-build-system.md §"Dev Server", 02-rendering-pipeline.md
  */
 
-import type { Plugin, ViteDevServer } from 'vite';
-import { isRunnableDevEnvironment } from 'vite';
+import type { Plugin, ViteDevServer, DevEnvironment } from 'vite';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { join } from 'node:path';
 import type { PluginContext } from '#/index.js';
@@ -147,8 +146,11 @@ function createTimberMiddleware(server: ViteDevServer, projectRoot: string) {
     // environment's module runner for HMR-aware loading.
     let handler: (req: Request) => Promise<Response>;
     try {
-      const rscEnv = server.environments.rsc;
-      if (!isRunnableDevEnvironment(rscEnv)) {
+      const rscEnv = server.environments.rsc as DevEnvironment & { runner?: { import: (id: string) => Promise<any> } };
+      // Duck-type check instead of isRunnableDevEnvironment() — the vite
+      // import-based check fails across pnpm link boundaries where the
+      // linked package resolves a different vite module instance.
+      if (!rscEnv?.runner?.import) {
         throw new Error('[timber] RSC environment is not runnable');
       }
       const rscModule = await rscEnv.runner.import(RSC_ENTRY_ID);

package/src/plugins/dynamic-transform.ts

@@ -54,7 +54,7 @@ interface TransformResult {
  *
  * Output:
  * ```tsx
- * import { markDynamic as __markDynamic } from '@timber/app/runtime';
+ * import { markDynamic as __markDynamic } from '@timber-js/app/runtime';
  * export default async function AddToCartButton({ productId }) {
  *   __markDynamic();
  *   const user = await getUser()
@@ -83,7 +83,7 @@ export function transformUseDynamic(code: string): TransformResult | null {
   }
 
   // Add the import at the top
-  result = `import { markDynamic as __markDynamic } from '@timber/app/runtime';\n` + result;
+  result = `import { markDynamic as __markDynamic } from '@timber-js/app/runtime';\n` + result;
 
   return { code: result, map: null };
 }

package/src/plugins/entries.ts

@@ -14,10 +14,17 @@
 import type { Plugin } from 'vite';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { existsSync } from 'node:fs';
 import type { PluginContext } from '#/index.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const SRC_DIR = resolve(__dirname, '..');
+
+// In workspace dev, __dirname is src/plugins/ and src/ is the parent.
+// In published package, entries.ts is bundled into dist/index.js so
+// __dirname is dist/ and src/ is a sibling directory.
+const SRC_DIR = existsSync(resolve(__dirname, '..', 'server', 'rsc-entry', 'index.ts'))
+  ? resolve(__dirname, '..')
+  : resolve(__dirname, '..', 'src');
 
 // ─── Virtual Module IDs ──────────────────────────────────────────────────
 

package/src/plugins/shims.ts

@@ -56,17 +56,17 @@ const CLIENT_SHIM_OVERRIDES: Record<string, string> = {
 };
 
 /**
- * Map from @timber/app/* subpath imports to real source files.
+ * Map from @timber-js/app/* subpath imports to real source files.
  *
- * These resolve subpath imports like `@timber/app/server` to the
+ * These resolve subpath imports like `@timber-js/app/server` to the
  * real entry files in the package source.
  */
 const TIMBER_SUBPATH_MAP: Record<string, string> = {
-  '@timber/app/server': resolve(__dirname, '..', 'server', 'index.ts'),
-  '@timber/app/client': resolve(__dirname, '..', 'client', 'index.ts'),
-  '@timber/app/cache': resolve(__dirname, '..', 'cache', 'index.ts'),
-  '@timber/app/search-params': resolve(__dirname, '..', 'search-params', 'index.ts'),
-  '@timber/app/routing': resolve(__dirname, '..', 'routing', 'index.ts'),
+  '@timber-js/app/server': resolve(__dirname, '..', 'server', 'index.ts'),
+  '@timber-js/app/client': resolve(__dirname, '..', 'client', 'index.ts'),
+  '@timber-js/app/cache': resolve(__dirname, '..', 'cache', 'index.ts'),
+  '@timber-js/app/search-params': resolve(__dirname, '..', 'search-params', 'index.ts'),
+  '@timber-js/app/routing': resolve(__dirname, '..', 'routing', 'index.ts'),
 };
 
 /**
@@ -94,13 +94,13 @@ export function timberShims(_ctx: PluginContext): Plugin {
     enforce: 'pre',
 
     /**
-     * Resolve next/* and @timber/app/* imports to shim/source files.
+     * Resolve next/* and @timber-js/app/* imports to shim/source files.
      *
      * Resolution order:
      * 1. Check server-only / client-only poison pill packages
      * 2. Strip .js extension from the import specifier
      * 3. Check next/* shim map
-     * 4. Check @timber/app/* subpath map
+     * 4. Check @timber-js/app/* subpath map
      * 5. Return null (pass through) for unrecognized imports
      */
     resolveId(id: string) {
@@ -121,7 +121,7 @@ export function timberShims(_ctx: PluginContext): Plugin {
         return SHIM_MAP[cleanId];
       }
 
-      // Check @timber/app/* subpath map
+      // Check @timber-js/app/* subpath map
       if (cleanId in TIMBER_SUBPATH_MAP) {
         return TIMBER_SUBPATH_MAP[cleanId];
       }

package/src/routing/codegen.ts

@@ -46,7 +46,7 @@ export interface CodegenOptions {
 /**
  * Generate a TypeScript declaration file string from a scanned route tree.
  *
- * The output is a `declare module '@timber/app'` block containing the Routes
+ * The output is a `declare module '@timber-js/app'` block containing the Routes
  * interface that maps every route path to its params and searchParams shape.
  */
 export function generateRouteMap(tree: RouteTree, options: CodegenOptions = {}): string {
@@ -180,7 +180,7 @@ function formatDeclarationFile(routes: RouteEntry[], importBase?: string): strin
   // (removing exports like bindUseQueryStates that aren't listed here).
   lines.push('export {};');
   lines.push('');
-  lines.push("declare module '@timber/app' {");
+  lines.push("declare module '@timber-js/app' {");
   lines.push('  interface Routes {');
 
   for (const route of routes) {
@@ -197,12 +197,12 @@ function formatDeclarationFile(routes: RouteEntry[], importBase?: string): strin
   lines.push('}');
   lines.push('');
 
-  // Generate @timber/app/server augmentation — typed searchParams() generic
+  // Generate @timber-js/app/server augmentation — typed searchParams() generic
   const pageRoutes = routes.filter((r) => !r.isApiRoute);
 
   if (pageRoutes.length > 0) {
-    lines.push("declare module '@timber/app/server' {");
-    lines.push("  import type { Routes } from '@timber/app'");
+    lines.push("declare module '@timber-js/app/server' {");
+    lines.push("  import type { Routes } from '@timber-js/app'");
     lines.push(
       "  export function searchParams<R extends keyof Routes>(): Promise<Routes[R]['searchParams']>"
     );
@@ -210,13 +210,13 @@ function formatDeclarationFile(routes: RouteEntry[], importBase?: string): strin
     lines.push('');
   }
 
-  // Generate overloads for @timber/app/client
+  // Generate overloads for @timber-js/app/client
   const dynamicRoutes = routes.filter((r) => r.params.length > 0);
 
   if (dynamicRoutes.length > 0 || pageRoutes.length > 0) {
-    lines.push("declare module '@timber/app/client' {");
+    lines.push("declare module '@timber-js/app/client' {");
     lines.push(
-      "  import type { SearchParamsDefinition, SetParams, QueryStatesOptions, SearchParamCodec } from '@timber/app/search-params'"
+      "  import type { SearchParamsDefinition, SetParams, QueryStatesOptions, SearchParamCodec } from '@timber-js/app/search-params'"
     );
     lines.push('');
 
@@ -303,7 +303,7 @@ function formatSearchParamsType(route: RouteEntry, importBase?: string): string
     // Use (typeof import('...'))[' default'] instead of import('...').default
     // because with moduleResolution:"bundler", import('...').default is treated as
     // a namespace member access which doesn't work for default exports.
-    return `(typeof import('${importPath}'))['default'] extends import('@timber/app/search-params').SearchParamsDefinition<infer T> ? T : never`;
+    return `(typeof import('${importPath}'))['default'] extends import('@timber-js/app/search-params').SearchParamsDefinition<infer T> ? T : never`;
   }
   return '{}';
 }

package/src/search-params/codecs.ts

@@ -63,7 +63,7 @@ function validateSync<Output>(
  * Serialize: uses `String()` for primitives, `null` for null/undefined.
  *
  * ```ts
- * import { fromSchema } from '@timber/app/search-params'
+ * import { fromSchema } from '@timber-js/app/search-params'
  * import { z } from 'zod/v4'
  *
  * const pageCodec = fromSchema(z.coerce.number().int().min(1).default(1))
@@ -109,7 +109,7 @@ export function fromSchema<T>(schema: StandardSchemaV1<T>): SearchParamCodec<T>
  * and repeated query keys (`?tag=a&tag=b`).
  *
  * ```ts
- * import { fromArraySchema } from '@timber/app/search-params'
+ * import { fromArraySchema } from '@timber-js/app/search-params'
  * import { z } from 'zod/v4'
  *
  * const tagsCodec = fromArraySchema(z.array(z.string()).default([]))

package/src/search-params/create.ts

@@ -145,7 +145,7 @@ function getDefaultSerialized<T>(codec: SearchParamCodec<T>): string | null {
  * Create a SearchParamsDefinition from a codec map and optional URL key aliases.
  *
  * ```ts
- * import { createSearchParams, fromSchema } from '@timber/app/search-params'
+ * import { createSearchParams, fromSchema } from '@timber-js/app/search-params'
  * import { z } from 'zod/v4'
  *
  * export default createSearchParams({
@@ -290,11 +290,11 @@ function buildDefinition<T extends Record<string, unknown>>(
   // ---- useQueryStates ----
   // This is a placeholder that will be replaced by the client runtime.
   // At import time in a server context, calling this throws.
-  // The actual implementation wraps nuqs and lives in @timber/app/client.
+  // The actual implementation wraps nuqs and lives in @timber-js/app/client.
   function useQueryStates(_options?: QueryStatesOptions): [T, SetParams<T>] {
     throw new Error(
       'useQueryStates() can only be called in a client component. ' +
-        'Import from @timber/app/client instead.'
+        'Import from @timber-js/app/client instead.'
     );
   }
 

package/src/search-params/index.ts

@@ -1,4 +1,4 @@
-// @timber/app/search-params — Typed search params
+// @timber-js/app/search-params — Typed search params
 
 // Core types and factory
 export type {

package/src/server/action-client.ts

@@ -386,7 +386,7 @@ export function createActionClient<TCtx = Record<string, never>>(
  * @example
  * ```ts
  * 'use server'
- * import { validated } from '@timber/app/server'
+ * import { validated } from '@timber-js/app/server'
  * import { z } from 'zod'
  *
  * export const createTodo = validated(

package/src/server/asset-headers.ts

@@ -69,7 +69,7 @@ export function getAssetCacheControl(pathname: string): string {
  * Everything else (favicon.ico, robots.txt, etc.) gets a shorter cache.
  */
 export function generateHeadersFile(): string {
-  return `# Auto-generated by @timber/app — static asset cache headers.
+  return `# Auto-generated by @timber-js/app — static asset cache headers.
 # See design/25-production-deployments.md §"CDN / Edge Cache"
 
 /assets/*

package/src/server/dev-fetch-instrumentation.ts

@@ -0,0 +1,96 @@
+/**
+ * Dev-mode fetch instrumentation — patches globalThis.fetch to create OTEL
+ * spans for every fetch call, giving visibility into async data fetching
+ * in the dev request log tree.
+ *
+ * Only activated in dev mode — zero overhead in production.
+ *
+ * The spans are automatically children of the active OTEL context (e.g. a
+ * timber.page or timber.layout span), so they appear nested under the
+ * component that initiated the fetch in the dev log tree.
+ *
+ * Design ref: 17-logging.md §"Dev Logging", LOCAL-289
+ */
+
+import * as api from '@opentelemetry/api';
+
+export type DevFetchCleanup = () => void;
+
+/**
+ * Patch globalThis.fetch to wrap every call in an OTEL span.
+ *
+ * Returns a cleanup function that restores the original fetch.
+ * Only call this in dev mode.
+ */
+export function instrumentDevFetch(): DevFetchCleanup {
+  const originalFetch = globalThis.fetch;
+  const tracer = api.trace.getTracer('timber.js');
+
+  globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
+    const { method, url } = extractFetchInfo(input, init);
+
+    return tracer.startActiveSpan(
+      'timber.fetch',
+      {
+        attributes: {
+          'http.request.method': method,
+          'http.url': url,
+        },
+      },
+      async (span) => {
+        try {
+          const response = await originalFetch(input, init);
+
+          span.setAttribute('http.response.status_code', response.status);
+
+          // Surface cache status from standard headers
+          const cacheStatus =
+            response.headers.get('X-Cache') ?? response.headers.get('CF-Cache-Status');
+          if (cacheStatus) {
+            span.setAttribute('timber.cache_status', cacheStatus);
+          }
+
+          span.setStatus({ code: api.SpanStatusCode.OK });
+          span.end();
+          return response;
+        } catch (error) {
+          span.setStatus({ code: api.SpanStatusCode.ERROR });
+          if (error instanceof Error) {
+            span.setAttribute('timber.fetch_error', error.message);
+            span.recordException(error);
+          }
+          span.end();
+          throw error;
+        }
+      }
+    );
+  };
+
+  return () => {
+    globalThis.fetch = originalFetch;
+  };
+}
+
+/**
+ * Extract method and URL from the various fetch() call signatures.
+ */
+function extractFetchInfo(
+  input: RequestInfo | URL,
+  init?: RequestInit
+): { method: string; url: string } {
+  let method = init?.method ?? 'GET';
+  let url: string;
+
+  if (input instanceof Request) {
+    url = input.url;
+    if (!init?.method) {
+      method = input.method;
+    }
+  } else if (input instanceof URL) {
+    url = input.toString();
+  } else {
+    url = input;
+  }
+
+  return { method: method.toUpperCase(), url };
+}