fix: renumber sets after delete and use last-logged values for prefill

Two bugs fixed:
- Deleting a set left gaps in set numbering (1, 3, 3). Now renumbers
  remaining sets sequentially after deletion.
- Logging set 1 caused the prefill to recalculate via the progression
  engine, shifting suggested reps mid-session. Now prefills from the
  last logged set's actual values; progression suggestion is only used
  for the first set of a session.

.dockerignore

@@ -13,3 +13,4 @@ alembic/
 __pycache__
 *.pyc
 docker-compose.yaml
+docker-compose.dev.yaml

.env.production

@@ -0,0 +1,12 @@
+# SneakySwole Production Environment
+# Copy to .env on your production server and fill in real values.
+
+ADMIN_USERNAME=admin
+ADMIN_PASSWORD=
+
+APP_ENV=production
+APP_HOST=0.0.0.0
+APP_PORT=8000
+APP_LOG_LEVEL=warning
+
+DATABASE_URL=sqlite:///data/sneakyswole.db

.gitea/workflows/build-package.yaml

@@ -9,13 +9,10 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    container: docker.io/catthehacker/ubuntu:act-latest
     timeout-minutes: 15
 
     steps:
-      - name: Install Node.js (required for actions)
-        run: |
-          apt-get update && apt-get install -y nodejs git
-
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -27,7 +24,7 @@ jobs:
         with:
           registry: git.sneakygeek.net
           username: ${{ gitea.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
 
       - name: Extract metadata (tags, labels)
         id: meta

app/routes/logging.py

@@ -14,6 +14,7 @@ from sqlmodel import Session
 from app.database import get_db_session
 from app.models.user import User
 from app.services.log_service import LogService
+from app.services.progression_service import ProgressionService
 from app.services.workout_session_service import WorkoutSessionService
 from app.utils.auth import get_current_admin_user, get_active_profile_id
 
@@ -22,6 +23,30 @@ logger = structlog.get_logger(__name__)
 router = APIRouter(prefix="/log", tags=["logging"])
 
 
+def _get_prefill_values(
+    logs: list,
+    session: Session,
+    profile_id: int,
+    exercise_id: int,
+) -> tuple:
+    """Get pre-fill values for the next set form.
+
+    If sets have already been logged this session, use the last logged
+    set's values (users typically repeat the same reps/weight across sets).
+    Otherwise, use the progression engine's suggestion.
+
+    Returns:
+        (suggested_reps, suggested_weight) tuple.
+    """
+    if logs:
+        last = logs[-1]
+        return last.reps_completed, last.weight_used
+
+    progression = ProgressionService(session)
+    suggestion = progression.get_suggestion(profile_id, exercise_id)
+    return suggestion.get("suggested_reps"), suggestion.get("suggested_weight")
+
+
 @router.post("", response_class=HTMLResponse)
 async def log_set(
     request: Request,
@@ -79,6 +104,9 @@ async def log_set(
     # Return updated logs for this exercise
     logs = log_service.list_logs_for_exercise(ws.id, exercise_id)
     next_set = len(logs) + 1
+    suggested_reps, suggested_weight = _get_prefill_values(
+        logs, session, active_profile_id, exercise_id,
+    )
 
     templates = request.app.state.templates
     return templates.TemplateResponse("partials/log_entry.html", {
@@ -88,6 +116,8 @@ async def log_set(
         "workout_day_id": workout_day_id,
         "next_set": next_set,
         "session_id": ws.id,
+        "suggested_reps": suggested_reps,
+        "suggested_weight": suggested_weight,
     })
 
 
@@ -124,6 +154,13 @@ async def edit_log(
     logs = log_service.list_logs_for_exercise(log.session_id, log.exercise_id)
     next_set = len(logs) + 1
 
+    active_profile_id = get_active_profile_id(request)
+    suggested_reps, suggested_weight = None, None
+    if active_profile_id:
+        suggested_reps, suggested_weight = _get_prefill_values(
+            logs, session, active_profile_id, log.exercise_id,
+        )
+
     templates = request.app.state.templates
     return templates.TemplateResponse("partials/log_entry.html", {
         "request": request,
@@ -132,6 +169,8 @@ async def edit_log(
         "workout_day_id": 0,
         "next_set": next_set,
         "session_id": log.session_id,
+        "suggested_reps": suggested_reps,
+        "suggested_weight": suggested_weight,
     })
 
 
@@ -164,6 +203,13 @@ async def delete_log(
         logs = log_service.list_logs_for_exercise(session_id, exercise_id)
         next_set = len(logs) + 1
 
+        active_profile_id = get_active_profile_id(request)
+        suggested_reps, suggested_weight = None, None
+        if active_profile_id:
+            suggested_reps, suggested_weight = _get_prefill_values(
+                logs, session, active_profile_id, exercise_id,
+            )
+
         templates = request.app.state.templates
         return templates.TemplateResponse("partials/log_entry.html", {
             "request": request,
@@ -172,6 +218,8 @@ async def delete_log(
             "workout_day_id": 0,
             "next_set": next_set,
             "session_id": session_id,
+            "suggested_reps": suggested_reps,
+            "suggested_weight": suggested_weight,
         })
 
     return HTMLResponse("")

app/services/log_service.py

@@ -149,7 +149,8 @@ class LogService:
     def delete_log(self, log_id: int) -> None:
         """Delete a log entry.
 
-        Removes the log and cleans up the parent session if no logs remain.
+        Removes the log, renumbers remaining sets, and cleans up the
+        parent session if no logs remain.
 
         Args:
             log_id: The log entry ID.
@@ -162,15 +163,32 @@ class LogService:
             raise ValueError(f"WorkoutLog with id {log_id} not found")
 
         session_id = log.session_id
+        exercise_id = log.exercise_id
         self._session.delete(log)
         self._session.commit()
         logger.info("log_deleted", log_id=log_id)
 
-        # Clean up orphaned session if no logs remain
+        # Renumber remaining sets so they stay sequential (1, 2, 3...)
         remaining = self._session.exec(
+            select(WorkoutLog)
+            .where(
+                WorkoutLog.session_id == session_id,
+                WorkoutLog.exercise_id == exercise_id,
+            )
+            .order_by(WorkoutLog.set_number)
+        ).all()
+        for i, remaining_log in enumerate(remaining, start=1):
+            if remaining_log.set_number != i:
+                remaining_log.set_number = i
+                self._session.add(remaining_log)
+        if remaining:
+            self._session.commit()
+
+        # Clean up orphaned session if no logs remain for ANY exercise
+        any_remaining = self._session.exec(
             select(WorkoutLog).where(WorkoutLog.session_id == session_id)
         ).first()
-        if remaining is None:
+        if any_remaining is None:
             ws = self._session.get(WorkoutSession, session_id)
             if ws:
                 self._session.delete(ws)

app/templates/partials/exercise_card.html

@@ -32,6 +32,10 @@
     <!-- Inline logging (Phase 4) -->
     {% if active_profile %}
     <div id="logs-exercise-{{ exercise.id }}">
+        {% if suggestions and suggestions[exercise.id] %}
+            {% set suggested_reps = suggestions[exercise.id].suggested_reps %}
+            {% set suggested_weight = suggestions[exercise.id].suggested_weight %}
+        {% endif %}
         {% if existing_logs and existing_logs[exercise.id] %}
             {% set logs = existing_logs[exercise.id] %}
             {% set exercise_id = exercise.id %}

app/templates/partials/log_form.html

@@ -11,9 +11,11 @@
         <small style="white-space:nowrap; opacity:0.7;">Set {{ next_set|default(1) }}</small>
         <input type="number" name="reps" placeholder="Reps"
                min="0" max="100" required
+               {% if suggested_reps %}value="{{ suggested_reps }}"{% endif %}
                style="width:5rem; margin-bottom:0;">
         <input type="text" name="weight" placeholder="Weight (lbs)"
                required
+               {% if suggested_weight %}value="{{ suggested_weight }}"{% endif %}
                style="width:8rem; margin-bottom:0;">
         <label style="display:flex; align-items:center; gap:0.3rem; margin-bottom:0; white-space:nowrap;">
             <input type="checkbox" name="felt_easy" role="switch" style="margin-bottom:0;">

docker-compose.dev.yaml

@@ -0,0 +1,29 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: sneakyswole-dev
+    ports:
+      - "${APP_PORT:-8000}:8000"
+    volumes:
+      - sneakyswole-data:/app/data
+      - ./app:/app/app
+      - ./config:/app/config
+    env_file:
+      - .env
+    environment:
+      - APP_ENV=development
+      - APP_LOG_LEVEL=debug
+    command: ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/health')"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+
+volumes:
+  sneakyswole-data:
+    driver: local

docker-compose.yaml

@@ -1,11 +1,9 @@
 services:
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: git.sneakygeek.net/sneakygeek/sneakyswole:latest
     container_name: sneakyswole
     ports:
-      - "8000:8000"
+      - "${APP_PORT:-8000}:8000"
     volumes:
       - sneakyswole-data:/app/data
     env_file:

run_dev_docker.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker compose -f docker-compose.dev.yaml up --build "$@"

tests/test_auth_dependency.py

@@ -3,25 +3,27 @@
 from unittest.mock import MagicMock
 
 import pytest
-from fastapi import HTTPException
 
-from app.utils.auth import get_current_admin_user, get_active_profile_id
+from app.utils.auth import (
+    NotAuthenticatedError,
+    get_current_admin_user,
+    get_active_profile_id,
+)
 
 
 class TestAuthDependency:
     """Tests for the require_admin dependency."""
 
     def test_redirects_when_no_session_cookie(self) -> None:
-        """Should redirect to /login (303) when no session cookie is present."""
+        """Should raise NotAuthenticatedError when no session cookie is present."""
         request = MagicMock()
         request.cookies = {}
 
-        with pytest.raises(HTTPException) as exc_info:
+        with pytest.raises(NotAuthenticatedError):
             get_current_admin_user(request=request, session=MagicMock())
-        assert exc_info.value.status_code == 303
 
     def test_redirects_when_invalid_token(self) -> None:
-        """Should redirect to /login (303) when session cookie has invalid token."""
+        """Should raise NotAuthenticatedError when session cookie has invalid token."""
         request = MagicMock()
         request.cookies = {"session": "invalid-token"}
         request.app.state.secret_key = "test-secret"
@@ -29,9 +31,8 @@ class TestAuthDependency:
         mock_session = MagicMock()
         mock_session.get.return_value = None
 
-        with pytest.raises(HTTPException) as exc_info:
+        with pytest.raises(NotAuthenticatedError):
             get_current_admin_user(request=request, session=mock_session)
-        assert exc_info.value.status_code == 303
 
 
 class TestGetActiveProfileId:

tests/test_dashboard_routes.py

@@ -9,7 +9,7 @@ class TestDashboard:
     def test_dashboard_requires_auth(self, client: TestClient) -> None:
         """GET /dashboard should require admin login."""
         response = client.get("/dashboard", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)
 
 
 class TestExerciseProgress:
@@ -18,4 +18,4 @@ class TestExerciseProgress:
     def test_exercise_progress_requires_auth(self, client: TestClient) -> None:
         """GET /dashboard/exercise/1 should require admin login."""
         response = client.get("/dashboard/exercise/1", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)

tests/test_exercise_routes.py

@@ -9,7 +9,7 @@ class TestExerciseBrowser:
     def test_exercise_browser_requires_auth(self, client: TestClient) -> None:
         """GET /exercises should require admin login."""
         response = client.get("/exercises", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)
 
 
 class TestExerciseSearch:
@@ -21,4 +21,4 @@ class TestExerciseSearch:
             "/exercises/search?workout_day=Push",
             follow_redirects=False,
         )
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)

tests/test_history_routes.py

@@ -9,7 +9,7 @@ class TestLogHistory:
     def test_history_requires_auth(self, client: TestClient) -> None:
         """GET /history should require admin login."""
         response = client.get("/history", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)
 
 
 class TestSessionDetail:
@@ -18,4 +18,4 @@ class TestSessionDetail:
     def test_session_detail_requires_auth(self, client: TestClient) -> None:
         """GET /history/1 should require admin login."""
         response = client.get("/history/1", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)

tests/test_logging_routes.py

@@ -19,7 +19,7 @@ class TestLogSet:
             },
             follow_redirects=False,
         )
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)
 
 
 class TestLogEdit:
@@ -32,7 +32,7 @@ class TestLogEdit:
             data={"reps": "10", "weight": "35 lbs"},
             follow_redirects=False,
         )
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)
 
 
 class TestLogDelete:
@@ -41,4 +41,4 @@ class TestLogDelete:
     def test_delete_log_requires_auth(self, client: TestClient) -> None:
         """POST /log/1/delete should require admin login."""
         response = client.post("/log/1/delete", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)

tests/test_profile_routes.py

@@ -14,7 +14,7 @@ class TestProfileSwitcher:
             follow_redirects=False,
         )
         # Should redirect to login or return 401
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)
 
 
 class TestProfileList:
@@ -23,4 +23,4 @@ class TestProfileList:
     def test_profiles_page_requires_auth(self, client: TestClient) -> None:
         """GET /profiles should require admin login."""
         response = client.get("/profiles", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)

tests/test_schedule_routes.py

@@ -9,4 +9,4 @@ class TestSchedule:
     def test_schedule_requires_auth(self, client: TestClient) -> None:
         """GET /schedule should require admin login."""
         response = client.get("/schedule", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)

tests/test_workout_routes.py

@@ -9,9 +9,9 @@ class TestWorkoutDayViewer:
     def test_workout_day_requires_auth(self, client: TestClient) -> None:
         """GET /workouts/push should require admin login."""
         response = client.get("/workouts/push", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)
 
     def test_workout_days_list_requires_auth(self, client: TestClient) -> None:
         """GET /workouts should require admin login."""
         response = client.get("/workouts", follow_redirects=False)
-        assert response.status_code in (401, 303)
+        assert response.status_code in (401, 302, 303)