craft-native 0.0.278 → 0.0.290

package/README.md

@@ -668,3 +668,19 @@ Browser audio assigns one owner per sound ID. A newer play or stop invalidates
 pending media resolution for that ID; stopping all sounds, changing accounts,
 aborting a call or disposing the host also releases active audio. Superseded
 play calls reject with `AbortError`.
+
+### Packaging sandboxed macOS apps
+
+Pass `macos.appBundlePath` to package a complete STX app without discarding its
+resources. Distribution options also apply to prebuilt bundles: `buildNumber`,
+`provisioningProfile`, `privacyManifest`, and the icon are embedded before signing.
+Craft signs nested Mach-O code before the main bundle and verifies the result.
+Use `helperEntitlements` for a compiled backend's runtime permissions; App Store
+helpers inherit the main sandbox by default. `signingKeychain` selects the
+keychain for both application and installer identities.
+
+Craft's bundled-backend host reads `backend: { executable: 'stx-backend' }` from
+`Contents/Resources/craft.json`. The native app remains the main process, starts
+the helper with `--serve --managed`, and consumes its authenticated loopback URL.
+The helper's standard input is a lifetime lease: it must stop when that pipe
+closes. `craft --capabilities` advertises `bundleBackend` on macOS.

package/dist/android/src/emulator.d.ts

