Fix executor beta packaging for 1Password wasm

Author: RhysSullivan

.changeset/fuzzy-camels-cheer.md

@@ -0,0 +1,5 @@
+---
+"executor": patch
+---
+
+Fix the packaged beta so the bundled 1Password SDK can load its wasm asset after install.

.changeset/pre.json

@@ -51,6 +51,7 @@
   },
   "changesets": [
     "funny-forks-listen",
+    "fuzzy-camels-cheer",
     "tame-trains-confess"
   ]
 }

apps/executor/CHANGELOG.md

@@ -1,5 +1,11 @@
 # executor
 
+## 1.3.0-beta.2
+
+### Patch Changes
+
+- Fix the packaged beta so the bundled 1Password SDK can load its wasm asset after install.
+
 ## 1.3.0-beta.1
 
 ### Patch Changes

apps/executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.3.0-beta.1",
+  "version": "1.3.0-beta.2",
   "description": "Local AI executor with a CLI, local API server, and web UI.",
   "keywords": [
     "executor",

apps/executor/src/distribution/artifact.ts

@@ -1,5 +1,5 @@
 import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { chmod, cp, mkdir, rename, rm, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { dirname, join, resolve } from "node:path";
@@ -23,6 +23,12 @@ export type DistributionPackageArtifact = {
   resourcesDir: string;
 };
 
+type BundledDependency = {
+  name: string;
+  version: string;
+  packageDir: string;
+};
+
 type CommandInput = {
   command: string;
   args: ReadonlyArray<string>;
@@ -90,6 +96,56 @@ const resolveQuickJsWasmPath = (): string => {
   return wasmPath;
 };
 
+const resolveInstalledPackage = (input: {
+  packageName: string;
+  fromPackageJsonPath: string;
+}): BundledDependency => {
+  const requireFromPackage = createRequire(input.fromPackageJsonPath);
+  const packageEntrypointPath = requireFromPackage.resolve(input.packageName);
+  let packageDir = dirname(packageEntrypointPath);
+  let packageJsonPath = join(packageDir, "package.json");
+
+  while (!existsSync(packageJsonPath)) {
+    const parentDir = dirname(packageDir);
+    if (parentDir === packageDir) {
+      throw new Error(`Unable to locate package.json for ${input.packageName} from ${packageEntrypointPath}`);
+    }
+    packageDir = parentDir;
+    packageJsonPath = join(packageDir, "package.json");
+  }
+
+  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8")) as {
+    name?: string;
+    version?: string;
+  };
+
+  if (!packageJson.name || !packageJson.version) {
+    throw new Error(`Invalid package metadata at ${packageJsonPath}`);
+  }
+
+  return {
+    name: packageJson.name,
+    version: packageJson.version,
+    packageDir,
+  };
+};
+
+const resolveBundledDependencies = (): ReadonlyArray<BundledDependency> => {
+  const onePasswordSdk = resolveInstalledPackage({
+    packageName: "@1password/sdk",
+    fromPackageJsonPath: join(repoRoot, "plugins/onepassword/sdk/package.json"),
+  });
+  const onePasswordSdkCore = resolveInstalledPackage({
+    packageName: "@1password/sdk-core",
+    fromPackageJsonPath: join(onePasswordSdk.packageDir, "package.json"),
+  });
+
+  return [
+    onePasswordSdk,
+    onePasswordSdkCore,
+  ];
+};
+
 
 const createPackageJson = (input: {
   packageName: string;
@@ -105,6 +161,8 @@ const createPackageJson = (input: {
     url?: string;
   };
   license?: string;
+  dependencies?: Readonly<Record<string, string>>;
+  bundleDependencies?: ReadonlyArray<string>;
 }) => {
   const packageJson = {
     name: input.packageName,
@@ -122,13 +180,16 @@ const createPackageJson = (input: {
     },
     files: [
       "bin",
+      "node_modules",
       "resources",
       "README.md",
       "package.json",
     ],
     engines: {
       node: ">=20",
     },
+    dependencies: input.dependencies,
+    bundleDependencies: input.bundleDependencies,
   };
 
   return JSON.stringify(packageJson, null, 2) + "\n";
@@ -195,6 +256,7 @@ const buildCliBundle = async (input: {
       "node",
       "--outdir",
       input.binDir,
+      "--external=@1password/sdk",
     ],
     cwd: repoRoot,
   });
@@ -217,14 +279,17 @@ export const buildDistributionPackage = async (
   const webDir = join(resourcesDir, "web");
   const bundlePath = join(binDir, "executor.mjs");
   const launcherPath = join(binDir, "executor.js");
+  const nodeModulesDir = join(packageDir, "node_modules");
   const quickJsWasmPath = resolveQuickJsWasmPath();
+  const bundledDependencies = resolveBundledDependencies();
 
   const webDistDir = join(repoRoot, "apps/web/dist");
   const readmePath = join(repoRoot, "README.md");
   const packageName = options.packageName ?? defaults.name;
   const packageVersion = options.packageVersion ?? defaults.version;
   await rm(packageDir, { recursive: true, force: true });
   await mkdir(binDir, { recursive: true });
+  await mkdir(nodeModulesDir, { recursive: true });
   await mkdir(resourcesDir, { recursive: true });
 
   if ((options.buildWeb ?? true) || !existsSync(webDistDir)) {
@@ -245,6 +310,11 @@ export const buildDistributionPackage = async (
   });
 
   await cp(webDistDir, webDir, { recursive: true });
+  for (const dependency of bundledDependencies) {
+    const destinationDir = join(nodeModulesDir, ...dependency.name.split("/"));
+    await mkdir(dirname(destinationDir), { recursive: true });
+    await cp(dependency.packageDir, destinationDir, { recursive: true });
+  }
   await cp(quickJsWasmPath, join(binDir, "emscripten-module.wasm"));
   await cp(
     join(repoRoot, "packages/kernel/runtime-deno-subprocess/src/deno-subprocess-worker.mjs"),
@@ -271,6 +341,10 @@ export const buildDistributionPackage = async (
     bugs: defaults.bugs,
     repository: defaults.repository,
     license: defaults.license,
+    dependencies: Object.fromEntries(
+      bundledDependencies.map((dependency) => [dependency.name, dependency.version]),
+    ),
+    bundleDependencies: bundledDependencies.map((dependency) => dependency.name),
   }));
   await cp(readmePath, join(packageDir, "README.md"));
   await writeFile(launcherPath, createLauncherSource());

apps/executor/src/distribution/distribution.test.ts

@@ -1,3 +1,6 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
 import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 
@@ -17,6 +20,12 @@ describe("distribution flow", () => {
   ) =>
     Effect.gen(function* () {
       const harness = yield* DistributionHarness;
+      const bundleSource = readFileSync(join(harness.packageDir, "bin/executor.mjs"), "utf8");
+
+      expect(bundleSource).not.toContain("core_bg.wasm");
+      expect(
+        existsSync(join(harness.packageDir, "node_modules/@1password/sdk-core/nodejs/core_bg.wasm")),
+      ).toBe(true);
 
       yield* harness.writeProjectConfig(`{
   "runtime": "ses",