diff --git a/cc-registry-v2/AGENTS.md b/cc-registry-v2/AGENTS.md
index 289953aa498d..e1b4f8bda1d0 100644
--- a/cc-registry-v2/AGENTS.md
+++ b/cc-registry-v2/AGENTS.md
@@ -139,21 +139,24 @@ docker-compose restart backend
 
 ### Theme & Design Tokens
 
+Registry theme is aligned with RunWhen docs (`/workspaces/docs` Starlight custom.css). Use theme tokens; do not hardcode colors.
+
 | Token | Light | Dark | Usage |
 |-------|-------|------|-------|
-| `primary.main` | `#5282f1` | `#5282f1` | Interactive elements, links |
-| `text.primary` | `#3f3f3f` | `#e0e0e0` | Headings, body text |
-| `text.secondary` | `#858484` | `#a0a0a0` | Descriptions, metadata |
-| `background.paper` | `#ffffff` | `#1e1e1e` | Cards, surfaces |
-| `background.default` | `#ffffff` | `#121212` | Page background |
-| `divider` | `rgba(0,0,0,0.12)` | `rgba(255,255,255,0.12)` | Borders, separators |
+| `primary.main` | `#2F80ED` | `#2F80ED` | Interactive elements, links, header/footer |
+| `text.primary` | `#1a202c` | `#e2e8f0` | Headings, body text |
+| `text.secondary` | `#4a5568` | `#94a3b8` | Descriptions, metadata |
+| `background.paper` | `#ffffff` | `#1e293b` | Cards, surfaces |
+| `background.default` | `#ffffff` | `#0f172a` | Page background |
+| `divider` | `#e2e8f0` | `rgba(255,255,255,0.12)` | Borders, separators |
 | `action.hover` | — | — | Hover/zebra backgrounds |
 
 **Rules:**
 - Always use theme tokens — never hardcode `#fff`, `#000`, `#666`, `#ddd`
-- Font family: **Raleway** (brand font, do not change)
+- Font family: **Inter** (aligned with RunWhen docs; load via Google Fonts in `index.html`)
 - Font weight: `400` body, `500` emphasis, `600` headings/buttons — never `700` or `'bold'`
 - Font size grid: `0.75rem` (12px), `0.8125rem` (13px), `0.875rem` (14px), `0.9375rem` (15px), `1rem` (16px) — no sizes below 12px
+- Border radius: buttons/chips `6px`, cards `8px` (docs `--rw-radius-sm` / `--rw-radius-md`)
 - Chip min height: `24px`, row min height: `40px`
 - Dark mode is supported via `ThemeContext` — test both modes
 
@@ -221,5 +224,4 @@ All containers: `runAsNonRoot: true`, `runAsUser: 1000`, drop all capabilities.
 4. Run database operations in HTTP request handlers (use Celery)
 5. Show raw database IDs in the UI (use slugs)
 6. Use emoji in code or docs unless explicitly requested
-7. Change the font to Inter or the primary color to `#0570de` (registry has its own brand)
-8. "Fix" `Home.tsx` to match the app design system — it's intentionally different
+7. "Fix" `Home.tsx` to match the app design system — it's intentionally different
diff --git a/cc-registry-v2/README.md b/cc-registry-v2/README.md
index b25be7bb151a..e5f12fa1401e 100644
--- a/cc-registry-v2/README.md
+++ b/cc-registry-v2/README.md
@@ -240,6 +240,28 @@ The application requires Azure OpenAI credentials for two purposes:
 
 **See [AZURE_OPENAI_SETUP.md](AZURE_OPENAI_SETUP.md) for configuration details.**
 
+### GitHub App (Issue Creation)
+
+The registry can create GitHub issues (intake requests, codebundle requests) using either a GitHub App (preferred) or a personal access token.
+
+**GitHub App (preferred)** -- provides short-lived installation tokens, no long-lived secrets:
+
+| Variable | Required | Description |
+|----------|----------|-------------|
+| `GITHUB_APP_ID` | Yes | Numeric App ID (Settings > General > App ID) |
+| `GITHUB_APP_PRIVATE_KEY` | Yes | PEM private key -- raw PEM text or base64-encoded PEM. Generate under the App's Settings > Private keys |
+| `GITHUB_APP_INSTALLATION_ID` | No | Installation ID. If omitted, the first installation returned by the API is used. Useful when the App is installed on multiple orgs |
+
+**Personal Access Token fallback:**
+
+| Variable | Required | Description |
+|----------|----------|-------------|
+| `GITHUB_TOKEN` | Yes | Classic or fine-grained PAT with `repo` (or Issues read/write) scope on the target repository |
+
+At least one of the above groups must be set, otherwise issue creation is disabled at runtime.
+
+Both the backend (`app/services/github_auth.py`) and the MCP server (`mcp-server/tools/github_issue.py`) use these variables.
+
 ### Secrets Configuration
 
 All secrets are managed via Kubernetes secrets. See [k8s/secrets-example.yaml](k8s/secrets-example.yaml) for examples.
diff --git a/cc-registry-v2/Taskfile.yml b/cc-registry-v2/Taskfile.yml
index 096ba89cd901..78613b2490df 100644
--- a/cc-registry-v2/Taskfile.yml
+++ b/cc-registry-v2/Taskfile.yml
@@ -15,7 +15,7 @@ tasks:
     desc: Start all services
     cmds:
       - echo "🚀 Starting all services..."
-      - docker-compose up -d --build
+      - . ./az.secret && docker-compose up -d --build
 
   stop:
     desc: Stop all services
@@ -27,7 +27,7 @@ tasks:
     desc: Restart all services
     cmds:
       - echo "🔄 Restarting all services..."
-      - docker-compose restart
+      - . ./az.secret && docker-compose restart
 
   # Monitoring commands
   logs:
@@ -83,7 +83,7 @@ tasks:
     desc: Start only backend services (db, redis, backend)
     cmds:
       - echo "🔧 Starting backend services..."
-      - docker-compose up -d database redis backend
+      - . ./az.secret && docker-compose up -d database redis backend
 
   frontend:
     desc: Start only frontend (requires backend)
@@ -95,14 +95,14 @@ tasks:
     desc: Start worker services
     cmds:
       - echo "🔄 Starting worker services..."
-      - docker-compose up -d worker scheduler flower
+      - . ./az.secret && docker-compose up -d worker scheduler flower
 
   # Development commands
   dev:
     desc: Start development environment (backend + frontend)
     cmds:
       - echo "💻 Starting development environment..."
-      - docker-compose up -d database redis backend frontend
+      - . ./az.secret && docker-compose up -d database redis backend frontend
 
   dev:logs:
     desc: Show logs for development services
diff --git a/cc-registry-v2/backend/app/core/config.py b/cc-registry-v2/backend/app/core/config.py
index 073e28160117..12a39e90e953 100644
--- a/cc-registry-v2/backend/app/core/config.py
+++ b/cc-registry-v2/backend/app/core/config.py
@@ -17,6 +17,14 @@ class Settings(BaseSettings):
     GITHUB_WEBHOOK_SECRET: str = "your_webhook_secret_here"
     GITHUB_OWNER: str = "runwhen-contrib"
     GITHUB_REPO: str = "codecollection-registry"
+
+    # GitHub App Authentication (preferred over GITHUB_TOKEN when configured)
+    GITHUB_APP_ID: Optional[str] = None
+    GITHUB_APP_PRIVATE_KEY: Optional[str] = None
+    GITHUB_APP_INSTALLATION_ID: Optional[int] = None
+
+    # Target repo for intake wizard issue creation
+    GITHUB_INTAKE_REPO: str = "runwhen-contrib/codecollection-registry"
     
     # Security
     SECRET_KEY: str = "your-secret-key-change-in-production"
diff --git a/cc-registry-v2/backend/app/main.py b/cc-registry-v2/backend/app/main.py
index dcd7f24c1177..2a0c2b88fcd8 100644
--- a/cc-registry-v2/backend/app/main.py
+++ b/cc-registry-v2/backend/app/main.py
@@ -99,7 +99,7 @@ async def health_check():
     }
 
 # Include routers
-from app.routers import admin, tasks, raw_data, admin_crud, task_execution_admin, versions, task_management, admin_inventory, helm_charts, mcp_chat, chat_debug, github_issues, schedule_config, analytics, vector_search
+from app.routers import admin, tasks, raw_data, admin_crud, task_execution_admin, versions, task_management, admin_inventory, helm_charts, mcp_chat, chat_debug, github_issues, schedule_config, analytics, vector_search, intake
 app.include_router(admin.router)
 app.include_router(tasks.router)
 app.include_router(raw_data.router)
@@ -115,6 +115,7 @@ async def health_check():
 app.include_router(github_issues.router, prefix="/api/v1")
 app.include_router(analytics.router)
 app.include_router(vector_search.router)
+app.include_router(intake.router)
 
 @app.get("/api/v1/registry/collections")
 async def list_collections():
diff --git a/cc-registry-v2/backend/app/routers/github_issues.py b/cc-registry-v2/backend/app/routers/github_issues.py
index 510099fd259d..4c54bb272d66 100644
--- a/cc-registry-v2/backend/app/routers/github_issues.py
+++ b/cc-registry-v2/backend/app/routers/github_issues.py
@@ -8,6 +8,7 @@
 import requests
 
 from app.core.config import settings
+from app.services.github_auth import get_github_auth
 
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/github", tags=["github"])
@@ -32,19 +33,18 @@ class IssueResponse(BaseModel):
 async def create_task_request_issue(request: TaskRequestIssue):
     """Create a GitHub issue requesting new tasks for the registry"""
     
-    if settings.GITHUB_TOKEN == "your_github_token_here":
+    gh = get_github_auth()
+    if not gh.is_configured:
         raise HTTPException(
             status_code=status.HTTP_501_NOT_IMPLEMENTED,
-            detail="GitHub integration not configured. Please set GITHUB_TOKEN in environment variables."
+            detail="GitHub integration not configured. Set GITHUB_APP_ID/GITHUB_APP_PRIVATE_KEY or GITHUB_TOKEN.",
         )
-    
+
     try:
-        # Create issue title
         title = f"Task Request: {request.user_query}"
-        
-        # Create issue body
+
         body_parts = [
-            "## 🚀 New Task Request",
+            "## New Task Request",
             "",
             f"**User Query:** {request.user_query}",
             "",
@@ -58,12 +58,10 @@ async def create_task_request_issue(request: TaskRequestIssue):
             f"- **Platform:** {request.platform}",
             f"- **Priority:** {request.priority}",
         ]
-        
+
         if request.user_email:
-            body_parts.extend([
-                f"- **Requested by:** {request.user_email}",
-            ])
-        
+            body_parts.append(f"- **Requested by:** {request.user_email}")
+
         body_parts.extend([
             "",
             "### Acceptance Criteria",
@@ -75,51 +73,52 @@ async def create_task_request_issue(request: TaskRequestIssue):
             "---",
             "*This issue was automatically created from the CodeCollection Registry chat interface.*"
         ])
-        
+
         body = "\n".join(body_parts)
-        
-        # Create GitHub issue
+
         github_api_url = f"https://api.github.com/repos/{settings.GITHUB_OWNER}/{settings.GITHUB_REPO}/issues"
-        
+
         headers = {
-            "Authorization": f"token {settings.GITHUB_TOKEN}",
+            **gh.auth_header(),
             "Accept": "application/vnd.github.v3+json",
-            "Content-Type": "application/json"
+            "Content-Type": "application/json",
         }
-        
+
         issue_data = {
             "title": title,
             "body": body,
-            "labels": ["enhancement", "task-request", f"platform:{request.platform.lower()}", f"priority:{request.priority}"]
+            "labels": ["enhancement", "task-request", f"platform:{request.platform.lower()}", f"priority:{request.priority}"],
         }
-        
+
         response = requests.post(github_api_url, json=issue_data, headers=headers)
-        
+
         if response.status_code == 201:
             issue_info = response.json()
             return IssueResponse(
                 issue_url=issue_info["html_url"],
                 issue_number=issue_info["number"],
-                message=f"Successfully created GitHub issue #{issue_info['number']}"
+                message=f"Successfully created GitHub issue #{issue_info['number']}",
             )
         else:
             logger.error(f"GitHub API error: {response.status_code} - {response.text}")
             raise HTTPException(
                 status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail=f"Failed to create GitHub issue: {response.text}"
+                detail=f"GitHub API error: {response.text}",
             )
-            
+
+    except HTTPException:
+        raise
     except requests.RequestException as e:
         logger.error(f"Error creating GitHub issue: {e}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Error communicating with GitHub: {str(e)}"
+            detail=f"Error communicating with GitHub: {str(e)}",
         )
     except Exception as e:
         logger.error(f"Unexpected error creating GitHub issue: {e}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Unexpected error: {str(e)}"
+            detail=f"Unexpected error: {str(e)}",
         )
 
 