@@ -10,6 +10,10 @@ export interface AndroidEmulatorOptions {
     acceptLicenses?: boolean;
     /** Defaults to 10 minutes; hardware is capped there, software cold provisioning at 20 minutes. */
     bootTimeoutMs?: number;
+    /** Requested guest RAM, 1536–8192 MB (Android emulator limits); defaults to 2048. */
+    memoryMb?: number;
+    /** Requested guest CPU count, 1–8; defaults to 2. */
+    virtualCpus?: number;
     env?: Record<string, string | undefined>;
 }
 export interface AndroidEmulatorSession {

package/dist/android/src/index.js

@@ -198,6 +198,12 @@ async function createAndroidEmulator(options) {
   const maximumBootTimeoutMs = options.acceleration === "software" ? 1200000 : 600000;
   if (!Number.isSafeInteger(bootTimeoutMs) || bootTimeoutMs < 1000 || bootTimeoutMs > maximumBootTimeoutMs)
     throw new Error(`Android bootTimeoutMs must be an integer between 1000 and ${maximumBootTimeoutMs} milliseconds`);
+  const memoryMb = options.memoryMb ?? 2048;
+  if (!Number.isSafeInteger(memoryMb) || memoryMb < 1536 || memoryMb > 8192)
+    throw new Error("Android memoryMb must be an integer between 1536 and 8192 megabytes");
+  const virtualCpus = options.virtualCpus ?? 2;
+  if (!Number.isSafeInteger(virtualCpus) || virtualCpus < 1 || virtualCpus > 8)
+    throw new Error("Android virtualCpus must be an integer between 1 and 8");
   const port = options.port ?? 5558;
   if (!Number.isInteger(port) || port < 5554 || port > 5682 || port % 2 !== 0)
     throw new Error("Android console ports must be even and between 5554 and 5682");
@@ -299,7 +305,7 @@ async function createAndroidEmulator(options) {
     const hostCpus = cpus();
     cpuStart = hostCpus.reduce((total, cpu) => total + Object.values(cpu.times).reduce((sum, value) => sum + value, 0), 0);
     idleStart = hostCpus.reduce((total, cpu) => total + cpu.times.idle, 0);
-    child = Bun.spawn([executable, "-avd", name, "-port", String(port), "-no-window", "-no-snapshot", "-no-audio", "-no-boot-anim", "-gpu", "software", "-memory", "2048", "-cores", "2", "-accel", options.acceleration === "software" ? "off" : "on"], { env, stdout: log, stderr: log });
+    child = Bun.spawn([executable, "-avd", name, "-port", String(port), "-no-window", "-no-snapshot", "-no-audio", "-no-boot-anim", "-gpu", "software", "-memory", String(memoryMb), "-cores", String(virtualCpus), "-accel", options.acceleration === "software" ? "off" : "on"], { env, stdout: log, stderr: log });
     identity = {
       image: options.image,
       acceleration: options.acceleration,
@@ -307,8 +313,8 @@ async function createAndroidEmulator(options) {
       bootTimeoutMs,
       bootStartedAt: new Date(bootStartedAt).toISOString(),
       host: { cpuModel: hostCpus[0]?.model, logicalCpus: hostCpus.length, availableParallelism: availableParallelism(), memoryBytes: totalmem() },
-      virtualCpus: 2,
-      memoryMb: 2048,
+      virtualCpus,
+      memoryMb,
       serial,
       avdDirectory: env.ANDROID_AVD_HOME,
       emulatorPid: child.pid
@@ -335,11 +341,13 @@ async function createAndroidEmulator(options) {
           const packages = await run([adb, "-s", serial, "shell", "pm", "path", "android"], undefined, probeTimeout(), true);
           const playStore = requiresPlayStore ? await run([adb, "-s", serial, "shell", "pm", "path", "com.android.vending"], undefined, probeTimeout(), true) : undefined;
           const systemUi = await run([adb, "-s", serial, "shell", "pidof", "com.android.systemui"], undefined, probeTimeout(), true);
-          const events = await run([adb, "-s", serial, "logcat", "-b", "events", "-d", "-t", "1"], undefined, probeTimeout(), true);
+          const events = await run([adb, "-s", serial, "logcat", "-b", "events", "-d", "-v", "threadtime"], undefined, probeTimeout(), true);
           const home = await run([adb, "-s", serial, "shell", "cmd", "package", "resolve-activity", "--brief", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.HOME"], undefined, probeTimeout(), true);
           const homeActivity = home.stdout.trim().split(/\r?\n/).at(-1) ?? "";
           const temporaryHome = homeActivity.startsWith("com.android.sdksetup/") || homeActivity.startsWith("com.google.android.googlesdksetup/") || /^com\.android\.settings\/(?:\.|com\.android\.settings\.)FallbackHome$/.test(homeActivity) || /^android\/.*(?:Resolver|Chooser)Activity$/.test(homeActivity);
-          booted = settings.code === 0 && packages.code === 0 && systemUi.code === 0 && events.code === 0 && /^package:\/\S+/m.test(packages.stdout) && /^\d+(?:\s+\d+)*$/.test(systemUi.stdout.trim()) && (!requiresPlayStore || playStore?.code === 0 && /^package:\/\S+/m.test(playStore.stdout)) && home.code === 0 && /^[\w.]+\/[\w.$]+$/.test(homeActivity) && !temporaryHome;
+          const windows = await run([adb, "-s", serial, "shell", "dumpsys", "window"], undefined, probeTimeout(), true);
+          const focusedPackage = windows.stdout.match(/^\s*mCurrentFocus\s*=\s*Window\{[^}\r\n]*\bu\d+\s+([\w.]+)\//m)?.[1];
+          booted = settings.code === 0 && packages.code === 0 && systemUi.code === 0 && events.code === 0 && /^package:\/\S+/m.test(packages.stdout) && /^\d+(?:\s+\d+)*$/.test(systemUi.stdout.trim()) && (!requiresPlayStore || playStore?.code === 0 && /^package:\/\S+/m.test(playStore.stdout)) && home.code === 0 && /^[\w.]+\/[\w.$]+$/.test(homeActivity) && !temporaryHome && windows.code === 0 && focusedPackage === homeActivity.split("/")[0];
         }
       }
       const checkedAt = Date.now();
@@ -845,6 +853,7 @@ function writeNativeShellSources(output, packagePath, packageName, config) {
   };
   write("CraftBluetooth.kt.template", "CraftBluetooth.kt");
   write("CraftNativeShell.kt.template", "CraftNativeShell.kt");
+  write("CraftSnapshotFile.kt.template", "CraftSnapshotFile.kt");
   write("CraftNativeImageCache.kt.template", "CraftNativeImageCache.kt");
   write("CraftNativeHaptics.kt.template", "CraftNativeHaptics.kt");
   write("CraftNativeBackground.kt.template", "CraftNativeBackground.kt");

package/dist/android/templates/CraftNativeShell.kt.template

@@ -270,7 +270,12 @@ internal object CraftNativeStorage {
 
 }
 
-internal class CraftNativeStores private constructor(context: Context, private val secureEnabled: Boolean) {
+internal class CraftNativeStores private constructor(
+    context: Context,
+    private val secureEnabled: Boolean,
+    private val snapshotFiles: CraftSnapshotFile,
+) {
+    private constructor(context: Context, secureEnabled: Boolean) : this(context, secureEnabled, CraftSnapshotFile())
     private val appContext = context.applicationContext
     private val storage: SharedPreferences = appContext.getSharedPreferences("craft-native-storage", Context.MODE_PRIVATE)
     private val snapshotsDir = File(appContext.filesDir, "craft-snapshots").apply { mkdirs() }
@@ -355,20 +360,22 @@ internal class CraftNativeStores private constructor(context: Context, private v
     fun setSnapshot(name: String, json: String?, from: String?, done: (Boolean) -> Unit) {
         writer.execute {
             val file = snapshotFile(name)
+            val previous = snapshotCache[name]
             val ok = runCatching {
                 if (json == null) {
                     !file.exists() || file.delete()
                 } else {
-                    val temporary = File(file.parentFile, "${file.name}.tmp")
-                    temporary.writeText(json)
-                    temporary.renameTo(file) || run { file.writeText(json); temporary.delete(); true }
+                    snapshotFiles.set(file, json)
+                    true
                 }
             }.getOrDefault(false)
             if (ok) {
                 if (json == null) snapshotCache.remove(name) else snapshotCache[name] = json
             }
             main.post {
-                if (ok) changed("snapshots", name, json, null)
+                // Isolates optimistically display their write. Restore the
+                // confirmed value before rejecting an unsuccessful checkpoint.
+                changed("snapshots", name, if (ok) json else previous, null)
                 done(ok)
             }
         }

package/dist/android/templates/CraftSnapshotFile.kt.template

@@ -0,0 +1,26 @@
+package {{PACKAGE_NAME}}
+
+import java.io.File
+import java.io.FileOutputStream
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+import java.util.UUID
+
+/** One checkpoint replacement. Filesystem failures must leave the previous checkpoint intact. */
+internal class CraftSnapshotFile(
+    private val write: (File, ByteArray) -> Unit = { file, bytes ->
+        FileOutputStream(file).use { stream -> stream.write(bytes); stream.fd.sync() }
+    },
+    private val replace: (File, File) -> Unit = { source, destination ->
+        Files.move(source.toPath(), destination.toPath(), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING)
+    },
+) {
+    fun set(destination: File, json: String) {
+        val temporary = File(destination.parentFile, ".craft-snapshot-${UUID.randomUUID()}.tmp")
+        val bytes = json.toByteArray(Charsets.UTF_8)
+        try {
+            write(temporary, bytes)
+            replace(temporary, destination)
+        } finally { temporary.delete() }
+    }
+}

package/dist/android/templates/MainActivityNative.kt.template

@@ -4661,6 +4661,7 @@ class MainActivity : AppCompatActivity() {
             capabilities: ${capabilityNames()},
             initialAppState: ${JSONObject.quote(nativeAppState)},
             colorScheme: ${JSONObject.quote(colorScheme())},
+            viewportWidth: ${resources.configuration.screenWidthDp},
             appearance: ${appearance()},
             appURL: ${JSONObject.quote(config.optString("devServerURL"))},
             appVersion: ${JSONObject.quote(appVersion().first)},
@@ -4909,6 +4910,21 @@ class MainActivity : AppCompatActivity() {
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         publishAppearance()
+        publishViewport(newConfig)
+    }
+
+    /// The width the screens last heard, in dp (a web page's CSS pixels).
+    private var reportedViewportWidth = -1
+
+    /// Rotation, split screen or a resized window: the bundle's width classes
+    /// (`md:`, `lg:`) follow the window's new width.
+    private fun publishViewport(config: Configuration) {
+        val width = config.screenWidthDp
+        if (width <= 0 || width == reportedViewportWidth) return
+        reportedViewportWidth = width
+        if (!::root.isInitialized) return
+        val payload = JSONObject().put("width", width).put("height", config.screenHeightDp)
+        allScreens().forEach { screen -> if (!screen.headless) send(screen, "VIEWPORT", payload) }
     }
 
     private fun publishAppearance() {

package/dist/browser/storage.d.ts

@@ -17,8 +17,10 @@ export interface BrowserStorageOptions {
      * or in another tab: called once the new account's storage is in place.
      */
     sessionChanged?: (token: string | null, previous: string | null) => void;
-    /** A host lock primitive; browsers use their native Web Locks implementation. */
-    lock?: (<T>(name: string, operation: () => T | Promise<T>) => Promise<T>) | null;
+    /** A host lock primitive; honor signal cancellation while queued, as native Web Locks do. */
+    lock?: (<T>(name: string, operation: () => T | Promise<T>, options?: {
+        signal?: AbortSignal;
+    }) => Promise<T>) | null;
 }
 export interface BrowserStorage {
     atomicStorage: boolean;
@@ -37,7 +39,7 @@ export interface BrowserStorage {
             keys: () => string[];
         };
     };
-    call: (module: string, method: string, args: unknown[]) => Promise<unknown>;
+    call: (module: string, method: string, args: unknown[], signal?: AbortSignal) => Promise<unknown>;
     accountChanged: () => Promise<void>;
     scope: () => string;
 }

package/dist/browser.d.ts

@@ -18,6 +18,7 @@ export interface BrowserPlatformOptions {
 export interface BrowserPlatform {
     craft: Record<string, unknown>;
     capabilities: string[];
+    /** Queued storage calls abort without writing; cancellation cannot undo an already committed synchronous write. */
     call: (module: string, method: string, args: unknown[], signal: AbortSignal) => Promise<unknown>;
     navigate: (path: string, replace?: boolean) => void;
     emit: (listener: (type: string, payload: unknown) => void) => () => void;

package/dist/browser.js

@@ -63,12 +63,35 @@ function secureUUID() {
 }
 
 // src/browser/storage.ts
+async function waitForAccount(operation, signal) {
+  if (!signal)
+    return operation;
+  let abort;
+  try {
+    return await Promise.race([operation, new Promise((resolve, reject) => {
+      abort = () => reject(signal.reason);
+      if (signal.aborted)
+        abort();
+      else
+        signal.addEventListener("abort", abort, { once: true });
+    })]);
+  } finally {
+    signal.removeEventListener("abort", abort);
+  }
+}
 async function createBrowserStorage(options) {
   const { storage, namespace, tokenKey, changed } = options;
   const sessionTokenKey = options.sessionTokenKey || "auth.token";
   const prefix = `${namespace}:`;
-  const lock = options.lock === null ? undefined : options.lock ?? (typeof navigator !== "undefined" && typeof navigator.locks?.request === "function" ? (name, operation) => navigator.locks.request(name, operation) : undefined);
-  const exclusive = (operation) => lock ? lock(`${namespace}:storage`, operation) : Promise.resolve().then(operation);
+  const lock = options.lock === null ? undefined : options.lock ?? (typeof navigator !== "undefined" && typeof navigator.locks?.request === "function" ? (name, operation, settings) => navigator.locks.request(name, settings ?? {}, operation) : undefined);
+  const exclusive = (operation, signal) => {
+    const guarded = () => {
+      signal?.throwIfAborted();
+      return operation();
+    };
+    signal?.throwIfAborted();
+    return lock ? lock(`${namespace}:storage`, guarded, { signal }) : Promise.resolve().then(guarded);
+  };
   const scopeChanged = () => Object.assign(new Error("The storage account changed"), { code: "STORAGE_SCOPE_CHANGED" });
   const pending = new Map;
   let token = storage.getItem(tokenKey);
@@ -215,10 +238,11 @@ async function createBrowserStorage(options) {
         keys: () => available() ? keys(key("snapshot:")).map((name) => name.slice(key("snapshot:").length)) : []
       }
     },
-    async call(module, method, args) {
+    async call(module, method, args, signal) {
+      signal?.throwIfAborted();
       const captured = capture();
       const wasAvailable = available();
-      await accountChanged();
+      await waitForAccount(accountChanged(), signal);
       const name = String(args[0] ?? "");
       if (module === "Storage") {
         if (!wasAvailable)
@@ -259,7 +283,7 @@ async function createBrowserStorage(options) {
             return true;
           }
           throw Object.assign(new Error(`Unsupported browser storage operation ${method}`), { code: "UNSUPPORTED" });
-        });
+        }, signal);
       }
       if (module === "SecureStorage") {
         if (!wasAvailable)
@@ -284,7 +308,7 @@ async function createBrowserStorage(options) {
             return true;
           }
           throw Object.assign(new Error(`Unsupported browser storage operation ${module}.${method}`), { code: "UNSUPPORTED" });
-        });
+        }, signal);
         if (method === "clear" || name === sessionTokenKey && (method === "set" || method === "remove"))
           await accountChanged();
         return result;
@@ -608,7 +632,7 @@ async function createBrowserPlatform(options = {}) {
       const first = object(args[0]);
       if (module === "Storage" || module === "SecureStorage") {
         const before = persistence.craft.secureStorage.getSync(sessionTokenKey);
-        const answer = await persistence.call(module, method, args);
+        const answer = await persistence.call(module, method, args, signal);
         if (before !== persistence.craft.secureStorage.getSync(sessionTokenKey))
           await resetAccount();
         return answer;

package/dist/cli.js

@@ -130,12 +130,15 @@ import { spawn } from "child_process";
 import { createHash } from "crypto";
 import {
   chmodSync,
+  closeSync,
   copyFileSync,
   cpSync,
   existsSync as existsSync4,
   lstatSync,
   mkdirSync,
+  openSync,
   readFileSync as readFileSync2,
+  readSync,
   readdirSync as readdirSync2,
   rmSync as rmSync2,
   writeFileSync as writeFileSync3
@@ -243,6 +246,8 @@ async function packageMacOS(config, outDir) {
   const { name, version, bundleId = `com.myapp.${name.toLowerCase()}` } = config;
   const opts = config.macos || {};
   const hardenedRuntime = !opts.appStore;
+  if (opts.appStore && (!opts.entitlements || !opts.provisioningProfile))
+    return [{ success: false, platform: "macos", format: "app", error: "App Store packaging requires macos.entitlements and macos.provisioningProfile" }];
   const appBundlePath = join2(outDir, `${name}.app`);
   const appBundle = opts.appBundlePath ? copyMacOSAppBundle(opts.appBundlePath, appBundlePath) : createMacOSAppBundle({
     name,
@@ -268,25 +273,42 @@ async function packageMacOS(config, outDir) {
     });
     return results;
   }
-  if (opts.signIdentity) {
-    const signed = await runTool("codesign", codesignArguments({
-      path: appBundlePath,
-      identity: opts.signIdentity,
-      entitlements: opts.entitlements,
-      hardenedRuntime
-    }));
-    if (!signed.success) {
-      results.push({ success: false, platform: "macos", format: "app", error: signed.error });
-      return results;
+  try {
+    const contents = join2(appBundlePath, "Contents");
+    if (opts.provisioningProfile) {
+      const profile = join2(contents, "embedded.provisionprofile");
+      copyFileSync(opts.provisioningProfile, profile);
+      chmodSync(profile, 420);
+    }
+    if (opts.privacyManifest)
+      copyFileSync(opts.privacyManifest, join2(contents, "Resources", "PrivacyInfo.xcprivacy"));
+    if (opts.appBundlePath) {
+      const metadata = {
+        CFBundleVersion: opts.buildNumber,
+        LSApplicationCategoryType: opts.category,
+        LSMinimumSystemVersion: opts.minimumSystemVersion,
+        LSUIElement: opts.menuBarOnly
+      };
+      if (config.iconPath) {
+        const icon = basename(config.iconPath);
+        copyFileSync(config.iconPath, join2(contents, "Resources", icon));
+        metadata.CFBundleIconFile = icon;
+      }
+      for (const [key, value] of Object.entries(metadata)) {
+        if (value === undefined)
+          continue;
+        const result = await runTool("plutil", ["-replace", key, typeof value === "boolean" ? "-bool" : "-string", String(value), join2(contents, "Info.plist")]);
+        if (!result.success)
+          throw new Error(result.error);
+      }
     }
-  } else if (opts.appStore) {
-    results.push({
-      success: false,
-      platform: "macos",
-      format: "pkg",
-      error: 'App Store packaging requires macos.signIdentity (a "3rd Party Mac Developer Application" identity)'
-    });
-    return results;
+    if (opts.signIdentity) {
+      await signMacOSAppBundle(appBundlePath, bundleId, opts, hardenedRuntime);
+    } else if (opts.appStore) {
+      throw new Error('App Store packaging requires macos.signIdentity (a "3rd Party Mac Developer Application" identity)');
+    }
+  } catch (error) {
+    return [{ success: false, platform: "macos", format: "app", error: error.message }];
   }
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
@@ -310,7 +332,8 @@ async function packageMacOS(config, outDir) {
       identifier: bundleId,
       version,
       appStore: opts.appStore === true,
-      installerIdentity: opts.installerIdentity
+      installerIdentity: opts.installerIdentity,
+      signingKeychain: opts.signingKeychain
     });
     results.push({
       success: pkgResult.success,
@@ -550,6 +573,59 @@ ${body}
 </dict>
 </plist>`;
 }
+async function signMacOSAppBundle(app, bundleId, opts, hardenedRuntime) {
+  const scratch = createTempDir("craft-sign-");
+  try {
+    let helperEntitlements = opts.helperEntitlements;
+    if (opts.appStore && !helperEntitlements) {
+      helperEntitlements = join2(scratch, "inherit.plist");
+      writeFileSync3(helperEntitlements, '<?xml version="1.0"?><plist version="1.0"><dict><key>com.apple.security.app-sandbox</key><true/><key>com.apple.security.inherit</key><true/></dict></plist>');
+    }
+    const extracted = await runTool("plutil", ["-extract", "CFBundleExecutable", "raw", "-o", "-", join2(app, "Contents", "Info.plist")]);
+    if (!extracted.success)
+      throw new Error(extracted.error);
+    const main = join2(app, "Contents", "MacOS", extracted.stdout.trim());
+    const sign = async (path, entitlements, identifier) => {
+      const signed = await runTool("codesign", codesignArguments({ path, identity: opts.signIdentity, entitlements, hardenedRuntime, identifier, keychain: opts.signingKeychain, deep: false }));
+      if (!signed.success)
+        throw new Error(signed.error);
+    };
+    const walk = async (directory) => {
+      for (const entry of readdirSync2(directory)) {
+        const path = join2(directory, entry);
+        const stat = lstatSync(path);
+        if (stat.isSymbolicLink())
+          continue;
+        if (stat.isDirectory()) {
+          await walk(path);
+          if (/\.(?:app|framework|xpc|appex|bundle)$/.test(entry))
+            await sign(path, /\.(?:app|xpc|appex)$/.test(entry) ? helperEntitlements : undefined);
+        } else if (path !== main && stat.isFile() && isMachO(path)) {
+          const executable = (stat.mode & 73) !== 0 && !/\.(?:dylib|so)$/.test(entry);
+          await sign(path, executable ? helperEntitlements : undefined, `${bundleId}.${entry}`);
+        }
+      }
+    };
+    await walk(join2(app, "Contents"));
+    await sign(app, opts.entitlements);
+    const verified = await runTool("codesign", ["--verify", "--deep", "--strict", app]);
+    if (!verified.success)
+      throw new Error(verified.error);
+  } finally {
+    removeTempDir(scratch);
+  }
+}
+function isMachO(path) {
+  const fd = openSync(path, "r");
+  try {
+    const magic = Buffer.alloc(4);
+    if (readSync(fd, magic, 0, 4, 0) !== 4)
+      return false;
+    return [4277009102, 3472551422, 4277009103, 3489328638, 3405691582, 3199925962, 3405691583, 3216703178].includes(magic.readUInt32BE());
+  } finally {
+    closeSync(fd);
+  }
+}
 function codesignArguments(opts) {
   return [
     "--force",
@@ -558,7 +634,9 @@ function codesignArguments(opts) {
     ...opts.identity === "-" ? [] : ["--timestamp"],
     ...opts.hardenedRuntime ? ["--options", "runtime"] : [],
     ...opts.entitlements ? ["--entitlements", opts.entitlements] : [],
-    "--deep",
+    ...opts.identifier ? ["--identifier", opts.identifier] : [],
+    ...opts.keychain ? ["--keychain", opts.keychain] : [],
+    ...opts.deep === false ? [] : ["--deep"],
     opts.path
   ];
 }
@@ -569,6 +647,7 @@ function productbuildArguments(opts) {
     "/Applications",
     "--sign",
     opts.identity,
+    ...opts.keychain ? ["--keychain", opts.keychain] : [],
     opts.outputPath
   ];
 }
@@ -686,7 +765,7 @@ function runTool(tool, args) {
     });
     proc.on("close", (code) => {
       if (code === 0)
-        resolve({ success: true });
+        resolve({ success: true, stdout });
       else
         resolve({ success: false, error: formatPackagingCommandError(tool, code, stdout, stderr) });
     });
@@ -760,7 +839,8 @@ async function createPKG(opts) {
     const built = await runTool("productbuild", productbuildArguments({
       appBundlePath: opts.appBundlePath,
       outputPath: opts.outputPath,
-      identity: opts.installerIdentity
+      identity: opts.installerIdentity,
+      keychain: opts.signingKeychain
     }));
     return built.success ? { success: true, outputPath: opts.outputPath } : { success: false, error: built.error };
   }
@@ -2865,7 +2945,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.278";
+var version = "0.0.290";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];