@agent-native/core 0.182.1-nightly-20260917183518 → 0.182.1

package/corpus/README.md

@@ -31,4 +31,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- template files: 9514
+- template files: 9518

package/corpus/templates/analytics/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable user-facing changes to Agent-Native Analytics are documented here. Open it any
 time from the command menu (Cmd+K → "What's new") or from Settings.
 
+## 2026-09-16
+
+### Improved
+
+- Dashboards open without background synchronization scans during cold starts
+
 ## 2026-09-15
 
 ### Improved

package/corpus/templates/calendar/CHANGELOG.md

@@ -7,6 +7,7 @@ time from the command menu (Cmd+K → "What's new") or from Settings.
 
 ### Fixed
 
+- Booking links reject unsafe validation rules without freezing the booking page
 - Booking link time-zone arrows now scroll to earlier and later times.
 
 ## 2026-09-15

package/corpus/templates/clips/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable user-facing changes to Clips are documented here. Open it any time
 from the command menu (Cmd+K → "What's new") or from Settings.
 
+## 2026-09-17
+
+### Fixed
+
+- Clips waits for authentication before showing the recording action
+- The Clips sort control keeps its keyboard focus ring visible
+
 ## 2026-09-16
 
 ### Improved

package/corpus/templates/clips/app/components/library/sort-menu.tsx

