diff --git a/KANBAN_INTEGRATION.md b/KANBAN_INTEGRATION.md new file mode 100644 index 00000000..19c7c8da --- /dev/null +++ b/KANBAN_INTEGRATION.md @@ -0,0 +1,377 @@ +# Kanban + Tmux Integration + +This document describes the integrated kanban ticket system that links with the launcher's tmux and worktree management. + +## Overview + +The kanban system provides: +- **Ticket Management**: Create, track, and organize development tasks +- **Epic Grouping**: Group related tickets with shared branches and color teams +- **Tmux Integration**: Each ticket automatically gets its own tmux window +- **Context Sharing**: Tickets with matching tags or in the same epic share context +- **Shared Branches**: Multiple tickets can collaborate on a single branch + +## Architecture + +### Backend (Python/FastAPI) + +**Models** (`ushadow/backend/src/models/kanban.py`): +- `Epic`: Groups related tickets with shared branch and color +- `Ticket`: Individual work items with 1:1 tmux window mapping +- `TicketStatus`: Enum for workflow states (backlog, todo, in_progress, in_review, done, archived) +- `TicketPriority`: Enum for urgency levels (low, medium, high, urgent) + +**API Router** (`ushadow/backend/src/routers/kanban.py`): +- `POST /api/kanban/epics` - Create epic +- `GET /api/kanban/epics` - List epics (with optional project filter) +- `GET /api/kanban/epics/{id}` - Get epic details +- `PATCH /api/kanban/epics/{id}` - Update epic +- `DELETE /api/kanban/epics/{id}` - Delete epic (unlinks tickets) +- `POST /api/kanban/tickets` - Create ticket +- `GET /api/kanban/tickets` - List tickets (filters: project, epic, status, tags, assigned_to) +- `GET /api/kanban/tickets/{id}` - Get ticket details +- `PATCH /api/kanban/tickets/{id}` - Update ticket +- `DELETE /api/kanban/tickets/{id}` - Delete ticket +- `GET /api/kanban/tickets/{id}/related` - Find related tickets (epic + tags) +- `GET /api/kanban/stats` - Board statistics + +### Launcher Backend (Rust/Tauri) + +**Tmux Integration** (`ushadow/launcher/src-tauri/src/commands/kanban.rs`): +- `create_ticket_worktree()` - Create worktree and tmux window for ticket +- `attach_ticket_to_worktree()` - Attach ticket to existing worktree (for shared branches) +- `get_tickets_for_tmux_window()` - Query tickets using a tmux window +- `get_ticket_tmux_info()` - Get tmux details for a ticket + +**How It Works**: +1. When creating a ticket with epic → checks if epic has shared branch +2. If shared branch exists → attach to existing worktree +3. If no shared branch → create new worktree with `create_worktree_with_workmux` +4. Tmux window naming: `ushadow-{branch_name}` or `ushadow-ticket-{id}` +5. Session name: `workmux` (default) + +### Frontend (React/TypeScript) + +**Components** (`ushadow/launcher/src/components/`): +- `KanbanBoard.tsx` - Main board with column layout +- `TicketCard.tsx` - Individual ticket card with color team visualization +- `CreateTicketDialog.tsx` - Modal for creating new tickets +- `CreateEpicDialog.tsx` - Modal for creating new epics + +**Navigation**: +- Added "Kanban" tab to launcher navigation (Install | Infra | Environments | **Kanban**) +- Full-screen kanban view when activated +- Automatically uses first running environment's backend URL + +**Color Teams**: +Tickets inherit colors through three-level fallback: +1. Ticket's own color (if set) +2. Epic's color (if ticket belongs to epic) +3. Generated color (hash-based from ticket ID) + +## Workflow Examples + +### Creating an Epic with Shared Branch + +```bash +# 1. Create epic via API or UI +POST /api/kanban/epics +{ + "title": "Authentication Overhaul", + "color": "#8B5CF6", + "base_branch": "main", + "project_id": "/path/to/project" +} + +# Epic gets created with no branch yet (branch_name: null) +# When first ticket is created, shared branch gets created +``` + +### Creating Tickets in an Epic + +```bash +# 2. Create first ticket +POST /api/kanban/tickets +{ + "title": "Add JWT token validation", + "epic_id": "epic-id-here", + "priority": "high" +} + +# Launcher creates worktree for this ticket: +# - Branch: "epic-auth-overhaul" (derived from epic title) +# - Tmux window: "ushadow-epic-auth-overhaul" + +# 3. Create second ticket in same epic +POST /api/kanban/tickets +{ + "title": "Add refresh token rotation", + "epic_id": "epic-id-here", + "priority": "medium" +} + +# Launcher attaches to existing worktree: +# - Same branch: "epic-auth-overhaul" +# - Same tmux window: "ushadow-epic-auth-overhaul" +# Both tickets share context! +``` + +### Tag-Based Context Sharing + +```bash +# Tickets with matching tags can find each other even across epics +POST /api/kanban/tickets +{ + "title": "Update login API", + "tags": ["api", "auth"], + "epic_id": "epic-1" +} + +POST /api/kanban/tickets +{ + "title": "Add API rate limiting", + "tags": ["api", "security"], + "epic_id": "epic-2" # Different epic! +} + +# Find related tickets +GET /api/kanban/tickets/ticket-1-id/related +# Returns both epic tickets AND tickets with shared tags +``` + +## Configuration + +### Backend Setup + +1. **Database**: MongoDB (Beanie ODM) + - Collections: `tickets`, `epics` + - Indexes: status, epic_id, project_id, tags, assigned_to + +2. **Registration**: Already added to `main.py` + ```python + from src.models.kanban import Ticket, Epic + from src.routers import kanban + + await init_beanie(database=db, document_models=[User, Ticket, Epic]) + app.include_router(kanban.router, tags=["kanban"]) + ``` + +### Frontend Setup + +1. **App Store**: Added `'kanban'` to `AppMode` type in `store/appStore.ts` + +2. **Navigation**: Added kanban tab to `App.tsx` + ```tsx + + ``` + +3. **Rendering**: Kanban board renders when `appMode === 'kanban'` + +## Key Design Decisions + +### 1. Simple 1:1 Ticket-Tmux Mapping +Each ticket = exactly one tmux window. This keeps the mental model simple. + +**Alternative considered**: One ticket = multiple windows (frontend, backend, tests) +**Why rejected**: Added complexity without clear benefit for most workflows + +### 2. Epic + Tag Based Context Sharing +Enables both structured (epic) and ad-hoc (tag) relationships. + +**Structured (Epic)**: "All auth tickets share same branch" +**Ad-hoc (Tags)**: "All tickets tagged 'api' can see each other" + +### 3. Shared Branches for Epic Tickets +Tickets in the same epic use one shared branch. + +**Alternative considered**: One branch per ticket with merging +**Why rejected**: Sharing context across tickets is the explicit goal + +### 4. Standalone Kanban (No External Dependency) +Built directly into launcher, no vibe-kanban required. + +**Alternative considered**: Two-way sync with vibe-kanban +**Why rejected**: Simpler architecture, fewer moving parts + +## Color Team System + +Color inheritance creates visual organization: + +``` +Epic: "Authentication" (Purple #8B5CF6) + ├─ Ticket 1: "JWT validation" (inherits purple) + ├─ Ticket 2: "Refresh tokens" (inherits purple) + └─ Ticket 3: "OAuth flow" (overrides with orange) + +Epic: "Database" (Green #10B981) + ├─ Ticket 4: "Add indexes" (inherits green) + └─ Ticket 5: "Migration" (inherits green) +``` + +Visual indicators: +- **Ticket card border**: 4px left border in team color +- **Epic badge**: Badge with epic color at 20% opacity +- **Generated colors**: Hash-based HSL when no color set + +## Next Steps / TODOs + +### Immediate +- [ ] Add "Create Ticket from Environment" button to EnvironmentsPanel + - **Decision needed**: Where to place button? (card action, context menu, or details panel) + - See `KANBAN_INTEGRATION.md` for options + +### Enhancements +- [ ] Drag-and-drop to change ticket status +- [ ] Ticket detail modal with full description + comments +- [ ] Assign tickets to users (already has `assigned_to` field) +- [ ] Epic progress visualization (% tickets complete) +- [ ] Timeline view (Gantt chart style) +- [ ] Sprint planning mode +- [ ] Ticket time tracking integration with tmux activity + +### Integration Opportunities +- [ ] Auto-create ticket when running `/commit` in tmux +- [ ] Show active ticket in launcher status bar +- [ ] Link tickets to PRs via GitHub integration +- [ ] Chronicle integration (link tickets to memories) +- [ ] Notification when ticket's tmux window becomes inactive + +## Testing + +### Backend API Testing +```bash +# Start backend +cd ushadow/backend +uv run main.py + +# Create epic +curl -X POST http://localhost:8000/api/kanban/epics \ + -H "Content-Type: application/json" \ + -d '{"title": "Test Epic", "color": "#3B82F6", "base_branch": "main"}' + +# Create ticket +curl -X POST http://localhost:8000/api/kanban/tickets \ + -H "Content-Type: application/json" \ + -d '{"title": "Test Ticket", "priority": "medium", "tags": ["test"]}' + +# List tickets +curl http://localhost:8000/api/kanban/tickets +``` + +### Frontend Testing +```bash +# Start launcher +cd ushadow/launcher +npm run dev + +# Navigate to Kanban tab +# Should see empty kanban board +# Click "New Epic" or "New Ticket" to create items +``` + +### Tmux Integration Testing +```bash +# From launcher, create ticket via UI +# Check tmux window created +tmux list-windows -t workmux + +# Should see: ushadow-{branch-name} +``` + +## Architecture Diagram + +``` +┌─────────────────────────────────────────────────────────┐ +│ Vibe Launcher (Tauri) │ +├─────────────────────────────────────────────────────────┤ +│ Navigation: [Install] [Infra] [Environments] [Kanban] │ +├─────────────────────────────────────────────────────────┤ +│ │ +│ ┌────────────────────────────────────────────────┐ │ +│ │ KanbanBoard Component │ │ +│ │ ┌──────┬──────┬──────┬──────┬──────┐ │ │ +│ │ │Back- │ To │ In │ In │ Done │ │ │ +│ │ │log │ Do │Prog │Review│ │ │ │ +│ │ ├──────┼──────┼──────┼──────┼──────┤ │ │ +│ │ │[Card]│[Card]│[Card]│[Card]│[Card]│ │ │ +│ │ │[Card]│[Card]│ │ │[Card]│ │ │ +│ │ │ │[Card]│ │ │ │ │ │ +│ │ └──────┴──────┴──────┴──────┴──────┘ │ │ +│ │ │ │ +│ │ Epic Filter: [All Tickets ▼] │ │ +│ │ Actions: [New Epic] [New Ticket] │ │ +│ └────────────────────────────────────────────────┘ │ +│ │ │ +│ │ API Calls │ +│ ▼ │ +└─────────────────────────┬───────────────────────────────┘ + │ + │ +┌─────────────────────────▼───────────────────────────────┐ +│ Backend (FastAPI + MongoDB) │ +├─────────────────────────────────────────────────────────┤ +│ Routers: │ +│ /api/kanban/tickets │ +│ /api/kanban/epics │ +│ /api/kanban/stats │ +│ │ +│ Models: │ +│ ┌──────────┐ ┌──────────┐ │ +│ │ Epic │ │ Ticket │ │ +│ │─────────│ │──────────│ │ +│ │ title │1 ∞│ title │ │ +│ │ color │◀───────│ epic_id │ │ +│ │ branch │ │ tags[] │ │ +│ │ base_br │ │ status │ │ +│ └──────────┘ │ tmux_win │ │ +│ │ branch │ │ +│ └──────────┘ │ +│ │ │ +│ │ Worktree Creation │ +│ ▼ │ +└─────────────────────────────┬───────────────────────────┘ + │ + │ +┌─────────────────────────────▼───────────────────────────┐ +│ Tauri Commands (Rust) + Tmux │ +├─────────────────────────────────────────────────────────┤ +│ create_ticket_worktree() │ +│ ├─ git worktree add │ +│ ├─ tmux new-window -n ushadow-{branch} │ +│ └─ cd {worktree_path} │ +│ │ +│ attach_ticket_to_worktree() │ +│ └─ verify tmux window exists │ +│ │ +│ Tmux Session: "workmux" │ +│ ├─ Window: ushadow-epic-auth (3 tickets) │ +│ ├─ Window: ushadow-ticket-123 (1 ticket) │ +│ └─ Window: ushadow-database (2 tickets) │ +└─────────────────────────────────────────────────────────┘ +``` + +## Files Modified/Created + +### Backend +- ✅ `ushadow/backend/src/models/kanban.py` - Data models +- ✅ `ushadow/backend/src/routers/kanban.py` - API routes +- ✅ `ushadow/backend/main.py` - Router registration + Beanie init + +### Launcher Backend +- ✅ `ushadow/launcher/src-tauri/src/commands/kanban.rs` - Tmux integration commands +- ✅ `ushadow/launcher/src-tauri/src/commands/mod.rs` - Module exports +- ✅ `ushadow/launcher/src-tauri/src/main.rs` - Command registration + +### Frontend +- ✅ `ushadow/launcher/src/components/KanbanBoard.tsx` - Main board +- ✅ `ushadow/launcher/src/components/TicketCard.tsx` - Ticket cards +- ✅ `ushadow/launcher/src/components/CreateTicketDialog.tsx` - Ticket creation modal +- ✅ `ushadow/launcher/src/components/CreateEpicDialog.tsx` - Epic creation modal +- ✅ `ushadow/launcher/src/store/appStore.ts` - Added 'kanban' mode +- ✅ `ushadow/launcher/src/App.tsx` - Navigation + routing + +### Documentation +- ✅ `KANBAN_INTEGRATION.md` - This file! diff --git a/ushadow/backend/main.py b/ushadow/backend/main.py index 22314653..1e2a3241 100644 --- a/ushadow/backend/main.py +++ b/ushadow/backend/main.py @@ -19,11 +19,12 @@ from motor.motor_asyncio import AsyncIOMotorClient from src.models.user import User # Beanie document model +from src.models.kanban import Ticket, Epic # Kanban models from src.routers import health, wizard, chronicle, auth, feature_flags from src.routers import services, deployments, providers, service_configs, chat from src.routers import kubernetes, tailscale, unodes, docker -from src.routers import github_import +from src.routers import github_import, kanban from src.routers import settings as settings_api from src.middleware import setup_middleware from src.services.unode_manager import init_unode_manager, get_unode_manager @@ -122,7 +123,7 @@ def send_telemetry(): app.state.db = db # Initialize Beanie ODM with document models - await init_beanie(database=db, document_models=[User]) + await init_beanie(database=db, document_models=[User, Ticket, Epic]) logger.info("✓ Beanie ODM initialized") # Create admin user if explicitly configured in secrets.yaml @@ -185,6 +186,7 @@ def send_telemetry(): app.include_router(deployments.router, tags=["deployments"]) app.include_router(tailscale.router, tags=["tailscale"]) app.include_router(github_import.router, prefix="/api/github-import", tags=["github-import"]) +app.include_router(kanban.router, tags=["kanban"]) # Setup MCP server for LLM tool access setup_mcp_server(app) diff --git a/ushadow/backend/src/models/kanban.py b/ushadow/backend/src/models/kanban.py new file mode 100644 index 00000000..bfa45255 --- /dev/null +++ b/ushadow/backend/src/models/kanban.py @@ -0,0 +1,267 @@ +"""Kanban ticket models for integrated task management with tmux. + +This module provides models for kanban boards, tickets, and epics that integrate +directly with the launcher's tmux and worktree management. + +Key Features: +- Tickets linked to tmux windows for context preservation +- Epic-based grouping for related tickets +- Tag-based context sharing for ad-hoc relationships +- Color teams for visual organization +- Shared branches for collaborative tickets +""" + +import logging +from datetime import datetime +from enum import Enum +from typing import Optional, List + +from beanie import Document, PydanticObjectId, Link +from pydantic import ConfigDict, Field, BaseModel + +logger = logging.getLogger(__name__) + + +class TicketStatus(str, Enum): + """Ticket workflow status.""" + BACKLOG = "backlog" + TODO = "todo" + IN_PROGRESS = "in_progress" + IN_REVIEW = "in_review" + DONE = "done" + ARCHIVED = "archived" + + +class TicketPriority(str, Enum): + """Ticket priority levels.""" + LOW = "low" + MEDIUM = "medium" + HIGH = "high" + URGENT = "urgent" + + +class Epic(Document): + """Epic for grouping related tickets with shared context. + + Epics enable: + - Logical grouping of related tickets + - Shared branch across all tickets in the epic + - Unified color team for visual organization + - Context sharing (all tickets access same worktree) + """ + + model_config = ConfigDict( + from_attributes=True, + populate_by_name=True, + ) + + # Core fields + title: str = Field(..., min_length=1, max_length=200) + description: Optional[str] = None + + # Color team (hex color for UI) + color: str = Field(default="#3B82F6") # Default blue + + # Branch management + branch_name: Optional[str] = None # Shared branch for all tickets + base_branch: str = Field(default="main") # Branch to fork from + + # Project association + project_id: Optional[str] = None # Links to launcher project + + # Metadata + created_at: datetime = Field(default_factory=datetime.utcnow) + updated_at: datetime = Field(default_factory=datetime.utcnow) + created_by: Optional[PydanticObjectId] = None # User who created epic + + class Settings: + name = "epics" + + async def save(self, *args, **kwargs): + """Override save to update timestamp.""" + self.updated_at = datetime.utcnow() + return await super().save(*args, **kwargs) + + +class Ticket(Document): + """Kanban ticket with tmux and worktree integration. + + Each ticket represents a unit of work that: + - Has exactly one tmux window (1:1 mapping) + - May belong to an epic (shared branch) + - Has tags for ad-hoc context sharing + - Uses color from epic or generates own color + """ + + model_config = ConfigDict( + from_attributes=True, + populate_by_name=True, + ) + + # Core fields + title: str = Field(..., min_length=1, max_length=200) + description: Optional[str] = None + status: TicketStatus = Field(default=TicketStatus.TODO) + priority: TicketPriority = Field(default=TicketPriority.MEDIUM) + + # Epic relationship (optional) + epic_id: Optional[PydanticObjectId] = None + epic: Optional[Link[Epic]] = None + + # Tags for context sharing + tags: List[str] = Field(default_factory=list) + + # Color team (inherited from epic or unique) + color: Optional[str] = None # If None, inherit from epic or generate + + # Tmux integration + tmux_window_name: Optional[str] = None # e.g., "ushadow-ticket-123" + tmux_session_name: Optional[str] = None # Usually project name + + # Worktree/branch integration + branch_name: Optional[str] = None # Own branch or epic's shared branch + worktree_path: Optional[str] = None # Path to worktree on filesystem + + # Environment association + environment_name: Optional[str] = None # Links to launcher environment + project_id: Optional[str] = None # Links to launcher project + + # Assignment + assigned_to: Optional[PydanticObjectId] = None # User assigned to ticket + + # Ordering + order: int = Field(default=0) # For custom ordering within status column + + # Metadata + created_at: datetime = Field(default_factory=datetime.utcnow) + updated_at: datetime = Field(default_factory=datetime.utcnow) + created_by: Optional[PydanticObjectId] = None + + class Settings: + name = "tickets" + indexes = [ + "status", + "epic_id", + "project_id", + "tags", + "assigned_to", + ] + + async def save(self, *args, **kwargs): + """Override save to update timestamp.""" + self.updated_at = datetime.utcnow() + return await super().save(*args, **kwargs) + + @property + def ticket_id_str(self) -> str: + """Return short ticket ID for display (last 6 chars).""" + return str(self.id)[-6:] + + async def get_effective_color(self) -> str: + """Get the color to use for this ticket (own or epic's).""" + if self.color: + return self.color + + if self.epic_id and self.epic: + epic = await self.epic.fetch() + return epic.color if epic else self._generate_color() + + return self._generate_color() + + def _generate_color(self) -> str: + """Generate a color based on ticket ID hash.""" + # Simple hash-based color generation + id_hash = hash(str(self.id)) + hue = id_hash % 360 + return f"hsl({hue}, 70%, 60%)" + + async def get_effective_branch(self) -> Optional[str]: + """Get the branch to use (own or epic's shared branch).""" + if self.branch_name: + return self.branch_name + + if self.epic_id and self.epic: + epic = await self.epic.fetch() + return epic.branch_name if epic else None + + return None + + +# Pydantic schemas for API requests/responses + +class EpicCreate(BaseModel): + """Schema for creating a new epic.""" + title: str + description: Optional[str] = None + color: Optional[str] = None + base_branch: str = "main" + project_id: Optional[str] = None + + +class EpicRead(BaseModel): + """Schema for reading epic data.""" + id: PydanticObjectId + title: str + description: Optional[str] + color: str + branch_name: Optional[str] + base_branch: str + project_id: Optional[str] + created_at: datetime + updated_at: datetime + + +class EpicUpdate(BaseModel): + """Schema for updating epic data.""" + title: Optional[str] = None + description: Optional[str] = None + color: Optional[str] = None + branch_name: Optional[str] = None + + +class TicketCreate(BaseModel): + """Schema for creating a new ticket.""" + title: str + description: Optional[str] = None + status: TicketStatus = TicketStatus.TODO + priority: TicketPriority = TicketPriority.MEDIUM + epic_id: Optional[str] = None + tags: List[str] = [] + color: Optional[str] = None + project_id: Optional[str] = None + assigned_to: Optional[str] = None + + +class TicketRead(BaseModel): + """Schema for reading ticket data.""" + id: PydanticObjectId + title: str + description: Optional[str] + status: TicketStatus + priority: TicketPriority + epic_id: Optional[PydanticObjectId] + tags: List[str] + color: Optional[str] + tmux_window_name: Optional[str] + tmux_session_name: Optional[str] + branch_name: Optional[str] + worktree_path: Optional[str] + environment_name: Optional[str] + project_id: Optional[str] + assigned_to: Optional[PydanticObjectId] + order: int + created_at: datetime + updated_at: datetime + + +class TicketUpdate(BaseModel): + """Schema for updating ticket data.""" + title: Optional[str] = None + description: Optional[str] = None + status: Optional[TicketStatus] = None + priority: Optional[TicketPriority] = None + epic_id: Optional[str] = None + tags: Optional[List[str]] = None + color: Optional[str] = None + assigned_to: Optional[str] = None + order: Optional[int] = None diff --git a/ushadow/backend/src/routers/kanban.py b/ushadow/backend/src/routers/kanban.py new file mode 100644 index 00000000..5d3c09b4 --- /dev/null +++ b/ushadow/backend/src/routers/kanban.py @@ -0,0 +1,404 @@ +"""API routes for kanban ticket management. + +This router provides CRUD operations for tickets and epics, integrating with +the launcher's tmux and worktree systems for context-aware task management. +""" + +import logging +from typing import List, Optional, Dict, Any + +from fastapi import APIRouter, HTTPException, Depends, Query +from beanie import PydanticObjectId +from pydantic import BaseModel + +from src.models.kanban import ( + Ticket, + Epic, + TicketStatus, + TicketPriority, + TicketCreate, + TicketRead, + TicketUpdate, + EpicCreate, + EpicRead, + EpicUpdate, +) +from src.services.auth import get_current_user + +logger = logging.getLogger(__name__) + +router = APIRouter(prefix="/api/kanban", tags=["kanban"]) + + +# ============================================================================= +# Epic Endpoints +# ============================================================================= + +@router.post("/epics", response_model=Dict[str, Any]) +async def create_epic( + epic_data: EpicCreate, + current_user: dict = Depends(get_current_user) +): + """Create a new epic for grouping related tickets.""" + try: + epic = Epic( + title=epic_data.title, + description=epic_data.description, + color=epic_data.color or "#3B82F6", + base_branch=epic_data.base_branch, + project_id=epic_data.project_id, + created_by=PydanticObjectId(current_user["id"]) + ) + await epic.save() + + logger.info(f"Created epic: {epic.title} (ID: {epic.id})") + return epic.model_dump() + except Exception as e: + logger.error(f"Failed to create epic: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.get("/epics", response_model=List[Dict[str, Any]]) +async def list_epics( + project_id: Optional[str] = Query(None), + current_user: dict = Depends(get_current_user) +): + """List all epics, optionally filtered by project.""" + try: + query = {} + if project_id: + query["project_id"] = project_id + + epics = await Epic.find(query).to_list() + return [epic.model_dump() for epic in epics] + except Exception as e: + logger.error(f"Failed to list epics: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.get("/epics/{epic_id}", response_model=Dict[str, Any]) +async def get_epic( + epic_id: str, + current_user: dict = Depends(get_current_user) +): + """Get a specific epic by ID.""" + try: + epic = await Epic.get(PydanticObjectId(epic_id)) + if not epic: + raise HTTPException(status_code=404, detail="Epic not found") + return epic.model_dump() + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to get epic {epic_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.patch("/epics/{epic_id}", response_model=Dict[str, Any]) +async def update_epic( + epic_id: str, + update_data: EpicUpdate, + current_user: dict = Depends(get_current_user) +): + """Update an epic.""" + try: + epic = await Epic.get(PydanticObjectId(epic_id)) + if not epic: + raise HTTPException(status_code=404, detail="Epic not found") + + # Update fields + if update_data.title is not None: + epic.title = update_data.title + if update_data.description is not None: + epic.description = update_data.description + if update_data.color is not None: + epic.color = update_data.color + if update_data.branch_name is not None: + epic.branch_name = update_data.branch_name + + await epic.save() + logger.info(f"Updated epic: {epic.title} (ID: {epic.id})") + return epic.model_dump() + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to update epic {epic_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.delete("/epics/{epic_id}") +async def delete_epic( + epic_id: str, + current_user: dict = Depends(get_current_user) +): + """Delete an epic. Tickets in the epic will have epic_id set to None.""" + try: + epic = await Epic.get(PydanticObjectId(epic_id)) + if not epic: + raise HTTPException(status_code=404, detail="Epic not found") + + # Unlink tickets from epic + tickets = await Ticket.find(Ticket.epic_id == epic.id).to_list() + for ticket in tickets: + ticket.epic_id = None + ticket.epic = None + await ticket.save() + + await epic.delete() + logger.info(f"Deleted epic: {epic.title} (ID: {epic.id})") + return {"status": "success", "deleted": str(epic.id)} + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to delete epic {epic_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +# ============================================================================= +# Ticket Endpoints +# ============================================================================= + +@router.post("/tickets", response_model=Dict[str, Any]) +async def create_ticket( + ticket_data: TicketCreate, + current_user: dict = Depends(get_current_user) +): + """Create a new ticket.""" + try: + # Validate epic exists if provided + epic_obj_id = None + if ticket_data.epic_id: + epic = await Epic.get(PydanticObjectId(ticket_data.epic_id)) + if not epic: + raise HTTPException(status_code=400, detail="Epic not found") + epic_obj_id = epic.id + + ticket = Ticket( + title=ticket_data.title, + description=ticket_data.description, + status=ticket_data.status, + priority=ticket_data.priority, + epic_id=epic_obj_id, + tags=ticket_data.tags, + color=ticket_data.color, + project_id=ticket_data.project_id, + assigned_to=PydanticObjectId(ticket_data.assigned_to) if ticket_data.assigned_to else None, + created_by=PydanticObjectId(current_user["id"]) + ) + await ticket.save() + + logger.info(f"Created ticket: {ticket.title} (ID: {ticket.id})") + return ticket.model_dump() + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to create ticket: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.get("/tickets", response_model=List[Dict[str, Any]]) +async def list_tickets( + project_id: Optional[str] = Query(None), + epic_id: Optional[str] = Query(None), + status: Optional[TicketStatus] = Query(None), + tags: Optional[str] = Query(None), # Comma-separated tags + assigned_to: Optional[str] = Query(None), + current_user: dict = Depends(get_current_user) +): + """List tickets with optional filters.""" + try: + query = {} + if project_id: + query["project_id"] = project_id + if epic_id: + query["epic_id"] = PydanticObjectId(epic_id) + if status: + query["status"] = status + if assigned_to: + query["assigned_to"] = PydanticObjectId(assigned_to) + + # Tag filtering (find tickets with ANY of the specified tags) + if tags: + tag_list = [t.strip() for t in tags.split(",")] + query["tags"] = {"$in": tag_list} + + tickets = await Ticket.find(query).sort("+order").to_list() + return [ticket.model_dump() for ticket in tickets] + except Exception as e: + logger.error(f"Failed to list tickets: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.get("/tickets/{ticket_id}", response_model=Dict[str, Any]) +async def get_ticket( + ticket_id: str, + current_user: dict = Depends(get_current_user) +): + """Get a specific ticket by ID.""" + try: + ticket = await Ticket.get(PydanticObjectId(ticket_id)) + if not ticket: + raise HTTPException(status_code=404, detail="Ticket not found") + return ticket.model_dump() + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to get ticket {ticket_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.patch("/tickets/{ticket_id}", response_model=Dict[str, Any]) +async def update_ticket( + ticket_id: str, + update_data: TicketUpdate, + current_user: dict = Depends(get_current_user) +): + """Update a ticket.""" + try: + ticket = await Ticket.get(PydanticObjectId(ticket_id)) + if not ticket: + raise HTTPException(status_code=404, detail="Ticket not found") + + # Update fields + if update_data.title is not None: + ticket.title = update_data.title + if update_data.description is not None: + ticket.description = update_data.description + if update_data.status is not None: + ticket.status = update_data.status + if update_data.priority is not None: + ticket.priority = update_data.priority + if update_data.epic_id is not None: + # Validate epic exists + epic = await Epic.get(PydanticObjectId(update_data.epic_id)) + if not epic: + raise HTTPException(status_code=400, detail="Epic not found") + ticket.epic_id = epic.id + if update_data.tags is not None: + ticket.tags = update_data.tags + if update_data.color is not None: + ticket.color = update_data.color + if update_data.assigned_to is not None: + ticket.assigned_to = PydanticObjectId(update_data.assigned_to) if update_data.assigned_to else None + if update_data.order is not None: + ticket.order = update_data.order + + await ticket.save() + logger.info(f"Updated ticket: {ticket.title} (ID: {ticket.id})") + return ticket.model_dump() + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to update ticket {ticket_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.delete("/tickets/{ticket_id}") +async def delete_ticket( + ticket_id: str, + current_user: dict = Depends(get_current_user) +): + """Delete a ticket.""" + try: + ticket = await Ticket.get(PydanticObjectId(ticket_id)) + if not ticket: + raise HTTPException(status_code=404, detail="Ticket not found") + + await ticket.delete() + logger.info(f"Deleted ticket: {ticket.title} (ID: {ticket.id})") + return {"status": "success", "deleted": str(ticket.id)} + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to delete ticket {ticket_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +# ============================================================================= +# Context Sharing Endpoints +# ============================================================================= + +@router.get("/tickets/{ticket_id}/related", response_model=List[Dict[str, Any]]) +async def get_related_tickets( + ticket_id: str, + current_user: dict = Depends(get_current_user) +): + """Find tickets related to this one via epic or shared tags.""" + try: + ticket = await Ticket.get(PydanticObjectId(ticket_id)) + if not ticket: + raise HTTPException(status_code=404, detail="Ticket not found") + + related = [] + + # Find tickets in same epic + if ticket.epic_id: + epic_tickets = await Ticket.find( + Ticket.epic_id == ticket.epic_id, + Ticket.id != ticket.id + ).to_list() + related.extend(epic_tickets) + + # Find tickets with shared tags + if ticket.tags: + tag_tickets = await Ticket.find( + Ticket.tags == {"$in": ticket.tags}, + Ticket.id != ticket.id + ).to_list() + # Deduplicate + existing_ids = {t.id for t in related} + for t in tag_tickets: + if t.id not in existing_ids: + related.append(t) + + return [t.model_dump() for t in related] + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to get related tickets for {ticket_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +# ============================================================================= +# Statistics Endpoints +# ============================================================================= + +@router.get("/stats", response_model=Dict[str, Any]) +async def get_kanban_stats( + project_id: Optional[str] = Query(None), + current_user: dict = Depends(get_current_user) +): + """Get kanban board statistics.""" + try: + query = {} + if project_id: + query["project_id"] = project_id + + tickets = await Ticket.find(query).to_list() + + stats = { + "total": len(tickets), + "by_status": {}, + "by_priority": {}, + "by_epic": {}, + "with_tmux": sum(1 for t in tickets if t.tmux_window_name), + } + + for status in TicketStatus: + stats["by_status"][status.value] = sum(1 for t in tickets if t.status == status) + + for priority in TicketPriority: + stats["by_priority"][priority.value] = sum(1 for t in tickets if t.priority == priority) + + # Count tickets per epic + epic_counts = {} + for ticket in tickets: + if ticket.epic_id: + epic_id_str = str(ticket.epic_id) + epic_counts[epic_id_str] = epic_counts.get(epic_id_str, 0) + 1 + stats["by_epic"] = epic_counts + + return stats + except Exception as e: + logger.error(f"Failed to get kanban stats: {e}") + raise HTTPException(status_code=500, detail=str(e)) diff --git a/ushadow/launcher/src-tauri/src/commands/kanban.rs b/ushadow/launcher/src-tauri/src/commands/kanban.rs new file mode 100644 index 00000000..5c9625b2 --- /dev/null +++ b/ushadow/launcher/src-tauri/src/commands/kanban.rs @@ -0,0 +1,149 @@ +use crate::models::WorktreeInfo; +use super::worktree::{create_worktree_with_workmux, create_worktree}; +use super::utils::shell_command; +use std::path::PathBuf; +use serde::{Deserialize, Serialize}; + +/// Request to create a ticket with worktree and tmux +#[derive(Debug, Deserialize)] +pub struct CreateTicketWorktreeRequest { + pub ticket_id: String, + pub ticket_title: String, + pub project_root: String, + pub branch_name: Option, // If None, will be generated from ticket_id + pub base_branch: Option, // Default to "main" + pub epic_branch: Option, // If part of epic with shared branch +} + +/// Result of creating a ticket worktree +#[derive(Debug, Serialize)] +pub struct CreateTicketWorktreeResult { + pub worktree_path: String, + pub branch_name: String, + pub tmux_window_name: String, + pub tmux_session_name: String, +} + +/// Create a worktree and tmux window for a kanban ticket +/// +/// This command handles two scenarios: +/// 1. Ticket has its own branch (epic_branch is None) +/// 2. Ticket shares a branch with epic (epic_branch is Some) +#[tauri::command] +pub async fn create_ticket_worktree( + request: CreateTicketWorktreeRequest, +) -> Result { + eprintln!("[create_ticket_worktree] Creating worktree for ticket: {}", request.ticket_title); + + // Determine branch to use + let branch_name = if let Some(epic_branch) = request.epic_branch { + // Use epic's shared branch + eprintln!("[create_ticket_worktree] Using epic's shared branch: {}", epic_branch); + epic_branch + } else if let Some(branch_name) = request.branch_name { + // Use provided branch name + branch_name + } else { + // Generate branch name from ticket ID + format!("ticket-{}", request.ticket_id) + }; + + let base_branch = request.base_branch.unwrap_or_else(|| "main".to_string()); + + // Create worktree with tmux integration + // The worktree name will be the branch name + let worktree_info = create_worktree_with_workmux( + request.project_root.clone(), + branch_name.clone(), + Some(base_branch), + Some(false), // Not background + ).await?; + + // Tmux window naming: "ushadow-{branch_name}" or "ushadow-ticket-{id}" + let tmux_window_name = format!("ushadow-{}", branch_name); + let tmux_session_name = "workmux".to_string(); // Default session + + eprintln!("[create_ticket_worktree] ✓ Worktree created at: {}", worktree_info.path); + eprintln!("[create_ticket_worktree] ✓ Tmux window: {}", tmux_window_name); + + Ok(CreateTicketWorktreeResult { + worktree_path: worktree_info.path, + branch_name, + tmux_window_name, + tmux_session_name, + }) +} + +/// Attach an existing ticket to an existing worktree (for epic-shared branches) +#[tauri::command] +pub async fn attach_ticket_to_worktree( + ticket_id: String, + worktree_path: String, + branch_name: String, +) -> Result { + eprintln!("[attach_ticket_to_worktree] Attaching ticket {} to existing worktree: {}", ticket_id, worktree_path); + + // Verify worktree exists + let path_buf = PathBuf::from(&worktree_path); + if !path_buf.exists() { + return Err(format!("Worktree path does not exist: {}", worktree_path)); + } + + // The tmux window should already exist for this branch + let tmux_window_name = format!("ushadow-{}", branch_name); + let tmux_session_name = "workmux".to_string(); + + // Verify tmux window exists + let check_window = shell_command(&format!( + "tmux list-windows -t {} -F '#W'", + tmux_session_name + )) + .output(); + + let window_exists = match check_window { + Ok(output) if output.status.success() => { + let stdout = String::from_utf8_lossy(&output.stdout); + stdout.lines().any(|line| line == tmux_window_name) + } + _ => false, + }; + + if !window_exists { + return Err(format!( + "Tmux window '{}' does not exist. Expected window for shared branch.", + tmux_window_name + )); + } + + eprintln!("[attach_ticket_to_worktree] ✓ Ticket attached to worktree and tmux window"); + + Ok(CreateTicketWorktreeResult { + worktree_path, + branch_name, + tmux_window_name, + tmux_session_name, + }) +} + +/// List all tickets associated with a specific tmux window +/// Returns ticket IDs that are using this tmux window +#[tauri::command] +pub async fn get_tickets_for_tmux_window( + window_name: String, +) -> Result, String> { + // This will need to query the backend API + // For now, return empty list as placeholder + eprintln!("[get_tickets_for_tmux_window] Getting tickets for window: {}", window_name); + Ok(vec![]) +} + +/// Get tmux window information for a ticket +#[tauri::command] +pub async fn get_ticket_tmux_info( + ticket_id: String, +) -> Result, String> { + // This will need to query the backend API to get ticket's tmux details + // For now, return None as placeholder + eprintln!("[get_ticket_tmux_info] Getting tmux info for ticket: {}", ticket_id); + Ok(None) +} diff --git a/ushadow/launcher/src-tauri/src/commands/mod.rs b/ushadow/launcher/src-tauri/src/commands/mod.rs index 11deacb7..a54d8f75 100644 --- a/ushadow/launcher/src-tauri/src/commands/mod.rs +++ b/ushadow/launcher/src-tauri/src/commands/mod.rs @@ -11,6 +11,7 @@ mod settings; mod bundled; // Bundled resources locator pub mod worktree; pub mod platform; // Platform abstraction layer +mod kanban; // Kanban ticket integration // Embedded terminal module (PTY-based) - DEPRECATED in favor of native terminal integration (iTerm2/Terminal.app/gnome-terminal) // pub mod terminal; mod config_commands; @@ -28,6 +29,7 @@ pub use generic_installer::*; // Export generic installer functions pub use permissions::*; pub use settings::*; pub use worktree::*; +pub use kanban::*; // Export kanban ticket functions // pub use terminal::*; pub use config_commands::*; pub use container_discovery::*; diff --git a/ushadow/launcher/src-tauri/src/main.rs b/ushadow/launcher/src-tauri/src/main.rs index 81495b9f..9167c7cc 100644 --- a/ushadow/launcher/src-tauri/src/main.rs +++ b/ushadow/launcher/src-tauri/src/main.rs @@ -24,6 +24,8 @@ use commands::{AppState, check_prerequisites, discover_environments, get_os_type open_in_vscode, open_in_vscode_with_tmux, remove_worktree, delete_environment, get_tmux_sessions, kill_tmux_window, kill_tmux_server, open_tmux_in_terminal, capture_tmux_pane, get_claude_status, + // Kanban ticket commands + create_ticket_worktree, attach_ticket_to_worktree, get_tickets_for_tmux_window, get_ticket_tmux_info, // Settings load_launcher_settings, save_launcher_settings, write_credentials_to_worktree, // Prerequisites config (from prerequisites_config.rs) @@ -169,6 +171,11 @@ fn main() { open_tmux_in_terminal, capture_tmux_pane, get_claude_status, + // Kanban ticket integration + create_ticket_worktree, + attach_ticket_to_worktree, + get_tickets_for_tmux_window, + get_ticket_tmux_info, // Settings load_launcher_settings, save_launcher_settings, diff --git a/ushadow/launcher/src/App.tsx b/ushadow/launcher/src/App.tsx index 0bdc72aa..8dce2747 100644 --- a/ushadow/launcher/src/App.tsx +++ b/ushadow/launcher/src/App.tsx @@ -17,8 +17,9 @@ import { TmuxManagerDialog } from './components/TmuxManagerDialog' import { SettingsDialog } from './components/SettingsDialog' import { EmbeddedView } from './components/EmbeddedView' import { ProjectManager } from './components/ProjectManager' -import { RefreshCw, Settings, Zap, Loader2, FolderOpen, Pencil, Terminal, Sliders, Package, FolderGit2 } from 'lucide-react' +import { RefreshCw, Settings, Zap, Loader2, FolderOpen, Pencil, Terminal, Sliders, Package, FolderGit2, Trello } from 'lucide-react' import { getColors } from './utils/colors' +import { KanbanBoard } from './components/KanbanBoard' function App() { // Store @@ -1565,6 +1566,16 @@ function App() { Environments + {/* Tmux Manager */} @@ -1719,7 +1730,7 @@ function App() { /> )} - ) : ( + ) : appMode === 'environments' ? ( /* Environments Page - Worktree Management */
- )} + ) : appMode === 'kanban' ? ( + /* Kanban Page - Ticket Management */ + + ) : null} {/* Log Panel - Bottom */} diff --git a/ushadow/launcher/src/components/CreateEpicDialog.tsx b/ushadow/launcher/src/components/CreateEpicDialog.tsx new file mode 100644 index 00000000..d50d8c71 --- /dev/null +++ b/ushadow/launcher/src/components/CreateEpicDialog.tsx @@ -0,0 +1,187 @@ +import { useState } from 'react' + +interface CreateEpicDialogProps { + isOpen: boolean + onClose: () => void + onCreated: () => void + projectId?: string + backendUrl: string +} + +const PRESET_COLORS = [ + '#3B82F6', // blue + '#8B5CF6', // purple + '#EC4899', // pink + '#F59E0B', // amber + '#10B981', // green + '#06B6D4', // cyan + '#F97316', // orange + '#EF4444', // red +] + +export function CreateEpicDialog({ + isOpen, + onClose, + onCreated, + projectId, + backendUrl, +}: CreateEpicDialogProps) { + const [title, setTitle] = useState('') + const [description, setDescription] = useState('') + const [color, setColor] = useState(PRESET_COLORS[0]) + const [baseBranch, setBaseBranch] = useState('main') + const [creating, setCreating] = useState(false) + const [error, setError] = useState(null) + + if (!isOpen) return null + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault() + setError(null) + setCreating(true) + + try { + const payload = { + title, + description: description || undefined, + color, + base_branch: baseBranch, + project_id: projectId, + } + + const response = await fetch(`${backendUrl}/api/kanban/epics`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(payload), + }) + + if (!response.ok) { + throw new Error('Failed to create epic') + } + + onCreated() + // Reset form + setTitle('') + setDescription('') + setColor(PRESET_COLORS[0]) + setBaseBranch('main') + } catch (err) { + setError(err instanceof Error ? err.message : 'Failed to create epic') + } finally { + setCreating(false) + } + } + + return ( +
+
e.stopPropagation()} + > +

Create New Epic

+ +
+ {/* Title */} +
+ + setTitle(e.target.value)} + className="w-full bg-gray-900 border border-gray-700 rounded px-3 py-2 text-white" + placeholder="Epic title" + required + data-testid="create-epic-title" + /> +
+ + {/* Description */} +
+ +