diff --git a/.github/scripts/extract_guest_metadata.py b/.github/scripts/extract_guest_metadata.py
index ee308d2..9515b11 100644
--- a/.github/scripts/extract_guest_metadata.py
+++ b/.github/scripts/extract_guest_metadata.py
@@ -4,13 +4,13 @@
 
 import json
 import os
-import re
 import sys
 import urllib.request
-from datetime import datetime
 
 import sentry_sdk
 
+from osf_issue_parser import parse_issue, to_guest_promo_metadata
+
 sentry_sdk.init(
     dsn=os.environ.get("SENTRY_DSN", ""),
     traces_sample_rate=0,
@@ -20,12 +20,6 @@
 
 GITHUB_TOKEN = os.environ.get("GITHUB_TOKEN", "")
 REPO = "githubevents/open-source-friday"
-HOST_NAMES = {
-    "AndreaGriffiths11": "Andrea Griffiths",
-    "KevinCrosby": "Kevin Crosby",
-    "marlenezw": "Marlene Mhangami",
-    "madebygps": "Gwyneth Peña-Siguenza",
-}
 
 
 def fetch_issue(number: int) -> dict:
@@ -39,24 +33,6 @@ def fetch_issue(number: int) -> dict:
         return json.loads(resp.read())
 
 
-def parse_field(body: str, field: str) -> str:
-    m = re.search(rf"### {re.escape(field)}\s*\n+(.+?)(?:\n###|\Z)", body, re.DOTALL)
-    if m:
-        val = m.group(1).strip()
-        if val.upper() not in ("_NO RESPONSE_", "TBD", "NOT YET", ""):
-            return val
-    return ""
-
-
-def parse_date(raw: str) -> str:
-    for fmt in ("%m-%d-%Y", "%m-%d-%y", "%m/%d/%Y", "%B %d, %Y", "%B %-d, %Y"):
-        try:
-            return datetime.strptime(raw.strip(), fmt).strftime("%B %-d, %Y")
-        except ValueError:
-            continue
-    return raw
-
-
 def main() -> None:
     if len(sys.argv) < 2:
         print("Usage: extract_guest_metadata.py <issue_number>")
@@ -64,66 +40,16 @@ def main() -> None:
 
     number = int(sys.argv[1])
     issue = fetch_issue(number)
-    body = issue.get("body") or ""
-    title = issue.get("title") or ""
-
-    guest_name = parse_field(body, "Name")
-    github_handle = parse_field(body, "GitHub Handle").lstrip("@")
-    bio = parse_field(body, "Tell us about yourself")
-    project_name = parse_field(body, "Project Name")
-    project_url = parse_field(body, "Project Repo Link")
-    raw_date = parse_field(body, "Dates")
-
-    # Calendly-style body: "Name: Angela Wen @handle"
-    if not guest_name:
-        m = re.search(r"Name:\s+(.+?)(?:\s*@\S+)?\s*$", body, re.MULTILINE)
-        if m:
-            guest_name = m.group(1).strip()
-
-    # Title-based date fallback
-    if not raw_date or raw_date.upper() in ("TBD", "_NO RESPONSE_", "NOT YET", ""):
-        m = re.search(r"(\d{1,2}[-/]\d{1,2}[-/]\d{2,4})", title)
-        if m:
-            raw_date = m.group(1)
-
-    stream_date = parse_date(raw_date) if raw_date else "Date TBD"
-
-    assignees = issue.get("assignees") or []
-    # Every new issue auto-assigns all four hosts via the issue template.
-    # The actual host is decided in a team meeting and only known once the
-    # other assignees have been removed. Treat host as TBD until exactly one
-    # assignee remains — the video template hides the "with {host}" line when
-    # host_name == "TBD".
-    if len(assignees) == 1:
-        login = assignees[0]["login"]
-        host_name = HOST_NAMES.get(login, login)
-    else:
-        host_name = "TBD"
-
-    # Truncate bio for video overlay
-    if bio and len(bio) > 280:
-        bio = bio[:277] + "..."
-
-    metadata = {
-        "guest_name": guest_name or "Guest",
-        "github_handle": github_handle,
-        "project_name": project_name or "Open Source",
-        "project_url": project_url,
-        "bio": bio,
-        "stream_date": stream_date,
-        "stream_time": "1 PM ET",
-        "host_name": host_name,
-        "issue_number": number,
-        "issue_url": issue["html_url"],
-        "has_audio": False,  # set to True by workflow after TTS succeeds
-    }
+    
+    parsed = parse_issue(issue)
+    metadata = to_guest_promo_metadata(parsed)
 
     output_path = os.environ.get("METADATA_OUTPUT", "video/public/guest-promo.json")
     os.makedirs(os.path.dirname(output_path), exist_ok=True)
     with open(output_path, "w") as f:
         json.dump(metadata, f, indent=2)
 
-    print(f"✅ Wrote metadata for '{guest_name}' → {output_path}")
+    print(f"✅ Wrote metadata for '{metadata['guest_name']}' → {output_path}")
     print(json.dumps(metadata, indent=2))
 
 
diff --git a/.github/scripts/osf_issue_parser.py b/.github/scripts/osf_issue_parser.py
new file mode 100644
index 0000000..e23e8cc
--- /dev/null
+++ b/.github/scripts/osf_issue_parser.py
@@ -0,0 +1,192 @@
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass
+from datetime import datetime
+
+# Map GitHub logins → display names for the hosting team
+HOST_NAMES = {
+    "AndreaGriffiths11": "Andrea Griffiths",
+    "KevinCrosby": "Kevin Crosby",
+    "marlenezw": "Marlene Mhangami",
+    "madebygps": "Gwyneth Peña-Siguenza",
+}
+
+EMPTY_VALUES = {"TBD", "_NO RESPONSE_", "NOT YET", ""}
+
+_MONTHS = (
+    "January|February|March|April|May|June|"
+    "July|August|September|October|November|December"
+)
+
+@dataclass
+class ParsedIssue:
+    guest_name: str
+    github_handle: str
+    bio: str
+    project_name: str
+    project_url: str
+    raw_date: str
+    date_obj: datetime | None
+    date_str: str
+    host_name: str     # Single host for promo video (TBD if multiple assignees)
+    all_hosts: str     # All assignees joined by commas for the schedule table
+    url: str
+    number: int
+
+
+def parse_field(body: str, label: str) -> str:
+    """Extract the value under a ### <label> heading in the issue body."""
+    # This covers both the old version (with trailing \Z) and new version
+    pattern = rf"###\s+{re.escape(label)}\s*\n+(.+?)(?=\n###|\Z)"
+    match = re.search(pattern, body, re.DOTALL)
+    if not match:
+        return ""
+    val = match.group(1).strip()
+    if val.upper() in EMPTY_VALUES:
+        return ""
+    return val
+
+def parse_date_from_title(title: str) -> str:
+    """Try to extract a date string from an issue title."""
+    # Bracketed MM-DD-YYYY e.g. [04-17-2026]
+    m = re.search(r"\[(\d{1,2}-\d{1,2}-\d{4})\]", title)
+    if m:
+        return m.group(1)
+    # Unbracketed MM-DD-YYYY
+    m = re.search(r"(\d{1,2}-\d{1,2}-\d{4})", title)
+    if m:
+        return m.group(1)
+    # 2-digit year MM-DD-YY e.g. 06-19-26
+    m = re.search(r"(\d{1,2}-\d{1,2}-(\d{2}))(?:$|\s)", title)
+    if m and len(m.group(2)) == 2:
+        return m.group(1)[:-2] + "20" + m.group(2)
+    # "Month D, YYYY" or "Month DD YYYY"
+    m = re.search(rf"({_MONTHS})\s+(\d{{1,2}}),?\s+(\d{{4}})", title)
+    if m:
+        return f"{m.group(1)} {m.group(2)}, {m.group(3)}"
+    
+    # Generic short fallback for extract_guest_metadata.py compatibility
+    m = re.search(r"(\d{1,2}[-/]\d{1,2}[-/]\d{2,4})", title)
+    if m:
+        return m.group(1)
+        
+    return ""
+
+def parse_date(raw: str) -> datetime | None:
+    """Try common date formats found in the issues."""
+    raw = raw.strip()
+    for fmt in ("%m-%d-%Y", "%m-%d-%y", "%m/%d/%Y", "%B %d, %Y", "%B %-d, %Y"):
+        try:
+            return datetime.strptime(raw, fmt)
+        except ValueError:
+            pass
+    # Try without leading zeros via regex
+    m = re.match(r"^(\d{1,2})[-/](\d{1,2})[-/](\d{4})$", raw)
+    if m:
+        month, day, year = int(m.group(1)), int(m.group(2)), int(m.group(3))
+        try:
+            return datetime(year, month, day)
+        except ValueError:
+            pass
+    return None
+
+def parse_issue(issue: dict) -> ParsedIssue:
+    body = issue.get("body") or ""
+    title = issue.get("title") or ""
+    number = issue.get("number", 0)
+    url = issue.get("html_url", "")
+
+    guest_name = parse_field(body, "Name")
+    github_handle = parse_field(body, "GitHub Handle").lstrip("@")
+    bio = parse_field(body, "Tell us about yourself")
+    project_name = parse_field(body, "Project Name")
+    project_url = parse_field(body, "Project Repo Link")
+    
+    # We explicitly need the unparsed original dates string, taking EMPTY_VALUES as missing
+    raw_date = ""
+    # We do a custom field match so we can see the exact uppercase string
+    date_match = re.search(r"### Dates\s*\n+(.+?)(?=\n###|\Z)", body, re.DOTALL)
+    if date_match:
+        val = date_match.group(1).strip()
+        if val.upper() not in EMPTY_VALUES:
+            raw_date = val
+
+    if not raw_date:
+        raw_date = parse_date_from_title(title)
+
+    if not guest_name:
+        # First try Calendly-style body: "Name: Angela Wen @handle"
+        m = re.search(r"Name:\s+(.+?)(?:\s*@\S+)?\s*$", body, re.MULTILINE)
+        if m:
+            guest_name = m.group(1).strip()
+
+    if not guest_name:
+        parts = [p.strip() for p in re.split(r"\s+-\s+", title)]
+        # Remove the leading "Open Source Friday..." segment and trailing date segment
+        candidates = [p for p in parts[1:] if not re.search(r"\d{4}|\d{2}$", p)]
+        if candidates:
+            guest_name = candidates[0]
+
+    date_obj = parse_date(raw_date)
+    date_str = date_obj.strftime("%B %-d, %Y") if date_obj else "Date TBD"
+
+    assignees = issue.get("assignees") or []
+    if assignees:
+        all_hosts = ", ".join(HOST_NAMES.get(a["login"], a["login"]) for a in assignees)
+    else:
+        all_hosts = "TBD"
+
+    # Single host for promo
+    if len(assignees) == 1:
+        login = assignees[0]["login"]
+        host_name = HOST_NAMES.get(login, login)
+    else:
+        host_name = "TBD"
+
+    return ParsedIssue(
+        guest_name=guest_name or "Guest",
+        github_handle=github_handle,
+        bio=bio,
+        project_name=project_name or "Open Source",
+        project_url=project_url,
+        raw_date=raw_date,
+        date_obj=date_obj,
+        date_str=date_str,
+        host_name=host_name,
+        all_hosts=all_hosts,
+        url=url,
+        number=number,
+    )
+
+def to_schedule_row(parsed: ParsedIssue) -> dict | None:
+    if not parsed.date_obj:
+        return None
+    return {
+        "date": parsed.date_obj,
+        "date_str": parsed.date_str,
+        "guest": parsed.guest_name if parsed.guest_name != "Guest" else "TBD",
+        "project": parsed.project_name if parsed.project_name != "Open Source" else "TBD",
+        "host": parsed.all_hosts,
+        "url": parsed.url,
+        "number": parsed.number,
+    }
+
+def to_guest_promo_metadata(parsed: ParsedIssue) -> dict:
+    bio = parsed.bio
+    if bio and len(bio) > 280:
+        bio = bio[:277] + "..."
+
+    return {
+        "guest_name": parsed.guest_name,
+        "github_handle": parsed.github_handle,
+        "project_name": parsed.project_name,
+        "project_url": parsed.project_url,
+        "bio": bio,
+        "stream_date": parsed.date_str if parsed.date_obj else (parsed.raw_date if parsed.raw_date else "Date TBD"),
+        "stream_time": "1 PM ET",
+        "host_name": parsed.host_name,
+        "issue_number": parsed.number,
+        "issue_url": parsed.url,
+        "has_audio": False,
+    }
diff --git a/.github/scripts/test_osf_issue_parser.py b/.github/scripts/test_osf_issue_parser.py
new file mode 100644
index 0000000..62bcc55
--- /dev/null
+++ b/.github/scripts/test_osf_issue_parser.py
@@ -0,0 +1,112 @@
+import unittest
+from datetime import datetime
+
+from osf_issue_parser import (
+    parse_field,
+    parse_date_from_title,
+    parse_date,
+    parse_issue,
+    to_schedule_row,
+    to_guest_promo_metadata,
+    ParsedIssue
+)
+
+class TestOSFIssueParser(unittest.TestCase):
+    def test_parse_field(self):
+        body = "### Name\n\nAlice\n\n### Dates\n\n_No response_"
+        self.assertEqual(parse_field(body, "Name"), "Alice")
+        self.assertEqual(parse_field(body, "Dates"), "")
+        self.assertEqual(parse_field(body, "Missing"), "")
+
+    def test_parse_date_from_title(self):
+        self.assertEqual(parse_date_from_title("Guest - [04-17-2026]"), "04-17-2026")
+        self.assertEqual(parse_date_from_title("Guest - 04-17-2026"), "04-17-2026")
+        self.assertEqual(parse_date_from_title("Guest - 04-17-26"), "04-17-2026")
+        self.assertEqual(parse_date_from_title("Guest - April 17, 2026"), "April 17, 2026")
+        self.assertEqual(parse_date_from_title("Guest without date"), "")
+
+    def test_parse_date(self):
+        self.assertEqual(parse_date("04-17-2026"), datetime(2026, 4, 17))
+        self.assertEqual(parse_date("04-17-26"), datetime(2026, 4, 17))
+        self.assertEqual(parse_date("4/17/2026"), datetime(2026, 4, 17))
+        self.assertEqual(parse_date("April 17, 2026"), datetime(2026, 4, 17))
+        self.assertIsNone(parse_date("Date TBD"))
+
+    def test_parse_issue_template(self):
+        issue = {
+            "title": "Open Source Friday - John Doe",
+            "body": "### Name\n\nJohn Doe\n\n### Dates\n\n05-01-2026",
+            "assignees": [{"login": "AndreaGriffiths11"}]
+        }
+        parsed = parse_issue(issue)
+        self.assertEqual(parsed.guest_name, "John Doe")
+        self.assertEqual(parsed.raw_date, "05-01-2026")
+        self.assertEqual(parsed.date_obj, datetime(2026, 5, 1))
+        self.assertEqual(parsed.host_name, "Andrea Griffiths")
+        self.assertEqual(parsed.all_hosts, "Andrea Griffiths")
+
+    def test_parse_issue_calendly(self):
+        issue = {
+            "title": "Open Source Friday",
+            "body": "Name: Jane Smith @janesmith\nDates: 05-02-2026",
+            "assignees": []
+        }
+        parsed = parse_issue(issue)
+        self.assertEqual(parsed.guest_name, "Jane Smith")
+        self.assertEqual(parsed.host_name, "TBD")
+        self.assertEqual(parsed.all_hosts, "TBD")
+
+    def test_parse_issue_multiple_assignees(self):
+        issue = {
+            "title": "Guest",
+            "body": "### Name\n\nBob\n\n### Dates\n\n05-03-2026",
+            "assignees": [{"login": "AndreaGriffiths11"}, {"login": "KevinCrosby"}]
+        }
+        parsed = parse_issue(issue)
+        # Multiple hosts -> promo host should be TBD, schedule hosts should list all
+        self.assertEqual(parsed.host_name, "TBD")
+        self.assertEqual(parsed.all_hosts, "Andrea Griffiths, Kevin Crosby")
+
+    def test_to_schedule_row(self):
+        issue = {
+            "title": "Guest",
+            "body": "### Name\n\nBob\n\n### Dates\n\n05-03-2026",
+            "number": 123,
+            "html_url": "http://example.com"
+        }
+        parsed = parse_issue(issue)
+        row = to_schedule_row(parsed)
+        self.assertIsNotNone(row)
+        self.assertEqual(row["guest"], "Bob")
+        self.assertEqual(row["date"], datetime(2026, 5, 3))
+        self.assertEqual(row["number"], 123)
+        self.assertEqual(row["url"], "http://example.com")
+
+    def test_to_schedule_row_missing_date(self):
+        issue = {
+            "title": "Guest",
+            "body": "### Name\n\nBob\n\n### Dates\n\nTBD"
+        }
+        parsed = parse_issue(issue)
+        row = to_schedule_row(parsed)
+        self.assertIsNone(row)
+
+    def test_to_guest_promo_metadata(self):
+        issue = {
+            "title": "Guest",
+            "body": "### Name\n\nBob\n\n### Dates\n\n05-03-2026\n\n### Tell us about yourself\n\n" + ("A" * 300),
+            "number": 123,
+            "html_url": "http://example.com",
+            "assignees": [{"login": "AndreaGriffiths11"}]
+        }
+        parsed = parse_issue(issue)
+        meta = to_guest_promo_metadata(parsed)
+        self.assertEqual(meta["guest_name"], "Bob")
+        self.assertEqual(meta["stream_date"], "May 3, 2026")
+        self.assertEqual(meta["host_name"], "Andrea Griffiths")
+        self.assertTrue(len(meta["bio"]) <= 280)
+        self.assertTrue(meta["bio"].endswith("..."))
+        self.assertEqual(meta["issue_number"], 123)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/.github/scripts/update_schedule.py b/.github/scripts/update_schedule.py
index 7b3c9d1..6e3edd7 100644
--- a/.github/scripts/update_schedule.py
+++ b/.github/scripts/update_schedule.py
@@ -16,6 +16,8 @@
 
 import sentry_sdk
 
+from osf_issue_parser import parse_issue, to_schedule_row
+
 sentry_sdk.init(
     dsn=os.environ.get("SENTRY_DSN", ""),
     traces_sample_rate=0,
@@ -31,14 +33,6 @@
 START_MARKER = "<!-- SCHEDULE_START -->"
 END_MARKER = "<!-- SCHEDULE_END -->"
 
-# Map GitHub logins → display names for the hosting team
-HOST_NAMES = {
-    "AndreaGriffiths11": "Andrea Griffiths",
-    "KevinCrosby": "Kevin Crosby",
-    "marlenezw": "Marlene Mhangami",
-    "madebygps": "Gwyneth Peña-Siguenza",
-}
-
 
 def gh_get(path: str, token: str) -> list | dict:
     url = f"https://api.github.com{path}"
@@ -68,119 +62,6 @@ def fetch_scheduled_issues(token: str) -> list:
     return issues
 
 
-def parse_field(body: str, label: str) -> str:
-    """Extract the value under a ### <label> heading in the issue body."""
-    pattern = rf"###\s+{re.escape(label)}\s*\n+(.+?)(?=\n###|\Z)"
-    match = re.search(pattern, body, re.DOTALL)
-    if not match:
-        return ""
-    return match.group(1).strip()
-
-
-_MONTHS = (
-    "January|February|March|April|May|June|"
-    "July|August|September|October|November|December"
-)
-
-
-def parse_date_from_title(title: str) -> str:
-    """Try to extract a date string from an issue title."""
-    # Bracketed MM-DD-YYYY e.g. [04-17-2026]
-    m = re.search(r"\[(\d{1,2}-\d{1,2}-\d{4})\]", title)
-    if m:
-        return m.group(1)
-    # Unbracketed MM-DD-YYYY
-    m = re.search(r"(\d{1,2}-\d{1,2}-\d{4})", title)
-    if m:
-        return m.group(1)
-    # 2-digit year MM-DD-YY e.g. 06-19-26
-    m = re.search(r"(\d{1,2}-\d{1,2}-(\d{2}))$", title)
-    if m and len(m.group(2)) == 2:
-        return m.group(1)[:-2] + "20" + m.group(2)
-    # "Month D, YYYY" or "Month DD YYYY"
-    m = re.search(rf"({_MONTHS})\s+(\d{{1,2}}),?\s+(\d{{4}})", title)
-    if m:
-        return f"{m.group(1)} {m.group(2)}, {m.group(3)}"
-    return ""
-
-
-def parse_date(raw: str) -> datetime | None:
-    """Try common date formats found in the issues."""
-    raw = raw.strip()
-    for fmt in ("%m-%d-%Y", "%m/%d/%Y", "%B %d, %Y", "%B %-d, %Y"):
-        try:
-            return datetime.strptime(raw, fmt)
-        except ValueError:
-            pass
-    # Try without leading zeros via regex
-    m = re.match(r"^(\d{1,2})[-/](\d{1,2})[-/](\d{4})$", raw)
-    if m:
-        month, day, year = int(m.group(1)), int(m.group(2)), int(m.group(3))
-        try:
-            return datetime(year, month, day)
-        except ValueError:
-            pass
-    return None
-
-
-def build_row(issue: dict) -> dict | None:
-    body = issue.get("body") or ""
-    title = issue.get("title") or ""
-    number = issue["number"]
-    url = issue["html_url"]
-
-    guest_name = parse_field(body, "Name")
-    raw_date = parse_field(body, "Dates")
-    project = parse_field(body, "Project Name")
-
-    # Fall back to extracting date from the issue title for manually-created issues
-    if not raw_date or raw_date.upper() in ("TBD", "_NO RESPONSE_", "NOT YET", ""):
-        raw_date = parse_date_from_title(title)
-
-    # For manually-created issues the guest name may be in the title
-    # e.g. "Open Source Friday - Guest Name - MM-DD-YYYY"
-    if not guest_name:
-        # First try Calendly-style body: "Name: Angela Wen @handle"
-        m = re.search(r"Name:\s+(.+?)(?:\s*@\S+)?\s*$", body, re.MULTILINE)
-        if m:
-            guest_name = m.group(1).strip()
-
-    if not guest_name:
-        parts = [p.strip() for p in re.split(r"\s+-\s+", title)]
-        # Remove the leading "Open Source Friday..." segment and trailing date segment
-        candidates = [p for p in parts[1:] if not re.search(r"\d{4}|\d{2}$", p)]
-        if candidates:
-            guest_name = candidates[0]
-
-    # Skip issues where the date is clearly TBD / not set
-    if not raw_date or raw_date.upper() in ("TBD", "_NO RESPONSE_", "NOT YET"):
-        print(f"  Skipping #{number}: date is '{raw_date}'")
-        return None
-
-    date_obj = parse_date(raw_date)
-    if not date_obj:
-        print(f"  Skipping #{number}: could not parse date '{raw_date}'")
-        return None
-
-    assignees = issue.get("assignees") or []
-    if assignees:
-        host = ", ".join(
-            HOST_NAMES.get(a["login"], a["login"]) for a in assignees
-        )
-    else:
-        host = "TBD"
-
-    return {
-        "date": date_obj,
-        "date_str": date_obj.strftime("%B %-d, %Y"),
-        "guest": guest_name or "TBD",
-        "project": project or "TBD",
-        "host": host,
-        "url": url,
-        "number": number,
-    }
-
-
 def build_table(rows: list) -> str:
     today = datetime.now(tz=None).replace(hour=0, minute=0, second=0, microsecond=0)
     upcoming = sorted(
@@ -245,9 +126,12 @@ def main():
 
     rows = []
     for issue in issues:
-        row = build_row(issue)
-        if row:
-            rows.append(row)
+        parsed = parse_issue(issue)
+        row = to_schedule_row(parsed)
+        if not row:
+            print(f"  Skipping #{issue['number']}: could not parse valid date")
+            continue
+        rows.append(row)
 
     print(f"Parsed {len(rows)} issue(s) with valid dates.")
     table_md = build_table(rows)