@agent-native/core 0.96.0 → 0.97.0

package/corpus/templates/analytics/server/lib/dashboards-store.ts

@@ -129,6 +129,45 @@ function nanoidFallback(): string {
   );
 }
 
+/**
+ * Normalize affected-row metadata from every createGetDb backend: libSQL,
+ * PGlite, Neon, postgres.js, better-sqlite3, and D1. Mirrors
+ * templates/design/actions/update-design.ts's `affectedRowCount`.
+ */
+function affectedRowCount(result: unknown): number | undefined {
+  const candidate = result as
+    | {
+        rowsAffected?: unknown;
+        affectedRows?: unknown;
+        rowCount?: unknown;
+        count?: unknown;
+        changes?: unknown;
+        meta?: { changes?: unknown };
+      }
+    | undefined;
+  const value =
+    candidate?.rowsAffected ??
+    candidate?.affectedRows ??
+    candidate?.rowCount ??
+    candidate?.count ??
+    candidate?.changes ??
+    candidate?.meta?.changes;
+  return typeof value === "number" ? value : undefined;
+}
+
+/**
+ * Thrown when a fenced `upsertDashboard` write (an `expectedUpdatedAt` was
+ * supplied) loses its compare-and-swap because another writer changed the
+ * row first. Callers should re-read the dashboard and re-apply their mutation
+ * against the fresh config — see `upsertDashboardWithRetry`.
+ */
+export class DashboardConflictError extends Error {
+  constructor(id: string) {
+    super(`Dashboard "${id}" changed between read and write.`);
+    this.name = "DashboardConflictError";
+  }
+}
+
 function changeScope(
   ownerEmail: string,
   orgId: string | null,
@@ -466,15 +505,33 @@ async function snapshotDashboardRevision(
  * Upsert a dashboard. On create, caller becomes owner and visibility defaults
  * to `private`; users explicitly promote useful dashboards to org/public via
  * sharing. On update, `assertAccess` requires `editor`.
+ *
+ * `expectedUpdatedAt` fences the update against concurrent writers: pass the
+ * `updatedAt` observed by an earlier `getDashboard` call and the UPDATE only
+ * applies `WHERE id = ? AND updated_at = ?`. If another writer already saved
+ * in between, the fenced UPDATE affects zero rows and this throws
+ * `DashboardConflictError` instead of silently clobbering their write. Omit
+ * it (the default) to keep the prior unconditional last-write-wins behavior,
+ * which existing callers (legacy migration, revision restore, and any
+ * one-shot write that isn't a read-modify-write) still rely on.
  */
 export async function upsertDashboard(
   id: string,
   kind: DashboardKind,
   body: Record<string, unknown>,
   ctx: AccessCtx,
+  expectedUpdatedAt?: string,
 ): Promise<DashboardRecord> {
   // If the row exists (or legacy-migrates), require editor.
   const existing = await getDashboard(id, ctx);
+  if (!existing && expectedUpdatedAt !== undefined) {
+    // A fence was supplied against a specific prior version, but the row is
+    // gone (deleted, or a legacy key that failed to migrate) by the time we
+    // looked. Treat this as a conflict rather than silently creating a fresh
+    // row — the caller's mutation was computed against state that no longer
+    // exists.
+    throw new DashboardConflictError(id);
+  }
   const db = getDb() as any;
   const { title, config } = configFromSettings(body);
   const configJson = JSON.stringify(config);
@@ -487,17 +544,43 @@ export async function upsertDashboard(
       existing.kind !== kind ||
       existing.title !== title ||
       JSON.stringify(existing.config) !== configJson;
-    if (changed) await snapshotDashboardRevision(db, existing, ctx);
-    await db
-      .update(schema.dashboards)
-      .set({
-        kind,
-        title,
-        config: configJson,
-        updatedAt: nowIso(),
-        updatedBy: ctx.email,
-      })
-      .where(eq(schema.dashboards.id, id));
+    const setValues = {
+      kind,
+      title,
+      config: configJson,
+      updatedAt: nowIso(),
+      updatedBy: ctx.email,
+    };
+    if (expectedUpdatedAt !== undefined) {
+      // Fenced write. Snapshot the revision only after we know this exact
+      // write actually landed — otherwise a lost race would record a
+      // revision for a save that never happened.
+      const updateResult = await db
+        .update(schema.dashboards)
+        .set(setValues)
+        .where(
+          and(
+            eq(schema.dashboards.id, id),
+            eq(schema.dashboards.updatedAt, expectedUpdatedAt),
+          ),
+        );
+      const affected = affectedRowCount(updateResult);
+      if (affected === undefined) {
+        throw new Error(
+          "The database driver did not report an affected-row count for the fenced dashboard update.",
+        );
+      }
+      if (affected === 0) {
+        throw new DashboardConflictError(id);
+      }
+      if (changed) await snapshotDashboardRevision(db, existing, ctx);
+    } else {
+      if (changed) await snapshotDashboardRevision(db, existing, ctx);
+      await db
+        .update(schema.dashboards)
+        .set(setValues)
+        .where(eq(schema.dashboards.id, id));
+    }
   } else {
     await db.insert(schema.dashboards).values({
       id,
@@ -528,6 +611,66 @@ export async function upsertDashboard(
   return dashboard;
 }
 
+/** Max attempts (first try + retries) for `upsertDashboardWithRetry`. */
+export const DASHBOARD_SAVE_MAX_ATTEMPTS = 3;
+
+/**
+ * Read-modify-write helper for the four action call sites that fetch a
+ * dashboard, mutate its config in memory, then save it back. Fences every
+ * save with the `updatedAt` of the record `mutate` was given, so a
+ * concurrent writer (agent adds a panel while a human drags one, or two
+ * agent calls race) never gets silently clobbered.
+ *
+ * `mutate` is invoked with the freshest `DashboardRecord` on every attempt —
+ * re-fetched from `getDashboard` each time — and must recompute the
+ * `{ kind, body }` to save FROM THAT RECORD, not from a closure over an
+ * earlier read; only then does a retry actually merge both writers' changes
+ * instead of re-deriving the same stale result. `mutate` may throw a
+ * non-conflict error (e.g. validation) to abort immediately without
+ * retrying.
+ *
+ * On a lost race, this re-reads and re-invokes `mutate` up to `maxAttempts`
+ * times before failing loud with a clear error so callers never silently
+ * drop a write or loop forever.
+ */
+export async function upsertDashboardWithRetry(
+  id: string,
+  ctx: AccessCtx,
+  mutate: (
+    existing: DashboardRecord,
+  ) =>
+    | { kind: DashboardKind; body: Record<string, unknown> }
+    | Promise<{ kind: DashboardKind; body: Record<string, unknown> }>,
+  maxAttempts: number = DASHBOARD_SAVE_MAX_ATTEMPTS,
+): Promise<DashboardRecord> {
+  let lastConflict: unknown;
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    const existing = await getDashboard(id, ctx);
+    if (!existing) {
+      throw new Error(
+        `dashboard "${id}" not found (or you don't have access).`,
+      );
+    }
+    const { kind, body } = await mutate(existing);
+    try {
+      return await upsertDashboard(id, kind, body, ctx, existing.updatedAt);
+    } catch (err) {
+      if (err instanceof DashboardConflictError) {
+        lastConflict = err;
+        continue;
+      }
+      throw err;
+    }
+  }
+  const finalError = new Error(
+    `Could not save dashboard "${id}" after ${maxAttempts} attempt(s); it kept changing concurrently. Re-read the dashboard and try again.`,
+  );
+  if (lastConflict !== undefined) {
+    (finalError as Error & { cause?: unknown }).cause = lastConflict;
+  }
+  throw finalError;
+}
+
 export async function listDashboardRevisions(
   dashboardId: string,
   ctx: AccessCtx,

package/corpus/templates/assets/package.json

@@ -22,7 +22,7 @@
     "@libsql/client": "^0.15.8",
     "@tabler/icons-react": "catalog:",
     "drizzle-orm": "^0.45.2",
-    "h3": "^2.0.1-rc.20",
+    "h3": "catalog:",
     "isbot": "^5",
     "nanoid": "^5.1.9",
     "p-limit": "^7.3.0",
@@ -66,7 +66,6 @@
     "tailwind-merge": "^3.5.0",
     "tailwindcss": "catalog:",
     "tsx": "^4.20.3",
-    "typescript": "catalog:",
     "typescript-7": "catalog:",
     "vite": "catalog:",
     "vitest": "catalog:"

package/corpus/templates/brain/package.json

@@ -23,7 +23,7 @@
     "@fontsource-variable/inter": "^5.2.8",
     "@libsql/client": "^0.15.0",
     "drizzle-orm": "^0.45.2",
-    "h3": "^2.0.1-rc.22",
+    "h3": "catalog:",
     "isbot": "^5.1.40",
     "react": "catalog:",
     "react-dom": "catalog:",
@@ -57,7 +57,6 @@
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.6.0",
     "tailwindcss": "catalog:",
-    "typescript": "catalog:",
     "typescript-7": "catalog:",
     "vite": "catalog:",
     "vitest": "catalog:"

package/corpus/templates/calendar/package.json

@@ -26,7 +26,7 @@
     "chrono-node": "2.9.1",
     "dotenv": "^17.2.1",
     "drizzle-orm": "^0.45.2",
-    "h3": "^2.0.1-rc.20",
+    "h3": "catalog:",
     "isbot": "^5",
     "nanoid": "^5.1.9",
     "zod": "^4.3.6"
@@ -93,7 +93,6 @@
     "tailwind-merge": "^3.5.0",
     "tailwindcss": "catalog:",
     "tsx": "^4.20.3",
-    "typescript": "catalog:",
     "typescript-7": "catalog:",
     "vaul": "^1.1.2",
     "vite": "catalog:",

package/corpus/templates/chat/package.json

@@ -19,7 +19,7 @@
     "@fontsource-variable/inter": "^5.2.8",
     "@libsql/client": "^0.15.8",
     "@tabler/icons-react": "catalog:",
-    "h3": "^2.0.1-rc.20",
+    "h3": "catalog:",
     "isbot": "^5",
     "node-pty": "^1.1.0",
     "zod": "^4.4.3"
@@ -81,7 +81,6 @@
     "tailwind-merge": "^3.5.0",
     "tailwindcss": "catalog:",
     "tsx": "^4.20.3",
-    "typescript": "catalog:",
     "typescript-7": "catalog:",
     "vaul": "^1.1.2",
     "vite": "catalog:",

package/corpus/templates/clips/changelog/2026-07-10-atomic-view-tracking.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-10
+---
+
+Viewer analytics stay accurate when multiple playback events arrive at the same time.

package/corpus/templates/clips/chrome-extension/package.json

@@ -8,6 +8,7 @@
     "dev:hot": "tsx scripts/dev.ts",
     "build": "vite build",
     "typecheck": "tsc --noEmit",
+    "test": "vitest --run",
     "package": "pnpm build && tsx scripts/package.ts"
   },
   "dependencies": {
@@ -16,8 +17,8 @@
   "devDependencies": {
     "@types/chrome": "^0.2.0",
     "tsx": "catalog:",
-    "typescript": "catalog:",
     "typescript-7": "catalog:",
-    "vite": "catalog:"
+    "vite": "catalog:",
+    "vitest": "catalog:"
   }
 }

package/corpus/templates/clips/desktop/package.json

@@ -12,13 +12,15 @@
     "build:tauri": "CLIPS_DESKTOP_LOCAL_BUILD=1 pnpm run check:prereqs && CLIPS_DESKTOP_LOCAL_BUILD=1 tauri build --config '{\"bundle\":{\"createUpdaterArtifacts\":false},\"plugins\":{\"updater\":{\"active\":false}}}' && node ./scripts/sign-macos-local.ts",
     "tauri": "tauri",
     "vite:dev": "vite",
-    "vite:build": "vite build"
+    "vite:build": "vite build",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest --run"
   },
   "dependencies": {
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@sentry/browser": "10.62.0",
-    "@tabler/icons-react": "^3.26.0",
+    "@tabler/icons-react": "catalog:",
     "@tauri-apps/api": "^2.11.0",
     "@tauri-apps/plugin-fs": "2.5.1",
     "@tauri-apps/plugin-process": "^2.3.1",
@@ -32,8 +34,8 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "catalog:",
-    "typescript": "catalog:",
     "typescript-7": "catalog:",
-    "vite": "catalog:"
+    "vite": "catalog:",
+    "vitest": "catalog:"
   }
 }

package/corpus/templates/clips/desktop/src/lib/recorder.ts

@@ -2147,12 +2147,18 @@ async function startNativeFullscreenRecording(
     console.log(
       `[clips-recorder] native begin durationMs=${Date.now() - beginStartedAt} clickToLiveMs=${Date.now() - clickStartedAt}`,
     );
-    await transcriptionCapture?.resetTimeline().catch((err) => {
-      console.warn(
-        "[clips-recorder] transcription timeline reset failed:",
-        err,
-      );
-    });
+    // Cast: `transcriptionCapture` is only ever reassigned inside the
+    // `startNativeTranscriptionBeforeRecording` closure above, so TS's
+    // control-flow analysis can't see past that call and narrows this
+    // read to `null`. Restate the variable's own declared type.
+    await (transcriptionCapture as TranscriptionCapture | null)
+      ?.resetTimeline()
+      .catch((err) => {
+        console.warn(
+          "[clips-recorder] transcription timeline reset failed:",
+          err,
+        );
+      });
     // Capture is now live — after rebasing the transcript timeline, stamp the
     // timer baseline so the toolbar clock lines up with the real start.
     startedAt = Date.now();
@@ -2164,12 +2170,15 @@ async function startNativeFullscreenRecording(
     localCameraExport?.start(2_000);
   } catch (err) {
     await localCameraExport?.cancel().catch(() => {});
-    await transcriptionCapture?.cancel().catch((cancelErr) => {
-      console.warn(
-        "[clips-recorder] native transcription cancel after start failure failed:",
-        cancelErr,
-      );
-    });
+    // Same TS narrowing gap as above: reassert the declared type.
+    await (transcriptionCapture as TranscriptionCapture | null)
+      ?.cancel()
+      .catch((cancelErr) => {
+        console.warn(
+          "[clips-recorder] native transcription cancel after start failure failed:",
+          cancelErr,
+        );
+      });
     // Tear down any capture started by the warm phase — on a countdown cancel
     // (or a `begin` failure) the SCStream is already running with the mic live,
     // and without this it would keep capturing after the aborted start.
@@ -2629,7 +2638,11 @@ async function startNativeFullscreenRecording(
       console.log(
         "[clips-recorder] native: paused during startup, pausing transcription",
       );
-      void transcriptionCapture.pause().catch(() => {});
+      // The `if` above already proves non-null at runtime; TS just can't see
+      // it (same closure-narrowing gap as above).
+      void (transcriptionCapture as TranscriptionCapture)
+        .pause()
+        .catch(() => {});
     }
   }
 

package/corpus/templates/clips/desktop/src/lib/voice-dictation.ts

@@ -298,7 +298,10 @@ function appendFinalTranscript(session: VoiceSession, text: string): void {
   } else if (clean === committed || clean.startsWith(`${committed} `)) {
     // Some recognizers send the whole dictation as their final result.
     session.finalTranscriptParts = [clean];
-  } else if (session.finalTranscriptParts.at(-1) !== clean) {
+  } else if (
+    session.finalTranscriptParts[session.finalTranscriptParts.length - 1] !==
+    clean
+  ) {
     session.finalTranscriptParts.push(clean);
   }
   session.interimTranscript = "";

package/corpus/templates/clips/package.json

@@ -30,7 +30,7 @@
     "@tabler/icons-react": "catalog:",
     "drizzle-orm": "^0.45.2",
     "ffmpeg-static": "^5.3.0",
-    "h3": "^2.0.1-rc.20",
+    "h3": "catalog:",
     "isbot": "^5",
     "postgres": "^3.4.9",
     "zod": "^4.3.6"
@@ -92,7 +92,6 @@
     "tailwind-merge": "^3.5.0",
     "tailwindcss": "catalog:",
     "tsx": "^4.20.3",
-    "typescript": "catalog:",
     "typescript-7": "catalog:",
     "vaul": "^1.1.2",
     "vite": "catalog:",

package/corpus/templates/clips/server/db/schema.ts

@@ -6,6 +6,7 @@ import {
   now,
   ownableColumns,
   createSharesTable,
+  uniqueIndex,
 } from "@agent-native/core/db/schema";
 
 // -----------------------------------------------------------------------------
@@ -332,23 +333,34 @@ export const recordingReactions = table("recording_reactions", {
 // Analytics: viewers + granular events
 // -----------------------------------------------------------------------------
 
-export const recordingViewers = table("recording_viewers", {
-  id: text("id").primaryKey(),
-  recordingId: text("recording_id").notNull(),
-  viewerEmail: text("viewer_email"), // null = anonymous
-  viewerName: text("viewer_name"),
-  firstViewedAt: text("first_viewed_at").notNull().default(now()),
-  lastViewedAt: text("last_viewed_at").notNull().default(now()),
-  totalWatchMs: integer("total_watch_ms").notNull().default(0),
-  completedPct: integer("completed_pct").notNull().default(0),
-  // True once they meet the 5s / 75% / end-scrub rule.
-  countedView: integer("counted_view", { mode: "boolean" })
-    .notNull()
-    .default(false),
-  ctaClicked: integer("cta_clicked", { mode: "boolean" })
-    .notNull()
-    .default(false),
-});
+export const recordingViewers = table(
+  "recording_viewers",
+  {
+    id: text("id").primaryKey(),
+    recordingId: text("recording_id").notNull(),
+    // Stable canonical identity for new viewers. Nullable so existing rows can
+    // be migrated additively and claimed on their next event.
+    viewerKey: text("viewer_key"),
+    viewerEmail: text("viewer_email"), // null = anonymous
+    viewerName: text("viewer_name"),
+    firstViewedAt: text("first_viewed_at").notNull().default(now()),
+    lastViewedAt: text("last_viewed_at").notNull().default(now()),
+    totalWatchMs: integer("total_watch_ms").notNull().default(0),
+    completedPct: integer("completed_pct").notNull().default(0),
+    // True once they meet the 5s / 75% / end-scrub rule.
+    countedView: integer("counted_view", { mode: "boolean" })
+      .notNull()
+      .default(false),
+    ctaClicked: integer("cta_clicked", { mode: "boolean" })
+      .notNull()
+      .default(false),
+  },
+  (viewer) => ({
+    recordingViewerKeyUnique: uniqueIndex(
+      "recording_viewers_recording_viewer_key_unique_idx",
+    ).on(viewer.recordingId, viewer.viewerKey),
+  }),
+);
 
 // Per-view records — one row per distinct counted view, so the owner can see
 // *who viewed and when* (not just an aggregate count or a single

package/corpus/templates/clips/server/plugins/db.ts

@@ -825,6 +825,14 @@ const migrations = runMigrations(
         `CREATE UNIQUE INDEX IF NOT EXISTS recording_views_session_unique_idx ON recording_views (recording_id, viewer_key, view_session_id)`,
       ].join("; "),
     },
+    {
+      version: 48,
+      name: "recording-viewers-canonical-viewer-key",
+      sql: [
+        `ALTER TABLE recording_viewers ADD COLUMN IF NOT EXISTS viewer_key TEXT`,
+        `CREATE UNIQUE INDEX IF NOT EXISTS recording_viewers_recording_viewer_key_unique_idx ON recording_viewers (recording_id, viewer_key)`,
+      ].join("; "),
+    },
   ],
   { table: "clips_migrations" },
 );