@todesktop/cli 1.21.0 → 1.23.0

package/dist/cli.js

@@ -1453,9 +1453,10 @@ var BuildProgress = ({
 };
 var BuildProgress_default = BuildProgress;
 
-// src/components/ErrorDisplay.tsx
-var import_ink9 = require("ink");
-var import_react6 = require("react");
+// src/components/CancelBuild.tsx
+var import_ink10 = require("ink");
+var import_is_ci3 = __toESM(require("is-ci"));
+var import_react7 = require("react");
 
 // src/utilities/CliError.ts
 var CliError = class _CliError extends Error {
@@ -1473,8 +1474,26 @@ var CliError = class _CliError extends Error {
     }
   }
 };
+function toError(e, defaultMessage = "Unknown error") {
+  if (e instanceof Error) {
+    return e;
+  }
+  if (typeof e === "string") {
+    return new Error(e);
+  }
+  if (e) {
+    try {
+      return new Error(JSON.stringify(e));
+    } catch (serializeError) {
+      return new Error(String(serializeError));
+    }
+  }
+  return new Error(defaultMessage);
+}
 
 // src/components/ErrorDisplay.tsx
+var import_ink9 = require("ink");
+var import_react6 = require("react");
 var import_jsx_runtime7 = require("react/jsx-runtime");
 function ErrorDisplay({
   commandUsed,
@@ -1517,100 +1536,132 @@ function ErrorDisplay({
   ] });
 }
 
-// src/components/MainLayout.tsx
-var import_ink13 = require("ink");
-var import_is_ci3 = __toESM(require("is-ci"));
-var import_react8 = require("react");
-
 // src/components/CancelBuild.tsx
-var import_ink10 = require("ink");
-var import_react7 = require("react");
 var import_jsx_runtime8 = require("react/jsx-runtime");
-var cancelBuild = getCallableFirebaseFunction_default("cancelBuild");
-var CancelBuild = ({
+var callCancelBuildCloudFn = getCallableFirebaseFunction_default("cancelBuild");
+function CancelBuild({
+  buildId,
+  cancellation,
+  commandUsed
+}) {
+  const { error, errorType, status } = cancellation;
+  switch (status) {
+    case "cancel-failed": {
+      if (!error) {
+        return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+          ErrorDisplay,
+          {
+            commandUsed,
+            error: "Sorry, something went wrong while cancelling the build."
+          }
+        );
+      }
+      if (errorType === "internal") {
+        return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(ErrorDisplay, { commandUsed, error });
+      }
+      return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ink10.Text, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ink10.Text, { color: "red", children: [
+          "Cannot cancel build (",
+          buildId,
+          ")."
+        ] }),
+        " ",
+        error.message
+      ] });
+    }
+    case "cancelled": {
+      return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_ink10.Text, { children: "Build cancelled" });
+    }
+    case "cancelling": {
+      return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ink10.Text, { children: [
+        "Cancelling build (",
+        buildId,
+        ")..."
+      ] });
+    }
+    case "idle":
+    default: {
+      return null;
+    }
+  }
+}
+function useCancellation({
+  abortController,
   appId,
-  children: postCancelContents,
-  commandUsed,
-  id
-}) => {
-  logger_default.debug({ appId, buildId: id }, "CancelBuild component: render");
+  autoExit = true,
+  build
+}) {
+  const { isRawModeSupported } = (0, import_ink10.useStdin)();
   const exit = useExit_default();
-  const [
-    { arbitraryMessageComponent, error, hasCompleted, hasStarted },
-    setState
-  ] = (0, import_react7.useState)({
-    arbitraryMessageComponent: null,
-    error: null,
-    hasCompleted: false,
-    hasStarted: false
-  });
+  const [state, setState] = (0, import_react7.useState)({ status: "idle" });
   (0, import_react7.useEffect)(() => {
-    if (hasCompleted || hasStarted) {
+    if (autoExit && state.status === "cancelled" && !state.error) {
+      logger_default.debug("useCancellation: exiting now that build is cancelled");
+      setTimeout(exit, 10);
+    }
+  }, [autoExit, exit, state.status, state.error]);
+  const canCancel = Boolean(
+    appId && !import_is_ci3.default && isRawModeSupported && state.status === "idle" && isBuildCancellable(build)
+  );
+  return {
+    canCancel,
+    cancel,
+    error: state.error,
+    errorType: state.errorType,
+    executed: state.status !== "idle",
+    status: state.status
+  };
+  async function cancel() {
+    logger_default.debug("useCancellation: cancel() called");
+    const buildId = build == null ? void 0 : build.id;
+    if (!appId || !buildId) {
+      logger_default.warn("useCancellation: can't run with:", { appId, buildId });
       return;
     }
-    setState((previousState) => ({ ...previousState, hasStarted: true }));
+    abortController == null ? void 0 : abortController.abort(new CanceledError("Build was cancelled by user"));
+    setState({ status: "cancelling" });
     logForCI("Cancelling build...");
-    cancelBuild({ appId, buildId: id }).then((result) => {
+    try {
+      const result = await callCancelBuildCloudFn({ appId, buildId });
       logger_default.debug(
-        { appId, buildId: id, result },
-        "CancelBuild component: cancellation request complete"
+        { appId, buildId, result },
+        "useCancellation: cancellation request complete"
       );
-      setState((previousState) => ({ ...previousState, hasCompleted: true }));
-    }).catch((e) => {
+      setState({ status: "cancelled" });
+    } catch (e) {
+      const error = toError(e);
       logger_default.debug(
-        { appId, buildId: id, code: e.code },
-        "CancelBuild component: cancellation request failed"
+        { appId, buildId, code: error.code },
+        "useCancellation: cancellation request failed"
       );
       logger_default.error(e);
-      const stateUpdates = {
-        arbitraryMessageComponent: void 0,
-        error: void 0,
-        hasCompleted: true
-      };
-      if (e.code === "internal") {
-        stateUpdates.error = e;
+      if (error.code === "internal") {
+        setState({
+          status: "cancel-failed",
+          error: new Error(
+            `Failed to cancel build (${buildId}). ${error.message}`
+          ),
+          errorType: "internal"
+        });
       } else {
-        stateUpdates.arbitraryMessageComponent = /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ink10.Text, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ink10.Text, { color: "red", children: [
-            "Cannot cancel build (",
-            id,
-            ")."
-          ] }),
-          " ",
-          e.message
-        ] });
+        setState({
+          status: "cancel-failed",
+          error,
+          errorType: "other"
+        });
       }
-      setState((prevState) => ({
-        ...prevState,
-        ...stateUpdates
-      }));
-    });
-  }, [appId, id, hasStarted, hasCompleted]);
-  (0, import_react7.useEffect)(() => {
-    if (hasCompleted && !postCancelContents) {
-      logger_default.debug(
-        "CancelBuild component: exiting now that build is cancelled"
-      );
-      exit();
     }
-  }, [postCancelContents, exit, hasCompleted]);
-  if (error) {
-    error.message = `Failed to cancel build (${id}). ${error.message}`;
-    return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(ErrorDisplay, { commandUsed, error });
-  }
-  if (arbitraryMessageComponent) {
-    return arbitraryMessageComponent;
   }
