@pilatos/bitbucket-cli 1.13.0 → 1.13.2

package/dist/index.js

@@ -12239,73 +12239,6 @@ var require_form_data = __commonJS((exports, module) => {
   module.exports = FormData2;
 });
 
-// node_modules/proxy-from-env/index.js
-var require_proxy_from_env = __commonJS((exports) => {
-  var parseUrl = __require("url").parse;
-  var DEFAULT_PORTS = {
-    ftp: 21,
-    gopher: 70,
-    http: 80,
-    https: 443,
-    ws: 80,
-    wss: 443
-  };
-  var stringEndsWith = String.prototype.endsWith || function(s) {
-    return s.length <= this.length && this.indexOf(s, this.length - s.length) !== -1;
-  };
-  function getProxyForUrl(url2) {
-    var parsedUrl = typeof url2 === "string" ? parseUrl(url2) : url2 || {};
-    var proto2 = parsedUrl.protocol;
-    var hostname = parsedUrl.host;
-    var port = parsedUrl.port;
-    if (typeof hostname !== "string" || !hostname || typeof proto2 !== "string") {
-      return "";
-    }
-    proto2 = proto2.split(":", 1)[0];
-    hostname = hostname.replace(/:\d*$/, "");
-    port = parseInt(port) || DEFAULT_PORTS[proto2] || 0;
-    if (!shouldProxy(hostname, port)) {
-      return "";
-    }
-    var proxy = getEnv("npm_config_" + proto2 + "_proxy") || getEnv(proto2 + "_proxy") || getEnv("npm_config_proxy") || getEnv("all_proxy");
-    if (proxy && proxy.indexOf("://") === -1) {
-      proxy = proto2 + "://" + proxy;
-    }
-    return proxy;
-  }
-  function shouldProxy(hostname, port) {
-    var NO_PROXY = (getEnv("npm_config_no_proxy") || getEnv("no_proxy")).toLowerCase();
-    if (!NO_PROXY) {
-      return true;
-    }
-    if (NO_PROXY === "*") {
-      return false;
-    }
-    return NO_PROXY.split(/[,\s]/).every(function(proxy) {
-      if (!proxy) {
-        return true;
-      }
-      var parsedProxy = proxy.match(/^(.+):(\d+)$/);
-      var parsedProxyHostname = parsedProxy ? parsedProxy[1] : proxy;
-      var parsedProxyPort = parsedProxy ? parseInt(parsedProxy[2]) : 0;
-      if (parsedProxyPort && parsedProxyPort !== port) {
-        return true;
-      }
-      if (!/^[.*]/.test(parsedProxyHostname)) {
-        return hostname !== parsedProxyHostname;
-      }
-      if (parsedProxyHostname.charAt(0) === "*") {
-        parsedProxyHostname = parsedProxyHostname.slice(1);
-      }
-      return !stringEndsWith.call(hostname, parsedProxyHostname);
-    });
-  }
-  function getEnv(key) {
-    return process.env[key.toLowerCase()] || process.env[key.toUpperCase()] || "";
-  }
-  exports.getProxyForUrl = getProxyForUrl;
-});
-
 // node_modules/ms/index.js
 var require_ms = __commonJS((exports, module) => {
   var s = 1000;
@@ -13351,7 +13284,7 @@ var require_follow_redirects = __commonJS((exports, module) => {
       removeMatchingHeaders(/^content-/i, this._options.headers);
     }
     var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
-    var currentUrlParts = parseUrl(this._currentUrl);
+    var currentUrlParts = parseUrl2(this._currentUrl);
     var currentHost = currentHostHeader || currentUrlParts.host;
     var currentUrl = /^\w+:/.test(location) ? this._currentUrl : url2.format(Object.assign(currentUrlParts, { host: currentHost }));
     var redirectUrl = resolveUrl(location, currentUrl);
@@ -13390,7 +13323,7 @@ var require_follow_redirects = __commonJS((exports, module) => {
         if (isURL(input)) {
           input = spreadUrlObject(input);
         } else if (isString2(input)) {
-          input = spreadUrlObject(parseUrl(input));
+          input = spreadUrlObject(parseUrl2(input));
         } else {
           callback = options;
           options = validateUrl(input);
@@ -13425,7 +13358,7 @@ var require_follow_redirects = __commonJS((exports, module) => {
     return exports2;
   }
   function noop2() {}
-  function parseUrl(input) {
+  function parseUrl2(input) {
     var parsed;
     if (useNativeURL) {
       parsed = new URL2(input);
@@ -13438,7 +13371,7 @@ var require_follow_redirects = __commonJS((exports, module) => {
     return parsed;
   }
   function resolveUrl(relative, base) {
-    return useNativeURL ? new URL2(relative, base) : parseUrl(url2.resolve(base, relative));
+    return useNativeURL ? new URL2(relative, base) : parseUrl2(url2.resolve(base, relative));
   }
   function validateUrl(input) {
     if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
@@ -14257,10 +14190,10 @@ class Container {
 }
 var ServiceTokens = {
   ConfigService: "ConfigService",
+  CredentialStore: "CredentialStore",
   GitService: "GitService",
   ContextService: "ContextService",
   OutputService: "OutputService",
-  HttpClient: "HttpClient",
   OAuthService: "OAuthService",
   VersionService: "VersionService",
   PullrequestsApi: "PullrequestsApi",
@@ -14321,7 +14254,7 @@ var ServiceTokens = {
 };
 
 // src/services/config.service.ts
-import { join, win32 } from "path";
+import { posix, win32 } from "path";
 import { homedir } from "os";
 
 // src/types/errors.ts
@@ -14394,14 +14327,15 @@ class ConfigService {
   configCache = null;
   constructor(configDir, options = {}) {
     const platform = options.platform ?? process.platform;
-    const joinPath = platform === "win32" ? win32.join : join;
+    const joinPath = platform === "win32" ? win32.join : posix.join;
     this.configDir = configDir ?? this.resolveDefaultConfigDir({ ...options, platform });
     this.configFile = joinPath(this.configDir, "config.json");
   }
   resolveDefaultConfigDir(options) {
     const platform = options.platform ?? process.platform;
+    const isSimulatedPlatform = options.platform !== undefined;
     if (platform === "win32") {
-      const appDataDir = options.appData ?? process.env.APPDATA;
+      const appDataDir = options.appData ?? (isSimulatedPlatform ? undefined : process.env.APPDATA);
       if (appDataDir) {
         return win32.join(appDataDir, "bb");
       }
@@ -14409,7 +14343,7 @@ class ConfigService {
       return win32.join(homeDir2, "AppData", "Roaming", "bb");
     }
     const homeDir = options.homeDir ?? homedir();
-    return join(homeDir, ".config", "bb");
+    return posix.join(homeDir, ".config", "bb");
   }
   async ensureConfigDir() {
     try {
@@ -14636,14 +14570,14 @@ class ContextService {
     this.configService = configService;
   }
   parseRemoteUrl(url) {
-    const sshMatch = new RegExp(/git@bitbucket\.org:([^/]+)\/([^.]+)(?:\.git)?/).exec(url);
+    const sshMatch = /git@bitbucket\.org:([^/]+)\/([^.]+)(?:\.git)?/.exec(url);
     if (sshMatch) {
       return {
         workspace: sshMatch[1],
         repoSlug: sshMatch[2]
       };
     }
-    const httpsMatch = new RegExp(/https?:\/\/(?:[^@]+@)?bitbucket\.org\/([^/]+)\/([^/.]+)(?:\.git)?/).exec(url);
+    const httpsMatch = /https?:\/\/(?:[^@]+@)?bitbucket\.org\/([^/]+)\/([^/.]+)(?:\.git)?/.exec(url);
     if (httpsMatch) {
       return {
         workspace: httpsMatch[1],
@@ -14700,6 +14634,19 @@ class ContextService {
     }
     return context;
   }
+  async requireWorkspace(explicit) {
+    if (explicit && explicit.length > 0) {
+      return explicit;
+    }
+    const config = await this.configService.getConfig();
+    if (config.defaultWorkspace && config.defaultWorkspace.length > 0) {
+      return config.defaultWorkspace;
+    }
+    throw new BBError({
+      code: 6002 /* CONTEXT_WORKSPACE_NOT_FOUND */,
+      message: "No workspace specified. Use --workspace option or set a default workspace with `bb config set defaultWorkspace <name>`."
+    });
+  }
 }
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
@@ -15585,16 +15532,40 @@ var isEmptyObject = (val) => {
 };
 var isDate = kindOfTest("Date");
 var isFile = kindOfTest("File");
+var isReactNativeBlob = (value) => {
+  return !!(value && typeof value.uri !== "undefined");
+};
+var isReactNative = (formData) => formData && typeof formData.getParts !== "undefined";
 var isBlob = kindOfTest("Blob");
 var isFileList = kindOfTest("FileList");
 var isStream = (val) => isObject(val) && isFunction(val.pipe);
+function getGlobal() {
+  if (typeof globalThis !== "undefined")
+    return globalThis;
+  if (typeof self !== "undefined")
+    return self;
+  if (typeof window !== "undefined")
+    return window;
+  if (typeof global !== "undefined")
+    return global;
+  return {};
+}
+var G = getGlobal();
+var FormDataCtor = typeof G.FormData !== "undefined" ? G.FormData : undefined;
 var isFormData = (thing) => {
   let kind;
-  return thing && (typeof FormData === "function" && thing instanceof FormData || isFunction(thing.append) && ((kind = kindOf(thing)) === "formdata" || kind === "object" && isFunction(thing.toString) && thing.toString() === "[object FormData]"));
+  return thing && (FormDataCtor && thing instanceof FormDataCtor || isFunction(thing.append) && ((kind = kindOf(thing)) === "formdata" || kind === "object" && isFunction(thing.toString) && thing.toString() === "[object FormData]"));
 };
 var isURLSearchParams = kindOfTest("URLSearchParams");
-var [isReadableStream, isRequest, isResponse, isHeaders] = ["ReadableStream", "Request", "Response", "Headers"].map(kindOfTest);
-var trim = (str) => str.trim ? str.trim() : str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "");
+var [isReadableStream, isRequest, isResponse, isHeaders] = [
+  "ReadableStream",
+  "Request",
+  "Response",
+  "Headers"
+].map(kindOfTest);
+var trim = (str) => {
+  return str.trim ? str.trim() : str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "");
+};
 function forEach(obj, fn, { allOwnKeys = false } = {}) {
   if (obj === null || typeof obj === "undefined") {
     return;
@@ -15647,6 +15618,9 @@ function merge() {
   const { caseless, skipUndefined } = isContextDefined(this) && this || {};
   const result = {};
   const assignValue = (val, key) => {
+    if (key === "__proto__" || key === "constructor" || key === "prototype") {
+      return;
+    }
     const targetKey = caseless && findKey(result, key) || key;
     if (isPlainObject(result[targetKey]) && isPlainObject(val)) {
       result[targetKey] = merge(result[targetKey], val);
@@ -15666,9 +15640,19 @@ function merge() {
 var extend = (a, b, thisArg, { allOwnKeys } = {}) => {
   forEach(b, (val, key) => {
     if (thisArg && isFunction(val)) {
-      a[key] = bind(val, thisArg);
+      Object.defineProperty(a, key, {
+        value: bind(val, thisArg),
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
     } else {
-      a[key] = val;
+      Object.defineProperty(a, key, {
+        value: val,
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
     }
   }, { allOwnKeys });
   return a;
@@ -15681,7 +15665,12 @@ var stripBOM = (content) => {
 };
 var inherits = (constructor, superConstructor, props, descriptors) => {
   constructor.prototype = Object.create(superConstructor.prototype, descriptors);
-  constructor.prototype.constructor = constructor;
+  Object.defineProperty(constructor.prototype, "constructor", {
+    value: constructor,
+    writable: true,
+    enumerable: false,
+    configurable: true
+  });
   Object.defineProperty(constructor, "super", {
     value: superConstructor.prototype
   });
@@ -15874,6 +15863,8 @@ var utils_default = {
   isUndefined,
   isDate,
   isFile,
+  isReactNativeBlob,
+  isReactNative,
   isBlob,
   isRegExp,
   isFunction,
@@ -15916,25 +15907,36 @@ var utils_default = {
 };
 
 // node_modules/axios/lib/core/AxiosError.js
-function AxiosError(message, code, config, request, response) {
-  Error.call(this);
-  if (Error.captureStackTrace) {
-    Error.captureStackTrace(this, this.constructor);
-  } else {
-    this.stack = new Error().stack;
-  }
-  this.message = message;
-  this.name = "AxiosError";
-  code && (this.code = code);
-  config && (this.config = config);
-  request && (this.request = request);
-  if (response) {
-    this.response = response;
-    this.status = response.status ? response.status : null;
+class AxiosError extends Error {
+  static from(error, code, config, request, response, customProps) {
+    const axiosError = new AxiosError(error.message, code || error.code, config, request, response);
+    axiosError.cause = error;
+    axiosError.name = error.name;
+    if (error.status != null && axiosError.status == null) {
+      axiosError.status = error.status;
+    }
+    customProps && Object.assign(axiosError, customProps);
+    return axiosError;
+  }
+  constructor(message, code, config, request, response) {
+    super(message);
+    Object.defineProperty(this, "message", {
+      value: message,
+      enumerable: true,
+      writable: true,
+      configurable: true
+    });
+    this.name = "AxiosError";
+    this.isAxiosError = true;
+    code && (this.code = code);
+    config && (this.config = config);
+    request && (this.request = request);
+    if (response) {
+      this.response = response;
+      this.status = response.status;
+    }
   }
-}
-utils_default.inherits(AxiosError, Error, {
-  toJSON: function toJSON() {
+  toJSON() {
     return {
       message: this.message,
       name: this.name,
@@ -15949,44 +15951,19 @@ utils_default.inherits(AxiosError, Error, {
       status: this.status
     };
   }
-});
-var prototype = AxiosError.prototype;
-var descriptors = {};
-[
-  "ERR_BAD_OPTION_VALUE",
-  "ERR_BAD_OPTION",
-  "ECONNABORTED",
-  "ETIMEDOUT",
-  "ERR_NETWORK",
-  "ERR_FR_TOO_MANY_REDIRECTS",
-  "ERR_DEPRECATED",
-  "ERR_BAD_RESPONSE",
-  "ERR_BAD_REQUEST",
-  "ERR_CANCELED",
-  "ERR_NOT_SUPPORT",
-  "ERR_INVALID_URL"
-].forEach((code) => {
-  descriptors[code] = { value: code };
-});
-Object.defineProperties(AxiosError, descriptors);
-Object.defineProperty(prototype, "isAxiosError", { value: true });
-AxiosError.from = (error, code, config, request, response, customProps) => {
-  const axiosError = Object.create(prototype);
-  utils_default.toFlatObject(error, axiosError, function filter(obj) {
-    return obj !== Error.prototype;
-  }, (prop) => {
-    return prop !== "isAxiosError";
-  });
-  const msg = error && error.message ? error.message : "Error";
-  const errCode = code == null && error ? error.code : code;
-  AxiosError.call(axiosError, msg, errCode, config, request, response);
-  if (error && axiosError.cause == null) {
-    Object.defineProperty(axiosError, "cause", { value: error, configurable: true });
-  }
-  axiosError.name = error && error.name || "Error";
-  customProps && Object.assign(axiosError, customProps);
-  return axiosError;
-};
+}
+AxiosError.ERR_BAD_OPTION_VALUE = "ERR_BAD_OPTION_VALUE";
+AxiosError.ERR_BAD_OPTION = "ERR_BAD_OPTION";
+AxiosError.ECONNABORTED = "ECONNABORTED";
+AxiosError.ETIMEDOUT = "ETIMEDOUT";
+AxiosError.ERR_NETWORK = "ERR_NETWORK";
+AxiosError.ERR_FR_TOO_MANY_REDIRECTS = "ERR_FR_TOO_MANY_REDIRECTS";
+AxiosError.ERR_DEPRECATED = "ERR_DEPRECATED";
+AxiosError.ERR_BAD_RESPONSE = "ERR_BAD_RESPONSE";
+AxiosError.ERR_BAD_REQUEST = "ERR_BAD_REQUEST";
+AxiosError.ERR_CANCELED = "ERR_CANCELED";
+AxiosError.ERR_NOT_SUPPORT = "ERR_NOT_SUPPORT";
+AxiosError.ERR_INVALID_URL = "ERR_INVALID_URL";
 var AxiosError_default = AxiosError;
 
 // node_modules/axios/lib/platform/node/classes/FormData.js
@@ -16054,6 +16031,10 @@ function toFormData(obj, formData, options) {
   }
   function defaultVisitor(value, key, path) {
     let arr = value;
+    if (utils_default.isReactNative(formData) && utils_default.isReactNativeBlob(value)) {
+      formData.append(renderKey(path, key, dots), convertValue(value));
+      return false;
+    }
     if (value && !path && typeof value === "object") {
       if (utils_default.endsWith(key, "{}")) {
         key = metaTokens ? key : key.slice(0, -2);
@@ -16120,11 +16101,11 @@ function AxiosURLSearchParams(params, options) {
   this._pairs = [];
   params && toFormData_default(params, this, options);
 }
-var prototype2 = AxiosURLSearchParams.prototype;
-prototype2.append = function append(name, value) {
+var prototype = AxiosURLSearchParams.prototype;
+prototype.append = function append(name, value) {
   this._pairs.push([name, value]);
 };
-prototype2.toString = function toString2(encoder) {
+prototype.toString = function toString2(encoder) {
   const _encode = encoder ? function(value) {
     return encoder.call(this, value, encode);
   } : encode;
@@ -16143,17 +16124,15 @@ function buildURL(url, params, options) {
     return url;
   }
   const _encode = options && options.encode || encode2;
-  if (utils_default.isFunction(options)) {
-    options = {
-      serialize: options
-    };
-  }
-  const serializeFn = options && options.serialize;
+  const _options = utils_default.isFunction(options) ? {
+    serialize: options
+  } : options;
+  const serializeFn = _options && _options.serialize;
   let serializedParams;
   if (serializeFn) {
-    serializedParams = serializeFn(params, options);
+    serializedParams = serializeFn(params, _options);
   } else {
-    serializedParams = utils_default.isURLSearchParams(params) ? params.toString() : new AxiosURLSearchParams_default(params, options).toString(_encode);
+    serializedParams = utils_default.isURLSearchParams(params) ? params.toString() : new AxiosURLSearchParams_default(params, _options).toString(_encode);
   }
   if (serializedParams) {
     const hashmarkIndex = url.indexOf("#");
@@ -16203,7 +16182,8 @@ var InterceptorManager_default = InterceptorManager;
 var transitional_default = {
   silentJSONParsing: true,
   forcedJSONParsing: true,
-  clarifyTimeoutError: false
+  clarifyTimeoutError: false,
+  legacyInterceptorReqResOrdering: true
 };
 
 // node_modules/axios/lib/platform/node/index.js
@@ -16351,66 +16331,70 @@ function stringifySafely(rawValue, parser, encoder) {
 var defaults = {
   transitional: transitional_default,
   adapter: ["xhr", "http", "fetch"],
-  transformRequest: [function transformRequest(data, headers) {
-    const contentType = headers.getContentType() || "";
-    const hasJSONContentType = contentType.indexOf("application/json") > -1;
-    const isObjectPayload = utils_default.isObject(data);
-    if (isObjectPayload && utils_default.isHTMLForm(data)) {
-      data = new FormData(data);
-    }
-    const isFormData2 = utils_default.isFormData(data);
-    if (isFormData2) {
-      return hasJSONContentType ? JSON.stringify(formDataToJSON_default(data)) : data;
-    }
-    if (utils_default.isArrayBuffer(data) || utils_default.isBuffer(data) || utils_default.isStream(data) || utils_default.isFile(data) || utils_default.isBlob(data) || utils_default.isReadableStream(data)) {
-      return data;
-    }
-    if (utils_default.isArrayBufferView(data)) {
-      return data.buffer;
-    }
-    if (utils_default.isURLSearchParams(data)) {
-      headers.setContentType("application/x-www-form-urlencoded;charset=utf-8", false);
-      return data.toString();
-    }
-    let isFileList2;
-    if (isObjectPayload) {
-      if (contentType.indexOf("application/x-www-form-urlencoded") > -1) {
-        return toURLEncodedForm(data, this.formSerializer).toString();
+  transformRequest: [
+    function transformRequest(data, headers) {
+      const contentType = headers.getContentType() || "";
+      const hasJSONContentType = contentType.indexOf("application/json") > -1;
+      const isObjectPayload = utils_default.isObject(data);
+      if (isObjectPayload && utils_default.isHTMLForm(data)) {
+        data = new FormData(data);
+      }
+      const isFormData2 = utils_default.isFormData(data);
+      if (isFormData2) {
+        return hasJSONContentType ? JSON.stringify(formDataToJSON_default(data)) : data;
+      }
+      if (utils_default.isArrayBuffer(data) || utils_default.isBuffer(data) || utils_default.isStream(data) || utils_default.isFile(data) || utils_default.isBlob(data) || utils_default.isReadableStream(data)) {
+        return data;
+      }
+      if (utils_default.isArrayBufferView(data)) {
+        return data.buffer;
+      }
+      if (utils_default.isURLSearchParams(data)) {
+        headers.setContentType("application/x-www-form-urlencoded;charset=utf-8", false);
+        return data.toString();
+      }
+      let isFileList2;
+      if (isObjectPayload) {
+        if (contentType.indexOf("application/x-www-form-urlencoded") > -1) {
+          return toURLEncodedForm(data, this.formSerializer).toString();
+        }
+        if ((isFileList2 = utils_default.isFileList(data)) || contentType.indexOf("multipart/form-data") > -1) {
+          const _FormData = this.env && this.env.FormData;
+          return toFormData_default(isFileList2 ? { "files[]": data } : data, _FormData && new _FormData, this.formSerializer);
+        }
       }
-      if ((isFileList2 = utils_default.isFileList(data)) || contentType.indexOf("multipart/form-data") > -1) {
-        const _FormData = this.env && this.env.FormData;
-        return toFormData_default(isFileList2 ? { "files[]": data } : data, _FormData && new _FormData, this.formSerializer);
+      if (isObjectPayload || hasJSONContentType) {
+        headers.setContentType("application/json", false);
+        return stringifySafely(data);
       }
-    }
-    if (isObjectPayload || hasJSONContentType) {
-      headers.setContentType("application/json", false);
-      return stringifySafely(data);
-    }
-    return data;
-  }],
-  transformResponse: [function transformResponse(data) {
-    const transitional = this.transitional || defaults.transitional;
-    const forcedJSONParsing = transitional && transitional.forcedJSONParsing;
-    const JSONRequested = this.responseType === "json";
-    if (utils_default.isResponse(data) || utils_default.isReadableStream(data)) {
       return data;
     }
-    if (data && utils_default.isString(data) && (forcedJSONParsing && !this.responseType || JSONRequested)) {
-      const silentJSONParsing = transitional && transitional.silentJSONParsing;
-      const strictJSONParsing = !silentJSONParsing && JSONRequested;
-      try {
-        return JSON.parse(data, this.parseReviver);
-      } catch (e) {
-        if (strictJSONParsing) {
-          if (e.name === "SyntaxError") {
-            throw AxiosError_default.from(e, AxiosError_default.ERR_BAD_RESPONSE, this, null, this.response);
+  ],
+  transformResponse: [
+    function transformResponse(data) {
+      const transitional = this.transitional || defaults.transitional;
+      const forcedJSONParsing = transitional && transitional.forcedJSONParsing;
+      const JSONRequested = this.responseType === "json";
+      if (utils_default.isResponse(data) || utils_default.isReadableStream(data)) {
+        return data;
+      }
+      if (data && utils_default.isString(data) && (forcedJSONParsing && !this.responseType || JSONRequested)) {
+        const silentJSONParsing = transitional && transitional.silentJSONParsing;
+        const strictJSONParsing = !silentJSONParsing && JSONRequested;
+        try {
+          return JSON.parse(data, this.parseReviver);
+        } catch (e) {
+          if (strictJSONParsing) {
+            if (e.name === "SyntaxError") {
+              throw AxiosError_default.from(e, AxiosError_default.ERR_BAD_RESPONSE, this, null, this.response);
+            }
+            throw e;
           }
-          throw e;
         }
       }
+      return data;
     }
-    return data;
-  }],
+  ],
   timeout: 0,
   xsrfCookieName: "XSRF-TOKEN",
   xsrfHeaderName: "X-XSRF-TOKEN",
@@ -16483,14 +16467,38 @@ var parseHeaders_default = (rawHeaders) => {
 
 // node_modules/axios/lib/core/AxiosHeaders.js
 var $internals = Symbol("internals");
+var isValidHeaderValue = (value) => !/[\r\n]/.test(value);
+function assertValidHeaderValue(value, header) {
+  if (value === false || value == null) {
+    return;
+  }
+  if (utils_default.isArray(value)) {
+    value.forEach((v) => assertValidHeaderValue(v, header));
+    return;
+  }
+  if (!isValidHeaderValue(String(value))) {
+    throw new Error(`Invalid character in header content ["${header}"]`);
+  }
+}
 function normalizeHeader(header) {
   return header && String(header).trim().toLowerCase();
 }
+function stripTrailingCRLF(str) {
+  let end = str.length;
+  while (end > 0) {
+    const charCode = str.charCodeAt(end - 1);
+    if (charCode !== 10 && charCode !== 13) {
+      break;
+    }
+    end -= 1;
+  }
+  return end === str.length ? str : str.slice(0, end);
+}
 function normalizeValue(value) {
   if (value === false || value == null) {
     return value;
   }
-  return utils_default.isArray(value) ? value.map(normalizeValue) : String(value);
+  return utils_default.isArray(value) ? value.map(normalizeValue) : stripTrailingCRLF(String(value));
 }
 function parseTokens(str) {
   const tokens = Object.create(null);
@@ -16548,6 +16556,7 @@ class AxiosHeaders {
       }
       const key = utils_default.findKey(self2, lHeader);
       if (!key || self2[key] === undefined || _rewrite === true || _rewrite === undefined && self2[key] !== false) {
+        assertValidHeaderValue(_value, _header);
         self2[key || _header] = normalizeValue(_value);
       }
     }
@@ -16688,11 +16697,11 @@ class AxiosHeaders {
       accessors: {}
     };
     const accessors = internals.accessors;
-    const prototype3 = this.prototype;
+    const prototype2 = this.prototype;
     function defineAccessor(_header) {
       const lHeader = normalizeHeader(_header);
       if (!accessors[lHeader]) {
-        buildAccessors(prototype3, _header);
+        buildAccessors(prototype2, _header);
         accessors[lHeader] = true;
       }
     }
@@ -16700,7 +16709,14 @@ class AxiosHeaders {
     return this;
   }
 }
-AxiosHeaders.accessor(["Content-Type", "Content-Length", "Accept", "Accept-Encoding", "User-Agent", "Authorization"]);
+AxiosHeaders.accessor([
+  "Content-Type",
+  "Content-Length",
+  "Accept",
+  "Accept-Encoding",
+  "User-Agent",
+  "Authorization"
+]);
 utils_default.reduceDescriptors(AxiosHeaders.prototype, ({ value }, key) => {
   let mapped = key[0].toUpperCase() + key.slice(1);
   return {
@@ -16732,13 +16748,13 @@ function isCancel(value) {
 }
 
 // node_modules/axios/lib/cancel/CanceledError.js
-function CanceledError(message, config, request) {
-  AxiosError_default.call(this, message == null ? "canceled" : message, AxiosError_default.ERR_CANCELED, config, request);
-  this.name = "CanceledError";
+class CanceledError extends AxiosError_default {
+  constructor(message, config, request) {
+    super(message == null ? "canceled" : message, AxiosError_default.ERR_CANCELED, config, request);
+    this.name = "CanceledError";
+    this.__CANCEL__ = true;
+  }
 }
-utils_default.inherits(CanceledError, AxiosError_default, {
-  __CANCEL__: true
-});
 var CanceledError_default = CanceledError;
 
 // node_modules/axios/lib/core/settle.js
@@ -16753,6 +16769,9 @@ function settle(resolve, reject, response) {
 
 // node_modules/axios/lib/helpers/isAbsoluteURL.js
 function isAbsoluteURL(url2) {
+  if (typeof url2 !== "string") {
+    return false;
+  }
   return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url2);
 }
 
@@ -16770,8 +16789,74 @@ function buildFullPath(baseURL, requestedURL, allowAbsoluteUrls) {
   return requestedURL;
 }
 
+// node_modules/proxy-from-env/index.js
+var DEFAULT_PORTS = {
+  ftp: 21,
+  gopher: 70,
+  http: 80,
+  https: 443,
+  ws: 80,
+  wss: 443
+};
+function parseUrl(urlString) {
+  try {
+    return new URL(urlString);
+  } catch {
+    return null;
+  }
+}
+function getProxyForUrl(url2) {
+  var parsedUrl = (typeof url2 === "string" ? parseUrl(url2) : url2) || {};
+  var proto2 = parsedUrl.protocol;
+  var hostname = parsedUrl.host;
+  var port = parsedUrl.port;
+  if (typeof hostname !== "string" || !hostname || typeof proto2 !== "string") {
+    return "";
+  }
+  proto2 = proto2.split(":", 1)[0];
+  hostname = hostname.replace(/:\d*$/, "");
+  port = parseInt(port) || DEFAULT_PORTS[proto2] || 0;
+  if (!shouldProxy(hostname, port)) {
+    return "";
+  }
+  var proxy = getEnv(proto2 + "_proxy") || getEnv("all_proxy");
+  if (proxy && proxy.indexOf("://") === -1) {
+    proxy = proto2 + "://" + proxy;
+  }
+  return proxy;
+}
+function shouldProxy(hostname, port) {
+  var NO_PROXY = getEnv("no_proxy").toLowerCase();
+  if (!NO_PROXY) {
+    return true;
+  }
+  if (NO_PROXY === "*") {
+    return false;
+  }
+  return NO_PROXY.split(/[,\s]/).every(function(proxy) {
+    if (!proxy) {
+      return true;
+    }
+    var parsedProxy = proxy.match(/^(.+):(\d+)$/);
+    var parsedProxyHostname = parsedProxy ? parsedProxy[1] : proxy;
+    var parsedProxyPort = parsedProxy ? parseInt(parsedProxy[2]) : 0;
+    if (parsedProxyPort && parsedProxyPort !== port) {
+      return true;
+    }
+    if (!/^[.*]/.test(parsedProxyHostname)) {
+      return hostname !== parsedProxyHostname;
+    }
+    if (parsedProxyHostname.charAt(0) === "*") {
+      parsedProxyHostname = parsedProxyHostname.slice(1);
+    }
+    return !hostname.endsWith(parsedProxyHostname);
+  });
+}
+function getEnv(key) {
+  return process.env[key.toLowerCase()] || process.env[key.toUpperCase()] || "";
+}
+
 // node_modules/axios/lib/adapters/http.js
-var import_proxy_from_env = __toESM(require_proxy_from_env(), 1);
 var import_follow_redirects = __toESM(require_follow_redirects(), 1);
 import http from "http";
 import https from "https";
@@ -16780,7 +16865,7 @@ import util2 from "util";
 import zlib from "zlib";
 
 // node_modules/axios/lib/env/data.js
-var VERSION = "1.13.2";
+var VERSION = "1.15.0";
 
 // node_modules/axios/lib/helpers/parseProtocol.js
 function parseProtocol(url2) {
@@ -17077,6 +17162,83 @@ var callbackify = (fn, reducer) => {
 };
 var callbackify_default = callbackify;
 
+// node_modules/axios/lib/helpers/shouldBypassProxy.js
+var DEFAULT_PORTS2 = {
+  http: 80,
+  https: 443,
+  ws: 80,
+  wss: 443,
+  ftp: 21
+};
+var parseNoProxyEntry = (entry) => {
+  let entryHost = entry;
+  let entryPort = 0;
+  if (entryHost.charAt(0) === "[") {
+    const bracketIndex = entryHost.indexOf("]");
+    if (bracketIndex !== -1) {
+      const host = entryHost.slice(1, bracketIndex);
+      const rest = entryHost.slice(bracketIndex + 1);
+      if (rest.charAt(0) === ":" && /^\d+$/.test(rest.slice(1))) {
+        entryPort = Number.parseInt(rest.slice(1), 10);
+      }
+      return [host, entryPort];
+    }
+  }
+  const firstColon = entryHost.indexOf(":");
+  const lastColon = entryHost.lastIndexOf(":");
+  if (firstColon !== -1 && firstColon === lastColon && /^\d+$/.test(entryHost.slice(lastColon + 1))) {
+    entryPort = Number.parseInt(entryHost.slice(lastColon + 1), 10);
+    entryHost = entryHost.slice(0, lastColon);
+  }
+  return [entryHost, entryPort];
+};
+var normalizeNoProxyHost = (hostname) => {
+  if (!hostname) {
+    return hostname;
+  }
+  if (hostname.charAt(0) === "[" && hostname.charAt(hostname.length - 1) === "]") {
+    hostname = hostname.slice(1, -1);
+  }
+  return hostname.replace(/\.+$/, "");
+};
+function shouldBypassProxy(location) {
+  let parsed;
+  try {
+    parsed = new URL(location);
+  } catch (_err) {
+    return false;
+  }
+  const noProxy = (process.env.no_proxy || process.env.NO_PROXY || "").toLowerCase();
+  if (!noProxy) {
+    return false;
+  }
+  if (noProxy === "*") {
+    return true;
+  }
+  const port = Number.parseInt(parsed.port, 10) || DEFAULT_PORTS2[parsed.protocol.split(":", 1)[0]] || 0;
+  const hostname = normalizeNoProxyHost(parsed.hostname.toLowerCase());
+  return noProxy.split(/[\s,]+/).some((entry) => {
+    if (!entry) {
+      return false;
+    }
+    let [entryHost, entryPort] = parseNoProxyEntry(entry);
+    entryHost = normalizeNoProxyHost(entryHost);
+    if (!entryHost) {
+      return false;
+    }
+    if (entryPort && entryPort !== port) {
+      return false;
+    }
+    if (entryHost.charAt(0) === "*") {
+      entryHost = entryHost.slice(1);
+    }
+    if (entryHost.charAt(0) === ".") {
+      return hostname.endsWith(entryHost);
+    }
+    return hostname === entryHost;
+  });
+}
+
 // node_modules/axios/lib/helpers/speedometer.js
 function speedometer(samplesCount, min) {
   samplesCount = samplesCount || 10;
@@ -17175,11 +17337,14 @@ var progressEventReducer = (listener, isDownloadStream, freq = 3) => {
 };
 var progressEventDecorator = (total, throttled) => {
   const lengthComputable = total != null;
-  return [(loaded) => throttled[0]({
-    lengthComputable,
-    total,
-    loaded
-  }), throttled[1]];
+  return [
+    (loaded) => throttled[0]({
+      lengthComputable,
+      total,
+      loaded
+    }),
+    throttled[1]
+  ];
 };
 var asyncDecorator = (fn) => (...args) => utils_default.asap(() => fn(...args));
 
@@ -17288,6 +17453,9 @@ class Http2Sessions {
           } else {
             entries.splice(i, 1);
           }
+          if (!session.closed) {
+            session.close();
+          }
           return;
         }
       }
@@ -17316,10 +17484,7 @@ class Http2Sessions {
       };
     }
     session.once("close", removeSession);
-    let entry = [
-      session,
-      options
-    ];
+    let entry = [session, options];
     authoritySessions ? authoritySessions.push(entry) : authoritySessions = this.sessions[authority] = [entry];
     return session;
   }
@@ -17336,9 +17501,11 @@ function dispatchBeforeRedirect(options, responseDetails) {
 function setProxy(options, configProxy, location) {
   let proxy = configProxy;
   if (!proxy && proxy !== false) {
-    const proxyUrl = import_proxy_from_env.default.getProxyForUrl(location);
+    const proxyUrl = getProxyForUrl(location);
     if (proxyUrl) {
-      proxy = new URL(proxyUrl);
+      if (!shouldBypassProxy(location)) {
+        proxy = new URL(proxyUrl);
+      }
     }
   }
   if (proxy) {
@@ -17346,8 +17513,11 @@ function setProxy(options, configProxy, location) {
       proxy.auth = (proxy.username || "") + ":" + (proxy.password || "");
     }
     if (proxy.auth) {
-      if (proxy.auth.username || proxy.auth.password) {
+      const validProxyAuth = Boolean(proxy.auth.username || proxy.auth.password);
+      if (validProxyAuth) {
         proxy.auth = (proxy.auth.username || "") + ":" + (proxy.auth.password || "");
+      } else if (typeof proxy.auth === "object") {
+        throw new AxiosError_default("Invalid proxy authorization", AxiosError_default.ERR_BAD_OPTION, { proxy });
       }
       const base64 = Buffer.from(proxy.auth, "utf8").toString("base64");
       options.headers["Proxy-Authorization"] = "Basic " + base64;
@@ -17400,15 +17570,10 @@ var resolveFamily = ({ address, family }) => {
 var buildAddressEntry = (address, family) => resolveFamily(utils_default.isObject(address) ? address : { address, family });
 var http2Transport = {
   request(options, cb) {
-    const authority = options.protocol + "//" + options.hostname + ":" + (options.port || 80);
+    const authority = options.protocol + "//" + options.hostname + ":" + (options.port || (options.protocol === "https:" ? 443 : 80));
     const { http2Options, headers } = options;
     const session = http2Sessions.getSession(authority, http2Options);
-    const {
-      HTTP2_HEADER_SCHEME,
-      HTTP2_HEADER_METHOD,
-      HTTP2_HEADER_PATH,
-      HTTP2_HEADER_STATUS
-    } = http2.constants;
+    const { HTTP2_HEADER_SCHEME, HTTP2_HEADER_METHOD, HTTP2_HEADER_PATH, HTTP2_HEADER_STATUS } = http2.constants;
     const http2Headers = {
       [HTTP2_HEADER_SCHEME]: options.protocol.replace(":", ""),
       [HTTP2_HEADER_METHOD]: options.method,
@@ -17595,9 +17760,12 @@ var http_default = isHttpAdapterSupported && function httpAdapter(config) {
       if (!utils_default.isStream(data)) {
         data = stream3.Readable.from(data, { objectMode: false });
       }
-      data = stream3.pipeline([data, new AxiosTransformStream_default({
-        maxRate: utils_default.toFiniteNumber(maxUploadRate)
-      })], utils_default.noop);
+      data = stream3.pipeline([
+        data,
+        new AxiosTransformStream_default({
+          maxRate: utils_default.toFiniteNumber(maxUploadRate)
+        })
+      ], utils_default.noop);
       onUploadProgress && data.on("progress", flushOnFinish(data, progressEventDecorator(contentLength, progressEventReducer(asyncDecorator(onUploadProgress), false, 3))));
     }
     let auth = undefined;
@@ -17942,7 +18110,9 @@ function mergeConfig(config1, config2) {
     headers: (a, b, prop) => mergeDeepProperties(headersToObject(a), headersToObject(b), prop, true)
   };
   utils_default.forEach(Object.keys({ ...config1, ...config2 }), function computeConfigValue(prop) {
-    const merge2 = mergeMap[prop] || mergeDeepProperties;
+    if (prop === "__proto__" || prop === "constructor" || prop === "prototype")
+      return;
+    const merge2 = utils_default.hasOwnProp(mergeMap, prop) ? mergeMap[prop] : mergeDeepProperties;
     const configValue = merge2(config1[prop], config2[prop], prop);
     utils_default.isUndefined(configValue) && merge2 !== mergeDirectKeys || (config[prop] = configValue);
   });
@@ -18122,7 +18292,7 @@ var composeSignals = (signals, timeout) => {
     };
     let timer = timeout && setTimeout(() => {
       timer = null;
-      onabort(new AxiosError_default(`timeout ${timeout} of ms exceeded`, AxiosError_default.ETIMEDOUT));
+      onabort(new AxiosError_default(`timeout of ${timeout}ms exceeded`, AxiosError_default.ETIMEDOUT));
     }, timeout);
     const unsubscribe = () => {
       if (signals) {
@@ -18226,10 +18396,7 @@ var globalFetchAPI = (({ Request, Response: Response2 }) => ({
   Request,
   Response: Response2
 }))(utils_default.global);
-var {
-  ReadableStream: ReadableStream2,
-  TextEncoder: TextEncoder2
-} = utils_default.global;
+var { ReadableStream: ReadableStream2, TextEncoder: TextEncoder2 } = utils_default.global;
 var test = (fn, ...args) => {
   try {
     return !!fn(...args);
@@ -18252,14 +18419,16 @@ var factory = (env2) => {
   const encodeText = isFetchSupported && (typeof TextEncoder2 === "function" ? ((encoder) => (str) => encoder.encode(str))(new TextEncoder2) : async (str) => new Uint8Array(await new Request(str).arrayBuffer()));
   const supportsRequestStream = isRequestSupported && isReadableStreamSupported && test(() => {
     let duplexAccessed = false;
+    const body = new ReadableStream2;
     const hasContentType = new Request(platform_default.origin, {
-      body: new ReadableStream2,
+      body,
       method: "POST",
       get duplex() {
         duplexAccessed = true;
         return "half";
       }
     }).headers.has("Content-Type");
+    body.cancel();
     return duplexAccessed && !hasContentType;
   });
   const supportsResponseStream = isResponseSupported && isReadableStreamSupported && test(() => utils_default.isReadableStream(new Response2("").body));
@@ -18388,11 +18557,11 @@ var factory = (env2) => {
     } catch (err) {
       unsubscribe && unsubscribe();
       if (err && err.name === "TypeError" && /Load failed|fetch/i.test(err.message)) {
-        throw Object.assign(new AxiosError_default("Network Error", AxiosError_default.ERR_NETWORK, config, request), {
+        throw Object.assign(new AxiosError_default("Network Error", AxiosError_default.ERR_NETWORK, config, request, err && err.response), {
           cause: err.cause || err
         });
       }
-      throw AxiosError_default.from(err, err && err.code, config, request);
+      throw AxiosError_default.from(err, err && err.code, config, request, err && err.response);
     }
   };
 };
@@ -18400,11 +18569,7 @@ var seedCache = new Map;
 var getFetch = (config) => {
   let env2 = config && config.env || {};
   const { fetch: fetch2, Request, Response: Response2 } = env2;
-  const seeds = [
-    Request,
-    Response2,
-    fetch2
-  ];
+  const seeds = [Request, Response2, fetch2];
   let len = seeds.length, i = len, seed, target, map = seedCache;
   while (i--) {
     seed = seeds[i];
@@ -18577,13 +18742,27 @@ class Axios {
       if (err instanceof Error) {
         let dummy = {};
         Error.captureStackTrace ? Error.captureStackTrace(dummy) : dummy = new Error;
-        const stack = dummy.stack ? dummy.stack.replace(/^.+\n/, "") : "";
+        const stack = (() => {
+          if (!dummy.stack) {
+            return "";
+          }
+          const firstNewlineIndex = dummy.stack.indexOf(`
+`);
+          return firstNewlineIndex === -1 ? "" : dummy.stack.slice(firstNewlineIndex + 1);
+        })();
         try {
           if (!err.stack) {
             err.stack = stack;
-          } else if (stack && !String(err.stack).endsWith(stack.replace(/^.+\n.+\n/, ""))) {
-            err.stack += `
+          } else if (stack) {
+            const firstNewlineIndex = stack.indexOf(`
+`);
+            const secondNewlineIndex = firstNewlineIndex === -1 ? -1 : stack.indexOf(`
+`, firstNewlineIndex + 1);
+            const stackWithoutTwoTopLines = secondNewlineIndex === -1 ? "" : stack.slice(secondNewlineIndex + 1);
+            if (!String(err.stack).endsWith(stackWithoutTwoTopLines)) {
+              err.stack += `
 ` + stack;
+            }
           }
         } catch (e) {}
       }
@@ -18603,7 +18782,8 @@ class Axios {
       validator_default.assertOptions(transitional2, {
         silentJSONParsing: validators2.transitional(validators2.boolean),
         forcedJSONParsing: validators2.transitional(validators2.boolean),
-        clarifyTimeoutError: validators2.transitional(validators2.boolean)
+        clarifyTimeoutError: validators2.transitional(validators2.boolean),
+        legacyInterceptorReqResOrdering: validators2.transitional(validators2.boolean)
       }, false);
     }
     if (paramsSerializer != null) {
@@ -18640,7 +18820,13 @@ class Axios {
         return;
       }
       synchronousRequestInterceptors = synchronousRequestInterceptors && interceptor.synchronous;
-      requestInterceptorChain.unshift(interceptor.fulfilled, interceptor.rejected);
+      const transitional3 = config.transitional || transitional_default;
+      const legacyInterceptorReqResOrdering = transitional3 && transitional3.legacyInterceptorReqResOrdering;
+      if (legacyInterceptorReqResOrdering) {
+        requestInterceptorChain.unshift(interceptor.fulfilled, interceptor.rejected);
+      } else {
+        requestInterceptorChain.push(interceptor.fulfilled, interceptor.rejected);
+      }
     });
     const responseInterceptorChain = [];
     this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
@@ -18976,7 +19162,7 @@ function getRetryDelay(error, attempt) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-function createApiClient(configService, oauthService) {
+function createApiClient(credentialStore, oauthService) {
   const instance = axios_default.create({
     baseURL: BASE_URL,
     headers: {
@@ -18988,12 +19174,12 @@ function createApiClient(configService, oauthService) {
     if (process.env.DEBUG === "true") {
       console.debug(`[HTTP] ${config.method?.toUpperCase()} ${config.url}`);
     }
-    const authMethod = await configService.getAuthMethod();
+    const authMethod = await credentialStore.getAuthMethod();
     if (authMethod === "oauth" && oauthService) {
       const accessToken = await oauthService.getValidAccessToken();
       config.headers.Authorization = `Bearer ${accessToken}`;
     } else {
-      const credentials = await configService.getCredentials();
+      const credentials = await credentialStore.getCredentials();
       const authString = Buffer.from(`${credentials.username}:${credentials.apiToken}`).toString("base64");
       config.headers.Authorization = `Basic ${authString}`;
     }
@@ -19015,7 +19201,7 @@ function createApiClient(configService, oauthService) {
     if (error.response?.status === 401 && oauthService) {
       const config = error.config;
       if (config && !config.__tokenRefreshed) {
-        const authMethod = await configService.getAuthMethod();
+        const authMethod = await credentialStore.getAuthMethod();
         if (authMethod === "oauth") {
           try {
             config.__tokenRefreshed = true;
@@ -19105,8 +19291,10 @@ function generateState() {
 
 class OAuthService {
   configService;
-  constructor(configService) {
+  credentialStore;
+  constructor(configService, credentialStore) {
     this.configService = configService;
+    this.credentialStore = credentialStore;
   }
   async authorize(clientId, clientSecret) {
     const resolvedClientId = clientId ?? await this.getClientId();
@@ -19115,7 +19303,7 @@ class OAuthService {
     const { code } = await this.waitForCallback(authUrl, state);
     const tokenResponse = await this.exchangeCode(code, resolvedClientId, clientSecret);
     const expiresAt = Math.floor(Date.now() / 1000) + tokenResponse.expires_in;
-    await this.configService.setOAuthCredentials({
+    await this.credentialStore.setOAuthCredentials({
       accessToken: tokenResponse.access_token,
       refreshToken: tokenResponse.refresh_token,
       expiresAt
@@ -19130,7 +19318,7 @@ class OAuthService {
     return userInfo;
   }
   async refreshAccessToken() {
-    const credentials = await this.configService.getOAuthCredentials();
+    const credentials = await this.credentialStore.getOAuthCredentials();
     const clientId = await this.getClientId();
     const clientSecret = await this.getClientSecret();
     const params = new URLSearchParams({
@@ -19155,7 +19343,7 @@ class OAuthService {
     }
     const tokenResponse = await response.json();
     const expiresAt = Math.floor(Date.now() / 1000) + tokenResponse.expires_in;
-    await this.configService.setOAuthCredentials({
+    await this.credentialStore.setOAuthCredentials({
       accessToken: tokenResponse.access_token,
       refreshToken: tokenResponse.refresh_token,
       expiresAt
@@ -19164,7 +19352,7 @@ class OAuthService {
   }
   async revokeToken() {
     try {
-      const credentials = await this.configService.getOAuthCredentials();
+      const credentials = await this.credentialStore.getOAuthCredentials();
       const clientId = await this.getClientId();
       const clientSecret = await this.getClientSecret();
       const params = new URLSearchParams({
@@ -19181,11 +19369,11 @@ class OAuthService {
     } catch {}
   }
   async getValidAccessToken() {
-    const isExpired = await this.configService.isOAuthTokenExpired();
+    const isExpired = await this.credentialStore.isOAuthTokenExpired();
     if (isExpired) {
       return this.refreshAccessToken();
     }
-    const credentials = await this.configService.getOAuthCredentials();
+    const credentials = await this.credentialStore.getOAuthCredentials();
     return credentials.accessToken;
   }
   async getClientId() {
@@ -19480,21 +19668,6 @@ h1{
 `);
   }
 }
-// src/services/workspace-resolver.ts
-var NO_WORKSPACE_MESSAGE = "No workspace specified. Use --workspace option or set a default workspace with `bb config set defaultWorkspace <name>`.";
-async function resolveWorkspace(configService, explicit) {
-  if (explicit && explicit.length > 0) {
-    return explicit;
-  }
-  const config = await configService.getConfig();
-  if (config.defaultWorkspace && config.defaultWorkspace.length > 0) {
-    return config.defaultWorkspace;
-  }
-  throw new BBError({
-    code: 6002 /* CONTEXT_WORKSPACE_NOT_FOUND */,
-    message: NO_WORKSPACE_MESSAGE
-  });
-}
 // src/services/snippet-files.service.ts
 import fs6 from "fs";
 import path2 from "path";
@@ -19592,7 +19765,7 @@ async function updatePullRequestReviewers(pullrequestsApi, repoContext, prId, tr
     workspace: repoContext.workspace,
     repoSlug: repoContext.repoSlug,
     pullRequestId: prId,
-    body
+    pullrequest: body
   });
   return response.data;
 }
@@ -19600,12 +19773,15 @@ async function updatePullRequestReviewers(pullrequestsApi, repoContext, prId, tr
 var DEFAULT_LIMIT = 25;
 var MAX_PAGE_LENGTH = 50;
 function parseLimit(limit, fallback = DEFAULT_LIMIT) {
-  if (!limit) {
+  if (limit === undefined || limit === "") {
     return fallback;
   }
   const parsed = Number.parseInt(limit, 10);
-  if (Number.isNaN(parsed) || parsed <= 0) {
-    return fallback;
+  if (!Number.isFinite(parsed) || parsed < 1) {
+    throw new BBError({
+      code: 5002 /* VALIDATION_INVALID */,
+      message: "--limit must be a positive integer"
+    });
   }
   return parsed;
 }
@@ -19852,7 +20028,7 @@ var CommitStatusesApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut: async (commit, key, repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut: async (commit, key, repoSlug, workspace, commitstatus, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut", "commit", commit);
       assertParamExists("repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut", "key", key);
       assertParamExists("repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut", "repoSlug", repoSlug);
@@ -19874,13 +20050,13 @@ var CommitStatusesApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(commitstatus, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost: async (commit, repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost: async (commit, repoSlug, workspace, commitstatus, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost", "commit", commit);
       assertParamExists("repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost", "workspace", workspace);
@@ -19901,7 +20077,7 @@ var CommitStatusesApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(commitstatus, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -19983,14 +20159,14 @@ var CommitStatusesApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["CommitStatusesApi.repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut(commit, key, repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut(commit, key, repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut(commit, key, repoSlug, workspace, commitstatus, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut(commit, key, repoSlug, workspace, commitstatus, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["CommitStatusesApi.repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost(commit, repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost(commit, repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost(commit, repoSlug, workspace, commitstatus, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost(commit, repoSlug, workspace, commitstatus, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["CommitStatusesApi.repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -20014,10 +20190,10 @@ class CommitStatusesApi extends BaseAPI {
     return CommitStatusesApiFp(this.configuration).repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyGet(requestParameters.commit, requestParameters.key, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut(requestParameters, options) {
-    return CommitStatusesApiFp(this.configuration).repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut(requestParameters.commit, requestParameters.key, requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return CommitStatusesApiFp(this.configuration).repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildKeyPut(requestParameters.commit, requestParameters.key, requestParameters.repoSlug, requestParameters.workspace, requestParameters.commitstatus, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost(requestParameters, options) {
-    return CommitStatusesApiFp(this.configuration).repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost(requestParameters.commit, requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return CommitStatusesApiFp(this.configuration).repositoriesWorkspaceRepoSlugCommitCommitStatusesBuildPost(requestParameters.commit, requestParameters.repoSlug, requestParameters.workspace, requestParameters.commitstatus, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugCommitCommitStatusesGet(requestParameters, options) {
     return CommitStatusesApiFp(this.configuration).repositoriesWorkspaceRepoSlugCommitCommitStatusesGet(requestParameters.commit, requestParameters.repoSlug, requestParameters.workspace, requestParameters.refname, requestParameters.q, requestParameters.sort, options).then((request) => request(this.axios, this.basePath));
@@ -20233,7 +20409,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPullrequestsPost: async (repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPullrequestsPost: async (repoSlug, workspace, pullrequest, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPost", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPost", "workspace", workspace);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/pullrequests`.replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
@@ -20253,7 +20429,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(pullrequest, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -20386,12 +20562,12 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut: async (commentId, pullRequestId, repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut: async (commentId, pullRequestId, repoSlug, workspace, pullrequestComment, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut", "commentId", commentId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut", "pullRequestId", pullRequestId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut", "workspace", workspace);
-      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut", "body", body);
+      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut", "pullrequestComment", pullrequestComment);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/pullrequests/{pull_request_id}/comments/{comment_id}`.replace(`{${"comment_id"}}`, encodeURIComponent(String(commentId))).replace(`{${"pull_request_id"}}`, encodeURIComponent(String(pullRequestId))).replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -20409,7 +20585,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(pullrequestComment, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -20492,11 +20668,11 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost: async (pullRequestId, repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost: async (pullRequestId, repoSlug, workspace, pullrequestComment, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost", "pullRequestId", pullRequestId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost", "workspace", workspace);
-      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost", "body", body);
+      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost", "pullrequestComment", pullrequestComment);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/pullrequests/{pull_request_id}/comments`.replace(`{${"pull_request_id"}}`, encodeURIComponent(String(pullRequestId))).replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -20514,7 +20690,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(pullrequestComment, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -20643,7 +20819,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost: async (pullRequestId, repoSlug, workspace, async, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost: async (pullRequestId, repoSlug, workspace, async, pullrequestMergeParameters, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost", "pullRequestId", pullRequestId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost", "workspace", workspace);
@@ -20667,7 +20843,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(pullrequestMergeParameters, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -20722,7 +20898,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut: async (pullRequestId, repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut: async (pullRequestId, repoSlug, workspace, pullrequest, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut", "pullRequestId", pullRequestId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut", "workspace", workspace);
@@ -20743,7 +20919,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(pullrequest, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -20864,11 +21040,11 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost: async (pullRequestId, repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost: async (pullRequestId, repoSlug, workspace, pullrequestTaskCreate, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost", "pullRequestId", pullRequestId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost", "workspace", workspace);
-      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost", "body", body);
+      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost", "pullrequestTaskCreate", pullrequestTaskCreate);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/pullrequests/{pull_request_id}/tasks`.replace(`{${"pull_request_id"}}`, encodeURIComponent(String(pullRequestId))).replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -20886,7 +21062,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(pullrequestTaskCreate, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -20944,12 +21120,12 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut: async (pullRequestId, repoSlug, taskId, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut: async (pullRequestId, repoSlug, taskId, workspace, pullrequestTaskUpdate, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut", "pullRequestId", pullRequestId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut", "taskId", taskId);
       assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut", "workspace", workspace);
-      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut", "body", body);
+      assertParamExists("repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut", "pullrequestTaskUpdate", pullrequestTaskUpdate);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/pullrequests/{pull_request_id}/tasks/{task_id}`.replace(`{${"pull_request_id"}}`, encodeURIComponent(String(pullRequestId))).replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"task_id"}}`, encodeURIComponent(String(taskId))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -20967,7 +21143,7 @@ var PullrequestsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(pullrequestTaskUpdate, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -21053,8 +21229,8 @@ var PullrequestsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPullrequestsPost(repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPost(repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPullrequestsPost(repoSlug, workspace, pullrequest, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPost(repoSlug, workspace, pullrequest, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -21089,8 +21265,8 @@ var PullrequestsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut(commentId, pullRequestId, repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut(commentId, pullRequestId, repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut(commentId, pullRequestId, repoSlug, workspace, pullrequestComment, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut(commentId, pullRequestId, repoSlug, workspace, pullrequestComment, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -21113,8 +21289,8 @@ var PullrequestsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost(pullRequestId, repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost(pullRequestId, repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost(pullRequestId, repoSlug, workspace, pullrequestComment, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost(pullRequestId, repoSlug, workspace, pullrequestComment, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -21149,8 +21325,8 @@ var PullrequestsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost(pullRequestId, repoSlug, workspace, async, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost(pullRequestId, repoSlug, workspace, async, body, options);
+    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost(pullRequestId, repoSlug, workspace, async, pullrequestMergeParameters, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost(pullRequestId, repoSlug, workspace, async, pullrequestMergeParameters, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -21167,8 +21343,8 @@ var PullrequestsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPatchGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut(pullRequestId, repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut(pullRequestId, repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut(pullRequestId, repoSlug, workspace, pullrequest, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut(pullRequestId, repoSlug, workspace, pullrequest, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -21197,8 +21373,8 @@ var PullrequestsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost(pullRequestId, repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost(pullRequestId, repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost(pullRequestId, repoSlug, workspace, pullrequestTaskCreate, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost(pullRequestId, repoSlug, workspace, pullrequestTaskCreate, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -21215,8 +21391,8 @@ var PullrequestsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut(pullRequestId, repoSlug, taskId, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut(pullRequestId, repoSlug, taskId, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut(pullRequestId, repoSlug, taskId, workspace, pullrequestTaskUpdate, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut(pullRequestId, repoSlug, taskId, workspace, pullrequestTaskUpdate, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["PullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -21255,7 +21431,7 @@ class PullrequestsApi extends BaseAPI {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsGet(requestParameters.repoSlug, requestParameters.workspace, requestParameters.state, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPost(requestParameters, options) {
-    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPost(requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPost(requestParameters.repoSlug, requestParameters.workspace, requestParameters.pullrequest, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdActivityGet(requestParameters, options) {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdActivityGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -21273,7 +21449,7 @@ class PullrequestsApi extends BaseAPI {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdGet(requestParameters.commentId, requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut(requestParameters, options) {
-    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut(requestParameters.commentId, requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut(requestParameters.commentId, requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.pullrequestComment, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdResolveDelete(requestParameters, options) {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdResolveDelete(requestParameters.commentId, requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -21285,7 +21461,7 @@ class PullrequestsApi extends BaseAPI {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost(requestParameters, options) {
-    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.pullrequestComment, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommitsGet(requestParameters, options) {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommitsGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -21303,7 +21479,7 @@ class PullrequestsApi extends BaseAPI {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost(requestParameters, options) {
-    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.async, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.async, requestParameters.pullrequestMergeParameters, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergeTaskStatusTaskIdGet(requestParameters, options) {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergeTaskStatusTaskIdGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.taskId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -21312,7 +21488,7 @@ class PullrequestsApi extends BaseAPI {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPatchGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut(requestParameters, options) {
-    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.pullrequest, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdRequestChangesDelete(requestParameters, options) {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdRequestChangesDelete(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -21327,7 +21503,7 @@ class PullrequestsApi extends BaseAPI {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.q, requestParameters.sort, requestParameters.pagelen, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost(requestParameters, options) {
-    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksPost(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.workspace, requestParameters.pullrequestTaskCreate, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdDelete(requestParameters, options) {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdDelete(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.taskId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -21336,7 +21512,7 @@ class PullrequestsApi extends BaseAPI {
     return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdGet(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.taskId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut(requestParameters, options) {
-    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.taskId, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return PullrequestsApiFp(this.configuration).repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdTasksTaskIdPut(requestParameters.pullRequestId, requestParameters.repoSlug, requestParameters.taskId, requestParameters.workspace, requestParameters.pullrequestTaskUpdate, options).then((request) => request(this.axios, this.basePath));
   }
   workspacesWorkspacePullrequestsSelectedUserGet(requestParameters, options) {
     return PullrequestsApiFp(this.configuration).workspacesWorkspacePullrequestsSelectedUserGet(requestParameters.selectedUser, requestParameters.workspace, requestParameters.state, options).then((request) => request(this.axios, this.basePath));
@@ -21505,7 +21681,7 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugForksPost: async (repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugForksPost: async (repoSlug, workspace, repository, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugForksPost", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugForksPost", "workspace", workspace);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/forks`.replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
@@ -21525,7 +21701,7 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(repository, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -21800,11 +21976,11 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut: async (groupSlug, repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut: async (groupSlug, repoSlug, workspace, bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut", "groupSlug", groupSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut", "workspace", workspace);
-      assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut", "body", body);
+      assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut", "bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema", bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/permissions-config/groups/{group_slug}`.replace(`{${"group_slug"}}`, encodeURIComponent(String(groupSlug))).replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -21822,7 +21998,7 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -21902,11 +22078,11 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut: async (repoSlug, selectedUserId, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut: async (repoSlug, selectedUserId, workspace, bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut", "selectedUserId", selectedUserId);
       assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut", "workspace", workspace);
-      assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut", "body", body);
+      assertParamExists("repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut", "bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema", bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema);
       const localVarPath = `/repositories/{workspace}/{repo_slug}/permissions-config/users/{selected_user_id}`.replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"selected_user_id"}}`, encodeURIComponent(String(selectedUserId))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -21924,13 +22100,13 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPost: async (repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPost: async (repoSlug, workspace, repository, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPost", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPost", "workspace", workspace);
       const localVarPath = `/repositories/{workspace}/{repo_slug}`.replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
@@ -21950,13 +22126,13 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(repository, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
       };
     },
-    repositoriesWorkspaceRepoSlugPut: async (repoSlug, workspace, body, options = {}) => {
+    repositoriesWorkspaceRepoSlugPut: async (repoSlug, workspace, repository, options = {}) => {
       assertParamExists("repositoriesWorkspaceRepoSlugPut", "repoSlug", repoSlug);
       assertParamExists("repositoriesWorkspaceRepoSlugPut", "workspace", workspace);
       const localVarPath = `/repositories/{workspace}/{repo_slug}`.replace(`{${"repo_slug"}}`, encodeURIComponent(String(repoSlug))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
@@ -21976,7 +22152,7 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(repository, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -22137,6 +22313,35 @@ var RepositoriesApiAxiosParamCreator = function(configuration) {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
       };
+    },
+    userWorkspacesWorkspacePermissionsRepositoriesGet: async (workspace, q, sort, options = {}) => {
+      assertParamExists("userWorkspacesWorkspacePermissionsRepositoriesGet", "workspace", workspace);
+      const localVarPath = `/user/workspaces/{workspace}/permissions/repositories`.replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
+      const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+      let baseOptions;
+      if (configuration) {
+        baseOptions = configuration.baseOptions;
+      }
+      const localVarRequestOptions = { method: "GET", ...baseOptions, ...options };
+      const localVarHeaderParameter = {};
+      const localVarQueryParameter = {};
+      await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration);
+      await setOAuthToObject(localVarHeaderParameter, "oauth2", ["account", "repository"], configuration);
+      setBasicAuthToObject(localVarRequestOptions, configuration);
+      if (q !== undefined) {
+        localVarQueryParameter["q"] = q;
+      }
+      if (sort !== undefined) {
+        localVarQueryParameter["sort"] = sort;
+      }
+      localVarHeaderParameter["Accept"] = "application/json";
+      setSearchParams(localVarUrlObj, localVarQueryParameter);
+      let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+      localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
+      return {
+        url: toPathString(localVarUrlObj),
+        options: localVarRequestOptions
+      };
     }
   };
 };
@@ -22173,8 +22378,8 @@ var RepositoriesApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugForksGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugForksPost(repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugForksPost(repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugForksPost(repoSlug, workspace, repository, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugForksPost(repoSlug, workspace, repository, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugForksPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -22245,8 +22450,8 @@ var RepositoriesApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut(groupSlug, repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut(groupSlug, repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut(groupSlug, repoSlug, workspace, bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut(groupSlug, repoSlug, workspace, bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -22269,20 +22474,20 @@ var RepositoriesApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut(repoSlug, selectedUserId, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut(repoSlug, selectedUserId, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut(repoSlug, selectedUserId, workspace, bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut(repoSlug, selectedUserId, workspace, bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPost(repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPost(repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPost(repoSlug, workspace, repository, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPost(repoSlug, workspace, repository, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async repositoriesWorkspaceRepoSlugPut(repoSlug, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPut(repoSlug, workspace, body, options);
+    async repositoriesWorkspaceRepoSlugPut(repoSlug, workspace, repository, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.repositoriesWorkspaceRepoSlugPut(repoSlug, workspace, repository, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.repositoriesWorkspaceRepoSlugPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -22316,6 +22521,12 @@ var RepositoriesApiFp = function(configuration) {
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.userPermissionsRepositoriesGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
+    },
+    async userWorkspacesWorkspacePermissionsRepositoriesGet(workspace, q, sort, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.userWorkspacesWorkspacePermissionsRepositoriesGet(workspace, q, sort, options);
+      const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+      const localVarOperationServerBasePath = operationServerMap["RepositoriesApi.userWorkspacesWorkspacePermissionsRepositoriesGet"]?.[localVarOperationServerIndex]?.url;
+      return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     }
   };
 };
@@ -22336,7 +22547,7 @@ class RepositoriesApi extends BaseAPI {
     return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugForksGet(requestParameters.repoSlug, requestParameters.workspace, requestParameters.role, requestParameters.q, requestParameters.sort, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugForksPost(requestParameters, options) {
-    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugForksPost(requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugForksPost(requestParameters.repoSlug, requestParameters.workspace, requestParameters.repository, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugGet(requestParameters, options) {
     return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugGet(requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -22372,7 +22583,7 @@ class RepositoriesApi extends BaseAPI {
     return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugGet(requestParameters.groupSlug, requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut(requestParameters, options) {
-    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut(requestParameters.groupSlug, requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPermissionsConfigGroupsGroupSlugPut(requestParameters.groupSlug, requestParameters.repoSlug, requestParameters.workspace, requestParameters.bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPermissionsConfigUsersGet(requestParameters, options) {
     return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPermissionsConfigUsersGet(requestParameters.repoSlug, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -22384,13 +22595,13 @@ class RepositoriesApi extends BaseAPI {
     return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdGet(requestParameters.repoSlug, requestParameters.selectedUserId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut(requestParameters, options) {
-    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut(requestParameters.repoSlug, requestParameters.selectedUserId, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPermissionsConfigUsersSelectedUserIdPut(requestParameters.repoSlug, requestParameters.selectedUserId, requestParameters.workspace, requestParameters.bitbucketAppsPermissionsSerializersRepoPermissionUpdateSchema, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPost(requestParameters, options) {
-    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPost(requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPost(requestParameters.repoSlug, requestParameters.workspace, requestParameters.repository, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugPut(requestParameters, options) {
-    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPut(requestParameters.repoSlug, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugPut(requestParameters.repoSlug, requestParameters.workspace, requestParameters.repository, options).then((request) => request(this.axios, this.basePath));
   }
   repositoriesWorkspaceRepoSlugSrcCommitPathGet(requestParameters, options) {
     return RepositoriesApiFp(this.configuration).repositoriesWorkspaceRepoSlugSrcCommitPathGet(requestParameters.commit, requestParameters.path, requestParameters.repoSlug, requestParameters.workspace, requestParameters.format, requestParameters.q, requestParameters.sort, requestParameters.maxDepth, options).then((request) => request(this.axios, this.basePath));
@@ -22407,6 +22618,9 @@ class RepositoriesApi extends BaseAPI {
   userPermissionsRepositoriesGet(requestParameters = {}, options) {
     return RepositoriesApiFp(this.configuration).userPermissionsRepositoriesGet(requestParameters.q, requestParameters.sort, options).then((request) => request(this.axios, this.basePath));
   }
+  userWorkspacesWorkspacePermissionsRepositoriesGet(requestParameters, options) {
+    return RepositoriesApiFp(this.configuration).userWorkspacesWorkspacePermissionsRepositoriesGet(requestParameters.workspace, requestParameters.q, requestParameters.sort, options).then((request) => request(this.axios, this.basePath));
+  }
 }
 var SnippetsApiAxiosParamCreator = function(configuration) {
   return {
@@ -22435,8 +22649,8 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    snippetsPost: async (body, options = {}) => {
-      assertParamExists("snippetsPost", "body", body);
+    snippetsPost: async (snippet, options = {}) => {
+      assertParamExists("snippetsPost", "snippet", snippet);
       const localVarPath = `/snippets`;
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -22454,7 +22668,7 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(snippet, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -22510,11 +22724,11 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    snippetsWorkspaceEncodedIdCommentsCommentIdPut: async (commentId, encodedId, workspace, body, options = {}) => {
+    snippetsWorkspaceEncodedIdCommentsCommentIdPut: async (commentId, encodedId, workspace, snippetComment, options = {}) => {
       assertParamExists("snippetsWorkspaceEncodedIdCommentsCommentIdPut", "commentId", commentId);
       assertParamExists("snippetsWorkspaceEncodedIdCommentsCommentIdPut", "encodedId", encodedId);
       assertParamExists("snippetsWorkspaceEncodedIdCommentsCommentIdPut", "workspace", workspace);
-      assertParamExists("snippetsWorkspaceEncodedIdCommentsCommentIdPut", "body", body);
+      assertParamExists("snippetsWorkspaceEncodedIdCommentsCommentIdPut", "snippetComment", snippetComment);
       const localVarPath = `/snippets/{workspace}/{encoded_id}/comments/{comment_id}`.replace(`{${"comment_id"}}`, encodeURIComponent(String(commentId))).replace(`{${"encoded_id"}}`, encodeURIComponent(String(encodedId))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -22532,7 +22746,7 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(snippetComment, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -22562,10 +22776,10 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    snippetsWorkspaceEncodedIdCommentsPost: async (encodedId, workspace, body, options = {}) => {
+    snippetsWorkspaceEncodedIdCommentsPost: async (encodedId, workspace, snippetComment, options = {}) => {
       assertParamExists("snippetsWorkspaceEncodedIdCommentsPost", "encodedId", encodedId);
       assertParamExists("snippetsWorkspaceEncodedIdCommentsPost", "workspace", workspace);
-      assertParamExists("snippetsWorkspaceEncodedIdCommentsPost", "body", body);
+      assertParamExists("snippetsWorkspaceEncodedIdCommentsPost", "snippetComment", snippetComment);
       const localVarPath = `/snippets/{workspace}/{encoded_id}/comments`.replace(`{${"encoded_id"}}`, encodeURIComponent(String(encodedId))).replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -22583,7 +22797,7 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(snippetComment, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -23011,9 +23225,9 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
         options: localVarRequestOptions
       };
     },
-    snippetsWorkspacePost: async (workspace, body, options = {}) => {
+    snippetsWorkspacePost: async (workspace, snippet, options = {}) => {
       assertParamExists("snippetsWorkspacePost", "workspace", workspace);
-      assertParamExists("snippetsWorkspacePost", "body", body);
+      assertParamExists("snippetsWorkspacePost", "snippet", snippet);
       const localVarPath = `/snippets/{workspace}`.replace(`{${"workspace"}}`, encodeURIComponent(String(workspace)));
       const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
       let baseOptions;
@@ -23031,7 +23245,7 @@ var SnippetsApiAxiosParamCreator = function(configuration) {
       setSearchParams(localVarUrlObj, localVarQueryParameter);
       let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
       localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
-      localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions, configuration);
+      localVarRequestOptions.data = serializeDataIfNeeded(snippet, localVarRequestOptions, configuration);
       return {
         url: toPathString(localVarUrlObj),
         options: localVarRequestOptions
@@ -23048,8 +23262,8 @@ var SnippetsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async snippetsPost(body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsPost(body, options);
+    async snippetsPost(snippet, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsPost(snippet, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -23066,8 +23280,8 @@ var SnippetsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsWorkspaceEncodedIdCommentsCommentIdGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async snippetsWorkspaceEncodedIdCommentsCommentIdPut(commentId, encodedId, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsWorkspaceEncodedIdCommentsCommentIdPut(commentId, encodedId, workspace, body, options);
+    async snippetsWorkspaceEncodedIdCommentsCommentIdPut(commentId, encodedId, workspace, snippetComment, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsWorkspaceEncodedIdCommentsCommentIdPut(commentId, encodedId, workspace, snippetComment, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsWorkspaceEncodedIdCommentsCommentIdPut"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -23078,8 +23292,8 @@ var SnippetsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsWorkspaceEncodedIdCommentsGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async snippetsWorkspaceEncodedIdCommentsPost(encodedId, workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsWorkspaceEncodedIdCommentsPost(encodedId, workspace, body, options);
+    async snippetsWorkspaceEncodedIdCommentsPost(encodedId, workspace, snippetComment, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsWorkspaceEncodedIdCommentsPost(encodedId, workspace, snippetComment, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsWorkspaceEncodedIdCommentsPost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -23186,8 +23400,8 @@ var SnippetsApiFp = function(configuration) {
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsWorkspaceGet"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
     },
-    async snippetsWorkspacePost(workspace, body, options) {
-      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsWorkspacePost(workspace, body, options);
+    async snippetsWorkspacePost(workspace, snippet, options) {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.snippetsWorkspacePost(workspace, snippet, options);
       const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
       const localVarOperationServerBasePath = operationServerMap["SnippetsApi.snippetsWorkspacePost"]?.[localVarOperationServerIndex]?.url;
       return (axios2, basePath) => createRequestFunction(localVarAxiosArgs, axios_default, BASE_PATH, configuration)(axios2, localVarOperationServerBasePath || basePath);
@@ -23199,7 +23413,7 @@ class SnippetsApi extends BaseAPI {
     return SnippetsApiFp(this.configuration).snippetsGet(requestParameters.role, options).then((request) => request(this.axios, this.basePath));
   }
   snippetsPost(requestParameters, options) {
-    return SnippetsApiFp(this.configuration).snippetsPost(requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return SnippetsApiFp(this.configuration).snippetsPost(requestParameters.snippet, options).then((request) => request(this.axios, this.basePath));
   }
   snippetsWorkspaceEncodedIdCommentsCommentIdDelete(requestParameters, options) {
     return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommentsCommentIdDelete(requestParameters.commentId, requestParameters.encodedId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -23208,13 +23422,13 @@ class SnippetsApi extends BaseAPI {
     return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommentsCommentIdGet(requestParameters.commentId, requestParameters.encodedId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   snippetsWorkspaceEncodedIdCommentsCommentIdPut(requestParameters, options) {
-    return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommentsCommentIdPut(requestParameters.commentId, requestParameters.encodedId, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommentsCommentIdPut(requestParameters.commentId, requestParameters.encodedId, requestParameters.workspace, requestParameters.snippetComment, options).then((request) => request(this.axios, this.basePath));
   }
   snippetsWorkspaceEncodedIdCommentsGet(requestParameters, options) {
     return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommentsGet(requestParameters.encodedId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
   }
   snippetsWorkspaceEncodedIdCommentsPost(requestParameters, options) {
-    return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommentsPost(requestParameters.encodedId, requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommentsPost(requestParameters.encodedId, requestParameters.workspace, requestParameters.snippetComment, options).then((request) => request(this.axios, this.basePath));
   }
   snippetsWorkspaceEncodedIdCommitsGet(requestParameters, options) {
     return SnippetsApiFp(this.configuration).snippetsWorkspaceEncodedIdCommitsGet(requestParameters.encodedId, requestParameters.workspace, options).then((request) => request(this.axios, this.basePath));
@@ -23268,7 +23482,7 @@ class SnippetsApi extends BaseAPI {
     return SnippetsApiFp(this.configuration).snippetsWorkspaceGet(requestParameters.workspace, requestParameters.role, options).then((request) => request(this.axios, this.basePath));
   }
   snippetsWorkspacePost(requestParameters, options) {
-    return SnippetsApiFp(this.configuration).snippetsWorkspacePost(requestParameters.workspace, requestParameters.body, options).then((request) => request(this.axios, this.basePath));
+    return SnippetsApiFp(this.configuration).snippetsWorkspacePost(requestParameters.workspace, requestParameters.snippet, options).then((request) => request(this.axios, this.basePath));
   }
 }
 var SnippetsWorkspaceGetRoleEnum = {
@@ -23491,14 +23705,14 @@ class BaseCommand {
 
 // src/commands/auth/login.command.ts
 class LoginCommand extends BaseCommand {
-  configService;
+  credentialStore;
   usersApi;
   oauthService;
   name = "login";
   description = "Authenticate with Bitbucket";
-  constructor(configService, usersApi, oauthService, output) {
+  constructor(credentialStore, usersApi, oauthService, output) {
     super(output);
-    this.configService = configService;
+    this.credentialStore = credentialStore;
     this.usersApi = usersApi;
     this.oauthService = oauthService;
   }
@@ -23527,7 +23741,7 @@ class LoginCommand extends BaseCommand {
       }
       this.output.success(`Logged in as ${userInfo.displayName} (${userInfo.username})`);
     } catch (error) {
-      await this.configService.clearOAuthCredentials();
+      await this.credentialStore.clearOAuthCredentials();
       throw error;
     }
   }
@@ -23546,8 +23760,8 @@ class LoginCommand extends BaseCommand {
         message: "API token is required. Use --password option or set BB_API_TOKEN environment variable."
       });
     }
-    await this.configService.clearOAuthCredentials();
-    await this.configService.setCredentials({ username, apiToken });
+    await this.credentialStore.clearOAuthCredentials();
+    await this.credentialStore.setCredentials({ username, apiToken });
     try {
       const response = await this.usersApi.userGet();
       const user = response.data;
@@ -23565,7 +23779,7 @@ class LoginCommand extends BaseCommand {
       }
       this.output.success(`Logged in as ${user.display_name} (${user.username})`);
     } catch (error) {
-      await this.configService.clearCredentials();
+      await this.credentialStore.clearCredentials();
       throw new BBError({
         code: 1002 /* AUTH_INVALID */,
         message: `Authentication failed: ${error instanceof Error ? error.message : String(error)}`
@@ -23576,22 +23790,22 @@ class LoginCommand extends BaseCommand {
 
 // src/commands/auth/logout.command.ts
 class LogoutCommand extends BaseCommand {
-  configService;
+  credentialStore;
   oauthService;
   name = "logout";
   description = "Log out of Bitbucket";
-  constructor(configService, oauthService, output) {
+  constructor(credentialStore, oauthService, output) {
     super(output);
-    this.configService = configService;
+    this.credentialStore = credentialStore;
     this.oauthService = oauthService;
   }
   async execute(_options, context) {
-    const authMethod = await this.configService.getAuthMethod();
+    const authMethod = await this.credentialStore.getAuthMethod();
     if (authMethod === "oauth") {
       await this.oauthService.revokeToken();
-      await this.configService.clearOAuthCredentials();
+      await this.credentialStore.clearOAuthCredentials();
     } else {
-      await this.configService.clearCredentials();
+      await this.credentialStore.clearCredentials();
     }
     if (context.globalOptions.json) {
       this.output.json({ authenticated: false, success: true });
@@ -23604,17 +23818,19 @@ class LogoutCommand extends BaseCommand {
 // src/commands/auth/status.command.ts
 class StatusCommand extends BaseCommand {
   configService;
+  credentialStore;
   usersApi;
   name = "status";
   description = "Show authentication status";
-  constructor(configService, usersApi, output) {
+  constructor(configService, credentialStore, usersApi, output) {
     super(output);
     this.configService = configService;
+    this.credentialStore = credentialStore;
     this.usersApi = usersApi;
   }
   async execute(_options, context) {
     const config = await this.configService.getConfig();
-    const authMethod = await this.configService.getAuthMethod();
+    const authMethod = await this.credentialStore.getAuthMethod();
     const hasBasicAuth = config.username && config.apiToken;
     const hasOAuth = config.oauthAccessToken && config.oauthRefreshToken;
     if (!hasBasicAuth && !hasOAuth) {
@@ -23680,17 +23896,17 @@ class StatusCommand extends BaseCommand {
 
 // src/commands/auth/token.command.ts
 class TokenCommand extends BaseCommand {
-  configService;
+  credentialStore;
   oauthService;
   name = "token";
   description = "Print the current access token";
-  constructor(configService, oauthService, output) {
+  constructor(credentialStore, oauthService, output) {
     super(output);
-    this.configService = configService;
+    this.credentialStore = credentialStore;
     this.oauthService = oauthService;
   }
   async execute(_options, context) {
-    const authMethod = await this.configService.getAuthMethod();
+    const authMethod = await this.credentialStore.getAuthMethod();
     if (authMethod === "oauth") {
       const accessToken = await this.oauthService.getValidAccessToken();
       if (context.globalOptions.json) {
@@ -23700,7 +23916,7 @@ class TokenCommand extends BaseCommand {
       this.output.text(accessToken);
       return;
     }
-    const credentials = await this.configService.getCredentials();
+    const credentials = await this.credentialStore.getCredentials();
     if (!credentials.username || !credentials.apiToken) {
       throw new BBError({
         code: 1001 /* AUTH_REQUIRED */,
@@ -23719,13 +23935,13 @@ class TokenCommand extends BaseCommand {
 // src/commands/repo/clone.command.ts
 class CloneCommand extends BaseCommand {
   gitService;
-  configService;
+  contextService;
   name = "clone";
   description = "Clone a Bitbucket repository";
-  constructor(gitService, configService, output) {
+  constructor(gitService, contextService, output) {
     super(output);
     this.gitService = gitService;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
     const { repository, directory } = options;
@@ -23751,7 +23967,7 @@ class CloneCommand extends BaseCommand {
     let workspace;
     let repoSlug;
     if (parts.length === 1) {
-      workspace = await resolveWorkspace(this.configService);
+      workspace = await this.contextService.requireWorkspace();
       repoSlug = parts[0];
     } else if (parts.length === 2) {
       workspace = parts[0];
@@ -24064,19 +24280,19 @@ function parsePullrequestActivitiesPage(data) {
 // src/commands/repo/create.command.ts
 class CreateRepoCommand extends BaseCommand {
   repositoriesApi;
-  configService;
+  contextService;
   name = "create";
   description = "Create a new repository";
-  constructor(repositoriesApi, configService, output) {
+  constructor(repositoriesApi, contextService, output) {
     super(output);
     this.repositoriesApi = repositoriesApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
     const { description, project } = options;
     const name = this.requireOption(options.name, "name");
     const isPublic = options.public === true;
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const request = {
       type: "repository",
       scm: "git",
@@ -24092,7 +24308,7 @@ class CreateRepoCommand extends BaseCommand {
     const response = await this.repositoriesApi.repositoriesWorkspaceRepoSlugPost({
       workspace,
       repoSlug: name,
-      body: request
+      repository: request
     });
     const repo = response.data;
     if (context.globalOptions.json) {
@@ -24112,16 +24328,16 @@ class CreateRepoCommand extends BaseCommand {
 // src/commands/repo/list.command.ts
 class ListReposCommand extends BaseCommand {
   repositoriesApi;
-  configService;
+  contextService;
   name = "list";
   description = "List repositories";
-  constructor(repositoriesApi, configService, output) {
+  constructor(repositoriesApi, contextService, output) {
     super(output);
     this.repositoriesApi = repositoriesApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const limit = parseLimit(options.limit);
     const repos = await collectPages({
       limit,
@@ -24444,7 +24660,7 @@ class CreatePRCommand extends BaseCommand {
     const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPost({
       workspace: repoContext.workspace,
       repoSlug: repoContext.repoSlug,
-      body: request
+      pullrequest: request
     });
     const pr = response.data;
     const links = pr.links;
@@ -24518,6 +24734,9 @@ class CreatePRCommand extends BaseCommand {
   }
 }
 
+// src/types/pr.ts
+var PR_STATES = ["OPEN", "MERGED", "DECLINED", "SUPERSEDED"];
+
 // src/commands/pr/list.command.ts
 class ListPRsCommand extends BaseCommand {
   pullrequestsApi;
@@ -24536,13 +24755,7 @@ class ListPRsCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const ALLOWED_STATES = [
-      "OPEN",
-      "MERGED",
-      "DECLINED",
-      "SUPERSEDED"
-    ];
-    const state = options.state ? this.parseEnumOption(options.state, "state", ALLOWED_STATES) : "OPEN";
+    const state = options.state ? this.parseEnumOption(options.state, "state", PR_STATES) : "OPEN";
     const limit = parseLimit(options.limit);
     const reviewerQuery = options.mine ? await this.buildMineFilter() : undefined;
     const values = await collectPages({
@@ -24698,7 +24911,10 @@ class ViewPRCommand extends BaseCommand {
     this.output.text("");
     this.output.text(this.output.dim("Reviewers:"));
     for (const reviewer of reviewers) {
-      const status = this.getReviewerStatus(reviewer);
+      const status = this.getReviewerStatus({
+        approved: reviewer.approved,
+        state: reviewer.state ?? undefined
+      });
       this.output.text(`  ${status.icon} ${reviewer.user?.display_name ?? "Unknown"} ${this.output.gray(status.label)}`);
     }
   }
@@ -24816,7 +25032,7 @@ class EditPRCommand extends BaseCommand {
       workspace: repoContext.workspace,
       repoSlug: repoContext.repoSlug,
       pullRequestId: prId,
-      body: request
+      pullrequest: request
     });
     const pr = response.data;
     const links = pr.links;
@@ -24869,7 +25085,7 @@ class MergePRCommand extends BaseCommand {
       workspace: repoContext.workspace,
       repoSlug: repoContext.repoSlug,
       pullRequestId: prId,
-      body: request
+      pullrequestMergeParameters: request
     });
     const pr = response.data;
     if (context.globalOptions.json) {
@@ -24973,7 +25189,7 @@ class ReadyPRCommand extends BaseCommand {
       workspace: repoContext.workspace,
       repoSlug: repoContext.repoSlug,
       pullRequestId: prId,
-      body: {
+      pullrequest: {
         type: "pullrequest",
         draft: false
       }
@@ -25536,7 +25752,7 @@ class CommentPRCommand extends BaseCommand {
       workspace: repoContext.workspace,
       repoSlug: repoContext.repoSlug,
       pullRequestId: prId,
-      body
+      pullrequestComment: body
     });
     if (context.globalOptions.json) {
       const jsonOutput = {
@@ -25641,7 +25857,7 @@ class EditCommentPRCommand extends BaseCommand {
       repoSlug: repoContext.repoSlug,
       pullRequestId: prId,
       commentId,
-      body: {
+      pullrequestComment: {
         type: "pullrequest_comment",
         content: {
           raw: options.message
@@ -25962,16 +26178,16 @@ var VALID_ROLES = Object.values(SnippetsWorkspaceGetRoleEnum);
 
 class ListSnippetsCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "list";
   description = "List snippets";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const limit = parseLimit(options.limit);
     const role = options.role ? this.parseEnumOption(options.role, "role", VALID_ROLES) : undefined;
     const snippets = await collectPages({
@@ -26013,17 +26229,17 @@ class ListSnippetsCommand extends BaseCommand {
 class ViewSnippetCommand extends BaseCommand {
   snippetsApi;
   snippetFilesService;
-  configService;
+  contextService;
   name = "view";
   description = "View snippet details";
-  constructor(snippetsApi, snippetFilesService, configService, output) {
+  constructor(snippetsApi, snippetFilesService, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
     this.snippetFilesService = snippetFilesService;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const response = await this.snippetsApi.snippetsWorkspaceEncodedIdGet({
       workspace,
       encodedId: options.id
@@ -26059,7 +26275,7 @@ class ViewSnippetCommand extends BaseCommand {
       for (const name of fileNames) {
         this.output.text("");
         this.output.text(this.output.bold(`\u2500\u2500 ${name} \u2500\u2500`));
-        this.output.text(contents[name]);
+        this.output.text(contents[name] ?? "");
       }
       return;
     }
@@ -26115,16 +26331,16 @@ class ViewSnippetCommand extends BaseCommand {
 import fs8 from "fs";
 class CreateSnippetCommand extends BaseCommand {
   snippetFilesService;
-  configService;
+  contextService;
   name = "create";
   description = "Create a snippet";
-  constructor(snippetFilesService, configService, output) {
+  constructor(snippetFilesService, contextService, output) {
     super(output);
     this.snippetFilesService = snippetFilesService;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const title = this.requireOption(options.title, "title", "Snippet title is required. Use --title option.");
     if (!options.file || options.file.length === 0) {
       throw new BBError({
@@ -26171,16 +26387,16 @@ class CreateSnippetCommand extends BaseCommand {
 import fs9 from "fs";
 class EditSnippetCommand extends BaseCommand {
   snippetFilesService;
-  configService;
+  contextService;
   name = "edit";
   description = "Edit a snippet";
-  constructor(snippetFilesService, configService, output) {
+  constructor(snippetFilesService, contextService, output) {
     super(output);
     this.snippetFilesService = snippetFilesService;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const hasTitle = options.title !== undefined;
     const hasVisibility = options.private !== undefined || options.public !== undefined;
     const hasFiles = options.file !== undefined && options.file.length > 0;
@@ -26231,16 +26447,16 @@ class EditSnippetCommand extends BaseCommand {
 // src/commands/snippet/delete.command.ts
 class DeleteSnippetCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "delete";
   description = "Delete a snippet";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     if (!options.yes) {
       throw new BBError({
         code: 5001 /* VALIDATION_REQUIRED */,
@@ -26267,16 +26483,16 @@ class DeleteSnippetCommand extends BaseCommand {
 // src/commands/snippet/watch.command.ts
 class WatchSnippetCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "watch";
   description = "Watch a snippet";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     await this.snippetsApi.snippetsWorkspaceEncodedIdWatchPut({
       workspace,
       encodedId: options.id
@@ -26296,16 +26512,16 @@ class WatchSnippetCommand extends BaseCommand {
 // src/commands/snippet/unwatch.command.ts
 class UnwatchSnippetCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "unwatch";
   description = "Stop watching a snippet";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     await this.snippetsApi.snippetsWorkspaceEncodedIdWatchDelete({
       workspace,
       encodedId: options.id
@@ -26325,16 +26541,16 @@ class UnwatchSnippetCommand extends BaseCommand {
 // src/commands/snippet/comments.list.command.ts
 class ListSnippetCommentsCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "list";
   description = "List comments on a snippet";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const limit = parseLimit(options.limit);
     const comments = await collectPages({
       limit,
@@ -26361,8 +26577,7 @@ class ListSnippetCommentsCommand extends BaseCommand {
       this.output.info("No comments found on this snippet");
       return;
     }
-    const record = comments;
-    const rows = record.map((comment) => {
+    const rows = comments.map((comment) => {
       const content = getRawContent(comment.content) ?? "";
       return [
         String(comment.id ?? ""),
@@ -26378,16 +26593,16 @@ class ListSnippetCommentsCommand extends BaseCommand {
 // src/commands/snippet/comments.add.command.ts
 class AddSnippetCommentCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "add";
   description = "Add a comment to a snippet";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const message = this.requireOption(options.message, "message", "Comment message is required. Use --message option.");
     const body = {
       type: "snippet_comment",
@@ -26398,7 +26613,7 @@ class AddSnippetCommentCommand extends BaseCommand {
     const response = await this.snippetsApi.snippetsWorkspaceEncodedIdCommentsPost({
       workspace,
       encodedId: options.id,
-      body
+      snippetComment: body
     });
     const comment = response.data;
     const commentId = comment.id;
@@ -26417,16 +26632,16 @@ class AddSnippetCommentCommand extends BaseCommand {
 // src/commands/snippet/comments.edit.command.ts
 class EditSnippetCommentCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "edit";
   description = "Edit a comment on a snippet";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const commentId = this.parseIntOption(options.commentId, "comment-id");
     const body = {
       type: "snippet_comment",
@@ -26438,7 +26653,7 @@ class EditSnippetCommentCommand extends BaseCommand {
       workspace,
       encodedId: options.snippetId,
       commentId,
-      body
+      snippetComment: body
     });
     if (context.globalOptions.json) {
       this.output.json({
@@ -26455,16 +26670,16 @@ class EditSnippetCommentCommand extends BaseCommand {
 // src/commands/snippet/comments.delete.command.ts
 class DeleteSnippetCommentCommand extends BaseCommand {
   snippetsApi;
-  configService;
+  contextService;
   name = "delete";
   description = "Delete a comment on a snippet";
-  constructor(snippetsApi, configService, output) {
+  constructor(snippetsApi, contextService, output) {
     super(output);
     this.snippetsApi = snippetsApi;
-    this.configService = configService;
+    this.contextService = contextService;
   }
   async execute(options, context) {
-    const workspace = await resolveWorkspace(this.configService, options.workspace ?? context.globalOptions.workspace);
+    const workspace = await this.contextService.requireWorkspace(options.workspace ?? context.globalOptions.workspace);
     const commentId = this.parseIntOption(options.commentId, "comment-id");
     if (!options.yes) {
       throw new BBError({
@@ -26698,350 +26913,285 @@ class UninstallCompletionCommand extends BaseCommand {
 // src/bootstrap.ts
 var require2 = createRequire(import.meta.url);
 var pkg = require2("../package.json");
+function registerApiClient(container, token, ctor) {
+  container.register(token, () => {
+    const credentialStore = container.resolve(ServiceTokens.CredentialStore);
+    const oauthService = container.resolve(ServiceTokens.OAuthService);
+    const axiosInstance = createApiClient(credentialStore, oauthService);
+    return new ctor(undefined, undefined, axiosInstance);
+  });
+}
+function registerCommand(container, token, ctor, deps) {
+  container.register(token, () => {
+    const resolved = deps.map((dep) => container.resolve(dep));
+    return new ctor(...resolved);
+  });
+}
 function bootstrap(options = {}) {
   const container = Container.getInstance();
   container.register(ServiceTokens.ConfigService, () => new ConfigService);
+  container.register(ServiceTokens.CredentialStore, () => container.resolve(ServiceTokens.ConfigService));
   container.register(ServiceTokens.GitService, () => new GitService);
   container.register(ServiceTokens.OutputService, () => new OutputService({ noColor: options.noColor }));
-  container.register(ServiceTokens.OAuthService, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    return new OAuthService(configService);
-  });
-  container.register(ServiceTokens.PullrequestsApi, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const oauthService = container.resolve(ServiceTokens.OAuthService);
-    const axiosInstance = createApiClient(configService, oauthService);
-    return new PullrequestsApi(undefined, undefined, axiosInstance);
-  });
-  container.register(ServiceTokens.RepositoriesApi, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const oauthService = container.resolve(ServiceTokens.OAuthService);
-    const axiosInstance = createApiClient(configService, oauthService);
-    return new RepositoriesApi(undefined, undefined, axiosInstance);
-  });
-  container.register(ServiceTokens.UsersApi, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const oauthService = container.resolve(ServiceTokens.OAuthService);
-    const axiosInstance = createApiClient(configService, oauthService);
-    return new UsersApi(undefined, undefined, axiosInstance);
-  });
-  container.register(ServiceTokens.CommitStatusesApi, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const oauthService = container.resolve(ServiceTokens.OAuthService);
-    const axiosInstance = createApiClient(configService, oauthService);
-    return new CommitStatusesApi(undefined, undefined, axiosInstance);
-  });
+  registerCommand(container, ServiceTokens.OAuthService, OAuthService, [
+    ServiceTokens.ConfigService,
+    ServiceTokens.CredentialStore
+  ]);
+  registerCommand(container, ServiceTokens.ContextService, ContextService, [
+    ServiceTokens.GitService,
+    ServiceTokens.ConfigService
+  ]);
+  registerApiClient(container, ServiceTokens.PullrequestsApi, PullrequestsApi);
+  registerApiClient(container, ServiceTokens.RepositoriesApi, RepositoriesApi);
+  registerApiClient(container, ServiceTokens.UsersApi, UsersApi);
+  registerApiClient(container, ServiceTokens.CommitStatusesApi, CommitStatusesApi);
   container.register(ServiceTokens.SnippetsAxios, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
+    const credentialStore = container.resolve(ServiceTokens.CredentialStore);
     const oauthService = container.resolve(ServiceTokens.OAuthService);
-    return createApiClient(configService, oauthService);
+    return createApiClient(credentialStore, oauthService);
   });
   container.register(ServiceTokens.SnippetsApi, () => {
     const axiosInstance = container.resolve(ServiceTokens.SnippetsAxios);
     return new SnippetsApi(undefined, undefined, axiosInstance);
   });
-  container.register(ServiceTokens.SnippetFilesService, () => {
-    const axiosInstance = container.resolve(ServiceTokens.SnippetsAxios);
-    return new SnippetFilesService(axiosInstance);
-  });
-  container.register(ServiceTokens.ContextService, () => {
-    const gitService = container.resolve(ServiceTokens.GitService);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    return new ContextService(gitService, configService);
-  });
-  container.register(ServiceTokens.LoginCommand, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const oauthService = container.resolve(ServiceTokens.OAuthService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new LoginCommand(configService, usersApi, oauthService, output);
-  });
-  container.register(ServiceTokens.LogoutCommand, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const oauthService = container.resolve(ServiceTokens.OAuthService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new LogoutCommand(configService, oauthService, output);
-  });
-  container.register(ServiceTokens.StatusCommand, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new StatusCommand(configService, usersApi, output);
-  });
-  container.register(ServiceTokens.TokenCommand, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const oauthService = container.resolve(ServiceTokens.OAuthService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new TokenCommand(configService, oauthService, output);
-  });
-  container.register(ServiceTokens.CloneCommand, () => {
-    const gitService = container.resolve(ServiceTokens.GitService);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new CloneCommand(gitService, configService, output);
-  });
-  container.register(ServiceTokens.CreateRepoCommand, () => {
-    const repositoriesApi = container.resolve(ServiceTokens.RepositoriesApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new CreateRepoCommand(repositoriesApi, configService, output);
-  });
-  container.register(ServiceTokens.ListReposCommand, () => {
-    const repositoriesApi = container.resolve(ServiceTokens.RepositoriesApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListReposCommand(repositoriesApi, configService, output);
-  });
-  container.register(ServiceTokens.ViewRepoCommand, () => {
-    const repositoriesApi = container.resolve(ServiceTokens.RepositoriesApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ViewRepoCommand(repositoriesApi, contextService, output);
-  });
-  container.register(ServiceTokens.DeleteRepoCommand, () => {
-    const repositoriesApi = container.resolve(ServiceTokens.RepositoriesApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new DeleteRepoCommand(repositoriesApi, contextService, output);
-  });
-  container.register(ServiceTokens.DefaultReviewerService, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    return new DefaultReviewerService(pullrequestsApi);
-  });
-  container.register(ServiceTokens.ListDefaultReviewersCommand, () => {
-    const service = container.resolve(ServiceTokens.DefaultReviewerService);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListDefaultReviewersCommand(service, contextService, output);
-  });
-  container.register(ServiceTokens.AddDefaultReviewerCommand, () => {
-    const service = container.resolve(ServiceTokens.DefaultReviewerService);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new AddDefaultReviewerCommand(service, usersApi, contextService, output);
-  });
-  container.register(ServiceTokens.RemoveDefaultReviewerCommand, () => {
-    const service = container.resolve(ServiceTokens.DefaultReviewerService);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new RemoveDefaultReviewerCommand(service, usersApi, contextService, output);
-  });
-  container.register(ServiceTokens.CreatePRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const gitService = container.resolve(ServiceTokens.GitService);
-    const defaultReviewerService = container.resolve(ServiceTokens.DefaultReviewerService);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new CreatePRCommand(pullrequestsApi, usersApi, contextService, gitService, defaultReviewerService, configService, output);
-  });
-  container.register(ServiceTokens.ListPRsCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListPRsCommand(pullrequestsApi, usersApi, contextService, output);
-  });
-  container.register(ServiceTokens.ViewPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ViewPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.EditPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const gitService = container.resolve(ServiceTokens.GitService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new EditPRCommand(pullrequestsApi, contextService, gitService, output);
-  });
-  container.register(ServiceTokens.MergePRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new MergePRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.ApprovePRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ApprovePRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.DeclinePRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new DeclinePRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.ReadyPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ReadyPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.CheckoutPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const gitService = container.resolve(ServiceTokens.GitService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new CheckoutPRCommand(pullrequestsApi, contextService, gitService, output);
-  });
-  container.register(ServiceTokens.DiffPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const gitService = container.resolve(ServiceTokens.GitService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new DiffPRCommand(pullrequestsApi, contextService, gitService, output);
-  });
-  container.register(ServiceTokens.ActivityPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ActivityPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.CommentPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new CommentPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.ListCommentsPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListCommentsPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.EditCommentPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new EditCommentPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.DeleteCommentPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new DeleteCommentPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.AddReviewerPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new AddReviewerPRCommand(pullrequestsApi, usersApi, contextService, output);
-  });
-  container.register(ServiceTokens.RemoveReviewerPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const usersApi = container.resolve(ServiceTokens.UsersApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new RemoveReviewerPRCommand(pullrequestsApi, usersApi, contextService, output);
-  });
-  container.register(ServiceTokens.ListReviewersPRCommand, () => {
-    const pullrequestsApi = container.resolve(ServiceTokens.PullrequestsApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListReviewersPRCommand(pullrequestsApi, contextService, output);
-  });
-  container.register(ServiceTokens.ChecksPRCommand, () => {
-    const commitStatusesApi = container.resolve(ServiceTokens.CommitStatusesApi);
-    const contextService = container.resolve(ServiceTokens.ContextService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ChecksPRCommand(commitStatusesApi, contextService, output);
-  });
-  container.register(ServiceTokens.ListSnippetsCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListSnippetsCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.ViewSnippetCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const snippetFilesService = container.resolve(ServiceTokens.SnippetFilesService);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ViewSnippetCommand(snippetsApi, snippetFilesService, configService, output);
-  });
-  container.register(ServiceTokens.CreateSnippetCommand, () => {
-    const snippetFilesService = container.resolve(ServiceTokens.SnippetFilesService);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new CreateSnippetCommand(snippetFilesService, configService, output);
-  });
-  container.register(ServiceTokens.EditSnippetCommand, () => {
-    const snippetFilesService = container.resolve(ServiceTokens.SnippetFilesService);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new EditSnippetCommand(snippetFilesService, configService, output);
-  });
-  container.register(ServiceTokens.DeleteSnippetCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new DeleteSnippetCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.WatchSnippetCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new WatchSnippetCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.UnwatchSnippetCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new UnwatchSnippetCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.ListSnippetCommentsCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListSnippetCommentsCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.AddSnippetCommentCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new AddSnippetCommentCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.EditSnippetCommentCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new EditSnippetCommentCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.DeleteSnippetCommentCommand, () => {
-    const snippetsApi = container.resolve(ServiceTokens.SnippetsApi);
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new DeleteSnippetCommentCommand(snippetsApi, configService, output);
-  });
-  container.register(ServiceTokens.GetConfigCommand, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new GetConfigCommand(configService, output);
-  });
-  container.register(ServiceTokens.SetConfigCommand, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new SetConfigCommand(configService, output);
-  });
-  container.register(ServiceTokens.ListConfigCommand, () => {
-    const configService = container.resolve(ServiceTokens.ConfigService);
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new ListConfigCommand(configService, output);
-  });
-  container.register(ServiceTokens.InstallCompletionCommand, () => {
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new InstallCompletionCommand(output);
-  });
-  container.register(ServiceTokens.UninstallCompletionCommand, () => {
-    const output = container.resolve(ServiceTokens.OutputService);
-    return new UninstallCompletionCommand(output);
-  });
+  registerCommand(container, ServiceTokens.SnippetFilesService, SnippetFilesService, [ServiceTokens.SnippetsAxios]);
+  registerCommand(container, ServiceTokens.DefaultReviewerService, DefaultReviewerService, [ServiceTokens.PullrequestsApi]);
+  registerCommand(container, ServiceTokens.LoginCommand, LoginCommand, [
+    ServiceTokens.CredentialStore,
+    ServiceTokens.UsersApi,
+    ServiceTokens.OAuthService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.LogoutCommand, LogoutCommand, [
+    ServiceTokens.CredentialStore,
+    ServiceTokens.OAuthService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.StatusCommand, StatusCommand, [
+    ServiceTokens.ConfigService,
+    ServiceTokens.CredentialStore,
+    ServiceTokens.UsersApi,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.TokenCommand, TokenCommand, [
+    ServiceTokens.CredentialStore,
+    ServiceTokens.OAuthService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.CloneCommand, CloneCommand, [
+    ServiceTokens.GitService,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.CreateRepoCommand, CreateRepoCommand, [
+    ServiceTokens.RepositoriesApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListReposCommand, ListReposCommand, [
+    ServiceTokens.RepositoriesApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ViewRepoCommand, ViewRepoCommand, [
+    ServiceTokens.RepositoriesApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.DeleteRepoCommand, DeleteRepoCommand, [
+    ServiceTokens.RepositoriesApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListDefaultReviewersCommand, ListDefaultReviewersCommand, [
+    ServiceTokens.DefaultReviewerService,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.AddDefaultReviewerCommand, AddDefaultReviewerCommand, [
+    ServiceTokens.DefaultReviewerService,
+    ServiceTokens.UsersApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.RemoveDefaultReviewerCommand, RemoveDefaultReviewerCommand, [
+    ServiceTokens.DefaultReviewerService,
+    ServiceTokens.UsersApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.CreatePRCommand, CreatePRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.UsersApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.GitService,
+    ServiceTokens.DefaultReviewerService,
+    ServiceTokens.ConfigService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListPRsCommand, ListPRsCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.UsersApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ViewPRCommand, ViewPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.EditPRCommand, EditPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.GitService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.MergePRCommand, MergePRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ApprovePRCommand, ApprovePRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.DeclinePRCommand, DeclinePRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ReadyPRCommand, ReadyPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.CheckoutPRCommand, CheckoutPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.GitService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.DiffPRCommand, DiffPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.GitService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ActivityPRCommand, ActivityPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.CommentPRCommand, CommentPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListCommentsPRCommand, ListCommentsPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.EditCommentPRCommand, EditCommentPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.DeleteCommentPRCommand, DeleteCommentPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.AddReviewerPRCommand, AddReviewerPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.UsersApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.RemoveReviewerPRCommand, RemoveReviewerPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.UsersApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListReviewersPRCommand, ListReviewersPRCommand, [
+    ServiceTokens.PullrequestsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ChecksPRCommand, ChecksPRCommand, [
+    ServiceTokens.CommitStatusesApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListSnippetsCommand, ListSnippetsCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ViewSnippetCommand, ViewSnippetCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.SnippetFilesService,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.CreateSnippetCommand, CreateSnippetCommand, [
+    ServiceTokens.SnippetFilesService,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.EditSnippetCommand, EditSnippetCommand, [
+    ServiceTokens.SnippetFilesService,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.DeleteSnippetCommand, DeleteSnippetCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.WatchSnippetCommand, WatchSnippetCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.UnwatchSnippetCommand, UnwatchSnippetCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListSnippetCommentsCommand, ListSnippetCommentsCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.AddSnippetCommentCommand, AddSnippetCommentCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.EditSnippetCommentCommand, EditSnippetCommentCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.DeleteSnippetCommentCommand, DeleteSnippetCommentCommand, [
+    ServiceTokens.SnippetsApi,
+    ServiceTokens.ContextService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.GetConfigCommand, GetConfigCommand, [
+    ServiceTokens.ConfigService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.SetConfigCommand, SetConfigCommand, [
+    ServiceTokens.ConfigService,
+    ServiceTokens.OutputService
+  ]);
+  registerCommand(container, ServiceTokens.ListConfigCommand, ListConfigCommand, [ServiceTokens.ConfigService, ServiceTokens.OutputService]);
+  registerCommand(container, ServiceTokens.InstallCompletionCommand, InstallCompletionCommand, [ServiceTokens.OutputService]);
+  registerCommand(container, ServiceTokens.UninstallCompletionCommand, UninstallCompletionCommand, [ServiceTokens.OutputService]);
   container.register(ServiceTokens.VersionService, () => {
     const configService = container.resolve(ServiceTokens.ConfigService);
     return new VersionService(configService, pkg.version);
@@ -27098,41 +27248,97 @@ function createHelpTextBuilder(noColor) {
 import tabtab3 from "tabtab";
 var require3 = createRequire2(import.meta.url);
 var pkg2 = require3("../package.json");
+function getCompletionParent(line, word) {
+  if (typeof line !== "string") {
+    return;
+  }
+  const tokens = line.split(/\s+/).filter(Boolean);
+  const idx = tokens.lastIndexOf(word);
+  if (idx <= 0) {
+    return;
+  }
+  for (let i = idx - 1;i >= 0; i--) {
+    const token = tokens[i];
+    if (token && !token.startsWith("-")) {
+      return token;
+    }
+  }
+  return;
+}
+var ROOT_COMPLETIONS = [
+  "auth",
+  "repo",
+  "pr",
+  "snippet",
+  "config",
+  "completion",
+  "--help",
+  "--version",
+  "--json",
+  "--no-color",
+  "--workspace",
+  "--repo"
+];
+var SUBCOMMAND_COMPLETIONS = new Map([
+  ["auth", ["login", "logout", "status", "token"]],
+  ["repo", ["clone", "create", "list", "view", "delete", "default-reviewers"]],
+  ["default-reviewers", ["list", "add", "remove"]],
+  [
+    "pr",
+    [
+      "create",
+      "list",
+      "view",
+      "activity",
+      "checks",
+      "edit",
+      "merge",
+      "approve",
+      "decline",
+      "ready",
+      "checkout",
+      "diff",
+      "comments",
+      "reviewers"
+    ]
+  ],
+  ["reviewers", ["list", "add", "remove"]],
+  [
+    "snippet",
+    [
+      "list",
+      "view",
+      "create",
+      "edit",
+      "delete",
+      "watch",
+      "unwatch",
+      "comments"
+    ]
+  ],
+  ["config", ["get", "set", "list"]],
+  ["completion", ["install", "uninstall"]]
+]);
+var COMMENTS_SUBCOMMANDS = [
+  "list",
+  "add",
+  "edit",
+  "delete"
+];
 if (process.argv.includes("--get-yargs-completions") || process.env.COMP_LINE) {
   const env2 = tabtab3.parseEnv(process.env);
   if (env2.complete) {
-    const completions = [
-      "auth",
-      "repo",
-      "pr",
-      "snippet",
-      "config",
-      "completion",
-      "--help",
-      "--version",
-      "--json",
-      "--no-color",
-      "--workspace",
-      "--repo"
-    ];
-    if (env2.prev === "auth") {
-      completions.push("login", "logout", "status", "token");
-    } else if (env2.prev === "repo") {
-      completions.push("clone", "create", "list", "view", "delete", "default-reviewers");
-    } else if (env2.prev === "default-reviewers") {
-      completions.push("list", "add", "remove");
-    } else if (env2.prev === "pr") {
-      completions.push("create", "list", "view", "activity", "checks", "edit", "merge", "approve", "decline", "ready", "checkout", "diff", "comments", "reviewers");
-    } else if (env2.prev === "reviewers") {
-      completions.push("list", "add", "remove");
-    } else if (env2.prev === "snippet") {
-      completions.push("list", "view", "create", "edit", "delete", "watch", "unwatch", "comments");
-    } else if (env2.prev === "comments" && typeof env2.line === "string" && env2.line.includes(" snippet ")) {
-      completions.push("list", "add", "edit", "delete");
-    } else if (env2.prev === "config") {
-      completions.push("get", "set", "list");
-    } else if (env2.prev === "completion") {
-      completions.push("install", "uninstall");
+    const completions = [...ROOT_COMPLETIONS];
+    if (env2.prev === "comments") {
+      const parent = getCompletionParent(env2.line, "comments");
+      if (parent === "snippet" || parent === "pr") {
+        completions.push(...COMMENTS_SUBCOMMANDS);
+      }
+    } else {
+      const subcommands = SUBCOMMAND_COMPLETIONS.get(env2.prev);
+      if (subcommands) {
+        completions.push(...subcommands);
+      }
     }
     tabtab3.log(completions);
     process.exit(0);
@@ -27343,7 +27549,7 @@ prCmd.command("create").description("Create a pull request").option("-t, --title
   const context = createContext(cli);
   await runCommand(ServiceTokens.CreatePRCommand, withGlobalOptions(options, context), cli, context);
 });
-prCmd.command("list").description("List pull requests").option("-s, --state <state>", "Filter by state (OPEN, MERGED, DECLINED, SUPERSEDED)", "OPEN").option("--limit <number>", "Maximum number of PRs to list", "25").option("--mine", "Show only PRs where you are a reviewer").addHelpText("after", buildHelpText({
+prCmd.command("list").description("List pull requests").option("-s, --state <state>", `Filter by state (${PR_STATES.join(", ")})`, "OPEN").option("--limit <number>", "Maximum number of PRs to list", "25").option("--mine", "Show only PRs where you are a reviewer").addHelpText("after", buildHelpText({
   examples: [
     "bb pr list",
     "bb pr list -s MERGED --limit 10",
@@ -27351,7 +27557,7 @@ prCmd.command("list").description("List pull requests").option("-s, --state <sta
     "bb pr list --json"
   ],
   validValues: {
-    "Valid states": ["OPEN", "MERGED", "DECLINED", "SUPERSEDED"]
+    "Valid states": [...PR_STATES]
   },
   defaults: { state: "OPEN", limit: "25" }
 })).action(async (options) => {