diff --git a/cc-registry-v2/backend/app/routers/intake.py b/cc-registry-v2/backend/app/routers/intake.py
new file mode 100644
index 000000000000..3b4a70a48193
--- /dev/null
+++ b/cc-registry-v2/backend/app/routers/intake.py
@@ -0,0 +1,431 @@
+"""
+CodeBundle Intake Wizard Router
+
+Guides users through a conversational flow to define CodeBundle requirements,
+searches existing coverage via the MCP server, and files structured issues
+to the codebundle-farm repository.
+"""
+import logging
+from typing import Dict, List, Optional, Any
+from datetime import datetime, timezone
+from fastapi import APIRouter, HTTPException, status
+from pydantic import BaseModel
+import requests
+
+from app.core.config import settings
+from app.services.github_auth import get_github_auth
+from app.services.mcp_client import get_mcp_client, MCPError
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/api/v1/intake", tags=["intake"])
+
+CODEBUNDLE_FARM_REPO = settings.GITHUB_INTAKE_REPO
+
+PLATFORMS = [
+    "Kubernetes", "AWS", "Azure", "GCP", "Linux",
+    "Database", "Terraform", "Docker", "GitHub", "Other",
+]
+
+
+# =============================================================================
+# Request/Response Models
+# =============================================================================
+
+class SearchRequest(BaseModel):
+    """Step 1–2: User describes their need and we search for existing coverage."""
+    description: str
+    platform: Optional[str] = None
+
+
+class SearchMatch(BaseModel):
+    display_name: str
+    slug: str
+    collection_slug: str
+    platform: str
+    description: str
+    tasks: List[str] = []
+    tags: List[str] = []
+    relevance_score: float = 0.0
+    source_url: str = ""
+
+
+class ExistingRequest(BaseModel):
+    number: int
+    title: str
+    url: str
+    created_at: str
+
+
+class SearchResponse(BaseModel):
+    matches: List[SearchMatch]
+    existing_requests: List[ExistingRequest]
+    suggested_platform: str
+    query_used: str
+
+
+class DesignSpecDraft(BaseModel):
+    """Legacy: structured Design Spec. Kept for backwards compat; minimal intake uses SubmitRequest."""
+    codebundle_name: str
+    target_collection: str = "rw-cli-codecollection"
+    platform: str = ""
+    purpose: str
+    tasks: List[Dict[str, str]] = []
+    resource_types: List[str] = []
+    env_vars: List[Dict[str, str]] = []
+    secrets: List[Dict[str, str]] = []
+    tools_required: List[str] = []
+    related_bundles: List[str] = []
+    user_description: str
+    coverage_notes: str = ""
+
+
+class SubmitRequest(BaseModel):
+    """Minimal intake: title + description required. Search results included for the designer."""
+    title: str
+    description: str
+    extra_context: Optional[str] = None
+    contact_email: Optional[str] = None
+    contact_ok: Optional[bool] = False
+    matches: List[SearchMatch] = []
+    existing_requests: List[ExistingRequest] = []
+
+
+class SubmitResponse(BaseModel):
+    issue_url: str
+    issue_number: int
+    message: str
+
+
+# =============================================================================
+# Endpoints
+# =============================================================================
+
+@router.get("/platforms")
+async def get_platforms():
+    """Return the list of supported platforms for the wizard."""
+    return {"platforms": PLATFORMS}
+
+
+@router.post("/search", response_model=SearchResponse)
+async def search_existing_coverage(req: SearchRequest):
+    """
+    Search for existing CodeBundles and open requests that match the
+    user's description. Called during wizard steps 1–3.
+    """
+    mcp = get_mcp_client()
+    matches: List[SearchMatch] = []
+    existing_requests: List[ExistingRequest] = []
+    suggested_platform = req.platform or ""
+
+    # Search existing CodeBundles via MCP
+    try:
+        if await mcp.is_available():
+            args: Dict[str, Any] = {"query": req.description, "max_results": 8}
+            if req.platform:
+                args["platform"] = req.platform
+
+            result = await mcp.call_tool("find_codebundle", args)
+            if result:
+                matches = _parse_codebundle_results(result)
+
+            # Check for open requests
+            search_term = req.platform or req.description.split()[0] if req.description else ""
+            if search_term:
+                req_result = await mcp.call_tool("check_existing_requests", {"search_term": search_term})
+                if req_result:
+                    existing_requests = _parse_existing_requests(req_result)
+    except MCPError as e:
+        logger.warning(f"MCP search failed, continuing without results: {e}")
+    except Exception as e:
+        logger.warning(f"Unexpected error during MCP search: {e}")
+
+    # Infer platform from description if not provided
+    if not suggested_platform:
+        suggested_platform = _infer_platform(req.description)
+
+    return SearchResponse(
+        matches=matches,
+        existing_requests=existing_requests,
+        suggested_platform=suggested_platform,
+        query_used=req.description,
+    )
+
+
+@router.post("/generate-spec", response_model=DesignSpecDraft)
+async def generate_design_spec(
+    description: str,
+    platform: str,
+    tasks_description: str,
+    resource_types: str = "",
+    tools: str = "",
+):
+    """
+    Generate a draft Design Spec from user-provided information.
+    This is a helper that pre-fills the spec structure; the frontend
+    lets the user refine it before submission.
+    """
+    task_list = [t.strip() for t in tasks_description.split("\n") if t.strip()]
+    tasks = [{"name": _slugify_task(t), "checks": t} for t in task_list]
+    resources = [r.strip() for r in resource_types.split(",") if r.strip()]
+    tool_list = [t.strip() for t in tools.split(",") if t.strip()]
+
+    name = _generate_bundle_name(platform, description)
+
+    return DesignSpecDraft(
+        codebundle_name=name,
+        platform=platform,
+        purpose=description,
+        tasks=tasks,
+        resource_types=resources,
+        tools_required=tool_list,
+        user_description=description,
+    )
+
+
+@router.post("/submit", response_model=SubmitResponse)
+async def submit_intake(req: SubmitRequest):
+    """
+    Create a GitHub Issue in codebundle-farm. Requires only title + description.
+    Search results (matches, existing_requests) are included in the issue body
+    so the designer can see existing coverage and avoid duplication.
+    """
+    gh = get_github_auth()
+    if not gh.is_configured:
+        raise HTTPException(
+            status_code=status.HTTP_501_NOT_IMPLEMENTED,
+            detail="GitHub integration not configured. Set GITHUB_APP_ID/GITHUB_APP_PRIVATE_KEY or GITHUB_TOKEN.",
+        )
+
+    title = f"[intake] {req.title[:100]}"
+    body = _build_minimal_issue_body(req)
+    platform = _infer_platform(req.description)
+    labels = ["intake", "needs-architect"]
+    if platform:
+        labels.append(f"platform:{platform.lower()}")
+
+    try:
+        api_url = f"https://api.github.com/repos/{CODEBUNDLE_FARM_REPO}/issues"
+        headers = {
+            **gh.auth_header(),
+            "Accept": "application/vnd.github.v3+json",
+        }
+        issue_data = {"title": title, "body": body, "labels": labels}
+
+        response = requests.post(api_url, json=issue_data, headers=headers)
+
+        if response.status_code == 201:
+            info = response.json()
+            return SubmitResponse(
+                issue_url=info["html_url"],
+                issue_number=info["number"],
+                message=f"Created issue #{info['number']} in {CODEBUNDLE_FARM_REPO}",
+            )
+        else:
+            logger.error(f"GitHub API error: {response.status_code} - {response.text}")
+            raise HTTPException(
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                detail=f"GitHub API error: {response.text}",
+            )
+    except HTTPException:
+        raise
+    except requests.RequestException as e:
+        logger.error(f"Error creating GitHub issue: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Error communicating with GitHub: {e}",
+        )
+    except Exception as e:
+        logger.error(f"Unexpected error in submit_intake: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Unexpected error: {e}",
+        )
+
+
+# =============================================================================
+# Helpers
+# =============================================================================
+
+
+def _build_minimal_issue_body(req: SubmitRequest) -> str:
+    """Build issue body with original request + full existing coverage details for the designer."""
+    parts = [
+        "## Request",
+        "",
+        f"**Title:** {req.title}",
+        "",
+        "**Description:**",
+        "",
+        "\n".join(f"> {line}" for line in req.description.splitlines()),
+        "",
+    ]
+
+    if req.extra_context:
+        parts.extend([
+            "**Additional context:**",
+            "",
+            req.extra_context,
+            "",
+        ])
+
+    # Existing CodeBundles found by search — full details for the designer
+    if req.matches:
+        parts.extend([
+            "---",
+            "## Existing Coverage (from registry search)",
+            "",
+            "The following CodeBundles may overlap with this request. Designer: consider reusing, extending, or differentiating.",
+            "",
+        ])
+        for i, m in enumerate(req.matches, 1):
+            score_str = f" ({int(m.relevance_score * 100)}% match)" if m.relevance_score > 0 else ""
+            parts.append(f"### {i}. {m.display_name}{score_str}")
+            parts.append("")
+            parts.append(f"- **Collection:** `{m.collection_slug}`")
+            parts.append(f"- **Platform:** {m.platform or '—'}")
+            parts.append(f"- **Description:** {m.description[:500]}{'…' if len(m.description) > 500 else ''}")
+            if m.tasks:
+                parts.append(f"- **Tasks:** {', '.join(m.tasks[:8])}{'…' if len(m.tasks) > 8 else ''}")
+            if m.tags:
+                parts.append(f"- **Tags:** {', '.join(m.tags[:10])}")
+            if m.source_url:
+                parts.append(f"- **Link:** {m.source_url}")
+            parts.append("")
+
+    # Existing open requests — designer can consolidate
+    if req.existing_requests:
+        parts.extend([
+            "---",
+            "## Open Requests (may overlap)",
+            "",
+            "Consider commenting on an existing issue instead of duplicating work.",
+            "",
+        ])
+        for r in req.existing_requests:
+            parts.append(f"- [#{r.number} {r.title}]({r.url})")
+        parts.append("")
+
+    if req.contact_email:
+        parts.append(f"**Contact:** {req.contact_email}")
+        parts.append("")
+    if req.contact_ok:
+        parts.append("**Contact OK:** Yes, please reach out.")
+        parts.append("")
+
+    parts.extend([
+        "---",
+        f"*Created via CodeCollection Registry intake at {datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M UTC')}.*",
+    ])
+    return "\n".join(parts)
+
+
+def _infer_platform(description: str) -> str:
+    """Best-effort platform detection from free text."""
+    d = description.lower()
+    mapping = [
+        (["kubernetes", "k8s", "kubectl", "pod", "deployment", "namespace", "helm"], "Kubernetes"),
+        (["aws", "amazon", "s3", "ec2", "lambda", "cloudwatch", "iam"], "AWS"),
+        (["azure", "az ", "aks", "app service", "resource group"], "Azure"),
+        (["gcp", "google cloud", "gke", "bigquery", "pubsub"], "GCP"),
+        (["terraform", "tfstate", "hcl"], "Terraform"),
+        (["docker", "container", "dockerfile"], "Docker"),
+        (["github", "gh ", "actions", "repository"], "GitHub"),
+        (["postgres", "mysql", "redis", "database", "sql"], "Database"),
+        (["linux", "ssh", "systemd", "cron"], "Linux"),
+    ]
+    for keywords, platform in mapping:
+        if any(kw in d for kw in keywords):
+            return platform
+    return ""
+
+
+def _generate_bundle_name(platform: str, description: str) -> str:
+    """Generate a bundle name slug from platform and description."""
+    prefix = platform.lower().replace(" ", "-") if platform else "generic"
+    words = description.lower().split()[:4]
+    slug = "-".join(w for w in words if len(w) > 2 and w.isalnum())
+    if not slug:
+        slug = "healthcheck"
+    return f"{prefix}-{slug}"
+
+
+def _slugify_task(description: str) -> str:
+    """Turn a task description into a Robot Framework task name."""
+    words = description.strip().split()[:8]
+    return " ".join(w.capitalize() for w in words)
+
+
+def _parse_codebundle_results(markdown: str) -> List[SearchMatch]:
+    """Parse the markdown output from MCP find_codebundle into structured matches."""
+    matches = []
+    current: Dict[str, Any] = {}
+
+    for line in markdown.split("\n"):
+        line = line.strip()
+        if line.startswith("## ") and "**" in line:
+            if current.get("display_name"):
+                matches.append(SearchMatch(**current))
+            name = line.split("**")[1] if "**" in line else line[3:]
+            current = {
+                "display_name": name.strip(),
+                "slug": "",
+                "collection_slug": "",
+                "platform": "",
+                "description": "",
+                "tasks": [],
+                "tags": [],
+                "relevance_score": 0.0,
+                "source_url": "",
+            }
+        elif line.startswith("**Collection:**"):
+            current["collection_slug"] = line.split("**Collection:**")[1].strip()
+        elif line.startswith("**Platform:**"):
+            current["platform"] = line.split("**Platform:**")[1].strip()
+        elif line.startswith("**Description:**"):
+            current["description"] = line.split("**Description:**")[1].strip()
+        elif line.startswith("**Relevance:**"):
+            try:
+                score_str = line.split("**Relevance:**")[1].strip().rstrip("%")
+                current["relevance_score"] = float(score_str) / 100
+            except (ValueError, IndexError):
+                pass
+        elif line.startswith("**Tags:**"):
+            tags_str = line.split("**Tags:**")[1].strip()
+            current["tags"] = [t.strip() for t in tags_str.split(",") if t.strip()]
+        elif line.startswith("**Source:**"):
+            # Extract slug from source link
+            if "/codebundles/" in line:
+                slug_part = line.split("/codebundles/")[-1].rstrip(")")
+                current["slug"] = slug_part
+                current["source_url"] = line.split("(")[-1].rstrip(")") if "(" in line else ""
+        elif line.startswith("- ") and current.get("display_name"):
+            task = line[2:].strip()
+            if task and "tasks" in current:
+                current["tasks"].append(task)
+
+    if current.get("display_name"):
+        matches.append(SearchMatch(**current))
+
+    return matches
+
+
+def _parse_existing_requests(markdown: str) -> List[ExistingRequest]:
+    """Parse the markdown output from MCP check_existing_requests."""
+    requests_list = []
+    for line in markdown.split("\n"):
+        line = line.strip()
+        if line.startswith("- **#"):
+            try:
+                number = int(line.split("**#")[1].split("**")[0])
+                title = line.split("[")[1].split("]")[0] if "[" in line else ""
+                url = line.split("(")[1].split(")")[0] if "(" in line else ""
+                created = ""
+                if "Created:" in line:
+                    created = line.split("Created:")[1].strip()
+                requests_list.append(ExistingRequest(
+                    number=number, title=title, url=url, created_at=created,
+                ))
+            except (IndexError, ValueError):
+                continue
+    return requests_list
diff --git a/cc-registry-v2/backend/app/services/github_auth.py b/cc-registry-v2/backend/app/services/github_auth.py
new file mode 100644
index 000000000000..58a8ddc8bd98
--- /dev/null
+++ b/cc-registry-v2/backend/app/services/github_auth.py
@@ -0,0 +1,206 @@
+"""
+GitHub App authentication service.
+
+Generates short-lived installation access tokens from a GitHub App's
+private key.  Falls back to the static GITHUB_TOKEN PAT when App
+credentials are not configured.
+"""
+import base64
+import logging
+import threading
+import time
+from typing import Optional
+
+import httpx
+from jose import jwt as jose_jwt
+
+from app.core.config import settings
+
+logger = logging.getLogger(__name__)
+
+GITHUB_API = "https://api.github.com"
+
+
+class GitHubAuth:
+    """Manages GitHub authentication via App credentials or PAT fallback."""
+
+    def __init__(self) -> None:
+        self._private_key: Optional[str] = None
+        self._app_id: Optional[str] = None
+        self._installation_id: Optional[int] = settings.GITHUB_APP_INSTALLATION_ID
+        self._token: Optional[str] = None
+        self._token_expires_at: float = 0
+        self._lock = threading.Lock()
+
+        raw_key = settings.GITHUB_APP_PRIVATE_KEY
+        has_app_id = bool(settings.GITHUB_APP_ID)
+        has_key = bool(raw_key)
+        has_pat = bool(settings.GITHUB_TOKEN and settings.GITHUB_TOKEN != "your_github_token_here")
+
+        logger.info(
+            "GitHub auth init: GITHUB_APP_ID=%s, GITHUB_APP_PRIVATE_KEY=%s (%d chars), "
+            "GITHUB_APP_INSTALLATION_ID=%s, GITHUB_TOKEN=%s",
+            "set" if has_app_id else "MISSING",
+            "set" if has_key else "MISSING",
+            len(raw_key) if raw_key else 0,
+            settings.GITHUB_APP_INSTALLATION_ID or "not set (will auto-discover)",
+            "set" if has_pat else "MISSING/default",
+        )
+
+        if has_app_id and has_key:
+            self._app_id = settings.GITHUB_APP_ID
+            self._private_key = self._decode_key(raw_key)
+            if self._private_key:
+                logger.info("GitHub App authentication configured (app_id=%s)", self._app_id)
+            else:
+                logger.warning("GITHUB_APP_PRIVATE_KEY could not be decoded; falling back to PAT")
+        elif has_app_id and not has_key:
+            logger.warning("GITHUB_APP_ID is set but GITHUB_APP_PRIVATE_KEY is missing")
+        elif has_key and not has_app_id:
+            logger.warning("GITHUB_APP_PRIVATE_KEY is set but GITHUB_APP_ID is missing")
+
+        if not self.is_configured:
+            logger.warning(
+                "GitHub integration NOT configured — issue creation will be disabled. "
+                "Set GITHUB_APP_ID + GITHUB_APP_PRIVATE_KEY, or GITHUB_TOKEN."
+            )
+
+    @property
+    def is_app_auth(self) -> bool:
+        return bool(self._app_id and self._private_key)
+
+    @property
+    def is_configured(self) -> bool:
+        if self.is_app_auth:
+            return True
+        return bool(settings.GITHUB_TOKEN and settings.GITHUB_TOKEN != "your_github_token_here")
+
+    # ------------------------------------------------------------------
+    # Public API
+    # ------------------------------------------------------------------
+
+    def get_token(self) -> str:
+        """Return a valid GitHub token (installation token or PAT)."""
+        if self.is_app_auth:
+            return self._get_installation_token()
+        return settings.GITHUB_TOKEN
+
+    def auth_header(self) -> dict:
+        """Return an Authorization header dict ready for requests."""
+        token = self.get_token()
+        if self.is_app_auth:
+            return {"Authorization": f"Bearer {token}"}
+        return {"Authorization": f"token {token}"}
+
+    # ------------------------------------------------------------------
+    # Internals
+    # ------------------------------------------------------------------
+
+    @staticmethod
+    def _decode_key(raw: str) -> Optional[str]:
+        """Accept either a PEM string or a base64-encoded PEM."""
+        if raw.startswith("-----BEGIN"):
+            return raw
+        try:
+            decoded = base64.b64decode(raw).decode("utf-8")
+            if "-----BEGIN" in decoded:
+                return decoded
+        except Exception:
+            pass
+        logger.error("GITHUB_APP_PRIVATE_KEY is not a valid PEM or base64-encoded PEM")
+        return None
+
+    def _make_jwt(self) -> str:
+        """Create a short-lived JWT signed with the App's private key."""
+        now = int(time.time())
+        payload = {
+            "iat": now - 60,
+            "exp": now + (10 * 60),
+            "iss": self._app_id,
+        }
+        return jose_jwt.encode(payload, self._private_key, algorithm="RS256")
+
+    def _discover_installation_id(self, app_jwt: str) -> Optional[int]:
+        """Find the first installation of the App."""
+        try:
+            resp = httpx.get(
+                f"{GITHUB_API}/app/installations",
+                headers={
+                    "Authorization": f"Bearer {app_jwt}",
+                    "Accept": "application/vnd.github+json",
+                },
+                timeout=15,
+            )
+            if resp.status_code != 200:
+                logger.error("Failed to list installations: %s %s", resp.status_code, resp.text)
+                return None
+            installations = resp.json()
+            if not installations:
+                logger.error("No installations found for GitHub App %s", self._app_id)
+                return None
+            inst_id = installations[0]["id"]
+            logger.info("Auto-discovered GitHub App installation_id=%s", inst_id)
+            return inst_id
+        except Exception as exc:
+            logger.error("Error discovering installation: %s", exc)
+            return None
+
+    def _request_installation_token(self, app_jwt: str, installation_id: int) -> Optional[str]:
+        """Exchange the JWT for an installation access token."""
+        try:
+            resp = httpx.post(
+                f"{GITHUB_API}/app/installations/{installation_id}/access_tokens",
+                headers={
+                    "Authorization": f"Bearer {app_jwt}",
+                    "Accept": "application/vnd.github+json",
+                },
+                timeout=15,
+            )
+            if resp.status_code != 201:
+                logger.error("Failed to create installation token: %s %s", resp.status_code, resp.text)
+                return None
+            data = resp.json()
+            self._token_expires_at = time.time() + 3500
+            return data["token"]
+        except Exception as exc:
+            logger.error("Error requesting installation token: %s", exc)
+            return None
+
+    def _get_installation_token(self) -> str:
+        """Return a cached installation token, refreshing if needed."""
+        if self._token and time.time() < self._token_expires_at:
+            return self._token
+
+        with self._lock:
+            if self._token and time.time() < self._token_expires_at:
+                return self._token
+
+            app_jwt = self._make_jwt()
+
+            if not self._installation_id:
+                self._installation_id = self._discover_installation_id(app_jwt)
+                if not self._installation_id:
+                    raise RuntimeError("Cannot discover GitHub App installation; set GITHUB_APP_INSTALLATION_ID")
+
+            token = self._request_installation_token(app_jwt, self._installation_id)
+            if not token:
+                raise RuntimeError("Failed to obtain GitHub App installation token")
+
+            self._token = token
+            return self._token
+
+
+# ---------------------------------------------------------------------------
+# Singleton
+# ---------------------------------------------------------------------------
+_instance: Optional[GitHubAuth] = None
+_singleton_lock = threading.Lock()
+
+
+def get_github_auth() -> GitHubAuth:
+    global _instance
+    if _instance is None:
+        with _singleton_lock:
+            if _instance is None:
+                _instance = GitHubAuth()
+    return _instance
diff --git a/cc-registry-v2/docker-compose.yml b/cc-registry-v2/docker-compose.yml
index 19325929a070..b30e2db0e601 100644
--- a/cc-registry-v2/docker-compose.yml
+++ b/cc-registry-v2/docker-compose.yml
@@ -165,6 +165,9 @@ services:
       - SKIP_PREFLIGHT_CHECK=true
       - DISABLE_ESLINT_PLUGIN=true
       - NODE_OPTIONS=--max-old-space-size=4096