-  if (hasCompleted) {
-    return postCancelContents ? /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_jsx_runtime8.Fragment, { children: postCancelContents }) : /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_ink10.Text, { children: "Build cancelled" });
+}
+var CanceledError = class _CanceledError extends Error {
+  static isCanceled(e) {
+    return e instanceof _CanceledError || e instanceof Error && e.name === "CanceledError";
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ink10.Text, { children: [
-    "Cancelling build (",
-    id,
-    ")..."
-  ] });
 };
-var CancelBuild_default = CancelBuild;
+
+// src/components/MainLayout.tsx
+var import_ink13 = require("ink");
+var import_react8 = require("react");
 
 // src/components/Footer.tsx
 var import_ink11 = require("ink");
@@ -1688,7 +1739,8 @@ var Header_default = Header;
 
 // src/components/MainLayout.tsx
 var import_jsx_runtime11 = require("react/jsx-runtime");
-var MainLayout = ({
+function MainLayout({
+  abortController,
   appId,
   appName,
   appVersion,
@@ -1696,57 +1748,39 @@ var MainLayout = ({
   children,
   commandUsed,
   hasBuildEverFailed
-}) => {
-  const { isRawModeSupported } = (0, import_ink13.useStdin)();
-  const [
-    { canCancelBuild, hasKickedOff, isCancellingBuild, wasCtrlCPressed },
-    setState
-  ] = (0, import_react8.useState)({
-    canCancelBuild: null,
-    hasKickedOff: false,
-    isCancellingBuild: false,
-    wasCtrlCPressed: false
-  });
-  (0, import_react8.useEffect)(() => {
-    setState((previousState) => ({
-      ...previousState,
-      hasKickedOff: hasBuildKickedOff(build)
-    }));
-  }, [build]);
-  (0, import_react8.useEffect)(() => {
-    setState((previousState) => ({
-      ...previousState,
-      canCancelBuild: !import_is_ci3.default && isRawModeSupported && !isCancellingBuild && isBuildCancellable(build)
-    }));
-  }, [build, isCancellingBuild, isRawModeSupported]);
+}) {
+  const [wasCtrlCPressed, setWasCtrlCPressed] = (0, import_react8.useState)(false);
+  const cancellation = useCancellation({ abortController, appId, build });
+  const hasKickedOff = hasBuildKickedOff(build);
   useInput(
     async (_input, key) => {
-      if (key.escape && canCancelBuild) {
+      if (key.escape && cancellation.canCancel) {
         logger_default.debug("MainLayout component: esc pressed, cancelling build");
-        setState((previousState) => ({
-          ...previousState,
-          isCancellingBuild: true
-        }));
+        cancellation.cancel();
       }
     },
     {},
     {
       onCtrlCPressed: () => {
-        setState((previousState) => ({
-          ...previousState,
-          wasCtrlCPressed: true
-        }));
+        setWasCtrlCPressed(true);
       }
     }
   );
   return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_jsx_runtime11.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Header_default, { build, name: appName, version: appVersion }),
-    isCancellingBuild ? /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ink13.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(CancelBuild_default, { appId, commandUsed, id: build.id }) }) : children,
+    cancellation.executed && build ? /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ink13.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+      CancelBuild,
+      {
+        buildId: build.id,
+        cancellation,
+        commandUsed
+      }
+    ) }) : children,
     /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       Footer_default,
       {
         hasBuildEverFailed,
-        shouldShowCancelBuildInstructions: canCancelBuild && !wasCtrlCPressed,
+        shouldShowCancelBuildInstructions: cancellation.canCancel && !wasCtrlCPressed,
         uiUrl: build ? build.url : null
       }
     ),
