fluxloop-cli 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

fluxloop_cli/__init__.py

@@ -2,7 +2,7 @@
 FluxLoop CLI - Command-line interface for running agent simulations.
 """
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 from .main import app
 

fluxloop_cli/auth_manager.py

@@ -77,6 +77,50 @@ def ensure_fluxloop_home() -> Path:
     return fluxloop_home
 
 
+def get_pending_login_path() -> Path:
+    """Get the path to the pending login file."""
+    return ensure_fluxloop_home() / "pending_login.json"
+
+
+def save_pending_login(device_response: DeviceCodeResponse, api_url: str) -> Path:
+    """Save pending device-code login data for later resume."""
+    pending_path = get_pending_login_path()
+    now = datetime.now(timezone.utc)
+    expires_at = now + timedelta(seconds=device_response.expires_in)
+    payload = {
+        "api_url": api_url,
+        "device_code": device_response.device_code,
+        "user_code": device_response.user_code,
+        "verification_url": device_response.verification_url,
+        "expires_in": device_response.expires_in,
+        "interval": device_response.interval,
+        "created_at": now.isoformat(),
+        "expires_at": expires_at.isoformat(),
+    }
+    pending_path.write_text(json.dumps(payload, indent=2))
+    pending_path.chmod(0o600)
+    return pending_path
+
+
+def load_pending_login() -> Optional[dict]:
+    """Load pending login data from ~/.fluxloop/pending_login.json."""
+    pending_path = get_pending_login_path()
+    if not pending_path.exists():
+        return None
+    try:
+        return json.loads(pending_path.read_text())
+    except (json.JSONDecodeError, ValueError) as e:
+        print(f"Warning: Failed to load pending login: {e}")
+        return None
+
+
+def delete_pending_login() -> None:
+    """Delete pending login data."""
+    pending_path = get_pending_login_path()
+    if pending_path.exists():
+        pending_path.unlink()
+
+
 def load_auth_token() -> Optional[AuthToken]:
     """
     Load authentication token from ~/.fluxloop/auth.json.
