Fix LLM chat startup and polish cybersecurity advisor UI.

Load shared.env before bootstrap so API keys are available, fix chat-stream session binding, and remove the chat title from the header.

Co-authored-by: Cursor <cursoragent@cursor.com>

cybersecurity_config.yaml

@@ -3,7 +3,7 @@
 # ============================================================================
 
 app:
-  title: "Cybersecurity Advisor Canvas"
+  title: "Cybersecurity Advisor"
   subtitle: "AI-Powered Security Guidance"
   primary_color: "#0F172A"
   logo_icon: "Shield"

multi_llm_chatbot_backend/.env.example

@@ -9,4 +9,8 @@ VLLM_API_KEY=
 OPENAI_API_KEY=
 GEMINI_API_KEY=
 
-CORS_ORIGINS=http://localhost:3010,http://127.0.0.1:3010
+# Include every frontend origin you use locally (React default is 3000)
+CORS_ORIGINS=http://localhost:3010,http://127.0.0.1:3010,http://localhost:3000,http://127.0.0.1:3000
+
+# Optional override; default is %USERPROFILE%\.secrets\shared.env
+# SHARED_ENV=C:\Users\dream\.secrets\shared.env

multi_llm_chatbot_backend/app/api/routes/auth.py

@@ -90,17 +90,19 @@ async def signup(user_data: UserCreate):
         result = await db.users.insert_one(user.dict(by_alias=True))
         user.id = result.inserted_id
 
-        profile_seed = {}
+        profile_seed: dict = {
+            "user_id": user.id,
+            "updated_at": datetime.utcnow(),
+        }
+        if user_data.academicStage:
+            profile_seed["knowledge_level"] = user_data.academicStage
         if user_data.researchArea:
             profile_seed["timezone"] = user_data.researchArea
-        if profile_seed:
-            profile_seed["user_id"] = user.id
-            profile_seed["updated_at"] = datetime.utcnow()
-            await db.user_profiles.update_one(
-                {"user_id": user.id},
-                {"$set": profile_seed},
-                upsert=True,
-            )
+        await db.user_profiles.update_one(
+            {"user_id": user.id},
+            {"$set": profile_seed},
+            upsert=True,
+        )
         
         # Create access token
         access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
@@ -260,11 +262,15 @@ async def update_profile(
                 )
 
         await db.users.update_one({"_id": current_user.id}, {"$set": updates})
-        if body.researchArea:
+        profile_sync: dict = {"updated_at": datetime.utcnow()}
+        if body.academicStage is not None:
+            profile_sync["knowledge_level"] = body.academicStage
+        if body.researchArea is not None:
+            profile_sync["timezone"] = body.researchArea
+        if len(profile_sync) > 1:
             await db.user_profiles.update_one(
                 {"user_id": current_user.id},
-                {"$set": {"timezone": body.researchArea, "updated_at": datetime.utcnow()},
-                 "$setOnInsert": {"user_id": current_user.id}},
+                {"$set": profile_sync, "$setOnInsert": {"user_id": current_user.id}},
                 upsert=True,
             )
         updated_user = await db.users.find_one({"_id": current_user.id})

multi_llm_chatbot_backend/app/api/routes/chat.py

@@ -16,29 +16,22 @@ from app.core.bootstrap import chat_orchestrator
 from app.core.database import get_database
 from app.core.session_manager import get_session_manager
 from app.models.user import User
+from app.api.routes.user_profile import PROFILE_FIELDS, enrich_profile_from_user
 
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
 session_manager = get_session_manager()
 
-_PROFILE_FIELDS = [
-    "cyber_role", "organization_type", "primary_domains", "certifications",
-    "tools_stack", "compliance_focus", "current_goals", "learning_preferences", "timezone",
-]
-
 
 async def _attach_user_profile_context(session, user: User) -> None:
     """Load Mongo profile + signup fields into session for persona prompts."""
     try:
         db = get_database()
-        profile = await db.user_profiles.find_one({"user_id": user.id}) or {}
+        doc = await db.user_profiles.find_one({"user_id": user.id})
+        profile = enrich_profile_from_user(doc, user)
         parts = []
-        if user.academicStage:
-            parts.append(f"knowledge_level: {user.academicStage}")
-        if user.researchArea and not profile.get("timezone"):
-            parts.append(f"timezone: {user.researchArea}")
-        for key in _PROFILE_FIELDS:
+        for key in PROFILE_FIELDS:
             val = profile.get(key)
             if val:
                 if isinstance(val, list):