@@ -1758,8 +1792,7 @@ var MainLayout = ({
       ] }) })
     ] }) : null
   ] });
-};
-var MainLayout_default = MainLayout;
+}
 
 // src/commands/build/components/Preparation.tsx
 var import_ink15 = require("ink");
@@ -2212,6 +2245,24 @@ var addCustomKeywords_default = (ajv, context) => {
       return true;
     }
   });
+  addKeyword({
+    keyword: "validSemverOrLatest",
+    type: "string",
+    validate: (_schema, data) => {
+      if (data === "latest") {
+        return true;
+      }
+      if (!(0, import_valid.default)(data)) {
+        throw new import_ajv2.ValidationError([
+          {
+            keyword: "validSemverOrLatest",
+            message: `${data} must be "latest" or a valid semantic version or version range`
+          }
+        ]);
+      }
+      return true;
+    }
+  });
   addKeyword({
     keyword: "excludedDependencies",
     validate: (schema, data) => {
@@ -2287,6 +2338,13 @@ var addCustomKeywords_default = (ajv, context) => {
         ]);
       }
       const stats = fs2.statSync(filePath);
+      const extension = path4.extname(filePath).substr(1).toLowerCase();
+      const allowDirectoryExtensions = Array.isArray(
+        schema.allowDirectoryExtensions
+      ) ? schema.allowDirectoryExtensions : [];
+      const mustBeDirectoryExtensions = Array.isArray(
+        schema.mustBeDirectoryExtensions
+      ) ? schema.mustBeDirectoryExtensions : [];
       if (mustBeDirectory && stats.isFile()) {
         throw new import_ajv2.ValidationError([
           {
@@ -2294,7 +2352,14 @@ var addCustomKeywords_default = (ajv, context) => {
             message: `must be a directory, not a file (${filePath})`
           }
         ]);
-      } else if (schema.mustBeFile && stats.isDirectory()) {
+      } else if (mustBeDirectoryExtensions.includes(extension) && stats.isFile()) {
+        throw new import_ajv2.ValidationError([
+          {
+            keyword: "Directory",
+            message: `must be a directory, not a file (${filePath})`
+          }
+        ]);
+      } else if (schema.mustBeFile && stats.isDirectory() && !allowDirectoryExtensions.includes(extension)) {
         throw new import_ajv2.ValidationError([
           {
             keyword: "File",
@@ -2444,6 +2509,30 @@ var addCustomKeywords_default = (ajv, context) => {
       return true;
     }
   });
+  addKeyword({
+    keyword: "macIconComposerAppBuilderLibVersion",
+    type: "object",
+    validate: (_schema, data) => {
+      var _a2;
+      const macIcon = (_a2 = data == null ? void 0 : data.mac) == null ? void 0 : _a2.icon;
+      if (typeof macIcon !== "string" || path4.extname(macIcon).toLowerCase() !== ".icon") {
+        return true;
+      }
+      const minSupportedVersion = "26.8.1";
+      const configuredVersion = data == null ? void 0 : data.appBuilderLibVersion;
+      const resolvedVersion = configuredVersion ? semver.minVersion(configuredVersion) : null;
+      if (!resolvedVersion || !semver.gte(resolvedVersion, minSupportedVersion)) {
+        throw new import_ajv2.ValidationError([
+          {
+            keyword: "appBuilderLibVersion",
+            message: `must be set to ${minSupportedVersion} or later when using mac.icon as an Apple .icon package`,
+            instancePath: "/mac/icon"
+          }
+        ]);
+      }
+      return true;
+    }
+  });
 };
 
 // schemas/schema.json
@@ -2459,6 +2548,7 @@ var schema_default = {
   else: {
     required: ["id", "icon", "schemaVersion"]
   },
+  macIconComposerAppBuilderLibVersion: {},
   properties: {
     $schema: {
       type: "string",
@@ -2572,10 +2662,10 @@ var schema_default = {
   definitions: {
     appBuilderLibVersionProperty: {
       type: "string",
-      validSemver: {},
+      validSemverOrLatest: {},
       minLength: 1,
-      description: "The version of app-builder-lib that ToDesktop should use for building your app. This can be useful if you need to use a specific version that includes certain features or fixes.",
-      examples: ["22.14.13"]
+      description: 'The version of app-builder-lib that ToDesktop should use for building your app. This can be a specific version, a semantic version range, or "latest". This can be useful if you need to use a specific version that includes certain features or fixes.',
+      examples: ["22.14.13", "latest"]
     },
     appIdProperty: {
       type: "string",
@@ -2902,6 +2992,27 @@ var schema_default = {
             ["--enable-features=UseOzonePlatform", "--ozone-platform=x11"]
           ]
         },
+        deb: {
+          type: "object",
+          description: "Configuration for Debian (.deb) packaging.",
+          additionalProperties: false,
+          properties: {
+            additionalDepends: {
+              type: "array",
+              items: {
+                type: "string"
+              },
+              description: "Additional package dependencies to append to ToDesktop's default .deb dependencies."
+            },
+            depends: {
+              type: "array",
+              items: {
+                type: "string"
+              },
+              description: "The list of package dependencies for the .deb package. This overwrites ToDesktop's default dependency list and linux.deb.additionalDepends."
+            }
+          }
+        },
         noSandbox: {
           type: "boolean",
           description: "This option allows you to configure whether your app should run in a sandboxed environment.",
@@ -2966,11 +3077,13 @@ var schema_default = {
         },
         icon: {
           type: "string",
-          description: "The path to your application's Mac desktop icon. It must be an ICNS or PNG.",
+          description: "The path to your application's Mac desktop icon. It must be an ICNS, PNG, or Apple `.icon` package directory.",
           examples: ["./mac-icon.png"],
           file: {
-            extensions: ["icns", "png"],
-            mustBeFile: true
+            extensions: ["icns", "png", "icon"],
+            mustBeFile: true,
+            allowDirectoryExtensions: ["icon"],
+            mustBeDirectoryExtensions: ["icon"]
           },
           minLength: 3
         },
@@ -4775,10 +4888,12 @@ async function exists(filePath) {
 }
 
 // src/commands/build/utilities/runBuild.ts
+var callDeleteBuild = getCallableFirebaseFunction_default("deleteBuild");
 async function runBuild({
   configPath,
-  updateState,
-  flags
+  flags,
+  signal,
+  updateState
 }) {
   var _a2, _b, _c, _d, _e;
   logForCI("Getting application information...");
@@ -4803,23 +4918,29 @@ async function runBuild({
   });
   logForCI("Preparing...");
   let buildId;
+  signal == null ? void 0 : signal.throwIfAborted();
   try {
-    const prepareResult = await postToFirebaseFunction("prepareNewBuild", {
-      appPkgName: appPkgJson.name,
-      appPkgProductName: appPkgJson.productName,
-      appVersion: appPkgJson.version,
-      id: config.id,
-      onBuildFinishedWebhook: flags.onBuildFinishedWebhook,
-      projectConfig: unprocessedConfig,
-      shouldCodeSign: flags.shouldCodeSign !== false,
-      shouldRelease: false,
-      userId: primaryUserId,
-      versionControlInfo: await getVersionControlInfo_default(config.appPath),
-      introspect: flags.introspect,
-      breakpoints: (_b = flags.breakpointPlan) == null ? void 0 : _b.breakpoints,
-      idToken: await ((_c = currentUser()) == null ? void 0 : _c.getIdToken())
-    });
+    const prepareResult = await postToFirebaseFunction(
+      "prepareNewBuild",
+      {
+        appPkgName: appPkgJson.name,
+        appPkgProductName: appPkgJson.productName,
+        appVersion: appPkgJson.version,
+        id: config.id,
+        onBuildFinishedWebhook: flags.onBuildFinishedWebhook,
+        projectConfig: unprocessedConfig,
+        shouldCodeSign: flags.shouldCodeSign !== false,
+        shouldRelease: false,
+        userId: primaryUserId,
+        versionControlInfo: await getVersionControlInfo_default(config.appPath),
+        introspect: flags.introspect,
+        breakpoints: (_b = flags.breakpointPlan) == null ? void 0 : _b.breakpoints,
+        idToken: await ((_c = currentUser()) == null ? void 0 : _c.getIdToken())
+      },
+      { signal }
+    );
     buildId = prepareResult.appData.meta.currentBuildProgress.id;
+    signal == null ? void 0 : signal.throwIfAborted();
     buildObserver.subscribe({ appId, buildId, userId: prepareResult.userId });
     await buildObserver.whenFirstUpdate();
   } catch (e) {
@@ -4832,6 +4953,7 @@ async function runBuild({
   });
   logForCI("Uploading...");
   let sourceArchiveDetails;
+  signal == null ? void 0 : signal.throwIfAborted();
   try {
     sourceArchiveDetails = await uploadApplicationSource({
       appId,
@@ -4850,25 +4972,31 @@ async function runBuild({
       }
     });
   } catch (e) {
+    await tryDeleteBuild(appId, buildId);
     throw addErrorMessage(e, "Failed while uploading application source");
   }
   updateState({ state: "building" });
   logForCI("Kicking off build...");
+  signal == null ? void 0 : signal.throwIfAborted();
   try {
-    await postToFirebaseFunction("kickOffBuild", {
-      appBuilderLibVersion: config.appBuilderLibVersion,
-      appId,
-      appPkgName: appPkgJson.name,
-      appVersion: appPkgJson.version,
-      buildId,
-      idToken: await ((_d = currentUser()) == null ? void 0 : _d.getIdToken()),
-      linuxImageVersion: (_e = config.linux) == null ? void 0 : _e.imageVersion,
-      nodeVersion: config.nodeVersion,
-      npmVersion: config.npmVersion,
-      pnpmVersion: config.pnpmVersion,
-      sourceArchiveDetails,
-      userId: primaryUserId
-    });
+    await postToFirebaseFunction(
+      "kickOffBuild",
+      {
+        appBuilderLibVersion: config.appBuilderLibVersion,
+        appId,
+        appPkgName: appPkgJson.name,
+        appVersion: appPkgJson.version,
+        buildId,
+        idToken: await ((_d = currentUser()) == null ? void 0 : _d.getIdToken()),
+        linuxImageVersion: (_e = config.linux) == null ? void 0 : _e.imageVersion,
+        nodeVersion: config.nodeVersion,
+        npmVersion: config.npmVersion,
+        pnpmVersion: config.pnpmVersion,
+        sourceArchiveDetails,
+        userId: primaryUserId
+      },
+      { signal }
+    );
   } catch (e) {
     throw addErrorMessage(e, "Failed while kicking off build");
   }
@@ -4876,6 +5004,7 @@ async function runBuild({
     updateState({ state: "exit-after-uploading" });
     return;
   }
+  signal == null ? void 0 : signal.throwIfAborted();
   const build = await buildObserver.whenSettled();
   if ((build == null ? void 0 : build.status) === "failed" && shouldExitOnBuildFailure_default(build)) {
     updateState({ state: "build-failed" });
@@ -4883,6 +5012,9 @@ async function runBuild({
 }
 function addErrorMessage(e, message2) {
   var _a2, _b;
+  if (CanceledError.isCanceled(e)) {
+    return e;
+  }
   let originalMessage = "";
   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;
@@ -4899,6 +5031,13 @@ function addErrorMessage(e, message2) {
   }
   return newError;
 }
+async function tryDeleteBuild(appId, buildId) {
+  try {
+    await callDeleteBuild({ appId, buildId });
+  } catch (e) {
+    logger_default.error(e, "Failed to delete build after error");
+  }
+}
 
 // src/commands/build/components/Build.tsx
 var import_jsx_runtime15 = require("react/jsx-runtime");
@@ -4910,11 +5049,19 @@ function Build({
   var _a2, _b, _c, _d, _e, _f;
   const exit = useExit_default();
   const [state, setState] = (0, import_react9.useState)({ state: "initializing" });
+  const [abortController] = (0, import_react9.useState)(() => new AbortController());
   (0, import_react9.useEffect)(() => {
-    runBuild({ configPath, flags, updateState }).catch((e) => {
-      const error = e.response ? e.response.data : e;
-      logForCI(error);
-      updateState({ state: "error", error });
+    runBuild({
+      configPath,
+      flags,
+      signal: abortController.signal,
+      updateState
+    }).catch((e) => {
+      if (!CanceledError.isCanceled(e)) {
+        const error = e.response ? e.response.data : e;
+        logForCI(error);
+        updateState({ state: "error", error });
+      }
     });
     return () => {
       var _a3;
@@ -4939,8 +5086,10 @@ function Build({
         return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(ErrorDisplay, { commandUsed, error: "No build is set" });
       }
       return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
-        MainLayout_default,
+        MainLayout,
         {
+          abortController,
+          appId: state.appId,
           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,
@@ -4963,8 +5112,10 @@ function Build({
       return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_ink16.Text, { children: "Getting app info..." });
     case "preparing":
       return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
-        MainLayout_default,
+        MainLayout,
         {
+          abortController,
+          appId: state.appId,
           appName: ((_c = state.build) == null ? void 0 : _c.appName) || ((_d = state.appPkg) == null ? void 0 : _d.name) || "",
           appVersion: ((_e = state.build) == null ? void 0 : _e.appVersion) || ((_f = state.appPkg) == null ? void 0 : _f.version) || "",
           build: state.build,
@@ -5263,7 +5414,6 @@ var ErrorBoundary_default = ErrorBoundary;
 // src/commands/build/components/OngoingBuildGuard.tsx
 var import_ink23 = require("ink");
 var import_ink_select_input = __toESM(require("ink-select-input"));
-var import_prop_types9 = __toESM(require("prop-types"));
 var import_react15 = require("react");
 
 // src/components/CustomSelectInputIndicator.tsx
@@ -5502,7 +5652,7 @@ var ViewBuild = ({ commandUsed, id, configPath }) => {
     }));
   };
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-    MainLayout_default,
+    MainLayout,
     {
       appId,
       appName: build.appName,
@@ -5537,11 +5687,11 @@ var ViewBuild_default = ViewBuild;
 var import_firestore15 = require("firebase/firestore");
 var import_is_ci5 = __toESM(require("is-ci"));
 var import_jsx_runtime23 = require("react/jsx-runtime");
-var OngoingBuildGuard = ({
+function OngoingBuildGuard({
   children,
   commandUsed,
   configPath
-}) => {
+}) {
   const { isRawModeSupported } = (0, import_ink23.useStdin)();
   const exit = useExit_default();
   const [{ appId, builds, error, isLoading, itemChosen }, setState] = (0, import_react15.useState)({
@@ -5551,6 +5701,11 @@ var OngoingBuildGuard = ({
     isLoading: true,
     itemChosen: null
   });
+  const cancellation = useCancellation({
+    appId: appId ?? void 0,
+    build: builds.find(Boolean),
+    autoExit: false
+  });
   (0, import_react15.useEffect)(() => {
     if (!isLoading) {
       return;
@@ -5568,7 +5723,7 @@ var OngoingBuildGuard = ({
             firestore_default,
             `users/${id}/applications/${applicationId}/builds`
           ),
-          (0, import_firestore15.where)("createdAt", ">=", twentyFourHoursAgo),
+          (0, import_firestore15.where)("createdAt", ">=", twentyFourHoursAgo.toISOString()),
           (0, import_firestore15.orderBy)("createdAt", "desc"),
           (0, import_firestore15.limit)(10)
         );
@@ -5618,7 +5773,17 @@ var OngoingBuildGuard = ({
     if (itemChosen.value === "view" && build) {
       return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ViewBuild_default, { commandUsed, id: build.id });
     } else if (itemChosen.value === "cancel" && build && appId) {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(CancelBuild_default, { appId, commandUsed, id: build.id, children });
+      if (cancellation.status === "cancelled") {
+        return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children });
+      }
+      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+        CancelBuild,
+        {
+          buildId: build.id,
+          cancellation,
+          commandUsed
+        }
+      );
     } else if (itemChosen.value === "concurrent") {
       return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children });
     } else {
@@ -5648,10 +5813,15 @@ var OngoingBuildGuard = ({
       label: "Exit",
       value: "exit"
     });
-    const handleSelect = (selectedItem) => setState((previousState) => ({
-      ...previousState,
-      itemChosen: selectedItem
-    }));
+    const handleSelect = (selectedItem) => {
+      if (selectedItem.value === "cancel") {
+        cancellation.cancel();
+      }
+      setState((previousState) => ({
+        ...previousState,
+        itemChosen: selectedItem
+      }));
+    };
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(import_jsx_runtime23.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(import_ink23.Box, { marginBottom: 1, children: [
         /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_ink23.Text, { bold: true, children: multiple ? "There are ongoing builds " : "There is an ongoing build " }),
@@ -5675,13 +5845,7 @@ var OngoingBuildGuard = ({
   } else {
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children });
   }
-};
-OngoingBuildGuard.propTypes = {
-  commandUsed: import_prop_types9.default.string.isRequired,
-  children: import_prop_types9.default.oneOfType([import_prop_types9.default.array, import_prop_types9.default.object]),
-  configPath: import_prop_types9.default.string
-};
-var OngoingBuildGuard_default = OngoingBuildGuard;
+}
 
 // src/utilities/useAnalytics.ts
 var import_react16 = require("react");
@@ -5739,7 +5903,7 @@ function BuildCommand({
     webhook: flags.onBuildFinishedWebhook
   });
   const commandUsed = "todesktop build";
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ErrorBoundary_default, { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(LoginHOC_default, { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(OngoingBuildGuard_default, { configPath, commandUsed, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ErrorBoundary_default, { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(LoginHOC_default, { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(OngoingBuildGuard, { configPath, commandUsed, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
     Build,
     {
       commandUsed,
@@ -5751,16 +5915,16 @@ function BuildCommand({
 
 // src/components/ViewBuilds.tsx
 var import_ink29 = require("ink");
-var import_prop_types15 = __toESM(require("prop-types"));
+var import_prop_types14 = __toESM(require("prop-types"));
 var import_react18 = require("react");
 
 // src/components/Table.tsx
 var import_ink27 = require("ink");
-var import_prop_types14 = __toESM(require("prop-types"));
+var import_prop_types13 = __toESM(require("prop-types"));
 
 // src/components/TableEnd.tsx
 var import_ink24 = require("ink");
-var import_prop_types10 = __toESM(require("prop-types"));
+var import_prop_types9 = __toESM(require("prop-types"));
 var import_jsx_runtime25 = require("react/jsx-runtime");
 var TableEnd = ({ keyDetails, ...props }) => {
   let content = "\u2514";
@@ -5769,13 +5933,13 @@ var TableEnd = ({ keyDetails, ...props }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_ink24.Box, { ...props, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_ink24.Text, { children: content }) });
 };
 TableEnd.propTypes = {
-  keyDetails: import_prop_types10.default.shape({}).isRequired
+  keyDetails: import_prop_types9.default.shape({}).isRequired
 };
 var TableEnd_default = TableEnd;
 
 // src/components/TableHead.tsx
 var import_ink25 = require("ink");
-var import_prop_types11 = __toESM(require("prop-types"));
+var import_prop_types10 = __toESM(require("prop-types"));
 var import_react17 = require("react");
 var import_jsx_runtime26 = require("react/jsx-runtime");
 var TableHead = ({ keyDetails, ...props }) => {
@@ -5800,17 +5964,17 @@ var TableHead = ({ keyDetails, ...props }) => {
   ] });
 };
 TableHead.propTypes = {
-  bottomLinePrefix: import_prop_types11.default.string,
-  keyDetails: import_prop_types11.default.shape({}).isRequired
+  bottomLinePrefix: import_prop_types10.default.string,
+  keyDetails: import_prop_types10.default.shape({}).isRequired
 };
 var TableHead_default = TableHead;
 
 // src/components/TableBody.tsx
-var import_prop_types13 = __toESM(require("prop-types"));
+var import_prop_types12 = __toESM(require("prop-types"));
 
 // src/components/TableRow.tsx
 var import_ink26 = require("ink");
-var import_prop_types12 = __toESM(require("prop-types"));
+var import_prop_types11 = __toESM(require("prop-types"));
 var import_jsx_runtime27 = require("react/jsx-runtime");
 var TableRow = ({
   data,
@@ -5848,10 +6012,10 @@ var TableRow = ({
   ] });
 };
 TableRow.propTypes = {
-  data: import_prop_types12.default.shape({}).isRequired,
-  getCellTextProps: import_prop_types12.default.func,
-  keyDetails: import_prop_types12.default.shape({}).isRequired,
-  textProps: import_prop_types12.default.shape({})
+  data: import_prop_types11.default.shape({}).isRequired,
+  getCellTextProps: import_prop_types11.default.func,
+  keyDetails: import_prop_types11.default.shape({}).isRequired,
+  textProps: import_prop_types11.default.shape({})
 };
 var TableRow_default = TableRow;
 
@@ -5882,8 +6046,8 @@ TableBody.propTypes = {
       );
     }
   },
-  getCellTextProps: import_prop_types13.default.func,
-  keyDetails: import_prop_types13.default.shape({}).isRequired
+  getCellTextProps: import_prop_types12.default.func,
+  keyDetails: import_prop_types12.default.shape({}).isRequired
 };
 var TableBody_default = TableBody;
 
@@ -5933,7 +6097,7 @@ Table.propTypes = {
       );
     }
   },
-  getCellTextProps: import_prop_types14.default.func
+  getCellTextProps: import_prop_types13.default.func
 };
 var Table_default = Table;
 
@@ -6203,11 +6367,11 @@ var removeAppBuilderLibConfig = (builds) => {
   });
 };
 ViewBuilds.propTypes = {
-  commandUsed: import_prop_types15.default.string.isRequired,
-  configPath: import_prop_types15.default.string,
-  count: import_prop_types15.default.number,
-  format: import_prop_types15.default.string,
-  exit: import_prop_types15.default.bool
+  commandUsed: import_prop_types14.default.string.isRequired,
+  configPath: import_prop_types14.default.string,
+  count: import_prop_types14.default.number,
+  format: import_prop_types14.default.string,
+  exit: import_prop_types14.default.bool
 };
 var ViewBuilds_default = ViewBuilds;
 
@@ -6279,11 +6443,12 @@ function isFirebaseFunctionError(error) {
     typeof error === "object" && error && "code" in error && typeof error.code === "string"
   );
 }
-async function startIntrospectionSession(buildId, platform) {
+async function startIntrospectionSession(buildId, platform, appId) {
   try {
     const result = await startIntrospectionSessionFn({
       buildId,
-      platform
+      platform,
+      appId
     });
     return result.data;
   } catch (error) {
@@ -6422,7 +6587,8 @@ var import_jsx_runtime33 = require("react/jsx-runtime");
 function IntrospectSession({
   buildId,
   platform,
-  verbose
+  verbose,
+  appId
 }) {
   const exit = useExit_default();
   const exitRef = (0, import_react19.useRef)(exit);
@@ -6527,7 +6693,8 @@ ${message2}`;
         setStatus("starting-session");
         const sessionResponse = await startIntrospectionSession(
           buildId,
-          platform
+          platform,
+          appId
         );
         setJti(sessionResponse.jti);
         if (verbose) {
@@ -6813,7 +6980,7 @@ var import_ink32 = require("ink");
 // src/components/SelectTable.tsx
 var import_ink31 = require("ink");
 var import_ink_select_input2 = __toESM(require("ink-select-input"));
-var import_prop_types16 = __toESM(require("prop-types"));
+var import_prop_types15 = __toESM(require("prop-types"));
 var import_jsx_runtime34 = require("react/jsx-runtime");
 var CustomIndicator = (props) => /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(CustomSelectInputIndicator, { marginTop: 1, ...props });
 var SelectTable = ({ data, onSelect }) => {
@@ -6872,7 +7039,7 @@ SelectTable.propTypes = {
       );
     }
   },
-  onSelect: import_prop_types16.default.func
+  onSelect: import_prop_types15.default.func
 };
 var SelectTable_default = SelectTable;
 
@@ -7368,6 +7535,13 @@ function IntrospectCommand({
 }) {
   const [buildId, setBuildId] = (0, import_react24.useState)(initialBuildId);
   const [platform, setPlatform] = (0, import_react24.useState)(initialPlatform);
+  const appId = (0, import_react24.useMemo)(() => {
+    try {
+      return getProjectConfig(configPath).config.id;
+    } catch {
+      return void 0;
+    }
+  }, [configPath]);
   useAnalyticsCommand("introspect", {
     buildId,
     platform,
@@ -7410,7 +7584,8 @@ function IntrospectCommand({
       {
         buildId,
         platform: normalizedPlatform,
-        verbose: verbose ?? false
+        verbose: verbose ?? false,
+        appId
       }
     );
   };
@@ -8737,7 +8912,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.21.0",
+  version: "1.23.0",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",