fix: address Copilot review comments

Fix JIRA_LINK placeholder collision in feature-freeze-update template
(team lines were getting release-notes URL instead of feature-freeze
URL). Remove stale references to deleted fetch_team_mapping.py and
cross-skill fetch_schedule.py — replace with gog CLI fallbacks. Fix
contradictory team_id gotchas and stale test docstring.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: durandom

skills/rhdh-release/references/slack-templates.md

@@ -26,7 +26,7 @@ Here's what's outstanding for Feature Freeze. Please review and share if there a
 • *{{TEAM_NAME}}* - [{{ISSUE_COUNT}}]({{JIRA_LINK}}) @{{LEAD_SLACK}}
 (repeat for each active engineering team)
 
-There are [{{OUTSTANDING_RELEASE_NOTES_ISSUE_COUNT}}]({{JIRA_LINK}}) outstanding Release Notes. Please review and update Features and bugs.
+There are [{{OUTSTANDING_RELEASE_NOTES_ISSUE_COUNT}}]({{RELEASE_NOTES_JIRA_LINK}}) outstanding Release Notes. Please review and update Features and bugs.
 
 cc @rhdh-release
 ```

skills/rhdh-release/scripts/release.py

@@ -825,7 +825,7 @@ def cmd_slack_feature_freeze_update(args: argparse.Namespace, fmt: OutputFormatt
             "RELEASE_VERSION": version,
             "FEATURE_FREEZE_DATE": ff_date,
             "OUTSTANDING_RELEASE_NOTES_ISSUE_COUNT": str(rn_count),
-            "JIRA_LINK": rn_url,
+            "RELEASE_NOTES_JIRA_LINK": rn_url,
         },
     )
     message = slack_mod.expand_team_lines(template, team_lines)

skills/rhdh-release/workflows/announce-code-freeze-update.md

@@ -40,9 +40,11 @@ Extract the Code Freeze date from the description.
 ## Step 3 (fallback): Get active engineering teams
 
 ```bash
-python scripts/fetch_team_mapping.py --category Engineering --json
+gog sheets get 1vQXfvID72qwqvLb17eyGOvnZXrZG7NBzTGv6RP9wvyM Team --json --results-only
 ```
 
+Filter to category "Engineering" and status "Active".
+
 ## Step 4 (fallback): Get outstanding release notes count
 
 ```bash

skills/rhdh-release/workflows/announce-feature-freeze-update.md

@@ -40,9 +40,11 @@ Extract the Feature Freeze date from the description.
 ## Step 3 (fallback): Get active engineering teams
 
 ```bash
-python scripts/fetch_team_mapping.py --category Engineering --json
+gog sheets get 1vQXfvID72qwqvLb17eyGOvnZXrZG7NBzTGv6RP9wvyM Team --json --results-only
 ```
 
+Filter to category "Engineering" and status "Active".
+
 ## Step 4 (fallback): Get outstanding release notes count
 
 Use the `release_notes` JQL:

skills/rhdh-release/workflows/future-release-dates.md

@@ -22,26 +22,24 @@ python scripts/release.py --json future-dates {{RELEASE_VERSION}}
 
 If the CLI succeeds, use its output directly. If it fails, follow the manual steps below.
 
-## Step 2 (fallback): Fetch schedule from Google Sheets
+## Step 2 (fallback): Fetch schedule from Google Sheets via gog
 
-Use the existing `fetch_schedule.py` from `rhdh-test-plan-review`:
+First, find the schedule tab:
 
 ```bash
-python ../../rhdh-test-plan-review/scripts/fetch_schedule.py --version "{{RELEASE_VERSION}}" --sheet-id "1knVzlMW0l0X4c7gkoiuaGql1zuFgEGwHHBsj-ygUTnc"
+gog sheets metadata 1knVzlMW0l0X4c7gkoiuaGql1zuFgEGwHHBsj-ygUTnc --json
 ```
 
-This returns:
+Look for a tab containing the current year and "schedule" in the name.
 
-```json
-{
-  "version": "1.10",
-  "feature_freeze": "2025-09-15",
-  "code_freeze": "2025-10-01",
-  "ga_date": "2025-10-15",
-  "tab": "2025 Schedule"
-}
+Then fetch the tab contents:
+
+```bash
+gog sheets get 1knVzlMW0l0X4c7gkoiuaGql1zuFgEGwHHBsj-ygUTnc "{{TAB_NAME}}" --json --results-only
 ```
 
+Search the rows for the target version's GA row, then walk backward to find Feature Freeze and Code Freeze dates.
+
 If a specific version is not given, ask the user which version they want, or fetch for each known active release (from the `release-dates` workflow).
 
 ## Step 3 (fallback): Format output

skills/rhdh-release/workflows/issues-by-team.md

@@ -24,10 +24,10 @@ If the CLI succeeds, use its output directly. If it fails, follow the manual ste
 ## Step 2 (fallback): Get active engineering teams
 
 ```bash
-python scripts/fetch_team_mapping.py --category Engineering --json
+gog sheets get 1vQXfvID72qwqvLb17eyGOvnZXrZG7NBzTGv6RP9wvyM Team --json --results-only
 ```
 
-This returns a list of active engineering teams with their `team_id` values.
+Filter to category "Engineering" and status "Active". This gives team names and `team_id` values.
 
 ## Step 3 (fallback): Query issues and filter by team
 

skills/rhdh-release/workflows/teams-and-leads.md

@@ -28,23 +28,13 @@ python scripts/release.py --json teams --category Engineering
 
 If the CLI succeeds, use its output directly. If it fails, follow the manual steps below.
 
-## Step 2 (fallback): Fetch team data
+## Step 2 (fallback): Fetch team data via gog
 
 ```bash
-python scripts/fetch_team_mapping.py --json
+gog sheets get 1vQXfvID72qwqvLb17eyGOvnZXrZG7NBzTGv6RP9wvyM Team --json --results-only
 ```
 
-To filter by category (e.g., Engineering only):
-
-```bash
-python scripts/fetch_team_mapping.py --category Engineering --json
-```
-
-To include deprecated teams:
-
-```bash
-python scripts/fetch_team_mapping.py --all --json
-```
+Filter the JSON output to active teams only (status column = "Active"). To filter by category, match the category column.
 
 ## Step 3 (fallback): Format output
 
@@ -60,15 +50,14 @@ Include link to source: [RHDH Team Mapping](https://docs.google.com/spreadsheets
 
 <gotchas>
 
-- By default only Active teams are returned. Use `--all` flag for deprecated teams.
-- The `team_id` is the numeric ID used for JQL filtering with `"Team[Team]" = {{TEAM_ID}}` syntax.
-- Team ID is used by `parse_issues.py --enrich` for team-based filtering — not direct JQL (the Team custom field cannot be queried via JQL).
+- By default only active teams are returned. The CLI filters by `status = Active` in the Google Sheet.
+- The `team_id` is the numeric ID used by `parse_issues.py --enrich` for team-based filtering — the Team custom field cannot be queried via JQL directly.
 
 </gotchas>
 
 <success_criteria>
 
 - [ ] Table with team name, lead, category, and team ID
-- [ ] Only active teams shown (unless `--all` requested)
+- [ ] Only active teams shown by default
 
 </success_criteria>

tests/unit/test_release_cli.py

@@ -1,4 +1,4 @@
-"""Unit tests for skills/rhdh-release/scripts/ — jql.py, slack_templates.py, release.py, schedule.py."""
+"""Unit tests for skills/rhdh-release/scripts/ — jql.py, slack_templates.py, release.py."""
 
 import sys
 from pathlib import Path