@agent-native/core 0.81.1 → 0.81.3

package/corpus/templates/calendar/server/handlers/google-auth.ts

@@ -43,6 +43,28 @@ const GOOGLE_IDENTITY_SCOPES = [
   "https://www.googleapis.com/auth/userinfo.profile",
 ];
 
+type CalendarOAuthStateOptions = {
+  redirectUri: string;
+  owner?: string;
+  orgId?: string;
+  desktop?: boolean;
+  addAccount?: boolean;
+  app?: string;
+  returnUrl?: string;
+  flowId?: string;
+};
+
+function encodeCalendarOAuthState(options: CalendarOAuthStateOptions): string {
+  return encodeOAuthState(options as any);
+}
+
+function getCalendarOAuthStateOrgId(
+  state: ReturnType<typeof decodeOAuthState>,
+): string | undefined {
+  return (state as ReturnType<typeof decodeOAuthState> & { orgId?: string })
+    .orgId;
+}
+
 async function resolveCalendarOAuthCredentials(event: H3Event) {
   const session = await getSession(event).catch(() => null);
   const { clientId, clientSecret } = await runWithRequestContext(
@@ -182,6 +204,28 @@ function googleOAuthErrorResponse(
   return oauthErrorPage(payload.message);
 }
 
+function missingCredentialsResponse(
+  event: H3Event,
+  message: string,
+  opts: { desktop?: boolean; flowId?: string; redirect?: boolean } = {},
+) {
+  if (opts.desktop && opts.flowId) {
+    setDesktopExchangeError(opts.flowId, {
+      message,
+      code: "missing_credentials",
+    });
+    return oauthDesktopExchangePage("Returning to Calendar...");
+  }
+  if (opts.redirect) {
+    return oauthErrorPage(message);
+  }
+  setResponseStatus(event, 422);
+  return {
+    error: "missing_credentials",
+    message,
+  };
+}
+
 export const getGoogleAuthUrl = defineEventHandler(async (event: H3Event) => {
   try {
     const q = getQuery(event);
@@ -195,6 +239,7 @@ export const getGoogleAuthUrl = defineEventHandler(async (event: H3Event) => {
     }
     const session = await getSession(event);
     const owner = session?.email;
+    const orgId = session?.orgId;
     const desktop =
       isElectron(event) || q.desktop === "1" || q.desktop === "true";
     const flowId = desktop ? (q.flow_id as string) || undefined : undefined;
@@ -204,13 +249,13 @@ export const getGoogleAuthUrl = defineEventHandler(async (event: H3Event) => {
       : resolveGoogleSignInCredentials();
 
     if (!credentials) {
-      setResponseStatus(event, 422);
-      return {
-        error: "missing_credentials",
-        message: calendarConnect
+      return missingCredentialsResponse(
+        event,
+        calendarConnect
           ? "Google Calendar OAuth credentials are not configured. Save GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in settings."
           : "Google sign-in credentials are not configured. Set GOOGLE_SIGN_IN_CLIENT_ID and GOOGLE_SIGN_IN_CLIENT_SECRET.",
-      };
+        { desktop, flowId, redirect: q.redirect === "1" },
+      );
     }
 
     if (calendarConnect && !owner) {
@@ -226,9 +271,10 @@ export const getGoogleAuthUrl = defineEventHandler(async (event: H3Event) => {
     const returnUrl = requestedReturn !== "/" ? requestedReturn : undefined;
     // Use the named-arg overload — the positional form previously passed
     // `flowId` in the `returnUrl` slot, breaking desktop completion.
-    const state = encodeOAuthState({
+    const state = encodeCalendarOAuthState({
       redirectUri,
       owner,
+      orgId,
       desktop,
       addAccount: calendarConnect,
       app: OAUTH_STATE_APP_ID,
@@ -237,7 +283,7 @@ export const getGoogleAuthUrl = defineEventHandler(async (event: H3Event) => {
     });
 
     const url = calendarConnect
-      ? await getAuthUrl(undefined, redirectUri, state, owner)
+      ? await getAuthUrl(undefined, redirectUri, state, owner, orgId)
       : `${GOOGLE_AUTH_URL}?${new URLSearchParams({
           client_id: credentials.clientId,
           redirect_uri: redirectUri,
@@ -293,6 +339,7 @@ export const handleGoogleCallback = defineEventHandler(
       }
 
       const { redirectUri, owner: stateOwner, addAccount, returnUrl } = state;
+      const stateOrgId = getCalendarOAuthStateOrgId(state);
 
       // 1. Resolve owner (needs session context, before exchangeCode)
       const { owner, hasProductionSession } = await resolveOAuthOwner(
@@ -330,7 +377,13 @@ export const handleGoogleCallback = defineEventHandler(
       }
 
       // 2. Exchange code with Google (template-specific Calendar connect)
-      const email = await exchangeCode(code, undefined, redirectUri, owner);
+      const email = await exchangeCode(
+        code,
+        undefined,
+        redirectUri,
+        owner,
+        stateOrgId,
+      );
 
       // 3. Create session token (after we have the email)
       // Skip for add-account flows — adding a second account must not switch
@@ -372,16 +425,18 @@ export const getGoogleAddAccountUrl = defineEventHandler(
       setResponseStatus(event, 401);
       return { error: "Must be logged in to add an account" };
     }
+    const q = getQuery(event);
+    const desktop =
+      isElectron(event) || q.desktop === "1" || q.desktop === "true";
+    const flowId = desktop ? (q.flow_id as string) || undefined : undefined;
     if (!(await resolveCalendarOAuthCredentials(event))) {
-      setResponseStatus(event, 422);
-      return {
-        error: "missing_credentials",
-        message:
-          "Google OAuth credentials are not configured. Save GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in settings.",
-      };
+      return missingCredentialsResponse(
+        event,
+        "Google OAuth credentials are not configured. Save GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in settings.",
+        { desktop, flowId, redirect: q.redirect === "1" },
+      );
     }
     try {
-      const q = getQuery(event);
       const redirectUri = resolveOAuthRedirectUri(event);
       if (!redirectUri) {
         setResponseStatus(event, 400);
@@ -390,12 +445,10 @@ export const getGoogleAddAccountUrl = defineEventHandler(
           message: "redirect_uri must stay on this app's _agent-native routes.",
         };
       }
-      const desktop =
-        isElectron(event) || q.desktop === "1" || q.desktop === "true";
-      const flowId = desktop ? (q.flow_id as string) || undefined : undefined;
-      const state = encodeOAuthState({
+      const state = encodeCalendarOAuthState({
         redirectUri,
         owner: session.email,
+        orgId: session.orgId,
         desktop,
         addAccount: true,
         app: OAUTH_STATE_APP_ID,
@@ -406,6 +459,7 @@ export const getGoogleAddAccountUrl = defineEventHandler(
         redirectUri,
         state,
         session.email,
+        session.orgId,
       );
       if (q.redirect === "1") {
         return oauthRedirectResponse(url);
@@ -449,6 +503,7 @@ export const handleGoogleAddAccountCallback = defineEventHandler(
       }
 
       const { redirectUri, owner: stateOwner } = state;
+      const stateOrgId = getCalendarOAuthStateOrgId(state);
 
       const ownerEmail = session?.email || stateOwner;
       if (!ownerEmail) {
@@ -466,6 +521,7 @@ export const handleGoogleAddAccountCallback = defineEventHandler(
         undefined,
         redirectUri,
         ownerEmail,
+        session?.orgId ?? stateOrgId,
       );
 
       return oauthCallbackResponse(event, addedEmail, {
@@ -486,7 +542,7 @@ export const handleGoogleAddAccountCallback = defineEventHandler(
 export const getGoogleStatus = defineEventHandler(async (event: H3Event) => {
   try {
     const session = await getSession(event);
-    return await getAuthStatus(session?.email);
+    return await getAuthStatus(session?.email, session?.orgId);
   } catch (error: any) {
     setResponseStatus(event, 500);
     return { error: error.message };
@@ -506,7 +562,7 @@ export const disconnectGoogle = defineEventHandler(async (event: H3Event) => {
       setResponseStatus(event, 400);
       return { error: "email is required" };
     }
-    const owned = await getAuthStatus(session.email);
+    const owned = await getAuthStatus(session.email, session.orgId);
     const isOwned = owned.accounts.some((a) => a.email === targetEmail);
     if (!isOwned) {
       setResponseStatus(event, 403);

package/corpus/templates/calendar/server/lib/google-calendar.ts

@@ -7,6 +7,7 @@ import {
 import {
   isOAuthConnected,
   getOAuthAccounts,
+  getRequestOrgId,
   resolveSecret,
   runWithRequestContext,
 } from "@agent-native/core/server";
@@ -61,9 +62,9 @@ function optionalString(value: unknown): string | undefined {
   return typeof value === "string" && value.length > 0 ? value : undefined;
 }
 
-async function getOAuth2Credentials(owner?: string) {
+async function getOAuth2Credentials(owner?: string, orgId?: string) {
   const credentials = (
-    await resolveGoogleProviderCredentialCandidates(owner)
+    await resolveGoogleProviderCredentialCandidates(owner, orgId)
   )[0];
   if (!credentials) {
     throw new Error(
@@ -73,8 +74,11 @@ async function getOAuth2Credentials(owner?: string) {
   return credentials;
 }
 
-async function getOAuth2RefreshCredentials(owner?: string) {
-  const candidates = await resolveGoogleProviderCredentialCandidates(owner);
+async function getOAuth2RefreshCredentials(owner?: string, orgId?: string) {
+  const candidates = await resolveGoogleProviderCredentialCandidates(
+    owner,
+    orgId,
+  );
   if (!candidates.length) {
     throw new Error(
       "GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET must be saved in settings",
@@ -97,6 +101,7 @@ async function readCredentialPair(
 
 async function resolveGoogleProviderCredentialCandidates(
   owner?: string,
+  orgId?: string,
 ): Promise<GoogleOAuthCredentials[]> {
   const resolve = async () => {
     const primary = await readCredentialPair(
@@ -111,8 +116,9 @@ async function resolveGoogleProviderCredentialCandidates(
     if (!legacy || legacy.clientId === primary.clientId) return [primary];
     return [primary, legacy];
   };
+  const resolvedOrgId = orgId ?? getRequestOrgId();
   return owner
-    ? runWithRequestContext({ userEmail: owner }, resolve)
+    ? runWithRequestContext({ userEmail: owner, orgId: resolvedOrgId }, resolve)
     : await resolve();
 }
 
@@ -359,6 +365,7 @@ async function getValidAccessToken(
   accountId: string,
   tokens: GoogleTokens,
   owner?: string,
+  orgId?: string,
 ): Promise<string> {
   // Check if token is expired (with 5-minute buffer)
   if (tokens.expiry_date && tokens.expiry_date < Date.now() + 5 * 60 * 1000) {
@@ -375,7 +382,7 @@ async function getValidAccessToken(
       for (const {
         clientId,
         clientSecret,
-      } of await getOAuth2RefreshCredentials(owner)) {
+      } of await getOAuth2RefreshCredentials(owner, orgId)) {
         try {
           const oauth2 = createOAuth2Client(clientId, clientSecret, "");
           const newTokens = await oauth2.refreshToken(tokens.refresh_token);
@@ -420,8 +427,9 @@ export async function getAuthUrl(
   redirectUri?: string,
   state?: string,
   owner?: string,
+  orgId?: string,
 ): Promise<string> {
-  const { clientId, clientSecret } = await getOAuth2Credentials(owner);
+  const { clientId, clientSecret } = await getOAuth2Credentials(owner, orgId);
   const uri =
     redirectUri ||
     (origin ? `${origin}/_agent-native/google/callback` : undefined);
@@ -439,8 +447,9 @@ export async function exchangeCode(
   origin?: string,
   redirectUri?: string,
   owner?: string,
+  orgId?: string,
 ): Promise<string> {
-  const { clientId, clientSecret } = await getOAuth2Credentials(owner);
+  const { clientId, clientSecret } = await getOAuth2Credentials(owner, orgId);
   const uri =
     redirectUri ||
     (origin ? `${origin}/_agent-native/google/callback` : undefined);
@@ -621,6 +630,7 @@ export async function getPrimaryAccountPhotoUrl(
 
 export async function getAuthStatus(
   forEmail?: string,
+  orgId?: string,
 ): Promise<GoogleAuthStatus> {
   const oauthAccounts = await getOAuthAccounts("google", forEmail);
 
@@ -642,6 +652,7 @@ export async function getAuthStatus(
         account.accountId,
         tokens,
         forEmail,
+        orgId,
       );
       tokenValid = true;
       photoUrl = await resolveAccountPhotoUrl(accessToken, photoUrl);

package/corpus/templates/design/actions/apply-design-token-edit.ts

@@ -10,7 +10,11 @@ import {
   INLINE_DEFAULT_CAPABILITIES,
   hasCapability,
 } from "../shared/design-source-capabilities.js";
-import { resolveTweaksToCssVars } from "../shared/resolve-tweaks.js";
+import {
+  isSafeCssTokenValue,
+  isSafeCssVarName,
+  resolveTweaksToCssVars,
+} from "../shared/resolve-tweaks.js";
 
 // ---------------------------------------------------------------------------
 // Token-edit patch schema (mirrors preview-design-token-edit)
@@ -23,17 +27,20 @@ const tokenEditSchema = z.object({
     .startsWith("--")
     // The token name is spliced raw into a `:root { … }` rule, so constrain it
     // to a safe CSS custom-property ident (leading "--" plus ident chars only).
-    .regex(
-      /^--[-_a-zA-Z0-9]+$/,
+    .refine(
+      isSafeCssVarName,
       "cssVar must be a valid CSS custom property name (-- followed by letters, digits, hyphens, or underscores).",
     )
     .describe("CSS custom property to edit"),
   /** New value string, e.g. "#3B82F6" or "0.75rem". */
   value: z
     .string()
-    // The value is spliced raw into the `:root { … }` block; reject characters
-    // that could terminate the rule (`}`) or break out of a `<style>` (`<`).
-    .refine((v) => !/[}<]/.test(v), 'Token value may not contain "}" or "<".')
+    // The value is rendered into CSS custom-property declarations; reject
+    // declaration terminators and style-tag breakout characters.
+    .refine(
+      isSafeCssTokenValue,
+      'Token value may not contain ";", "{", "}", "<", ">", CSS comments, or control characters.',
+    )
     .describe("New value for the token"),
 });
 

package/corpus/templates/design/actions/import-design-tokens.ts

@@ -17,7 +17,11 @@ import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
-import { resolveTweaksToCssVars } from "../shared/resolve-tweaks.js";
+import {
+  isSafeCssTokenValue,
+  isSafeCssVarName,
+  resolveTweaksToCssVars,
+} from "../shared/resolve-tweaks.js";
 
 type ImportedTokenType =
   | "color"
@@ -174,10 +178,6 @@ function normalizeValue(value: string): string {
     .trim();
 }
 
-function isSafeTokenValue(value: string): boolean {
-  return value.length > 0 && value.length <= 300 && !/[}<]/.test(value);
-}
-
 function tokenVar(prefix: string, key: string): string {
   if (key.startsWith("--")) return key;
   const stem = toKebab(key);
@@ -224,7 +224,7 @@ function parseNamedLines(
 
       const label = match[1].replace(/\*\*/g, "").trim();
       const value = normalizeValue(match[2]);
-      if (!isSafeTokenValue(value)) continue;
+      if (!isSafeCssTokenValue(value)) continue;
 
       const lower = label.toLowerCase();
       let cssVar: string | null = null;
@@ -261,7 +261,7 @@ function uniqueTokenList(tokens: ImportedDesignToken[]): ImportedDesignToken[] {
 
   for (const token of tokens) {
     if (!/^--[-_a-zA-Z0-9]+$/.test(token.cssVar)) continue;
-    if (!isSafeTokenValue(token.value)) continue;
+    if (!isSafeCssTokenValue(token.value)) continue;
     const previous = byVar.get(token.cssVar);
     byVar.set(token.cssVar, token);
     if (!previous && !/^--color-imported-\d+$/.test(token.cssVar)) {
@@ -404,7 +404,11 @@ export default defineAction({
     }
 
     const { filesAnalyzed, tokens } = tokensFromFiles(importFiles);
-    if (tokens.length === 0) {
+    const safeTokens = tokens.filter(
+      (token) =>
+        isSafeCssVarName(token.cssVar) && isSafeCssTokenValue(token.value),
+    );
+    if (safeTokens.length === 0) {
       return {
         designId,
         source,
@@ -452,7 +456,7 @@ export default defineAction({
         : {};
     const nextSelections = { ...prevSelections };
 
-    for (const token of tokens) {
+    for (const token of safeTokens) {
       const tweakId = cssVarToTweakId.get(token.cssVar);
       nextSelections[tweakId ?? token.cssVar] = token.value;
     }
@@ -464,7 +468,7 @@ export default defineAction({
         ? (prevData.tokenImportSources as Record<string, string>)
         : {};
     const tokenImportSources = { ...previousSources };
-    for (const token of tokens) {
+    for (const token of safeTokens) {
       tokenImportSources[token.cssVar] =
         token.source === "CSS variables" || token.source === "Colors"
           ? sourceLabel
@@ -484,7 +488,7 @@ export default defineAction({
         {
           source,
           sourceLabel,
-          tokenCount: tokens.length,
+          tokenCount: safeTokens.length,
           filesAnalyzed,
           importedAt: now,
         },
@@ -500,10 +504,10 @@ export default defineAction({
     return {
       designId,
       source,
-      importedCount: tokens.length,
+      importedCount: safeTokens.length,
       skippedCount: importFiles.length - filesAnalyzed.length,
       filesAnalyzed,
-      tokens,
+      tokens: safeTokens,
       resolvedCssVars: resolveTweaksToCssVars(tweaks, nextSelections),
       deepLink: designDeepLink(designId),
     };

package/corpus/templates/design/actions/preview-design-token-edit.ts

@@ -3,7 +3,11 @@ import { resolveAccess } from "@agent-native/core/sharing";
 import { z } from "zod";
 
 import "../server/db/index.js"; // ensure registerShareableResource runs
-import { resolveTweaksToCssVars } from "../shared/resolve-tweaks.js";
+import {
+  isSafeCssTokenValue,
+  isSafeCssVarName,
+  resolveTweaksToCssVars,
+} from "../shared/resolve-tweaks.js";
 
 // ---------------------------------------------------------------------------
 // Token-edit patch schema
@@ -11,9 +15,22 @@ import { resolveTweaksToCssVars } from "../shared/resolve-tweaks.js";
 
 const tokenEditSchema = z.object({
   /** The CSS custom property to update, e.g. "--primary-color". */
-  cssVar: z.string().startsWith("--").describe("CSS custom property to edit"),
+  cssVar: z
+    .string()
+    .startsWith("--")
+    .refine(
+      isSafeCssVarName,
+      "cssVar must be a valid CSS custom property name (-- followed by letters, digits, hyphens, or underscores).",
+    )
+    .describe("CSS custom property to edit"),
   /** New value string, e.g. "#3B82F6" or "0.75rem". */
-  value: z.string().describe("New value for the token"),
+  value: z
+    .string()
+    .refine(
+      isSafeCssTokenValue,
+      'Token value may not contain ";", "{", "}", "<", ">", CSS comments, or control characters.',
+    )
+    .describe("New value for the token"),
 });
 
 // ---------------------------------------------------------------------------

package/corpus/templates/design/actions/run-design-audit.ts

@@ -196,13 +196,20 @@ export function checkTapTargets(html: string): A11yFinding[] {
   const findings: A11yFinding[] = [];
   // Heuristic: buttons/links with explicit tiny size classes (h-4, h-5, w-4, w-5, size-4, size-5)
   // and no explicit larger override or sr-only are flagged.
-  const interactivePattern = /<(?:button|a)\b[^>]*>/gi;
+  const interactivePattern =
+    /<(button|a|input|select|textarea)\b[^>]*(?:\/>|>)/gi;
   const tinyPattern = /\b(?:h|w|size)-[345]\b/;
   const largePattern = /\b(?:h|w|size)-(?:[6-9]|[1-9]\d)/;
   const srOnlyPattern = /\bsr-only\b/;
   let idx = 0;
   for (const m of html.matchAll(interactivePattern)) {
     const tag = m[0];
+    const tagName = (m[1] ?? "button").toLowerCase();
+    const typeMatch = tag.match(/\btype\s*=\s*(?:"([^"]*?)"|'([^']*?)')/i);
+    if (tagName === "input") {
+      const type = (typeMatch?.[1] ?? typeMatch?.[2] ?? "text").toLowerCase();
+      if (type === "hidden") continue;
+    }
     if (
       tinyPattern.test(tag) &&
       !largePattern.test(tag) &&
@@ -217,7 +224,7 @@ export function checkTapTargets(html: string): A11yFinding[] {
         detail:
           "Minimum recommended tap target size is 44×44 px (WCAG 2.5.5). Consider increasing padding or size.",
         nodeId: extractNodeId(tag),
-        selector: extractSelector(tag, "button"),
+        selector: extractSelector(tag, tagName),
         wcag: "2.5.5",
         fixAvailable: true,
       });

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

@@ -374,6 +374,8 @@ interface DesignCanvasProps {
   designTitle?: string;
   /** Stable id for comment pins, usually scoped to the active screen. */
   commentContextId?: string;
+  /** Stable id of the screen containing this canvas when rendered in overview. */
+  screenId?: string;
   /** Human-readable label for comment-pin prompts. */
   commentContextLabel?: string;
   /**
@@ -506,6 +508,7 @@ export function DesignCanvas({
   designId,
   designTitle,
   commentContextId,
+  screenId,
   commentContextLabel,
   onPrototypeNavigate,
   motionTracks,
@@ -1098,7 +1101,10 @@ export function DesignCanvas({
   const beginTextEdit = useCallback((nodeId: string) => {
     const iframe = iframeRef.current;
     if (!iframe?.contentWindow || !nodeId) return;
-    iframe.contentWindow.postMessage({ type: "begin-text-edit", nodeId }, "*");
+    iframe.contentWindow.postMessage(
+      { type: "begin-text-edit", nodeId, force: true },
+      "*",
+    );
   }, []);
 
   const sendStyleChange = useCallback(
@@ -1342,6 +1348,7 @@ export function DesignCanvas({
             : "allow-scripts allow-popups allow-popups-to-escape-sandbox allow-same-origin"
         }
         data-design-preview-iframe
+        data-screen-iframe-id={screenId ?? undefined}
         data-design-source-type={
           sourceType ??
           (externalPreviewUrl

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

@@ -1000,7 +1000,11 @@ function LayerRow({
   const hideable = node.hideable !== false && Boolean(onToggleHidden);
   const dragEligible = selectable && !node.locked && !node.hidden;
   const draggable = dragEligible && Boolean(onMoveLayer);
-  const canDropInside = layerCanDropInside(node, hasChildren);
+  const canDropInside = layerCanDropInside(
+    node,
+    hasChildren,
+    canAcceptChildren,
+  );
   const activeDrop =
     dropIndicator?.targetId === node.id ? dropIndicator.placement : null;
   // Tracks whether the user pressed Escape to cancel rename so that the
@@ -1868,9 +1872,14 @@ function ElementLayerGlyph({ className }: { className?: string }) {
   );
 }
 
-function layerCanDropInside(node: LayersPanelNode, hasChildren: boolean) {
+function layerCanDropInside(
+  node: LayersPanelNode,
+  hasChildren: boolean,
+  canAcceptChildren: boolean,
+) {
   return (
     hasChildren ||
+    canAcceptChildren ||
     Boolean(node.layout?.isFlexContainer || node.layout?.isGridContainer) ||
     node.type === "file" ||
     node.type === "screen" ||