@agent-native/core 0.84.55 → 0.84.57

package/corpus/templates/clips/app/components/player/share-dialog.tsx

@@ -1,6 +1,6 @@
 import {
-  appBasePath,
   appPath,
+  useActionMutation,
   useActionQuery,
   useSession,
   useT,
@@ -38,7 +38,6 @@ import {
 import { Switch } from "@/components/ui/switch";
 import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
 
-import { buildAgentApiUrls } from "../../../shared/agent-context";
 import { isLoomEmbedUrl } from "../../../shared/loom";
 import { withShareAttribution } from "../../../shared/share-attribution";
 
@@ -284,46 +283,27 @@ function LinkTab({
     (data?.visibility as Visibility | null) ?? "private";
   const isPublic = visibility === "public";
   const isLoomRecording = isLoomRecordingProp || isLoomEmbedUrl(videoUrl);
-  const publicAgentContextUrl =
-    typeof window === "undefined"
-      ? ""
-      : buildAgentApiUrls(recordingId, {
-          origin: window.location.origin,
-          basePath: appBasePath(),
-        }).contextUrl;
-  const [tokenizedAgentContextUrl, setTokenizedAgentContextUrl] = useState("");
+  const createAgentLink = useActionMutation(
+    "create-recording-agent-link" as any,
+  );
+  const [agentContextUrl, setAgentContextUrl] = useState("");
 
   useEffect(() => {
-    if (!isPublic || !hasPassword || typeof window === "undefined") {
-      setTokenizedAgentContextUrl("");
-      return;
-    }
-
-    let cancelled = false;
-    async function loadTokenizedAgentContextUrl() {
-      setTokenizedAgentContextUrl("");
-      const res = await fetch(publicAgentContextUrl, {
-        credentials: "include",
-      }).catch(() => null);
-      if (!res?.ok) return;
-      const payload = await res.json().catch(() => null);
-      const contextUrl =
-        typeof payload?.apis?.context?.url === "string"
-          ? payload.apis.context.url
-          : "";
-      if (!cancelled) setTokenizedAgentContextUrl(contextUrl);
-    }
-
-    void loadTokenizedAgentContextUrl();
-    return () => {
-      cancelled = true;
-    };
-  }, [hasPassword, isPublic, publicAgentContextUrl]);
-
-  const agentContextUrl = hasPassword
-    ? tokenizedAgentContextUrl
-    : publicAgentContextUrl;
-  const agentShareDisabled = isPending || !isPublic || !agentContextUrl;
+    setAgentContextUrl("");
+  }, [recordingId, visibility]);
+
+  async function handleCreateAgentLink() {
+    if (createAgentLink.isPending) return;
+    const result = (await createAgentLink.mutateAsync({
+      recordingId,
+    })) as { url?: string };
+    if (!result?.url) return;
+    setAgentContextUrl(result.url);
+    copyToClipboard(result.url);
+  }
+
+  const agentShareDisabled =
+    isPending || createAgentLink.isPending || !agentContextUrl;
   const agentPrompt = agentContextUrl
     ? t("shareDialog.agentPrompt", { agentContextUrl })
     : "";
@@ -348,11 +328,28 @@ function LinkTab({
           (and a connect link) instead of leaving it buried in Settings. */}
       {isPublic ? <SlackShareHint canManage={canManage} /> : null}
 
-      <CopyField
-        label={t("shareDialog.shareWithAgents")}
-        value={agentContextUrl}
-        disabled={agentShareDisabled}
-      />
+      <div className="space-y-2">
+        <div className="flex items-end justify-between gap-2">
+          <div className="text-xs font-medium text-muted-foreground">
+            {t("shareDialog.shareWithAgents")}
+          </div>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            className="h-7"
+            onClick={() => void handleCreateAgentLink()}
+            disabled={isPending || createAgentLink.isPending}
+          >
+            {t("shareUi.copy")}
+          </Button>
+        </div>
+        <CopyField
+          label=""
+          value={agentContextUrl}
+          disabled={agentShareDisabled}
+        />
+      </div>
 
       <CopyField
         label={t("shareDialog.copyAgentPrompt")}
@@ -360,7 +357,7 @@ function LinkTab({
         disabled={agentShareDisabled}
       />
 
-      {isPublic && hasPassword ? (
+      {agentContextUrl || hasPassword || !isPublic ? (
         <p className="text-xs text-muted-foreground">
           {t("shareDialog.agentTokenDescription")}
         </p>

package/corpus/templates/clips/app/components/sharing/share-ui.tsx

@@ -270,9 +270,11 @@ export function CopyField({
   };
   return (
     <div>
-      <div className="mb-1 text-xs font-medium text-muted-foreground">
-        {label}
-      </div>
+      {label ? (
+        <div className="mb-1 text-xs font-medium text-muted-foreground">
+          {label}
+        </div>
+      ) : null}
       <div className="flex items-stretch gap-2">
         <Input
           readOnly

package/corpus/templates/clips/app/i18n/ar-SA.ts

@@ -419,7 +419,7 @@ const messages = {
     agentPrompt:
       "اجلب عنوان URL لسياق وكيل Clips هذا: {{agentContextUrl}}. استخدم transcript.segments للسياق المنطوق، واجلب recommendedFrames أو عناوين URL الخاصة بواجهة API للإطارات لرؤية الشاشة، وتحقق من browserDiagnostics إن وجدت لسجلات وحدة التحكم المنقحة وبيانات طلبات fetch/XHR الوصفية.",
     agentTokenDescription:
-      "يستخدم هذا الوكيل URL رمزًا مميزًا قصير العمر، بحيث يمكن للعملاء قراءة المقطع دون الكشف عن كلمة المرور.",
+      "يسمح URL المؤقت هذا للوكلاء بقراءة المقطع دون جعله عاما. تنتهي صلاحيته بعد ساعتين.",
     gifPreview: "معاينة GIF",
     openPlayer: "مشغل مفتوح",
     downloadMp4: "تحميل MP4",

package/corpus/templates/clips/app/i18n/de-DE.ts

@@ -436,7 +436,7 @@ const messages = {
     agentPrompt:
       "Rufe diese Clips-Agent-Kontext-URL ab: {{agentContextUrl}}. Verwende transcript.segments fuer den gesprochenen Kontext, rufe recommendedFrames oder die Frame-API-URLs ab, um den Bildschirm zu sehen, und pruefe browserDiagnostics, falls vorhanden, fuer redigierte Konsolenprotokolle und fetch/XHR-Anfragemetadaten.",
     agentTokenDescription:
-      "Dieser Agent URL verwendet ein kurzlebiges Token, sodass Agenten den Clip lesen können, ohne das Passwort preiszugeben.",
+      "Diese temporare Agent-URL lasst Agenten den Clip lesen, ohne ihn offentlich zu machen. Sie lauft nach zwei Stunden ab.",
     gifPreview: "GIF-Vorschau",
     openPlayer: "Spieler öffnen",
     downloadMp4: "Laden Sie MP4 herunter",

package/corpus/templates/clips/app/i18n/en-US.ts

@@ -419,7 +419,7 @@ const messages = {
     agentPrompt:
       "Fetch this Clips agent context URL: {{agentContextUrl}}. Use transcript.segments for spoken context, fetch recommendedFrames or the frame API URLs to see the screen, and check browserDiagnostics if present for redacted console logs and fetch/XHR request metadata.",
     agentTokenDescription:
-      "This agent URL uses a short-lived token, so agents can read the clip without exposing the password.",
+      "This temporary agent URL lets agents read the clip without making it public. It expires after two hours.",
     gifPreview: "GIF preview",
     openPlayer: "Open player",
     downloadMp4: "Download MP4",

package/corpus/templates/clips/app/i18n/es-ES.ts

@@ -431,7 +431,7 @@ const messages = {
     agentPrompt:
       "Obtén esta URL de contexto para agentes de Clips: {{agentContextUrl}}. Usa transcript.segments para el contexto hablado, obtén recommendedFrames o las URLs de la API de fotogramas para ver la pantalla y revisa browserDiagnostics si está presente para ver registros de consola redactados y metadatos de solicitudes fetch/XHR.",
     agentTokenDescription:
-      "Este agente URL utiliza un token de corta duración, por lo que los agentes pueden leer el clip sin exponer la contraseña.",
+      "Esta URL temporal para agentes permite leer el clip sin hacerlo publico. Caduca en dos horas.",
     gifPreview: "vista previa de GIF",
     openPlayer: "jugador abierto",
     downloadMp4: "Descargar MP4",

package/corpus/templates/clips/app/i18n/fr-FR.ts

@@ -431,7 +431,7 @@ const messages = {
     agentPrompt:
       "Récupère cette URL de contexte Clips pour agent : {{agentContextUrl}}. Utilise transcript.segments pour le contexte parlé, récupère recommendedFrames ou les URLs de l'API d'images pour voir l'écran, et consulte browserDiagnostics s'il est présent pour les journaux de console expurgés et les métadonnées de requêtes fetch/XHR.",
     agentTokenDescription:
-      "Cet agent URL utilise un jeton de courte durée, afin que les agents puissent lire le clip sans exposer le mot de passe.",
+      "Cette URL temporaire pour agents permet de lire le clip sans le rendre public. Elle expire dans deux heures.",
     gifPreview: "aperçu de GIF",
     openPlayer: "Joueur ouvert",
     downloadMp4: "Télécharger MP4",

package/corpus/templates/clips/app/i18n/hi-IN.ts

@@ -416,7 +416,7 @@ const messages = {
     agentPrompt:
       "यह Clips एजेंट संदर्भ URL प्राप्त करें: {{agentContextUrl}}। बोले गए संदर्भ के लिए transcript.segments का उपयोग करें, स्क्रीन देखने के लिए recommendedFrames या फ्रेम API URL प्राप्त करें, और यदि browserDiagnostics मौजूद हो तो संशोधित कंसोल लॉग और fetch/XHR अनुरोध मेटाडेटा जांचें।",
     agentTokenDescription:
-      "यह एजेंट URL एक अल्पकालिक टोकन का उपयोग करता है, ताकि एजेंट पासवर्ड उजागर किए बिना क्लिप पढ़ सकें।",
+      "यह अस्थायी एजेंट URL क्लिप को सार्वजनिक किए बिना एजेंटों को इसे पढ़ने देता है। यह दो घंटे बाद समाप्त हो जाता है।",
     gifPreview: "GIF पूर्वावलोकन",
     openPlayer: "खुला खिलाड़ी",
     downloadMp4: "MP4 डाउनलोड करें",

package/corpus/templates/clips/app/i18n/ja-JP.ts

@@ -428,7 +428,7 @@ const messages = {
     agentPrompt:
       "この Clips エージェントコンテキスト URL を取得してください: {{agentContextUrl}}。音声の文脈には transcript.segments を使い、画面を見るために recommendedFrames またはフレーム API URL を取得し、browserDiagnostics がある場合は、編集済みのコンソールログと fetch/XHR リクエストのメタデータを確認してください。",
     agentTokenDescription:
-      "このエージェント URL は有効期間の短いトークンを使用するため、エージェントはパスワードを公開せずにクリップを読み取ることができます。",
+      "この一時的なエージェント URL により、クリップを公開せずにエージェントが読み取れます。2 時間後に期限切れになります。",
     gifPreview: "GIF プレビュー",
     openPlayer: "プレーヤーを開く",
     downloadMp4: "ダウンロード",

package/corpus/templates/clips/app/i18n/ko-KR.ts

@@ -421,7 +421,7 @@ const messages = {
     agentPrompt:
       "이 Clips 에이전트 컨텍스트 URL을 가져오세요: {{agentContextUrl}}. 말한 내용의 맥락은 transcript.segments를 사용하고, 화면을 보기 위해 recommendedFrames 또는 프레임 API URL을 가져오며, browserDiagnostics가 있으면 수정된 콘솔 로그와 fetch/XHR 요청 메타데이터를 확인하세요.",
     agentTokenDescription:
-      "이 에이전트 URL는 수명이 짧은 토큰을 사용하므로 에이전트는 비밀번호를 노출하지 않고도 클립을 읽을 수 있습니다.",
+      "이 임시 에이전트 URL을 사용하면 클립을 공개하지 않고도 에이전트가 읽을 수 있습니다. 2시간 후 만료됩니다.",
     gifPreview: "GIF 미리보기",
     openPlayer: "플레이어 열기",
     downloadMp4: "MP4 다운로드",

package/corpus/templates/clips/app/i18n/pt-BR.ts

@@ -429,7 +429,7 @@ const messages = {
     agentPrompt:
       "Busque esta URL de contexto para agentes do Clips: {{agentContextUrl}}. Use transcript.segments para o contexto falado, busque recommendedFrames ou as URLs da API de quadros para ver a tela e confira browserDiagnostics, se presente, para logs de console redigidos e metadados de solicitações fetch/XHR.",
     agentTokenDescription:
-      "Este agente URL usa um token de curta duração, para que os agentes possam ler o clipe sem expor a senha.",
+      "Esta URL temporaria para agentes permite ler o clipe sem torna-lo publico. Ela expira em duas horas.",
     gifPreview: "visualização de GIF",
     openPlayer: "Jogador aberto",
     downloadMp4: "Baixar MP4",

package/corpus/templates/clips/app/i18n/zh-CN.ts

@@ -403,7 +403,7 @@ const messages = {
     agentPrompt:
       "获取这个 Clips 代理上下文 URL：{{agentContextUrl}}。使用 transcript.segments 读取语音上下文，获取 recommendedFrames 或帧 API URL 来查看屏幕，并在 browserDiagnostics 存在时检查经过脱敏的控制台日志和 fetch/XHR 请求元数据。",
     agentTokenDescription:
-      "该代理 URL 使用短期令牌，因此代理可以在不暴露密码的情况下读取剪辑。",
+      "这个临时代理 URL 可让代理读取剪辑，而无需将其设为公开。它会在两小时后过期。",
     gifPreview: "GIF 预览",
     openPlayer: "开放玩家",
     downloadMp4: "下载MP4",

package/corpus/templates/clips/app/i18n/zh-TW.ts

@@ -403,7 +403,7 @@ const messages = {
     agentPrompt:
       "取得這個 Clips Agent 脈絡 URL：{{agentContextUrl}}。使用 transcript.segments 讀取語音脈絡，取得 recommendedFrames 或影格 API URL 來查看螢幕，並在 browserDiagnostics 存在時檢查已遮蔽的主控台記錄和 fetch/XHR 請求中繼資料。",
     agentTokenDescription:
-      "此 Agent URL 使用短期權杖，因此 Agent 可以在不暴露密碼的情況下讀取剪輯。",
+      "這個臨時 Agent URL 可讓 Agent 讀取剪輯，而不必將其設為公開。它會在兩小時後過期。",
     gifPreview: "GIF 預覽",
     openPlayer: "開啟播放器",
     downloadMp4: "下載 MP4",

package/corpus/templates/clips/app/routes/share.$shareId.tsx

@@ -11,6 +11,7 @@ import {
 import {
   getRequestUserEmail,
   signShortLivedToken,
+  verifyShortLivedToken,
 } from "@agent-native/core/server";
 import { resolveAccess } from "@agent-native/core/sharing";
 import {
@@ -32,7 +33,12 @@ import {
   useState,
   type ReactNode,
 } from "react";
-import type { LoaderFunctionArgs, MetaFunction } from "react-router";
+import {
+  data,
+  type HeadersArgs,
+  type LoaderFunctionArgs,
+  type MetaFunction,
+} from "react-router";
 import { useLoaderData, useNavigate, useParams } from "react-router";
 
 import { CaptureInstallButton } from "@/components/capture-install-options";
@@ -65,7 +71,12 @@ import { parsePlaybackSpeed } from "@/lib/playback-speed";
 import { isStorageSetupFailureReason } from "@/lib/storage-failures";
 
 import { getDb, schema } from "../../server/db";
-import { buildAgentApiUrls, safeJsonForHtml } from "../../shared/agent-context";
+import { CLIPS_AGENT_ACCESS_PARAM } from "../../server/lib/public-agent-context";
+import {
+  agentAccessTokenResourceId,
+  buildAgentApiUrls,
+  safeJsonForHtml,
+} from "../../shared/agent-context";
 import {
   isLoomEmbedBackedRecording,
   isLoomRecordingSource,
@@ -99,6 +110,34 @@ type SharePageLoaderData = {
   shareUrl: string | null;
 };
 
+const PRIVATE_AGENT_SHARE_HEADERS = {
+  "Cache-Control": "private, max-age=0, no-store",
+  "Referrer-Policy": "no-referrer",
+};
+
+function emptyLoaderData(url: URL): SharePageLoaderData {
+  return {
+    recording: null,
+    agentContextUrl: null,
+    origin: url.origin,
+    shareUrl: null,
+  };
+}
+
+function shareLoaderData(
+  payload: SharePageLoaderData,
+  privateAgentAccess = false,
+) {
+  if (!privateAgentAccess) return payload;
+  return data(payload, {
+    headers: PRIVATE_AGENT_SHARE_HEADERS,
+  });
+}
+
+export function headers({ loaderHeaders }: HeadersArgs) {
+  return loaderHeaders;
+}
+
 function failureDetail(reason: string | null | undefined): string | null {
   const trimmed = reason?.trim();
   if (!trimmed) return null;
@@ -132,13 +171,7 @@ function shouldShowGeneratedTitleSkeleton(
 
 export async function loader({ params, url }: LoaderFunctionArgs) {
   const id = params.shareId;
-  if (!id)
-    return {
-      recording: null,
-      agentContextUrl: null,
-      origin: url.origin,
-      shareUrl: null,
-    };
+  if (!id) return emptyLoaderData(url);
 
   const [rec] = await getDb()
     .select({
@@ -151,6 +184,7 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
       status: schema.recordings.status,
       ownerEmail: schema.recordings.ownerEmail,
       password: schema.recordings.password,
+      expiresAt: schema.recordings.expiresAt,
       archivedAt: schema.recordings.archivedAt,
       trashedAt: schema.recordings.trashedAt,
     })
@@ -158,24 +192,25 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
     .where(eq(schema.recordings.id, id))
     .limit(1);
 
-  if (!rec)
-    return {
-      recording: null,
-      agentContextUrl: null,
-      origin: url.origin,
-      shareUrl: null,
-    };
+  const agentAccessToken = url.searchParams.get(CLIPS_AGENT_ACCESS_PARAM) ?? "";
+  const hasAgentAccessToken = Boolean(agentAccessToken);
+  const tokenGrantsAgentAccess = agentAccessToken
+    ? verifyShortLivedToken(agentAccessToken, agentAccessTokenResourceId(id)).ok
+    : false;
+
+  if (!rec) return shareLoaderData(emptyLoaderData(url), hasAgentAccessToken);
+
+  if (rec.expiresAt) {
+    const expires = new Date(rec.expiresAt).getTime();
+    if (Number.isFinite(expires) && expires < Date.now()) {
+      return shareLoaderData(emptyLoaderData(url), hasAgentAccessToken);
+    }
+  }
 
-  if (rec.visibility !== "public") {
+  if (rec.visibility !== "public" && !tokenGrantsAgentAccess) {
     const userEmail = getRequestUserEmail();
     const access = userEmail ? await resolveAccess("recording", id) : null;
-    if (!access)
-      return {
-        recording: null,
-        agentContextUrl: null,
-        origin: url.origin,
-        shareUrl: null,
-      };
+    if (!access) return emptyLoaderData(url);
   }
 
   const recording: SharePageMetaRecording = {
@@ -190,29 +225,37 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
     trashedAt: rec.trashedAt,
   };
   const canExposeAgentContext =
-    rec.visibility === "public" && !rec.archivedAt && !rec.trashedAt;
-  const token =
-    canExposeAgentContext &&
-    rec.password &&
-    getRequestUserEmail() === rec.ownerEmail
-      ? signShortLivedToken({ resourceId: id })
+    (rec.visibility === "public" || tokenGrantsAgentAccess) &&
+    !rec.archivedAt &&
+    !rec.trashedAt;
+  const token = tokenGrantsAgentAccess
+    ? agentAccessToken
+    : canExposeAgentContext &&
+        rec.password &&
+        getRequestUserEmail() === rec.ownerEmail
+      ? signShortLivedToken({ resourceId: agentAccessTokenResourceId(id) })
       : undefined;
   const canExposeAnonymousAgentContext = canExposeAgentContext && !rec.password;
   const canExposeOwnerAgentContext = canExposeAgentContext && Boolean(token);
-  return {
-    recording,
-    origin: url.origin,
-    shareUrl: `${url.origin}${url.pathname}`,
-    agentContextUrl:
-      canExposeAnonymousAgentContext || canExposeOwnerAgentContext
-        ? buildAgentApiUrls(id, {
-            origin: url.origin,
-            basePath:
-              process.env.VITE_APP_BASE_PATH || process.env.APP_BASE_PATH || "",
-            token,
-          }).contextUrl
-        : null,
-  };
+  return shareLoaderData(
+    {
+      recording,
+      origin: url.origin,
+      shareUrl: `${url.origin}${url.pathname}`,
+      agentContextUrl:
+        canExposeAnonymousAgentContext || canExposeOwnerAgentContext
+          ? buildAgentApiUrls(id, {
+              origin: url.origin,
+              basePath:
+                process.env.VITE_APP_BASE_PATH ||
+                process.env.APP_BASE_PATH ||
+                "",
+              token,
+            }).contextUrl
+          : null,
+    },
+    hasAgentAccessToken || canExposeOwnerAgentContext,
+  );
 }
 
 export const meta: MetaFunction<typeof loader> = ({ loaderData }) => {
@@ -273,7 +316,7 @@ function AgentDiscovery({
         {t("sharePage.agentReadableContext")}
       </a>
       <script
-        type="application/json"
+        type="application/agent-native+json"
         id="clips-agent-context"
         dangerouslySetInnerHTML={{ __html: safeJsonForHtml(payload) }}
       />
@@ -362,9 +405,17 @@ export default function ShareRoute() {
     [],
   );
   const [downloading, setDownloading] = useState(false);
+  const agentAccessToken = useMemo(() => {
+    if (typeof window === "undefined") return "";
+    return (
+      new URLSearchParams(window.location.search).get(
+        CLIPS_AGENT_ACCESS_PARAM,
+      ) ?? ""
+    );
+  }, []);
 
   const dataQ = useQuery({
-    queryKey: ["public-recording", shareId, password],
+    queryKey: ["public-recording", shareId, password, agentAccessToken],
     queryFn: async () => {
       const url = new URL(
         `${appBasePath()}/api/public-recording`,
@@ -372,6 +423,9 @@ export default function ShareRoute() {
       );
       url.searchParams.set("id", shareId ?? "");
       if (password) url.searchParams.set("password", password);
+      if (agentAccessToken) {
+        url.searchParams.set(CLIPS_AGENT_ACCESS_PARAM, agentAccessToken);
+      }
       const res = await fetch(url.toString());
       const data = await res.json().catch(() => ({}));
       return { ok: res.ok, status: res.status, data };

package/corpus/templates/clips/changelog/2026-07-02-private-recordings-can-be-shared-with-agents-through-temporary-links-without-making-them-public.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-07-02
+---
+
+Private recordings can be shared with agents through temporary links without making them public.

package/corpus/templates/clips/server/lib/public-agent-context.ts

@@ -9,6 +9,7 @@ import { asc, eq } from "drizzle-orm";
 import { getRequestURL, setResponseHeader, type H3Event } from "h3";
 
 import {
+  agentAccessTokenResourceId,
   buildAgentApiUrls,
   buildRecommendedFrames,
   CLIP_AGENT_CONTEXT_VERSION,
@@ -53,6 +54,8 @@ export type PublicAgentAccessResult =
   | { ok: false; failure: PublicAgentFailure };
 
 const DEFAULT_MAX_AGENT_FRAME_MEDIA_BYTES = 200 * 1024 * 1024;
+export const CLIPS_AGENT_ACCESS_PARAM = "agent_access";
+export const CLIPS_AGENT_ACCESS_TTL_SECONDS = 2 * 60 * 60;
 
 function sameOwnerEmail(
   a: string | null | undefined,
@@ -207,8 +210,20 @@ export async function loadPublicAgentAccess(
   const viewerIsOwner = Boolean(
     session?.email && sameOwnerEmail(session.email, recording.ownerEmail),
   );
+  const suppliedToken = options.token ?? "";
+  const tokenAccess = suppliedToken
+    ? verifyShortLivedToken(
+        suppliedToken,
+        agentAccessTokenResourceId(recording.id),
+      )
+    : null;
+  const tokenAllowsAgentAccess = Boolean(tokenAccess?.ok);
 
-  if (recording.visibility !== "public" && !viewerIsOwner) {
+  if (
+    recording.visibility !== "public" &&
+    !viewerIsOwner &&
+    !tokenAllowsAgentAccess
+  ) {
     return {
       ok: false,
       failure: { status: 404, body: { error: "Not found" } },
@@ -229,26 +244,22 @@ export async function loadPublicAgentAccess(
   }
 
   let apiToken: string | null = null;
+  if (tokenAllowsAgentAccess) {
+    apiToken = suppliedToken;
+  }
   if (
     recording.password &&
     recording.visibility === "public" &&
     viewerIsOwner
   ) {
-    apiToken = signShortLivedToken({ resourceId: recording.id });
+    apiToken = signShortLivedToken({
+      resourceId: agentAccessTokenResourceId(recording.id),
+    });
   }
 
   if (recording.password && !viewerIsOwner) {
-    const suppliedToken = options.token ?? "";
     const suppliedPassword = options.password ?? "";
-    let allowed = false;
-
-    if (suppliedToken) {
-      const result = verifyShortLivedToken(suppliedToken, recording.id);
-      if (result.ok) {
-        allowed = true;
-        apiToken = suppliedToken;
-      }
-    }
+    let allowed = tokenAllowsAgentAccess;
 
     if (
       !allowed &&
@@ -256,7 +267,9 @@ export async function loadPublicAgentAccess(
       verifySharePassword(suppliedPassword, recording.password)
     ) {
       allowed = true;
-      apiToken = signShortLivedToken({ resourceId: recording.id });
+      apiToken = signShortLivedToken({
+        resourceId: agentAccessTokenResourceId(recording.id),
+      });
     }
 
     if (!allowed) {

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

@@ -23,6 +23,7 @@ import {
   loadPublicAgentAccess,
   parseAgentChapters,
   queryString,
+  CLIPS_AGENT_ACCESS_PARAM,
 } from "../../lib/public-agent-context.js";
 
 export default defineEventHandler(async (event: H3Event) => {
@@ -32,7 +33,7 @@ export default defineEventHandler(async (event: H3Event) => {
   const id = queryString(query.id);
   const accessResult = await loadPublicAgentAccess(event, id, {
     password: queryString(query.password),
-    token: queryString(query.t),
+    token: queryString(query[CLIPS_AGENT_ACCESS_PARAM]) || queryString(query.t),
   });
 
   if (!accessResult.ok) {

package/corpus/templates/clips/server/routes/api/agent-frame.jpg.get.ts

@@ -13,6 +13,7 @@ import {
 } from "h3";
 
 import {
+  CLIPS_AGENT_ACCESS_PARAM,
   loadPublicAgentAccess,
   loadRecordingMediaBytes,
   queryString,
@@ -95,7 +96,7 @@ export default defineEventHandler(async (event: H3Event) => {
   const id = queryString(query.id);
   const accessResult = await loadPublicAgentAccess(event, id, {
     password: queryString(query.password),
-    token: queryString(query.t),
+    token: queryString(query[CLIPS_AGENT_ACCESS_PARAM]) || queryString(query.t),
   });
 
   if (!accessResult.ok) {

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

@@ -16,6 +16,7 @@ import { buildAgentApiUrls } from "../../../shared/agent-context.js";
 import { isLoomEmbedBackedRecording } from "../../../shared/loom.js";
 import {
   applyAgentJsonHeaders,
+  CLIPS_AGENT_ACCESS_PARAM,
   getServerAppBasePath,
   loadAgentTranscript,
   loadPublicAgentAccess,
@@ -30,7 +31,7 @@ export default defineEventHandler(async (event: H3Event) => {
   const id = queryString(query.id);
   const accessResult = await loadPublicAgentAccess(event, id, {
     password: queryString(query.password),
-    token: queryString(query.t),
+    token: queryString(query[CLIPS_AGENT_ACCESS_PARAM]) || queryString(query.t),
   });
 
   if (!accessResult.ok) {

package/corpus/templates/clips/server/routes/api/public-recording.get.ts

@@ -26,7 +26,10 @@ import {
   type H3Event,
 } from "h3";
 
-import { buildAgentApiUrls } from "../../../shared/agent-context.js";
+import {
+  agentAccessTokenResourceId,
+  buildAgentApiUrls,
+} from "../../../shared/agent-context.js";
 import {
   normalizeTranscriptSegments,
   parseTranscriptSegments,
@@ -248,7 +251,9 @@ export default defineEventHandler(async (event) => {
     rec.visibility === "public" && !rec.archivedAt && !rec.trashedAt;
   const agentToken =
     canExposeAgentContext && rec.password
-      ? signShortLivedToken({ resourceId: recordingId })
+      ? signShortLivedToken({
+          resourceId: agentAccessTokenResourceId(recordingId),
+        })
       : undefined;
   const agentContextUrl = canExposeAgentContext
     ? buildAgentApiUrls(recordingId, {