Merge add multi tenancy support in taskflow api and fix org switcher pull request #22 from mjunaidca/009-multi-tenancy

add multi tenancy #20

Author: mjunaidca

history/prompts/multi-tenancy/0001-multi-tenancy-specification.spec.prompt.md

@@ -0,0 +1,76 @@
+---
+id: "0001"
+title: "Multi-Tenancy Specification"
+stage: spec
+date: "2025-12-10"
+surface: agent
+model: claude-opus-4-5-20251101
+feature: multi-tenancy
+branch: 009-multi-tenancy
+user: system
+command: /sp.specify multi-tenancy
+labels: ["multi-tenancy", "api", "security", "project-isolation"]
+links:
+  spec: specs/009-multi-tenancy/spec.md
+  ticket: null
+  adr: null
+  pr: null
+files:
+  - specs/009-multi-tenancy/spec.md
+  - specs/009-multi-tenancy/checklists/requirements.md
+tests: []
+---
+
+# Multi-Tenancy Specification
+
+## Prompt
+
+User requested via /sp.orchestrate to implement multi-tenancy using the SDD-RI loop. The objective is to add tenant_id scoping to the TaskFlow API so projects are isolated by organization, using a default tenant ("taskflow") for all users to avoid SSO changes.
+
+Key requirements specified:
+1. Add tenant_id field to Project model with default "taskflow"
+2. Update schemas for tenant_id visibility in create/read
+3. Add get_tenant_id() helper function for tenant extraction
+4. Filter all project queries by tenant_id
+5. Handle edge cases: cross-tenant 404 (not 403), slug uniqueness per tenant, dev mode header override
+
+## Response
+
+Created comprehensive specification at `specs/009-multi-tenancy/spec.md` with:
+
+**User Stories (4 total)**:
+- P1: Project Isolation by Tenant (core security boundary)
+- P1: Default Tenant for Existing Users (backward compatibility)
+- P2: Unique Project Slugs Per Tenant (UX improvement)
+- P3: Dev Mode Tenant Override (developer tooling)
+
+**Functional Requirements (10 total)**:
+- FR-001 through FR-010 covering model changes, query filtering, tenant extraction, security responses, and audit logging
+
+**Edge Cases (6 total)**:
+- 404 vs 403 for cross-tenant access
+- JWT vs header tenant priority
+- Empty string handling
+- Existing data migration
+- Production mode header blocking
+- Audit log inheritance
+
+**Validation Results**:
+- spec-architect verdict: READY FOR PLANNING
+- Quality score: 9.5/10
+- All 5 formal invariants verified
+- No clarifications needed
+
+## Outcome
+
+SPECIFICATION COMPLETE - Ready for /sp.plan
+
+## Evaluation
+
+| Criterion | Status |
+|-----------|--------|
+| Spec created | PASS |
+| Checklist generated | PASS |
+| Formal verification | PASS |
+| Evals-first pattern | PASS |
+| Ready for planning | PASS |

history/prompts/multi-tenancy/0002-multi-tenancy-planning.plan.prompt.md

