superset-showtime 0.1.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

showtime/cli.py

@@ -18,12 +18,9 @@ from .core.github import GitHubError, GitHubInterface
 DEFAULT_GITHUB_ACTOR = "unknown"
 
 
-def _get_service_urls(pr_number: int, sha: str = None):
+def _get_service_urls(show):
     """Get AWS Console URLs for a service"""
-    if sha:
-        service_name = f"pr-{pr_number}-{sha}-service"
-    else:
-        service_name = f"pr-{pr_number}-service"
+    service_name = show.ecs_service_name
 
     return {
         "logs": f"https://us-west-2.console.aws.amazon.com/ecs/v2/clusters/superset-ci/services/{service_name}/logs?region=us-west-2",
@@ -31,15 +28,54 @@ def _get_service_urls(pr_number: int, sha: str = None):
     }
 
 
-def _show_service_urls(pr_number: int, context: str = "deployment", sha: str = None):
+def _show_service_urls(show, context: str = "deployment"):
     """Show helpful AWS Console URLs for monitoring service"""
-    urls = _get_service_urls(pr_number, sha)
+    urls = _get_service_urls(show)
     console.print(f"\n🎪 [bold blue]Monitor {context} progress:[/bold blue]")
     console.print(f"   📝 Live Logs: {urls['logs']}")
     console.print(f"   📊 ECS Service: {urls['service']}")
     console.print("")
 
 
+def _determine_sync_action(pr, pr_state: str, target_sha: str) -> str:
+    """Determine what action is needed based on PR state and labels"""
+
+    # 1. Closed PRs always need cleanup
+    if pr_state == "closed":
+        return "cleanup"
+
+    # 2. Check for explicit trigger labels
+    trigger_labels = [label for label in pr.labels if "showtime-trigger-" in label]
+
+    # 3. Check for freeze label (PR-level) - only if no explicit triggers
+    freeze_labels = [label for label in pr.labels if "showtime-freeze" in label]
+    if freeze_labels and not trigger_labels:
+        return "frozen_no_action"  # Frozen and no explicit triggers to override
+
+    if trigger_labels:
+        # Explicit triggers take priority
+        for trigger in trigger_labels:
+            if "showtime-trigger-start" in trigger:
+                if pr.current_show:
+                    if pr.current_show.needs_update(target_sha):
+                        return "rolling_update"  # New commit with existing env
+                    else:
+                        return "no_action"  # Same commit, no change needed
+                else:
+                    return "create_environment"  # New environment
+            elif "showtime-trigger-stop" in trigger:
+                return "destroy_environment"
+
+    # 3. No explicit triggers - check for implicit sync needs
+    if pr.current_show:
+        if pr.current_show.needs_update(target_sha):
+            return "auto_sync"  # Auto-update on new commits
+        else:
+            return "no_action"  # Everything in sync
+    else:
+        return "no_action"  # No environment, no triggers
+
+
 def _schedule_blue_cleanup(pr_number: int, blue_services: list):
     """Schedule cleanup of blue services after successful green deployment"""
     import threading
@@ -96,10 +132,10 @@ app = typer.Typer(
     help="""🎪 Apache Superset ephemeral environment management
 
 [bold]GitHub Label Workflow:[/bold]
-1. Add [green]🎪 trigger-start[/green] label to PR → Creates environment
+1. Add [green]🎪 ⚡ showtime-trigger-start[/green] label to PR → Creates environment
 2. Watch state labels: [blue]🎪 abc123f 🚦 building[/blue] → [green]🎪 abc123f 🚦 running[/green]
-3. Add [yellow]🎪 conf-enable-ALERTS[/yellow] → Enables feature flags
-4. Add [red]🎪 trigger-stop[/red] label → Destroys environment
+3. Add [orange]🎪 🧊 showtime-freeze[/orange] → Freezes environment from auto-sync
+4. Add [red]🎪 🛑 showtime-trigger-stop[/red] label → Destroys environment
 
 [bold]Reading State Labels:[/bold]
 • [green]🎪 abc123f 🚦 running[/green] - Environment status
@@ -111,13 +147,22 @@ app = typer.Typer(
 [dim]CLI commands work with existing environments or dry-run new ones.[/dim]""",
     rich_markup_mode="rich",
 )
