fix: address round-2 feedback — remove api/0? handling, check getSystemErrorMap upfront

- Remove api/0? query-string edge case (reviewer: clearly an error)
- Replace try-catch patch with upfront hasGetSystemErrorMap check at
  module load — conditionally excludes NodeSystemError integration
  when util.getSystemErrorMap is missing (Bun)

Author: BYK

src/commands/api.ts

@@ -92,12 +92,8 @@ export function normalizeEndpoint(endpoint: string): string {
   // Strip api/0/ prefix if user accidentally included it — the base URL
   // already includes /api/0/, so keeping it would produce a doubled path
   // like /api/0/api/0/... (see CLI-K1).
-  // Handles: "api/0/path", "api/0" (bare), and "api/0?query" (query without slash).
-  if (
-    trimmed.startsWith("api/0/") ||
-    trimmed.startsWith("api/0?") ||
-    trimmed === "api/0"
-  ) {
+  // Also strip bare "api/0" to maintain idempotency.
+  if (trimmed.startsWith("api/0/") || trimmed === "api/0") {
     log.warn(
       "Endpoint includes the /api/0/ prefix which is added automatically — stripping it to avoid a doubled path"
     );

src/lib/telemetry.ts

@@ -25,8 +25,6 @@ import { getRealUsername } from "./utils.js";
 
 export type { Span } from "@sentry/core";
 
-import type { Integration } from "@sentry/core";
-
 /** Re-imported locally because Span is exported via re-export */
 type Span = Sentry.Span;
 
@@ -265,37 +263,22 @@ const EXCLUDED_INTEGRATIONS = new Set([
 ]);
 
 /**
- * Patch the NodeSystemError integration's processEvent to catch missing
- * `util.getSystemErrorMap()` on Bun. Without this, the SDK crashes during
- * event processing instead of sending the error report (CLI-K1).
+ * Check whether `util.getSystemErrorMap` exists at setup time.
+ * Bun does not implement this Node.js API, which the SDK's NodeSystemError
+ * integration uses in its `processEvent` hook. When missing, the hook crashes
+ * during event processing instead of sending the error report (CLI-K1).
  *
- * We wrap rather than exclude the integration so that on runtimes (or future
- * Bun versions) that implement `getSystemErrorMap`, system error context is
- * still attached.
+ * Checked once at module load so the integration filter is a simple boolean.
  */
-function patchNodeSystemErrorIntegration(
-  integration: Integration
-): Integration {
-  if (integration.name !== "NodeSystemError") {
-    return integration;
-  }
-
-  const original = integration.processEvent?.bind(integration);
-  if (!original) {
-    return integration;
+const hasGetSystemErrorMap = (() => {
+  try {
+    // Dynamic require to avoid bundler issues — the check only matters at runtime
+    const util = require("node:util") as Record<string, unknown>;
+    return typeof util.getSystemErrorMap === "function";
+  } catch {
+    return false;
   }
-
-  integration.processEvent = (...args) => {
-    try {
-      return original(...args);
-    } catch {
-      // getSystemErrorMap is not available — skip enrichment, keep the event
-      return args[0];
-    }
-  };
-
-  return integration;
-}
+})();
 
 /** Current beforeExit handler, tracked so it can be replaced on re-init */
 let currentBeforeExitHandler: (() => void) | null = null;
@@ -347,12 +330,15 @@ export function initSentry(
   const client = Sentry.init({
     dsn: SENTRY_CLI_DSN,
     enabled,
-    // Keep default integrations but filter out ones that add overhead without benefit
-    // Important: Don't use defaultIntegrations: false as it may break debug ID support
+    // Keep default integrations but filter out ones that add overhead without benefit.
+    // Important: Don't use defaultIntegrations: false as it may break debug ID support.
+    // NodeSystemError is excluded on runtimes missing util.getSystemErrorMap (Bun) — CLI-K1.
     integrations: (defaults) =>
-      defaults
-        .filter((integration) => !EXCLUDED_INTEGRATIONS.has(integration.name))
-        .map(patchNodeSystemErrorIntegration),
+      defaults.filter(
+        (integration) =>
+          !EXCLUDED_INTEGRATIONS.has(integration.name) &&
+          (integration.name !== "NodeSystemError" || hasGetSystemErrorMap)
+      ),
     environment,
     // Enable Sentry structured logs for non-exception telemetry (e.g., unexpected input warnings)
     enableLogs: true,

test/commands/api.test.ts

@@ -87,18 +87,6 @@ describe("normalizeEndpoint: api/0/ prefix stripping (CLI-K1)", () => {
     expect(normalizeEndpoint("api/0")).toBe("/");
   });
 
-  test("strips api/0 followed directly by query string", () => {
-    // After stripping "api/0", the remaining "?query=test" gets a trailing
-    // slash on the (empty) path portion → "/?query=test"
-    expect(normalizeEndpoint("api/0?query=test")).toBe("/?query=test");
-  });
-
-  test("strips /api/0 followed directly by query string", () => {
-    expect(normalizeEndpoint("/api/0?query=test&page=2")).toBe(
-      "/?query=test&page=2"
-    );
-  });
-
   test("does not strip partial api/ prefix", () => {
     expect(normalizeEndpoint("api/1/organizations/")).toBe(
       "api/1/organizations/"