@agent-native/core 0.180.0 → 0.180.1-nightly-20260915205111

package/corpus/templates/design/app/components/design/ResponsiveInteractBar.tsx

@@ -135,8 +135,50 @@ export interface ResponsiveInteractBarProps {
   onModeChange: (mode: "edit" | "annotate") => void;
   /** Annotate is editor-only; commenters get Edit alone. */
   canAnnotate: boolean;
+  onClose: () => void;
+  /**
+   * The docked (non-floating) bar sits in the canvas column, which is
+   * inset by the left rail's width via `paddingLeft`. A wide rail (e.g. the
+   * Code panel) plus a narrow window can squeeze that column so far that
+   * Close — the one control a stuck user is looking for — gets clipped by
+   * the column's `overflow-hidden` instead of just losing the device/zoom
+   * controls it sits next to. The caller renders `ResponsiveInteractExitButton`
+   * pinned outside that squeeze instead and sets this to `false` for the
+   * docked bar. The floating (minimal-UI) bar has no docked rail competing
+   * for width, so it keeps Close inline.
+   */
+  showClose?: boolean;
+  className?: string;
+}
+
+/**
+ * The Close/Exit control on its own, styled to match its home inside
+ * ResponsiveInteractBar. Exported so a caller can pin it somewhere the
+ * docked bar's own horizontal squeeze can't reach — see `showClose` above.
+ */
+export function ResponsiveInteractExitButton({
+  onClose,
+  className,
+}: {
   onClose: () => void;
   className?: string;
+}) {
+  const t = useT();
+  return (
+    <Button
+      variant="ghost"
+      size="sm"
+      onClick={onClose}
+      aria-label={t("designEditor.responsiveInteract.exit")}
+      className={cn(
+        "h-7 shrink-0 cursor-pointer gap-1.5 rounded-md px-2 !text-[12px] text-muted-foreground hover:text-foreground",
+        className,
+      )}
+    >
+      <IconX className="size-4" />
+      {t("designEditor.responsiveInteract.exit")}
+    </Button>
+  );
 }
 
 /**
@@ -157,6 +199,7 @@ export function ResponsiveInteractBar({
   onModeChange,
   canAnnotate,
   onClose,
+  showClose = true,
   className,
 }: ResponsiveInteractBarProps) {
   const t = useT();
@@ -357,24 +400,11 @@ export function ResponsiveInteractBar({
           </Popover>
         </div>
       </div>
-      <div className="flex shrink-0 items-center bg-[var(--design-editor-panel-bg)] pl-1">
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Button
-              variant="ghost"
-              size="icon"
-              onClick={onClose}
-              aria-label={t("designEditor.responsiveInteract.exit")}
-              className="size-7 shrink-0 cursor-pointer rounded-md text-muted-foreground hover:text-foreground"
-            >
-              <IconX className="size-4" />
-            </Button>
-          </TooltipTrigger>
-          <TooltipContent side="bottom">
-            {t("designEditor.responsiveInteract.exit")}
-          </TooltipContent>
-        </Tooltip>
-      </div>
+      {showClose ? (
+        <div className="flex shrink-0 items-center bg-[var(--design-editor-panel-bg)] pl-1">
+          <ResponsiveInteractExitButton onClose={onClose} />
+        </div>
+      ) : null}
     </div>
   );
 }

package/corpus/templates/design/app/components/design/bridge/editor-chrome.bridge.ts

@@ -6352,11 +6352,14 @@ declare var __INITIAL_SOURCE_HEAD__: string;
     var paddingRight = readPx(cs.paddingRight);
     var paddingBottom = readPx(cs.paddingBottom);
     var paddingLeft = readPx(cs.paddingLeft);
-    var sx = chromeScaleX();
-    var sy = chromeScaleY();
     var line = chromeLineScale();
-    var hLineWidth = Math.max(6, Math.min(18, rect.width * 0.12)) * sx;
-    var vLineHeight = Math.max(6, Math.min(18, rect.height * 0.12)) * sy;
+    // Both orientations derive their tick length from the same metric (the
+    // element's smaller dimension) and the same uniform scale factor, so a
+    // horizontal (top/bottom) tick and a vertical (left/right) tick always
+    // render at the same visual length.
+    var tickLength =
+      Math.max(6, Math.min(18, Math.min(rect.width, rect.height) * 0.12)) *
+      line;
     var innerLeft = borderLeft;
     var innerTop = borderTop;
     var innerWidth = Math.max(1, rect.width - borderLeft - borderRight);
@@ -6378,9 +6381,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
             height: paddingTop,
           },
           line: {
-            x: rect.width / 2 - hLineWidth / 2,
+            x: rect.width / 2 - tickLength / 2,
             y: innerTop + paddingTop / 2 - line / 2,
-            width: hLineWidth,
+            width: tickLength,
             height: line,
           },
         }),
@@ -6403,9 +6406,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
             height: paddingBottom,
           },
           line: {
-            x: rect.width / 2 - hLineWidth / 2,
+            x: rect.width / 2 - tickLength / 2,
             y: rect.height - borderBottom - paddingBottom / 2 - line / 2,
-            width: hLineWidth,
+            width: tickLength,
             height: line,
           },
         }),
@@ -6429,9 +6432,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
           },
           line: {
             x: innerLeft + paddingLeft / 2 - line / 2,
-            y: rect.height / 2 - vLineHeight / 2,
+            y: rect.height / 2 - tickLength / 2,
             width: line,
-            height: vLineHeight,
+            height: tickLength,
           },
         }),
       );
@@ -6454,9 +6457,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
           },
           line: {
             x: rect.width - borderRight - paddingRight / 2 - line / 2,
-            y: rect.height / 2 - vLineHeight / 2,
+            y: rect.height / 2 - tickLength / 2,
             width: line,
-            height: vLineHeight,
+            height: tickLength,
           },
         }),
       );
@@ -6472,11 +6475,10 @@ declare var __INITIAL_SOURCE_HEAD__: string;
     var children = visibleLayoutChildren(el);
     if (children.length < 2) return [];
     var handles = [];
-    var sx = chromeScaleX();
-    var sy = chromeScaleY();
     var line = chromeLineScale();
-    var hLineWidth = 8 * sx;
-    var vLineHeight = 8 * sy;
+    // Use the same uniform scale for both axes so a horizontal gap tick and
+    // a vertical gap tick render at the same visual length.
+    var tickLength = 8 * line;
     var isFlex = cs.display === "flex" || cs.display === "inline-flex";
     var isGrid = cs.display === "grid" || cs.display === "inline-grid";
     if (!isFlex && !isGrid) return handles;
@@ -6516,9 +6518,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
               region: { x: a.right, y: top, width: gap, height: height },
               line: {
                 x: a.right + gap / 2 - line / 2,
-                y: top + height / 2 - vLineHeight / 2,
+                y: top + height / 2 - tickLength / 2,
                 width: line,
-                height: vLineHeight,
+                height: tickLength,
               },
             }),
           );
@@ -6536,9 +6538,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
               value: cssGap,
               region: { x: left, y: a.bottom, width: width, height: gap },
               line: {
-                x: left + width / 2 - hLineWidth / 2,
+                x: left + width / 2 - tickLength / 2,
                 y: a.bottom + gap / 2 - line / 2,
-                width: hLineWidth,
+                width: tickLength,
                 height: line,
               },
             }),

package/corpus/templates/design/app/components/design/design-canvas/LocalNetworkAccessPrompt.tsx

@@ -0,0 +1,92 @@
+import {
+  IconPlugConnected,
+  IconPlugConnectedX,
+  IconX,
+} from "@tabler/icons-react";
+
+import { Button } from "@/components/ui/button";
+
+import type { BridgeRegistrationFailureKind } from "./external-preview";
+
+/**
+ * Non-blocking floating card shown over a localhost screen when the live-edit
+ * bridge can't be reached. Deliberately NOT a full-cover overlay: the real
+ * iframe underneath (see `externalPreviewUrl`'s raw-URL fallback in
+ * DesignCanvas.tsx) is still rendering the actual running app, so this stays a
+ * small corner card the user can act on or dismiss without losing the view —
+ * mirrors the liveEditSameInstanceStalledError banner pattern just above it.
+ */
+export function LocalNetworkAccessPrompt({
+  kind,
+  connecting,
+  onConnect,
+  onDismiss,
+}: {
+  kind: BridgeRegistrationFailureKind;
+  connecting: boolean;
+  onConnect: () => void;
+  onDismiss: () => void;
+}) {
+  // "unreachable" is the one confident case (permission is confirmed
+  // granted, so it's confirmed NOT the cause) — every other kind is
+  // deliberately hedged copy, never a diagnosed permission claim. See
+  // classifyBridgeRegistrationFailure's doc comment for why.
+  const isConfirmedUnreachable = kind === "unreachable";
+  return (
+    <div className="pointer-events-none absolute inset-x-0 bottom-4 z-10 flex justify-center px-4">
+      <div className="pointer-events-auto relative flex w-full max-w-[22rem] flex-col items-start gap-3 rounded-lg border bg-card p-4 shadow-md">
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon"
+          className="absolute right-1.5 top-1.5 size-6"
+          onClick={onDismiss}
+        >
+          <IconX className="size-3.5" />
+          <span className="sr-only">
+            {
+              "Dismiss" /* i18n-ignore transient local dev connect card dismiss */
+            }
+          </span>
+        </Button>
+        <div className="flex size-8 shrink-0 items-center justify-center rounded-full bg-accent">
+          {isConfirmedUnreachable ? (
+            <IconPlugConnectedX className="size-4 text-accent-foreground" />
+          ) : (
+            <IconPlugConnected className="size-4 text-accent-foreground" />
+          )}
+        </div>
+        <div className="flex flex-col gap-0.5 pr-4">
+          <div className="text-sm font-medium text-foreground">
+            {
+              isConfirmedUnreachable
+                ? "Local dev server unreachable" /* i18n-ignore local dev connect card title */
+                : "Can't reach your local dev server" /* i18n-ignore local dev connect card title */
+            }
+          </div>
+          <div className="text-xs text-muted-foreground">
+            {
+              isConfirmedUnreachable
+                ? "Is it still running?" /* i18n-ignore local dev connect card body */
+                : "Your browser may need permission to connect to localhost — or the dev server may be offline." /* i18n-ignore local dev connect card body */
+            }
+          </div>
+        </div>
+        <Button
+          type="button"
+          size="sm"
+          onClick={onConnect}
+          disabled={connecting}
+        >
+          {
+            connecting
+              ? "Connecting…" /* i18n-ignore local dev connect card button, transient */
+              : isConfirmedUnreachable
+                ? "Retry" /* i18n-ignore local dev connect card button */
+                : "Connect" /* i18n-ignore local dev connect card button */
+          }
+        </Button>
+      </div>
+    </div>
+  );
+}

