Fix GitHub ticket auth and popup state

app.py

@@ -860,12 +860,12 @@ def llm_chat(prompt: str, timeout: Tuple[int, int] = (10, 600)) -> Tuple[str, Op
 
 def github_create_issue(title: str, body: str, labels: Optional[List[str]] = None) -> Tuple[Optional[int], Optional[str]]:
     global _GITHUB_TOKEN_LOGGED
-    token = os.getenv("GITHUB_TOKEN") or ""
+    token = (os.getenv("GITHUB_TOKEN") or "").strip()
     if not _GITHUB_TOKEN_LOGGED:
-        print("GitHub token present:", bool(token))
+        print("GitHub token present:", bool(token), "len:", len(token))
         _GITHUB_TOKEN_LOGGED = True
     if not token:
-        return None, "GITHUB_TOKEN is not set. Add it as a Hugging Face Secret."
+        return None, "GITHUB_TOKEN is missing. Add it as a Hugging Face Secret and restart the Space."
     if not (title or "").strip() or not (body or "").strip():
         return None, "GitHub issue title/body must be non-empty."
     url = f"https://api.github.com/repos/{REPO_OWNER}/{REPO_NAME}/issues"
@@ -873,7 +873,20 @@ def github_create_issue(title: str, body: str, labels: Optional[List[str]] = Non
         "Authorization": f"Bearer {token}",
         "Accept": "application/vnd.github+json",
         "Content-Type": "application/json",
+        "X-GitHub-Api-Version": "2022-11-28",
     }
+    try:
+        auth_resp = requests.get("https://api.github.com/user", headers=headers, timeout=(10, 30))
+        if auth_resp.status_code != 200:
+            return (
+                None,
+                "GitHub auth failed "
+                f"(status={auth_resp.status_code}): {auth_resp.text}. "
+                "This usually means the token is invalid/expired, or you copied it incorrectly. "
+                "If the repo is under an org with SSO, authorize the token for that org.",
+            )
+    except Exception as e:
+        return None, f"GitHub auth check failed: {e}"
     payload = {"title": title, "body": body}
     if labels:
         payload["labels"] = labels
@@ -1019,12 +1032,16 @@ with st.sidebar:
     st.write("")
     st.subheader("Support")
     st.caption("If an answer is not found in the dataset, you can create a support ticket (GitHub issue).")
-    st.session_state.setdefault("open_ticket_ui", False)
-    if st.button("Open ticket form", use_container_width=True, disabled=st.session_state["is_thinking"]):
+    if st.button(
+        "Open ticket form",
+        key="sidebar_open_ticket_btn",
+        use_container_width=True,
+        disabled=st.session_state["is_thinking"],
+    ):
         st.session_state["open_ticket_ui"] = True
     if read_only_mode:
         st.warning("Embeddings unavailable (HF Hub temporary error). App is in read-only mode.")
-        if st.button("Retry loading embeddings", use_container_width=True):
+        if st.button("Retry loading embeddings", key="retry_embed_btn", use_container_width=True):
             load_embedder.clear()
             st.session_state.pop("embedder_error", None)
             st.rerun()
@@ -1070,7 +1087,12 @@ with st.sidebar:
     st.write("")
     st.session_state.setdefault("show_sources", False)
     st.markdown('<div class="stacked-control sources-btn">', unsafe_allow_html=True)
-    if st.button("Sources (click to expand the list)", use_container_width=True, disabled=st.session_state["is_thinking"]):
+    if st.button(
+        "Sources (click to expand the list)",
+        key="sidebar_sources_btn",
+        use_container_width=True,
+        disabled=st.session_state["is_thinking"],
+    ):
         st.session_state["show_sources"] = not st.session_state["show_sources"]
     st.markdown("</div>", unsafe_allow_html=True)
     if st.session_state["show_sources"]:
@@ -1091,8 +1113,8 @@ if "chat" not in st.session_state:
     st.session_state["chat"] = []
 if "pending_question" not in st.session_state:
     st.session_state["pending_question"] = ""
-if "ticket_prefill" not in st.session_state:
-    st.session_state["ticket_prefill"] = None
+st.session_state.setdefault("open_ticket_ui", False)
+st.session_state.setdefault("ticket_prefill", {"question": "", "citations": []})
 if "enhancing_key" not in st.session_state:
     st.session_state["enhancing_key"] = None
 if "active_action" not in st.session_state:
@@ -1365,6 +1387,7 @@ with aq1:
 with aq2:
     regen_btn = st.button(
         "Regenerate article questions",
+        key="regen_article_btn",
         use_container_width=True,
         disabled=st.session_state["is_thinking"],
     )
@@ -1422,8 +1445,12 @@ def ticket_form(prefill: Optional[Dict]):
     desc_default = f"Question:\n{q_pref}\n\nWhat I expected:\n\nWhat happened:\n"
     details = st.text_area("Description (details)", value=(desc_default if q_pref else ""))
     col1, col2 = st.columns(2)
-    submit = col1.button("Submit ticket", use_container_width=True)
-    cancel = col2.button("Cancel", use_container_width=True)
+    submit = col1.button("Submit ticket", key="ticket_submit_btn", use_container_width=True)
+    cancel = col2.button("Cancel", key="ticket_cancel_btn", use_container_width=True)
+    close = st.button("Close", key="ticket_close_btn", use_container_width=True)
+    if close:
+        st.session_state["open_ticket_ui"] = False
+        st.rerun()
     if cancel:
         st.session_state["open_ticket_ui"] = False
         return
@@ -1447,6 +1474,8 @@ def ticket_form(prefill: Optional[Dict]):
         else:
             st.success(f"Ticket created: Issue #{num}")
             st.session_state["open_ticket_ui"] = False
+            st.session_state["ticket_prefill"] = {"question": "", "citations": []}
+            st.rerun()
 
 if st.session_state.get("open_ticket_ui"):
     prefill = st.session_state.get("ticket_prefill") or {}