appwrite-cli 22.2.2 → 22.3.0

package/dist/cli.cjs

@@ -86539,7 +86539,7 @@ var package_default = {
   type: "module",
   homepage: "https://appwrite.io/support",
   description: "Appwrite is an open-source self-hosted backend server that abstracts and simplifies complex and repetitive development tasks behind a very simple REST API",
-  version: "22.2.2",
+  version: "22.3.0",
   license: "BSD-3-Clause",
   main: "dist/index.cjs",
   module: "dist/index.js",
@@ -101271,7 +101271,7 @@ var validateCrossDatabase = (data, ctx) => {
 // lib/constants.ts
 var SDK_TITLE = "Appwrite";
 var SDK_TITLE_LOWER = "appwrite";
-var SDK_VERSION = "22.2.2";
+var SDK_VERSION = "22.3.0";
 var SDK_NAME = "Command Line";
 var SDK_PLATFORM = "console";
 var SDK_LANGUAGE = "cli";
@@ -101383,9 +101383,9 @@ var SettingsSchema = external_exports.object({
     }).strict().optional(),
     security: external_exports.object({
       duration: external_exports.union([external_exports.number(), external_exports.bigint()]).optional(),
-      limit: external_exports.union([external_exports.number(), external_exports.bigint()]).optional(),
-      sessionsLimit: external_exports.union([external_exports.number(), external_exports.bigint()]).optional(),
-      passwordHistory: external_exports.union([external_exports.number(), external_exports.bigint()]).optional(),
+      limit: external_exports.union([external_exports.number(), external_exports.bigint()]).nullable().optional(),
+      sessionsLimit: external_exports.union([external_exports.number(), external_exports.bigint()]).nullable().optional(),
+      passwordHistory: external_exports.union([external_exports.number(), external_exports.bigint()]).nullable().optional(),
       passwordDictionary: external_exports.boolean().optional(),
       personalDataCheck: external_exports.boolean().optional(),
       sessionAlerts: external_exports.boolean().optional(),
@@ -131622,7 +131622,10 @@ var createSettingsObject = (project2, policies, mockNumbers) => {
   }
   const policyTotal = (id) => {
     const policy = policyById.get(id);
-    return policy && "total" in policy ? policy.total : void 0;
+    if (!policy || !("total" in policy)) {
+      return void 0;
+    }
+    return policy.total === 0 ? null : policy.total;
   };
   const policyEnabled = (id) => {
     const policy = policyById.get(id);
@@ -131857,8 +131860,40 @@ var isRegionalCloudEndpoint = (endpoint) => {
     return false;
   }
 };
+var getCloudEndpointRegion = (endpoint) => {
+  try {
+    const hostname3 = new URL(endpoint).hostname;
+    if (!isCloudHostname(hostname3) || hostname3 === "cloud.appwrite.io") {
+      return null;
+    }
+    const region = hostname3.split(".")[0];
+    return CLOUD_REGION_CODES.has(region) ? region : null;
+  } catch (_error) {
+    return null;
+  }
+};
 var isLocalhostHostname = (hostname3) => hostname3 === "localhost" || hostname3 === "127.0.0.1" || hostname3 === "[::1]";
 var isCloudEnvironmentHostname = (hostname3) => hostname3.endsWith(".cloud.appwrite.io") && CLOUD_LOGIN_ENVIRONMENTS.has(hostname3.split(".")[0]);
+var getCloudConsoleHostname = (hostname3) => {
+  if (hostname3 === "cloud.appwrite.io") {
+    return hostname3;
+  }
+  const labels = hostname3.split(".");
+  if (labels.length < 4 || labels.slice(-3).join(".") !== "cloud.appwrite.io") {
+    return null;
+  }
+  if (CLOUD_REGION_CODES.has(labels[0])) {
+    const environment = labels[1];
+    if (environment && CLOUD_LOGIN_ENVIRONMENTS.has(environment)) {
+      return `${environment}.cloud.appwrite.io`;
+    }
+    return "cloud.appwrite.io";
+  }
+  if (CLOUD_LOGIN_ENVIRONMENTS.has(labels[0])) {
+    return hostname3;
+  }
+  return null;
+};
 var isCloudLoginEndpoint = (endpoint) => {
   try {
     const hostname3 = new URL(endpoint).hostname;
@@ -131870,8 +131905,9 @@ var isCloudLoginEndpoint = (endpoint) => {
 var getConsoleBaseUrl = (endpoint) => {
   try {
     const url2 = new URL(endpoint);
-    if (isCloudHostname(url2.hostname)) {
-      url2.hostname = "cloud.appwrite.io";
+    const consoleHostname = getCloudConsoleHostname(url2.hostname);
+    if (consoleHostname) {
+      url2.hostname = consoleHostname;
     }
     url2.pathname = url2.pathname.replace(/\/v1\/?$/, "");
     url2.search = "";
@@ -132745,10 +132781,7 @@ var Config = class {
   }
   _addDBEntity(entityType, props, keysSet, nestedKeys = {}) {
     props = whitelistKeys(props, keysSet, nestedKeys);
-    if (!this.has(entityType)) {
-      this.set(entityType, []);
-    }
-    const entities = this.get(entityType);
+    const entities = this.has(entityType) ? [...this.get(entityType) ?? []] : [];
     for (let i = 0; i < entities.length; i++) {
       if (entities[i]["$id"] == props["$id"]) {
         entities[i] = props;
@@ -134476,6 +134509,28 @@ var printQueryErrorHint = (err) => {
     `For common list filters, use flags like --limit 25, --sort-desc '$createdAt', or --filter 'status=active'. Raw --queries values must be Appwrite JSON query strings, for example: ${EXECUTABLE_NAME} tables-db list-rows --queries '{"method":"limit","values":[25]}'`
   );
 };
+var ERROR_DETAIL_KEYS = ["code", "type", "response"];
+var formatErrorForLog = (err) => {
+  const stack = err.stack || `${err.name}: ${err.message}`;
+  const detailLines = ERROR_DETAIL_KEYS.flatMap((key) => {
+    if (!Object.prototype.hasOwnProperty.call(err, key)) {
+      return [];
+    }
+    const value = err[key];
+    let detail = "undefined";
+    try {
+      detail = typeof value === "string" ? JSON.stringify(value) : JSON.stringify(value) ?? String(value);
+    } catch {
+      detail = String(value);
+    }
+    return [`${key}: ${detail}`];
+  });
+  if (detailLines.length === 0) {
+    return stack;
+  }
+  const [summary, ...frames] = stack.split("\n");
+  return [summary, ...detailLines, ...frames].join("\n");
+};
 var parseError = (err) => {
   if (cliConfig.report) {
     void (async () => {
@@ -134526,12 +134581,12 @@ ${stack}`
       );
       printQueryErrorHint(err);
       error51("\n Stack Trace: \n");
-      console.error(err);
+      console.error(formatErrorForLog(err));
       process.exit(1);
     })();
   } else {
     if (cliConfig.verbose) {
-      console.error(err);
+      console.error(formatErrorForLog(err));
       printQueryErrorHint(err);
     } else {
       log("For detailed error pass the --verbose or --report flag");
@@ -135164,12 +135219,12 @@ var deleteStoredRefreshToken = (sessionId) => {
 };
 
 // lib/sdks.ts
-var getValidAccessToken = async (endpoint) => {
+var getValidAccessToken = async (endpoint, options = {}) => {
   const accessToken = globalConfig2.getAccessToken();
   const tokenExpiry = globalConfig2.getTokenExpiry();
   const clientId = globalConfig2.getClientId() || OAUTH2_CLIENT_ID;
   const currentSession = globalConfig2.getCurrentSession();
-  if (accessToken && tokenExpiry > Date.now() + 6e4) {
+  if (!options.forceRefresh && accessToken && tokenExpiry > Date.now() + 6e4) {
     return accessToken;
   }
   const refreshToken = currentSession ? getStoredRefreshToken(currentSession) : "";
@@ -137097,6 +137152,16 @@ var getCurrentAccount = async () => {
     return account2;
   } catch (err) {
     if (isGuestUnauthorizedError(err)) {
+      try {
+        await getValidAccessToken(globalConfig2.getEndpoint(), {
+          forceRefresh: true
+        });
+        const refreshedClient = await sdkForConsole();
+        const refreshedAccount = await new Account(refreshedClient).get();
+        globalConfig2.setEmail(refreshedAccount.email);
+        return refreshedAccount;
+      } catch (_refreshError) {
+      }
       removeCurrentSession();
     }
     return null;
@@ -142185,6 +142250,11 @@ var getExistingProjectSummary = async (organizationId, projectId) => {
     region: project2.region || ""
   };
 };
+var getRegionalCloudEndpoint = (region) => {
+  const url2 = new URL(globalConfig2.getEndpoint() || DEFAULT_ENDPOINT);
+  url2.hostname = `${region}.${url2.hostname}`;
+  return url2.toString().replace(/\/$/, "");
+};
 var printInitProjectSuccess = (message) => {
   console.log(`${import_chalk9.default.green.bold("\u2713")} ${import_chalk9.default.green(message)}`);
 };
@@ -142371,7 +142441,6 @@ var initProject = async ({
     );
   }
   localConfig.clear();
-  const url2 = new URL(DEFAULT_ENDPOINT);
   if (answers.start === "new") {
     let projectIdToCreate;
     let projectNameToCreate;
@@ -142402,9 +142471,7 @@ var initProject = async ({
     localConfig.setProject(response["$id"], response.name ?? "");
     localConfig.setOrganizationId(answers.organization);
     if (answers.region) {
-      localConfig.setEndpoint(
-        `https://${answers.region}.${url2.host}${url2.pathname}`
-      );
+      localConfig.setEndpoint(getRegionalCloudEndpoint(answers.region));
     }
   } else {
     let selectedProject;
@@ -142422,9 +142489,7 @@ var initProject = async ({
     localConfig.setProject(selectedProject.$id, selectedProject.name ?? "");
     localConfig.setOrganizationId(answers.organization);
     if (isCloud() && selectedProject.region) {
-      localConfig.setEndpoint(
-        `https://${selectedProject.region}.${url2.host}${url2.pathname}`
-      );
+      localConfig.setEndpoint(getRegionalCloudEndpoint(selectedProject.region));
     }
   }
   let autoPulled = false;
@@ -147045,6 +147110,44 @@ function createDeploymentLogsController(enabled) {
     close: cleanup
   };
 }
+var getPushErrorMessage = (error52) => {
+  if (error52 instanceof Error) {
+    return error52.message;
+  }
+  if (typeof error52 === "object" && error52 !== null && "message" in error52 && typeof error52.message === "string") {
+    return error52.message;
+  }
+  return String(error52);
+};
+var getPushResultErrors = (result) => {
+  if (typeof result !== "object" || result === null) {
+    return [];
+  }
+  if ("errors" in result && Array.isArray(result.errors) && result.errors.length > 0) {
+    return result.errors.map(getPushErrorMessage).filter((message) => message.trim() !== "");
+  }
+  if ("error" in result && typeof result.error === "string" && result.error.trim() !== "") {
+    return [result.error];
+  }
+  return [];
+};
+var formatPushResourceErrors = (results) => {
+  const failed = Object.entries(results).map(([resourceGroup, result]) => ({
+    resourceGroup,
+    messages: getPushResultErrors(result)
+  })).filter(({ messages }) => messages.length > 0);
+  if (failed.length === 0) {
+    return "Failed to push resource groups.";
+  }
+  return [
+    `Failed to push ${failed.length} resource group${failed.length === 1 ? "" : "s"}:`,
+    ...failed.flatMap(({ resourceGroup, messages }) => [
+      `- ${resourceGroup}:`,
+      ...messages.map((message) => `  - ${message}`)
+    ])
+  ].join("\n");
+};
+var nullablePolicyTotal = (value) => value === null || Number(value) === 0 ? null : Number(value);
 var normalizeIgnoreRules = (value) => {
   if (Array.isArray(value)) {
     return value.filter(
@@ -147090,6 +147193,53 @@ var Push = class {
       warn(message);
     }
   }
+  getFunctionRuleDomain(domain2) {
+    const region = getCloudEndpointRegion(this.projectClient.config.endpoint);
+    if (!region) {
+      return domain2;
+    }
+    const parts = domain2.split(".");
+    if (parts.length < 3) {
+      return domain2;
+    }
+    parts[0] = region;
+    return parts.join(".");
+  }
+  async createDefaultFunctionRule(functionId) {
+    let domain2 = "";
+    try {
+      const consoleService = await getConsoleService(this.consoleClient);
+      const variables = await consoleService.variables();
+      const domains = variables["_APP_DOMAIN_FUNCTIONS"].split(",").map((value) => value.trim()).filter((value) => value.length > 0);
+      if (domains.length === 0) {
+        throw new Error("_APP_DOMAIN_FUNCTIONS is not configured.");
+      }
+      domain2 = id_default2.unique() + "." + this.getFunctionRuleDomain(domains[0]);
+    } catch (err) {
+      this.error("Error fetching console variables.");
+      throw err;
+    }
+    try {
+      const proxyService = await getProxyService(this.projectClient);
+      this.log(`Creating function proxy rule for ${domain2} ...`);
+      await proxyService.createFunctionRule(domain2, functionId);
+    } catch (err) {
+      this.error("Error creating function rule.");
+      throw err;
+    }
+  }
+  async hasDefaultFunctionRule(functionId) {
+    const proxyService = await getProxyService(this.projectClient);
+    const { rules } = await proxyService.listRules({
+      queries: [
+        Query.limit(1),
+        Query.equal("deploymentResourceType", "function"),
+        Query.equal("deploymentResourceId", functionId),
+        Query.equal("trigger", "manual")
+      ]
+    });
+    return rules.length > 0;
+  }
   /**
    * Log an error message (respects silent mode)
    */
@@ -147153,7 +147303,11 @@ var Push = class {
           results.settings = { success: true };
         } catch (e) {
           allErrors.push(e);
-          results.settings = { success: false, error: e.message };
+          results.settings = {
+            success: false,
+            error: getPushErrorMessage(e),
+            errors: [e]
+          };
         }
       }
       if ((shouldPushAll || options.buckets) && config2.buckets && config2.buckets.length > 0) {
@@ -147236,10 +147390,28 @@ var Push = class {
       }
       if ((shouldPushAll || options.sites) && config2.sites && config2.sites.length > 0) {
         try {
+          let siteOptions = options.siteOptions;
+          if (siteOptions?.code === void 0) {
+            let allowSitesCodePush = cliConfig.force === true ? true : null;
+            if (allowSitesCodePush === null) {
+              const codeAnswer = await import_inquirer8.default.prompt(questionsPushSitesCode);
+              allowSitesCodePush = codeAnswer.override;
+            }
+            siteOptions = {
+              ...siteOptions,
+              code: allowSitesCodePush === true
+            };
+          }
+          if (siteOptions.code === true && siteOptions.activate === void 0) {
+            siteOptions = {
+              ...siteOptions,
+              activate: cliConfig.force === true ? true : (await import_inquirer8.default.prompt(questionsPushSitesActivate)).activate
+            };
+          }
           this.log("Pushing sites ...");
           const result = await this.pushSites(
             config2.sites,
-            options.siteOptions
+            siteOptions
           );
           this.success(
             `Successfully pushed ${import_chalk14.default.bold(result.successfullyPushed)} sites.`
@@ -147258,6 +147430,12 @@ var Push = class {
       }
       if ((shouldPushAll || options.tables) && config2.tables && config2.tables.length > 0) {
         try {
+          const { resyncNeeded } = await checkAndApplyTablesDBChanges();
+          if (resyncNeeded) {
+            throw new Error(
+              "Configuration changed after applying tablesDB deletions. Re-run the push command to continue."
+            );
+          }
           this.log("Pushing tables ...");
           const result = await this.pushTables(config2.tables, {
             attempts: options.tableOptions?.attempts,
@@ -147329,46 +147507,80 @@ var Push = class {
     }
     if (settings.services) {
       this.log("Applying service statuses ...");
-      for (const [service, status] of Object.entries(settings.services)) {
-        await projectService.updateService({
-          serviceId: service,
-          enabled: status
-        });
-      }
+      await Promise.all(
+        Object.entries(settings.services).map(
+          ([service, status]) => projectService.updateService({
+            serviceId: service,
+            enabled: status
+          })
+        )
+      );
     }
     if (settings.protocols) {
       this.log("Applying protocol statuses ...");
-      for (const [protocol, status] of Object.entries(settings.protocols)) {
-        await projectService.updateProtocol({
-          protocolId: protocol,
-          enabled: status
-        });
-      }
+      await Promise.all(
+        Object.entries(settings.protocols).map(
+          ([protocol, status]) => projectService.updateProtocol({
+            protocolId: protocol,
+            enabled: status
+          })
+        )
+      );
     }
     if (settings.auth) {
       if (settings.auth.security) {
         this.log("Applying auth security settings ...");
-        await projectService.updateSessionDurationPolicy({
-          duration: Number(settings.auth.security.duration)
-        });
-        await projectService.updateUserLimitPolicy({
-          total: Number(settings.auth.security.limit)
-        });
-        await projectService.updateSessionLimitPolicy({
-          total: Number(settings.auth.security.sessionsLimit)
-        });
-        await projectService.updatePasswordDictionaryPolicy({
-          enabled: settings.auth.security.passwordDictionary
-        });
-        await projectService.updatePasswordHistoryPolicy({
-          total: Number(settings.auth.security.passwordHistory)
-        });
-        await projectService.updatePasswordPersonalDataPolicy({
-          enabled: settings.auth.security.personalDataCheck
-        });
-        await projectService.updateSessionAlertPolicy({
-          enabled: settings.auth.security.sessionAlerts
-        });
+        const securityUpdates = [];
+        if (settings.auth.security.duration !== void 0) {
+          securityUpdates.push(
+            projectService.updateSessionDurationPolicy({
+              duration: Number(settings.auth.security.duration)
+            })
+          );
+        }
+        if (settings.auth.security.limit !== void 0) {
+          securityUpdates.push(
+            projectService.updateUserLimitPolicy({
+              total: nullablePolicyTotal(settings.auth.security.limit)
+            })
+          );
+        }
+        if (settings.auth.security.sessionsLimit !== void 0) {
+          securityUpdates.push(
+            projectService.updateSessionLimitPolicy({
+              total: nullablePolicyTotal(settings.auth.security.sessionsLimit)
+            })
+          );
+        }
+        if (settings.auth.security.passwordDictionary !== void 0) {
+          securityUpdates.push(
+            projectService.updatePasswordDictionaryPolicy({
+              enabled: settings.auth.security.passwordDictionary
+            })
+          );
+        }
+        if (settings.auth.security.passwordHistory !== void 0) {
+          securityUpdates.push(
+            projectService.updatePasswordHistoryPolicy({
+              total: nullablePolicyTotal(settings.auth.security.passwordHistory)
+            })
+          );
+        }
+        if (settings.auth.security.personalDataCheck !== void 0) {
+          securityUpdates.push(
+            projectService.updatePasswordPersonalDataPolicy({
+              enabled: settings.auth.security.personalDataCheck
+            })
+          );
+        }
+        if (settings.auth.security.sessionAlerts !== void 0) {
+          securityUpdates.push(
+            projectService.updateSessionAlertPolicy({
+              enabled: settings.auth.security.sessionAlerts
+            })
+          );
+        }
+        await Promise.all(securityUpdates);
         if (settings.auth.security.mockNumbers !== void 0) {
           const remoteMockNumbers = [];
           const limit = 100;
@@ -147391,40 +147603,50 @@ var Push = class {
               mockNumber.otp
             ])
           );
+          const mockNumberUpdates = [];
           for (const remoteMockNumber of remoteMockNumbers) {
             const desiredOtp = desiredMockNumbersByPhone.get(
               remoteMockNumber.number
             );
             if (desiredOtp === void 0) {
-              await projectService.deleteMockPhone({
-                number: remoteMockNumber.number
-              });
+              mockNumberUpdates.push(
+                projectService.deleteMockPhone({
+                  number: remoteMockNumber.number
+                })
+              );
               continue;
             }
             if (remoteMockNumber.otp !== desiredOtp) {
-              await projectService.updateMockPhone({
-                number: remoteMockNumber.number,
-                otp: desiredOtp
-              });
+              mockNumberUpdates.push(
+                projectService.updateMockPhone({
+                  number: remoteMockNumber.number,
+                  otp: desiredOtp
+                })
+              );
             }
             desiredMockNumbersByPhone.delete(remoteMockNumber.number);
           }
           for (const [phone, otp] of desiredMockNumbersByPhone) {
-            await projectService.createMockPhone({
-              number: phone,
-              otp
-            });
+            mockNumberUpdates.push(
+              projectService.createMockPhone({
+                number: phone,
+                otp
+              })
+            );
           }
+          await Promise.all(mockNumberUpdates);
         }
       }
       if (settings.auth.methods) {
         this.log("Applying auth methods statuses ...");
-        for (const [method, status] of Object.entries(settings.auth.methods)) {
-          await projectService.updateAuthMethod({
-            methodId: method,
-            enabled: status
-          });
-        }
+        await Promise.all(
+          Object.entries(settings.auth.methods).map(
+            ([method, status]) => projectService.updateAuthMethod({
+              methodId: method,
+              enabled: status
+            })
+          )
+        );
       }
     }
   }
@@ -147715,24 +147937,7 @@ var Push = class {
                 runtimeSpecification: func.runtimeSpecification,
                 deploymentRetention: func.deploymentRetention
               });
-              let domain2 = "";
-              try {
-                const consoleService = await getConsoleService(
-                  this.consoleClient
-                );
-                const variables = await consoleService.variables();
-                domain2 = id_default2.unique() + "." + variables["_APP_DOMAIN_FUNCTIONS"];
-              } catch (err) {
-                this.error("Error fetching console variables.");
-                throw err;
-              }
-              try {
-                const proxyService = await getProxyService(this.projectClient);
-                await proxyService.createFunctionRule(domain2, func.$id);
-              } catch (err) {
-                this.error("Error creating function rule.");
-                throw err;
-              }
+              await this.createDefaultFunctionRule(func.$id);
               updaterRow.update({ status: "Created" });
             } catch (e) {
               errors.push(e);
@@ -147741,6 +147946,18 @@ var Push = class {
               });
               return;
             }
+          } else {
+            try {
+              if (!await this.hasDefaultFunctionRule(func.$id)) {
+                await this.createDefaultFunctionRule(func.$id);
+              }
+            } catch (e) {
+              errors.push(e);
+              updaterRow.fail({
+                errorMessage: e.message ?? "General error occurs please try again"
+              });
+              return;
+            }
           }
           if (withVariables) {
             updaterRow.update({ status: "Updating variables" }).replaceSpinner(SPINNER_DOTS);
@@ -148842,10 +149059,11 @@ async function createPushInstance(options = {
   silent: false,
   requiresConsoleAuth: false
 }) {
-  const { silent, requiresConsoleAuth } = options;
+  const { silent, requiresConsoleAuth, organizationId } = options;
   const projectClient2 = await sdkForProject();
   const consoleClient = await sdkForConsole({
-    requiresAuth: requiresConsoleAuth
+    requiresAuth: requiresConsoleAuth,
+    organizationId
   });
   return new Push(projectClient2, consoleClient, silent);
 }
@@ -148876,20 +149094,11 @@ var pushResources = async ({
       activateFunctionsDeployment = activateAnswer.activate;
     }
     const sites2 = localConfig.getSites();
-    let allowSitesCodePush = cliConfig.force === true ? true : null;
-    let activateSitesDeployment = cliConfig.force === true ? true : void 0;
-    if (sites2.length > 0 && allowSitesCodePush === null) {
-      const codeAnswer = await import_inquirer8.default.prompt(questionsPushSitesCode);
-      allowSitesCodePush = codeAnswer.override;
-    }
-    if (sites2.length > 0 && allowSitesCodePush === true && activateSitesDeployment === void 0) {
-      const activateAnswer = await import_inquirer8.default.prompt(questionsPushSitesActivate);
-      activateSitesDeployment = activateAnswer.activate;
-    }
+    const project2 = localConfig.getProject();
     const pushInstance = await createPushInstance({
-      requiresConsoleAuth: true
+      requiresConsoleAuth: true,
+      organizationId: project2.organizationId
     });
-    const project2 = localConfig.getProject();
     const config2 = {
       organizationId: project2.organizationId,
       projectId: project2.projectId ?? "",
@@ -148912,7 +149121,7 @@ var pushResources = async ({
       "Configuration validation failed",
       config2
     );
-    await pushInstance.pushResources(config2, {
+    const result = await pushInstance.pushResources(config2, {
       all: cliConfig.all,
       skipDeprecated,
       functionOptions: {
@@ -148922,12 +149131,13 @@ var pushResources = async ({
         logs: functionOptions?.logs
       },
       siteOptions: {
-        code: allowSitesCodePush === true,
-        activate: activateSitesDeployment ?? true,
         withVariables: false,
         logs: siteOptions?.logs
       }
     });
+    if (result.errors.length > 0) {
+      throw new Error(formatPushResourceErrors(result.results));
+    }
   } else {
     const actions = {
       settings: pushSettings,
@@ -149006,10 +149216,11 @@ var pushSettings = async () => {
   }
   try {
     log("Pushing project settings ...");
+    const config2 = localConfig.getProject();
     const pushInstance = await createPushInstance({
-      requiresConsoleAuth: true
+      requiresConsoleAuth: true,
+      organizationId: config2.organizationId ?? resolvedOrganizationId
     });
-    const config2 = localConfig.getProject();
     await pushInstance.pushSettings({
       projectId: config2.projectId,
       organizationId: config2.organizationId ?? resolvedOrganizationId,
@@ -149098,7 +149309,10 @@ var pushSite = async ({
   }
   log("Pushing sites ...");
   const pushStartTime = Date.now();
-  const pushInstance = await createPushInstance();
+  const pushInstance = await createPushInstance({
+    requiresConsoleAuth: true,
+    organizationId: localConfig.getProject().organizationId
+  });
   const result = await pushInstance.pushSites(
     withResolvedResourcePaths("sites", sites2),
     {
@@ -149153,7 +149367,7 @@ var pushSite = async ({
   }
   if (cliConfig.verbose) {
     errors.forEach((e) => {
-      console.error(e);
+      console.error(formatErrorForLog(e));
     });
   }
 };
@@ -149236,7 +149450,10 @@ var pushFunction = async ({
   }
   log("Pushing functions ...");
   const pushStartTime = Date.now();
-  const pushInstance = await createPushInstance();
+  const pushInstance = await createPushInstance({
+    requiresConsoleAuth: true,
+    organizationId: localConfig.getProject().organizationId
+  });
   const result = await pushInstance.pushFunctions(
     withResolvedResourcePaths("functions", functions2),
     {
@@ -149291,7 +149508,7 @@ var pushFunction = async ({
   }
   if (cliConfig.verbose) {
     errors.forEach((e) => {
-      console.error(e);
+      console.error(formatErrorForLog(e));
     });
   }
 };
@@ -149436,7 +149653,7 @@ var pushTable = async ({
     success2(`Successfully pushed ${successfullyPushed} tables.`);
   }
   if (cliConfig.verbose) {
-    errors.forEach((e) => console.error(e));
+    errors.forEach((e) => console.error(formatErrorForLog(e)));
   }
 };
 var pushCollection = async () => {
@@ -149500,7 +149717,7 @@ var pushCollection = async () => {
     success2(`Successfully pushed ${successfullyPushed} collections.`);
   }
   if (cliConfig.verbose) {
-    errors.forEach((e) => console.error(e));
+    errors.forEach((e) => console.error(formatErrorForLog(e)));
   }
 };
 var pushBucket = async () => {
@@ -149550,7 +149767,7 @@ var pushBucket = async () => {
     success2(`Successfully pushed ${successfullyPushed} buckets.`);
   }
   if (cliConfig.verbose) {
-    errors.forEach((e) => console.error(e));
+    errors.forEach((e) => console.error(formatErrorForLog(e)));
   }
 };
 var pushTeam = async () => {
@@ -149600,7 +149817,7 @@ var pushTeam = async () => {
     success2(`Successfully pushed ${successfullyPushed} teams.`);
   }
   if (cliConfig.verbose) {
-    errors.forEach((e) => console.error(e));
+    errors.forEach((e) => console.error(formatErrorForLog(e)));
   }
 };
 var pushWebhook = async () => {
@@ -149650,7 +149867,7 @@ var pushWebhook = async () => {
     success2(`Successfully pushed ${successfullyPushed} webhooks.`);
   }
   if (cliConfig.verbose) {
-    errors.forEach((e) => console.error(e));
+    errors.forEach((e) => console.error(formatErrorForLog(e)));
   }
 };
 var pushMessagingTopic = async () => {
@@ -149700,7 +149917,7 @@ var pushMessagingTopic = async () => {
     success2(`Successfully pushed ${successfullyPushed} topics.`);
   }
   if (cliConfig.verbose) {
-    errors.forEach((e) => console.error(e));
+    errors.forEach((e) => console.error(formatErrorForLog(e)));
   }
 };
 var push = new Command("push").description(commandDescriptions["push"]).action(actionRunner(() => pushResources({ skipDeprecated: true })));