@agent-native/core 0.72.4 → 0.74.0

package/corpus/core/src/client/blocks/library/AnnotatedCodeBlock.tsx

@@ -16,6 +16,7 @@ import {
   AnnotationHiddenStack,
   AnnotationHoverCard,
   AnnotationInlineOverlayStack,
+  AnnotationGutterMarker,
   anchorFromElements,
   buildLineMarkerMap,
   hasRailAnnotations,
@@ -42,9 +43,9 @@ import { DevInput, DevLabel, DevTextarea } from "./dev-doc-ui.js";
  * pairs, so it reads correctly in BOTH light and dark mode. Code lines render as
  * `<span>`s (never one `<pre>` per line) so they don't pick up document
  * code/pre chrome. Lives in core so any app can register the dev-doc block.
- * Each annotated range also gets a small sticky glowing indicator at the top
- * right of its first line, making the hover affordance visible without a note
- * column.
+ * Each annotated range also gets a numbered marker in the left gutter on the
+ * first line, matching the diff block's annotation affordance without adding a
+ * persistent note column.
  *
  * Editing is panel-driven (config-style, like the diff/HTML blocks): a monospace
  * code Textarea, filename/language Inputs, and add/remove-able annotation rows.
@@ -283,6 +284,7 @@ function AnnotatedCodeRead({
     );
     const rangeStartMarkers =
       markers?.filter((item) => item.range?.start === lineNo) ?? [];
+    const showMarkerColumn = hasAnnotations;
 
     const buildAnchorForItem = (
       item: ResolvedAnnotation<AnnotatedCodeAnnotation>,
@@ -373,14 +375,13 @@ function AnnotatedCodeRead({
         <span className="w-11 shrink-0 select-none px-3 text-right text-[11px] tabular-nums text-plan-muted/60">
           {lineNo}
         </span>
-        <span className="flex-1 whitespace-pre pr-4 text-plan-code-text">
-          {highlightedLines[lineNo - 1]}
-        </span>
-        {rangeStartMarkers.length > 0 && (
+        {showMarkerColumn && (
           <span
             aria-hidden
-            className="sticky right-0.5 z-10 ml-2 flex h-[22px] shrink-0 items-center gap-1 self-start pr-0.5"
-            data-annotated-code-marker-stack
+            className="flex w-6 shrink-0 select-none items-center justify-center gap-1 py-0"
+            data-annotated-code-marker-stack={
+              rangeStartMarkers.length > 0 ? "" : undefined
+            }
           >
             {rangeStartMarkers.map((item) => (
               <span
@@ -394,24 +395,35 @@ function AnnotatedCodeRead({
                     ) ?? event.currentTarget;
                   openAnnotation(item, row);
                 }}
-                className="group inline-flex size-3 cursor-pointer items-center justify-center rounded-full outline-none transition-transform hover:scale-110"
+                onClick={(event) => {
+                  event.stopPropagation();
+                  const row =
+                    event.currentTarget.closest<HTMLElement>(
+                      "[data-code-line]",
+                    ) ?? event.currentTarget;
+                  openAnnotation(item, row);
+                }}
+                className="inline-flex cursor-pointer outline-none transition-transform hover:scale-110"
               >
-                <span
-                  className={cn(
-                    "block rounded-full ring-1 transition-all duration-150",
-                    activeIndex === item.index
-                      ? "size-[6px] bg-yellow-300 ring-yellow-200 shadow-[0_0_0_3px_rgba(250,204,21,0.30),0_0_16px_rgba(250,204,21,0.92)] dark:bg-yellow-200 dark:ring-yellow-100/70 dark:shadow-[0_0_0_3px_rgba(253,224,71,0.26),0_0_16px_rgba(253,224,71,0.76)]"
-                      : "size-1 bg-yellow-300/95 ring-yellow-200/65 shadow-[0_0_0_2px_rgba(250,204,21,0.18),0_0_11px_rgba(250,204,21,0.56)] group-hover:size-[6px] group-hover:bg-yellow-300 group-hover:ring-yellow-200 group-hover:shadow-[0_0_0_3px_rgba(250,204,21,0.30),0_0_16px_rgba(250,204,21,0.90)] dark:bg-yellow-200/78 dark:ring-yellow-100/38 dark:shadow-[0_0_0_2px_rgba(253,224,71,0.16),0_0_11px_rgba(253,224,71,0.46)] dark:group-hover:bg-yellow-200 dark:group-hover:ring-yellow-100/68 dark:group-hover:shadow-[0_0_0_3px_rgba(253,224,71,0.26),0_0_16px_rgba(253,224,71,0.74)]",
-                  )}
+                <AnnotationGutterMarker
+                  marker={item.marker}
+                  active={
+                    activeIndex === item.index ||
+                    persistentAnnotationIndexes.has(item.index)
+                  }
                 />
               </span>
             ))}
           </span>
         )}
+        <span className="flex-1 whitespace-pre pr-4 text-plan-code-text">
+          {highlightedLines[lineNo - 1]}
+        </span>
         {overlayItems.length > 0 && (
           <AnnotationInlineOverlayStack
             items={overlayItems}
             ctx={ctx}
+            showMarker
             containerRef={codeRef}
             mode={showAnnotationOverlays ? "capture" : "margin"}
             side={showAnnotationOverlays ? "right" : annotationMarginSide}
@@ -503,7 +515,9 @@ function AnnotatedCodeRead({
           live in a visually-hidden stack (a11y + tests) and surface ONE at a
           time as an on-hover popover anchored to the right of the code. */}
       {codeSurface}
-      {hasAnnotations && <AnnotationHiddenStack items={resolved} ctx={ctx} />}
+      {hasAnnotations && (
+        <AnnotationHiddenStack items={resolved} ctx={ctx} showMarker />
+      )}
       {hasAnnotations &&
         !showAnnotationOverlays &&
         !activeItemIsPersistentlyVisible &&
@@ -513,6 +527,7 @@ function AnnotatedCodeRead({
             item={activeItem}
             anchor={hover.anchor}
             ctx={ctx}
+            showMarker
             preferredSide={annotationHoverSide}
             hoverFallbackSide={annotationHoverFallbackSide}
             onMouseEnter={hover.cancelClose}

package/corpus/core/src/client/blocks/library/annotation-rail.tsx

@@ -26,11 +26,10 @@ import type { BlockRenderContext } from "../types.js";
  *    into stable, marker-numbered, range-resolved records and a line→markers map.
  *  - `rangeLabel` — the human "Line 8" / "Lines 3–6" label.
  *  - `AnnotationGutterMarker` — the numbered amber pip placed on an annotated row
- *    (used by the diff grid; the annotated-code surface uses its own rail bar).
+ *    by both the diff grid and the annotated-code gutter.
  *  - `AnnotationNoteRail` — the responsive list of note cards with two-way hover.
- *    `showMarker` opts the diff block into a leading numbered pip on each card so
- *    a note can be matched to its `①`/`②` row marker; annotated-code omits it to
- *    keep its original card chrome.
+ *    `showMarker` opts blocks into a leading numbered pip on each card so a note
+ *    can be matched to its `①`/`②` row marker.
  *
  * `AnnotatedCodeBlock` annotates a single code surface; `DiffBlock` annotates a
  * before/after grid (each annotation also carries a `side`). The shared types

package/corpus/core/src/client/components/CodeRequiredDialog.tsx

@@ -12,6 +12,8 @@ import { trackEvent } from "../analytics.js";
 import { withBuilderConnectTrackingParams } from "../settings/useBuilderStatus.js";
 
 const DESKTOP_DOWNLOAD_URL = "https://www.agent-native.com/download";
+const CODE_CHANGE_FALLBACK_DETAIL =
+  "Edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way you like.";
 
 export interface CodeRequiredDialogProps {
   open: boolean;
@@ -219,15 +221,10 @@ export function CodeRequiredDialog({
                 <IconExternalLink size={24} />
               </div>
               <div style={s.optionText}>
-                <span style={s.optionTitle}>
-                  Builder Cloud Agents coming soon
-                </span>
-                <span style={s.optionDesc}>
-                  You don't have access yet. Use the desktop app or your local
-                  clone for this code change.
-                </span>
+                <span style={s.optionTitle}>This requires a code change</span>
+                <span style={s.optionDesc}>{CODE_CHANGE_FALLBACK_DETAIL}</span>
               </div>
-              <span style={s.badge}>Coming soon</span>
+              <span style={s.badge}>Code change</span>
             </div>
           ) : (
             <a

package/corpus/core/src/server/agent-chat-plugin.ts

@@ -2039,7 +2039,7 @@ function createBuilderBrowserTool(deps: {
   const entries: Record<string, ActionEntry> = {
     "connect-builder": {
       tool: {
-        description: `Render a Builder.io card inline in the chat. Call this as the first step (no code exploration or planning needed) when the user asks to modify the APP'S OWN SOURCE CODE: add a feature, change the UI chrome, edit a React component, add a route, add an integration, fix a bug in the app itself, or anything else that requires source-file edits while in hosted/production mode. ${extensionRequestGuidance}Do NOT call this for content the app is meant to produce — creating a video, generating a design, drafting an email, building a slide deck, making a dashboard, etc. — those run through the app's own domain actions, not Builder. Do NOT mention 'click Send to Builder' in your response unless this card is already in the conversation. If Builder is connected and Builder Cloud Agents are available, the card shows a 'Send to Builder' button that hands the work off to Builder's cloud agent and returns a branch URL. If \`builderEnabled\` is false, the card shows a waitlist/local-dev fallback instead; never tell the user to enable Builder Cloud Agents in Builder org settings or beta settings, and do not claim the Builder card has everything, is pre-loaded for handoff, or can run the cloud agent. When you call this for a code-change request, pass the user's request verbatim as the \`prompt\` arg so the card can forward it to Builder unchanged when cloud agents are available.`,
+        description: `Render a Builder.io card inline in the chat. Call this as the first step (no code exploration or planning needed) when the user asks to modify the APP'S OWN SOURCE CODE: add a feature, change the UI chrome, edit a React component, add a route, add an integration, fix a bug in the app itself, or anything else that requires source-file edits while in hosted/production mode. ${extensionRequestGuidance}Do NOT call this for content the app is meant to produce — creating a video, generating a design, drafting an email, building a slide deck, making a dashboard, etc. — those run through the app's own domain actions, not Builder. Do NOT mention 'click Send to Builder' in your response unless this card is already in the conversation. The tool result includes \`builderEnabled\`; treat \`true\` as "Builder Cloud Agents can take the code-change handoff" and \`false\` as "this still needs a code change, but no Builder Cloud Agent can run here." If Builder is connected and Builder Cloud Agents are available, the card shows a 'Send to Builder' button that hands the work off to Builder's cloud agent and returns a branch URL. If \`builderEnabled\` is false, the card still renders but shows the code-change fallback: "This requires a code change. Edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way you like." Never tell the user to enable Builder Cloud Agents in Builder org settings or beta settings, and do not claim the Builder card has everything, is pre-loaded for handoff, or can run the cloud agent when \`builderEnabled\` is false. When you call this for a code-change request, pass the user's request verbatim as the \`prompt\` arg so the card can forward it to Builder unchanged when cloud agents are available.`,
         parameters: {
           type: "object",
           properties: {
@@ -2920,7 +2920,7 @@ Do NOT add this offer for one-shot work: lookups (find Alice, what's the schema,
 
   builder: `### Connecting Builder.io
 
-When the user asks to connect Builder.io or you hit a "Builder not configured" error, call the \`connect-builder\` tool. It renders a one-click Connect card inline — do NOT write out multi-step setup instructions yourself. If Builder Cloud Agents are not available for this workspace, never send the user to Builder org settings or beta settings; use the card's waitlist/local-dev fallback.`,
+When the user asks to connect Builder.io or you hit a "Builder not configured" error, call the \`connect-builder\` tool. It renders a Connect/code-change card inline — do NOT write out multi-step setup instructions yourself. Inspect the returned \`builderEnabled\` flag: \`true\` means Builder Cloud Agents can take the code-change handoff, while \`false\` means this requires a code change and the user should edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way they like. If Builder Cloud Agents are not available for this workspace, never send the user to Builder org settings or beta settings.`,
 
   browser: `### Browser Automation
 
@@ -3108,14 +3108,14 @@ ${extensionConnectBuilderGuard}
 In Act mode, when the user asks you to change the UI, modify code, add a feature, fix a bug in the app itself, change styles, add a hook, create a component, add a route, add an integration, or anything else that requires editing source files — you MUST take exactly these steps, in order:
 
 1. Briefly acknowledge the user's specific request in their own terms — one short clause naming what they asked for (e.g. "Got it — wider subject lines in the email list."). Do NOT restate the request verbatim, do NOT add a generic preamble, and do NOT promise outcomes. Skip this step entirely if the user already knows you're handing off (e.g. they said "send this to Builder").
-2. Call the \`connect-builder\` tool, passing the user's full request verbatim as the \`prompt\` argument. This renders an inline card. If Builder is connected and \`builderEnabled\` is true, the card hands the prompt off to Builder's cloud agent on one click and returns a branch URL. If Builder is not connected, it shows the Connect Builder flow. If \`builderEnabled\` is false, it shows a waitlist/local-dev fallback instead of a cloud handoff.
-3. After the card renders, inspect the tool result and write one sentence that frames the next click around what the user just asked — not as a Builder pitch. Examples: "Click Send to Builder and it'll wire that up for you." / "Connect Builder once and it'll handle this and future changes." / "Builder Cloud Agents aren't available here yet — join the waitlist in the card, or use the Agent Native Desktop app for local code changes: https://www.agent-native.com/download." Do NOT say the card is pre-loaded, has everything, or lead with "Builder Cloud Agents are…" as if it were the headline.
+2. Call the \`connect-builder\` tool, passing the user's full request verbatim as the \`prompt\` argument. This renders an inline card. The returned \`builderEnabled\` flag is authoritative: \`true\` means Builder Cloud Agents can take the code-change handoff; \`false\` means this still requires a code change, but no Builder Cloud Agent can run from this workspace. If Builder is connected and \`builderEnabled\` is true, the card hands the prompt off to Builder's cloud agent on one click and returns a branch URL. If Builder is not connected and \`builderEnabled\` is true, it shows the Connect Builder flow. If \`builderEnabled\` is false, it still shows the card, but as a code-change fallback instead of a runnable cloud handoff.
+3. After the card renders, inspect the tool result and write one sentence that frames the next click around what the user just asked — not as a Builder pitch. If \`builderEnabled\` is true and the card can send, say something like "Click Send to Builder and it'll wire that up for you." If the user needs to connect first, say something like "Connect Builder once and it'll handle this and future changes." If \`builderEnabled\` is false, say: "This requires a code change. Edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way you like." Do NOT say "click Send to Builder", mention a branch URL, say the card is pre-loaded, or imply a Builder Cloud Agent can run when \`builderEnabled\` is false.
 
-When \`builderEnabled\` is false, Builder Cloud Agents are not self-serve from Builder org settings. Do NOT tell the user to go to Builder org settings, beta features, "Cloud Agents", or "AI Agents" to enable them. The only allowed guidance is the card's waitlist/local-dev fallback: join the waitlist when the card offers it, use Agent Native Desktop, or edit from a local clone.
+When \`builderEnabled\` is false, Builder Cloud Agents are not self-serve from Builder org settings. Do NOT tell the user to go to Builder org settings, beta features, "Cloud Agents", or "AI Agents" to enable them. The only allowed guidance is the card's code-change fallback: edit locally, use Agent Native Desktop, or use Builder.io to edit this code in the cloud and continue customizing the app any way you like.
 
 **Act-mode handoff — do exactly this:** The moment a code change is requested, call \`connect-builder\` with the user's verbatim request, then write one sentence framing the next click. That is the whole job: Builder plans and edits in its own sandbox, so the planning, file-mapping, and code all happen there, not here. Keep your turn to the call plus that one sentence — skip code exploration, implementation plans, \`resources\` writes of specs, and sub-agents (they have no code-editing tools either). You don't need filesystem access to recommend Builder, so don't reach for it or list tools you lack.
 
-Builder Cloud Agents are the recommended path when available because they are one-click and run in the cloud. Local dev and the desktop app are the fallback when cloud agent access is waitlisted or unavailable.
+Builder Cloud Agents are the recommended path when \`builderEnabled\` is true because they are one-click and run in the cloud. Local dev, Agent Native Desktop, and Builder.io cloud editing are the fallback when \`builderEnabled\` is false.
 ${FRAMEWORK_CORE}`;
 
   const DEV_FRAMEWORK_PROMPT = `## Agent-Native Framework — Development Mode
@@ -3157,7 +3157,7 @@ ${extensionInstructionsCompact}
 
 ### Code Changes — Call \`connect-builder\`
 
-In Act mode, when a request genuinely needs a source-code edit (per the rules above), do this in order: (1) briefly acknowledge the user's specific ask in their own terms — one short clause, no preamble — then (2) call \`connect-builder\` with the user's request as the \`prompt\`, then (3) write one sentence framing the next click around what they asked for, not a Builder pitch. Do NOT write code, list files, make plans, or spawn sub-agents. Mention \`npx agent-native create <app-name>\`, Agent Native Desktop, or the waitlist card as the fallback when Builder Cloud Agents aren't available. Never tell users to enable Builder Cloud Agents from Builder org settings, beta features, "Cloud Agents", or "AI Agents"; they are not self-serve there.
+In Act mode, when a request genuinely needs a source-code edit (per the rules above), do this in order: (1) briefly acknowledge the user's specific ask in their own terms — one short clause, no preamble — then (2) call \`connect-builder\` with the user's request as the \`prompt\`, then (3) inspect \`builderEnabled\` in the result and write one sentence framing the next click around what they asked for, not a Builder pitch. When \`builderEnabled\` is true, Builder Cloud Agents can take the handoff; when \`builderEnabled\` is false, say this requires a code change and they can edit locally or use Builder.io to edit this code in the cloud and continue customizing the app any way they like. Do NOT write code, list files, make plans, or spawn sub-agents. Mention \`npx agent-native create <app-name>\`, Agent Native Desktop, or the code-change fallback when Builder Cloud Agents aren't available. Never tell users to enable Builder Cloud Agents from Builder org settings, beta features, "Cloud Agents", or "AI Agents"; they are not self-serve there.
 ${FRAMEWORK_CORE_COMPACT}`;
 
   const DEV_FRAMEWORK_PROMPT_COMPACT = `## Agent-Native Framework — Development Mode

package/corpus/core/src/server/auth.ts

@@ -262,6 +262,12 @@ export interface AuthOptions {
     continueLabel?: string;
     cancelLabel?: string;
   };
+  /**
+   * Optional email signup legal copy for the built-in login page.
+   * Leave unset to use Agent Native links only on `*.agent-native.com` hosts,
+   * pass false to suppress, or pass URLs for custom/self-hosted policies.
+   */
+  signupLegalNotice?: OnboardingHtmlOptions["signupLegalNotice"];
   /**
    * Google sign-in flow: `'popup'`, `'redirect'`, or `'auto'` (default).
    *
@@ -1013,6 +1019,7 @@ function getOnboardingHtmlOptions(
     googleOnly: options.googleOnly,
     marketing: options.marketing,
     googleSignInNotice: options.googleSignInNotice,
+    signupLegalNotice: options.signupLegalNotice,
     googleAuthMode: options.googleAuthMode,
     requestHost: event ? getRequestHost(event) : undefined,
     requestPath: rawPath,

package/corpus/core/src/server/onboarding-html.ts

@@ -55,6 +55,36 @@ function withAppBasePath(path: string): string {
   return `${basePath}${cleanPath}`;
 }
 
+const AGENT_NATIVE_TERMS_URL = "https://www.agent-native.com/terms";
+const AGENT_NATIVE_PRIVACY_URL = "https://www.agent-native.com/privacy";
+
+export interface SignupLegalNoticeOptions {
+  termsUrl: string;
+  privacyUrl: string;
+  termsLabel?: string;
+  privacyLabel?: string;
+  prefix?: string;
+  connector?: string;
+  suffix?: string;
+}
+
+function normalizeRequestHostname(host: string | undefined): string {
+  const firstHost = host?.split(",")[0]?.trim().toLowerCase() ?? "";
+  if (!firstHost) return "";
+  if (firstHost.startsWith("[")) {
+    const close = firstHost.indexOf("]");
+    return close > 0 ? firstHost.slice(1, close) : firstHost;
+  }
+  return firstHost.replace(/:\d+$/, "");
+}
+
+function isAgentNativeHostedHost(host: string | undefined): boolean {
+  const hostname = normalizeRequestHostname(host);
+  return (
+    hostname === "agent-native.com" || hostname.endsWith(".agent-native.com")
+  );
+}
+
 export interface OnboardingHtmlOptions {
   /**
    * Hide email/password forms and show ONLY the Google sign-in button.
@@ -93,6 +123,12 @@ export interface OnboardingHtmlOptions {
     continueLabel?: string;
     cancelLabel?: string;
   };
+  /**
+   * Optional email signup legal copy. Builder-hosted `*.agent-native.com`
+   * deployments get the Agent Native links automatically; self-hosted and
+   * custom-domain apps must opt in with their own URLs.
+   */
+  signupLegalNotice?: SignupLegalNoticeOptions | false;
   /**
    * Google sign-in flow: `'popup'`, `'redirect'`, or `'auto'` (default).
    * Falls back to `GOOGLE_AUTH_MODE` env var, then `'auto'`. Builder web
@@ -139,6 +175,21 @@ export function getOnboardingHtml(opts: OnboardingHtmlOptions = {}): string {
       .replace(/</g, "&lt;")
       .replace(/>/g, "&gt;")
       .replace(/"/g, "&quot;");
+  const hostedSignupLegalNotice: SignupLegalNoticeOptions | undefined =
+    opts.signupLegalNotice === undefined &&
+    isAgentNativeHostedHost(opts.requestHost)
+      ? {
+          termsUrl: AGENT_NATIVE_TERMS_URL,
+          privacyUrl: AGENT_NATIVE_PRIVACY_URL,
+        }
+      : undefined;
+  const signupLegalNotice =
+    opts.signupLegalNotice === false
+      ? undefined
+      : (opts.signupLegalNotice ?? hostedSignupLegalNotice);
+  const signupLegalNoteHtml = signupLegalNotice
+    ? `      <p class="legal-note">${esc(signupLegalNotice.prefix ?? "By signing up, you accept our")} <a href="${esc(signupLegalNotice.termsUrl)}" target="_blank" rel="noreferrer">${esc(signupLegalNotice.termsLabel ?? "Terms")}</a> ${esc(signupLegalNotice.connector ?? "and")} <a href="${esc(signupLegalNotice.privacyUrl)}" target="_blank" rel="noreferrer">${esc(signupLegalNotice.privacyLabel ?? "Privacy Policy")}</a>${esc(signupLegalNotice.suffix ?? ".")}</p>`
+    : "";
   const googleSignInNotice = opts.googleSignInNotice;
   const googleNoticeBodyParts = googleSignInNotice
     ? (Array.isArray(googleSignInNotice.body)
@@ -177,11 +228,16 @@ export function getOnboardingHtml(opts: OnboardingHtmlOptions = {}): string {
     aria-describedby="google-preflight-copy"
     tabindex="-1"
   >
-    <div class="google-preflight-heading">
-      <p class="google-preflight-title" id="google-preflight-title">${esc(googleSignInNotice.title)}</p>
-      <button type="button" class="google-preflight-close" aria-label="Close Google sign-in choices" onclick="__anHideGoogleNotice()">&times;</button>
-    </div>
+    <button type="button" class="google-preflight-close" aria-label="Close Google sign-in choices" onclick="__anHideGoogleNotice()">&times;</button>
+    <div class="google-preflight-main">
+      <span class="google-preflight-icon" aria-hidden="true">
+        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10.24 3.957l-8.422 14.06a1.989 1.989 0 0 0 1.7 2.983h16.845a1.989 1.989 0 0 0 1.7 -2.983l-8.423 -14.06a1.989 1.989 0 0 0 -3.4 0z"/><path d="M12 9v4"/><path d="M12 16h.01"/></svg>
+      </span>
+      <div class="google-preflight-text">
+        <p class="google-preflight-title" id="google-preflight-title">${esc(googleSignInNotice.title)}</p>
 ${googleNoticeBodyHtml}
+      </div>
+    </div>
     <div class="google-preflight-actions">
       <button type="button" class="btn-primary" id="google-preflight-continue" onclick="__anAcceptGoogleNotice()">${esc(googleSignInNotice.continueLabel ?? "Continue")}</button>
 ${googleNoticeRunLocalHtml}
@@ -707,6 +763,19 @@ ${
     cursor: pointer;
   }
   .btn-secondary:hover { color: #bbb; border-color: rgba(255,255,255,0.2); }
+  .legal-note {
+    margin-top: 0.625rem;
+    color: #666;
+    font-size: 0.6875rem;
+    line-height: 1.45;
+    text-align: center;
+  }
+  .legal-note a {
+    color: #777;
+    text-decoration: underline;
+    text-underline-offset: 2px;
+  }
+  .legal-note a:hover { color: #aaa; }
   .msg { margin-top: 0.75rem; font-size: 0.8125rem; display: none; }
   .msg.error { color: #f87171; }
   .msg.success { color: #33C4FF; }
@@ -898,25 +967,40 @@ ${
     border-left: 1px solid rgba(255,255,255,0.12);
     border-top: 1px solid rgba(255,255,255,0.12);
   }
-  .google-preflight-heading {
+  .google-preflight-main {
     display: flex;
     align-items: flex-start;
-    justify-content: space-between;
-    gap: 0.75rem;
-    margin-bottom: 0.375rem;
+    gap: 0.625rem;
+    padding-right: 1.25rem;
   }
+  .google-preflight-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    flex: none;
+    width: 1.75rem;
+    height: 1.75rem;
+    border-radius: 7px;
+    background: rgba(245,158,11,0.15);
+    color: #fcd34d;
+  }
+  .google-preflight-icon svg { width: 1rem; height: 1rem; }
+  .google-preflight-text { min-width: 0; }
   .google-preflight-title {
     color: #fff;
     font-size: 0.8125rem;
     font-weight: 600;
+    margin-bottom: 0.25rem;
   }
   .google-preflight-close {
+    position: absolute;
+    top: 0.5rem;
+    right: 0.5rem;
     display: inline-flex;
     align-items: center;
     justify-content: center;
     width: 1.5rem;
     height: 1.5rem;
-    margin: -0.25rem -0.25rem 0 0;
     background: transparent;
     border: none;
     border-radius: 999px;
@@ -942,6 +1026,7 @@ ${
     flex: 1;
     width: auto;
     margin-top: 0;
+    white-space: nowrap;
   }
   .google-preflight-command {
     margin-top: 0.75rem;
@@ -1039,6 +1124,7 @@ ${
     <label for="s-pass2">Confirm password</label>
     <input id="s-pass2" type="password" autocomplete="new-password" placeholder="Confirm password" required minlength="8" />
       <button type="submit">Create account</button>
+${signupLegalNoteHtml}
       <p class="msg" id="s-msg"></p>
     </form>
 

package/corpus/core/src/server/self-dispatch.ts

@@ -150,7 +150,14 @@ export async function fireInternalDispatch(
     }
   });
   dispatchPromise.catch((err) => {
-    console.error(`[self-dispatch] dispatch to ${options.path} failed:`, err);
+    // Include the resolved base URL: a self-dispatch failure is almost always
+    // about *which* host we POST to (custom domain behind an edge/auth wall vs
+    // the deploy URL), and that is invisible from the error alone. Keeps prod
+    // logs diagnostic without changing the URL resolution order.
+    console.error(
+      `[self-dispatch] dispatch to ${options.path} (base ${baseUrl}) failed:`,
+      err,
+    );
   });
 
   const settleMs = options.settleMs ?? DEFAULT_DISPATCH_SETTLE_MS;

package/corpus/core/src/templates/default/AGENTS.md

@@ -38,6 +38,10 @@ Read these local package docs before implementing advanced Agent Native
 features. Prefer this app's own `AGENTS.md` and `.agents/skills/` for
 app-specific rules, then use the corpus for reusable framework/template
 patterns.
+After updating `@agent-native/core`, run `pnpm skills:update` or
+`npx @agent-native/core@latest skills update scaffold --project` from the app
+root to refresh framework-provided `.agents/skills` and repair `CLAUDE.md` /
+`.claude/skills` compatibility links.
 
 ### Database Code
 

package/corpus/core/src/templates/default/package.json

@@ -8,7 +8,8 @@
     "start": "agent-native start",
     "typecheck": "agent-native typecheck",
     "action": "agent-native action",
-    "script": "agent-native script"
+    "script": "agent-native script",
+    "skills:update": "agent-native skills update scaffold --project"
   },
   "dependencies": {
     "@agent-native/core": "latest",

package/corpus/core/src/templates/headless/AGENTS.md

@@ -38,6 +38,10 @@ first-party template patterns ships in `node_modules/@agent-native/core/corpus`.
 Read these local package docs before implementing advanced Agent Native
 features. Prefer this app's own `AGENTS.md` for app-specific rules, then use
 the corpus for reusable framework/template patterns.
+After updating `@agent-native/core`, run `pnpm skills:update` or
+`npx @agent-native/core@latest skills update scaffold --project` from the app
+root to refresh framework-provided `.agents/skills` and repair `CLAUDE.md` /
+`.claude/skills` compatibility links.
 
 ## Actions
 

package/corpus/core/src/templates/headless/package.json

@@ -6,6 +6,7 @@
     "action": "agent-native action",
     "agent": "agent-native agent",
     "script": "agent-native script",
+    "skills:update": "agent-native skills update scaffold --project",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {

package/corpus/core/src/templates/workspace-root/AGENTS.md

@@ -27,6 +27,10 @@ first-party template patterns ships in `node_modules/@agent-native/core/corpus`.
 Use package docs for framework APIs, the package corpus for reusable
 framework/template patterns, and `packages/shared/AGENTS.md` plus
 `packages/shared/.agents/skills/` for workspace-specific conventions.
+After updating `@agent-native/core`, run `pnpm skills:update` or
+`npx @agent-native/core@latest skills update scaffold --project` from the
+workspace root to refresh framework-provided shared skills and repair
+`CLAUDE.md` / `.claude/skills` compatibility links.
 
 ## Core Agent Rule
 

package/corpus/core/src/templates/workspace-root/README.md

@@ -35,6 +35,10 @@ the shared package (`@{{APP_NAME}}/shared`).
 
 The workspace root also links `.agents/skills` to the shared package so coding
 agents launched from the root can discover the same workspace-wide skills.
+Run `pnpm skills:update` (or
+`npx @agent-native/core@latest skills update scaffold --project`) after updating
+`@agent-native/core` to refresh framework-provided shared skills and repair
+Claude compatibility links.
 
 Runtime-editable global resources live in Dispatch, not in `packages/shared`.
 Use Dispatch **Resources** for company context and guardrails that admins should

package/corpus/core/src/templates/workspace-root/package.json

@@ -7,6 +7,7 @@
     "build": "pnpm -r build",
     "typecheck": "pnpm -r typecheck",
     "repair:workspace-org": "tsx scripts/repair-workspace-org.ts",
+    "skills:update": "agent-native skills update scaffold --project",
     "fmt:check": "prettier --check .",
     "lint": "pnpm fmt:check"
   },

package/corpus/templates/analytics/actions/compose-dashboard.ts

@@ -7,10 +7,12 @@ import {
 import { z } from "zod";
 import { getDashboard, upsertDashboard } from "../server/lib/dashboards-store";
 import {
+  buildFirstPartyDashboardFilters,
   buildPanel,
   listMetricKeys,
   type ComposedPanel,
   type MetricWindow,
+  usesFirstPartyDashboardFilters,
 } from "../server/lib/first-party-metric-catalog";
 import { validateFirstPartyAnalyticsSql } from "../server/lib/first-party-analytics.js";
 import {
@@ -97,6 +99,32 @@ const metricSchema = z.union([
 
 const METRIC_KEYS = listMetricKeys();
 
+function filterId(filter: unknown): string | null {
+  if (!filter || typeof filter !== "object" || Array.isArray(filter)) {
+    return null;
+  }
+  const id = (filter as { id?: unknown }).id;
+  return typeof id === "string" && id.trim() ? id : null;
+}
+
+function withFirstPartyDashboardFilters(
+  config: Record<string, unknown>,
+): Record<string, unknown> {
+  const filters = Array.isArray(config.filters) ? [...config.filters] : [];
+  const existingIds = new Set(
+    filters
+      .map((filter) => filterId(filter))
+      .filter((id): id is string => id !== null),
+  );
+  for (const filter of buildFirstPartyDashboardFilters()) {
+    if (!existingIds.has(filter.id)) {
+      filters.push(filter);
+      existingIds.add(filter.id);
+    }
+  }
+  return { ...config, filters };
+}
+
 export default defineAction({
   description:
     "Build a large first-party analytics dashboard in ONE fast call: name the metrics you want and the SERVER generates the validated SQL + chart config for every panel. " +
@@ -249,6 +277,12 @@ export default defineAction({
       };
     }
 
+    if (
+      composedPanels.some((panel) => usesFirstPartyDashboardFilters(panel.sql))
+    ) {
+      finalConfig = withFirstPartyDashboardFilters(finalConfig);
+    }
+
     const panelCount = Array.isArray(finalConfig.panels)
       ? (finalConfig.panels as unknown[]).length
       : 0;

package/corpus/templates/analytics/actions/install-dashboard-template.ts

@@ -41,6 +41,49 @@ function uniqueConstraintMessage(err: unknown): boolean {
   return /unique|constraint|primary key/i.test(message);
 }
 
+function filterId(filter: unknown): string | null {
+  if (!filter || typeof filter !== "object" || Array.isArray(filter)) {
+    return null;
+  }
+  const id = (filter as { id?: unknown }).id;
+  return typeof id === "string" && id.trim() ? id : null;
+}
+
+function mergeMissingFilters(
+  targetConfig: Record<string, unknown>,
+  seedConfig: Record<string, unknown>,
+): { config: Record<string, unknown>; addedFilterIds: string[] } {
+  const seedFilters = Array.isArray(seedConfig.filters)
+    ? (seedConfig.filters as unknown[])
+    : [];
+  if (seedFilters.length === 0) {
+    return { config: targetConfig, addedFilterIds: [] };
+  }
+
+  const targetFilters = Array.isArray(targetConfig.filters)
+    ? [...targetConfig.filters]
+    : [];
+  const existingIds = new Set(
+    targetFilters
+      .map((filter) => filterId(filter))
+      .filter((id): id is string => id !== null),
+  );
+  const addedFilterIds: string[] = [];
+  for (const filter of seedFilters) {
+    const id = filterId(filter);
+    if (id && existingIds.has(id)) continue;
+    targetFilters.push(filter);
+    if (id) {
+      existingIds.add(id);
+      addedFilterIds.push(id);
+    }
+  }
+
+  return addedFilterIds.length > 0
+    ? { config: { ...targetConfig, filters: targetFilters }, addedFilterIds }
+    : { config: targetConfig, addedFilterIds };
+}
+
 export default defineAction({
   description:
     "Install a dashboard template from the Analytics catalog into the user's SQL-backed dashboards. Use list-dashboard-templates first when choosing a template. " +
@@ -125,7 +168,10 @@ export default defineAction({
           .filter((id): id is string => !!id),
       );
 
-      const seedConfig = cloneDashboardConfig(entry);
+      const seedConfig = cloneDashboardConfig(entry) as unknown as Record<
+        string,
+        unknown
+      >;
       const seedPanels = Array.isArray(seedConfig.panels)
         ? (seedConfig.panels as unknown as Array<Record<string, unknown>>)
         : [];
@@ -146,13 +192,15 @@ export default defineAction({
         }
       }
 
-      const mergedConfig: Record<string, unknown> = {
+      let mergedConfig: Record<string, unknown> = {
         ...targetConfig,
         panels: [...existingPanels, ...appended],
       };
+      const filterMerge = mergeMissingFilters(mergedConfig, seedConfig);
+      mergedConfig = filterMerge.config;
       const panelCount = (mergedConfig.panels as unknown[]).length;
 
-      if (appended.length > 0) {
+      if (appended.length > 0 || filterMerge.addedFilterIds.length > 0) {
         const saved = await upsertDashboard(
           targetId,
           target.kind,