@@ -183,9 +176,10 @@ async def chat_stream(
                     await done_queue.put(result)
                 except Exception as e:
                     logger.exception(f"chat-stream _run failed for {pid}: {e}")
+                    failed_persona = chat_orchestrator.get_persona(pid)
                     await done_queue.put({
-                        "persona_id": persona.id,
-                        "persona_name": persona.name,
+                        "persona_id": pid,
+                        "persona_name": failed_persona.name if failed_persona else pid,
                         "response": f"I ran into a technical issue. Please try again. ({e!s})",
                         "used_documents": False,
                         "document_chunks_used": 0,

multi_llm_chatbot_backend/app/api/routes/onboarding.py

@@ -35,7 +35,7 @@ from typing import Any, Dict, Optional
 from fastapi import APIRouter, Depends
 from pydantic import BaseModel
 
-from app.api.routes.user_profile import _is_field_filled
+from app.api.routes.user_profile import _is_field_filled, enrich_profile_from_user
 from app.core.auth import get_current_active_user
 from app.core.bootstrap import create_llm_client
 from app.core.database import get_database
@@ -77,7 +77,8 @@ async def onboarding_start(
     message is generated based on which fields are still missing.
     """
     db = get_database()
-    profile = await db.user_profiles.find_one({"user_id": current_user.id}) or {}
+    doc = await db.user_profiles.find_one({"user_id": current_user.id})
+    profile = enrich_profile_from_user(doc, current_user)
     progress = _progress(profile)
 
     if progress >= 100:
@@ -128,7 +129,8 @@ async def onboarding_chat(
     current_user: User = Depends(get_current_active_user),
 ) -> Dict[str, Any]:
     db = get_database()
-    profile = await db.user_profiles.find_one({"user_id": current_user.id}) or {}
+    doc = await db.user_profiles.find_one({"user_id": current_user.id})
+    profile = enrich_profile_from_user(doc, current_user)
 
     agent = OnboardingAgent(create_llm_client())
     result = await agent.chat(msg.user_input, current_user.id, profile)

multi_llm_chatbot_backend/app/api/routes/user_profile.py

@@ -15,6 +15,8 @@ LOG = logging.getLogger(__name__)
 router = APIRouter()
 
 PROFILE_FIELDS = [
+    "knowledge_level",
+    "timezone",
     "cyber_role",
     "organization_type",
     "primary_domains",
@@ -23,7 +25,6 @@ PROFILE_FIELDS = [
     "compliance_focus",
     "current_goals",
     "learning_preferences",
-    "timezone",
 ]
 
 LIST_FIELDS = {"primary_domains", "certifications", "tools_stack"}
@@ -61,11 +62,35 @@ def _is_field_filled(value: Any) -> bool:
     return bool(value)
 
 
+def enrich_profile_from_user(
+    doc: Optional[Dict[str, Any]], user: User
+) -> Dict[str, Any]:
+    """Merge account signup fields into the profile when profile slots are empty."""
+    merged = dict(doc or {})
+    if user.academicStage and not _is_field_filled(merged.get("knowledge_level")):
+        merged["knowledge_level"] = user.academicStage
+    if user.researchArea and not _is_field_filled(merged.get("timezone")):
+        merged["timezone"] = user.researchArea
+    return merged
+
+
 def _calc_completion(doc: Dict[str, Any]) -> int:
     filled = sum(1 for f in PROFILE_FIELDS if _is_field_filled(doc.get(f)))
     return int(filled / len(PROFILE_FIELDS) * 100)
 
 
+def _profile_response(doc: Dict[str, Any], user: User) -> UserProfileResponse:
+    enriched = enrich_profile_from_user(doc, user)
+    fields = {k: _normalize_field(k, enriched.get(k)) for k in PROFILE_FIELDS}
+    return UserProfileResponse(
+        user_id=str(enriched.get("user_id", user.id)),
+        **fields,
+        advisor_notes=enriched.get("advisor_notes"),
+        updated_at=enriched.get("updated_at"),
+        completion_pct=_calc_completion(enriched),
+    )
+
+
 _SELECT_LOOKUP: Dict[str, Dict[str, str]] = {
     field: {opt.lower(): opt for opt in opts}
     for field, opts in _SELECT_OPTIONS.items()
@@ -99,6 +124,18 @@ def _normalize_field(key: str, value: Any) -> Any:
     return value
 
 
+async def _sync_profile_to_user(user: User, update_data: Dict[str, Any]) -> None:
+    """Keep users.academicStage / researchArea aligned with profile edits."""
+    user_updates: Dict[str, Any] = {}
+    if "knowledge_level" in update_data:
+        user_updates["academicStage"] = update_data["knowledge_level"] or None
+    if "timezone" in update_data:
+        user_updates["researchArea"] = update_data["timezone"] or None
+    if user_updates:
+        db = get_database()
+        await db.users.update_one({"_id": user.id}, {"$set": user_updates})
+
+
 @router.get("/users/me/profile", response_model=UserProfileResponse)
 async def get_my_profile(
     current_user: User = Depends(get_current_active_user),
@@ -106,18 +143,8 @@ async def get_my_profile(
     db = get_database()
     doc = await db.user_profiles.find_one({"user_id": current_user.id})
     if not doc:
-        resp = UserProfileResponse(user_id=str(current_user.id))
-        if current_user.researchArea:
-            resp.timezone = current_user.researchArea
-        return resp
-    fields = {k: _normalize_field(k, doc.get(k)) for k in PROFILE_FIELDS}
-    return UserProfileResponse(
-        user_id=str(doc["user_id"]),
-        **fields,
-        advisor_notes=doc.get("advisor_notes"),
-        updated_at=doc.get("updated_at"),
-        completion_pct=_calc_completion(doc),
-    )
+        doc = {"user_id": current_user.id}
+    return _profile_response(doc, current_user)
 
 
 @router.put("/users/me/profile", response_model=UserProfileResponse)
@@ -133,15 +160,11 @@ async def update_my_profile(
         {"$set": update_data, "$setOnInsert": {"user_id": current_user.id}},
         upsert=True,
     )
-    doc = await db.user_profiles.find_one({"user_id": current_user.id})
-    fields = {k: _normalize_field(k, doc.get(k)) for k in PROFILE_FIELDS}
-    return UserProfileResponse(
-        user_id=str(doc["user_id"]),
-        **fields,
-        advisor_notes=doc.get("advisor_notes"),
-        updated_at=doc.get("updated_at"),
-        completion_pct=_calc_completion(doc),
-    )
+    await _sync_profile_to_user(current_user, update_data)
+    doc = await db.user_profiles.find_one({"user_id": current_user.id}) or {
+        "user_id": current_user.id
+    }
+    return _profile_response(doc, current_user)
 
 
 class ClearDataRequest(BaseModel):

multi_llm_chatbot_backend/app/core/bootstrap.py

@@ -2,6 +2,10 @@
 import os
 from pathlib import Path
 
+from app.core.env_loader import load_application_env
+
+load_application_env()
+
 from app.config import get_settings
 from app.llm.improved_gemini_client import ImprovedGeminiClient
 from app.llm.improved_ollama_client import ImprovedOllamaClient
@@ -17,22 +21,35 @@ current_provider = settings.llm.provider or "vllm"
 available_providers = ["ollama", "gemini", "vllm"]
 
 
-def _load_shared_env_vllm_key() -> str:
-    shared = Path.home() / ".secrets" / "shared.env"
-    if shared.exists():
+def _load_shared_env_var(name: str) -> str:
+    explicit = os.environ.get("SHARED_ENV", "").strip()
+    candidates = [Path(explicit)] if explicit else []
+    candidates.append(Path.home() / ".secrets" / "shared.env")
+    prefix = f"{name}="
+    for shared in candidates:
+        if not shared.is_file():
+            continue
         for line in shared.read_text(encoding="utf-8").splitlines():
             line = line.strip()
-            if line.startswith("VLLM_API_KEY="):
+            if line.startswith(prefix):
                 return line.split("=", 1)[1].strip()
     return ""
 
 
 def _vllm_api_key() -> str:
-    return settings.llm.vllm.api_key or os.getenv("VLLM_API_KEY", "") or _load_shared_env_vllm_key()
+    return (
+        settings.llm.vllm.api_key
+        or os.getenv("VLLM_API_KEY", "")
+        or _load_shared_env_var("VLLM_API_KEY")
+    )
 
 
 def _openai_api_key() -> str:
-    return settings.llm.openai.api_key or os.getenv("OPENAI_API_KEY", "")
+    return (
+        settings.llm.openai.api_key
+        or os.getenv("OPENAI_API_KEY", "")
+        or _load_shared_env_var("OPENAI_API_KEY")
+    )
 
 
 def _build_neon_vllm(neon_persona: str | None) -> ImprovedVllmClient:

multi_llm_chatbot_backend/app/core/env_loader.py

@@ -0,0 +1,31 @@
+"""Load local and shared environment files before LLM bootstrap."""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+
+from dotenv import load_dotenv
+
+_BACKEND_ROOT = Path(__file__).resolve().parents[2]
+
+
+def _shared_env_paths() -> list[Path]:
+    paths: list[Path] = []
+    explicit = os.environ.get("SHARED_ENV", "").strip()
+    if explicit:
+        paths.append(Path(explicit))
+    paths.append(Path.home() / ".secrets" / "shared.env")
+    return paths
+
+
+def load_application_env() -> None:
+    """Load cwd .env, backend .env, then shared secrets (without overriding explicit env)."""
+    load_dotenv()
+    backend_env = _BACKEND_ROOT / ".env"
+    if backend_env.is_file():
+        load_dotenv(backend_env, override=False)
+    for path in _shared_env_paths():
+        if path.is_file():
+            load_dotenv(path, override=False)
+            return

multi_llm_chatbot_backend/app/core/onboarding_agent.py

@@ -13,6 +13,10 @@ from app.core.database import get_database
 LOG = logging.getLogger(__name__)
 
 PROFILE_FIELDS: List[tuple] = [
+    ("knowledge_level", "What is your cybersecurity knowledge level?",
+     "Level such as newcomer, foundational, practitioner, experienced, or expert"),
+    ("timezone", "What time zone are you usually in?",
+     "IANA timezone or region such as America/New_York, Europe/London, UTC"),
     ("cyber_role", "What best describes your role right now?",
      "Job or learning role: student, SOC analyst, engineer, architect, manager, career changer, etc."),
     ("organization_type", "What type of organization are you in (or targeting)?",
@@ -29,8 +33,6 @@ PROFILE_FIELDS: List[tuple] = [
      "Incident readiness, certification, job search, architecture review, audit prep, etc."),
     ("learning_preferences", "How do you prefer to learn new security concepts?",
      "Hands-on labs, reading, videos, mentorship, certifications, capture-the-flag, etc."),
-    ("timezone", "What time zone are you usually in?",
-     "IANA timezone or region such as America/New_York, Europe/London, UTC"),
 ]
 
 

multi_llm_chatbot_backend/app/main.py

@@ -1,9 +1,9 @@
 import os
-from dotenv import load_dotenv
+from pathlib import Path
 
-load_dotenv()
+from app.core.env_loader import load_application_env
 
-from pathlib import Path
+load_application_env()
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware

multi_llm_chatbot_backend/app/models/user_profile.py

@@ -15,6 +15,8 @@ class UserProfile(BaseModel):
 
     id: PyObjectId = Field(default_factory=PyObjectId, alias="_id")
     user_id: PyObjectId
+    knowledge_level: Optional[str] = None
+    timezone: Optional[str] = None
     cyber_role: Optional[str] = None
     organization_type: Optional[str] = None
     primary_domains: List[str] = []
@@ -23,12 +25,13 @@ class UserProfile(BaseModel):
     compliance_focus: Optional[str] = None
     current_goals: Optional[str] = None
     learning_preferences: Optional[str] = None
-    timezone: Optional[str] = None
     advisor_notes: Optional[str] = None
     updated_at: datetime = Field(default_factory=datetime.utcnow)
 
 
 class UserProfileUpdate(BaseModel):
+    knowledge_level: Optional[str] = None
+    timezone: Optional[str] = None
     cyber_role: Optional[str] = None
     organization_type: Optional[str] = None
     primary_domains: Optional[List[str]] = None
@@ -37,12 +40,13 @@ class UserProfileUpdate(BaseModel):
     compliance_focus: Optional[str] = None
     current_goals: Optional[str] = None
     learning_preferences: Optional[str] = None
-    timezone: Optional[str] = None
     advisor_notes: Optional[str] = None
 
 
 class UserProfileResponse(BaseModel):
     user_id: str
+    knowledge_level: Optional[str] = None
+    timezone: Optional[str] = None
     cyber_role: Optional[str] = None
     organization_type: Optional[str] = None
     primary_domains: List[str] = []
@@ -51,7 +55,6 @@ class UserProfileResponse(BaseModel):
     compliance_focus: Optional[str] = None
     current_goals: Optional[str] = None
     learning_preferences: Optional[str] = None
-    timezone: Optional[str] = None
     advisor_notes: Optional[str] = None
     updated_at: Optional[datetime] = None
     completion_pct: int = 0

phd-advisor-frontend/src/components/MessageBubble.js

@@ -302,34 +302,38 @@ const MessageBubble = ({
     const colors = getAdvisorColors(personaId, isDark);
     const isCopied = copiedStates[message.id];
 
-    const avatarElement = (size = 40) => (
-      advisor.avatarUrl ? (
-        <img 
-          src={advisor.avatarUrl} 
-          alt={advisor.name || 'Advisor'} 
-          style={{ width: size, height: size, borderRadius: '50%', objectFit: 'cover', flexShrink: 0 }} 
-        />
-      ) : Icon ? (
+    const avatarElement = (size = 44) => {
+      const iconSize = Math.round(size * 0.52);
+      return (
         <div
-          style={{
-            width: size, height: size, borderRadius: '50%', backgroundColor: colors.bgColor || 'var(--bg-muted)',
-            display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0, overflow: 'hidden'
-          }}
+          className="advisor-message-avatar-ring"
+          style={{ width: size, height: size }}
         >
-          <Icon style={{ color: colors.color || 'var(--text-secondary)', width: size * 0.5, height: size * 0.5 }} />
-        </div>
-      ) : (
-        <div
-          style={{
-            width: size, height: size, borderRadius: '50%', backgroundColor: colors.bgColor || 'var(--bg-muted)',
-            display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0,
-            color: colors.color || 'var(--text-secondary)', fontWeight: 600, fontSize: size * 0.4
-          }}
-        >
-          {advisor.name ? advisor.name.charAt(0) : 'A'}
+          {advisor.avatarUrl ? (
+            <img
+              src={advisor.avatarUrl}
+              alt={advisor.name || 'Advisor'}
+            />
+          ) : Icon ? (
+            <Icon
+              className="advisor-message-avatar-icon"
+              style={{
+                color: colors.color || 'var(--text-secondary)',
+                width: iconSize,
+                height: iconSize,
+              }}
+            />
+          ) : (
+            <span
+              className="advisor-message-avatar-initial"
+              style={{ color: colors.color || 'var(--text-secondary)', fontSize: iconSize }}
+            >
+              {advisor.name ? advisor.name.charAt(0) : 'A'}
+            </span>
+          )}
         </div>
-      )
-    );
+      );
+    };
 
     return (
       <div className={`advisor-message-container ${inlineAvatar ? 'inline-avatar-mode' : ''}`}>
@@ -350,7 +354,7 @@ const MessageBubble = ({
           }}
         >
           <div className="advisor-message-header">
-            {inlineAvatar && avatarElement(32)}
+            {inlineAvatar && avatarElement(44)}
             <h4 
               className="advisor-message-name" 
               style={{ color: colors.color || 'var(--text-primary)' }}

phd-advisor-frontend/src/components/ProfileWalkthrough.js

@@ -1,34 +1,80 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { X, ChevronLeft, ChevronRight, Check } from 'lucide-react';
+import { useAppConfig } from '../contexts/AppConfigContext';
 
-const STEPS = [
-  {
-    title: 'Role & environment',
-    fields: [
-      { key: 'cyber_role', label: 'Your role', type: 'select', options: ['Student / Learner', 'Career changer', 'SOC analyst', 'Security engineer', 'Architect / lead', 'Manager / director', 'Consultant', 'Other'] },
-      { key: 'organization_type', label: 'Organization type', type: 'select', options: ['Startup', 'Mid-size company', 'Enterprise', 'Government / public sector', 'Education', 'MSP / MSSP', 'Independent / job seeker'] },
-      { key: 'timezone', label: 'Time zone', type: 'text', placeholder: 'e.g. America/New_York' },
-    ],
-  },
-  {
-    title: 'Focus & tools',
-    fields: [
-      { key: 'primary_domains', label: 'Primary domains (comma-separated)', type: 'text', placeholder: 'e.g. cloud, appsec, IR, GRC, identity' },
-      { key: 'certifications', label: 'Certifications (comma-separated)', type: 'text', placeholder: 'e.g. Security+, CISSP, OSCP, or none yet' },
-      { key: 'tools_stack', label: 'Tools & platforms (comma-separated)', type: 'text', placeholder: 'e.g. Splunk, CrowdStrike, AWS, Jira' },
-    ],
-  },
-  {
-    title: 'Goals & learning',
-    fields: [
-      { key: 'compliance_focus', label: 'Compliance / frameworks', type: 'text', placeholder: 'e.g. SOC 2, NIST CSF, ISO 27001, HIPAA' },
-      { key: 'current_goals', label: 'Current goals', type: 'textarea', placeholder: 'Audit prep, cert study, incident readiness, architecture review...' },
-      { key: 'learning_preferences', label: 'How you learn best', type: 'text', placeholder: 'Labs, reading, CTFs, mentorship, certifications...' },
-    ],
-  },
-];
+const buildSteps = (config) => {
+  const knowledgeLevels = (config?.login?.knowledge_levels || config?.login?.academic_stages || [])
+    .filter((o) => o.value)
+    .map((o) => ({ value: o.value, label: o.label }));
+
+  const timezones = (config?.login?.timezones || [])
+    .filter((o) => o.value)
+    .map((o) => ({ value: o.value, label: o.label }));
+
+  return [
+    {
+      title: 'Background',
+      fields: [
+        {
+          key: 'knowledge_level',
+          label: 'Cybersecurity knowledge level',
+          type: 'select',
+          options: knowledgeLevels.length
+            ? knowledgeLevels
+            : [
+                { value: 'newcomer', label: 'New to cybersecurity' },
+                { value: 'practitioner', label: 'Practitioner' },
+              ],
+        },
+        {
+          key: 'timezone',
+          label: 'Time zone',
+          type: 'select',
+          options: timezones.length
+            ? timezones
+            : [{ value: 'UTC', label: 'UTC' }],
+        },
+      ],
+    },
+    {
+      title: 'Role & environment',
+      fields: [
+        { key: 'cyber_role', label: 'Your role', type: 'select', options: ['Student / Learner', 'Career changer', 'SOC analyst', 'Security engineer', 'Architect / lead', 'Manager / director', 'Consultant', 'Other'] },
+        { key: 'organization_type', label: 'Organization type', type: 'select', options: ['Startup', 'Mid-size company', 'Enterprise', 'Government / public sector', 'Education', 'MSP / MSSP', 'Independent / job seeker'] },
+      ],
+    },
+    {
+      title: 'Focus & tools',
+      fields: [
+        { key: 'primary_domains', label: 'Primary domains (comma-separated)', type: 'text', placeholder: 'e.g. cloud, appsec, IR, GRC, identity' },
+        { key: 'certifications', label: 'Certifications (comma-separated)', type: 'text', placeholder: 'e.g. Security+, CISSP, OSCP, or none yet' },
+        { key: 'tools_stack', label: 'Tools & platforms (comma-separated)', type: 'text', placeholder: 'e.g. Splunk, CrowdStrike, AWS, Jira' },
+      ],
+    },
+    {
+      title: 'Goals & learning',
+      fields: [
+        { key: 'compliance_focus', label: 'Compliance / frameworks', type: 'text', placeholder: 'e.g. SOC 2, NIST CSF, ISO 27001, HIPAA' },
+        { key: 'current_goals', label: 'Current goals', type: 'textarea', placeholder: 'Audit prep, cert study, incident readiness, architecture review...' },
+        { key: 'learning_preferences', label: 'How you learn best', type: 'text', placeholder: 'Labs, reading, CTFs, mentorship, certifications...' },
+      ],
+    },
+  ];
+};
+
+const initFormFromProfile = (steps, profile) => {
+  const init = {};
+  steps.forEach((s) => s.fields.forEach((f) => {
+    const val = profile[f.key];
+    if (Array.isArray(val)) init[f.key] = val.join(', ');
+    else if (val) init[f.key] = val;
+  }));
+  return init;
+};
 
 const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
+  const { config } = useAppConfig();
+  const steps = useMemo(() => buildSteps(config), [config]);
   const [step, setStep] = useState(0);
   const [formData, setFormData] = useState({});
   const [saving, setSaving] = useState(false);
@@ -43,24 +89,11 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
         });
         if (resp.ok && !cancelled) {
           const profile = await resp.json();
-          const init = {};
-          STEPS.forEach(s => s.fields.forEach(f => {
-            const val = profile[f.key];
-            if (Array.isArray(val)) init[f.key] = val.join(', ');
-            else if (val) init[f.key] = val;
-          }));
-          setFormData(init);
+          setFormData(initFormFromProfile(steps, profile));
         }
       } catch (e) {
-        // Fall back to existingProfile prop
         if (!cancelled && existingProfile) {
-          const init = {};
-          STEPS.forEach(s => s.fields.forEach(f => {
-            const val = existingProfile[f.key];
-            if (Array.isArray(val)) init[f.key] = val.join(', ');
-            else if (val) init[f.key] = val;
-          }));
-          setFormData(init);
+          setFormData(initFormFromProfile(steps, existingProfile));
         }
       } finally {
         if (!cancelled) setLoading(false);
@@ -68,19 +101,19 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
     };
     fetchProfile();
     return () => { cancelled = true; };
-  }, [authToken, existingProfile]);
+  }, [authToken, existingProfile, steps]);
 
-  const handleChange = (key, value) => setFormData(prev => ({ ...prev, [key]: value }));
+  const handleChange = (key, value) => setFormData((prev) => ({ ...prev, [key]: value }));
 
   const saveProfile = async () => {
     const payload = { ...formData };
-    ['primary_domains', 'certifications', 'tools_stack'].forEach(k => {
+    ['primary_domains', 'certifications', 'tools_stack'].forEach((k) => {
       if (typeof payload[k] === 'string') {
-        payload[k] = payload[k].split(',').map(s => s.trim()).filter(Boolean);
+        payload[k] = payload[k].split(',').map((s) => s.trim()).filter(Boolean);
       }
     });
-    const hasData = Object.values(payload).some(v =>
-      Array.isArray(v) ? v.length > 0 : Boolean(v)
+    const hasData = Object.values(payload).some((v) =>
+      (Array.isArray(v) ? v.length > 0 : Boolean(v))
     );
     if (!hasData) return;
     try {
@@ -106,8 +139,15 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
     onClose();
   };
 
-  const currentStep = STEPS[step];
-  const isLast = step === STEPS.length - 1;
+  const currentStep = steps[step];
+  const isLast = step === steps.length - 1;
+
+  const renderSelectOptions = (options) => options.map((o) => {
+    if (o && typeof o === 'object' && o.value != null) {
+      return <option key={o.value} value={o.value}>{o.label}</option>;
+    }
+    return <option key={o} value={o}>{o}</option>;
+  });
 
   return (
     <div onClick={handleClose} style={{
@@ -115,7 +155,7 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
       background: 'rgba(0,0,0,0.5)', display: 'flex',
       alignItems: 'center', justifyContent: 'center',
     }}>
-      <div onClick={e => e.stopPropagation()} style={{
+      <div onClick={(e) => e.stopPropagation()} style={{
         background: 'var(--bg-primary)', borderRadius: 16,
         width: '90%', maxWidth: 480, padding: 24,
         boxShadow: '0 20px 60px rgba(0,0,0,0.3)',
@@ -125,27 +165,24 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
             Loading profile...
           </div>
         ) : <>
-        {/* Header */}
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20 }}>
           <h3 style={{ margin: 0, fontSize: 16, color: 'var(--text-primary)' }}>
-            {currentStep.title} ({step + 1}/{STEPS.length})
+            {currentStep.title} ({step + 1}/{steps.length})
           </h3>
           <button onClick={handleClose} style={{ background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-secondary)' }}>
             <X size={18} />
           </button>
         </div>
 
-        {/* Progress bar */}
         <div style={{ height: 4, background: 'var(--bg-secondary)', borderRadius: 2, marginBottom: 20 }}>
           <div style={{
             height: '100%', borderRadius: 2, background: 'var(--accent-primary)',
-            width: `${((step + 1) / STEPS.length) * 100}%`, transition: 'width 0.3s',
+            width: `${((step + 1) / steps.length) * 100}%`, transition: 'width 0.3s',
           }} />
         </div>
 
-        {/* Fields */}
         <div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
-          {currentStep.fields.map(f => (
+          {currentStep.fields.map((f) => (
             <div key={f.key}>
               <label style={{ display: 'block', fontSize: 12, fontWeight: 600, color: 'var(--text-secondary)', marginBottom: 4 }}>
                 {f.label}
@@ -153,7 +190,7 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
               {f.type === 'select' ? (
                 <select
                   value={formData[f.key] || ''}
-                  onChange={e => handleChange(f.key, e.target.value)}
+                  onChange={(e) => handleChange(f.key, e.target.value)}
                   style={{
                     width: '100%', padding: '8px 10px', borderRadius: 8,
                     border: '1px solid var(--border-primary)', background: 'var(--bg-secondary)',
@@ -161,12 +198,12 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
                   }}
                 >
                   <option value="">Select...</option>
-                  {f.options.map(o => <option key={o} value={o}>{o}</option>)}
+                  {renderSelectOptions(f.options)}
                 </select>
               ) : f.type === 'textarea' ? (
                 <textarea
                   value={formData[f.key] || ''}
-                  onChange={e => handleChange(f.key, e.target.value)}
+                  onChange={(e) => handleChange(f.key, e.target.value)}
                   placeholder={f.placeholder}
                   rows={3}
                   style={{
@@ -179,7 +216,7 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
                 <input
                   type="text"
                   value={formData[f.key] || ''}
-                  onChange={e => handleChange(f.key, e.target.value)}
+                  onChange={(e) => handleChange(f.key, e.target.value)}
                   placeholder={f.placeholder}
                   style={{
                     width: '100%', padding: '8px 10px', borderRadius: 8,
@@ -192,10 +229,9 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
           ))}
         </div>
 
-        {/* Navigation */}
         <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: 24 }}>
           <button
-            onClick={() => setStep(s => s - 1)}
+            onClick={() => setStep((s) => s - 1)}
             disabled={step === 0}
             style={{
               display: 'flex', alignItems: 'center', gap: 4, padding: '8px 14px',
@@ -222,7 +258,7 @@ const ProfileWalkthrough = ({ authToken, onClose, existingProfile }) => {
             </button>
           ) : (
             <button
-              onClick={() => setStep(s => s + 1)}
+              onClick={() => setStep((s) => s + 1)}
               style={{
                 display: 'flex', alignItems: 'center', gap: 4, padding: '8px 14px',
                 borderRadius: 8, border: 'none',

phd-advisor-frontend/src/components/ThinkingIndicator.js

@@ -14,57 +14,41 @@ const ThinkingIndicator = ({ advisorId }) => {
 
   return (
     <div className="thinking-container">
-      <div 
-        className="advisor-avatar" 
-        style={{ backgroundColor: colors.bgColor }}
-      >
-        {Icon ? <Icon style={{ color: colors.color }} /> : null}
+      <div className="advisor-message-avatar-ring" style={{ width: 44, height: 44 }}>
+        {Icon ? (
+          <Icon
+            className="advisor-message-avatar-icon"
+            style={{ color: colors.color, width: 23, height: 23 }}
+          />
+        ) : null}
       </div>
-      <div 
+      <div
         className="thinking-bubble"
-        style={{ 
+        style={{
           backgroundColor: colors.bgColor,
-          borderColor: colors.color + '40' // Adding transparency to the border
+          borderColor: colors.color + '40',
         }}
       >
         <div className="thinking-header">
-          <h4 
-            className="advisor-name" 
-            style={{ color: colors.color }}
-          >
+          <h4 className="advisor-name" style={{ color: colors.color }}>
             {advisor.name}
           </h4>
         </div>
         <div className="thinking-dots">
-          <div 
-            className="thinking-dot" 
-            style={{ 
-              backgroundColor: colors.color, 
-              animationDelay: '0ms' 
-            }}
-          ></div>
-          <div 
-            className="thinking-dot" 
-            style={{ 
-              backgroundColor: colors.color, 
-              animationDelay: '150ms' 
-            }}
-          ></div>
-          <div 
-            className="thinking-dot" 
-            style={{ 
-              backgroundColor: colors.color, 
-              animationDelay: '300ms' 
-            }}
-          ></div>
+          <div
+            className="thinking-dot"
+            style={{ backgroundColor: colors.color, animationDelay: '0ms' }}
+          />
+          <div
+            className="thinking-dot"
+            style={{ backgroundColor: colors.color, animationDelay: '150ms' }}
+          />
+          <div
+            className="thinking-dot"
+            style={{ backgroundColor: colors.color, animationDelay: '300ms' }}
+          />
         </div>
-        <p 
-          className="thinking-text"
-          style={{ 
-            color: colors.color,
-            opacity: 0.8 
-          }}
-        >
+        <p className="thinking-text" style={{ color: colors.color, opacity: 0.8 }}>
           thinking...
         </p>
       </div>

phd-advisor-frontend/src/pages/ChatPage.js

@@ -254,19 +254,20 @@ const loadChatSession = async (sessionId) => {
   }
 };
 
-// Save a message to the current session
-const saveMessageToSession = async (message) => {
-  if (!currentSessionId || !authToken) return;
+// Save a message to the current session (optional sessionId when state is not updated yet)
+const saveMessageToSession = async (message, sessionIdOverride) => {
+  const sid = sessionIdOverride || currentSessionId;
+  if (!sid || !authToken) return;
 
   try {
-    await fetch(`${process.env.REACT_APP_API_URL}/api/chat-sessions/${currentSessionId}/messages`, {
+    await fetch(`${process.env.REACT_APP_API_URL}/api/chat-sessions/${sid}/messages`, {
       method: 'POST',
       headers: {
         'Authorization': `Bearer ${authToken}`,
         'Content-Type': 'application/json'
       },
       body: JSON.stringify({
-        session_id: currentSessionId,
+        session_id: sid,
         message: {
           ...message,
           timestamp: message.timestamp.toISOString()
@@ -434,6 +435,10 @@ const handleNewChat = async (sessionId = null) => {
       }
     }
 
+    saveMessageToSession(userMessage, sessionId).catch(err =>
+      console.error('Failed to persist user message:', err)
+    );
+
     // Update session title if this is the first message and title is generic
     if (messages.length === 0 && currentSessionTitle.includes('Chat ')) {
       const newTitle = inputMessage.length > 30 
@@ -456,7 +461,7 @@ const handleNewChat = async (sessionId = null) => {
         body: JSON.stringify({
           user_input: inputMessage,
           response_length: 'medium',
-          chat_session_id: currentSessionId // Include current session ID
+          chat_session_id: sessionId,
         }),
       });
 
@@ -496,7 +501,7 @@ const handleNewChat = async (sessionId = null) => {
               };
               setMessages(prev => [...prev, msg]);
               setThinkingAdvisors(prev => prev.filter(a => a !== d.persona_id));
-              await saveMessageToSession(msg);
+              await saveMessageToSession(msg, sessionId);
               break;
             }
             case 'clarification':
@@ -823,11 +828,6 @@ const handleNewChat = async (sessionId = null) => {
             onNavigateToCanvas={onNavigateToCanvas}
             onMobileMenu={handleMobileMenuToggle}
           >
-            {currentSessionTitle && (
-              <div className="session-title-display">
-                <span>{currentSessionTitle}</span>
-              </div>
-            )}
             <ExportButton
               hasMessages={hasConversationMessages}
               currentSessionId={currentSessionId}
@@ -996,67 +996,10 @@ const handleNewChat = async (sessionId = null) => {
                   ? `Reply to ${replyingTo.advisorName}...`
                   : chatPlaceholder
               }
-              showProfileButtons={!userProfile || userProfile.completion_pct < 100}
-              onOpenOnboarding={() => setShowOnboarding(true)}
-              onOpenProfileForm={() => setShowProfileForm(true)}
             />
           </div>
         </div>
       </div>
-
-      {showOnboarding && (
-        <OnboardingChat
-          authToken={authToken}
-          userName={user?.firstName}
-          onClose={() => { setShowOnboarding(false); loadProfile(); }}
-        />
-      )}
-
-      {showProfileForm && (
-        <ProfileWalkthrough
-          authToken={authToken}
-          existingProfile={userProfile}
-          onClose={() => { setShowProfileForm(false); loadProfile(); }}
-        />
-      )}
-
-      {showClearData && (
-        <ClearDataModal
-          authToken={authToken}
-          onClose={() => setShowClearData(false)}
-          onDataCleared={({ profile: clearedProfile, chats: clearedChats }) => {
-            if (clearedProfile) {
-              setUserProfile(null);
-              loadProfile();
-            }
-            if (clearedChats) {
-              setMessages([]);
-              setCurrentSessionId(null);
-              setCurrentSessionTitle('');
-              handleNewChat();
-            }
-          }}
-        />
-      )}
-
-      {showAccount && (
-        <AccountModal
-          user={user}
-          authToken={authToken}
-          onClose={() => setShowAccount(false)}
-          onAccountUpdated={(updated) => {
-            if (user) {
-              user.firstName = updated.firstName;
-              user.lastName = updated.lastName;
-              user.email = updated.email;
-            }
-          }}
-          onAccountDeleted={() => {
-            setShowAccount(false);
-            onSignOut();
-          }}
-        />
-      )}
     </div>
   );
 };

phd-advisor-frontend/src/styles/CanvasPage.css

@@ -215,19 +215,24 @@
   justify-content: center;
   color: #fff;
 }
+.canvas-page-with-sidebar .brand-text {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
 .canvas-page-with-sidebar .brand-text h1 {
   font-size: 20px;
   font-weight: 700;
   color: var(--canvas-text);
   margin: 0;
-  line-height: 1.15;
+  line-height: 1.2;
   letter-spacing: -0.01em;
 }
 .canvas-page-with-sidebar .brand-text p {
   font-size: 13px;
   color: var(--canvas-text-3);
-  margin: 2px 0 0;
-  line-height: 1;
+  margin: 0;
+  line-height: 1.35;
 }
 .canvas-page-with-sidebar .theme-toggle .theme-icon { display: block; }
 

phd-advisor-frontend/src/styles/ChatPage.css

@@ -79,19 +79,25 @@
   color: white;
 }
 
+.brand-text {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
 .brand-text h1 {
   font-size: 20px;
   font-weight: 700;
   color: var(--text-primary);
   margin: 0;
-  line-height: 1;
+  line-height: 1.2;
 }
 
 .brand-text p {
   font-size: 13px;
   color: var(--text-secondary);
   margin: 0;
-  line-height: 1;
+  line-height: 1.35;
 }
 
 .header-right {
@@ -678,34 +684,6 @@
   margin-left: 70px; /* Width of sidebar when collapsed */
 }
 
-/* Session title display in header */
-.session-title-display {
-  display: flex;
-  align-items: center;
-  padding: 6px 12px;
-  background: var(--bg-secondary, #f3f4f6);
-  border-radius: 6px;
-  margin-right: 8px;
-}
-
-.dark .session-title-display {
-  background: var(--bg-secondary-dark, #374151);
-}
-
-.session-title-display span {
-  font-size: 13px;
-  font-weight: 500;
-  color: var(--text-primary, #111827);
-  max-width: 150px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.dark .session-title-display span {
-  color: var(--text-primary-dark, #f9fafb);
-}
-
 /* Optional header sign out button */
 .header-signout-btn {
   display: flex;

phd-advisor-frontend/src/styles/components.css

@@ -527,13 +527,15 @@
 .advisor-message-header {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 10px;
   margin-bottom: 8px;
 }
 
 .advisor-message-name {
-  font-weight: 500;
-  font-size: 14px;
+  font-weight: 600;
+  font-size: 1rem;
+  line-height: 1.6;
+  margin: 0;
 }
 
 .reply-badge {
@@ -550,9 +552,44 @@
 }
 
 .advisor-message-text {
+  font-size: 1rem;
   line-height: 1.6;
 }
 
+/* Advisor icon in message header: circular badge, theme-aware fill */
+.advisor-message-avatar-ring {
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  overflow: hidden;
+  background: #ffffff;
+  border: 1px solid rgba(15, 23, 42, 0.1);
+  box-shadow: 0 1px 3px rgba(15, 23, 42, 0.08);
+}
+
+[data-theme="dark"] .advisor-message-avatar-ring {
+  background: #1e293b;
+  border-color: rgba(248, 250, 252, 0.12);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
+}
+
+.advisor-message-avatar-ring img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.advisor-message-avatar-icon {
+  flex-shrink: 0;
+}
+
+.advisor-message-avatar-initial {
+  font-weight: 700;
+  line-height: 1;
+}
+
 .advisor-message-text > div:last-child p:last-child {
   margin-bottom: 0; /* Remove bottom margin from last paragraph */
 }
@@ -765,8 +802,9 @@
 }
 
 .advisor-name {
-  font-weight: 500;
-  font-size: 14px;
+  font-weight: 600;
+  font-size: 1rem;
+  line-height: 1.6;
   margin: 0;
 }
 
@@ -1184,7 +1222,11 @@
   }
 
   .advisor-message-text {
-    font-size: 14px;
+    font-size: 1rem;
+  }
+
+  .advisor-message-name {
+    font-size: 1rem;
   }
 
   /* Basic ChatInput mobile styles */