package/corpus/templates/design/app/components/design/design-canvas/external-preview.ts

@@ -45,6 +45,47 @@ export function resolveLiveEditPreviewUrl(args: {
   });
 }
 
+/**
+ * A registration `fetch()` to the localhost bridge can fail for two very
+ * different reasons that look identical to page JS (both throw a generic
+ * `TypeError: Failed to fetch`, with zero visible network activity):
+ *
+ * - The dev server / bridge process is genuinely unreachable.
+ * - Chrome's Local Network Access permission (a same-origin-policy-adjacent
+ *   browser security feature, distinct from CORS) is blocking the request
+ *   because this page's origin hasn't been granted permission to reach a
+ *   loopback address.
+ *
+ * `navigator.permissions.query({ name: "local-network-access" })` is a signal,
+ * not proof: it reports the SITE's standing permission grant, not why THIS
+ * particular fetch failed — a `"prompt"` state is also the default on a first
+ * visit regardless of whether the dev server happens to be reachable, so it
+ * does not establish that permission was the actual cause. Only `"granted"`
+ * is unambiguous (permission is definitely fine, so it's definitely not the
+ * cause). Everything else — `"prompt"`, an unsupported browser, or the query
+ * throwing — stays in the same "maybePermissionBlocked" bucket, which the UI
+ * must present as a possibility to try, never as a diagnosed fact.
+ */
+export type BridgeRegistrationFailureKind =
+  | "maybePermissionBlocked"
+  | "unreachable";
+
+export async function classifyBridgeRegistrationFailure(): Promise<BridgeRegistrationFailureKind> {
+  try {
+    if (typeof navigator === "undefined" || !navigator.permissions?.query) {
+      return "maybePermissionBlocked";
+    }
+    const status = await navigator.permissions.query({
+      name: "local-network-access" as PermissionName,
+    });
+    return status.state === "granted"
+      ? "unreachable"
+      : "maybePermissionBlocked";
+  } catch {
+    return "maybePermissionBlocked";
+  }
+}
+
 export function shouldUseIframeLoadReadyFallback(
   usesLiveEditEditorBridge: boolean,
 ): boolean {

package/corpus/templates/design/app/pages/DesignEditor.tsx

@@ -346,7 +346,10 @@ import { isWheelCameraGestureActive } from "@/components/design/multi-screen/whe
 import { MultiScreenCanvas } from "@/components/design/MultiScreenCanvas";
 import { QuestionFlow } from "@/components/design/QuestionFlow";
 import { ReadOnlyDesignBanner } from "@/components/design/ReadOnlyDesignBanner";
-import { ResponsiveInteractBar } from "@/components/design/ResponsiveInteractBar";
+import {
+  ResponsiveInteractBar,
+  ResponsiveInteractExitButton,
+} from "@/components/design/ResponsiveInteractBar";
 import { type ReviewCommentsPanelProps } from "@/components/design/ReviewCommentsPanel";
 import type { ReviewPanelProps } from "@/components/design/ReviewPanel";
 import { TokensPanel } from "@/components/design/TokensPanel";
@@ -15365,6 +15368,24 @@ function DesignEditor() {
     () => enterOverviewFromZoom(),
     [enterOverviewFromZoom],
   );
+  // Escape is the standard "leave this mode" convention users try first, and
+  // Interact had no keyboard path back to Edit at all — only the bar's Close
+  // button. This listens on `window` in the default bubble phase, same as
+  // useDesignHotkeys elsewhere, so a Radix layer (the device Select, zoom
+  // Popover) still gets first refusal: its own document-level Escape
+  // handling stops the event before it reaches here, matching
+  // DesignColorPicker.escape.test.tsx's documented ordering. It intentionally
+  // does not reuse useDesignHotkeys, which stays disabled in Interact so the
+  // running prototype keeps owning every other shortcut.
+  useEffect(() => {
+    if (!responsiveInteractActive) return;
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key !== "Escape" || event.defaultPrevented) return;
+      handleExitResponsiveInteract();
+    };
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [responsiveInteractActive, handleExitResponsiveInteract]);
   // Fit against the actual center canvas, not window.innerWidth: both rails
   // remain mounted in Interact, so window-level math can place a wide device
   // partly behind them. ResizeObserver also refits after either rail moves.
