@agent-native/core 0.122.3 → 0.123.0

package/src/client/org/OrgSwitcher.tsx

@@ -13,6 +13,7 @@ import {
   IconClipboardList,
   IconCode,
   IconFileText,
+  IconKey,
   IconLayoutBoard,
   IconListCheck,
   IconLoader2,
@@ -473,33 +474,42 @@ export function OrgSwitcher({
                   {orgs.length > 0 && <div className="my-1 h-px bg-border" />}
                   <div className={SECTION_LABEL_CLASS}>Invitations</div>
                   {pendingInvitations.map((inv) => (
-                    <div
-                      key={inv.id}
-                      className="flex items-center gap-2 px-2.5 py-1.5 text-xs"
-                    >
-                      <IconUsersGroup className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
-                      <span className="truncate flex-1 text-foreground">
-                        {inv.orgName}
-                      </span>
-                      <button
-                        type="button"
-                        onClick={async () => {
-                          try {
-                            await acceptInvitation.mutateAsync(inv.id);
-                            setOpen(false);
-                          } catch {
-                            /* error surfaced via acceptInvitation.error */
-                          }
-                        }}
-                        disabled={acceptInvitation.isPending}
-                        className="rounded px-1.5 py-0.5 text-[11px] font-medium text-primary hover:bg-primary/10 disabled:opacity-50 cursor-pointer"
-                      >
-                        {acceptInvitation.isPending ? (
-                          <IconLoader2 className="h-3 w-3 animate-spin" />
-                        ) : (
-                          "Join"
-                        )}
-                      </button>
+                    <div key={inv.id} className="px-2.5 py-1.5 text-xs">
+                      <div className="flex items-center gap-2">
+                        <IconUsersGroup className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+                        <span className="truncate flex-1 text-foreground">
+                          {inv.orgName}
+                        </span>
+                        <button
+                          type="button"
+                          onClick={async () => {
+                            try {
+                              await acceptInvitation.mutateAsync(inv.id);
+                              setOpen(false);
+                            } catch {
+                              /* error surfaced via acceptInvitation.error */
+                            }
+                          }}
+                          disabled={acceptInvitation.isPending}
+                          className="rounded px-1.5 py-0.5 text-[11px] font-medium text-primary hover:bg-primary/10 disabled:opacity-50 cursor-pointer"
+                        >
+                          {acceptInvitation.isPending ? (
+                            <IconLoader2 className="h-3 w-3 animate-spin" />
+                          ) : (
+                            "Join"
+                          )}
+                        </button>
+                      </div>
+                      {org.orgId && (
+                        <p className="mt-1 flex items-start gap-1.5 text-[11px] leading-snug text-muted-foreground">
+                          <IconKey className="mt-0.5 h-3 w-3 shrink-0" />
+                          <span>
+                            {t("org.acceptInvitationOrgSwitchNotice", {
+                              name: inv.orgName,
+                            })}
+                          </span>
+                        </p>
+                      )}
                     </div>
                   ))}
                 </>
@@ -682,6 +692,10 @@ export function OrgSwitcher({
               <div className="px-0.5 pb-1 text-[10px] uppercase tracking-wide text-muted-foreground">
                 New organization
               </div>
+              <p className="flex items-start gap-1.5 px-0.5 pb-1.5 text-[11px] leading-snug text-muted-foreground">
+                <IconKey className="mt-0.5 h-3 w-3 shrink-0" />
+                <span>{t("org.createOrgVaultNotice")}</span>
+              </p>
               <input
                 autoFocus
                 value={newName}

package/src/client/org/RequireActiveOrg.tsx

@@ -1,5 +1,6 @@
 import {
   IconAlertTriangle,
+  IconKey,
   IconLoader2,
   IconUserPlus,
   IconAt,
@@ -288,6 +289,12 @@ function CreateOrgPane({
             }}
             className="space-y-3"
           >
+            {(hasDomainMatches || hasInvites) && (
+              <p className="flex items-start gap-2 text-xs text-muted-foreground">
+                <IconKey className="mt-0.5 h-3.5 w-3.5 shrink-0" />
+                <span>{t("org.createOrgVaultNotice")}</span>
+              </p>
+            )}
             <label className="block">
               <span className="mb-1 block text-xs font-medium text-foreground">
                 {t("org.organizationName")}

package/src/client/org/TeamPage.tsx

@@ -1,3 +1,14 @@
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@agent-native/toolkit/ui/alert-dialog";
 import { Button as ToolkitButton } from "@agent-native/toolkit/ui/button";
 import {
   Select,
@@ -64,8 +75,10 @@ import {
   useChangeMemberRole,
   useAcceptInvitation,
   useRemoveMember,
+  useDeleteOrg,
   useSwitchOrg,
   useSetOrgDomain,
+  useRevealA2ASecret,
   useSetA2ASecret,
   useSyncA2ASecret,
   useJoinByDomain,
@@ -239,6 +252,10 @@ function CreateOrgCard({ description }: { description?: string }) {
       <p className="text-sm text-muted-foreground">
         {description || t("org.createOrgCardDescription")}
       </p>
+      <p className="flex items-start gap-2 text-xs text-muted-foreground">
+        <IconKey className="mt-0.5 h-3.5 w-3.5 shrink-0" />
+        <span>{t("org.createOrgVaultNotice")}</span>
+      </p>
       {!showForm ? (
         <Button
           type="button"
@@ -427,7 +444,7 @@ function MembersCard() {
               ownerEmail={org.email}
             />
 
-            {isOwner && <A2ASecretSection secret={org.a2aSecret} />}
+            {isOwner && <A2ASecretSection isSet={Boolean(org.a2aSecretSet)} />}
           </div>
         )}
 
@@ -441,6 +458,8 @@ function MembersCard() {
         currentUserEmail={org.email}
         currentUserRole={org.role ?? null}
       />
+
+      {isOwner && <DangerZoneCard orgName={org.orgName ?? ""} />}
     </div>
   );
 }
@@ -544,6 +563,92 @@ function MembersTableCard({
   );
 }
 
+function DangerZoneCard({ orgName }: { orgName: string }) {
+  const t = useT();
+  const deleteOrg = useDeleteOrg();
+  const [open, setOpen] = useState(false);
+  const [confirmText, setConfirmText] = useState("");
+
+  const canConfirm =
+    confirmText.trim().toLowerCase() === orgName.trim().toLowerCase();
+
+  function handleConfirm(e: { preventDefault: () => void }) {
+    e.preventDefault();
+    if (!canConfirm || deleteOrg.isPending) return;
+    deleteOrg.mutate(orgName, { onSuccess: () => setOpen(false) });
+  }
+
+  return (
+    <section className="rounded-lg border border-destructive/40 bg-card p-4 space-y-3">
+      <div className="flex items-start gap-2.5">
+        <IconAlertTriangle className="mt-0.5 h-4 w-4 shrink-0 text-destructive" />
+        <div className="space-y-1">
+          <h3 className="text-sm font-medium text-destructive">
+            {t("org.dangerZone")}
+          </h3>
+          <p className="text-sm text-muted-foreground">
+            {t("org.deleteOrgDescription")}
+          </p>
+        </div>
+      </div>
+      <AlertDialog
+        open={open}
+        onOpenChange={(next) => {
+          setOpen(next);
+          if (!next) setConfirmText("");
+        }}
+      >
+        <AlertDialogTrigger asChild>
+          <Button
+            type="button"
+            intent="danger"
+            emphasis="outline"
+            className="cursor-pointer rounded-md border border-destructive/40 px-3 py-1.5 text-xs font-medium text-destructive hover:bg-destructive/10"
+          >
+            {t("org.deleteOrg")}
+          </Button>
+        </AlertDialogTrigger>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>{t("org.deleteOrg")}</AlertDialogTitle>
+            <AlertDialogDescription>
+              {t("org.deleteOrgConfirmPrompt", { name: orgName })}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <input
+            type="text"
+            value={confirmText}
+            onChange={(e) => setConfirmText(e.target.value)}
+            placeholder={t("org.deleteOrgConfirmPlaceholder")}
+            className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-destructive"
+            autoFocus
+          />
+          <ErrorText error={deleteOrg.error} />
+          <AlertDialogFooter>
+            <AlertDialogCancel className="cursor-pointer">
+              {t("org.cancel")}
+            </AlertDialogCancel>
+            <AlertDialogAction
+              disabled={!canConfirm || deleteOrg.isPending}
+              onClick={handleConfirm}
+              className="cursor-pointer bg-destructive text-destructive-foreground hover:bg-destructive/90 disabled:cursor-not-allowed disabled:opacity-50"
+            >
+              {deleteOrg.isPending ? (
+                <span className="inline-flex items-center gap-1.5">
+                  <IconLoader2 size={14} className="animate-spin" />
+                  {t("org.deleteOrgPending")}
+                </span>
+              ) : (
+                t("org.deleteOrgConfirmCta")
+              )}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </section>
+  );
+}
+
 function roleLabel(role: string, t: ReturnType<typeof useT>) {
   if (role === "owner") return t("org.owner");
   if (role === "admin") return t("org.admin");
@@ -1218,10 +1323,11 @@ function DomainSettingsSection({
   );
 }
 
-function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
+function A2ASecretSection({ isSet }: { isSet: boolean }) {
+  const revealA2ASecret = useRevealA2ASecret();
   const setA2ASecret = useSetA2ASecret();
   const syncA2ASecret = useSyncA2ASecret();
-  const [revealed, setRevealed] = useState(false);
+  const [secret, setSecret] = useState<string | null>(null);
   const [copied, setCopied] = useState(false);
   const [pasteMode, setPasteMode] = useState(false);
   const [pasteValue, setPasteValue] = useState("");
@@ -1229,14 +1335,35 @@ function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
     null,
   );
 
-  function copyToClipboard() {
-    if (!secret) return;
-    navigator.clipboard.writeText(secret).then(() => {
+  function writeClipboard(value: string) {
+    navigator.clipboard.writeText(value).then(() => {
       setCopied(true);
       setTimeout(() => setCopied(false), 2000);
     });
   }
 
+  function toggleReveal() {
+    if (secret) {
+      setSecret(null);
+      return;
+    }
+    revealA2ASecret.mutate(undefined, {
+      onSuccess: (result) => setSecret(result.a2aSecret),
+    });
+  }
+
+  function copyToClipboard() {
+    if (secret) {
+      writeClipboard(secret);
+      return;
+    }
+    revealA2ASecret.mutate(undefined, {
+      onSuccess: (result) => {
+        if (result.a2aSecret) writeClipboard(result.a2aSecret);
+      },
+    });
+  }
+
   // Push the current secret to all connected apps. Optionally pass the
   // PREVIOUS secret as `signSecret` so the receiving apps (which still
   // hold the previous value) can verify the JWT.
@@ -1252,7 +1379,7 @@ function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
   function regenerate() {
     setA2ASecret.mutate(undefined, {
       onSuccess: (result) => {
-        setRevealed(false);
+        setSecret(null);
         // Auto-sync the new secret to all connected apps. Sign with the
         // PREVIOUS secret (which peers still hold) so verification on
         // their side succeeds and they accept the new value.
@@ -1275,7 +1402,7 @@ function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
     });
   }
 
-  const masked = secret ? "****" + secret.slice(-8) : "Not set";
+  const masked = isSet ? "••••••••••••" : "Not set";
 
   return (
     <div className="space-y-2">
@@ -1306,22 +1433,23 @@ function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
       <div className="flex items-center gap-2 flex-wrap">
         <span className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-2.5 py-1.5 text-sm font-mono">
           <IconKey className="h-3.5 w-3.5 text-muted-foreground" />
-          {revealed && secret ? secret : masked}
+          {secret ?? masked}
         </span>
-        {secret && (
+        {isSet && (
           <>
             <Tooltip>
               <TooltipTrigger asChild>
                 <Button
                   type="button"
-                  onClick={() => setRevealed(!revealed)}
+                  onClick={toggleReveal}
+                  disabled={revealA2ASecret.isPending}
                   className="text-muted-foreground hover:text-foreground"
                 >
-                  {revealed ? <IconEyeOff size={14} /> : <IconEye size={14} />}
+                  {secret ? <IconEyeOff size={14} /> : <IconEye size={14} />}
                 </Button>
               </TooltipTrigger>
               <TooltipContent>
-                {revealed ? "Hide secret" : "Reveal secret"}
+                {secret ? "Hide secret" : "Reveal secret"}
               </TooltipContent>
             </Tooltip>
             <Tooltip>
@@ -1329,6 +1457,7 @@ function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
                 <Button
                   type="button"
                   onClick={copyToClipboard}
+                  disabled={revealA2ASecret.isPending}
                   className="text-muted-foreground hover:text-foreground"
                 >
                   {copied ? (
@@ -1364,7 +1493,7 @@ function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
             Regenerate secret and sync to connected apps
           </TooltipContent>
         </Tooltip>
-        {secret && (
+        {isSet && (
           <Tooltip>
             <TooltipTrigger asChild>
               <Button
@@ -1474,6 +1603,7 @@ function A2ASecretSection({ secret }: { secret: string | null | undefined }) {
         </div>
       )}
 
+      <ErrorText error={revealA2ASecret.error} />
       <ErrorText error={setA2ASecret.error} />
       <ErrorText error={syncA2ASecret.error} />
     </div>

package/src/client/org/hooks.ts

@@ -274,6 +274,22 @@ export function useSwitchOrg() {
   });
 }
 
+export function useDeleteOrg() {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: (name: string) =>
+      apiFetch(ORG_BASE, {
+        method: "DELETE",
+        body: JSON.stringify({ name }),
+      }),
+    onSuccess: async () => {
+      // Deleting an org drops the user into a different active org (or none),
+      // so every org-scoped query is stale — same reasoning as create/switch.
+      await qc.invalidateQueries();
+    },
+  });
+}
+
 export function useJoinByDomain() {
   const qc = useQueryClient();
   return useMutation({
@@ -302,6 +318,17 @@ export function useSetOrgDomain() {
   });
 }
 
+/**
+ * Fetch the org's A2A secret on demand (owner/admin). Deliberately a separate
+ * request from `useOrg()` so the secret only reaches the browser when the
+ * operator asks to reveal or copy it.
+ */
+export function useRevealA2ASecret() {
+  return useMutation<{ a2aSecret: string | null }, Error, void>({
+    mutationFn: () => apiFetch(`${ORG_BASE}/a2a-secret`),
+  });
+}
+
 export function useSetA2ASecret() {
   const qc = useQueryClient();
   return useMutation<

package/src/client/org/index.ts

@@ -11,9 +11,11 @@ export {
   useChangeMemberRole,
   useAcceptInvitation,
   useRemoveMember,
+  useDeleteOrg,
   useSwitchOrg,
   useJoinByDomain,
   useSetOrgDomain,
+  useRevealA2ASecret,
   useSetA2ASecret,
   useSyncA2ASecret,
   useOrgRole,

package/src/client/require-session.tsx

@@ -29,10 +29,28 @@
  */
 import React, { useEffect, useRef } from "react";
 
-import { agentNativePath } from "./api-path.js";
+import { signInJourney } from "../shared/sign-in-journey.js";
+import { agentNativePath, appBasePath } from "./api-path.js";
 import { DefaultSpinner } from "./DefaultSpinner.js";
 import { useSession } from "./use-session.js";
 
+/**
+ * The sign-in journey for the browser's current location.
+ *
+ * `basePath` comes from `appBasePath()` and NEVER from the continuation —
+ * base-path containment is the only control that stops an unsigned path-only
+ * continuation from redirecting to a sibling app on a shared workspace host.
+ */
+function currentJourney(returnTo?: string) {
+  const { pathname, search, hash } = window.location;
+  return signInJourney({
+    at: returnTo ?? pathname + search + hash,
+    continuation: new URLSearchParams(search).get("c"),
+    legacyReturn: new URLSearchParams(search).get("return"),
+    basePath: appBasePath(),
+  });
+}
+
 export interface RequireSessionProps {
   children: React.ReactNode;
   /**
@@ -42,10 +60,9 @@ export interface RequireSessionProps {
   fallback?: React.ReactNode;
   /**
    * When true (default), unauthenticated visitors are redirected to the
-   * framework sign-in entry point (`/_agent-native/sign-in`) with a `return`
-   * query pointing back at the current URL — so they land back here once
-   * signed in. When false, `signedOut` is rendered instead and no navigation
-   * happens.
+   * framework sign-in entry point (`/_agent-native/sign-in`) carrying a `c`
+   * continuation for the current URL — so they land back here once signed in.
+   * When false, `signedOut` is rendered instead and no navigation happens.
    */
   redirect?: boolean;
   /**
@@ -61,31 +78,19 @@ export interface RequireSessionProps {
   bypass?: boolean;
 }
 
-/** Build the framework sign-in URL that returns to the current location. */
-export function buildSignInReturnHref(): string {
-  const base = agentNativePath("/_agent-native/sign-in");
-  if (typeof window === "undefined") return base;
-  const ret =
-    window.location.pathname + window.location.search + window.location.hash;
-  return `${base}?return=${encodeURIComponent(ret)}`;
-}
-
 /**
- * True when the browser is already sitting on the framework sign-in entry
- * point. Redirecting to sign-in from here would append the current sign-in
- * URL as a fresh `?return=`, re-encode it, and navigate again — an infinite
- * loop of ever-growing `…sign-in?return=%252F…sign-in%253Freturn%253D…` URLs.
+ * Build the framework sign-in URL that returns the visitor to where they are
+ * now (or to `returnTo`). Emits the opaque `?c=` continuation.
  *
- * This happens when the authenticated app shell (wrapped in `RequireSession`)
- * is served at the sign-in path instead of the framework login HTML — e.g.
- * under a base-path deploy where the SPA shell answers `/<app>/_agent-native/
- * sign-in`. The sign-in page is the framework's job, not the gate's: never
- * redirect to ourselves. Compared against `agentNativePath(...)` so it matches
- * whether or not the app is mounted under a base path.
+ * Returns the bare sign-in path — no continuation — when the browser is
+ * already at an auth entry path, because there is no such thing as signing in
+ * from the sign-in page. Callers that navigate must use `signInJourney`
+ * directly and honour its `signInHref: null`.
  */
-export function isOnSignInPage(): boolean {
-  if (typeof window === "undefined") return false;
-  return window.location.pathname === agentNativePath("/_agent-native/sign-in");
+export function buildSignInReturnHref(opts?: { returnTo?: string }): string {
+  const base = agentNativePath("/_agent-native/sign-in");
+  if (typeof window === "undefined") return base;
+  return currentJourney(opts?.returnTo).signInHref ?? base;
 }
 
 export function RequireSession({
@@ -119,16 +124,22 @@ function ResolvedSessionGate({
   // flight is harmless but noisy.
   const redirectedRef = useRef(false);
 
-  const mustRedirect = !isLoading && !session && redirect && !isOnSignInPage();
+  const mustRedirect = !isLoading && !session && redirect;
 
   useEffect(() => {
     if (!mustRedirect) return;
     if (redirectedRef.current) return;
     if (typeof window === "undefined") return;
+    // `null` means the browser is already at an auth entry path — the sign-in
+    // page is the framework's job, not the gate's. This is the only thing
+    // standing between here and a same-URL replace loop, so it must stay a
+    // null check and never gain a fallback.
+    const { signInHref } = currentJourney();
+    if (!signInHref) return;
     redirectedRef.current = true;
     // `replace` (not `assign`) so the dead authenticated URL doesn't land in
     // history — pressing Back after signing in shouldn't bounce here again.
-    window.location.replace(buildSignInReturnHref());
+    window.location.replace(signInHref);
   }, [mustRedirect]);
 
   // Still resolving, or redirect already in flight: show the loading fallback

package/src/client/session-replay.ts

@@ -2397,7 +2397,7 @@ function installConsoleCapture(
         ...(stack ? { stack } : {}),
         ...(url ? { url } : {}),
       };
-      const key = `${level}${source}${message}`;
+      const key = `${level}\u0000${source}\u0000${message}`;
       if (pending && pending.key === key) {
         pending.repeat += 1;
         return;

package/src/client/settings/DemoModeSection.tsx

@@ -1,7 +1,6 @@
 /** Browser-local presentation toggle. Backend and agent results stay real. */
 
 import { Switch } from "@agent-native/toolkit/design-system";
-import { IconEyeOff } from "@tabler/icons-react";
 
 import { setBrowserDemoModeEnabled } from "../../demo/browser-state.js";
 import { useDemoModeStatus } from "../use-demo-mode-status.js";
@@ -30,7 +29,3 @@ export function DemoModeSection() {
     </div>
   );
 }
-
-export function DemoModeIcon() {
-  return <IconEyeOff size={14} />;
-}