@jami-studio/core 0.92.32 → 0.92.33

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @agent-native/core
 
+## 0.92.33
+
+### Patch Changes
+
+- b400c4a: Fix a unified-worker regression in 0.92.32's workspace env baking: per-app keys (app id, base path, audience, public/protected route lists) were baked into the SHARED `process.env` of the single Cloudflare isolate, so the first app's scope-init poisoned every sibling — all apps stripped request paths against dispatch's base path and 401'd their framework routes (A2A, auth/session). Per-app keys now travel through the per-module-graph scope (`setModuleGraphEnvDefaults` in `_scope-init.js`, read via `getModuleGraphEnvDefault` fallbacks in the audience/route-access env readers), the same isolation mechanism as the 0.92.28 registry scoping. Only workspace-identical keys (`AGENT_NATIVE_WORKSPACE`, the workspace-apps manifest JSON) remain `process.env` defaults.
+
 ## 0.92.32
 
 ### Patch Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.92.32",
+  "version": "0.92.33",
   "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": {

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

@@ -624,53 +624,72 @@ export interface GenerateWorkerEntryOptions {
  * lean `global-scope` subpath so nothing registry-touching evaluates before
  * the scope id is set (ESM evaluates imports depth-first in order).
  *
- * `envDefaults` bakes the per-app workspace env (workspace-apps manifest,
- * app id, base path, audience, route-access lists) into the module as
- * `process.env` DEFAULTS. Cloudflare workerd has no filesystem and no
- * ambient build env, so without this the runtime falls back as if the app
- * were standalone — `loadWorkspaceAppsManifest()` returns null and agent
- * discovery targets the builtin hosted prod URLs instead of the sibling
- * apps mounted on this origin (ask_app/call-agent "internal error"). The
- * Netlify preset already bakes the same keys in its generated function
- * entry (`setBasePathEnv`); this is the Cloudflare-preset equivalent.
- * Defaults never override real runtime env: the worker's per-request
- * bindings copy assigns binding keys on top, and baked keys only apply
- * when the key is absent.
+ * Two kinds of baked env, split deliberately (issue-49 regression lesson):
+ *
+ * - `envDefaults` — workspace-IDENTICAL keys (the workspace-apps manifest,
+ *   the workspace flag). These are safe as `process.env` DEFAULTS even
+ *   though the unified worker shares one `process.env` across all apps,
+ *   because every app bakes the same value. Runtime bindings still win
+ *   (defaults only fill absent keys; the per-request bindings copy assigns
+ *   binding keys on top).
+ *
+ * - `moduleGraphEnvDefaults` — PER-APP keys (app id, base path, audience,
+ *   public/protected route lists). These must NEVER touch the shared
+ *   `process.env`: the first app's scope-init would win and poison every
+ *   sibling (observed live: all apps stripped paths against dispatch's
+ *   base path and 401'd framework routes). They are stored per module
+ *   graph via `setModuleGraphEnvDefaults`, and env readers fall back to
+ *   `getModuleGraphEnvDefault`.
+ *
+ * workerd has no filesystem and no ambient build env, so without this the
+ * runtime falls back as if the app were standalone — agent discovery
+ * targets builtin hosted prod URLs (ask_app "internal error") and per-app
+ * route access/audience declarations never apply. The Netlify preset bakes
+ * the same keys in its generated function entry (`setBasePathEnv`), where
+ * per-function isolation makes plain env safe.
  */
 export function generateScopeInitSource(
   appScopeId: string,
   envDefaults?: Record<string, string>,
+  moduleGraphEnvDefaults?: Record<string, string>,
 ): string {
-  const entries = Object.entries(envDefaults ?? {}).filter(
+  const sharedEntries = Object.entries(envDefaults ?? {}).filter(
+    ([, value]) => typeof value === "string" && value !== "",
+  );
+  const perAppEntries = Object.entries(moduleGraphEnvDefaults ?? {}).filter(
     ([, value]) => typeof value === "string" && value !== "",
   );
-  const envBlock = entries.length
+  const envBlock = sharedEntries.length
     ? `
-// Baked per-app workspace env defaults (runtime bindings still win).
+// Baked workspace-identical env defaults (runtime bindings still win).
 {
   const processRef = (globalThis.process ??= { env: {} });
   processRef.env ??= {};
-  const defaults = ${JSON.stringify(Object.fromEntries(entries))};
+  const defaults = ${JSON.stringify(Object.fromEntries(sharedEntries))};
   for (const key of Object.keys(defaults)) {
     if (processRef.env[key] === undefined) processRef.env[key] = defaults[key];
   }
 }
+`
+    : "";
+  const moduleGraphBlock = perAppEntries.length
+    ? `setModuleGraphEnvDefaults(${JSON.stringify(Object.fromEntries(perAppEntries))});
 `
     : "";
   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";
+import { setGlobalScopeId${perAppEntries.length ? ", setModuleGraphEnvDefaults" : ""} } from "@agent-native/core/global-scope";
 setGlobalScopeId(${JSON.stringify(appScopeId)});
-${envBlock}`;
+${moduleGraphBlock}${envBlock}`;
 }
 
 /**
- * Snapshot the per-app workspace env keys that must survive into the edge
- * runtime. Called at build time (workspace-deploy sets these in the child
- * build env); the result is baked into `_scope-init.js` as process.env
- * defaults for runtimes with no filesystem/ambient env (workerd).
+ * Snapshot the workspace-IDENTICAL env keys that must survive into the edge
+ * runtime as shared `process.env` defaults. Per-app keys deliberately live
+ * in `workspaceAppModuleGraphEnvDefaultsFromBuildEnv` instead — see
+ * `generateScopeInitSource`.
  */
 export function workspaceEnvDefaultsFromBuildEnv(
   env: NodeJS.ProcessEnv = process.env,
@@ -678,19 +697,37 @@ export function workspaceEnvDefaultsFromBuildEnv(
   if (env.AGENT_NATIVE_WORKSPACE !== "1") return {};
   const keys = [
     "AGENT_NATIVE_WORKSPACE",
+    "AGENT_NATIVE_WORKSPACE_APPS_JSON",
+    "VITE_AGENT_NATIVE_WORKSPACE",
+    "VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON",
+  ];
+  const defaults: Record<string, string> = {};
+  for (const key of keys) {
+    const value = env[key];
+    if (typeof value === "string" && value !== "") defaults[key] = value;
+  }
+  return defaults;
+}
+
+/**
+ * Snapshot the PER-APP workspace env keys for this app's module graph.
+ * Delivered via `setModuleGraphEnvDefaults` (never shared `process.env`).
+ */
+export function workspaceAppModuleGraphEnvDefaultsFromBuildEnv(
+  env: NodeJS.ProcessEnv = process.env,
+): Record<string, string> {
+  if (env.AGENT_NATIVE_WORKSPACE !== "1") return {};
+  const keys = [
     "AGENT_NATIVE_WORKSPACE_APP_ID",
     "APP_BASE_PATH",
     "AGENT_NATIVE_WORKSPACE_APP_AUDIENCE",
     "AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS",
     "AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS",
-    "AGENT_NATIVE_WORKSPACE_APPS_JSON",
-    "VITE_AGENT_NATIVE_WORKSPACE",
     "VITE_AGENT_NATIVE_WORKSPACE_APP_ID",
     "VITE_APP_BASE_PATH",
     "VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE",
     "VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS",
     "VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS",
-    "VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON",
   ];
   const defaults: Record<string, string> = {};
   for (const key of keys) {
@@ -1884,7 +1921,11 @@ async function buildCloudflarePages() {
   if (appScopeId) {
     fs.writeFileSync(
       path.join(tmpDir, "_scope-init.js"),
-      generateScopeInitSource(appScopeId, workspaceEnvDefaultsFromBuildEnv()),
+      generateScopeInitSource(
+        appScopeId,
+        workspaceEnvDefaultsFromBuildEnv(),
+        workspaceAppModuleGraphEnvDefaultsFromBuildEnv(),
+      ),
     );
   }
 

package/corpus/core/src/shared/global-scope.ts

@@ -73,3 +73,35 @@ export function __deleteScopedGlobal(base: string): void {
   const key = Symbol.for(scopedGlobalKeyName(base));
   delete (globalThis as unknown as Record<symbol, unknown>)[key];
 }
+
+/**
+ * Per-module-graph env defaults for unified workspace deployments.
+ *
+ * workerd has no filesystem and no ambient build env, so per-app workspace
+ * config (app id, base path, audience, public/protected route lists) must be
+ * baked into the artifact. It CANNOT go through `process.env`: the unified
+ * worker shares ONE `process.env` across every app's module graph, so the
+ * first app's baked values would poison every sibling (the exact issue-35
+ * class the scope id above exists for — observed live as every app stripping
+ * paths against dispatch's base path, 401ing all framework routes).
+ *
+ * Instead the generated scope-init module stores this graph's per-app values
+ * here (module scope = per app bundle), and env readers fall back to
+ * `getModuleGraphEnvDefault` when the ambient env lacks the key. Real runtime
+ * env still wins; dev/single-app graphs never set defaults, so behavior is
+ * unchanged there.
+ */
+let moduleGraphEnvDefaults: Record<string, string> | null = null;
+
+/** Set (or clear with `null`) this module graph's baked env defaults. */
+export function setModuleGraphEnvDefaults(
+  defaults: Record<string, string> | null,
+): void {
+  moduleGraphEnvDefaults =
+    defaults && Object.keys(defaults).length > 0 ? { ...defaults } : null;
+}
+
+/** This module graph's baked default for `key`, or undefined. */
+export function getModuleGraphEnvDefault(key: string): string | undefined {
+  return moduleGraphEnvDefaults?.[key];
+}

package/corpus/core/src/shared/workspace-app-audience.ts

@@ -1,3 +1,5 @@
+import { getModuleGraphEnvDefault } from "./global-scope.js";
+
 export const WORKSPACE_APP_AUDIENCES = ["internal", "public"] as const;
 
 export type WorkspaceAppAudience = (typeof WORKSPACE_APP_AUDIENCES)[number];
@@ -48,7 +50,12 @@ export function workspaceAppAudienceFromEnv(
   const source = env ?? (typeof process !== "undefined" ? process.env : {});
   const raw =
     source.AGENT_NATIVE_WORKSPACE_APP_AUDIENCE ??
-    source.VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE;
+    source.VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE ??
+    // Unified workerd deployments deliver per-app config via the module
+    // graph (shared process.env would cross-poison sibling apps).
+    (env === undefined
+      ? getModuleGraphEnvDefault("AGENT_NATIVE_WORKSPACE_APP_AUDIENCE")
+      : undefined);
   if (raw === undefined) return undefined;
   return normalizeWorkspaceAppAudience(raw);
 }
@@ -57,14 +64,18 @@ export function workspaceAppRouteAccessFromEnv(
   env?: Record<string, string | undefined>,
 ): WorkspaceAppRouteAccess {
   const source = env ?? (typeof process !== "undefined" ? process.env : {});
+  const moduleGraphFallback = (key: string) =>
+    env === undefined ? getModuleGraphEnvDefault(key) : undefined;
   return {
     publicPaths: normalizeWorkspaceAppPathList(
       source.AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS ??
-        source.VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS,
+        source.VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS ??
+        moduleGraphFallback("AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS"),
     ),
     protectedPaths: normalizeWorkspaceAppPathList(
       source.AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS ??
-        source.VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS,
+        source.VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS ??
+        moduleGraphFallback("AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS"),
     ),
   };
 }

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/deploy/build.d.ts

@@ -48,27 +48,43 @@ export interface GenerateWorkerEntryOptions {
  * lean `global-scope` subpath so nothing registry-touching evaluates before
  * the scope id is set (ESM evaluates imports depth-first in order).
  *
- * `envDefaults` bakes the per-app workspace env (workspace-apps manifest,
- * app id, base path, audience, route-access lists) into the module as
- * `process.env` DEFAULTS. Cloudflare workerd has no filesystem and no
- * ambient build env, so without this the runtime falls back as if the app
- * were standalone — `loadWorkspaceAppsManifest()` returns null and agent
- * discovery targets the builtin hosted prod URLs instead of the sibling
- * apps mounted on this origin (ask_app/call-agent "internal error"). The
- * Netlify preset already bakes the same keys in its generated function
- * entry (`setBasePathEnv`); this is the Cloudflare-preset equivalent.
- * Defaults never override real runtime env: the worker's per-request
- * bindings copy assigns binding keys on top, and baked keys only apply
- * when the key is absent.
+ * Two kinds of baked env, split deliberately (issue-49 regression lesson):
+ *
+ * - `envDefaults` — workspace-IDENTICAL keys (the workspace-apps manifest,
+ *   the workspace flag). These are safe as `process.env` DEFAULTS even
+ *   though the unified worker shares one `process.env` across all apps,
+ *   because every app bakes the same value. Runtime bindings still win
+ *   (defaults only fill absent keys; the per-request bindings copy assigns
+ *   binding keys on top).
+ *
+ * - `moduleGraphEnvDefaults` — PER-APP keys (app id, base path, audience,
+ *   public/protected route lists). These must NEVER touch the shared
+ *   `process.env`: the first app's scope-init would win and poison every
+ *   sibling (observed live: all apps stripped paths against dispatch's
+ *   base path and 401'd framework routes). They are stored per module
+ *   graph via `setModuleGraphEnvDefaults`, and env readers fall back to
+ *   `getModuleGraphEnvDefault`.
+ *
+ * workerd has no filesystem and no ambient build env, so without this the
+ * runtime falls back as if the app were standalone — agent discovery
+ * targets builtin hosted prod URLs (ask_app "internal error") and per-app
+ * route access/audience declarations never apply. The Netlify preset bakes
+ * the same keys in its generated function entry (`setBasePathEnv`), where
+ * per-function isolation makes plain env safe.
  */
-export declare function generateScopeInitSource(appScopeId: string, envDefaults?: Record<string, string>): string;
+export declare function generateScopeInitSource(appScopeId: string, envDefaults?: Record<string, string>, moduleGraphEnvDefaults?: Record<string, string>): string;
 /**
- * Snapshot the per-app workspace env keys that must survive into the edge
- * runtime. Called at build time (workspace-deploy sets these in the child
- * build env); the result is baked into `_scope-init.js` as process.env
- * defaults for runtimes with no filesystem/ambient env (workerd).
+ * Snapshot the workspace-IDENTICAL env keys that must survive into the edge
+ * runtime as shared `process.env` defaults. Per-app keys deliberately live
+ * in `workspaceAppModuleGraphEnvDefaultsFromBuildEnv` instead — see
+ * `generateScopeInitSource`.
  */
 export declare function workspaceEnvDefaultsFromBuildEnv(env?: NodeJS.ProcessEnv): Record<string, string>;
+/**
+ * Snapshot the PER-APP workspace env keys for this app's module graph.
+ * Delivered via `setModuleGraphEnvDefaults` (never shared `process.env`).
+ */
+export declare function workspaceAppModuleGraphEnvDefaultsFromBuildEnv(env?: NodeJS.ProcessEnv): Record<string, string>;
 /**
  * Derive the workspace app id from a mounted app base path ("/assets" →
  * "assets"). Returns null for unmounted (root) builds.

package/dist/deploy/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/deploy/build.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;;GAYG;AAmCH,OAAO,EAML,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,6BAA6B,UAiBzC,CAAC;AAEF,eAAO,MAAM,mCAAmC,UAiB/C,CAAC;AACF,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAuIjE,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,UAUnC,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAaxB;AAoCD,eAAO,MAAM,2CAA2C,EAAE,MAAM,CAC9D,MAAM,EACN,MAAM,CAmSP,CAAC;AAEF,MAAM,WAAW,0BAA0B;IACzC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,MAAM,CAwBR;AAED;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwBxB;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,GAAG,IAAI,CAKf;AAED,UAAU,wBAAwB;IAChC,KAAK,EAAE,6BAA6B,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;IACtD,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,6BAA6B;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,UAAU,6BAA6B;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAwBD,wBAAgB,wCAAwC,CACtD,WAAW,EAAE,MAAM,EAAE,GACpB,MAAM,CAaR;AAgBD,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAAC;AAgBvE,wBAAgB,yCAAyC,CACvD,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,EACjB,WAAW,SAAK,GACf,IAAI,CAQN;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,eAAe,EAAE,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,kBAAkB,GAAE,MAAM,EAAO,EACjC,OAAO,GAAE,gBAAgB,EAAO,EAChC,aAAa,GAAE,oBAAoB,GAAG,IAAW,EACjD,mBAAmB,GAAE,MAAM,EAAO,EAClC,gBAAgB,SAAmC,EACnD,OAAO,GAAE,0BAA+B,GACvC,MAAM,CAipBR;AA4BD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAoC5E;AAkED,wBAAgB,8CAA8C,CAC5D,QAAQ,EAAE,wBAAwB,EAClC,QAAQ,SAAmC,GAC1C,MAAM,CAiCR;AA6gBD,wBAAgB,mBAAmB,IAAI,MAAM,EAAE,CAE9C;AAoED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EAAE,GACb;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAKlC;AA6DD,wBAAgB,OAAO,CACrB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,iBAAiB,cAAoB,QAoCtC;AAiCD,KAAK,0BAA0B,GAAG,OAAO,GAAG,KAAK,CAAC;AAQlD,wBAAgB,qCAAqC,CACnD,YAAY,GAAE,MAAM,CAAC,QAA2B,EAChD,QAAQ,GAAE,MAAM,CAAC,YAA2B,EAC5C,UAAU,GAAE,0BAA0B,GAAG,IAAgD,GACxF,OAAO,CAOT;AAqED,wBAAgB,gCAAgC,CAC9C,gBAAgB,EAAE,MAAM,EAAE,GACzB,MAAM,GAAG,IAAI,CA8Bf;AAED,wBAAgB,0BAA0B,CACxC,gBAAgB,EAAE,MAAM,EAAE,GACzB,KAAK,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAqCpD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gCAAgC,IAAI,OAAO,CAK1D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,wBAAgB,2CAA2C,CACzD,UAAU,EAAE,MAAM,GACjB,IAAI,CA0GN;AA0DD;;;;;GAKG;AACH,wBAAgB,wCAAwC,CACtD,SAAS,EAAE,MAAM,GAChB,MAAM,EAAE,CA+CV;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA0BpE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,MAAM,EAAE,CAwDX;AAED,wBAAgB,sCAAsC,CACpD,UAAU,EAAE,MAAM,GACjB,IAAI,CAwJN;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAY5E;AA6GD;;;;;;GAMG;AACH,wBAAgB,yCAAyC,CACvD,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,IAAI,CAqDN;AA6ID;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,gBAAgB,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,UAAU,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAkBD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iCAAiC,YAAI,KAAK,CAAU,CAAC;AAElE;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,GACnB,IAAI,GAAG,SAAS,MAAM,EAAE,CAK1B"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/deploy/build.ts"],"names":[],"mappings":"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"}

package/dist/deploy/build.js

@@ -523,66 +523,99 @@ export const CLOUDFLARE_WORKER_NODE_BUILTIN_STUB_MODULES = {
  * lean `global-scope` subpath so nothing registry-touching evaluates before
  * the scope id is set (ESM evaluates imports depth-first in order).
  *
- * `envDefaults` bakes the per-app workspace env (workspace-apps manifest,
- * app id, base path, audience, route-access lists) into the module as
- * `process.env` DEFAULTS. Cloudflare workerd has no filesystem and no
- * ambient build env, so without this the runtime falls back as if the app
- * were standalone — `loadWorkspaceAppsManifest()` returns null and agent
- * discovery targets the builtin hosted prod URLs instead of the sibling
- * apps mounted on this origin (ask_app/call-agent "internal error"). The
- * Netlify preset already bakes the same keys in its generated function
- * entry (`setBasePathEnv`); this is the Cloudflare-preset equivalent.
- * Defaults never override real runtime env: the worker's per-request
- * bindings copy assigns binding keys on top, and baked keys only apply
- * when the key is absent.
+ * Two kinds of baked env, split deliberately (issue-49 regression lesson):
+ *
+ * - `envDefaults` — workspace-IDENTICAL keys (the workspace-apps manifest,
+ *   the workspace flag). These are safe as `process.env` DEFAULTS even
+ *   though the unified worker shares one `process.env` across all apps,
+ *   because every app bakes the same value. Runtime bindings still win
+ *   (defaults only fill absent keys; the per-request bindings copy assigns
+ *   binding keys on top).
+ *
+ * - `moduleGraphEnvDefaults` — PER-APP keys (app id, base path, audience,
+ *   public/protected route lists). These must NEVER touch the shared
+ *   `process.env`: the first app's scope-init would win and poison every
+ *   sibling (observed live: all apps stripped paths against dispatch's
+ *   base path and 401'd framework routes). They are stored per module
+ *   graph via `setModuleGraphEnvDefaults`, and env readers fall back to
+ *   `getModuleGraphEnvDefault`.
+ *
+ * workerd has no filesystem and no ambient build env, so without this the
+ * runtime falls back as if the app were standalone — agent discovery
+ * targets builtin hosted prod URLs (ask_app "internal error") and per-app
+ * route access/audience declarations never apply. The Netlify preset bakes
+ * the same keys in its generated function entry (`setBasePathEnv`), where
+ * per-function isolation makes plain env safe.
  */
-export function generateScopeInitSource(appScopeId, envDefaults) {
-    const entries = Object.entries(envDefaults ?? {}).filter(([, value]) => typeof value === "string" && value !== "");
-    const envBlock = entries.length
+export function generateScopeInitSource(appScopeId, envDefaults, moduleGraphEnvDefaults) {
+    const sharedEntries = Object.entries(envDefaults ?? {}).filter(([, value]) => typeof value === "string" && value !== "");
+    const perAppEntries = Object.entries(moduleGraphEnvDefaults ?? {}).filter(([, value]) => typeof value === "string" && value !== "");
+    const envBlock = sharedEntries.length
         ? `
-// Baked per-app workspace env defaults (runtime bindings still win).
+// Baked workspace-identical env defaults (runtime bindings still win).
 {
   const processRef = (globalThis.process ??= { env: {} });
   processRef.env ??= {};
-  const defaults = ${JSON.stringify(Object.fromEntries(entries))};
+  const defaults = ${JSON.stringify(Object.fromEntries(sharedEntries))};
   for (const key of Object.keys(defaults)) {
     if (processRef.env[key] === undefined) processRef.env[key] = defaults[key];
   }
 }
+`
+        : "";
+    const moduleGraphBlock = perAppEntries.length
+        ? `setModuleGraphEnvDefaults(${JSON.stringify(Object.fromEntries(perAppEntries))});
 `
         : "";
     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";
+import { setGlobalScopeId${perAppEntries.length ? ", setModuleGraphEnvDefaults" : ""} } from "@agent-native/core/global-scope";
 setGlobalScopeId(${JSON.stringify(appScopeId)});
-${envBlock}`;
+${moduleGraphBlock}${envBlock}`;
 }
 /**
- * Snapshot the per-app workspace env keys that must survive into the edge
- * runtime. Called at build time (workspace-deploy sets these in the child
- * build env); the result is baked into `_scope-init.js` as process.env
- * defaults for runtimes with no filesystem/ambient env (workerd).
+ * Snapshot the workspace-IDENTICAL env keys that must survive into the edge
+ * runtime as shared `process.env` defaults. Per-app keys deliberately live
+ * in `workspaceAppModuleGraphEnvDefaultsFromBuildEnv` instead — see
+ * `generateScopeInitSource`.
  */
 export function workspaceEnvDefaultsFromBuildEnv(env = process.env) {
     if (env.AGENT_NATIVE_WORKSPACE !== "1")
         return {};
     const keys = [
         "AGENT_NATIVE_WORKSPACE",
+        "AGENT_NATIVE_WORKSPACE_APPS_JSON",
+        "VITE_AGENT_NATIVE_WORKSPACE",
+        "VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON",
+    ];
+    const defaults = {};
+    for (const key of keys) {
+        const value = env[key];
+        if (typeof value === "string" && value !== "")
+            defaults[key] = value;
+    }
+    return defaults;
+}
+/**
+ * Snapshot the PER-APP workspace env keys for this app's module graph.
+ * Delivered via `setModuleGraphEnvDefaults` (never shared `process.env`).
+ */
+export function workspaceAppModuleGraphEnvDefaultsFromBuildEnv(env = process.env) {
+    if (env.AGENT_NATIVE_WORKSPACE !== "1")
+        return {};
+    const keys = [
         "AGENT_NATIVE_WORKSPACE_APP_ID",
         "APP_BASE_PATH",
         "AGENT_NATIVE_WORKSPACE_APP_AUDIENCE",
         "AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS",
         "AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS",
-        "AGENT_NATIVE_WORKSPACE_APPS_JSON",
-        "VITE_AGENT_NATIVE_WORKSPACE",
         "VITE_AGENT_NATIVE_WORKSPACE_APP_ID",
         "VITE_APP_BASE_PATH",
         "VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE",
         "VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS",
         "VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS",
-        "VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON",
     ];
     const defaults = {};
     for (const key of keys) {
@@ -1566,7 +1599,7 @@ 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, workspaceEnvDefaultsFromBuildEnv()));
+        fs.writeFileSync(path.join(tmpDir, "_scope-init.js"), generateScopeInitSource(appScopeId, workspaceEnvDefaultsFromBuildEnv(), workspaceAppModuleGraphEnvDefaultsFromBuildEnv()));
     }
     if (includeReactRouterSsr) {
         copyDir(serverDir, path.join(tmpDir, "server"));