@todesktop/cli 1.15.2 → 1.18.0

package/dist/cli.js

@@ -192,12 +192,19 @@ var firebaseApp = (0, import_app.initializeApp)({
 });
 var auth = (0, import_auth.getAuth)(firebaseApp);
 var db = (0, import_firestore.getFirestore)(firebaseApp);
-var currentUser = () => auth.currentUser;
+var _a;
+var [host, port] = ((_a = environmentVariables.TODESKTOP_CLI_FIRESTORE_HOST) == null ? void 0 : _a.split(":")) || [];
+if (host && port) {
+  (0, import_firestore.connectFirestoreEmulator)(db, host, Number.parseInt(port, 10));
+}
+var currentUser = () => {
+  return auth.currentUser;
+};
 var signInWithCustomToken = async (token) => {
   return (0, import_auth.signInWithCustomToken)(auth, token);
 };
 var onUserAuth = (handler) => (0, import_auth.onAuthStateChanged)(auth, (user) => {
-  handler(user || {});
+  handler(user ?? {});
 });
 var firestore_default = db;
 
@@ -322,7 +329,7 @@ var track = (event, properties = {}, callback = () => {
     analytics.track(
       {
         event,
-        userId: user ? user.uid : void 0,
+        userId: user == null ? void 0 : user.uid,
         anonymousId,
         properties: {
           ...properties,
@@ -380,10 +387,10 @@ function fixMacUrl(url) {
 // src/components/BuildCompleteMessage.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var BuildCompleteMessage = ({ build }) => {
-  var _a;
+  var _a2;
   const exit = useExit_default();
   let url = build.standardUniversalDownloadUrl;
-  if (process.platform === "darwin" && ((_a = build.mac) == null ? void 0 : _a.standardDownloadUrl)) {
+  if (process.platform === "darwin" && ((_a2 = build.mac) == null ? void 0 : _a2.standardDownloadUrl)) {
     url = fixMacUrl(build.mac.standardDownloadUrl);
   }
   logForCI_default(`Build complete! ${url}`);
@@ -565,18 +572,18 @@ var import_ink5 = require("ink");
 var import_react3 = require("react");
 
 // src/utilities/CliError.ts
-var CliError = class extends Error {
+var CliError = class _CliError extends Error {
   constructor(message2, { cause, type = "error" } = {}) {
     super(message2, { cause });
     this.type = type;
   }
   static from(e, type = "error") {
     if (e instanceof Error) {
-      return new CliError(e.message, { cause: e, type });
+      return new _CliError(e.message, { cause: e, type });
     } else if (typeof e === "string") {
-      return new CliError(e, { type });
+      return new _CliError(e, { type });
     } else {
-      return new CliError(JSON.stringify(e), { type });
+      return new _CliError(JSON.stringify(e), { type });
     }
   }
 };
@@ -647,8 +654,9 @@ var app = (0, import_app2.initializeApp)({
   appId: env.TODESKTOP_CLI_FIREBASE_ID
 });
 var functions = (0, import_functions.getFunctions)(app);
-if (env.TODESKTOP_CLI_ENV === "development") {
-  const firebaseUrl = new URL(env.TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE);
+var firebaseFunctionsBase = env.TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE || "";
+if (firebaseFunctionsBase.includes("localhost")) {
+  const firebaseUrl = new URL(firebaseFunctionsBase);
   (0, import_functions.connectFunctionsEmulator)(
     functions,
     firebaseUrl.hostname,
@@ -1016,9 +1024,13 @@ async function postToFirebaseFunction_default(functionName, body = {}, config2 =
     { scrub: { functionName, body, config: config2 } },
     "postToFirebaseFunction"
   );
+  let baseUrl = TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE;
+  if (!baseUrl.endsWith("/")) {
+    baseUrl += "/";
+  }
   try {
     const response = await import_axios.default.post(
-      `${TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE}${functionName}`,
+      `${baseUrl}${functionName}`,
       body,
       config2
     );
@@ -1062,8 +1074,8 @@ function loadTypeScriptConfig(configPath) {
         );
       }
     }
-    const fs6 = require("fs");
-    const sourceCode = fs6.readFileSync(configPath, "utf8");
+    const fs7 = require("fs");
+    const sourceCode = fs7.readFileSync(configPath, "utf8");
     const result = typescript.transpile(sourceCode, {
       target: typescript.ScriptTarget.ES2018,
       module: typescript.ModuleKind.CommonJS,
@@ -1643,6 +1655,21 @@ var schema_default = {
     appFiles: { $ref: "#/definitions/appFilesProperty" },
     appProtocolScheme: { $ref: "#/definitions/appProtocolSchemeProperty" },
     appPath: { $ref: "#/definitions/appPathProperty" },
+    bundleWorkspacePackages: {
+      type: "object",
+      additionalProperties: false,
+      description: "Useful when your application is a monorepo (e.g. pnpm workspaces). You can configure whether the CLI bundles workspace packages alongside the app upload. When enabled, workspace dependencies referenced via `workspace:` or local `file:` specifiers are bundled with your application upload and dependency ranges are rewritten to `file:` paths so they install deterministically on the build servers.",
+      examples: ['{"enabled":true}'],
+      default: { enabled: false },
+      properties: {
+        enabled: {
+          type: "boolean",
+          default: false,
+          description: "Enable automatic bundling of workspace packages for this project."
+        }
+      }
+    },
+    bytenode: { $ref: "#/definitions/bytenodeConfigProperty" },
     asar: { $ref: "#/definitions/asarProperty" },
     asarUnpack: { $ref: "#/definitions/asarUnpackProperty" },
     buildVersion: { $ref: "#/definitions/buildVersionProperty" },
@@ -1735,6 +1762,34 @@ var schema_default = {
       examples: ["com.microsoft.word"],
       default: "auto-generated"
     },
+    bytenodeConfigProperty: {
+      type: "object",
+      additionalProperties: false,
+      description: "Compile selected source files to .jsc using Bytenode during the build. Provide glob patterns relative to your appPath.",
+      default: { enabled: false },
+      properties: {
+        enabled: {
+          type: "boolean",
+          default: false,
+          description: "Enable Bytenode compilation."
+        },
+        files: {
+          type: "array",
+          items: { type: "string", minLength: 1 },
+          minItems: 1,
+          description: "Glob patterns relative to appPath for files to compile to Bytenode."
+        }
+      },
+      allOf: [
+        {
+          if: {
+            properties: { enabled: { const: true } },
+            required: ["enabled"]
+          },
+          then: { required: ["files"] }
+        }
+      ]
+    },
     appFilesProperty: {
       type: "array",
       description: "This option allows you to decide which files get uploaded to be built on the ToDesktop servers. By default, all files in your app path are included in your app, except for `node_modules` and `.git`. Dependencies are installed on our build servers as there could be platform-specific postinstall steps.",
@@ -2418,7 +2473,7 @@ var schema_default = {
           description: "The path to your application's Windows desktop icon. It must be an ICO, ICNS, or PNG.",
           examples: ["./icon.ico"],
           file: {
-            extensions: ["icns", "png", "icon"],
+            extensions: ["icns", "png", "ico"],
             mustBeFile: true
           },
           minLength: 3
@@ -2483,6 +2538,7 @@ var schema_default = {
           $ref: "#/definitions/appProtocolSchemeProperty"
         },
         appPath: { $ref: "#/definitions/appPathProperty" },
+        bytenode: { $ref: "#/definitions/bytenodeConfigProperty" },
         asar: { $ref: "#/definitions/asarProperty" },
         asarUnpack: { $ref: "#/definitions/asarUnpackProperty" },
         buildVersion: { $ref: "#/definitions/buildVersionProperty" },
@@ -2635,6 +2691,9 @@ function getProjectConfig(configPath, flags) {
   const config2 = computeFullProjectConfig(partialConfig, projectRoot, flags);
   validateConfig({ config: config2, projectRoot });
   const result = resolveConfigPaths({ config: config2, projectRoot });
+  if (process.env.TODESKTOP_CLI_APP_ID) {
+    result.id = process.env.TODESKTOP_CLI_APP_ID;
+  }
   return { config: result, unprocessedConfig: config2, projectRoot };
 }
 
@@ -2705,6 +2764,19 @@ var getVersionControlInfo_default = async (directory) => {
 // src/commands/build/utilities/spyBuild.ts
 var import_events = __toESM(require("events"));
 var import_firestore3 = require("firebase/firestore");
+
+// src/utilities/firestoreData.ts
+var readQueryDocument = (doc9) => {
+  return doc9.data();
+};
+var readDocumentSnapshot = (snapshot) => {
+  return snapshot.exists() ? snapshot.data() : void 0;
+};
+var readQuerySnapshot = (snapshot) => {
+  return snapshot.docs.map((doc9) => readQueryDocument(doc9));
+};
+
+// src/commands/build/utilities/spyBuild.ts
 function spyBuild() {
   const emitter = new import_events.default();
   let unsubscribeSnapshot;
@@ -2734,7 +2806,7 @@ function spyBuild() {
       unsubscribeSnapshot = (0, import_firestore3.onSnapshot)(
         (0, import_firestore3.doc)(firestore_default, buildPath),
         (snapshot) => {
-          latestBuildDoc = snapshot.exists() ? snapshot.data() : void 0;
+          latestBuildDoc = readDocumentSnapshot(snapshot);
           emitter.emit("update", {
             build: latestBuildDoc,
             snapshot
@@ -2764,16 +2836,16 @@ function spyBuild() {
 function buildHasSettled(build) {
   return ["linux", "mac", "windows"].every(
     (platform) => {
-      var _a, _b, _c, _d, _e;
-      return ((_a = build[platform]) == null ? void 0 : _a.shouldSkip) || "succeeded" === ((_b = build[platform]) == null ? void 0 : _b.status) || "cancelled" === ((_c = build[platform]) == null ? void 0 : _c.status) || "failed" === ((_d = build[platform]) == null ? void 0 : _d.status) && ((_e = build[platform]) == null ? void 0 : _e.numberOfAttemptedBuilds) === 2;
+      var _a2, _b, _c, _d, _e;
+      return ((_a2 = build[platform]) == null ? void 0 : _a2.shouldSkip) || "succeeded" === ((_b = build[platform]) == null ? void 0 : _b.status) || "cancelled" === ((_c = build[platform]) == null ? void 0 : _c.status) || "failed" === ((_d = build[platform]) == null ? void 0 : _d.status) && ((_e = build[platform]) == null ? void 0 : _e.numberOfAttemptedBuilds) === 2;
     }
   );
 }
 
 // src/commands/build/utilities/uploadApplicationSource.ts
-var import_fast_glob = __toESM(require("fast-glob"));
-var fs5 = __toESM(require("fs"));
-var path7 = __toESM(require("path"));
+var import_fast_glob2 = __toESM(require("fast-glob"));
+var fs6 = __toESM(require("fs"));
+var path8 = __toESM(require("path"));
 
 // src/commands/build/utilities/generateS3Key.ts
 var generateS3Key_default = ({ appId, buildId, filenameSuffix }) => `${appId}/sourceArchives/${buildId}--${filenameSuffix}`;
@@ -2859,13 +2931,29 @@ async function zip_default({
   });
   const processedFiles = await Promise.all(
     files.map(async (file) => {
+      if (file.content !== void 0 && file.content !== null) {
+        const buffer = Buffer.isBuffer(file.content) ? file.content : Buffer.from(file.content);
+        return {
+          ...file,
+          contentBuffer: buffer,
+          isDirectory: false,
+          size: buffer.length,
+          virtual: true
+        };
+      }
+      if (!file.from) {
+        throw new Error(
+          `Zip entry for ${file.to} must provide either a source path or in-memory content.`
+        );
+      }
       const stats = import_fs2.default.lstatSync(file.from);
       const isDirectory = stats.isDirectory();
       return {
         ...file,
         isDirectory,
         stats,
-        size: isDirectory ? await (0, import_du.default)(file.from) : stats.size
+        size: isDirectory ? await (0, import_du.default)(file.from) : stats.size,
+        virtual: false
       };
     })
   );
@@ -2888,15 +2976,21 @@ Your app is larger than ${fileSizeLimit}MB. Your app is ${import_chalk.default.b
     );
     return stream;
   }
-  processedFiles.forEach(({ from, isDirectory, stats, to }) => {
-    if (isDirectory) {
+  processedFiles.forEach((entry) => {
+    const { from, isDirectory, stats, to, virtual, contentBuffer, mode } = entry;
+    if (virtual) {
+      stream.append(contentBuffer, {
+        name: to,
+        mode: mode ?? 420
+      });
+    } else if (isDirectory) {
       stream.directory(from, to);
     } else if (appPkgJson && to === import_path7.default.join("app", "package.json")) {
       stream.append(JSON.stringify(appPkgJson), {
         name: to
       });
     } else {
-      stream.file(from, { name: to, mode: stats.mode });
+      stream.file(from, { name: to, mode: mode ?? stats.mode });
     }
   });
   stream.finalize();
@@ -2910,6 +3004,528 @@ Your app is larger than ${fileSizeLimit}MB. Your app is ${import_chalk.default.b
   return stream;
 }
 
+// src/commands/build/utilities/workspace/index.ts
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs3 = __toESM(require("fs"));
+var import_path8 = __toESM(require("path"));
+var import_js_yaml = __toESM(require("js-yaml"));
+var BUNDLED_ROOT = "bundledPackages";
+var DEFAULT_IGNORE_GLOBS = [
+  "**/node_modules/**",
+  "**/.git/**",
+  "**/.hg/**",
+  "**/.svn/**",
+  "**/.DS_Store",
+  "**/npm-debug.log",
+  "**/yarn-error.log"
+];
+async function prepareWorkspaceBundle(input) {
+  var _a2;
+  const { config: config2, appPkgJson, appPath } = input;
+  if (!((_a2 = config2.bundleWorkspacePackages) == null ? void 0 : _a2.enabled)) {
+    return {
+      appPackageJson: appPkgJson,
+      entries: [],
+      shouldBundle: false
+    };
+  }
+  const workspace = findWorkspaceDefinition(appPath, appPkgJson);
+  if (!workspace) {
+    throw new Error(
+      "Bundle workspace packages is enabled but no workspace root could be found."
+    );
+  }
+  if (workspace.warning) {
+    logger_default.warn(workspace.warning);
+  }
+  const workspacePackages = collectWorkspacePackages(workspace);
+  const bundledPackageNames = determineBundleClosure({
+    appPath,
+    appPkgJson,
+    workspace,
+    workspacePackages
+  });
+  if (!bundledPackageNames.size) {
+    logger_default.info("No workspace packages matched bundle criteria.");
+    return {
+      appPackageJson: appPkgJson,
+      entries: [],
+      shouldBundle: false
+    };
+  }
+  const bundleEntries = [];
+  const appRewriteMap = {};
+  const bundledPackageContexts = /* @__PURE__ */ new Map();
+  const sortedPackageNames = Array.from(bundledPackageNames).sort();
+  for (const packageName of sortedPackageNames) {
+    const pkg = workspacePackages.get(packageName);
+    if (!pkg) {
+      throw new Error(
+        `Workspace package "${packageName}" referenced for bundling but not found in workspace map.`
+      );
+    }
+    const bundlePath = getBundlePath(packageName);
+    bundledPackageContexts.set(packageName, { bundlePath, packageName });
+    appRewriteMap[packageName] = `file:../${import_path8.default.posix.join(
+      BUNDLED_ROOT,
+      bundlePath
+    )}`;
+    const packageEntries = await buildPackageEntries({
+      bundlePath,
+      workspacePackage: pkg,
+      bundledNames: bundledPackageNames,
+      contexts: bundledPackageContexts
+    });
+    bundleEntries.push(...packageEntries.files);
+    bundleEntries.push(packageEntries.packageJsonEntry);
+  }
+  const rewrittenAppPkgJson = applyRewriteMap(appPkgJson, appRewriteMap);
+  logger_default.info(
+    `Bundling ${sortedPackageNames.length} workspace package(s) from ${workspace.type} workspace at ${workspace.rootDir}`
+  );
+  logger_default.info(`Bundled packages: ${sortedPackageNames.join(", ")}`);
+  return {
+    appPackageJson: rewrittenAppPkgJson,
+    entries: bundleEntries,
+    shouldBundle: true
+  };
+}
+function findWorkspaceDefinition(appPath, appPkgJson) {
+  const appDir = import_path8.default.resolve(appPath);
+  let currentDir = appDir;
+  let previousDir = "";
+  const pnpmPreference = detectPnpmPreference(appPkgJson);
+  while (currentDir !== previousDir) {
+    const pnpmFile = import_path8.default.join(currentDir, "pnpm-workspace.yaml");
+    const packageJsonPath = import_path8.default.join(currentDir, "package.json");
+    const hasPnpm = import_fs3.default.existsSync(pnpmFile);
+    const packageJson2 = readPackageJsonIfExists(packageJsonPath);
+    const npmWorkspaces = getNpmWorkspaces(packageJson2);
+    if (hasPnpm || npmWorkspaces.length) {
+      const pnpmDefinition = hasPnpm ? createPnpmDefinition({ pnpmFile, rootDir: currentDir }) : void 0;
+      const npmDefinition = npmWorkspaces.length ? createNpmDefinition({ globs: npmWorkspaces, rootDir: currentDir }) : void 0;
+      const chosen = chooseWorkspaceDefinition({
+        pnpmPreference,
+        pnpmDefinition,
+        npmDefinition
+      });
+      if (chosen) {
+        const includesApp = workspaceIncludesPath({
+          appDir,
+          globs: chosen.globs,
+          rootDir: chosen.rootDir
+        });
+        if (includesApp) {
+          return chosen;
+        }
+      }
+    }
+    previousDir = currentDir;
+    currentDir = import_path8.default.dirname(currentDir);
+  }
+  return void 0;
+}
+function detectPnpmPreference(appPkgJson) {
+  const pkgManager = appPkgJson.packageManager;
+  if (typeof pkgManager !== "string") {
+    return false;
+  }
+  return pkgManager.startsWith("pnpm@");
+}
+function readPackageJsonIfExists(filePath) {
+  if (!import_fs3.default.existsSync(filePath)) {
+    return void 0;
+  }
+  try {
+    return JSON.parse(import_fs3.default.readFileSync(filePath, "utf8"));
+  } catch (error) {
+    throw new Error(`Unable to parse package.json at ${filePath}: ${error}`);
+  }
+}
+function getNpmWorkspaces(packageJson2) {
+  if (!packageJson2) {
+    return [];
+  }
+  const { workspaces } = packageJson2;
+  if (!workspaces) {
+    return [];
+  }
+  if (Array.isArray(workspaces)) {
+    return workspaces.filter(
+      (value) => typeof value === "string"
+    );
+  }
+  if (typeof workspaces === "object" && Array.isArray(workspaces.packages)) {
+    return workspaces.packages.filter(
+      (value) => typeof value === "string"
+    );
+  }
+  return [];
+}
+function createPnpmDefinition({
+  pnpmFile,
+  rootDir
+}) {
+  const packages = parsePnpmWorkspaceFile(pnpmFile);
+  if (!packages.length) {
+    throw new Error(
+      `pnpm workspace file at ${pnpmFile} does not define any packages.`
+    );
+  }
+  return {
+    globs: packages,
+    rootDir,
+    realRootDir: import_fs3.default.realpathSync(rootDir),
+    type: "pnpm"
+  };
+}
+function createNpmDefinition({
+  globs,
+  rootDir
+}) {
+  return {
+    globs,
+    rootDir,
+    realRootDir: import_fs3.default.realpathSync(rootDir),
+    type: "npm"
+  };
+}
+function chooseWorkspaceDefinition({
+  pnpmPreference,
+  pnpmDefinition,
+  npmDefinition
+}) {
+  if (pnpmDefinition && npmDefinition) {
+    const warning = "Both pnpm-workspace.yaml and package.json workspaces detected; defaulting to pnpm.";
+    if (pnpmPreference) {
+      return pnpmDefinition;
+    }
+    return { ...pnpmDefinition, warning };
+  }
+  return pnpmDefinition || npmDefinition;
+}
+function parsePnpmWorkspaceFile(filePath) {
+  const content = import_fs3.default.readFileSync(filePath, "utf8");
+  const parsed = import_js_yaml.default.load(content);
+  let packagesField;
+  if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+    packagesField = parsed.packages;
+  } else {
+    packagesField = parsed;
+  }
+  if (!Array.isArray(packagesField)) {
+    throw new Error(
+      `pnpm workspace file at ${filePath} does not define any packages.`
+    );
+  }
+  const packages = packagesField.map((value) => typeof value === "string" ? value.trim() : "").filter((value) => Boolean(value));
+  if (!packages.length) {
+    throw new Error(
+      `pnpm workspace file at ${filePath} does not define any packages.`
+    );
+  }
+  return packages;
+}
+function workspaceIncludesPath({
+  appDir,
+  globs,
+  rootDir
+}) {
+  const target = import_path8.default.resolve(appDir);
+  const matches = import_fast_glob.default.sync(globs, {
+    absolute: true,
+    cwd: rootDir,
+    onlyDirectories: true,
+    followSymbolicLinks: false,
+    ignore: ["**/node_modules/**"]
+  });
+  return matches.some((dir) => import_path8.default.resolve(dir) === target);
+}
+function collectWorkspacePackages(definition) {
+  const { globs, rootDir } = definition;
+  const directories = import_fast_glob.default.sync(globs, {
+    absolute: true,
+    cwd: rootDir,
+    onlyDirectories: true,
+    followSymbolicLinks: false,
+    ignore: ["**/node_modules/**"]
+  });
+  const packages = /* @__PURE__ */ new Map();
+  for (const dir of directories) {
+    const packageJsonPath = import_path8.default.join(dir, "package.json");
+    if (!import_fs3.default.existsSync(packageJsonPath)) {
+      continue;
+    }
+    const manifest = readPackageJsonIfExists(packageJsonPath);
+    if (!manifest || !manifest.name) {
+      continue;
+    }
+    const name = manifest.name;
+    if (packages.has(name)) {
+      const existing = packages.get(name);
+      throw new Error(
+        `Duplicate workspace package name "${name}" found at ${existing == null ? void 0 : existing.dir} and ${dir}`
+      );
+    }
+    const absoluteDir = import_path8.default.resolve(dir);
+    const pkg = {
+      dir: absoluteDir,
+      manifest,
+      name,
+      realDir: import_fs3.default.realpathSync(absoluteDir)
+    };
+    packages.set(name, pkg);
+  }
+  return packages;
+}
+function determineBundleClosure({
+  appPath,
+  appPkgJson,
+  workspace,
+  workspacePackages
+}) {
+  const bundled = /* @__PURE__ */ new Set();
+  const queue = [];
+  collectDependencyReferences({
+    manifest: appPkgJson,
+    packageDir: appPath,
+    queue,
+    workspace,
+    workspacePackages,
+    sourceName: "app"
+  });
+  while (queue.length) {
+    const ref = queue.shift();
+    if (!ref) {
+      continue;
+    }
+    const targetPackage = workspacePackages.get(ref.name);
+    if (!targetPackage) {
+      throw new Error(
+        `Dependency "${ref.name}" referenced via ${ref.section} is not part of the workspace.`
+      );
+    }
+    if (bundled.has(targetPackage.name)) {
+      continue;
+    }
+    bundled.add(targetPackage.name);
+    collectDependencyReferences({
+      manifest: targetPackage.manifest,
+      packageDir: targetPackage.dir,
+      queue,
+      workspace,
+      workspacePackages,
+      sourceName: targetPackage.name
+    });
+  }
+  return bundled;
+}
+function collectDependencyReferences({
+  manifest,
+  packageDir,
+  queue,
+  workspace,
+  workspacePackages,
+  sourceName
+}) {
+  const sections = [
+    "dependencies",
+    "optionalDependencies",
+    "devDependencies"
+  ];
+  for (const section of sections) {
+    const deps = manifest[section];
+    if (!deps) continue;
+    for (const [depName, spec] of Object.entries(deps)) {
+      if (typeof spec !== "string") continue;
+      const target = resolveWorkspaceTarget({
+        depName,
+        packageDir,
+        spec,
+        workspace,
+        workspacePackages,
+        sourceName
+      });
+      if (target) {
+        queue.push({ name: target, spec, section });
+      }
+    }
+  }
+}
+function resolveWorkspaceTarget({
+  depName,
+  packageDir,
+  spec,
+  workspace,
+  workspacePackages,
+  sourceName
+}) {
+  if (spec.startsWith("workspace:")) {
+    if (!workspacePackages.has(depName)) {
+      throw new Error(
+        `Workspace dependency "${depName}" referenced by ${sourceName} is not declared in workspace globs.`
+      );
+    }
+    return depName;
+  }
+  if (spec.startsWith("file:")) {
+    const targetPath = spec.slice("file:".length);
+    const resolved = import_path8.default.resolve(packageDir, targetPath);
+    const targetRealPath = import_fs3.default.realpathSync(resolved);
+    const relativeToRoot = import_path8.default.relative(workspace.realRootDir, targetRealPath);
+    if (relativeToRoot.startsWith("..") || import_path8.default.isAbsolute(relativeToRoot)) {
+      throw new Error(
+        `Dependency "${depName}" from ${sourceName} resolves outside of workspace root via spec ${spec}.`
+      );
+    }
+    for (const pkg of workspacePackages.values()) {
+      if (pkg.realDir === targetRealPath) {
+        return pkg.name;
+      }
+    }
+    throw new Error(
+      `Dependency "${depName}" from ${sourceName} points to ${resolved}, which is not a known workspace package.`
+    );
+  }
+  return void 0;
+}
+function getBundlePath(packageName) {
+  if (packageName.startsWith("@")) {
+    const [scope, ...rest] = packageName.split("/");
+    return [scope, rest.join("/")].filter(Boolean).join("/");
+  }
+  return packageName;
+}
+function applyRewriteMap(manifest, rewriteMap) {
+  const clone = JSON.parse(JSON.stringify(manifest));
+  const sections = [
+    "dependencies",
+    "optionalDependencies",
+    "devDependencies"
+  ];
+  for (const section of sections) {
+    const sectionDeps = clone[section];
+    if (!sectionDeps) continue;
+    for (const [depName, rewrite] of Object.entries(rewriteMap)) {
+      if (sectionDeps[depName]) {
+        sectionDeps[depName] = rewrite;
+      }
+    }
+  }
+  return clone;
+}
+async function buildPackageEntries({
+  bundlePath,
+  workspacePackage,
+  bundledNames,
+  contexts
+}) {
+  const packageDir = workspacePackage.dir;
+  const manifest = workspacePackage.manifest;
+  const filesToInclude = await gatherPackageFiles({ packageDir, manifest });
+  const files = filesToInclude.map((absolutePath) => {
+    const relative3 = import_path8.default.relative(packageDir, absolutePath);
+    const posixRelative = toPosix(import_path8.default.join(bundlePath, relative3));
+    return {
+      from: absolutePath,
+      to: import_path8.default.posix.join(BUNDLED_ROOT, posixRelative)
+    };
+  });
+  const rewrites = buildRewriteMapForPackage({
+    bundlePath,
+    manifest,
+    bundledNames,
+    contexts
+  });
+  const packageJsonEntry = {
+    content: Buffer.from(
+      `${JSON.stringify(applyRewriteMap(manifest, rewrites), null, 2)}
+`
+    ),
+    to: import_path8.default.posix.join(BUNDLED_ROOT, bundlePath, "package.json")
+  };
+  return { files, packageJsonEntry };
+}
+async function gatherPackageFiles({
+  packageDir,
+  manifest
+}) {
+  const declaredPatterns = Array.isArray(manifest.files) ? manifest.files : ["**/*"];
+  const normalizedPatterns = declaredPatterns.flatMap((pattern) => {
+    if (pattern.includes("*")) {
+      return [pattern];
+    }
+    const absoluteCandidate = import_path8.default.join(packageDir, pattern);
+    try {
+      const stats = import_fs3.default.statSync(absoluteCandidate);
+      if (stats.isDirectory()) {
+        const posixPattern = pattern.replace(/\\/g, "/");
+        return [pattern, `${posixPattern}/**/*`];
+      }
+    } catch (error) {
+    }
+    return [pattern];
+  });
+  const matchedFiles = await (0, import_fast_glob.default)(normalizedPatterns, {
+    absolute: true,
+    cwd: packageDir,
+    dot: true,
+    onlyFiles: true,
+    followSymbolicLinks: false,
+    ignore: DEFAULT_IGNORE_GLOBS
+  });
+  const extras = [
+    "README",
+    "README.md",
+    "README.txt",
+    "LICENSE",
+    "LICENCE",
+    "NOTICE",
+    "CHANGELOG",
+    "CHANGELOG.md"
+  ];
+  for (const extra of extras) {
+    const extraPath = import_path8.default.join(packageDir, extra);
+    if (import_fs3.default.existsSync(extraPath) && import_fs3.default.statSync(extraPath).isFile()) {
+      matchedFiles.push(extraPath);
+    }
+  }
+  const uniqueFiles = Array.from(new Set(matchedFiles));
+  return uniqueFiles.filter((filePath) => !filePath.endsWith("package.json"));
+}
+function buildRewriteMapForPackage({
+  bundlePath,
+  manifest,
+  bundledNames,
+  contexts
+}) {
+  var _a2;
+  const rewriteMap = {};
+  const sections = [
+    "dependencies",
+    "optionalDependencies",
+    "devDependencies"
+  ];
+  for (const section of sections) {
+    const deps = manifest[section];
+    if (!deps) continue;
+    for (const [depName, spec] of Object.entries(deps)) {
+      if (typeof spec !== "string") continue;
+      if (bundledNames.has(depName)) {
+        const targetBundlePath = ((_a2 = contexts.get(depName)) == null ? void 0 : _a2.bundlePath) ?? getBundlePath(depName);
+        const fromPath = import_path8.default.posix.join(BUNDLED_ROOT, bundlePath);
+        const toPath = import_path8.default.posix.join(BUNDLED_ROOT, targetBundlePath);
+        const relative3 = import_path8.default.posix.relative(fromPath, toPath) || ".";
+        rewriteMap[depName] = `file:${relative3}`;
+      }
+    }
+  }
+  return rewriteMap;
+}
+function toPosix(targetPath) {
+  return targetPath.split(import_path8.default.sep).join(import_path8.default.posix.sep);
+}
+
 // src/commands/build/utilities/uploadApplicationSource.ts
 var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   const globs = [
@@ -2923,11 +3539,11 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   if (globsInput && globsInput.length) {
     globs.push(
       ...globsInput,
-      path7.join(appPath, "package.json"),
-      path7.join(appPath, "package-lock.json"),
-      path7.join(appPath, "yarn.lock"),
-      path7.join(appPath, "pnpm-lock.yaml"),
-      path7.join(appPath, "shrinkwrap.yaml")
+      path8.join(appPath, "package.json"),
+      path8.join(appPath, "package-lock.json"),
+      path8.join(appPath, "yarn.lock"),
+      path8.join(appPath, "pnpm-lock.yaml"),
+      path8.join(appPath, "shrinkwrap.yaml")
     );
   } else {
     globs.push("**");
@@ -2938,14 +3554,14 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
     "todesktop:afterPack"
   ]) {
     if (appPkgJson.scripts && appPkgJson.scripts[hookName]) {
-      globs.push(path7.join(appPath, appPkgJson.scripts[hookName]));
+      globs.push(path8.join(appPath, appPkgJson.scripts[hookName]));
     }
   }
   const normalizedGlobs = globs.map((glob) => {
-    const globToUse = path7.isAbsolute(glob) ? path7.relative(appPath, glob) : glob;
+    const globToUse = path8.isAbsolute(glob) ? path8.relative(appPath, glob) : glob;
     return globToUse.replace(/\\/g, "/").replace(/\/+$/, "");
   }).filter((glob) => !glob.startsWith("..") && !glob.startsWith("!.."));
-  let absolutePaths = await (0, import_fast_glob.default)(normalizedGlobs, {
+  let absolutePaths = await (0, import_fast_glob2.default)(normalizedGlobs, {
     absolute: true,
     cwd: appPath,
     dot: true,
@@ -2957,7 +3573,7 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   });
   if (process.platform === "win32") {
     absolutePaths = absolutePaths.map(
-      (absolutePath) => absolutePath.replace(/\//g, path7.sep)
+      (absolutePath) => absolutePath.replace(/\//g, path8.sep)
     );
   }
   if (!absolutePaths || !absolutePaths.length) {
@@ -2971,21 +3587,21 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   } else {
     let mainFilePath = appPath;
     if (appPkgJson.main) {
-      mainFilePath = path7.join(mainFilePath, appPkgJson.main);
+      mainFilePath = path8.join(mainFilePath, appPkgJson.main);
     }
-    if (fs5.statSync(mainFilePath).isDirectory()) {
-      mainFilePath = path7.join(mainFilePath, "index.js");
+    if (fs6.statSync(mainFilePath).isDirectory()) {
+      mainFilePath = path8.join(mainFilePath, "index.js");
     }
     if (!absolutePaths.includes(mainFilePath)) {
       throw new Error(
-        `The "main" file specified in your package.json (${appPkgJson.main ? path7.relative(appPath, mainFilePath) : "defaults to index.js"}) is not set to be uploaded to our servers. This is likely due to how you have configured the \`appFiles\` option. Learn more at https://www.npmjs.com/package/@todesktop/cli#appfiles----optional-array-of-glob-patterns. If this is not the case, please contact us.`
+        `The "main" file specified in your package.json (${appPkgJson.main ? path8.relative(appPath, mainFilePath) : "defaults to index.js"}) is not set to be uploaded to our servers. This is likely due to how you have configured the \`appFiles\` option. Learn more at https://www.npmjs.com/package/@todesktop/cli#appfiles----optional-array-of-glob-patterns. If this is not the case, please contact us.`
       );
     }
   }
   return absolutePaths.map((absolutePath) => {
     return {
       from: absolutePath,
-      to: path7.join("app", path7.relative(appPath, absolutePath))
+      to: path8.join("app", path8.relative(appPath, absolutePath))
     };
   });
 };
@@ -2996,7 +3612,7 @@ async function uploadApplicationSource({
   config: config2,
   onProgress
 }) {
-  var _a;
+  var _a2;
   logger_default.debug(
     {
       scrub: {
@@ -3010,11 +3626,29 @@ async function uploadApplicationSource({
     "uploadApplicationSource"
   );
   let totalBytes = 0;
+  let effectiveAppPkgJson = appPkgJson;
+  let workspaceEntries = [];
+  try {
+    const workspaceBundle = await prepareWorkspaceBundle({
+      appPath: config2.appPath,
+      appPkgJson,
+      config: config2
+    });
+    effectiveAppPkgJson = workspaceBundle.appPackageJson;
+    workspaceEntries = workspaceBundle.entries;
+  } catch (error) {
+    logger_default.error({ err: error }, "Failed to prepare workspace bundle");
+    throw error;
+  }
   const files = [
     /*
       App files (stored in app/ in the ZIP)
     */
-    ...await getAppFiles(config2.appFiles, config2.appPath, appPkgJson),
+    ...await getAppFiles(
+      config2.appFiles,
+      config2.appPath,
+      effectiveAppPkgJson
+    ),
     /*
       Optional extra content files (stored in extraContentFiles/ in the ZIP). Their
       paths within is the their relative path from the project root so
@@ -3025,7 +3659,7 @@ async function uploadApplicationSource({
     ...(config2.extraContentFiles || []).map(({ from, to = "." }) => {
       return {
         from,
-        to: path7.join("extraContentFiles", to, path7.basename(from))
+        to: path8.join("extraContentFiles", to, path8.basename(from))
       };
     }),
     /*
@@ -3035,7 +3669,7 @@ async function uploadApplicationSource({
     ...(config2.extraResources || []).map(({ from, to = "." }) => {
       return {
         from,
-        to: path7.join("extraResources", to, path7.basename(from))
+        to: path8.join("extraResources", to, path8.basename(from))
       };
     }),
     /*
@@ -3043,16 +3677,16 @@ async function uploadApplicationSource({
     */
     {
       from: config2.icon,
-      to: path7.join("icons", "appIcon" + path7.extname(config2.icon))
+      to: path8.join("icons", "appIcon" + path8.extname(config2.icon))
     }
   ];
   if (config2.linux) {
     if (config2.linux.icon) {
       files.push({
         from: config2.linux.icon,
-        to: path7.join(
+        to: path8.join(
           "icons",
-          "appIcon-linux" + path7.extname(config2.linux.icon)
+          "appIcon-linux" + path8.extname(config2.linux.icon)
         )
       });
     }
@@ -3061,10 +3695,10 @@ async function uploadApplicationSource({
     const possibleIcons = [];
     for (const fa of config2.fileAssociations) {
       if (fa.icon) {
-        const icon = path7.parse(fa.icon);
+        const icon = path8.parse(fa.icon);
         possibleIcons.push(
-          { ext: fa.ext, icon: path7.join(icon.dir, icon.name) + ".ico" },
-          { ext: fa.ext, icon: path7.join(icon.dir, icon.name) + ".icns" }
+          { ext: fa.ext, icon: path8.join(icon.dir, icon.name) + ".ico" },
+          { ext: fa.ext, icon: path8.join(icon.dir, icon.name) + ".icns" }
         );
       }
     }
@@ -3073,7 +3707,7 @@ async function uploadApplicationSource({
         if (await exists(icon)) {
           files.push({
             from: icon,
-            to: path7.join("icons", "association-" + ext + path7.extname(icon))
+            to: path8.join("icons", "association-" + ext + path8.extname(icon))
           });
         }
       })
@@ -3083,25 +3717,25 @@ async function uploadApplicationSource({
     if (config2.mac.entitlements) {
       files.push({
         from: config2.mac.entitlements,
-        to: path7.join("other", "mac", "entitlements.mac.plist")
+        to: path8.join("other", "mac", "entitlements.mac.plist")
       });
     }
     if (config2.mac.entitlementsInherit) {
       files.push({
         from: config2.mac.entitlementsInherit,
-        to: path7.join("other", "mac", "entitlementsInherit.mac.plist")
+        to: path8.join("other", "mac", "entitlementsInherit.mac.plist")
       });
     }
     if (config2.mac.icon) {
       files.push({
         from: config2.mac.icon,
-        to: path7.join("icons", "appIcon-mac" + path7.extname(config2.mac.icon))
+        to: path8.join("icons", "appIcon-mac" + path8.extname(config2.mac.icon))
       });
     }
     if (config2.mac.requirements) {
       files.push({
         from: config2.mac.requirements,
-        to: path7.join("other", "mac", "requirements.txt")
+        to: path8.join("other", "mac", "requirements.txt")
       });
     }
   }
@@ -3109,19 +3743,19 @@ async function uploadApplicationSource({
     if (config2.mas.entitlements) {
       files.push({
         from: config2.mas.entitlements,
-        to: path7.join("other", "mac", "entitlements.mas.plist")
+        to: path8.join("other", "mac", "entitlements.mas.plist")
       });
     }
     if (config2.mas.entitlementsInherit) {
       files.push({
         from: config2.mas.entitlementsInherit,
-        to: path7.join("other", "mac", "entitlementsInherit.mas.plist")
+        to: path8.join("other", "mac", "entitlementsInherit.mas.plist")
       });
     }
     if (config2.mas.provisioningProfile) {
       files.push({
         from: config2.mas.provisioningProfile,
-        to: path7.join("other", "mac", "mas.provisionprofile")
+        to: path8.join("other", "mac", "mas.provisionprofile")
       });
     }
   }
@@ -3129,7 +3763,7 @@ async function uploadApplicationSource({
     if (config2.dmg.background) {
       files.push({
         from: config2.dmg.background,
-        to: path7.join("other", "mac", "dmg-background.tiff")
+        to: path8.join("other", "mac", "dmg-background.tiff")
       });
     }
   }
@@ -3137,19 +3771,22 @@ async function uploadApplicationSource({
     if (config2.windows.icon) {
       files.push({
         from: config2.windows.icon,
-        to: path7.join(
+        to: path8.join(
           "icons",
-          "appIcon-windows" + path7.extname(config2.windows.icon)
+          "appIcon-windows" + path8.extname(config2.windows.icon)
         )
       });
     }
     if (config2.windows.nsisInclude) {
       files.push({
         from: config2.windows.nsisInclude,
-        to: path7.join("other", "installer.nsh")
+        to: path8.join("other", "installer.nsh")
       });
     }
   }
+  if (workspaceEntries.length) {
+    files.push(...workspaceEntries);
+  }
   return uploadToS3_default({
     bucket: config2.bucket || void 0,
     inputStream: await zip_default({
@@ -3158,15 +3795,15 @@ async function uploadApplicationSource({
       onError: (e) => {
         throw e;
       },
-      onProgress({ fs: fs6 }) {
-        totalBytes = fs6.totalBytes;
+      onProgress({ fs: fs7 }) {
+        totalBytes = fs7.totalBytes;
       },
-      appPkgJson
+      appPkgJson: effectiveAppPkgJson
     }),
     key: generateS3Key_default({
       appId,
       buildId,
-      filenameSuffix: `${(_a = appPkgJson.name) == null ? void 0 : _a.replaceAll("/", "")}.zip`
+      filenameSuffix: `${(_a2 = effectiveAppPkgJson.name) == null ? void 0 : _a2.replaceAll("/", "")}.zip`
     }),
     onProgress({ loaded, total }) {
       onProgress(loaded / total * 100, loaded);
@@ -3175,7 +3812,7 @@ async function uploadApplicationSource({
 }
 async function exists(filePath) {
   try {
-    await fs5.promises.access(filePath);
+    await fs6.promises.access(filePath);
     return true;
   } catch (e) {
     return false;
@@ -3188,9 +3825,9 @@ async function runBuild({
   updateState,
   flags
 }) {
-  var _a, _b, _c, _d;
+  var _a2, _b, _c, _d;
   logForCI_default("Getting application information...");
-  const primaryUserId = (_a = currentUser()) == null ? void 0 : _a.uid;
+  const primaryUserId = (_a2 = currentUser()) == null ? void 0 : _a2.uid;
   const { config: config2, unprocessedConfig } = getProjectConfig(configPath, {
     build: flags
   });
@@ -3285,9 +3922,9 @@ async function runBuild({
   }
 }
 function addErrorMessage(e, message2) {
-  var _a, _b;
+  var _a2, _b;
   let originalMessage = "";
-  if (import_axios2.default.isAxiosError(e) && ((_b = (_a = e.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message)) {
+  if (import_axios2.default.isAxiosError(e) && ((_b = (_a2 = e.response) == null ? void 0 : _a2.data) == null ? void 0 : _b.message)) {
     originalMessage = e.response.data.message;
   } else if (e instanceof Error) {
     originalMessage = e.message;
@@ -3310,7 +3947,7 @@ function Build({
   configPath,
   flags
 }) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a2, _b, _c, _d, _e, _f;
   const exit = useExit_default();
   const [state, setState] = (0, import_react6.useState)({ state: "initializing" });
   (0, import_react6.useEffect)(() => {
@@ -3320,8 +3957,8 @@ function Build({
       updateState({ state: "error", error });
     });
     return () => {
-      var _a2;
-      return (_a2 = state.onUnmount) == null ? void 0 : _a2.call(state);
+      var _a3;
+      return (_a3 = state.onUnmount) == null ? void 0 : _a3.call(state);
     };
   }, []);
   function updateState(changes) {
@@ -3344,7 +3981,7 @@ function Build({
       return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
         MainLayout_default,
         {
-          appName: state.build.appName || ((_a = state.appPkg) == null ? void 0 : _a.name) || "",
+          appName: state.build.appName || ((_a2 = state.appPkg) == null ? void 0 : _a2.name) || "",
           appVersion: state.build.appVersion || ((_b = state.appPkg) == null ? void 0 : _b.version) || "",
           build: state.build,
           commandUsed,
@@ -3424,8 +4061,7 @@ var loginFields = [
     placeholder: "name@email.com",
     Input: TextInput_default,
     validate: (value) => {
-      if (!value)
-        return "Required";
+      if (!value) return "Required";
     }
   },
   {
@@ -3434,8 +4070,7 @@ var loginFields = [
     placeholder: "********",
     Input: TextInput_default,
     validate: (value) => {
-      if (!value)
-        return "Required";
+      if (!value) return "Required";
     },
     mask: "*"
   }
@@ -3451,7 +4086,7 @@ var Login = ({ setIsLoggedIn }) => {
     setActiveField(0);
   };
   const onSubmitLogin = async ({ email, accessToken }) => {
-    var _a, _b;
+    var _a2, _b;
     setFailureMessage(null);
     setIsSubmittingForm(true);
     try {
@@ -3471,13 +4106,12 @@ var Login = ({ setIsLoggedIn }) => {
         setError(err);
       } else {
         onFailure(
-          `Login unsuccessful: ${((_b = (_a = err == null ? void 0 : err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message) || err.message}`
+          `Login unsuccessful: ${((_b = (_a2 = err == null ? void 0 : err.response) == null ? void 0 : _a2.data) == null ? void 0 : _b.message) || err.message}`
         );
       }
     }
   };
-  if (error)
-    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ErrorDisplay, { error });
+  if (error) return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ErrorDisplay, { error });
   return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_jsx_runtime14.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { children: "You are not currently logged in." }),
     /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { children: "Log in below:" }),
@@ -3563,8 +4197,7 @@ var LoginHOC = ({ children, isInteractive = true }) => {
           );
           if (newJwtToken) {
             userCreds = await signInWithCustomToken(newJwtToken);
-            if (userCreds.user)
-              setIsLoggedIn(true);
+            if (userCreds.user) setIsLoggedIn(true);
           }
         } else if (!isRawModeSupported || import_is_ci4.default) {
           setError(
@@ -3582,8 +4215,7 @@ var LoginHOC = ({ children, isInteractive = true }) => {
       try {
         if (!userCreds && jwtToken) {
           userCreds = await signInWithCustomToken(jwtToken);
-          if (userCreds.user)
-            setIsLoggedIn(true);
+          if (userCreds.user) setIsLoggedIn(true);
         }
       } catch (err) {
       }
@@ -3596,8 +4228,7 @@ var LoginHOC = ({ children, isInteractive = true }) => {
           if (newJwtToken) {
             userCreds = await signInWithCustomToken(newJwtToken);
             setAuthConfig(email, accessToken, newJwtToken);
-            if (userCreds.user)
-              setIsLoggedIn(true);
+            if (userCreds.user) setIsLoggedIn(true);
           }
         }
       } catch (err) {
@@ -3714,7 +4345,7 @@ async function subscribeToFirebaseDoc(key, receiver) {
       (snapshot) => {
         receiver({
           snapshot,
-          data: snapshot.exists() ? snapshot.data() : void 0
+          data: readDocumentSnapshot(snapshot)
         });
         resolve5(unsubscribe);
       },
@@ -3744,15 +4375,21 @@ var subscribeToBuild_default = async ({ appId, buildId, onDataReceived, userId }
 var import_firestore12 = require("firebase/firestore");
 var getCollection = async (collectionRef) => {
   const resp = await (0, import_firestore12.getDocs)(collectionRef);
-  const result = [];
-  resp.forEach((doc9) => result.push(doc9.data()));
-  return result;
+  return readQuerySnapshot(resp);
 };
 var acceptedUsersCollection = (id) => (0, import_firestore12.collection)(firestore_default, `users/${id}/acceptedUsers`);
 var findAppUserId = async (appId) => {
-  const { uid, email } = currentUser();
-  const acceptedUsers = await getCollection(acceptedUsersCollection(uid));
-  const primaryUser = { id: uid, label: email };
+  const authUser = currentUser();
+  if (!(authUser == null ? void 0 : authUser.uid)) {
+    throw new Error("A signed-in Firebase user is required");
+  }
+  const acceptedUsers = await getCollection(
+    acceptedUsersCollection(authUser.uid)
+  );
+  const primaryUser = {
+    id: authUser.uid,
+    label: authUser.email ?? authUser.uid
+  };
   const users = [
     primaryUser,
     ...acceptedUsers.map((user) => ({ id: user.id, label: user.email }))
@@ -3761,8 +4398,7 @@ var findAppUserId = async (appId) => {
     try {
       const docRef = (0, import_firestore12.doc)(firestore_default, `users/${user.id}/applications/${appId}`);
       const docSnap = await (0, import_firestore12.getDoc)(docRef);
-      if (docSnap.exists())
-        return user;
+      if (docSnap.exists()) return user;
     } catch (err) {
       console.error(err);
     }
@@ -3958,7 +4594,7 @@ var OngoingBuildGuard = ({
       try {
         const applicationId = getProjectConfig(configPath).config.id;
         const { id } = await findAppUserId_default(applicationId);
-        const now = new Date();
+        const now = /* @__PURE__ */ new Date();
         const twentyFourHoursAgo = new Date(
           now.getTime() - 24 * 60 * 60 * 1e3
         );
@@ -3978,13 +4614,13 @@ var OngoingBuildGuard = ({
           builds: []
         };
         if (!buildsResult.empty) {
-          const latestBuild = buildsResult.docs[0].data();
+          const latestBuild = readQueryDocument(buildsResult.docs[0]);
           const isRunning = isBuildRunning(latestBuild) && latestBuild.status !== "preparation";
           logger_default.debug(
             { isRunning },
             "OngoingBuildGuard component: got latest build"
           );
-          stateUpdates.builds = buildsResult.docs.map((doc9) => doc9.data()).filter((build) => {
+          stateUpdates.builds = buildsResult.docs.map((doc9) => readQueryDocument(doc9)).filter((build) => {
             if (isBuildRunning(build) && build.status !== "preparation") {
               return true;
             }
@@ -4372,12 +5008,12 @@ async function getBuilds({
   if (buildsResult.empty) {
     return [];
   }
-  return buildsResult.docs.map((doc9) => doc9.data());
+  return readQuerySnapshot(buildsResult);
 }
 
 // src/utilities/getRelativeDateFromDateString.ts
 var dateFns = __toESM(require("date-fns"));
-var getRelativeDateFromDateString_default = (input) => dateFns.formatDistance(new Date(input), new Date()) + " ago";
+var getRelativeDateFromDateString_default = (input) => dateFns.formatDistance(new Date(input), /* @__PURE__ */ new Date()) + " ago";
 
 // src/components/SyntaxHighlight.tsx
 var import_chalk2 = __toESM(require("chalk"));
@@ -4759,7 +5395,7 @@ async function getBuildById({
   if (!snapshot.exists()) {
     return null;
   }
-  return snapshot.data();
+  return readDocumentSnapshot(snapshot) ?? null;
 }
 
 // src/utilities/getLatestReleasedBuild.ts
@@ -4767,14 +5403,14 @@ async function getLatestReleasedBuild({
   appId,
   userId
 }) {
-  var _a, _b;
+  var _a2, _b;
   const appRef = (0, import_firestore21.doc)(firestore_default, `users/${userId}/applications/${appId}`);
   const appSnapshot = await (0, import_firestore21.getDoc)(appRef);
-  const app2 = appSnapshot.exists() ? appSnapshot.data() : void 0;
+  const app2 = readDocumentSnapshot(appSnapshot);
   if (!app2) {
     throw new Error(`Application with ID of ${appId} doesn't exist.`);
   }
-  if ((_a = app2.meta) == null ? void 0 : _a.latestReleaseBuildId) {
+  if ((_a2 = app2.meta) == null ? void 0 : _a2.latestReleaseBuildId) {
     return await getBuildById({
       buildId: (_b = app2.meta) == null ? void 0 : _b.latestReleaseBuildId,
       appId,
@@ -4787,7 +5423,7 @@ async function getLatestReleasedBuild({
     (0, import_firestore21.limit)(1)
   );
   const buildsResult = await (0, import_firestore21.getDocs)(buildsQuery);
-  return buildsResult.empty ? void 0 : buildsResult.docs[0].data();
+  return buildsResult.empty ? void 0 : readQueryDocument(buildsResult.docs[0]);
 }
 
 // src/components/BuildPicker.tsx
@@ -4931,6 +5567,7 @@ async function getBuildAttributes({
   buildId,
   configPath
 }) {
+  var _a2;
   const {
     id: appId,
     nodeVersion,
@@ -4938,7 +5575,7 @@ async function getBuildAttributes({
     pnpmVersion
   } = getProjectConfig(configPath).config;
   const { id: userId } = await findAppUserId_default(appId);
-  const { uid: contextUserId } = currentUser();
+  const contextUserId = (_a2 = currentUser()) == null ? void 0 : _a2.uid;
   const build = await fetchBuild({ appId, buildId, userId });
   return {
     appId,
@@ -5017,7 +5654,7 @@ function ReleaseBuildView({
   commandUsed,
   state
 }) {
-  var _a, _b;
+  var _a2, _b;
   switch (state.state) {
     case "build-error": {
       return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
@@ -5025,7 +5662,7 @@ function ReleaseBuildView({
         {
           build: state.build,
           description: "Can't release build",
-          message: ((_a = state.error) == null ? void 0 : _a.message) || "Internal build error"
+          message: ((_a2 = state.error) == null ? void 0 : _a2.message) || "Internal build error"
         }
       );
     }
@@ -5128,7 +5765,7 @@ var defaultVM = {
   imageVersion: ""
 };
 function makeProgress(build) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a2, _b, _c, _d, _e, _f, _g;
   const defaultProgress = {
     message: "Starting",
     progress: 0,
@@ -5138,7 +5775,7 @@ function makeProgress(build) {
   };
   const linux = {
     ...defaultProgress,
-    ...(_a = build.smokeTest) == null ? void 0 : _a.linux,
+    ...(_a2 = build.smokeTest) == null ? void 0 : _a2.linux,
     shouldSkip: ((_b = build.linux) == null ? void 0 : _b.shouldSkip) || false
   };
   const mac = {
@@ -5352,7 +5989,7 @@ function ReleaseConfirmation({
   disabled = false,
   loadData = loadBuildsData
 }) {
-  var _a;
+  var _a2;
   const [state, setState] = (0, import_react20.useState)({
     state: disabled ? "bypass" : "loading"
   });
@@ -5377,7 +6014,7 @@ function ReleaseConfirmation({
         {
           build: state.build,
           description: "Can't release build",
-          message: ((_a = state.error) == null ? void 0 : _a.message) || "Internal build error"
+          message: ((_a2 = state.error) == null ? void 0 : _a2.message) || "Internal build error"
         }
       );
     }
@@ -5714,7 +6351,7 @@ function SmokeTestView({
   commandUsed = "",
   state
 }) {
-  var _a, _b, _c, _d;
+  var _a2, _b, _c, _d;
   switch (state.state) {
     case "build-error": {
       return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
@@ -5722,7 +6359,7 @@ function SmokeTestView({
         {
           build: state.build,
           description: "Can't finish smoke test",
-          message: (_a = state.error) == null ? void 0 : _a.message
+          message: (_a2 = state.error) == null ? void 0 : _a2.message
         }
       );
     }
@@ -5771,12 +6408,12 @@ async function cancelSmokeTest({
   buildId,
   userId
 }) {
-  var _a;
+  var _a2;
   await postToFirebaseFunction_default("cancelSmokeTest_HTTP", {
     appId,
     buildId,
     userId,
-    idToken: await ((_a = currentUser()) == null ? void 0 : _a.getIdToken())
+    idToken: await ((_a2 = currentUser()) == null ? void 0 : _a2.getIdToken())
   });
 }
 
@@ -5790,7 +6427,7 @@ async function queueSmokeTest({
   pnpmVersion,
   userId
 }) {
-  var _a;
+  var _a2;
   try {
     await postToFirebaseFunction_default("queueSmokeTest_HTTP", {
       appId,
@@ -5800,7 +6437,7 @@ async function queueSmokeTest({
       pnpmVersion,
       userId,
       contextUserId,
-      idToken: await ((_a = currentUser()) == null ? void 0 : _a.getIdToken())
+      idToken: await ((_a2 = currentUser()) == null ? void 0 : _a2.getIdToken())
     });
   } catch (e) {
     logger_default.error({ error: e });
@@ -5821,7 +6458,10 @@ async function waitUntilFinished({
     const unsubscribe = (0, import_firestore27.onSnapshot)(
       (0, import_firestore27.doc)(firestore_default, docPath),
       (snapshot) => {
-        const data = snapshot.exists() ? snapshot.data() : void 0;
+        const data = readDocumentSnapshot(snapshot);
+        if (!data) {
+          return;
+        }
         const progress = makeProgress(data);
         onProgress(progress);
         if (progress.isFinished) {
@@ -5956,8 +6596,8 @@ async function smokeTestWorkflow({
   }
 }
 function buildCanBeCanceled(build) {
-  var _a, _b;
-  if ((_a = build == null ? void 0 : build.smokeTest) == null ? void 0 : _a.isCanceled) {
+  var _a2, _b;
+  if ((_a2 = build == null ? void 0 : build.smokeTest) == null ? void 0 : _a2.isCanceled) {
     return false;
   }
   return Boolean((_b = build == null ? void 0 : build.smokeTest) == null ? void 0 : _b.buildServerExecutionId);
@@ -6001,7 +6641,7 @@ var exitIfCLIOutOfDate_default = () => {
   (0, import_latest_version.default)(pkg.name).then((latest) => {
     if (import_semver3.default.gt(latest, pkg.version)) {
       const commandToUpdate = import_chalk3.default.greenBright(
-        `npm install ${import_is_installed_globally.default ? "--location=global" : "--save-dev"} @todesktop/cli`
+        `npm install ${import_is_installed_globally.default ? "-g" : "--save-dev"} @todesktop/cli`
       );
       console.log(
         `Your version of @todesktop/cli is out of date.
@@ -6026,7 +6666,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.15.1",
+  version: "1.18.0",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -6041,23 +6681,23 @@ var package_default = {
     node: ">=16"
   },
   scripts: {
-    dev: "cp-cli dev.env .env && npm run build:dev && npm link",
-    "dev:prod": "cp-cli prod.env .env && npm run build && npm link",
-    "dev:local:prod": "cp-cli prod-local.env .env && npm run build && npm link && cp-cli prod-local.env .env",
-    build: "npm run types:generate && esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli prod.env .env",
-    "build:dev": "npm run types:generate && esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli dev.env .env",
+    build: "scripts/esbuild.js",
+    dev: "scripts/esbuild.js --link --watch --stage dev",
+    "dev:local:prod": "scripts/esbuild.js --link --watch --stage prod-local",
+    "dev:prod": "scripts/esbuild.js --link --watch",
+    "docs:generate": "node scripts/generate-readme.js",
+    format: "prettier --write .",
     lint: "npm run lint:types && npm run lint:styles",
+    "lint--fix": "eslint src test --fix",
     "lint:styles": "eslint src test .eslintrc.js && prettier --check .",
-    format: "prettier --write .",
     "lint:types": "tsc && tsc-strict",
-    "lint--fix": "eslint src test --fix",
-    "docs:generate": "node scripts/generate-readme.js",
     "types:generate": "node scripts/generate-types.js",
-    release: "npm run docs:generate && npm run build && npx np --tag=latest",
+    release: "npm run docs:generate && npm run build && pnpx np --tag=latest",
     "release-beta": "npm run docs:generate && npm run build && npx np --any-branch --no-tests --tag=beta",
     test: "ava",
+    "test:e2e": "node test/output-snapshots/output.test.js",
     "test--watch": "npm test -- --watch",
-    postinstall: "node scripts/postinstall.js"
+    typecheck: "tsc --noEmit"
   },
   files: [
     "scripts/postinstall.js",
@@ -6094,6 +6734,7 @@ var package_default = {
     "ink-text-input": "^4.0.1",
     "is-ci": "^3.0.1",
     "is-installed-globally": "^0.3.2",
+    "js-yaml": "^4.1.0",
     "latest-version": "^5.1.0",
     "lodash.merge": "^4.6.2",
     "lodash.throttle": "^4.1.1",
@@ -6111,6 +6752,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
+    "@todesktop/dev-config": "workspace:*",
     "@todesktop/shared": "^7.189.6",
     "@types/bunyan": "^1.8.6",
     "@types/is-ci": "^3.0.4",
@@ -6120,7 +6762,7 @@ var package_default = {
     "@typescript-eslint/parser": "^5.46.1",
     ava: "^4.3.1",
     "cp-cli": "^2.0.0",
-    esbuild: "^0.16.5",
+    esbuild: "^0.25.10",
     "esbuild-register": "^3.4.1",
     eslint: "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
@@ -6142,7 +6784,7 @@ var package_default = {
     prettier: "^2.8.1",
     proxyquire: "^2.1.3",
     sinon: "^9.0.3",
-    typescript: "^4.9.4",
+    typescript: "catalog:",
     "typescript-strict-plugin": "^2.2.1"
   },
   ava: {
@@ -6176,18 +6818,6 @@ var package_default = {
       "pre-commit": "lint-staged"
     }
   },
-  overrides: {
-    pastel: {
-      "parcel-bundler": {
-        deasync: "0.1.27"
-      }
-    }
-  },
-  resolutions: {
-    "pastel/parcel-bundler/deasync": "0.1.24",
-    ink: "3.2.0",
-    react: "17.0.2"
-  },
   packageExtensions: {
     "ink-progress-bar@*": {
       dependencies: {