aline-ai 0.5.11__py3-none-any.whl → 0.5.13__py3-none-any.whl

realign/commands/watcher.py

@@ -1012,7 +1012,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 +1226,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 +1526,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 +1622,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 +1849,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 +2114,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 +2174,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/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.

realign/dashboard/widgets/config_panel.py

@@ -1,14 +1,31 @@
 """Config Panel Widget for viewing and editing configuration."""
 
+import threading
+import webbrowser
 from dataclasses import fields
 from pathlib import Path
 from typing import Optional
 
 from textual.app import ComposeResult
-from textual.containers import Horizontal
+from textual.containers import Horizontal, Vertical
 from textual.widgets import Button, DataTable, Input, Static, Switch
 
 from ..tmux_manager import _run_outer_tmux, OUTER_SESSION
+from ...auth import (
+    load_credentials,
+    save_credentials,
+    clear_credentials,
+    open_login_page,
+    is_logged_in,
+    get_current_user,
+    find_free_port,
+    start_callback_server,
+    validate_cli_token,
+)
+from ...config import ReAlignConfig
+from ...logging_config import setup_logger
+
+logger = setup_logger("realign.dashboard.widgets.config_panel", "dashboard.log")
 
 
 class ConfigPanel(Static):
@@ -74,6 +91,21 @@ class ConfigPanel(Static):
     ConfigPanel .tmux-settings Switch {
         width: auto;
     }
