Merge origin/leader with conflicts

Author: arii

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +1,18 @@
 ## Description
 
-Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+Please include a summary of the change and which issue is fixed.
 
 Fixes # (issue)
 
-## Change Type (select one)
+## Change Type
 
-- [ ] 🐛 Bug fix (non-breaking change fixing an issue)
-- [ ] ✨ New feature (non-breaking change adding functionality)
-- [ ] 💥 Breaking change (fix/feature causing existing functionality to break)
-- [ ] 🏗️ Refactoring (code change that neither fixes bug nor adds feature)
-- [ ] 📚 Documentation (changes only affecting documentation)
-- [ ] 🎨 Styling (changes that do not affect functionality)
+- 🐛 Bug fix (non-breaking change fixing an issue)
+- ✨ New feature (non-breaking change adding functionality)
+- 💥 Breaking change (fix/feature causing existing functionality to break)
+- 🏗️ Refactoring (code change that neither fixes bug nor adds feature)
+- 📚 Documentation (changes only affecting documentation)
+- 🎨 Styling (changes that do not affect functionality)
 
-## PR Scope Checklist
+## Related Issues
 
-_This checklist is mandatory for all PRs._
-
-- [ ] **PR has a clear, single purpose:** The title and description of the PR clearly state the purpose of the change.
-- [ ] **All changes relate to the stated objective:** The code changes should be directly related to the purpose of the PR.
-- [ ] **No unrelated cleanup or refactoring:** The PR should not contain any changes that are not directly related to the stated objective.
-- [ ] **Title and description match the actual changes:** The title and description should accurately reflect the changes in the PR.
-- [ ] **Tests cover the specific change scope:** The tests should be focused on the changes in the PR and should not include unrelated tests.
-
-## Impact Assessment
-
-- [ ] Changes are **backward compatible** (or breaking changes are documented)
-- [ ] **Tests** are added/updated for new functionality
-- [ ] **Documentation** is updated if needed
-- [ ] **ADR** is created/updated for significant architectural changes
+Closes #(issue_number)

.github/actions/setup-env/action.yml

@@ -53,6 +53,11 @@ runs:
     - name: Install GitHub CLI
       shell: bash
       run: |
+        if command -v gh &> /dev/null; then
+          echo "GitHub CLI already installed: $(gh --version)"
+          exit 0
+        fi
+
         mkdir -p $HOME/.local/bin
         # Detect OS and Architecture
         OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
@@ -67,7 +72,7 @@ runs:
         URL="https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_${OS}_${ARCH}.tar.gz"
 
         echo "Downloading GitHub CLI from $URL"
-        curl -L "$URL" -o gh.tar.gz
+        curl -f -L --retry 3 --retry-delay 5 "$URL" -o gh.tar.gz
         tar xvf gh.tar.gz
 
         # Move binary to local bin

.github/automated-labels.json

