Merge branch 't3code/61c5f7df' into v2/rewrite

2026-05-15 00:28:49 -04:00
parent 0e5a31866f c8a39e6416
commit 50d166cb7c
4 changed files with 126 additions and 6 deletions
--- a/apps/web/src/ui/app/AppShell.tsx
+++ b/apps/web/src/ui/app/AppShell.tsx
@@ -14,6 +14,7 @@ import type {
  RpcResult,
  ServerSettings,
  Screen,
+  UserProfile,
  WorkspaceSection,
 } from "@mosaiciq/contracts/rpc";
 import { rpc } from "../../rpcClient";
@@ -140,6 +141,7 @@ export function App() {
  const [llmLoading, setLlmLoading] = useState(false);
  const [selectedLlmModel, setSelectedLlmModel] = useState<string>("");
  const [keybindingsDraft, setKeybindingsDraft] = useState<Record<string, string>>({});
+  const [profile, setProfile] = useState<Partial<UserProfile>>({});
  const [workspaceSection, setWorkspaceSection] = useState<WorkspaceSection | null>(null);
  const [workspaceSources, setWorkspaceSources] = useState<WorkspaceSource[]>([]);
  const [workspaceLoading, setWorkspaceLoading] = useState(false);
@@ -294,6 +296,7 @@ export function App() {
        if (settings.theme) setTheme(settings.theme);
        if (settings.density) setDensity(settings.density);
        setKeybindingsDraft(settings.keybindings ?? {});
+        setProfile(settings.profile ?? {});
      }
      const server = await rpc.call("settings.get", { scope: "server" });
      if (server.ok) {
@@ -557,6 +560,7 @@ export function App() {
        onScreenChange={setActiveScreen}
        onSettingsOpen={() => setSettingsOpen(true)}
        searchOpen={searchOpen}
+        profile={profile}
        searchQuery={searchQuery}
        onSearchChange={(q) => {
          setSearchOpen(true);
@@ -876,6 +880,12 @@ export function App() {
      <ProfileOverlay
        open={profileOpen}
        onClose={() => setProfileOpen(false)}
+        profile={profile}
+        onSave={async (newProfile) => {
+          setProfile(newProfile);
+          const result = await rpc.call("settings.update", { scope: "client", changes: { profile: newProfile } });
+          if (!result.ok) addToast({ type: "error", title: "Profile save failed", desc: result.error.message });
+        }}
      />
      <AgentFullscreenOverlay
        open={agentFullscreenOpen}
@@ -1034,6 +1044,7 @@ function Topbar(props: {
    ticker?: string;
    action?: string;
  }>;
+  profile?: Partial<UserProfile>;
 }) {
  return (
    <header className={ui.topbar}>
@@ -1120,8 +1131,16 @@ function Topbar(props: {
      <button
        className="grid h-7 w-7 place-items-center rounded-full border border-[var(--border)] bg-[var(--surface)] font-[var(--font-mono)] text-[11px] font-semibold text-[var(--muted)] hover:border-[var(--accent)] hover:text-[var(--accent)]"
        onClick={props.onProfileOpen}
+        title={props.profile?.name ? `${props.profile.name}'s profile` : "Profile"}
      >
-        JD
+        {props.profile?.name
+          ? props.profile.name
+              .split(" ")
+              .map((n) => n[0])
+              .join("")
+              .toUpperCase()
+              .slice(0, 2)
+          : "JD"}
      </button>
    </header>
  );
@@ -3389,11 +3408,34 @@ function SettingsOverlay({
 function ProfileOverlay({
  open,
  onClose,
+  profile,
+  onSave,
 }: {
  open: boolean;
  onClose: () => void;
+  profile: Partial<UserProfile>;
+  onSave: (profile: Partial<UserProfile>) => Promise<void>;
 }) {
+  const [draft, setDraft] = useState<Partial<UserProfile>>(profile);
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    setDraft(profile);
+  }, [profile]);
+
  if (!open) return null;
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    setSaving(true);
+    try {
+      await onSave(draft);
+      onClose();
+    } finally {
+      setSaving(false);
+    }
+  };
+
  return (
    <div
      className={cx(ui.overlayWide, "overlay-backdrop open")}
@@ -3406,15 +3448,76 @@ function ProfileOverlay({
      <section className="overlay-body w-[420px] border border-[var(--border)] bg-[var(--surface)] p-5 shadow-2xl">
        <div className="mb-5 flex items-center justify-between">
          <h2 className="font-[var(--font-display)] text-2xl font-semibold">
-            JD Profile
+            Profile
          </h2>
          <button className={ui.iconBtn} onClick={onClose}>
            ×
          </button>
        </div>
-        <SettingsRow label="Name" value="Jordan Davis" />
-        <SettingsRow label="Role" value="Portfolio Manager" />
-        <p className="mt-4 text-xs text-[var(--muted)]">Profile editing is local-only until a profile backend is added.</p>
+        <form onSubmit={handleSubmit}>
+          <SettingsRow
+            label="Name"
+            value={draft.name}
+          >
+            <input
+              className="w-full border border-[var(--border)] bg-[var(--bg)] px-3 py-2 text-sm outline-none focus:border-[var(--accent)]"
+              value={draft.name ?? ""}
+              onChange={(e) => setDraft({ ...draft, name: e.target.value })}
+              placeholder="Your name"
+            />
+          </SettingsRow>
+          <SettingsRow
+            label="Role"
+            value={draft.role}
+          >
+            <input
+              className="w-full border border-[var(--border)] bg-[var(--bg)] px-3 py-2 text-sm outline-none focus:border-[var(--accent)]"
+              value={draft.role ?? ""}
+              onChange={(e) => setDraft({ ...draft, role: e.target.value })}
+              placeholder="Portfolio Manager, Analyst, etc."
+            />
+          </SettingsRow>
+          <SettingsRow
+            label="Email"
+            value={draft.email}
+          >
+            <input
+              type="email"
+              className="w-full border border-[var(--border)] bg-[var(--bg)] px-3 py-2 text-sm outline-none focus:border-[var(--accent)]"
+              value={draft.email ?? ""}
+              onChange={(e) => setDraft({ ...draft, email: e.target.value || undefined })}
+              placeholder="you@example.com"
+            />
+          </SettingsRow>
+          <SettingsRow
+            label="Phone"
+            value={draft.phone}
+          >
+            <input
+              type="tel"
+              className="w-full border border-[var(--border)] bg-[var(--bg)] px-3 py-2 text-sm outline-none focus:border-[var(--accent)]"
+              value={draft.phone ?? ""}
+              onChange={(e) => setDraft({ ...draft, phone: e.target.value || undefined })}
+              placeholder="+1 (555) 123-4567"
+            />
+          </SettingsRow>
+          <div className="mt-5 flex justify-end gap-2">
+            <button
+              type="button"
+              className="px-4 py-2 text-sm text-[var(--muted)] hover:text-[var(--fg)]"
+              onClick={onClose}
+            >
+              Cancel
+            </button>
+            <button
+              type="submit"
+              disabled={saving}
+              className="rounded bg-[var(--accent)] px-4 py-2 text-sm font-medium text-[var(--accent-fg)] hover:opacity-90 disabled:opacity-50"
+            >
+              {saving ? "Saving..." : "Save"}
+            </button>
+          </div>
+        </form>
      </section>
    </div>
  );
--- a/packages/contracts/src/rpc.ts
+++ b/packages/contracts/src/rpc.ts
@@ -187,6 +187,8 @@ export type ClientSettings = z.infer<typeof import("./rpcSchemas.js").ClientSett

 export type ServerSettings = z.infer<typeof import("./rpcSchemas.js").ServerSettingsSchema>;

+export type UserProfile = z.infer<typeof import("./rpcSchemas.js").UserProfileSchema>;
+
 export type RpcRequestMap = {
  "portfolio.get": undefined;
  "portfolio.addHolding": { ticker: string };
--- a/packages/contracts/src/rpcSchemas.ts
+++ b/packages/contracts/src/rpcSchemas.ts
@@ -28,12 +28,20 @@ const tickerString = z.string().trim().min(1).max(16);
 const nonNegativeIndex = z.number().int().min(0);
 const unknownRecord = z.record(z.unknown());

+export const UserProfileSchema = z.object({
+  name: z.string().min(1).default(""),
+  role: z.string().min(1).default(""),
+  email: z.string().email().optional(),
+  phone: z.string().optional(),
+});
+
 export const ClientSettingsSchema = z.object({
  theme: z.enum(["light", "dark", "system"]),
  density: z.enum(["comfortable", "compact", "dense"]),
  sidebarWidth: z.number().int().min(160).max(520),
  navCollapsed: z.record(z.boolean()),
  keybindings: z.record(z.string()),
+  profile: UserProfileSchema.partial().default({}),
 });

 export const ServerSettingsSchema = z.object({
--- a/packages/shared/src/db/queries.ts
+++ b/packages/shared/src/db/queries.ts
@@ -25,7 +25,7 @@ import type {
  ClientSettings,
  ServerSettings,
 } from "@mosaiciq/contracts/rpc";
-import { ClientSettingsSchema, ServerSettingsSchema } from "@mosaiciq/contracts/rpcSchemas";
+import { ClientSettingsSchema, ServerSettingsSchema, UserProfileSchema } from "@mosaiciq/contracts/rpcSchemas";

 export function parseJsonWithSchema<T>(
  value: string,
@@ -1024,6 +1024,7 @@ const DEFAULT_CLIENT_SETTINGS: ClientSettings = {
    "navigation.agents": "Cmd+4",
    "navigation.home": "Cmd+0",
  },
+  profile: {},
 };

 export function getClientSettings(db: Db): ClientSettings {
@@ -1041,6 +1042,9 @@ export function getClientSettings(db: Db): ClientSettings {
      } else if (row.key === "navCollapsed") {
        const navCollapsed = z.record(z.boolean()).safeParse(parsed);
        if (navCollapsed.success) settings.navCollapsed = { ...settings.navCollapsed, ...navCollapsed.data };
+      } else if (row.key === "profile") {
+        const profile = UserProfileSchema.partial().safeParse(parsed);
+        if (profile.success) settings.profile = { ...settings.profile, ...profile.data };
      } else {
        const candidate = { ...settings, [row.key]: parsed };
        const validated = ClientSettingsSchema.safeParse(candidate);
@@ -1083,6 +1087,9 @@ export function updateClientSettings(db: Db, settings: Partial<ClientSettings>):
  if (settings.keybindings !== undefined) {
    updateClientSetting(db, "keybindings", settings.keybindings);
  }
+  if (settings.profile !== undefined) {
+    updateClientSetting(db, "profile", settings.profile);
+  }
 }

 export function getServerSettings(db: Db): ServerSettings {