@jami-studio/core 0.92.27 → 0.92.28

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,22 @@
 # @agent-native/core
 
+## 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.28",
   "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 {
@@ -734,6 +774,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 +895,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";' : ""}
 
@@ -1668,6 +1709,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 +1723,7 @@ async function buildCloudflarePages() {
     workspaceCore,
     immutableAssetPaths,
     normalizeConfiguredAppBasePath(),
-    { includeReactRouterSsr },
+    { includeReactRouterSsr, appScopeId },
   );
 
   // Create _worker.js output directory
@@ -1704,6 +1751,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();
+}

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

@@ -1,79 +1,81 @@
-/**
- * In-process registry of event definitions.
- *
- * Integrations and templates call `registerEvent()` at module load to declare
- * the event types they emit. The bus uses these definitions to validate
- * payloads, and the Automations UI lists them so users can build triggers.
- */
-
-import { z } from "zod";
-
-import type { EventDefinition } from "./types.js";
-
-// Pin to globalThis so multiple ESM graphs (dev-mode Vite + Nitro, symlinks,
-// dist/ vs src/) share a single registry. Same pattern as secrets/register.ts.
-const REGISTRY_KEY = Symbol.for("@agent-native/core/event-bus.registry");
-interface GlobalWithRegistry {
-  [REGISTRY_KEY]?: Map<string, EventDefinition>;
-}
-const registry: Map<string, EventDefinition> = ((
-  globalThis as unknown as GlobalWithRegistry
-)[REGISTRY_KEY] ??= new Map());
-
-/**
- * Register (or replace) an event definition.
- *
- * Subsequent registrations with the same `name` replace the previous
- * definition — later plugins can override built-in defaults.
- */
-export function registerEvent(def: EventDefinition): void {
-  if (!def || typeof def.name !== "string" || !def.name) {
-    throw new Error("registerEvent: def.name is required");
-  }
-  if (typeof def.description !== "string" || !def.description) {
-    throw new Error("registerEvent: def.description is required");
-  }
-  if (!def.payloadSchema) {
-    throw new Error("registerEvent: def.payloadSchema is required");
-  }
-  registry.set(def.name, def);
-}
-
-/** Return all registered events in registration order. */
-export function listEvents(): EventDefinition[] {
-  return Array.from(registry.values());
-}
-
-/** Look up a single registered event by name. */
-export function getEvent(name: string): EventDefinition | undefined {
-  return registry.get(name);
-}
-
-/** Test helper — clears the registry between runs. */
-export function __resetEventRegistry(): void {
-  registry.clear();
-  registerBuiltInEvents();
-}
-
-function registerBuiltInEvents(): void {
-  registerEvent({
-    name: "test.event.fired",
-    description:
-      "Developer test event — fired manually from the Automations UI or via the test-event action.",
-    payloadSchema: z
-      .object({ data: z.record(z.string(), z.unknown()).optional() })
-      .optional() as unknown as EventDefinition["payloadSchema"],
-  });
-
-  registerEvent({
-    name: "agent.turn.completed",
-    description: "Fires after the agent completes a conversational turn.",
-    payloadSchema: z.object({
-      threadId: z.string().optional(),
-      turnIndex: z.number().optional(),
-      model: z.string().optional(),
-    }) as unknown as EventDefinition["payloadSchema"],
-  });
-}
-
-registerBuiltInEvents();
+/**
+ * In-process registry of event definitions.
+ *
+ * Integrations and templates call `registerEvent()` at module load to declare
+ * the event types they emit. The bus uses these definitions to validate
+ * payloads, and the Automations UI lists them so users can build triggers.
+ */
+
+import { z } from "zod";
+
+import { getScopedGlobal } from "../shared/global-scope.js";
+import type { EventDefinition } from "./types.js";
+
+// Pin to globalThis so multiple ESM graphs (dev-mode Vite + Nitro, symlinks,
+// dist/ vs src/) share a single registry. Same pattern as secrets/register.ts.
+// Scope-aware + lazily resolved so unified workspace deployments (all apps in
+// one isolate) keep per-app event definitions. See shared/global-scope.
+function getEventRegistry(): Map<string, EventDefinition> {
+  return getScopedGlobal(
+    "agent-native.event-bus.registry",
+    () => new Map<string, EventDefinition>(),
+  );
+}
+
+/**
+ * Register (or replace) an event definition.
+ *
+ * Subsequent registrations with the same `name` replace the previous
+ * definition — later plugins can override built-in defaults.
+ */
+export function registerEvent(def: EventDefinition): void {
+  if (!def || typeof def.name !== "string" || !def.name) {
+    throw new Error("registerEvent: def.name is required");
+  }
+  if (typeof def.description !== "string" || !def.description) {
+    throw new Error("registerEvent: def.description is required");
+  }
+  if (!def.payloadSchema) {
+    throw new Error("registerEvent: def.payloadSchema is required");
+  }
+  getEventRegistry().set(def.name, def);
+}
+
+/** Return all registered events in registration order. */
+export function listEvents(): EventDefinition[] {
+  return Array.from(getEventRegistry().values());
+}
+
+/** Look up a single registered event by name. */
+export function getEvent(name: string): EventDefinition | undefined {
+  return getEventRegistry().get(name);
+}
+
+/** Test helper — clears the registry between runs. */
+export function __resetEventRegistry(): void {
+  getEventRegistry().clear();
+  registerBuiltInEvents();
+}
+
+function registerBuiltInEvents(): void {
+  registerEvent({
+    name: "test.event.fired",
+    description:
+      "Developer test event — fired manually from the Automations UI or via the test-event action.",
+    payloadSchema: z
+      .object({ data: z.record(z.string(), z.unknown()).optional() })
+      .optional() as unknown as EventDefinition["payloadSchema"],
+  });
+
+  registerEvent({
+    name: "agent.turn.completed",
+    description: "Fires after the agent completes a conversational turn.",
+    payloadSchema: z.object({
+      threadId: z.string().optional(),
+      turnIndex: z.number().optional(),
+      model: z.string().optional(),
+    }) as unknown as EventDefinition["payloadSchema"],
+  });
+}
+
+registerBuiltInEvents();