+      # Accept any Host header (required for Remote SSH port forwarding / tunnels)
+      - HOST=0.0.0.0
+      - DANGEROUSLY_DISABLE_HOST_CHECK=true
       - WDS_SOCKET_HOST=localhost
       - WDS_SOCKET_PORT=3000
     volumes:
diff --git a/cc-registry-v2/frontend/public/index.html b/cc-registry-v2/frontend/public/index.html
index 52f90d3e9e3f..fc5ad06b65fa 100644
--- a/cc-registry-v2/frontend/public/index.html
+++ b/cc-registry-v2/frontend/public/index.html
@@ -4,12 +4,19 @@
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#FF6B35" />
+    <meta name="theme-color" content="#2F80ED" />
     <meta
       name="description"
-      content="RunWhen CodeCollection Registry - Browse and manage Robot Framework codebundles"
+      content="AI SRE tools for troubleshooting, monitoring, and day2 ops. Find and configure automation for your environment."
     />
+    <!-- Open Graph / LinkedIn and social link previews -->
+    <meta property="og:title" content="RunWhen Registry – Tools for AI SRE Agents" />
+    <meta property="og:description" content="AI SRE tools for troubleshooting, monitoring, and day2 ops. Find and configure automation for your environment." />
+    <meta property="og:type" content="website" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo_small.png" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,7 +31,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>RunWhen CodeCollection Registry</title>
+    <title>RunWhen Registry – Tools for AI SRE Agents</title>
     
     <!-- Google Analytics (only loads if REACT_APP_GA_MEASUREMENT_ID is set) -->
     <script>
diff --git a/cc-registry-v2/frontend/src/App.tsx b/cc-registry-v2/frontend/src/App.tsx
index 5777e1d3e8e5..7a93231db9f9 100644
--- a/cc-registry-v2/frontend/src/App.tsx
+++ b/cc-registry-v2/frontend/src/App.tsx
@@ -17,6 +17,7 @@ import Login from './pages/Login';
 import ConfigBuilder from './pages/ConfigBuilder';
 import Chat from './pages/Chat';
 import ChatDebug from './pages/ChatDebug';
+import IntakeWizard from './pages/IntakeWizard';
 import Footer from './components/Footer';
 import { CartProvider } from './contexts/CartContext';
 import { AuthProvider } from './contexts/AuthContext';
@@ -38,6 +39,7 @@ function AppContent() {
           <Route path="/collections/:collectionSlug/codebundles/:codebundleSlug" element={<CodeBundleDetail />} />
           <Route path="/all-tasks" element={<AllTasks />} />
           <Route path="/chat" element={<Chat />} />
+          <Route path="/intake" element={<IntakeWizard />} />
           <Route path="/test-api" element={<TestAPI />} />
           <Route path="/login" element={<Login />} />
           
diff --git a/cc-registry-v2/frontend/src/components/Footer.tsx b/cc-registry-v2/frontend/src/components/Footer.tsx
index ddd7f906e3e1..1acaecc09577 100644
--- a/cc-registry-v2/frontend/src/components/Footer.tsx
+++ b/cc-registry-v2/frontend/src/components/Footer.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Box, Typography, Link, Container, SvgIcon } from '@mui/material';
+import { Box, Typography, Link, Container, SvgIcon, useTheme } from '@mui/material';
 import GitHubIcon from '@mui/icons-material/GitHub';
 
 // Custom Slack icon using official Slack logo SVG path