+
+    ConfigPanel .account-section {
+        height: auto;
+        margin-top: 1;
+        padding: 1;
+        border: solid $success;
+    }
+
+    ConfigPanel .account-section .account-status {
+        margin-bottom: 1;
+    }
+
+    ConfigPanel .account-section Button {
+        margin-right: 1;
+    }
     """
 
     def __init__(self) -> None:
@@ -83,6 +115,8 @@ class ConfigPanel(Static):
         self._selected_key: Optional[str] = None
         self._border_resize_enabled: bool = True  # Track tmux border resize state
         self._syncing_switch: bool = False  # Flag to prevent recursive switch updates
+        self._login_in_progress: bool = False  # Track login state
+        self._refresh_timer = None  # Timer for auto-refresh
 
     def compose(self) -> ComposeResult:
         """Compose the config panel layout."""
@@ -96,6 +130,14 @@ class ConfigPanel(Static):
             yield Button("Save", id="save-btn", variant="primary")
             yield Button("Reload", id="reload-btn", variant="default")
 
+        # Account section
+        with Static(classes="account-section"):
+            yield Static("[bold]Account[/bold]", classes="section-title")
+            yield Static(id="account-status", classes="account-status")
+            with Horizontal(classes="button-row"):
+                yield Button("Login", id="login-btn", variant="primary")
+                yield Button("Logout", id="logout-btn", variant="warning")
+
         # Tmux settings section
         with Static(classes="tmux-settings"):
             yield Static("[bold]Tmux Settings[/bold]", classes="section-title")
@@ -112,9 +154,15 @@ class ConfigPanel(Static):
         # Load initial data
         self.refresh_data()
 
+        # Update account status display
+        self._update_account_status()
+
         # Query and set the actual tmux border resize state
         self._sync_border_resize_switch()
 
+        # Start timer to periodically refresh account status (every 5 seconds)
+        self._refresh_timer = self.set_interval(5.0, self._update_account_status)
+
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
         """Handle row selection in the config table."""
         table = self.query_one("#config-table", DataTable)
@@ -147,7 +195,12 @@ class ConfigPanel(Static):
             self._save_config()
         elif event.button.id == "reload-btn":
             self.refresh_data()
+            self._update_account_status()
             self.app.notify("Configuration reloaded", title="Config")
+        elif event.button.id == "login-btn":
+            self._handle_login()
+        elif event.button.id == "logout-btn":
+            self._handle_logout()
 
     def on_switch_changed(self, event: Switch.Changed) -> None:
         """Handle switch toggle events."""
@@ -156,6 +209,129 @@ class ConfigPanel(Static):
         if event.switch.id == "border-resize-switch":
             self._toggle_border_resize(event.value)
 
+    def _update_account_status(self) -> None:
+        """Update the account status display."""
+        try:
+            status_widget = self.query_one("#account-status", Static)
+            login_btn = self.query_one("#login-btn", Button)
+            logout_btn = self.query_one("#logout-btn", Button)
+        except Exception:
+            # Widget not ready yet
+            return
+
+        # Don't update if login is in progress
+        if self._login_in_progress:
+            return
+
+        credentials = get_current_user()
+        if credentials:
+            status_widget.update(
+                f"[green]Logged in as:[/green] [bold]{credentials.email}[/bold]"
+            )
+            login_btn.disabled = True
+            logout_btn.disabled = False
+        else:
+            status_widget.update("[yellow]Not logged in[/yellow]")
+            login_btn.disabled = False
+            logout_btn.disabled = True
+
+    def _handle_login(self) -> None:
+        """Handle login button click - start login flow in background."""
+        if self._login_in_progress:
+            self.app.notify("Login already in progress...", title="Login")
+            return
+
+        self._login_in_progress = True
+
+        # Update UI to show login in progress
+        login_btn = self.query_one("#login-btn", Button)
+        login_btn.disabled = True
+        status_widget = self.query_one("#account-status", Static)
+        status_widget.update("[cyan]Opening browser for login...[/cyan]")
+
+        # Start login flow in background thread
+        def do_login():
+            try:
+                port = find_free_port()
+                open_login_page(callback_port=port)
+
+                # Wait for callback (up to 5 minutes)
+                cli_token, error = start_callback_server(port, timeout=300)
+
+                if error:
+                    self.app.call_from_thread(
+                        self.app.notify, f"Login failed: {error}", title="Login", severity="error"
+                    )
+                    self.app.call_from_thread(self._update_account_status)
+                    return
+
+                if not cli_token:
+                    self.app.call_from_thread(
+                        self.app.notify, "No token received", title="Login", severity="error"
+                    )
+                    self.app.call_from_thread(self._update_account_status)
+                    return
+
+                # Validate token
+                credentials = validate_cli_token(cli_token)
+                if not credentials:
+                    self.app.call_from_thread(
+                        self.app.notify, "Invalid token", title="Login", severity="error"
+                    )
+                    self.app.call_from_thread(self._update_account_status)
+                    return
+
+                # Save credentials
+                if save_credentials(credentials):
+                    # Sync Supabase uid to local config
+                    try:
+                        config = ReAlignConfig.load()
+                        old_uid = config.uid
+                        config.uid = credentials.user_id
+                        if not config.user_name:
+                            config.user_name = credentials.email.split("@")[0]
+                        config.save()
+                        logger.info(f"Synced Supabase uid to config: {credentials.user_id[:8]}...")
+
+                        # V18: Upsert user info to users table
+                        try:
+                            from ...db import get_database
+                            db = get_database()
+                            db.upsert_user(config.uid, config.user_name)
+                        except Exception as e:
+                            logger.debug(f"Failed to upsert user to users table: {e}")
+                    except Exception as e:
+                        logger.warning(f"Failed to sync uid to config: {e}")
+
+                    self.app.call_from_thread(
+                        self.app.notify, f"Logged in as {credentials.email}", title="Login"
+                    )
+                else:
+                    self.app.call_from_thread(
+                        self.app.notify, "Failed to save credentials", title="Login", severity="error"
+                    )
+
+                self.app.call_from_thread(self._update_account_status)
+
+            finally:
+                self._login_in_progress = False
+
+        thread = threading.Thread(target=do_login, daemon=True)
+        thread.start()
+
+        self.app.notify("Complete login in browser...", title="Login")
+
+    def _handle_logout(self) -> None:
+        """Handle logout button click - clear credentials."""
+        credentials = load_credentials()
+        email = credentials.email if credentials else "user"
+
+        if clear_credentials():
+            self._update_account_status()
+            self.app.notify(f"Logged out: {email}", title="Account")
+        else:
+            self.app.notify("Failed to logout", title="Account", severity="error")
+
     def _sync_border_resize_switch(self) -> None:
         """Query tmux state and sync the switch to match."""
         try:

realign/db/base.py

@@ -49,9 +49,9 @@ class SessionRecord:
     summary_status: Optional[str] = None
     summary_locked_until: Optional[datetime] = None
     summary_error: Optional[str] = None
-    # V9: creator information
-    creator_name: Optional[str] = None
-    creator_id: Optional[str] = None
+    # V18: user identity
+    created_by: Optional[str] = None  # Creator UID
+    shared_by: Optional[str] = None  # Sharer UID (who imported this)
     temp_title: Optional[str] = None
     # V10: cached total turn count for session list performance
     total_turns: Optional[int] = None
@@ -78,9 +78,6 @@ class TurnRecord:
     git_commit_hash: Optional[str] = None
     # V12: temporary title stored in DB turns.temp_title
     temp_title: Optional[str] = None
-    # V9: creator information
-    creator_name: Optional[str] = None
-    creator_id: Optional[str] = None
 
 
 @dataclass
@@ -102,9 +99,9 @@ class EventRecord:
     share_id: Optional[str] = None  # V14: Share ID on server (for reuse)
     share_admin_token: Optional[str] = None  # V14: Admin token for extending expiry
     share_expiry_at: Optional[datetime] = None  # V14: Last known expiry timestamp
-    # V9: creator information
-    creator_name: Optional[str] = None
-    creator_id: Optional[str] = None
+    # V18: user identity
+    created_by: Optional[str] = None  # Creator UID
+    shared_by: Optional[str] = None  # Sharer UID (who imported this)
 
 
 @dataclass
@@ -124,8 +121,8 @@ class AgentRecord:
     status: str = "active"  # 'active', 'stopped'
     attention: Optional[str] = None  # 'permission_request', 'stop', or None
     source: Optional[str] = None
-    creator_name: Optional[str] = None
-    creator_id: Optional[str] = None
+    # V18: user identity
+    created_by: Optional[str] = None  # Creator UID
 
 
 @dataclass
@@ -143,6 +140,16 @@ class AgentContextRecord:
     event_ids: Optional[List[str]] = None
 
 
+@dataclass
+class UserRecord:
+    """Represents a user in the users table (V18)."""
+
+    uid: str
+    user_name: Optional[str] = None
+    created_at: Optional[datetime] = None
+    updated_at: Optional[datetime] = None
+
+
 class DatabaseInterface(ABC):
     """Abstract interface for ReAlign storage backend."""
 
@@ -420,3 +427,13 @@ class DatabaseInterface(ABC):
     def get_all_locks(self, include_expired: bool = False) -> List[LockRecord]:
         """Get all locks, optionally including expired ones."""
         pass
+
+    @abstractmethod
+    def upsert_user(self, uid: str, user_name: Optional[str] = None) -> None:
+        """Insert or update a user in the users table (V18)."""
+        pass
+
+    @abstractmethod
+    def get_user(self, uid: str) -> Optional[UserRecord]:
+        """Get a user by UID from the users table (V18)."""
+        pass

realign/db/schema.py

@@ -62,9 +62,23 @@ Schema V15: Agents and contexts tables (replaces terminal.json and load.json).
 Schema V16: Remove FK constraints from agent_context_sessions/events.
 - Context may reference sessions/events not yet imported to DB
 - Recreate M2M tables without FK constraints on session_id/event_id
+
+Schema V17: Rename creator_id/creator_name to uid/user_name.
+- sessions.creator_id -> uid, sessions.creator_name -> user_name
+- turns.creator_id -> uid, turns.creator_name -> user_name
+- events.creator_id -> uid, events.creator_name -> user_name
+- agents.creator_id -> uid, agents.creator_name -> user_name
+- Update indexes accordingly
+
+Schema V18: UID refactor - created_by/shared_by with users table.
+- New users table: uid -> user_name mapping
+- sessions/events: uid -> created_by, drop user_name, add shared_by
+- turns: drop uid and user_name (inherit from session)
+- agents: uid -> created_by, drop user_name
+- Update indexes accordingly
 """
 
