@agent-native/core 0.157.2 → 0.157.4

package/corpus/templates/clips/app/routes/access-request.approve.tsx

@@ -0,0 +1,250 @@
+import { callAction, useSession } from "@agent-native/core/client/hooks";
+import { useT } from "@agent-native/core/client/i18n";
+import { buildSignInReturnHref } from "@agent-native/core/client/ui";
+import { IconAlertTriangle, IconCheck, IconLock } from "@tabler/icons-react";
+import { useEffect, useMemo, useState } from "react";
+import { Link, useSearchParams } from "react-router";
+
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";
+import enMessages from "@/i18n/en-US";
+
+import {
+  recordingAccessApprovalContinuationPath,
+  recordingAccessApprovalSessionKey,
+} from "../../shared/recording-link";
+
+interface ApprovalResult {
+  ok: true;
+  alreadyAllowed: boolean;
+  requesterEmail: string;
+  recordingId: string;
+  recordingTitle: string;
+  shareId: string;
+  message: string;
+}
+
+type ApprovalState =
+  | { kind: "loading" }
+  | { kind: "sign-in" }
+  | { kind: "success"; result: ApprovalResult }
+  | { kind: "error"; message: string };
+
+export function meta() {
+  return [{ title: enMessages.sharePage.privateClip }];
+}
+
+export default function ApproveRecordingAccessRequestRoute() {
+  const t = useT();
+  const [searchParams] = useSearchParams();
+  const { session, isLoading: sessionLoading } = useSession();
+  const recordingId = searchParams.get("recordingId") ?? "";
+  const approvalTokenFromUrl = searchParams.get("token") ?? "";
+  const approvalTokenStorageKey =
+    recordingAccessApprovalSessionKey(recordingId);
+  const [approvalToken, setApprovalToken] = useState(() => {
+    if (approvalTokenFromUrl) return approvalTokenFromUrl;
+    if (typeof window === "undefined" || !recordingId) return "";
+    try {
+      return sessionStorage.getItem(approvalTokenStorageKey) ?? "";
+    } catch {
+      // coercion-ok: unavailable tab storage is an absent continuation.
+      return "";
+    }
+  });
+  const [state, setState] = useState<ApprovalState>({ kind: "loading" });
+
+  useEffect(() => {
+    if (!recordingId) {
+      setApprovalToken("");
+      return;
+    }
+    if (!approvalTokenFromUrl) {
+      try {
+        setApprovalToken(sessionStorage.getItem(approvalTokenStorageKey) ?? "");
+      } catch {
+        setApprovalToken("");
+      }
+      return;
+    }
+    try {
+      sessionStorage.setItem(approvalTokenStorageKey, approvalTokenFromUrl);
+    } catch {
+      // coercion-ok: never fall back to putting the bearer token in the URL.
+      // Session storage may be unavailable in hardened browser contexts.
+    }
+    setApprovalToken(approvalTokenFromUrl);
+
+    // The email link must contain the capability, but it should not remain in
+    // the address bar or be copied into the sign-in continuation URL.
+    const params = new URLSearchParams(window.location.search);
+    params.delete("token");
+    const nextSearch = params.toString();
+    window.history.replaceState(
+      window.history.state,
+      "",
+      `${window.location.pathname}${nextSearch ? `?${nextSearch}` : ""}${window.location.hash}`,
+    );
+  }, [approvalTokenFromUrl, approvalTokenStorageKey, recordingId]);
+
+  const signInReturnTo = useMemo(() => {
+    return recordingAccessApprovalContinuationPath(recordingId);
+  }, [recordingId]);
+
+  useEffect(() => {
+    if (sessionLoading) return;
+
+    let cancelled = false;
+    if (!session?.email) {
+      setState({ kind: "sign-in" });
+      return () => {
+        cancelled = true;
+      };
+    }
+    if (!recordingId || !approvalToken) {
+      setState({
+        kind: "error",
+        message: t("sharePage.accessApprovalInvalid"),
+      });
+      return () => {
+        cancelled = true;
+      };
+    }
+
+    setState({ kind: "loading" });
+    void callAction<ApprovalResult>("approve-recording-access-request", {
+      recordingId,
+      approvalToken,
+    })
+      .then((result) => {
+        try {
+          sessionStorage.removeItem(approvalTokenStorageKey);
+        } catch {
+          // coercion-ok: cleanup failure cannot authorize or expose the token.
+          // Session storage may be unavailable in hardened browser contexts.
+        }
+        if (!cancelled) setState({ kind: "success", result });
+      })
+      .catch((error: unknown) => {
+        if (cancelled) return;
+        setState({
+          kind: "error",
+          message:
+            error instanceof Error
+              ? error.message
+              : t("sharePage.accessApprovalInvalid"),
+        });
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    approvalToken,
+    approvalTokenStorageKey,
+    recordingId,
+    session?.email,
+    sessionLoading,
+    t,
+  ]);
+
+  const signInHref = buildSignInReturnHref({ returnTo: signInReturnTo });
+
+  return (
+    <div className="flex min-h-screen items-center justify-center bg-background px-6 py-12 text-foreground">
+      <Card className="w-full max-w-md">
+        <CardHeader>
+          <CardTitle className="flex items-center gap-2">
+            <IconLock
+              className="size-5 text-muted-foreground"
+              aria-hidden="true"
+            />
+            {state.kind === "success"
+              ? state.result.alreadyAllowed
+                ? t("sharePage.accessApprovalAlreadyTitle")
+                : t("sharePage.accessApprovalTitle")
+              : state.kind === "error"
+                ? t("sharePage.accessApprovalErrorTitle")
+                : state.kind === "sign-in"
+                  ? t("sharePage.accessApprovalSignInTitle")
+                  : t("sharePage.accessApprovalLoading")}
+          </CardTitle>
+        </CardHeader>
+        <CardContent aria-live="polite">
+          {state.kind === "loading" ? (
+            <div className="space-y-3 py-2">
+              <Skeleton className="h-4 w-full" />
+              <Skeleton className="h-4 w-4/5" />
+            </div>
+          ) : state.kind === "sign-in" ? (
+            <div className="space-y-4">
+              <p className="text-sm text-muted-foreground">
+                {t("sharePage.accessApprovalSignInMessage")}
+              </p>
+              <Button asChild>
+                <a
+                  href={signInHref}
+                  onClick={() => {
+                    if (!approvalToken) return;
+                    try {
+                      sessionStorage.setItem(
+                        approvalTokenStorageKey,
+                        approvalToken,
+                      );
+                    } catch {
+                      // coercion-ok: never fall back to putting the bearer token in the URL.
+                      // Session storage may be unavailable in hardened browser contexts.
+                    }
+                  }}
+                >
+                  {t("sharePage.accessApprovalSignIn")}
+                </a>
+              </Button>
+            </div>
+          ) : state.kind === "error" ? (
+            <div className="space-y-4">
+              <div className="flex items-start gap-3 rounded-md border border-destructive/30 bg-destructive/10 p-3 text-sm text-destructive">
+                <IconAlertTriangle
+                  className="mt-0.5 size-4 shrink-0"
+                  aria-hidden="true"
+                />
+                <span>{state.message}</span>
+              </div>
+              {recordingId ? (
+                <Button asChild variant="outline">
+                  <Link to={`/r/${encodeURIComponent(recordingId)}`}>
+                    {t("sharePage.accessApprovalOpenClip")}
+                  </Link>
+                </Button>
+              ) : null}
+            </div>
+          ) : (
+            <div className="space-y-4">
+              <div className="flex items-start gap-3 rounded-md border border-primary/30 bg-primary/10 p-3 text-sm">
+                <IconCheck
+                  className="mt-0.5 size-4 shrink-0 text-primary"
+                  aria-hidden="true"
+                />
+                <span>
+                  {state.result.alreadyAllowed
+                    ? t("sharePage.accessApprovalAlreadyMessage", {
+                        email: state.result.requesterEmail,
+                      })
+                    : t("sharePage.accessApprovalMessage", {
+                        email: state.result.requesterEmail,
+                      })}
+                </span>
+              </div>
+              <Button asChild variant="outline">
+                <Link to={`/r/${encodeURIComponent(state.result.recordingId)}`}>
+                  {t("sharePage.accessApprovalOpenClip")}
+                </Link>
+              </Button>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}

package/corpus/templates/clips/app/routes/r.$recordingId.tsx

@@ -16,7 +16,7 @@ import {
   isHumanReadableDocumentTitle,
   normalizeDocumentTitle,
 } from "@agent-native/core/shared";
-import { ShareTrigger } from "@agent-native/toolkit/sharing";
+import { ShareCopyRow, ShareTrigger } from "@agent-native/toolkit/sharing";
 import {
   BUILDER_CREDITS_UPGRADE_URL,
   type BuilderCreditsStatus,
@@ -277,7 +277,6 @@ export default function RecordingPage() {
   const [processingTimeout, setProcessingTimeout] = useState(false);
   const [retryingFinalize, setRetryingFinalize] = useState(false);
   const [downloading, setDownloading] = useState(false);
-  const [pendingLinkCopied, setPendingLinkCopied] = useState(false);
   const browserTabId = useMemo(() => getBrowserTabId(), []);
   const recordingScope = useMemo(
     () =>
@@ -445,14 +444,6 @@ export default function RecordingPage() {
     if (!recordingId || typeof window === "undefined") return "";
     return recordingShareUrl(recordingId, shareViaId);
   }, [recordingId, shareViaId]);
-  const copyPendingShareLink = useCallback(async () => {
-    if (!pendingShareUrl) return;
-    // The full Share popover remains available when clipboard permission is
-    // unavailable, so a denied clipboard write does not block the page.
-    if (!(await writeClipboardText(pendingShareUrl))) return;
-    setPendingLinkCopied(true);
-    window.setTimeout(() => setPendingLinkCopied(false), 1400);
-  }, [pendingShareUrl]);
   useEffect(() => {
     if (!recording?.id) return;
     const now = Date.now();
@@ -1033,28 +1024,14 @@ export default function RecordingPage() {
                   />
                 </div>
               ) : null}
-              <div className="flex min-w-0 items-center gap-2 rounded-lg border border-border bg-muted/30 p-2 ps-3">
-                <div className="min-w-0 flex-1">
-                  <p className="text-[11px] font-medium text-muted-foreground">
-                    {t("shareDialog.shareLink")}
-                  </p>
-                  <p className="truncate text-sm text-foreground">
-                    {pendingShareUrl}
-                  </p>
-                </div>
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  className="shrink-0 gap-1.5"
-                  onClick={() => void copyPendingShareLink()}
-                >
-                  <IconClipboardCopy className="size-4" />
-                  {pendingLinkCopied
-                    ? t("bugReportRoute.copied")
-                    : t("shareUi.copy")}
-                </Button>
-              </div>
+              <ShareCopyRow
+                value={pendingShareUrl}
+                label={t("shareDialog.shareLink")}
+                copyLabel={t("shareUi.copy")}
+                copiedLabel={t("bugReportRoute.copied")}
+                onCopy={writeClipboardText}
+                className="rounded-lg border border-border bg-muted/30 p-2 ps-3"
+              />
             </div>
           </main>
         </div>

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

@@ -32,6 +32,7 @@ import {
   useMemo,
   useRef,
   useState,
+  type FormEvent,
   type ReactNode,
 } from "react";
 import {
@@ -55,6 +56,7 @@ import { RecordingOptionsMenu } from "@/components/player/delete-recording-menu"
 import { InsightsPanel } from "@/components/player/insights-panel";
 import { ReactionsTray } from "@/components/player/reactions-tray";
 import { RecordingViewsBadge } from "@/components/player/recording-views-badge";
+import { RequestAccessDialog } from "@/components/player/request-access-dialog";
 import { ShareRecordingPopover } from "@/components/player/share-dialog";
 import { SignInPromptDialog } from "@/components/player/sign-in-prompt-dialog";
 import { TranscriptPanel } from "@/components/player/transcript-panel";
@@ -97,6 +99,7 @@ import {
   CLIPS_ACCESS_REQUEST_TOKEN_TTL_SECONDS,
 } from "../../shared/recording-link";
 import {
+  buildShareContinuationQuery,
   buildSignupAttributionQuery,
   readShareAttribution,
 } from "../../shared/share-attribution";
@@ -242,14 +245,12 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
     if (!access) {
       const status = userEmail ? 403 : 401;
       const deniedData = emptyLoaderData(url, status);
-      if (userEmail) {
-        deniedData.accessRequestToken = signScopedAgentAccessToken({
-          resourceKind: CLIPS_ACCESS_REQUEST_TOKEN_PREFIX,
-          resourceId: id,
-          viewerEmail: userEmail,
-          ttlSeconds: CLIPS_ACCESS_REQUEST_TOKEN_TTL_SECONDS,
-        });
-      }
+      deniedData.accessRequestToken = signScopedAgentAccessToken({
+        resourceKind: CLIPS_ACCESS_REQUEST_TOKEN_PREFIX,
+        resourceId: id,
+        ...(userEmail ? { viewerEmail: userEmail } : {}),
+        ttlSeconds: CLIPS_ACCESS_REQUEST_TOKEN_TTL_SECONDS,
+      });
       return privateShareLoaderData(deniedData, status);
     }
   }
@@ -453,7 +454,11 @@ export default function ShareRoute() {
       notifiedOwner: boolean;
       ok: true;
     },
-    { accessRequestToken?: string; recordingId: string }
+    {
+      accessRequestToken?: string;
+      recordingId: string;
+      requesterEmail?: string;
+    }
   >("request-recording-access");
   const [signInIntent, setSignInIntent] = useState<"comment" | "react" | null>(
     null,
@@ -467,6 +472,14 @@ export default function ShareRoute() {
   const [downloading, setDownloading] = useState(false);
   const [downloadMenuOpen, setDownloadMenuOpen] = useState(false);
   const [accessRequestSent, setAccessRequestSent] = useState(false);
+  const [accessRequestError, setAccessRequestError] = useState<string | null>(
+    null,
+  );
+  const [requestAccessDialogOpen, setRequestAccessDialogOpen] = useState(false);
+  const [requesterEmail, setRequesterEmail] = useState("");
+  const [requestAccessDialogError, setRequestAccessDialogError] = useState<
+    string | null
+  >(null);
   const agentAccessToken = useMemo(() => {
     if (typeof window === "undefined") return "";
     return (
@@ -476,6 +489,71 @@ export default function ShareRoute() {
     );
   }, []);
 
+  const shareReturnTo = useMemo(() => {
+    const path = `/share/${encodeURIComponent(recordingId)}`;
+    if (typeof window === "undefined") return path;
+    const query = buildShareContinuationQuery(attribution);
+    return query ? `${path}?${query}` : path;
+  }, [attribution, recordingId]);
+  const signInHref = buildSignInReturnHref({ returnTo: shareReturnTo });
+
+  const submitAccessRequest = useCallback(
+    (email?: string) => {
+      if (!shareId || accessRequestSent || requestAccess.isPending) return;
+      const normalizedEmail = email?.trim() || undefined;
+      setAccessRequestError(null);
+      setRequestAccessDialogError(null);
+      requestAccess.mutate(
+        {
+          accessRequestToken: loaderData.accessRequestToken,
+          recordingId: shareId,
+          ...(normalizedEmail ? { requesterEmail: normalizedEmail } : {}),
+        },
+        {
+          onSuccess: () => {
+            setAccessRequestSent(true);
+            setRequestAccessDialogOpen(false);
+            toast.success(
+              normalizedEmail
+                ? t("sharePage.accessRequestSentWithEmail", {
+                    email: normalizedEmail,
+                  })
+                : t("sharePage.accessRequestSent"),
+            );
+          },
+          onError: (error: unknown) => {
+            const message =
+              error instanceof Error && error.message
+                ? error.message
+                : t("sharePage.accessRequestFailed");
+            setAccessRequestError(message);
+            setRequestAccessDialogError(message);
+          },
+        },
+      );
+    },
+    [
+      accessRequestSent,
+      loaderData.accessRequestToken,
+      requestAccess,
+      shareId,
+      t,
+    ],
+  );
+
+  const submitGuestAccessRequest = useCallback(
+    (event: FormEvent<HTMLFormElement>) => {
+      event.preventDefault();
+      const email = requesterEmail.trim();
+      if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+        setRequestAccessDialogError(t("sharePage.requestAccessEmailRequired"));
+        return;
+      }
+      submitAccessRequest(email);
+    },
+    [requesterEmail, submitAccessRequest, t],
+  );
+
   const dataQ = useQuery({
     queryKey: ["public-recording", shareId, password, agentAccessToken],
     queryFn: async () => {
@@ -815,29 +893,13 @@ export default function ShareRoute() {
               ? "sharePage.privateClipMessage"
               : "sharePage.privateClipSignedOutMessage",
           )}
+          error={canRequestAccess ? accessRequestError : null}
           action={
             canRequestAccess ? (
               <Button
                 size="sm"
                 disabled={requestAccess.isPending || requestSent}
-                onClick={() => {
-                  if (!shareId || requestSent) return;
-                  requestAccess.mutate(
-                    {
-                      accessRequestToken: loaderData.accessRequestToken,
-                      recordingId: shareId,
-                    },
-                    {
-                      onSuccess: () => {
-                        setAccessRequestSent(true);
-                        toast.success(t("sharePage.accessRequestSent"));
-                      },
-                      onError: () => {
-                        toast.error(t("sharePage.accessRequestFailed"));
-                      },
-                    },
-                  );
-                }}
+                onClick={() => submitAccessRequest()}
               >
                 {requestSent
                   ? t("sharePage.accessRequested")
@@ -846,20 +908,34 @@ export default function ShareRoute() {
                     : t("sharePage.requestAccess")}
               </Button>
             ) : shareId ? (
-              <Button asChild size="sm">
-                <a
-                  href={buildSignInReturnHref({
-                    returnTo: `/share/${shareId}`,
-                  })}
-                  className="gap-1.5"
-                >
-                  <IconLogin2 className="h-4 w-4 rtl:-scale-x-100" />
-                  {t("sharePage.signIn")}
-                </a>
+              <Button
+                size="sm"
+                onClick={() => {
+                  setAccessRequestError(null);
+                  setRequestAccessDialogError(null);
+                  setRequestAccessDialogOpen(true);
+                }}
+              >
+                {t("sharePage.requestAccess")}
               </Button>
             ) : null
           }
         />
+        {!canRequestAccess && shareId ? (
+          <RequestAccessDialog
+            open={requestAccessDialogOpen}
+            onOpenChange={setRequestAccessDialogOpen}
+            signInHref={signInHref}
+            email={requesterEmail}
+            onEmailChange={(value) => {
+              setRequesterEmail(value);
+              setRequestAccessDialogError(null);
+            }}
+            onSubmit={submitGuestAccessRequest}
+            isSubmitting={requestAccess.isPending}
+            error={requestAccessDialogError}
+          />
+        ) : null}
       </>
     );
   }
@@ -1464,11 +1540,13 @@ function EndState({
   icon,
   title,
   message,
+  error,
   action,
 }: {
   icon?: ReactNode;
   title: string;
   message: string;
+  error?: string | null;
   action?: ReactNode;
 }) {
   const t = useT();
@@ -1484,6 +1562,14 @@ function EndState({
       <p className="mb-6 max-w-md text-center text-sm text-muted-foreground">
         {message}
       </p>
+      {error ? (
+        <p
+          className="mb-6 max-w-md text-center text-sm text-destructive"
+          role="alert"
+        >
+          {error}
+        </p>
+      ) : null}
       <div className="flex flex-wrap items-center justify-center gap-2">
         {action}
         <Button asChild variant="ghost" size="sm">

package/corpus/templates/clips/app/routes/share.meeting.$meetingId.tsx

@@ -45,6 +45,11 @@ import {
 import { getDb, schema } from "../../server/db";
 import { CLIPS_MEETING_AGENT_RESOURCE_KIND } from "../../shared/meeting-agent-access";
 import { privateShareLoaderData } from "../../shared/share-loader-response";
+import {
+  normalizeTranscriptSegments,
+  parseTranscriptSegments,
+} from "../../shared/transcript-segments";
+import { resolveTranscriptPresentation } from "../../shared/transcript-status";
 
 type LoaderData = { meeting: PublicMeeting | null };
 
@@ -84,6 +89,8 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
       actualStart: schema.meetings.actualStart,
       actualEnd: schema.meetings.actualEnd,
       transcriptStatus: schema.meetings.transcriptStatus,
+      recordingId: schema.meetings.recordingId,
+      shareTranscript: schema.meetings.shareTranscript,
       visibility: schema.meetings.visibility,
     })
     .from(schema.meetings)
@@ -104,7 +111,7 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
     return shareMeetingLoaderData({ meeting: null }, hasAgentAccessToken);
   }
 
-  const [participants, actionItems] = await Promise.all([
+  const [participants, actionItems, transcriptRows] = await Promise.all([
     getDb()
       .select({
         email: schema.meetingParticipants.email,
@@ -122,8 +129,33 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
       })
       .from(schema.meetingActionItems)
       .where(eq(schema.meetingActionItems.meetingId, meetingId)),
+    meeting.shareTranscript && meeting.recordingId
+      ? getDb()
+          .select({
+            status: schema.recordingTranscripts.status,
+            language: schema.recordingTranscripts.language,
+            fullText: schema.recordingTranscripts.fullText,
+            failureReason: schema.recordingTranscripts.failureReason,
+            segmentsJson: schema.recordingTranscripts.segmentsJson,
+            updatedAt: schema.recordingTranscripts.updatedAt,
+          })
+          .from(schema.recordingTranscripts)
+          .where(
+            eq(schema.recordingTranscripts.recordingId, meeting.recordingId),
+          )
+          .limit(1)
+      : Promise.resolve([]),
   ]);
 
+  const transcript = transcriptRows[0] ?? null;
+  const transcriptPresentation = resolveTranscriptPresentation(transcript);
+  const transcriptSegments = transcript
+    ? normalizeTranscriptSegments({
+        segments: parseTranscriptSegments(transcript.segmentsJson),
+        fullText: transcript.fullText,
+      })
+    : [];
+
   let bullets: PublicMeeting["bullets"] = [];
   try {
     const parsed = JSON.parse(meeting.bulletsJson);
@@ -150,6 +182,14 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
         actualStart: meeting.actualStart,
         actualEnd: meeting.actualEnd,
         transcriptStatus: meeting.transcriptStatus,
+        transcript: transcript
+          ? {
+              status: transcriptPresentation.status ?? transcript.status,
+              language: transcript.language,
+              fullText: transcript.fullText,
+              segments: transcriptSegments,
+            }
+          : null,
       },
     },
     hasAgentAccessToken,

package/corpus/templates/clips/server/lib/calendar-event-meetings.ts

@@ -504,6 +504,7 @@ export async function materializeCalendarMeetingFromVirtualId(
         calendarEventId: snapshot.id,
         recordingId: null,
         transcriptStatus: "idle",
+        shareTranscript: false,
         summaryMd: "",
         bulletsJson: "[]",
         actionItemsJson: "[]",