@agent-native/core 0.79.16 → 0.79.18

package/corpus/templates/slides/server/lib/google-docs-oauth.ts

@@ -4,6 +4,10 @@ import {
   listOAuthAccountsByOwner,
   saveOAuthTokens,
 } from "@agent-native/core/oauth-tokens";
+import {
+  resolveSecret,
+  runWithRequestContext,
+} from "@agent-native/core/server";
 
 const TOKEN_URL = "https://oauth2.googleapis.com/token";
 const AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
@@ -35,42 +39,58 @@ interface GoogleOAuthCredentials {
   clientSecret: string;
 }
 
-function readCredentialPair(
+async function readCredentialPair(
   clientIdKey: string,
   clientSecretKey: string,
-): GoogleOAuthCredentials | null {
-  const clientId = process.env[clientIdKey];
-  const clientSecret = process.env[clientSecretKey];
+): Promise<GoogleOAuthCredentials | null> {
+  const [clientId, clientSecret] = await Promise.all([
+    resolveSecret(clientIdKey),
+    resolveSecret(clientSecretKey),
+  ]);
   if (!clientId || !clientSecret) return null;
   return { clientId, clientSecret };
 }
 
-function resolveGoogleProviderCredentialCandidates(): GoogleOAuthCredentials[] {
-  const primary = readCredentialPair(
-    "GOOGLE_CLIENT_ID",
-    "GOOGLE_CLIENT_SECRET",
-  );
-  const legacy = readCredentialPair(
-    "GOOGLE_LEGACY_CLIENT_ID",
-    "GOOGLE_LEGACY_CLIENT_SECRET",
-  );
-  if (!primary) return legacy ? [legacy] : [];
-  if (!legacy || legacy.clientId === primary.clientId) return [primary];
-  return [primary, legacy];
+async function resolveGoogleProviderCredentialCandidates(
+  owner?: string,
+): Promise<GoogleOAuthCredentials[]> {
+  const resolve = async () => {
+    const primary = await readCredentialPair(
+      "GOOGLE_CLIENT_ID",
+      "GOOGLE_CLIENT_SECRET",
+    );
+    const legacy = await readCredentialPair(
+      "GOOGLE_LEGACY_CLIENT_ID",
+      "GOOGLE_LEGACY_CLIENT_SECRET",
+    );
+    if (!primary) return legacy ? [legacy] : [];
+    if (!legacy || legacy.clientId === primary.clientId) return [primary];
+    return [primary, legacy];
+  };
+  return owner
+    ? runWithRequestContext({ userEmail: owner }, resolve)
+    : await resolve();
 }
 
-function getOAuthCredentials(): { clientId: string; clientSecret: string } {
-  const credentials = resolveGoogleProviderCredentialCandidates()[0];
+async function getOAuthCredentials(owner?: string): Promise<{
+  clientId: string;
+  clientSecret: string;
+}> {
+  const credentials = (
+    await resolveGoogleProviderCredentialCandidates(owner)
+  )[0];
   if (!credentials) {
     throw new Error(
-      "Google OAuth is not configured. Set GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET.",
+      "Google OAuth is not configured. Save GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in settings.",
     );
   }
   return credentials;
 }
 
-export function isGoogleDocsOAuthConfigured(): boolean {
-  return resolveGoogleProviderCredentialCandidates().length > 0;
+export async function isGoogleDocsOAuthConfigured(
+  owner?: string,
+): Promise<boolean> {
+  return (await resolveGoogleProviderCredentialCandidates(owner)).length > 0;
 }
 
 function isPermanentGoogleRefreshError(error: string | undefined): boolean {
@@ -81,29 +101,33 @@ function isPermanentGoogleRefreshError(error: string | undefined): boolean {
   );
 }
 
-export function getGooglePickerConfig(): {
+export async function getGooglePickerConfig(owner?: string): Promise<{
   apiKey: string | null;
   appId: string | null;
-} {
-  return {
+}> {
+  const resolve = async () => ({
     apiKey:
-      process.env.GOOGLE_PICKER_API_KEY ||
-      process.env.GOOGLE_API_KEY ||
+      (await resolveSecret("GOOGLE_PICKER_API_KEY")) ||
+      (await resolveSecret("GOOGLE_API_KEY")) ||
       process.env.VITE_GOOGLE_PICKER_API_KEY ||
       null,
     appId:
-      process.env.GOOGLE_PICKER_APP_ID ||
-      process.env.GOOGLE_PROJECT_NUMBER ||
+      (await resolveSecret("GOOGLE_PICKER_APP_ID")) ||
+      (await resolveSecret("GOOGLE_PROJECT_NUMBER")) ||
       process.env.VITE_GOOGLE_PICKER_APP_ID ||
       null,
-  };
+  });
+  return owner
+    ? runWithRequestContext({ userEmail: owner }, resolve)
+    : await resolve();
 }
 
-export function getGoogleDocsAuthUrl(
+export async function getGoogleDocsAuthUrl(
   redirectUri: string,
   state: string,
-): string {
-  const { clientId } = getOAuthCredentials();
+  owner?: string,
+): Promise<string> {
+  const { clientId } = await getOAuthCredentials(owner);
   const params = new URLSearchParams({
     client_id: clientId,
     redirect_uri: redirectUri,
@@ -134,7 +158,8 @@ async function refreshGoogleDocsToken(
     throw new Error("Google Docs connection expired. Please reconnect.");
   }
 
-  const credentialCandidates = resolveGoogleProviderCredentialCandidates();
+  const credentialCandidates =
+    await resolveGoogleProviderCredentialCandidates(owner);
   let data: {
     access_token?: string;
     expires_in?: number;
@@ -217,7 +242,7 @@ export async function exchangeGoogleDocsCode(opts: {
   redirectUri: string;
   owner: string;
 }): Promise<{ email: string; name?: string }> {
-  const { clientId, clientSecret } = getOAuthCredentials();
+  const { clientId, clientSecret } = await getOAuthCredentials(opts.owner);
   const response = await fetch(TOKEN_URL, {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded" },

package/corpus/templates/slides/server/register-secrets.ts

@@ -73,3 +73,63 @@ registerRequiredSecret({
     }
   },
 });
+
+registerRequiredSecret({
+  key: "GOOGLE_API_KEY",
+  label: "Google API Key",
+  description: "Required for image search with Google Custom Search.",
+  docsUrl: "https://console.cloud.google.com/apis/credentials",
+  scope: "user",
+  kind: "api-key",
+  required: false,
+});
+
+registerRequiredSecret({
+  key: "GOOGLE_SEARCH_CX",
+  label: "Google Search Engine ID",
+  description: "Required with GOOGLE_API_KEY for image search.",
+  docsUrl: "https://programmablesearchengine.google.com/controlpanel/all",
+  scope: "user",
+  kind: "api-key",
+  required: false,
+});
+
+registerRequiredSecret({
+  key: "GOOGLE_CLIENT_ID",
+  label: "Google OAuth Client ID",
+  description: "Required for Google Docs import.",
+  docsUrl: "https://console.cloud.google.com/apis/credentials",
+  scope: "user",
+  kind: "api-key",
+  required: false,
+});
+
+registerRequiredSecret({
+  key: "GOOGLE_CLIENT_SECRET",
+  label: "Google OAuth Client Secret",
+  description: "Required for Google Docs import.",
+  docsUrl: "https://console.cloud.google.com/apis/credentials",
+  scope: "user",
+  kind: "api-key",
+  required: false,
+});
+
+registerRequiredSecret({
+  key: "GOOGLE_PICKER_API_KEY",
+  label: "Google Picker API Key",
+  description: "Required for the Google Docs picker.",
+  docsUrl: "https://console.cloud.google.com/apis/credentials",
+  scope: "user",
+  kind: "api-key",
+  required: false,
+});
+
+registerRequiredSecret({
+  key: "GOOGLE_PICKER_APP_ID",
+  label: "Google Picker App ID",
+  description: "Required for the Google Docs picker.",
+  docsUrl: "https://console.cloud.google.com/apis/credentials",
+  scope: "user",
+  kind: "api-key",
+  required: false,
+});

package/corpus/templates/videos/actions/db-connect.ts

@@ -1,6 +1,3 @@
-import fs from "fs";
-import path from "path";
-
 function parseArgs(args: string[]): Record<string, string> {
   const result: Record<string, string> = {};
   for (let i = 0; i < args.length; i++) {
@@ -19,24 +16,6 @@ function parseArgs(args: string[]): Record<string, string> {
   return result;
 }
 
-function upsertEnvLine(lines: string[], key: string, value: string): string[] {
-  // Reject values with newlines, carriage returns, or null bytes
-  if (/[\r\n\0]/.test(value)) {
-    throw new Error(
-      `Invalid value for ${key}: must not contain newlines or null bytes`,
-    );
-  }
-
-  const idx = lines.findIndex((l) => l.startsWith(`${key}=`));
-  const line = `${key}=${value}`;
-  if (idx >= 0) {
-    lines[idx] = line;
-  } else {
-    lines.push(line);
-  }
-  return lines;
-}
-
 export default async function main(args: string[]) {
   const { url, token, help } = parseArgs(args);
 
@@ -44,7 +23,9 @@ export default async function main(args: string[]) {
     console.log(
       "Usage: pnpm action db-connect --url <DATABASE_URL> [--token <DATABASE_AUTH_TOKEN>]",
     );
-    console.log("\nWrites DATABASE_URL and DATABASE_AUTH_TOKEN to .env");
+    console.log(
+      "\nDATABASE_URL and DATABASE_AUTH_TOKEN are deployment-level settings.",
+    );
     return;
   }
 
@@ -53,31 +34,12 @@ export default async function main(args: string[]) {
     throw new Error("Script failed");
   }
 
-  const envPath = path.join(process.cwd(), ".env");
-  let lines: string[] = [];
-
-  if (fs.existsSync(envPath)) {
-    lines = fs.readFileSync(envPath, "utf8").split("\n");
-  }
-
-  try {
-    upsertEnvLine(lines, "DATABASE_URL", url);
-    if (token) {
-      upsertEnvLine(lines, "DATABASE_AUTH_TOKEN", token);
-    }
-  } catch (err) {
-    console.error(
-      `Error: ${err instanceof Error ? err.message : "Invalid value"}`,
-    );
-    throw new Error("Script failed");
-  }
-
-  fs.writeFileSync(envPath, lines.join("\n"));
-
-  console.log(`\nDatabase connection saved to .env`);
+  console.log(`\nDatabase connection not written locally`);
   console.log(
     `  DATABASE_URL=${url.startsWith("file:") ? url : url.replace(/\/\/.*@/, "//***@")}`,
   );
   if (token) console.log(`  DATABASE_AUTH_TOKEN=***`);
-  console.log(`\nRestart the dev server for changes to take effect.`);
+  console.log(
+    `\nConfigure these as deployment environment variables with your host, then redeploy.`,
+  );
 }

package/corpus/templates/videos/app/components/CloudUpgrade.tsx

@@ -1,4 +1,4 @@
-import { agentNativePath, useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client";
 import {
   IconX,
   IconCheck,
@@ -106,63 +106,20 @@ export function CloudUpgrade({
     connectingRef.current = true;
 
     if (!dbUrl.trim()) {
-      setErrorMsg("Database URL is required");
+      setErrorMsg(
+        "Database settings are deployment-level. Configure DATABASE_URL with your host and redeploy the app.",
+      );
       setStatus("error");
       connectingRef.current = false;
       return;
     }
 
     try {
-      setStatus("saving");
+      setStatus("error");
       setErrorMsg("");
-
-      const vars: Array<{ key: string; value: string }> = [
-        { key: "DATABASE_URL", value: dbUrl.trim() },
-      ];
-      if (authToken.trim()) {
-        vars.push({ key: "DATABASE_AUTH_TOKEN", value: authToken.trim() });
-      }
-
-      const saveRes = await fetch(agentNativePath("/_agent-native/env-vars"), {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ vars }),
-      });
-
-      if (!saveRes.ok) {
-        const data = await saveRes.json().catch(() => ({}));
-        throw new Error(data.error || "Failed to save credentials");
-      }
-
-      // Poll db-health until it returns ok
-      setStatus("polling");
-      let ok = false;
-      for (let i = 0; i < 30; i++) {
-        await new Promise((r) => setTimeout(r, 1000));
-        try {
-          const healthRes = await fetch(
-            agentNativePath("/_agent-native/actions/db-health"),
-          );
-          const health = await healthRes.json();
-          if (health.ok && health.local === false) {
-            ok = true;
-            break;
-          }
-        } catch {
-          // Keep polling
-        }
-      }
-
-      if (!ok) {
-        throw new Error(
-          "Database connection failed after 30 attempts. Check your credentials.",
-        );
-      }
-
-      setStatus("success");
-      setTimeout(() => {
-        window.location.reload();
-      }, 1500);
+      throw new Error(
+        "Database settings are deployment-level. Configure DATABASE_URL and DATABASE_AUTH_TOKEN with your host, redeploy, then check sharing again.",
+      );
     } catch (e) {
       setErrorMsg(
         e instanceof Error ? e.message : t("raw.cloud.connectionFailed"),

package/corpus/templates/videos/app/components/Sidebar.tsx

@@ -16,7 +16,6 @@ import {
   IconVideo,
   IconComponents,
   IconPalette,
-  IconUsers,
   IconFolderPlus,
 } from "@tabler/icons-react";
 import { useState, useEffect, useRef } from "react";
@@ -238,8 +237,7 @@ export function Sidebar({
       href: "/",
       active:
         !location.pathname.startsWith("/components") &&
-        !location.pathname.startsWith("/design-systems") &&
-        !location.pathname.startsWith("/team"),
+        !location.pathname.startsWith("/design-systems"),
     },
     {
       icon: IconComponents,
@@ -253,12 +251,6 @@ export function Sidebar({
       href: "/design-systems",
       active: location.pathname.startsWith("/design-systems"),
     },
-    {
-      icon: IconUsers,
-      labelKey: "navigation.team",
-      href: "/team",
-      active: location.pathname === "/team",
-    },
   ];
 
   return (

package/corpus/templates/videos/app/components/layout/Header.tsx

@@ -10,7 +10,6 @@ const pageTitleKeys: Record<string, string> = {
   "/": "header.videos",
   "/components": "header.components",
   "/design-systems": "header.designSystems",
-  "/team": "header.team",
   "/settings": "header.settings",
 };
 

package/corpus/templates/videos/app/components/layout/NavSidebar.tsx

@@ -11,7 +11,6 @@ import {
   IconComponents,
   IconPalette,
   IconSettings,
-  IconUsers,
 } from "@tabler/icons-react";
 import { Link, useLocation } from "react-router";
 
@@ -30,7 +29,6 @@ const navItems = [
     href: "/design-systems",
   },
   { icon: IconSettings, labelKey: "navigation.settings", href: "/settings" },
-  { icon: IconUsers, labelKey: "navigation.team", href: "/team" },
 ];
 
 export function NavSidebar() {
@@ -65,7 +63,6 @@ export function NavSidebar() {
               ? !location.pathname.startsWith("/components") &&
                 !location.pathname.startsWith("/design-systems") &&
                 !location.pathname.startsWith("/settings") &&
-                !location.pathname.startsWith("/team") &&
                 !location.pathname.startsWith("/extensions")
               : location.pathname.startsWith(item.href);
           return (

package/corpus/templates/videos/app/routes/settings.tsx

@@ -1,10 +1,11 @@
 import {
   ChangelogSettingsCard,
   LanguagePicker,
+  SettingsTabsPage,
   openAgentSettings,
   useT,
 } from "@agent-native/core/client";
-import { Link } from "react-router";
+import { TeamPage } from "@agent-native/core/client/org";
 
 import { useSetPageTitle } from "@/components/layout/HeaderActions";
 import { Button } from "@/components/ui/button";
@@ -29,60 +30,59 @@ export default function SettingsRoute() {
   useSetPageTitle(t("settings.title"));
 
   return (
-    <main className="mx-auto w-full max-w-3xl space-y-6 px-4 py-6 sm:px-6 sm:py-10">
-      <div className="space-y-1">
-        <h1 className="text-2xl font-semibold tracking-tight">
-          {t("settings.title")}
-        </h1>
-        <p className="text-sm leading-6 text-muted-foreground">
-          {t("settings.description")}
-        </p>
-      </div>
+    <SettingsTabsPage
+      teamLabel={t("navigation.team")}
+      general={
+        <div className="mx-auto w-full max-w-3xl space-y-6">
+          <p className="text-sm leading-6 text-muted-foreground">
+            {t("settings.description")}
+          </p>
 
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">
-            {t("settings.languageTitle")}
-          </CardTitle>
-          <CardDescription>{t("settings.languageDescription")}</CardDescription>
-        </CardHeader>
-        <CardContent className="max-w-xs space-y-1.5">
-          <Label>{t("settings.languageLabel")}</Label>
-          <LanguagePicker label={t("settings.languageLabel")} />
-        </CardContent>
-      </Card>
+          <Card>
+            <CardHeader>
+              <CardTitle className="text-base">
+                {t("settings.languageTitle")}
+              </CardTitle>
+              <CardDescription>
+                {t("settings.languageDescription")}
+              </CardDescription>
+            </CardHeader>
+            <CardContent className="max-w-xs space-y-1.5">
+              <Label>{t("settings.languageLabel")}</Label>
+              <LanguagePicker label={t("settings.languageLabel")} />
+            </CardContent>
+          </Card>
 
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">
-            {t("settings.workspaceTitle")}
-          </CardTitle>
-          <CardDescription>
-            {t("settings.workspaceDescription")}
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <Button variant="outline" asChild>
-            <Link to="/team">{t("settings.openTeamSettings")}</Link>
-          </Button>
-        </CardContent>
-      </Card>
-
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">
-            {t("settings.agentTitle")}
-          </CardTitle>
-          <CardDescription>{t("settings.agentDescription")}</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <Button variant="outline" onClick={() => openAgentSettings()}>
-            {t("settings.openAgentSettings")}
-          </Button>
-        </CardContent>
-      </Card>
-
-      <ChangelogSettingsCard markdown={changelog} />
-    </main>
+          <Card>
+            <CardHeader>
+              <CardTitle className="text-base">
+                {t("settings.agentTitle")}
+              </CardTitle>
+              <CardDescription>
+                {t("settings.agentDescription")}
+              </CardDescription>
+            </CardHeader>
+            <CardContent>
+              <Button variant="outline" onClick={() => openAgentSettings()}>
+                {t("settings.openAgentSettings")}
+              </Button>
+            </CardContent>
+          </Card>
+        </div>
+      }
+      team={
+        <div className="mx-auto w-full max-w-3xl">
+          <TeamPage
+            showTitle={false}
+            createOrgDescription="Set up a team to share compositions and animations with your colleagues."
+          />
+        </div>
+      }
+      whatsNew={
+        <div className="mx-auto w-full max-w-3xl">
+          <ChangelogSettingsCard markdown={changelog} />
+        </div>
+      }
+    />
   );
 }

package/corpus/templates/videos/app/routes/team.tsx

@@ -1,6 +1,5 @@
-import { TeamPage } from "@agent-native/core/client/org";
+import { Navigate } from "react-router";
 
-import { useSetPageTitle } from "@/components/layout/HeaderActions";
 import enUS from "@/i18n/en-US";
 
 export function meta() {
@@ -8,10 +7,5 @@ export function meta() {
 }
 
 export default function TeamRoute() {
-  useSetPageTitle("Team");
-  return (
-    <main className="max-w-3xl mx-auto px-4 sm:px-6 py-6 sm:py-10">
-      <TeamPage createOrgDescription="Set up a team to share compositions and animations with your colleagues." />
-    </main>
-  );
+  return <Navigate to="/settings#team" replace />;
 }

package/dist/agent/engine/builder-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder-engine.d.ts","sourceRoot":"","sources":["../../../src/agent/engine/builder-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAwBH,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,oBAAoB,EAAE,kBAMlC,CAAC;AAEF,eAAO,MAAM,wBAAwB,kNAAuC,CAAC;AAW7E,eAAO,MAAM,qBAAqB,qBAAoC,CAAC;AA+qBvE,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,WAAW,CAEb"}
+{"version":3,"file":"builder-engine.d.ts","sourceRoot":"","sources":["../../../src/agent/engine/builder-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAwBH,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,oBAAoB,EAAE,kBAMlC,CAAC;AAEF,eAAO,MAAM,wBAAwB,kNAAuC,CAAC;AAW7E,eAAO,MAAM,qBAAqB,qBAAoC,CAAC;AAorBvE,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,WAAW,CAEb"}

package/dist/agent/engine/builder-engine.js

@@ -68,11 +68,16 @@ function mapReasoningEffort(budgetTokens) {
  * `/app/organizations/Nicholas%20kipchumba%20Space/billing` which Builder's
  * router treats as unknown and silently bounces to `/app/projects`. The
  * Builder CLI-auth callback doesn't expose the org slug/id today, so we route
- * to the org-agnostic billing page — Builder resolves the active org from
- * session there and users with multiple orgs can switch from that screen.
+ * to the org-agnostic subscription page. Agent Native attribution lets Builder
+ * skip generic onboarding for new users who land there from an upgrade CTA.
  */
 async function buildUpgradeUrl() {
-    return "https://builder.io/account/billing";
+    const url = new URL("https://builder.io/account/subscription");
+    url.searchParams.set("signupSource", "agent-native");
+    url.searchParams.set("agentNativeConnectSource", "gateway_quota_upgrade");
+    url.searchParams.set("agentNativeFlow", "connect_llm");
+    url.searchParams.set("framework", "agent-native");
+    return url.toString();
 }
 class BuilderEngine {
     name = "builder";