@@ -0,0 +1,80 @@
+---
+id: "0002"
+title: "Multi-Tenancy Implementation Planning"
+stage: plan
+date: "2025-12-10"
+surface: agent
+model: claude-opus-4-5-20251101
+feature: multi-tenancy
+branch: 009-multi-tenancy
+user: system
+command: /sp.plan multi-tenancy
+labels: ["multi-tenancy", "api", "architecture", "planning"]
+links:
+  spec: specs/009-multi-tenancy/spec.md
+  plan: specs/009-multi-tenancy/plan.md
+  ticket: null
+  adr: null
+  pr: null
+files:
+  - specs/009-multi-tenancy/plan.md
+tests: []
+---
+
+# Multi-Tenancy Implementation Planning
+
+## Prompt
+
+Execute implementation planning for the multi-tenancy feature following the SDD-RI workflow. Work type classified as ENGINEERING (API feature with data model changes). Route to general-purpose subagent for architectural decomposition.
+
+## Response
+
+Created comprehensive implementation plan at `specs/009-multi-tenancy/plan.md` with:
+
+**Constitutional Compliance** (All 5 Checks Passed):
+1. Audit Check: All project operations include tenant context in audit entries
+2. Agent Parity: Agents inherit tenant filtering through API layer
+3. Recursive Tasks: Tasks inherit tenant through project relationship
+4. Spec-Driven: Spec exists and validated
+5. Phase Continuity: Data model designed for permanence across all phases
+
+**6 Key Technical Decisions**:
+1. Tenant ID Format: String identifier (VARCHAR(100)) for human-readability
+2. Storage Strategy: Embedded tenant_id (denormalized, no JOINs)
+3. Slug Uniqueness: Per-tenant UNIQUE(tenant_id, slug)
+4. Dev Mode Override: X-Tenant-ID header only in dev mode
+5. Audit Context: tenant_id in JSONB details field
+6. Task Scoping: Derived from Project relationship
+
+**5 Implementation Components**:
+1. Data Model Changes (Project.tenant_id field)
+2. Tenant Context Extraction (get_tenant_id() function)
+3. Schema Updates (ProjectRead.tenant_id)
+4. Project Router Filtering (5 endpoints)
+5. Audit Log Integration
+
+**4 Implementation Phases** (2 hours total):
+- Phase 1: Foundation (30 min) - Data model + tenant extraction
+- Phase 2: Schema Updates (15 min) - API response changes
+- Phase 3: Tenant Filtering (45 min) - All 5 endpoints
+- Phase 4: Audit & Testing (30 min) - Verification
+
+**Security Model**:
+- 404 (not 403) for cross-tenant access prevents enumeration
+- Indexed tenant_id for query performance
+- Dev mode flag required for header override
+
+## Outcome
+
+PLANNING COMPLETE - Ready for /sp.tasks
+
+## Evaluation
+
+| Criterion | Status |
+|-----------|--------|
+| Plan created | PASS |
+| Constitutional compliance | PASS |
+| Component breakdown | PASS |
+| Implementation sequence | PASS |
+| Risk analysis | PASS |
+| Deployment checklist | PASS |

history/prompts/multi-tenancy/0003-multi-tenancy-task-breakdown.tasks.prompt.md

@@ -0,0 +1,75 @@
+---
+id: "0003"
+title: "Multi-Tenancy Task Breakdown"
+stage: tasks
+date: "2025-12-10"
+surface: agent
+model: claude-opus-4-5-20251101
+feature: multi-tenancy
+branch: 009-multi-tenancy
+user: system
+command: /sp.tasks multi-tenancy
+labels: ["multi-tenancy", "tasks", "breakdown", "implementation"]
+links:
+  spec: specs/009-multi-tenancy/spec.md
+  plan: specs/009-multi-tenancy/plan.md
+  tasks: specs/009-multi-tenancy/tasks.md
+  ticket: null
+  adr: null
+  pr: null
+files:
+  - specs/009-multi-tenancy/tasks.md
+tests: []
+---
+
+# Multi-Tenancy Task Breakdown
+
+## Prompt
+
+Generate actionable tasks from the multi-tenancy spec and plan. Tasks should be organized by user story to enable independent implementation and testing.
+
+## Response
+
+Created comprehensive task breakdown at `specs/009-multi-tenancy/tasks.md` with:
+
+**7 Phases**:
+1. Setup (2 tasks) - Prepare for implementation
+2. Foundation (4 tasks) - Data model + tenant extraction (BLOCKING)
+3. US1: Tenant Isolation (8 tasks) - Core feature
+4. US2: Default Tenant (3 tasks) - Backward compatibility
+5. US3: Slug Uniqueness (2 tasks) - Per-tenant naming
+6. US4: Dev Mode (2 tasks) - Testing workflow
+7. Polish (4 tasks) - Audit trail + comprehensive testing
+
+**Task Summary**:
+- Total Tasks: 25
+- Parallel Opportunities: 8 tasks
+- MVP Scope: Phases 1-4 (17 tasks)
+
+**User Story Task Distribution**:
+- US1 (Tenant Isolation): 8 tasks including tests
+- US2 (Default Tenant): 3 tasks including tests
+- US3 (Slug Uniqueness): 2 tasks including tests
+- US4 (Dev Mode): 2 tasks including tests
+
+**Key Files Modified**:
+- `packages/api/src/taskflow_api/models/project.py` - tenant_id field
+- `packages/api/src/taskflow_api/auth.py` - get_tenant_id()
+- `packages/api/src/taskflow_api/schemas/project.py` - ProjectRead update
+- `packages/api/src/taskflow_api/routers/projects.py` - all endpoint filtering
+- `packages/api/tests/test_multitenancy.py` - new test file
+
+## Outcome
+
+TASK BREAKDOWN COMPLETE - Ready for /sp.implement
+
+## Evaluation
+
+| Criterion | Status |
+|-----------|--------|
+| Tasks created | PASS |
+| Checklist format | PASS |
+| User story organization | PASS |
+| Parallel opportunities | PASS |
+| MVP scope defined | PASS |
+| Dependencies documented | PASS |

