From 903caaef1cdd0869656402254efdf8df690be94f Mon Sep 17 00:00:00 2001
From: Seongho Bae <me@seonghobae.me>
Date: Mon, 17 Aug 2026 07:58:29 +0900
Subject: [PATCH 1/2] feat: open the corp grouping with the scored week
 (v0.98.0)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Open period report 2026-W02 from a corporate-entity analysis run also
switches Report grouping to Corporate entity. Mean θ stays on the
report panel. No TEPP theta is invented.
---
 ....98.0-analysis-run-open-report-grouping.md |  4 ++
 CHANGELOG.md                                  |  9 ++++
 .../0024-seed-period-report-analysis-run.md   |  7 +--
 frontend/package.json                         |  2 +-
 frontend/src/App.test.tsx                     |  3 ++
 frontend/src/App.tsx                          | 43 ++++++++++++++++---
 lineageweave/__init__.py                      |  2 +-
 pyproject.toml                                |  2 +-
 uv.lock                                       |  2 +-
 9 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md

diff --git a/CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md b/CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md
new file mode 100644
index 000000000..1eba3f75e
--- /dev/null
+++ b/CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md
@@ -0,0 +1,4 @@
+# 0.98.0 Open the corp grouping with the scored week
+
+Open period report 2026-W02 also switches Report grouping to Corporate
+entity. Mean θ stays on the report panel.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba848eea0..8a35c4682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project are documented here. Format follows
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); versioning follows
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.98.0] - 2026-08-17
+
+### Added
+
+- Opening **Open period report 2026-W02** from a corporate-entity
+  analysis run also switches Report grouping to Corporate entity.
+  After `make seed`, the Demo Corp week is the one that opens. Mean θ
+  stays on the report panel. No TEPP theta is invented.
+
 ## [0.97.0] - 2026-08-17
 
 ### Added
diff --git a/docs/adr/0024-seed-period-report-analysis-run.md b/docs/adr/0024-seed-period-report-analysis-run.md
index de8bf3240..58236126e 100644
--- a/docs/adr/0024-seed-period-report-analysis-run.md
+++ b/docs/adr/0024-seed-period-report-analysis-run.md
@@ -47,9 +47,10 @@ on a path that is not allowed to (ADR 0021 / ADR 0022 / ADR 0023).
 After `make seed`, Demo Analyst opens Analysis runs and sees
 **Period report · Succeeded · Demo Corp** next to the lineage and TEPP
 rows. Opening it shows the cutoff posts and **Open period report
-2026-W02** (the week stored on `scope_key`). Mean θ remains on the
-period-report panel. Re-seed is idempotent on
-`demo-report-seed-2026-w02`.
+2026-W02** (the week stored on `scope_key`). That click also switches
+Report grouping to Corporate entity so the Demo Corp week is the one
+that opens. Mean θ remains on the period-report panel. Re-seed is
+idempotent on `demo-report-seed-2026-w02`.
 
 ## References — APA 7th
 
diff --git a/frontend/package.json b/frontend/package.json
index d62e46766..3e22b4931 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frontend",
   "private": true,
-  "version": "0.97.0",
+  "version": "0.98.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/frontend/src/App.test.tsx b/frontend/src/App.test.tsx
index 3d020ad40..af84e69fc 100644
--- a/frontend/src/App.test.tsx
+++ b/frontend/src/App.test.tsx
@@ -2119,8 +2119,11 @@ describe("App, authenticated", () => {
     await userEvent.clear(periodInput);
     await userEvent.type(periodInput, "2026-W03");
     expect(periodInput).toHaveValue("2026-W03");
+    const groupingSelect = screen.getByLabelText("Report grouping");
+    expect(groupingSelect).toHaveValue("process_unit");
     await userEvent.click(screen.getByRole("button", { name: "Open period report 2026-W02" }));
     expect(periodInput).toHaveValue("2026-W02");
+    expect(groupingSelect).toHaveValue("corporate_entity");
     expect(periodInput).toHaveFocus();
   });
 
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index c6a3f570d..391cc6954 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1689,6 +1689,24 @@ const REPORT_PERIOD_KEY = /^\d{4}-W\d{2}$/;
  * That key is a week label, not a theta. Missing or malformed keys
  * stay closed so we do not invent a period.
  */
