@agent-native/core 0.79.16 → 0.79.18

package/corpus/templates/clips/server/lib/video-storage.ts

@@ -1,5 +1,8 @@
 import { listFileUploadProviders } from "@agent-native/core/file-upload";
-import { resolveHasBuilderPrivateKey } from "@agent-native/core/server";
+import {
+  resolveHasBuilderPrivateKey,
+  runWithRequestContext,
+} from "@agent-native/core/server";
 
 export const STORAGE_SETUP_REQUIRED_REASON =
   "Video storage is not connected yet. Connect Builder.io or configure S3-compatible storage to upload clips.";
@@ -22,16 +25,41 @@ export function requiresConfiguredVideoStorage(): boolean {
   return process.env.NODE_ENV === "production" || !isLikelyLocalDatabase();
 }
 
-export async function hasRequestVideoStorage(): Promise<boolean> {
-  for (const provider of listFileUploadProviders()) {
-    if (provider.id !== "builder" && provider.isConfigured()) return true;
-  }
+interface VideoStorageResolveContext {
+  userEmail?: string;
+  orgId?: string | null;
+}
+
+export async function hasRequestVideoStorage(
+  context?: VideoStorageResolveContext,
+): Promise<boolean> {
+  const resolve = async () => {
+    for (const provider of listFileUploadProviders()) {
+      if (provider.id === "builder") continue;
+      if (provider.isConfigured()) return true;
+      if (provider.isConfiguredForRequest) {
+        try {
+          if (await provider.isConfiguredForRequest()) return true;
+        } catch {
+          // Treat a failed scoped lookup as not configured.
+        }
+      }
+    }
+
+    try {
+      return await resolveHasBuilderPrivateKey();
+    } catch {
+      return false;
+    }
+  };
 
-  try {
-    return await resolveHasBuilderPrivateKey();
-  } catch {
-    return false;
+  if (context?.userEmail) {
+    return runWithRequestContext(
+      { userEmail: context.userEmail, orgId: context.orgId ?? undefined },
+      resolve,
+    );
   }
+  return resolve();
 }
 
 export async function shouldRejectVideoUploadWithoutStorage(): Promise<boolean> {

package/corpus/templates/clips/server/routes/api/agent-transcript.json.get.ts

@@ -20,6 +20,7 @@ import {
   loadAgentTranscript,
   loadPublicAgentAccess,
   queryString,
+  transcriptStatusInstructions,
 } from "../../lib/public-agent-context.js";
 
 export default defineEventHandler(async (event: H3Event) => {
@@ -58,6 +59,7 @@ export default defineEventHandler(async (event: H3Event) => {
     },
     apis: {
       context: { method: "GET", url: api.contextUrl },
+      transcript: { method: "GET", url: api.transcriptUrl },
       ...(isLoomEmbedBacked
         ? {}
         : {
@@ -70,9 +72,12 @@ export default defineEventHandler(async (event: H3Event) => {
     transcript: {
       status: transcript?.status ?? "missing",
       language: transcript?.language ?? null,
+      failureReason: transcript?.failureReason ?? null,
+      retryAfterSeconds: transcript?.status === "pending" ? 15 : null,
       fullText: transcript?.fullText ?? "",
       segments: agentSegments,
       segmentCount: agentSegments.length,
     },
+    instructions: transcriptStatusInstructions(transcript),
   };
 });

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

@@ -9,7 +9,6 @@ import { useHeaderTitle, useHeaderActions } from "./HeaderActions";
 
 const pageTitles: Record<string, string> = {
   "/": "Content",
-  "/team": "Team",
 };
 
 function resolveTitle(pathname: string): string {

package/corpus/templates/content/app/components/sidebar/NotionButton.tsx

@@ -191,6 +191,7 @@ export function NotionButton() {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
+          scope: "workspace",
           vars: [
             { key: "NOTION_CLIENT_ID", value: clientId },
             { key: "NOTION_CLIENT_SECRET", value: clientSecret },

package/corpus/templates/content/app/routes/_app.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";
@@ -23,65 +24,63 @@ export default function SettingsRoute() {
 
   return (
     <div className="flex-1 overflow-auto">
-      <main className="mx-auto w-full max-w-3xl space-y-6 px-4 py-6 sm:px-8 sm:py-10">
-        <div className="space-y-1">
-          <h1 className="text-2xl font-bold tracking-tight">
-            {t("settings.title")}
-          </h1>
-          <p className="text-sm leading-6 text-muted-foreground">
-            {t("settings.description")}
-          </p>
-        </div>
-
-        <section className="rounded-lg border border-border bg-card p-5">
-          <div className="space-y-1">
-            <h2 className="text-base font-semibold">
-              {t("settings.languageTitle")}
-            </h2>
+      <SettingsTabsPage
+        teamLabel={t("team.pageTitle")}
+        general={
+          <main className="mx-auto w-full max-w-3xl space-y-6">
             <p className="text-sm leading-6 text-muted-foreground">
-              {t("settings.languageDescription")}
+              {t("settings.description")}
             </p>
-          </div>
-          <div className="mt-4 max-w-xs space-y-1.5">
-            <Label>{t("settings.languageLabel")}</Label>
-            <LanguagePicker label={t("settings.languageLabel")} />
-          </div>
-        </section>
 
-        <section className="rounded-lg border border-border bg-card p-5">
-          <div className="space-y-1">
-            <h2 className="text-base font-semibold">
-              {t("settings.workspaceTitle")}
-            </h2>
-            <p className="text-sm leading-6 text-muted-foreground">
-              {t("settings.workspaceDescription")}
-            </p>
-          </div>
-          <Button className="mt-4" variant="outline" asChild>
-            <Link to="/team">{t("settings.openTeamSettings")}</Link>
-          </Button>
-        </section>
+            <section className="rounded-lg border border-border bg-card p-5">
+              <div className="space-y-1">
+                <h2 className="text-base font-semibold">
+                  {t("settings.languageTitle")}
+                </h2>
+                <p className="text-sm leading-6 text-muted-foreground">
+                  {t("settings.languageDescription")}
+                </p>
+              </div>
+              <div className="mt-4 max-w-xs space-y-1.5">
+                <Label>{t("settings.languageLabel")}</Label>
+                <LanguagePicker label={t("settings.languageLabel")} />
+              </div>
+            </section>
 
-        <section className="rounded-lg border border-border bg-card p-5">
-          <div className="space-y-1">
-            <h2 className="text-base font-semibold">
-              {t("settings.agentTitle")}
-            </h2>
-            <p className="text-sm leading-6 text-muted-foreground">
-              {t("settings.agentDescription")}
-            </p>
+            <section className="rounded-lg border border-border bg-card p-5">
+              <div className="space-y-1">
+                <h2 className="text-base font-semibold">
+                  {t("settings.agentTitle")}
+                </h2>
+                <p className="text-sm leading-6 text-muted-foreground">
+                  {t("settings.agentDescription")}
+                </p>
+              </div>
+              <Button
+                className="mt-4"
+                variant="outline"
+                onClick={() => openAgentSettings()}
+              >
+                {t("settings.openAgentSettings")}
+              </Button>
+            </section>
+          </main>
+        }
+        team={
+          <div className="mx-auto w-full max-w-3xl">
+            <TeamPage
+              showTitle={false}
+              createOrgDescription={t("team.createOrgDescription")}
+              className="max-w-3xl"
+            />
           </div>
-          <Button
-            className="mt-4"
-            variant="outline"
-            onClick={() => openAgentSettings()}
-          >
-            {t("settings.openAgentSettings")}
-          </Button>
-        </section>
-
-        <ChangelogSettingsCard markdown={changelog} />
-      </main>
+        }
+        whatsNew={
+          <div className="mx-auto w-full max-w-3xl">
+            <ChangelogSettingsCard markdown={changelog} />
+          </div>
+        }
+      />
     </div>
   );
 }

package/corpus/templates/content/app/routes/_app.team.tsx

@@ -1,7 +1,5 @@
-import { useT } from "@agent-native/core/client";
-import { TeamPage } from "@agent-native/core/client/org";
+import { Navigate } from "react-router";
 
-import { useSetPageTitle } from "@/components/layout/HeaderActions";
 import { messagesByLocale } from "@/i18n-data";
 
 export function meta() {
@@ -9,29 +7,5 @@ export function meta() {
 }
 
 export default function TeamRoute() {
-  const t = useT();
-  useSetPageTitle(
-    <h1 className="text-lg font-semibold tracking-tight truncate">
-      {t("team.pageTitle")}
-    </h1>,
-  );
-  return (
-    <div className="flex-1 overflow-auto">
-      <div className="mx-auto w-full max-w-3xl px-4 py-6 sm:px-8">
-        <div className="mb-6 space-y-1">
-          <h2 className="text-2xl font-bold tracking-tight">
-            {t("team.heading")}
-          </h2>
-          <p className="text-sm text-muted-foreground">
-            {t("team.description")}
-          </p>
-        </div>
-        <TeamPage
-          title={t("team.peopleTitle")}
-          createOrgDescription={t("team.createOrgDescription")}
-          className="max-w-3xl"
-        />
-      </div>
-    </div>
-  );
+  return <Navigate to="/settings#team" replace />;
 }

package/corpus/templates/content/server/lib/notion.ts

@@ -5,7 +5,11 @@ import {
   listOAuthAccountsByOwner,
   saveOAuthTokens,
 } from "@agent-native/core/oauth-tokens";
-import { getSession, runWithRequestContext } from "@agent-native/core/server";
+import {
+  getSession,
+  resolveSecret,
+  runWithRequestContext,
+} from "@agent-native/core/server";
 import { assertAccess } from "@agent-native/core/sharing";
 import { createError, type H3Event } from "h3";
 
@@ -87,12 +91,31 @@ function decodeState(stateParam: string | undefined): Record<string, string> {
   }
 }
 
-function notionBasicAuthHeader(): string {
-  const clientId = process.env.NOTION_CLIENT_ID;
-  const clientSecret = process.env.NOTION_CLIENT_SECRET;
+async function resolveNotionOAuthCredentials(event: H3Event): Promise<{
+  clientId: string;
+  clientSecret: string;
+} | null> {
+  const session = await getSession(event).catch(() => null);
+  return runWithRequestContext(
+    { userEmail: session?.email, orgId: session?.orgId },
+    async () => {
+      const [clientId, clientSecret] = await Promise.all([
+        resolveSecret("NOTION_CLIENT_ID"),
+        resolveSecret("NOTION_CLIENT_SECRET"),
+      ]);
+      if (!clientId || !clientSecret) return null;
+      return { clientId, clientSecret };
+    },
+  );
+}
+
+async function notionBasicAuthHeader(event: H3Event): Promise<string> {
+  const credentials = await resolveNotionOAuthCredentials(event);
+  const clientId = credentials?.clientId;
+  const clientSecret = credentials?.clientSecret;
   if (!clientId || !clientSecret) {
     throw new Error(
-      "Notion OAuth credentials are not configured. Set NOTION_CLIENT_ID and NOTION_CLIENT_SECRET.",
+      "Notion OAuth credentials are not configured. Save NOTION_CLIENT_ID and NOTION_CLIENT_SECRET in settings.",
     );
   }
   return `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString("base64")}`;
@@ -486,18 +509,27 @@ export async function disconnectNotionForOwner(owner: string) {
   return deleted;
 }
 
-export function buildNotionAuthUrl(event: H3Event, redirectPath = "/"): string {
-  const clientId = process.env.NOTION_CLIENT_ID;
-  if (!clientId) {
+export async function hasNotionOAuthCredentials(
+  event: H3Event,
+): Promise<boolean> {
+  return !!(await resolveNotionOAuthCredentials(event));
+}
+
+export async function buildNotionAuthUrl(
+  event: H3Event,
+  redirectPath = "/",
+): Promise<string> {
+  const credentials = await resolveNotionOAuthCredentials(event);
+  if (!credentials?.clientId) {
     throw new Error(
-      "Notion OAuth credentials are not configured. Set NOTION_CLIENT_ID and NOTION_CLIENT_SECRET.",
+      "Notion OAuth credentials are not configured. Save NOTION_CLIENT_ID and NOTION_CLIENT_SECRET in settings.",
     );
   }
   const redirectUri = `${getOrigin(event)}/api/notion/callback`;
   const state = encodeState({ redirectPath });
   const params = new URLSearchParams({
     owner: "user",
-    client_id: clientId,
+    client_id: credentials.clientId,
     redirect_uri: redirectUri,
     response_type: "code",
     state,
@@ -518,7 +550,7 @@ export async function exchangeNotionCodeForTokens(
   const response = await fetch(`${NOTION_API_BASE}/oauth/token`, {
     method: "POST",
     headers: {
-      Authorization: notionBasicAuthHeader(),
+      Authorization: await notionBasicAuthHeader(event),
       "Content-Type": "application/json",
     },
     body: JSON.stringify({

package/corpus/templates/content/server/routes/api/notion/auth-url.get.ts

@@ -2,7 +2,7 @@ import { defineEventHandler, getQuery } from "h3";
 
 import { buildNotionAuthUrl } from "../../../lib/notion.js";
 
-export default defineEventHandler((event) => {
+export default defineEventHandler(async (event) => {
   const redirectPath = (getQuery(event).redirect as string) || "/";
-  return { url: buildNotionAuthUrl(event, redirectPath) };
+  return { url: await buildNotionAuthUrl(event, redirectPath) };
 });

package/corpus/templates/content/server/routes/api/notion/status.get.ts

@@ -4,6 +4,7 @@ import {
   buildNotionAuthUrl,
   getDocumentOwnerEmail,
   getNotionConnectionForOwner,
+  hasNotionOAuthCredentials,
 } from "../../../lib/notion.js";
 
 export default defineEventHandler(async (event) => {
@@ -21,14 +22,13 @@ export default defineEventHandler(async (event) => {
   }
 
   // Not connected — check what's available
-  const hasOAuthCredentials =
-    !!process.env.NOTION_CLIENT_ID && !!process.env.NOTION_CLIENT_SECRET;
+  const hasOAuthCredentials = await hasNotionOAuthCredentials(event);
 
   return {
     connected: false,
     workspaceName: null,
     workspaceId: null,
-    authUrl: hasOAuthCredentials ? buildNotionAuthUrl(event) : null,
+    authUrl: hasOAuthCredentials ? await buildNotionAuthUrl(event) : null,
     error: "missing_credentials" as const,
     mode: null,
   };

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

@@ -1,11 +1,13 @@
 import {
   SettingsPanel,
+  SettingsTabsPage,
   useDevMode,
   ChangelogSettingsCard,
   LanguagePicker,
   openAgentSettings,
   useT,
 } from "@agent-native/core/client";
+import { TeamPage } from "@agent-native/core/client/org";
 
 import {
   Card,
@@ -29,45 +31,65 @@ export default function SettingsRoute() {
 
   return (
     <div className="flex h-full min-h-0 flex-col overflow-y-auto bg-background">
-      <SettingsPanel
-        isDevMode={isDevMode}
-        onToggleDevMode={() => setDevMode(!isDevMode)}
-        showDevToggle={canToggle}
+      <SettingsTabsPage
+        general={
+          <>
+            <SettingsPanel
+              isDevMode={isDevMode}
+              onToggleDevMode={() => setDevMode(!isDevMode)}
+              showDevToggle={canToggle}
+            />
+            <div className="mx-auto w-full max-w-2xl px-4 pb-8">
+              <Card className="mb-6">
+                <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 className="mb-6">
+                <CardHeader>
+                  <CardTitle className="text-base">
+                    {t("settings.agentTitle")}
+                  </CardTitle>
+                  <CardDescription>
+                    {t("settings.agentDescription")}
+                  </CardDescription>
+                </CardHeader>
+                <CardContent>
+                  <button
+                    type="button"
+                    className="inline-flex h-9 items-center justify-center rounded-md border border-input bg-background px-3 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground"
+                    onClick={() => openAgentSettings()}
+                  >
+                    {t("settings.openAgentSettings")}
+                  </button>
+                </CardContent>
+              </Card>
+            </div>
+          </>
+        }
+        team={
+          <div className="mx-auto w-full max-w-3xl">
+            <TeamPage
+              showTitle={false}
+              createOrgDescription={t("pages.teamCreateOrgDescription")}
+            />
+          </div>
+        }
+        whatsNew={
+          <div className="mx-auto w-full max-w-2xl">
+            <ChangelogSettingsCard markdown={changelog} />
+          </div>
+        }
       />
-      <div className="mx-auto w-full max-w-2xl px-4 pb-8">
-        <Card className="mb-6">
-          <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 className="mb-6">
-          <CardHeader>
-            <CardTitle className="text-base">
-              {t("settings.agentTitle")}
-            </CardTitle>
-            <CardDescription>{t("settings.agentDescription")}</CardDescription>
-          </CardHeader>
-          <CardContent>
-            <button
-              type="button"
-              className="inline-flex h-9 items-center justify-center rounded-md border border-input bg-background px-3 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground"
-              onClick={() => openAgentSettings()}
-            >
-              {t("settings.openAgentSettings")}
-            </button>
-          </CardContent>
-        </Card>
-        <ChangelogSettingsCard markdown={changelog} />
-      </div>
     </div>
   );
 }

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

@@ -1,5 +1,4 @@
-import { useT } from "@agent-native/core/client";
-import { TeamPage } from "@agent-native/core/client/org";
+import { Navigate } from "react-router";
 
 import { messagesByLocale } from "@/i18n-data";
 
@@ -8,12 +7,5 @@ export function meta() {
 }
 
 export default function TeamRoute() {
-  const t = useT();
-  return (
-    <div className="flex-1 overflow-y-auto">
-      <main className="mx-auto max-w-6xl px-4 py-6 sm:px-6 sm:py-10">
-        <TeamPage createOrgDescription={t("pages.teamCreateOrgDescription")} />
-      </main>
-    </div>
-  );
+  return <Navigate to="/settings#team" replace />;
 }

package/corpus/templates/dispatch/app/hooks/use-navigation-state.ts

@@ -166,7 +166,7 @@ function resolveView(
   if (pathname.startsWith("/audit")) return "audit";
   if (pathname.startsWith("/dreams")) return "dreams";
   if (pathname.startsWith("/thread-debug")) return "thread-debug";
-  if (pathname.startsWith("/team")) return "team";
+  if (pathname.startsWith("/team")) return "settings";
   return "overview";
 }
 
@@ -216,7 +216,7 @@ function resolvePath(
     case "threads":
       return "/thread-debug";
     case "team":
-      return "/team";
+      return "/settings#team";
     case "extensions":
       return command?.extensionId
         ? `/extensions/${encodeURIComponent(command.extensionId)}`