akanjs 2.3.2-rc.5 → 2.3.2-rc.7

package/client/makePageProto.tsx

@@ -23,13 +23,15 @@ interface ErrPayload extends ErrRestoreOption {
 const getPageInfo = (): { locale: string; path: string } => {
   const { defaultLocale, locales } = parseAkanI18nEnv();
   const localeSet = new Set(locales);
+  const activeLocale = Translator.getActiveLocale();
+  const activePath = Translator.getActivePath();
+  if (activePath) return { locale: activeLocale ?? defaultLocale, path: activePath };
   if (getEnv().side !== "server") {
     const [, firstSegment = "", ...rest] = window.location.pathname.split("/");
     const hasLocalePrefix = localeSet.has(firstSegment);
 
-    const activeLocale = Translator.getActiveLocale();
     const locale = activeLocale ?? (hasLocalePrefix ? firstSegment : defaultLocale);
-    return { locale, path: hasLocalePrefix ? `/${rest.join("/")}` : window.location.pathname };
+    return { locale, path: activePath ?? (hasLocalePrefix ? `/${rest.join("/")}` : window.location.pathname) };
   }
   const h = untrackedHeaders();
 

package/client/translator.ts

@@ -14,7 +14,11 @@ interface TranslatorState {
 
   seededDicts: WeakSet<object>;
 
+  replacedDicts: WeakSet<object>;
+
   activeLocale?: string;
+
+  activePath?: string;
 }
 
 const TRANSLATOR_STATE_KEY = "__AKAN_TRANSLATOR_STATE__";
@@ -25,6 +29,7 @@ const getTranslatorState = (): TranslatorState => {
   globalScope[TRANSLATOR_STATE_KEY] ??= {
     langDictionaryMap: new Map<string, Dictionary>(),
     seededDicts: new WeakSet<object>(),
+    replacedDicts: new WeakSet<object>(),
   };
   return globalScope[TRANSLATOR_STATE_KEY];
 };
@@ -44,6 +49,17 @@ export class Translator {
   static getActiveLocale(): string | undefined {
     return getTranslatorState().activeLocale;
   }
+  static setActivePath(path: string | undefined) {
+    const state = getTranslatorState();
+    if (path) state.activePath = path;
+    else delete state.activePath;
+  }
+  static getActivePath(): string | undefined {
+    return getTranslatorState().activePath;
+  }
+  static markHydrated() {
+    delete getTranslatorState().activePath;
+  }
   static translateByLocale(lang: string, key: string, param?: Record<string, string | number>): string {
     const dictionary = getTranslatorState().langDictionaryMap.get(lang);
     if (!dictionary) return key;
@@ -63,6 +79,14 @@ export class Translator {
     });
     state.langDictionaryMap.set(lang, existingDictionary);
   }
+  static replace(lang: string, dict: Dictionary | undefined) {
+    if (!dict) return;
+    const state = getTranslatorState();
+    if (state.replacedDicts.has(dict)) return;
+    state.seededDicts.add(dict);
+    state.replacedDicts.add(dict);
+    state.langDictionaryMap.set(lang, { ...dict });
+  }
   translate(lang: string, key: string, param?: Record<string, string | number>): string {
     return Translator.translateByLocale(lang, key, param);
   }

package/dictionary/trans.ts

@@ -80,7 +80,6 @@ export const msg = {
   loading: (key: TransMessage<Record<string, unknown>>, option?: TransMessageOption) => void;
 };
 
-const rootDictionary = {} as RootDictionary;
 export const makeTrans = <
   GlobalTransMap extends Record<string, DictModule<string, string>>,
   _DictKey extends string = GlobalTransMap[keyof GlobalTransMap]["__Dict_Key__"],
@@ -103,6 +102,7 @@ export const makeTrans = <
   __Dict_Key__: _DictKey;
   __Error_Key__: _ErrorKey;
 } => {
+  const rootDictionary = {} as RootDictionary;
   Object.entries(transMap).forEach(([refName, trans]) => {
     trans.dict._registerToRoot(refName, rootDictionary);
   });

package/fetch/client/fetchClient.ts

@@ -35,7 +35,7 @@ export type FetchProxy<
   SliceMetaObj extends Record<string, SliceMeta> = Record<never, never>,
 > = typeof global.fetch &
   FetchClient &
-  FetchType & { slice: SliceMetaObj; instance: FetchClient; _FetchType: FetchType };
+  FetchType & { slice: SliceMetaObj; instance: FetchClient; _FetchType: FetchType; _SliceMetaObj: SliceMetaObj };
 
 type ClientSignalMap<SigType extends { fetch: any }> = {
   [K in keyof SigType as SigType[K] extends DatabaseSignal<any, any, any, any>
@@ -662,8 +662,8 @@ export class FetchClient {
           (signal as DatabaseSignal | ServiceSignal).serializedSignal,
         );
       } else {
-        Object.assign(handler, (signal as FetchClient).handler);
-        Object.entries((signal as FetchClient).serializedSignal).forEach(([refName, signal]) => {
+        Object.assign(handler, signal.handler);
+        Object.entries(signal.serializedSignal).forEach(([refName, signal]) => {
           FetchClient.#mergeSerializedSignalInto(serializedSignal, refName, signal);
         });
       }

package/fetch/fetchType/buildFetch.type.ts

@@ -1,28 +1,68 @@
-import type { DatabaseSignal, EndpointCls, ServiceSignal, SliceCls } from "akanjs/signal";
+import type { DatabaseSignal, EndpointCls, SerializedSignal, ServiceSignal, SliceCls } from "akanjs/signal";
 import type { FetchProxy } from "../client";
 import type { GetSliceMetaObjFromDatabaseSignals } from "../types";
+import type { SliceMeta } from "./appliedReturn.type";
 import type { GetFetchTypeFromEndpoint } from "./endpointFetch.type";
 import type { GetFetchTypeFromSlice } from "./sliceFetch.type";
 
-export type FetchSignalInput = FetchProxy | DatabaseSignal | ServiceSignal;
+export type FetchProxySignalInput<
+  FetchType = unknown,
+  SliceMetaObj extends Record<string, SliceMeta> = Record<never, never>,
+> = {
+  handler: Record<string, unknown>;
+  serializedSignal: Record<string, SerializedSignal>;
+  _FetchType: FetchType;
+  _SliceMetaObj: SliceMetaObj;
+};
 
-export type FetchTypeOfSignal<Signal extends FetchSignalInput> =
-  Signal extends FetchProxy<infer FetchType>
-    ? FetchType
-    : Signal extends { endpoint: infer EndpCls extends EndpointCls; slice: infer SlceCls extends SliceCls }
-      ? GetFetchTypeFromEndpoint<EndpCls> & GetFetchTypeFromSlice<SlceCls>
-      : Signal extends { endpoint: infer EndpCls extends EndpointCls }
-        ? GetFetchTypeFromEndpoint<EndpCls>
-        : unknown;
+export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceSignal;
 
-type OverrideFetchType<Current, Next> = Omit<Current, keyof Next> & Next;
+export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends { _FetchType: infer FetchType }
+  ? FetchType
+  : Signal extends { endpoint: infer EndpCls extends EndpointCls; slice: infer SlceCls extends SliceCls }
+    ? GetFetchTypeFromEndpoint<EndpCls, SlceCls> & GetFetchTypeFromSlice<SlceCls>
+    : Signal extends { endpoint: infer EndpCls extends EndpointCls }
+      ? GetFetchTypeFromEndpoint<EndpCls>
+      : unknown;
 
-export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> = Signals extends readonly [
-  infer First extends FetchSignalInput,
-  ...infer Rest extends readonly FetchSignalInput[],
+type FetchKeysOfProxySignal<Signal> = Signal extends { _FetchType: infer FetchType } ? keyof FetchType : never;
+type FetchKeysOfProxySignals<Signals extends readonly FetchSignalInput[]> = FetchKeysOfProxySignal<Signals[number]>;
+
+type LastProxyFetchValue<
+  Signals extends readonly FetchSignalInput[],
+  Key extends PropertyKey,
+  Current = never,
+> = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]]
+  ? First extends { _FetchType: infer FetchType }
+    ? Key extends keyof FetchType
+      ? LastProxyFetchValue<Rest, Key, FetchType[Key]>
+      : LastProxyFetchValue<Rest, Key, Current>
+    : LastProxyFetchValue<Rest, Key, Current>
+  : Current;
+
+type MergeProxyFetchTypes<Signals extends readonly FetchSignalInput[]> = [FetchKeysOfProxySignals<Signals>] extends [
+  never,
 ]
-  ? OverrideFetchType<FetchTypeOfSignal<First>, MergeAllFetchTypes<Rest>>
-  : unknown;
+  ? Record<never, never>
+  : {
+      [Key in FetchKeysOfProxySignals<Signals>]: LastProxyFetchValue<Signals, Key>;
+    };
+
+type MergeDirectFetchTypes<
+  Signals extends readonly FetchSignalInput[],
+  Acc = Record<never, never>,
+> = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]]
+  ? First extends { _FetchType: unknown }
+    ? MergeDirectFetchTypes<Rest, Acc>
+    : MergeDirectFetchTypes<Rest, Acc & FetchTypeOfSignal<First>>
+  : Acc;
+
+export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> =
+  MergeProxyFetchTypes<Signals> extends infer ProxyFetch
+    ? MergeDirectFetchTypes<Signals> extends infer DirectFetch
+      ? Omit<ProxyFetch, keyof DirectFetch> & DirectFetch
+      : never
+    : never;
 
 export type FetchClientType<Signals extends readonly FetchSignalInput[]> = FetchProxy<
   MergeAllFetchTypes<Signals>,

package/fetch/fetchType/endpointFetch.type.ts

@@ -7,55 +7,84 @@ import type {
   EndpInfoReqType,
   EndpointCls,
   EndpointInfo,
+  SliceCls,
 } from "akanjs/signal";
 
-type EndpInfoReturns<E> = EndpInfoClientReturns<E> | (EndpInfoNullable<E> extends true ? null : never);
+type ExtendedEndpointReturn<ClientReturns, Full, Light, Insight> = ClientReturns extends (infer R)[]
+  ? ExtendedEndpointReturn<R, Full, Light, Insight>[]
+  : Full extends ClientReturns
+    ? Full
+    : Light extends ClientReturns
+      ? Light
+      : Insight extends ClientReturns
+        ? Insight
+        : ClientReturns;
 
-type QueryOrMutationFetchFn<E> = (
+type EndpointClientReturns<E, SlceCls extends SliceCls | never> = [SlceCls] extends [never]
+  ? EndpInfoClientReturns<E>
+  : ExtendedEndpointReturn<
+      EndpInfoClientReturns<E>,
+      SlceCls["srv"]["cnst"]["_Full"],
+      SlceCls["srv"]["cnst"]["_Light"],
+      SlceCls["srv"]["cnst"]["_Insight"]
+    >;
+
+type EndpInfoReturns<E, SlceCls extends SliceCls | never> =
+  | EndpointClientReturns<E, SlceCls>
+  | (EndpInfoNullable<E> extends true ? null : never);
+
+type QueryOrMutationFetchFn<E, SlceCls extends SliceCls | never> = (
   ...args: [...EndpInfoArgs<E>, fetchPolicy?: FetchPolicy]
-) => Promise<EndpInfoReturns<E>>;
+) => Promise<EndpInfoReturns<E, SlceCls>>;
 
-type MessageEmitFn<E> = (...args: EndpInfoArgs<E>) => EndpInfoReturns<E>;
+type MessageEmitFn<E, SlceCls extends SliceCls | never> = (...args: EndpInfoArgs<E>) => EndpInfoReturns<E, SlceCls>;
 
-type MessageListenFn<E> = (
-  handleEvent: (data: EndpInfoReturns<E>) => PromiseOrObject<void>,
+type MessageListenFn<E, SlceCls extends SliceCls | never> = (
+  handleEvent: (data: EndpInfoReturns<E, SlceCls>) => PromiseOrObject<void>,
   options?: FetchPolicy,
 ) => () => void;
 
-type PubsubSubscribeFn<E> = (
-  ...args: [...EndpInfoArgs<E>, handleEvent: (data: EndpInfoReturns<E>) => PromiseOrObject<void>, options?: FetchPolicy]
+type PubsubSubscribeFn<E, SlceCls extends SliceCls | never> = (
+  ...args: [
+    ...EndpInfoArgs<E>,
+    handleEvent: (data: EndpInfoReturns<E, SlceCls>) => PromiseOrObject<void>,
+    options?: FetchPolicy,
+  ]
 ) => () => void;
 
-type PrimaryFetchFn<E> =
+type PrimaryFetchFn<E, SlceCls extends SliceCls | never> =
   EndpInfoReqType<E> extends "query" | "mutation"
-    ? QueryOrMutationFetchFn<E>
+    ? QueryOrMutationFetchFn<E, SlceCls>
     : EndpInfoReqType<E> extends "message"
-      ? MessageEmitFn<E>
+      ? MessageEmitFn<E, SlceCls>
       : never;
 
-type PrimaryFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
+type PrimaryFetchType<EInfoObj extends { [key: string]: EndpointInfo }, SlceCls extends SliceCls | never> = {
   [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "query" | "mutation" | "message"
     ? K
-    : never]: PrimaryFetchFn<EInfoObj[K]>;
+    : never]: PrimaryFetchFn<EInfoObj[K], SlceCls>;
 };
 
-type PubsubFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
+type PubsubFetchType<EInfoObj extends { [key: string]: EndpointInfo }, SlceCls extends SliceCls | never> = {
   [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "pubsub"
     ? K extends string
       ? `subscribe${Capitalize<K>}`
       : never
-    : never]: PubsubSubscribeFn<EInfoObj[K]>;
+    : never]: PubsubSubscribeFn<EInfoObj[K], SlceCls>;
 };
 
-type MessageListenFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
+type MessageListenFetchType<EInfoObj extends { [key: string]: EndpointInfo }, SlceCls extends SliceCls | never> = {
   [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "message"
     ? K extends string
       ? `listen${Capitalize<K>}`
       : never
-    : never]: MessageListenFn<EInfoObj[K]>;
+    : never]: MessageListenFn<EInfoObj[K], SlceCls>;
 };
 
 export type GetFetchTypeFromEndpoint<
   EndpCls extends EndpointCls,
+  SlceCls extends SliceCls | never = never,
   _EndpointInfoObj extends { [key: string]: EndpointInfo } = EndpCls[typeof ENDPOINT_META],
-> = PrimaryFetchType<_EndpointInfoObj> & PubsubFetchType<_EndpointInfoObj> & MessageListenFetchType<_EndpointInfoObj>;
+> = PrimaryFetchType<_EndpointInfoObj, SlceCls> &
+  PubsubFetchType<_EndpointInfoObj, SlceCls> &
+  MessageListenFetchType<_EndpointInfoObj, SlceCls>;

package/fetch/types.ts

@@ -12,12 +12,18 @@ export const getDefaultAccount = (): Account => {
   return { appName: env.appName, environment: env.environment };
 };
 
-type GetSliceNameFromSignal<Signal> = Signal extends DatabaseSignal
-  ? `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}`
-  : Signal extends { slice: { [K in infer Key]: SliceMeta } }
-    ? Key
-    : never;
-type GetSliceNamesFromSignals<Signals extends readonly unknown[]> = GetSliceNameFromSignal<Signals[number]>;
-export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[]> = {
-  [K in GetSliceNamesFromSignals<Signals>]: SliceMeta;
-};
+type GetSliceMetaObjFromSignal<Signal> = Signal extends {
+  _SliceMetaObj: infer SliceMetaObj extends Record<string, SliceMeta>;
+}
+  ? SliceMetaObj
+  : Signal extends DatabaseSignal
+    ? {
+        [K in `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}`]: SliceMeta;
+      }
+    : Record<never, never>;
+export type GetSliceMetaObjFromDatabaseSignals<
+  Signals extends readonly unknown[],
+  Acc extends Record<string, SliceMeta> = Record<never, never>,
+> = Signals extends readonly [infer First, ...infer Rest]
+  ? GetSliceMetaObjFromDatabaseSignals<Rest, Acc & GetSliceMetaObjFromSignal<First>>
+  : Acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.2-rc.5",
+  "version": "2.3.2-rc.7",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/server/hmr/clientScript.ts

@@ -9,6 +9,8 @@ export const HMR_CLIENT_SCRIPT = `(function(){
   var socket = null;
   var lastBuildId = null;
   var refreshRuntimePromise = null;
+  var refreshRuntime = null;
+  var pendingRefreshRegistrations = [];
   var refreshQueue = Promise.resolve();
   var overlayEl = null;
   var overlayLabelEl = null;
@@ -19,8 +21,14 @@ export const HMR_CLIENT_SCRIPT = `(function(){
   var overlayJobs = {};
   self.__AKAN_HMR_PHASE__ = null;
 
-  self.$RefreshReg$ = self.$RefreshReg$ || function(){};
+  self.$RefreshReg$ = self.$RefreshReg$ || function(type, id){
+    if (refreshRuntime) refreshRuntime.register(type, id);
+    else pendingRefreshRegistrations.push([type, id]);
+  };
   self.$RefreshSig$ = self.$RefreshSig$ || function(){ return function(type){ return type; }; };
+  ensureRefreshRuntime().catch(function(err){
+    console.warn("[akan-hmr] React Refresh runtime preload failed", err);
+  });
 
   function connect(){
     try { socket = new WebSocket(url); }
@@ -194,9 +202,14 @@ export const HMR_CLIENT_SCRIPT = `(function(){
     refreshRuntimePromise = import("react-refresh/runtime").then(function(mod){
       var runtime = mod.default || mod;
       if (!self.__AKAN_REACT_REFRESH_READY__) {
+        refreshRuntime = runtime;
         runtime.injectIntoGlobalHook(self);
         self.$RefreshReg$ = function(type, id){ runtime.register(type, id); };
         self.$RefreshSig$ = runtime.createSignatureFunctionForTransform;
+        for (var i = 0; i < pendingRefreshRegistrations.length; i++) {
+          self.$RefreshReg$(pendingRefreshRegistrations[i][0], pendingRefreshRegistrations[i][1]);
+        }
+        pendingRefreshRegistrations = [];
         self.__AKAN_REACT_REFRESH_READY__ = true;
         self.__AKAN_REACT_REFRESH_RUNTIME__ = runtime;
       }

package/server/hmr/devHmrController.ts

@@ -12,6 +12,38 @@ import type { RenderState } from "../types";
 import type { ChangeKind } from "./changeBatch";
 import { type HmrWsData, HmrWsHub } from "./wsHub";
 
+const APP_RUNTIME_METADATA_BASENAMES = new Set(["dict.ts", "sig.ts", "useClient.ts"]);
+
+export function isAkanRuntimeMetadataFile(file: string): boolean {
+  const resolved = path.resolve(file);
+  const parts = resolved.split(/[\\/]+/).filter(Boolean);
+  const base = parts.at(-1);
+  if (!base) return false;
+
+  const parent = parts.at(-2);
+  if (parent === "lib" && APP_RUNTIME_METADATA_BASENAMES.has(base)) return true;
+
+  const libIndex = parts.lastIndexOf("lib");
+  if (libIndex < 0 || parts.length <= libIndex + 1) return false;
+  return base.endsWith(".dictionary.ts") || base.endsWith(".signal.ts");
+}
+
+export function manifestClientEntriesForFiles(
+  files: string[],
+  clientManifest: ClientManifest,
+  workspaceRoot = process.cwd(),
+): Set<string> {
+  const normalizedFiles = new Set(files.map((file) => path.resolve(file)));
+  const entries = new Set<string>();
+  for (const key of Object.keys(clientManifest)) {
+    const hashIdx = key.lastIndexOf("#");
+    const entryKey = hashIdx >= 0 ? key.slice(0, hashIdx) : key;
+    const resolved = path.isAbsolute(entryKey) ? path.resolve(entryKey) : path.resolve(workspaceRoot, entryKey);
+    if (normalizedFiles.has(resolved)) entries.add(resolved);
+  }
+  return entries;
+}
+
 export interface DevHmrControllerOptions {
   renderState: RenderState;
   rsc: RscWorker;
@@ -125,6 +157,10 @@ export class DevHmrController {
     return [...urls];
   }
 
+  static shouldFullReloadForRuntimeMetadata(files: string[]): boolean {
+    return files.some(isAkanRuntimeMetadataFile);
+  }
+
   #createBuilderRpc() {
     return new BuilderRpc({
       onInvalidate: (ev) => {
@@ -148,13 +184,17 @@ export class DevHmrController {
       },
       onPagesUpdated: async ({ bundlePath, buildId, generation, changedFiles }) => {
         const started = Date.now();
-        const staleClientEntries = this.#staleClientEntriesForFiles(changedFiles ?? []);
-        const routeIds = this.#routeIdsForFiles(changedFiles ?? [], staleClientEntries);
-        const fastRefreshCandidate = this.#isFastRefreshCandidate(changedFiles ?? []);
+        const files = changedFiles ?? [];
+        const runtimeMetadataChanged = DevHmrController.shouldFullReloadForRuntimeMetadata(files);
+        const staleClientEntries = runtimeMetadataChanged ? new Set<string>() : this.#staleClientEntriesForFiles(files);
+        const routeIds = runtimeMetadataChanged ? undefined : this.#routeIdsForFiles(files, staleClientEntries);
+        const fastRefreshCandidate = !runtimeMetadataChanged && this.#isFastRefreshCandidate(files);
         this.#logger.verbose(
-          `[SSR] pages-updated bundlePath=${bundlePath} buildId=${buildId} generation=${generation ?? "(unknown)"} files=${changedFiles?.length ?? 0} routes=${routeIds?.length ?? 0} fastRefresh=${fastRefreshCandidate} staleEntries=${staleClientEntries.size}`,
+          `[SSR] pages-updated bundlePath=${bundlePath} buildId=${buildId} generation=${generation ?? "(unknown)"} files=${files.length} routes=${routeIds?.length ?? 0} fastRefresh=${fastRefreshCandidate} staleEntries=${staleClientEntries.size} runtimeMetadata=${runtimeMetadataChanged}`,
         );
-        const dropped = this.#invalidateRoutes(changedFiles ?? [], routeIds, staleClientEntries);
+        const dropped = this.#invalidateRoutes(files, routeIds, staleClientEntries, {
+          forceClear: runtimeMetadataChanged,
+        });
         this.#renderState.buildId = buildId;
         const manifest = this.routeCache.snapshot();
         const reloadStarted = Date.now();
@@ -165,7 +205,7 @@ export class DevHmrController {
           pagesBundlePath: bundlePath,
         });
         this.#logger.verbose(`[SSR] rsc reload buildId=${buildId} in ${Date.now() - reloadStarted}ms`);
-        const shouldReload = this.#shouldFullReloadForFiles(changedFiles ?? [], routeIds);
+        const shouldReload = runtimeMetadataChanged || this.#shouldFullReloadForFiles(files, routeIds);
         if (shouldReload) this.#hub.broadcast({ type: "reload", buildId });
         else if (fastRefreshCandidate)
           this.#hub.broadcast({ type: "client-refresh", buildId, generation, changedFiles, routeIds });
@@ -233,9 +273,15 @@ export class DevHmrController {
     this.#dirtyFiles.clear();
   }
 
-  #invalidateRoutes(files: string[], routeIds: string[] | undefined, staleClientEntries = new Set<string>()): string[] {
+  #invalidateRoutes(
+    files: string[],
+    routeIds: string[] | undefined,
+    staleClientEntries = new Set<string>(),
+    { forceClear = false }: { forceClear?: boolean } = {},
+  ): string[] {
     this.#dirty.clear();
     this.#dirtyFiles.clear();
+    if (forceClear) return this.routeCache.clear();
     if (staleClientEntries.size > 0) {
       const staleKeys = this.#clientEntryManifestKeys(staleClientEntries);
       return this.routeCache.invalidateClientEntries({
@@ -268,6 +314,7 @@ export class DevHmrController {
 
   #isFastRefreshCandidate(files: string[]): boolean {
     if (!this.#fastRefreshEnabled || files.length === 0) return false;
+    if (manifestClientEntriesForFiles(files, this.routeCache.merged.clientManifest).size > 0) return true;
     return files.some((file) => {
       const resolved = path.resolve(file);
       return this.#recentClientEntries.has(resolved) || this.#recentClientFiles.has(resolved);
@@ -328,7 +375,7 @@ export class DevHmrController {
   }
 
   #staleClientEntriesForFiles(files: string[]): Set<string> {
-    const stale = new Set<string>();
+    const stale = manifestClientEntriesForFiles(files, this.routeCache.merged.clientManifest);
     for (const file of files) {
       const resolved = path.resolve(file);
       if (this.#recentClientEntries.has(resolved)) stale.add(resolved);

package/signal/endpoint.ts

@@ -15,16 +15,6 @@ export interface EndpointCls<
   [ENDPOINT_META]: EndpointInfoObj;
 }
 
-type ExtendedEndpointReturn<ClientReturns, Full, Light, Insight> = ClientReturns extends (infer R)[]
-  ? ExtendedEndpointReturn<R, Full, Light, Insight>[]
-  : Full extends ClientReturns
-    ? Full
-    : Light extends ClientReturns
-      ? Light
-      : Insight extends ClientReturns
-        ? Insight
-        : ClientReturns;
-
 type EndpointMetaOf<EndpCls> = EndpCls extends EndpointCls<any, infer EndpointInfoObj> ? EndpointInfoObj : never;
 
 type MergeEndpointMetas<EndpClses extends readonly EndpointCls[], Acc = unknown> = EndpClses extends readonly [
@@ -34,41 +24,6 @@ type MergeEndpointMetas<EndpClses extends readonly EndpointCls[], Acc = unknown>
   ? MergeEndpointMetas<Rest, Assign<Acc, EndpointMetaOf<First>>>
   : Acc;
 
-type ExtendEndpoints<
-  SrvModule extends ServiceModel,
-  LibEndpoints extends readonly EndpointCls[],
-  _Full = NonNullable<SrvModule["cnst"]>["_Full"],
-  _Light = NonNullable<SrvModule["cnst"]>["_Light"],
-  _Insight = NonNullable<SrvModule["cnst"]>["_Insight"],
-  _Merged = MergeEndpointMetas<LibEndpoints>,
-> = {
-  [K in keyof _Merged]: _Merged[K] extends EndpointInfo<
-    infer ReqType,
-    infer Srvs,
-    infer ArgNames,
-    infer Args,
-    infer InternalArgs,
-    infer ServerArgs,
-    infer Returns,
-    infer ClientReturns,
-    infer ServerReturns,
-    infer Nullable
-  >
-    ? EndpointInfo<
-        ReqType,
-        Srvs,
-        ArgNames,
-        Args,
-        InternalArgs,
-        ServerArgs,
-        Returns,
-        ExtendedEndpointReturn<ClientReturns, _Full, _Light, _Insight>,
-        ServerReturns,
-        Nullable
-      >
-    : never;
-};
-
 /** Builds a typed endpoint adaptor from a service module and endpoint builder. */
 export function endpoint<
   SrvModule extends ServiceModel,
@@ -80,9 +35,7 @@ export function endpoint<
   ...libEndpoints: LibEndpoints
 ): EndpointCls<
   SrvModule,
-  LibEndpoints extends readonly []
-    ? ReturnType<Builder>
-    : Assign<ReturnType<Builder>, ExtendEndpoints<SrvModule, LibEndpoints>>
+  LibEndpoints extends readonly [] ? ReturnType<Builder> : Assign<ReturnType<Builder>, MergeEndpointMetas<LibEndpoints>>
 > {
   const srvKeys = [
     ...new Set([

package/types/client/translator.d.ts

@@ -11,8 +11,12 @@ export declare class Translator {
     hasDictionary(lang: string): boolean;
     static setActiveLocale(lang: string | undefined): void;
     static getActiveLocale(): string | undefined;
+    static setActivePath(path: string | undefined): void;
+    static getActivePath(): string | undefined;
+    static markHydrated(): void;
     static translateByLocale(lang: string, key: string, param?: Record<string, string | number>): string;
     static seed(lang: string, dict: Dictionary | undefined): void;
+    static replace(lang: string, dict: Dictionary | undefined): void;
     translate(lang: string, key: string, param?: Record<string, string | number>): string;
     getDictionary(lang: string): Promise<Dictionary>;
 }

package/types/fetch/client/fetchClient.d.ts

@@ -9,6 +9,7 @@ export type FetchProxy<FetchType = unknown, SliceMetaObj extends Record<string,
     slice: SliceMetaObj;
     instance: FetchClient;
     _FetchType: FetchType;
+    _SliceMetaObj: SliceMetaObj;
 };
 type ClientSignalMap<SigType extends {
     fetch: any;

package/types/fetch/fetchType/buildFetch.type.d.ts

@@ -1,19 +1,39 @@
-import type { DatabaseSignal, EndpointCls, ServiceSignal, SliceCls } from "akanjs/signal";
+import type { DatabaseSignal, EndpointCls, SerializedSignal, ServiceSignal, SliceCls } from "akanjs/signal";
 import type { FetchProxy } from "../client.d.ts";
 import type { GetSliceMetaObjFromDatabaseSignals } from "../types.d.ts";
+import type { SliceMeta } from "./appliedReturn.type";
 import type { GetFetchTypeFromEndpoint } from "./endpointFetch.type";
 import type { GetFetchTypeFromSlice } from "./sliceFetch.type";
-export type FetchSignalInput = FetchProxy | DatabaseSignal | ServiceSignal;
-export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends FetchProxy<infer FetchType> ? FetchType : Signal extends {
+export type FetchProxySignalInput<FetchType = unknown, SliceMetaObj extends Record<string, SliceMeta> = Record<never, never>> = {
+    handler: Record<string, unknown>;
+    serializedSignal: Record<string, SerializedSignal>;
+    _FetchType: FetchType;
+    _SliceMetaObj: SliceMetaObj;
+};
+export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceSignal;
+export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends {
+    _FetchType: infer FetchType;
+} ? FetchType : Signal extends {
     endpoint: infer EndpCls extends EndpointCls;
     slice: infer SlceCls extends SliceCls;
-} ? GetFetchTypeFromEndpoint<EndpCls> & GetFetchTypeFromSlice<SlceCls> : Signal extends {
+} ? GetFetchTypeFromEndpoint<EndpCls, SlceCls> & GetFetchTypeFromSlice<SlceCls> : Signal extends {
     endpoint: infer EndpCls extends EndpointCls;
 } ? GetFetchTypeFromEndpoint<EndpCls> : unknown;
-type OverrideFetchType<Current, Next> = Omit<Current, keyof Next> & Next;
-export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> = Signals extends readonly [
-    infer First extends FetchSignalInput,
-    ...infer Rest extends readonly FetchSignalInput[]
-] ? OverrideFetchType<FetchTypeOfSignal<First>, MergeAllFetchTypes<Rest>> : unknown;
+type FetchKeysOfProxySignal<Signal> = Signal extends {
+    _FetchType: infer FetchType;
+} ? keyof FetchType : never;
+type FetchKeysOfProxySignals<Signals extends readonly FetchSignalInput[]> = FetchKeysOfProxySignal<Signals[number]>;
+type LastProxyFetchValue<Signals extends readonly FetchSignalInput[], Key extends PropertyKey, Current = never> = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]] ? First extends {
+    _FetchType: infer FetchType;
+} ? Key extends keyof FetchType ? LastProxyFetchValue<Rest, Key, FetchType[Key]> : LastProxyFetchValue<Rest, Key, Current> : LastProxyFetchValue<Rest, Key, Current> : Current;
+type MergeProxyFetchTypes<Signals extends readonly FetchSignalInput[]> = [FetchKeysOfProxySignals<Signals>] extends [
+    never
+] ? Record<never, never> : {
+    [Key in FetchKeysOfProxySignals<Signals>]: LastProxyFetchValue<Signals, Key>;
+};
+type MergeDirectFetchTypes<Signals extends readonly FetchSignalInput[], Acc = Record<never, never>> = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]] ? First extends {
+    _FetchType: unknown;
+} ? MergeDirectFetchTypes<Rest, Acc> : MergeDirectFetchTypes<Rest, Acc & FetchTypeOfSignal<First>> : Acc;
+export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> = MergeProxyFetchTypes<Signals> extends infer ProxyFetch ? MergeDirectFetchTypes<Signals> extends infer DirectFetch ? Omit<ProxyFetch, keyof DirectFetch> & DirectFetch : never : never;
 export type FetchClientType<Signals extends readonly FetchSignalInput[]> = FetchProxy<MergeAllFetchTypes<Signals>, GetSliceMetaObjFromDatabaseSignals<Signals>>;
 export {};

package/types/fetch/fetchType/endpointFetch.type.d.ts

@@ -1,28 +1,34 @@
 import type { ENDPOINT_META, PromiseOrObject } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
-import type { EndpInfoArgs, EndpInfoClientReturns, EndpInfoNullable, EndpInfoReqType, EndpointCls, EndpointInfo } from "akanjs/signal";
-type EndpInfoReturns<E> = EndpInfoClientReturns<E> | (EndpInfoNullable<E> extends true ? null : never);
-type QueryOrMutationFetchFn<E> = (...args: [...EndpInfoArgs<E>, fetchPolicy?: FetchPolicy]) => Promise<EndpInfoReturns<E>>;
-type MessageEmitFn<E> = (...args: EndpInfoArgs<E>) => EndpInfoReturns<E>;
-type MessageListenFn<E> = (handleEvent: (data: EndpInfoReturns<E>) => PromiseOrObject<void>, options?: FetchPolicy) => () => void;
-type PubsubSubscribeFn<E> = (...args: [...EndpInfoArgs<E>, handleEvent: (data: EndpInfoReturns<E>) => PromiseOrObject<void>, options?: FetchPolicy]) => () => void;
-type PrimaryFetchFn<E> = EndpInfoReqType<E> extends "query" | "mutation" ? QueryOrMutationFetchFn<E> : EndpInfoReqType<E> extends "message" ? MessageEmitFn<E> : never;
+import type { EndpInfoArgs, EndpInfoClientReturns, EndpInfoNullable, EndpInfoReqType, EndpointCls, EndpointInfo, SliceCls } from "akanjs/signal";
+type ExtendedEndpointReturn<ClientReturns, Full, Light, Insight> = ClientReturns extends (infer R)[] ? ExtendedEndpointReturn<R, Full, Light, Insight>[] : Full extends ClientReturns ? Full : Light extends ClientReturns ? Light : Insight extends ClientReturns ? Insight : ClientReturns;
+type EndpointClientReturns<E, SlceCls extends SliceCls | never> = [SlceCls] extends [never] ? EndpInfoClientReturns<E> : ExtendedEndpointReturn<EndpInfoClientReturns<E>, SlceCls["srv"]["cnst"]["_Full"], SlceCls["srv"]["cnst"]["_Light"], SlceCls["srv"]["cnst"]["_Insight"]>;
+type EndpInfoReturns<E, SlceCls extends SliceCls | never> = EndpointClientReturns<E, SlceCls> | (EndpInfoNullable<E> extends true ? null : never);
+type QueryOrMutationFetchFn<E, SlceCls extends SliceCls | never> = (...args: [...EndpInfoArgs<E>, fetchPolicy?: FetchPolicy]) => Promise<EndpInfoReturns<E, SlceCls>>;
+type MessageEmitFn<E, SlceCls extends SliceCls | never> = (...args: EndpInfoArgs<E>) => EndpInfoReturns<E, SlceCls>;
+type MessageListenFn<E, SlceCls extends SliceCls | never> = (handleEvent: (data: EndpInfoReturns<E, SlceCls>) => PromiseOrObject<void>, options?: FetchPolicy) => () => void;
+type PubsubSubscribeFn<E, SlceCls extends SliceCls | never> = (...args: [
+    ...EndpInfoArgs<E>,
+    handleEvent: (data: EndpInfoReturns<E, SlceCls>) => PromiseOrObject<void>,
+    options?: FetchPolicy
+]) => () => void;
+type PrimaryFetchFn<E, SlceCls extends SliceCls | never> = EndpInfoReqType<E> extends "query" | "mutation" ? QueryOrMutationFetchFn<E, SlceCls> : EndpInfoReqType<E> extends "message" ? MessageEmitFn<E, SlceCls> : never;
 type PrimaryFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
-}> = {
-    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "query" | "mutation" | "message" ? K : never]: PrimaryFetchFn<EInfoObj[K]>;
+}, SlceCls extends SliceCls | never> = {
+    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "query" | "mutation" | "message" ? K : never]: PrimaryFetchFn<EInfoObj[K], SlceCls>;
 };
 type PubsubFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
-}> = {
-    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "pubsub" ? K extends string ? `subscribe${Capitalize<K>}` : never : never]: PubsubSubscribeFn<EInfoObj[K]>;
+}, SlceCls extends SliceCls | never> = {
+    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "pubsub" ? K extends string ? `subscribe${Capitalize<K>}` : never : never]: PubsubSubscribeFn<EInfoObj[K], SlceCls>;
 };
 type MessageListenFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
-}> = {
-    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "message" ? K extends string ? `listen${Capitalize<K>}` : never : never]: MessageListenFn<EInfoObj[K]>;
+}, SlceCls extends SliceCls | never> = {
+    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "message" ? K extends string ? `listen${Capitalize<K>}` : never : never]: MessageListenFn<EInfoObj[K], SlceCls>;
 };
-export type GetFetchTypeFromEndpoint<EndpCls extends EndpointCls, _EndpointInfoObj extends {
+export type GetFetchTypeFromEndpoint<EndpCls extends EndpointCls, SlceCls extends SliceCls | never = never, _EndpointInfoObj extends {
     [key: string]: EndpointInfo;
-} = EndpCls[typeof ENDPOINT_META]> = PrimaryFetchType<_EndpointInfoObj> & PubsubFetchType<_EndpointInfoObj> & MessageListenFetchType<_EndpointInfoObj>;
+} = EndpCls[typeof ENDPOINT_META]> = PrimaryFetchType<_EndpointInfoObj, SlceCls> & PubsubFetchType<_EndpointInfoObj, SlceCls> & MessageListenFetchType<_EndpointInfoObj, SlceCls>;
 export {};

package/types/fetch/types.d.ts

@@ -7,13 +7,10 @@ export type Account<AddData = unknown> = {
     environment: Environment;
 } & AddData;
 export declare const getDefaultAccount: () => Account;
-type GetSliceNameFromSignal<Signal> = Signal extends DatabaseSignal ? `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}` : Signal extends {
-    slice: {
-        [K in infer Key]: SliceMeta;
-    };
-} ? Key : never;
-type GetSliceNamesFromSignals<Signals extends readonly unknown[]> = GetSliceNameFromSignal<Signals[number]>;
-export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[]> = {
-    [K in GetSliceNamesFromSignals<Signals>]: SliceMeta;
-};
+type GetSliceMetaObjFromSignal<Signal> = Signal extends {
+    _SliceMetaObj: infer SliceMetaObj extends Record<string, SliceMeta>;
+} ? SliceMetaObj : Signal extends DatabaseSignal ? {
+    [K in `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}`]: SliceMeta;
+} : Record<never, never>;
+export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[], Acc extends Record<string, SliceMeta> = Record<never, never>> = Signals extends readonly [infer First, ...infer Rest] ? GetSliceMetaObjFromDatabaseSignals<Rest, Acc & GetSliceMetaObjFromSignal<First>> : Acc;
 export {};

package/types/server/hmr/clientScript.d.ts

@@ -1 +1 @@
-export declare const HMR_CLIENT_SCRIPT = "(function(){\n  if (self.__AKAN_HMR_INSTALLED__) return;\n  self.__AKAN_HMR_INSTALLED__ = true;\n  var proto = location.protocol === \"https:\" ? \"wss:\" : \"ws:\";\n  var url = proto + \"//\" + location.host + \"/_akan/hmr\";\n  var attempts = 0;\n  var socket = null;\n  var lastBuildId = null;\n  var refreshRuntimePromise = null;\n  var refreshQueue = Promise.resolve();\n  var overlayEl = null;\n  var overlayLabelEl = null;\n  var overlayStyleEl = null;\n  var overlayTimer = null;\n  var overlayHideTimer = null;\n  var overlayNextToken = 1;\n  var overlayJobs = {};\n  self.__AKAN_HMR_PHASE__ = null;\n\n  // Bun's React Fast Refresh transform can emit top-level calls to these globals\n  // even when we fall back to full reload instead of applying React Refresh.\n  self.$RefreshReg$ = self.$RefreshReg$ || function(){};\n  self.$RefreshSig$ = self.$RefreshSig$ || function(){ return function(type){ return type; }; };\n\n  function connect(){\n    try { socket = new WebSocket(url); }\n    catch(e){ console.error(\"[akan-hmr] ws init failed\", e); schedule(); return; }\n    socket.addEventListener(\"open\", function(){ attempts = 0; });\n    socket.addEventListener(\"message\", function(ev){\n      var msg;\n      try { msg = JSON.parse(ev.data); } catch (e){ return; }\n      if (!msg || typeof msg.type !== \"string\") return;\n      if (msg.type === \"hello\") {\n        if (lastBuildId !== null && msg.buildId !== lastBuildId) {\n          location.reload();\n          return;\n        }\n        lastBuildId = msg.buildId;\n        return;\n      }\n      if (msg.type === \"reload\") {\n        beginHmrOverlay(\"Reloading...\", true);\n        try { self.__AKAN_RSC_CLEAR_CACHE__ && self.__AKAN_RSC_CLEAR_CACHE__(); } catch(e){}\n        setTimeout(function(){ location.reload(); }, 30);\n        return;\n      }\n      if (msg.type === \"rsc-refresh\") {\n        refreshRsc(msg);\n        return;\n      }\n      if (msg.type === \"client-refresh\") {\n        refreshClient(msg);\n        return;\n      }\n      if (msg.type === \"css-update\") {\n        var cssUrl = selectCssUrl(msg.cssAssets);\n        if (cssUrl) swapCss(cssUrl);\n        else {\n          beginHmrOverlay(\"Reloading...\", true);\n          location.reload();\n        }\n        return;\n      }\n      if (msg.type === \"error\") { console.error(\"[akan-hmr]\", msg.message); return; }\n    });\n    socket.addEventListener(\"close\", function(){ socket = null; schedule(); });\n    socket.addEventListener(\"error\", function(){ try { socket && socket.close(); } catch(e){} });\n  }\n\n  function schedule(){\n    attempts = Math.min(attempts + 1, 6);\n    var delay = Math.min(30000, 250 * Math.pow(2, attempts - 1));\n    setTimeout(connect, delay);\n  }\n\n  function ensureOverlay(){\n    if (overlayEl && overlayLabelEl) return overlayEl;\n    if (!overlayStyleEl) {\n      overlayStyleEl = document.createElement(\"style\");\n      overlayStyleEl.textContent =\n        \"@keyframes akan-hmr-spin{to{transform:rotate(360deg)}}\" +\n        \".__akan_hmr_overlay{position:fixed;left:16px;bottom:16px;z-index:2147483647;display:flex;align-items:center;gap:9px;padding:10px 12px;border-radius:999px;background:rgba(17,24,39,.94);color:#fff;font:500 13px/1.2 ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif;box-shadow:0 10px 28px rgba(0,0,0,.28);pointer-events:none;opacity:0;transform:translateY(6px);transition:opacity .15s ease,transform .15s ease;backdrop-filter:blur(8px)}\" +\n        \".__akan_hmr_overlay[data-show=true]{opacity:1;transform:translateY(0)}\" +\n        \".__akan_hmr_spinner{width:14px;height:14px;border:2px solid rgba(255,255,255,.32);border-top-color:#fff;border-radius:999px;animation:akan-hmr-spin .75s linear infinite;flex:none}\" +\n        \"@media (prefers-reduced-motion:reduce){.__akan_hmr_overlay{transition:none}.__akan_hmr_spinner{animation:none}}\";\n      document.head.appendChild(overlayStyleEl);\n    }\n    overlayEl = document.createElement(\"div\");\n    overlayEl.className = \"__akan_hmr_overlay\";\n    overlayEl.setAttribute(\"role\", \"status\");\n    overlayEl.setAttribute(\"aria-live\", \"polite\");\n    overlayEl.innerHTML = '<span class=\"__akan_hmr_spinner\" aria-hidden=\"true\"></span><span data-akan-hmr-label>Updating...</span>';\n    overlayLabelEl = overlayEl.querySelector(\"[data-akan-hmr-label]\");\n    (document.body || document.documentElement).appendChild(overlayEl);\n    return overlayEl;\n  }\n\n  function activeOverlayTokens(){\n    return Object.keys(overlayJobs);\n  }\n\n  function latestOverlayLabel(){\n    var keys = activeOverlayTokens();\n    if (keys.length === 0) return \"Updating...\";\n    return overlayJobs[keys[keys.length - 1]] || \"Updating...\";\n  }\n\n  function showOverlayNow(){\n    overlayTimer = null;\n    if (activeOverlayTokens().length === 0) return;\n    var el = ensureOverlay();\n    if (overlayHideTimer) {\n      clearTimeout(overlayHideTimer);\n      overlayHideTimer = null;\n    }\n    if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n    requestAnimationFrame(function(){ el.setAttribute(\"data-show\", \"true\"); });\n  }\n\n  function beginHmrOverlay(label, immediate){\n    var token = overlayNextToken++;\n    overlayJobs[token] = label || \"Updating...\";\n    if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n    if (overlayHideTimer) {\n      clearTimeout(overlayHideTimer);\n      overlayHideTimer = null;\n    }\n    if (immediate) {\n      if (overlayTimer) clearTimeout(overlayTimer);\n      showOverlayNow();\n    } else if (!overlayTimer && (!overlayEl || overlayEl.getAttribute(\"data-show\") !== \"true\")) {\n      overlayTimer = setTimeout(showOverlayNow, 120);\n    }\n    return token;\n  }\n\n  function setHmrOverlayLabel(token, label){\n    if (!overlayJobs[token]) return;\n    overlayJobs[token] = label || \"Updating...\";\n    if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n  }\n\n  function endHmrOverlay(token){\n    delete overlayJobs[token];\n    if (activeOverlayTokens().length > 0) {\n      if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n      return;\n    }\n    if (overlayTimer) {\n      clearTimeout(overlayTimer);\n      overlayTimer = null;\n    }\n    if (!overlayEl) return;\n    overlayEl.setAttribute(\"data-show\", \"false\");\n    if (overlayHideTimer) clearTimeout(overlayHideTimer);\n    overlayHideTimer = setTimeout(function(){\n      if (overlayEl && activeOverlayTokens().length === 0 && overlayEl.parentNode) {\n        overlayEl.parentNode.removeChild(overlayEl);\n        overlayEl = null;\n        overlayLabelEl = null;\n      }\n    }, 180);\n  }\n\n  function refreshRsc(msg){\n    var started = performance.now();\n    var overlayToken = beginHmrOverlay(\"Refreshing page...\");\n    try { self.__AKAN_RSC_CLEAR_CACHE__ && self.__AKAN_RSC_CLEAR_CACHE__(); } catch(e){}\n    if (!self.__AKAN_RSC_REFRESH__) {\n      console.warn(\"[akan-hmr] RSC refresh API unavailable, falling back to full reload\");\n      setHmrOverlayLabel(overlayToken, \"Reloading...\");\n      setTimeout(function(){ location.reload(); }, 30);\n      return;\n    }\n    Promise.resolve(self.__AKAN_RSC_REFRESH__({ buildId: msg.buildId })).then(function(){\n      lastBuildId = msg.buildId;\n      endHmrOverlay(overlayToken);\n      console.debug && console.debug(\"[akan-hmr] RSC refreshed\", {\n        buildId: msg.buildId,\n        generation: msg.generation,\n        routeIds: msg.routeIds,\n        changedFiles: msg.changedFiles && msg.changedFiles.length,\n        durationMs: Math.round(performance.now() - started)\n      });\n    }, function(err){\n      console.error(\"[akan-hmr] RSC refresh failed, falling back to full reload\", err);\n      setHmrOverlayLabel(overlayToken, \"Update failed, reloading...\");\n      setTimeout(function(){ location.reload(); }, 250);\n    });\n  }\n\n  function ensureRefreshRuntime(){\n    if (refreshRuntimePromise) return refreshRuntimePromise;\n    refreshRuntimePromise = import(\"react-refresh/runtime\").then(function(mod){\n      var runtime = mod.default || mod;\n      if (!self.__AKAN_REACT_REFRESH_READY__) {\n        runtime.injectIntoGlobalHook(self);\n        self.$RefreshReg$ = function(type, id){ runtime.register(type, id); };\n        self.$RefreshSig$ = runtime.createSignatureFunctionForTransform;\n        self.__AKAN_REACT_REFRESH_READY__ = true;\n        self.__AKAN_REACT_REFRESH_RUNTIME__ = runtime;\n      }\n      return runtime;\n    });\n    return refreshRuntimePromise;\n  }\n\n  function refreshClient(msg){\n    refreshQueue = refreshQueue.then(function(){ return doRefreshClient(msg); }, function(){ return doRefreshClient(msg); });\n  }\n\n  function setHmrPhase(phase){\n    self.__AKAN_HMR_PHASE__ = phase;\n  }\n\n  function doRefreshClient(msg){\n    var started = performance.now();\n    var metadataAt = started;\n    var importAt = started;\n    var refreshAt = started;\n    var overlayToken = beginHmrOverlay(\"Updating...\");\n    var fallbackToRsc = false;\n    return ensureRefreshRuntime().then(function(runtime){\n      setHmrOverlayLabel(overlayToken, \"Fetching update...\");\n      var endpoint = new URL(\"/_akan/hmr/client-refresh\", location.origin);\n      endpoint.searchParams.set(\"url\", location.href);\n      if (msg.buildId != null) endpoint.searchParams.set(\"buildId\", String(msg.buildId));\n      return fetch(endpoint, { credentials: \"same-origin\", cache: \"no-store\" })\n        .then(function(res){\n          if (!res.ok) throw new Error(\"client-refresh metadata failed \" + res.status + \" \" + res.statusText);\n          return res.json();\n        })\n        .then(function(info){\n          metadataAt = performance.now();\n          var chunks = Array.isArray(info.chunks) ? info.chunks : [];\n          if (chunks.length === 0) throw new Error(\"no client chunks returned\");\n          setHmrPhase(\"refresh-import\");\n          setHmrOverlayLabel(overlayToken, \"Importing update...\");\n          return Promise.all(chunks.map(function(chunk){ return import(chunk); })).then(function(){\n            importAt = performance.now();\n            setHmrPhase(\"react-refresh\");\n            setHmrOverlayLabel(overlayToken, \"Applying update...\");\n            try {\n              runtime.performReactRefresh();\n            } finally {\n              setHmrPhase(null);\n            }\n            refreshAt = performance.now();\n            lastBuildId = msg.buildId;\n            console.debug && console.debug(\"[akan-hmr] React Fast Refresh applied\", {\n              buildId: msg.buildId,\n              generation: msg.generation,\n              chunks: chunks.length,\n              routeIds: info.routeIds || msg.routeIds,\n              changedFiles: msg.changedFiles && msg.changedFiles.length,\n              metadataMs: Math.round(metadataAt - started),\n              importMs: Math.round(importAt - metadataAt),\n              refreshMs: Math.round(refreshAt - importAt),\n              durationMs: Math.round(refreshAt - started)\n            });\n            endHmrOverlay(overlayToken);\n          }, function(err){\n            setHmrPhase(null);\n            throw err;\n          });\n        });\n    }).catch(function(err){\n      console.warn(\"[akan-hmr] React Fast Refresh failed, falling back to RSC refresh\", err);\n      fallbackToRsc = true;\n      endHmrOverlay(overlayToken);\n      refreshRsc(msg);\n    }).finally(function(){\n      if (!fallbackToRsc) endHmrOverlay(overlayToken);\n    });\n  }\n\n  function swapCss(href){\n    var overlayToken = beginHmrOverlay(\"Updating styles...\");\n    var link = document.createElement(\"link\");\n    link.rel = \"stylesheet\";\n    link.href = href;\n    link.setAttribute(\"data-akan-css\", \"pending\");\n    link.addEventListener(\"load\", function(){\n      var prev = document.querySelectorAll(\"link[data-akan-css=active]\");\n      for (var i = 0; i < prev.length; i++) prev[i].parentNode && prev[i].parentNode.removeChild(prev[i]);\n      link.setAttribute(\"data-akan-css\", \"active\");\n      endHmrOverlay(overlayToken);\n    });\n    link.addEventListener(\"error\", function(){\n      if (link.parentNode) link.parentNode.removeChild(link);\n      endHmrOverlay(overlayToken);\n    });\n    document.head.appendChild(link);\n  }\n\n  function selectCssUrl(cssAssets){\n    if (!cssAssets || typeof cssAssets !== \"object\") return null;\n    var parts = location.pathname.split(\"/\").filter(Boolean);\n    for (var i = 0; i < parts.length; i++) {\n      var asset = cssAssets[parts[i]];\n      if (asset && asset.cssUrl) return asset.cssUrl;\n    }\n    return cssAssets[\"\"] && cssAssets[\"\"].cssUrl ? cssAssets[\"\"].cssUrl : null;\n  }\n\n  connect();\n})();";
+export declare const HMR_CLIENT_SCRIPT = "(function(){\n  if (self.__AKAN_HMR_INSTALLED__) return;\n  self.__AKAN_HMR_INSTALLED__ = true;\n  var proto = location.protocol === \"https:\" ? \"wss:\" : \"ws:\";\n  var url = proto + \"//\" + location.host + \"/_akan/hmr\";\n  var attempts = 0;\n  var socket = null;\n  var lastBuildId = null;\n  var refreshRuntimePromise = null;\n  var refreshRuntime = null;\n  var pendingRefreshRegistrations = [];\n  var refreshQueue = Promise.resolve();\n  var overlayEl = null;\n  var overlayLabelEl = null;\n  var overlayStyleEl = null;\n  var overlayTimer = null;\n  var overlayHideTimer = null;\n  var overlayNextToken = 1;\n  var overlayJobs = {};\n  self.__AKAN_HMR_PHASE__ = null;\n\n  // Bun's React Fast Refresh transform can emit top-level calls to these globals\n  // even when we fall back to full reload instead of applying React Refresh.\n  self.$RefreshReg$ = self.$RefreshReg$ || function(type, id){\n    if (refreshRuntime) refreshRuntime.register(type, id);\n    else pendingRefreshRegistrations.push([type, id]);\n  };\n  self.$RefreshSig$ = self.$RefreshSig$ || function(){ return function(type){ return type; }; };\n  // Start installing React Refresh before the application module graph loads.\n  // Injecting the runtime only on the first update is too late for React's renderer hook.\n  ensureRefreshRuntime().catch(function(err){\n    console.warn(\"[akan-hmr] React Refresh runtime preload failed\", err);\n  });\n\n  function connect(){\n    try { socket = new WebSocket(url); }\n    catch(e){ console.error(\"[akan-hmr] ws init failed\", e); schedule(); return; }\n    socket.addEventListener(\"open\", function(){ attempts = 0; });\n    socket.addEventListener(\"message\", function(ev){\n      var msg;\n      try { msg = JSON.parse(ev.data); } catch (e){ return; }\n      if (!msg || typeof msg.type !== \"string\") return;\n      if (msg.type === \"hello\") {\n        if (lastBuildId !== null && msg.buildId !== lastBuildId) {\n          location.reload();\n          return;\n        }\n        lastBuildId = msg.buildId;\n        return;\n      }\n      if (msg.type === \"reload\") {\n        beginHmrOverlay(\"Reloading...\", true);\n        try { self.__AKAN_RSC_CLEAR_CACHE__ && self.__AKAN_RSC_CLEAR_CACHE__(); } catch(e){}\n        setTimeout(function(){ location.reload(); }, 30);\n        return;\n      }\n      if (msg.type === \"rsc-refresh\") {\n        refreshRsc(msg);\n        return;\n      }\n      if (msg.type === \"client-refresh\") {\n        refreshClient(msg);\n        return;\n      }\n      if (msg.type === \"css-update\") {\n        var cssUrl = selectCssUrl(msg.cssAssets);\n        if (cssUrl) swapCss(cssUrl);\n        else {\n          beginHmrOverlay(\"Reloading...\", true);\n          location.reload();\n        }\n        return;\n      }\n      if (msg.type === \"error\") { console.error(\"[akan-hmr]\", msg.message); return; }\n    });\n    socket.addEventListener(\"close\", function(){ socket = null; schedule(); });\n    socket.addEventListener(\"error\", function(){ try { socket && socket.close(); } catch(e){} });\n  }\n\n  function schedule(){\n    attempts = Math.min(attempts + 1, 6);\n    var delay = Math.min(30000, 250 * Math.pow(2, attempts - 1));\n    setTimeout(connect, delay);\n  }\n\n  function ensureOverlay(){\n    if (overlayEl && overlayLabelEl) return overlayEl;\n    if (!overlayStyleEl) {\n      overlayStyleEl = document.createElement(\"style\");\n      overlayStyleEl.textContent =\n        \"@keyframes akan-hmr-spin{to{transform:rotate(360deg)}}\" +\n        \".__akan_hmr_overlay{position:fixed;left:16px;bottom:16px;z-index:2147483647;display:flex;align-items:center;gap:9px;padding:10px 12px;border-radius:999px;background:rgba(17,24,39,.94);color:#fff;font:500 13px/1.2 ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif;box-shadow:0 10px 28px rgba(0,0,0,.28);pointer-events:none;opacity:0;transform:translateY(6px);transition:opacity .15s ease,transform .15s ease;backdrop-filter:blur(8px)}\" +\n        \".__akan_hmr_overlay[data-show=true]{opacity:1;transform:translateY(0)}\" +\n        \".__akan_hmr_spinner{width:14px;height:14px;border:2px solid rgba(255,255,255,.32);border-top-color:#fff;border-radius:999px;animation:akan-hmr-spin .75s linear infinite;flex:none}\" +\n        \"@media (prefers-reduced-motion:reduce){.__akan_hmr_overlay{transition:none}.__akan_hmr_spinner{animation:none}}\";\n      document.head.appendChild(overlayStyleEl);\n    }\n    overlayEl = document.createElement(\"div\");\n    overlayEl.className = \"__akan_hmr_overlay\";\n    overlayEl.setAttribute(\"role\", \"status\");\n    overlayEl.setAttribute(\"aria-live\", \"polite\");\n    overlayEl.innerHTML = '<span class=\"__akan_hmr_spinner\" aria-hidden=\"true\"></span><span data-akan-hmr-label>Updating...</span>';\n    overlayLabelEl = overlayEl.querySelector(\"[data-akan-hmr-label]\");\n    (document.body || document.documentElement).appendChild(overlayEl);\n    return overlayEl;\n  }\n\n  function activeOverlayTokens(){\n    return Object.keys(overlayJobs);\n  }\n\n  function latestOverlayLabel(){\n    var keys = activeOverlayTokens();\n    if (keys.length === 0) return \"Updating...\";\n    return overlayJobs[keys[keys.length - 1]] || \"Updating...\";\n  }\n\n  function showOverlayNow(){\n    overlayTimer = null;\n    if (activeOverlayTokens().length === 0) return;\n    var el = ensureOverlay();\n    if (overlayHideTimer) {\n      clearTimeout(overlayHideTimer);\n      overlayHideTimer = null;\n    }\n    if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n    requestAnimationFrame(function(){ el.setAttribute(\"data-show\", \"true\"); });\n  }\n\n  function beginHmrOverlay(label, immediate){\n    var token = overlayNextToken++;\n    overlayJobs[token] = label || \"Updating...\";\n    if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n    if (overlayHideTimer) {\n      clearTimeout(overlayHideTimer);\n      overlayHideTimer = null;\n    }\n    if (immediate) {\n      if (overlayTimer) clearTimeout(overlayTimer);\n      showOverlayNow();\n    } else if (!overlayTimer && (!overlayEl || overlayEl.getAttribute(\"data-show\") !== \"true\")) {\n      overlayTimer = setTimeout(showOverlayNow, 120);\n    }\n    return token;\n  }\n\n  function setHmrOverlayLabel(token, label){\n    if (!overlayJobs[token]) return;\n    overlayJobs[token] = label || \"Updating...\";\n    if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n  }\n\n  function endHmrOverlay(token){\n    delete overlayJobs[token];\n    if (activeOverlayTokens().length > 0) {\n      if (overlayLabelEl) overlayLabelEl.textContent = latestOverlayLabel();\n      return;\n    }\n    if (overlayTimer) {\n      clearTimeout(overlayTimer);\n      overlayTimer = null;\n    }\n    if (!overlayEl) return;\n    overlayEl.setAttribute(\"data-show\", \"false\");\n    if (overlayHideTimer) clearTimeout(overlayHideTimer);\n    overlayHideTimer = setTimeout(function(){\n      if (overlayEl && activeOverlayTokens().length === 0 && overlayEl.parentNode) {\n        overlayEl.parentNode.removeChild(overlayEl);\n        overlayEl = null;\n        overlayLabelEl = null;\n      }\n    }, 180);\n  }\n\n  function refreshRsc(msg){\n    var started = performance.now();\n    var overlayToken = beginHmrOverlay(\"Refreshing page...\");\n    try { self.__AKAN_RSC_CLEAR_CACHE__ && self.__AKAN_RSC_CLEAR_CACHE__(); } catch(e){}\n    if (!self.__AKAN_RSC_REFRESH__) {\n      console.warn(\"[akan-hmr] RSC refresh API unavailable, falling back to full reload\");\n      setHmrOverlayLabel(overlayToken, \"Reloading...\");\n      setTimeout(function(){ location.reload(); }, 30);\n      return;\n    }\n    Promise.resolve(self.__AKAN_RSC_REFRESH__({ buildId: msg.buildId })).then(function(){\n      lastBuildId = msg.buildId;\n      endHmrOverlay(overlayToken);\n      console.debug && console.debug(\"[akan-hmr] RSC refreshed\", {\n        buildId: msg.buildId,\n        generation: msg.generation,\n        routeIds: msg.routeIds,\n        changedFiles: msg.changedFiles && msg.changedFiles.length,\n        durationMs: Math.round(performance.now() - started)\n      });\n    }, function(err){\n      console.error(\"[akan-hmr] RSC refresh failed, falling back to full reload\", err);\n      setHmrOverlayLabel(overlayToken, \"Update failed, reloading...\");\n      setTimeout(function(){ location.reload(); }, 250);\n    });\n  }\n\n  function ensureRefreshRuntime(){\n    if (refreshRuntimePromise) return refreshRuntimePromise;\n    refreshRuntimePromise = import(\"react-refresh/runtime\").then(function(mod){\n      var runtime = mod.default || mod;\n      if (!self.__AKAN_REACT_REFRESH_READY__) {\n        refreshRuntime = runtime;\n        runtime.injectIntoGlobalHook(self);\n        self.$RefreshReg$ = function(type, id){ runtime.register(type, id); };\n        self.$RefreshSig$ = runtime.createSignatureFunctionForTransform;\n        for (var i = 0; i < pendingRefreshRegistrations.length; i++) {\n          self.$RefreshReg$(pendingRefreshRegistrations[i][0], pendingRefreshRegistrations[i][1]);\n        }\n        pendingRefreshRegistrations = [];\n        self.__AKAN_REACT_REFRESH_READY__ = true;\n        self.__AKAN_REACT_REFRESH_RUNTIME__ = runtime;\n      }\n      return runtime;\n    });\n    return refreshRuntimePromise;\n  }\n\n  function refreshClient(msg){\n    refreshQueue = refreshQueue.then(function(){ return doRefreshClient(msg); }, function(){ return doRefreshClient(msg); });\n  }\n\n  function setHmrPhase(phase){\n    self.__AKAN_HMR_PHASE__ = phase;\n  }\n\n  function doRefreshClient(msg){\n    var started = performance.now();\n    var metadataAt = started;\n    var importAt = started;\n    var refreshAt = started;\n    var overlayToken = beginHmrOverlay(\"Updating...\");\n    var fallbackToRsc = false;\n    return ensureRefreshRuntime().then(function(runtime){\n      setHmrOverlayLabel(overlayToken, \"Fetching update...\");\n      var endpoint = new URL(\"/_akan/hmr/client-refresh\", location.origin);\n      endpoint.searchParams.set(\"url\", location.href);\n      if (msg.buildId != null) endpoint.searchParams.set(\"buildId\", String(msg.buildId));\n      return fetch(endpoint, { credentials: \"same-origin\", cache: \"no-store\" })\n        .then(function(res){\n          if (!res.ok) throw new Error(\"client-refresh metadata failed \" + res.status + \" \" + res.statusText);\n          return res.json();\n        })\n        .then(function(info){\n          metadataAt = performance.now();\n          var chunks = Array.isArray(info.chunks) ? info.chunks : [];\n          if (chunks.length === 0) throw new Error(\"no client chunks returned\");\n          setHmrPhase(\"refresh-import\");\n          setHmrOverlayLabel(overlayToken, \"Importing update...\");\n          return Promise.all(chunks.map(function(chunk){ return import(chunk); })).then(function(){\n            importAt = performance.now();\n            setHmrPhase(\"react-refresh\");\n            setHmrOverlayLabel(overlayToken, \"Applying update...\");\n            try {\n              runtime.performReactRefresh();\n            } finally {\n              setHmrPhase(null);\n            }\n            refreshAt = performance.now();\n            lastBuildId = msg.buildId;\n            console.debug && console.debug(\"[akan-hmr] React Fast Refresh applied\", {\n              buildId: msg.buildId,\n              generation: msg.generation,\n              chunks: chunks.length,\n              routeIds: info.routeIds || msg.routeIds,\n              changedFiles: msg.changedFiles && msg.changedFiles.length,\n              metadataMs: Math.round(metadataAt - started),\n              importMs: Math.round(importAt - metadataAt),\n              refreshMs: Math.round(refreshAt - importAt),\n              durationMs: Math.round(refreshAt - started)\n            });\n            endHmrOverlay(overlayToken);\n          }, function(err){\n            setHmrPhase(null);\n            throw err;\n          });\n        });\n    }).catch(function(err){\n      console.warn(\"[akan-hmr] React Fast Refresh failed, falling back to RSC refresh\", err);\n      fallbackToRsc = true;\n      endHmrOverlay(overlayToken);\n      refreshRsc(msg);\n    }).finally(function(){\n      if (!fallbackToRsc) endHmrOverlay(overlayToken);\n    });\n  }\n\n  function swapCss(href){\n    var overlayToken = beginHmrOverlay(\"Updating styles...\");\n    var link = document.createElement(\"link\");\n    link.rel = \"stylesheet\";\n    link.href = href;\n    link.setAttribute(\"data-akan-css\", \"pending\");\n    link.addEventListener(\"load\", function(){\n      var prev = document.querySelectorAll(\"link[data-akan-css=active]\");\n      for (var i = 0; i < prev.length; i++) prev[i].parentNode && prev[i].parentNode.removeChild(prev[i]);\n      link.setAttribute(\"data-akan-css\", \"active\");\n      endHmrOverlay(overlayToken);\n    });\n    link.addEventListener(\"error\", function(){\n      if (link.parentNode) link.parentNode.removeChild(link);\n      endHmrOverlay(overlayToken);\n    });\n    document.head.appendChild(link);\n  }\n\n  function selectCssUrl(cssAssets){\n    if (!cssAssets || typeof cssAssets !== \"object\") return null;\n    var parts = location.pathname.split(\"/\").filter(Boolean);\n    for (var i = 0; i < parts.length; i++) {\n      var asset = cssAssets[parts[i]];\n      if (asset && asset.cssUrl) return asset.cssUrl;\n    }\n    return cssAssets[\"\"] && cssAssets[\"\"].cssUrl ? cssAssets[\"\"].cssUrl : null;\n  }\n\n  connect();\n})();";

package/types/server/hmr/devHmrController.d.ts

@@ -2,6 +2,8 @@ import { BuilderRpc, type ClientManifest, RouteClientCache, type RouteSeedIndex
 import type { RscWorker } from "../rscWorkerHost.d.ts";
 import type { RenderState } from "../types.d.ts";
 import { type HmrWsData, HmrWsHub } from "./wsHub.d.ts";
+export declare function isAkanRuntimeMetadataFile(file: string): boolean;
+export declare function manifestClientEntriesForFiles(files: string[], clientManifest: ClientManifest, workspaceRoot?: string): Set<string>;
 export interface DevHmrControllerOptions {
     renderState: RenderState;
     rsc: RscWorker;
@@ -21,4 +23,5 @@ export declare class DevHmrController {
     ensureRoute(url: URL): Promise<import("..").MergedManifest>;
     routeIdsForPath(pathname: string): string[] | undefined;
     static clientChunkUrls(clientManifest: ClientManifest): string[];
+    static shouldFullReloadForRuntimeMetadata(files: string[]): boolean;
 }

package/types/signal/endpoint.d.ts

@@ -13,16 +13,12 @@ export interface EndpointCls<SrvModule extends ServiceModel = ServiceModel, Endp
     srv: SrvModule;
     [ENDPOINT_META]: EndpointInfoObj;
 }
-type ExtendedEndpointReturn<ClientReturns, Full, Light, Insight> = ClientReturns extends (infer R)[] ? ExtendedEndpointReturn<R, Full, Light, Insight>[] : Full extends ClientReturns ? Full : Light extends ClientReturns ? Light : Insight extends ClientReturns ? Insight : ClientReturns;
 type EndpointMetaOf<EndpCls> = EndpCls extends EndpointCls<any, infer EndpointInfoObj> ? EndpointInfoObj : never;
 type MergeEndpointMetas<EndpClses extends readonly EndpointCls[], Acc = unknown> = EndpClses extends readonly [
     infer First extends EndpointCls,
     ...infer Rest extends readonly EndpointCls[]
 ] ? MergeEndpointMetas<Rest, Assign<Acc, EndpointMetaOf<First>>> : Acc;
-type ExtendEndpoints<SrvModule extends ServiceModel, LibEndpoints extends readonly EndpointCls[], _Full = NonNullable<SrvModule["cnst"]>["_Full"], _Light = NonNullable<SrvModule["cnst"]>["_Light"], _Insight = NonNullable<SrvModule["cnst"]>["_Insight"], _Merged = MergeEndpointMetas<LibEndpoints>> = {
-    [K in keyof _Merged]: _Merged[K] extends EndpointInfo<infer ReqType, infer Srvs, infer ArgNames, infer Args, infer InternalArgs, infer ServerArgs, infer Returns, infer ClientReturns, infer ServerReturns, infer Nullable> ? EndpointInfo<ReqType, Srvs, ArgNames, Args, InternalArgs, ServerArgs, Returns, ExtendedEndpointReturn<ClientReturns, _Full, _Light, _Insight>, ServerReturns, Nullable> : never;
-};
 /** Builds a typed endpoint adaptor from a service module and endpoint builder. */
-export declare function endpoint<SrvModule extends ServiceModel, Builder extends EndpointBuilder<SrvModule>, LibEndpoints extends readonly EndpointCls[]>(srv: SrvModule, builder: Builder, ...libEndpoints: LibEndpoints): EndpointCls<SrvModule, LibEndpoints extends readonly [] ? ReturnType<Builder> : Assign<ReturnType<Builder>, ExtendEndpoints<SrvModule, LibEndpoints>>>;
+export declare function endpoint<SrvModule extends ServiceModel, Builder extends EndpointBuilder<SrvModule>, LibEndpoints extends readonly EndpointCls[]>(srv: SrvModule, builder: Builder, ...libEndpoints: LibEndpoints): EndpointCls<SrvModule, LibEndpoints extends readonly [] ? ReturnType<Builder> : Assign<ReturnType<Builder>, MergeEndpointMetas<LibEndpoints>>>;
 export declare function sliceEndpoint<SrvModule extends ServiceModel, Builder extends EndpointBuilder<SrvModule>>(srv: SrvModule, builder: Builder): EndpointCls<SrvModule, ReturnType<Builder>>;
 export {};

package/types/ui/System/Client.d.ts

@@ -5,7 +5,7 @@ import type { SerializedSignal } from "akanjs/signal";
 import { type HTMLAttributes, type ReactNode, type RefObject } from "react";
 export declare const Client: {
     (): import("react/jsx-runtime").JSX.Element;
-    Wrapper: ({ children, theme, lang, dictionary, signals, reconnect, }: ClientWrapperProps) => import("react/jsx-runtime").JSX.Element;
+    Wrapper: ({ children, theme, lang, path, dictionary, signals, reconnect, }: ClientWrapperProps) => import("react/jsx-runtime").JSX.Element;
     Bridge: ({ env, lang, theme, prefix, gaTrackingId, wsConnect }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
     Inner: () => import("react/jsx-runtime").JSX.Element;
     SsrBridge: ({ lang, prefix }: ClientSsrBridgeProps) => null;
@@ -14,22 +14,30 @@ interface ClientWrapperProps {
     children: ReactNode;
     theme?: AkanTheme;
     lang?: string;
+    path?: string;
     dictionary?: Record<string, Record<string, unknown>>;
     signals?: SerializedSignal[];
     reconnect?: boolean;
 }
-export declare const ClientWrapper: ({ children, theme, lang, dictionary, signals, reconnect, }: ClientWrapperProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ClientWrapper: ({ children, theme, lang, path, dictionary, signals, reconnect, }: ClientWrapperProps) => import("react/jsx-runtime").JSX.Element;
 interface ClientPathWrapperProps extends Omit<HTMLAttributes<HTMLDivElement>, "style"> {
     bind?: () => HTMLAttributes<HTMLDivElement>;
     wrapperRef?: RefObject<HTMLDivElement | null> | null;
     pageType?: "current" | "prev" | "cached";
     location?: Location;
+    initialHref?: string;
+    initialPath?: string;
+    initialPathname?: string;
+    initialParams?: Record<string, string>;
+    initialSearch?: string;
+    initialSearchParams?: Record<string, string | string[]>;
+    initialHash?: string;
     style?: TransitionStyle;
     prefix?: string;
     children?: ReactNode;
     layoutStyle?: "web" | "mobile";
 }
-export declare const ClientPathWrapper: ({ className, bind, wrapperRef, pageType, location, prefix, children, layoutStyle, ...props }: ClientPathWrapperProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ClientPathWrapper: ({ className, bind, wrapperRef, pageType, location, initialHref, initialPath, initialPathname, initialParams, initialSearch, initialSearchParams, initialHash, prefix, children, layoutStyle, ...props }: ClientPathWrapperProps) => import("react/jsx-runtime").JSX.Element;
 interface ClientBridgeProps {
     env: ClientEnv;
     lang?: string;

package/types/ui/System/SSR.d.ts

@@ -4,7 +4,7 @@ import { type ProviderProps } from "./Common.d.ts";
 export declare const SSR: {
     (): import("react/jsx-runtime").JSX.Element;
     Provider: ({ className, appName, params, head, manifest, env, gaTrackingId, children, theme, prefix, fonts, layoutStyle, reconnect, wsConnect, dictionary, allDictionary, of, }: SSRProviderProps) => import("react/jsx-runtime").JSX.Element;
-    Wrapper: ({ children, head, manifest, fonts, className, prefix, layoutStyle, }: SSRWrapperProps) => import("react/jsx-runtime").JSX.Element;
+    Wrapper: ({ children, head, manifest, fonts, className, lang, path, prefix, layoutStyle, }: SSRWrapperProps) => import("react/jsx-runtime").JSX.Element;
 };
 export type SSRProviderProps = ProviderProps & {
     fonts?: ReactFont[];
@@ -14,6 +14,7 @@ interface SSRWrapperProps {
     className?: string;
     appName: string;
     lang: "en" | "ko" | (string & {});
+    path: string;
     head?: ReactNode;
     manifest?: WebAppManifest;
     fonts?: ReactFont[];

package/ui/Link/SsrLink.tsx

@@ -3,7 +3,6 @@
 import { getEnv } from "akanjs/base";
 import { clsx, getPathInfo, router, usePage, usePathCtx } from "akanjs/client";
 import { Logger } from "akanjs/common";
-import { st } from "akanjs/store";
 import type { SsrLinkProps } from "./types";
 
 export default function SsrLink({
@@ -21,11 +20,7 @@ export default function SsrLink({
   const pathCtx = usePathCtx();
   const prefix = pathCtx.prefix;
   const { lang, path: pagePath } = usePage();
-  const storePathname = st.use.pathname();
-  const currentPath =
-    getEnv().side === "server"
-      ? getPathInfo(pagePath, lang, prefix ?? "").path
-      : getPathInfo(storePathname, lang, prefix ?? "").path;
+  const currentPath = pathCtx.location?.pathRoute?.path ?? getPathInfo(pagePath, lang, prefix ?? "").path;
   const isExternal = href.startsWith("http") || href.startsWith("mailto:") || href.startsWith("tel:");
   const internalPathInfo = getPathInfo(href, lang, prefix ?? "");
   const publicPathInfo = getPathInfo(href, lang, "");

package/ui/System/Client.tsx

@@ -43,6 +43,7 @@ interface ClientWrapperProps {
   children: ReactNode;
   theme?: AkanTheme;
   lang?: string;
+  path?: string;
   dictionary?: Record<string, Record<string, unknown>>;
   signals?: SerializedSignal[];
   reconnect?: boolean;
@@ -51,6 +52,7 @@ export const ClientWrapper = ({
   children,
   theme,
   lang = "en",
+  path,
   dictionary,
   signals = [],
   reconnect = true,
@@ -59,8 +61,12 @@ export const ClientWrapper = ({
   if (dictionary) {
     Translator.seed(lang, dictionary);
 
-    if (typeof window !== "undefined") Translator.setActiveLocale(lang);
+    Translator.setActiveLocale(lang);
   }
+  Translator.setActivePath(path);
+  useEffect(() => {
+    Translator.markHydrated();
+  }, [path]);
   useLayoutEffect(() => {
     Logger.rawLog(logo);
   }, []);
@@ -79,6 +85,13 @@ interface ClientPathWrapperProps extends Omit<HTMLAttributes<HTMLDivElement>, "s
   wrapperRef?: RefObject<HTMLDivElement | null> | null;
   pageType?: "current" | "prev" | "cached";
   location?: Location;
+  initialHref?: string;
+  initialPath?: string;
+  initialPathname?: string;
+  initialParams?: Record<string, string>;
+  initialSearch?: string;
+  initialSearchParams?: Record<string, string | string[]>;
+  initialHash?: string;
   style?: TransitionStyle;
   prefix?: string;
   children?: ReactNode;
@@ -90,22 +103,29 @@ export const ClientPathWrapper = ({
   wrapperRef,
   pageType = "current",
   location,
+  initialHref,
+  initialPath,
+  initialPathname,
+  initialParams,
+  initialSearch,
+  initialSearchParams,
+  initialHash,
   prefix = "",
   children,
   layoutStyle = "web",
   ...props
 }: ClientPathWrapperProps) => {
-  const href = location?.href ?? (typeof window !== "undefined" ? window.location.href : "");
-  const hash = location?.hash ?? (typeof window !== "undefined" ? window.location.hash : "");
-  const pathname = location?.pathname ?? "/"; 
-  const params = location?.params ?? {}; 
-  const searchParams = location?.searchParams ?? {}; 
-  const search = location?.search ?? (typeof window !== "undefined" ? window.location.search : "");
+  const href = location?.href ?? initialHref ?? (typeof window !== "undefined" ? window.location.href : "");
+  const hash = location?.hash ?? initialHash ?? (typeof window !== "undefined" ? window.location.hash : "");
+  const pathname = location?.pathname ?? initialPathname ?? "/"; 
+  const params = location?.params ?? initialParams ?? {}; 
+  const searchParams = location?.searchParams ?? initialSearchParams ?? {}; 
+  const search = location?.search ?? initialSearch ?? (typeof window !== "undefined" ? window.location.search : "");
   const lang = params.lang;
   const firstPath = pathname.split("/")[2];
   const pathRoute: PathRoute = location?.pathRoute ?? {
-    path: `/${pathname.split("/").slice(2).join("/")}`,
-    pathSegments: pathname.split("/").slice(2),
+    path: initialPath ?? `/${pathname.split("/").slice(2).join("/")}`,
+    pathSegments: (initialPath ?? `/${pathname.split("/").slice(2).join("/")}`).split("/").filter(Boolean),
     renderPage: { render: () => <></> },
     pageState: defaultPageState,
     renderRootLayouts: [],

package/ui/System/SSR.tsx

@@ -1,5 +1,5 @@
 import { getEnv } from "akanjs/base";
-import { clsx, type ReactFont, router, Translator, usePage, type WebAppManifest } from "akanjs/client";
+import { clsx, getPathInfo, type ReactFont, router, Translator, usePage, type WebAppManifest } from "akanjs/client";
 import { setRequestTheme } from "akanjs/fetch";
 import { Children, Fragment, type ReactNode, Suspense } from "react";
 import { FontCss } from "../fontCss";
@@ -35,8 +35,9 @@ const SSRProvider = ({
   of,
 }: SSRProviderProps) => {
   setRequestTheme(theme);
+  Translator.markHydrated();
 
-  const { lang: activeLocale } = usePage();
+  const { lang: activeLocale, path: activePath } = usePage();
 
   if (allDictionary) for (const [lng, dict] of Object.entries(allDictionary)) Translator.seed(lng, dict);
 
@@ -47,20 +48,21 @@ const SSRProvider = ({
       of={of}
       loader={async () => {
         if (!router.isInitialized) router.init({ type: "ssr", side: "server", lang: activeLocale, prefix });
-        return { lang: activeLocale } as const;
+        return { lang: activeLocale, path: activePath } as const;
       }}
-      render={({ lang }) => (
+      render={({ lang, path }) => (
         <SSRWrapper
           className={className}
           appName={appName}
           lang={lang}
+          path={path}
           head={head}
           manifest={manifest}
           fonts={fonts}
           prefix={prefix}
           layoutStyle={layoutStyle}
         >
-          <ClientWrapper theme={theme} lang={lang} reconnect={reconnect} dictionary={activeDictionary}>
+          <ClientWrapper theme={theme} lang={lang} path={path} reconnect={reconnect} dictionary={activeDictionary}>
             <Fragment key="children">{Children.toArray(children)}</Fragment>
             <Suspense key="client-inner" fallback={null}>
               <ClientInner />
@@ -106,6 +108,7 @@ interface SSRWrapperProps {
   className?: string;
   appName: string;
   lang: "en" | "ko" | (string & {});
+  path: string;
   head?: ReactNode;
   manifest?: WebAppManifest;
   fonts?: ReactFont[];
@@ -120,59 +123,74 @@ const SSRWrapper = ({
   manifest,
   fonts = [],
   className,
+  lang,
+  path,
   prefix,
   layoutStyle = "web",
-}: SSRWrapperProps) => (
-  <>
-    <ServerFontFace key="fonts" fonts={fonts} />
-    <ManifestLink key="manifest" manifest={manifest} />
-    {head ? <Fragment key="head">{head}</Fragment> : null}
-    <div key="frame-root" id="frameRoot" className={className}>
-      <ClientPathWrapper layoutStyle={layoutStyle} prefix={prefix}>
-        <div key="top-safe-area" id="topSafeArea" className={clsx("fixed inset-x-0 top-0 bg-base-100")} />
-        <div key="page-containers" id="pageContainers" className={clsx("isolate")}>
-          <div id="pageContainer">
-            <div
-              id="pageContent"
-              className={clsx("relative isolate", {
-                "w-full": layoutStyle === "web",
-                "left-1/2 h-screen w-[600px] -translate-x-1/2": layoutStyle === "mobile",
-              })}
-            >
-              {Children.toArray(children)}
+}: SSRWrapperProps) => {
+  const { href, pathname, search, hash } = getPathInfo(path, lang, prefix ?? "");
+
+  return (
+    <>
+      <ServerFontFace key="fonts" fonts={fonts} />
+      <ManifestLink key="manifest" manifest={manifest} />
+      {head ? <Fragment key="head">{head}</Fragment> : null}
+      <div key="frame-root" id="frameRoot" className={className}>
+        <ClientPathWrapper
+          layoutStyle={layoutStyle}
+          prefix={prefix}
+          initialHref={href}
+          initialPath={path}
+          initialPathname={pathname}
+          initialParams={{ lang }}
+          initialSearch={search}
+          initialHash={hash}
+        >
+          <div key="top-safe-area" id="topSafeArea" className={clsx("fixed inset-x-0 top-0 bg-base-100")} />
+          <div key="page-containers" id="pageContainers" className={clsx("isolate")}>
+            <div id="pageContainer">
+              <div
+                id="pageContent"
+                className={clsx("relative isolate", {
+                  "w-full": layoutStyle === "web",
+                  "left-1/2 h-screen w-[600px] -translate-x-1/2": layoutStyle === "mobile",
+                })}
+              >
+                {Children.toArray(children)}
+              </div>
             </div>
           </div>
-        </div>
-        <div
-          key="top-inset"
-          id="topInsetContainer"
-          className={clsx("fixed inset-x-0 top-0 isolate bg-base-100", {
-            "left-1/2 w-[600px] -translate-x-1/2": layoutStyle === "mobile",
-            "w-full": layoutStyle === "web",
-          })}
-        >
-          <div id="topInsetContent" className={clsx("relative isolate size-full")} />
-        </div>
-        <div
-          key="top-left-action"
-          id="topLeftActionContainer"
-          className="absolute top-0 left-0 isolate flex aspect-1 items-center justify-center"
-        />
-        <div
-          key="bottom-inset"
-          id="bottomInsetContainer"
-          className={clsx("fixed inset-x-0 bottom-0 isolate", {
-            "left-1/2 w-[600px] -translate-x-1/2": layoutStyle === "mobile",
-            "w-full": layoutStyle === "web",
-          })}
-        >
-          <div id="bottomInsetContent" className="isolate size-full" />
-        </div>
-        <div key="bottom-safe-area" id="bottomSafeArea" className="fixed inset-x-0 bg-base-100" />
-      </ClientPathWrapper>
-    </div>
-  </>
-);
+          <div
+            key="top-inset"
+            id="topInsetContainer"
+            className={clsx("fixed inset-x-0 top-0 isolate bg-base-100", {
+              "left-1/2 w-[600px] -translate-x-1/2": layoutStyle === "mobile",
+              "w-full": layoutStyle === "web",
+            })}
+          >
+            <div id="topInsetContent" className={clsx("relative isolate size-full")} />
+          </div>
+          <div
+            key="top-left-action"
+            id="topLeftActionContainer"
+            className="absolute top-0 left-0 isolate flex aspect-1 items-center justify-center"
+          />
+          <div
+            key="bottom-inset"
+            id="bottomInsetContainer"
+            className={clsx("fixed inset-x-0 bottom-0 isolate", {
+              "left-1/2 w-[600px] -translate-x-1/2": layoutStyle === "mobile",
+              "w-full": layoutStyle === "web",
+            })}
+          >
+            <div id="bottomInsetContent" className="isolate size-full" />
+          </div>
+          <div key="bottom-safe-area" id="bottomSafeArea" className="fixed inset-x-0 bg-base-100" />
+        </ClientPathWrapper>
+      </div>
+    </>
+  );
+};
 SSR.Wrapper = SSRWrapper;
 
 export default SSRProvider;