Upload Advisernote.py

Advisernote.py

@@ -3,14 +3,14 @@ import pandas as pd
 import io
 import os
 import json
-import sys
-import warnings
-import platform
-import imaplib
-import email
-import html
-import socket
-from imaplib import IMAP4_SSL
+import sys
+import warnings
+import platform
+import imaplib
+import email
+import html
+import socket
+from imaplib import IMAP4_SSL
 from email.header import decode_header, make_header
 from datetime import datetime
 from docx import Document
@@ -18,49 +18,49 @@ from docx.shared import Pt, RGBColor, Inches
 from docx.enum.text import WD_ALIGN_PARAGRAPH
 from docx.oxml.ns import qn
 from docx.oxml import OxmlElement
-import pdfplumber
-import vertexai
-import requests
+import pdfplumber
+import vertexai
+import requests
 import copy
 import re
-import sqlite3
-
-def get_config_value(key, default=""):
-    value = os.environ.get(key)
-    if value is not None:
-        return value
-    try:
-        return st.secrets.get(key, default)
-    except Exception:
-        return default
-
-def parse_allowed_users(raw_users):
-    if hasattr(raw_users, "items"):
-        return {str(email).strip().lower(): str(password) for email, password in raw_users.items()}
-
-    users = {}
-    for item in str(raw_users or "").split(","):
-        email_addr, separator, password = item.partition("=")
-        email_addr = email_addr.strip().strip('"').strip("'").lower()
-        if separator and email_addr:
-            users[email_addr] = password.strip().strip('"').strip("'")
-    return users
-
-# 1. 인증 및 Secrets 통합 로드
-os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = "credentials.json"
-
-# 2. 모든 필수 변수 한 번에 선언 (변수명 일치 확인)
-COMMON_PW = get_config_value("EMAIL_PASSWORD")
-MASTER_PW = get_config_value("MASTER_PASSWORD")
-ADMIN_EMAIL = get_config_value("ADMIN_EMAIL").strip().lower()
-PROJECT_ID = get_config_value("PROJECT_ID")
-NOTION_TOKEN = get_config_value("NOTION_API_TOKEN")
-NOTION_DB_ID = get_config_value("NOTION_DATABASE_ID")
-
-# 3. 리스트/딕셔너리 변환 로직
-ALL_MAILBOXES = [item.strip() for item in get_config_value("ALL_MAILBOXES").split(",") if item.strip()]
-allowed_users = parse_allowed_users(get_config_value("ALLOWED_USERS"))
-MAX_EMAILS_PER_FOLDER = 250
+import sqlite3
+
+def get_config_value(key, default=""):
+    value = os.environ.get(key)
+    if value is not None:
+        return value
+    try:
+        return st.secrets.get(key, default)
+    except Exception:
+        return default
+
+def parse_allowed_users(raw_users):
+    if hasattr(raw_users, "items"):
+        return {str(email).strip().lower(): str(password) for email, password in raw_users.items()}
+
+    users = {}
+    for item in str(raw_users or "").split(","):
+        email_addr, separator, password = item.partition("=")
+        email_addr = email_addr.strip().strip('"').strip("'").lower()
+        if separator and email_addr:
+            users[email_addr] = password.strip().strip('"').strip("'")
+    return users
+
+# 1. 인증 및 Secrets 통합 로드
+os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = "credentials.json"
+
+# 2. 모든 필수 변수 한 번에 선언 (변수명 일치 확인)
+COMMON_PW = get_config_value("EMAIL_PASSWORD")
+MASTER_PW = get_config_value("MASTER_PASSWORD")
+ADMIN_EMAIL = get_config_value("ADMIN_EMAIL").strip().lower()
+PROJECT_ID = get_config_value("PROJECT_ID")
+NOTION_TOKEN = get_config_value("NOTION_API_TOKEN")
+NOTION_DB_ID = get_config_value("NOTION_DATABASE_ID")
+
+# 3. 리스트/딕셔너리 변환 로직
+ALL_MAILBOXES = [item.strip() for item in get_config_value("ALL_MAILBOXES").split(",") if item.strip()]
+allowed_users = parse_allowed_users(get_config_value("ALLOWED_USERS"))
+MAX_EMAILS_PER_FOLDER = 250
 
 def save_rules_to_db(df):
     conn = sqlite3.connect("data.db")
@@ -125,78 +125,143 @@ if 'client_names' not in st.session_state: st.session_state['client_names'] = ""
 if 'support_name' not in st.session_state: st.session_state['support_name'] = ""
 if 'refs' not in st.session_state: st.session_state['refs'] = ""
 if 'folder_path' not in st.session_state: st.session_state['folder_path'] = ""