+/**
+ * Report grouping that matches the run's authorized scope.
+ *
+ * A corporate-entity run must not leave the panel on process unit.
+ */
+function analysisRunReportGrouping(run: AnalysisRun): string | null {
+  switch (run.scope_kind_code) {
+    case "analysis_scope_corporate_entity":
+      return "corporate_entity";
+    case "analysis_scope_process_unit":
+      return "process_unit";
+    case "analysis_scope_thread_group":
+      return "thread_group";
+    default:
+      return null;
+  }
+}
+
 function analysisRunReportPeriod(run: AnalysisRun): string | null {
   if (run.run_kind_code !== "analysis_run_report") {
     return null;
@@ -1725,7 +1743,7 @@ function AnalysisRunsPanel({
 }: {
   accessToken: string;
   onSelectPost: (postId: string, options?: SelectPostOptions) => void;
-  onSelectReportPeriod?: (periodCode: string) => void;
+  onSelectReportPeriod?: (periodCode: string, groupingKind?: string) => void;
 }) {
   const [runs, setRuns] = useState<AnalysisRun[] | null>(null);
   const [selected, setSelected] = useState<AnalysisRun | null>(null);
@@ -1903,7 +1921,7 @@ function AnalysisRunsPanel({
               onClick={() => {
                 const periodCode = analysisRunReportPeriod(selected);
                 if (periodCode) {
-                  onSelectReportPeriod(periodCode);
+                  onSelectReportPeriod(periodCode, analysisRunReportGrouping(selected) ?? undefined);
                   document.getElementById("report-period")?.focus();
                 }
               }}
@@ -2061,14 +2079,17 @@ function ReportsPanel({
   onSelectPost,
   period,
   onSelectPeriod,
+  grouping,
+  onSelectGrouping,
 }: {
   accessToken: string;
   canRebuild: boolean;
   onSelectPost: (postId: string) => void;
   period: string;
   onSelectPeriod: (periodCode: string) => void;
+  grouping: string;
+  onSelectGrouping: (groupingKind: string) => void;
 }) {
-  const [grouping, setGrouping] = useState("process_unit");
   const [payload, setPayload] = useState<PeriodReports | null>(null);
   const [index, setIndex] = useState<PeriodReportIndex | null>(null);
   const [comparison, setComparison] = useState<PeriodComparison | null>(null);
@@ -2129,7 +2150,7 @@ function ReportsPanel({
       <div className="chat-input-row">
         <label>
           Grouping
-          <select aria-label="Report grouping" value={grouping} onChange={(event) => setGrouping(event.target.value)}>
+          <select aria-label="Report grouping" value={grouping} onChange={(event) => onSelectGrouping(event.target.value)}>
             <option value="process_unit">Process unit</option>
             <option value="corporate_entity">Corporate entity</option>
             <option value="thread_group">Thread group</option>
@@ -2152,7 +2173,7 @@ function ReportsPanel({
               <button
                 className="post-list-item"
                 aria-label={`Compare ${row.grouping_kind}: ${row.grouping_label}`}
-                onClick={() => setGrouping(row.grouping_kind)}
+                onClick={() => onSelectGrouping(row.grouping_kind)}
               >
                 <span className="ticket-title">
                   {groupingLabels[row.grouping_kind] ?? row.grouping_kind}: {row.grouping_label}
@@ -2271,6 +2292,14 @@ function PostList({ accessToken }: { accessToken: string }) {
   const [rebuilding, setRebuilding] = useState(false);
   const [rebuildError, setRebuildError] = useState<string | null>(null);
   const [reportPeriod, setReportPeriod] = useState("2026-W02");
+  const [reportGrouping, setReportGrouping] = useState("process_unit");
+
+  function openReportFromAnalysisRun(periodCode: string, groupingKind?: string) {
+    setReportPeriod(periodCode);
+    if (groupingKind) {
+      setReportGrouping(groupingKind);
+    }
+  }
 
   function selectPost(postId: string, options?: SelectPostOptions) {
     setSelectedPostId(postId);
@@ -2315,7 +2344,7 @@ function PostList({ accessToken }: { accessToken: string }) {
       <AnalysisRunsPanel
         accessToken={accessToken}
         onSelectPost={selectPost}
-        onSelectReportPeriod={setReportPeriod}
+        onSelectReportPeriod={openReportFromAnalysisRun}
       />
       <ReportsPanel
         accessToken={accessToken}
@@ -2323,6 +2352,8 @@ function PostList({ accessToken }: { accessToken: string }) {
         onSelectPost={selectPost}
         period={reportPeriod}
         onSelectPeriod={setReportPeriod}
+        grouping={reportGrouping}
+        onSelectGrouping={setReportGrouping}
       />
       <section className="popup-section lineage-home">
         <div className="lineage-home-header">
diff --git a/lineageweave/__init__.py b/lineageweave/__init__.py
index 6a95380b4..f8f1f2c33 100644
--- a/lineageweave/__init__.py
+++ b/lineageweave/__init__.py
@@ -55,4 +55,4 @@
     "sentence_excerpts",
 ]
 
-__version__ = "0.97.0"
+__version__ = "0.98.0"
diff --git a/pyproject.toml b/pyproject.toml
index 5b083b793..14b33ac89 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "lineageweave"
-version = "0.97.0"
+version = "0.98.0"
 description = "Reconstructs git-branch-style lineage DAGs from scattered short records using multi-channel score fusion and LLM adjudication."
 readme = "README.md"
 license = { text = "MIT" }
diff --git a/uv.lock b/uv.lock
index 13b554778..4eb0030d7 100644
--- a/uv.lock
+++ b/uv.lock
@@ -454,7 +454,7 @@ wheels = [
 
 [[package]]
 name = "lineageweave"
-version = "0.97.0"
+version = "0.98.0"
 source = { virtual = "." }
 dependencies = [
     { name = "certifi" },

From 4632dee04e457f03994dbef86021785aaec75817 Mon Sep 17 00:00:00 2001
From: Seongho Bae <me@seonghobae.me>
Date: Mon, 17 Aug 2026 09:25:24 +0900
Subject: [PATCH 2/2] fix(ui): name the opened Demo Corp grouping

Open period report 2026-W02 now marks Demo Corp current and shows
that label instead of a UUID. The persisted scope grouping key is
the corporate entity, never the week or a theta.
---
 ....98.0-analysis-run-open-report-grouping.md |  2 +-
 CHANGELOG.md                                  |  7 +-
 CLAUDE.md                                     |  3 +-
 backend/app/analysis_run_ingestion.py         | 21 +++++
 backend/app/report_ingestion.py               |  6 +-
 .../0024-seed-period-report-analysis-run.md   |  7 +-
 frontend/src/App.css                          |  6 ++
 frontend/src/App.test.tsx                     | 65 +++++++++++++-
 frontend/src/App.tsx                          | 85 +++++++++++++++++--
 frontend/src/api.ts                           |  2 +
 tests/test_analysis_run_scope_grouping_key.py | 56 ++++++++++++
 11 files changed, 242 insertions(+), 18 deletions(-)
 create mode 100644 tests/test_analysis_run_scope_grouping_key.py

diff --git a/CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md b/CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md
index 1eba3f75e..26f164206 100644
--- a/CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md
+++ b/CHANGELOG.d/0.98.0-analysis-run-open-report-grouping.md
@@ -1,4 +1,4 @@
 # 0.98.0 Open the corp grouping with the scored week
 
 Open period report 2026-W02 also switches Report grouping to Corporate
-entity. Mean θ stays on the report panel.
+entity and marks Demo Corp current. Mean θ stays on the report panel.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a35c4682..1f7a2a579 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,10 @@ All notable changes to this project are documented here. Format follows
 ### Added
 
 - Opening **Open period report 2026-W02** from a corporate-entity
-  analysis run also switches Report grouping to Corporate entity.
-  After `make seed`, the Demo Corp week is the one that opens. Mean θ
-  stays on the report panel. No TEPP theta is invented.
+  analysis run also switches Report grouping to Corporate entity and
+  marks the Demo Corp grouping current. The opened report is named
+  Demo Corp, not a UUID. Mean θ stays on the report panel. No TEPP
+  theta is invented.
 
 ## [0.97.0] - 2026-08-17
 
diff --git a/CLAUDE.md b/CLAUDE.md
index b80545927..5d246f6ac 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -42,4 +42,5 @@ then start. Do not invent a theta. Hover the Result prefix to read
 the parent-choice digest.
 After `make seed`, open **Period report · Succeeded · Demo Corp**,
 then **Open period report 2026-W02**. The report period field is
-focused. Mean θ stays on the period-report panel.
+focused. Report grouping is Corporate entity and Demo Corp is current.
+Mean θ stays on the period-report panel.
diff --git a/backend/app/analysis_run_ingestion.py b/backend/app/analysis_run_ingestion.py
index f9108b9c6..b848c6ca6 100644
--- a/backend/app/analysis_run_ingestion.py
+++ b/backend/app/analysis_run_ingestion.py
@@ -90,6 +90,24 @@
 """
 
 
+def scope_grouping_key(row: Any) -> str | None:
+    """Persist the reconstruct grouping key for the run's authorized scope.
+
+    A corporate-entity report run stores the week on ``scope_key``. The
+    grouping that reconstruct and the period-report panel share is the
+    corporate entity (or process unit / thread group), never that week
+    label and never a theta.
+    """
+    scope = row["scope_kind_code"]
+    if scope == "analysis_scope_corporate_entity" and row["corporate_entity_id"]:
+        return str(row["corporate_entity_id"])
+    if scope == "analysis_scope_process_unit" and row["process_unit_id"]:
+        return str(row["process_unit_id"])
+    if scope == "analysis_scope_thread_group" and row["scope_key"]:
+        return str(row["scope_key"])
+    return None
+
+
 def _iso(value: Any) -> str:
     """Serialize a timestamptz the same way post payloads do."""
     return value.isoformat() if hasattr(value, "isoformat") else str(value)
@@ -253,6 +271,9 @@ async def _serialize_runs(
             item["scope_entity_name"] = row["scope_entity_name"]
         if row["scope_key"]:
             item["scope_key"] = row["scope_key"]
+        grouping_key = scope_grouping_key(row)
+        if grouping_key:
+            item["scope_grouping_key"] = grouping_key
         payload.append(item)
     return payload
 
diff --git a/backend/app/report_ingestion.py b/backend/app/report_ingestion.py
index 07c0bf56f..e5459b30c 100644
--- a/backend/app/report_ingestion.py
+++ b/backend/app/report_ingestion.py
@@ -490,10 +490,14 @@ async def fetch_period_reports(
         selected_by_group[row["grouping_key"]].append(row)
     payload: list[dict[str, Any]] = []
     for header in headers:
+        grouping_key = header["grouping_key"]
         payload.append(
             {
                 "grouping_kind": header["grouping_kind"],
-                "grouping_key": header["grouping_key"],
+                "grouping_key": grouping_key,
+                "grouping_label": await resolve_grouping_label(
+                    conn, header["grouping_kind"], grouping_key
+                ),
                 "period_code": header["period_code"],
                 "rubric_version": header["rubric_version"],
                 "selected_model": header["selected_model"],
diff --git a/docs/adr/0024-seed-period-report-analysis-run.md b/docs/adr/0024-seed-period-report-analysis-run.md
index 58236126e..a392de46f 100644
--- a/docs/adr/0024-seed-period-report-analysis-run.md
+++ b/docs/adr/0024-seed-period-report-analysis-run.md
@@ -48,9 +48,10 @@ After `make seed`, Demo Analyst opens Analysis runs and sees
 **Period report · Succeeded · Demo Corp** next to the lineage and TEPP
 rows. Opening it shows the cutoff posts and **Open period report
 2026-W02** (the week stored on `scope_key`). That click also switches
-Report grouping to Corporate entity so the Demo Corp week is the one
-that opens. Mean θ remains on the period-report panel. Re-seed is
-idempotent on `demo-report-seed-2026-w02`.
+Report grouping to Corporate entity and marks the Demo Corp grouping
+current, using the persisted scope grouping key. Mean θ remains on
+the period-report panel. Re-seed is idempotent on
+`demo-report-seed-2026-w02`.
 
 ## References — APA 7th
 
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 135c251f2..d43b5d75f 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -48,6 +48,12 @@
   font-size: 1rem;
 }
 
+.post-list-item[aria-current="true"],
+.ticket-list-item[aria-current="true"] {
+  border-color: #2563eb;
+  box-shadow: inset 0 0 0 1px #2563eb;
+}
+
 .post-badge {
   font-size: 0.75rem;
   opacity: 0.7;
diff --git a/frontend/src/App.test.tsx b/frontend/src/App.test.tsx
index af84e69fc..55d7b24b6 100644
--- a/frontend/src/App.test.tsx
+++ b/frontend/src/App.test.tsx
@@ -189,6 +189,7 @@ describe("App, authenticated", () => {
             scope_kind_label: "Corporate entity",
             scope_entity_name: "Demo Corp",
             scope_key: "2026-W02",
+            scope_grouping_key: "corp-1",
             status_code: reportSucceeded ? "analysis_status_succeeded" : "analysis_status_failed",
             status_label: reportSucceeded ? "Succeeded" : "Failed",
             knowledge_cutoff: "2026-01-12T12:00:00Z",
@@ -674,6 +675,7 @@ describe("App, authenticated", () => {
                 scope_kind_label: "Corporate entity",
                 scope_entity_name: "Demo Corp",
                 scope_key: "2026-W02",
+                scope_grouping_key: "corp-1",
                 status_code: options?.failedReportRun
                   ? ("analysis_status_failed" as const)
                   : ("analysis_status_succeeded" as const),
@@ -743,7 +745,7 @@ describe("App, authenticated", () => {
               {
                 grouping_kind: "corporate_entity",
                 grouping_key: "corp-1",
-                grouping_label: "Test Corp",
+                grouping_label: "Demo Corp",
                 mean_theta: 0.01,
                 post_count: 8,
                 link_method: "fipc",
@@ -793,6 +795,59 @@ describe("App, authenticated", () => {
           }),
         );
       }
+      if (url.includes("/api/reports/corporate_entity/") && method === "GET") {
+        return Promise.resolve(
+          jsonResponse({
+            grouping_kind: "corporate_entity",
+            period_code: url.includes("2026-W03") ? "2026-W03" : "2026-W02",
+            reports: [
+              {
+                grouping_key: "corp-other",
+                grouping_label: "Other Corp",
+                selected_model: "grm",
+                mean_theta: -0.2,
+                mean_theta_sd: 0.1,
+                post_count: 2,
+                item_count: 3,
+                fit_converged: true,
+                link_method: "fipc",
+                anchor_period_code: "2026-W02",
+                delta_mean_theta: null,
+                selected_items: [],
+                members: [],
+              },
+              {
+                grouping_key: "corp-1",
+                grouping_label: "Demo Corp",
+                selected_model: "grm",
+                mean_theta: 0.42,
+                mean_theta_sd: 0.1,
+                post_count: 8,
+                item_count: 3,
+                fit_converged: true,
+                link_method: "fipc",
+                anchor_period_code: "2026-W02",
+                delta_mean_theta: null,
+                selected_items: [
+                  { item_code: "sales_lead_specificity", rank: 1, information: 0.7 },
+                ],
+                members: [
+                  {
+                    post_id: "post-1",
+                    post_title: "Public post",
+                    theta_eap: 0.91,
+                    theta_sd: 0.2,
+                    ticket_due_date: "2026-01-12",
+                    ticket_title: "Send Northridge Grid the revised quote",
+                    ticket_status_code: "open",
+                    ticket_status_label: "Open",
+                  },
+                ],
+              },
+            ],
+          }),
+        );
+      }
       if (url.includes("/api/reports/") && method === "GET") {
         return Promise.resolve(
           jsonResponse({
@@ -2125,6 +2180,14 @@ describe("App, authenticated", () => {
     expect(periodInput).toHaveValue("2026-W02");
     expect(groupingSelect).toHaveValue("corporate_entity");
     expect(periodInput).toHaveFocus();
+    expect(
+      screen.getByRole("button", { name: "Compare corporate_entity: Demo Corp" }),
+    ).toHaveAttribute("aria-current", "true");
+    expect(
+      screen.getByRole("button", { name: "Compare process_unit: Demo Report High" }),
+    ).not.toHaveAttribute("aria-current");
+    expect(await screen.findByText(/Demo Corp: mean θ 0\.42/)).toBeInTheDocument();
+    expect(screen.queryByText(/corp-1: mean θ/)).not.toBeInTheDocument();
   });
 
   it("does not tell a failed period report to connect the measurement service", async () => {
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 391cc6954..570355774 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1707,6 +1707,10 @@ function analysisRunReportGrouping(run: AnalysisRun): string | null {
   }
 }
 
+function analysisRunReportGroupingKey(run: AnalysisRun): string | undefined {
+  return run.scope_grouping_key || undefined;
+}
+
 function analysisRunReportPeriod(run: AnalysisRun): string | null {
   if (run.run_kind_code !== "analysis_run_report") {
     return null;
@@ -1743,7 +1747,12 @@ function AnalysisRunsPanel({
 }: {
   accessToken: string;
   onSelectPost: (postId: string, options?: SelectPostOptions) => void;
-  onSelectReportPeriod?: (periodCode: string, groupingKind?: string) => void;
+  onSelectReportPeriod?: (
+    periodCode: string,
+    groupingKind?: string,
+    groupingKey?: string,
+    groupingLabel?: string,
+  ) => void;
 }) {
   const [runs, setRuns] = useState<AnalysisRun[] | null>(null);
   const [selected, setSelected] = useState<AnalysisRun | null>(null);
@@ -1921,7 +1930,12 @@ function AnalysisRunsPanel({
               onClick={() => {
                 const periodCode = analysisRunReportPeriod(selected);
                 if (periodCode) {
-                  onSelectReportPeriod(periodCode, analysisRunReportGrouping(selected) ?? undefined);
+                  onSelectReportPeriod(
+                    periodCode,
+                    analysisRunReportGrouping(selected) ?? undefined,
+                    analysisRunReportGroupingKey(selected),
+                    selected.scope_entity_name,
+                  );
                   document.getElementById("report-period")?.focus();
                 }
               }}
@@ -2081,6 +2095,9 @@ function ReportsPanel({
   onSelectPeriod,
   grouping,
   onSelectGrouping,
+  openedGroupingKey,
+  openedGroupingLabel,
+  onOpenGrouping,
 }: {
   accessToken: string;
   canRebuild: boolean;
@@ -2089,6 +2106,9 @@ function ReportsPanel({
   onSelectPeriod: (periodCode: string) => void;
   grouping: string;
   onSelectGrouping: (groupingKind: string) => void;
+  openedGroupingKey?: string | null;
+  openedGroupingLabel?: string | null;
+  onOpenGrouping?: (groupingKey: string, groupingLabel: string) => void;
 }) {
   const [payload, setPayload] = useState<PeriodReports | null>(null);
   const [index, setIndex] = useState<PeriodReportIndex | null>(null);
@@ -2102,6 +2122,16 @@ function ReportsPanel({
     thread_group: "Thread group",
   };
 
+  function groupingIsOpened(groupingKind: string, groupingKey: string, groupingLabel?: string) {
+    if (groupingKind !== grouping) {
+      return false;
+    }
+    if (openedGroupingKey && groupingKey === openedGroupingKey) {
+      return true;
+    }
+    return Boolean(openedGroupingLabel && groupingLabel && groupingLabel === openedGroupingLabel);
+  }
+
   useEffect(() => {
     setError(null);
     Promise.all([
@@ -2173,7 +2203,15 @@ function ReportsPanel({
               <button
                 className="post-list-item"
                 aria-label={`Compare ${row.grouping_kind}: ${row.grouping_label}`}
-                onClick={() => onSelectGrouping(row.grouping_kind)}
+                aria-current={
+                  groupingIsOpened(row.grouping_kind, row.grouping_key, row.grouping_label)
+                    ? "true"
+                    : undefined
+                }
+                onClick={() => {
+                  onSelectGrouping(row.grouping_kind);
+                  onOpenGrouping?.(row.grouping_key, row.grouping_label);
+                }}
               >
                 <span className="ticket-title">
                   {groupingLabels[row.grouping_kind] ?? row.grouping_kind}: {row.grouping_label}
@@ -2225,9 +2263,17 @@ function ReportsPanel({
       {payload && payload.reports.length > 0 && (
         <ul className="ticket-list">
           {payload.reports.map((report) => (
-            <li key={report.grouping_key} className="ticket-list-item">
+            <li
+              key={report.grouping_key}
+              className="ticket-list-item"
+              aria-current={
+                groupingIsOpened(grouping, report.grouping_key, report.grouping_label)
+                  ? "true"
+                  : undefined
+              }
+            >
               <span className="ticket-title">
-                {report.grouping_key}: mean θ {report.mean_theta.toFixed(2)} ({report.selected_model}
+                {report.grouping_label ?? report.grouping_key}: mean θ {report.mean_theta.toFixed(2)} ({report.selected_model}
                 {report.fit_converged ? ", converged" : ", not converged"})
               </span>
               <span className="post-badge">{report.post_count} posts</span>
@@ -2293,12 +2339,32 @@ function PostList({ accessToken }: { accessToken: string }) {
   const [rebuildError, setRebuildError] = useState<string | null>(null);
   const [reportPeriod, setReportPeriod] = useState("2026-W02");
   const [reportGrouping, setReportGrouping] = useState("process_unit");
-
-  function openReportFromAnalysisRun(periodCode: string, groupingKind?: string) {
+  const [openedGroupingKey, setOpenedGroupingKey] = useState<string | null>(null);
+  const [openedGroupingLabel, setOpenedGroupingLabel] = useState<string | null>(null);
+
+  function openReportFromAnalysisRun(
+    periodCode: string,
+    groupingKind?: string,
+    groupingKey?: string,
+    groupingLabel?: string,
+  ) {
     setReportPeriod(periodCode);
     if (groupingKind) {
       setReportGrouping(groupingKind);
     }
+    setOpenedGroupingKey(groupingKey ?? null);
+    setOpenedGroupingLabel(groupingLabel ?? null);
+  }
+
+  function selectReportGrouping(groupingKind: string) {
+    setReportGrouping(groupingKind);
+    setOpenedGroupingKey(null);
+    setOpenedGroupingLabel(null);
+  }
+
+  function openComparedGrouping(groupingKey: string, groupingLabel: string) {
+    setOpenedGroupingKey(groupingKey);
+    setOpenedGroupingLabel(groupingLabel);
   }
 
   function selectPost(postId: string, options?: SelectPostOptions) {
@@ -2353,7 +2419,10 @@ function PostList({ accessToken }: { accessToken: string }) {
         period={reportPeriod}
         onSelectPeriod={setReportPeriod}
         grouping={reportGrouping}
-        onSelectGrouping={setReportGrouping}
+        onSelectGrouping={selectReportGrouping}
+        openedGroupingKey={openedGroupingKey}
+        openedGroupingLabel={openedGroupingLabel}
+        onOpenGrouping={openComparedGrouping}
       />
       <section className="popup-section lineage-home">
         <div className="lineage-home-header">
diff --git a/frontend/src/api.ts b/frontend/src/api.ts
index 2a9f2cb46..576cf1eb1 100644
--- a/frontend/src/api.ts
+++ b/frontend/src/api.ts
@@ -359,6 +359,7 @@ export interface SelectedReportItem {
 
 export interface PeriodGroupReport {
   grouping_key: string;
+  grouping_label?: string;
   selected_model: string;
   mean_theta: number;
   mean_theta_sd: number;
@@ -566,6 +567,7 @@ export interface AnalysisRun {
   scope_kind_label: string;
   scope_entity_name?: string;
   scope_key?: string;
+  scope_grouping_key?: string;
   status_code: AnalysisRunStatusCode | null;
   status_label: string | null;
   failure_code?: string;
diff --git a/tests/test_analysis_run_scope_grouping_key.py b/tests/test_analysis_run_scope_grouping_key.py
new file mode 100644
index 000000000..fb8414ef0
--- /dev/null
+++ b/tests/test_analysis_run_scope_grouping_key.py
@@ -0,0 +1,56 @@
+"""Report-open grouping keys stay on the authorized scope, never a week or theta."""
+
+from backend.app.analysis_run_ingestion import scope_grouping_key
+
+
+def test_corporate_scope_persists_entity_id_not_the_week_key() -> None:
+    assert (
+        scope_grouping_key(
+            {
+                "scope_kind_code": "analysis_scope_corporate_entity",
+                "corporate_entity_id": "corp-1",
+                "process_unit_id": None,
+                "scope_key": "2026-W02",
+            }
+        )
+        == "corp-1"
+    )
+
+
+def test_process_unit_and_thread_scopes_keep_their_grouping_keys() -> None:
+    assert (
+        scope_grouping_key(
+            {
+                "scope_kind_code": "analysis_scope_process_unit",
+                "corporate_entity_id": "corp-1",
+                "process_unit_id": "pu-high",
+                "scope_key": None,
+            }
+        )
+        == "pu-high"
+    )
+    assert (
+        scope_grouping_key(
+            {
+                "scope_kind_code": "analysis_scope_thread_group",
+                "corporate_entity_id": None,
+                "process_unit_id": None,
+                "scope_key": "A-100",
+            }
+        )
+        == "A-100"
+    )
+
+
+def test_scope_grouping_key_is_never_a_theta() -> None:
+    key = scope_grouping_key(
+        {
+            "scope_kind_code": "analysis_scope_corporate_entity",
+            "corporate_entity_id": "corp-1",
+            "process_unit_id": None,
+            "scope_key": "2026-W02",
+        }
+    )
+    assert key is not None
+    assert "theta" not in key.lower()
+    assert "θ" not in key