refactor(init): reuse resolveOrg for offline-first org detection

resolveOrgSlug was reimplementing org detection (DSN scanning + numeric
ID resolution) that resolveOrg in resolve-target.ts already handles,
including env vars and config defaults that the init version missed.

Now calls resolveOrg() first (flags, env vars, defaults, DSN), and only
falls through to listOrganizations + interactive select when it returns
null.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: betegon

src/lib/init/local-ops.ts

@@ -16,6 +16,7 @@ import {
   tryGetPrimaryDsn,
 } from "../api-client.js";
 import { ApiError } from "../errors.js";
+import { resolveOrg } from "../resolve-target.js";
 import { resolveOrCreateTeam } from "../resolve-team.js";
 import { buildProjectUrl } from "../sentry-urls.js";
 import { slugify } from "../utils.js";
@@ -25,7 +26,6 @@ import {
   MAX_FILE_BYTES,
   MAX_OUTPUT_BYTES,
 } from "./constants.js";
-import { resolveOrgPrefetched } from "./prefetch.js";
 import type {
   ApplyPatchsetPayload,
   CreateSentryProjectPayload,
@@ -40,9 +40,6 @@ import type {
   WizardOptions,
 } from "./types.js";
 
-/** Matches a bare numeric org ID extracted from a DSN (e.g. "4507492088676352"). */
-const NUMERIC_ORG_ID_RE = /^\d+$/;
-
 /** Whitespace characters used for JSON indentation. */
 const Indenter = {
   SPACE: " ",
@@ -710,38 +707,28 @@ async function applyPatchset(
 }
 
 /**
- * Resolve the org slug from local config, env vars, or by listing the user's
- * organizations from the API as a fallback.
+ * Resolve the org slug using the shared offline-first resolver, falling back
+ * to interactive selection when multiple orgs are available.
  *
- * DSN scanning uses the prefetch-aware helper from `./prefetch.ts` — if
- * {@link warmOrgDetection} was called earlier (by `init.ts`), the result is
- * already cached and returns near-instantly.
+ * Resolution priority (via {@link resolveOrg}):
+ * 1. CLI `--org` flag
+ * 2. `SENTRY_ORG` / `SENTRY_PROJECT` env vars
+ * 3. Config defaults (SQLite)
+ * 4. DSN auto-detection (with numeric ID normalization)
  *
- * `listOrganizations()` uses SQLite caching for near-instant warm lookups
- * (populated after `sentry login` or the first API call), so it does not
- * need background prefetching.
+ * If none of the above resolve, lists the user's organizations (SQLite-cached
+ * after `sentry login`) and prompts for selection.
  *
  * @returns The org slug on success, or a {@link LocalOpResult} error to return early.
  */
 export async function resolveOrgSlug(
   cwd: string,
   yes: boolean
 ): Promise<string | LocalOpResult> {
-  const resolved = await resolveOrgPrefetched(cwd);
+  // Reuse the shared offline-first resolver (flags, env vars, defaults, DSN)
+  const resolved = await resolveOrg({ cwd });
   if (resolved) {
-    // If the detected org is a raw numeric ID (extracted from a DSN), try to
-    // resolve it to a real slug. Numeric IDs can fail for write operations like
-    // project/team creation, and may belong to a different Sentry account.
-    if (NUMERIC_ORG_ID_RE.test(resolved.org)) {
-      const { getOrgByNumericId } = await import("../db/regions.js");
-      const match = getOrgByNumericId(resolved.org);
-      if (match) {
-        return match.slug;
-      }
-      // Cache miss — fall through to listOrganizations() for proper selection
-    } else {
-      return resolved.org;
-    }
+    return resolved.org;
   }
 
   // Fallback: list user's organizations (SQLite-cached after login/first call)

test/lib/init/local-ops.create-sentry-project.test.ts

@@ -194,7 +194,7 @@ describe("create-sentry-project", () => {
 
   describe("resolveOrgSlug (called directly)", () => {
     test("single org fallback when resolveOrg returns null", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue(null);
+      resolveOrgSpy.mockResolvedValue(null);
       listOrgsSpy.mockResolvedValue([
         { id: "1", slug: "solo-org", name: "Solo Org" },
       ]);
@@ -206,7 +206,7 @@ describe("create-sentry-project", () => {
     });
 
     test("no orgs (not authenticated) returns error result", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue(null);
+      resolveOrgSpy.mockResolvedValue(null);
       listOrgsSpy.mockResolvedValue([]);
 
       const result = await resolveOrgSlug("/tmp/test", false);
@@ -218,7 +218,7 @@ describe("create-sentry-project", () => {
     });
 
     test("multiple orgs + yes flag returns error with slug list", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue(null);
+      resolveOrgSpy.mockResolvedValue(null);
       listOrgsSpy.mockResolvedValue([
         { id: "1", slug: "org-a", name: "Org A" },
         { id: "2", slug: "org-b", name: "Org B" },
@@ -235,7 +235,7 @@ describe("create-sentry-project", () => {
     });
 
     test("multiple orgs + interactive select picks chosen org", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue(null);
+      resolveOrgSpy.mockResolvedValue(null);
       listOrgsSpy.mockResolvedValue([
         { id: "1", slug: "org-a", name: "Org A" },
         { id: "2", slug: "org-b", name: "Org B" },
@@ -249,7 +249,7 @@ describe("create-sentry-project", () => {
     });
 
     test("multiple orgs + user cancels select throws WizardCancelledError", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue(null);
+      resolveOrgSpy.mockResolvedValue(null);
       listOrgsSpy.mockResolvedValue([
         { id: "1", slug: "org-a", name: "Org A" },
         { id: "2", slug: "org-b", name: "Org B" },
@@ -295,23 +295,18 @@ describe("create-sentry-project", () => {
     expect(data.dsn).toBe("");
   });
 
-  describe("resolveOrgSlug — numeric org ID from DSN", () => {
-    test("numeric ID + cache hit → resolved to slug", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue({ org: "4507492088676352" });
-      getOrgByNumericIdSpy.mockReturnValue({
-        slug: "acme-corp",
-        regionUrl: "https://us.sentry.io",
-      });
+  describe("resolveOrgSlug — resolveOrg integration", () => {
+    test("returns org from resolveOrg when it resolves", async () => {
+      resolveOrgSpy.mockResolvedValue({ org: "acme-corp" });
 
       const result = await resolveOrgSlug("/tmp/test", false);
 
       expect(result).toBe("acme-corp");
-      expect(getOrgByNumericIdSpy).toHaveBeenCalledWith("4507492088676352");
+      expect(listOrgsSpy).not.toHaveBeenCalled();
     });
 
-    test("numeric ID + cache miss → falls through to single org in listOrganizations", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue({ org: "4507492088676352" });
-      getOrgByNumericIdSpy.mockReturnValue(undefined);
+    test("falls through to listOrganizations when resolveOrg returns null", async () => {
+      resolveOrgSpy.mockResolvedValue(null);
       listOrgsSpy.mockResolvedValue([
         { id: "1", slug: "solo-org", name: "Solo Org" },
       ]);
@@ -320,22 +315,6 @@ describe("create-sentry-project", () => {
 
       expect(result).toBe("solo-org");
     });
-
-    test("numeric ID + cache miss + multiple orgs + --yes → error with org list", async () => {
-      resolveOrgPrefetchedSpy.mockResolvedValue({ org: "4507492088676352" });
-      getOrgByNumericIdSpy.mockReturnValue(undefined);
-      listOrgsSpy.mockResolvedValue([
-        { id: "1", slug: "org-a", name: "Org A" },
-        { id: "2", slug: "org-b", name: "Org B" },
-      ]);
-
-      const result = await resolveOrgSlug("/tmp/test", true);
-
-      expect(typeof result).toBe("object");
-      const err = result as { ok: boolean; error: string };
-      expect(err.ok).toBe(false);
-      expect(err.error).toContain("Multiple organizations found");
-    });
   });
 
   describe("detectExistingProject (called directly)", () => {