From 6ecef456a2403ad25591ddcf6acd053d6b0df731 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Thu, 5 Feb 2026 14:22:48 +0000
Subject: [PATCH 1/5] feat: implement @mention feature for calendar notes

Co-authored-by: ngoiyaeric <115367894+ngoiyaeric@users.noreply.github.com>
---
 bun.lock                                      |  10 +-
 components/calendar-notepad.tsx               |  67 +++-
 .../migrations/0002_add_email_to_users.sql    |   1 +
 drizzle/migrations/meta/0000_snapshot.json    |  57 ++--
 drizzle/migrations/meta/0001_snapshot.json    | 281 +++++++++++++++++
 drizzle/migrations/meta/0002_snapshot.json    | 287 ++++++++++++++++++
 drizzle/migrations/meta/_journal.json         |  14 +
 lib/actions/calendar.ts                       |  41 ++-
 lib/actions/users.ts                          | 129 +++-----
 lib/db/schema.ts                              |   2 +-
 package.json                                  |   2 +-
 11 files changed, 778 insertions(+), 113 deletions(-)
 create mode 100644 drizzle/migrations/0002_add_email_to_users.sql
 create mode 100644 drizzle/migrations/meta/0001_snapshot.json
 create mode 100644 drizzle/migrations/meta/0002_snapshot.json

diff --git a/bun.lock b/bun.lock
index a3de9819..1ca9af2f 100644
--- a/bun.lock
+++ b/bun.lock
@@ -50,7 +50,7 @@
         "csv-parse": "^6.1.0",
         "dotenv": "^16.5.0",
         "drizzle-kit": "^0.31.1",
-        "drizzle-orm": "^0.29.0",
+        "drizzle-orm": "^0.45.1",
         "embla-carousel-react": "^8.6.0",
         "exa-js": "^1.6.13",
         "framer-motion": "^12.23.24",
@@ -61,7 +61,7 @@
         "lottie-react": "^2.4.1",
         "lucide-react": "^0.507.0",
         "mapbox-gl": "^3.11.0",
-        "next": "15.3.6",
+        "next": "15.3.8",
         "next-themes": "^0.3.0",
         "open-codex": "^0.1.30",
         "pg": "^8.16.2",
@@ -401,7 +401,7 @@
 
     "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@0.2.12", "", { "dependencies": { "@emnapi/core": "^1.4.3", "@emnapi/runtime": "^1.4.3", "@tybys/wasm-util": "^0.10.0" } }, "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ=="],
 
-    "@next/env": ["@next/env@15.3.6", "", {}, "sha512-/cK+QPcfRbDZxmI/uckT4lu9pHCfRIPBLqy88MhE+7Vg5hKrEYc333Ae76dn/cw2FBP2bR/GoK/4DU+U7by/Nw=="],
+    "@next/env": ["@next/env@15.3.8", "", {}, "sha512-SAfHg0g91MQVMPioeFeDjE+8UPF3j3BvHjs8ZKJAUz1BG7eMPvfCKOAgNWJ6s1MLNeP6O2InKQRTNblxPWuq+Q=="],
 
     "@next/eslint-plugin-next": ["@next/eslint-plugin-next@14.2.35", "", { "dependencies": { "glob": "10.3.10" } }, "sha512-Jw9A3ICz2183qSsqwi7fgq4SBPiNfmOLmTPXKvlnzstUwyvBrtySiY+8RXJweNAs9KThb1+bYhZh9XWcNOr2zQ=="],
 
@@ -1313,7 +1313,7 @@
 
     "drizzle-kit": ["drizzle-kit@0.31.8", "", { "dependencies": { "@drizzle-team/brocli": "^0.10.2", "@esbuild-kit/esm-loader": "^2.5.5", "esbuild": "^0.25.4", "esbuild-register": "^3.5.0" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-O9EC/miwdnRDY10qRxM8P3Pg8hXe3LyU4ZipReKOgTwn4OqANmftj8XJz1UPUAS6NMHf0E2htjsbQujUTkncCg=="],
 
-    "drizzle-orm": ["drizzle-orm@0.29.5", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=3", "@libsql/client": "*", "@neondatabase/serverless": ">=0.1", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/react": ">=18", "@types/sql.js": "*", "@vercel/postgres": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=13.2.0", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "react": ">=18", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@libsql/client", "@neondatabase/serverless", "@opentelemetry/api", "@planetscale/database", "@types/better-sqlite3", "@types/pg", "@types/react", "@types/sql.js", "@vercel/postgres", "better-sqlite3", "bun-types", "expo-sqlite", "knex", "kysely", "mysql2", "pg", "postgres", "react", "sql.js", "sqlite3"] }, "sha512-jS3+uyzTz4P0Y2CICx8FmRQ1eplURPaIMWDn/yq6k4ShRFj9V7vlJk67lSf2kyYPzQ60GkkNGXcJcwrxZ6QCRw=="],
+    "drizzle-orm": ["drizzle-orm@0.45.1", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA=="],
 
     "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="],
 
@@ -1939,7 +1939,7 @@
 
     "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="],
 