+
 console = Console()
 
 
+@app.command()
+def version():
+    """Show version information"""
+    from . import __version__
+
+    console.print(f"🎪 Superset Showtime v{__version__}")
+
+
 @app.command()
 def start(
     pr_number: int = typer.Argument(..., help="PR number to create environment for"),
-    sha: Optional[str] = typer.Option(None, help="Specific commit SHA (default: latest)"),
+    sha: Optional[str] = typer.Option(None, "--sha", help="Specific commit SHA (default: latest)"),
     ttl: Optional[str] = typer.Option("24h", help="Time to live (24h, 48h, 1w, close)"),
     size: Optional[str] = typer.Option("standard", help="Environment size (standard, large)"),
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be done"),
@@ -125,14 +170,23 @@ def start(
         False, "--dry-run-aws", help="Skip AWS operations, use mock data"
     ),
     aws_sleep: int = typer.Option(0, "--aws-sleep", help="Seconds to sleep during AWS operations"),
+    image_tag: Optional[str] = typer.Option(
+        None, "--image-tag", help="Override ECR image tag (e.g., pr-34764-ci)"
+    ),
+    force: bool = typer.Option(
+        False, "--force", help="Force re-deployment by deleting existing service"
+    ),
 ):
     """Create ephemeral environment for PR"""
     try:
         github = GitHubInterface()
 
-        # Get latest SHA if not provided
+        # Get SHA - use provided SHA or default to latest
         if not sha:
             sha = github.get_latest_commit_sha(pr_number)
+            console.print(f"🎪 Using latest SHA: {sha[:7]}")
+        else:
+            console.print(f"🎪 Using specified SHA: {sha[:7]}")
 
         if dry_run:
             console.print("🎪 [bold yellow]DRY RUN[/bold yellow] - Would create environment:")