@@ -266,7 +310,7 @@ def poll_device_code(
             if status == "denied":
                 raise ValueError("User denied authentication")
             if status == "expired":
-                    raise ValueError("Authentication code has expired")
+                raise ValueError("Authentication code has expired")
             if status not in {"approved", "pending"}:
                 raise ValueError(f"Authentication error: {status}")
 

fluxloop_cli/commands/__init__.py

@@ -7,16 +7,14 @@ from . import (
     config,
     context,
     criteria,
-    doctor,
+    data,
     evaluate,
     generate,
     init,
     inputs,
     local_context,
-    parse,
     personas,
     projects,
-    record,
     run,
     scenarios,
     status,
@@ -31,16 +29,14 @@ __all__ = [
     "config",
     "context",
     "criteria",
-    "doctor",
+    "data",
     "evaluate",
     "generate",
     "init",
     "inputs",
     "local_context",
-    "parse",
     "personas",
     "projects",
-    "record",
     "run",
     "scenarios",
     "status",

fluxloop_cli/commands/apikeys.py

@@ -12,16 +12,32 @@ from typing import Dict, Optional
 import typer
 from rich.console import Console
 
-from ..constants import DEFAULT_ROOT_DIR_NAME
+from ..constants import DEFAULT_ROOT_DIR_NAME, FLUXLOOP_DIR_NAME
 from ..http_client import create_authenticated_client, post_with_retry
 from ..api_utils import handle_api_error, resolve_api_url
 from ..context_manager import get_current_project_id
-from ..project_paths import resolve_env_path
+from ..project_paths import resolve_env_path, find_workspace_root
 
 app = typer.Typer(help="Manage API Keys for sync operations")
 console = Console()
 
 
+def _get_workspace_env_path() -> Optional[Path]:
+    """Get the workspace-level .env path (.fluxloop/.env).
+    
+    API keys are project-scoped, so they're stored at workspace level
+    and shared by all scenarios.
+    """
+    workspace_root = find_workspace_root()
+    if workspace_root:
+        return workspace_root / FLUXLOOP_DIR_NAME / ".env"
+    # Fall back to current directory
+    cwd_fluxloop = Path.cwd() / FLUXLOOP_DIR_NAME
+    if cwd_fluxloop.exists():
+        return cwd_fluxloop / ".env"
+    return None
+
+
 def _check_existing_api_key(env_file: Path) -> Optional[str]:
     """Check if API Key already exists in .env file."""
     if not env_file.exists():
@@ -88,21 +104,35 @@ def create_api_key(
     project_id: Optional[str] = typer.Option(None, "--project-id", help="Project ID"),
     name: Optional[str] = typer.Option("cli-generated", "--name", "-n", help="Key name"),
     save: bool = typer.Option(True, "--save/--no-save", help="Save to .env"),
-    env_file: Path = typer.Option(Path(".env"), "--env-file", help="Env file path"),
+    env_file: Optional[Path] = typer.Option(None, "--env-file", help="Override env file path"),
     overwrite_env: bool = typer.Option(False, "--overwrite-env", help="Overwrite existing"),
-    project: Optional[str] = typer.Option(None, "--project", help="Project name"),
+    project: Optional[str] = typer.Option(None, "--project", help="Project name (legacy)"),
     root: Path = typer.Option(Path(DEFAULT_ROOT_DIR_NAME), "--root", help="Root dir"),
     api_url: Optional[str] = typer.Option(None, "--api-url", help="API base URL"),
 ):
-    """Create an API Key for sync operations (pull/upload)."""
+    """Create an API Key for sync operations (pull/upload).
+    
+    Saves to .fluxloop/.env (workspace level) by default.
+    API keys are project-scoped and shared by all scenarios.
+    """
     api_url = resolve_api_url(api_url)
-    env_path = resolve_env_path(env_file, project, root)
+    
+    # Priority: --env-file > workspace .fluxloop/.env > legacy resolution
+    if env_file:
+        env_path = env_file.expanduser().resolve()
+    else:
+        env_path = _get_workspace_env_path()
+        if env_path:
+            console.print(f"[dim]Saving to workspace: {env_path}[/dim]")
+        else:
+            env_path = resolve_env_path(Path(".env"), project, root)
+            console.print(f"[dim]No workspace found, saving to: {env_path}[/dim]")
     
     if not project_id:
         project_id = get_current_project_id()
         if not project_id:
             console.print("[yellow]No project selected.[/yellow]")
-            console.print("[dim]Select: fluxloop context set-project <id>[/dim]")
+            console.print("[dim]Select: fluxloop projects select <id>[/dim]")
             raise typer.Exit(1)
     
     # Pre-check existing key
@@ -155,40 +185,48 @@ def create_api_key(
 
 @app.command("check")
 def check_api_key(
-    env_file: Path = typer.Option(Path(".env"), "--env-file", help="Env file"),
-    project: Optional[str] = typer.Option(None, "--project", help="Project name"),
+    env_file: Optional[Path] = typer.Option(None, "--env-file", help="Override env file"),
+    project: Optional[str] = typer.Option(None, "--project", help="Project name (legacy)"),
     root: Path = typer.Option(Path(DEFAULT_ROOT_DIR_NAME), "--root", help="Root dir"),
 ):
-    """Check if API Key is configured."""
-    env_key = os.getenv("FLUXLOOP_SYNC_API_KEY") or os.getenv("FLUXLOOP_API_KEY")
+    """Check if API Key is configured.
     
-    if env_key:
+    Checks in order: environment variable → .fluxloop/.env → legacy paths
+    """
+    # 1. Check environment variable
+    env_key = os.getenv("FLUXLOOP_SYNC_API_KEY") or os.getenv("FLUXLOOP_API_KEY")
+    if env_key and env_key != "your-api-key-here":
         masked = "****" + env_key[-4:] if len(env_key) > 4 else "****"
         console.print(f"[green]✓[/green] API Key set: {masked}")
         console.print("[dim]Source: environment variable[/dim]")
         return
     
-    env_path = resolve_env_path(env_file, project, root)
-    
-    if env_path.exists():
-        for line in env_path.read_text().splitlines():
+    # 2. Check workspace .fluxloop/.env
+    workspace_env = _get_workspace_env_path()
+    if workspace_env and workspace_env.exists():
+        for line in workspace_env.read_text().splitlines():
             if line.startswith("FLUXLOOP_SYNC_API_KEY=") or line.startswith("FLUXLOOP_API_KEY="):
                 val = line.split("=", 1)[1].strip()
-                if val:
+                if val and val != "your-api-key-here":
                     masked = "****" + val[-4:] if len(val) > 4 else "****"
                     console.print(f"[green]✓[/green] API Key set: {masked}")
-                    console.print(f"[dim]Source: {env_path}[/dim]")
+                    console.print(f"[dim]Source: {workspace_env}[/dim]")
                     return
     
-    cwd_env = Path.cwd() / ".env"
-    if cwd_env != env_path and cwd_env.exists():
-        for line in cwd_env.read_text().splitlines():
+    # 3. Check explicit env file or legacy path
+    if env_file:
+        env_path = env_file.expanduser().resolve()
+    else:
+        env_path = resolve_env_path(Path(".env"), project, root)
+    
+    if env_path.exists():
+        for line in env_path.read_text().splitlines():
             if line.startswith("FLUXLOOP_SYNC_API_KEY=") or line.startswith("FLUXLOOP_API_KEY="):
                 val = line.split("=", 1)[1].strip()
-                if val:
+                if val and val != "your-api-key-here":
                     masked = "****" + val[-4:] if len(val) > 4 else "****"
                     console.print(f"[green]✓[/green] API Key set: {masked}")
-                    console.print(f"[dim]Source: {cwd_env}[/dim]")
+                    console.print(f"[dim]Source: {env_path}[/dim]")
                     return
     
     console.print("[yellow]✗[/yellow] API Key not set")

fluxloop_cli/commands/auth.py

@@ -1,9 +1,13 @@
 """
 Authentication commands for FluxLoop CLI.
+
+Designed for both interactive and agent (Claude Code, Cursor) environments.
 """
 
 import os
+import sys
 import webbrowser
+from datetime import datetime, timezone
 from typing import Optional
 
 import typer
@@ -18,7 +22,11 @@ from ..auth_manager import (
     save_auth_token,
     load_auth_token,
     delete_auth_token,
+    save_pending_login,
+    load_pending_login,
+    delete_pending_login,
     is_token_expired,
+    ensure_valid_token,
     format_expires_at,
 )
 
@@ -38,44 +46,191 @@ def _resolve_api_url(override: Optional[str]) -> str:
     return url.rstrip("/")
 
 
+def _is_agent_environment() -> bool:
+    """Detect if running in an agent/headless environment."""
+    # Check common agent environment indicators
+    if not sys.stdout.isatty():
+        return True
+    if os.getenv("CLAUDE_CODE") or os.getenv("CURSOR_AGENT"):
+        return True
+    if os.getenv("CI") or os.getenv("GITHUB_ACTIONS"):
+        return True
+    return False
+
+
 @app.command()
 def login(
     api_url: Optional[str] = typer.Option(
         None, "--api-url", help="FluxLoop API base URL"
     ),
+    force: bool = typer.Option(
+        False, "--force", "-f", help="Force re-login even if already logged in"
+    ),
+    no_browser: bool = typer.Option(
+        False, "--no-browser", help="Don't open browser automatically (for CI/CD or headless environments)"
+    ),
+    no_wait: bool = typer.Option(
+        False,
+        "--no-wait",
+        help="Print device code and exit without polling (use --resume to finish)",
+    ),
+    resume: bool = typer.Option(
+        False,
+        "--resume",
+        help="Resume a pending login by polling saved device code",
+    ),
 ):
     """
     Login to connect your FluxLoop account.
+    
+    If already logged in with a valid token, this command will skip login
+    unless --force is specified. This makes the command idempotent and
+    safe to call from automated scripts or AI agents.
     """
     api_url = _resolve_api_url(api_url)
 
+    # Check if already logged in (idempotent behavior)
+    if not force:
+        existing_token = load_auth_token()
+        if existing_token and not is_token_expired(existing_token):
+            console.print(f"[green]✓[/green] Already logged in: [bold]{existing_token.user_email}[/bold]")
+            time_remaining = format_expires_at(existing_token.expires_at)
+            console.print(f"  Token expires: {time_remaining}")
+            console.print("[dim]Use --force to re-login with a new session.[/dim]")
+            return
+
+    if resume:
+        pending = load_pending_login()
+        if not pending:
+            console.print("[red]✗[/red] No pending login found. Run 'fluxloop auth login --no-wait' first.")
+            print("LOGIN_STATUS: no_pending")
+            raise typer.Exit(1)
+
+        pending_api_url = pending.get("api_url") or api_url
+        device_code = pending.get("device_code")
+        if not device_code:
+            console.print("[red]✗[/red] Pending login data is missing device_code.")
+            delete_pending_login()
+            print("LOGIN_STATUS: invalid_pending")
+            raise typer.Exit(1)
+
+        interval = pending.get("interval") or 5
+        timeout = pending.get("expires_in") or 300
+        expires_at = pending.get("expires_at")
+        if expires_at:
+            try:
+                expires_dt = datetime.fromisoformat(expires_at.replace("Z", "+00:00"))
+                if expires_dt.tzinfo is None:
+                    expires_dt = expires_dt.replace(tzinfo=timezone.utc)
+                remaining = int((expires_dt - datetime.now(timezone.utc)).total_seconds())
+                if remaining <= 0:
+                    delete_pending_login()
+                    console.print("[red]✗[/red] Pending login has expired. Run 'fluxloop auth login --no-wait' again.")
+                    print("LOGIN_STATUS: expired_pending")
+                    raise typer.Exit(1)
+                timeout = remaining
+            except ValueError:
+                pass
+
+        try:
+            # Poll for completion
+            token = poll_device_code(
+                pending_api_url,
+                device_code,
+                interval=interval,
+                timeout=timeout,
+            )
+
+            save_auth_token(token)
+            delete_pending_login()
+
+            print()
+            print(f"LOGIN_SUCCESS: {token.user_email}")
+            console.print(f"[green]✓[/green] Login successful: [bold]{token.user_email}[/bold]")
+            console.print()
+            console.print("[dim]Next steps:[/dim]")
+            console.print("[dim]  • fluxloop projects list    - View your projects[/dim]")
+            console.print("[dim]  • fluxloop context set-project <id>  - Select a project[/dim]")
+            return
+        except TimeoutError as e:
+            delete_pending_login()
+            console.print(f"\n[red]✗[/red] {e}", style="bold red")
+            raise typer.Exit(1)
+        except ValueError as e:
+            delete_pending_login()
+            console.print(f"\n[red]✗[/red] {e}", style="bold red")
+            raise typer.Exit(1)
+        except Exception as e:
+            delete_pending_login()
+            console.print(f"\n[red]✗[/red] Login failed: {e}", style="bold red")
+            raise typer.Exit(1)
+
+    # Detect agent environment for adjusted behavior
+    is_agent = _is_agent_environment()
+    skip_browser = no_browser
+
     try:
         # Start device-code flow
         device_response = start_device_code_flow(api_url)
 
-        # Display login panel
-        login_panel = Panel(
-            f"[bold cyan]Open this URL in your browser:[/bold cyan]\n"
-            f"{device_response.verification_url}\n\n"
-            f"[bold yellow]Enter code:[/bold yellow] [bold green]{device_response.user_code}[/bold green]",
-            title="[bold blue]FluxLoop CLI Login[/bold blue]",
-            border_style="blue",
-        )
-        console.print(login_panel)
-        console.print()
+        # Always print plain text for agent compatibility (parseable output)
+        # Use flush=True to ensure output appears immediately in agent environments
+        print(flush=True)
+        print("=" * 50, flush=True)
+        print("FLUXLOOP LOGIN", flush=True)
+        print("=" * 50, flush=True)
+        print(f"URL:  {device_response.verification_url}", flush=True)
+        print(f"CODE: {device_response.user_code}", flush=True)
+        print("=" * 50, flush=True)
+        print(flush=True)
 
-        # Try to open browser automatically
-        try:
-            webbrowser.open(device_response.verification_url)
-            console.print("[dim]Browser opened automatically...[/dim]")
-        except Exception:
-            console.print("[dim]Please open the browser manually.[/dim]")
+        # Also display rich panel for interactive terminals
+        if sys.stdout.isatty():
+            login_panel = Panel(
+                f"[bold cyan]Open this URL in your browser:[/bold cyan]\n"
+                f"{device_response.verification_url}\n\n"
+                f"[bold yellow]Enter code:[/bold yellow] [bold green]{device_response.user_code}[/bold green]",
+                title="[bold blue]FluxLoop CLI Login[/bold blue]",
+                border_style="blue",
+            )
+            console.print(login_panel)
+            console.print()
 
-        console.print()
+        # Save pending login info for agent/non-blocking resume
+        pending_path = save_pending_login(device_response, api_url)
+
+        # Try to open browser automatically (unless disabled with --no-browser)
+        if not skip_browser:
+            try:
+                webbrowser.open(device_response.verification_url)
+                console.print("[dim]Browser opened automatically...[/dim]")
+            except Exception:
+                console.print("[dim]Please open the browser manually.[/dim]")
+        else:
+            print("(Browser auto-open disabled with --no-browser)", flush=True)
+
+        print(flush=True)
+        print("Waiting for approval...", flush=True)
 
-        # Poll for completion with spinner
-        spinner = Spinner("dots", text="Waiting for approval...")
-        with Live(spinner, console=console, refresh_per_second=10):
+        if no_wait:
+            print(f"PENDING_LOGIN_PATH: {pending_path}", flush=True)
+            console.print("[yellow]Login pending.[/yellow] Open the URL, enter the code, then run:")
+            console.print("[dim]  fluxloop auth login --resume[/dim]")
+            return
+
+        # Poll for completion
+        if sys.stdout.isatty() and not is_agent:
+            # Use spinner for interactive terminals
+            spinner = Spinner("dots", text="Waiting for approval...")
+            with Live(spinner, console=console, refresh_per_second=10):
+                token = poll_device_code(
+                    api_url,
+                    device_response.device_code,
+                    interval=device_response.interval,
+                    timeout=device_response.expires_in,
+                )
+        else:
+            # Simple polling for agents (no spinner)
             token = poll_device_code(
                 api_url,
                 device_response.device_code,
@@ -85,9 +240,11 @@ def login(
 
         # Save token
         save_auth_token(token)
+        delete_pending_login()
 
         # Success message (User-scoped, no project selection at login)
-        console.print()
+        print()
+        print(f"LOGIN_SUCCESS: {token.user_email}")
         console.print(f"[green]✓[/green] Login successful: [bold]{token.user_email}[/bold]")
         console.print()
         console.print("[dim]Next steps:[/dim]")
@@ -95,12 +252,15 @@ def login(
         console.print("[dim]  • fluxloop context set-project <id>  - Select a project[/dim]")
 
     except TimeoutError as e:
+        delete_pending_login()
         console.print(f"\n[red]✗[/red] {e}", style="bold red")
         raise typer.Exit(1)
     except ValueError as e:
+        delete_pending_login()
         console.print(f"\n[red]✗[/red] {e}", style="bold red")
         raise typer.Exit(1)
     except Exception as e:
+        delete_pending_login()
         console.print(f"\n[red]✗[/red] Login failed: {e}", style="bold red")
         raise typer.Exit(1)
 
@@ -114,42 +274,72 @@ def logout():
 
     if not token:
         console.print("[yellow]Already logged out.[/yellow]")
+        print("LOGOUT_STATUS: already_logged_out")
         return
 
     delete_auth_token()
     console.print("[green]✓[/green] Logged out successfully")
+    print("LOGOUT_STATUS: success")
 
 
 @app.command()
 def status():
     """
     Check current login status.
+    
+    If token is expired or about to expire, automatically attempts to refresh.
+    Only suggests re-login if refresh fails.
     """
+    api_url = _resolve_api_url(None)
     token = load_auth_token()
 
     if not token:
         console.print("[yellow]Not logged in.[/yellow]")
         console.print("[dim]Run [bold]fluxloop auth login[/bold] to login.[/dim]")
+        print("AUTH_STATUS: not_logged_in")
         return
 
-    # Check expiration
+    # Check expiration - if expired, try refresh first
     expired = is_token_expired(token)
-    time_remaining = format_expires_at(token.expires_at)
-
+    
     if expired:
-        console.print("[red]✗[/red] Token has expired")
-        console.print("[dim]Run [bold]fluxloop auth login[/bold] to login again.[/dim]")
+        # Try to refresh before declaring "expired"
+        console.print("[dim]Token expired or expiring soon, attempting refresh...[/dim]")
+        refreshed_token = ensure_valid_token(api_url)
+        
+        if refreshed_token:
+            # Refresh succeeded
+            token = refreshed_token
+            time_remaining = format_expires_at(token.expires_at)
+            console.print(f"[green]✓[/green] Logged in: [bold]{token.user_email}[/bold] (token refreshed)")
+            console.print(f"  Token expires: {time_remaining}")
+            print(f"AUTH_STATUS: logged_in (refreshed)")
+            print(f"AUTH_USER: {token.user_email}")
+        else:
+            # Refresh failed
+            console.print("[red]✗[/red] Token expired and refresh failed")
+            console.print("[dim]Run [bold]fluxloop auth login[/bold] to login again.[/dim]")
+            print("AUTH_STATUS: expired")
+            return
     else:
+        time_remaining = format_expires_at(token.expires_at)
         console.print(f"[green]✓[/green] Logged in: [bold]{token.user_email}[/bold]")
         console.print(f"  Token expires: {time_remaining}")
-        
-        # Show current context if available
-        from ..context_manager import load_context
-        context = load_context()
-        if context:
-            if context.current_project:
-                console.print(f"  Project: {context.current_project.name} ([dim]{context.current_project.id}[/dim])")
-            if context.current_scenario:
-                console.print(f"  Scenario: {context.current_scenario.name} ([dim]{context.current_scenario.id}[/dim])")
-        else:
-            console.print("[dim]  No project selected. Run [bold]fluxloop projects list[/bold] to see your projects.[/dim]")
+        print(f"AUTH_STATUS: logged_in")
+        print(f"AUTH_USER: {token.user_email}")
+    
+    # Show current context if available
+    from ..context_manager import load_context, load_project_connection
+    
+    project_conn = load_project_connection()
+    if project_conn:
+        console.print(f"  Project: {project_conn.project_name} ([dim]{project_conn.project_id}[/dim])")
+        print(f"AUTH_PROJECT: {project_conn.project_id}")
+    
+    context = load_context()
+    if context and context.current_scenario:
+        console.print(f"  Scenario: {context.current_scenario.name} ([dim]{context.current_scenario.id}[/dim])")
+        print(f"AUTH_SCENARIO: {context.current_scenario.id}")
+    
+    if not project_conn:
+        console.print("[dim]  No project selected. Run [bold]fluxloop projects select[/bold] to choose a project.[/dim]")