-if 'doc_context' not in st.session_state: st.session_state['doc_context'] = ""
-if 'results' not in st.session_state: st.session_state['results'] = None
-if 'notion_client_name' not in st.session_state: st.session_state['notion_client_name'] = ""
-if 'case_comments' not in st.session_state: st.session_state['case_comments'] = ""
+if 'doc_context' not in st.session_state: st.session_state['doc_context'] = ""
+if 'results' not in st.session_state: st.session_state['results'] = None
+if 'notion_client_name' not in st.session_state: st.session_state['notion_client_name'] = ""
+if 'case_comments' not in st.session_state: st.session_state['case_comments'] = ""
 
 # =========================================================================
-# [보안 끝판왕] 최초 로그인 비번 세팅 & 관리자 실시간 동기화/삭제 통제 시스템
-# =========================================================================
-USER_DB_FILE = "user_passwords.db"
-
-def init_user_db(seed_users):
-    conn = sqlite3.connect(USER_DB_FILE)
-    conn.execute("""
-        CREATE TABLE IF NOT EXISTS users (
-            email TEXT PRIMARY KEY,
-            password TEXT NOT NULL DEFAULT '',
-            active INTEGER NOT NULL DEFAULT 1
-        )
-    """)
-    for email_addr, password in seed_users.items():
-        conn.execute(
-            "INSERT OR IGNORE INTO users (email, password, active) VALUES (?, ?, 1)",
-            (email_addr, password)
-        )
-    conn.commit()
-    conn.close()
-
-def load_active_users():
-    conn = sqlite3.connect(USER_DB_FILE)
-    rows = conn.execute("SELECT email, password FROM users WHERE active = 1 ORDER BY email").fetchall()
-    conn.close()
-    return {email_addr: password for email_addr, password in rows}
-
-def update_user_password(email_addr, new_password):
-    conn = sqlite3.connect(USER_DB_FILE)
-    conn.execute(
-        "UPDATE users SET password = ?, active = 1 WHERE email = ?",
-        (new_password, email_addr)
-    )
-    conn.commit()
-    updated = conn.total_changes > 0
-    conn.close()
-    return updated
-
-def add_or_restore_user(email_addr, initial_password=""):
-    email_addr = email_addr.strip().lower()
-    conn = sqlite3.connect(USER_DB_FILE)
-    existing = conn.execute("SELECT email FROM users WHERE email = ?", (email_addr,)).fetchone()
-    if existing:
-        conn.execute(
-            "UPDATE users SET password = ?, active = 1 WHERE email = ?",
-            (initial_password, email_addr)
-        )
-    else:
-        conn.execute(
-            "INSERT INTO users (email, password, active) VALUES (?, ?, 1)",
-            (email_addr, initial_password)
-        )
-    conn.commit()
-    updated = conn.total_changes > 0
-    conn.close()
-    return updated
-
-def revoke_user_access(email_addr):
-    conn = sqlite3.connect(USER_DB_FILE)
-    conn.execute("UPDATE users SET active = 0 WHERE email = ?", (email_addr,))
-    conn.commit()
-    updated = conn.total_changes > 0
-    conn.close()
-    return updated
-
-init_user_db(allowed_users)
+# [보안 끝판왕] 최초 로그인 비번 세팅 & 관리자 실시간 동기화/삭제 통제 시스템
+# =========================================================================
+USER_DB_FILE = "user_passwords.db"
+
+def init_user_db(seed_users):
+    conn = sqlite3.connect(USER_DB_FILE)
+    conn.execute("""
+        CREATE TABLE IF NOT EXISTS users (
+            email TEXT PRIMARY KEY,
+            password TEXT NOT NULL DEFAULT '',
+            active INTEGER NOT NULL DEFAULT 1
+        )
+    """)
+    conn.execute("""
+        CREATE TABLE IF NOT EXISTS mailboxes (
+            email TEXT PRIMARY KEY,
+            entry TEXT NOT NULL,
+            active INTEGER NOT NULL DEFAULT 1
+        )
+    """)
+    for email_addr, password in seed_users.items():
+        conn.execute(
+            "INSERT OR IGNORE INTO users (email, password, active) VALUES (?, ?, 1)",
+            (email_addr, password)
+        )
+    for mailbox_entry in ALL_MAILBOXES:
+        mailbox_email = parse_mailbox_email(mailbox_entry)
+        if mailbox_email:
+            conn.execute(
+                "INSERT OR IGNORE INTO mailboxes (email, entry, active) VALUES (?, ?, 1)",
+                (mailbox_email, mailbox_entry)
+            )
+    conn.commit()
+    conn.close()
+
+def parse_mailbox_email(mailbox_entry):
+    credential_part = str(mailbox_entry or "").split("|", 1)[0].strip()
+    return credential_part.split(":", 1)[0].strip().lower()
+
+def load_active_users():
+    conn = sqlite3.connect(USER_DB_FILE)
+    rows = conn.execute("SELECT email, password FROM users WHERE active = 1 ORDER BY email").fetchall()
+    conn.close()
+    return {email_addr: password for email_addr, password in rows}
+
+def update_user_password(email_addr, new_password):
+    conn = sqlite3.connect(USER_DB_FILE)
+    conn.execute(
+        "UPDATE users SET password = ?, active = 1 WHERE email = ?",
+        (new_password, email_addr)
+    )
+    conn.commit()
+    updated = conn.total_changes > 0
+    conn.close()
+    return updated
+
+def add_or_restore_user(email_addr, initial_password=""):
+    email_addr = email_addr.strip().lower()
+    conn = sqlite3.connect(USER_DB_FILE)
+    existing = conn.execute("SELECT email FROM users WHERE email = ?", (email_addr,)).fetchone()
+    if existing:
+        conn.execute(
+            "UPDATE users SET password = ?, active = 1 WHERE email = ?",
+            (initial_password, email_addr)
+        )
+    else:
+        conn.execute(
+            "INSERT INTO users (email, password, active) VALUES (?, ?, 1)",
+            (email_addr, initial_password)
+        )
+    conn.commit()
+    updated = conn.total_changes > 0
+    conn.close()
+    return updated
+
+def revoke_user_access(email_addr):
+    conn = sqlite3.connect(USER_DB_FILE)
+    conn.execute("UPDATE users SET active = 0 WHERE email = ?", (email_addr,))
+    conn.commit()
+    updated = conn.total_changes > 0
+    conn.close()
+    return updated
+
+def load_active_mailboxes():
+    conn = sqlite3.connect(USER_DB_FILE)
+    rows = conn.execute("SELECT email, entry FROM mailboxes WHERE active = 1 ORDER BY email").fetchall()
+    conn.close()
+    return {email_addr: entry for email_addr, entry in rows}
+
+def add_or_restore_mailbox(mailbox_entry):
+    mailbox_entry = mailbox_entry.strip()
+    mailbox_email = parse_mailbox_email(mailbox_entry)
+    if not mailbox_email:
+        return False
+    conn = sqlite3.connect(USER_DB_FILE)
+    existing = conn.execute("SELECT email FROM mailboxes WHERE email = ?", (mailbox_email,)).fetchone()
+    if existing:
+        conn.execute(
+            "UPDATE mailboxes SET entry = ?, active = 1 WHERE email = ?",
+            (mailbox_entry, mailbox_email)
+        )
+    else:
+        conn.execute(
+            "INSERT INTO mailboxes (email, entry, active) VALUES (?, ?, 1)",
+            (mailbox_email, mailbox_entry)
+        )
+    conn.commit()
+    updated = conn.total_changes > 0
+    conn.close()
+    return updated
+
+def revoke_mailbox_access(mailbox_email):
+    conn = sqlite3.connect(USER_DB_FILE)
+    conn.execute("UPDATE mailboxes SET active = 0 WHERE email = ?", (mailbox_email,))
+    conn.commit()
+    updated = conn.total_changes > 0
+    conn.close()
+    return updated
+
+def get_imap_host_candidates(primary_host, mailbox_email):
+    candidates = []
+    primary_host = str(primary_host or "").strip()
+    if primary_host:
+        candidates.append(primary_host)
+    if "@" in mailbox_email:
+        fallback_host = "mail." + mailbox_email.split("@", 1)[1].strip()
+        if fallback_host not in candidates:
+            candidates.append(fallback_host)
+    return candidates
+
+init_user_db(allowed_users)
 
 def check_password():
     """로그인 검증, 최초 접속자 비번 세팅, 관리자 전용 대시보드 스위칭 마스터 함수"""
