@agent-native/core 0.181.0 → 0.181.1-nightly-20260916144018

package/corpus/templates/design/app/pages/design-editor/pending-structure-verification.ts

@@ -2,9 +2,9 @@ import {
   buildCodeLayerProjection,
   type CodeLayerNode,
 } from "@shared/code-layer";
+import { parse, type DefaultTreeAdapterMap } from "parse5";
 
 import {
-  bridgeSourceIdForCodeLayerNode,
   collapsedElementText,
   resolveCodeLayerTargetFromBridge,
 } from "./code-layer-state";
@@ -20,6 +20,8 @@ export type RuntimeStructureVerificationFailure =
   | "ambiguous-subject"
   | "subject-still-present"
   | "missing-replacement"
+  | "missing-replacement-evidence"
+  | "replacement-context-changed"
   | "ambiguous-replacement"
   | "missing-anchor"
   | "ambiguous-anchor"
@@ -37,7 +39,6 @@ type RuntimeStructureNodeRole = "subject" | "replacement" | "anchor";
 interface RuntimeStructureNodeResolution {
   node?: CodeLayerNode;
   failure?: RuntimeStructureVerificationFailure;
-  matchedBy?: "identity" | "selector" | "signature";
 }
 
 function runtimeStructureResolutionFailure(
@@ -85,16 +86,11 @@ function resolveRuntimeStructureNode(args: {
     args.sourceId ?? undefined,
   );
   if (direct.status === "resolved") {
-    const matchedBy =
-      args.sourceId &&
-      bridgeSourceIdForCodeLayerNode(direct.node) === args.sourceId
-        ? "identity"
-        : "selector";
     if (
       !args.signature ||
       runtimeStructureNodeMatchesSignature(direct.node, args.signature)
     ) {
-      return { node: direct.node, matchedBy };
+      return { node: direct.node };
     }
     // A live identity is stronger evidence than a stale content signature.
     // Do not let an unrelated sibling with the old signature validate this
@@ -108,75 +104,31 @@ function resolveRuntimeStructureNode(args: {
             : "missing-anchor",
     };
   }
-
-  if (!args.signature) {
+  if (direct.status === "ambiguous") {
     return {
-      failure: runtimeStructureResolutionFailure(
-        direct.status === "ambiguous" ? "ambiguous" : "absent",
-        args.role,
-      ),
+      failure: runtimeStructureResolutionFailure("ambiguous", args.role),
     };
   }
 
-  const matches = args.projection.nodes.filter((node) =>
-    runtimeStructureNodeMatchesSignature(node, args.signature!),
-  );
-  if (matches.length === 1) {
-    return { node: matches[0], matchedBy: "signature" };
-  }
-  return {
-    failure: runtimeStructureResolutionFailure(
-      matches.length > 1 ? "ambiguous" : "absent",
-      args.role,
-    ),
-  };
-}
-
-function resolveRuntimeStructureNodeByIdentity(args: {
-  projection: { nodes: CodeLayerNode[] };
-  selector?: string;
-  sourceId?: string | null;
-  role: RuntimeStructureNodeRole;
-}): RuntimeStructureNodeResolution {
-  const direct = resolveCodeLayerTargetFromBridge(
-    args.projection,
-    args.selector,
-    args.sourceId ?? undefined,
-  );
-  if (direct.status === "resolved") {
-    return {
-      node: direct.node,
-      matchedBy:
-        args.sourceId &&
-        bridgeSourceIdForCodeLayerNode(direct.node) === args.sourceId
-          ? "identity"
-          : "selector",
-    };
-  }
-  return {
-    failure: runtimeStructureResolutionFailure(
-      direct.status === "ambiguous" ? "ambiguous" : "absent",
-      args.role,
-    ),
-  };
+  return resolveRuntimeStructureNodeBySignature(args);
 }
 
 function resolveRuntimeStructureNodeBySignature(args: {
   projection: { nodes: CodeLayerNode[] };
   signature?: RuntimeStructureNodeSignature;
   role: RuntimeStructureNodeRole;
-  excludedNodeIds?: ReadonlySet<string>;
+  excludedNode?: CodeLayerNode;
 }): RuntimeStructureNodeResolution {
   if (!args.signature) {
     return { failure: runtimeStructureResolutionFailure("absent", args.role) };
   }
   const matches = args.projection.nodes.filter(
     (node) =>
-      !args.excludedNodeIds?.has(node.id) &&
+      node !== args.excludedNode &&
       runtimeStructureNodeMatchesSignature(node, args.signature!),
   );
   if (matches.length === 1) {
-    return { node: matches[0], matchedBy: "signature" };
+    return { node: matches[0] };
   }
   return {
     failure: runtimeStructureResolutionFailure(
@@ -186,18 +138,142 @@ function resolveRuntimeStructureNodeBySignature(args: {
   };
 }
 
-function resolveRuntimeStructureNodeForPresence(args: {
-  projection: { nodes: CodeLayerNode[] };
-  selector?: string;
-  sourceId?: string | null;
-  signature?: RuntimeStructureNodeSignature;
-  role: RuntimeStructureNodeRole;
-}): RuntimeStructureNodeResolution {
-  const identity = resolveRuntimeStructureNodeByIdentity(args);
-  if (identity.node || identity.failure?.startsWith("ambiguous")) {
-    return identity;
+function verifyRuntimeStructureSubjectAbsent(
+  projection: { nodes: CodeLayerNode[] },
+  edit: PendingLiveStructureEdit,
+  replacement?: CodeLayerNode,
+): RuntimeStructureVerificationResult {
+  // Absence must inspect the old identity alone: a positional selector may
+  // now point at the replacement or an unrelated sibling.
+  const subject = resolveCodeLayerTargetFromBridge(
+    projection,
+    edit.sourceId ? undefined : edit.selector,
+    edit.sourceId ?? undefined,
+  );
+  if (subject.status === "ambiguous") {
+    return { ok: false, failure: "ambiguous-subject" };
   }
-  return resolveRuntimeStructureNodeBySignature(args);
+  if (
+    subject.status === "resolved" &&
+    (edit.sourceId ||
+      replacement === undefined ||
+      (subject.node === replacement &&
+        (!edit.subjectSignature ||
+          runtimeStructureNodeMatchesSignature(
+            subject.node,
+            edit.subjectSignature,
+          ))))
+  ) {
+    return { ok: false, failure: "subject-still-present" };
+  }
+
+  // Signature-only fallback cannot distinguish unchanged old content. A
+  // unique identity or selector independently resolves the replacement;
+  // captured document evidence still has to prove the resulting structure.
+  const replacementTarget = resolveCodeLayerTargetFromBridge(
+    projection,
+    edit.replacementSourceId ? undefined : edit.replacementSelector,
+    edit.replacementSourceId ?? undefined,
+  );
+  const signature = resolveRuntimeStructureNodeBySignature({
+    projection,
+    signature: edit.subjectSignature,
+    role: "subject",
+    excludedNode:
+      replacementTarget.status === "resolved" &&
+      replacementTarget.node === replacement
+        ? replacement
+        : undefined,
+  });
+  if (signature.failure === "ambiguous-subject") {
+    return { ok: false, failure: signature.failure };
+  }
+  return signature.node
+    ? { ok: false, failure: "subject-still-present" }
+    : { ok: true };
+}
+
+// These attributes are injected by serializeRuntimeLayerSnapshot, not authored
+// semantic state. Keep this list exact so other data-* attributes remain evidence.
+const runtimeSnapshotMetadataAttributes = new Set([
+  "style",
+  "data-agent-native-node-id",
+  "data-agent-native-node-rewrite-proposal",
+  "data-agent-native-group-runtime-state",
+  "data-agent-native-runtime-hidden",
+  "data-agent-native-runtime-locked",
+  "data-agent-native-previous-display",
+  "data-agent-native-text-editing",
+  "data-an-runtime-layer-snapshot",
+  "data-an-pending-node-id",
+  "data-an-state-preview",
+  "data-an-state-preview-key",
+  "data-an-vector-logical-width",
+  "data-an-vector-stroke-defs",
+  "data-an-vector-stroke-geometry",
+  "data-an-vector-stroke-original-overflow",
+  "data-an-vector-stroke-original-overflow-priority",
+  "data-an-vector-stroke-overlay",
+  "data-an-vector-stroke-position",
+  "data-source-framework",
+  "data-source-file",
+  "data-source-line",
+  "data-source-method",
+  "data-source-column",
+  "data-component-name",
+  "data-source-owner-file",
+  "data-source-owner-line",
+  "data-source-owner-column",
+  "data-source-owner-component",
+  "data-source-owner-method",
+  "data-source-owner-key",
+  "data-source-unavailable",
+]);
+
+/** Full visual-tree evidence: sibling order, nesting, content and semantic
+ * attributes must match; runtime identities and computed styles may change. */
+export function runtimeStructureSnapshotSignature(
+  snapshotHtml: string,
+): string {
+  function structure(node: DefaultTreeAdapterMap["node"]): unknown[] {
+    if ("value" in node && node.nodeName === "#text") {
+      const text = collapsedElementText(node.value);
+      return text ? [text] : [];
+    }
+    if ("tagName" in node && node.tagName === "head") return [];
+    const children =
+      "childNodes" in node ? node.childNodes.flatMap(structure) : [];
+    if (!("tagName" in node) || node.tagName === "html") return children;
+    return [
+      [
+        node.namespaceURI,
+        node.tagName,
+        normalizeRuntimeStructureClasses(
+          (
+            node.attrs.find((attribute) => attribute.name === "class")?.value ??
+            ""
+          ).split(/\s+/),
+        ),
+        node.attrs
+          .filter(
+            (attribute) =>
+              attribute.namespace ||
+              (attribute.name !== "class" &&
+                !runtimeSnapshotMetadataAttributes.has(attribute.name)),
+          )
+          .map((attribute) =>
+            JSON.stringify([
+              attribute.namespace ?? "",
+              attribute.name,
+              attribute.value,
+            ]),
+          )
+          .sort(),
+        children,
+      ],
+    ];
+  }
+  return JSON.stringify(structure(parse(snapshotHtml)));
 }
 
 function runtimeStructureNodeForNoOp(
@@ -229,9 +305,9 @@ export function verifyPendingStructureRuntime(
 ): RuntimeStructureVerificationResult {
   const projection = buildCodeLayerProjection(snapshotHtml);
   if (edit.replaced) {
-    const replacementResolution = resolveRuntimeStructureNodeForPresence({
+    const replacementResolution = resolveRuntimeStructureNode({
       projection,
-      selector: edit.replacementSelector,
+      selector: edit.replacementSourceId ? undefined : edit.replacementSelector,
       sourceId: edit.replacementSourceId,
       signature: edit.replacementSignature,
       role: "replacement",
@@ -243,83 +319,22 @@ export function verifyPendingStructureRuntime(
       };
     }
 
-    const subjectIdentityResolution = resolveRuntimeStructureNodeByIdentity({
+    const absence = verifyRuntimeStructureSubjectAbsent(
       projection,
-      selector: edit.selector,
-      sourceId: edit.sourceId,
-      role: "subject",
-    });
-    if (subjectIdentityResolution.failure === "ambiguous-subject") {
-      return { ok: false, failure: "ambiguous-subject" };
-    }
-    if (subjectIdentityResolution.node) {
-      const sameNode =
-        subjectIdentityResolution.node.id === replacementResolution.node.id;
-      const replacementIsProvenByPosition =
-        sameNode &&
-        subjectIdentityResolution.matchedBy === "selector" &&
-        replacementResolution.matchedBy === "selector";
-      if (!replacementIsProvenByPosition) {
-        return { ok: false, failure: "subject-still-present" };
-      }
-    }
-
-    const subjectMatches = projection.nodes.filter((node) =>
-      edit.subjectSignature
-        ? runtimeStructureNodeMatchesSignature(node, edit.subjectSignature)
-        : false,
+      edit,
+      replacementResolution.node,
     );
-    const replacementIsUniquelyLocated =
-      replacementResolution.matchedBy === "identity" ||
-      replacementResolution.matchedBy === "selector";
-    const remainingSubjectMatches = replacementIsUniquelyLocated
-      ? subjectMatches.filter(
-          (node) => node.id !== replacementResolution.node!.id,
-        )
-      : subjectMatches;
-    const replacementIsProvenByPosition =
-      subjectIdentityResolution.node?.id === replacementResolution.node.id &&
-      subjectIdentityResolution.matchedBy === "selector" &&
-      replacementResolution.matchedBy === "selector";
-    if (!replacementIsProvenByPosition) {
-      if (remainingSubjectMatches.length > 1) {
-        return { ok: false, failure: "ambiguous-subject" };
-      }
-      if (remainingSubjectMatches.length === 1) {
-        return { ok: false, failure: "subject-still-present" };
-      }
+    if (!absence.ok) return absence;
+    if (!edit.replacementSnapshotSignature) {
+      return { ok: false, failure: "missing-replacement-evidence" };
     }
-    return { ok: true };
+    return runtimeStructureSnapshotSignature(snapshotHtml) ===
+      edit.replacementSnapshotSignature
+      ? { ok: true }
+      : { ok: false, failure: "replacement-context-changed" };
   }
-  // A removal proves itself by ABSENCE. Running it through the anchor/order
-  // checks below would report "missing-subject" for the exact outcome it
-  // asked for, and the apply flow would sit in awaiting-runtime until it
-  // timed out on a source write that actually succeeded.
   if (edit.removed) {
-    const subjectIdentityResolution = resolveRuntimeStructureNodeByIdentity({
-      projection,
-      selector: edit.selector,
-      sourceId: edit.sourceId,
-      role: "subject",
-    });
-    if (subjectIdentityResolution.failure === "ambiguous-subject") {
-      return { ok: false, failure: "ambiguous-subject" };
-    }
-    if (subjectIdentityResolution.node) {
-      return { ok: false, failure: "subject-still-present" };
-    }
-    const subjectSignatureResolution = resolveRuntimeStructureNodeBySignature({
-      projection,
-      signature: edit.subjectSignature,
-      role: "subject",
-    });
-    if (subjectSignatureResolution.failure === "ambiguous-subject") {
-      return { ok: false, failure: "ambiguous-subject" };
-    }
-    if (subjectSignatureResolution.node) {
-      return { ok: false, failure: "subject-still-present" };
-    }
-    return { ok: true };
+    return verifyRuntimeStructureSubjectAbsent(projection, edit);
   }
 
   const subjectResolution = resolveRuntimeStructureNode({
@@ -433,14 +448,30 @@ export function isPendingStructureDropNoOp(
   );
 }
 
+function replacementSnapshotsByScreen(
+  edits: readonly PendingLiveStructureEdit[],
+) {
+  // Later replacement gestures include the earlier optimistic replacements.
+  // Verify the composed screen without discarding each edit's identity checks.
+  return new Map(
+    edits
+      .filter((edit) => edit.replaced)
+      .map((edit) => [edit.screenId, edit.replacementSnapshotSignature]),
+  );
+}
+
 export function verifyPendingStructuresRuntime(
   snapshots: Record<string, { html: string } | undefined>,
   edits: readonly PendingLiveStructureEdit[],
 ): RuntimeStructureVerificationResult {
+  const replacementSnapshots = replacementSnapshotsByScreen(edits);
   for (const edit of edits) {
     const snapshot = snapshots[edit.screenId];
     if (!snapshot) return { ok: false, failure: "missing-subject" };
-    const result = verifyPendingStructureRuntime(snapshot.html, edit);
+    const result = verifyPendingStructureRuntime(snapshot.html, {
+      ...edit,
+      replacementSnapshotSignature: replacementSnapshots.get(edit.screenId),
+    });
     if (!result.ok) return result;
   }
   return { ok: true };
@@ -453,11 +484,30 @@ export function partitionPendingStructuresRuntime(
   verified: PendingLiveStructureEdit[];
   remaining: PendingLiveStructureEdit[];
 } {
+  const replacementSnapshots = replacementSnapshotsByScreen(edits);
+  const results = edits.map((edit) => {
+    const snapshot = snapshots[edit.screenId];
+    return {
+      edit,
+      ok: Boolean(
+        snapshot &&
+        verifyPendingStructureRuntime(snapshot.html, {
+          ...edit,
+          replacementSnapshotSignature: replacementSnapshots.get(edit.screenId),
+        }).ok,
+      ),
+    };
+  });
+  // Keep the shared evidence until every replacement using it verifies.
+  const blockedScreens = new Set(
+    results
+      .filter(({ edit, ok }) => edit.replaced && !ok)
+      .map(({ edit }) => edit.screenId),
+  );
   const verified: PendingLiveStructureEdit[] = [];
   const remaining: PendingLiveStructureEdit[] = [];
-  for (const edit of edits) {
-    const snapshot = snapshots[edit.screenId];
-    if (snapshot && verifyPendingStructureRuntime(snapshot.html, edit).ok) {
+  for (const { edit, ok } of results) {
+    if (ok && (!edit.replaced || !blockedScreens.has(edit.screenId))) {
       verified.push(edit);
     } else {
       remaining.push(edit);

package/corpus/templates/design/changelog/2026-09-16-design-editor-agent-chat-uses-shared-conversation-tabs-and-s.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-09-16
+---
+
+Design editor agent chat uses shared conversation tabs and stays usable at narrow widths

package/corpus/templates/design/changelog/2026-09-16-visual-edits-stay-applied-after-replacements.md

@@ -0,0 +1,5 @@
+---
+type: fixed
+date: 2026-09-16
+---
+Visual edits stay applied when the page structure shifts after a replacement.

package/corpus/templates/mail/app/components/GoogleConnectBanner.tsx

@@ -6,6 +6,7 @@ import {
 } from "@agent-native/core/client/host";
 import { useT } from "@agent-native/core/client/i18n";
 import { startWorkspaceProviderOAuth } from "@agent-native/core/client/integrations";
+import { openOAuthPopup } from "@agent-native/core/client/oauth-popup";
 import {
   IconMail,
   IconX,
@@ -178,7 +179,7 @@ export function GoogleConnectBanner({
       desktop: "1",
       flow_id: flowId,
     });
-    const popup = window.open("", "_blank");
+    const popup = openOAuthPopup();
     if (!popup) {
       setDesktopAuthIssue({
         code: "popup_blocked",

package/corpus/templates/mail/changelog/2026-09-15-google-connections-now-open-reliably-in-embedded-browsers.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-15
+---
+
+Google connections now open reliably in embedded browsers

package/dist/client/AgentPanel.d.ts

@@ -55,7 +55,7 @@ export declare function shouldShowAgentPanelSidebarChatTabs(tabs: MultiTabAssist
 export declare function shouldShowAgentPanelPageNewChatButton(tabs: MultiTabAssistantChatHeaderProps["tabs"], activeTabId: string, activeTabMessageCount: number): boolean;
 export declare function shouldShowAgentPanelPageHeader(tabs: MultiTabAssistantChatHeaderProps["tabs"], activeTabId: string, activeTabMessageCount: number): boolean;
 export declare function shouldShowAgentPanelCliTabBar(cliTabs: string[]): boolean;
-export declare function shouldShowAgentPanelModeButtons(isSidebar: boolean): boolean;
+export declare function shouldShowAgentPanelModeButtons(isSidebar: boolean, chatOnly?: boolean): boolean;
 export declare function shouldShowAgentPanelFullViewAction(agentPageHref: string | undefined, mode: PanelMode, isSidebar?: boolean, currentPath?: string): boolean;
 export declare function resolveAgentPanelFullViewAction(agentPageHref: string | undefined, onFullViewRequest: (() => void) | undefined, mode: PanelMode, isSidebar?: boolean, currentPath?: string): {
     readonly kind: "callback";

package/dist/client/AgentPanel.js

@@ -342,8 +342,8 @@ export function shouldShowAgentPanelPageHeader(tabs, activeTabId, activeTabMessa
 export function shouldShowAgentPanelCliTabBar(cliTabs) {
     return cliTabs.length > 1;
 }
-export function shouldShowAgentPanelModeButtons(isSidebar) {
-    return !isSidebar;
+export function shouldShowAgentPanelModeButtons(isSidebar, chatOnly = false) {
+    return !isSidebar && !chatOnly;
 }
 export function shouldShowAgentPanelFullViewAction(agentPageHref, mode, isSidebar = false, currentPath) {
     return (Boolean(agentPageHref) &&
@@ -1018,7 +1018,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                                     borderRadius: "0 6px 6px 0",
                                                     background: "linear-gradient(to right, transparent, hsl(var(--accent)) 40%)",
                                                 }, children: _jsx(IconX, { size: 10 }) })] }, tab.id));
-                                }) })) : shouldShowAgentPanelModeButtons(Boolean(onCollapse)) ? (renderModeButtons(mode)) : null }), _jsx("div", { className: "flex items-center gap-0.5", children: renderHeaderActions({
+                                }) })) : shouldShowAgentPanelModeButtons(Boolean(onCollapse), chatOnly) ? (renderModeButtons(mode)) : null }), _jsx("div", { className: "flex items-center gap-0.5", children: renderHeaderActions({
                                 activeChatSessionId: activeTabId,
                                 activeTabId,
                                 activeTabMessageCount,
@@ -1119,7 +1119,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
         switchMode,
         t,
     ]);
-    return (_jsxs(ThinkingDisplayProvider, { value: assistantChatProps.thinkingDisplay, children: [_jsx(AgentPanelSettingsNavigation, { onOpenSettings: onOpenSettings }), _jsxs("div", { className: cn("agent-panel-root agent-kit-density flex flex-1 flex-col min-h-0 h-full antialiased", className), style: {
+    return (_jsxs(ThinkingDisplayProvider, { value: assistantChatProps.thinkingDisplay, children: [_jsx(AgentPanelSettingsNavigation, { onOpenSettings: onOpenSettings }), _jsxs("div", { className: cn("agent-panel-root agent-kit-density flex flex-1 flex-col min-h-0 min-w-0 h-full antialiased", className), style: {
                     ...AGENT_PANEL_ROOT_STYLE,
                     ...style,
                     // The chat view-transition container otherwise traps fixed onboarding

package/dist/client/auth/AuthPage.js

@@ -7,6 +7,7 @@ import { AUTH_SIGNUP_INVITE_ONLY_CODE } from "../../shared/auth-copy.js";
 import { isQaTestEmail } from "../../shared/qa-test-email.js";
 import { signInJourney, } from "../../shared/sign-in-journey.js";
 import { isSyntheticTrafficValue } from "../../shared/test-traffic.js";
+import { openOAuthPopup } from "../oauth-popup.js";
 import { OceanBackground } from "../ocean/OceanBackground.js";
 const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 const TAB_STORAGE_KEY = "an.onboarding.tab";
@@ -1180,7 +1181,10 @@ export function AuthPage(props) {
             // redirect and hit that same 403 the moment the popup failed to open.
             const redirectFallbackUnsafe = isInFrame();
             try {
-                popup = window.open("", "_blank", "width=640,height=760");
+                popup = openOAuthPopup({
+                    initialUrl: new URL(`${runtimeAppBasePath}/_agent-native/oauth/popup`, window.location.origin).href,
+                    features: "width=640,height=760",
+                });
                 if (!popup) {
                     if (redirectFallbackUnsafe) {
                         setGoogleBusy(false);
@@ -1277,6 +1281,7 @@ export function AuthPage(props) {
         googleViaIdentitySso,
         resolveGoogleFlow,
         resumeHref,
+        runtimeAppBasePath,
         setNotice,
         showGoogle,
         startOAuthExchange,

package/dist/client/oauth-popup.d.ts

@@ -0,0 +1,7 @@
+export interface OpenOAuthPopupOptions {
+    /** HTTP(S) URL loaded synchronously while the user gesture is active. */
+    initialUrl?: string;
+    features?: string;
+}
+export declare function oauthPopupWaitingUrl(): string;
+export declare function openOAuthPopup({ initialUrl, features, }?: OpenOAuthPopupOptions): Window | null;

package/dist/client/oauth-popup.js

@@ -0,0 +1,14 @@
+import { agentNativePath } from "./api-path.js";
+export function oauthPopupWaitingUrl() {
+    if (typeof window === "undefined")
+        return "";
+    return new URL(agentNativePath("/_agent-native/oauth/popup"), window.location.href).href;
+}
+export function openOAuthPopup({ initialUrl, features, } = {}) {
+    if (typeof window === "undefined")
+        return null;
+    const url = new URL(initialUrl || oauthPopupWaitingUrl(), window.location.href);
+    if (url.protocol !== "http:" && url.protocol !== "https:")
+        return null;
+    return window.open(url.href, "_blank", features);
+}

package/dist/client/ocean/OceanBackground.d.ts

@@ -1,4 +1,6 @@
+/** @jsxRuntime classic */
+import * as React from "react";
 export declare function OceanBackground({ className, frameRate, }: {
     className: string;
     frameRate?: number;
-}): import("react").JSX.Element;
+}): React.JSX.Element;

package/dist/client/ocean/OceanBackground.js

@@ -1,4 +1,5 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+/** @jsxRuntime classic */
+import * as React from "react";
 import { useCallback, useEffect, useState } from "react";
 import { StarfieldBackground } from "../StarfieldBackground.js";
 import { HeroOceanBackground } from "./hero-ocean-background.js";
@@ -41,7 +42,7 @@ export function OceanBackground({ className, frameRate = 30, }) {
     }, []);
     const handleOceanError = useCallback(() => setBackground("fallback"), []);
     if (background === "ocean") {
-        return (_jsx(HeroOceanBackground, { className: className, frameRate: frameRate, onError: handleOceanError }));
+        return (React.createElement(HeroOceanBackground, { className: className, frameRate: frameRate, onError: handleOceanError }));
     }
-    return _jsx(StarfieldBackground, { className: className, frameRate: frameRate });
+    return React.createElement(StarfieldBackground, { className: className, frameRate: frameRate });
 }

package/dist/client/resources/mcp-integration-catalog.js

@@ -1,6 +1,8 @@
 import { normalizeMcpIntegrationsConfig, } from "../../shared/mcp-integration-config.js";
 import { hostMatches, MCP_LINK_HOSTS, normalizeMcpUrl, } from "../../shared/mcp-provider-hosts.js";
 import { mergeDefinitionsById } from "../../shared/merge-by-id.js";
+import { agentNativePath } from "../api-path.js";
+import { openOAuthPopup } from "../oauth-popup.js";
 import { markMcpConnectionPending } from "./mcp-connection-refresh.js";
 import { mcpIntegrationLogo } from "./mcp-integration-logos.js";
 export const DEFAULT_MCP_INTEGRATIONS = [
@@ -877,17 +879,19 @@ export function buildMcpOAuthStartUrl({ name, url, description, scope, returnUrl
             ? { tracking_integration_id: trackingIntegrationId }
             : {}),
     });
-    return `/_agent-native/mcp/servers/oauth/start?${params.toString()}`;
+    return `${agentNativePath("/_agent-native/mcp/servers/oauth/start")}?${params.toString()}`;
 }
 export function navigateToMcpOAuthStart(url) {
     if (typeof window === "undefined")
         return false;
     try {
-        const popup = window.open("about:blank", "_blank");
+        const popup = openOAuthPopup({
+            initialUrl: url,
+            features: "width=640,height=760",
+        });
         if (!popup)
             return false;
         popup.opener = null;
-        popup.location.replace(url);
         // The callback redirects the popup, not this window, so this marker is the
         // only thing that tells the opener its cached server list is now suspect.
         markMcpConnectionPending();

package/dist/client/settings/useBuilderStatus.js

@@ -4,6 +4,7 @@ import { trackEvent } from "../analytics.js";
 import { agentNativePath } from "../api-path.js";
 import { getCallbackOrigin } from "../frame.js";
 import { openMcpAppHostLink } from "../mcp-app-host.js";
+import { oauthPopupWaitingUrl } from "../oauth-popup.js";
 import { scheduleAfterPaint } from "../use-after-paint.js";
 import { usePollLoop } from "../use-poll-loop.js";
 /**
@@ -677,8 +678,8 @@ export function useBuilderConnectFlow(opts = {}) {
             ? statusConnectUrl
             : null;
         // popupUrl props and statusConnectUrl are signed URLs minted before the
-        // click. In web browsers, always refresh inside an about:blank popup so a
-        // server/package restart cannot leave the user with a stale signed state.
+        // click. In web browsers, always refresh inside the inert HTTP waiting
+        // page so a server/package restart cannot leave the user with stale state.
         // Desktop keeps the direct path because the Electron shell owns the popup.
         const signedPropUrl = hasSignedConnectToken(popupUrl) ? popupUrl : null;
         const fallbackUrl = new URL(agentNativePath("/_agent-native/builder/connect"), origin).href;
@@ -710,7 +711,7 @@ export function useBuilderConnectFlow(opts = {}) {
         }
         else {
             const opened = openBuilderConnectPopup({
-                url: "about:blank",
+                url: oauthPopupWaitingUrl(),
                 source: clickTrackingSource,
                 flow: clickTrackingFlow,
                 features: "width=600,height=700",