@@ -16196,8 +16217,11 @@ function DesignEditor() {
     onSendToBack: canEditDesign
       ? () => changeSelectedZIndex("back")
       : undefined,
-    // Interact owns the running app's keyboard behavior. The editor shell must
-    // not consume Escape or use it to change view/selection underneath it.
+    // Interact owns the running app's keyboard behavior. The editor shell's
+    // canvas Escape handling (selection clearing, drawing/pin-mode exit,
+    // breakpoint targeting) must not fire underneath it — the separate
+    // Escape listener next to handleExitResponsiveInteract covers leaving
+    // Interact itself.
     onEscape: responsiveInteractActive ? undefined : handleEscapeHotkey,
     onEnter: handleEnterHotkey,
     onSelectParent: handleSelectParentLayer,
@@ -22898,6 +22922,13 @@ function DesignEditor() {
       onModeChange={handleModeChange}
       canAnnotate={canEditDesign}
       onClose={handleExitResponsiveInteract}
+      // The docked bar sits in the canvas column, inset by the left rail's
+      // width — a wide rail plus a narrow window can squeeze that column
+      // enough to clip Close before anything else in the bar (see the
+      // pinned ResponsiveInteractExitButton rendered alongside the left
+      // rail below). The floating bar has no rail competing for width, so
+      // it keeps Close inline.
+      showClose={floating}
       className={
         floating
           ? "pointer-events-auto w-full max-w-[680px] rounded-lg border shadow-xl"
@@ -23410,6 +23441,27 @@ function DesignEditor() {
           </div>
         ) : null}
 
+        {/* The docked bar's Close used to live inside a canvas column inset
+            by the left rail's width (`leftChromeOverlayInset`). A wide rail
+            (the Code panel is 640px) plus a modest window can squeeze that
+            column until the bar's own `overflow-hidden` clips Close before
+            it clips anything else in the row — the rail sits at z-[70], so a
+            squeeze this severe doesn't just crowd Close, it makes it
+            unreachable. Anchoring it here instead, to the canvas area's own
+            right edge rather than the bar's shrunken one, guarantees a way
+            out no matter how little room the rail has left the bar. Height-
+            and edge-matched to the bar (h-12, pr-3) so it reads as the same
+            row rather than a second floating control. Not needed for the
+            floating (minimal-UI) bar: minimal UI hides this rail entirely. */}
+        {responsiveInteractActive && !minimalUi ? (
+          <div className="pointer-events-none absolute right-0 top-0 z-[80] flex h-12 items-center pr-3">
+            <ResponsiveInteractExitButton
+              onClose={handleExitResponsiveInteract}
+              className="pointer-events-auto"
+            />
+          </div>
+        ) : null}
+
         {/* Interact owns the running app's surface (same reasoning as the
             Escape hotkey gate): its canvas tools and mode tabs belong to the
             infinite canvas, and ResponsiveInteractBar's Close is the way

package/corpus/templates/design/changelog/2026-09-15-fixed-padding-indicator-tick-marks-so-they-render-at-the-sam.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-15
+---
+
+Fixed padding indicator tick marks so they render at the same length on every edge

package/dist/collab/awareness.d.ts

@@ -62,11 +62,11 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
-    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
+    error?: undefined;
 }>>;
 /**
  * GET /_agent-native/collab/:docId/users
@@ -77,9 +77,9 @@ export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("
     error: string;
     users?: undefined;
 } | {
-    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
+    error?: undefined;
 }>>;

package/dist/collab/routes.d.ts

@@ -26,8 +26,8 @@ export declare const getCollabState: import("h3").EventHandlerWithFetch<import("
  * Body: { update: string (base64), requestSource?: string }
  */
 export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/file-upload/actions/upload-image.d.ts

@@ -3,25 +3,25 @@ declare const _default: import("../../action.js").ActionDefinition<{
     url?: string;
     filename?: string;
 }, {
+    id?: undefined;
     error: string;
     configured?: undefined;
     connectPath?: undefined;
     url?: undefined;
-    id?: undefined;
     provider?: undefined;
 } | {
+    id?: undefined;
     error: string;
     configured: boolean;
     connectPath: string;
     url?: undefined;
-    id?: undefined;
     provider?: undefined;
 } | {
-    error?: undefined;
     configured?: undefined;
     connectPath?: undefined;
     url: string;
     id: string;
     provider: string;
+    error?: undefined;
 }>;
 export default _default;

package/dist/notifications/routes.d.ts

@@ -11,14 +11,14 @@
  *   DELETE /_agent-native/notifications/:id         — delete
  */
 export declare function createNotificationsHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<"" | import("./types.js").Notification[] | {
-    error?: undefined;
     count: number;
     updated?: undefined;
+    error?: undefined;
     ok?: undefined;
 } | {
-    error?: undefined;
     count?: undefined;
     updated: number;
+    error?: undefined;
     ok?: undefined;
 } | {
     count?: undefined;
@@ -26,8 +26,8 @@ export declare function createNotificationsHandler(): import("h3").EventHandlerW
     error: string;
     ok?: undefined;
 } | {
-    error?: undefined;
     count?: undefined;
     updated?: undefined;
     ok: boolean;
+    error?: undefined;
 }>>;

package/dist/observability/routes.d.ts

@@ -41,16 +41,16 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     thumbsUpRate: number;
     avgEvalScore: number;
 } | {
-    error?: undefined;
     summary: import("./types.js").TraceSummary;
     spans: import("./types.js").TraceSpan[];
     id?: undefined;
+    error?: undefined;
     ok?: undefined;
 } | {
-    error?: undefined;
     summary?: undefined;
     spans?: undefined;
     id: string;
+    error?: undefined;
     ok?: undefined;
 } | {
     summary?: undefined;
@@ -59,9 +59,9 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     error: any;
     ok?: undefined;
 } | {
-    error?: undefined;
     summary?: undefined;
     spans?: undefined;
     id?: undefined;
+    error?: undefined;
     ok: boolean;
 }>>;

package/dist/org/handlers.d.ts

@@ -52,9 +52,9 @@ export declare const setWorkspaceAppDefaultVisibilityHandler: import("h3").Event
 /** POST /_agent-native/org — create a new organization */
 export declare const createOrgHandler: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     success: boolean;
+    id?: undefined;
     name?: undefined;
     role?: undefined;
-    id?: undefined;
 } | {
     success?: undefined;
     id: string;

package/dist/progress/routes.d.ts

@@ -15,6 +15,6 @@ export declare function createProgressHandler(): import("h3").EventHandlerWithFe
     error: string;
     ok?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
+    error?: undefined;
 }>>;

package/dist/server/core-routes-plugin.d.ts

@@ -396,8 +396,8 @@ export declare function createPublicRemoteAgentsHandler(discover?: PublicAgentDi
     error: string;
     agents?: undefined;
 } | {
-    error?: undefined;
     agents: Omit<import("./agent-discovery.js").DiscoveredAgent, "auth">[];
+    error?: undefined;
 }>>;
 export declare function getBuilderConnectErrorDisposition(error: unknown, connectAttemptId: string | null): "correlated" | "legacy" | null;
 export declare function getBuilderConnectErrorKey(ownerEmail: string, connectAttemptId?: string | null): string;

package/dist/vite/sentry-source-maps.js

@@ -4,7 +4,7 @@
  * captured events. Both derive it from the same `resolveAgentNativeBuildId()`
  * identifier so they can't drift apart independently.
  */
-import { readdir, rm } from "node:fs/promises";
+import { rm } from "node:fs/promises";
 import path from "node:path";
 import { sentryVitePlugin } from "@sentry/vite-plugin";
 import { resolveAgentNativeBuildId } from "../shared/build-id.js";
@@ -44,18 +44,6 @@ export function resolveSentrySourceMapUploadConfig(env = process.env) {
 export function isSentrySourceMapUploadEnabled(env = process.env) {
     return resolveSentrySourceMapUploadConfig(env) !== null;
 }
-async function removeSourceMaps(directory) {
-    const entries = await readdir(directory, { withFileTypes: true });
-    await Promise.all(entries.map(async (entry) => {
-        const filePath = path.join(directory, entry.name);
-        if (entry.isDirectory()) {
-            await removeSourceMaps(filePath);
-        }
-        else if (entry.name.endsWith(".map")) {
-            await rm(filePath, { force: true });
-        }
-    }));
-}
 function createUploadedSourceMapCleanupPlugin() {
     return {
         name: "agent-native:delete-uploaded-sentry-source-maps",
@@ -63,13 +51,17 @@ function createUploadedSourceMapCleanupPlugin() {
         writeBundle: {
             order: "post",
             sequential: true,
-            async handler(outputOptions) {
-                if (outputOptions.dir) {
-                    await removeSourceMaps(outputOptions.dir);
-                }
-                else if (outputOptions.file) {
-                    await rm(`${outputOptions.file}.map`, { force: true });
-                }
+            async handler(outputOptions, bundle) {
+                const outputDirectory = outputOptions.dir
+                    ? outputOptions.dir
+                    : path.dirname(outputOptions.file);
+                const sourceMapFileNames = Object.values(bundle).flatMap((output) => {
+                    if (output.type === "asset") {
+                        return output.fileName.endsWith(".map") ? [output.fileName] : [];
+                    }
+                    return output.map ? [`${output.fileName}.map`] : [];
+                });
+                await Promise.all(sourceMapFileNames.map((fileName) => rm(path.join(outputDirectory, fileName), { force: true })));
             },
         },
     };