@@ -10,10 +10,11 @@ const SlackIcon: React.FC<{ fontSize?: 'small' | 'medium' | 'large' | 'inherit'
 );
 
 const Footer: React.FC = () => {
+  const theme = useTheme();
   return (
     <Box
       sx={{
-        backgroundColor: (theme) => theme.palette.mode === 'light' ? '#2f80ed' : '#1a1a2e',
+        backgroundColor: theme.palette.mode === 'light' ? theme.palette.primary.main : '#0f172a',
         color: 'white',
         padding: 3,
         marginTop: 'auto',
diff --git a/cc-registry-v2/frontend/src/components/Header.tsx b/cc-registry-v2/frontend/src/components/Header.tsx
index 6548f574b1c0..436afa5d6abd 100644
--- a/cc-registry-v2/frontend/src/components/Header.tsx
+++ b/cc-registry-v2/frontend/src/components/Header.tsx
@@ -9,6 +9,7 @@ import {
   Menu,
   MenuItem,
   Divider,
+  Tooltip,
 } from '@mui/material';
 import { Link, useLocation, useNavigate } from 'react-router-dom';
 import {
@@ -17,6 +18,7 @@ import {
   MoreVert as MoreVertIcon,
   DarkMode as DarkModeIcon,
   LightMode as LightModeIcon,
+  ChatBubbleOutline as ChatIcon,
 } from '@mui/icons-material';
 import { useCart } from '../contexts/CartContext';
 import { useAuth } from '../contexts/AuthContext';
@@ -121,12 +123,27 @@ const Header: React.FC = () => {
               fontWeight: 'bold',
             }}
           >
-            CodeCollection Registry
+            Registry
           </Typography>
         </Box>
         
         <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, marginLeft: 'auto' }}>
-          <Box sx={{ display: { xs: 'none', md: 'flex' }, gap: 1 }}>
+          <Box sx={{ display: { xs: 'none', md: 'flex' }, gap: 1, alignItems: 'center' }}>
+            <Tooltip title="Chat with the Registry AI assistant" arrow placement="bottom">
+              <Button
+                component={Link}
+                to="/chat"
+                color="inherit"
+                startIcon={<ChatIcon sx={{ fontSize: 20 }} />}
+                sx={{
+                  color: 'white',
+                  fontWeight: location.pathname === '/chat' ? 'bold' : 'normal',
+                }}
+              >
+                Chat
+              </Button>
+            </Tooltip>
+
             {/* Browse Dropdown */}
             <Button
               color="inherit"
@@ -218,14 +235,14 @@ const Header: React.FC = () => {
 
             <Button
               component={Link}
-              to="/chat"
+              to="/intake"
               color="inherit"
               sx={{
                 color: 'white',
-                fontWeight: location.pathname === '/chat' ? 'bold' : 'normal',
+                fontWeight: location.pathname === '/intake' ? 'bold' : 'normal',
               }}
             >
-              Registry Chat
+              Request
             </Button>
 
             <Box sx={{ borderLeft: '1px solid rgba(255,255,255,0.3)', height: 20, mx: 1, alignSelf: 'center' }} />
diff --git a/cc-registry-v2/frontend/src/index.css b/cc-registry-v2/frontend/src/index.css
index a2c2c8dac103..8ffc8a3162da 100644
--- a/cc-registry-v2/frontend/src/index.css
+++ b/cc-registry-v2/frontend/src/index.css
@@ -40,7 +40,7 @@ h3 {
 .codebundle-name {
   font-family: 'Monaco', 'Menlo', 'Consolas', monospace;
   font-weight: 600;
-  color: #5282f1;
+  color: #2F80ED;
 }
 
 
diff --git a/cc-registry-v2/frontend/src/pages/AllTasks.tsx b/cc-registry-v2/frontend/src/pages/AllTasks.tsx
index 56333073891b..9bdaa3426fb8 100644
--- a/cc-registry-v2/frontend/src/pages/AllTasks.tsx
+++ b/cc-registry-v2/frontend/src/pages/AllTasks.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import {
   Box,
@@ -7,7 +7,6 @@ import {
   Select,
   MenuItem,
   FormControl,
-  InputLabel,
   Card,
   CardContent,
   Chip,
@@ -15,7 +14,9 @@ import {
   CircularProgress,
   Alert,
   Pagination,
-  InputAdornment
+  InputAdornment,
+  ToggleButtonGroup,
+  ToggleButton,
 } from '@mui/material';
 import {
   Search as SearchIcon,
@@ -24,11 +25,17 @@ import {
   Launch as LaunchIcon,
   Close as CloseIcon,
   Add as AddIcon,
-  Remove as RemoveIcon
+  Remove as RemoveIcon,
+  ViewList as ListIcon,
+  ViewModule as GroupedIcon,
+  Sort as SortIcon,
 } from '@mui/icons-material';
 import { apiService, Task, TasksResponse } from '../services/api';
 import { useCart } from '../contexts/CartContext';
 
+type ViewMode = 'grouped' | 'presentation';
+type SortOrder = 'alpha' | 'diverse' | 'codebundle';
+
 const AllTasks: React.FC = () => {
   const [searchParams, setSearchParams] = useSearchParams();
   const [tasks, setTasks] = useState<Task[]>([]);
@@ -36,28 +43,38 @@ const AllTasks: React.FC = () => {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   
-  // Get initial category from URL params
-  const initialCategory = searchParams.get('category');
+  const initialTags = searchParams.get('support_tags');
+  const initialView = searchParams.get('view') as ViewMode | null;
+  const initialSort = searchParams.get('sort') as SortOrder | null;
   
-  // Filter states
   const [selectedSupportTags, setSelectedSupportTags] = useState<string[]>(
-    initialCategory ? [initialCategory] : []
+    initialTags ? initialTags.split(',').map(t => t.trim()).filter(Boolean) : []
   );
   const [supportTagSearch, setSupportTagSearch] = useState('');
   const [supportTagSearchInput, setSupportTagSearchInput] = useState('');
   const [selectedCollection, setSelectedCollection] = useState('');
   const [taskSearch, setTaskSearch] = useState('');
   
-  // Pagination
   const [page, setPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
   const [hasMore, setHasMore] = useState(false);
   const tasksPerPage = 200;
   
-  // Cart functionality
+  const validViews: ViewMode[] = ['grouped', 'presentation'];
+  const validSorts: SortOrder[] = ['alpha', 'diverse', 'codebundle'];
+  const [viewMode, setViewMode] = useState<ViewMode>(initialView && validViews.includes(initialView) ? initialView : 'grouped');
+  const [sortOrder, setSortOrder] = useState<SortOrder>(initialSort && validSorts.includes(initialSort) ? initialSort : 'alpha');
+
+  // Keep URL params in sync with view/sort state
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams);
+    if (viewMode !== 'grouped') { params.set('view', viewMode); } else { params.delete('view'); }
+    if (sortOrder !== 'alpha') { params.set('sort', sortOrder); } else { params.delete('sort'); }
+    setSearchParams(params, { replace: true });
+  }, [viewMode, sortOrder]);
+  
   const { addToCart, removeFromCart, isInCart } = useCart();
 
-  // Fetch tasks
   const fetchTasks = async (
     search?: string,
     supportTags?: string[],
@@ -90,28 +107,22 @@ const AllTasks: React.FC = () => {
     }
   };
 
-  // Initial load
   useEffect(() => {
     fetchTasks();
   }, []);
 
-  // Handle filter changes (support tags and collection)
   useEffect(() => {
     setPage(1);
     fetchTasks('', selectedSupportTags, selectedCollection, 1);
   }, [selectedSupportTags, selectedCollection]);
 
-  // Debounce tag search input (only filter after user stops typing for 200ms)
   useEffect(() => {
     const timeoutId = setTimeout(() => {
       setSupportTagSearch(supportTagSearchInput);
     }, 200);
-
     return () => clearTimeout(timeoutId);
   }, [supportTagSearchInput]);
 
-
-  // Handle filter changes
   const handleSupportTagAdd = (tag: string) => {
     if (!selectedSupportTags.includes(tag)) {
       const newTags = [...selectedSupportTags, tag];
@@ -134,7 +145,6 @@ const AllTasks: React.FC = () => {
     fetchTasks('', selectedSupportTags, collection, 1);
   };
 
-  // Clear filters
   const clearFilters = () => {
     setSelectedSupportTags([]);
     setSupportTagSearch('');
@@ -145,23 +155,19 @@ const AllTasks: React.FC = () => {
     fetchTasks('', [], '', 1);
   };
 
-  // Handle pagination
   const handlePageChange = (event: React.ChangeEvent<unknown>, value: number) => {
     setPage(value);
     fetchTasks('', selectedSupportTags, selectedCollection, value);
   };
 
-  // Get unique collections from tasks
   const uniqueCollections = Array.from(
     new Set(tasks.map(task => task.collection_slug))
   ).sort();
 
-  // Filter support tags based on search (show all if less than 2 characters)
   const filteredSupportTags = supportTags.filter(tag =>
     supportTagSearch.length < 2 || tag.toLowerCase().includes(supportTagSearch.toLowerCase())
   );
 
-  // Group tasks by CodeBundle
   interface CodeBundleGroup {
     id: number;
     name: string;
@@ -175,8 +181,9 @@ const AllTasks: React.FC = () => {
     runbook_source_url: string;
   }
 
-  // Filter tasks by search term (searches both task names and codebundle names)
   const filteredTasks = tasks.filter(task => {
+    // Hide generic templated tasks that accept arbitrary user input
+    if (task.name.includes('${TASK_TITLE}')) return false;
     if (!taskSearch) return true;
     const searchLower = taskSearch.toLowerCase();
     return (
@@ -208,18 +215,92 @@ const AllTasks: React.FC = () => {
     return groups;
   }, {} as Record<string, { codebundle: CodeBundleGroup; tasks: Task[] }>);
 
+  // Sorted flat task list for presentation mode
+  const sortedFlatTasks = useMemo(() => {
+    const list = [...filteredTasks];
+    if (sortOrder === 'alpha') {
+      list.sort((a, b) => a.name.localeCompare(b.name));
+    } else if (sortOrder === 'codebundle') {
+      list.sort((a, b) => a.codebundle_name.localeCompare(b.codebundle_name) || a.name.localeCompare(b.name));
+    } else if (sortOrder === 'diverse') {
+      // Round-robin across primary support tag to interleave platforms
+      const buckets: Record<string, Task[]> = {};
+      for (const task of list) {
+        const tag = task.support_tags?.[0] || '_other';
+        if (!buckets[tag]) buckets[tag] = [];
+        buckets[tag].push(task);
+      }
+      // Sort within each bucket alphabetically
+      for (const key of Object.keys(buckets)) {
+        buckets[key].sort((a, b) => a.name.localeCompare(b.name));
+      }
+      const keys = Object.keys(buckets).sort();
+      const result: Task[] = [];
+      let remaining = true;
+      let idx = 0;
+      while (remaining) {
+        remaining = false;
+        for (const key of keys) {
+          if (idx < buckets[key].length) {
+            result.push(buckets[key][idx]);
+            remaining = true;
+          }
+        }
+        idx++;
+      }
+      return result;
+    }
+    return list;
+  }, [filteredTasks, sortOrder]);
+
   const totalPages = Math.ceil(totalCount / tasksPerPage);
 
+  const isPresentation = viewMode === 'presentation';
+
   return (
     <Box sx={{ p: 3 }}>
-      {/* Header */}
-      <Box sx={{ mb: 3 }}>
-        <Typography variant="h4" component="h1" gutterBottom>
-          All Tasks
-        </Typography>
-        <Typography variant="body1" color="text.secondary">
-          Browse and search through all available tasks across all CodeCollections.
-        </Typography>
+      {/* Header with view toggle */}
+      <Box sx={{ mb: 2, display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', flexWrap: 'wrap', gap: 2 }}>
+        <Box>
+          <Typography variant="h4" component="h1" gutterBottom sx={{ fontSize: { xs: '1.5rem', md: '1.75rem' }, fontWeight: 700, mb: 0.5 }}>
+            All Tasks
+          </Typography>
+          <Typography variant="body1" color="text.secondary" sx={{ fontSize: '0.9375rem' }}>
+            {filteredTasks.length} tasks across {Object.keys(groupedTasks).length} CodeBundles
+          </Typography>
+        </Box>
+
+        <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
+          {/* Sort (presentation mode only) */}
+          {isPresentation && (
+            <FormControl size="small" sx={{ minWidth: 180 }}>
+              <Select
+                value={sortOrder}
+                onChange={(e) => setSortOrder(e.target.value as SortOrder)}
+                startAdornment={<SortIcon sx={{ mr: 0.5, fontSize: 18, color: 'text.secondary' }} />}
+                sx={{ fontSize: '0.875rem' }}
+              >
+                <MenuItem value="alpha">Alphabetical</MenuItem>
+                <MenuItem value="diverse">Platform Diversity</MenuItem>
+                <MenuItem value="codebundle">By CodeBundle</MenuItem>
+              </Select>
+            </FormControl>
+          )}
+
+          <ToggleButtonGroup
+            value={viewMode}
+            exclusive
+            onChange={(_, v) => { if (v) setViewMode(v); }}
+            size="small"
+          >
+            <ToggleButton value="grouped" sx={{ px: 1.5, textTransform: 'none', fontSize: '0.8125rem' }}>
+              <GroupedIcon sx={{ fontSize: 18, mr: 0.5 }} /> Grouped
+            </ToggleButton>
+            <ToggleButton value="presentation" sx={{ px: 1.5, textTransform: 'none', fontSize: '0.8125rem' }}>
+              <ListIcon sx={{ fontSize: 18, mr: 0.5 }} /> Presentation
+            </ToggleButton>
+          </ToggleButtonGroup>
+        </Box>
       </Box>
 
       {/* Search Bar */}
@@ -243,383 +324,294 @@ const AllTasks: React.FC = () => {
               '&.Mui-focused fieldset': { borderColor: 'primary.main' },
             }
           }}
-          sx={{ maxWidth: 600 }}
+          sx={{ maxWidth: isPresentation ? '100%' : 600 }}
         />
       </Box>
 
-      {/* Main Layout: Full Width Support Tags + Content */}
-      <Box sx={{ display: 'flex', gap: 1.5, height: 'calc(100vh - 200px)' }}>
-        {/* Left: Support Tags Filter - Full Height */}
-        <Box sx={{ width: 280, flexShrink: 0 }}>
-          <Card sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
-            <CardContent sx={{ p: 1.5, display: 'flex', flexDirection: 'column', height: '100%', '&:last-child': { pb: 1.5 } }}>
-              <Typography variant="subtitle2" gutterBottom sx={{ display: 'flex', alignItems: 'center', fontWeight: 600, mb: 1 }}>
-                <FilterIcon sx={{ mr: 1, fontSize: 18 }} />
-                Support Tags ({selectedSupportTags.length}/{filteredSupportTags.length})
-              </Typography>
-              
-              {/* Selected Tags */}
-              {selectedSupportTags.length > 0 && (
-                <Box sx={{ mb: 1, display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
-                  {selectedSupportTags.map((tag) => (
-                    <Chip
-                      key={tag}
-                      label={tag}
-                      size="small"
-                      onDelete={() => handleSupportTagRemove(tag)}
-                      deleteIcon={<CloseIcon />}
-                      color="primary"
-                      variant="filled"
-                      sx={{ height: 24, fontSize: '0.75rem' }}
-                    />
-                  ))}
-                </Box>
-              )}
-              
-              {/* Tag Search */}
-              <TextField
-                fullWidth
-                size="small"
-                placeholder="Filter tags..."
-                value={supportTagSearchInput}
-                onChange={(e) => setSupportTagSearchInput(e.target.value)}
-                InputProps={{
-                  startAdornment: (
-                    <InputAdornment position="start">
-                      <SearchIcon fontSize="small" />
-                    </InputAdornment>
-                  )
-                }}
-                sx={{ mb: 1 }}
-              />
-              
-              {/* Available Tags - Full Height List */}
-              <Box sx={{ 
-                flex: 1,
-                overflow: 'auto', 
-                border: '1px solid', 
-                borderColor: 'divider',
-                borderRadius: 1,
-                bgcolor: 'background.paper'
-              }}>
-                {filteredSupportTags.map((tag, index) => (
-                  <Box
-                    key={tag}
-                    sx={{
-                      display: 'flex',
-                      alignItems: 'center',
-                      justifyContent: 'space-between',
-                      px: 1,
-                      py: 0.5,
-                      cursor: 'pointer',
-                      '&:hover': { bgcolor: 'action.hover' },
-                      borderBottom: index < filteredSupportTags.length - 1 ? '1px solid' : 'none',
-                      borderBottomColor: 'divider',
-                      bgcolor: selectedSupportTags.includes(tag) ? 'primary.50' : 'transparent'
-                    }}
-                    onClick={() => {
-                      if (selectedSupportTags.includes(tag)) {
-                        handleSupportTagRemove(tag);
-                      } else {
-                        handleSupportTagAdd(tag);
-                      }
-                    }}
-                  >
-                    <Typography variant="body2" sx={{ 
-                      flex: 1,
-                      fontSize: '0.75rem',
-                      fontWeight: selectedSupportTags.includes(tag) ? 500 : 400,
-                      overflow: 'hidden',
-                      textOverflow: 'ellipsis'
-                    }}>
-                      {tag}
-                    </Typography>
-                    <Box
-                      sx={{
-                        width: 12,
-                        height: 12,
-                        border: '2px solid',
-                        borderColor: selectedSupportTags.includes(tag) ? 'primary.main' : 'grey.400',
-                        borderRadius: 0.5,
-                        bgcolor: selectedSupportTags.includes(tag) ? 'primary.main' : 'transparent',
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'center',
-                        flexShrink: 0
-                      }}
-                    >
-                      {selectedSupportTags.includes(tag) && (
-                        <Box
-                          sx={{
-                            width: 6,
-                            height: 6,
-                            bgcolor: 'white',
-                            borderRadius: 0.25
-                          }}
-                        />
-                      )}
-                    </Box>
-                  </Box>
-                ))}
-                {filteredSupportTags.length === 0 && supportTagSearch.length >= 2 && (
-                  <Box sx={{ p: 2, textAlign: 'center', color: 'text.secondary' }}>
-                    <Typography variant="body2" sx={{ fontSize: '0.75rem' }}>
-                      No tags found matching "{supportTagSearch}"
-                    </Typography>
-                  </Box>
-                )}
-              </Box>
-
-              {/* Collection Filter & Clear Button */}
-              <Box sx={{ mt: 1 }}>
-                <FormControl fullWidth size="small" sx={{ mb: 1 }}>
-                  <Select
-                    value={selectedCollection}
-                    onChange={(e) => handleCollectionChange(e.target.value)}
-                    displayEmpty
-                    sx={{ fontSize: '0.8125rem' }}
-                  >
-                    <MenuItem value="">All Collections</MenuItem>
-                    {uniqueCollections.map((collection) => (
-                      <MenuItem key={collection} value={collection}>
-                        {collection}
-                      </MenuItem>
-                    ))}
-                  </Select>
-                </FormControl>
-                
-                <Button variant="outlined" onClick={clearFilters} fullWidth size="small" sx={{ py: 0.5, fontSize: '0.75rem' }}>
-                  Clear Filters
-                </Button>
-              </Box>
-            </CardContent>
-          </Card>
-        </Box>
-
-        {/* Right Content - Tasks List */}
-        <Box sx={{ flex: 1, minWidth: 0, overflow: 'auto' }}>
-          {/* Compact Filter Bar */}
-          <Box sx={{ mb: 1, p: 1, bgcolor: 'action.hover', borderRadius: 1, border: '1px solid', borderColor: 'divider' }}>
-            <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', flexWrap: 'wrap', gap: 1 }}>
-              <Typography variant="body2" color="text.secondary" sx={{ fontSize: '0.75rem' }}>
-                {Object.keys(groupedTasks).length} CodeBundle{Object.keys(groupedTasks).length !== 1 ? 's' : ''} • {filteredTasks.length} task{filteredTasks.length !== 1 ? 's' : ''}
-                {selectedSupportTags.length > 0 && ` • ${selectedSupportTags.length} tag${selectedSupportTags.length > 1 ? 's' : ''}`}
-                {selectedCollection && ` • ${selectedCollection}`}
-              </Typography>
-              
-              {/* Quick Clear Filters */}
-              {(selectedSupportTags.length > 0 || selectedCollection) && (
-                <Button
-                  size="small"
-                  variant="text"
-                  onClick={clearFilters}
-                  startIcon={<ClearIcon />}
-                  sx={{ fontSize: '0.75rem', minHeight: 'auto', py: 0.25, px: 0.5 }}
-                >
-                  Clear
-                </Button>
+      {/* ============================================================
+          PRESENTATION MODE — flat, full-width task list
+          ============================================================ */}
+      {isPresentation ? (
+        <Box sx={{ height: 'calc(100vh - 220px)', overflow: 'auto' }}>
+          {/* Active filters bar */}
+          {(selectedSupportTags.length > 0 || selectedCollection) && (
+            <Box sx={{ mb: 1.5, p: 1, bgcolor: 'action.hover', borderRadius: 1, border: '1px solid', borderColor: 'divider', display: 'flex', alignItems: 'center', gap: 1, flexWrap: 'wrap' }}>
+              <FilterIcon sx={{ fontSize: 16, color: 'text.secondary' }} />
+              {selectedSupportTags.map(tag => (
+                <Chip key={tag} label={tag} size="small" onDelete={() => handleSupportTagRemove(tag)} deleteIcon={<CloseIcon />} color="primary" variant="filled" sx={{ height: 24, fontSize: '0.75rem' }} />
+              ))}
+              {selectedCollection && (
+                <Chip label={selectedCollection} size="small" onDelete={() => handleCollectionChange('')} deleteIcon={<CloseIcon />} color="secondary" variant="filled" sx={{ height: 24, fontSize: '0.75rem' }} />
               )}
+              <Button size="small" variant="text" onClick={clearFilters} startIcon={<ClearIcon />} sx={{ fontSize: '0.75rem', ml: 'auto' }}>Clear All</Button>
             </Box>
-          </Box>
+          )}
 
-          {/* Loading */}
           {loading && (
             <Box sx={{ display: 'flex', justifyContent: 'center', py: 8 }}>
               <CircularProgress />
             </Box>
           )}
 
-          {/* Error */}
-          {error && (
-            <Alert severity="error" sx={{ mb: 3 }}>
-              {error}
-            </Alert>
-          )}
+          {error && <Alert severity="error" sx={{ mb: 3 }}>{error}</Alert>}
 
-          {/* Tasks List */}
           {!loading && !error && (
             <>
-              {Object.keys(groupedTasks).length > 0 ? (
-                <Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5 }}>
-                  {Object.entries(groupedTasks).map(([key, group]) => (
-                    <Card key={key}>
-                      <CardContent sx={{ p: 1.5, '&:last-child': { pb: 1.5 } }}>
-                        {/* CodeBundle Header */}
-                        <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', mb: 1.5, pb: 1, borderBottom: '1px solid', borderColor: 'divider' }}>
-                          <Box sx={{ flex: 1 }}>
-                            <Typography variant="h6" component="h2" sx={{ mb: 0.5, fontSize: '1rem', fontWeight: 600 }}>
-                              {group.codebundle.name}
-                            </Typography>
-                            <Typography variant="body2" color="text.secondary" sx={{ fontSize: '0.8125rem' }}>
-                              {group.codebundle.collection_name} • {group.tasks.filter(t => t.type === 'TaskSet').length} tasks • {group.tasks.filter(t => t.type === 'SLI').length} SLIs
-                            </Typography>
-                          </Box>
-                          
-                          <Box sx={{ ml: 1.5, display: 'flex', flexDirection: 'row', gap: 0.75, alignItems: 'center' }}>
-                            <Button
-                              variant={isInCart(group.codebundle.id) ? "contained" : "outlined"}
-                              size="small"
-                              color={isInCart(group.codebundle.id) ? "error" : "primary"}
-                              startIcon={isInCart(group.codebundle.id) ? <RemoveIcon /> : <AddIcon />}
-                              sx={{ fontSize: '0.75rem', py: 0.5, px: 1.5, whiteSpace: 'nowrap' }}
-                              onClick={() => {
-                                if (isInCart(group.codebundle.id)) {
-                                  removeFromCart(group.codebundle.id);
-                                } else {
-                                  const codebundleItem = {
-                                    id: group.codebundle.id,
-                                    name: group.codebundle.name,
-                                    slug: group.codebundle.slug,
-                                    display_name: group.codebundle.name,
-                                    description: group.codebundle.description,
-                                    doc: '',
-                                    readme: null,
-                                    author: group.codebundle.author,
-                                    support_tags: group.codebundle.support_tags,
-                                    tasks: group.tasks.filter(t => t.type === 'TaskSet').map(t => ({name: t.name, doc: t.description || '', tags: []})),
-                                    slis: group.tasks.filter(t => t.type === 'SLI').map(t => ({name: t.name, doc: t.description || '', tags: []})),
-                                    task_count: group.tasks.filter(t => t.type === 'TaskSet').length,
-                                    sli_count: group.tasks.filter(t => t.type === 'SLI').length,
-                                    runbook_source_url: group.codebundle.runbook_source_url || '',
-                                    created_at: new Date().toISOString(),
-                                    updated_at: new Date().toISOString(),
-                                    git_updated_at: null,
-                                    configuration_type: {
-                                      type: 'Manual' as const,
-                                      has_generation_rules: false,
-                                      platform: null,
-                                      resource_types: [],
-                                      match_patterns: [],
-                                      templates: [],
-                                      output_items: [],
-                                      level_of_detail: null,
-                                      runwhen_directory_path: null
-                                    },
-                                    codecollection: {
-                                      id: 0,
-                                      name: group.codebundle.collection_name,
-                                      slug: group.codebundle.collection_slug,
-                                      git_url: group.tasks[0]?.git_url || '',
-                                      git_ref: (group.tasks[0] as any)?.git_ref || 'main'
-                                    }
-                                  };
-                                  addToCart(codebundleItem);
-                                }
-                              }}
-                            >
-                              {isInCart(group.codebundle.id) ? "Remove" : "Select CodeBundle"}
-                            </Button>
-                            <Button
-                              variant="outlined"
-                              size="small"
-                              startIcon={<LaunchIcon />}
-                              href={`/collections/${group.codebundle.collection_slug}/codebundles/${group.codebundle.slug}`}
-                              sx={{ fontSize: '0.75rem', py: 0.5, px: 1.5, whiteSpace: 'nowrap' }}
-                            >
-                              View
-                            </Button>
-                          </Box>
-                        </Box>
-
-                        {/* TaskSet and SLI Tasks */}
-                        <Box>
-                          {/* TaskSet Tasks */}
-                          {group.tasks.filter(task => task.type === 'TaskSet').length > 0 && (
-                            <Box sx={{ mb: 1.5 }}>
-                              <Typography variant="subtitle2" sx={{ color: 'primary.main', fontWeight: 600, mb: 0.5, fontSize: '0.875rem' }}>
-                                TaskSet ({group.tasks.filter(task => task.type === 'TaskSet').length})
-                              </Typography>
-                              <Box sx={{ display: 'flex', flexDirection: 'column', gap: 0.5 }}>
-                                {group.tasks.filter(task => task.type === 'TaskSet').map((task) => (
-                                  <Box
-                                    key={task.id}
-                                    sx={{
-                                      px: 1.5,
-                                      py: 1,
-                                      minHeight: 40,
-                                      bgcolor: 'action.hover',
-                                      borderRadius: 0.5,
-                                      border: '1px solid',
-                                      borderColor: 'divider',
-                                      display: 'flex',
-                                      justifyContent: 'space-between',
-                                      alignItems: 'center',
-                                    }}
-                                  >
-                                    <Typography variant="body2" sx={{ fontSize: '0.8125rem', fontWeight: 500 }}>
-                                      {task.name}
-                                    </Typography>
-                                  </Box>
-                                ))}
-                              </Box>
-                            </Box>
-                          )}
-
-                          {/* SLI Tasks */}
-                          {group.tasks.filter(task => task.type === 'SLI').length > 0 && (
-                            <Box>
-                              <Typography variant="subtitle2" sx={{ color: 'secondary.main', fontWeight: 600, mb: 0.5, fontSize: '0.875rem' }}>
-                                SLI ({group.tasks.filter(task => task.type === 'SLI').length})
-                              </Typography>
-                              <Box sx={{ display: 'flex', flexDirection: 'column', gap: 0.5 }}>
-                                {group.tasks.filter(task => task.type === 'SLI').map((task) => (
-                                  <Box
-                                    key={task.id}
-                                    sx={{
-                                      px: 1.5,
-                                      py: 1,
-                                      minHeight: 40,
-                                      bgcolor: 'action.hover',
-                                      borderRadius: 0.5,
-                                      border: '1px solid',
-                                      borderColor: 'divider',
-                                      display: 'flex',
-                                      justifyContent: 'space-between',
-                                      alignItems: 'center',
-                                    }}
-                                  >
-                                    <Typography variant="body2" sx={{ fontSize: '0.8125rem', fontWeight: 500 }}>
-                                      {task.name}
-                                    </Typography>
-                                  </Box>
-                                ))}
-                              </Box>
-                            </Box>
-                          )}
-                        </Box>
-                      </CardContent>
-                    </Card>
+              {sortedFlatTasks.length > 0 ? (
+                <Box sx={{ border: '1px solid', borderColor: 'divider', borderRadius: 1, overflow: 'hidden' }}>
+                  {sortedFlatTasks.map((task, idx) => (
+                    <Box
+                      key={task.id}
+                      sx={{
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'space-between',
+                        px: 3,
+                        py: 1.5,
+                        minHeight: 52,
+                        borderBottom: idx < sortedFlatTasks.length - 1 ? '1px solid' : 'none',
+                        borderBottomColor: 'divider',
+                        '&:hover': { bgcolor: 'action.hover' },
+                        transition: 'background-color 0.1s',
+                      }}
+                    >
+                      <Typography sx={{ fontSize: '1.0625rem', fontWeight: 500, color: 'text.primary', flex: 1, mr: 2 }}>
+                        {task.name}
+                      </Typography>
+                      <Box sx={{ display: 'flex', gap: 0.5, flexShrink: 0 }}>
+                        {task.support_tags.slice(0, 2).map(tag => (
+                          <Chip
+                            key={tag}
+                            label={tag}
+                            size="small"
+                            variant="outlined"
+                            onClick={() => handleSupportTagAdd(tag)}
+                            sx={{
+                              height: 22,
+                              fontSize: '0.6875rem',
+                              fontWeight: 500,
+                              borderColor: 'divider',
+                              color: 'text.secondary',
+                              cursor: 'pointer',
+                              '&:hover': { borderColor: 'primary.main', color: 'primary.main' },
+                            }}
+                          />
+                        ))}
+                      </Box>
+                    </Box>
                   ))}
                 </Box>
               ) : (
                 <Box sx={{ textAlign: 'center', py: 8 }}>
-                  <Typography variant="h6" color="text.secondary" gutterBottom>
-                    No tasks found
-                  </Typography>
-                  <Typography variant="body2" color="text.secondary">
-                    Try adjusting your search criteria or clearing filters.
-                  </Typography>
+                  <Typography variant="h6" color="text.secondary" gutterBottom>No tasks found</Typography>
+                  <Typography variant="body2" color="text.secondary">Try adjusting your search criteria or clearing filters.</Typography>
                 </Box>
               )}
 
-              {/* Pagination */}
               {totalPages > 1 && (
                 <Box sx={{ display: 'flex', justifyContent: 'center', mt: 4 }}>
-                  <Pagination
-                    count={totalPages}
-                    page={page}
-                    onChange={handlePageChange}
-                    color="primary"
-                    size="large"
-                    showFirstButton
-                    showLastButton
-                  />
+                  <Pagination count={totalPages} page={page} onChange={handlePageChange} color="primary" size="large" showFirstButton showLastButton />
                 </Box>
               )}
             </>
           )}
         </Box>
-      </Box>
+      ) : (
+        /* ============================================================
+           GROUPED MODE — original sidebar + codebundle cards
+           ============================================================ */
+        <Box sx={{ display: 'flex', gap: 1.5, height: 'calc(100vh - 220px)' }}>
+          {/* Left: Support Tags Filter */}
+          <Box sx={{ width: 280, flexShrink: 0 }}>
+            <Card sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
+              <CardContent sx={{ p: 1.5, display: 'flex', flexDirection: 'column', height: '100%', '&:last-child': { pb: 1.5 } }}>
+                <Typography variant="subtitle2" gutterBottom sx={{ display: 'flex', alignItems: 'center', fontWeight: 600, mb: 1 }}>
+                  <FilterIcon sx={{ mr: 1, fontSize: 18 }} />
+                  Support Tags ({selectedSupportTags.length}/{filteredSupportTags.length})
+                </Typography>
+                
+                {selectedSupportTags.length > 0 && (
+                  <Box sx={{ mb: 1, display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
+                    {selectedSupportTags.map((tag) => (
+                      <Chip key={tag} label={tag} size="small" onDelete={() => handleSupportTagRemove(tag)} deleteIcon={<CloseIcon />} color="primary" variant="filled" sx={{ height: 24, fontSize: '0.75rem' }} />
+                    ))}
+                  </Box>
+                )}
+                
+                <TextField
+                  fullWidth size="small" placeholder="Filter tags..."
+                  value={supportTagSearchInput}
+                  onChange={(e) => setSupportTagSearchInput(e.target.value)}
+                  InputProps={{ startAdornment: (<InputAdornment position="start"><SearchIcon fontSize="small" /></InputAdornment>) }}
+                  sx={{ mb: 1 }}
+                />
+                
+                <Box sx={{ flex: 1, overflow: 'auto', border: '1px solid', borderColor: 'divider', borderRadius: 1, bgcolor: 'background.paper' }}>
+                  {filteredSupportTags.map((tag, index) => (
+                    <Box
+                      key={tag}
+                      sx={{
+                        display: 'flex', alignItems: 'center', justifyContent: 'space-between',
+                        px: 1, py: 0.5, cursor: 'pointer',
+                        '&:hover': { bgcolor: 'action.hover' },
+                        borderBottom: index < filteredSupportTags.length - 1 ? '1px solid' : 'none',
+                        borderBottomColor: 'divider',
+                        bgcolor: selectedSupportTags.includes(tag) ? 'primary.50' : 'transparent'
+                      }}
+                      onClick={() => {
+                        if (selectedSupportTags.includes(tag)) { handleSupportTagRemove(tag); }
+                        else { handleSupportTagAdd(tag); }
+                      }}
+                    >
+                      <Typography variant="body2" sx={{ flex: 1, fontSize: '0.75rem', fontWeight: selectedSupportTags.includes(tag) ? 500 : 400, overflow: 'hidden', textOverflow: 'ellipsis' }}>
+                        {tag}
+                      </Typography>
+                      <Box sx={{ width: 12, height: 12, border: '2px solid', borderColor: selectedSupportTags.includes(tag) ? 'primary.main' : 'grey.400', borderRadius: 0.5, bgcolor: selectedSupportTags.includes(tag) ? 'primary.main' : 'transparent', display: 'flex', alignItems: 'center', justifyContent: 'center', flexShrink: 0 }}>
+                        {selectedSupportTags.includes(tag) && <Box sx={{ width: 6, height: 6, bgcolor: 'white', borderRadius: 0.25 }} />}
+                      </Box>
+                    </Box>
+                  ))}
+                  {filteredSupportTags.length === 0 && supportTagSearch.length >= 2 && (
+                    <Box sx={{ p: 2, textAlign: 'center', color: 'text.secondary' }}>
+                      <Typography variant="body2" sx={{ fontSize: '0.75rem' }}>No tags found matching "{supportTagSearch}"</Typography>
+                    </Box>
+                  )}
+                </Box>
+
+                <Box sx={{ mt: 1 }}>
+                  <FormControl fullWidth size="small" sx={{ mb: 1 }}>
+                    <Select value={selectedCollection} onChange={(e) => handleCollectionChange(e.target.value)} displayEmpty sx={{ fontSize: '0.8125rem' }}>
+                      <MenuItem value="">All Collections</MenuItem>
+                      {uniqueCollections.map((collection) => (<MenuItem key={collection} value={collection}>{collection}</MenuItem>))}
+                    </Select>
+                  </FormControl>
+                  <Button variant="outlined" onClick={clearFilters} fullWidth size="small" sx={{ py: 0.5, fontSize: '0.75rem' }}>Clear Filters</Button>
+                </Box>
+              </CardContent>
+            </Card>
+          </Box>
+
+          {/* Right Content - Tasks List */}
+          <Box sx={{ flex: 1, minWidth: 0, overflow: 'auto' }}>
+            <Box sx={{ mb: 1, p: 1, bgcolor: 'action.hover', borderRadius: 1, border: '1px solid', borderColor: 'divider' }}>
+              <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', flexWrap: 'wrap', gap: 1 }}>
+                <Typography variant="body2" color="text.secondary" sx={{ fontSize: '0.75rem' }}>
+                  {Object.keys(groupedTasks).length} CodeBundle{Object.keys(groupedTasks).length !== 1 ? 's' : ''} • {filteredTasks.length} task{filteredTasks.length !== 1 ? 's' : ''}
+                  {selectedSupportTags.length > 0 && ` • ${selectedSupportTags.length} tag${selectedSupportTags.length > 1 ? 's' : ''}`}
+                  {selectedCollection && ` • ${selectedCollection}`}
+                </Typography>
+                {(selectedSupportTags.length > 0 || selectedCollection) && (
+                  <Button size="small" variant="text" onClick={clearFilters} startIcon={<ClearIcon />} sx={{ fontSize: '0.75rem', minHeight: 'auto', py: 0.25, px: 0.5 }}>Clear</Button>
+                )}
+              </Box>
+            </Box>
+
+            {loading && (<Box sx={{ display: 'flex', justifyContent: 'center', py: 8 }}><CircularProgress /></Box>)}
+            {error && (<Alert severity="error" sx={{ mb: 3 }}>{error}</Alert>)}
+
+            {!loading && !error && (
+              <>
+                {Object.keys(groupedTasks).length > 0 ? (
+                  <Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5 }}>
+                    {Object.entries(groupedTasks).map(([key, group]) => (
+                      <Card key={key}>
+                        <CardContent sx={{ p: 1.5, '&:last-child': { pb: 1.5 } }}>
+                          <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', mb: 1.5, pb: 1, borderBottom: '1px solid', borderColor: 'divider' }}>
+                            <Box sx={{ flex: 1 }}>
+                              <Typography variant="h6" component="h2" sx={{ mb: 0.5, fontSize: '1.125rem', fontWeight: 600, color: 'text.primary' }}>
+                                {group.codebundle.name}
+                              </Typography>
+                              <Typography variant="body2" color="text.secondary" sx={{ fontSize: '0.875rem' }}>
+                                {group.codebundle.collection_name} • {group.tasks.filter(t => t.type === 'TaskSet').length} tasks • {group.tasks.filter(t => t.type === 'SLI').length} SLIs
+                              </Typography>
+                            </Box>
+                            <Box sx={{ ml: 1.5, display: 'flex', flexDirection: 'row', gap: 0.75, alignItems: 'center' }}>
+                              <Button
+                                variant={isInCart(group.codebundle.id) ? "contained" : "outlined"} size="small"
+                                color={isInCart(group.codebundle.id) ? "error" : "primary"}
+                                startIcon={isInCart(group.codebundle.id) ? <RemoveIcon /> : <AddIcon />}
+                                sx={{ fontSize: '0.75rem', py: 0.5, px: 1.5, whiteSpace: 'nowrap' }}
+                                onClick={() => {
+                                  if (isInCart(group.codebundle.id)) {
+                                    removeFromCart(group.codebundle.id);
+                                  } else {
+                                    const codebundleItem = {
+                                      id: group.codebundle.id, name: group.codebundle.name, slug: group.codebundle.slug,
+                                      display_name: group.codebundle.name, description: group.codebundle.description,
+                                      doc: '', readme: null, author: group.codebundle.author, support_tags: group.codebundle.support_tags,
+                                      tasks: group.tasks.filter(t => t.type === 'TaskSet').map(t => ({name: t.name, doc: t.description || '', tags: []})),
+                                      slis: group.tasks.filter(t => t.type === 'SLI').map(t => ({name: t.name, doc: t.description || '', tags: []})),
+                                      task_count: group.tasks.filter(t => t.type === 'TaskSet').length,
+                                      sli_count: group.tasks.filter(t => t.type === 'SLI').length,
+                                      runbook_source_url: group.codebundle.runbook_source_url || '',
+                                      created_at: new Date().toISOString(), updated_at: new Date().toISOString(), git_updated_at: null,
+                                      configuration_type: { type: 'Manual' as const, has_generation_rules: false, platform: null, resource_types: [], match_patterns: [], templates: [], output_items: [], level_of_detail: null, runwhen_directory_path: null },
+                                      codecollection: { id: 0, name: group.codebundle.collection_name, slug: group.codebundle.collection_slug, git_url: group.tasks[0]?.git_url || '', git_ref: (group.tasks[0] as any)?.git_ref || 'main' }
+                                    };
+                                    addToCart(codebundleItem);
+                                  }
+                                }}
+                              >
+                                {isInCart(group.codebundle.id) ? "Remove" : "Select CodeBundle"}
+                              </Button>
+                              <Button variant="outlined" size="small" startIcon={<LaunchIcon />}
+                                href={`/collections/${group.codebundle.collection_slug}/codebundles/${group.codebundle.slug}`}
+                                sx={{ fontSize: '0.75rem', py: 0.5, px: 1.5, whiteSpace: 'nowrap' }}
+                              >View</Button>
+                            </Box>
+                          </Box>
+
+                          <Box>
+                            {group.tasks.filter(task => task.type === 'TaskSet').length > 0 && (
+                              <Box sx={{ mb: 1.5 }}>
+                                <Typography variant="subtitle2" sx={{ color: 'primary.main', fontWeight: 600, mb: 0.5, fontSize: '0.875rem' }}>
+                                  TaskSet ({group.tasks.filter(task => task.type === 'TaskSet').length})
+                                </Typography>
+                                <Box sx={{ display: 'flex', flexDirection: 'column', gap: 0.5 }}>
+                                  {group.tasks.filter(task => task.type === 'TaskSet').map((task) => (
+                                    <Box key={task.id} sx={{ px: 1.5, py: 0.75, minHeight: 40, bgcolor: 'action.hover', borderRadius: 0.5, border: '1px solid', borderColor: 'divider', display: 'flex', alignItems: 'center' }}>
+                                      <Typography variant="body2" sx={{ fontSize: '0.9375rem', fontWeight: 500, color: 'text.primary' }}>{task.name}</Typography>
+                                    </Box>
+                                  ))}
+                                </Box>
+                              </Box>
+                            )}
+                            {group.tasks.filter(task => task.type === 'SLI').length > 0 && (
+                              <Box>
+                                <Typography variant="subtitle2" sx={{ color: 'secondary.main', fontWeight: 600, mb: 0.5, fontSize: '0.875rem' }}>
+                                  SLI ({group.tasks.filter(task => task.type === 'SLI').length})
+                                </Typography>
+                                <Box sx={{ display: 'flex', flexDirection: 'column', gap: 0.5 }}>
+                                  {group.tasks.filter(task => task.type === 'SLI').map((task) => (
+                                    <Box key={task.id} sx={{ px: 1.5, py: 0.75, minHeight: 40, bgcolor: 'action.hover', borderRadius: 0.5, border: '1px solid', borderColor: 'divider', display: 'flex', alignItems: 'center' }}>
+                                      <Typography variant="body2" sx={{ fontSize: '0.9375rem', fontWeight: 500, color: 'text.primary' }}>{task.name}</Typography>
+                                    </Box>
+                                  ))}
+                                </Box>
+                              </Box>
+                            )}
+                          </Box>
+                        </CardContent>
+                      </Card>
+                    ))}
+                  </Box>
+                ) : (
+                  <Box sx={{ textAlign: 'center', py: 8 }}>
+                    <Typography variant="h6" color="text.secondary" gutterBottom>No tasks found</Typography>
+                    <Typography variant="body2" color="text.secondary">Try adjusting your search criteria or clearing filters.</Typography>
+                  </Box>
+                )}
+
+                {totalPages > 1 && (
+                  <Box sx={{ display: 'flex', justifyContent: 'center', mt: 4 }}>
+                    <Pagination count={totalPages} page={page} onChange={handlePageChange} color="primary" size="large" showFirstButton showLastButton />
+                  </Box>
+                )}
+              </>
+            )}
+          </Box>
+        </Box>
+      )}
     </Box>
   );
 };
diff --git a/cc-registry-v2/frontend/src/pages/Chat.tsx b/cc-registry-v2/frontend/src/pages/Chat.tsx
index c06fae03f0ef..df6485ead0e1 100644
--- a/cc-registry-v2/frontend/src/pages/Chat.tsx
+++ b/cc-registry-v2/frontend/src/pages/Chat.tsx
@@ -12,10 +12,6 @@ import {
   Link,
   Avatar,
   Button,
-  Dialog,
-  DialogTitle,
-  DialogContent,
-  DialogActions
 } from '@mui/material';
 import {
   Send as SendIcon,
@@ -30,8 +26,8 @@ import {
 } from '@mui/icons-material';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
-import { useLocation } from 'react-router-dom';
-import { chatApi, githubApi, ChatResponse, ExampleQueries, TaskRequestIssue } from '../services/api';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { chatApi, ChatResponse, ExampleQueries } from '../services/api';
 
 interface ChatMessage {
   id: string;
@@ -45,6 +41,7 @@ interface ChatMessage {
 
 const Chat: React.FC = () => {
   const location = useLocation();
+  const navigate = useNavigate();
   const [messages, setMessages] = useState<ChatMessage[]>([]);
   const [inputValue, setInputValue] = useState('');
   const [loading, setLoading] = useState(false);
@@ -53,10 +50,6 @@ const Chat: React.FC = () => {
   const [examples, setExamples] = useState<ExampleQueries | null>(null);
   const [copiedId, setCopiedId] = useState<string | null>(null);
   const [expandedTasks, setExpandedTasks] = useState<Set<string>>(new Set());
-  const [requestDialogOpen, setRequestDialogOpen] = useState(false);
-  const [requestContext, setRequestContext] = useState('');
-  const [currentRequestQuery, setCurrentRequestQuery] = useState('');
-  const [submittingRequest, setSubmittingRequest] = useState(false);
   const [initialQueryProcessed, setInitialQueryProcessed] = useState(false);
   const [codebundleContext, setCodebundleContext] = useState<any>(null);
   const messagesEndRef = useRef<HTMLDivElement>(null);
@@ -240,43 +233,8 @@ const Chat: React.FC = () => {
     }
   };
 
-  const handleOpenRequestDialog = (userQuery: string) => {
-    setCurrentRequestQuery(userQuery);
-    setRequestContext('');
-    setRequestDialogOpen(true);
-  };
-
-  const handleCloseRequestDialog = () => {
-    setRequestDialogOpen(false);
-    setRequestContext('');
-    setCurrentRequestQuery('');
-  };
-
-  const handleSubmitRequest = async () => {
-    setSubmittingRequest(true);
-    try {
-      // Combine the original query with additional context
-      const fullQuery = requestContext.trim() 
-        ? `${currentRequestQuery}\n\nAdditional context: ${requestContext}`
-        : currentRequestQuery;
-      
-      const template = await githubApi.getIssueTemplate(fullQuery);
-      const issueData: TaskRequestIssue = {
-        user_query: template.user_query,
-        task_description: template.task_description,
-        use_case: template.use_case,
-        platform: template.platform,
-        priority: template.priority
-      };
-      const result = await githubApi.createTaskRequest(issueData);
-      window.open(result.issue_url, '_blank');
-      handleCloseRequestDialog();
-    } catch (error: any) {
-      console.error('Error creating GitHub issue:', error);
-      alert(error.response?.data?.detail || 'Error creating GitHub issue');
-    } finally {
-      setSubmittingRequest(false);
-    }
+  const handleRequestCodeBundle = (userQuery: string) => {
+    navigate('/intake', { state: { initialQuery: userQuery } });
   };
 
   const handleKeyPress = (event: React.KeyboardEvent) => {
@@ -559,7 +517,7 @@ const Chat: React.FC = () => {
                                 size="small"
                                 variant="outlined"
                                 startIcon={<RequestIcon sx={{ fontSize: 16 }} />}
-                                onClick={() => handleOpenRequestDialog(message.userQuery || message.content)}
+                                onClick={() => handleRequestCodeBundle(message.userQuery || message.content)}
                                 sx={{
                                   textTransform: 'none',
                                   fontSize: '0.75rem',
@@ -624,7 +582,7 @@ const Chat: React.FC = () => {
                                 variant="contained"
                                 size="small"
                                 startIcon={<RequestIcon />}
-                                onClick={() => handleOpenRequestDialog(message.userQuery || message.content)}
+                                onClick={() => handleRequestCodeBundle(message.userQuery || message.content)}
                                 sx={{
                                   backgroundColor: 'primary.main',
                                   color: 'white',
@@ -845,74 +803,6 @@ const Chat: React.FC = () => {
         </Box>
       </Box>
 
-      {/* Request CodeBundle Dialog */}
-      <Dialog 
-        open={requestDialogOpen} 
-        onClose={handleCloseRequestDialog}
-        maxWidth="sm"
-        fullWidth
-      >
-        <DialogTitle>
-          Request a CodeBundle
-        </DialogTitle>
-        <DialogContent>
-          <Box sx={{ mt: 1 }}>
-            <Typography variant="body2" color="text.secondary" sx={{ mb: 2 }}>
-              Your original query:
-            </Typography>
-            <Paper sx={{ p: 2, backgroundColor: 'grey.50', mb: 3 }}>
-              <Typography variant="body2">
-                {currentRequestQuery}
-              </Typography>
-            </Paper>
-            
-            <Typography variant="body2" color="text.secondary" sx={{ mb: 1 }}>
-              Add more context to help us understand your needs (optional):
-            </Typography>
-            <TextField
-              fullWidth
-              multiline
-              rows={4}
-              value={requestContext}
-              onChange={(e) => setRequestContext(e.target.value)}
-              placeholder="e.g., I need this to work with AWS EKS clusters, integrate with PagerDuty alerts, and run every 5 minutes..."
-              variant="outlined"
-            />
-            
-            <Alert severity="info" sx={{ mt: 2 }}>
-              This will create a GitHub issue with your request. The more details you provide, the better we can help!
-            </Alert>
-          </Box>
-        </DialogContent>
-        <DialogActions sx={{ px: 3, pb: 2 }}>
-          <Button 
-            onClick={handleCloseRequestDialog}
-            disabled={submittingRequest}
-          >
-            Cancel
-          </Button>
-          <Button 
-            onClick={handleSubmitRequest}
-            variant="contained"
-            startIcon={submittingRequest ? <CircularProgress size={16} sx={{ color: 'white' }} /> : <RequestIcon />}
-            disabled={submittingRequest}
-            sx={{
-              backgroundColor: 'primary.main',
-              color: 'white',
-              '&:hover': { 
-                backgroundColor: 'primary.dark',
-                color: 'white'
-              },
-              '&.Mui-disabled': {
-                backgroundColor: 'rgba(82, 130, 241, 0.6)',
-                color: 'white'
-              }
-            }}
-          >
-            {submittingRequest ? 'Creating...' : 'Submit Request'}
-          </Button>
-        </DialogActions>
-      </Dialog>
     </Box>
   );
 };
diff --git a/cc-registry-v2/frontend/src/pages/Home.tsx b/cc-registry-v2/frontend/src/pages/Home.tsx
index 9884386edba8..90abf8be3834 100644
--- a/cc-registry-v2/frontend/src/pages/Home.tsx
+++ b/cc-registry-v2/frontend/src/pages/Home.tsx
@@ -101,7 +101,7 @@ const Home: React.FC = () => {
   };
 
   const handleTagClick = (tag: string) => {
-    navigate(`/all-tasks?category=${tag}`);
+    navigate(`/all-tasks?support_tags=${encodeURIComponent(tag)}`);
   };
 
   useEffect(() => {
@@ -208,7 +208,7 @@ const Home: React.FC = () => {
       <Box sx={{ 
         background: isDark
           ? 'linear-gradient(180deg, #1a1a2e 0%, #1a1a2e 5%, #16163a 50%, #1e2a4a 100%)'
-          : 'linear-gradient(180deg, #5282f1 0%, #5282f1 5%, #4a75d9 50%, #6b93f5 100%)',
+          : 'linear-gradient(180deg, #2F80ED 0%, #2F80ED 5%, #1a5fc9 50%, #5b9bf5 100%)',
         borderBottom: 'none',
         pt: { xs: 12, md: 16 },
         pb: { xs: 6, md: 10 },
@@ -249,7 +249,7 @@ const Home: React.FC = () => {
               lineHeight: 1.2
             }}
           >
-            CodeCollection Registry
+            RunWhen Registry
           </Typography>
           
           <Typography 
@@ -265,7 +265,7 @@ const Home: React.FC = () => {
               mx: 'auto'
             }}
           >
-            Explore the largest open library of AI SRE tools. Describe your problem and the assistant will suggest the right automation — then run it securely in your own environment.
+            Explore the largest open library of AI SRE tools. Describe your problem and the assistant will suggest the right automation to run securely in your own environment.
           </Typography>
 
           {/* Search Bar that routes to Registry Chat */}
@@ -423,17 +423,17 @@ const Home: React.FC = () => {
               left: '12%',
               right: '12%',
               height: 2,
-              background: '#5282f1',
+              background: '#2F80ED',
               borderRadius: 1,
               zIndex: 0,
             }} />
             {/* Steps */}
             <Box sx={{ display: 'flex', justifyContent: 'space-between', width: '100%', maxWidth: 700, position: 'relative', zIndex: 1 }}>
               {[
-                { label: 'Ask', color: '#5282f1', muiIcon: ChatIcon },
-                { label: 'Run Tools', color: '#5282f1', muiIcon: RunnerIcon },
-                { label: 'Collect Insights', color: '#5282f1', img: 'https://storage.googleapis.com/runwhen-nonprod-shared-images/icons/Eager-Edgar-Happy.png' },
-                { label: 'Resolve', color: '#5282f1', muiIcon: ResolveIcon },
+                { label: 'Ask', color: '#2F80ED', muiIcon: ChatIcon },
+                { label: 'Run Tools', color: '#2F80ED', muiIcon: RunnerIcon },
+                { label: 'Collect Insights', color: '#2F80ED', img: 'https://storage.googleapis.com/runwhen-nonprod-shared-images/icons/Eager-Edgar-Happy.png' },
+                { label: 'Resolve', color: '#2F80ED', muiIcon: ResolveIcon },
               ].map((step) => (
                 <Box key={step.label} sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 0.75 }}>
                   <Box sx={{
@@ -575,7 +575,7 @@ const Home: React.FC = () => {
                           width: page === activeCatPage ? 24 : 8,
                           height: 8,
                           borderRadius: 4,
-                          bgcolor: page === activeCatPage ? '#5282f1' : '#d0d8e8',
+                          bgcolor: page === activeCatPage ? '#2F80ED' : '#e2e8f0',
                           cursor: 'pointer',
                           transition: 'all 0.3s',
                         }}
@@ -600,7 +600,7 @@ const Home: React.FC = () => {
           {/* Left Column: Recently Updated CodeBundles */}
           <Box>
             <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 2 }}>
-              <TrendingIcon sx={{ color: '#5282f1', fontSize: 24 }} />
+              <TrendingIcon sx={{ color: '#2F80ED', fontSize: 24 }} />
               <Typography 
                 variant="h2" 
                 sx={{ 
@@ -729,7 +729,7 @@ const Home: React.FC = () => {
           {/* Right Column: Recently Updated Tasks */}
           <Box>
             <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mb: 2 }}>
-              <TrendingIcon sx={{ color: '#5282f1', fontSize: 24 }} />
+              <TrendingIcon sx={{ color: '#2F80ED', fontSize: 24 }} />
               <Typography 
                 variant="h2" 
                 sx={{ 
diff --git a/cc-registry-v2/frontend/src/pages/IntakeWizard.tsx b/cc-registry-v2/frontend/src/pages/IntakeWizard.tsx
new file mode 100644
index 000000000000..08611da262e5
--- /dev/null
+++ b/cc-registry-v2/frontend/src/pages/IntakeWizard.tsx
@@ -0,0 +1,310 @@
+import React, { useState, useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+import {
+  Box, Container, Typography, TextField, Button, Paper,
+  CircularProgress, Alert, Collapse, FormControlLabel, Checkbox,
+  ToggleButton, ToggleButtonGroup,
+} from '@mui/material';
+import {
+  CheckCircle as CheckIcon,
+  OpenInNew as ExternalLinkIcon,
+  ExpandMore as ExpandMoreIcon,
+  ExpandLess as ExpandLessIcon,
+  RocketLaunch as RocketIcon,
+  Chat as ChatIcon,
+  Tune as TuneIcon,
+} from '@mui/icons-material';
+import { intakeApi, IntakeSearchMatch, IntakeExistingRequest } from '../services/api';
+
+type Mode = 'simple' | 'explicit';
+
+export default function IntakeWizard() {
+  const location = useLocation();
+  const [mode, setMode] = useState<Mode>('simple');
+
+  // Core answers (question-driven)
+  const [problemDescription, setProblemDescription] = useState('');
+  const [platform, setPlatform] = useState('');
+  const [healthyLooksLike, setHealthyLooksLike] = useState('');
+  const [anythingElse, setAnythingElse] = useState('');
+
+  // Explicit mode only
+  const [explicitTasks, setExplicitTasks] = useState('');
+  const [explicitVariables, setExplicitVariables] = useState('');
+
+  // Meta
+  const [contactEmail, setContactEmail] = useState('');
+  const [contactOk, setContactOk] = useState(false);
+  const [showContact, setShowContact] = useState(false);
+
+  const [submitting, setSubmitting] = useState(false);
+  const [submitResult, setSubmitResult] = useState<{ url: string; number: number } | null>(null);
+  const [error, setError] = useState('');
+
+  // Pre-fill from Chat "Request CodeBundle" or other entry points
+  useEffect(() => {
+    const state = location.state as { initialQuery?: string } | null;
+    if (state?.initialQuery?.trim()) {
+      setProblemDescription(state.initialQuery.trim());
+    }
+  }, [location.state]);
+
+  const buildTitle = () => {
+    const firstLine = problemDescription.split('\n')[0].trim();
+    return firstLine.length > 60 ? firstLine.slice(0, 57) + '...' : firstLine || 'CodeBundle request';
+  };
+
+  const buildDescription = () => {
+    const parts: string[] = [problemDescription];
+    if (platform.trim()) parts.push(`\n**Platform:** ${platform.trim()}`);
+    if (healthyLooksLike.trim()) parts.push(`\n**What healthy looks like:** ${healthyLooksLike.trim()}`);
+    if (anythingElse.trim()) parts.push(`\n**Additional context:** ${anythingElse.trim()}`);
+    if (mode === 'explicit' && (explicitTasks.trim() || explicitVariables.trim())) {
+      if (explicitTasks.trim()) parts.push(`\n**Suggested tasks:**\n${explicitTasks.trim()}`);
+      if (explicitVariables.trim()) parts.push(`\n**Variables/config:**\n${explicitVariables.trim()}`);
+    }
+    return parts.join('\n');
+  };
+
+  const handleSubmit = async () => {
+    setSubmitting(true);
+    setError('');
+    try {
+      const description = buildDescription();
+      let matches: IntakeSearchMatch[] = [];
+      let existingRequests: IntakeExistingRequest[] = [];
+      try {
+        const searchRes = await intakeApi.search(description);
+        matches = searchRes.matches;
+        existingRequests = searchRes.existing_requests;
+      } catch {
+        // Search failed — continue
+      }
+
+      const res = await intakeApi.submit({
+        title: buildTitle(),
+        description,
+        extra_context: undefined,
+        contact_email: contactEmail.trim() || undefined,
+        contact_ok: contactOk,
+        matches,
+        existing_requests: existingRequests,
+      });
+      setSubmitResult({ url: res.issue_url, number: res.issue_number });
+    } catch (err: any) {
+      setError(err?.response?.data?.detail || 'Failed to create request. Please try again.');
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  const canSubmit = problemDescription.trim().length > 0;
+
+  if (submitResult) {
+    return (
+      <Container maxWidth="sm" sx={{ py: 4 }}>
+        <Paper sx={{ p: 4, textAlign: 'center' }}>
+          <CheckIcon color="success" sx={{ fontSize: 64, mb: 2 }} />
+          <Typography variant="h5" gutterBottom>
+            Request Submitted
+          </Typography>
+          <Typography variant="body1" color="text.secondary" sx={{ mb: 3 }}>
+            Issue #{submitResult.number} has been created. The designer will review
+            your request and any existing coverage we found.
+          </Typography>
+          <Button
+            variant="contained"
+            startIcon={<ExternalLinkIcon />}
+            href={submitResult.url}
+            target="_blank"
+            rel="noopener"
+            sx={{ mr: 2 }}
+          >
+            View Issue
+          </Button>
+          <Button variant="outlined" onClick={() => window.location.reload()}>
+            Submit Another
+          </Button>
+        </Paper>
+      </Container>
+    );
+  }
+
+  return (
+    <Container maxWidth="md" sx={{ py: 4 }}>
+      <Box sx={{ mb: 4, textAlign: 'center' }}>
+        <Typography variant="h4" gutterBottom>
+          Request a CodeBundle
+        </Typography>
+        <Typography variant="body1" color="text.secondary">
+          Describe the problem you're solving. The designer will figure out the rest.
+        </Typography>
+      </Box>
+
+      {error && (
+        <Alert severity="error" sx={{ mb: 3 }} onClose={() => setError('')}>
+          {error}
+        </Alert>
+      )}
+
+      <Paper sx={{ p: 4 }}>
+        {/* Mode toggle */}
+        <Box sx={{ mb: 3, display: 'flex', justifyContent: 'center' }}>
+          <ToggleButtonGroup
+            value={mode}
+            exclusive
+            onChange={(_, v) => v && setMode(v)}
+            size="small"
+          >
+            <ToggleButton value="simple">
+              <ChatIcon sx={{ mr: 0.5, fontSize: 18 }} />
+              Simple
+            </ToggleButton>
+            <ToggleButton value="explicit">
+              <TuneIcon sx={{ mr: 0.5, fontSize: 18 }} />
+              Explicit
+            </ToggleButton>
+          </ToggleButtonGroup>
+          <Typography variant="caption" sx={{ ml: 2, alignSelf: 'center', color: 'text.secondary' }}>
+            {mode === 'simple'
+              ? 'Describe naturally — the designer has autonomy'
+              : 'Specify tasks and variables if you know them'}
+          </Typography>
+        </Box>
+
+        {/* Question 1: Core */}
+        <Typography variant="subtitle1" fontWeight={600} sx={{ mb: 1, color: 'text.primary' }}>
+          What problem are you trying to solve?
+        </Typography>
+        <Typography variant="body2" color="text.secondary" sx={{ mb: 1.5 }}>
+          Describe the infrastructure task, health check, or troubleshooting scenario in your own words.
+        </Typography>
+        <TextField
+          fullWidth
+          multiline
+          minRows={4}
+          maxRows={10}
+          placeholder="e.g., We need to monitor Kubernetes CronJobs — detect failed jobs, jobs that haven't run on schedule, and suspended CronJobs. Our team gets paged when things break and we need to triage quickly."
+          value={problemDescription}
+          onChange={(e) => setProblemDescription(e.target.value)}
+          sx={{ mb: 3 }}
+        />
+
+        {/* Question 2: Platform */}
+        <Typography variant="subtitle1" fontWeight={600} sx={{ mb: 1, color: 'text.primary' }}>
+          What platform or infrastructure does this involve?
+        </Typography>
+        <Typography variant="body2" color="text.secondary" sx={{ mb: 1.5 }}>
+          Optional — we can often infer this from your description.
+        </Typography>
+        <TextField
+          fullWidth
+          placeholder="e.g., Kubernetes, AWS, Azure, GCP, Terraform..."
+          value={platform}
+          onChange={(e) => setPlatform(e.target.value)}
+          sx={{ mb: 3 }}
+        />
+
+        {/* Question 3: Healthy */}
+        <Typography variant="subtitle1" fontWeight={600} sx={{ mb: 1, color: 'text.primary' }}>
+          What does "healthy" or "working" look like? How would you know something is wrong?
+        </Typography>
+        <Typography variant="body2" color="text.secondary" sx={{ mb: 1.5 }}>
+          Optional — helps the designer scope the checks.
+        </Typography>
+        <TextField
+          fullWidth
+          multiline
+          minRows={2}
+          placeholder="e.g., CronJobs run on schedule, no failed jobs in the last 24h, no suspended CronJobs..."
+          value={healthyLooksLike}
+          onChange={(e) => setHealthyLooksLike(e.target.value)}
+          sx={{ mb: 3 }}
+        />
+
+        {/* Question 4: Anything else */}
+        <Typography variant="subtitle1" fontWeight={600} sx={{ mb: 1, color: 'text.primary' }}>
+          Anything else the designer should know?
+        </Typography>
+        <TextField
+          fullWidth
+          multiline
+          minRows={2}
+          placeholder="Constraints, tools you use, how this fits into your workflow..."
+          value={anythingElse}
+          onChange={(e) => setAnythingElse(e.target.value)}
+          sx={{ mb: 3 }}
+        />
+
+        {/* Explicit mode: tasks and variables */}
+        <Collapse in={mode === 'explicit'}>
+          <Box sx={{ mb: 3, pl: 1, borderLeft: 2, borderColor: 'divider' }}>
+            <Typography variant="subtitle2" color="text.secondary" sx={{ mb: 2 }}>
+              Only fill these if you already know the structure. Otherwise leave blank.
+            </Typography>
+            <TextField
+              fullWidth
+              multiline
+              minRows={2}
+              label="Suggested tasks (one per line)"
+              placeholder="Check for failed CronJobs\nCheck for suspended CronJobs\n..."
+              value={explicitTasks}
+              onChange={(e) => setExplicitTasks(e.target.value)}
+              sx={{ mb: 2 }}
+            />
+            <TextField
+              fullWidth
+              multiline
+              minRows={1}
+              label="Variables or config needed"
+              placeholder="NAMESPACE, KUBECONFIG, ..."
+              value={explicitVariables}
+              onChange={(e) => setExplicitVariables(e.target.value)}
+            />
+          </Box>
+        </Collapse>
+
+        {/* Contact (collapsible) */}
+        <Box sx={{ mb: 3 }}>
+          <Button
+            size="small"
+            startIcon={showContact ? <ExpandLessIcon /> : <ExpandMoreIcon />}
+            onClick={() => setShowContact(!showContact)}
+          >
+            {showContact ? 'Hide' : 'Add contact info (optional)'}
+          </Button>
+          <Collapse in={showContact}>
+            <Box sx={{ mt: 2 }}>
+              <TextField
+                fullWidth
+                label="Email"
+                placeholder="your@email.com"
+                value={contactEmail}
+                onChange={(e) => setContactEmail(e.target.value)}
+                sx={{ mb: 1 }}
+              />
+              <FormControlLabel
+                control={<Checkbox checked={contactOk} onChange={(e) => setContactOk(e.target.checked)} />}
+                label="It's OK to reach out for clarification"
+              />
+            </Box>
+          </Collapse>
+        </Box>
+
+        <Button
+          fullWidth
+          variant="contained"
+          size="large"
+          startIcon={submitting ? <CircularProgress size={20} color="inherit" /> : <RocketIcon />}
+          onClick={handleSubmit}
+          disabled={!canSubmit || submitting}
+        >
+          {submitting ? 'Searching & Submitting...' : 'Search & Submit'}
+        </Button>
+        <Typography variant="caption" display="block" sx={{ mt: 2, textAlign: 'center', color: 'text.secondary' }}>
+          We search existing CodeBundles first, then create your request with the results attached for the designer.
+        </Typography>
+      </Paper>
+    </Container>
+  );
+}
diff --git a/cc-registry-v2/frontend/src/services/api.ts b/cc-registry-v2/frontend/src/services/api.ts
index 773bd7f56646..39b8fa85f2ac 100644
--- a/cc-registry-v2/frontend/src/services/api.ts
+++ b/cc-registry-v2/frontend/src/services/api.ts
@@ -1031,6 +1031,69 @@ export const chatApi = {
   }
 };
 
+// =============================================================================
+// Intake Wizard API
+// =============================================================================
+
+export interface IntakeSearchMatch {
+  display_name: string;
+  slug: string;
+  collection_slug: string;
+  platform: string;
+  description: string;
+  tasks: string[];
+  tags: string[];
+  relevance_score: number;
+  source_url: string;
+}
+
+export interface IntakeExistingRequest {
+  number: number;
+  title: string;
+  url: string;
+  created_at: string;
+}
+
+export interface IntakeSearchResponse {
+  matches: IntakeSearchMatch[];
+  existing_requests: IntakeExistingRequest[];
+  suggested_platform: string;
+  query_used: string;
+}
+
+export interface IntakeSubmitRequest {
+  title: string;
+  description: string;
+  extra_context?: string;
+  contact_email?: string;
+  contact_ok?: boolean;
+  matches: IntakeSearchMatch[];
+  existing_requests: IntakeExistingRequest[];
+}
+
+export interface IntakeSubmitResponse {
+  issue_url: string;
+  issue_number: number;
+  message: string;
+}
+
+export const intakeApi = {
+  async getPlatforms(): Promise<{ platforms: string[] }> {
+    const response = await api.get('/intake/platforms');
+    return response.data;
+  },
+
+  async search(description: string, platform?: string): Promise<IntakeSearchResponse> {
+    const response = await api.post('/intake/search', { description, platform });
+    return response.data;
+  },
+
+  async submit(payload: IntakeSubmitRequest): Promise<IntakeSubmitResponse> {
+    const response = await api.post('/intake/submit', payload);
+    return response.data;
+  },
+};
+
 export const githubApi = {
   // Get issue template for a query
   async getIssueTemplate(userQuery: string): Promise<IssueTemplate> {
diff --git a/cc-registry-v2/frontend/src/theme.ts b/cc-registry-v2/frontend/src/theme.ts
index 7d13c0e17262..f5c5e10a9f56 100644
--- a/cc-registry-v2/frontend/src/theme.ts
+++ b/cc-registry-v2/frontend/src/theme.ts
@@ -3,74 +3,84 @@ import { createTheme, PaletteMode } from '@mui/material';
 export const getTheme = (mode: PaletteMode) => {
   const isLight = mode === 'light';
 
+  // Aligned with /workspaces/docs src/styles/custom.css (RunWhen Starlight theme)
+  const docsPrimary = '#2F80ED';
+  const docsPrimaryLight = '#90cdf4';
+  const docsPrimaryDark = '#1a365d';
+  const docsGray1 = isLight ? '#2d3748' : '#cbd5e1';
+  const docsGray2 = isLight ? '#4a5568' : '#94a3b8';
+  const docsGray5 = isLight ? '#e2e8f0' : '#64748b';
+  const docsGray6 = isLight ? '#f7fafc' : '#334155';
+  const docsGray7 = isLight ? '#ffffff' : '#0f172a';
+
   return createTheme({
     palette: {
       mode,
       primary: {
-        main: '#5282f1',
-        light: '#7a9ff4',
-        dark: '#3a5cb8',
+        main: docsPrimary,
+        light: docsPrimaryLight,
+        dark: docsPrimaryDark,
       },
       secondary: {
-        main: '#f8ad4b',
-        light: '#fac273',
+        main: '#faa629',
+        light: '#f6ad37',
         dark: '#e69538',
       },
       background: {
-        default: isLight ? '#ffffff' : '#121212',
-        paper: isLight ? '#ffffff' : '#1e1e1e',
+        default: docsGray7,
+        paper: isLight ? docsGray7 : '#1e293b',
       },
       text: {
-        primary: isLight ? '#3f3f3f' : '#e0e0e0',
-        secondary: isLight ? '#858484' : '#a0a0a0',
+        primary: isLight ? '#1a202c' : '#e2e8f0',
+        secondary: isLight ? docsGray2 : docsGray2,
       },
-      divider: isLight ? 'rgba(0, 0, 0, 0.12)' : 'rgba(255, 255, 255, 0.12)',
+      divider: isLight ? docsGray5 : 'rgba(255, 255, 255, 0.12)',
     },
     typography: {
-      fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+      fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
       h1: {
-        fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+        fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
         fontSize: '2.5rem',
         fontWeight: 700,
-        color: isLight ? '#858484' : '#e0e0e0',
+        color: isLight ? '#1a202c' : '#e2e8f0',
       },
       h2: {
-        fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+        fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
         fontSize: '2rem',
         fontWeight: 600,
-        color: isLight ? '#858484' : '#e0e0e0',
+        color: isLight ? '#1a202c' : '#e2e8f0',
       },
       h3: {
-        fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+        fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
         fontSize: '1.5rem',
         fontWeight: 600,
-        color: isLight ? '#858484' : '#e0e0e0',
+        color: isLight ? '#1a202c' : '#e2e8f0',
       },
       h4: {
-        fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+        fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
         fontSize: '1.25rem',
         fontWeight: 600,
-        color: isLight ? '#858484' : '#e0e0e0',
+        color: isLight ? '#1a202c' : '#e2e8f0',
       },
       h5: {
-        fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+        fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
         fontSize: '1.125rem',
         fontWeight: 600,
-        color: isLight ? '#858484' : '#e0e0e0',
+        color: isLight ? '#1a202c' : '#e2e8f0',
       },
       h6: {
-        fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+        fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
         fontSize: '1rem',
         fontWeight: 600,
-        color: isLight ? '#858484' : '#e0e0e0',
+        color: isLight ? '#1a202c' : '#e2e8f0',
       },
       body1: {
-        fontSize: '1rem',
-        color: isLight ? '#858484' : '#c0c0c0',
+        fontSize: '0.875rem',
+        color: isLight ? docsGray2 : '#cbd5e1',
       },
       body2: {
-        fontSize: '0.875rem',
-        color: isLight ? '#858484' : '#c0c0c0',
+        fontSize: '0.8125rem',
+        color: isLight ? docsGray2 : '#94a3b8',
       },
     },
     components: {
@@ -78,7 +88,7 @@ export const getTheme = (mode: PaletteMode) => {
         styleOverrides: {
           root: {
             textTransform: 'none',
-            borderRadius: '4px',
+            borderRadius: 6,
             fontWeight: 600,
           },
         },
@@ -86,7 +96,7 @@ export const getTheme = (mode: PaletteMode) => {
       MuiCard: {
         styleOverrides: {
           root: ({ theme }) => ({
-            borderRadius: '4px',
+            borderRadius: 8,
             boxShadow: theme.palette.mode === 'light'
               ? '0 2px 4px rgba(0, 0, 0, 0.1)'
               : '0 2px 4px rgba(0, 0, 0, 0.4)',
@@ -97,7 +107,7 @@ export const getTheme = (mode: PaletteMode) => {
       MuiAppBar: {
         styleOverrides: {
           root: ({ theme }) => ({
-            backgroundColor: theme.palette.mode === 'light' ? '#5282f1' : '#1a1a2e',
+            backgroundColor: theme.palette.mode === 'light' ? theme.palette.primary.main : '#0f172a',
             color: '#ffffff',
           }),
         },
@@ -105,14 +115,14 @@ export const getTheme = (mode: PaletteMode) => {
       MuiTableCell: {
         styleOverrides: {
           root: {
-            fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+            fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
             fontSize: '0.875rem',
-            color: isLight ? '#858484' : '#c0c0c0',
+            color: isLight ? docsGray2 : '#94a3b8',
           },
           head: {
-            fontFamily: '"Raleway", "Roboto", "Helvetica", "Arial", sans-serif',
+            fontFamily: '"Inter", "Roboto", "Helvetica", "Arial", sans-serif',
             fontWeight: 600,
-            color: isLight ? '#3f3f3f' : '#e0e0e0',
+            color: isLight ? '#1a202c' : '#e2e8f0',
           },
         },
       },
diff --git a/cc-registry-v2/k8s/backend-deployment.yaml b/cc-registry-v2/k8s/backend-deployment.yaml
index d93117f9e73e..36bfca2d82f9 100644
--- a/cc-registry-v2/k8s/backend-deployment.yaml
+++ b/cc-registry-v2/k8s/backend-deployment.yaml
@@ -65,6 +65,9 @@ spec:
         envFrom:
         - secretRef:
             name: azure-openai-credentials
+        - secretRef:
+            name: github-credentials
+            optional: true
         volumeMounts:
         - name: schedules-config
           mountPath: /app/schedules.yaml
diff --git a/cc-registry-v2/k8s/mcp-server-deployment.yaml b/cc-registry-v2/k8s/mcp-server-deployment.yaml
index 0a4b28c02fe4..df2871ecae81 100644
--- a/cc-registry-v2/k8s/mcp-server-deployment.yaml
+++ b/cc-registry-v2/k8s/mcp-server-deployment.yaml
@@ -37,6 +37,10 @@ spec:
           value: "INFO"
         - name: REGISTRY_API_URL
           value: "http://cc-registry-backend:8001"  # Backend service in same namespace
+        envFrom:
+        - secretRef:
+            name: github-credentials
+            optional: true
         resources:
           requests:
             memory: "128Mi"
diff --git a/cc-registry-v2/k8s/secrets-example.yaml b/cc-registry-v2/k8s/secrets-example.yaml
index 79de83dfc15f..370f34221a0b 100644
--- a/cc-registry-v2/k8s/secrets-example.yaml
+++ b/cc-registry-v2/k8s/secrets-example.yaml
@@ -77,8 +77,21 @@ stringData:
   AZURE_OPENAI_EMBEDDING_API_VERSION: "2024-02-15-preview"
   AZURE_OPENAI_EMBEDDING_DEPLOYMENT: "text-embedding-3-small"
   
-  # GitHub Token (for MCP server GitHub issue creation - optional)
-  GITHUB_TOKEN: "ghp_your_github_token_here"
+  # GitHub credentials have moved to the dedicated 'github-credentials' Secret below
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: github-credentials
+  namespace: codecollection-registry
+type: Opaque
+stringData:
+  # GitHub App (preferred) — short-lived installation tokens
+  GITHUB_APP_ID: "123456"
+  GITHUB_APP_PRIVATE_KEY: "base64-encoded-pem-or-raw-pem-here"
+  # GITHUB_APP_INSTALLATION_ID: ""  # Optional — auto-discovered if omitted
+  # OR: Personal Access Token fallback
+  # GITHUB_TOKEN: "ghp_your_github_token_here"
 ---
 apiVersion: v1
 kind: Secret
diff --git a/mcp-server/requirements.txt b/mcp-server/requirements.txt
index 3b220f2ae9f1..0b526a4e4f5a 100644
--- a/mcp-server/requirements.txt
+++ b/mcp-server/requirements.txt
@@ -5,5 +5,8 @@ uvicorn[standard]>=0.24.0
 pyyaml>=6.0.0
 httpx>=0.25.0
 
+# GitHub App authentication
+PyJWT[crypto]>=2.8.0
+
 # Utilities
 GitPython>=3.1.0
diff --git a/mcp-server/tools/github_issue.py b/mcp-server/tools/github_issue.py
index 437424c7040c..09ad466fe851 100644
--- a/mcp-server/tools/github_issue.py
+++ b/mcp-server/tools/github_issue.py
@@ -6,9 +6,15 @@
 
 Uses the codebundle-wanted.yaml template format from:
 https://github.com/runwhen-contrib/codecollection-registry/blob/main/.github/ISSUE_TEMPLATE/codebundle-wanted.yaml
+
+Requires GitHub App or PAT credentials -- see cc-registry-v2/README.md
+"GitHub App (Issue Creation)" section for env var details.
 """
 
+import base64
 import os
+import time
+import threading
 import httpx
 import logging
 from typing import Optional, List, Dict, Any
@@ -33,29 +39,132 @@ class CodeBundleRequest:
     contact_ok: bool = False         # Willing to be contacted?
 
 
+class _AppTokenManager:
+    """Manages GitHub App JWT -> installation token lifecycle.
+
+    Parallel implementation to backend's GitHubAuth (different service,
+    different JWT library).  Keep changes in sync.
+    """
+
+    def __init__(self, app_id: str, private_key_raw: str, installation_id: Optional[int] = None):
+        self._app_id = app_id
+        self._installation_id = installation_id
+        self._private_key = self._decode_key(private_key_raw)
+        self._token: Optional[str] = None
+        self._expires_at: float = 0
+        self._lock = threading.Lock()
+
+    @property
+    def available(self) -> bool:
+        return bool(self._private_key)
+
+    @staticmethod
+    def _decode_key(raw: str) -> Optional[str]:
+        if raw.startswith("-----BEGIN"):
+            return raw
+        try:
+            decoded = base64.b64decode(raw).decode("utf-8")
+            if "-----BEGIN" in decoded:
+                return decoded
+        except Exception:
+            pass
+        logger.error("GITHUB_APP_PRIVATE_KEY is not a valid PEM or base64-encoded PEM")
+        return None
+
+    def _make_jwt(self) -> str:
+        import jwt as pyjwt
+        now = int(time.time())
+        payload = {"iat": now - 60, "exp": now + 600, "iss": self._app_id}
+        return pyjwt.encode(payload, self._private_key, algorithm="RS256")
+
+    def _discover_installation(self, app_jwt: str) -> Optional[int]:
+        try:
+            resp = httpx.get(
+                f"{GITHUB_API_BASE}/app/installations",
+                headers={"Authorization": f"Bearer {app_jwt}", "Accept": "application/vnd.github+json"},
+                timeout=15,
+            )
+            if resp.status_code != 200:
+                logger.error("Failed to list installations: %s %s", resp.status_code, resp.text)
+                return None
+            installs = resp.json()
+            if not installs:
+                logger.error("No installations for GitHub App %s", self._app_id)
+                return None
+            return installs[0]["id"]
+        except Exception as exc:
+            logger.error("Error discovering installation: %s", exc)
+            return None
+
+    def get_token(self) -> str:
+        if self._token and time.time() < self._expires_at:
+            return self._token
+        with self._lock:
+            if self._token and time.time() < self._expires_at:
+                return self._token
+            app_jwt = self._make_jwt()
+            if not self._installation_id:
+                self._installation_id = self._discover_installation(app_jwt)
+                if not self._installation_id:
+                    raise RuntimeError("Cannot discover GitHub App installation")
+            resp = httpx.post(
+                f"{GITHUB_API_BASE}/app/installations/{self._installation_id}/access_tokens",
+                headers={"Authorization": f"Bearer {app_jwt}", "Accept": "application/vnd.github+json"},
+                timeout=15,
+            )
+            if resp.status_code != 201:
+                raise RuntimeError(f"Failed to get installation token: {resp.status_code} {resp.text}")
+            self._token = resp.json()["token"]
+            self._expires_at = time.time() + 3500
+            return self._token
+
+
 class GitHubIssueClient:
     """
     Low-level client for GitHub issue operations.
-    
-    Requires GITHUB_TOKEN environment variable with repo scope.
+
+    Authenticates via GitHub App (GITHUB_APP_ID + GITHUB_APP_PRIVATE_KEY)
+    or falls back to GITHUB_TOKEN PAT.
     """
-    
+
     def __init__(self):
+        self._app_mgr: Optional[_AppTokenManager] = None
         self.token = os.getenv("GITHUB_TOKEN")
+
+        app_id = os.getenv("GITHUB_APP_ID")
+        app_key = os.getenv("GITHUB_APP_PRIVATE_KEY")
+        inst_id = os.getenv("GITHUB_APP_INSTALLATION_ID")
+        if app_id and app_key:
+            mgr = _AppTokenManager(app_id, app_key, int(inst_id) if inst_id else None)
+            if mgr.available:
+                self._app_mgr = mgr
+                logger.info("GitHub App authentication configured (app_id=%s)", app_id)
+
         self.client = httpx.Client(
             base_url=GITHUB_API_BASE,
             headers={
                 "Accept": "application/vnd.github+json",
                 "X-GitHub-Api-Version": "2022-11-28",
             },
-            timeout=30.0
+            timeout=30.0,
         )
+        self._refresh_auth()
+
+    def _refresh_auth(self):
+        """Set the Authorization header using the best available credential."""
+        if self._app_mgr:
+            try:
+                token = self._app_mgr.get_token()
+                self.client.headers["Authorization"] = f"Bearer {token}"
+                return
+            except Exception as exc:
+                logger.warning("App token refresh failed, falling back to PAT: %s", exc)
         if self.token:
             self.client.headers["Authorization"] = f"Bearer {self.token}"
-    
+
     def is_configured(self) -> bool:
-        """Check if GitHub token is configured."""
-        return bool(self.token)
+        """Check if any GitHub credential is available."""
+        return bool(self._app_mgr and self._app_mgr.available) or bool(self.token)
     
     def _format_tasks(self, tasks: List[str]) -> str:
         """Format tasks as a numbered list."""
@@ -108,9 +217,10 @@ def create_issue(self, request: CodeBundleRequest) -> Dict[str, Any]:
         if not self.is_configured():
             return {
                 "success": False,
-                "error": "GitHub token not configured. Set GITHUB_TOKEN environment variable."
+                "error": "GitHub not configured. Set GITHUB_APP_ID/GITHUB_APP_PRIVATE_KEY or GITHUB_TOKEN."
             }
         
+        self._refresh_auth()
         title = self._generate_title(request)
         body = self._build_issue_body(request)
         
@@ -160,8 +270,8 @@ def check_existing_issues(self, search_term: str) -> List[Dict[str, Any]]:
         
         Returns list of potentially related open issues.
         """
+        self._refresh_auth()
         try:
-            # Search for open issues with the search term
             query = f"repo:{REPO_OWNER}/{REPO_NAME} is:issue is:open {search_term}"
             response = self.client.get(
                 "/search/issues",