relic 0.4.3 → 0.4.4

package/dist/cli.js

@@ -11450,7 +11450,38 @@ var init_crypto2 = __esm(() => {
 });
 
 // ../../packages/auth/src/password.ts
+import { existsSync as existsSync3, readFileSync as readFileSync2, rmSync, writeFileSync as writeFileSync3 } from "fs";
 import { resolve as resolve3 } from "path";
+function readPasswordMetadata() {
+  try {
+    if (!existsSync3(PASSWORD_METADATA_FILE))
+      return null;
+    let raw = JSON.parse(readFileSync2(PASSWORD_METADATA_FILE, "utf-8"));
+    if (typeof raw.userId !== "string" || raw.userId.length === 0)
+      return null;
+    return {
+      userId: raw.userId,
+      email: typeof raw.email === "string" ? raw.email : void 0,
+      savedAt: typeof raw.savedAt === "number" ? raw.savedAt : Date.now()
+    };
+  } catch {
+    return null;
+  }
+}
+function writePasswordMetadata(account) {
+  if (!account.userId)
+    return;
+  writeFileSync3(PASSWORD_METADATA_FILE, JSON.stringify({
+    userId: account.userId,
+    email: account.email,
+    savedAt: Date.now()
+  }, null, 2));
+}
+function clearPasswordMetadata() {
+  try {
+    rmSync(PASSWORD_METADATA_FILE, { force: !0 });
+  } catch (_5) {}
+}
 async function ensureConfigDir2() {
   let { mkdir: mkdir2, chmod: chmod2 } = await import("fs/promises");
   try {
@@ -11511,15 +11542,33 @@ async function hasPassword() {
   let password = await getPasswordFromStorage();
   return password !== null && password.length > 0;
 }
-async function savePassword(password) {
-  await savePasswordToStorage(password);
+async function hasPasswordForAccount(account) {
+  let password = await getPasswordFromStorage();
+  if (!password)
+    return !1;
+  let metadata = readPasswordMetadata(), canVerifyAgainstKeys = !!account.encryptedPrivateKey && !!account.salt;
+  if (metadata?.userId && metadata.userId !== account.userId)
+    return !1;
+  if (!canVerifyAgainstKeys)
+    return metadata?.userId === account.userId;
+  let { encryptedPrivateKey, salt } = account;
+  if (!encryptedPrivateKey || !salt)
+    return !1;
+  let isValid = await verifyPasswordWithExistingKeys(password, encryptedPrivateKey, salt);
+  if (isValid && metadata?.userId !== account.userId)
+    await ensureConfigDir2(), writePasswordMetadata(account);
+  return isValid;
+}
+async function savePassword(password, account) {
+  if (await savePasswordToStorage(password), account)
+    await ensureConfigDir2(), writePasswordMetadata(account);
 }
 async function verifyPassword(password) {
   let stored = await getPasswordFromStorage();
   return stored !== null && stored === password;
 }
 async function clearPassword() {
-  await deletePasswordFromStorage();
+  await deletePasswordFromStorage(), clearPasswordMetadata();
 }
 function checkPasswordRequirements(password) {
   return [
@@ -11578,10 +11627,10 @@ function getConfigDir2() {
 function getPasswordFilePath() {
   return PASSWORD_FILE;
 }
-var HOME3, CONFIG_DIR3, PASSWORD_FILE, SECRETS_SERVICE = "com.relic.tui", SECRETS_NAME = "master-password", ENV_PASSWORD_KEY = "RELIC_PASSWORD", MIN_PASSWORD_LENGTH = 8;
+var HOME3, CONFIG_DIR3, PASSWORD_FILE, PASSWORD_METADATA_FILE, SECRETS_SERVICE = "com.relic.tui", SECRETS_NAME = "master-password", ENV_PASSWORD_KEY = "RELIC_PASSWORD", MIN_PASSWORD_LENGTH = 8;
 var init_password = __esm(() => {
   init_crypto2();
-  HOME3 = process.env.HOME || process.env.USERPROFILE || "~", CONFIG_DIR3 = process.platform === "win32" ? resolve3(HOME3, "AppData", "Roaming", "relic") : resolve3(HOME3, ".config", "relic"), PASSWORD_FILE = resolve3(CONFIG_DIR3, "password");
+  HOME3 = process.env.HOME || process.env.USERPROFILE || "~", CONFIG_DIR3 = process.platform === "win32" ? resolve3(HOME3, "AppData", "Roaming", "relic") : resolve3(HOME3, ".config", "relic"), PASSWORD_FILE = resolve3(CONFIG_DIR3, "password"), PASSWORD_METADATA_FILE = resolve3(CONFIG_DIR3, "password-meta.json");
 });
 
 // ../../packages/auth/src/userKeyCache.ts
@@ -11663,6 +11712,7 @@ __export(exports_auth, {
   isAuthorizationDenied: () => isAuthorizationDenied,
   initializeUserKeyCacheSchema: () => initializeSchema,
   hasValidSession: () => hasValidSession,
+  hasPasswordForAccount: () => hasPasswordForAccount,
   hasPassword: () => hasPassword,
   getUserKeyCacheDb: () => getUserKeyCacheDb,
   getStrengthColor: () => getStrengthColor,
@@ -13393,7 +13443,7 @@ import { EventEmitter as EventEmitter3 } from "events";
 import { resolve as resolve6, dirname as dirname4 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { resolve as resolve22, isAbsolute, parse as parse2 } from "path";
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { basename, join as join2 } from "path";
 import os3 from "os";
 import path2 from "path";
@@ -23236,7 +23286,7 @@ var init_index_h33hh1n5 = __esm(async () => {
         worker_path = OTUI_TREE_SITTER_WORKER_PATH;
       else if (this.options.workerPath)
         worker_path = this.options.workerPath;
-      else if (worker_path = new URL("./parser.worker.js", import.meta.url).href, !existsSync3(resolve22(import.meta.dirname, "parser.worker.js")))
+      else if (worker_path = new URL("./parser.worker.js", import.meta.url).href, !existsSync4(resolve22(import.meta.dirname, "parser.worker.js")))
         worker_path = new URL("./parser.worker.ts", import.meta.url).href;
       this.worker = new Worker(worker_path), this.worker.onmessage = this.handleWorkerMessage.bind(this), this.worker.onerror = (error) => {
         if (console.error("TreeSitter worker error:", error.message), this.initializeResolvers)
@@ -54532,8 +54582,8 @@ var init_constants2 = __esm(() => {
   }, KEY_SYMBOLS = {
     enter: "enter"
   }, PRICING = {
-    seatPrice: "$5",
-    projectPrice: "$10"
+    seatPrice: "$1",
+    projectPrice: "$2"
   }, SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"], DASHBOARD_URL = `${SITE_URL}/dashboard`;
 });
 
@@ -55391,78 +55441,10 @@ var init_api4 = __esm(() => {
   logger4 = createLogger2("tui");
 });
 
-// ../../packages/tui/utils/mappers.ts
-function mapApiEnvironment(apiEnv) {
-  return {
-    id: apiEnv.id,
-    name: apiEnv.name
-  };
-}
-function mapApiFolder(apiFolder) {
-  return {
-    id: apiFolder.id,
-    name: apiFolder.name,
-    environmentId: apiFolder.environmentId
-  };
-}
-function mapApiSecret(apiSecret) {
-  return {
-    id: apiSecret.id,
-    key: apiSecret.key,
-    value: void 0,
-    encryptedValue: apiSecret.encryptedValue,
-    type: apiSecret.valueType === "string" ? "string" : apiSecret.valueType === "number" ? "number" : apiSecret.valueType === "boolean" ? "boolean" : "string",
-    scope: apiSecret.scope,
-    folderId: apiSecret.folderId,
-    environmentId: apiSecret.environmentId
-  };
-}
-function getUserDisplayName(user) {
-  return user.name || user.email.split("@")[0] || "User";
-}
-
-// ../../packages/tui/hooks/useCurrentUser.ts
-function useCurrentUser() {
-  let [user, setUser] = import_react26.useState(null), [hasKeys, setHasKeys] = import_react26.useState(!1), [isLoading, setIsLoading] = import_react26.useState(!0), [error, setError] = import_react26.useState(null), fetchUser = import_react26.useCallback(async () => {
-    setIsLoading(!0), setError(null);
-    try {
-      let api2 = getProtectedApi();
-      await api2.ensureAuth();
-      let [currentUser, userHasKeys] = await Promise.all([
-        api2.getCurrentUser(),
-        api2.hasUserKeys()
-      ]);
-      setUser(currentUser), setHasKeys(userHasKeys);
-    } catch (err) {
-      setError(err instanceof Error ? err : Error("Failed to fetch user"));
-    } finally {
-      setIsLoading(!1);
-    }
-  }, []);
-  import_react26.useEffect(() => {
-    fetchUser();
-  }, [fetchUser]);
-  let displayName = user ? getUserDisplayName(user) : "User";
-  return {
-    user,
-    displayName,
-    isLoading,
-    error,
-    refetch: fetchUser,
-    hasKeys,
-    hasPro: user?.hasPro ?? !1
-  };
-}
-var import_react26;
-var init_useCurrentUser = __esm(() => {
-  init_api4();
-  import_react26 = __toESM(require_react_development(), 1);
-});
-
 // ../../packages/tui/hooks/useCursorBlink.ts
 function useCursorBlink(shouldBlink) {
-  let [cursorVisible, setCursorVisible] = import_react27.useState(!0);
-  return import_react27.useEffect(() => {
+  let [cursorVisible, setCursorVisible] = import_react26.useState(!0);
+  return import_react26.useEffect(() => {
     if (!shouldBlink) {
       setCursorVisible(!0);
       return;
@@ -55473,9 +55455,9 @@ function useCursorBlink(shouldBlink) {
     return () => clearInterval(interval);
   }, [shouldBlink]), cursorVisible;
 }
-var import_react27;
+var import_react26;
 var init_useCursorBlink = __esm(() => {
-  import_react27 = __toESM(require_react_development(), 1);
+  import_react26 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/hooks/useInput.ts
@@ -55507,14 +55489,14 @@ function wordBoundaryAfter(str, pos) {
   return p2;
 }
 function useSingleLineInput(options = {}) {
-  let { initialValue = "", maxLength = 1000, onSubmit } = options, [value, setValue] = import_react28.useState(initialValue), [cursor, setCursor] = import_react28.useState(0), stateRef = import_react28.useRef({ value, cursor });
+  let { initialValue = "", maxLength = 1000, onSubmit } = options, [value, setValue] = import_react27.useState(initialValue), [cursor, setCursor] = import_react27.useState(0), stateRef = import_react27.useRef({ value, cursor });
   stateRef.current = { value, cursor };
-  let reset = import_react28.useCallback(() => {
+  let reset = import_react27.useCallback(() => {
     setValue(initialValue), setCursor(0);
-  }, [initialValue]), handlePaste = import_react28.useCallback((text) => {
+  }, [initialValue]), handlePaste = import_react27.useCallback((text) => {
     let current = stateRef.current, result = insertAt(current.value, current.cursor, text, maxLength);
     setValue(result.value), setCursor(result.cursor), stateRef.current = result;
-  }, [maxLength]), handleKey = import_react28.useCallback((key) => {
+  }, [maxLength]), handleKey = import_react27.useCallback((key) => {
     if (key.name === "return" && onSubmit)
       return onSubmit(value), !0;
     if (key.name === "escape")
@@ -55582,12 +55564,12 @@ function indexToPosition(value, index) {
   return { line: lines.length - 1, column: lines[lines.length - 1]?.length ?? 0 };
 }
 function useMultiLineInput(options = {}) {
-  let { initialValue = "", maxLines = 100 } = options, [value, setValue] = import_react28.useState(initialValue), [cursor, setCursor] = import_react28.useState({ line: 0, column: 0 }), stateRef = import_react28.useRef({ value, cursor });
+  let { initialValue = "", maxLines = 100 } = options, [value, setValue] = import_react27.useState(initialValue), [cursor, setCursor] = import_react27.useState({ line: 0, column: 0 }), stateRef = import_react27.useRef({ value, cursor });
   stateRef.current = { value, cursor };
   let lines = value.split(`
-`), reset = import_react28.useCallback(() => {
+`), reset = import_react27.useCallback(() => {
     setValue(initialValue), setCursor({ line: 0, column: 0 });
-  }, [initialValue]), handlePaste = import_react28.useCallback((text) => {
+  }, [initialValue]), handlePaste = import_react27.useCallback((text) => {
     let current = stateRef.current, currentLines = current.value.split(`
 `), index = linesToPosition(currentLines, current.cursor), newValue = current.value.slice(0, index) + text + current.value.slice(index);
     if (newValue.split(`
@@ -55596,7 +55578,7 @@ function useMultiLineInput(options = {}) {
     setValue(newValue);
     let newCursor = indexToPosition(newValue, index + text.length);
     setCursor(newCursor), stateRef.current = { value: newValue, cursor: newCursor };
-  }, [maxLines]), handleKey = import_react28.useCallback((key) => {
+  }, [maxLines]), handleKey = import_react27.useCallback((key) => {
     let currentLine = lines[cursor.line] || "";
     if (key.name === "a" && key.ctrl)
       return setCursor({ ...cursor, column: 0 }), !0;
@@ -55687,15 +55669,15 @@ ${value.slice(index)}`), setCursor({ line: cursor.line + 1, column: 0 }), !0;
   }, [value, cursor, lines, maxLines]);
   return { value, lines, cursor, setValue, setCursor, reset, handleKey, handlePaste };
 }
-var import_react28;
+var import_react27;
 var init_useInput = __esm(() => {
-  import_react28 = __toESM(require_react_development(), 1);
+  import_react27 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/hooks/usePaste.ts
 function usePaste(callback) {
-  let callbackRef = import_react29.useRef(callback);
-  callbackRef.current = callback, import_react29.useEffect(() => {
+  let callbackRef = import_react28.useRef(callback);
+  callbackRef.current = callback, import_react28.useEffect(() => {
     let stdin2 = process.stdin, pasteBuffer = "", isPasting = !1, handleData = (data) => {
       if (data.includes("\x1B[200~"))
         isPasting = !0, data = data.replace(/\x1b\[200~/g, "");
@@ -55723,9 +55705,9 @@ function usePaste(callback) {
     };
   }, []);
 }
-var import_react29;
+var import_react28;
 var init_usePaste = __esm(() => {
-  import_react29 = __toESM(require_react_development(), 1);
+  import_react28 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/components/forms/InlineInput.tsx
@@ -55749,11 +55731,11 @@ function InlineInput({
   onSubmit,
   onCancel
 }) {
-  let input = useSingleLineInput({ maxLength, initialValue, onSubmit }), cursorVisible = useCursorBlink(active), submittedRef = import_react31.useRef(!1);
-  import_react31.useEffect(() => {
+  let input = useSingleLineInput({ maxLength, initialValue, onSubmit }), cursorVisible = useCursorBlink(active), submittedRef = import_react30.useRef(!1);
+  import_react30.useEffect(() => {
     if (active)
       submittedRef.current = !1;
-  }, [active]), import_react31.useEffect(() => {
+  }, [active]), import_react30.useEffect(() => {
     onChange?.(input.value);
   }, [input.value, onChange]), usePaste((text) => {
     if (!active)
@@ -55865,7 +55847,7 @@ function InlineInput({
     ]
   }, void 0, !0, void 0, this);
 }
-var import_react31;
+var import_react30;
 var init_InlineInput = __esm(async () => {
   init_useCursorBlink();
   init_useInput();
@@ -55873,7 +55855,7 @@ var init_InlineInput = __esm(async () => {
   init_constants2();
   init_jsx_dev_runtime();
   await init_react();
-  import_react31 = __toESM(require_react_development(), 1);
+  import_react30 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/components/modals/CommandPaletteModal.tsx
@@ -55895,7 +55877,7 @@ function CommandPaletteModal(props) {
   }, void 0, !1, void 0, this);
 }
 function SmartCommandPaletteModal({ commands, onClose, onExecute }) {
-  let [selectedIndex, setSelectedIndex] = import_react33.useState(0), findNextIndex = (current, direction) => {
+  let [selectedIndex, setSelectedIndex] = import_react32.useState(0), findNextIndex = (current, direction) => {
     let next = current, attempts = commands.length;
     do
       next = direction === 1 ? (next + 1) % commands.length : (next - 1 + commands.length) % commands.length, attempts--;
@@ -56068,12 +56050,12 @@ function CommandPaletteDisplay({
     ]
   }, void 0, !0, void 0, this);
 }
-var import_react33;
+var import_react32;
 var init_CommandPaletteModal = __esm(async () => {
   init_constants2();
   init_jsx_dev_runtime();
   await init_react();
-  import_react33 = __toESM(require_react_development(), 1);
+  import_react32 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/components/shared/Modal.tsx
@@ -56312,15 +56294,15 @@ function UrlOpenModal({
   hint,
   autoOpenDelay = 1500
 }) {
-  let { isRunning } = useTaskQueue(), [status, setStatus] = import_react37.useState("pending");
-  if (import_react37.useEffect(() => {
+  let { isRunning } = useTaskQueue(), [status, setStatus] = import_react36.useState("pending");
+  if (import_react36.useEffect(() => {
     if (visible && url && status === "pending") {
       let timer = setTimeout(() => {
         setStatus("opening"), open_default(url).then(() => setStatus("opened"));
       }, autoOpenDelay);
       return () => clearTimeout(timer);
     }
-  }, [visible, url, status, autoOpenDelay]), import_react37.useEffect(() => {
+  }, [visible, url, status, autoOpenDelay]), import_react36.useEffect(() => {
     if (!visible)
       setStatus("pending");
   }, [visible]), useKeyboard((key) => {
@@ -56399,7 +56381,7 @@ function BillingPortalModal({
     onClose
   }, void 0, !1, void 0, this);
 }
-var import_react37, STATUS_MESSAGES, STATUS_COLORS2, CHECKOUT_TITLES;
+var import_react36, STATUS_MESSAGES, STATUS_COLORS2, CHECKOUT_TITLES;
 var init_UrlOpenModal = __esm(async () => {
   init_open();
   init_useTaskQueue();
@@ -56409,7 +56391,7 @@ var init_UrlOpenModal = __esm(async () => {
     init_react(),
     init_Modal()
   ]);
-  import_react37 = __toESM(require_react_development(), 1), STATUS_MESSAGES = {
+  import_react36 = __toESM(require_react_development(), 1), STATUS_MESSAGES = {
     pending: {
       checkout: "Preparing checkout...",
       billing: "Preparing billing portal...",
@@ -56581,7 +56563,7 @@ function PasswordInput({
   error = null,
   additionalShortcuts = []
 }) {
-  let [focusedField, setFocusedField] = import_react39.useState(mode === "change" ? "current" : "password"), [showPassword, setShowPassword] = import_react39.useState(!1), [currentValue, setCurrentValue] = import_react39.useState(""), [passwordValue, setPasswordValue] = import_react39.useState(""), [confirmValue, setConfirmValue] = import_react39.useState(""), requirements = checkPasswordRequirements(passwordValue), validation = validatePassword(passwordValue), passwordsMatch = confirmValue.length > 0 && confirmValue === passwordValue, showStrength = mode !== "verify" && focusedField === "password", cycleFocus = (direction) => {
+  let [focusedField, setFocusedField] = import_react38.useState(mode === "change" ? "current" : "password"), [showPassword, setShowPassword] = import_react38.useState(!1), [currentValue, setCurrentValue] = import_react38.useState(""), [passwordValue, setPasswordValue] = import_react38.useState(""), [confirmValue, setConfirmValue] = import_react38.useState(""), requirements = checkPasswordRequirements(passwordValue), validation = validatePassword(passwordValue), passwordsMatch = confirmValue.length > 0 && confirmValue === passwordValue, showStrength = mode !== "verify" && focusedField === "password", cycleFocus = (direction) => {
     let fields = mode === "change" ? ["current", "password", "confirm"] : mode === "verify" ? ["password"] : ["password", "confirm"], currentIndex = fields.indexOf(focusedField), nextIndex = direction === "next" ? (currentIndex + 1) % fields.length : (currentIndex - 1 + fields.length) % fields.length;
     setFocusedField(fields[nextIndex] ?? "password");
   }, handleSubmit = () => {
@@ -56749,7 +56731,7 @@ function PasswordInput({
     ]
   }, void 0, !0, void 0, this);
 }
-var import_react39;
+var import_react38;
 var init_PasswordInput = __esm(async () => {
   init_auth();
   init_constants2();
@@ -56759,7 +56741,7 @@ var init_PasswordInput = __esm(async () => {
     init_react(),
     init_InlineInput()
   ]);
-  import_react39 = __toESM(require_react_development(), 1);
+  import_react38 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/components/shared/DeleteConfirmation.tsx
@@ -56819,13 +56801,13 @@ var init_DeleteConfirmation = __esm(() => {
 
 // ../../packages/tui/convex/hooks/useUserKeys.ts
 function useUserKeys(options) {
-  let [publicKey, setPublicKey] = import_react40.useState(null), [encryptedPrivateKey, setEncryptedPrivateKey] = import_react40.useState(null), [salt, setSalt] = import_react40.useState(null), [isLoading, setIsLoading] = import_react40.useState(!0), [isStoring, setIsStoring] = import_react40.useState(!1), [isUpdating, setIsUpdating] = import_react40.useState(!1), [isRotating, setIsRotating] = import_react40.useState(!1), [error, setError] = import_react40.useState(null), onErrorRef = import_react40.useRef(options?.onError);
-  import_react40.useEffect(() => {
+  let [publicKey, setPublicKey] = import_react39.useState(null), [encryptedPrivateKey, setEncryptedPrivateKey] = import_react39.useState(null), [salt, setSalt] = import_react39.useState(null), [isLoading, setIsLoading] = import_react39.useState(!0), [isStoring, setIsStoring] = import_react39.useState(!1), [isUpdating, setIsUpdating] = import_react39.useState(!1), [isRotating, setIsRotating] = import_react39.useState(!1), [error, setError] = import_react39.useState(null), onErrorRef = import_react39.useRef(options?.onError);
+  import_react39.useEffect(() => {
     onErrorRef.current = options?.onError;
   }, [options?.onError]);
-  let clearError = import_react40.useCallback(() => {
+  let clearError = import_react39.useCallback(() => {
     setError(null);
-  }, []), fetchUserKeys = import_react40.useCallback(async () => {
+  }, []), fetchUserKeys = import_react39.useCallback(async () => {
     setIsLoading(!0), setError(null);
     try {
       let api2 = getProtectedApi();
@@ -56846,7 +56828,7 @@ function useUserKeys(options) {
     } finally {
       setIsLoading(!1);
     }
-  }, []), checkHasKeys = import_react40.useCallback(async () => {
+  }, []), checkHasKeys = import_react39.useCallback(async () => {
     try {
       let api2 = getProtectedApi();
       return await api2.ensureAuth(), await api2.hasUserKeys();
@@ -56855,7 +56837,7 @@ function useUserKeys(options) {
       let error2 = err instanceof Error ? err : Error("Failed to check if user has keys");
       return setError(error2), onErrorRef.current?.(error2), !1;
     }
-  }, []), storeUserKeys = import_react40.useCallback(async (args) => {
+  }, []), storeUserKeys = import_react39.useCallback(async (args) => {
     setIsStoring(!0), setError(null);
     try {
       let api2 = getProtectedApi();
@@ -56873,7 +56855,7 @@ function useUserKeys(options) {
     } finally {
       setIsStoring(!1);
     }
-  }, []), updatePassword = import_react40.useCallback(async (args) => {
+  }, []), updatePassword = import_react39.useCallback(async (args) => {
     setIsUpdating(!0), setError(null);
     try {
       let api2 = getProtectedApi();
@@ -56891,7 +56873,7 @@ function useUserKeys(options) {
     } finally {
       setIsUpdating(!1);
     }
-  }, []), rotateUserKeys = import_react40.useCallback(async (args) => {
+  }, []), rotateUserKeys = import_react39.useCallback(async (args) => {
     setIsRotating(!0), setError(null);
     try {
       let api2 = getProtectedApi();
@@ -56916,7 +56898,7 @@ function useUserKeys(options) {
       setIsRotating(!1);
     }
   }, []);
-  return import_react40.useEffect(() => {
+  return import_react39.useEffect(() => {
     fetchUserKeys();
   }, [fetchUserKeys]), {
     publicKey,
@@ -56936,12 +56918,12 @@ function useUserKeys(options) {
     clearError
   };
 }
-var import_react40, logger5;
+var import_react39, logger5;
 var init_useUserKeys = __esm(() => {
   init_auth();
   init_logger2();
   init_api4();
-  import_react40 = __toESM(require_react_development(), 1), logger5 = createLogger2("tui");
+  import_react39 = __toESM(require_react_development(), 1), logger5 = createLogger2("tui");
 });
 
 // ../../packages/tui/hooks/useListNavigation.ts
@@ -56950,14 +56932,14 @@ function useListNavigation({
   pageSize = 10,
   onSelect
 }) {
-  let [selectedIndex, setSelectedIndex] = import_react41.useState(0), [scrollOffset, setScrollOffset] = import_react41.useState(0), onSelectRef = import_react41.useRef(onSelect);
-  import_react41.useEffect(() => {
+  let [selectedIndex, setSelectedIndex] = import_react40.useState(0), [scrollOffset, setScrollOffset] = import_react40.useState(0), onSelectRef = import_react40.useRef(onSelect);
+  import_react40.useEffect(() => {
     onSelectRef.current = onSelect;
-  }, [onSelect]), import_react41.useEffect(() => {
+  }, [onSelect]), import_react40.useEffect(() => {
     if (items.length > 0 && selectedIndex >= items.length)
       setSelectedIndex(0);
   }, [items.length, selectedIndex]);
-  let moveUp = import_react41.useCallback(() => {
+  let moveUp = import_react40.useCallback(() => {
     if (items.length === 0)
       return;
     setSelectedIndex((prev) => {
@@ -56970,7 +56952,7 @@ function useListNavigation({
         return currentOffset;
       }), next;
     });
-  }, [items.length, pageSize]), moveDown = import_react41.useCallback(() => {
+  }, [items.length, pageSize]), moveDown = import_react40.useCallback(() => {
     if (items.length === 0)
       return;
     setSelectedIndex((prev) => {
@@ -56983,10 +56965,10 @@ function useListNavigation({
         return currentOffset;
       }), next;
     });
-  }, [items.length, pageSize]), select = import_react41.useCallback(() => {
+  }, [items.length, pageSize]), select = import_react40.useCallback(() => {
     if (items.length > 0 && onSelectRef.current)
       onSelectRef.current(selectedIndex);
-  }, [selectedIndex, items.length]), reset = import_react41.useCallback(() => {
+  }, [selectedIndex, items.length]), reset = import_react40.useCallback(() => {
     setSelectedIndex(0), setScrollOffset(0);
   }, []);
   return {
@@ -57005,18 +56987,18 @@ function useListNavigation({
     }
   };
 }
-var import_react41;
+var import_react40;
 var init_useListNavigation = __esm(() => {
-  import_react41 = __toESM(require_react_development(), 1);
+  import_react40 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/hooks/useLoadingState.ts
 function useLoadingState(flags = []) {
-  let [loading, setLoading] = import_react42.useState(() => Object.fromEntries(flags.map((flag) => [flag, !1]))), start = import_react42.useCallback((flag) => {
+  let [loading, setLoading] = import_react41.useState(() => Object.fromEntries(flags.map((flag) => [flag, !1]))), start = import_react41.useCallback((flag) => {
     setLoading((prev) => ({ ...prev, [flag]: !0 }));
-  }, []), stop = import_react42.useCallback((flag) => {
+  }, []), stop = import_react41.useCallback((flag) => {
     setLoading((prev) => ({ ...prev, [flag]: !1 }));
-  }, []), run2 = import_react42.useCallback(async (flag, fn) => {
+  }, []), run2 = import_react41.useCallback(async (flag, fn) => {
     if (loading[flag])
       return;
     start(flag);
@@ -57025,7 +57007,7 @@ function useLoadingState(flags = []) {
     } finally {
       stop(flag);
     }
-  }, [loading, start, stop]), isLoading = import_react42.useCallback((flag) => loading[flag] || !1, [loading]), anyLoading = import_react42.useCallback(() => Object.values(loading).some(Boolean), [loading]);
+  }, [loading, start, stop]), isLoading = import_react41.useCallback((flag) => loading[flag] || !1, [loading]), anyLoading = import_react41.useCallback(() => Object.values(loading).some(Boolean), [loading]);
   return {
     isLoading,
     anyLoading,
@@ -57035,16 +57017,16 @@ function useLoadingState(flags = []) {
     flags: loading
   };
 }
-var import_react42;
+var import_react41;
 var init_useLoadingState = __esm(() => {
-  import_react42 = __toESM(require_react_development(), 1);
+  import_react41 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/hooks/usePaymentFlow.ts
 function usePaymentFlow(options = {}) {
-  let { cancelTask, showSuccess, showError } = useTaskQueue(), [confirmationModal, setConfirmationModal] = import_react43.useState({ visible: !1, type: "project", balance: 0 }), [checkoutModal, setCheckoutModal] = import_react43.useState({ visible: !1, url: "", reason: "pro_required" }), [billingPortalModal, setBillingPortalModal] = import_react43.useState({ visible: !1, url: "" }), [removalModal, setRemovalModal] = import_react43.useState({ visible: !1, currentUsage: 0, includedUsage: 0, excessCount: 0 }), closeAll = import_react43.useCallback(() => {
+  let { cancelTask, showSuccess, showError } = useTaskQueue(), [confirmationModal, setConfirmationModal] = import_react42.useState({ visible: !1, type: "project", balance: 0 }), [checkoutModal, setCheckoutModal] = import_react42.useState({ visible: !1, url: "", reason: "pro_required" }), [billingPortalModal, setBillingPortalModal] = import_react42.useState({ visible: !1, url: "" }), [removalModal, setRemovalModal] = import_react42.useState({ visible: !1, currentUsage: 0, includedUsage: 0, excessCount: 0 }), closeAll = import_react42.useCallback(() => {
     setConfirmationModal({ visible: !1, type: "project", balance: 0 }), setCheckoutModal({ visible: !1, url: "", reason: "pro_required" }), setBillingPortalModal({ visible: !1, url: "" }), setRemovalModal({ visible: !1, currentUsage: 0, includedUsage: 0, excessCount: 0 });
-  }, []), handleResult = import_react43.useCallback((result, type, itemName) => {
+  }, []), handleResult = import_react42.useCallback((result, type, itemName) => {
     let normalized = "status" in result ? result.status === "success" ? {
       success: !0,
       message: result.message
@@ -57127,15 +57109,15 @@ function usePaymentFlow(options = {}) {
     closeAll
   };
 }
-var import_react43;
+var import_react42;
 var init_usePaymentFlow = __esm(() => {
   init_useTaskQueue();
-  import_react43 = __toESM(require_react_development(), 1);
+  import_react42 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/hooks/useProjects.ts
 function useProjects() {
-  let ownedProjectsData = useQuery(api.project.listUserProjects), sharedProjectsData = useQuery(api.projectShare.listActiveSharedProjectsForCurrentUser), [limits, setLimits] = import_react45.useState(null), [limitsLoading, setLimitsLoading] = import_react45.useState(!0), [limitsError, setLimitsError] = import_react45.useState(null), fetchLimits = import_react45.useCallback(async () => {
+  let ownedProjectsData = useQuery(api.project.listUserProjects), sharedProjectsData = useQuery(api.projectShare.listActiveSharedProjectsForCurrentUser), [limits, setLimits] = import_react44.useState(null), [limitsLoading, setLimitsLoading] = import_react44.useState(!0), [limitsError, setLimitsError] = import_react44.useState(null), fetchLimits = import_react44.useCallback(async () => {
     setLimitsLoading(!0), setLimitsError(null);
     try {
       let apiClient = getProtectedApi();
@@ -57148,10 +57130,10 @@ function useProjects() {
       setLimitsLoading(!1);
     }
   }, []);
-  import_react45.useEffect(() => {
+  import_react44.useEffect(() => {
     fetchLimits();
   }, [fetchLimits]);
-  let { archivedCount, projects: projects2 } = import_react45.useMemo(() => {
+  let { archivedCount, projects: projects2 } = import_react44.useMemo(() => {
     let projectMap = /* @__PURE__ */ new Map;
     if (ownedProjectsData?.projects)
       for (let p2 of ownedProjectsData.projects)
@@ -57174,7 +57156,7 @@ function useProjects() {
       return diff !== 0 ? diff : a2.name.localeCompare(b4.name);
     });
     return { archivedCount: archivedCount2, projects: sorted };
-  }, [ownedProjectsData, sharedProjectsData]), isLoading = ownedProjectsData === void 0 || sharedProjectsData === void 0 || limitsLoading, createProject = import_react45.useCallback(async (name, encryptedProjectKey, confirmPayment) => {
+  }, [ownedProjectsData, sharedProjectsData]), isLoading = ownedProjectsData === void 0 || sharedProjectsData === void 0 || limitsLoading, createProject = import_react44.useCallback(async (name, encryptedProjectKey, confirmPayment) => {
     try {
       let apiClient = getProtectedApi();
       await apiClient.ensureAuth();
@@ -57185,10 +57167,10 @@ function useProjects() {
     } catch (err) {
       throw err instanceof Error ? err : Error("Failed to create project");
     }
-  }, [fetchLimits]), renameProject = import_react45.useCallback(async (projectId, name) => {
+  }, [fetchLimits]), renameProject = import_react44.useCallback(async (projectId, name) => {
     let apiClient = getProtectedApi();
     await apiClient.ensureAuth(), await apiClient.updateProject({ projectId, name });
-  }, []), archiveProject = import_react45.useCallback(async (projectId) => {
+  }, []), archiveProject = import_react44.useCallback(async (projectId) => {
     let apiClient = getProtectedApi();
     await apiClient.ensureAuth(), await apiClient.archiveProject(projectId), fetchLimits();
   }, [fetchLimits]);
@@ -57204,18 +57186,18 @@ function useProjects() {
     archiveProject
   };
 }
-var import_react45, logger6;
+var import_react44, logger6;
 var init_useProjects = __esm(() => {
   init_backend();
   init_logger2();
   init_react2();
   init_api4();
-  import_react45 = __toESM(require_react_development(), 1), logger6 = createLogger2("tui");
+  import_react44 = __toESM(require_react_development(), 1), logger6 = createLogger2("tui");
 });
 
 // ../../packages/tui/router.tsx
 function useRouter() {
-  let context = import_react46.useContext(RouterContext);
+  let context = import_react45.useContext(RouterContext);
   if (!context)
     throw Error("useRouter must be used within RouterProvider");
   return context;
@@ -57224,7 +57206,7 @@ function RouterProvider({
   children,
   initialRoute = { name: "login" }
 }) {
-  let [route, setRoute] = import_react46.useState(initialRoute), [history, setHistory] = import_react46.useState([]), navigate = (newRoute) => {
+  let [route, setRoute] = import_react45.useState(initialRoute), [history, setHistory] = import_react45.useState([]), navigate = (newRoute) => {
     setHistory((prev) => [...prev, route]), setRoute(newRoute);
   }, goBack = () => {
     let prev = history[history.length - 1];
@@ -57236,18 +57218,18 @@ function RouterProvider({
     children
   }, void 0, !1, void 0, this);
 }
-var import_react46, RouterContext;
+var import_react45, RouterContext;
 var init_router = __esm(() => {
   init_jsx_dev_runtime();
-  import_react46 = __toESM(require_react_development(), 1), RouterContext = import_react46.createContext(null);
+  import_react45 = __toESM(require_react_development(), 1), RouterContext = import_react45.createContext(null);
 });
 
 // ../../packages/tui/pages/HomePage.tsx
 function HomePage() {
-  import_react48.useEffect(() => {
+  import_react47.useEffect(() => {
     trackEvent("tui_page_viewed", { page: "home" });
   }, []);
-  let { width, height } = useTerminalDimensions(), { navigate } = useRouter(), { logout: logout2 } = useAppSession(), { runTask, continueTask, cancelTask, showSuccess, showError, isProcessing } = useTaskQueue(), { hasPro, isLoading: isLoadingPlan } = useUser(), {
+  let { width, height } = useTerminalDimensions(), { navigate } = useRouter(), { logout: logout2 } = useAppSession(), { runTask, continueTask, cancelTask, showSuccess, showError, isProcessing } = useTaskQueue(), { user, hasPro, isLoading: isLoadingPlan } = useUser(), {
     archivedCount,
     projects: projects2,
     isLoading: isLoadingProjects,
@@ -57261,7 +57243,9 @@ function HomePage() {
     encryptedPrivateKey,
     salt,
     updatePassword
-  } = useUserKeys(), navigation = useListNavigation({
+  } = useUserKeys(), showSetupRequiredError = import_react47.useCallback(() => {
+    showError(hasKeys ? "Unlock your master password to continue." : "Create a master password first to generate your encryption keys.");
+  }, [hasKeys, showError]), navigation = useListNavigation({
     items: projects2,
     pageSize: PAGE_SIZE,
     onSelect: (index) => {
@@ -57274,16 +57258,16 @@ function HomePage() {
           projectStatus: project.status
         });
     }
-  }), payment = usePaymentFlow(), loading = useLoadingState(["creating", "renaming", "archiving"]), [showProSuccess, setShowProSuccess] = import_react48.useState(!1), prevHasProRef = import_react48.useRef(null);
-  import_react48.useEffect(() => {
+  }), payment = usePaymentFlow(), loading = useLoadingState(["creating", "renaming", "archiving"]), [showProSuccess, setShowProSuccess] = import_react47.useState(!1), prevHasProRef = import_react47.useRef(null);
+  import_react47.useEffect(() => {
     if (isLoadingPlan)
       return;
     if (prevHasProRef.current !== null && hasPro && !prevHasProRef.current)
       payment.closeAll(), refetchProjects(), setShowProSuccess(!0);
     prevHasProRef.current = hasPro;
   }, [hasPro, isLoadingPlan, payment, refetchProjects]);
-  let [activeModal, setActiveModal] = import_react48.useState("none"), [creatingProject, setCreatingProject] = import_react48.useState(!1), [pendingProjectName, setPendingProjectName] = import_react48.useState(null), [spinnerFrame, setSpinnerFrame] = import_react48.useState(0), [editingProject, setEditingProject] = import_react48.useState(null), [confirmingDelete, setConfirmingDelete] = import_react48.useState(null), [removalSelectedIndex, setRemovalSelectedIndex] = import_react48.useState(0), [isChangingPassword, setIsChangingPassword] = import_react48.useState(!1), [passwordChangeError, setPasswordChangeError] = import_react48.useState(null);
-  import_react48.useEffect(() => {
+  let [activeModal, setActiveModal] = import_react47.useState("none"), [creatingProject, setCreatingProject] = import_react47.useState(!1), [pendingProjectName, setPendingProjectName] = import_react47.useState(null), [spinnerFrame, setSpinnerFrame] = import_react47.useState(0), [editingProject, setEditingProject] = import_react47.useState(null), [confirmingDelete, setConfirmingDelete] = import_react47.useState(null), [removalSelectedIndex, setRemovalSelectedIndex] = import_react47.useState(0), [isChangingPassword, setIsChangingPassword] = import_react47.useState(!1), [passwordChangeError, setPasswordChangeError] = import_react47.useState(null);
+  import_react47.useEffect(() => {
     if (!pendingProjectName)
       return;
     let interval = setInterval(() => {
@@ -57293,7 +57277,7 @@ function HomePage() {
   }, [pendingProjectName]);
   let validatedEditingProject = editingProject && projects2.some((p2) => p2.id === editingProject.id) ? editingProject : null, validatedConfirmingDelete = confirmingDelete && projects2.some((p2) => p2.id === confirmingDelete.id) ? confirmingDelete : null, showPendingProject = pendingProjectName && !projects2.some((p2) => p2.name === pendingProjectName), archivableProjects = projects2.filter((p2) => p2.status === "owned" && !p2.status.includes("archived")), handleCreateProject = async (name, confirmPayment) => {
     if (!hasKeys || !publicKey) {
-      logger7.error("Cannot create project: User has no keys");
+      logger7.error("Cannot create project: User has no keys"), showSetupRequiredError();
       return;
     }
     await loading.run("creating", async () => {
@@ -57404,7 +57388,10 @@ function HomePage() {
       return;
     }
     try {
-      await savePassword(newPassword);
+      await savePassword(newPassword, user ? {
+        userId: user.id,
+        email: user.email
+      } : void 0);
     } catch (error) {
       logger7.error("Failed to save password locally:", error);
     }
@@ -57421,6 +57408,8 @@ function HomePage() {
       case "n":
         if (!isLoadingKeys && hasKeys && publicKey)
           setCreatingProject(!0);
+        else if (!isLoadingKeys)
+          showSetupRequiredError();
         break;
       case "u":
         if (isOwned && project.id)
@@ -57503,6 +57492,8 @@ function HomePage() {
     } else if (key.name === "n") {
       if (!isLoadingKeys && hasKeys && publicKey)
         setCreatingProject(!0);
+      else if (!isLoadingKeys)
+        showSetupRequiredError();
     } else if (key.name === "u") {
       let project = projects2[navigation.selectedIndex];
       if (project && project.status === "owned" && project.id)
@@ -58018,7 +58009,7 @@ function HomePage() {
     ]
   }, void 0, !0, void 0, this);
 }
-var import_react48, logger7, STATUS_ICONS, PAGE_SIZE = 5;
+var import_react47, logger7, STATUS_ICONS, PAGE_SIZE = 5;
 var init_HomePage = __esm(async () => {
   init_auth();
   init_crypto2();
@@ -58047,7 +58038,7 @@ var init_HomePage = __esm(async () => {
     init_PasswordInput(),
     init_Modal()
   ]);
-  import_react48 = __toESM(require_react_development(), 1), logger7 = createLogger2("tui"), STATUS_ICONS = {
+  import_react47 = __toESM(require_react_development(), 1), logger7 = createLogger2("tui"), STATUS_ICONS = {
     owned: "\u25CF",
     shared: "\u25C9",
     archived: "\u25CB",
@@ -58081,13 +58072,13 @@ var init_LoginButton = __esm(() => {
 
 // ../../packages/tui/convex/hooks/useDeviceAuth.ts
 function useDeviceAuth(options) {
-  let [status, setStatus] = import_react49.useState("idle"), [userCode, setUserCode] = import_react49.useState(null), [verificationUri, setVerificationUri] = import_react49.useState(null), [isLoading, setIsLoading] = import_react49.useState(!1), [error, setError] = import_react49.useState(null), isMounted = import_react49.useRef(!0);
-  import_react49.useEffect(() => {
+  let [status, setStatus] = import_react48.useState("idle"), [userCode, setUserCode] = import_react48.useState(null), [verificationUri, setVerificationUri] = import_react48.useState(null), [isLoading, setIsLoading] = import_react48.useState(!1), [error, setError] = import_react48.useState(null), isMounted = import_react48.useRef(!0);
+  import_react48.useEffect(() => {
     return isMounted.current = !0, () => {
       isMounted.current = !1, deviceAuth.stopPolling();
     };
   }, []);
-  let startAuth = import_react49.useCallback(async () => {
+  let startAuth = import_react48.useCallback(async () => {
     if (!isMounted.current)
       return;
     setIsLoading(!0), setError(null), setStatus("pending");
@@ -58116,7 +58107,7 @@ function useDeviceAuth(options) {
     if (!result.success && result.error)
       setError(result.error);
     setIsLoading(!1);
-  }, [options]), cancel = import_react49.useCallback(() => {
+  }, [options]), cancel = import_react48.useCallback(() => {
     deviceAuth.stopPolling(), setStatus("idle"), setIsLoading(!1), setUserCode(null), setVerificationUri(null);
   }, []);
   return {
@@ -58129,10 +58120,10 @@ function useDeviceAuth(options) {
     cancel
   };
 }
-var import_react49;
+var import_react48;
 var init_useDeviceAuth = __esm(() => {
   init_auth();
-  import_react49 = __toESM(require_react_development(), 1);
+  import_react48 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/utils/ui.ts
@@ -58269,7 +58260,7 @@ function getStatusColor(status, hasCode, isLoading) {
   }
 }
 function LoginPage({ onLogin }) {
-  let { width, height } = useTerminalDimensions(), [isModalOpen, setIsModalOpen] = import_react51.useState(!1), { status, userCode, verificationUri, isLoading, error, startAuth, cancel } = useDeviceAuth({
+  let { width, height } = useTerminalDimensions(), [isModalOpen, setIsModalOpen] = import_react50.useState(!1), { status, userCode, verificationUri, isLoading, error, startAuth, cancel } = useDeviceAuth({
     onSuccess: () => {
       trackEvent("tui_login_completed", { success: !0 }), setTimeout(() => {
         onLogin();
@@ -58278,8 +58269,8 @@ function LoginPage({ onLogin }) {
     onError: (err) => {
       logger8.error("Device auth error:", err), trackEvent("tui_login_completed", { success: !1 });
     }
-  }), hyperlinkWrittenRef = import_react51.useRef(null);
-  import_react51.useEffect(() => {
+  }), hyperlinkWrittenRef = import_react50.useRef(null);
+  import_react50.useEffect(() => {
     if (verificationUri && isModalOpen && hyperlinkWrittenRef.current !== verificationUri) {
       let timer = setTimeout(() => {
         let hyperlink = createHyperlink(verificationUri, verificationUri);
@@ -58460,7 +58451,7 @@ function LoginPage({ onLogin }) {
     ]
   }, void 0, !0, void 0, this);
 }
-var import_react51, logger8, getShortcutGroups = (isLoading) => ({
+var import_react50, logger8, getShortcutGroups = (isLoading) => ({
   primary: [
     { shortcuts: [{ key: KEY_SYMBOLS.enter, description: "sign in", disabled: isLoading }] }
   ],
@@ -58479,15 +58470,19 @@ var init_LoginPage = __esm(async () => {
     init_react(),
     init_Modal()
   ]);
-  import_react51 = __toESM(require_react_development(), 1), logger8 = createLogger2("tui");
+  import_react50 = __toESM(require_react_development(), 1), logger8 = createLogger2("tui");
 });
 
 // ../../packages/tui/pages/PasswordSetupPage.tsx
-function PasswordSetupPage({ onComplete, onLogout }) {
-  let { width, height } = useTerminalDimensions(), { encryptedPrivateKey, salt, checkHasKeys, updatePassword, storeUserKeys } = useUserKeys(), [showLogoutModal, setShowLogoutModal] = import_react53.useState(!1), [showPasswordWarning, setShowPasswordWarning] = import_react53.useState(!1), [pendingPassword, setPendingPassword] = import_react53.useState(null), [currentEncryptedPrivateKey, setCurrentEncryptedPrivateKey] = import_react53.useState(null), [currentSalt, setCurrentSalt] = import_react53.useState(null), [taskStatus, setTaskStatus] = import_react53.useState(null), [rewrapError, setRewrapError] = import_react53.useState(null), handleLogout = async () => {
+function PasswordSetupPage({
+  hasExistingKeys,
+  onComplete,
+  onLogout
+}) {
+  let { width, height } = useTerminalDimensions(), { encryptedPrivateKey, salt, checkHasKeys, updatePassword, storeUserKeys } = useUserKeys(), [showLogoutModal, setShowLogoutModal] = import_react52.useState(!1), [showPasswordWarning, setShowPasswordWarning] = import_react52.useState(!1), [pendingPassword, setPendingPassword] = import_react52.useState(null), [currentEncryptedPrivateKey, setCurrentEncryptedPrivateKey] = import_react52.useState(null), [currentSalt, setCurrentSalt] = import_react52.useState(null), [taskStatus, setTaskStatus] = import_react52.useState(null), [setupError, setSetupError] = import_react52.useState(null), [rewrapError, setRewrapError] = import_react52.useState(null), handleLogout = async () => {
     await onLogout();
   }, handlePasswordSubmit = async (password) => {
-    trackEvent("password_setup_started"), setTaskStatus("checking_password");
+    trackEvent("password_setup_started"), setSetupError(null), setTaskStatus("checking_password");
     try {
       if (!await checkHasKeys()) {
         setTaskStatus("creating_keys");
@@ -58501,7 +58496,7 @@ function PasswordSetupPage({ onComplete, onLogout }) {
             publicKey,
             encryptedPrivateKey: newEncryptedPrivateKey,
             salt: newSalt
-          }), setTaskStatus(null), onComplete(password);
+          }), setTaskStatus(null), await onComplete(password);
           return;
         } catch (error) {
           throw logger9.error("Failed to create user keys:", error), setTaskStatus(null), error;
@@ -58518,15 +58513,15 @@ function PasswordSetupPage({ onComplete, onLogout }) {
         storedEncryptedPrivateKey = encryptedPrivateKey, storedSalt = salt;
       if (storedEncryptedPrivateKey && storedSalt) {
         if (await verifyPasswordWithExistingKeys(password, storedEncryptedPrivateKey, storedSalt)) {
-          setTaskStatus(null), onComplete(password);
+          setTaskStatus(null), await onComplete(password);
           return;
         }
         setPendingPassword(password), setCurrentEncryptedPrivateKey(storedEncryptedPrivateKey), setCurrentSalt(storedSalt), setTaskStatus(null), setShowPasswordWarning(!0), setRewrapError(null);
         return;
       }
-      setTaskStatus(null), onComplete(password);
+      setTaskStatus(null), setSetupError("Could not load your encryption keys. Please try again.");
     } catch (error) {
-      logger9.error("Error checking password:", error), setTaskStatus(null), onComplete(password);
+      logger9.error("Error checking password:", error), setTaskStatus(null), setSetupError("Failed to prepare your account. Please try again.");
     }
   }, handleWarningConfirm = async (oldPassword) => {
     if (!pendingPassword || !currentEncryptedPrivateKey || !currentSalt)
@@ -58549,7 +58544,7 @@ function PasswordSetupPage({ onComplete, onLogout }) {
       setTaskStatus("updating_backend"), await updatePassword({
         encryptedPrivateKey: newEncryptedPrivateKey,
         salt: newSalt
-      }), setTaskStatus(null), setShowPasswordWarning(!1), onComplete(pendingPassword);
+      }), setTaskStatus(null), setShowPasswordWarning(!1), await onComplete(pendingPassword);
     } catch (error) {
       logger9.error("Failed to rewrap password:", error), setTaskStatus(null), setRewrapError("Failed to update password. Please try again.");
     }
@@ -58614,24 +58609,16 @@ function PasswordSetupPage({ onComplete, onLogout }) {
               marginTop: 1,
               children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
                 fg: THEME_COLORS.text,
-                children: "Set Your Password"
+                children: hasExistingKeys ? "Unlock Master Password" : "Create Master Password"
               }, void 0, !1, void 0, this)
             }, void 0, !1, void 0, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
               height: 1,
               marginTop: 1,
               children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-                children: [
-                  /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                    fg: THEME_COLORS.accent,
-                    children: "[!]"
-                  }, void 0, !1, void 0, this),
-                  /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                    fg: THEME_COLORS.accent,
-                    children: " Your master password is never stored"
-                  }, void 0, !1, void 0, this)
-                ]
-              }, void 0, !0, void 0, this)
+                fg: hasExistingKeys ? THEME_COLORS.textDim : THEME_COLORS.accent,
+                children: hasExistingKeys ? "Enter your password to unlock this account." : "Create a password to generate your encryption keys."
+              }, void 0, !1, void 0, this)
             }, void 0, !1, void 0, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
               flexDirection: "column",
@@ -58641,7 +58628,8 @@ function PasswordSetupPage({ onComplete, onLogout }) {
                 mode: "setup",
                 onSubmit: handlePasswordSubmit,
                 width: 46,
-                disabled: isAnyModalOpen
+                disabled: isAnyModalOpen,
+                error: setupError
               }, void 0, !1, void 0, this)
             }, void 0, !1, void 0, this)
           ]
@@ -58707,7 +58695,7 @@ function PasswordSetupPage({ onComplete, onLogout }) {
     ]
   }, void 0, !0, void 0, this);
 }
-var import_react53, logger9;
+var import_react52, logger9;
 var init_PasswordSetupPage = __esm(async () => {
   init_auth();
   init_crypto2();
@@ -58721,7 +58709,7 @@ var init_PasswordSetupPage = __esm(async () => {
     init_PasswordInput(),
     init_Modal()
   ]);
-  import_react53 = __toESM(require_react_development(), 1), logger9 = createLogger2("tui");
+  import_react52 = __toESM(require_react_development(), 1), logger9 = createLogger2("tui");
 });
 
 // ../../packages/tui/utils/bulkImport.ts
@@ -58919,7 +58907,7 @@ function BulkImportModal({
   cursorVisible,
   onClose: _onClose
 }) {
-  let { isRunning } = useTaskQueue(), validationResult = import_react54.useMemo(() => {
+  let { isRunning } = useTaskQueue(), validationResult = import_react53.useMemo(() => {
     let trimmed = content.trim();
     if (trimmed === "")
       return { valid: !1, secrets: [], errors: [], duplicateKeys: [] };
@@ -58945,7 +58933,7 @@ function BulkImportModal({
       { key: "esc", description: "cancel", disabled: isRunning }
     ];
   }, lines = content.split(`
-`), visibleLines = EDITOR_HEIGHT - 2, maxLineWidth = EDITOR_WIDTH - 8, { wrappedLine, wrappedColumn, allWrappedLines } = import_react54.useMemo(() => mapCursorToWrappedLines(lines, cursor, maxLineWidth), [lines, cursor, maxLineWidth]), scrollOffset = Math.max(0, wrappedLine - visibleLines + 1), renderEditorContent = () => {
+`), visibleLines = EDITOR_HEIGHT - 2, maxLineWidth = EDITOR_WIDTH - 8, { wrappedLine, wrappedColumn, allWrappedLines } = import_react53.useMemo(() => mapCursorToWrappedLines(lines, cursor, maxLineWidth), [lines, cursor, maxLineWidth]), scrollOffset = Math.max(0, wrappedLine - visibleLines + 1), renderEditorContent = () => {
     if (content === "")
       return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
         children: [
@@ -59141,7 +59129,7 @@ function BulkImportModal({
     }, void 0, !0, void 0, this)
   }, void 0, !1, void 0, this);
 }
-var import_react54, EDITOR_HEIGHT = 18, EDITOR_WIDTH = 76;
+var import_react53, EDITOR_HEIGHT = 18, EDITOR_WIDTH = 76;
 var init_BulkImportModal = __esm(async () => {
   init_useTaskQueue();
   init_bulkImport();
@@ -59149,7 +59137,7 @@ var init_BulkImportModal = __esm(async () => {
   init_ui();
   init_jsx_dev_runtime();
   await init_Modal();
-  import_react54 = __toESM(require_react_development(), 1);
+  import_react53 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/components/modals/ManageCollaboratorsModal.tsx
@@ -59167,8 +59155,8 @@ function ManageCollaboratorsModal({
   pendingEmail,
   shareLimits
 }) {
-  let { isRunning } = useTaskQueue(), [selectedIndex, setSelectedIndex] = import_react56.useState(0), [creatingCollab, setCreatingCollab] = import_react56.useState(!1), [confirmingDelete, setConfirmingDelete] = import_react56.useState(null), [emailError, setEmailError] = import_react56.useState(null), [spinnerFrame, setSpinnerFrame] = import_react56.useState(0), [emailValue, setEmailValue] = import_react56.useState("");
-  if (import_react56.useEffect(() => {
+  let { isRunning } = useTaskQueue(), [selectedIndex, setSelectedIndex] = import_react55.useState(0), [creatingCollab, setCreatingCollab] = import_react55.useState(!1), [confirmingDelete, setConfirmingDelete] = import_react55.useState(null), [emailError, setEmailError] = import_react55.useState(null), [spinnerFrame, setSpinnerFrame] = import_react55.useState(0), [emailValue, setEmailValue] = import_react55.useState("");
+  if (import_react55.useEffect(() => {
     if (!pendingEmail)
       return;
     let interval = setInterval(() => {
@@ -59394,7 +59382,7 @@ function ManageCollaboratorsModal({
     }, void 0, !0, void 0, this)
   }, void 0, !1, void 0, this);
 }
-var import_react56;
+var import_react55;
 var init_ManageCollaboratorsModal = __esm(async () => {
   init_useTaskQueue();
   init_constants2();
@@ -59404,12 +59392,42 @@ var init_ManageCollaboratorsModal = __esm(async () => {
     init_InlineInput(),
     init_Modal()
   ]);
-  import_react56 = __toESM(require_react_development(), 1);
+  import_react55 = __toESM(require_react_development(), 1);
 });
 
+// ../../packages/tui/utils/mappers.ts
+function mapApiEnvironment(apiEnv) {
+  return {
+    id: apiEnv.id,
+    name: apiEnv.name
+  };
+}
+function mapApiFolder(apiFolder) {
+  return {
+    id: apiFolder.id,
+    name: apiFolder.name,
+    environmentId: apiFolder.environmentId
+  };
+}
+function mapApiSecret(apiSecret) {
+  return {
+    id: apiSecret.id,
+    key: apiSecret.key,
+    value: void 0,
+    encryptedValue: apiSecret.encryptedValue,
+    type: apiSecret.valueType === "string" ? "string" : apiSecret.valueType === "number" ? "number" : apiSecret.valueType === "boolean" ? "boolean" : "string",
+    scope: apiSecret.scope,
+    folderId: apiSecret.folderId,
+    environmentId: apiSecret.environmentId
+  };
+}
+function getUserDisplayName(user) {
+  return user.name || user.email.split("@")[0] || "User";
+}
+
 // ../../packages/tui/hooks/useEnvironments.ts
 function useEnvironments(projectId) {
-  let [environments, setEnvironments] = import_react57.useState([]), [isLoading, setIsLoading] = import_react57.useState(!0), [error, setError] = import_react57.useState(null), fetch2 = import_react57.useCallback(async () => {
+  let [environments, setEnvironments] = import_react56.useState([]), [isLoading, setIsLoading] = import_react56.useState(!0), [error, setError] = import_react56.useState(null), fetch2 = import_react56.useCallback(async () => {
     setIsLoading(!0), setError(null);
     try {
       let api2 = getProtectedApi();
@@ -59422,35 +59440,35 @@ function useEnvironments(projectId) {
       setIsLoading(!1);
     }
   }, [projectId]);
-  import_react57.useEffect(() => {
+  import_react56.useEffect(() => {
     fetch2();
   }, [fetch2]);
-  let create = import_react57.useCallback(async (name, color) => {
+  let create = import_react56.useCallback(async (name, color) => {
     let api2 = getProtectedApi();
     await api2.ensureAuth();
     let { id } = await api2.createEnvironment({ projectId, name, color });
     return await fetch2(), id;
-  }, [projectId, fetch2]), update = import_react57.useCallback(async (environmentId, name, color) => {
+  }, [projectId, fetch2]), update = import_react56.useCallback(async (environmentId, name, color) => {
     let api2 = getProtectedApi();
     await api2.ensureAuth(), await api2.updateEnvironment({ environmentId, name, color }), await fetch2();
-  }, [fetch2]), remove = import_react57.useCallback(async (environmentId) => {
+  }, [fetch2]), remove = import_react56.useCallback(async (environmentId) => {
     let api2 = getProtectedApi();
     await api2.ensureAuth(), await api2.deleteEnvironment(environmentId), await fetch2();
   }, [fetch2]);
   return { environments, isLoading, error, refetch: fetch2, create, update, remove };
 }
-var import_react57, logger10;
+var import_react56, logger10;
 var init_useEnvironments = __esm(() => {
   init_logger2();
   init_api4();
-  import_react57 = __toESM(require_react_development(), 1), logger10 = createLogger2("tui");
+  import_react56 = __toESM(require_react_development(), 1), logger10 = createLogger2("tui");
 });
 
 // ../../packages/tui/hooks/useProject.ts
 function useProject(projectId) {
   let { user } = useUser(), projectData = useQuery(api.project.getProject, {
     projectId
-  }), isOwner = projectData && user ? projectData.ownerId === user.id : !1, sharesData = useQuery(api.projectShare.listActiveProjectSharesByProject, isOwner ? { projectId } : "skip"), [shareLimits, setShareLimits] = import_react59.useState(null), [limitsLoading, setLimitsLoading] = import_react59.useState(!1), fetchShareLimits = import_react59.useCallback(async () => {
+  }), isOwner = projectData && user ? projectData.ownerId === user.id : !1, sharesData = useQuery(api.projectShare.listActiveProjectSharesByProject, isOwner ? { projectId } : "skip"), [shareLimits, setShareLimits] = import_react58.useState(null), [limitsLoading, setLimitsLoading] = import_react58.useState(!1), fetchShareLimits = import_react58.useCallback(async () => {
     setLimitsLoading(!0);
     try {
       let apiClient = getProtectedApi();
@@ -59463,13 +59481,13 @@ function useProject(projectId) {
       setLimitsLoading(!1);
     }
   }, [projectId]);
-  import_react59.useEffect(() => {
+  import_react58.useEffect(() => {
     if (isOwner)
       fetchShareLimits();
     else
       setShareLimits(null), setLimitsLoading(!1);
   }, [isOwner, fetchShareLimits]);
-  let project = import_react59.useMemo(() => {
+  let project = import_react58.useMemo(() => {
     if (!projectData)
       return null;
     return {
@@ -59485,7 +59503,7 @@ function useProject(projectId) {
       updatedAt: projectData.updatedAt,
       shareUsageCount: 0
     };
-  }, [projectData]), sharedUsers = import_react59.useMemo(() => {
+  }, [projectData]), sharedUsers = import_react58.useMemo(() => {
     if (!sharesData?.shares)
       return [];
     return sharesData.shares.map((share) => ({
@@ -59505,14 +59523,14 @@ function useProject(projectId) {
     refetch: fetchShareLimits
   };
 }
-var import_react59, logger11;
+var import_react58, logger11;
 var init_useProject = __esm(() => {
   init_backend();
   init_logger2();
   init_react2();
   init_api4();
   init_context2();
-  import_react59 = __toESM(require_react_development(), 1), logger11 = createLogger2("tui");
+  import_react58 = __toESM(require_react_development(), 1), logger11 = createLogger2("tui");
 });
 
 // ../../packages/tui/utils/crypto.ts
@@ -59552,7 +59570,7 @@ var init_crypto3 = __esm(() => {
 
 // ../../packages/tui/hooks/useSecrets.ts
 function useSecrets(_projectId, encryptedProjectKeySource, encryptedPrivateKey, salt) {
-  let [folders, setFolders] = import_react60.useState([]), [secrets, setSecrets] = import_react60.useState([]), [isLoading, setIsLoading] = import_react60.useState(!1), [error, setError] = import_react60.useState(null), loadEnvironment = import_react60.useCallback(async (environmentId) => {
+  let [folders, setFolders] = import_react59.useState([]), [secrets, setSecrets] = import_react59.useState([]), [isLoading, setIsLoading] = import_react59.useState(!1), [error, setError] = import_react59.useState(null), loadEnvironment = import_react59.useCallback(async (environmentId) => {
     setIsLoading(!0), setError(null);
     try {
       let api2 = getProtectedApi();
@@ -59575,20 +59593,20 @@ function useSecrets(_projectId, encryptedProjectKeySource, encryptedPrivateKey,
     } finally {
       setIsLoading(!1);
     }
-  }, [encryptedProjectKeySource, encryptedPrivateKey, salt]), createFolder = import_react60.useCallback(async (environmentId, name) => {
+  }, [encryptedProjectKeySource, encryptedPrivateKey, salt]), createFolder = import_react59.useCallback(async (environmentId, name) => {
     let api2 = getProtectedApi();
     await api2.ensureAuth();
     let { id } = await api2.createFolder({ environmentId, name });
     return await loadEnvironment(environmentId), id;
-  }, [loadEnvironment]), updateFolder = import_react60.useCallback(async (folderId, name) => {
+  }, [loadEnvironment]), updateFolder = import_react59.useCallback(async (folderId, name) => {
     let folder = folders.find((f3) => f3.id === folderId), api2 = getProtectedApi();
     if (await api2.ensureAuth(), await api2.updateFolder({ folderId, name }), folder)
       await loadEnvironment(folder.environmentId);
-  }, [folders, loadEnvironment]), deleteFolder = import_react60.useCallback(async (folderId) => {
+  }, [folders, loadEnvironment]), deleteFolder = import_react59.useCallback(async (folderId) => {
     let folder = folders.find((f3) => f3.id === folderId), api2 = getProtectedApi();
     if (await api2.ensureAuth(), await api2.deleteFolder(folderId), folder)
       await loadEnvironment(folder.environmentId);
-  }, [folders, loadEnvironment]), createSecret = import_react60.useCallback(async (args) => {
+  }, [folders, loadEnvironment]), createSecret = import_react59.useCallback(async (args) => {
     if (!encryptedProjectKeySource || !encryptedPrivateKey || !salt)
       throw Error("Cannot encrypt: No project key available");
     let projectKey = await getProjectKey2(encryptedProjectKeySource, encryptedPrivateKey, salt), encryptedValue = await encryptSecretValue(projectKey, args.value), api2 = getProtectedApi();
@@ -59602,7 +59620,7 @@ function useSecrets(_projectId, encryptedProjectKeySource, encryptedPrivateKey,
       scope: args.scope
     });
     return await loadEnvironment(args.environmentId), id;
-  }, [encryptedProjectKeySource, encryptedPrivateKey, salt, loadEnvironment]), updateSecretBulk = import_react60.useCallback(async (args) => {
+  }, [encryptedProjectKeySource, encryptedPrivateKey, salt, loadEnvironment]), updateSecretBulk = import_react59.useCallback(async (args) => {
     if (!encryptedProjectKeySource || !encryptedPrivateKey || !salt)
       throw Error("Cannot encrypt: No project key available");
     let projectKey = await getProjectKey2(encryptedProjectKeySource, encryptedPrivateKey, salt), encrypted = await Promise.all(args.secrets.map(async (s2) => {
@@ -59631,7 +59649,7 @@ function useSecrets(_projectId, encryptedProjectKeySource, encryptedPrivateKey,
       mode: args.mode
     }, result = await api2.updateSecretBulk(payload);
     return await loadEnvironment(args.environmentId), result;
-  }, [encryptedProjectKeySource, encryptedPrivateKey, salt, loadEnvironment, secrets]), updateSecret = import_react60.useCallback(async (args) => {
+  }, [encryptedProjectKeySource, encryptedPrivateKey, salt, loadEnvironment, secrets]), updateSecret = import_react59.useCallback(async (args) => {
     let encryptedValue;
     if (args.value) {
       if (!encryptedProjectKeySource || !encryptedPrivateKey || !salt)
@@ -59646,7 +59664,7 @@ function useSecrets(_projectId, encryptedProjectKeySource, encryptedPrivateKey,
       encryptedValue,
       valueType: args.valueType
     }), await loadEnvironment(args.environmentId);
-  }, [encryptedProjectKeySource, encryptedPrivateKey, salt, loadEnvironment]), deleteSecret = import_react60.useCallback(async (secretId) => {
+  }, [encryptedProjectKeySource, encryptedPrivateKey, salt, loadEnvironment]), deleteSecret = import_react59.useCallback(async (secretId) => {
     let secret = secrets.find((s2) => s2.id === secretId), api2 = getProtectedApi();
     if (await api2.ensureAuth(), await api2.deleteSecret(secretId), secret)
       await loadEnvironment(secret.environmentId);
@@ -59666,17 +59684,17 @@ function useSecrets(_projectId, encryptedProjectKeySource, encryptedPrivateKey,
     deleteSecret
   };
 }
-var import_react60, logger12;
+var import_react59, logger12;
 var init_useSecrets = __esm(() => {
   init_logger2();
   init_api4();
   init_crypto3();
-  import_react60 = __toESM(require_react_development(), 1), logger12 = createLogger2("tui");
+  import_react59 = __toESM(require_react_development(), 1), logger12 = createLogger2("tui");
 });
 
 // ../../packages/tui/hooks/useSharing.ts
 function useSharing(projectId, encryptedProjectKeySource, encryptedPrivateKey, salt, shareLimits) {
-  let shareProject = import_react61.useCallback(async (email, confirmPayment) => {
+  let shareProject = import_react60.useCallback(async (email, confirmPayment) => {
     let api2 = getProtectedApi();
     if (await api2.ensureAuth(), !shareLimits?.hasPro)
       return await api2.shareProject({
@@ -59697,10 +59715,10 @@ function useSharing(projectId, encryptedProjectKeySource, encryptedPrivateKey, s
       encryptedProjectKey,
       confirmPayment
     });
-  }, [projectId, encryptedProjectKeySource, encryptedPrivateKey, salt, shareLimits]), revokeShare = import_react61.useCallback(async (shareId) => {
+  }, [projectId, encryptedProjectKeySource, encryptedPrivateKey, salt, shareLimits]), revokeShare = import_react60.useCallback(async (shareId) => {
     let api2 = getProtectedApi();
     await api2.ensureAuth(), await api2.revokeShare(shareId);
-  }, []), revokeShareWithRotation = import_react61.useCallback(async (shareId, sharedUsers) => {
+  }, []), revokeShareWithRotation = import_react60.useCallback(async (shareId, sharedUsers) => {
     if (!encryptedProjectKeySource || !encryptedPrivateKey || !salt)
       throw Error("Cannot rotate: Missing keys");
     let api2 = getProtectedApi();
@@ -59733,17 +59751,17 @@ function useSharing(projectId, encryptedProjectKeySource, encryptedPrivateKey, s
   }, [projectId, encryptedProjectKeySource, encryptedPrivateKey, salt]);
   return { shareProject, revokeShare, revokeShareWithRotation };
 }
-var import_react61;
+var import_react60;
 var init_useSharing = __esm(() => {
   init_crypto2();
   init_api4();
   init_crypto3();
-  import_react61 = __toESM(require_react_development(), 1);
+  import_react60 = __toESM(require_react_development(), 1);
 });
 
 // ../../packages/tui/hooks/useProjectPage.ts
 function useProjectPage(projectId) {
-  let { user } = useUser(), { encryptedPrivateKey, salt } = useUserKeys(), [encryptedProjectKey, setEncryptedProjectKey] = import_react62.useState(null), {
+  let { user } = useUser(), { encryptedPrivateKey, salt } = useUserKeys(), [encryptedProjectKey, setEncryptedProjectKey] = import_react61.useState(null), {
     project,
     sharedUsers,
     shareLimits,
@@ -59756,7 +59774,7 @@ function useProjectPage(projectId) {
     update: updateEnv,
     remove: removeEnv
   } = useEnvironments(projectId), isOwner = project && user ? project.ownerId === user.id : !1;
-  import_react62.useEffect(() => {
+  import_react61.useEffect(() => {
     let fetchProjectKey = async () => {
       if (isOwner && project?.encryptedProjectKey)
         setEncryptedProjectKey(project.encryptedProjectKey);
@@ -59814,7 +59832,7 @@ function useProjectPage(projectId) {
     revokeShareWithRotation
   };
 }
-var import_react62, logger13;
+var import_react61, logger13;
 var init_useProjectPage = __esm(() => {
   init_logger2();
   init_api4();
@@ -59824,12 +59842,12 @@ var init_useProjectPage = __esm(() => {
   init_useProject();
   init_useSecrets();
   init_useSharing();
-  import_react62 = __toESM(require_react_development(), 1), logger13 = createLogger2("tui");
+  import_react61 = __toESM(require_react_development(), 1), logger13 = createLogger2("tui");
 });
 
 // ../../packages/tui/pages/ProjectPage.tsx
 function ProjectPage({ projectId, projectName, projectStatus }) {
-  import_react64.useEffect(() => {
+  import_react63.useEffect(() => {
     trackEvent("tui_page_viewed", { page: "project" });
   }, []);
   let { width, height } = useTerminalDimensions(), { goBack: routerGoBack } = useRouter(), {
@@ -59860,19 +59878,19 @@ function ProjectPage({ projectId, projectName, projectStatus }) {
     revokeShare,
     revokeShareWithRotation,
     refetchProject: refetchProjectData
-  } = useProjectPage(projectId), [showProSuccess, setShowProSuccess] = import_react64.useState(!1), prevHasProRef = import_react64.useRef(null);
-  import_react64.useEffect(() => {
+  } = useProjectPage(projectId), [showProSuccess, setShowProSuccess] = import_react63.useState(!1), prevHasProRef = import_react63.useRef(null);
+  import_react63.useEffect(() => {
     if (isLoadingPlan)
       return;
     if (prevHasProRef.current !== null && hasPro && !prevHasProRef.current)
       refetchProjectData(), setCheckoutModal({ visible: !1, url: "", reason: "pro_required" }), setBillingPortalModal({ visible: !1, url: "" }), setShowProSuccess(!0);
     prevHasProRef.current = hasPro;
   }, [hasPro, isLoadingPlan, refetchProjectData]);
-  let [viewLevel, setViewLevel] = import_react64.useState("environments"), [selectedEnvId, setSelectedEnvId] = import_react64.useState(null), [selectedFolderId, setSelectedFolderId] = import_react64.useState(null), [selectedIndex, setSelectedIndex] = import_react64.useState(0), [scrollOffset, setScrollOffset] = import_react64.useState(0), [showSecrets, setShowSecrets] = import_react64.useState(!1), [activeModal, setActiveModal] = import_react64.useState("none"), [creatingItem, setCreatingItem] = import_react64.useState(null), [editingItem, setEditingItem] = import_react64.useState(null), [confirmingDelete, setConfirmingDelete] = import_react64.useState(null), bulkImportInput = useMultiLineInput({ maxLines: 50 }), [bulkImportFormat, setBulkImportFormat] = import_react64.useState("env"), [bulkImportScopes, setBulkImportScopes] = import_react64.useState(/* @__PURE__ */ new Map), [bulkImportCollisions, setBulkImportCollisions] = import_react64.useState([]), [pendingCollaboratorEmail, setPendingCollaboratorEmail] = import_react64.useState(null), [confirmationModal, setConfirmationModal] = import_react64.useState({
+  let [viewLevel, setViewLevel] = import_react63.useState("environments"), [selectedEnvId, setSelectedEnvId] = import_react63.useState(null), [selectedFolderId, setSelectedFolderId] = import_react63.useState(null), [selectedIndex, setSelectedIndex] = import_react63.useState(0), [scrollOffset, setScrollOffset] = import_react63.useState(0), [showSecrets, setShowSecrets] = import_react63.useState(!1), [activeModal, setActiveModal] = import_react63.useState("none"), [creatingItem, setCreatingItem] = import_react63.useState(null), [editingItem, setEditingItem] = import_react63.useState(null), [confirmingDelete, setConfirmingDelete] = import_react63.useState(null), bulkImportInput = useMultiLineInput({ maxLines: 50 }), [bulkImportFormat, setBulkImportFormat] = import_react63.useState("env"), [bulkImportScopes, setBulkImportScopes] = import_react63.useState(/* @__PURE__ */ new Map), [bulkImportCollisions, setBulkImportCollisions] = import_react63.useState([]), [pendingCollaboratorEmail, setPendingCollaboratorEmail] = import_react63.useState(null), [confirmationModal, setConfirmationModal] = import_react63.useState({
     visible: !1,
     type: "seat",
     balance: 0
-  }), [checkoutModal, setCheckoutModal] = import_react64.useState({ visible: !1, url: "", reason: "pro_required" }), [billingPortalModal, setBillingPortalModal] = import_react64.useState({ visible: !1, url: "" }), [isAddingCollaborator, setIsAddingCollaborator] = import_react64.useState(!1), [isRevokingCollaborator, setIsRevokingCollaborator] = import_react64.useState(!1), [isRevokingWithRotation, setIsRevokingWithRotation] = import_react64.useState(!1), [isCreatingItem, setIsCreatingItem] = import_react64.useState(!1), [isRenamingItem, setIsRenamingItem] = import_react64.useState(!1), [isDeletingItem, setIsDeletingItem] = import_react64.useState(!1), [showPasswordModal, setShowPasswordModal] = import_react64.useState(!1), [passwordError, setPasswordError] = import_react64.useState(null), [isVerifyingPassword, setIsVerifyingPassword] = import_react64.useState(!1), [isSessionUnlocked, setIsSessionUnlocked] = import_react64.useState(!1), [pendingAction, setPendingAction] = import_react64.useState(null), isRestricted = projectStatus === "restricted" || projectStatus === "archived", selectedEnv = environments.find((e3) => e3.id === selectedEnvId), selectedFolder = folders.find((f3) => f3.id === selectedFolderId), items = import_react64.useCallback(() => {
+  }), [checkoutModal, setCheckoutModal] = import_react63.useState({ visible: !1, url: "", reason: "pro_required" }), [billingPortalModal, setBillingPortalModal] = import_react63.useState({ visible: !1, url: "" }), [isAddingCollaborator, setIsAddingCollaborator] = import_react63.useState(!1), [isRevokingCollaborator, setIsRevokingCollaborator] = import_react63.useState(!1), [isRevokingWithRotation, setIsRevokingWithRotation] = import_react63.useState(!1), [isCreatingItem, setIsCreatingItem] = import_react63.useState(!1), [isRenamingItem, setIsRenamingItem] = import_react63.useState(!1), [isDeletingItem, setIsDeletingItem] = import_react63.useState(!1), [showPasswordModal, setShowPasswordModal] = import_react63.useState(!1), [passwordError, setPasswordError] = import_react63.useState(null), [isVerifyingPassword, setIsVerifyingPassword] = import_react63.useState(!1), [isSessionUnlocked, setIsSessionUnlocked] = import_react63.useState(!1), [pendingAction, setPendingAction] = import_react63.useState(null), isRestricted = projectStatus === "restricted" || projectStatus === "archived", selectedEnv = environments.find((e3) => e3.id === selectedEnvId), selectedFolder = folders.find((f3) => f3.id === selectedFolderId), items = import_react63.useCallback(() => {
     if (viewLevel === "environments")
       return environments.map((e3) => ({ type: "env", id: e3.id, name: e3.name }));
     if (viewLevel === "environment" && selectedEnvId) {
@@ -59900,7 +59918,7 @@ function ProjectPage({ projectId, projectName, projectStatus }) {
       }));
     return [];
   }, [viewLevel, selectedEnvId, selectedFolderId, environments, folders, secrets])();
-  import_react64.useEffect(() => {
+  import_react63.useEffect(() => {
     if (activeModal !== "bulkImport")
       return;
     let trimmed = bulkImportInput.value.trim();
@@ -60811,7 +60829,7 @@ API_KEY=your_key_here`), setBulkImportScopes(/* @__PURE__ */ new Map);
     ]
   }, void 0, !0, void 0, this);
 }
-var import_react64, logger14, PAGE_SIZE2 = 10;
+var import_react63, logger14, PAGE_SIZE2 = 10;
 var init_ProjectPage = __esm(async () => {
   init_auth();
   init_logger2();
@@ -60838,33 +60856,60 @@ var init_ProjectPage = __esm(async () => {
     init_PasswordInput(),
     init_Modal()
   ]);
-  import_react64 = __toESM(require_react_development(), 1), logger14 = createLogger2("tui");
+  import_react63 = __toESM(require_react_development(), 1), logger14 = createLogger2("tui");
 });
 
 // ../../packages/tui/index.tsx
 var exports_tui = {};
 function AuthenticatedApp({ onLogout }) {
-  let { route, navigate } = useRouter(), { displayName } = useCurrentUser(), [passwordStatus, setPasswordStatus] = import_react66.useState({
-    has: !1,
+  let { route, navigate } = useRouter(), { user, isLoading: isUserLoading } = useUser(), displayName = user ? getUserDisplayName(user) : "User", hasExistingKeys = !!user?.publicKey && !!user?.encryptedPrivateKey && !!user?.salt, [passwordStatus, setPasswordStatus] = import_react65.useState({
+    isReady: !1,
     loading: !0
   });
-  import_react66.useEffect(() => {
-    (async () => {
-      let has = await hasPassword();
-      setPasswordStatus({ has, loading: !1 });
-    })();
-  }, []);
-  let handleLogout = import_react66.useCallback(async () => {
+  import_react65.useEffect(() => {
+    let cancelled = !1, checkPassword = async () => {
+      if (isUserLoading)
+        return;
+      if (!user || !hasExistingKeys) {
+        if (!cancelled)
+          setPasswordStatus({ isReady: !1, loading: !1 });
+        return;
+      }
+      let isReady = await hasPasswordForAccount({
+        userId: user.id,
+        email: user.email,
+        encryptedPrivateKey: user.encryptedPrivateKey,
+        salt: user.salt
+      });
+      if (!cancelled)
+        setPasswordStatus({ isReady, loading: !1 });
+    };
+    return setPasswordStatus({ isReady: !1, loading: !0 }), checkPassword(), () => {
+      cancelled = !0;
+    };
+  }, [
+    hasExistingKeys,
+    isUserLoading,
+    user?.email,
+    user?.encryptedPrivateKey,
+    user?.id,
+    user?.salt
+  ]);
+  let handleLogout = import_react65.useCallback(async () => {
     await onLogout(), navigate({ name: "login" });
   }, [onLogout, navigate]), handlePasswordSetup = async (password) => {
-    await savePassword(password), trackEvent("password_setup_completed", { success: !0 }), setPasswordStatus({ has: !0, loading: !1 }), navigate({ name: "home" });
+    await savePassword(password, user ? {
+      userId: user.id,
+      email: user.email
+    } : void 0), trackEvent("password_setup_completed", { success: !0 }), setPasswordStatus({ isReady: !0, loading: !1 }), navigate({ name: "home" });
   };
-  if (passwordStatus.loading)
+  if (isUserLoading || !user || passwordStatus.loading)
     return null;
-  if (!passwordStatus.has)
+  if (!hasExistingKeys || !passwordStatus.isReady)
     return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(import_jsx_dev_runtime2.Fragment, {
       children: [
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(PasswordSetupPage, {
+          hasExistingKeys,
           onComplete: handlePasswordSetup,
           onLogout: handleLogout
         }, void 0, !1, void 0, this),
@@ -60905,8 +60950,8 @@ function AuthenticatedTaskBar() {
   }, void 0, !1, void 0, this);
 }
 function AppRouter() {
-  let { navigate } = useRouter(), [authState, setAuthState] = import_react66.useState({ isAuthenticated: !1, isLoading: !0 });
-  import_react66.useEffect(() => {
+  let { navigate } = useRouter(), [authState, setAuthState] = import_react65.useState({ isAuthenticated: !1, isLoading: !0 });
+  import_react65.useEffect(() => {
     let cleanup;
     return (async () => {
       try {
@@ -60925,10 +60970,10 @@ function AppRouter() {
       });
     })(), () => cleanup?.();
   }, []);
-  let handleLogin = import_react66.useCallback(async () => {
+  let handleLogin = import_react65.useCallback(async () => {
     let validation = await validateSession();
     setAuthState({ isAuthenticated: validation.isValid, isLoading: !1 }), navigate({ name: "home" });
-  }, [navigate]), handleLogout = import_react66.useCallback(async () => {
+  }, [navigate]), handleLogout = import_react65.useCallback(async () => {
     let userKeyDb = await getUserKeyCacheDb();
     clearCachedUserKeys(userKeyDb), await clearSession(), await clearPassword(), setAuthState({ isAuthenticated: !1, isLoading: !1 });
   }, []);
@@ -60958,14 +61003,13 @@ function App() {
     }, void 0, !1, void 0, this)
   }, void 0, !1, void 0, this);
 }
-var import_react66, isDev3, renderer;
+var import_react65, isDev3, renderer;
 var init_tui = __esm(async () => {
   init_logger2();
   init_auth();
   init_context2();
   init_provider();
   init_useAppSession();
-  init_useCurrentUser();
   init_useTaskQueue();
   init_router();
   init_jsx_dev_runtime();
@@ -60978,7 +61022,7 @@ var init_tui = __esm(async () => {
     init_PasswordSetupPage(),
     init_ProjectPage()
   ]);
-  import_react66 = __toESM(require_react_development(), 1);
+  import_react65 = __toESM(require_react_development(), 1);
   await initLogger();
   if (isFirstRun())
     console.log("Relic collects anonymous usage data to improve the product. Run `relic telemetry disable` to opt out."), saveTelemetryPreference(!0);
@@ -64465,7 +64509,7 @@ async function whoami() {
 // package.json
 var package_default = {
   name: "relic",
-  version: "0.4.3",
+  version: "0.4.4",
   description: "The Relic CLI for managing and sharing secrets. Encrypted on your device, never exposed to anyone else. Not even us.",
   keywords: [
     "cli",