-SCHEMA_VERSION = 16
+SCHEMA_VERSION = 18
 
 FTS_EVENTS_SCRIPTS = [
     # Full Text Search for Events
@@ -115,7 +129,7 @@ INIT_SCRIPTS = [
         metadata TEXT                     -- JSON metadata
     );
     """,
-    # Sessions table (V2: decoupled from projects, V3: summary fields, V9: creator fields, V10: total_turns cache)
+    # Sessions table (V2: decoupled from projects, V3: summary fields, V18: created_by/shared_by, V10: total_turns cache)
     """
     CREATE TABLE IF NOT EXISTS sessions (
         id TEXT PRIMARY KEY,              -- session ID (filename stem)
@@ -133,13 +147,13 @@ INIT_SCRIPTS = [
         summary_status TEXT DEFAULT 'idle',        -- V7: 'idle' | 'processing' | 'completed' | 'failed'
         summary_locked_until TEXT,                -- V7: lease/TTL to avoid stuck processing
         summary_error TEXT,                       -- V7: last error message if failed
-        creator_name TEXT,                        -- V9: Username who created the session
-        creator_id TEXT,                          -- V9: User UUID (based on MAC address)
+        created_by TEXT,                          -- V18: Creator UID (FK to users.uid)
+        shared_by TEXT,                           -- V18: Sharer UID (who imported this)
         total_turns INTEGER DEFAULT 0,            -- V10: Cached total turn count (avoids reading files)
         total_turns_mtime REAL                    -- V12: File mtime when total_turns was cached (for validation)
     );
     """,
-    # Turns table (corresponds to git commits, V9: creator fields)
+    # Turns table (corresponds to git commits, V18: uid/user_name removed)
     """
     CREATE TABLE IF NOT EXISTS turns (
         id TEXT PRIMARY KEY,              -- UUID
@@ -158,8 +172,6 @@ INIT_SCRIPTS = [
         timestamp TEXT NOT NULL,
         created_at TEXT DEFAULT (datetime('now')),
         git_commit_hash TEXT,             -- Linked git commit hash
-        creator_name TEXT,                -- V9: Username who created the turn
-        creator_id TEXT,                  -- V9: User UUID
         UNIQUE(session_id, turn_number)
     );
     """,
@@ -209,12 +221,11 @@ INIT_SCRIPTS = [
     "CREATE INDEX IF NOT EXISTS idx_sessions_workspace ON sessions(workspace_path);",
     "CREATE INDEX IF NOT EXISTS idx_sessions_activity ON sessions(last_activity_at DESC);",
     "CREATE INDEX IF NOT EXISTS idx_sessions_type ON sessions(session_type);",
-    "CREATE INDEX IF NOT EXISTS idx_sessions_creator ON sessions(creator_id);",  # V9
+    "CREATE INDEX IF NOT EXISTS idx_sessions_created_by ON sessions(created_by);",  # V18
     "CREATE INDEX IF NOT EXISTS idx_turns_session ON turns(session_id);",
     "CREATE INDEX IF NOT EXISTS idx_turns_timestamp ON turns(timestamp DESC);",
     "CREATE INDEX IF NOT EXISTS idx_turns_hash ON turns(content_hash);",
-    "CREATE INDEX IF NOT EXISTS idx_turns_creator ON turns(creator_id);",  # V9
-    # Events table (V9: creator fields)
+    # Events table (V18: created_by/shared_by)
     """
     CREATE TABLE IF NOT EXISTS events (
         id TEXT PRIMARY KEY,              -- UUID
@@ -233,8 +244,8 @@ INIT_SCRIPTS = [
         share_id TEXT,                    -- V14: Server share ID (for reuse)
         share_admin_token TEXT,           -- V14: Server admin token (extend expiry)
         share_expiry_at TEXT,             -- V14: Last known expiry timestamp
-        creator_name TEXT,                -- V9: Username who created the event
-        creator_id TEXT                   -- V9: User UUID
+        created_by TEXT,                  -- V18: Creator UID (FK to users.uid)
+        shared_by TEXT                    -- V18: Sharer UID (who imported this)
     );
     """,
     # Event-Commit relationship (Many-to-Many)
@@ -256,7 +267,8 @@ INIT_SCRIPTS = [
     """,
     "CREATE INDEX IF NOT EXISTS idx_event_sessions_event ON event_sessions(event_id);",
     "CREATE INDEX IF NOT EXISTS idx_event_sessions_session ON event_sessions(session_id);",
-    # Agents table (V15: replaces terminal.json)
+    "CREATE INDEX IF NOT EXISTS idx_events_created_by ON events(created_by);",  # V18
+    # Agents table (V15: replaces terminal.json, V18: created_by)
     """
     CREATE TABLE IF NOT EXISTS agents (
         id TEXT PRIMARY KEY,              -- terminal_id (UUID)
@@ -272,8 +284,7 @@ INIT_SCRIPTS = [
         source TEXT,
         created_at TEXT DEFAULT (datetime('now')),
         updated_at TEXT DEFAULT (datetime('now')),
-        creator_name TEXT,
-        creator_id TEXT
+        created_by TEXT                   -- V18: Creator UID (FK to users.uid)
     );
     """,
     "CREATE INDEX IF NOT EXISTS idx_agents_session ON agents(session_id);",
@@ -315,6 +326,15 @@ INIT_SCRIPTS = [
     """,
     "CREATE INDEX IF NOT EXISTS idx_agent_context_events_context ON agent_context_events(context_id);",
     "CREATE INDEX IF NOT EXISTS idx_agent_context_events_event ON agent_context_events(event_id);",
+    # Users table (V18: UID-to-user-info mapping)
+    """
+    CREATE TABLE IF NOT EXISTS users (
+        uid TEXT PRIMARY KEY,
+        user_name TEXT,
+        created_at TEXT DEFAULT (datetime('now')),
+        updated_at TEXT DEFAULT (datetime('now'))
+    );
+    """,
     *FTS_EVENTS_SCRIPTS,
 ]
 
@@ -570,6 +590,67 @@ MIGRATION_V15_TO_V16 = [
     "CREATE INDEX IF NOT EXISTS idx_agent_context_events_event ON agent_context_events(event_id);",
 ]
 
+# V16 to V17: Rename creator_id/creator_name to uid/user_name
+MIGRATION_V16_TO_V17 = [
+    # Sessions table: rename columns
+    "ALTER TABLE sessions RENAME COLUMN creator_id TO uid;",
+    "ALTER TABLE sessions RENAME COLUMN creator_name TO user_name;",
+    # Turns table: rename columns
+    "ALTER TABLE turns RENAME COLUMN creator_id TO uid;",
+    "ALTER TABLE turns RENAME COLUMN creator_name TO user_name;",
+    # Events table: rename columns
+    "ALTER TABLE events RENAME COLUMN creator_id TO uid;",
+    "ALTER TABLE events RENAME COLUMN creator_name TO user_name;",
+    # Agents table: rename columns
+    "ALTER TABLE agents RENAME COLUMN creator_id TO uid;",
+    "ALTER TABLE agents RENAME COLUMN creator_name TO user_name;",
+    # Update indexes: drop old, create new
+    "DROP INDEX IF EXISTS idx_sessions_creator;",
+    "DROP INDEX IF EXISTS idx_turns_creator;",
+    "DROP INDEX IF EXISTS idx_events_creator;",
+    "CREATE INDEX IF NOT EXISTS idx_sessions_uid ON sessions(uid);",
+    "CREATE INDEX IF NOT EXISTS idx_turns_uid ON turns(uid);",
+    "CREATE INDEX IF NOT EXISTS idx_events_uid ON events(uid);",
+]
+
+
+# V17 to V18: uid/user_name → created_by/shared_by, users table, remove turns uid
+MIGRATION_V17_TO_V18 = [
+    # 1. Create users table
+    """
+    CREATE TABLE IF NOT EXISTS users (
+        uid TEXT PRIMARY KEY,
+        user_name TEXT,
+        created_at TEXT DEFAULT (datetime('now')),
+        updated_at TEXT DEFAULT (datetime('now'))
+    );
+    """,
+    # 2. Extract user info from existing data into users table
+    "INSERT OR IGNORE INTO users (uid, user_name) SELECT DISTINCT uid, user_name FROM sessions WHERE uid IS NOT NULL AND uid != '';",
+    "INSERT OR IGNORE INTO users (uid, user_name) SELECT DISTINCT uid, user_name FROM events WHERE uid IS NOT NULL AND uid != '' AND uid NOT IN (SELECT uid FROM users);",
+    "INSERT OR IGNORE INTO users (uid, user_name) SELECT DISTINCT uid, user_name FROM turns WHERE uid IS NOT NULL AND uid != '' AND uid NOT IN (SELECT uid FROM users);",
+    "INSERT OR IGNORE INTO users (uid, user_name) SELECT DISTINCT uid, user_name FROM agents WHERE uid IS NOT NULL AND uid != '' AND uid NOT IN (SELECT uid FROM users);",
+    # 3. Sessions: uid → created_by, drop user_name, add shared_by
+    "DROP INDEX IF EXISTS idx_sessions_uid;",
+    "ALTER TABLE sessions RENAME COLUMN uid TO created_by;",
+    "ALTER TABLE sessions DROP COLUMN user_name;",
+    "ALTER TABLE sessions ADD COLUMN shared_by TEXT;",
+    "CREATE INDEX IF NOT EXISTS idx_sessions_created_by ON sessions(created_by);",
+    # 4. Events: uid → created_by, drop user_name, add shared_by
+    "DROP INDEX IF EXISTS idx_events_uid;",
+    "ALTER TABLE events RENAME COLUMN uid TO created_by;",
+    "ALTER TABLE events DROP COLUMN user_name;",
+    "ALTER TABLE events ADD COLUMN shared_by TEXT;",
+    "CREATE INDEX IF NOT EXISTS idx_events_created_by ON events(created_by);",
+    # 5. Turns: drop uid and user_name
+    "DROP INDEX IF EXISTS idx_turns_uid;",
+    "ALTER TABLE turns DROP COLUMN uid;",
+    "ALTER TABLE turns DROP COLUMN user_name;",
+    # 6. Agents: uid → created_by, drop user_name (no shared_by needed)
+    "ALTER TABLE agents RENAME COLUMN uid TO created_by;",
+    "ALTER TABLE agents DROP COLUMN user_name;",
+]
+
 
 def get_migration_scripts(from_version: int, to_version: int) -> list:
     """Get migration scripts for upgrading between versions."""
@@ -629,4 +710,10 @@ def get_migration_scripts(from_version: int, to_version: int) -> list:
         if from_version == 15:
             scripts.extend(MIGRATION_V15_TO_V16)
 
+    if from_version < 17 and to_version >= 17:
+        scripts.extend(MIGRATION_V16_TO_V17)
+
+    if from_version < 18 and to_version >= 18:
+        scripts.extend(MIGRATION_V17_TO_V18)
+
     return scripts