@@ -223,22 +288,22 @@ def check_password():
                 </div>
             """, unsafe_allow_html=True)
             
-            allowed_users = load_active_users()
-
-            input_email = st.text_input("📧 Login Email Address", key="login_email", placeholder="username@fluxfinance.co.nz").strip().lower()
-
-            if input_email and (input_email != ADMIN_EMAIL and input_email not in allowed_users):
-                st.error("❌ Access Denied: This account is unregistered or has been deactivated. Please contact the administrator.")
-                return False
-
-            # Case A: 최고 관리자(매니저님) 접속 시 (기능 100% 동일)
-            if input_email == ADMIN_EMAIL:
-                input_password = st.text_input("👑 Admin Password", type="password", key="login_password", placeholder="Enter admin password")
-                if st.button("Sign In as Manager", use_container_width=True):
-                    if input_password == MASTER_PW:
-                        st.session_state["password_correct"] = True
-                        st.session_state["is_admin_mode"] = True
-                        st.rerun()
+            allowed_users = load_active_users()
+
+            input_email = st.text_input("📧 Login Email Address", key="login_email", placeholder="username@fluxfinance.co.nz").strip().lower()
+
+            if input_email and (input_email != ADMIN_EMAIL and input_email not in allowed_users):
+                st.error("❌ Access Denied: This account is unregistered or has been deactivated. Please contact the administrator.")
+                return False
+
+            # Case A: 최고 관리자(매니저님) 접속 시 (기능 100% 동일)
+            if input_email == ADMIN_EMAIL:
+                input_password = st.text_input("👑 Admin Password", type="password", key="login_password", placeholder="Enter admin password")
+                if st.button("Sign In as Manager", use_container_width=True):
+                    if input_password == MASTER_PW:
+                        st.session_state["password_correct"] = True
+                        st.session_state["is_admin_mode"] = True
+                        st.rerun()
                     else:
                         st.error("❌ Incorrect Administrator password.")
                 return False
@@ -251,17 +316,17 @@ def check_password():
                 if current_db_pwd == "":
                     st.warning("🆕 Welcome! Please set up your personalized password for this account.")
                     new_pwd = st.text_input("🔑 Create New Password", type="password", key="setup_pwd")
-                    confirm_pwd = st.text_input("🔄 Confirm New Password", type="password", key="confirm_pwd")
-                    
-                    if st.button("Activate My Account", use_container_width=True):
-                        if new_pwd and new_pwd == confirm_pwd:
-                            if update_user_password(input_email, new_pwd):
-                                st.success("✅ Password configured successfully! Please sign in again with your new password.")
-                                st.rerun()
-                            else:
-                                st.error("⚠️ System Error: Failed to update your password. Please contact the administrator.")
-                        else:
-                            st.error("❌ Passwords do not match or fields are left blank.")
+                    confirm_pwd = st.text_input("🔄 Confirm New Password", type="password", key="confirm_pwd")
+                    
+                    if st.button("Activate My Account", use_container_width=True):
+                        if new_pwd and new_pwd == confirm_pwd:
+                            if update_user_password(input_email, new_pwd):
+                                st.success("✅ Password configured successfully! Please sign in again with your new password.")
+                                st.rerun()
+                            else:
+                                st.error("⚠️ System Error: Failed to update your password. Please contact the administrator.")
+                        else:
+                            st.error("❌ Passwords do not match or fields are left blank.")
                     return False
 
                 # 상황 ②: 이미 비번 세팅이 끝나서 정상 로그인을 시도할 때 -> 로그인 로직 완벽 보존
@@ -284,16 +349,16 @@ def check_password():
                             st.write("Verify your current password to update your credentials.")
                             verify_old = st.text_input("Current Password", type="password", key="v_old")
                             update_new = st.text_input("New Password", type="password", key="u_new")
-                            
-                            if st.button("Update Password", use_container_width=True):
-                                if verify_old == current_db_pwd and update_new:
-                                    if update_user_password(input_email, update_new):
-                                        st.toast("✅ Password updated successfully!", icon="🚀")
-                                        st.rerun()
-                                    else:
-                                        st.error("⚠️ System Error: Failed to update your password. Please contact the administrator.")
-                                else:
-                                    st.error("❌ Current password verification failed or input is missing.")
+                            
+                            if st.button("Update Password", use_container_width=True):
+                                if verify_old == current_db_pwd and update_new:
+                                    if update_user_password(input_email, update_new):
+                                        st.toast("✅ Password updated successfully!", icon="🚀")
+                                        st.rerun()
+                                    else:
+                                        st.error("⚠️ System Error: Failed to update your password. Please contact the administrator.")
+                                else:
+                                    st.error("❌ Current password verification failed or input is missing.")
                     return False
 # =========================================================================
 # [NOTION API CONNECTOR] 노션 페이지 본문 및 모든 실시간 댓글 병합 수집기
@@ -301,9 +366,9 @@ def check_password():
 # =========================
 # 1. 댓글 가져오기
 # =========================
-def fetch_notion_comments(page_id):
-    """노션 특정 페이지의 댓글과 작성 날짜를 함께 추출하는 함수"""
-    notion_token = NOTION_TOKEN
+def fetch_notion_comments(page_id):
+    """노션 특정 페이지의 댓글과 작성 날짜를 함께 추출하는 함수"""
+    notion_token = NOTION_TOKEN
     headers = {
         "Authorization": f"Bearer {notion_token}",
         "Notion-Version": "2025-09-03"
@@ -318,12 +383,12 @@ def fetch_notion_comments(page_id):
                 # 🟢 [수정] 작성 날짜(created_time)를 가져옵니다.
                 created_at = c.get("created_time", "").split("T")[0] # YYYY-MM-DD 형식만 추출
                 
-                c_text_list = c.get("rich_text", [])
-                c_text = "".join(
-                    item.get("plain_text", item.get("text", {}).get("content", ""))
-                    for item in c_text_list
-                    if isinstance(item, dict)
-                ).strip()
+                c_text_list = c.get("rich_text", [])
+                c_text = "".join(
+                    item.get("plain_text", item.get("text", {}).get("content", ""))
+                    for item in c_text_list
+                    if isinstance(item, dict)
+                ).strip()
                 
                 if c_text:
                     # 🟢 [수정] [날짜] 코멘트 내용 형식으로 조합
@@ -333,10 +398,10 @@ def fetch_notion_comments(page_id):
         pass
     return ""
 
-def fetch_client_tasks_from_notion(client_name):
-    # .streamlit/secrets.toml 파일에서 보안 정보를 안전하게 로드합니다.
-    notion_token = NOTION_TOKEN
-    target_data_source_id = NOTION_DB_ID
+def fetch_client_tasks_from_notion(client_name):
+    # .streamlit/secrets.toml 파일에서 보안 정보를 안전하게 로드합니다.
+    notion_token = NOTION_TOKEN
+    target_data_source_id = NOTION_DB_ID
     
     if not notion_token: 
         return [], "Missing NOTION_API_TOKEN in secrets.toml"
@@ -495,8 +560,8 @@ if check_password():
             st.markdown("### 👑 Admin Control")
             st.caption("Monitor real-time password setups for active team members and revoke access for offboarded employees.")
             
-            current_users = load_active_users()
-            admin_data = []
+            current_users = load_active_users()
+            admin_data = []
             
             for u_email, u_pwd in current_users.items():
                 status_tag = "🔴 Pending Setup" if u_pwd == "" else "🟢 Active (Password Set)"
@@ -515,42 +580,78 @@ if check_password():
                     "Status": status_tag
                 })
             
-            st.table(pd.DataFrame(admin_data))
-
-            st.markdown("**Add or Restore User Access**")
-            add_col_email, add_col_password = st.columns([2, 1])
-            new_user_email = add_col_email.text_input(
-                "Employee email address",
-                key="admin_add_user_email",
-                placeholder="new.user@fluxfinance.co.nz"
-            ).strip().lower()
-            new_user_password = add_col_password.text_input(
-                "Initial password",
-                type="password",
-                key="admin_add_user_password",
-                help="Leave blank to let the user set their password on first login."
-            )
-
-            if st.button("➕ Add / Restore User", use_container_width=True):
-                if not new_user_email:
-                    st.error("Please enter an email address.")
-                elif not re.match(r"^[^@\s]+@[^@\s]+\.[^@\s]+$", new_user_email):
-                    st.error("Please enter a valid email address.")
-                elif add_or_restore_user(new_user_email, new_user_password):
-                    st.success(f"✅ Access granted for {new_user_email}.")
-                    st.rerun()
-                else:
-                    st.error("⚠️ System Error: Failed to update user access.")
-            
-            st.markdown("**Deactivate & Revoke User Permissions**")
-            target_del = st.selectbox("Select email address to revoke access", ["-"] + list(current_users.keys()))
-            
-            if target_del != "-" and st.button("🚨 Revoke Access"):
-                if target_del in current_users and revoke_user_access(target_del):
-                    st.success(f"⚠️ Access permanently revoked for {target_del}. This user can no longer sign in.")
-                    st.rerun()
-        
-        # (2) 규칙 편집 관리 (Rules Configuration - Admin Control 바로 밑으로 배치)
+            st.table(pd.DataFrame(admin_data))
+
+            st.markdown("**Add or Restore User Access**")
+            add_col_email, add_col_password = st.columns([2, 1])
+            new_user_email = add_col_email.text_input(
+                "Employee email address",
+                key="admin_add_user_email",
+                placeholder="new.user@fluxfinance.co.nz"
+            ).strip().lower()
+            new_user_password = add_col_password.text_input(
+                "Initial password",
+                type="password",
+                key="admin_add_user_password",
+                help="Leave blank to let the user set their password on first login."
+            )
+
+            if st.button("➕ Add / Restore User", use_container_width=True):
+                if not new_user_email:
+                    st.error("Please enter an email address.")
+                elif not re.match(r"^[^@\s]+@[^@\s]+\.[^@\s]+$", new_user_email):
+                    st.error("Please enter a valid email address.")
+                elif add_or_restore_user(new_user_email, new_user_password):
+                    st.success(f"✅ Access granted for {new_user_email}.")
+                    st.rerun()
+                else:
+                    st.error("⚠️ System Error: Failed to update user access.")
+            
+            st.markdown("**Deactivate & Revoke User Permissions**")
+            target_del = st.selectbox("Select email address to revoke access", ["-"] + list(current_users.keys()))
+            
+            if target_del != "-" and st.button("🚨 Revoke Access"):
+                if target_del in current_users and revoke_user_access(target_del):
+                    st.success(f"⚠️ Access permanently revoked for {target_del}. This user can no longer sign in.")
+                    st.rerun()
+
+            st.markdown("**Mailbox Scan List**")
+            current_mailboxes = load_active_mailboxes()
+            mailbox_rows = [{"Mailbox": email_addr, "IMAP Entry": entry} for email_addr, entry in current_mailboxes.items()]
+            st.table(pd.DataFrame(mailbox_rows))
+
+            mailbox_entry = st.text_input(
+                "Mailbox entry",
+                key="admin_add_mailbox_entry",
+                placeholder="email@domain.com:optional-password||imap.server.com"
+            ).strip()
+
+            if st.button("➕ Add / Restore Mailbox", use_container_width=True):
+                mailbox_email = parse_mailbox_email(mailbox_entry)
+                if not mailbox_entry:
+                    st.error("Please enter a mailbox entry.")
+                elif not re.match(r"^[^@\s]+@[^@\s]+\.[^@\s]+$", mailbox_email):
+                    st.error("Please enter a valid mailbox email address.")
+                elif "||" not in mailbox_entry:
+                    st.error("Please include the IMAP host using the format email@domain.com||imap.server.com.")
+                elif add_or_restore_mailbox(mailbox_entry):
+                    st.success(f"✅ Mailbox added for scanning: {mailbox_email}.")
+                    st.rerun()
+                else:
+                    st.error("⚠️ System Error: Failed to update mailbox list.")
+
+            target_mailbox_del = st.selectbox(
+                "Select mailbox to remove from scan list",
+                ["-"] + list(current_mailboxes.keys()),
+                key="admin_revoke_mailbox_select"
+            )
+
+            if target_mailbox_del != "-" and st.button("🚫 Remove Mailbox From Scan List"):
+                if target_mailbox_del in current_mailboxes and revoke_mailbox_access(target_mailbox_del):
+                    st.success(f"⚠️ Mailbox removed from scan list: {target_mailbox_del}.")
+                    st.rerun()
+        
+        # (2) 규칙 편집 관리 (Rules Configuration - Admin Control 바로 밑으로 배치)
         with st.expander("⚙️ Rules Configuration", expanded=False):
             st.caption("📝 웹 화면에서 수정·추가하면 시스템 파일에 영구 저장되어 연동됩니다.")
             edited_rules = st.data_editor(st.session_state['rules_df'], num_rows="dynamic", use_container_width=True, hide_index=True, key="main_rules_editor")
@@ -1116,19 +1217,19 @@ if check_password():
                         status.update(label="✅ Notion Tasks Synced.", state="complete")
                         st.rerun()
 
-                    elif tasks_data is not None and not tasks_data:
-                        status.update(label="⚠️ 매칭 데이터 없음", state="error")
-                    else:
-                        status.update(label=f"❌ Failed: {msg}", state="error")
-
-            case_comments = st.session_state.get('case_comments', '').strip()
-            if case_comments:
-                html_case_comments = html.escape(case_comments).replace('\n', '<br>')
-                st.markdown(f"""
-                    <div style='background-color: #F0FDF4; padding: 12px 15px; border-radius: 8px; border: 1px solid #BBF7D0; font-size: 0.85rem; margin-top: 12px; color: #166534; line-height: 1.6;'>
-                        <b>💬 Case Comments:</b><br><br>{html_case_comments}
-                    </div>
-                """, unsafe_allow_html=True)
+                    elif tasks_data is not None and not tasks_data:
+                        status.update(label="⚠️ 매칭 데이터 없음", state="error")
+                    else:
+                        status.update(label=f"❌ Failed: {msg}", state="error")
+
+            case_comments = st.session_state.get('case_comments', '').strip()
+            if case_comments:
+                html_case_comments = html.escape(case_comments).replace('\n', '<br>')
+                st.markdown(f"""
+                    <div style='background-color: #F0FDF4; padding: 12px 15px; border-radius: 8px; border: 1px solid #BBF7D0; font-size: 0.85rem; margin-top: 12px; color: #166534; line-height: 1.6;'>
+                        <b>💬 Case Comments:</b><br><br>{html_case_comments}
+                    </div>
+                """, unsafe_allow_html=True)
     # TAB 2: 이메일 검색창
     with tab_email:                    
         with st.container(border=True):
@@ -1136,16 +1237,15 @@ if check_password():
             st.session_state['folder_path'] = st.text_input("📂 G: Drive Folder Path", value=st.session_state['folder_path'], key="fixed_mail_path")
             
             # 🎯 [추가] secrets에서 주소만 쏙 발라내어 멀티 셀렉트 박스 생성
-            raw_mailbox_list = ALL_MAILBOXES
-            mailbox_options = []
-            mailbox_map = {}
-            for entry in raw_mailbox_list:
-                entry_clean = entry.strip()
-                if not entry_clean: continue
-                cred_part = entry_clean.split("|", 1)[0].strip()
-                clean_email = cred_part.split(":", 1)[0].strip()
-                mailbox_options.append(clean_email)
-                mailbox_map[clean_email] = entry_clean
+            raw_mailbox_list = list(load_active_mailboxes().values())
+            mailbox_options = []
+            mailbox_map = {}
+            for entry in raw_mailbox_list:
+                entry_clean = entry.strip()
+                if not entry_clean: continue
+                clean_email = parse_mailbox_email(entry_clean)
+                mailbox_options.append(clean_email)
+                mailbox_map[clean_email] = entry_clean
             
             selected_boxes = st.multiselect("📬 Select Mailboxes to Scan", options=mailbox_options, default=[], key="active_mailboxes_select")
             
@@ -1178,16 +1278,16 @@ if check_password():
                         </div>
                     </div>
                 </div>
-            """, unsafe_allow_html=True)
-
-            if email_sync_btn:
-                st.session_state['active_mode'] = "EMAIL"
-                if not selected_boxes:
-                    st.warning("Please select at least one mailbox to scan.")
-                    st.stop()
-                # 🟢 [여기에 추가] 이메일 이름을 전역 변수로 확정 박아버림! (여러 명이면 &로 치환)
-                raw_names = st.session_state.get('client_names', '').strip()
-                st.session_state['global_client_name'] = raw_names.replace(';', ' & ') if raw_names else ''
+            """, unsafe_allow_html=True)
+
+            if email_sync_btn:
+                st.session_state['active_mode'] = "EMAIL"
+                if not selected_boxes:
+                    st.warning("Please select at least one mailbox to scan.")
+                    st.stop()
+                # 🟢 [여기에 추가] 이메일 이름을 전역 변수로 확정 박아버림! (여러 명이면 &로 치환)
+                raw_names = st.session_state.get('client_names', '').strip()
+                st.session_state['global_client_name'] = raw_names.replace(';', ' & ') if raw_names else ''
 
                 with st.status("🔍 Syncing...", expanded=True) as status:
                     progress_text = st.empty()
@@ -1206,12 +1306,12 @@ if check_password():
                     # 🎯 [교체 완료] 전체를 다 도는 대신, 멀티 셀렉트에서 선택된 사서함들만 추출
                     target_mailbox_entries = [mailbox_map[m] for m in selected_boxes if m in mailbox_map]
 
-                    if target_mailbox_entries:
-                        try:
-                            import email.utils
-                            socket.setdefaulttimeout(20)
-                            
-                            for entry in target_mailbox_entries:
+                    if target_mailbox_entries:
+                        try:
+                            import email.utils
+                            socket.setdefaulttimeout(20)
+                            
+                            for entry in target_mailbox_entries:
                                 entry_clean = entry.strip()
                                 if not entry_clean: continue
                                 
@@ -1230,11 +1330,31 @@ if check_password():
                                     my_mail_addr = credential_part.strip()
                                     target_pw = COMMON_PW
 
-                                status.write(f"🔐 Scanning Mailbox: '{my_mail_addr}'...")
-                                
-                                try:
-                                    mail = IMAP4_SSL(imap_host, 993)
-                                    mail.login(my_mail_addr, target_pw)
+                                status.write(f"🔐 Scanning Mailbox: '{my_mail_addr}' via {imap_host}:993...")
+
+                                mail = None
+                                last_connect_error = None
+                                for host_candidate in get_imap_host_candidates(imap_host, my_mail_addr):
+                                    try:
+                                        status.write(f"🌐 Connecting to {host_candidate}:993...")
+                                        mail = IMAP4_SSL(host_candidate, 993, timeout=45)
+                                        mail.login(my_mail_addr, target_pw)
+                                        imap_host = host_candidate
+                                        break
+                                    except Exception as connect_error:
+                                        last_connect_error = connect_error
+                                        try:
+                                            if mail:
+                                                mail.logout()
+                                        except Exception:
+                                            pass
+                                        mail = None
+
+                                if mail is None:
+                                    status.write(f"❌ Mailbox failed '{my_mail_addr}' via {imap_host}: {last_connect_error}")
+                                    continue
+
+                                try:
                                     
                                     res_list, folder_list = mail.list()
                                     all_target_folders = []
@@ -1251,32 +1371,32 @@ if check_password():
                                             else:
                                                 raw_folder_name = f_str.split()[-1].strip().strip('"')
                                                 
-                                            if any(k in raw_folder_name.lower() for k in ["junk", "trash", "deleted", "sync", "spam"]):
-                                                continue
-                                            if raw_folder_name:
-                                                all_target_folders.append(raw_folder_name)
-                                    
-                                    if not all_target_folders:
-                                        all_target_folders = ["INBOX", "Sent"]
-                                    status.write(f"📂 Found {len(all_target_folders)} folder(s). Scanning latest {MAX_EMAILS_PER_FOLDER} messages per folder.")
-
-                                    for folder in all_target_folders:
-                                        try:
-                                            mail.select(f'"{folder}"', readonly=True)
-                                            res, msg_ids = mail.search(None, "ALL")
-                                            matched_ids = msg_ids[0].split()[-MAX_EMAILS_PER_FOLDER:] if res == "OK" and msg_ids and msg_ids[0] else []
-
-                                            if not matched_ids:
-                                                continue
-                                            status.write(f"📁 {folder}: checking latest {len(matched_ids)} message(s)")
-                                                
-                                            # 획득한 메일 번호 기반 본문 추출 엔진 정위치 안착
-                                            for m_id in reversed(matched_ids):
-                                                stats["count"] += 1
-                                                res_body, body_data = mail.fetch(m_id, "(RFC822)")
-                                                if res_body != "OK" or not body_data or not body_data[0]:
-                                                    continue
-                                                msg_raw = email.message_from_bytes(body_data[0][1])
+                                            if any(k in raw_folder_name.lower() for k in ["junk", "trash", "deleted", "sync", "spam"]):
+                                                continue
+                                            if raw_folder_name:
+                                                all_target_folders.append(raw_folder_name)
+                                    
+                                    if not all_target_folders:
+                                        all_target_folders = ["INBOX", "Sent"]
+                                    status.write(f"📂 Found {len(all_target_folders)} folder(s). Scanning latest {MAX_EMAILS_PER_FOLDER} messages per folder.")
+
+                                    for folder in all_target_folders:
+                                        try:
+                                            mail.select(f'"{folder}"', readonly=True)
+                                            res, msg_ids = mail.search(None, "ALL")
+                                            matched_ids = msg_ids[0].split()[-MAX_EMAILS_PER_FOLDER:] if res == "OK" and msg_ids and msg_ids[0] else []
+
+                                            if not matched_ids:
+                                                continue
+                                            status.write(f"📁 {folder}: checking latest {len(matched_ids)} message(s)")
+                                                
+                                            # 획득한 메일 번호 기반 본문 추출 엔진 정위치 안착
+                                            for m_id in reversed(matched_ids):
+                                                stats["count"] += 1
+                                                res_body, body_data = mail.fetch(m_id, "(RFC822)")
+                                                if res_body != "OK" or not body_data or not body_data[0]:
+                                                    continue
+                                                msg_raw = email.message_from_bytes(body_data[0][1])
                                                 
                                                 subj = str(make_header(decode_header(msg_raw.get("Subject", ""))))
                                                 snd = str(make_header(decode_header(msg_raw.get("From", ""))))
@@ -1311,10 +1431,10 @@ if check_password():
                                                             decoded_filename = str(make_header(decode_header(filename)))
                                                             attachments.append(decoded_filename)
                                                             
-                                                try:
-                                                    dt = email.utils.parsedate_to_datetime(msg_raw.get("Date"))
-                                                except Exception:
-                                                    dt = datetime.now()
+                                                try:
+                                                    dt = email.utils.parsedate_to_datetime(msg_raw.get("Date"))
+                                                except Exception:
+                                                    dt = datetime.now()
                                                 
                                                 # 🎯 [타임존 변환 버그 교정] 서버 시간(UTC)을 뉴질랜드(Auckland) 현지 시간으로 정확하게 강제 변환합니다.
                                                 if dt and dt.tzinfo:
@@ -1358,14 +1478,14 @@ if check_password():
                                                         "Attach": attachments,
                                                         "RawDate": dt.replace(tzinfo=None)
                                                     })
-                                        except Exception as folder_error:
-                                            status.write(f"⚠️ Skipped folder '{folder}': {folder_error}")
-                                            continue
-                                    mail.logout()
-                                except Exception as mailbox_error:
-                                    status.write(f"❌ Mailbox failed '{my_mail_addr}': {mailbox_error}")
-                        except Exception as e:
-                            st.error(f"IMAP Engine Error: {e}")                
+                                        except Exception as folder_error:
+                                            status.write(f"⚠️ Skipped folder '{folder}': {folder_error}")
+                                            continue
+                                    mail.logout()
+                                except Exception as mailbox_error:
+                                    status.write(f"❌ Mailbox failed '{my_mail_addr}': {mailbox_error}")
+                        except Exception as e:
+                            st.error(f"IMAP Engine Error: {e}")                
 
                     if all_mails:
                         all_mails.sort(key=lambda x: x.get("RawDate", datetime.min))
@@ -1477,10 +1597,10 @@ if st.session_state['results'] is not None:
             st.markdown(f"<div class='content-box'>{row.get('Body', '')}</div>", unsafe_allow_html=True)
             
             # 🟢 [기존 기능 유지] 코멘트(Comments)가 있을 경우, 본문 아래에 별도의 말풍선 박스로 예쁘게 렌더링
-            comments_data = row.get('Comments', '').strip()
-            if comments_data:
-                html_comments = html.escape(comments_data).replace('\n', '<br>')
-                st.markdown(f"""
+            comments_data = row.get('Comments', '').strip()
+            if comments_data:
+                html_comments = html.escape(comments_data).replace('\n', '<br>')
+                st.markdown(f"""
                     <div style='background-color: #FEF3C7; padding: 12px 15px; border-radius: 8px; border: 1px solid #FCD34D; font-size: 0.85rem; margin-top: 12px; color: #92400E; line-height: 1.6;'>
                         <b>💬 Notion Comments:</b><br><br>{html_comments}
                     </div>