@@ -33,9 +33,9 @@ export function SortMenu({ value, onChange }: SortMenuProps) {
         <TooltipTrigger asChild>
           <DropdownMenuTrigger asChild>
             <Button
-              variant="ghost"
+              variant="ghost-inset"
               size="icon"
-              className="h-8 w-8 shrink-0 text-muted-foreground hover:bg-accent/40 hover:text-foreground"
+              className="h-8 w-8 shrink-0"
               aria-label={LABELS[value]}
             >
               <IconArrowsSort className="h-3.5 w-3.5" />

package/corpus/templates/clips/changelog/2026-09-17-clips-waits-for-authentication-before-showing-the-recording-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-17
+---
+
+Clips waits for authentication before showing the recording action

package/corpus/templates/clips/changelog/2026-09-17-the-clips-sort-control-keeps-its-keyboard-focus-ring-visible.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-17
+---
+
+The Clips sort control keeps its keyboard focus ring visible

package/corpus/templates/clips/chrome-extension/src/popup.html

@@ -388,7 +388,7 @@
         </button>
       </div>
 
-      <button id="start" class="primary start" type="button">
+      <button id="start" class="primary start" type="button" hidden>
         Start recording
       </button>
       <button id="sign-in" class="primary start" type="button" hidden>

package/corpus/templates/clips/chrome-extension/src/popup.ts

@@ -75,6 +75,17 @@ type PopupStatusResponse = {
 
 type AuthStatus = "checking" | "signed-in" | "signed-out";
 
+export function recordingControlVisibility(
+  recording: NativeRecording | null,
+  authStatus: AuthStatus,
+): { startHidden: boolean; signInHidden: boolean } {
+  const active = Boolean(recording);
+  return {
+    startHidden: active || authStatus !== "signed-in",
+    signInHidden: active || authStatus !== "signed-out",
+  };
+}
+
 type StoredAuth = {
   token: string;
   email?: string;
@@ -769,6 +780,7 @@ function formatDuration(startedAtMs: number): string {
 function renderActiveRecording(
   recording: NativeRecording | null,
   arming = false,
+  authStatus: AuthStatus = "checking",
 ): void {
   const idleContent = byId<HTMLDivElement>("idle-content");
   const activeContent = byId<HTMLDivElement>("active-content");
@@ -783,11 +795,12 @@ function renderActiveRecording(
     document.querySelector<HTMLDivElement>(".recording-actions");
 
   const active = Boolean(recording);
+  const controlVisibility = recordingControlVisibility(recording, authStatus);
   idleContent.hidden = active;
   activeContent.hidden = !active;
-  start.hidden = active;
+  start.hidden = controlVisibility.startHidden;
   start.disabled = arming;
-  signIn.hidden = true;
+  signIn.hidden = controlVisibility.signInHidden;
   if (recordingActions) recordingActions.hidden = !active;
   if (!recording) {
     setStorageHelp(false);
@@ -991,7 +1004,7 @@ async function init(): Promise<void> {
       await sendSimpleMessage<PopupStatusResponse>("CLIPS_POPUP_STATUS");
     activeRecording = status.activeRecording ?? null;
     arming = Boolean(status.arming);
-    renderActiveRecording(activeRecording, arming);
+    renderActiveRecording(activeRecording, arming, authStatus);
   };
   await refreshActiveRecording();
   if (activeRecording || arming) {
@@ -1222,11 +1235,8 @@ async function init(): Promise<void> {
   });
 
   authStatus = await readAuthStatus(settings);
-  if (!activeRecording && authStatus === "signed-out") {
-    start.hidden = true;
-    signIn.hidden = false;
-    setStatus("");
-  }
+  renderActiveRecording(activeRecording, arming, authStatus);
+  if (authStatus === "signed-out") setStatus("");
 
   start.addEventListener("click", async () => {
     start.disabled = true;
@@ -1236,9 +1246,7 @@ async function init(): Promise<void> {
     try {
       authStatus = await readAuthStatus(settings);
       if (authStatus === "signed-out") {
-        start.disabled = false;
-        start.hidden = true;
-        signIn.hidden = false;
+        renderActiveRecording(activeRecording, arming, authStatus);
         setStatus("");
         return;
       }
@@ -1375,8 +1383,7 @@ async function init(): Promise<void> {
       await sendSimpleMessage<PopupStartResponse>("CLIPS_POPUP_CANCEL");
     if (response.ok) {
       activeRecording = null;
-      renderActiveRecording(null);
-      if (authStatus === "signed-in") start.hidden = false;
+      renderActiveRecording(null, false, authStatus);
       setStatus("");
       stop.disabled = false;
       discard.disabled = false;
@@ -1398,12 +1405,14 @@ async function init(): Promise<void> {
   });
 }
 
-void init().catch((err) => {
-  captureExtensionError(err, {
-    tags: { surface: "popup", action: "init" },
+if (typeof document !== "undefined") {
+  void init().catch((err) => {
+    captureExtensionError(err, {
+      tags: { surface: "popup", action: "init" },
+    });
+    setStatus(
+      err instanceof Error ? err.message : "Could not load popup.",
+      "error",
+    );
   });
-  setStatus(
-    err instanceof Error ? err.message : "Could not load popup.",
-    "error",
-  );
-});
+}

package/corpus/templates/content/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable user-facing changes to Agent-Native Content are documented here. Open it any
 time from the command menu (Cmd+K → "What's new").
 
+## 2026-09-16
+
+### Fixed
+
+- Content now combines non-overlapping edits from another tab or agent automatically, while recovery choices stay attached to the exact draft and saved page version you reviewed.
+
 ## 2026-09-15
 
 ### Fixed
@@ -27,6 +33,7 @@ time from the command menu (Cmd+K → "What's new").
 
 ### Fixed
 
+- Tables now export as real tables. Downloading a page as PDF or HTML keeps rows, columns, header rows, header columns, and cell line breaks instead of flattening the table into plain text. Callouts, toggles, and column layouts survive the same export path, and printed tables repeat their header row across page breaks.
 - Suggestion previews and highlights stay aligned when editing text near lists.
 
 ## 2026-09-12

package/corpus/templates/content/actions/resolve-preview-document-draft.ts

@@ -35,6 +35,8 @@ const durableClaimPayload = z.object({
   updatedAt: z.string().min(1),
 });
 
+const PROCESSING_LEASE_MS = 5 * 60_000;
+
 function conflict(message: string, details?: Record<string, unknown>): never {
   throw new ActionContractError(message, {
     errorCode: "PREVIEW_DRAFT_RECOVERY_CONFLICT",
@@ -48,8 +50,10 @@ async function recoveryDocumentId(args: {
   expectedDraftVersion: number;
   expectedDraftTitle: string;
   expectedDraftContent: string;
+  expectedDocumentUpdatedAt: string;
   ownerEmail: string;
   orgId: string;
+  includeDocumentVersion: boolean;
 }): Promise<string> {
   const input = JSON.stringify([
     args.ownerEmail,
@@ -58,6 +62,7 @@ async function recoveryDocumentId(args: {
     args.expectedDraftVersion,
     args.expectedDraftTitle,
     args.expectedDraftContent,
+    ...(args.includeDocumentVersion ? [args.expectedDocumentUpdatedAt] : []),
   ]);
   const digest = await crypto.subtle.digest(
     "SHA-256",
@@ -104,14 +109,88 @@ export default defineAction({
     const access = await assertAccess("document", args.documentId, "editor");
     const ownerEmail = access.resource.ownerEmail as string;
     const db = getDb();
-    const recoveryId = await recoveryDocumentId({
+    let recoveryId = await recoveryDocumentId({
+      ...args,
+      ownerEmail: userEmail,
+      orgId,
+      includeDocumentVersion: true,
+    });
+    let claimId = `draft-claim-${recoveryId.slice("recovery-".length)}`;
+    let claimDocumentId = ownerEmail === userEmail ? args.documentId : claimId;
+    const legacyRecoveryId = await recoveryDocumentId({
       ...args,
       ownerEmail: userEmail,
       orgId,
+      includeDocumentVersion: false,
     });
-    const claimId = `draft-claim-${recoveryId.slice("recovery-".length)}`;
-    const claimDocumentId =
-      ownerEmail === userEmail ? args.documentId : claimId;
+    const legacyClaimId = `draft-claim-${legacyRecoveryId.slice(
+      "recovery-".length,
+    )}`;
+    const [currentClaim] = await db
+      .select({ id: schema.documentVersions.id })
+      .from(schema.documentVersions)
+      .where(
+        and(
+          eq(schema.documentVersions.id, claimId),
+          eq(schema.documentVersions.ownerEmail, userEmail),
+          eq(schema.documentVersions.documentId, claimDocumentId),
+        ),
+      )
+      .limit(1);
+    if (legacyClaimId !== claimId && !currentClaim) {
+      const [legacyClaim] = await db
+        .select({
+          id: schema.documentVersions.id,
+          chatContext: schema.documentVersions.chatContext,
+        })
+        .from(schema.documentVersions)
+        .where(
+          and(
+            eq(schema.documentVersions.id, legacyClaimId),
+            eq(schema.documentVersions.ownerEmail, userEmail),
+            eq(
+              schema.documentVersions.documentId,
+              ownerEmail === userEmail ? args.documentId : legacyClaimId,
+            ),
+          ),
+        )
+        .limit(1);
+      const [matchingDraft] = await db
+        .select({ id: schema.documentPreviewDrafts.id })
+        .from(schema.documentPreviewDrafts)
+        .where(
+          and(
+            eq(schema.documentPreviewDrafts.ownerEmail, userEmail),
+            eq(schema.documentPreviewDrafts.orgId, orgId),
+            eq(schema.documentPreviewDrafts.documentId, args.documentId),
+            eq(schema.documentPreviewDrafts.version, args.expectedDraftVersion),
+            eq(schema.documentPreviewDrafts.title, args.expectedDraftTitle),
+            eq(schema.documentPreviewDrafts.content, args.expectedDraftContent),
+          ),
+        )
+        .limit(1);
+      let legacyPayload: ReturnType<
+        typeof durableClaimPayload.safeParse
+      > | null = null;
+      if (legacyClaim?.chatContext) {
+        try {
+          legacyPayload = durableClaimPayload.safeParse(
+            JSON.parse(legacyClaim.chatContext),
+          );
+        } catch {
+          legacyPayload = null;
+        }
+      }
+      if (
+        legacyClaim &&
+        legacyPayload?.success &&
+        (!matchingDraft || legacyPayload.data.draftId === matchingDraft.id)
+      ) {
+        recoveryId = legacyRecoveryId;
+        claimId = legacyClaimId;
+        claimDocumentId = ownerEmail === userEmail ? args.documentId : claimId;
+      }
+    }
     const processingToken = crypto.randomUUID();
     const draftFilter = and(
       eq(schema.documentPreviewDrafts.ownerEmail, userEmail),
@@ -272,6 +351,13 @@ export default defineAction({
           if (payload.choice !== args.choice)
             conflict("This draft was already resolved with another choice.");
           if (payload.status === "resolved") {
+            if (
+              payload.draftId !== draft.id ||
+              payload.expectedDocumentUpdatedAt !==
+                args.expectedDocumentUpdatedAt
+            ) {
+              conflict("The saved draft changed during recovery.");
+            }
             const deleted = await tx
               .delete(schema.documentPreviewDrafts)
               .where(draftFilter)
@@ -280,10 +366,13 @@ export default defineAction({
               conflict("The saved draft changed during recovery.");
             return { status: "resolved" as const };
           }
+          if (payload.draftId !== draft.id)
+            conflict("The saved draft changed during recovery.");
           if (
             payload.status === "processing" &&
-            payload.processingStartedAt &&
-            Date.now() - Date.parse(payload.processingStartedAt) < 30_000
+            (!payload.processingStartedAt ||
+              Date.now() - Date.parse(payload.processingStartedAt) <
+                PROCESSING_LEASE_MS)
           )
             conflict("This recovery choice is already being applied.");
           await tx
@@ -350,15 +439,64 @@ export default defineAction({
         ) {
           conflict("The page changed after this recovery choice was reviewed.");
         }
-        if (
-          payload.status === "processing" &&
-          payload.processingStartedAt &&
-          Date.now() - Date.parse(payload.processingStartedAt) < 30_000
-        ) {
-          conflict("This recovery choice is already being applied.");
+        if (payload.status === "processing") {
+          const alreadyApplied =
+            args.choice === "use_saved" ||
+            (args.choice === "keep_mine" &&
+              currentDocument.title === claim.title &&
+              currentDocument.content === claim.content) ||
+            (args.choice === "save_separately" &&
+              (
+                await tx
+                  .select({
+                    ownerEmail: schema.documents.ownerEmail,
+                    title: schema.documents.title,
+                    content: schema.documents.content,
+                  })
+                  .from(schema.documents)
+                  .where(
+                    and(
+                      eq(schema.documents.id, recoveryId),
+                      eq(schema.documents.ownerEmail, userEmail),
+                      eq(schema.documents.title, claim.title),
+                      eq(schema.documents.content, claim.content),
+                    ),
+                  )
+                  .limit(1)
+              ).length === 1);
+          if (!alreadyApplied) {
+            if (
+              !payload.processingStartedAt ||
+              Date.now() - Date.parse(payload.processingStartedAt) <
+                PROCESSING_LEASE_MS
+            ) {
+              conflict("This recovery choice is already being applied.");
+            }
+          } else {
+            const resolvedAt = new Date().toISOString();
+            const resolved = await tx
+              .update(schema.documentVersions)
+              .set({
+                chatContext: JSON.stringify({
+                  ...payload,
+                  status: "resolved",
+                }),
+                updatedAt: resolvedAt,
+              })
+              .where(
+                and(
+                  eq(schema.documentVersions.id, claimId),
+                  eq(schema.documentVersions.chatContext, claim.chatContext),
+                ),
+              )
+              .returning({ id: schema.documentVersions.id });
+            if (resolved.length !== 1)
+              conflict("This recovery choice is already being applied.");
+            return false;
+          }
         }
         const now = new Date().toISOString();
-        await tx
+        const acquired = await tx
           .update(schema.documentVersions)
           .set({
             chatContext: JSON.stringify({
@@ -369,7 +507,15 @@ export default defineAction({
             }),
             updatedAt: now,
           })
-          .where(eq(schema.documentVersions.id, claimId));
+          .where(
+            and(
+              eq(schema.documentVersions.id, claimId),
+              eq(schema.documentVersions.chatContext, claim.chatContext),
+            ),
+          )
+          .returning({ id: schema.documentVersions.id });
+        if (acquired.length !== 1)
+          conflict("This recovery choice is already being applied.");
         return true;
       });
     const markClaimResolved = async () => {
@@ -395,7 +541,7 @@ export default defineAction({
         if (payload.status === "resolved") return;
         if (payload.processingToken !== processingToken)
           conflict("This recovery choice is already being applied.");
-        await tx
+        const resolved = await tx
           .update(schema.documentVersions)
           .set({
             chatContext: JSON.stringify({ ...payload, status: "resolved" }),
@@ -406,8 +552,11 @@ export default defineAction({
               eq(schema.documentVersions.id, claimId),
               eq(schema.documentVersions.ownerEmail, userEmail),
               eq(schema.documentVersions.documentId, claimDocumentId),
+              eq(schema.documentVersions.chatContext, claim.chatContext),
             ),
-          );
+          )
+          .returning({ id: schema.documentVersions.id });
+        if (resolved.length !== 1) conflict("The recovery claim was lost.");
       });
     };
     const restoreClaimedDraft = async (
@@ -511,6 +660,22 @@ export default defineAction({
           ctx,
         );
         if ((saved as DocumentUpdateConflictResponse).conflict === true) {
+          const [winner] = await db
+            .select()
+            .from(schema.documents)
+            .where(eq(schema.documents.id, args.documentId))
+            .limit(1);
+          if (
+            winner?.title === draft.title &&
+            winner.content === draft.content
+          ) {
+            await markClaimResolved();
+            return {
+              status: "resolved" as const,
+              choice: args.choice,
+              document: winner,
+            };
+          }
           await restoreClaimedDraft(draft);
           return {
             status: "document_conflict" as const,

package/corpus/templates/content/app/components/editor/DocumentEditor.tsx

@@ -1855,6 +1855,7 @@ function PageEditorSessionBody({
   const {
     report: reportReconcile,
     resolve: resolveReconcile,
+    resolveAutomatically: resolveReconcileAutomatically,
     resolveChoice: resolveReconcileChoice,
     updateDraft: updateReconcileDraft,
     reportRetentionFailure,
@@ -2419,7 +2420,9 @@ function PageEditorSessionBody({
           ...(baseUpdatedAt !== undefined ? { baseUpdatedAt } : {}),
           ...(baseRevision !== undefined ? { baseRevision } : {}),
           ...(updates.title !== undefined
-            ? { baseTitle: lastSavedTitleRef.current.title }
+            ? {
+                baseTitle: options.titleBase ?? lastSavedTitleRef.current.title,
+              }
             : {}),
         });
       } catch (error) {
@@ -3941,26 +3944,36 @@ function PageEditorSessionBody({
       }
       localContentRef.current = result.content;
       setLocalContent(result.content);
-      reportReconcile(
-        result.status === "conflict" ? "conflict" : "failed",
-        result.content,
-      );
-      retainActiveRecoveryDraft({
-        localTitle: localTitleRef.current,
-        localDraft: result.content,
-      });
       if (result.status === "merged") {
         if (documentContentRef.current === result.serverContent) {
-          void resolveReconcile({
-            title: document.title,
-            content: result.serverContent,
-            updatedAt: documentUpdatedAtRef.current,
-            revision: result.serverRevision,
+          void resolveReconcileAutomatically(
+            {
+              localTitle: localTitleRef.current,
+              localDraft: result.content,
+            },
+            {
+              title: documentTitleRef.current,
+              content: result.serverContent,
+              updatedAt: documentUpdatedAtRef.current,
+              revision: result.serverRevision,
+            },
+          );
+        } else {
+          reportReconcile("failed", result.content);
+          retainActiveRecoveryDraft({
+            localTitle: localTitleRef.current,
+            localDraft: result.content,
           });
         }
+        return;
       }
+      reportReconcile(result.status, result.content);
+      retainActiveRecoveryDraft({
+        localTitle: localTitleRef.current,
+        localDraft: result.content,
+      });
     },
-    [reportReconcile, resolveReconcile, retainActiveRecoveryDraft],
+    [reportReconcile, resolveReconcileAutomatically, retainActiveRecoveryDraft],
   );
 
   const handleResolveReconcile = useCallback(

package/corpus/templates/content/app/components/editor/VisualEditor.tsx

@@ -147,6 +147,16 @@ import { LinkHoverPreview } from "./LinkHoverPreview";
 import { SlashCommandMenu } from "./SlashCommandMenu";
 import { TableHoverControls } from "./TableHoverControls";
 
+function compareDocumentBodyRevisions(
+  first: string,
+  second: string,
+): number | null {
+  const firstMatch = /^body:(0|[1-9]\d*):/.exec(first);
+  const secondMatch = /^body:(0|[1-9]\d*):/.exec(second);
+  if (!firstMatch || !secondMatch) return null;
+  return Number(firstMatch[1]) - Number(secondMatch[1]);
+}
+
 /**
  * Override the paragraph node's markdown serialization so that empty
  * paragraphs survive round-trips. Without this, prosemirror-markdown
@@ -3648,6 +3658,7 @@ export function VisualEditor({
     contentRevision: propsPredateAcknowledgedRestore
       ? acknowledgedRestore!.contentRevision
       : contentRevision,
+    compareContentRevisions: compareDocumentBodyRevisions,
     acknowledgedLocalSnapshot,
     collabContentRevision: propsPredateAcknowledgedRestore
       ? null

package/corpus/templates/content/app/components/editor/document-save-rebase.ts

@@ -1,6 +1,6 @@
 import { planDocReconcile } from "@agent-native/toolkit/editor";
 import type { Document } from "@shared/api";
-import { nfmToDoc } from "@shared/nfm";
+import { docToNfm, nfmToDoc } from "@shared/nfm";
 import { getSchema } from "@tiptap/core";
 
 import { isDocumentUpdateConflict } from "@/hooks/use-documents";
@@ -42,13 +42,15 @@ export async function saveDocumentWithRebase({
   };
 }): Promise<RebasedDocumentSaveResult> {
   let attemptedBase = base;
-  const draft = content;
+  let candidate = content;
   const conflict = (): RebasedDocumentSaveResult => {
     const current = owner?.current();
     return {
       status: "conflict",
       localDraft:
-        current && current.version !== owner!.version ? current.content : draft,
+        current && current.version !== owner!.version
+          ? current.content
+          : candidate,
     };
   };
   const confirmed = (document: Document): RebasedDocumentSaveResult => {
@@ -57,12 +59,12 @@ export async function saveDocumentWithRebase({
     return { status: "saved", document, content: document.content };
   };
   for (let attempt = 0; attempt <= 2; attempt++) {
-    const saved = await persist(draft, attemptedBase);
+    const saved = await persist(candidate, attemptedBase);
     if (!isDocumentUpdateConflict(saved)) {
       return confirmed(saved);
     }
     const winner = saved.document;
-    if (winner.content === draft && confirmsWrite(winner)) {
+    if (winner.content === candidate && confirmsWrite(winner)) {
       return confirmed(winner);
     }
     if (
@@ -75,16 +77,17 @@ export async function saveDocumentWithRebase({
     }
     try {
       contentSchema ??= getSchema(createVisualEditorExtensions());
-      const localDoc = contentSchema.nodeFromJSON(nfmToDoc(draft));
+      const localDoc = contentSchema.nodeFromJSON(nfmToDoc(candidate));
       const plan = planDocReconcile(
         localDoc,
         contentSchema.nodeFromJSON(nfmToDoc(attemptedBase.content)),
         contentSchema.nodeFromJSON(nfmToDoc(winner.content)),
       );
-      // Only advance the CAS base when the editor already contains the winner.
-      // A server-only change must reach the live Y.Doc through its elected
-      // reconciler before later keystrokes can safely include that change.
-      if (plan.status !== "noop") {
+      // Carry an unambiguous three-way merge into the retry. Ambiguous edits
+      // still need recovery because choosing either side would discard work.
+      if (plan.status === "applied") {
+        candidate = docToNfm(plan.mergedDoc.toJSON());
+      } else if (plan.status !== "noop") {
         return conflict();
       }
       attemptedBase = {