history/prompts/multi-tenancy/0004-multi-tenancy-implementation.green.prompt.md

@@ -0,0 +1,88 @@
+---
+id: 0004
+title: Multi-Tenancy Implementation Complete
+stage: green
+date: 2025-12-10
+surface: agent
+model: claude-opus-4-5-20251101
+feature: multi-tenancy
+branch: 009-multi-tenancy
+user: system
+command: /sp.implement
+labels: [multi-tenancy, tenant-isolation, api, security, implementation]
+links:
+  spec: specs/009-multi-tenancy/spec.md
+  ticket: null
+  adr: null
+  pr: null
+files:
+  - packages/api/src/taskflow_api/models/project.py
+  - packages/api/src/taskflow_api/auth.py
+  - packages/api/src/taskflow_api/schemas/project.py
+  - packages/api/src/taskflow_api/routers/projects.py
+  - packages/api/src/taskflow_api/tests/test_multitenancy.py
+tests:
+  - test_list_projects_tenant_isolation
+  - test_get_project_wrong_tenant_returns_404
+  - test_create_project_sets_tenant
+  - test_default_tenant_fallback
+  - test_slug_unique_per_tenant
+---
+
+## Prompt
+
+Implementation of multi-tenancy feature following the SDD-RI Loop workflow. Execute tasks T003-T025 from specs/009-multi-tenancy/tasks.md to implement tenant isolation for projects.
+
+Key implementation requirements:
+1. Add tenant_id field to Project model with default "taskflow"
+2. Update CurrentUser to extract tenant_id from JWT claims
+3. Create get_tenant_id() function with priority: JWT → X-Tenant-ID header (dev mode) → default
+4. Add tenant_id to ProjectRead schema
+5. Update all 5 project endpoints with tenant filtering
+6. Return 404 (not 403) for cross-tenant access
+7. Per-tenant slug uniqueness (not global)
+8. Include tenant_id in all audit log entries
+
+## Response snapshot
+
+Successfully implemented all multi-tenancy features across 5 files:
+
+**Model Changes (project.py:21-26)**
+- Added `tenant_id: str` field with default "taskflow", max_length=100, indexed
+- Removed `unique=True` from slug field (now per-tenant unique)
+
+**Auth Changes (auth.py:152-155, 192-223)**
+- Updated `CurrentUser` class to extract tenant_id from `tenant_id` or `organization_id` JWT claims
+- Added `get_tenant_id()` function implementing priority: JWT claim → X-Tenant-ID header (dev mode only) → default "taskflow"
+- Empty string handling via `.strip()` check
+
+**Schema Changes (project.py:37)**
+- Added `tenant_id: str` to `ProjectRead` response schema
+
+**Router Changes (projects.py)**
+- Added imports for `Request` and `get_tenant_id`
+- `list_projects()`: Added tenant filter to join query (lines 34, 42-43)
+- `create_project()`: Set tenant on creation, per-tenant slug check (lines 102, 105-114, 118)
+- `get_project()`: Tenant filter returns 404 for cross-tenant (lines 179, 182-191)
+- `update_project()`: Tenant filter in query (lines 240, 243-251)
+- `delete_project()`: Tenant filter in query (lines 322, 325-333)
+- All audit logs include tenant_id in details (lines 145, 278, 381)
+
+**Tests (test_multitenancy.py)**
+- 5 comprehensive tests covering all user stories
+- All tests pass using X-Tenant-ID header in dev mode
+
+## Outcome
+
+- ✅ Impact: Multi-tenancy fully operational - projects isolated by tenant with backward compatibility
+- 🧪 Tests: 61 passed (5 new + 56 existing, no regressions)
+- 📁 Files: 5 files modified/created
+- 🔁 Next prompts: Commit changes, create PR
+- 🧠 Reflection: Clean implementation following spec precisely. The dev mode header override enabled testing without JWT manipulation.
+
+## Evaluation notes (flywheel)
+
+- Failure modes observed: None - implementation followed spec exactly
+- Graders run and results (PASS/FAIL): All 61 tests PASS
+- Prompt variant (if applicable): SDD-RI Loop with spec-architect validation
+- Next experiment (smallest change to try): Consider adding index on (tenant_id, slug) composite for query performance