@@ -158,7 +212,9 @@ def start(
 
         # Create environment using trigger handler logic
         console.print(f"🎪 [bold blue]Creating environment for PR #{pr_number}...[/bold blue]")
-        _handle_start_trigger(pr_number, github, dry_run_aws, (dry_run or False), aws_sleep)
+        _handle_start_trigger(
+            pr_number, github, dry_run_aws, (dry_run or False), aws_sleep, image_tag, force
+        )
 
     except GitHubError as e:
         console.print(f"🎪 [bold red]GitHub error:[/bold red] {e.message}")
@@ -210,9 +266,6 @@ def status(
         if show.requested_by:
             table.add_row("Requested by", f"@{show.requested_by}")
 
-        if show.config != "standard":
-            table.add_row("Configuration", show.config)
-
         if verbose:
             table.add_row("All Labels", ", ".join(pr.circus_labels))
 
@@ -284,19 +337,19 @@ def stop(
             console.print("🎪 [bold blue]Starting AWS cleanup...[/bold blue]")
             aws = AWSInterface()
 
-            # Show logs URL for monitoring cleanup
-            _show_service_urls(pr_number, "cleanup")
-
             try:
                 # Get current environment info
                 pr = PullRequest.from_id(pr_number, github)
 
                 if pr.current_show:
                     show = pr.current_show
+
+                    # Show logs URL for monitoring cleanup
+                    _show_service_urls(show, "cleanup")
                     console.print(f"🎪 Destroying environment: {show.aws_service_name}")
 
                     # Step 1: Check if ECS service exists and is active
-                    service_name = f"pr-{pr_number}-service"  # Match GHA service naming
+                    service_name = show.ecs_service_name
                     console.print(f"🎪 Checking ECS service: {service_name}")
 
                     service_exists = aws._service_exists(service_name)
@@ -409,7 +462,7 @@ def list(
                 superset_url = "-"
 
             # Get AWS service URLs - iTerm2 supports Rich clickable links
-            aws_urls = _get_service_urls(show.pr_number, show.sha)
+            aws_urls = _get_service_urls(show)
             aws_logs_link = f"[link={aws_urls['logs']}]View[/link]"
 
             # Make PR number clickable
@@ -437,34 +490,19 @@ def list(
 @app.command()
 def labels():
     """🎪 Show complete circus tent label reference"""
+    from .core.label_colors import LABEL_DEFINITIONS
 
     console.print("🎪 [bold blue]Circus Tent Label Reference[/bold blue]")
     console.print()
 
-    # Trigger Labels
-    console.print("[bold yellow]🎯 Trigger Labels (Add these to GitHub PR):[/bold yellow]")
+    # User Action Labels (from LABEL_DEFINITIONS)
+    console.print("[bold yellow]🎯 User Action Labels (Add these to GitHub PR):[/bold yellow]")
     trigger_table = Table()
     trigger_table.add_column("Label", style="green")
-    trigger_table.add_column("Action", style="white")
     trigger_table.add_column("Description", style="dim")
 
-    trigger_table.add_row(
-        "🎪 trigger-start", "Create environment", "Builds and deploys ephemeral environment"
-    )
-    trigger_table.add_row(
-        "🎪 trigger-stop", "Destroy environment", "Cleans up AWS resources and removes labels"
-    )
-    trigger_table.add_row(
-        "🎪 trigger-sync", "Update environment", "Updates to latest commit with zero downtime"
-    )
-    trigger_table.add_row(
-        "🎪 conf-enable-ALERTS", "Enable feature flag", "Enables SUPERSET_FEATURE_ALERTS=True"
-    )
-    trigger_table.add_row(
-        "🎪 conf-disable-DASHBOARD_RBAC",
-        "Disable feature flag",
-        "Disables SUPERSET_FEATURE_DASHBOARD_RBAC=False",
-    )
+    for label_name, definition in LABEL_DEFINITIONS.items():
+        trigger_table.add_row(f"`{label_name}`", definition["description"])
 
     console.print(trigger_table)
     console.print()
@@ -485,7 +523,6 @@ def labels():
     state_table.add_row("🎪 {sha} 🌐 {ip-with-dashes}", "Environment IP", "🎪 abc123f 🌐 52-1-2-3")
     state_table.add_row("🎪 {sha} ⌛ {ttl-policy}", "TTL policy", "🎪 abc123f ⌛ 24h")
     state_table.add_row("🎪 {sha} 🤡 {username}", "Requested by", "🎪 abc123f 🤡 maxime")
-    state_table.add_row("🎪 {sha} ⚙️ {config-list}", "Feature flags", "🎪 abc123f ⚙️ alerts,debug")
 
     console.print(state_table)
     console.print()
@@ -495,25 +532,23 @@ def labels():
     console.print()
 
     console.print("[bold]1. Create Environment:[/bold]")
-    console.print("   • Add label: [green]🎪 trigger-start[/green]")
+    console.print("   • Add label: [green]🎪 ⚡ showtime-trigger-start[/green]")
     console.print(
         "   • Watch for: [blue]🎪 abc123f 🚦 building[/blue] → [green]🎪 abc123f 🚦 running[/green]"
     )
-    console.print("   • Get URL from: [cyan]🎪 abc123f 🌐 52-1-2-3[/cyan] → http://52.1.2.3:8080")
-    console.print()
-
-    console.print("[bold]2. Enable Feature Flag:[/bold]")
-    console.print("   • Add label: [yellow]🎪 conf-enable-ALERTS[/yellow]")
-    console.print(
-        "   • Watch for: [blue]🎪 abc123f 🚦 configuring[/blue] → [green]🎪 abc123f 🚦 running[/green]"
-    )
     console.print(
-        "   • Config updates: [cyan]🎪 abc123f ⚙️ standard[/cyan] → [cyan]🎪 abc123f ⚙️ alerts[/cyan]"
+        "   • Get URL from: [cyan]🎪 abc123f 🌐 52.1.2.3:8080[/cyan] → http://52.1.2.3:8080"
     )
     console.print()
 
-    console.print("[bold]3. Update to New Commit:[/bold]")
-    console.print("   • Add label: [green]🎪 trigger-sync[/green]")
+    console.print("[bold]2. Freeze Environment (Optional):[/bold]")
+    console.print("   • Add label: [orange]🎪 🧊 showtime-freeze[/orange]")
+    console.print("   • Result: Environment won't auto-update on new commits")
+    console.print("   • Use case: Test specific SHA while continuing development")
+    console.print()
+
+    console.print("[bold]3. Update to New Commit (Automatic):[/bold]")
+    console.print("   • New commit pushed → Automatic blue-green rolling update")
     console.print(
         "   • Watch for: [blue]🎪 abc123f 🚦 updating[/blue] → [green]🎪 def456a 🚦 running[/green]"
     )
@@ -521,7 +556,7 @@ def labels():
     console.print()
 
     console.print("[bold]4. Clean Up:[/bold]")
-    console.print("   • Add label: [red]🎪 trigger-stop[/red]")
+    console.print("   • Add label: [red]🎪 🛑 showtime-trigger-stop[/red]")
     console.print("   • Result: All 🎪 labels removed, AWS resources deleted")
     console.print()
 
@@ -560,10 +595,8 @@ def test_lifecycle(
         _handle_start_trigger(pr_number, github, dry_run_aws, dry_run_github, aws_sleep)
 
         console.print()
-        console.print("🎪 [bold]Step 2: Simulate conf-enable-ALERTS[/bold]")
-        _handle_config_trigger(
-            pr_number, "🎪 conf-enable-ALERTS", github, dry_run_aws, dry_run_github
-        )
+        console.print("🎪 [bold]Step 2: Simulate config update[/bold]")
+        console.print("🎪 [dim]Config changes now done via code commits, not labels[/dim]")
 
         console.print()
         console.print("🎪 [bold]Step 3: Simulate trigger-sync (new commit)[/bold]")
@@ -581,8 +614,15 @@ def test_lifecycle(
 
 
 @app.command()
-def handle_trigger(
+def sync(
     pr_number: int,
+    sha: Optional[str] = typer.Option(None, "--sha", help="Specific commit SHA (default: latest)"),
+    check_only: bool = typer.Option(
+        False, "--check-only", help="Check what actions are needed without executing"
+    ),
+    deploy: bool = typer.Option(
+        False, "--deploy", help="Execute deployment actions (assumes build is complete)"
+    ),
     dry_run_aws: bool = typer.Option(
         False, "--dry-run-aws", help="Skip AWS operations, use mock data"
     ),
@@ -593,46 +633,95 @@ def handle_trigger(
         0, "--aws-sleep", help="Seconds to sleep during AWS operations (for testing)"
     ),
 ):
-    """🎪 Process trigger labels (called by GitHub Actions)"""
+    """🎪 Intelligently sync PR to desired state (called by GitHub Actions)"""
     try:
         github = GitHubInterface()
         pr = PullRequest.from_id(pr_number, github)
 
-        # Find trigger labels
-        trigger_labels = [
-            label
-            for label in pr.labels
-            if label.startswith("🎪 trigger-") or label.startswith("🎪 conf-")
-        ]
+        # Get PR metadata for state-based decisions
+        pr_data = github.get_pr_data(pr_number)
+        pr_state = pr_data.get("state", "open")  # open, closed
 
-        if not trigger_labels:
-            console.print(f"🎪 No trigger labels found for PR #{pr_number}")
-            return
+        # Get SHA - use provided SHA or default to latest
+        if sha:
+            target_sha = sha
+            console.print(f"🎪 Using specified SHA: {target_sha[:7]}")
+        else:
+            target_sha = github.get_latest_commit_sha(pr_number)
+            console.print(f"🎪 Using latest SHA: {target_sha[:7]}")
 
-        console.print(f"🎪 Processing {len(trigger_labels)} trigger(s) for PR #{pr_number}")
+        # Determine what actions are needed
+        action_needed = _determine_sync_action(pr, pr_state, target_sha)
 
-        for trigger in trigger_labels:
-            console.print(f"🎪 Processing: {trigger}")
+        if check_only:
+            # Output structured results for GitHub Actions
+            console.print(f"action_needed={action_needed}")
 
-            # Remove trigger label immediately (atomic operation)
-            if not dry_run_github:
-                github.remove_label(pr_number, trigger)
+            # Build needed for new environments and updates (SHA changes)
+            build_needed = action_needed in ["create_environment", "rolling_update", "auto_sync"]
+            console.print(f"build_needed={str(build_needed).lower()}")
+
+            # Deploy needed for everything except no_action
+            deploy_needed = action_needed != "no_action"
+            console.print(f"deploy_needed={str(deploy_needed).lower()}")
+            return
+
+        console.print(
+            f"🎪 [bold blue]Syncing PR #{pr_number}[/bold blue] (state: {pr_state}, SHA: {target_sha[:7]})"
+        )
+        console.print(f"🎪 Action needed: {action_needed}")
+
+        # Execute the determined action
+        if action_needed == "cleanup":
+            console.print("🎪 PR is closed - cleaning up environment")
+            if pr.current_show:
+                _handle_stop_trigger(pr_number, github, dry_run_aws, dry_run_github)
             else:
+                console.print("🎪 No environment to clean up")
+            return
+
+        # 2. Find explicit trigger labels
+        trigger_labels = [label for label in pr.labels if "showtime-trigger-" in label]
+
+        # 3. Handle explicit triggers first
+        if trigger_labels:
+            console.print(f"🎪 Processing {len(trigger_labels)} explicit trigger(s)")
+
+            for trigger in trigger_labels:
+                console.print(f"🎪 Processing: {trigger}")
+
+                # Remove trigger label immediately (atomic operation)
+                if not dry_run_github:
+                    github.remove_label(pr_number, trigger)
+                else:
+                    console.print(
+                        f"🎪 [bold yellow]DRY-RUN-GITHUB[/bold yellow] - Would remove: {trigger}"
+                    )
+
+                # Process the trigger
+                if "showtime-trigger-start" in trigger:
+                    _handle_start_trigger(pr_number, github, dry_run_aws, dry_run_github, aws_sleep)
+                elif "showtime-trigger-stop" in trigger:
+                    _handle_stop_trigger(pr_number, github, dry_run_aws, dry_run_github)
+
+            console.print("🎪 All explicit triggers processed!")
+            return
+
+        # 4. No explicit triggers - check for implicit sync needs
+        console.print("🎪 No explicit triggers found - checking for implicit sync needs")
+
+        if pr.current_show:
+            # Environment exists - check if it needs updating
+            if pr.current_show.needs_update(target_sha):
                 console.print(
-                    f"🎪 [bold yellow]DRY-RUN-GITHUB[/bold yellow] - Would remove: {trigger}"
+                    f"🎪 Environment outdated ({pr.current_show.sha} → {target_sha[:7]}) - auto-syncing"
                 )
-
-            # Process the trigger
-            if trigger == "🎪 trigger-start":
-                _handle_start_trigger(pr_number, github, dry_run_aws, dry_run_github, aws_sleep)
-            elif trigger == "🎪 trigger-stop":
-                _handle_stop_trigger(pr_number, github, dry_run_aws, dry_run_github)
-            elif trigger == "🎪 trigger-sync":
                 _handle_sync_trigger(pr_number, github, dry_run_aws, dry_run_github, aws_sleep)
-            elif trigger.startswith("🎪 conf-"):
-                _handle_config_trigger(pr_number, trigger, github, dry_run_aws, dry_run_github)
-
-        console.print("🎪 All triggers processed!")
+            else:
+                console.print(f"🎪 Environment is up to date ({pr.current_show.sha})")
+        else:
+            console.print(f"🎪 No environment exists for PR #{pr_number} - no action needed")
+            console.print("🎪 💡 Add '🎪 trigger-start' label to create an environment")
 
     except Exception as e:
         console.print(f"🎪 [bold red]Error processing triggers:[/bold red] {e}")
@@ -667,11 +756,65 @@ def handle_sync(pr_number: int):
         console.print(f"🎪 [bold red]Error handling sync:[/bold red] {e}")
 
 
+@app.command()
+def setup_labels(
+    dry_run: bool = typer.Option(False, "--dry-run", help="Show what labels would be created"),
+):
+    """🎪 Set up GitHub label definitions with colors and descriptions"""
+    try:
+        from .core.label_colors import LABEL_DEFINITIONS
+
+        github = GitHubInterface()
+
+        console.print("🎪 [bold blue]Setting up circus tent label definitions...[/bold blue]")
+
+        created_count = 0
+        updated_count = 0
+
+        for label_name, definition in LABEL_DEFINITIONS.items():
+            color = definition["color"]
+            description = definition["description"]
+
+            if dry_run:
+                console.print(f"🏷️ Would create: [bold]{label_name}[/bold]")
+                console.print(f"   Color: #{color}")
+                console.print(f"   Description: {description}")
+            else:
+                try:
+                    # Try to create or update the label
+                    success = github.create_or_update_label(label_name, color, description)
+                    if success:
+                        created_count += 1
+                        console.print(f"✅ Created: [bold]{label_name}[/bold]")
+                    else:
+                        updated_count += 1
+                        console.print(f"🔄 Updated: [bold]{label_name}[/bold]")
+                except Exception as e:
+                    console.print(f"❌ Failed to create {label_name}: {e}")
+
+        if not dry_run:
+            console.print("\n🎪 [bold green]Label setup complete![/bold green]")
+            console.print(f"   📊 Created: {created_count}")
+            console.print(f"   🔄 Updated: {updated_count}")
+            console.print(
+                "\n🎪 [dim]Note: Dynamic labels (with SHA) are created automatically during deployment[/dim]"
+            )
+
+    except Exception as e:
+        console.print(f"🎪 [bold red]Error setting up labels:[/bold red] {e}")
+
+
 @app.command()
 def cleanup(
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be cleaned"),
     older_than: str = typer.Option(
-        "48h", "--older-than", help="Clean environments older than this"
+        "48h", "--older-than", help="Clean environments older than this (ignored if --respect-ttl)"
+    ),
+    respect_ttl: bool = typer.Option(
+        False, "--respect-ttl", help="Use individual TTL labels instead of global --older-than"
+    ),
+    max_age: Optional[str] = typer.Option(
+        None, "--max-age", help="Maximum age limit when using --respect-ttl (e.g., 7d)"
     ),
     cleanup_labels: bool = typer.Option(
         True,
@@ -712,7 +855,13 @@ def cleanup(
                         console.print(
                             f"🎪 Deleting expired service {service_name} (PR #{pr_number}, {age_hours:.1f}h old)"
                         )
-                        _show_service_urls(pr_number, "cleanup")
+                        # Create minimal Show object for URL generation
+                        from .core.circus import Show
+
+                        temp_show = Show(
+                            pr_number=pr_number, sha=service_name.split("-")[2], status="cleanup"
+                        )
+                        _show_service_urls(temp_show, "cleanup")
 
                         # Delete ECS service
                         if aws._delete_ecs_service(service_name):
@@ -729,7 +878,10 @@ def cleanup(
             console.print(f"🎪 [bold red]AWS cleanup failed:[/bold red] {e}")
 
         # Step 2: Find and clean up expired environments from PRs
-        console.print(f"🎪 Finding environments older than {older_than}")
+        if respect_ttl:
+            console.print("🎪 Finding environments expired based on individual TTL labels")
+        else:
+            console.print(f"🎪 Finding environments older than {older_than}")
         prs_with_shows = github.find_prs_with_shows()
 
         if not prs_with_shows:
@@ -740,19 +892,12 @@ def cleanup(
             import re
             from datetime import datetime, timedelta
 
-            from .core.circus import PullRequest
-
-            # Parse the older_than parameter (e.g., "48h", "7d")
-            time_match = re.match(r"(\d+)([hd])", older_than)
-            if not time_match:
-                console.print(f"🎪 [bold red]Invalid time format:[/bold red] {older_than}")
-                return
-
-            hours = int(time_match.group(1))
-            if time_match.group(2) == "d":
-                hours *= 24
+            from .core.circus import PullRequest, get_effective_ttl, parse_ttl_days
 
-            cutoff_time = datetime.now() - timedelta(hours=hours)
+            # Parse max_age if provided (safety ceiling)
+            max_age_days = None
+            if max_age:
+                max_age_days = parse_ttl_days(max_age)
 
             cleaned_prs = 0
             for pr_number in prs_with_shows:
@@ -760,6 +905,44 @@ def cleanup(
                     pr = PullRequest.from_id(pr_number, github)
                     expired_shows = []
 
+                    if respect_ttl:
+                        # Use individual TTL labels
+                        effective_ttl_days = get_effective_ttl(pr)
+
+                        if effective_ttl_days is None:
+                            # "never" label found - skip cleanup
+                            console.print(
+                                f"🎪 [blue]PR #{pr_number} marked as 'never expire' - skipping[/blue]"
+                            )
+                            continue
+
+                        # Apply max_age ceiling if specified
+                        if max_age_days and effective_ttl_days > max_age_days:
+                            console.print(
+                                f"🎪 [yellow]PR #{pr_number} TTL ({effective_ttl_days}d) exceeds max-age ({max_age_days}d)[/yellow]"
+                            )
+                            effective_ttl_days = max_age_days
+
+                        cutoff_time = datetime.now() - timedelta(days=effective_ttl_days)
+                        console.print(
+                            f"🎪 PR #{pr_number} effective TTL: {effective_ttl_days} days"
+                        )
+
+                    else:
+                        # Use global older_than parameter (current behavior)
+                        time_match = re.match(r"(\d+)([hd])", older_than)
+                        if not time_match:
+                            console.print(
+                                f"🎪 [bold red]Invalid time format:[/bold red] {older_than}"
+                            )
+                            return
+
+                        hours = int(time_match.group(1))
+                        if time_match.group(2) == "d":
+                            hours *= 24
+
+                        cutoff_time = datetime.now() - timedelta(hours=hours)
+
                     # Check all shows in the PR for expiration
                     for show in pr.shows:
                         if show.created_at:
@@ -845,6 +1028,8 @@ def _handle_start_trigger(
     dry_run_aws: bool = False,
     dry_run_github: bool = False,
     aws_sleep: int = 0,
+    image_tag_override: Optional[str] = None,
+    force: bool = False,
 ):
     """Handle start trigger"""
     import os
@@ -883,7 +1068,6 @@ def _handle_start_trigger(
             created_at=datetime.utcnow().strftime("%Y-%m-%dT%H-%M"),
             ttl="24h",
             requested_by=github_actor,
-            config="standard",
         )
 
         console.print(f"🎪 Creating environment {show.aws_service_name}")
@@ -949,7 +1133,7 @@ def _handle_start_trigger(
 **Credentials:** admin / admin
 **TTL:** {show.ttl} (auto-cleanup)
 
-**Feature flags:** Add `🎪 conf-enable-ALERTS` labels to configure
+**Configuration:** Modify feature flags in your PR code for new SHA
 **Updates:** Environment updates automatically on new commits
 
 *Powered by [Superset Showtime](https://github.com/mistercrunch/superset-showtime)*"""
@@ -965,7 +1149,7 @@ def _handle_start_trigger(
             aws = AWSInterface()
 
             # Show logs URL immediately for monitoring
-            _show_service_urls(pr_number, "deployment", latest_sha[:7])
+            _show_service_urls(show, "deployment")
 
             # Parse feature flags from PR description (replicate GHA feature flag logic)
             feature_flags = _extract_feature_flags_from_pr(pr_number, github)
@@ -976,6 +1160,8 @@ def _handle_start_trigger(
                 sha=latest_sha,
                 github_user=github_actor,
                 feature_flags=feature_flags,
+                image_tag_override=image_tag_override,
+                force=force,
             )
 
             if result.success:
@@ -1058,7 +1244,7 @@ def _handle_start_trigger(
 **TTL:** {show.ttl} (auto-cleanup)
 **Feature flags:** {len(feature_flags)} enabled
 
-**Feature flags:** Add `🎪 conf-enable-ALERTS` labels to configure
+**Configuration:** Modify feature flags in your PR code for new SHA
 **Updates:** Environment updates automatically on new commits
 
 *Powered by [Superset Showtime](https://github.com/mistercrunch/superset-showtime)*"""
@@ -1108,9 +1294,11 @@ def _extract_feature_flags_from_pr(pr_number: int, github: GitHubInterface) -> l
         results = []
 
         for match in re.finditer(pattern, description):
-            config = {"name": f"SUPERSET_FEATURE_{match.group(1)}", "value": match.group(2)}
-            results.append(config)
-            console.print(f"🎪 Found feature flag: {config['name']}={config['value']}")
+            feature_config = {"name": f"SUPERSET_FEATURE_{match.group(1)}", "value": match.group(2)}
+            results.append(feature_config)
+            console.print(
+                f"🎪 Found feature flag: {feature_config['name']}={feature_config['value']}"
+            )
 
         return results
 
@@ -1148,12 +1336,12 @@ def _handle_stop_trigger(
             console.print("🎪 [bold blue]Starting AWS cleanup...[/bold blue]")
             aws = AWSInterface()
 
-            # Show logs URL for monitoring cleanup
-            _show_service_urls(pr_number, "cleanup")
-
             try:
+                # Show logs URL for monitoring cleanup
+                _show_service_urls(show, "cleanup")
+
                 # Step 1: Check if ECS service exists and is active (replicate GHA describe-services)
-                service_name = f"pr-{pr_number}-service"  # Match GHA service naming
+                service_name = show.ecs_service_name
                 console.print(f"🎪 Checking ECS service: {service_name}")
 
                 service_exists = aws._service_exists(service_name)
@@ -1254,7 +1442,6 @@ def _handle_sync_trigger(
             created_at=datetime.utcnow().strftime("%Y-%m-%dT%H-%M"),
             ttl=pr.current_show.ttl,
             requested_by=pr.current_show.requested_by,
-            config=pr.current_show.config,
         )
 
         console.print(f"🎪 Building new environment: {new_show.aws_service_name}")
@@ -1273,9 +1460,6 @@ def _handle_sync_trigger(
             console.print(f"🎪 Traffic switched to {new_show.sha} at {new_show.ip}")
 
             # Post rolling update success comment
-            import os
-
-            github_actor = os.getenv("GITHUB_ACTOR", DEFAULT_GITHUB_ACTOR)
             update_comment = f"""🎪 Environment updated: {pr.current_show.sha} → `{new_show.sha}`
 
 **New Environment:** http://{new_show.ip}:8080
@@ -1297,61 +1481,6 @@ Your latest changes are now live.
         console.print(f"🎪 [bold red]Sync trigger failed:[/bold red] {e}")
 
 
-def _handle_config_trigger(
-    pr_number: int,
-    trigger: str,
-    github: GitHubInterface,
-    dry_run_aws: bool = False,
-    dry_run_github: bool = False,
-):
-    """Handle configuration trigger"""
-    from .core.circus import merge_config, parse_configuration_command
-
-    console.print(f"🎪 Configuring environment for PR #{pr_number}: {trigger}")
-
-    try:
-        command = parse_configuration_command(trigger)
-        if not command:
-            console.print(f"🎪 [bold red]Invalid config trigger:[/bold red] {trigger}")
-            return
-
-        pr = PullRequest.from_id(pr_number, github)
-
-        if not pr.current_show:
-            console.print(f"🎪 No active environment for PR #{pr_number}")
-            return
-
-        show = pr.current_show
-        console.print(f"🎪 Applying config: {command} to {show.aws_service_name}")
-
-        # Update configuration
-        new_config = merge_config(show.config, command)
-        console.print(f"🎪 Config: {show.config} → {new_config}")
-
-        if dry_run_aws:
-            console.print("🎪 [bold yellow]DRY-RUN-AWS[/bold yellow] - Would update feature flags")
-            console.print(f"  Command: {command}")
-            console.print(f"  New config: {new_config}")
-        else:
-            # TODO: Real feature flag update
-            console.print(
-                "🎪 [bold yellow]Real feature flag update not yet implemented[/bold yellow]"
-            )
-
-        # Update config in labels
-        show.config = new_config
-        updated_labels = show.to_circus_labels()
-        console.print("🎪 Updating config labels")
-
-        # TODO: Actually update labels
-        # github.set_labels(pr_number, updated_labels)
-
-        console.print("🎪 [bold green]Configuration updated![/bold green]")
-
-    except Exception as e:
-        console.print(f"🎪 [bold red]Config trigger failed:[/bold red] {e}")
-
-
 def main():
     """Main entry point for the CLI"""
     app()