aline-ai 0.5.12__py3-none-any.whl → 0.6.0__py3-none-any.whl

realign/commands/export_shares.py

@@ -25,6 +25,7 @@ from typing import Any, List, Dict, Optional, Tuple, Set, Callable
 from ..logging_config import setup_logger
 from ..db.base import SessionRecord, TurnRecord
 from ..llm_client import call_llm, extract_json
+from ..auth import get_auth_headers, is_logged_in
 
 logger = setup_logger("realign.commands.export_shares", "export_shares.log")
 
@@ -177,9 +178,9 @@ class ExportableSession:
     last_activity_at: Optional[datetime]  # Last activity time
     turn_count: int  # Number of turns in session
     turns: List[TurnRecord]  # List of turns
-    # V9: creator information
-    creator_name: Optional[str] = None  # Username who created the session
-    creator_id: Optional[str] = None  # User UUID
+    # V18: user identity
+    created_by: Optional[str] = None  # Creator UID
+    shared_by: Optional[str] = None  # Sharer UID
 
 
 def get_sessions_for_export(
@@ -215,8 +216,8 @@ def get_sessions_for_export(
                 last_activity_at=session.last_activity_at,
                 turn_count=len(turns),
                 turns=turns,
-                creator_name=session.creator_name,
-                creator_id=session.creator_id,
+                created_by=session.created_by,
+                shared_by=session.shared_by,
             )
         )
 
@@ -298,8 +299,8 @@ def build_exportable_sessions_from_records(
                 last_activity_at=session.last_activity_at,
                 turn_count=len(turns),
                 turns=turns,
-                creator_name=session.creator_name,
-                creator_id=session.creator_id,
+                created_by=session.created_by,
+                shared_by=session.shared_by,
             )
         )
     return exportable
@@ -803,8 +804,8 @@ def build_enhanced_conversation_data(
             full_event.created_at.isoformat() if full_event.created_at else None
         )
         event_data["metadata"] = full_event.metadata or {}
-        event_data["creator_name"] = full_event.creator_name
-        event_data["creator_id"] = full_event.creator_id
+        event_data["created_by"] = full_event.created_by
+        event_data["shared_by"] = full_event.shared_by
 
     # Build sessions data with turn structure
     sessions_data = []
@@ -867,13 +868,11 @@ def build_enhanced_conversation_data(
                 ),
                 "model_name": turn.model_name,
                 "git_commit_hash": turn.git_commit_hash,
-                "creator_name": turn.creator_name,
-                "creator_id": turn.creator_id,
                 "messages": messages,  # Structured messages for this turn
             }
             turns_data.append(turn_data)
 