packages/api/src/taskflow_api/auth.py

@@ -12,7 +12,7 @@
 from typing import Any
 
 import httpx
-from fastapi import Depends, HTTPException, status
+from fastapi import Depends, HTTPException, Request, status
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from jose import JWTError, jwt
 
@@ -141,14 +141,18 @@ class CurrentUser:
     - name: Display name
     - role: "user" | "admin"
     - tenant_id: Primary organization (optional)
+    - organization_id: Alternative tenant claim (optional)
     """
 
     def __init__(self, payload: dict[str, Any]) -> None:
         self.id: str = payload.get("sub", "")
         self.email: str = payload.get("email", "")
         self.name: str = payload.get("name", "")
         self.role: str = payload.get("role", "user")
-        self.tenant_id: str | None = payload.get("tenant_id")
+        # Extract tenant from multiple possible JWT claims
+        self.tenant_id: str | None = (
+            payload.get("tenant_id") or payload.get("organization_id") or None
+        )
 
     def __repr__(self) -> str:
         return f"CurrentUser(id={self.id!r}, email={self.email!r})"
@@ -183,3 +187,37 @@ async def list_projects(user: CurrentUser = Depends(get_current_user)):
     user = CurrentUser(payload)
     logger.info("[AUTH] Authenticated user: %s", user)
     return user
+
+
+def get_tenant_id(user: CurrentUser, request: Request | None = None) -> str:
+    """Extract tenant context from JWT or request headers.
+
+    Priority:
+    1. JWT claim: tenant_id or organization_id
+    2. X-Tenant-ID header (dev mode only)
+    3. Default: "taskflow"
+
+    Args:
+        user: Authenticated user from JWT
+        request: FastAPI request (for header access in dev mode)
+
+    Returns:
+        Tenant identifier string (never empty)
+    """
+    # Priority 1: JWT claim
+    if user.tenant_id:
+        tenant = user.tenant_id.strip()
+        if tenant:
+            logger.debug("[TENANT] Using JWT tenant_id: %s", tenant)
+            return tenant
+
+    # Priority 2: Dev mode header override
+    if request and settings.dev_mode:
+        header_tenant = request.headers.get("X-Tenant-ID", "").strip()
+        if header_tenant:
+            logger.debug("[TENANT] Using dev mode header: %s", header_tenant)
+            return header_tenant
+
+    # Priority 3: Default tenant
+    logger.debug("[TENANT] Using default tenant: taskflow-default-org-id")
+    return "taskflow-default-org-id"