@jami-studio/core 0.92.23 → 0.92.24

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @agent-native/core
 
+## 0.92.24
+
+### Patch Changes
+
+- 300ff1a: Dedupe Yjs in Cloudflare worker bundles. The per-app cloudflare_pages build keeps `yjs` external and emits it as a standalone `_worker.js/_libs/yjs.mjs` (bare imports rewritten to it); unified workspace deploys then hoist ONE shared copy to `dist/_yjs/yjs.mjs` and shim every app's lib to re-export it, so wrangler's final re-bundle instantiates Yjs exactly once. Fixes the "Yjs was already imported. This breaks constructor checks" error logged once per extra app copy per isolate and removes the cross-copy instanceof risk in real-time collab.
+
 ## 0.92.23
 
 ### Patch Changes

package/corpus/core/package.json

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

@@ -1826,6 +1826,13 @@ async function buildCloudflarePages() {
     "--conditions=workerd,worker,import",
     // The ssr-handler imports a virtual module that only exists at dev time
     "--external:virtual:react-router/server-build",
+    // Keep Yjs out of the monolithic bundle so it can be emitted as a
+    // standalone _libs/yjs.mjs below. On unified workspace deploys the
+    // workspace assembly step points every app's lib at ONE shared copy so
+    // wrangler's final re-bundle instantiates Yjs exactly once — inlining it
+    // here would put N copies in a single isolate (Yjs logs "Yjs was already
+    // imported" per extra copy and cross-copy instanceof checks break).
+    "--external:yjs",
     `--alias:#nitro/virtual/server-assets=${nitroServerAssetsStub}`,
     // Banner: override the __require shim that esbuild generates for CJS modules.
     // This provides a real require() backed by ESM imports of node builtins.
@@ -1845,6 +1852,15 @@ async function buildCloudflarePages() {
     cwd,
   });
 
+  // Bundle the one real Yjs copy into _libs/yjs.mjs and rewrite the bare
+  // imports the --external:yjs flag left behind (see the flag comment above).
+  bundleSharedYjsLibForWorkerOutput({
+    workerOutDir,
+    esbuildBin,
+    projectCwd: cwd,
+    tmpDir,
+  });
+
   // Clean up tmp
   fs.rmSync(tmpDir, { recursive: true });
 
@@ -2694,6 +2710,112 @@ export function rewriteBareYjsImportsForServerlessOutput(
   return bareImports;
 }
 
