@jami-studio/core 0.92.27 → 0.92.29

package/corpus/README.md

@@ -27,5 +27,5 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- core files: 2156
+- core files: 2157
 - template files: 5114

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @agent-native/core
 
+## 0.92.29
+
+### Patch Changes
+
+- b9c3561: Cloudflare Pages static-shell deployments: strip `hasLoader`/`hasAction` from
+  the React Router client manifest at build time. The CF worker intentionally
+  ships no React Router request handler (static app shell keeps the merged
+  worker under the platform bundle-size limit), but templates build with
+  `ssr: true`, so the hydrated router issued single-fetch `GET <route>.data`
+  requests on every client-side navigation into a route with a server loader —
+  nothing served them, they 404'd, and React Router tripped the route
+  ErrorBoundary (`No result found for routeId "..."`), breaking in-app
+  navigation across every app of a unified workspace deployment. With the
+  server-only flags stripped, client-side navigation behaves exactly like the
+  initial static-shell load: render with client data only. `hasClientLoader`/
+  `hasClientAction` are preserved; other presets are unaffected.
+
+## 0.92.28
+
+### Patch Changes
+
+- 77b77e7: Per-app global-registry scoping on unified workspace deployments. The
+  globalThis-pinned framework registries (file-upload providers, private-blob
+  providers, shareable resources, event-bus registry + bus, notification
+  channels, tracking providers + queue, secrets registry) were shared across
+  every app in the single Cloudflare Pages isolate, so one app's registrations
+  served another app's requests — an upload POSTed to /assets was handled by
+  the clips app's S3 provider (wrong object prefix). Registries now resolve
+  their global keys lazily through a per-module-graph scope
+  (`@agent-native/core/global-scope`), and each mounted app's generated worker
+  entry sets its scope id via a `_scope-init.js` module evaluated first in the
+  bundle's import graph. Dev-mode and single-app deployments stay unscoped, so
+  the original multi-ESM-graph dedupe behavior is unchanged.
+
 ## 0.92.27
 
 ### Patch Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.92.27",
