@pilatos/bitbucket-cli 1.6.0 → 1.7.1

package/dist/index.js

@@ -10901,6 +10901,17 @@ var require_db = __commonJS((exports, module) => {
   };
 });
 
+// node_modules/mime-db/index.js
+var require_mime_db = __commonJS((exports, module) => {
+  /*!
+   * mime-db
+   * Copyright(c) 2014 Jonathan Ong
+   * Copyright(c) 2015-2022 Douglas Christopher Wilson
+   * MIT Licensed
+   */
+  module.exports = require_db();
+});
+
 // node_modules/mime-types/index.js
 var require_mime_types = __commonJS((exports) => {
   /*!
@@ -10909,7 +10920,7 @@ var require_mime_types = __commonJS((exports) => {
    * Copyright(c) 2015 Douglas Christopher Wilson
    * MIT Licensed
    */
-  var db = require_db();
+  var db = require_mime_db();
   var extname = __require("path").extname;
   var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
   var TEXT_TYPE_REGEXP = /^text\//i;
@@ -11256,7 +11267,7 @@ var require_round = __commonJS((exports, module) => {
 
 // node_modules/math-intrinsics/isNaN.js
 var require_isNaN = __commonJS((exports, module) => {
-  module.exports = Number.isNaN || function isNaN2(a) {
+  module.exports = Number.isNaN || function isNaN(a) {
     return a !== a;
   };
 });
@@ -11390,7 +11401,7 @@ var require_implementation = __commonJS((exports, module) => {
   var toStr = Object.prototype.toString;
   var max = Math.max;
   var funcType = "[object Function]";
-  var concatty = function concatty2(a, b) {
+  var concatty = function concatty(a, b) {
     var arr = [];
     for (var i = 0;i < a.length; i += 1) {
       arr[i] = a[i];
@@ -11400,7 +11411,7 @@ var require_implementation = __commonJS((exports, module) => {
     }
     return arr;
   };
-  var slicy = function slicy2(arrLike, offset) {
+  var slicy = function slicy(arrLike, offset) {
     var arr = [];
     for (var i = offset || 0, j = 0;i < arrLike.length; i += 1, j += 1) {
       arr[j] = arrLike[i];
@@ -11417,7 +11428,7 @@ var require_implementation = __commonJS((exports, module) => {
     }
     return str;
   };
-  module.exports = function bind2(that) {
+  module.exports = function bind(that) {
     var target = this;
     if (typeof target !== "function" || toStr.apply(target) !== funcType) {
       throw new TypeError(ERROR_MESSAGE + target);
@@ -11441,7 +11452,7 @@ var require_implementation = __commonJS((exports, module) => {
     }
     bound = Function("binder", "return function (" + joiny(boundArgs, ",") + "){ return binder.apply(this,arguments); }")(binder);
     if (target.prototype) {
-      var Empty = function Empty2() {};
+      var Empty = function Empty() {};
       Empty.prototype = target.prototype;
       bound.prototype = new Empty;
       Empty.prototype = null;
@@ -11680,7 +11691,7 @@ var require_get_intrinsic = __commonJS((exports, module) => {
     }
   }
   var errorProto;
-  var doEval = function doEval2(name) {
+  var doEval = function doEval(name) {
     var value;
     if (name === "%AsyncFunction%") {
       value = getEvalledConstructor("async function () {}");
@@ -11689,12 +11700,12 @@ var require_get_intrinsic = __commonJS((exports, module) => {
     } else if (name === "%AsyncGeneratorFunction%") {
       value = getEvalledConstructor("async function* () {}");
     } else if (name === "%AsyncGenerator%") {
-      var fn = doEval2("%AsyncGeneratorFunction%");
+      var fn = doEval("%AsyncGeneratorFunction%");
       if (fn) {
         value = fn.prototype;
       }
     } else if (name === "%AsyncIteratorPrototype%") {
-      var gen = doEval2("%AsyncGenerator%");
+      var gen = doEval("%AsyncGenerator%");
       if (gen && getProto) {
         value = getProto(gen.prototype);
       }
@@ -11765,7 +11776,7 @@ var require_get_intrinsic = __commonJS((exports, module) => {
   var $exec = bind2.call($call, RegExp.prototype.exec);
   var rePropName = /[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g;
   var reEscapeChar = /\\(\\)?/g;
-  var stringToPath = function stringToPath2(string) {
+  var stringToPath = function stringToPath(string) {
     var first = $strSlice(string, 0, 1);
     var last = $strSlice(string, -1);
     if (first === "%" && last !== "%") {
@@ -11779,7 +11790,7 @@ var require_get_intrinsic = __commonJS((exports, module) => {
     });
     return result;
   };
-  var getBaseIntrinsic = function getBaseIntrinsic2(name, allowMissing) {
+  var getBaseIntrinsic = function getBaseIntrinsic(name, allowMissing) {
     var intrinsicName = name;
     var alias;
     if (hasOwn(LEGACY_ALIASES, intrinsicName)) {
@@ -15954,7 +15965,7 @@ var require_lodash = __commonJS((exports, module) => {
     function unicodeWords(string) {
       return string.match(reUnicodeWord) || [];
     }
-    var runInContext = function runInContext2(context) {
+    var runInContext = function runInContext(context) {
       context = context == null ? root : _.defaults(root.Object(), context, _.pick(root, contextProps));
       var { Array: Array2, Date: Date2, Error: Error2, Function: Function2, Math: Math2, Object: Object2, RegExp: RegExp2, String: String2, TypeError: TypeError2 } = context;
       var arrayProto = Array2.prototype, funcProto = Function2.prototype, objectProto = Object2.prototype;
@@ -20467,7 +20478,7 @@ __p += '`;
       lodash.replace = replace;
       lodash.result = result;
       lodash.round = round;
-      lodash.runInContext = runInContext2;
+      lodash.runInContext = runInContext;
       lodash.sample = sample2;
       lodash.size = size;
       lodash.snakeCase = snakeCase;
@@ -29121,7 +29132,7 @@ var require_multicast = __commonJS((exports) => {
       if (typeof subjectOrSubjectFactory === "function") {
         subjectFactory = subjectOrSubjectFactory;
       } else {
-        subjectFactory = function subjectFactory2() {
+        subjectFactory = function subjectFactory() {
           return subjectOrSubjectFactory;
         };
       }
@@ -32592,7 +32603,7 @@ var require_signal_exit = __commonJS((exports, module) => {
       emitter.on(ev, cb);
       return remove;
     };
-    unload = function unload2() {
+    unload = function unload() {
       if (!loaded || !processOk(global.process)) {
         return;
       }
@@ -32607,7 +32618,7 @@ var require_signal_exit = __commonJS((exports, module) => {
       emitter.count -= 1;
     };
     module.exports.unload = unload;
-    emit = function emit2(event, code, signal) {
+    emit = function emit(event, code, signal) {
       if (emitter.emitted[event]) {
         return;
       }
@@ -32636,7 +32647,7 @@ var require_signal_exit = __commonJS((exports, module) => {
       return signals;
     };
     loaded = false;
-    load = function load2() {
+    load = function load() {
       if (loaded || !processOk(global.process)) {
         return;
       }
@@ -32655,7 +32666,7 @@ var require_signal_exit = __commonJS((exports, module) => {
     };
     module.exports.load = load;
     originalProcessReallyExit = process3.reallyExit;
-    processReallyExit = function processReallyExit2(code) {
+    processReallyExit = function processReallyExit(code) {
       if (!processOk(global.process)) {
         return;
       }
@@ -32665,7 +32676,7 @@ var require_signal_exit = __commonJS((exports, module) => {
       originalProcessReallyExit.call(process3, process3.exitCode);
     };
     originalProcessEmit = process3.emit;
-    processEmit = function processEmit2(ev, arg) {
+    processEmit = function processEmit(ev, arg) {
       if (ev === "exit" && processOk(global.process)) {
         if (arg !== undefined) {
           process3.exitCode = arg;
@@ -42622,7 +42633,7 @@ var require_lib = __commonJS((exports, module) => {
   iconv.encodings = null;
   iconv.defaultCharUnicode = "\uFFFD";
   iconv.defaultCharSingleByte = "?";
-  iconv.encode = function encode3(str, encoding, options) {
+  iconv.encode = function encode(str, encoding, options) {
     str = "" + (str || "");
     var encoder = iconv.getEncoder(encoding, options);
     var res = encoder.write(str);
@@ -44099,9 +44110,7 @@ class Container {
   services = new Map;
   static instance = null;
   static getInstance() {
-    if (!Container.instance) {
-      Container.instance = new Container;
-    }
+    Container.instance ??= new Container;
     return Container.instance;
   }
   static reset() {
@@ -44446,14 +44455,14 @@ class ContextService {
     this.configService = configService;
   }
   parseRemoteUrl(url) {
-    const sshMatch = url.match(/git@bitbucket\.org:([^/]+)\/([^.]+)(?:\.git)?/);
+    const sshMatch = new RegExp(/git@bitbucket\.org:([^/]+)\/([^.]+)(?:\.git)?/).exec(url);
     if (sshMatch) {
       return {
         workspace: sshMatch[1],
         repoSlug: sshMatch[2]
       };
     }
-    const httpsMatch = url.match(/https?:\/\/(?:[^@]+@)?bitbucket\.org\/([^/]+)\/([^/.]+)(?:\.git)?/);
+    const httpsMatch = new RegExp(/https?:\/\/(?:[^@]+@)?bitbucket\.org\/([^/]+)\/([^/.]+)(?:\.git)?/).exec(url);
     if (httpsMatch) {
       return {
         workspace: httpsMatch[1],
@@ -45069,6 +45078,30 @@ class OutputService {
   bold(text) {
     return this.format(text, source_default.bold);
   }
+  red(text) {
+    return this.format(text, source_default.red);
+  }
+  green(text) {
+    return this.format(text, source_default.green);
+  }
+  yellow(text) {
+    return this.format(text, source_default.yellow);
+  }
+  cyan(text) {
+    return this.format(text, source_default.cyan);
+  }
+  magenta(text) {
+    return this.format(text, source_default.magenta);
+  }
+  gray(text) {
+    return this.format(text, source_default.gray);
+  }
+  blue(text) {
+    return this.format(text, source_default.blue);
+  }
+  underline(text) {
+    return this.format(text, source_default.underline);
+  }
 }
 // src/services/version.service.ts
 var NPM_REGISTRY_URL = "https://registry.npmjs.org/@pilatos/bitbucket-cli";
@@ -45158,7 +45191,7 @@ class VersionService {
       const cleanVersion = version.replace(/^v/, "");
       return cleanVersion.split(".").map((part) => {
         const numPart = part.split("-")[0];
-        return parseInt(numPart, 10) || 0;
+        return Number.parseInt(numPart, 10) || 0;
       });
     };
     const newParts = parseVersion(newVersion);
@@ -51476,6 +51509,14 @@ class BaseCommand {
   constructor(output) {
     this.output = output;
   }
+  async run(options, context) {
+    try {
+      return await this.execute(options, context);
+    } catch (error) {
+      this.handleError(error, context);
+      throw error;
+    }
+  }
   handleError(error, context) {
     if (error instanceof Error) {
       this.output.error(error.message);
@@ -51512,24 +51553,30 @@ class LoginCommand extends BaseCommand {
     const username = options.username || process.env.BB_USERNAME;
     const apiToken = options.password || process.env.BB_API_TOKEN;
     if (!username) {
-      const error = new Error("Username is required. Use --username option or set BB_USERNAME environment variable.");
-      this.output.error(error.message);
-      throw error;
+      throw new Error("Username is required. Use --username option or set BB_USERNAME environment variable.");
     }
     if (!apiToken) {
-      const error = new Error("API token is required. Use --password option or set BB_API_TOKEN environment variable.");
-      this.output.error(error.message);
-      throw error;
+      throw new Error("API token is required. Use --password option or set BB_API_TOKEN environment variable.");
     }
     await this.configService.setCredentials({ username, apiToken });
     try {
       const response = await this.usersApi.userGet();
       const user = response.data;
+      if (context.globalOptions.json) {
+        this.output.json({
+          authenticated: true,
+          user: {
+            username: user.username,
+            displayName: user.display_name,
+            accountId: user.account_id
+          }
+        });
+        return;
+      }
       this.output.success(`Logged in as ${user.display_name} (${user.username})`);
     } catch (error) {
       await this.configService.clearConfig();
-      this.output.error(`Authentication failed: ${error instanceof Error ? error.message : String(error)}`);
-      throw error;
+      throw new Error(`Authentication failed: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
 }
@@ -51543,8 +51590,12 @@ class LogoutCommand extends BaseCommand {
     super(output);
     this.configService = configService;
   }
-  async execute(_options, _context) {
+  async execute(_options, context) {
     await this.configService.clearConfig();
+    if (context.globalOptions.json) {
+      this.output.json({ authenticated: false, success: true });
+      return;
+    }
     this.output.success("Logged out of Bitbucket");
   }
 }
@@ -51563,24 +51614,38 @@ class StatusCommand extends BaseCommand {
   async execute(_options, context) {
     const config = await this.configService.getConfig();
     if (!config.username || !config.apiToken) {
+      if (context.globalOptions.json) {
+        this.output.json({ authenticated: false });
+        return;
+      }
       this.output.info("Not logged in");
-      this.output.text(`Run ${source_default.cyan("bb auth login")} to authenticate.`);
+      this.output.text(`Run ${this.output.highlight("bb auth login")} to authenticate.`);
       return;
     }
     try {
       const response = await this.usersApi.userGet();
       const user = response.data;
+      if (context.globalOptions.json) {
+        this.output.json({
+          authenticated: true,
+          user: {
+            username: user.username,
+            displayName: user.display_name,
+            accountId: user.account_id
+          },
+          defaultWorkspace: config.defaultWorkspace
+        });
+        return;
+      }
       this.output.success("Logged in to Bitbucket");
-      this.output.text(`  Username: ${source_default.cyan(user.username)}`);
+      this.output.text(`  Username: ${this.output.highlight(user.username ?? "")}`);
       this.output.text(`  Display name: ${user.display_name}`);
       this.output.text(`  Account ID: ${user.account_id}`);
       if (config.defaultWorkspace) {
-        this.output.text(`  Default workspace: ${source_default.cyan(config.defaultWorkspace)}`);
+        this.output.text(`  Default workspace: ${this.output.highlight(config.defaultWorkspace)}`);
       }
     } catch (error) {
-      this.output.error("Authentication is invalid or expired");
-      this.output.text(`Run ${source_default.cyan("bb auth login")} to re-authenticate.`);
-      throw error;
+      throw new Error(`Authentication is invalid or expired. Run ${this.output.highlight("bb auth login")} to re-authenticate.`);
     }
   }
 }
@@ -51594,14 +51659,16 @@ class TokenCommand extends BaseCommand {
     super(output);
     this.configService = configService;
   }
-  async execute(_options, _context) {
+  async execute(_options, context) {
     const credentials = await this.configService.getCredentials();
     if (!credentials.username || !credentials.apiToken) {
-      const error = new Error("Not authenticated. Run 'bb auth login' first.");
-      this.output.error(error.message);
-      throw error;
+      throw new Error("Not authenticated. Run 'bb auth login' first.");
     }
     const token = Buffer.from(`${credentials.username}:${credentials.apiToken}`).toString("base64");
+    if (context.globalOptions.json) {
+      this.output.json({ token });
+      return;
+    }
     this.output.text(token);
   }
 }
@@ -51622,6 +51689,15 @@ class CloneCommand extends BaseCommand {
     const repoUrl = await this.resolveRepositoryUrl(repository);
     await this.gitService.clone(repoUrl, directory);
     const targetDir = directory || this.extractRepoName(repository);
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
+        repository,
+        path: targetDir,
+        cloneUrl: repoUrl
+      });
+      return;
+    }
     this.output.success(`Cloned ${repository} into ${targetDir}`);
   }
   async resolveRepositoryUrl(repository) {
@@ -51648,7 +51724,10 @@ class CloneCommand extends BaseCommand {
   }
   extractRepoName(repository) {
     const parts = repository.split("/");
-    const lastPart = parts[parts.length - 1];
+    const lastPart = parts.at(-1);
+    if (!lastPart) {
+      throw new Error("Invalid repository format.");
+    }
     return lastPart.replace(".git", "");
   }
 }
@@ -51680,22 +51759,21 @@ class CreateRepoCommand extends BaseCommand {
     if (project) {
       request.project = { type: "project", key: project };
     }
-    try {
-      const response = await this.repositoriesApi.repositoriesWorkspaceRepoSlugPost({
-        workspace,
-        repoSlug: name,
-        body: request
-      });
-      const repo = response.data;
-      this.output.success(`Created repository ${repo.full_name}`);
-      this.output.text(`  ${source_default.dim("URL:")} ${repo.links?.html?.href}`);
-      const sshClone = Array.from(repo.links?.clone ?? []).find((c) => c.name === "ssh");
-      if (sshClone?.href) {
-        this.output.text(`  ${source_default.dim("Clone:")} git clone ${sshClone.href}`);
-      }
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+    const response = await this.repositoriesApi.repositoriesWorkspaceRepoSlugPost({
+      workspace,
+      repoSlug: name,
+      body: request
+    });
+    const repo = response.data;
+    if (context.globalOptions.json) {
+      this.output.json(repo);
+      return;
+    }
+    this.output.success(`Created repository ${repo.full_name}`);
+    this.output.text(`  ${this.output.dim("URL:")} ${repo.links?.html?.href}`);
+    const sshClone = Array.from(repo.links?.clone ?? []).find((c) => c.name === "ssh");
+    if (sshClone?.href) {
+      this.output.text(`  ${this.output.dim("Clone:")} git clone ${sshClone.href}`);
     }
   }
   async resolveWorkspace(workspace) {
@@ -51722,27 +51800,30 @@ class ListReposCommand extends BaseCommand {
     this.configService = configService;
   }
   async execute(options, context) {
-    const workspace = await this.resolveWorkspace(options.workspace);
-    const limit = parseInt(options.limit || "25", 10);
-    try {
-      const response = await this.repositoriesApi.repositoriesWorkspaceGet({
-        workspace
+    const workspace = await this.resolveWorkspace(options.workspace ?? context.globalOptions.workspace);
+    const limit = Number.parseInt(options.limit || "25", 10);
+    const response = await this.repositoriesApi.repositoriesWorkspaceGet({
+      workspace
+    });
+    const repos = Array.from(response.data.values ?? []).slice(0, limit);
+    if (context.globalOptions.json) {
+      this.output.json({
+        workspace,
+        count: repos.length,
+        repositories: repos
       });
-      const repos = Array.from(response.data.values ?? []).slice(0, limit);
-      if (repos.length === 0) {
-        this.output.text("No repositories found");
-        return;
-      }
-      const rows = repos.map((repo) => [
-        repo.full_name ?? "",
-        repo.is_private ? "private" : "public",
-        (repo.description || "").substring(0, 50)
-      ]);
-      this.output.table(["REPOSITORY", "VISIBILITY", "DESCRIPTION"], rows);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    if (repos.length === 0) {
+      this.output.text("No repositories found");
+      return;
+    }
+    const rows = repos.map((repo) => [
+      repo.full_name ?? "",
+      repo.is_private ? "private" : "public",
+      (repo.description || "").substring(0, 50)
+    ]);
+    this.output.table(["REPOSITORY", "VISIBILITY", "DESCRIPTION"], rows);
   }
   async resolveWorkspace(workspace) {
     if (workspace) {
@@ -51779,36 +51860,35 @@ class ViewRepoCommand extends BaseCommand {
       }
     }
     const repoContext = await this.contextService.requireRepoContext(contextOptions);
-    try {
-      const response = await this.repositoriesApi.repositoriesWorkspaceRepoSlugGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug
-      });
-      const repo = response.data;
-      this.output.text(source_default.bold(repo.full_name ?? ""));
-      if (repo.description) {
-        this.output.text(source_default.dim(repo.description));
-      }
-      this.output.text("");
-      this.output.text(`  ${source_default.dim("Visibility:")} ${repo.is_private ? "Private" : "Public"}`);
-      this.output.text(`  ${source_default.dim("Owner:")} ${repo.owner?.display_name ?? "Unknown"}`);
-      if (repo.language) {
-        this.output.text(`  ${source_default.dim("Language:")} ${repo.language}`);
-      }
-      if (repo.mainbranch) {
-        this.output.text(`  ${source_default.dim("Default branch:")} ${repo.mainbranch.name}`);
-      }
-      this.output.text(`  ${source_default.dim("Created:")} ${this.output.formatDate(repo.created_on ?? "")}`);
-      this.output.text(`  ${source_default.dim("Updated:")} ${this.output.formatDate(repo.updated_on ?? "")}`);
-      this.output.text("");
-      this.output.text(`  ${source_default.dim("URL:")} ${repo.links?.html?.href}`);
-      const sshClone = Array.from(repo.links?.clone ?? []).find((c) => c.name === "ssh");
-      if (sshClone?.href) {
-        this.output.text(`  ${source_default.dim("SSH:")} ${sshClone.href}`);
-      }
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+    const response = await this.repositoriesApi.repositoriesWorkspaceRepoSlugGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug
+    });
+    const repo = response.data;
+    if (context.globalOptions.json) {
+      this.output.json(repo);
+      return;
+    }
+    this.output.text(this.output.bold(repo.full_name ?? ""));
+    if (repo.description) {
+      this.output.text(this.output.dim(repo.description));
+    }
+    this.output.text("");
+    this.output.text(`  ${this.output.dim("Visibility:")} ${repo.is_private ? "Private" : "Public"}`);
+    this.output.text(`  ${this.output.dim("Owner:")} ${repo.owner?.display_name ?? "Unknown"}`);
+    if (repo.language) {
+      this.output.text(`  ${this.output.dim("Language:")} ${repo.language}`);
+    }
+    if (repo.mainbranch) {
+      this.output.text(`  ${this.output.dim("Default branch:")} ${repo.mainbranch.name}`);
+    }
+    this.output.text(`  ${this.output.dim("Created:")} ${this.output.formatDate(repo.created_on ?? "")}`);
+    this.output.text(`  ${this.output.dim("Updated:")} ${this.output.formatDate(repo.updated_on ?? "")}`);
+    this.output.text("");
+    this.output.text(`  ${this.output.dim("URL:")} ${repo.links?.html?.href}`);
+    const sshClone = Array.from(repo.links?.clone ?? []).find((c) => c.name === "ssh");
+    if (sshClone?.href) {
+      this.output.text(`  ${this.output.dim("SSH:")} ${sshClone.href}`);
     }
   }
 }
@@ -51836,24 +51916,22 @@ class DeleteRepoCommand extends BaseCommand {
     }
     const repoContext = await this.contextService.requireRepoContext(contextOptions);
     if (!yes) {
-      const error = new Error(`This will permanently delete ${repoContext.workspace}/${repoContext.repoSlug}.
+      throw new Error(`This will permanently delete ${repoContext.workspace}/${repoContext.repoSlug}.
 ` + "Use --yes to confirm deletion.");
-      this.output.error(error.message);
-      if (true) {
-        process.exitCode = 1;
-      }
-      throw error;
     }
-    try {
-      await this.repositoriesApi.repositoriesWorkspaceRepoSlugDelete({
+    await this.repositoriesApi.repositoriesWorkspaceRepoSlugDelete({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug
+    });
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         workspace: repoContext.workspace,
         repoSlug: repoContext.repoSlug
       });
-      this.output.success(`Deleted repository ${repoContext.workspace}/${repoContext.repoSlug}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Deleted repository ${repoContext.workspace}/${repoContext.repoSlug}`);
   }
 }
 
@@ -51872,11 +51950,7 @@ class CreatePRCommand extends BaseCommand {
   }
   async execute(options, context) {
     if (!options.title) {
-      this.output.error("Pull request title is required. Use --title option.");
-      if (true) {
-        process.exitCode = 1;
-      }
-      throw new Error("Pull request title is required");
+      throw new Error("Pull request title is required. Use --title option.");
     }
     const repoContext = await this.contextService.requireRepoContext({
       ...context.globalOptions,
@@ -51906,21 +51980,20 @@ class CreatePRCommand extends BaseCommand {
     if (options.draft) {
       request.draft = true;
     }
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPost({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        body: request
-      });
-      const pr = response.data;
-      const links = pr.links;
-      this.output.success(`Created pull request #${pr.id}`);
-      this.output.text(`  ${source_default.dim("Title:")} ${pr.title}`);
-      this.output.text(`  ${source_default.dim("URL:")} ${links?.html?.href}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPost({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      body: request
+    });
+    const pr = response.data;
+    const links = pr.links;
+    if (context.globalOptions.json) {
+      this.output.json(pr);
+      return;
     }
+    this.output.success(`Created pull request #${pr.id}`);
+    this.output.text(`  ${this.output.dim("Title:")} ${pr.title}`);
+    this.output.text(`  ${this.output.dim("URL:")} ${links?.html?.href}`);
   }
 }
 
@@ -51941,34 +52014,39 @@ class ListPRsCommand extends BaseCommand {
       ...options
     });
     const state = options.state || "OPEN";
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsGet({
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      state
+    });
+    const data = response.data;
+    const values = data.values ? Array.from(data.values) : [];
+    if (context.globalOptions.json) {
+      this.output.json({
         workspace: repoContext.workspace,
         repoSlug: repoContext.repoSlug,
-        state
-      });
-      const data = response.data;
-      const values = data.values ? Array.from(data.values) : [];
-      if (values.length === 0) {
-        this.output.text(`No ${state.toLowerCase()} pull requests found`);
-        return;
-      }
-      const rows = values.map((pr) => {
-        const title = pr.draft ? `[DRAFT] ${pr.title}` : pr.title;
-        const source = pr.source;
-        const destination = pr.destination;
-        return [
-          `#${pr.id}`,
-          this.truncate(title ?? "", 50),
-          pr.author?.display_name ?? "Unknown",
-          `${source?.branch?.name ?? "unknown"} \u2192 ${destination?.branch?.name ?? "unknown"}`
-        ];
+        state,
+        count: values.length,
+        pullRequests: values
       });
-      this.output.table(["ID", "TITLE", "AUTHOR", "BRANCHES"], rows);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    if (values.length === 0) {
+      this.output.text(`No ${state.toLowerCase()} pull requests found`);
+      return;
+    }
+    const rows = values.map((pr) => {
+      const title = pr.draft ? `[DRAFT] ${pr.title}` : pr.title;
+      const source = pr.source;
+      const destination = pr.destination;
+      return [
+        `#${pr.id}`,
+        this.truncate(title ?? "", 50),
+        pr.author?.display_name ?? "Unknown",
+        `${source?.branch?.name ?? "unknown"} \u2192 ${destination?.branch?.name ?? "unknown"}`
+      ];
+    });
+    this.output.table(["ID", "TITLE", "AUTHOR", "BRANCHES"], rows);
   }
   truncate(text, maxLength) {
     if (text.length <= maxLength) {
@@ -51994,31 +52072,30 @@ class ViewPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
-      });
-      const pr = response.data;
-      this.renderHeader(pr);
-      this.renderDescription(pr);
-      this.renderBranchInfo(pr);
-      this.renderMetadata(pr);
-      this.renderReviewers(pr);
-      this.renderFooter(pr);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const pr = response.data;
+    if (context.globalOptions.json) {
+      this.output.json(pr);
+      return;
     }
+    this.renderHeader(pr);
+    this.renderDescription(pr);
+    this.renderBranchInfo(pr);
+    this.renderMetadata(pr);
+    this.renderReviewers(pr);
+    this.renderFooter(pr);
   }
   renderHeader(pr) {
     const stateColor = this.getStateColor(pr.state);
-    const draftLabel = pr.draft ? source_default.yellow(" [DRAFT]") : "";
+    const draftLabel = pr.draft ? this.output.yellow(" [DRAFT]") : "";
     this.output.text("");
-    this.output.text(`${source_default.bold(`#${pr.id}`)} ${pr.title}${draftLabel} ${stateColor(`[${pr.state}]`)}`);
-    this.output.text(source_default.gray("\u2500".repeat(60)));
+    this.output.text(`${this.output.bold(`#${pr.id}`)} ${pr.title}${draftLabel} ${stateColor(`[${pr.state}]`)}`);
+    this.output.text(this.output.gray("\u2500".repeat(60)));
   }
   renderDescription(pr) {
     if (pr.description) {
@@ -52029,75 +52106,75 @@ class ViewPRCommand extends BaseCommand {
   renderBranchInfo(pr) {
     const source = pr.source;
     const destination = pr.destination;
-    const sourceBranch = source_default.cyan(source?.branch?.name ?? "unknown");
-    const destBranch = source_default.cyan(destination?.branch?.name ?? "unknown");
-    const arrow = source_default.gray(" \u2192 ");
-    this.output.text(`${source_default.dim("Branch:")}   ${sourceBranch}${arrow}${destBranch}`);
+    const sourceBranch = this.output.cyan(source?.branch?.name ?? "unknown");
+    const destBranch = this.output.cyan(destination?.branch?.name ?? "unknown");
+    const arrow = this.output.gray(" \u2192 ");
+    this.output.text(`${this.output.dim("Branch:")}   ${sourceBranch}${arrow}${destBranch}`);
     if (source?.commit?.hash || destination?.commit?.hash) {
-      const sourceHash = source?.commit?.hash ? source_default.gray(source.commit.hash.slice(0, 7)) : source_default.gray("unknown");
-      const destHash = destination?.commit?.hash ? source_default.gray(destination.commit.hash.slice(0, 7)) : source_default.gray("unknown");
-      this.output.text(`${source_default.dim("Commits:")}  ${sourceHash}${arrow}${destHash}`);
+      const sourceHash = source?.commit?.hash ? this.output.gray(source.commit.hash.slice(0, 7)) : this.output.gray("unknown");
+      const destHash = destination?.commit?.hash ? this.output.gray(destination.commit.hash.slice(0, 7)) : this.output.gray("unknown");
+      this.output.text(`${this.output.dim("Commits:")}  ${sourceHash}${arrow}${destHash}`);
     }
   }
   renderMetadata(pr) {
-    this.output.text(`${source_default.dim("Author:")}   ${pr.author?.display_name ?? "Unknown"}`);
+    this.output.text(`${this.output.dim("Author:")}   ${pr.author?.display_name ?? "Unknown"}`);
     if (pr.closed_by) {
       const action = pr.state === "MERGED" ? "Merged" : "Closed";
-      this.output.text(`${source_default.dim(action + ":")}   ${pr.closed_by.display_name}`);
+      this.output.text(`${this.output.dim(action + ":")}   ${pr.closed_by.display_name}`);
     }
     const createdOn = pr.created_on ? this.output.formatDate(pr.created_on) : "Unknown";
     const updatedOn = pr.updated_on ? this.output.formatDate(pr.updated_on) : "Unknown";
-    this.output.text(`${source_default.dim("Created:")}  ${createdOn}`);
-    this.output.text(`${source_default.dim("Updated:")}  ${updatedOn}`);
+    this.output.text(`${this.output.dim("Created:")}  ${createdOn}`);
+    this.output.text(`${this.output.dim("Updated:")}  ${updatedOn}`);
     const mergeCommit = pr.merge_commit;
     if (mergeCommit?.hash) {
-      this.output.text(`${source_default.dim("Merge:")}    ${source_default.magenta(mergeCommit.hash.slice(0, 7))}`);
+      this.output.text(`${this.output.dim("Merge:")}    ${this.output.magenta(mergeCommit.hash.slice(0, 7))}`);
     }
-    const closeBranchIndicator = pr.close_source_branch ? source_default.green("\u2713") : source_default.gray("\u2717");
-    this.output.text(`${source_default.dim("Close Src:")} ${closeBranchIndicator} ${source_default.gray("(close source branch on merge)")}`);
-    this.output.text(`${source_default.dim("Activity:")} ${pr.comment_count ?? 0} comments \xB7 ${pr.task_count ?? 0} tasks`);
+    const closeBranchIndicator = pr.close_source_branch ? this.output.green("\u2713") : this.output.gray("\u2717");
+    this.output.text(`${this.output.dim("Close Src:")} ${closeBranchIndicator} ${this.output.gray("(close source branch on merge)")}`);
+    this.output.text(`${this.output.dim("Activity:")} ${pr.comment_count ?? 0} comments \xB7 ${pr.task_count ?? 0} tasks`);
   }
   renderReviewers(pr) {
     const participants = pr.participants ? Array.from(pr.participants) : [];
     const reviewers = participants.filter((p) => p.role === "REVIEWER");
     if (reviewers.length === 0) {
       this.output.text("");
-      this.output.text(source_default.gray("No reviewers assigned"));
+      this.output.text(this.output.gray("No reviewers assigned"));
       return;
     }
     this.output.text("");
-    this.output.text(source_default.dim("Reviewers:"));
+    this.output.text(this.output.dim("Reviewers:"));
     for (const reviewer of reviewers) {
       const status = this.getReviewerStatus(reviewer);
-      this.output.text(`  ${status.icon} ${reviewer.user?.display_name ?? "Unknown"} ${source_default.gray(status.label)}`);
+      this.output.text(`  ${status.icon} ${reviewer.user?.display_name ?? "Unknown"} ${this.output.gray(status.label)}`);
     }
   }
   getReviewerStatus(reviewer) {
     if (reviewer.approved) {
-      return { icon: source_default.green("\u2713"), label: "approved" };
+      return { icon: this.output.green("\u2713"), label: "approved" };
     }
     if (reviewer.state === "changes_requested") {
-      return { icon: source_default.red("\u2717"), label: "changes requested" };
+      return { icon: this.output.red("\u2717"), label: "changes requested" };
     }
-    return { icon: source_default.yellow("\u25CB"), label: "pending" };
+    return { icon: this.output.yellow("\u25CB"), label: "pending" };
   }
   renderFooter(pr) {
     const links = pr.links;
     this.output.text("");
-    this.output.text(source_default.gray("\u2500".repeat(60)));
-    this.output.text(`${source_default.dim("URL:")} ${source_default.blue.underline(links?.html?.href ?? "")}`);
+    this.output.text(this.output.gray("\u2500".repeat(60)));
+    this.output.text(`${this.output.dim("URL:")} ${this.output.underline(this.output.blue(links?.html?.href ?? ""))}`);
     this.output.text("");
   }
   getStateColor(state) {
     switch (state) {
       case "OPEN":
-        return source_default.green;
+        return (text) => this.output.green(text);
       case "MERGED":
-        return source_default.magenta;
+        return (text) => this.output.magenta(text);
       case "DECLINED":
-        return source_default.red;
+        return (text) => this.output.red(text);
       default:
-        return source_default.gray;
+        return (text) => this.output.gray(text);
     }
   }
 }
@@ -52123,7 +52200,7 @@ class EditPRCommand extends BaseCommand {
     });
     let prId;
     if (options.id) {
-      prId = parseInt(options.id, 10);
+      prId = Number.parseInt(options.id, 10);
     } else {
       const currentBranch = await this.gitService.getCurrentBranch();
       const prsResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsGet({
@@ -52132,17 +52209,12 @@ class EditPRCommand extends BaseCommand {
         state: "OPEN"
       });
       const values = prsResponse.data.values ? Array.from(prsResponse.data.values) : [];
-      const matchingPR = values.find((pr) => {
-        const source = pr.source;
+      const matchingPR = values.find((pr2) => {
+        const source = pr2.source;
         return source?.branch?.name === currentBranch;
       });
       if (!matchingPR) {
-        const error = new Error(`No open pull request found for current branch '${currentBranch}'. Specify a PR ID explicitly.`);
-        this.output.error(error.message);
-        if (true) {
-          process.exitCode = 1;
-        }
-        throw error;
+        throw new Error(`No open pull request found for current branch '${currentBranch}'. Specify a PR ID explicitly.`);
       }
       prId = matchingPR.id;
     }
@@ -52151,21 +52223,11 @@ class EditPRCommand extends BaseCommand {
       try {
         body = fs.readFileSync(options.bodyFile, "utf-8");
       } catch (err) {
-        const error = new Error(`Failed to read file '${options.bodyFile}': ${err instanceof Error ? err.message : "Unknown error"}`);
-        this.output.error(error.message);
-        if (true) {
-          process.exitCode = 1;
-        }
-        throw error;
+        throw new Error(`Failed to read file '${options.bodyFile}': ${err instanceof Error ? err.message : "Unknown error"}`);
       }
     }
     if (!options.title && !body) {
-      const error = new Error("At least one of --title or --body (or --body-file) is required.");
-      this.output.error(error.message);
-      if (true) {
-        process.exitCode = 1;
-      }
-      throw error;
+      throw new Error("At least one of --title or --body (or --body-file) is required.");
     }
     const request = {
       type: "pullrequest"
@@ -52176,26 +52238,25 @@ class EditPRCommand extends BaseCommand {
     if (body) {
       request.description = body;
     }
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId,
-        body: request
-      });
-      const pr = response.data;
-      const links = pr.links;
-      this.output.success(`Updated pull request #${pr.id}`);
-      this.output.text(`  ${source_default.dim("Title:")} ${pr.title}`);
-      if (pr.description) {
-        const truncatedDesc = pr.description.length > 100 ? pr.description.substring(0, 100) + "..." : pr.description;
-        this.output.text(`  ${source_default.dim("Description:")} ${truncatedDesc}`);
-      }
-      this.output.text(`  ${source_default.dim("URL:")} ${links?.html?.href}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      body: request
+    });
+    const pr = response.data;
+    const links = pr.links;
+    if (context.globalOptions.json) {
+      this.output.json(pr);
+      return;
     }
+    this.output.success(`Updated pull request #${pr.id}`);
+    this.output.text(`  ${this.output.dim("Title:")} ${pr.title}`);
+    if (pr.description) {
+      const truncatedDesc = pr.description.length > 100 ? pr.description.substring(0, 100) + "..." : pr.description;
+      this.output.text(`  ${this.output.dim("Description:")} ${truncatedDesc}`);
+    }
+    this.output.text(`  ${this.output.dim("URL:")} ${links?.html?.href}`);
   }
 }
 
@@ -52215,7 +52276,7 @@ class MergePRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
+    const prId = Number.parseInt(options.id, 10);
     const request = {
       type: "pullrequest_merge_parameters"
     };
@@ -52228,19 +52289,22 @@ class MergePRCommand extends BaseCommand {
     if (options.strategy) {
       request.merge_strategy = options.strategy;
     }
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdMergePost({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      body: request
+    });
+    const pr = response.data;
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         pullRequestId: prId,
-        body: request
+        pullRequest: pr
       });
-      const pr = response.data;
-      this.output.success(`Merged pull request #${prId}: ${pr.title}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Merged pull request #${prId}: ${pr.title}`);
   }
 }
 
@@ -52260,18 +52324,20 @@ class ApprovePRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdApprovePost({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
+    const prId = Number.parseInt(options.id, 10);
+    await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdApprovePost({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         pullRequestId: prId
       });
-      this.output.success(`Approved pull request #${prId}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Approved pull request #${prId}`);
   }
 }
 
@@ -52291,19 +52357,22 @@ class DeclinePRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdDeclinePost({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdDeclinePost({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const pr = response.data;
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
+        pullRequestId: prId,
+        pullRequest: pr
       });
-      const pr = response.data;
-      this.output.success(`Declined pull request #${prId}: ${pr.title}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Declined pull request #${prId}: ${pr.title}`);
   }
 }
 
@@ -52323,24 +52392,27 @@ class ReadyPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      body: {
+        type: "pullrequest",
+        draft: false
+      }
+    });
+    const pr = response.data;
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         pullRequestId: prId,
-        body: {
-          type: "pullrequest",
-          draft: false
-        }
+        pullRequest: pr
       });
-      const pr = response.data;
-      this.output.success(`Marked pull request #${prId} as ready for review`);
-      this.output.text(`  ${pr.title}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Marked pull request #${prId} as ready for review`);
+    this.output.text(`  ${pr.title}`);
   }
 }
 
@@ -52362,32 +52434,48 @@ class CheckoutPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
+    const prId = Number.parseInt(options.id, 10);
+    const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const pr = prResponse.data;
+    const branchName = pr.source?.branch?.name;
+    const localBranchName = `pr-${prId}`;
+    if (!branchName) {
+      throw new Error("Pull request source branch not found");
+    }
+    await this.gitService.fetch();
+    let checkedOutBranch;
     try {
-      const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
-      });
-      const pr = prResponse.data;
-      const branchName = pr.source?.branch?.name;
-      const localBranchName = `pr-${prId}`;
-      if (!branchName) {
-        throw new Error("Pull request source branch not found");
+      await this.gitService.checkout(branchName);
+      checkedOutBranch = branchName;
+      if (context.globalOptions.json) {
+        this.output.json({
+          success: true,
+          pullRequestId: prId,
+          branch: checkedOutBranch,
+          pullRequest: pr
+        });
+        return;
       }
-      await this.gitService.fetch();
-      try {
-        await this.gitService.checkout(branchName);
-        this.output.success(`Checked out PR #${prId} as '${branchName}'`);
-      } catch {
-        await this.gitService.checkoutNewBranch(localBranchName, `origin/${branchName}`);
-        this.output.success(`Checked out PR #${prId} as '${localBranchName}'`);
+      this.output.success(`Checked out PR #${prId} as '${branchName}'`);
+    } catch {
+      await this.gitService.checkoutNewBranch(localBranchName, `origin/${branchName}`);
+      checkedOutBranch = localBranchName;
+      if (context.globalOptions.json) {
+        this.output.json({
+          success: true,
+          pullRequestId: prId,
+          branch: checkedOutBranch,
+          pullRequest: pr
+        });
+        return;
       }
-      this.output.text(`  Title: ${pr.title}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      this.output.success(`Checked out PR #${prId} as '${localBranchName}'`);
     }
+    this.output.text(`  Title: ${pr.title}`);
   }
 }
 
@@ -52415,9 +52503,9 @@ class DiffPRCommand extends BaseCommand {
     });
     let prId;
     if (options.id) {
-      prId = parseInt(options.id, 10);
-      if (isNaN(prId)) {
-        throw new Error("Invalid PR ID");
+      prId = Number.parseInt(options.id, 10);
+      if (Number.isNaN(prId)) {
+        throw new TypeError("Invalid PR ID");
       }
     } else {
       const currentBranch = await this.gitService.getCurrentBranch();
@@ -52433,34 +52521,58 @@ class DiffPRCommand extends BaseCommand {
       prId = pr.id;
     }
     if (options.web) {
-      const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
-      });
-      const diffUrl = prResponse.data.links?.diff?.href;
-      if (!diffUrl) {
-        throw new Error("Could not get diff URL");
+      const webUrl = await this.getWebDiffUrl(repoContext.workspace, repoContext.repoSlug, prId);
+      if (context.globalOptions.json) {
+        this.output.json({
+          workspace: repoContext.workspace,
+          repoSlug: repoContext.repoSlug,
+          pullRequestId: prId,
+          mode: "web",
+          url: webUrl
+        });
+        return;
       }
-      const webUrl = diffUrl.replace(/api\.bitbucket\.org\/2\.0\/repositories\/(.*?)\/pullrequests\/(\d+)\/diff/, "bitbucket.org/$1/pull-requests/$2/diff");
-      await this.openInBrowser(webUrl, context);
+      await this.openInBrowser(webUrl);
       return;
     }
     if (options.stat) {
-      await this.showStat(repoContext.workspace, repoContext.repoSlug, prId, context);
+      const statResult = await this.showStat(repoContext.workspace, repoContext.repoSlug, prId, Boolean(context.globalOptions.json));
+      if (context.globalOptions.json) {
+        this.output.json({
+          workspace: repoContext.workspace,
+          repoSlug: repoContext.repoSlug,
+          pullRequestId: prId,
+          mode: "stat",
+          ...statResult
+        });
+      }
       return;
     }
     if (options.nameOnly) {
-      await this.showNameOnly(repoContext.workspace, repoContext.repoSlug, prId, context);
+      const files = await this.showNameOnly(repoContext.workspace, repoContext.repoSlug, prId, Boolean(context.globalOptions.json));
+      if (context.globalOptions.json) {
+        this.output.json({
+          workspace: repoContext.workspace,
+          repoSlug: repoContext.repoSlug,
+          pullRequestId: prId,
+          mode: "name-only",
+          files
+        });
+      }
       return;
     }
-    await this.showDiff(repoContext.workspace, repoContext.repoSlug, prId, options, context);
-  }
-  async openInBrowser(url2, context) {
+    const diff = await this.showDiff(repoContext.workspace, repoContext.repoSlug, prId, options, Boolean(context.globalOptions.json));
     if (context.globalOptions.json) {
-      this.output.json({ url: url2 });
-      return;
+      this.output.json({
+        workspace: repoContext.workspace,
+        repoSlug: repoContext.repoSlug,
+        pullRequestId: prId,
+        mode: "diff",
+        diff
+      });
     }
+  }
+  async openInBrowser(url2) {
     this.output.info(`Opening ${url2} in your browser...`);
     const platform = process.platform;
     let command;
@@ -52473,7 +52585,19 @@ class DiffPRCommand extends BaseCommand {
     }
     await execAsync(command);
   }
-  async showStat(workspace, repoSlug, prId, context) {
+  async getWebDiffUrl(workspace, repoSlug, prId) {
+    const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
+      workspace,
+      repoSlug,
+      pullRequestId: prId
+    });
+    const diffUrl = prResponse.data.links?.diff?.href;
+    if (!diffUrl) {
+      throw new Error("Could not get diff URL");
+    }
+    return diffUrl.replace(/api\.bitbucket\.org\/2\.0\/repositories\/(.*?)\/pullrequests\/(\d+)\/diff/, "bitbucket.org/$1/pull-requests/$2/diff");
+  }
+  async showStat(workspace, repoSlug, prId, useJson) {
     const diffstatResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdDiffstatGet({
       workspace,
       repoSlug,
@@ -52491,21 +52615,35 @@ class DiffPRCommand extends BaseCommand {
     const totalAdditions = files.reduce((sum, f) => sum + f.additions, 0);
     const totalDeletions = files.reduce((sum, f) => sum + f.deletions, 0);
     const filesChanged = files.length;
+    if (useJson) {
+      return {
+        files,
+        filesChanged,
+        totalAdditions,
+        totalDeletions
+      };
+    }
     for (const file of files) {
-      const additions = file.additions > 0 ? source_default.green(`+${file.additions}`) : "";
-      const deletions = file.deletions > 0 ? source_default.red(`-${file.deletions}`) : "";
+      const additions = file.additions > 0 ? this.output.green(`+${file.additions}`) : "";
+      const deletions = file.deletions > 0 ? this.output.red(`-${file.deletions}`) : "";
       const stats = [additions, deletions].filter(Boolean).join(" ");
       this.output.text(`${file.path} ${stats ? `| ${stats}` : ""}`);
     }
     this.output.text("");
     const summary = [
-      `${filesChanged} file${filesChanged !== 1 ? "s" : ""} changed`,
-      totalAdditions > 0 ? source_default.green(`${totalAdditions} insertion${totalAdditions !== 1 ? "s" : ""}(+)`) : null,
-      totalDeletions > 0 ? source_default.red(`${totalDeletions} deletion${totalDeletions !== 1 ? "s" : ""}(-)`) : null
+      `${filesChanged} file${filesChanged === 1 ? "" : "s"} changed`,
+      totalAdditions > 0 ? this.output.green(`${totalAdditions} insertion${totalAdditions === 1 ? "" : "s"}(+)`) : null,
+      totalDeletions > 0 ? this.output.red(`${totalDeletions} deletion${totalDeletions === 1 ? "" : "s"}(-)`) : null
     ].filter(Boolean).join(", ");
     this.output.text(summary);
+    return {
+      files,
+      filesChanged,
+      totalAdditions,
+      totalDeletions
+    };
   }
-  async showNameOnly(workspace, repoSlug, prId, context) {
+  async showNameOnly(workspace, repoSlug, prId, useJson) {
     const diffstatResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdDiffstatGet({
       workspace,
       repoSlug,
@@ -52513,11 +52651,15 @@ class DiffPRCommand extends BaseCommand {
     });
     const diffstat = diffstatResponse.data;
     const fileNames = Array.from(diffstat.values ?? []).map((file) => file.new?.path || file.old?.path || "unknown");
+    if (useJson) {
+      return fileNames;
+    }
     for (const fileName of fileNames) {
       this.output.text(fileName);
     }
+    return fileNames;
   }
-  async showDiff(workspace, repoSlug, prId, options, context) {
+  async showDiff(workspace, repoSlug, prId, options, useJson) {
     const diffResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdDiffGet({
       workspace,
       repoSlug,
@@ -52525,8 +52667,12 @@ class DiffPRCommand extends BaseCommand {
     });
     const diff = diffResponse.data;
     const shouldColorize = this.shouldColorize(options.color);
+    if (useJson) {
+      return String(diff);
+    }
     const colorizedDiff = shouldColorize ? this.colorizeDiff(String(diff)) : String(diff);
     this.output.text(colorizedDiff);
+    return String(diff);
   }
   shouldColorize(colorOption) {
     if (!colorOption || colorOption === "auto") {
@@ -52539,15 +52685,15 @@ class DiffPRCommand extends BaseCommand {
 `);
     return lines.map((line) => {
       if (line.startsWith("+") && !line.startsWith("+++")) {
-        return source_default.green(line);
+        return this.output.green(line);
       } else if (line.startsWith("-") && !line.startsWith("---")) {
-        return source_default.red(line);
+        return this.output.red(line);
       } else if (line.startsWith("@@")) {
-        return source_default.cyan(line);
+        return this.output.cyan(line);
       } else if (line.startsWith("diff --git")) {
-        return source_default.bold(line);
+        return this.output.bold(line);
       } else if (line.startsWith("index ") || line.startsWith("---") || line.startsWith("+++")) {
-        return source_default.dim(line);
+        return this.output.dim(line);
       }
       return line;
     }).join(`
@@ -52571,40 +52717,47 @@ class ActivityPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    const limit = options.limit ? parseInt(options.limit, 10) : 25;
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdActivityGet({
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdActivityGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const data = response.data;
+    const values = data?.values ? Array.from(data.values) : [];
+    const filterTypes = this.parseTypeFilter(options.type);
+    const activities = filterTypes.length > 0 ? values.filter((activity) => filterTypes.includes(this.getActivityType(activity))) : values;
+    if (context.globalOptions.json) {
+      this.output.json({
         workspace: repoContext.workspace,
         repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
+        pullRequestId: prId,
+        filters: {
+          types: filterTypes
+        },
+        count: activities.length,
+        activities
       });
-      const data = response.data;
-      const values = data?.values ? Array.from(data.values) : [];
-      const filterTypes = this.parseTypeFilter(options.type);
-      const activities = filterTypes.length > 0 ? values.filter((activity) => filterTypes.includes(this.getActivityType(activity))) : values;
-      if (activities.length === 0) {
-        if (filterTypes.length > 0) {
-          this.output.info("No activity entries matched the requested filter");
-        } else {
-          this.output.info("No activity found on this pull request");
-        }
-        return;
+      return;
+    }
+    if (activities.length === 0) {
+      if (filterTypes.length > 0) {
+        this.output.info("No activity entries matched the requested filter");
+      } else {
+        this.output.info("No activity found on this pull request");
       }
-      const rows = activities.map((activity) => {
-        const activityType = this.getActivityType(activity);
-        return [
-          activityType.toUpperCase(),
-          this.getActorName(activity),
-          this.formatActivityDate(activity),
-          this.buildActivityDetails(activity, activityType)
-        ];
-      });
-      this.output.table(["TYPE", "ACTOR", "DATE", "DETAILS"], rows);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    const rows = activities.map((activity) => {
+      const activityType = this.getActivityType(activity);
+      return [
+        activityType.toUpperCase(),
+        this.getActorName(activity),
+        this.formatActivityDate(activity),
+        this.buildActivityDetails(activity, activityType)
+      ];
+    });
+    this.output.table(["TYPE", "ACTOR", "DATE", "DETAILS"], rows);
   }
   parseTypeFilter(typeOption) {
     if (!typeOption) {
@@ -52717,24 +52870,27 @@ class CommentPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId,
-        body: {
-          type: "pullrequest_comment",
-          content: {
-            raw: options.message
-          }
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsPost({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      body: {
+        type: "pullrequest_comment",
+        content: {
+          raw: options.message
         }
+      }
+    });
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
+        pullRequestId: prId,
+        comment: response.data
       });
-      this.output.success(`Added comment to pull request #${prId}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Added comment to pull request #${prId}`);
   }
 }
 
@@ -52754,34 +52910,36 @@ class ListCommentsPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    const limit = options.limit ? parseInt(options.limit, 10) : 25;
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
-      });
-      const data = response.data;
-      const values = data.values ? Array.from(data.values) : [];
-      if (values.length === 0) {
-        this.output.info("No comments found on this pull request");
-        return;
-      }
-      const rows = values.map((comment) => {
-        const content = comment.content?.raw ?? "";
-        return [
-          comment.id?.toString() ?? "",
-          comment.user?.nickname ?? comment.user?.display_name ?? "Unknown",
-          comment.deleted ? "[deleted]" : options.truncate === false ? content : content.slice(0, 60) + (content.length > 60 ? "..." : ""),
-          this.output.formatDate(comment.created_on ?? "")
-        ];
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const data = response.data;
+    const values = data.values ? Array.from(data.values) : [];
+    if (context.globalOptions.json) {
+      this.output.json({
+        pullRequestId: prId,
+        count: values.length,
+        comments: values
       });
-      this.output.table(["ID", "Author", "Content", "Date"], rows);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
+    }
+    if (values.length === 0) {
+      this.output.info("No comments found on this pull request");
+      return;
     }
+    const rows = values.map((comment) => {
+      const content = comment.content?.raw ?? "";
+      return [
+        comment.id?.toString() ?? "",
+        comment.user?.nickname ?? comment.user?.display_name ?? "Unknown",
+        comment.deleted ? "[deleted]" : options.truncate === false ? content : content.slice(0, 60) + (content.length > 60 ? "..." : ""),
+        this.output.formatDate(comment.created_on ?? "")
+      ];
+    });
+    this.output.table(["ID", "Author", "Content", "Date"], rows);
   }
 }
 
@@ -52801,26 +52959,30 @@ class EditCommentPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.prId, 10);
-    const commentId = parseInt(options.commentId, 10);
-    try {
-      await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
+    const prId = Number.parseInt(options.prId, 10);
+    const commentId = Number.parseInt(options.commentId, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdPut({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      commentId,
+      body: {
+        type: "pullrequest_comment",
+        content: {
+          raw: options.message
+        }
+      }
+    });
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         pullRequestId: prId,
         commentId,
-        body: {
-          type: "pullrequest_comment",
-          content: {
-            raw: options.message
-          }
-        }
+        comment: response.data
       });
-      this.output.success(`Updated comment #${commentId}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Updated comment #${commentId} on PR #${prId}`);
   }
 }
 
@@ -52840,20 +53002,23 @@ class DeleteCommentPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.prId, 10);
-    const commentId = parseInt(options.commentId, 10);
-    try {
-      await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdDelete({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
+    const prId = Number.parseInt(options.prId, 10);
+    const commentId = Number.parseInt(options.commentId, 10);
+    await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdCommentsCommentIdDelete({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      commentId
+    });
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         pullRequestId: prId,
         commentId
       });
-      this.output.success(`Deleted comment #${commentId} from PR #${prId}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Deleted comment #${commentId} from PR #${prId}`);
   }
 }
 
@@ -52875,37 +53040,44 @@ class AddReviewerPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      const userResponse = await this.usersApi.usersSelectedUserGet({
-        selectedUser: options.username
-      });
-      const user = userResponse.data;
-      const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
-      });
-      const pr = prResponse.data;
-      const existingReviewers = pr.reviewers ? Array.from(pr.reviewers) : [];
-      const reviewerUuids = existingReviewers.map((r) => r.uuid).filter(Boolean);
-      if (!reviewerUuids.includes(user.uuid)) {
-        reviewerUuids.push(user.uuid);
+    const prId = Number.parseInt(options.id, 10);
+    const userResponse = await this.usersApi.usersSelectedUserGet({
+      selectedUser: options.username
+    });
+    const user = userResponse.data;
+    const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const pr = prResponse.data;
+    const existingReviewers = pr.reviewers ? Array.from(pr.reviewers) : [];
+    const reviewerUuids = existingReviewers.map((r) => r.uuid).filter(Boolean);
+    if (!reviewerUuids.includes(user.uuid)) {
+      reviewerUuids.push(user.uuid);
+    }
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      body: {
+        type: "pullrequest",
+        reviewers: reviewerUuids.map((uuid) => ({ uuid }))
       }
-      await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
+    });
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         pullRequestId: prId,
-        body: {
-          type: "pullrequest",
-          reviewers: reviewerUuids.map((uuid) => ({ uuid }))
-        }
+        reviewer: {
+          username: options.username,
+          uuid: user.uuid
+        },
+        pullRequest: response.data
       });
-      this.output.success(`Added ${options.username} as reviewer to pull request #${prId}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Added ${options.username} as reviewer to pull request #${prId}`);
   }
 }
 
@@ -52927,34 +53099,41 @@ class RemoveReviewerPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      const userResponse = await this.usersApi.usersSelectedUserGet({
-        selectedUser: options.username
-      });
-      const user = userResponse.data;
-      const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
-      });
-      const pr = prResponse.data;
-      const existingReviewers = pr.reviewers ? Array.from(pr.reviewers) : [];
-      const reviewerUuids = existingReviewers.map((r) => r.uuid).filter((uuid) => uuid && uuid !== user.uuid);
-      await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
+    const prId = Number.parseInt(options.id, 10);
+    const userResponse = await this.usersApi.usersSelectedUserGet({
+      selectedUser: options.username
+    });
+    const user = userResponse.data;
+    const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const pr = prResponse.data;
+    const existingReviewers = pr.reviewers ? Array.from(pr.reviewers) : [];
+    const reviewerUuids = existingReviewers.map((r) => r.uuid).filter((uuid) => uuid && uuid !== user.uuid);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId,
+      body: {
+        type: "pullrequest",
+        reviewers: reviewerUuids.map((uuid) => ({ uuid }))
+      }
+    });
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
         pullRequestId: prId,
-        body: {
-          type: "pullrequest",
-          reviewers: reviewerUuids.map((uuid) => ({ uuid }))
-        }
+        reviewer: {
+          username: options.username,
+          uuid: user.uuid
+        },
+        pullRequest: response.data
       });
-      this.output.success(`Removed ${options.username} as reviewer from pull request #${prId}`);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    this.output.success(`Removed ${options.username} as reviewer from pull request #${prId}`);
   }
 }
 
@@ -52974,28 +53153,26 @@ class ListReviewersPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-        workspace: repoContext.workspace,
-        repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const pr = response.data;
+    const reviewers = Array.from(pr.reviewers ?? []);
+    if (context.globalOptions.json) {
+      this.output.json({
+        pullRequestId: prId,
+        count: reviewers.length,
+        reviewers
       });
-      const pr = response.data;
-      const reviewers = pr.reviewers ?? [];
-      if (context.globalOptions.json) {
-        this.output.json(reviewers);
-      } else if (reviewers.length === 0) {
-        this.output.info("No reviewers assigned to this pull request");
-      } else {
-        this.output.table(["Display Name", "Account ID"], reviewers.map((r) => [
-          r.display_name ?? "Unknown",
-          r.account_id ?? ""
-        ]));
-      }
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
+    }
+    if (reviewers.length === 0) {
+      this.output.info("No reviewers assigned to this pull request");
+    } else {
+      this.output.table(["Display Name", "Account ID"], reviewers.map((r) => [r.display_name ?? "Unknown", r.account_id ?? ""]));
     }
   }
 }
@@ -53016,35 +53193,32 @@ class ChecksPRCommand extends BaseCommand {
       ...context.globalOptions,
       ...options
     });
-    const prId = parseInt(options.id, 10);
-    try {
-      const response = await this.commitStatusesApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdStatusesGet({
+    const prId = Number.parseInt(options.id, 10);
+    const response = await this.commitStatusesApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdStatusesGet({
+      workspace: repoContext.workspace,
+      repoSlug: repoContext.repoSlug,
+      pullRequestId: prId
+    });
+    const data = response.data;
+    const statuses = data?.values ? Array.from(data.values) : [];
+    const summary = this.getSummary(statuses);
+    const useJson = options.json || context.globalOptions.json;
+    if (useJson) {
+      this.output.json({
+        pullRequestId: prId,
         workspace: repoContext.workspace,
         repoSlug: repoContext.repoSlug,
-        pullRequestId: prId
+        summary,
+        statuses: statuses.map((status) => this.formatStatusForJson(status))
       });
-      const data = response.data;
-      const statuses = data?.values ? Array.from(data.values) : [];
-      const useJson = options.json || context.globalOptions.json;
-      if (useJson) {
-        this.output.json({
-          pullRequestId: prId,
-          workspace: repoContext.workspace,
-          repoSlug: repoContext.repoSlug,
-          statuses: statuses.map((status) => this.formatStatusForJson(status))
-        });
-        return;
-      }
-      if (statuses.length === 0) {
-        this.output.info("No CI/CD checks found for this pull request");
-        return;
-      }
-      this.renderHeader(prId, statuses.length);
-      this.renderStatuses(statuses);
-    } catch (error) {
-      this.handleError(error, context);
-      throw error;
+      return;
     }
+    if (statuses.length === 0) {
+      this.output.info("No CI/CD checks found for this pull request");
+      return;
+    }
+    this.renderHeader(prId, statuses.length);
+    this.renderStatuses(statuses, summary);
   }
   formatStatusForJson(status) {
     return {
@@ -53061,10 +53235,11 @@ class ChecksPRCommand extends BaseCommand {
   }
   renderHeader(prId, count) {
     this.output.text("");
-    this.output.text(`${source_default.bold(`Pull Request #${prId}`)} - ${count} check${count === 1 ? "" : "s"}`);
-    this.output.text(source_default.gray("-".repeat(60)));
+    const title = this.output.bold("Pull Request #" + prId);
+    this.output.text(`${title} - ${count} check${count === 1 ? "" : "s"}`);
+    this.output.text(this.output.gray("-".repeat(60)));
   }
-  renderStatuses(statuses) {
+  renderStatuses(statuses, summary) {
     const rows = statuses.map((status) => {
       const stateIcon = this.getStateIcon(status.state);
       const stateLabel = this.getStateLabel(status.state);
@@ -53072,29 +53247,28 @@ class ChecksPRCommand extends BaseCommand {
       const description = status.description ?? "-";
       return [
         `${stateIcon} ${stateLabel}`,
-        source_default.bold(name),
+        this.output.bold(name),
         this.truncate(description, 40),
         status.updated_on ? this.output.formatDate(status.updated_on) : "-"
       ];
     });
     this.output.table(["STATUS", "NAME", "DESCRIPTION", "UPDATED"], rows);
-    const summary = this.getSummary(statuses);
     this.output.text("");
-    this.output.text(`${source_default.green("OK")} ${summary.successful} successful, ${source_default.red("FAIL")} ${summary.failed} failed, ${source_default.yellow("RUN")} ${summary.pending} pending`);
+    this.output.text(`${this.output.green("OK")} ${summary.successful} successful, ${this.output.red("FAIL")} ${summary.failed} failed, ${this.output.yellow("RUN")} ${summary.pending} pending`);
     this.output.text("");
   }
   getStateIcon(state) {
     switch (state?.toUpperCase()) {
       case "SUCCESSFUL":
-        return source_default.green("OK");
+        return this.output.green("OK");
       case "FAILED":
-        return source_default.red("FAIL");
+        return this.output.red("FAIL");
       case "INPROGRESS":
-        return source_default.yellow("RUN");
+        return this.output.yellow("RUN");
       case "STOPPED":
-        return source_default.gray("STOP");
+        return this.output.gray("STOP");
       default:
-        return source_default.gray("?");
+        return this.output.gray("?");
     }
   }
   getStateLabel(state) {
@@ -53161,19 +53335,22 @@ class GetConfigCommand extends BaseCommand {
     super(output);
     this.configService = configService;
   }
-  async execute(options, _context) {
+  async execute(options, context) {
     const { key } = options;
     if (GetConfigCommand.HIDDEN_KEYS.includes(key)) {
-      const error = new Error(`Cannot display '${key}' - use 'bb auth token' to get authentication credentials`);
-      this.output.error(error.message);
-      throw error;
+      throw new Error(`Cannot display '${key}' - use 'bb auth token' to get authentication credentials`);
     }
     if (!isReadableConfigKey(key)) {
-      const error = new Error(`Unknown config key '${key}'. Valid keys: username, defaultWorkspace`);
-      this.output.error(error.message);
-      throw error;
+      throw new Error(`Unknown config key '${key}'. Valid keys: username, defaultWorkspace`);
     }
     const value = await this.configService.getValue(key);
+    if (context.globalOptions.json) {
+      this.output.json({
+        key,
+        value: value ?? null
+      });
+      return;
+    }
     this.output.text(String(value || ""));
   }
 }
@@ -53188,19 +53365,23 @@ class SetConfigCommand extends BaseCommand {
     super(output);
     this.configService = configService;
   }
-  async execute(options, _context) {
+  async execute(options, context) {
     const { key, value } = options;
     if (SetConfigCommand.PROTECTED_KEYS.includes(key)) {
-      const error = new Error(`Cannot set '${key}' directly. Use 'bb auth login' to configure authentication.`);
-      this.output.error(error.message);
-      throw error;
+      throw new Error(`Cannot set '${key}' directly. Use 'bb auth login' to configure authentication.`);
     }
     if (!isSettableConfigKey(key)) {
-      const error = new Error(`Unknown config key '${key}'. Valid keys: defaultWorkspace`);
-      this.output.error(error.message);
-      throw error;
+      throw new Error(`Unknown config key '${key}'. Valid keys: defaultWorkspace`);
     }
     await this.configService.setValue(key, value);
+    if (context.globalOptions.json) {
+      this.output.json({
+        success: true,
+        key,
+        value
+      });
+      return;
+    }
     this.output.success(`Set ${key} = ${value}`);
   }
 }
@@ -53214,14 +53395,21 @@ class ListConfigCommand extends BaseCommand {
     super(output);
     this.configService = configService;
   }
-  async execute(_options, _context) {
+  async execute(_options, context) {
     const config = await this.configService.getConfig();
     const displayConfig = {
       username: config.username || "",
       defaultWorkspace: config.defaultWorkspace || "",
       apiToken: config.apiToken ? "********" : ""
     };
-    this.output.text(source_default.dim(`Config file: ${this.configService.getConfigPath()}`));
+    if (context.globalOptions.json) {
+      this.output.json({
+        configPath: this.configService.getConfigPath(),
+        config: Object.fromEntries(Object.entries(displayConfig).filter(([, value]) => value !== ""))
+      });
+      return;
+    }
+    this.output.text(this.output.dim(`Config file: ${this.configService.getConfigPath()}`));
     this.output.text("");
     const rows = Object.entries(displayConfig).filter(([, value]) => value !== "").map(([key, value]) => [key, value]);
     if (rows.length === 0) {
@@ -53241,17 +53429,26 @@ class InstallCompletionCommand extends BaseCommand {
   constructor(output) {
     super(output);
   }
-  async execute(_options, _context) {
+  async execute(_options, context) {
     try {
       await import_tabtab.default.install({
         name: "bb",
         completer: "bb"
       });
+      if (context.globalOptions.json) {
+        this.output.json({
+          success: true,
+          shellCompletion: {
+            command: "bb",
+            installed: true
+          }
+        });
+        return;
+      }
       this.output.success("Shell completions installed successfully!");
       this.output.text("Restart your shell or source your profile to enable completions.");
     } catch (error) {
-      this.output.error(`Failed to install completions: ${error}`);
-      throw error;
+      throw new Error(`Failed to install completions: ${error}`);
     }
   }
 }
@@ -53265,15 +53462,24 @@ class UninstallCompletionCommand extends BaseCommand {
   constructor(output) {
     super(output);
   }
-  async execute(_options, _context) {
+  async execute(_options, context) {
     try {
       await import_tabtab2.default.uninstall({
         name: "bb"
       });
+      if (context.globalOptions.json) {
+        this.output.json({
+          success: true,
+          shellCompletion: {
+            command: "bb",
+            installed: false
+          }
+        });
+        return;
+      }
       this.output.success("Shell completions uninstalled successfully!");
     } catch (error) {
-      this.output.error(`Failed to uninstall completions: ${error}`);
-      throw error;
+      throw new Error(`Failed to uninstall completions: ${error}`);
     }
   }
 }
@@ -53281,11 +53487,11 @@ class UninstallCompletionCommand extends BaseCommand {
 // src/bootstrap.ts
 var require2 = createRequire(import.meta.url);
 var pkg = require2("../package.json");
-function bootstrap() {
+function bootstrap(options = {}) {
   const container = Container.getInstance();
   container.register(ServiceTokens.ConfigService, () => new ConfigService);
   container.register(ServiceTokens.GitService, () => new GitService);
-  container.register(ServiceTokens.OutputService, () => new OutputService);
+  container.register(ServiceTokens.OutputService, () => new OutputService({ noColor: options.noColor }));
   container.register(ServiceTokens.PullrequestsApi, () => {
     const configService = container.resolve(ServiceTokens.ConfigService);
     const axiosInstance = createApiClient(configService);
@@ -53529,6 +53735,7 @@ if (process.argv.includes("--get-yargs-completions") || process.env.COMP_LINE) {
       "--help",
       "--version",
       "--json",
+      "--no-color",
       "--workspace",
       "--repo"
     ];
@@ -53549,17 +53756,44 @@ if (process.argv.includes("--get-yargs-completions") || process.env.COMP_LINE) {
     process.exit(0);
   }
 }
-var container = bootstrap();
+function resolveNoColorSetting(argv, env2) {
+  const hasColorArg = argv.includes("--color");
+  const hasNoColorArg = argv.includes("--no-color");
+  const hasForceColorEnv = env2.FORCE_COLOR !== undefined && env2.FORCE_COLOR !== "0";
+  const hasNoColorEnv = env2.NO_COLOR !== undefined;
+  if (hasColorArg) {
+    return false;
+  }
+  if (hasForceColorEnv) {
+    return false;
+  }
+  if (hasNoColorArg) {
+    return true;
+  }
+  return hasNoColorEnv;
+}
+var noColor = resolveNoColorSetting(process.argv, process.env);
+var container = bootstrap({ noColor });
 function createContext(program2) {
   const opts = program2.opts();
   return {
     globalOptions: {
       json: opts.json,
+      noColor: opts.color === false,
       workspace: opts.workspace,
       repo: opts.repo
     }
   };
 }
+async function runCommand(token, options, program2, context) {
+  const cmd = container.resolve(token);
+  const resolvedContext = context ?? createContext(program2);
+  try {
+    return await cmd.run(options, resolvedContext);
+  } catch {
+    return;
+  }
+}
 function withGlobalOptions(options, context) {
   return {
     ...options,
@@ -53568,321 +53802,156 @@ function withGlobalOptions(options, context) {
   };
 }
 var cli = new Command;
-cli.name("bb").description("A command-line interface for Bitbucket Cloud").version(pkg2.version).option("--json", "Output as JSON").option("-w, --workspace <workspace>", "Specify workspace").option("-r, --repo <repo>", "Specify repository").action(async () => {
+cli.name("bb").description("A command-line interface for Bitbucket Cloud").version(pkg2.version).option("--json", "Output as JSON").option("--no-color", "Disable color output").option("-w, --workspace <workspace>", "Specify workspace").option("-r, --repo <repo>", "Specify repository").action(async () => {
   cli.outputHelp();
   const versionService = container.resolve(ServiceTokens.VersionService);
   const output = container.resolve(ServiceTokens.OutputService);
   try {
     const result = await versionService.checkForUpdate();
     if (result?.updateAvailable) {
-      console.log("");
-      console.log("\u2500".repeat(50));
-      console.log(`\u26A0 A new version is available: ${result.latestVersion} (you have ${result.currentVersion})`);
-      console.log(`  Run '${versionService.getInstallCommand()}' to update`);
-      console.log(`  Or disable with 'bb config set skipVersionCheck true'`);
-      console.log("\u2500".repeat(50));
+      output.text("");
+      output.text("\u2500".repeat(50));
+      output.text(`\u26A0 A new version is available: ${result.latestVersion} (you have ${result.currentVersion})`);
+      output.text(`  Run '${versionService.getInstallCommand()}' to update`);
+      output.text(`  Or disable with 'bb config set skipVersionCheck true'`);
+      output.text("\u2500".repeat(50));
     }
   } catch {}
 });
 var authCmd = new Command("auth").description("Authenticate with Bitbucket");
 authCmd.command("login").description("Authenticate with Bitbucket using an API token").option("-u, --username <username>", "Bitbucket username").option("-p, --password <password>", "Bitbucket API token").action(async (options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.LoginCommand);
-    await cmd.execute(options, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.LoginCommand, options, cli);
 });
 authCmd.command("logout").description("Log out of Bitbucket").action(async () => {
-  try {
-    const cmd = container.resolve(ServiceTokens.LogoutCommand);
-    await cmd.execute(undefined, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.LogoutCommand, undefined, cli);
 });
 authCmd.command("status").description("Show authentication status").action(async () => {
-  try {
-    const cmd = container.resolve(ServiceTokens.StatusCommand);
-    await cmd.execute(undefined, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.StatusCommand, undefined, cli);
 });
 authCmd.command("token").description("Print the current access token").action(async () => {
-  try {
-    const cmd = container.resolve(ServiceTokens.TokenCommand);
-    await cmd.execute(undefined, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.TokenCommand, undefined, cli);
 });
 cli.addCommand(authCmd);
 var repoCmd = new Command("repo").description("Manage repositories");
 repoCmd.command("clone <repository>").description("Clone a Bitbucket repository").option("-d, --directory <dir>", "Directory to clone into").action(async (repository, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.CloneCommand);
-    await cmd.execute({ repository, ...options }, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.CloneCommand, { repository, ...options }, cli);
 });
 repoCmd.command("create <name>").description("Create a new repository").option("-d, --description <description>", "Repository description").option("--private", "Create a private repository (default)").option("--public", "Create a public repository").option("-p, --project <project>", "Project key").action(async (name, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.CreateRepoCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ name, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.CreateRepoCommand, withGlobalOptions({ name, ...options }, context), cli, context);
 });
 repoCmd.command("list").description("List repositories").option("--limit <number>", "Maximum number of repositories to list", "25").action(async (options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ListReposCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions(options, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ListReposCommand, withGlobalOptions(options, context), cli, context);
 });
 repoCmd.command("view [repository]").description("View repository details").action(async (repository, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ViewRepoCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ repository, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ViewRepoCommand, withGlobalOptions({ repository, ...options }, context), cli, context);
 });
 repoCmd.command("delete <repository>").description("Delete a repository").option("-y, --yes", "Skip confirmation prompt").action(async (repository, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.DeleteRepoCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ repository, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.DeleteRepoCommand, withGlobalOptions({ repository, ...options }, context), cli, context);
 });
 cli.addCommand(repoCmd);
 var prCmd = new Command("pr").description("Manage pull requests");
 prCmd.command("create").description("Create a pull request").option("-t, --title <title>", "Pull request title").option("-b, --body <body>", "Pull request description").option("-s, --source <branch>", "Source branch (default: current branch)").option("-d, --destination <branch>", "Destination branch (default: main)").option("--close-source-branch", "Close source branch after merge").option("--draft", "Create the pull request as draft").action(async (options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.CreatePRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions(options, context), context);
-  } catch {
-    process.exit(1);
-  }
+  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").action(async (options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ListPRsCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions(options, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ListPRsCommand, withGlobalOptions(options, context), cli, context);
 });
 prCmd.command("view <id>").description("View pull request details").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ViewPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ViewPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("activity <id>").description("Show pull request activity log").option("--limit <number>", "Maximum number of activity entries", "25").option("--type <types>", "Filter activity by type (comma-separated)").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ActivityPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ActivityPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("checks <id>").description("Show CI/CD checks and build status for a pull request").option("--json", "Output as JSON").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ChecksPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ChecksPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("edit [id]").description("Edit a pull request").option("-t, --title <title>", "New pull request title").option("-b, --body <body>", "New pull request description").option("-F, --body-file <file>", "Read description from file").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.EditPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.EditPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("merge <id>").description("Merge a pull request").option("-m, --message <message>", "Merge commit message").option("--close-source-branch", "Delete the source branch after merging").option("--strategy <strategy>", "Merge strategy (merge_commit, squash, fast_forward)").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.MergePRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.MergePRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("approve <id>").description("Approve a pull request").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ApprovePRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ApprovePRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("decline <id>").description("Decline a pull request").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.DeclinePRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.DeclinePRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("ready <id>").description("Mark a draft pull request as ready for review").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ReadyPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ReadyPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("checkout <id>").description("Checkout a pull request locally").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.CheckoutPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.CheckoutPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCmd.command("diff [id]").description("View pull request diff").option("--color <when>", "Colorize output (auto, always, never)", "auto").option("--name-only", "Show only names of changed files").option("--stat", "Show diffstat").option("-w, --web", "Open diff in web browser").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.DiffPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.DiffPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 var prCommentsCmd = new Command("comments").description("Manage pull request comments");
 prCommentsCmd.command("list <id>").description("List comments on a pull request").option("--limit <number>", "Maximum number of comments (default: 25)").option("--no-truncate", "Show full comment content without truncation").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ListCommentsPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ListCommentsPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prCommentsCmd.command("add <id> <message>").description("Add a comment to a pull request").action(async (id, message, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.CommentPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, message }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.CommentPRCommand, withGlobalOptions({ id, message }, context), cli, context);
 });
 prCommentsCmd.command("edit <pr-id> <comment-id> <message>").description("Edit a comment on a pull request").action(async (prId, commentId, message, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.EditCommentPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ prId, commentId, message }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.EditCommentPRCommand, withGlobalOptions({ prId, commentId, message }, context), cli, context);
 });
 prCommentsCmd.command("delete <pr-id> <comment-id>").description("Delete a comment on a pull request").action(async (prId, commentId, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.DeleteCommentPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ prId, commentId }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.DeleteCommentPRCommand, withGlobalOptions({ prId, commentId }, context), cli, context);
 });
 var prReviewersCmd = new Command("reviewers").description("Manage pull request reviewers");
 prReviewersCmd.command("list <id>").description("List reviewers on a pull request").action(async (id, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ListReviewersPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.ListReviewersPRCommand, withGlobalOptions({ id, ...options }, context), cli, context);
 });
 prReviewersCmd.command("add <id> <username>").description("Add a reviewer to a pull request").action(async (id, username, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.AddReviewerPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, username, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.AddReviewerPRCommand, withGlobalOptions({ id, username, ...options }, context), cli, context);
 });
 prReviewersCmd.command("remove <id> <username>").description("Remove a reviewer from a pull request").action(async (id, username, options) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.RemoveReviewerPRCommand);
-    const context = createContext(cli);
-    await cmd.execute(withGlobalOptions({ id, username, ...options }, context), context);
-  } catch {
-    process.exit(1);
-  }
+  const context = createContext(cli);
+  await runCommand(ServiceTokens.RemoveReviewerPRCommand, withGlobalOptions({ id, username, ...options }, context), cli, context);
 });
 cli.addCommand(prCmd);
 prCmd.addCommand(prCommentsCmd);
 prCmd.addCommand(prReviewersCmd);
 var configCmd = new Command("config").description("Manage configuration");
 configCmd.command("get <key>").description("Get a configuration value").action(async (key) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.GetConfigCommand);
-    await cmd.execute({ key }, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.GetConfigCommand, { key }, cli);
 });
 configCmd.command("set <key> <value>").description("Set a configuration value").action(async (key, value) => {
-  try {
-    const cmd = container.resolve(ServiceTokens.SetConfigCommand);
-    await cmd.execute({ key, value }, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.SetConfigCommand, { key, value }, cli);
 });
 configCmd.command("list").description("List all configuration values").action(async () => {
-  try {
-    const cmd = container.resolve(ServiceTokens.ListConfigCommand);
-    await cmd.execute(undefined, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.ListConfigCommand, undefined, cli);
 });
 cli.addCommand(configCmd);
 var completionCmd = new Command("completion").description("Shell completion utilities");
 completionCmd.command("install").description("Install shell completions for bash, zsh, or fish").action(async () => {
-  try {
-    const cmd = container.resolve(ServiceTokens.InstallCompletionCommand);
-    await cmd.execute(undefined, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.InstallCompletionCommand, undefined, cli);
 });
 completionCmd.command("uninstall").description("Uninstall shell completions").action(async () => {
-  try {
-    const cmd = container.resolve(ServiceTokens.UninstallCompletionCommand);
-    await cmd.execute(undefined, createContext(cli));
-  } catch {
-    process.exit(1);
-  }
+  await runCommand(ServiceTokens.UninstallCompletionCommand, undefined, cli);
 });
 cli.addCommand(completionCmd);