@@ -1,10 +1,5 @@
 {
-  "review": [
-    "approved",
-    "changes-requested",
-    "ai-reviewed",
-    "ci-failure"
-  ],
+  "review": ["approved", "changes-requested", "ai-reviewed", "ci-failure"],
   "scope_prefix": "scope:",
   "obsolete": [
     "ready-for-approval",

.github/pull_request_template.md

@@ -232,6 +232,12 @@ jobs:
           - **Correct format:** \`## Change Type: 🐛 Bug fix (non-breaking change fixing an issue)\`
           - **Incorrect format:** Do NOT include the list of other options or checkboxes (\`- [ ] ...\`).
 
+          **No Checkboxes:**
+          Do NOT include any checkbox formatting (e.g., \`- [ ]\`) in any part of the generated description.
+
+          **Section Relevance:**
+          Only include the "Changes Made" and "Testing" sections if there is specific, relevant information to provide based on the PR data. If a section has no relevant content, omit it entirely to reduce "template slop".
+
           ### Output Format
           You MUST return a valid JSON object. Do not include markdown formatting like \`\`\`json.
           {

.github/workflows/pr-enrichment.yml

@@ -1,4 +1,3 @@
-// app/api/workout/route.ts
 import { NextResponse } from 'next/server'
 import { parseGoogleDocTable } from '@/services/googleDocParser'
 import logger from '@/utils/logger'
@@ -15,12 +14,11 @@ export async function GET(request: Request) {
   }
 
   try {
-    // We use the export endpoint to get raw HTML.
     // NOTE: The Google Doc must be shared as "Anyone with the link can view"
     const exportUrl = `https://docs.google.com/document/d/${docId}/export?format=html`
 
     const response = await fetch(exportUrl, {
-      next: { revalidate: 60 }, // Cache for 60 seconds to avoid hitting Google limits
+      next: { revalidate: 60 },
     })
 
     if (!response.ok) {

app/api/workout/route.ts

@@ -16,6 +16,7 @@ import WorkoutSummary from './WorkoutSummary'
 import UserSettings from './UserSettings'
 import { SignalQualityIndicator } from './SignalQualityIndicator'
 import WorkoutControls from './WorkoutControls'
+import ResetSection from './components/ResetSection'
 import { useState, useEffect } from 'react'
 import logger from '@/utils/logger'
 import { MeasurementSystem, Gender } from '../../../types/core'
@@ -76,38 +77,6 @@ interface ConnectViewProps {
   onEndWorkout: () => void
 }
 
-interface ResetSectionProps {
-  onReset: () => void
-  isResetting: boolean
-}
-
-const ResetSection = ({ onReset, isResetting }: ResetSectionProps) => (
-  <Box
-    sx={{
-      textAlign: 'center',
-      mt: 4,
-      pt: 4,
-      borderTop: '1px solid #eee',
-    }}
-  >
-    <Button
-      variant="contained"
-      color="error"
-      onClick={onReset}
-      disabled={isResetting}
-    >
-      {isResetting ? 'Resetting...' : 'Reset System & Device'}
-    </Button>
-    <Typography
-      variant="caption"
-      display="block"
-      sx={{ mt: 1, color: 'text.secondary' }}
-    >
-      Resets server state AND forgets Bluetooth device connection.
-    </Typography>
-  </Box>
-)
-
 export default function ConnectView({
   duration,
   caloriesBurned,

app/client/connect/ConnectView.tsx

@@ -0,0 +1,39 @@
+import Box from '@mui/material/Box'
+import Button from '@mui/material/Button'
+import Typography from '@mui/material/Typography'
+
+export interface ResetSectionProps {
+  onReset: () => void
+  isResetting: boolean
+}
+
+const ResetSection = ({ onReset, isResetting }: ResetSectionProps) => (
+  <Box
+    sx={{
+      textAlign: 'center',
+      mt: 4,
+      pt: 4,
+      borderTop: 1,
+      borderColor: 'divider',
+    }}
+  >
+    <Button
+      variant="contained"
+      color="error"
+      onClick={onReset}
+      disabled={isResetting}
+    >
+      {isResetting ? 'Resetting...' : 'Reset Permissions & Settings'}
+    </Button>
+    <Typography
+      variant="caption"
+      display="block"
+      sx={{ mt: 1, color: 'text.secondary' }}
+    >
+      Resets stored permissions and device settings, including Bluetooth
+      connection.
+    </Typography>
+  </Box>
+)
+
+export default ResetSection

app/client/connect/components/ResetSection.tsx

@@ -1,7 +1,7 @@
 // app/client/experimental/components/ExperimentalAnalyticsPage.tsx
 'use client'
 import { useState, useEffect, useMemo, useRef, useCallback } from 'react'
-import { Container, Box, Button } from '@mui/material'
+import { Container, Box, Button, Skeleton } from '@mui/material'
 import dynamic from 'next/dynamic'
 import { useWebSocket } from '@/context/WebSocketContext'
 import { useWorkoutSessionManager } from '@/hooks/useWorkoutSessionManager'
@@ -21,6 +21,11 @@ import CalorieTracker from './CalorieTracker'
 import SessionList from './SessionList'
 import SessionDetail from './SessionDetail'
 
+const HeartRateTimeSeries = dynamic(() => import('./HeartRateTimeSeries'), {
+  ssr: false,
+  loading: () => <Skeleton variant="rectangular" height={300} />,
+})
+
 const defaultTimeInZones: Record<HeartRateZone, number> = {
   ZONE_0: 0,
   ZONE_1: 0,
@@ -31,10 +36,6 @@ const defaultTimeInZones: Record<HeartRateZone, number> = {
   ZONE_6: 0,
 }
 
-const HeartRateTimeSeries = dynamic(() => import('./HeartRateTimeSeries'), {
-  ssr: false,
-})
-
 type View = 'active' | 'list' | 'detail'
 
 const ExperimentalAnalyticsPage = () => {

app/client/experimental/components/ExperimentalAnalyticsPage.tsx

@@ -1,6 +1,7 @@
 // app/client/experimental/components/HeartRateTimeSeries.tsx
 'use client'
-import { Card, CardContent, Typography, Box } from '@mui/material'
+import { useMemo } from 'react'
+import { Card, CardContent, Typography, Box, useTheme } from '@mui/material'
 import { HrDataPoint } from '@/lib/workout-session-storage'
 import {
   LineChart,
@@ -18,28 +19,44 @@ interface HeartRateTimeSeriesProps {
 }
 
 const HeartRateTimeSeries = ({ hrHistory }: HeartRateTimeSeriesProps) => {
+  const theme = useTheme()
+
+  const formatTime = useMemo(() => {
+    const formatter = new Intl.DateTimeFormat(undefined, {
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+    })
+    return (time: number) => formatter.format(new Date(time))
+  }, [])
+
   return (
     <Card>
       <CardContent>
         <Typography variant="h5" gutterBottom>
           Heart Rate Over Time
         </Typography>
-        <Box sx={{ height: 300 }} data-testid="hr-time-series-chart">
+        <Box
+          sx={{ height: 300, minHeight: 300 }}
+          data-testid="hr-time-series-chart"
+        >
           <ResponsiveContainer width="100%" height="100%">
             <LineChart data={hrHistory} syncId="anyId">
-              <CartesianGrid strokeDasharray="3 3" />
-              <XAxis
-                dataKey="time"
-                tickFormatter={(time) => new Date(time).toLocaleTimeString()}
+              <CartesianGrid
+                strokeDasharray="3 3"
+                stroke={theme.palette.divider}
               />
+              <XAxis dataKey="time" tickFormatter={formatTime} />
               <YAxis domain={['auto', 'auto']} />
               <Tooltip />
               <Legend />
               <Line
                 type="monotone"
                 dataKey="hr"
-                stroke="#8884d8"
-                activeDot={{ r: 8 }}
+                stroke={theme.palette.primary.main}
+                strokeWidth={2}
+                dot={false}
+                activeDot={{ r: 6 }}
               />
             </LineChart>
           </ResponsiveContainer>