+  "version": "0.92.29",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/studio-jami/jami-studio#readme",
   "bugs": {
@@ -97,6 +97,7 @@
     "./embedding/react": "./dist/embedding/react.js",
     "./onboarding": "./dist/onboarding/index.js",
     "./shared": "./dist/shared/index.js",
+    "./global-scope": "./dist/shared/global-scope.js",
     "./voice": "./dist/voice/index.js",
     "./scripts": "./dist/scripts/index.js",
     "./application-state": "./dist/application-state/index.js",

package/corpus/core/src/deploy/build.ts

@@ -605,6 +605,46 @@ export const CLOUDFLARE_WORKER_NODE_BUILTIN_STUB_MODULES: Record<
 
 export interface GenerateWorkerEntryOptions {
   includeReactRouterSsr?: boolean;
+  /**
+   * Per-app global-registry scope id for unified workspace deployments.
+   * When set, the generated entry's FIRST import is `./_scope-init.js`
+   * (written by the build via `generateScopeInitSource`), which calls
+   * core's `setGlobalScopeId(appId)` before any other module in the app
+   * bundle evaluates — so every globalThis-pinned registry in this app's
+   * module graph resolves per-app keys instead of colliding with sibling
+   * apps in the shared isolate (issue: /assets uploads served by clips'
+   * provider).
+   */
+  appScopeId?: string | null;
+}
+
+/**
+ * Source of the `_scope-init.js` module the worker entry imports first on
+ * unified workspace deployments. Must stay dependency-free beyond core's
+ * lean `global-scope` subpath so nothing registry-touching evaluates before
+ * the scope id is set (ESM evaluates imports depth-first in order).
+ */
+export function generateScopeInitSource(appScopeId: string): string {
+  return `// AUTO-GENERATED by @agent-native/core deploy build
+// Scope globalThis-pinned framework registries to this app's module graph.
+// Evaluated FIRST in the worker entry's import graph so the scope is set
+// before any registry module initializes. See core shared/global-scope.
+import { setGlobalScopeId } from "@agent-native/core/global-scope";
+setGlobalScopeId(${JSON.stringify(appScopeId)});
+`;
+}
+
+/**
+ * Derive the workspace app id from a mounted app base path ("/assets" →
+ * "assets"). Returns null for unmounted (root) builds.
+ */
+export function workspaceAppScopeIdFromBasePath(
+  basePath: string | undefined,
+): string | null {
+  const normalized = normalizeAppBasePath(basePath ?? "");
+  if (!normalized) return null;
+  const [first] = normalized.slice(1).split("/");
+  return first || null;
 }
 
 interface ReactRouterAssetManifest {
@@ -625,6 +665,7 @@ interface ReactRouterAssetManifestRoute {
   imports?: string[];
   css?: string[];
   hasLoader?: boolean;
+  hasAction?: boolean;
   clientActionModule?: string;
   clientLoaderModule?: string;
   clientMiddlewareModule?: string;
@@ -734,6 +775,7 @@ export function generateWorkerEntry(
   options: GenerateWorkerEntryOptions = {},
 ): string {
   const includeReactRouterSsr = options.includeReactRouterSsr ?? true;
+  const appScopeId = options.appScopeId ?? null;
   const routeImports: string[] = [];
   const routeRegistrations: string[] = [];
 
@@ -854,7 +896,7 @@ export function generateWorkerEntry(
 
   return `
 // Auto-generated worker entry point for ${preset}
-import { H3, defineEventHandler, readBody, toResponse } from "h3";
+${appScopeId ? 'import "./_scope-init.js";\n' : ""}import { H3, defineEventHandler, readBody, toResponse } from "h3";
 ${includeReactRouterSsr ? 'import { createRequestHandler } from "react-router";' : ""}
 ${includeReactRouterSsr ? 'import * as serverBuild from "./server-build.js";' : ""}
 
@@ -1416,6 +1458,63 @@ function findReactRouterManifest(distDir: string): ReactRouterAssetManifest {
   return JSON.parse(match[1].replace(/;$/, "")) as ReactRouterAssetManifest;
 }
 
+/**
+ * Align the React Router CLIENT manifest with the static-shell worker.
+ *
+ * The Cloudflare Pages worker intentionally ships NO React Router request
+ * handler (`includeReactRouterSsr = false` keeps the merged worker under the
+ * platform bundle-size limit; navigations get the static app shell instead).
+ * Templates build with `ssr: true`, so the emitted client manifest still
+ * advertises `hasLoader`/`hasAction` for routes with server exports — and the
+ * hydrated router then issues single-fetch `GET <route>.data` requests on
+ * every client-side navigation into such a route. Nothing serves them: the
+ * request 404s and React Router trips the route ErrorBoundary
+ * (`No result found for routeId "..."`), breaking in-app navigation on every
+ * app of a unified workspace deployment.
+ *
+ * Stripping the server-only flags makes client-side navigation behave exactly
+ * like the initial static-shell load already does: render with client data
+ * only (server loaders never run anywhere in this deployment shape).
+ * `hasClientLoader` / `hasClientAction` are preserved untouched.
+ */
+export function stripServerDataFlagsFromClientManifest(distDir: string): void {
+  const assetsDir = path.join(distDir, "assets");
+  if (!fs.existsSync(assetsDir)) return;
+  const manifestFile = fs
+    .readdirSync(assetsDir)
+    .find((file) => /^manifest-[\w-]+\.js$/.test(file));
+  if (!manifestFile) return;
+
+  const manifestPath = path.join(assetsDir, manifestFile);
+  const source = fs.readFileSync(manifestPath, "utf8");
+  const match = source.match(/^window\.__reactRouterManifest=(.*);?\s*$/);
+  if (!match) return;
+
+  const manifest = JSON.parse(
+    match[1].replace(/;$/, ""),
+  ) as ReactRouterAssetManifest;
+  let stripped = 0;
+  for (const route of Object.values(manifest.routes ?? {})) {
+    if (route.hasLoader) {
+      route.hasLoader = false;
+      stripped++;
+    }
+    if (route.hasAction) {
+      route.hasAction = false;
+      stripped++;
+    }
+  }
+  if (stripped === 0) return;
+
+  fs.writeFileSync(
+    manifestPath,
+    `window.__reactRouterManifest=${JSON.stringify(manifest)};`,
+  );
+  console.log(
+    `[deploy] Stripped ${stripped} server loader/action flag(s) from ${manifestFile} — the static-shell worker has no React Router handler, so single-fetch .data requests would 404.`,
+  );
+}
+
 function collectModulePreloads(
   manifest: ReactRouterAssetManifest,
   route: ReactRouterAssetManifestRoute,
@@ -1632,6 +1731,12 @@ async function buildCloudflarePages() {
   fs.mkdirSync(tmpDir, { recursive: true });
   writeCloudflarePagesStaticShell({ serverDir, distDir, tmpDir });
 
+  // AFTER the shell is written (its manifest fallback reads the original
+  // hasLoader flag to pick the embedded root-loader turbo stream): align the
+  // client manifest with the handler-less worker so client-side navigations
+  // don't issue .data single-fetch requests that can only 404.
+  stripServerDataFlagsFromClientManifest(distDir);
+
   // Exclude _worker.js from being served as a public asset
   fs.writeFileSync(path.join(distDir, ".assetsignore"), "_worker.js\n");
 
@@ -1668,6 +1773,12 @@ async function buildCloudflarePages() {
 
   // Generate the worker entry
   const immutableAssetPaths = collectImmutableAssetPaths(clientDir);
+  // Per-app global-registry scoping for unified workspace deploys: mounted
+  // builds (APP_BASE_PATH=/<app>) get a scope-init module evaluated first so
+  // globalThis-pinned registries stay per-app in the shared isolate.
+  const appScopeId = workspaceAppScopeIdFromBasePath(
+    normalizeConfiguredAppBasePath(),
+  );
   const entrySource = generateWorkerEntry(
     routes,
     plugins,
@@ -1676,7 +1787,7 @@ async function buildCloudflarePages() {
     workspaceCore,
     immutableAssetPaths,
     normalizeConfiguredAppBasePath(),
-    { includeReactRouterSsr },
+    { includeReactRouterSsr, appScopeId },
   );
 
   // Create _worker.js output directory
@@ -1704,6 +1815,13 @@ async function buildCloudflarePages() {
   const tmpEntry = path.join(tmpDir, "index.js");
   fs.writeFileSync(tmpEntry, adjustedEntry);
 
+  if (appScopeId) {
+    fs.writeFileSync(
+      path.join(tmpDir, "_scope-init.js"),
+      generateScopeInitSource(appScopeId),
+    );
+  }
+
   if (includeReactRouterSsr) {
     copyDir(serverDir, path.join(tmpDir, "server"));
   }

package/corpus/core/src/event-bus/bus.ts

@@ -1,140 +1,138 @@
-/**
- * Typed pub/sub bus for framework events.
- *
- * Wraps Node's EventEmitter with payload validation against the registered
- * Standard Schema for each event. Handler errors are caught and logged so a
- * misbehaving subscriber can never crash the emitter.
- */
-
-import { randomUUID } from "node:crypto";
-import { EventEmitter } from "node:events";
-
-import { getEvent } from "./registry.js";
-import type { EventMeta } from "./types.js";
-
-type Handler = (payload: unknown, meta: EventMeta) => void | Promise<void>;
-
-interface BusState {
-  emitter: EventEmitter;
-  subscriptions: Map<string, { event: string; handler: Handler }>;
-}
-
-const BUS_KEY = Symbol.for("@agent-native/core/event-bus.bus");
-interface GlobalWithBus {
-  [BUS_KEY]?: BusState;
-}
-
-function getBus(): BusState {
-  const g = globalThis as unknown as GlobalWithBus;
-  if (!g[BUS_KEY]) {
-    const emitter = new EventEmitter();
-    // Many integrations may subscribe to the same event; lift the warning
-    // ceiling rather than printing MaxListenersExceededWarning at runtime.
-    emitter.setMaxListeners(0);
-    g[BUS_KEY] = { emitter, subscriptions: new Map() };
-  }
-  return g[BUS_KEY]!;
-}
-
-export function subscribe(event: string, handler: Handler): string {
-  if (typeof event !== "string" || !event) {
-    throw new Error("subscribe: event name is required");
-  }
-  if (typeof handler !== "function") {
-    throw new Error("subscribe: handler must be a function");
-  }
-  const bus = getBus();
-  const id = randomUUID();
-  bus.subscriptions.set(id, { event, handler });
-  bus.emitter.on(event, handler);
-  return id;
-}
-
-export function unsubscribe(id: string): boolean {
-  const bus = getBus();
-  const sub = bus.subscriptions.get(id);
-  if (!sub) return false;
-  bus.emitter.off(sub.event, sub.handler);
-  bus.subscriptions.delete(id);
-  return true;
-}
-
-export function emit(
-  event: string,
-  payload: unknown,
-  meta?: Partial<EventMeta>,
-): void {
-  if (typeof event !== "string" || !event) {
-    throw new Error("emit: event name is required");
-  }
-  const bus = getBus();
-  const def = getEvent(event);
-
-  let validated: unknown = payload;
-  if (def) {
-    const result = def.payloadSchema["~standard"].validate(payload);
-    if (result instanceof Promise) {
-      console.warn(
-        `[event-bus] Payload schema for "${event}" returned a Promise — ` +
-          `async validation is not supported. Dispatching unvalidated payload.`,
-      );
-    } else if (result.issues) {
-      console.warn(
-        `[event-bus] Payload validation failed for "${event}":`,
-        result.issues,
-      );
-      return;
-    } else {
-      validated = (result as { value: unknown }).value;
-    }
-  } else {
-    console.warn(
-      `[event-bus] Emitting unregistered event "${event}". ` +
-        `Call registerEvent() to declare it.`,
-    );
-  }
-
-  const fullMeta: EventMeta = {
-    eventId: meta?.eventId ?? randomUUID(),
-    emittedAt: meta?.emittedAt ?? new Date().toISOString(),
-    owner: meta?.owner,
-  };
-
-  // Snapshot listeners so a handler that subscribes/unsubscribes during
-  // dispatch doesn't perturb this emission.
-  const listeners = bus.emitter.listeners(event) as Handler[];
-  for (const listener of listeners) {
-    try {
-      const r = listener(validated, fullMeta);
-      if (r && typeof (r as Promise<void>).catch === "function") {
-        (r as Promise<void>).catch((err) => {
-          console.error(
-            `[event-bus] Async handler for "${event}" rejected:`,
-            err,
-          );
-        });
-      }
-    } catch (err) {
-      console.error(`[event-bus] Handler for "${event}" threw:`, err);
-    }
-  }
-}
-
-export function listSubscriptions(
-  event?: string,
-): { id: string; event: string }[] {
-  const bus = getBus();
-  const out: { id: string; event: string }[] = [];
-  for (const [id, sub] of bus.subscriptions) {
-    if (event && sub.event !== event) continue;
-    out.push({ id, event: sub.event });
-  }
-  return out;
-}
-
-/** Test helper — drops all subscriptions. */
-export function __resetEventBus(): void {
-  const bus = getBus();
-  bus.emitter.removeAllListeners();
-  bus.subscriptions.clear();
-}
+/**
+ * Typed pub/sub bus for framework events.
+ *
+ * Wraps Node's EventEmitter with payload validation against the registered
+ * Standard Schema for each event. Handler errors are caught and logged so a
+ * misbehaving subscriber can never crash the emitter.
+ */
+
+import { randomUUID } from "node:crypto";
+import { EventEmitter } from "node:events";
+
+import { getScopedGlobal } from "../shared/global-scope.js";
+import { getEvent } from "./registry.js";
+import type { EventMeta } from "./types.js";
+
+type Handler = (payload: unknown, meta: EventMeta) => void | Promise<void>;
+
+interface BusState {
+  emitter: EventEmitter;
+  subscriptions: Map<string, { event: string; handler: Handler }>;
+}
+
+// globalThis-pinned so one app's ESM graphs share one bus, but scope-aware +
+// lazily resolved so unified workspace deployments (all apps in one isolate)
+// keep per-app buses — one app's handlers never fire for a same-named event
+// emitted by a sibling app. See shared/global-scope.
+function getBus(): BusState {
+  return getScopedGlobal("agent-native.event-bus.bus", () => {
+    const emitter = new EventEmitter();
+    // Many integrations may subscribe to the same event; lift the warning
+    // ceiling rather than printing MaxListenersExceededWarning at runtime.
+    emitter.setMaxListeners(0);
+    return { emitter, subscriptions: new Map() };
+  });
+}
+
+export function subscribe(event: string, handler: Handler): string {
+  if (typeof event !== "string" || !event) {
+    throw new Error("subscribe: event name is required");
+  }
+  if (typeof handler !== "function") {
+    throw new Error("subscribe: handler must be a function");
+  }
+  const bus = getBus();
+  const id = randomUUID();
+  bus.subscriptions.set(id, { event, handler });
+  bus.emitter.on(event, handler);
+  return id;
+}
+
+export function unsubscribe(id: string): boolean {
+  const bus = getBus();
+  const sub = bus.subscriptions.get(id);
+  if (!sub) return false;
+  bus.emitter.off(sub.event, sub.handler);
+  bus.subscriptions.delete(id);
+  return true;
+}
+
+export function emit(
+  event: string,
+  payload: unknown,
+  meta?: Partial<EventMeta>,
+): void {
+  if (typeof event !== "string" || !event) {
+    throw new Error("emit: event name is required");
+  }
+  const bus = getBus();
+  const def = getEvent(event);
+
+  let validated: unknown = payload;
+  if (def) {
+    const result = def.payloadSchema["~standard"].validate(payload);
+    if (result instanceof Promise) {
+      console.warn(
+        `[event-bus] Payload schema for "${event}" returned a Promise — ` +
+          `async validation is not supported. Dispatching unvalidated payload.`,
+      );
+    } else if (result.issues) {
+      console.warn(
+        `[event-bus] Payload validation failed for "${event}":`,
+        result.issues,
+      );
+      return;
+    } else {
+      validated = (result as { value: unknown }).value;
+    }
+  } else {
+    console.warn(
+      `[event-bus] Emitting unregistered event "${event}". ` +
+        `Call registerEvent() to declare it.`,
+    );
+  }
+
+  const fullMeta: EventMeta = {
+    eventId: meta?.eventId ?? randomUUID(),
+    emittedAt: meta?.emittedAt ?? new Date().toISOString(),
+    owner: meta?.owner,
+  };
+
+  // Snapshot listeners so a handler that subscribes/unsubscribes during
+  // dispatch doesn't perturb this emission.
+  const listeners = bus.emitter.listeners(event) as Handler[];
+  for (const listener of listeners) {
+    try {
+      const r = listener(validated, fullMeta);
+      if (r && typeof (r as Promise<void>).catch === "function") {
+        (r as Promise<void>).catch((err) => {
+          console.error(
+            `[event-bus] Async handler for "${event}" rejected:`,
+            err,
+          );
+        });
+      }
+    } catch (err) {
+      console.error(`[event-bus] Handler for "${event}" threw:`, err);
+    }
+  }
+}
+
+export function listSubscriptions(
+  event?: string,
+): { id: string; event: string }[] {
+  const bus = getBus();
+  const out: { id: string; event: string }[] = [];
+  for (const [id, sub] of bus.subscriptions) {
+    if (event && sub.event !== event) continue;
+    out.push({ id, event: sub.event });
+  }
+  return out;
+}
+
+/** Test helper — drops all subscriptions. */
+export function __resetEventBus(): void {
+  const bus = getBus();
+  bus.emitter.removeAllListeners();
+  bus.subscriptions.clear();
+}