-        # Build session data (V9: includes creator fields)
+        # Build session data (V18: created_by/shared_by)
         session_data = {
             "session_id": session.session_id,
             "session_type": session.session_type,
@@ -884,8 +883,8 @@ def build_enhanced_conversation_data(
             "last_activity_at": (
                 session.last_activity_at.isoformat() if session.last_activity_at else None
             ),
-            "creator_name": session.creator_name,
-            "creator_id": session.creator_id,
+            "created_by": session.created_by,
+            "shared_by": session.shared_by,
             "turns": turns_data,
         }
         sessions_data.append(session_data)
@@ -1688,9 +1687,13 @@ def _standard_upload(
         if ui_metadata:
             payload["ui_metadata"] = ui_metadata
 
+        # Include auth headers for Bearer token authentication
+        headers = get_auth_headers()
+
         response = httpx.post(
             f"{backend_url}/api/share/create",
             json=payload,
+            headers=headers,
             timeout=30.0,
         )
         response.raise_for_status()
@@ -1705,12 +1708,14 @@ def _upload_chunks_and_complete(
     upload_id: str,
     backend_url: str,
     progress_callback: Optional[Callable] = None,
+    auth_headers: Optional[Dict[str, str]] = None,
 ) -> None:
     """
     Helper function to upload chunks and complete the upload.
     Can be run in background thread.
     """
     total_chunks = len(chunks)
+    headers = auth_headers or {}
 
     # Upload each chunk
     for i, chunk in enumerate(chunks):
@@ -1727,6 +1732,7 @@ def _upload_chunks_and_complete(
             response = httpx.post(
                 f"{backend_url}/api/share/chunk/upload",
                 json=chunk_payload,
+                headers=headers,
                 timeout=60.0,  # Longer timeout for chunk uploads
             )
             response.raise_for_status()
@@ -1748,6 +1754,7 @@ def _upload_chunks_and_complete(
         response = httpx.post(
             f"{backend_url}/api/share/chunk/complete",
             json={"upload_id": upload_id},
+            headers=headers,
             timeout=60.0,
         )
         response.raise_for_status()
@@ -1806,6 +1813,9 @@ def _chunked_upload(
     if progress_callback:
         progress_callback(0, total_chunks + 2, "Initializing chunked upload...")
 
+    # Get auth headers for Bearer token authentication
+    auth_headers = get_auth_headers()
+
     # Step 1: Initialize upload session (now returns share_url immediately)
     try:
         init_payload = {
@@ -1823,6 +1833,7 @@ def _chunked_upload(
         response = httpx.post(
             f"{backend_url}/api/share/chunk/init",
             json=init_payload,
+            headers=auth_headers,
             timeout=30.0,
         )
         response.raise_for_status()
@@ -1847,7 +1858,7 @@ def _chunked_upload(
         # but user already has the share URL displayed
         thread = threading.Thread(
             target=_upload_chunks_and_complete,
-            args=(chunks, upload_id, backend_url, None),  # No callback in background
+            args=(chunks, upload_id, backend_url, None, auth_headers),  # No callback in background
             daemon=False,  # Important: let thread complete before process exits
         )
         thread.start()
@@ -1862,7 +1873,7 @@ def _chunked_upload(
         }
 
     # Foreground mode: upload chunks synchronously
-    _upload_chunks_and_complete(chunks, upload_id, backend_url, progress_callback)
+    _upload_chunks_and_complete(chunks, upload_id, backend_url, progress_callback, auth_headers)
 
     return {
         "share_id": share_id,
@@ -1917,11 +1928,13 @@ def upload_to_backend_unencrypted(
     else:
         logger.info(f"Payload size ({payload_size / 1024:.2f}KB), using standard upload")
         print(f"📤 Using standard upload...")
-        # Standard upload
+        # Standard upload with auth headers
         try:
+            headers = get_auth_headers()
             response = httpx.post(
                 f"{backend_url}/api/share/create",
                 json=full_payload,
+                headers=headers,
                 timeout=30.0,
             )
             response.raise_for_status()
@@ -1975,6 +1988,9 @@ def _chunked_upload_unencrypted(
     if progress_callback:
         progress_callback(0, total_chunks + 2, "Initializing chunked upload...")
 
+    # Get auth headers for Bearer token authentication
+    auth_headers = get_auth_headers()
+
     # Step 1: Initialize upload session (now returns share_url immediately)
     try:
         init_payload = {
@@ -1988,6 +2004,7 @@ def _chunked_upload_unencrypted(
         response = httpx.post(
             f"{backend_url}/api/share/chunk/init",
             json=init_payload,
+            headers=auth_headers,
             timeout=30.0,
         )
         response.raise_for_status()
@@ -2012,7 +2029,7 @@ def _chunked_upload_unencrypted(
         # but user already has the share URL displayed
         thread = threading.Thread(
             target=_upload_chunks_and_complete,
-            args=(chunks, upload_id, backend_url, None),  # No callback in background
+            args=(chunks, upload_id, backend_url, None, auth_headers),  # No callback in background
             daemon=False,  # Important: let thread complete before process exits
         )
         thread.start()
@@ -2027,7 +2044,7 @@ def _chunked_upload_unencrypted(
         }
 
     # Foreground mode: upload chunks synchronously
-    _upload_chunks_and_complete(chunks, upload_id, backend_url, progress_callback)
+    _upload_chunks_and_complete(chunks, upload_id, backend_url, progress_callback, auth_headers)
 
     return {
         "share_id": share_id,
@@ -3036,16 +3053,22 @@ def export_shares_interactive_command(
     # Check dependencies
     if not CRYPTO_AVAILABLE:
         if not json_output:
-            print("❌ Error: cryptography package not installed", file=sys.stderr)
+            print("Error: cryptography package not installed", file=sys.stderr)
             print("Install it with: pip install cryptography", file=sys.stderr)
         return 1
 
     if not HTTPX_AVAILABLE:
         if not json_output:
-            print("❌ Error: httpx package not installed", file=sys.stderr)
+            print("Error: httpx package not installed", file=sys.stderr)
             print("Install it with: pip install httpx", file=sys.stderr)
         return 1
 
+    # Check authentication - require login to create shares
+    if not is_logged_in():
+        if not json_output:
+            print("Error: Not logged in. Please run 'aline login' first.", file=sys.stderr)
+        return 1
+
     # Get backend URL
     if backend_url is None:
         # Try to load from config

realign/commands/import_shares.py

@@ -239,6 +239,9 @@ def import_v2_data(
 
     logger.info("Starting v2.0 data import")
 
+    # Load config to get current user's UID for shared_by
+    config = ReAlignConfig.load()
+
     # 1. Create Event
     event_data = data.get("event", {})
     event_id = event_data.get("event_id")
@@ -288,8 +291,9 @@ def import_v2_data(
             slack_message=None,
             share_url=share_url,
             commit_hashes=[],
-            creator_name=event_data.get("creator_name"),  # V9: preserve creator info
-            creator_id=event_data.get("creator_id"),
+            # V18: user identity (with backward compatibility for old format)
+            created_by=event_data.get("created_by") or event_data.get("uid") or event_data.get("creator_id"),
+            shared_by=config.uid,  # Current user is the importer
         )
 
         # Use sync_events for both create and update (upsert behavior)
@@ -365,6 +369,9 @@ def import_session_with_turns(
     Returns:
         Dict with counts: {'sessions': int, 'turns': int, 'skipped': int}
     """
+    # Load config to get current user's UID for shared_by
+    config = ReAlignConfig.load()
+
     session_id = session_data.get("session_id")
     imported_sessions = 0
     imported_turns = 0
@@ -393,8 +400,9 @@ def import_session_with_turns(
             summary_status="completed",
             summary_locked_until=None,
             summary_error=None,
-            creator_name=session_data.get("creator_name"),  # V9: preserve creator info
-            creator_id=session_data.get("creator_id"),
+            # V18: user identity (with backward compatibility for old format)
+            created_by=session_data.get("created_by") or session_data.get("uid") or session_data.get("creator_id"),
+            shared_by=config.uid,  # Current user is the importer
         )
 
         if existing_session and force:
@@ -423,8 +431,8 @@ def import_session_with_turns(
                     summary_status = ?,
                     summary_locked_until = ?,
                     summary_error = ?,
-                    creator_name = ?,
-                    creator_id = ?
+                    created_by = ?,
+                    shared_by = ?
                 WHERE id = ?
             """,
                 (
@@ -434,8 +442,8 @@ def import_session_with_turns(
                     session.summary_status,
                     session.summary_locked_until,
                     session.summary_error,
-                    session.creator_name,
-                    session.creator_id,
+                    session.created_by,
+                    session.shared_by,
                     session.id,
                 ),
             )
@@ -473,8 +481,6 @@ def import_session_with_turns(
             timestamp=parse_datetime(turn_data.get("timestamp")) or datetime.now(),
             created_at=datetime.now(),
             git_commit_hash=turn_data.get("git_commit_hash"),
-            creator_name=turn_data.get("creator_name"),  # V9: preserve creator info
-            creator_id=turn_data.get("creator_id"),
         )
 
         # Store turn content (JSONL)

realign/commands/init.py

@@ -9,7 +9,6 @@ from rich.console import Console
 from ..config import (
     ReAlignConfig,
     get_default_config_content,
-    generate_user_id,
     generate_random_username,
 )
 
@@ -647,45 +646,23 @@ def init_global(
         # Load config
         config = ReAlignConfig.load()
 
-        # User identity setup (V9)
-        if not config.user_id:
+        # User identity setup (V17: uid from Supabase login)
+        if not config.uid:
             console.print("\n[bold blue]═══ User Identity Setup ═══[/bold blue]")
             console.print(
-                "ReAlign needs to identify you for tracking session ownership.\n"
+                "Aline requires login for user identification.\n"
             )
-
-            # Generate user UUID (based on MAC address)
-            config.user_id = generate_user_id()
-            console.print(f"Generated user ID: [cyan]{config.user_id[:8]}...[/cyan]\n")
-
-            # Prompt user for username
-            try:
-                from rich.prompt import Prompt
-
-                user_input = Prompt.ask(
-                    "[cyan]Enter your username (or press Enter for auto-generated)[/cyan]",
-                    default="",
-                )
-            except ImportError:
-                user_input = input(
-                    "Enter your username (or press Enter for auto-generated): "
-                ).strip()
-
-            if user_input:
-                config.user_name = user_input
-            else:
-                # Auto-generate username
+            console.print(
+                "[yellow]Run 'aline login' to authenticate with your account.[/yellow]\n"
+            )
+            # If user_name is also not set, generate a temporary one
+            if not config.user_name:
                 config.user_name = generate_random_username()
+                config.save()
                 console.print(
-                    f"Auto-generated username: [yellow]{config.user_name}[/yellow]"
+                    f"Auto-generated username: [yellow]{config.user_name}[/yellow] (will update on login)\n"
                 )
 
-            # Save config with user identity
-            config.save()
-            console.print(
-                f"[green]✓[/green] User identity saved: [bold]{config.user_name}[/bold] ([dim]{config.user_id[:8]}...[/dim])\n"
-            )
-
         # Initialize database
         db_path = Path(config.sqlite_db_path).expanduser()
         db_path.parent.mkdir(parents=True, exist_ok=True)

realign/commands/watcher.py

@@ -658,6 +658,14 @@ def watcher_start_command() -> int:
         int: Exit code (0 = success, 1 = error)
     """
     try:
+        # Check login status first
+        from ..auth import is_logged_in
+
+        if not is_logged_in():
+            console.print("[red]✗ Not logged in. Watcher requires authentication.[/red]")
+            console.print("[dim]Run 'aline login' first.[/dim]")
+            return 1
+
         # Check if already running
         is_running, pid, mode = detect_watcher_process()
 
@@ -1012,7 +1020,7 @@ def _get_imported_sessions(db, exclude_session_ids: set) -> list:
                     "session_file": None,  # No file for imported sessions
                     "session_title": session.session_title,
                     "session_summary": session.session_summary,
-                    "creator_name": session.creator_name,
+                    "created_by": session.created_by,
                 }
             )
 
@@ -1226,7 +1234,7 @@ def _get_session_tracking_status_batch(
         if record and status in ("partial", "tracked"):
             info["session_title"] = record.session_title
             info["session_summary"] = record.session_summary
-            info["creator_name"] = record.creator_name
+            info["created_by"] = record.created_by
 
         session_infos.append(info)
 
@@ -1526,7 +1534,7 @@ def watcher_session_list_command(
                     "last_activity": info["last_activity"].isoformat(),
                     "session_title": info.get("session_title"),
                     "session_summary": info.get("session_summary"),
-                    "creator_name": info.get("creator_name"),
+                    "created_by": info.get("created_by"),
                     "session_file": (
                         str(info.get("session_file")) if info.get("session_file") else None
                     ),
@@ -1622,14 +1630,12 @@ def watcher_session_list_command(
                 title_str = info.get("session_title") or "-"
                 title_str = title_str.strip()
 
-            # V9: Display creator (truncate if too long)
+            # V18: Display created_by UID (truncate if too long)
             creator_display = "-"
             if info["status"] in ("partial", "tracked"):
-                creator_name = info.get("creator_name")
-                if creator_name:
-                    creator_display = creator_name
-                    if len(creator_display) > 10:
-                        creator_display = creator_display[:10] + "..."
+                created_by = info.get("created_by")
+                if created_by:
+                    creator_display = created_by[:8] + "..."
 
             # Truncate project name
             project_name = info["project_name"]
@@ -1851,8 +1857,7 @@ def watcher_event_generate_command(session_selector: str, show_sessions: bool =
             updated_at=now,
             metadata={},
             commit_hashes=[],
-            creator_name=config.user_name,
-            creator_id=config.user_id,
+            created_by=config.uid,
         )
 
         # Save to database
@@ -2117,7 +2122,7 @@ def watcher_event_list_command(
                     "id": event.id,
                     "title": event.title,
                     "description": event.description,
-                    "creator_name": event.creator_name,
+                    "created_by": event.created_by,
                     "generated_by": generated_by,
                     "session_count": session_count,
                     "session_ids": session_ids,
@@ -2177,10 +2182,8 @@ def watcher_event_list_command(
             else:
                 share_link_display = "[dim]-[/dim]"
 
-            # V9: Display creator (truncate if too long)
-            creator_display = event.creator_name or "-"
-            if creator_display and len(creator_display) > 12:
-                creator_display = creator_display[:12] + "..."
+            # V18: Display created_by UID (truncate)
+            creator_display = (event.created_by[:8] + "...") if event.created_by else "-"
 
             table.add_row(
                 str(idx),

realign/commands/worker.py

@@ -461,6 +461,14 @@ def worker_repair_command(*, force: bool = False) -> int:
 
 def worker_start_command() -> int:
     try:
+        # Check login status first
+        from ..auth import is_logged_in
+
+        if not is_logged_in():
+            console.print("[red]✗ Not logged in. Worker requires authentication.[/red]")
+            console.print("[dim]Run 'aline login' first.[/dim]")
+            return 1
+
         is_running, pid, mode = detect_worker_process()
         if is_running:
             console.print(f"[yellow]Worker is already running (PID: {pid}, mode: {mode})[/yellow]")

realign/config.py

@@ -27,9 +27,9 @@ class ReAlignConfig:
         "https://realign-server.vercel.app"  # Backend URL for interactive share export
     )
 
-    # User identity (V9)
-    user_name: str = ""  # User's display name (set during init)
-    user_id: str = ""  # User's UUID (generated from MAC address)
+    # User identity (V9, renamed in V17: user_id -> uid)
+    user_name: str = ""  # User's display name (set during init or login)
+    uid: str = ""  # User's UUID (from Supabase login)
 
     # Session catch-up settings
     max_catchup_sessions: int = 3  # Max sessions to auto-import on watcher startup
@@ -92,7 +92,7 @@ class ReAlignConfig:
             "enable_temp_turn_titles": os.getenv("REALIGN_ENABLE_TEMP_TURN_TITLES"),
             "share_backend_url": os.getenv("REALIGN_SHARE_BACKEND_URL"),
             "user_name": os.getenv("REALIGN_USER_NAME"),
-            "user_id": os.getenv("REALIGN_USER_ID"),
+            "uid": os.getenv("REALIGN_UID"),
             "max_catchup_sessions": os.getenv("REALIGN_MAX_CATCHUP_SESSIONS"),
             "anthropic_api_key": os.getenv("REALIGN_ANTHROPIC_API_KEY"),
             "openai_api_key": os.getenv("REALIGN_OPENAI_API_KEY"),
@@ -124,6 +124,13 @@ class ReAlignConfig:
                 else:
                     config_dict[key] = value
 
+        # Migration: user_id -> uid (V17)
+        if "user_id" in config_dict and "uid" not in config_dict:
+            config_dict["uid"] = config_dict.pop("user_id")
+        elif "user_id" in config_dict:
+            # Both exist, prefer uid, discard user_id
+            config_dict.pop("user_id")
+
         return cls(**{k: v for k, v in config_dict.items() if k in cls.__annotations__})
 
     def save(self, config_path: Optional[Path] = None):
@@ -148,7 +155,7 @@ class ReAlignConfig:
             "enable_temp_turn_titles": self.enable_temp_turn_titles,
             "share_backend_url": self.share_backend_url,
             "user_name": self.user_name,
-            "user_id": self.user_id,
+            "uid": self.uid,
             "max_catchup_sessions": self.max_catchup_sessions,
             "anthropic_api_key": self.anthropic_api_key,
             "openai_api_key": self.openai_api_key,
@@ -163,30 +170,6 @@ class ReAlignConfig:
             yaml.dump(config_dict, f, default_flow_style=False, allow_unicode=True)
 
 
-def generate_user_id() -> str:
-    """
-    Generate a persistent user UUID based on MAC address.
-
-    Uses uuid.getnode() to get the MAC address, then generates a UUID5
-    using DNS namespace. If MAC address retrieval fails, falls back to
-    a random UUID.
-
-    Returns:
-        str: User UUID as a string
-    """
-    import uuid
-
-    try:
-        mac = uuid.getnode()
-        # Use MAC address with DNS namespace to generate UUID5
-        namespace = uuid.UUID("6ba7b810-9dad-11d1-80b4-00c04fd430c8")  # DNS namespace
-        user_uuid = uuid.uuid5(namespace, str(mac))
-        return str(user_uuid)
-    except Exception:
-        # Fallback to random UUID if MAC address retrieval fails
-        return str(uuid.uuid4())
-
-
 def generate_random_username() -> str:
     """
     Generate a random username with format: 3 lowercase letters + 3 digits.