+/**
+ * Resolve Yjs's ESM entry for bundling into a worker `_libs/yjs.mjs`.
+ * Templates don't depend on `yjs` directly (it's a core dependency), so when
+ * the project itself can't resolve it, resolve through the installed
+ * `@agent-native/core` package location instead.
+ */
+export function resolveYjsEsmEntry(projectCwd: string): string | null {
+  const resolveFrom = (base: string): string | null => {
+    try {
+      return createRequire(path.join(base, "package.json")).resolve("yjs");
+    } catch {
+      return null;
+    }
+  };
+  let resolved = resolveFrom(projectCwd);
+  if (!resolved) {
+    try {
+      const corePkg = createRequire(
+        path.join(projectCwd, "package.json"),
+      ).resolve("@agent-native/core/package.json");
+      resolved = resolveFrom(path.dirname(fs.realpathSync(corePkg)));
+    } catch {
+      resolved = null;
+    }
+  }
+  if (!resolved) return null;
+  // require.resolve returns the CJS entry; prefer the sibling ESM build so
+  // `export * from` re-exports Yjs's real named exports statically.
+  const esmSibling = resolved.replace(/\.c?js$/, ".mjs");
+  return esmSibling !== resolved && fs.existsSync(esmSibling)
+    ? esmSibling
+    : resolved;
+}
+
+/**
+ * Emit Yjs as a standalone `_libs/yjs.mjs` in the Cloudflare worker output
+ * and rewrite every bare `yjs` import (left external by the main esbuild
+ * bundle) to it. Keeping Yjs in its own module file is what lets the unified
+ * workspace assembly (`workspace-deploy.ts`) collapse all apps onto ONE
+ * shared copy — wrangler's final re-bundle dedupes modules by file path, so
+ * N inlined copies would otherwise land in a single isolate and trip Yjs's
+ * "Yjs was already imported. This breaks constructor checks" guard.
+ */
+export function bundleSharedYjsLibForWorkerOutput(opts: {
+  workerOutDir: string;
+  esbuildBin: string;
+  projectCwd: string;
+  tmpDir: string;
+}): string[] {
+  const { workerOutDir, esbuildBin, projectCwd, tmpDir } = opts;
+
+  // Fail loud on CJS require sites — the import rewrite below cannot fix a
+  // `require("yjs")`, and leaving one would crash at runtime instead.
+  const requireSites: string[] = [];
+  let hasBareImport = false;
+  walkServerJavaScriptFiles(workerOutDir, (filePath) => {
+    const source = fs.readFileSync(filePath, "utf-8");
+    if (/\brequire\(\s*["']yjs["']\s*\)/.test(source)) {
+      requireSites.push(filePath);
+    }
+    if (hasBareYjsRuntimeImport(source)) hasBareImport = true;
+  });
+  if (requireSites.length > 0) {
+    throw new Error(
+      `[deploy] Cloudflare worker output left CJS require("yjs") sites the Yjs lib rewrite cannot fix: ${requireSites.join(", ")}`,
+    );
+  }
+  if (!hasBareImport) return [];
+
+  const yjsEntry = resolveYjsEsmEntry(projectCwd);
+  if (!yjsEntry) {
+    throw new Error(
+      "[deploy] Cloudflare worker output imports yjs but the package could not be resolved for _libs bundling",
+    );
+  }
+
+  const libsDir = path.join(workerOutDir, "_libs");
+  fs.mkdirSync(libsDir, { recursive: true });
+  const entryFile = path.join(tmpDir, "_yjs-lib-entry.js");
+  // Forward slashes: backslashes in an import specifier are escape sequences.
+  fs.writeFileSync(
+    entryFile,
+    `export * from "${yjsEntry.split(path.sep).join("/")}";\n`,
+  );
+  const command = esbuildSpawnCommand(esbuildBin, [
+    entryFile,
+    "--bundle",
+    `--outfile=${path.join(libsDir, "yjs.mjs")}`,
+    "--format=esm",
+    "--platform=browser",
+    "--target=es2022",
+    "--minify",
+    "--conditions=workerd,worker,import",
+  ]);
+  execFileSync(command.file, command.args, {
+    stdio: "inherit",
+    cwd: projectCwd,
+  });
+
+  const rewritten = rewriteBareYjsImportsForServerlessOutput(workerOutDir);
+  console.log(
+    `[deploy] Bundled yjs into _libs/yjs.mjs (${rewritten.length} import site file(s) rewritten)`,
+  );
+  return rewritten;
+}
+
 export function assertSingleTemplateNetlifyBuildOutput(
   projectCwd: string,
 ): void {

package/corpus/core/src/deploy/workspace-deploy.ts

@@ -178,6 +178,7 @@ export async function runWorkspaceDeploy(
   } else if (preset === "vercel") {
     writeVercelBuildConfig(vercelOutputDir, apps);
   } else {
+    dedupeCloudflareWorkspaceYjs(distDir, apps);
     writeCloudflareRoutingManifest(distDir, apps);
   }
 
@@ -405,6 +406,58 @@ function copyVercelAppBuildIntoWorkspace(
   patchVercelFunctionEntry(functionDest, app, workspaceApps);
 }
 
+/**
+ * Collapse every app's Yjs copy onto ONE shared module in the unified
+ * Cloudflare artifact. wrangler re-bundles all app workers into a single
+ * final bundle behind the dispatcher, so per-app Yjs copies all land in one
+ * isolate — Yjs's own guard logs "Yjs was already imported. This breaks
+ * constructor checks" once per extra copy, and Yjs objects crossing copies
+ * fail instanceof checks (real-time collab risk). Per-app builds emit Yjs as
+ * a standalone `dist/<app>/_worker.js/_libs/yjs.mjs` (see deploy/build.ts);
+ * here the first copy is hoisted to `dist/_yjs/yjs.mjs` and every app's lib
+ * becomes a re-export shim of it, so esbuild's path-keyed module dedupe
+ * instantiates Yjs exactly once.
+ */
+export function dedupeCloudflareWorkspaceYjs(
+  distDir: string,
+  apps: string[],
+): string[] {
+  const libPaths = apps
+    .map((app) => path.join(distDir, app, "_worker.js", "_libs", "yjs.mjs"))
+    .filter((libPath) => fs.existsSync(libPath));
+  if (libPaths.length === 0) return [];
+
+  const sharedFile = path.join(distDir, "_yjs", "yjs.mjs");
+  fs.mkdirSync(path.dirname(sharedFile), { recursive: true });
+  fs.copyFileSync(libPaths[0], sharedFile);
+  for (const libPath of libPaths) {
+    const rel = path
+      .relative(path.dirname(libPath), sharedFile)
+      .split(path.sep)
+      .join("/");
+    fs.writeFileSync(
+      libPath,
+      `export * from "${rel.startsWith(".") ? rel : `./${rel}`}";\n`,
+    );
+  }
+
+  // Keep the shared module (and the dispatcher worker) out of the public
+  // static asset set. `.assetsignore` is only honored at the output root.
+  const assetsIgnorePath = path.join(distDir, ".assetsignore");
+  const existing = fs.existsSync(assetsIgnorePath)
+    ? fs.readFileSync(assetsIgnorePath, "utf-8")
+    : "";
+  const lines = new Set(existing.split(/\r?\n/).filter(Boolean));
+  lines.add("_worker.js");
+  lines.add("_yjs");
+  fs.writeFileSync(assetsIgnorePath, [...lines].join("\n") + "\n");
+
+  console.log(
+    `[workspace-deploy] Deduped yjs across ${libPaths.length} app worker(s) into _yjs/yjs.mjs`,
+  );
+  return libPaths;
+}
+
 /**
  * Write the Cloudflare Pages `_routes.json` and a dispatcher `_worker.js` at
  * the workspace dist root so each app is reachable under /<app>/*.
@@ -435,8 +488,7 @@ function writeCloudflareRoutingManifest(distDir: string, apps: string[]): void {
   const dedupedInclude = [
     ...new Set(
       include.filter(
-        (r) =>
-          !splatPrefixes.some((p) => r !== `${p}*` && r.startsWith(p)),
+        (r) => !splatPrefixes.some((p) => r !== `${p}*` && r.startsWith(p)),
       ),
     ),
   ];

package/dist/deploy/build.d.ts

@@ -179,6 +179,28 @@ export declare function emitSingleTemplateNetlifyBackgroundFunction(projectCwd:
  * bundled copy before its function is packaged.
  */
 export declare function rewriteBareYjsImportsForServerlessOutput(serverDir: string): string[];
+/**
+ * Resolve Yjs's ESM entry for bundling into a worker `_libs/yjs.mjs`.
+ * Templates don't depend on `yjs` directly (it's a core dependency), so when
+ * the project itself can't resolve it, resolve through the installed
+ * `@agent-native/core` package location instead.
+ */
+export declare function resolveYjsEsmEntry(projectCwd: string): string | null;
+/**
+ * Emit Yjs as a standalone `_libs/yjs.mjs` in the Cloudflare worker output
+ * and rewrite every bare `yjs` import (left external by the main esbuild
+ * bundle) to it. Keeping Yjs in its own module file is what lets the unified
+ * workspace assembly (`workspace-deploy.ts`) collapse all apps onto ONE
+ * shared copy — wrangler's final re-bundle dedupes modules by file path, so
+ * N inlined copies would otherwise land in a single isolate and trip Yjs's
+ * "Yjs was already imported. This breaks constructor checks" guard.
+ */
+export declare function bundleSharedYjsLibForWorkerOutput(opts: {
+    workerOutDir: string;
+    esbuildBin: string;
+    projectCwd: string;
+    tmpDir: string;
+}): string[];
 export declare function assertSingleTemplateNetlifyBuildOutput(projectCwd: string): void;
 /**
  * Strip the harmful single-template catch-all rewrite that points at

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/deploy/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/deploy/build.ts"],"names":[],"mappings":"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"}

package/dist/deploy/build.js

@@ -1508,6 +1508,13 @@ async function buildCloudflarePages() {
         "--conditions=workerd,worker,import",
         // The ssr-handler imports a virtual module that only exists at dev time
         "--external:virtual:react-router/server-build",
+        // Keep Yjs out of the monolithic bundle so it can be emitted as a
+        // standalone _libs/yjs.mjs below. On unified workspace deploys the
+        // workspace assembly step points every app's lib at ONE shared copy so
+        // wrangler's final re-bundle instantiates Yjs exactly once — inlining it
+        // here would put N copies in a single isolate (Yjs logs "Yjs was already
+        // imported" per extra copy and cross-copy instanceof checks break).
+        "--external:yjs",
         `--alias:#nitro/virtual/server-assets=${nitroServerAssetsStub}`,
         // Banner: override the __require shim that esbuild generates for CJS modules.
         // This provides a real require() backed by ESM imports of node builtins.
@@ -1526,6 +1533,14 @@ async function buildCloudflarePages() {
         stdio: "inherit",
         cwd,
     });
+    // Bundle the one real Yjs copy into _libs/yjs.mjs and rewrite the bare
+    // imports the --external:yjs flag left behind (see the flag comment above).
+    bundleSharedYjsLibForWorkerOutput({
+        workerOutDir,
+        esbuildBin,
+        projectCwd: cwd,
+        tmpDir,
+    });
     // Clean up tmp
     fs.rmSync(tmpDir, { recursive: true });
     // Rewrite the external virtual import to a local stub.
@@ -2245,6 +2260,95 @@ export function rewriteBareYjsImportsForServerlessOutput(serverDir) {
     }
     return bareImports;
 }
+/**
+ * Resolve Yjs's ESM entry for bundling into a worker `_libs/yjs.mjs`.
+ * Templates don't depend on `yjs` directly (it's a core dependency), so when
+ * the project itself can't resolve it, resolve through the installed
+ * `@agent-native/core` package location instead.
+ */
+export function resolveYjsEsmEntry(projectCwd) {
+    const resolveFrom = (base) => {
+        try {
+            return createRequire(path.join(base, "package.json")).resolve("yjs");
+        }
+        catch {
+            return null;
+        }
+    };
+    let resolved = resolveFrom(projectCwd);
+    if (!resolved) {
+        try {
+            const corePkg = createRequire(path.join(projectCwd, "package.json")).resolve("@agent-native/core/package.json");
+            resolved = resolveFrom(path.dirname(fs.realpathSync(corePkg)));
+        }
+        catch {
+            resolved = null;
+        }
+    }
+    if (!resolved)
+        return null;
+    // require.resolve returns the CJS entry; prefer the sibling ESM build so
+    // `export * from` re-exports Yjs's real named exports statically.
+    const esmSibling = resolved.replace(/\.c?js$/, ".mjs");
+    return esmSibling !== resolved && fs.existsSync(esmSibling)
+        ? esmSibling
+        : resolved;
+}
+/**
+ * Emit Yjs as a standalone `_libs/yjs.mjs` in the Cloudflare worker output
+ * and rewrite every bare `yjs` import (left external by the main esbuild
+ * bundle) to it. Keeping Yjs in its own module file is what lets the unified
+ * workspace assembly (`workspace-deploy.ts`) collapse all apps onto ONE
+ * shared copy — wrangler's final re-bundle dedupes modules by file path, so
+ * N inlined copies would otherwise land in a single isolate and trip Yjs's
+ * "Yjs was already imported. This breaks constructor checks" guard.
+ */
+export function bundleSharedYjsLibForWorkerOutput(opts) {
+    const { workerOutDir, esbuildBin, projectCwd, tmpDir } = opts;
+    // Fail loud on CJS require sites — the import rewrite below cannot fix a
+    // `require("yjs")`, and leaving one would crash at runtime instead.
+    const requireSites = [];
+    let hasBareImport = false;
+    walkServerJavaScriptFiles(workerOutDir, (filePath) => {
+        const source = fs.readFileSync(filePath, "utf-8");
+        if (/\brequire\(\s*["']yjs["']\s*\)/.test(source)) {
+            requireSites.push(filePath);
+        }
+        if (hasBareYjsRuntimeImport(source))
+            hasBareImport = true;
+    });
+    if (requireSites.length > 0) {
+        throw new Error(`[deploy] Cloudflare worker output left CJS require("yjs") sites the Yjs lib rewrite cannot fix: ${requireSites.join(", ")}`);
+    }
+    if (!hasBareImport)
+        return [];
+    const yjsEntry = resolveYjsEsmEntry(projectCwd);
+    if (!yjsEntry) {
+        throw new Error("[deploy] Cloudflare worker output imports yjs but the package could not be resolved for _libs bundling");
+    }
+    const libsDir = path.join(workerOutDir, "_libs");
+    fs.mkdirSync(libsDir, { recursive: true });
+    const entryFile = path.join(tmpDir, "_yjs-lib-entry.js");
+    // Forward slashes: backslashes in an import specifier are escape sequences.
+    fs.writeFileSync(entryFile, `export * from "${yjsEntry.split(path.sep).join("/")}";\n`);
+    const command = esbuildSpawnCommand(esbuildBin, [
+        entryFile,
+        "--bundle",
+        `--outfile=${path.join(libsDir, "yjs.mjs")}`,
+        "--format=esm",
+        "--platform=browser",
+        "--target=es2022",
+        "--minify",
+        "--conditions=workerd,worker,import",
+    ]);
+    execFileSync(command.file, command.args, {
+        stdio: "inherit",
+        cwd: projectCwd,
+    });
+    const rewritten = rewriteBareYjsImportsForServerlessOutput(workerOutDir);
+    console.log(`[deploy] Bundled yjs into _libs/yjs.mjs (${rewritten.length} import site file(s) rewritten)`);
+    return rewritten;
+}
 export function assertSingleTemplateNetlifyBuildOutput(projectCwd) {
     const failures = [];
     const publishDir = path.join(projectCwd, "dist");