chore: minor changes

Author: MathurAditya724

src/lib/api-client.ts

@@ -47,6 +47,7 @@ import {
 
 import type { AutofixResponse, AutofixState } from "../types/seer.js";
 import { ApiError, AuthError } from "./errors.js";
+import { resolveOrgRegion } from "./region.js";
 import {
   getApiBaseUrl,
   getControlSiloUrl,
@@ -162,7 +163,6 @@ export function buildSearchParams(
  * Resolves the org's region URL and returns the config.
  */
 async function getOrgSdkConfig(orgSlug: string) {
-  const { resolveOrgRegion } = await import("./region.js");
   const regionUrl = await resolveOrgRegion(orgSlug);
   return getSdkConfig(regionUrl);
 }
@@ -460,7 +460,6 @@ export type ProjectWithOrg = SentryProject & {
  */
 export function listRepositories(orgSlug: string): Promise<SentryRepository[]> {
   return withHttpSpan("GET", `/organizations/${orgSlug}/repos/`, async () => {
-    const { resolveOrgRegion } = await import("./region.js");
     const regionUrl = await resolveOrgRegion(orgSlug);
 
     return apiRequestToRegion<SentryRepository[]>(
@@ -698,7 +697,6 @@ export function listIssues(
     "GET",
     `/projects/${orgSlug}/${projectSlug}/issues/`,
     async () => {
-      const { resolveOrgRegion } = await import("./region.js");
       const regionUrl = await resolveOrgRegion(orgSlug);
 
       // Use raw request: the SDK type doesn't support limit/sort params
@@ -855,7 +853,6 @@ export function getDetailedTrace(
     "GET",
     `/organizations/${orgSlug}/trace/${traceId}/`,
     async () => {
-      const { resolveOrgRegion } = await import("./region.js");
       const regionUrl = await resolveOrgRegion(orgSlug);
 
       return apiRequestToRegion<TraceSpan[]>(
@@ -917,7 +914,6 @@ export function listTransactions(
     const projectFilter = isNumericProject ? "" : `project:${projectSlug}`;
     const fullQuery = [projectFilter, options.query].filter(Boolean).join(" ");
 
-    const { resolveOrgRegion } = await import("./region.js");
     const regionUrl = await resolveOrgRegion(orgSlug);
 
     // Use raw request: the SDK's dataset type doesn't include "transactions"
@@ -1056,7 +1052,6 @@ export function triggerSolutionPlanning(
     "POST",
     `/organizations/${orgSlug}/issues/${issueId}/autofix/`,
     async () => {
-      const { resolveOrgRegion } = await import("./region.js");
       const regionUrl = await resolveOrgRegion(orgSlug);
 
       return apiRequestToRegion(

src/lib/region.ts

@@ -5,17 +5,21 @@
  * using cached data when available or fetching from the API when needed.
  */
 
+import { retrieveAnOrganization } from "@sentry/api";
 import { getOrgRegion, setOrgRegion } from "./db/regions.js";
+import { getSdkConfig } from "./sentry-client.js";
 import { getSentryBaseUrl, isSentrySaasUrl } from "./sentry-urls.js";
 
 /**
  * Resolve the region URL for an organization.
  *
  * Resolution order:
  * 1. Check SQLite cache
- * 2. Fetch organization details to get region URL
+ * 2. Fetch organization details via SDK to get region URL
  * 3. Fall back to default URL if resolution fails
  *
+ * Uses the SDK directly (not api-client) to avoid circular dependency.
+ *
  * @param orgSlug - The organization slug
  * @returns The region URL for the organization
  */
@@ -26,20 +30,21 @@ export async function resolveOrgRegion(orgSlug: string): Promise<string> {
     return cached;
   }
 
-  // 2. Try to fetch org details to get region
-  // Import dynamically to avoid circular dependency
-  const { apiRequestToRegion } = await import("./api-client.js");
-  type OrgWithLinks = { links?: { regionUrl?: string } };
+  // 2. Fetch org details via SDK to discover the region URL
+  const baseUrl = getSentryBaseUrl();
+  const config = getSdkConfig(baseUrl);
 
   try {
-    // First try the default URL - it may route correctly
-    const baseUrl = getSentryBaseUrl();
-    const org = await apiRequestToRegion<OrgWithLinks>(
-      baseUrl,
-      `/organizations/${orgSlug}/`
-    );
+    const result = await retrieveAnOrganization({
+      ...config,
+      path: { organization_id_or_slug: orgSlug },
+    });
+
+    if (result.error !== undefined) {
+      return baseUrl;
+    }
 
-    const regionUrl = org.links?.regionUrl ?? baseUrl;
+    const regionUrl = result.data?.links?.regionUrl ?? baseUrl;
 
     // Cache for future use
     await setOrgRegion(orgSlug, regionUrl);