fix: address BugBot review comments

- org/list: show both truncation notice and tip hint when results are
  truncated (was either-or due to else-if)
- cli/setup: rename local quiet-aware `log` to `emit` and module-level
  `cmdLog` to `log` to match the naming convention used by all other
  commands (avoids shadowing confusion)
- trace/list: keep empty-page next-page command inline in hint text
  instead of splitting it across main output and de-emphasized footer

Author: BYK

src/commands/cli/setup.ts

@@ -42,7 +42,7 @@ import {
   parseInstallationMethod,
 } from "../../lib/upgrade.js";
 
-const cmdLog = logger.withTag("cli.setup");
+const log = logger.withTag("cli.setup");
 
 type SetupFlags = {
   readonly install: boolean;
@@ -74,7 +74,7 @@ async function handleInstall(
   execPath: string,
   homeDir: string,
   env: NodeJS.ProcessEnv,
-  log: Logger
+  emit: Logger
 ): Promise<{ binaryPath: string; binaryDir: string; created: boolean }> {
   const installDir = determineInstallDir(homeDir, env);
   const targetPath = join(installDir, getBinaryFilename());
@@ -83,7 +83,7 @@ async function handleInstall(
   const binaryPath = await installBinary(execPath, installDir);
   const binaryDir = dirname(binaryPath);
 
-  log(`Binary: Installed to ${binaryPath}`);
+  emit(`Binary: Installed to ${binaryPath}`);
 
   // Clean up temp binary (Posix only — the inode stays alive for the running process)
   if (process.platform !== "win32") {
@@ -104,37 +104,37 @@ async function handlePathModification(
   binaryDir: string,
   shell: ShellInfo,
   env: NodeJS.ProcessEnv,
-  log: Logger
+  emit: Logger
 ): Promise<void> {
   const alreadyInPath = isInPath(binaryDir, env.PATH);
 
   if (alreadyInPath) {
-    log(`PATH: ${binaryDir} is already in PATH`);
+    emit(`PATH: ${binaryDir} is already in PATH`);
     return;
   }
 
   if (shell.configFile) {
     const result = await addToPath(shell.configFile, binaryDir, shell.type);
 
     if (result.modified) {
-      log(`PATH: ${result.message}`);
-      log(`      Restart your shell or run: source ${shell.configFile}`);
+      emit(`PATH: ${result.message}`);
+      emit(`      Restart your shell or run: source ${shell.configFile}`);
     } else if (result.manualCommand) {
-      log(`PATH: ${result.message}`);
-      log(`      Add manually: ${result.manualCommand}`);
+      emit(`PATH: ${result.message}`);
+      emit(`      Add manually: ${result.manualCommand}`);
     } else {
-      log(`PATH: ${result.message}`);
+      emit(`PATH: ${result.message}`);
     }
   } else {
     const cmd = getPathCommand(shell.type, binaryDir);
-    log("PATH: No shell config file found");
-    log(`      Add manually to your shell config: ${cmd}`);
+    emit("PATH: No shell config file found");
+    emit(`      Add manually to your shell config: ${cmd}`);
   }
 
   // Handle GitHub Actions
   const addedToGitHub = await addToGitHubPath(binaryDir, env);
   if (addedToGitHub) {
-    log("PATH: Added to $GITHUB_PATH");
+    emit("PATH: Added to $GITHUB_PATH");
   }
 }
 
@@ -235,30 +235,30 @@ async function handleCompletions(
  * Only produces output when the skill file is freshly created. Subsequent
  * runs (e.g. after upgrade) silently update without printing.
  */
-async function handleAgentSkills(homeDir: string, log: Logger): Promise<void> {
+async function handleAgentSkills(homeDir: string, emit: Logger): Promise<void> {
   const location = await installAgentSkills(homeDir, CLI_VERSION);
 
   if (location?.created) {
-    log(`Agent skills: Installed to ${location.path}`);
+    emit(`Agent skills: Installed to ${location.path}`);
   }
 }
 
 /**
  * Print a rich welcome message after fresh install.
  */
 function printWelcomeMessage(
-  log: Logger,
+  emit: Logger,
   version: string,
   binaryPath: string
 ): void {
-  log("");
-  log(`Installed sentry v${version} to ${binaryPath}`);
-  log("");
-  log("Get started:");
-  log("  sentry auth login  Authenticate with Sentry");
-  log("  sentry --help      See all available commands");
-  log("");
-  log("https://cli.sentry.dev");
+  emit("");
+  emit(`Installed sentry v${version} to ${binaryPath}`);
+  emit("");
+  emit("Get started:");
+  emit("  sentry auth login  Authenticate with Sentry");
+  emit("  sentry --help      See all available commands");
+  emit("");
+  emit("https://cli.sentry.dev");
 }
 
 type WarnLogger = (step: string, error: unknown) => void;
@@ -291,7 +291,7 @@ type ConfigStepOptions = {
   readonly binaryDir: string;
   readonly homeDir: string;
   readonly env: NodeJS.ProcessEnv;
-  readonly log: Logger;
+  readonly emit: Logger;
   readonly warn: WarnLogger;
 };
 
@@ -302,7 +302,7 @@ type ConfigStepOptions = {
  * error) doesn't prevent the others from running.
  */
 async function runConfigurationSteps(opts: ConfigStepOptions): Promise<void> {
-  const { flags, binaryPath, binaryDir, homeDir, env, log, warn } = opts;
+  const { flags, binaryPath, binaryDir, homeDir, env, emit, warn } = opts;
   const shell = detectShell(env.SHELL, homeDir, env.XDG_CONFIG_HOME);
 
   // 1. Record installation info
@@ -317,7 +317,7 @@ async function runConfigurationSteps(opts: ConfigStepOptions): Promise<void> {
           version: CLI_VERSION,
         });
         if (!flags.install) {
-          log(`Recorded installation method: ${method}`);
+          emit(`Recorded installation method: ${method}`);
         }
       },
       warn
@@ -332,7 +332,7 @@ async function runConfigurationSteps(opts: ConfigStepOptions): Promise<void> {
       () => {
         setReleaseChannel(channel);
         if (!flags.install) {
-          log(`Recorded release channel: ${channel}`);
+          emit(`Recorded release channel: ${channel}`);
         }
       },
       warn
@@ -343,7 +343,7 @@ async function runConfigurationSteps(opts: ConfigStepOptions): Promise<void> {
   if (!flags["no-modify-path"]) {
     await bestEffort(
       "PATH modification",
-      () => handlePathModification(binaryDir, shell, env, log),
+      () => handlePathModification(binaryDir, shell, env, emit),
       warn
     );
   }
@@ -360,7 +360,7 @@ async function runConfigurationSteps(opts: ConfigStepOptions): Promise<void> {
           env.PATH
         );
         for (const line of completionLines) {
-          log(line);
+          emit(line);
         }
       },
       warn
@@ -371,7 +371,7 @@ async function runConfigurationSteps(opts: ConfigStepOptions): Promise<void> {
   if (!flags["no-agent-skills"]) {
     await bestEffort(
       "Agent skills",
-      () => handleAgentSkills(homeDir, log),
+      () => handleAgentSkills(homeDir, emit),
       warn
     );
   }
@@ -444,16 +444,16 @@ export const setupCommand = buildCommand({
   async func(this: SentryContext, flags: SetupFlags): Promise<void> {
     const { process, homeDir } = this;
 
-    const log: Logger = (msg: string) => {
+    const emit: Logger = (msg: string) => {
       if (!flags.quiet) {
-        cmdLog.info(msg);
+        log.info(msg);
       }
     };
 
     const warn: WarnLogger = (step, error) => {
       const msg =
         error instanceof Error ? error.message : "Unknown error occurred";
-      cmdLog.warn(`${step} failed: ${msg}`);
+      log.warn(`${step} failed: ${msg}`);
     };
 
     let binaryPath = process.execPath;
@@ -466,7 +466,7 @@ export const setupCommand = buildCommand({
         process.execPath,
         homeDir,
         process.env,
-        log
+        emit
       );
       binaryPath = result.binaryPath;
       binaryDir = result.binaryDir;
@@ -480,14 +480,14 @@ export const setupCommand = buildCommand({
       binaryDir,
       homeDir,
       env: process.env,
-      log,
+      emit,
       warn,
     });
 
     // 5. Print welcome message only on fresh install — upgrades are silent
     // since the upgrade command itself prints a success message.
     if (!flags.quiet && freshInstall) {
-      printWelcomeMessage(log, CLI_VERSION, binaryPath);
+      printWelcomeMessage(emit, CLI_VERSION, binaryPath);
     }
   },
 });

src/commands/org/list.ts

@@ -143,14 +143,14 @@ export const listCommand = buildCommand({
         : undefined,
     }));
 
-    let hint: string | undefined;
+    const hints: string[] = [];
     if (orgs.length > flags.limit) {
-      hint = `Showing ${flags.limit} of ${orgs.length} organizations`;
-    } else if (entries.length > 0) {
-      hint = "Tip: Use 'sentry org view <slug>' for details";
+      hints.push(`Showing ${flags.limit} of ${orgs.length} organizations`);
+    }
+    if (entries.length > 0) {
+      hints.push("Tip: Use 'sentry org view <slug>' for details");
     }
-    // When entries is empty, hint remains undefined — no tip is shown
 
-    return { data: entries, hint };
+    return { data: entries, hint: hints.join("\n") || undefined };
   },
 });

src/commands/trace/list.ts

@@ -118,19 +118,15 @@ export function parseSort(value: string): SortValue {
 /**
  * Format trace list data for human-readable terminal output.
  *
- * Handles three display states:
- * - Empty list with more pages → "No traces on this page."
- * - Empty list, no more pages → "No traces found."
+ * Handles two display states:
+ * - Empty list → "No traces found." (next-page hint is in CommandOutput.hint)
  * - Non-empty → header line + formatted table
- *
- * The hint/footer is handled separately by the {@link CommandOutput.hint}
- * field, not by this formatter.
  */
 function formatTraceListHuman(result: TraceListResult): string {
-  const { traces, hasMore, org, project } = result;
+  const { traces, org, project } = result;
 
   if (traces.length === 0) {
-    return hasMore ? "No traces on this page." : "No traces found.";
+    return "No traces found.";
   }
 
   return `Recent traces in ${org}/${project}:\n\n${formatTraceTable(traces)}`;
@@ -271,7 +267,7 @@ export const listCommand = buildListCommand("trace", {
     // Build footer hint based on result state
     let hint: string | undefined;
     if (traces.length === 0 && hasMore) {
-      hint = `Try the next page: ${nextPageHint(org, project, flags)}`;
+      hint = `No traces on this page. Try the next page: ${nextPageHint(org, project, flags)}`;
     } else if (traces.length > 0) {
       const countText = `Showing ${traces.length} trace${traces.length === 1 ? "" : "s"}.`;
       hint = hasMore