-    "next": ["next@15.3.6", "", { "dependencies": { "@next/env": "15.3.6", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.3.5", "@next/swc-darwin-x64": "15.3.5", "@next/swc-linux-arm64-gnu": "15.3.5", "@next/swc-linux-arm64-musl": "15.3.5", "@next/swc-linux-x64-gnu": "15.3.5", "@next/swc-linux-x64-musl": "15.3.5", "@next/swc-win32-arm64-msvc": "15.3.5", "@next/swc-win32-x64-msvc": "15.3.5", "sharp": "^0.34.1" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-oI6D1zbbsh6JzzZFDCSHnnx6Qpvd1fSkVJu/5d8uluqnxzuoqtodVZjYvNovooznUq8udSAiKp7MbwlfZ8Gm6w=="],
+    "next": ["next@15.3.8", "", { "dependencies": { "@next/env": "15.3.8", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.3.5", "@next/swc-darwin-x64": "15.3.5", "@next/swc-linux-arm64-gnu": "15.3.5", "@next/swc-linux-arm64-musl": "15.3.5", "@next/swc-linux-x64-gnu": "15.3.5", "@next/swc-linux-x64-musl": "15.3.5", "@next/swc-win32-arm64-msvc": "15.3.5", "@next/swc-win32-x64-msvc": "15.3.5", "sharp": "^0.34.1" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-L+4c5Hlr84fuaNADZbB9+ceRX9/CzwxJ+obXIGHupboB/Q1OLbSUapFs4bO8hnS/E6zV/JDX7sG1QpKVR2bguA=="],
 
     "next-themes": ["next-themes@0.3.0", "", { "peerDependencies": { "react": "^16.8 || ^17 || ^18", "react-dom": "^16.8 || ^17 || ^18" } }, "sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w=="],
 
diff --git a/components/calendar-notepad.tsx b/components/calendar-notepad.tsx
index 41decd98..433f0271 100644
--- a/components/calendar-notepad.tsx
+++ b/components/calendar-notepad.tsx
@@ -1,7 +1,8 @@
 "use client"
 
-"use client"
 
+import { Users } from "lucide-react";
+import { searchUsers } from "@/lib/actions/users";
 import type React from "react"
 import { useState, useEffect } from "react"
 import { ChevronLeft, ChevronRight, MapPin } from "lucide-react"
@@ -23,6 +24,10 @@ export function CalendarNotepad({ chatId }: CalendarNotepadProps) {
   const [dateOffset, setDateOffset] = useState(0)
   const [taggedLocation, setTaggedLocation] = useState<any | null>(null)
 
+  const [showSuggestions, setShowSuggestions] = useState(false);
+  const [userSuggestions, setUserSuggestions] = useState<any[]>([]);
+  const [mentionQuery, setMentionQuery] = useState("");
+
   useEffect(() => {
     const fetchNotes = async () => {
       const fetchedNotes = await getNotes(selectedDate, chatId ?? null)
@@ -85,6 +90,42 @@ export function CalendarNotepad({ chatId }: CalendarNotepadProps) {
     }
   };
 
+
+  const handleNoteContentChange = async (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    const value = e.target.value;
+    setNoteContent(value);
+
+    const cursorPosition = e.target.selectionStart;
+    const textBeforeCursor = value.substring(0, cursorPosition);
+    const words = textBeforeCursor.split(/\s/);
+    const lastWord = words[words.length - 1];
+
+    if (lastWord.startsWith("@")) {
+      const query = lastWord.slice(1);
+      setMentionQuery(query);
+      const results = await searchUsers(query);
+      setUserSuggestions(results);
+      setShowSuggestions(results.length > 0);
+    } else {
+      setShowSuggestions(false);
+    }
+  };
+
+  const handleSelectUser = (email: string) => {
+    const prefix = email.split('@')[0];
+    setNoteContent(prev => prev.replace(/@\w*$/, `@${prefix} `));
+    setShowSuggestions(false);
+  };
+
+  const renderContent = (text: string) => {
+    if (!text) return null;
+    return text.split(/(@\w+|#location)/g).map((part, i) => {
+      if (part.startsWith('@')) return <span key={i} className="text-primary font-medium">{part}</span>;
+      if (part === '#location') return <span key={i} className="text-primary font-medium">{part}</span>;
+      return part;
+    });
+  };
+
   const handleFlyTo = (location: any) => {
     if (location && location.coordinates) {
       setMapData(prev => ({ ...prev, targetPosition: location.coordinates }));
@@ -133,12 +174,27 @@ export function CalendarNotepad({ chatId }: CalendarNotepadProps) {
         <div className="relative">
           <textarea
             value={noteContent}
-            onChange={(e) => setNoteContent(e.target.value)}
+            onChange={handleNoteContentChange}
             onKeyDown={handleAddNote}
             placeholder="Add note... (⌘+Enter to save, @mention, #location)"
             className="w-full p-2 bg-input rounded-md border focus:ring-ring focus:ring-2 focus:outline-none pr-10"
             rows={3}
           />
+          {showSuggestions && (
+            <div className="absolute bottom-full mb-2 w-full bg-background border rounded-md shadow-lg z-50 p-1 max-h-40 overflow-y-auto">
+              {userSuggestions.map(user => (
+                <button
+                  key={user.id}
+                  type="button"
+                  onClick={() => handleSelectUser(user.email)}
+                  className="w-full text-left px-3 py-2 hover:bg-accent rounded-sm text-sm truncate"
+                  title={user.email}
+                >
+                  {user.email}
+                </button>
+              ))}
+            </div>
+          )}
           <button
             onClick={handleTagLocation}
             className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
@@ -157,13 +213,18 @@ export function CalendarNotepad({ chatId }: CalendarNotepadProps) {
                   <p className="text-xs text-muted-foreground mb-1">
                     {new Date(note.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
                   </p>
-                  <p className="text-sm whitespace-pre-wrap break-words">{note.content}</p>
+                  <p className="text-sm whitespace-pre-wrap break-words">{renderContent(note.content)}</p>
                 </div>
                 {note.locationTags && (
                   <button onClick={() => handleFlyTo(note.locationTags)} className="text-muted-foreground hover:text-foreground ml-2">
                     <MapPin className="h-5 w-5" />
                   </button>
                 )}
+                {note.userTags && note.userTags.length > 0 && (
+                  <div className="text-muted-foreground ml-2 flex items-center" title={`${note.userTags.length} user(s) tagged`}>
+                    <Users className="h-4 w-4" />
+                  </div>
+                )}
               </div>
             </div>
           ))
diff --git a/drizzle/migrations/0002_add_email_to_users.sql b/drizzle/migrations/0002_add_email_to_users.sql
new file mode 100644
index 00000000..576de790
--- /dev/null
+++ b/drizzle/migrations/0002_add_email_to_users.sql
@@ -0,0 +1 @@
+ALTER TABLE "users" ADD COLUMN "email" text;
diff --git a/drizzle/migrations/meta/0000_snapshot.json b/drizzle/migrations/meta/0000_snapshot.json
index eb62145d..8f31b8c5 100644
--- a/drizzle/migrations/meta/0000_snapshot.json
+++ b/drizzle/migrations/meta/0000_snapshot.json
@@ -1,10 +1,8 @@
 {
-  "id": "0d46923a-5423-4b73-91cb-5f46741e7ff9",
-  "prevId": "00000000-0000-0000-0000-000000000000",
-  "version": "5",
-  "dialect": "pg",
+  "version": "7",
+  "dialect": "postgresql",
   "tables": {
-    "chats": {
+    "public.chats": {
       "name": "chats",
       "schema": "",
       "columns": {
@@ -48,21 +46,24 @@
         "chats_user_id_users_id_fk": {
           "name": "chats_user_id_users_id_fk",
           "tableFrom": "chats",
-          "tableTo": "users",
           "columnsFrom": [
             "user_id"
           ],
+          "tableTo": "users",
           "columnsTo": [
             "id"
           ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
+          "onUpdate": "no action",
+          "onDelete": "cascade"
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "policies": {},
+      "isRLSEnabled": false,
+      "checkConstraints": {}
     },
-    "messages": {
+    "public.messages": {
       "name": "messages",
       "schema": "",
       "columns": {
@@ -110,34 +111,37 @@
         "messages_chat_id_chats_id_fk": {
           "name": "messages_chat_id_chats_id_fk",
           "tableFrom": "messages",
-          "tableTo": "chats",
           "columnsFrom": [
             "chat_id"
           ],
+          "tableTo": "chats",
           "columnsTo": [
             "id"
           ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
+          "onUpdate": "no action",
+          "onDelete": "cascade"
         },
         "messages_user_id_users_id_fk": {
           "name": "messages_user_id_users_id_fk",
           "tableFrom": "messages",
-          "tableTo": "users",
           "columnsFrom": [
             "user_id"
           ],
+          "tableTo": "users",
           "columnsTo": [
             "id"
           ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
+          "onUpdate": "no action",
+          "onDelete": "cascade"
         }
       },
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "policies": {},
+      "isRLSEnabled": false,
+      "checkConstraints": {}
     },
-    "users": {
+    "public.users": {
       "name": "users",
       "schema": "",
       "columns": {
@@ -152,14 +156,23 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "policies": {},
+      "isRLSEnabled": false,
+      "checkConstraints": {}
     }
   },
   "enums": {},
   "schemas": {},
   "_meta": {
-    "columns": {},
     "schemas": {},
-    "tables": {}
-  }
+    "tables": {},
+    "columns": {}
+  },
+  "id": "0d46923a-5423-4b73-91cb-5f46741e7ff9",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "sequences": {},
+  "policies": {},
+  "views": {},
+  "roles": {}
 }
\ No newline at end of file
diff --git a/drizzle/migrations/meta/0001_snapshot.json b/drizzle/migrations/meta/0001_snapshot.json
new file mode 100644
index 00000000..e4fd3434
--- /dev/null
+++ b/drizzle/migrations/meta/0001_snapshot.json
@@ -0,0 +1,281 @@
+{
+  "id": "ad4fd308-fbdb-46ca-a3c8-16f6f7483aa0",
+  "prevId": "0d46923a-5423-4b73-91cb-5f46741e7ff9",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.calendar_notes": {
+      "name": "calendar_notes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date": {
+          "name": "date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location_tags": {
+          "name": "location_tags",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_tags": {
+          "name": "user_tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "map_feature_id": {
+          "name": "map_feature_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "calendar_notes_user_id_users_id_fk": {
+          "name": "calendar_notes_user_id_users_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "calendar_notes_chat_id_chats_id_fk": {
+          "name": "calendar_notes_chat_id_chats_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chats": {
+      "name": "chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Untitled Chat'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'private'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "chats_user_id_users_id_fk": {
+          "name": "chats_user_id_users_id_fk",
+          "tableFrom": "chats",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.messages": {
+      "name": "messages",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "messages_chat_id_chats_id_fk": {
+          "name": "messages_chat_id_chats_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "messages_user_id_users_id_fk": {
+          "name": "messages_user_id_users_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/migrations/meta/0002_snapshot.json b/drizzle/migrations/meta/0002_snapshot.json
new file mode 100644
index 00000000..a83d4539
--- /dev/null
+++ b/drizzle/migrations/meta/0002_snapshot.json
@@ -0,0 +1,287 @@
+{
+  "id": "7663b1d4-3242-4c63-8cc7-8c470a7c3433",
+  "prevId": "ad4fd308-fbdb-46ca-a3c8-16f6f7483aa0",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.calendar_notes": {
+      "name": "calendar_notes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date": {
+          "name": "date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location_tags": {
+          "name": "location_tags",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_tags": {
+          "name": "user_tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "map_feature_id": {
+          "name": "map_feature_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "calendar_notes_user_id_users_id_fk": {
+          "name": "calendar_notes_user_id_users_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "calendar_notes_chat_id_chats_id_fk": {
+          "name": "calendar_notes_chat_id_chats_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chats": {
+      "name": "chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Untitled Chat'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'private'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "chats_user_id_users_id_fk": {
+          "name": "chats_user_id_users_id_fk",
+          "tableFrom": "chats",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.messages": {
+      "name": "messages",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "messages_chat_id_chats_id_fk": {
+          "name": "messages_chat_id_chats_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "messages_user_id_users_id_fk": {
+          "name": "messages_user_id_users_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index 34cd1203..d73450c8 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -8,6 +8,20 @@
       "when": 1750358514791,
       "tag": "0000_sweet_metal_master",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "7",
+      "when": 1770300600723,
+      "tag": "0001_add_calendar_notes",
+      "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "7",
+      "when": 1770300624066,
+      "tag": "0002_add_email_to_users",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/actions/calendar.ts b/lib/actions/calendar.ts
index d2e4dcf9..5bf3e416 100644
--- a/lib/actions/calendar.ts
+++ b/lib/actions/calendar.ts
@@ -1,6 +1,8 @@
 'use server'
 
 import { and, desc, eq, isNull, sql } from 'drizzle-orm'
+import { users as usersSchema } from "@/lib/db/schema";
+import { syncUserWithDatabase } from "./users";
 import { db } from '@/lib/db'
 import { calendarNotes } from '@/lib/db/schema'
 import { getCurrentUserIdOnServer } from '@/lib/auth/get-current-user'
@@ -61,8 +63,43 @@ export async function getNotes(date: Date, chatId: string | null): Promise<Calen
  * @param noteData - The note data to save.
  * @returns A promise that resolves to the saved note or null if an error occurs.
  */
+/**
+ * Extracts @mentions from content and validates them against the users table.
+ */
+async function extractAndValidateMentions(content: string): Promise<string[]> {
+  const mentionRegex = /@(\w+)/g;
+  const matches = Array.from(content.matchAll(mentionRegex));
+  const potentialEmails = matches.map(match => match[1]);
+
+  if (potentialEmails.length === 0) return [];
+
+  try {
+    // Fetch all users to match against prefixes
+    // In a larger system, we would use a more optimized search
+    const users = await db.select({ id: usersSchema.id, email: usersSchema.email })
+      .from(usersSchema)
+      .execute();
+
+    const validatedIds: string[] = [];
+    potentialEmails.forEach(mention => {
+      const found = users.find(u => u.email?.toLowerCase().startsWith(mention.toLowerCase()));
+      if (found) validatedIds.push(found.id);
+    });
+
+    return Array.from(new Set(validatedIds));
+  } catch (error) {
+    console.error("Error validating mentions:", error);
+    return [];
+  }
+}
+
 export async function saveNote(noteData: NewCalendarNote | CalendarNote): Promise<CalendarNote | null> {
+    // Ensure current user is synced
+    await syncUserWithDatabase();
+
     const userId = await getCurrentUserIdOnServer();
+
+    const userTags = await extractAndValidateMentions(noteData.content);
     if (!userId) {
         console.error('saveNote: User not authenticated');
         return null;
@@ -73,7 +110,7 @@ export async function saveNote(noteData: NewCalendarNote | CalendarNote): Promis
         try {
             const [updatedNote] = await db
                 .update(calendarNotes)
-                .set({ ...noteData, updatedAt: new Date() })
+                .set({ ...noteData, userTags, updatedAt: new Date() })
                 .where(and(eq(calendarNotes.id, noteData.id), eq(calendarNotes.userId, userId)))
                 .returning();
             return updatedNote;
@@ -86,7 +123,7 @@ export async function saveNote(noteData: NewCalendarNote | CalendarNote): Promis
         try {
             const [newNote] = await db
                 .insert(calendarNotes)
-                .values({ ...noteData, userId })
+                .values({ ...noteData, userTags, userId })
                 .returning();
 
             if (newNote && newNote.chatId) {
diff --git a/lib/actions/users.ts b/lib/actions/users.ts
index 65a00de3..d1193730 100644
--- a/lib/actions/users.ts
+++ b/lib/actions/users.ts
@@ -1,12 +1,12 @@
-// File: lib/actions/users.ts
 'use server';
 
+import { db } from "@/lib/db";
+import { users as usersSchema } from "@/lib/db/schema";
+import { eq, ilike } from "drizzle-orm";
+import { getSupabaseUserAndSessionOnServer } from "@/lib/auth/get-current-user";
 import { revalidatePath, unstable_noStore as noStore } from 'next/cache';
-import fs from 'fs/promises';
-import path from 'path';
-
-// This is a placeholder for a database or other storage.
-// In a real application, you would interact with your database here.
+import * as fs from 'fs/promises';
+import * as path from 'path';
 
 // Define UserRole and User types
 export type UserRole = "admin" | "editor" | "viewer";
@@ -17,14 +17,14 @@ export interface User {
   role: UserRole;
 }
 
+// In-memory store for role management simulation
 let usersStore: Record<string, Array<User>> = {
-  'default-user': [ // Simulate a default user having some initial users
+  'default-user': [
     { id: '1', email: 'admin@example.com', role: 'admin' },
     { id: '2', email: 'editor@example.com', role: 'editor' },
   ],
 };
 
-// Simulate a delay to mimic network latency
 const simulateDBDelay = () => new Promise(resolve => setTimeout(resolve, 500));
 
 export async function getUsers(userId: string = 'default-user'): Promise<{ users: User[] }> {
@@ -32,7 +32,6 @@ export async function getUsers(userId: string = 'default-user'): Promise<{ users
   if (!usersStore[userId]) {
     usersStore[userId] = [];
   }
-  console.log(`[Action: getUsers] Fetched users for ${userId}:`, usersStore[userId]);
   return { users: usersStore[userId] };
 }
 
@@ -42,114 +41,86 @@ export async function addUser(userId: string = 'default-user', newUser: { email:
     usersStore[userId] = [];
   }
 
-  // Check if user already exists (simple check, real DB would handle this better)
   if (usersStore[userId].some(user => user.email === newUser.email)) {
-    console.warn(`[Action: addUser] User ${newUser.email} already exists for ${userId}`);
     return { error: 'User with this email already exists.' };
   }
 
   const userToAdd: User = { ...newUser, id: Math.random().toString(36).substr(2, 9) };
   usersStore[userId].push(userToAdd);
-  console.log(`[Action: addUser] Added user ${newUser.email} for ${userId}:`, userToAdd);
-  revalidatePath('/settings'); // Assuming settings page path, adjust if needed
+  revalidatePath('/settings');
   return { user: userToAdd };
 }
 
-export async function updateUserRole(userId: string = 'default-user', userEmail: string, newRole: UserRole): Promise<{ user?: User; error?: string }> {
-  await simulateDBDelay();
-  if (!usersStore[userId]) {
-    return { error: 'User list not found.' };
-  }
+/**
+ * Syncs the current authenticated user from Supabase to the local database.
+ */
+export async function syncUserWithDatabase() {
+  const { user } = await getSupabaseUserAndSessionOnServer();
+  if (!user) return null;
 
-  const userIndex = usersStore[userId].findIndex(user => user.email === userEmail);
-  if (userIndex === -1) {
-    console.warn(`[Action: updateUserRole] User ${userEmail} not found for ${userId}`);
-    return { error: 'User not found.' };
+  try {
+    const existingUser = await db.query.users.findFirst({
+      where: eq(usersSchema.id, user.id),
+    });
+
+    if (!existingUser) {
+      await db.insert(usersSchema).values({
+        id: user.id,
+        email: user.email,
+      });
+    } else if (existingUser.email !== user.email) {
+      await db.update(usersSchema)
+        .set({ email: user.email })
+        .where(eq(usersSchema.id, user.id));
+    }
+    return user.id;
+  } catch (error) {
+    console.error('Error syncing user:', error);
+    return null;
   }
-
-  usersStore[userId][userIndex].role = newRole;
-  console.log(`[Action: updateUserRole] Updated role for ${userEmail} to ${newRole} for ${userId}`);
-  revalidatePath('/settings');
-  return { user: usersStore[userId][userIndex] };
 }
 
-export async function removeUser(userId: string = 'default-user', userEmail: string): Promise<{ success?: boolean; error?: string }> {
-  await simulateDBDelay();
-  if (!usersStore[userId]) {
-    return { error: 'User list not found.' };
-  }
+/**
+ * Searches for users in the database by email prefix.
+ */
+export async function searchUsers(query: string) {
+  if (!query || query.length < 1) return [];
 
-  const initialLength = usersStore[userId].length;
-  usersStore[userId] = usersStore[userId].filter(user => user.email !== userEmail);
+  const searchTerm = query.startsWith('@') ? query.slice(1) : query;
 
-  if (usersStore[userId].length === initialLength) {
-    console.warn(`[Action: removeUser] User ${userEmail} not found for ${userId}`);
-    return { error: 'User not found.' };
+  try {
+    const results = await db.select()
+      .from(usersSchema)
+      .where(ilike(usersSchema.email, `${searchTerm}%`))
+      .limit(5);
+    return results;
+  } catch (error) {
+    console.error('Error searching users:', error);
+    return [];
   }
-
-  console.log(`[Action: removeUser] Removed user ${userEmail} for ${userId}`);
-  revalidatePath('/settings');
-  return { success: true };
-}
-
-// Example of how the settings form might use these actions (conceptual)
-export async function updateSettingsAndUsers(
-  userId: string = 'default-user',
-  formData: { users: Array<Omit<User, 'id'> & { id?: string }> } // Looser type for incoming, stricter for store
-): Promise<{ success: boolean; message?: string; users?: User[] }> {
-  // formData would contain systemPrompt, selectedModel, and the users array
-  console.log('[Action: updateSettingsAndUsers] Received data:', formData);
-
-  // Simulate saving systemPrompt and selectedModel
-  // ... (logic for other settings)
-
-  // For users, the frontend form already constructs the 'users' array.
-  // Here, we could compare the incoming users list with the stored one
-  // and make granular calls to addUser, updateUserRole, removeUser if needed,
-  // or simply replace the user list if that's the desired behavior.
-  // For simplicity in this simulation, let's assume the form sends the complete new user list.
-
-  await simulateDBDelay();
-  usersStore[userId] = formData.users.map((u): User => ({
-    id: u.id || Math.random().toString(36).substr(2, 9),
-    email: u.email,
-    role: u.role, // Assumes u.role is already UserRole, validation should occur before this action
-  }));
-
-  console.log(`[Action: updateSettingsAndUsers] Updated users for ${userId}:`, usersStore[userId]);
-  revalidatePath('/settings');
-  return { success: true, message: 'Settings and users updated successfully.', users: usersStore[userId] };
 }
 
+// Keep the model config logic
 const modelConfigPath = path.resolve(process.cwd(), 'config', 'model.json');
 
 export async function getSelectedModel(): Promise<string | null> {
   noStore();
-  console.log(`[DEBUG] getSelectedModel - Reading from path: "${modelConfigPath}"`);
   try {
     const data = await fs.readFile(modelConfigPath, 'utf8');
-    console.log(`[DEBUG] getSelectedModel - Raw file content: "${data}"`);
     const config = JSON.parse(data);
     return config.selectedModel || null;
   } catch (error) {
-    console.error('Error reading model config:', error);
-    console.log(`[DEBUG] getSelectedModel - Error reading file:`, error);
     return null;
   }
 }
 
 export async function saveSelectedModel(model: string): Promise<{ success: boolean; error?: string }> {
-  console.log(`[DEBUG] saveSelectedModel - Received model selection: "${model}"`);
-  console.log(`[DEBUG] saveSelectedModel - Writing to path: "${modelConfigPath}"`);
   try {
     const data = JSON.stringify({ selectedModel: model }, null, 2);
     await fs.writeFile(modelConfigPath, data, 'utf8');
-    console.log(`[DEBUG] saveSelectedModel - Successfully wrote to file.`);
     revalidatePath('/settings');
     return { success: true };
   } catch (error) {
-    console.error('Error saving model config:', error);
-    console.log(`[DEBUG] saveSelectedModel - Error writing to file:`, error);
     return { success: false, error: 'Failed to save selected model.' };
   }
 }
diff --git a/lib/db/schema.ts b/lib/db/schema.ts
index 4b7ef891..bb489004 100644
--- a/lib/db/schema.ts
+++ b/lib/db/schema.ts
@@ -9,7 +9,7 @@ import { relations } from 'drizzle-orm';
 // we'll include a basic one that can be referenced by chats and messages.
 export const users = pgTable('users', {
   id: uuid('id').primaryKey().defaultRandom(), // Assuming Supabase user IDs are UUIDs
-  // email: text('email'), // Supabase handles this in auth.users
+  email: text('email'), // Supabase handles this in auth.users
   // Other profile fields if necessary
 });
 
diff --git a/package.json b/package.json
index 87066925..ca1aed72 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "csv-parse": "^6.1.0",
     "dotenv": "^16.5.0",
     "drizzle-kit": "^0.31.1",
-    "drizzle-orm": "^0.29.0",
+    "drizzle-orm": "^0.45.1",
     "embla-carousel-react": "^8.6.0",
     "exa-js": "^1.6.13",
     "framer-motion": "^12.23.24",

From 57d9717eeccfa5bda1386284943de4815792b621 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Thu, 5 Feb 2026 14:39:54 +0000
Subject: [PATCH 2/5] fix: resolve site refresh and user persistence issues in
 settings

Co-authored-by: ngoiyaeric <115367894+ngoiyaeric@users.noreply.github.com>
---
 .../components/user-management-form.tsx       |   4 +-
 drizzle/migrations/0003_bent_cammi.sql        |   1 +
 drizzle/migrations/meta/0003_snapshot.json    | 293 ++++++++++++++++++
 drizzle/migrations/meta/_journal.json         |   7 +
 lib/actions/users.ts                          | 149 +++++++--
 lib/db/schema.ts                              |   3 +-
 6 files changed, 425 insertions(+), 32 deletions(-)
 create mode 100644 drizzle/migrations/0003_bent_cammi.sql
 create mode 100644 drizzle/migrations/meta/0003_snapshot.json

diff --git a/components/settings/components/user-management-form.tsx b/components/settings/components/user-management-form.tsx
index 2f9521df..229875a5 100644
--- a/components/settings/components/user-management-form.tsx
+++ b/components/settings/components/user-management-form.tsx
@@ -143,10 +143,10 @@ export function UserManagementForm({ form }: UserManagementFormProps) {
                     <TableCell>{user.email}</TableCell>
                     <TableCell className="capitalize">{user.role}</TableCell>
                     <TableCell className="text-right">
-                      <Button variant="ghost" size="icon" onClick={() => console.log('Edit user:', user.id)} className="mr-2">
+                      <Button type="button" variant="ghost" size="icon" onClick={() => console.log('Edit user:', user.id)} className="mr-2">
                         <Edit3 className="h-4 w-4" />
                       </Button>
-                      <Button variant="ghost" size="icon" onClick={() => remove(index)}>
+                      <Button type="button" variant="ghost" size="icon" onClick={() => remove(index)}>
                         <Trash2 className="h-4 w-4 text-destructive" />
                       </Button>
                     </TableCell>
diff --git a/drizzle/migrations/0003_bent_cammi.sql b/drizzle/migrations/0003_bent_cammi.sql
new file mode 100644
index 00000000..eaaefa23
--- /dev/null
+++ b/drizzle/migrations/0003_bent_cammi.sql
@@ -0,0 +1 @@
+ALTER TABLE "users" ADD COLUMN "role" text;
\ No newline at end of file
diff --git a/drizzle/migrations/meta/0003_snapshot.json b/drizzle/migrations/meta/0003_snapshot.json
new file mode 100644
index 00000000..6dd19dc8
--- /dev/null
+++ b/drizzle/migrations/meta/0003_snapshot.json
@@ -0,0 +1,293 @@
+{
+  "id": "dc77036d-3668-4921-8cbe-84c0293bb7ed",
+  "prevId": "7663b1d4-3242-4c63-8cc7-8c470a7c3433",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.calendar_notes": {
+      "name": "calendar_notes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date": {
+          "name": "date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location_tags": {
+          "name": "location_tags",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_tags": {
+          "name": "user_tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "map_feature_id": {
+          "name": "map_feature_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "calendar_notes_user_id_users_id_fk": {
+          "name": "calendar_notes_user_id_users_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "calendar_notes_chat_id_chats_id_fk": {
+          "name": "calendar_notes_chat_id_chats_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chats": {
+      "name": "chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Untitled Chat'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'private'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "chats_user_id_users_id_fk": {
+          "name": "chats_user_id_users_id_fk",
+          "tableFrom": "chats",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.messages": {
+      "name": "messages",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "messages_chat_id_chats_id_fk": {
+          "name": "messages_chat_id_chats_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "messages_user_id_users_id_fk": {
+          "name": "messages_user_id_users_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index d73450c8..01597a00 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -22,6 +22,13 @@
       "when": 1770300624066,
       "tag": "0002_add_email_to_users",
       "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "7",
+      "when": 1770302081113,
+      "tag": "0003_bent_cammi",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/actions/users.ts b/lib/actions/users.ts
index d1193730..01e7724b 100644
--- a/lib/actions/users.ts
+++ b/lib/actions/users.ts
@@ -1,5 +1,6 @@
 'use server';
 
+import crypto from "crypto";
 import { db } from "@/lib/db";
 import { users as usersSchema } from "@/lib/db/schema";
 import { eq, ilike } from "drizzle-orm";
@@ -17,38 +18,118 @@ export interface User {
   role: UserRole;
 }
 
-// In-memory store for role management simulation
-let usersStore: Record<string, Array<User>> = {
-  'default-user': [
-    { id: '1', email: 'admin@example.com', role: 'admin' },
-    { id: '2', email: 'editor@example.com', role: 'editor' },
-  ],
-};
-
-const simulateDBDelay = () => new Promise(resolve => setTimeout(resolve, 500));
-
+/**
+ * Fetches all users from the database.
+ */
 export async function getUsers(userId: string = 'default-user'): Promise<{ users: User[] }> {
-  await simulateDBDelay();
-  if (!usersStore[userId]) {
-    usersStore[userId] = [];
+  try {
+    const results = await db.select().from(usersSchema);
+    return { users: results as User[] };
+  } catch (error) {
+    console.error('Error fetching users:', error);
+    return { users: [] };
   }
-  return { users: usersStore[userId] };
 }
 
+/**
+ * Adds a new user to the database.
+ */
 export async function addUser(userId: string = 'default-user', newUser: { email: string; role: UserRole }): Promise<{ user?: User; error?: string }> {
-  await simulateDBDelay();
-  if (!usersStore[userId]) {
-    usersStore[userId] = [];
+  try {
+    // Check if user already exists
+    const existing = await db.select().from(usersSchema).where(eq(usersSchema.email, newUser.email)).limit(1);
+    if (existing.length > 0) {
+      return { error: 'User with this email already exists.' };
+    }
+
+    const [inserted] = await db.insert(usersSchema).values({
+      id: crypto.randomUUID(),
+      email: newUser.email,
+      role: newUser.role
+    }).returning();
+
+    return { user: inserted as User };
+  } catch (error) {
+    console.error('Error adding user:', error);
+    return { error: 'Failed to add user.' };
   }
+}
+
+/**
+ * Updates a user's role in the database.
+ */
+export async function updateUserRole(userId: string = 'default-user', userEmail: string, newRole: UserRole): Promise<{ user?: User; error?: string }> {
+  try {
+    const [updated] = await db.update(usersSchema)
+      .set({ role: newRole })
+      .where(eq(usersSchema.email, userEmail))
+      .returning();
 
-  if (usersStore[userId].some(user => user.email === newUser.email)) {
-    return { error: 'User with this email already exists.' };
+    if (!updated) return { error: 'User not found.' };
+    return { user: updated as User };
+  } catch (error) {
+    console.error('Error updating role:', error);
+    return { error: 'Failed to update user role.' };
   }
+}
 
-  const userToAdd: User = { ...newUser, id: Math.random().toString(36).substr(2, 9) };
-  usersStore[userId].push(userToAdd);
-  revalidatePath('/settings');
-  return { user: userToAdd };
+/**
+ * Removes a user from the database.
+ */
+export async function removeUser(userId: string = 'default-user', userEmail: string): Promise<{ success?: boolean; error?: string }> {
+  try {
+    const result = await db.delete(usersSchema)
+      .where(eq(usersSchema.email, userEmail))
+      .returning();
+
+    if (result.length === 0) return { error: 'User not found.' };
+    return { success: true };
+  } catch (error) {
+    console.error('Error removing user:', error);
+    return { error: 'Failed to remove user.' };
+  }
+}
+
+/**
+ * Updates settings and users (bulk update).
+ */
+export async function updateSettingsAndUsers(
+  userId: string = 'default-user',
+  formData: { users: Array<Omit<User, 'id'> & { id?: string }> }
+): Promise<{ success: boolean; message?: string; users?: User[] }> {
+  try {
+    const existingUsers = await db.select().from(usersSchema);
+    const incomingEmails = new Set(formData.users.map(u => u.email));
+
+    // Delete missing
+    const toDelete = existingUsers.filter(u => u.email && !incomingEmails.has(u.email));
+    for (const u of toDelete) {
+        if (u.email) await db.delete(usersSchema).where(eq(usersSchema.email, u.email));
+    }
+
+    // Upsert incoming
+    for (const u of formData.users) {
+        if (!u.email) continue;
+        const existing = existingUsers.find(ex => ex.email === u.email);
+        if (existing) {
+            await db.update(usersSchema)
+                .set({ role: u.role })
+                .where(eq(usersSchema.id, existing.id));
+        } else {
+            await db.insert(usersSchema).values({
+                id: u.id || crypto.randomUUID(),
+                email: u.email,
+                role: u.role
+            });
+        }
+    }
+
+    const updatedUsers = await db.select().from(usersSchema);
+    return { success: true, message: 'Settings and users updated successfully.', users: updatedUsers as User[] };
+  } catch (error) {
+    console.error('Error updating settings and users:', error);
+    return { success: false, message: 'Failed to update settings and users.' };
+  }
 }
 
 /**
@@ -56,7 +137,7 @@ export async function addUser(userId: string = 'default-user', newUser: { email:
  */
 export async function syncUserWithDatabase() {
   const { user } = await getSupabaseUserAndSessionOnServer();
-  if (!user) return null;
+  if (!user || !user.email) return null;
 
   try {
     const existingUser = await db.query.users.findFirst({
@@ -64,10 +145,21 @@ export async function syncUserWithDatabase() {
     });
 
     if (!existingUser) {
-      await db.insert(usersSchema).values({
-        id: user.id,
-        email: user.email,
-      });
+      // Check if user was added by email in settings
+      const existingByEmail = await db.select().from(usersSchema).where(eq(usersSchema.email, user.email)).limit(1);
+
+      if (existingByEmail.length > 0) {
+          // Update the placeholder ID with the real Supabase ID
+          await db.update(usersSchema)
+            .set({ id: user.id })
+            .where(eq(usersSchema.id, existingByEmail[0].id));
+      } else {
+          await db.insert(usersSchema).values({
+            id: user.id,
+            email: user.email,
+            role: 'viewer' // Default role for synced users
+          });
+      }
     } else if (existingUser.email !== user.email) {
       await db.update(usersSchema)
         .set({ email: user.email })
@@ -118,7 +210,6 @@ export async function saveSelectedModel(model: string): Promise<{ success: boole
   try {
     const data = JSON.stringify({ selectedModel: model }, null, 2);
     await fs.writeFile(modelConfigPath, data, 'utf8');
-    revalidatePath('/settings');
     return { success: true };
   } catch (error) {
     return { success: false, error: 'Failed to save selected model.' };
diff --git a/lib/db/schema.ts b/lib/db/schema.ts
index bb489004..1e66202a 100644
--- a/lib/db/schema.ts
+++ b/lib/db/schema.ts
@@ -9,7 +9,8 @@ import { relations } from 'drizzle-orm';
 // we'll include a basic one that can be referenced by chats and messages.
 export const users = pgTable('users', {
   id: uuid('id').primaryKey().defaultRandom(), // Assuming Supabase user IDs are UUIDs
-  email: text('email'), // Supabase handles this in auth.users
+  email: text('email').notNull(), // Supabase handles this in auth.users
+  role: text('role').notNull().default('viewer'),
   // Other profile fields if necessary
 });
 

From 0b81ac5890e1ca2ab7842088099c0f5ee066aba3 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Thu, 5 Feb 2026 15:25:50 +0000
Subject: [PATCH 3/5] fix: add in-memory fallback and restore resolution search
 functionality

Co-authored-by: ngoiyaeric <115367894+ngoiyaeric@users.noreply.github.com>
---
 lib/actions/calendar.ts |  57 +++++---
 lib/actions/users.ts    | 289 +++++++++++++++++++++++++---------------
 lib/db/index.ts         |  36 +++--
 3 files changed, 239 insertions(+), 143 deletions(-)

diff --git a/lib/actions/calendar.ts b/lib/actions/calendar.ts
index 5bf3e416..8b4afbc5 100644
--- a/lib/actions/calendar.ts
+++ b/lib/actions/calendar.ts
@@ -22,6 +22,11 @@ export async function getNotes(date: Date, chatId: string | null): Promise<Calen
     return []
   }
 
+  if (!db) {
+    console.warn('getNotes: Database unavailable, returning empty list');
+    return [];
+  }
+
   // Normalize date to the start of the day for consistent querying
   const startDate = new Date(date)
   startDate.setHours(0, 0, 0, 0)
@@ -50,7 +55,7 @@ export async function getNotes(date: Date, chatId: string | null): Promise<Calen
       .orderBy(desc(calendarNotes.createdAt))
       .execute()
 
-    return notes;
+    return notes as CalendarNote[];
 
   } catch (error) {
     console.error('Error fetching notes:', error)
@@ -58,11 +63,6 @@ export async function getNotes(date: Date, chatId: string | null): Promise<Calen
   }
 }
 
-/**
- * Saves a new note or updates an existing one.
- * @param noteData - The note data to save.
- * @returns A promise that resolves to the saved note or null if an error occurs.
- */
 /**
  * Extracts @mentions from content and validates them against the users table.
  */
@@ -73,38 +73,59 @@ async function extractAndValidateMentions(content: string): Promise<string[]> {
 
   if (potentialEmails.length === 0) return [];
 
+  // If no DB, we just store the strings themselves as a fallback?
+  // User asked for "tag user ... work in memory".
+  // Let's store the usernames as tags if DB is missing.
+  if (!db) {
+    return potentialEmails;
+  }
+
   try {
-    // Fetch all users to match against prefixes
-    // In a larger system, we would use a more optimized search
     const users = await db.select({ id: usersSchema.id, email: usersSchema.email })
       .from(usersSchema)
       .execute();
 
     const validatedIds: string[] = [];
-    potentialEmails.forEach(mention => {
-      const found = users.find(u => u.email?.toLowerCase().startsWith(mention.toLowerCase()));
+    potentialEmails.forEach((mention: string) => {
+      const found = users.find((u: any) => u.email?.toLowerCase().startsWith(mention.toLowerCase()));
       if (found) validatedIds.push(found.id);
+      else validatedIds.push(mention); // Fallback to raw string if not found
     });
 
     return Array.from(new Set(validatedIds));
   } catch (error) {
     console.error("Error validating mentions:", error);
-    return [];
+    return potentialEmails;
   }
 }
 
+/**
+ * Saves a new note or updates an existing one.
+ */
 export async function saveNote(noteData: NewCalendarNote | CalendarNote): Promise<CalendarNote | null> {
-    // Ensure current user is synced
-    await syncUserWithDatabase();
-
     const userId = await getCurrentUserIdOnServer();
-
-    const userTags = await extractAndValidateMentions(noteData.content);
     if (!userId) {
         console.error('saveNote: User not authenticated');
         return null;
     }
 
+    // Ensure current user is synced if possible
+    await syncUserWithDatabase();
+
+    const userTags = await extractAndValidateMentions(noteData.content);
+
+    if (!db) {
+      console.warn('saveNote: Database unavailable, returning mock saved note');
+      return {
+        ...noteData,
+        id: ('id' in noteData) ? noteData.id : Math.random().toString(36).substr(2, 9),
+        userId,
+        userTags,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      } as CalendarNote;
+    }
+
     if ('id' in noteData) {
         // Update existing note
         try {
@@ -113,7 +134,7 @@ export async function saveNote(noteData: NewCalendarNote | CalendarNote): Promis
                 .set({ ...noteData, userTags, updatedAt: new Date() })
                 .where(and(eq(calendarNotes.id, noteData.id), eq(calendarNotes.userId, userId)))
                 .returning();
-            return updatedNote;
+            return updatedNote as CalendarNote;
         } catch (error) {
             console.error('Error updating note:', error);
             return null;
@@ -139,7 +160,7 @@ export async function saveNote(noteData: NewCalendarNote | CalendarNote): Promis
                 await createMessage(calendarContextMessage);
             }
 
-            return newNote;
+            return newNote as CalendarNote;
         } catch (error) {
             console.error('Error creating note:', error);
             return null;
diff --git a/lib/actions/users.ts b/lib/actions/users.ts
index 01e7724b..8be56525 100644
--- a/lib/actions/users.ts
+++ b/lib/actions/users.ts
@@ -18,76 +18,128 @@ export interface User {
   role: UserRole;
 }
 
+// In-memory store for fallback/mock mode
+let usersStore: Record<string, Array<User>> = {
+  'default-user': [
+    { id: '1', email: 'admin@example.com', role: 'admin' },
+    { id: '2', email: 'editor@example.com', role: 'editor' },
+  ],
+};
+
+const simulateDBDelay = () => new Promise(resolve => setTimeout(resolve, 500));
+
 /**
- * Fetches all users from the database.
+ * Fetches all users. Fallbacks to in-memory if DB is unavailable.
  */
 export async function getUsers(userId: string = 'default-user'): Promise<{ users: User[] }> {
-  try {
-    const results = await db.select().from(usersSchema);
-    return { users: results as User[] };
-  } catch (error) {
-    console.error('Error fetching users:', error);
-    return { users: [] };
+  if (db) {
+    try {
+      const results = await db.select().from(usersSchema);
+      return { users: results as User[] };
+    } catch (error) {
+      console.error('Error fetching users from DB:', error);
+    }
+  }
+
+  // Fallback
+  await simulateDBDelay();
+  if (!usersStore[userId]) {
+    usersStore[userId] = [];
   }
+  return { users: usersStore[userId] };
 }
 
 /**
- * Adds a new user to the database.
+ * Adds a new user. Fallbacks to in-memory if DB is unavailable.
  */
 export async function addUser(userId: string = 'default-user', newUser: { email: string; role: UserRole }): Promise<{ user?: User; error?: string }> {
-  try {
-    // Check if user already exists
-    const existing = await db.select().from(usersSchema).where(eq(usersSchema.email, newUser.email)).limit(1);
-    if (existing.length > 0) {
-      return { error: 'User with this email already exists.' };
+  if (db) {
+    try {
+      const existing = await db.select().from(usersSchema).where(eq(usersSchema.email, newUser.email)).limit(1);
+      if (existing.length > 0) {
+        return { error: 'User with this email already exists.' };
+      }
+
+      const [inserted] = await db.insert(usersSchema).values({
+        id: crypto.randomUUID(),
+        email: newUser.email,
+        role: newUser.role
+      }).returning();
+
+      return { user: inserted as User };
+    } catch (error) {
+      console.error('Error adding user to DB:', error);
     }
+  }
 
-    const [inserted] = await db.insert(usersSchema).values({
-      id: crypto.randomUUID(),
-      email: newUser.email,
-      role: newUser.role
-    }).returning();
+  // Fallback
+  await simulateDBDelay();
+  if (!usersStore[userId]) {
+    usersStore[userId] = [];
+  }
 
-    return { user: inserted as User };
-  } catch (error) {
-    console.error('Error adding user:', error);
-    return { error: 'Failed to add user.' };
+  if (usersStore[userId].some(user => user.email === newUser.email)) {
+    return { error: 'User with this email already exists.' };
   }
+
+  const userToAdd: User = { ...newUser, id: Math.random().toString(36).substr(2, 9) };
+  usersStore[userId].push(userToAdd);
+  return { user: userToAdd };
 }
 
 /**
- * Updates a user's role in the database.
+ * Updates a user's role. Fallbacks to in-memory if DB is unavailable.
  */
 export async function updateUserRole(userId: string = 'default-user', userEmail: string, newRole: UserRole): Promise<{ user?: User; error?: string }> {
-  try {
-    const [updated] = await db.update(usersSchema)
-      .set({ role: newRole })
-      .where(eq(usersSchema.email, userEmail))
-      .returning();
+  if (db) {
+    try {
+      const [updated] = await db.update(usersSchema)
+        .set({ role: newRole })
+        .where(eq(usersSchema.email, userEmail))
+        .returning();
 
-    if (!updated) return { error: 'User not found.' };
-    return { user: updated as User };
-  } catch (error) {
-    console.error('Error updating role:', error);
-    return { error: 'Failed to update user role.' };
+      if (updated) return { user: updated as User };
+    } catch (error) {
+      console.error('Error updating role in DB:', error);
+    }
   }
+
+  // Fallback
+  await simulateDBDelay();
+  if (!usersStore[userId]) return { error: 'User list not found.' };
+
+  const userIndex = usersStore[userId].findIndex(user => user.email === userEmail);
+  if (userIndex === -1) return { error: 'User not found.' };
+
+  usersStore[userId][userIndex].role = newRole;
+  return { user: usersStore[userId][userIndex] };
 }
 
 /**
- * Removes a user from the database.
+ * Removes a user. Fallbacks to in-memory if DB is unavailable.
  */
 export async function removeUser(userId: string = 'default-user', userEmail: string): Promise<{ success?: boolean; error?: string }> {
-  try {
-    const result = await db.delete(usersSchema)
-      .where(eq(usersSchema.email, userEmail))
-      .returning();
+  if (db) {
+    try {
+      const result = await db.delete(usersSchema)
+        .where(eq(usersSchema.email, userEmail))
+        .returning();
 
-    if (result.length === 0) return { error: 'User not found.' };
-    return { success: true };
-  } catch (error) {
-    console.error('Error removing user:', error);
-    return { error: 'Failed to remove user.' };
+      if (result.length > 0) return { success: true };
+    } catch (error) {
+      console.error('Error removing user from DB:', error);
+    }
   }
+
+  // Fallback
+  await simulateDBDelay();
+  if (!usersStore[userId]) return { error: 'User list not found.' };
+
+  const initialLength = usersStore[userId].length;
+  usersStore[userId] = usersStore[userId].filter(user => user.email !== userEmail);
+
+  if (usersStore[userId].length === initialLength) return { error: 'User not found.' };
+  return { success: true };
 }
 
 /**
@@ -97,99 +149,114 @@ export async function updateSettingsAndUsers(
   userId: string = 'default-user',
   formData: { users: Array<Omit<User, 'id'> & { id?: string }> }
 ): Promise<{ success: boolean; message?: string; users?: User[] }> {
-  try {
-    const existingUsers = await db.select().from(usersSchema);
-    const incomingEmails = new Set(formData.users.map(u => u.email));
+  if (db) {
+    try {
+        const existingUsers = await db.select().from(usersSchema);
+        const incomingEmails = new Set(formData.users.map(u => u.email));
 
-    // Delete missing
-    const toDelete = existingUsers.filter(u => u.email && !incomingEmails.has(u.email));
-    for (const u of toDelete) {
-        if (u.email) await db.delete(usersSchema).where(eq(usersSchema.email, u.email));
-    }
+        // Delete missing
+        const toDelete = existingUsers.filter((u: any) => u.email && !incomingEmails.has(u.email));
+        for (const u of toDelete) {
+            if (u.email) await db.delete(usersSchema).where(eq(usersSchema.email, u.email));
+        }
 
-    // Upsert incoming
-    for (const u of formData.users) {
-        if (!u.email) continue;
-        const existing = existingUsers.find(ex => ex.email === u.email);
-        if (existing) {
-            await db.update(usersSchema)
-                .set({ role: u.role })
-                .where(eq(usersSchema.id, existing.id));
-        } else {
-            await db.insert(usersSchema).values({
-                id: u.id || crypto.randomUUID(),
-                email: u.email,
-                role: u.role
-            });
+        // Upsert incoming
+        for (const u of formData.users) {
+            if (!u.email) continue;
+            const existing = existingUsers.find((ex: any) => ex.email === u.email);
+            if (existing) {
+                await db.update(usersSchema)
+                    .set({ role: u.role })
+                    .where(eq(usersSchema.id, existing.id));
+            } else {
+                await db.insert(usersSchema).values({
+                    id: u.id || crypto.randomUUID(),
+                    email: u.email,
+                    role: u.role
+                });
+            }
         }
-    }
 
-    const updatedUsers = await db.select().from(usersSchema);
-    return { success: true, message: 'Settings and users updated successfully.', users: updatedUsers as User[] };
-  } catch (error) {
-    console.error('Error updating settings and users:', error);
-    return { success: false, message: 'Failed to update settings and users.' };
+        const updatedUsers = await db.select().from(usersSchema);
+        return { success: true, message: 'Settings and users updated successfully.', users: updatedUsers as User[] };
+    } catch (error) {
+        console.error('Error updating settings and users in DB:', error);
+    }
   }
+
+  // Fallback
+  await simulateDBDelay();
+  usersStore[userId] = formData.users.map((u): User => ({
+    id: u.id || Math.random().toString(36).substr(2, 9),
+    email: u.email,
+    role: u.role as UserRole,
+  }));
+  return { success: true, message: 'Settings updated (In-Memory).', users: usersStore[userId] };
 }
 
 /**
- * Syncs the current authenticated user from Supabase to the local database.
+ * Syncs the current authenticated user.
  */
 export async function syncUserWithDatabase() {
   const { user } = await getSupabaseUserAndSessionOnServer();
   if (!user || !user.email) return null;
 
-  try {
-    const existingUser = await db.query.users.findFirst({
-      where: eq(usersSchema.id, user.id),
-    });
-
-    if (!existingUser) {
-      // Check if user was added by email in settings
-      const existingByEmail = await db.select().from(usersSchema).where(eq(usersSchema.email, user.email)).limit(1);
-
-      if (existingByEmail.length > 0) {
-          // Update the placeholder ID with the real Supabase ID
-          await db.update(usersSchema)
-            .set({ id: user.id })
-            .where(eq(usersSchema.id, existingByEmail[0].id));
-      } else {
-          await db.insert(usersSchema).values({
-            id: user.id,
-            email: user.email,
-            role: 'viewer' // Default role for synced users
-          });
+  if (db) {
+    try {
+      const existingUser = await db.query.users.findFirst({
+        where: eq(usersSchema.id, user.id),
+      });
+
+      if (!existingUser) {
+        const existingByEmail = await db.select().from(usersSchema).where(eq(usersSchema.email, user.email)).limit(1);
+
+        if (existingByEmail.length > 0) {
+            await db.update(usersSchema)
+              .set({ id: user.id })
+              .where(eq(usersSchema.id, existingByEmail[0].id));
+        } else {
+            await db.insert(usersSchema).values({
+              id: user.id,
+              email: user.email,
+              role: 'viewer'
+            });
+        }
+      } else if (existingUser.email !== user.email) {
+        await db.update(usersSchema)
+          .set({ email: user.email })
+          .where(eq(usersSchema.id, user.id));
       }
-    } else if (existingUser.email !== user.email) {
-      await db.update(usersSchema)
-        .set({ email: user.email })
-        .where(eq(usersSchema.id, user.id));
+      return user.id;
+    } catch (error) {
+      console.error('Error syncing user with DB:', error);
     }
-    return user.id;
-  } catch (error) {
-    console.error('Error syncing user:', error);
-    return null;
   }
+
+  return user.id; // Just return ID in in-memory mode
 }
 
 /**
- * Searches for users in the database by email prefix.
+ * Searches for users by email prefix.
  */
 export async function searchUsers(query: string) {
   if (!query || query.length < 1) return [];
-
   const searchTerm = query.startsWith('@') ? query.slice(1) : query;
 
-  try {
-    const results = await db.select()
-      .from(usersSchema)
-      .where(ilike(usersSchema.email, `${searchTerm}%`))
-      .limit(5);
-    return results;
-  } catch (error) {
-    console.error('Error searching users:', error);
-    return [];
+  if (db) {
+    try {
+      const results = await db.select()
+        .from(usersSchema)
+        .where(ilike(usersSchema.email, `${searchTerm}%`))
+        .limit(5);
+      return results;
+    } catch (error) {
+      console.error('Error searching users in DB:', error);
+    }
   }
+
+  // Fallback: search in memory store (all users across all simulated contexts for convenience)
+  const allInMemoryUsers = Object.values(usersStore).flat();
+  return allInMemoryUsers.filter(u => u.email?.toLowerCase().startsWith(searchTerm.toLowerCase())).slice(0, 5);
 }
 
 // Keep the model config logic
diff --git a/lib/db/index.ts b/lib/db/index.ts
index 0283d9a3..c705fce7 100644
--- a/lib/db/index.ts
+++ b/lib/db/index.ts
@@ -1,25 +1,33 @@
 import { drizzle } from 'drizzle-orm/node-postgres';
-import { Pool, type PoolConfig } from 'pg'; // Uses Pool from pg, import PoolConfig
+import { Pool, type PoolConfig } from 'pg';
 import * as dotenv from 'dotenv';
 import * as schema from './schema';
 
 dotenv.config({ path: '.env.local' });
 
-if (!process.env.DATABASE_URL) {
-  throw new Error('DATABASE_URL environment variable is not set for Drizzle client');
-}
+const databaseUrl = process.env.DATABASE_URL;
 
-const poolConfig: PoolConfig = {
-  connectionString: process.env.DATABASE_URL,
-};
+let dbInstance: any = null;
 
-// Conditionally apply SSL for Supabase URLs
-if (process.env.DATABASE_URL && process.env.DATABASE_URL.includes('supabase.co')) {
-  poolConfig.ssl = {
-    rejectUnauthorized: false,
+if (databaseUrl) {
+  const poolConfig: PoolConfig = {
+    connectionString: databaseUrl,
   };
-}
 
-const pool = new Pool(poolConfig);
+  if (databaseUrl.includes('supabase.co')) {
+    poolConfig.ssl = {
+      rejectUnauthorized: false,
+    };
+  }
+
+  try {
+    const pool = new Pool(poolConfig);
+    dbInstance = drizzle(pool, { schema, logger: process.env.NODE_ENV === 'development' });
+  } catch (error) {
+    console.error('Failed to initialize Drizzle with DATABASE_URL:', error);
+  }
+} else {
+  console.warn('DATABASE_URL is not set. Database features will be disabled.');
+}
 
-export const db = drizzle(pool, { schema, logger: process.env.NODE_ENV === 'development' });
+export const db = dbInstance;

From 8d9d1c468eeb54f190a2ad99dc9b8b9f567e1943 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 6 Feb 2026 12:21:44 +0000
Subject: [PATCH 4/5] fix: resolve build error and final user management
 improvements

Co-authored-by: ngoiyaeric <115367894+ngoiyaeric@users.noreply.github.com>
---
 drizzle/migrations/0004_tense_darkstar.sql |   3 +
 drizzle/migrations/meta/0004_snapshot.json | 294 +++++++++++++++++++++
 drizzle/migrations/meta/_journal.json      |   7 +
 lib/actions/chat-db.ts                     |   2 +-
 4 files changed, 305 insertions(+), 1 deletion(-)
 create mode 100644 drizzle/migrations/0004_tense_darkstar.sql
 create mode 100644 drizzle/migrations/meta/0004_snapshot.json

diff --git a/drizzle/migrations/0004_tense_darkstar.sql b/drizzle/migrations/0004_tense_darkstar.sql
new file mode 100644
index 00000000..e3823b44
--- /dev/null
+++ b/drizzle/migrations/0004_tense_darkstar.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "users" ALTER COLUMN "email" SET NOT NULL;--> statement-breakpoint
+ALTER TABLE "users" ALTER COLUMN "role" SET DEFAULT 'viewer';--> statement-breakpoint
+ALTER TABLE "users" ALTER COLUMN "role" SET NOT NULL;
\ No newline at end of file
diff --git a/drizzle/migrations/meta/0004_snapshot.json b/drizzle/migrations/meta/0004_snapshot.json
new file mode 100644
index 00000000..41e4140e
--- /dev/null
+++ b/drizzle/migrations/meta/0004_snapshot.json
@@ -0,0 +1,294 @@
+{
+  "id": "a6dfcf10-c527-44c2-ab1c-d01e48cb990a",
+  "prevId": "dc77036d-3668-4921-8cbe-84c0293bb7ed",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.calendar_notes": {
+      "name": "calendar_notes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date": {
+          "name": "date",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location_tags": {
+          "name": "location_tags",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_tags": {
+          "name": "user_tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "map_feature_id": {
+          "name": "map_feature_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "calendar_notes_user_id_users_id_fk": {
+          "name": "calendar_notes_user_id_users_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "calendar_notes_chat_id_chats_id_fk": {
+          "name": "calendar_notes_chat_id_chats_id_fk",
+          "tableFrom": "calendar_notes",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chats": {
+      "name": "chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Untitled Chat'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'private'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "chats_user_id_users_id_fk": {
+          "name": "chats_user_id_users_id_fk",
+          "tableFrom": "chats",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.messages": {
+      "name": "messages",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "messages_chat_id_chats_id_fk": {
+          "name": "messages_chat_id_chats_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "chats",
+          "columnsFrom": [
+            "chat_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "messages_user_id_users_id_fk": {
+          "name": "messages_user_id_users_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'viewer'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index 01597a00..8937ed4d 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -29,6 +29,13 @@
       "when": 1770302081113,
       "tag": "0003_bent_cammi",
       "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "7",
+      "when": 1770380396966,
+      "tag": "0004_tense_darkstar",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/actions/chat-db.ts b/lib/actions/chat-db.ts
index 4f0559ec..a53bb7f2 100644
--- a/lib/actions/chat-db.ts
+++ b/lib/actions/chat-db.ts
@@ -87,7 +87,7 @@ export async function saveChat(chatData: NewChat, messagesData: Omit<NewMessage,
   }
 
   // Transaction to ensure atomicity
-  return db.transaction(async (tx) => {
+  return db.transaction(async (tx: any) => {
     let chatId = chatData.id;
 
     if (chatId) { // If chat ID is provided, assume update or append messages

From 9141d6b096d11b5d1710000da597c488273cf403 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 6 Feb 2026 13:17:44 +0000
Subject: [PATCH 5/5] fix: improve notepad UI and discoverability of location
 tagging

Co-authored-by: ngoiyaeric <115367894+ngoiyaeric@users.noreply.github.com>
---
 components/calendar-notepad.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/calendar-notepad.tsx b/components/calendar-notepad.tsx
index 433f0271..839120ae 100644
--- a/components/calendar-notepad.tsx
+++ b/components/calendar-notepad.tsx
@@ -181,7 +181,7 @@ export function CalendarNotepad({ chatId }: CalendarNotepadProps) {
             rows={3}
           />
           {showSuggestions && (
-            <div className="absolute bottom-full mb-2 w-full bg-background border rounded-md shadow-lg z-50 p-1 max-h-40 overflow-y-auto">
+            <div className="absolute top-full mt-2 w-full bg-background border rounded-md shadow-lg z-50 p-1 max-h-40 overflow-y-auto">
               {userSuggestions.map(user => (
                 <button
                   key={user.id}
@@ -197,7 +197,7 @@ export function CalendarNotepad({ chatId }: CalendarNotepadProps) {
           )}
           <button
             onClick={handleTagLocation}
-            className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
+            className="absolute right-2 top-2 text-muted-foreground hover:text-foreground" title="Tag current map location"
           >
             <MapPin className="h-5 w-5" />
           </button>