Merge branch 'main' into update-todo-md

TODO.md

@@ -54,7 +54,7 @@
 - [x] View deployment history per app
 - [x] Container logs viewing
 - [ ] Deployment rollback to previous image
-- [ ] Deployment cancellation
+- [x] Deployment cancellation
 
 ### Manual Container Controls
 - [x] Restart container
@@ -116,7 +116,7 @@
 - [x] Deployment history page
 - [x] Login page
 - [x] Setup page
-- [x] Container logs page
+- [ ] Container logs page
 - [ ] Webhook event history page
 - [ ] Settings page (webhook secret, SSH public key)
 - [ ] Real-time deployment log streaming (WebSocket/SSE)
@@ -211,7 +211,7 @@ Protected Routes (require auth):
 
 ### 3.3 Deployment Cancellation
 - [x] Add cancellation context to deploy service
-- [ ] Add `POST /apps/:id/deployments/:id/cancel` endpoint
+- [x] Add `POST /apps/:id/deployments/:id/cancel` endpoint
 - [x] Handle cleanup of partial builds/containers
 
 ## Phase 4: Lower Priority (Nice to Have)