fix: address second round of review findings

- Fix metric edit validateMetricBody using invalid fallback values
  (skip validation for fields not present in the document)
- Fix bare org slug in metrics create misrouted to project-search
  (append trailing slash for org-all mode)
- Fix status check defaulting to 'disabled' when API omits status
  field — invert to check for disabled (status=1) explicitly
- Fix metric view/edit/delete using resolveTargetsFromParsedArg
  (project-scoped) instead of resolveOrgOptionalProjectFromArg
  (org-scoped), avoiding misleading 'no accessible projects' error
- Remove unused imports (ContextError, parseOrgProjectArg)

Author: MathurAditya724

src/commands/alert/metrics/create.ts

@@ -146,6 +146,7 @@ export const createCommand = buildCommand({
     },
     aliases: { ...DRY_RUN_ALIASES, t: "trigger", p: "project" },
   },
+  // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: inherent per-flag validation and org resolution
   async *func(this: SentryContext, flags: CreateFlags, arg: string) {
     const { cwd } = this;
     if (!flags.name.trim()) {
@@ -166,7 +167,10 @@ export const createCommand = buildCommand({
     validateMetricTriggers(triggers);
     const projects = normalizeProjectList(flags.project);
 
-    const parsed = parseOrgProjectArg(arg);
+    // Metric alerts are org-scoped — treat a bare slug as org-all to avoid
+    // misrouting through project-search.
+    const normalizedArg = arg && !arg.includes("/") ? `${arg}/` : arg;
+    const parsed = parseOrgProjectArg(normalizedArg);
     const { targets } = await resolveTargetsFromParsedArg(parsed, {
       cwd,
       usageHint: USAGE_HINT,
@@ -213,7 +217,7 @@ export const createCommand = buildCommand({
 
     const created = await createMetricAlertRule(orgSlug, body);
     const status: "active" | "disabled" =
-      created.status === 0 || created.status === "0" ? "active" : "disabled";
+      created.status === 1 || created.status === "1" ? "disabled" : "active";
     yield new CommandOutput({
       org: orgSlug,
       id: String(created.id ?? ""),

src/commands/alert/metrics/delete.ts

@@ -6,16 +6,14 @@
 
 import type { SentryContext } from "../../../context.js";
 import { deleteMetricAlertRule } from "../../../lib/api-client.js";
-import { parseOrgProjectArg } from "../../../lib/arg-parsing.js";
-import { ContextError } from "../../../lib/errors.js";
 import { CommandOutput } from "../../../lib/formatters/output.js";
 import { logger } from "../../../lib/logger.js";
 import {
   buildDeleteCommand,
   confirmByTyping,
   isConfirmationBypassed,
 } from "../../../lib/mutate-command.js";
-import { resolveTargetsFromParsedArg } from "../../../lib/resolve-target.js";
+import { resolveOrgOptionalProjectFromArg } from "../../../lib/resolve-target.js";
 import { parseMetricRuleArg, resolveMetricAlertRule } from "./rule-resolve.js";
 
 const USAGE_HINT = "sentry alert metrics delete <org>/<rule-id-or-name>";
@@ -74,15 +72,12 @@ export const deleteCommand = buildDeleteCommand({
   async *func(this: SentryContext, flags: DeleteFlags, arg: string) {
     const { cwd } = this;
     const { ref, targetArg } = parseMetricRuleArg(arg, USAGE_HINT);
-    const parsed = parseOrgProjectArg(targetArg);
-    const { targets } = await resolveTargetsFromParsedArg(parsed, {
+    const { org } = await resolveOrgOptionalProjectFromArg(
+      targetArg,
       cwd,
-      usageHint: USAGE_HINT,
-    });
-    const orgSlugs = [...new Set(targets.map((t) => t.org))];
-    if (orgSlugs.length === 0) {
-      throw new ContextError("Organization", USAGE_HINT);
-    }
+      "alert metrics delete"
+    );
+    const orgSlugs = [org];
 
     const { orgSlug, rule } = await resolveMetricAlertRule(
       orgSlugs,

src/commands/alert/metrics/edit.ts

@@ -9,11 +9,10 @@ import {
   getMetricAlertRuleDocument,
   putMetricAlertRule,
 } from "../../../lib/api-client.js";
-import { parseOrgProjectArg } from "../../../lib/arg-parsing.js";
 import { buildCommand, numberParser } from "../../../lib/command.js";
-import { ContextError, ValidationError } from "../../../lib/errors.js";
+import { ValidationError } from "../../../lib/errors.js";
 import { CommandOutput } from "../../../lib/formatters/output.js";
-import { resolveTargetsFromParsedArg } from "../../../lib/resolve-target.js";
+import { resolveOrgOptionalProjectFromArg } from "../../../lib/resolve-target.js";
 import {
   normalizeProjectList,
   parseJsonObjectList,
@@ -130,8 +129,12 @@ function validateMetricBody(body: Record<string, unknown>): void {
   validateMetricTriggers(
     body.triggers as Record<string, unknown>[] | undefined
   );
-  validateMetricDataset(String(body.dataset ?? ""));
-  validateMetricTimeWindow(Number(body.timeWindow ?? 0));
+  if (body.dataset !== undefined) {
+    validateMetricDataset(String(body.dataset));
+  }
+  if (body.timeWindow !== undefined) {
+    validateMetricTimeWindow(Number(body.timeWindow));
+  }
   if (typeof body.query !== "string" || body.query.trim() === "") {
     throw new ValidationError("query must be present and non-empty.", "query");
   }
@@ -247,15 +250,12 @@ export const editCommand = buildCommand({
     const { cwd } = this;
     validateMetricEditFlags(flags);
     const { ref, targetArg } = parseMetricRuleArg(arg, USAGE_HINT);
-    const parsed = parseOrgProjectArg(targetArg);
-    const { targets } = await resolveTargetsFromParsedArg(parsed, {
+    const { org } = await resolveOrgOptionalProjectFromArg(
+      targetArg,
       cwd,
-      usageHint: USAGE_HINT,
-    });
-    const orgSlugs = [...new Set(targets.map((t) => t.org))];
-    if (orgSlugs.length === 0) {
-      throw new ContextError("Organization", USAGE_HINT);
-    }
+      "alert metrics edit"
+    );
+    const orgSlugs = [org];
     const { orgSlug, rule } = await resolveMetricAlertRule(
       orgSlugs,
       ref,
@@ -273,7 +273,7 @@ export const editCommand = buildCommand({
       org: orgSlug,
       id: String(updated.id ?? rule.id),
       status:
-        updated.status === 0 || updated.status === "0" ? "active" : "disabled",
+        updated.status === 1 || updated.status === "1" ? "disabled" : "active",
     } satisfies EditResult);
   },
 });

src/commands/alert/metrics/view.ts

@@ -1,10 +1,8 @@
 import type { SentryContext } from "../../../context.js";
-import { parseOrgProjectArg } from "../../../lib/arg-parsing.js";
 import { openInBrowser } from "../../../lib/browser.js";
 import { buildCommand } from "../../../lib/command.js";
-import { ContextError } from "../../../lib/errors.js";
 import { CommandOutput } from "../../../lib/formatters/output.js";
-import { resolveTargetsFromParsedArg } from "../../../lib/resolve-target.js";
+import { resolveOrgOptionalProjectFromArg } from "../../../lib/resolve-target.js";
 import { buildMetricAlertsUrl } from "../../../lib/sentry-urls.js";
 import {
   type MetricRuleResolution,
@@ -81,15 +79,12 @@ export const viewCommand = buildCommand({
   async *func(this: SentryContext, flags: ViewFlags, arg: string) {
     const { cwd } = this;
     const { ref, targetArg } = parseMetricRuleArg(arg, USAGE_HINT);
-    const parsed = parseOrgProjectArg(targetArg);
-    const { targets } = await resolveTargetsFromParsedArg(parsed, {
+    const { org } = await resolveOrgOptionalProjectFromArg(
+      targetArg,
       cwd,
-      usageHint: USAGE_HINT,
-    });
-    const orgSlugs = [...new Set(targets.map((target) => target.org))];
-    if (orgSlugs.length === 0) {
-      throw new ContextError("Organization", USAGE_HINT);
-    }
+      "alert metrics view"
+    );
+    const orgSlugs = [org];
 
     const result = await resolveMetricAlertRule(orgSlugs, ref, USAGE_HINT);
     if (flags.web) {