From db80dd2692f0af3ce0351df7d1ab3112a75592cd Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 02:38:57 +0400
Subject: [PATCH 01/18] feat: prompt history table

---
 .../374d2f66af06_add_prompt_history_table.py  | 245 ++++++++++++++++++
 1 file changed, 245 insertions(+)
 create mode 100644 backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py

diff --git a/backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py b/backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py
new file mode 100644
index 000000000..e56854a15
--- /dev/null
+++ b/backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py
@@ -0,0 +1,245 @@
+"""Add prompt history table
+
+Revision ID: 374d2f66af06
+Revises: c440947495f3
+Create Date: 2026-01-23 17:15:00.000000
+
+"""
+
+from typing import Sequence, Union
+import uuid
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision: str = "374d2f66af06"
+down_revision: Union[str, None] = "c440947495f3"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+
+    # Step 1: Read existing data from OLD table (schema likely command as PK)
+    # We use batch_alter previously, but we want to move to new table.
+    # We need to assume the OLD structure.
+
+    old_prompt_table = sa.table(
+        "prompt",
+        sa.column("command", sa.Text()),
+        sa.column("user_id", sa.Text()),
+        sa.column("title", sa.Text()),
+        sa.column("content", sa.Text()),
+        sa.column("timestamp", sa.BigInteger()),
+        sa.column("access_control", sa.JSON()),
+    )
+
+    # Check if table exists/read data
+    try:
+        existing_prompts = conn.execute(
+            sa.select(
+                old_prompt_table.c.command,
+                old_prompt_table.c.user_id,
+                old_prompt_table.c.title,
+                old_prompt_table.c.content,
+                old_prompt_table.c.timestamp,
+                old_prompt_table.c.access_control,
+            )
+        ).fetchall()
+    except Exception:
+        # Fallback if table doesn't exist (new install)
+        existing_prompts = []
+
+    # Step 2: Create new prompt table with 'id' as PRIMARY KEY
+    op.create_table(
+        "prompt_new",
+        sa.Column("id", sa.Text(), primary_key=True),
+        sa.Column("command", sa.String(), unique=True, index=True),
+        sa.Column("user_id", sa.String(), nullable=False),
+        sa.Column("name", sa.Text(), nullable=False),
+        sa.Column("content", sa.Text(), nullable=False),
+        sa.Column("data", sa.JSON(), nullable=True),
+        sa.Column("meta", sa.JSON(), nullable=True),
+        sa.Column("access_control", sa.JSON(), nullable=True),
+        sa.Column("is_active", sa.Boolean(), nullable=False, server_default="1"),
+        sa.Column("version_id", sa.Text(), nullable=True),
+        sa.Column("created_at", sa.BigInteger(), nullable=False),
+        sa.Column("updated_at", sa.BigInteger(), nullable=False),
+    )
+
+    # Step 3: Create prompt_history table
+    op.create_table(
+        "prompt_history",
+        sa.Column("id", sa.Text(), primary_key=True),
+        sa.Column("prompt_id", sa.Text(), nullable=False, index=True),
+        sa.Column("parent_id", sa.Text(), nullable=True),
+        sa.Column("snapshot", sa.JSON(), nullable=False),
+        sa.Column("user_id", sa.Text(), nullable=False),
+        sa.Column("commit_message", sa.Text(), nullable=True),
+        sa.Column("created_at", sa.BigInteger(), nullable=False),
+    )
+
+    # Step 4: Migrate data
+    prompt_new_table = sa.table(
+        "prompt_new",
+        sa.column("id", sa.Text()),
+        sa.column("command", sa.String()),
+        sa.column("user_id", sa.String()),
+        sa.column("name", sa.Text()),
+        sa.column("content", sa.Text()),
+        sa.column("data", sa.JSON()),
+        sa.column("meta", sa.JSON()),
+        sa.column("access_control", sa.JSON()),
+        sa.column("is_active", sa.Boolean()),
+        sa.column("version_id", sa.Text()),
+        sa.column("created_at", sa.BigInteger()),
+        sa.column("updated_at", sa.BigInteger()),
+    )
+
+    prompt_history_table = sa.table(
+        "prompt_history",
+        sa.column("id", sa.Text()),
+        sa.column("prompt_id", sa.Text()),
+        sa.column("parent_id", sa.Text()),
+        sa.column("snapshot", sa.JSON()),
+        sa.column("user_id", sa.Text()),
+        sa.column("commit_message", sa.Text()),
+        sa.column("created_at", sa.BigInteger()),
+    )
+
+    for row in existing_prompts:
+        command = row[0]
+        user_id = row[1]
+        title = row[2]
+        content = row[3]
+        timestamp = row[4]
+        access_control = row[5]
+
+        new_uuid = str(uuid.uuid4())
+        history_uuid = str(uuid.uuid4())
+        clean_command = command[1:] if command and command.startswith("/") else command
+
+        # Insert into prompt_new
+        conn.execute(
+            sa.insert(prompt_new_table).values(
+                id=new_uuid,
+                command=clean_command,
+                user_id=user_id,
+                name=title,
+                content=content,
+                data={},
+                meta={},
+                access_control=access_control,
+                is_active=True,
+                version_id=history_uuid,
+                created_at=timestamp,
+                updated_at=timestamp,
+            )
+        )
+
+        # Create initial history entry
+        conn.execute(
+            sa.insert(prompt_history_table).values(
+                id=history_uuid,
+                prompt_id=new_uuid,
+                parent_id=None,
+                snapshot={
+                    "name": title,
+                    "content": content,
+                    "command": clean_command,
+                    "data": {},
+                    "meta": {},
+                    "access_control": access_control,
+                },
+                user_id=user_id,
+                commit_message=None,
+                created_at=timestamp,
+            )
+        )
+
+    # Step 5: Replace old table with new one
+    op.drop_table("prompt")
+    op.rename_table("prompt_new", "prompt")
+
+
+def downgrade() -> None:
+    conn = op.get_bind()
+
+    # Step 1: Read new data
+    prompt_table = sa.table(
+        "prompt",
+        sa.column("command", sa.String()),
+        sa.column("name", sa.Text()),
+        sa.column("created_at", sa.BigInteger()),
+        sa.column("user_id", sa.Text()),
+        sa.column("content", sa.Text()),
+        sa.column("access_control", sa.JSON()),
+    )
+
+    try:
+        current_data = conn.execute(
+            sa.select(
+                prompt_table.c.command,
+                prompt_table.c.name,
+                prompt_table.c.created_at,
+                prompt_table.c.user_id,
+                prompt_table.c.content,
+                prompt_table.c.access_control,
+            )
+        ).fetchall()
+    except Exception:
+        current_data = []
+
+    # Step 2: Drop history and table
+    op.drop_table("prompt_history")
+    op.drop_table("prompt")
+
+    # Step 3: Recreate old table (command as PK?)
+    # Assuming old schema:
+    op.create_table(
+        "prompt",
+        sa.Column("command", sa.String(), primary_key=True),
+        sa.Column("user_id", sa.String()),
+        sa.Column("title", sa.Text()),
+        sa.Column("content", sa.Text()),
+        sa.Column("timestamp", sa.BigInteger()),
+        sa.Column("access_control", sa.JSON()),
+        sa.Column("id", sa.Integer(), nullable=True),
+    )
+
+    # Step 4: Restore data
+    old_prompt_table = sa.table(
+        "prompt",
+        sa.column("command", sa.String()),
+        sa.column("user_id", sa.String()),
+        sa.column("title", sa.Text()),
+        sa.column("content", sa.Text()),
+        sa.column("timestamp", sa.BigInteger()),
+        sa.column("access_control", sa.JSON()),
+    )
+
+    for row in current_data:
+        command = row[0]
+        name = row[1]
+        created_at = row[2]
+        user_id = row[3]
+        content = row[4]
+        access_control = row[5]
+
+        # Restore leading /
+        old_command = (
+            "/" + command if command and not command.startswith("/") else command
+        )
+
+        conn.execute(
+            sa.insert(old_prompt_table).values(
+                command=old_command,
+                user_id=user_id,
+                title=name,
+                content=content,
+                timestamp=created_at,
+                access_control=access_control,
+            )
+        )

From 66daa1572205f0d7765ac5b2e5d0dfe59bbebb34 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 02:39:29 +0400
Subject: [PATCH 02/18] wip: prompt history models

---
 backend/open_webui/models/prompt_history.py | 223 +++++++++++++++++++
 backend/open_webui/models/prompts.py        | 229 ++++++++++++++++++--
 2 files changed, 431 insertions(+), 21 deletions(-)
 create mode 100644 backend/open_webui/models/prompt_history.py

diff --git a/backend/open_webui/models/prompt_history.py b/backend/open_webui/models/prompt_history.py
new file mode 100644
index 000000000..ea7f566fb
--- /dev/null
+++ b/backend/open_webui/models/prompt_history.py
@@ -0,0 +1,223 @@
+"""Prompt history model for version tracking."""
+
+import time
+import uuid
+from typing import Optional
+import json
+import difflib
+
+from sqlalchemy.orm import Session
+from open_webui.internal.db import Base, get_db_context
+from open_webui.models.users import Users, UserResponse
+
+from pydantic import BaseModel, ConfigDict
+from sqlalchemy import BigInteger, Column, Text, JSON, Index
+
+
+####################
+# PromptHistory DB Schema
+####################
+
+
+class PromptHistory(Base):
+    __tablename__ = "prompt_history"
+
+    id = Column(Text, primary_key=True)
+    prompt_id = Column(Text, nullable=False, index=True)
+    parent_id = Column(Text, nullable=True)  # Reference to parent commit
+    snapshot = Column(JSON, nullable=False)
+    user_id = Column(Text, nullable=False)
+    commit_message = Column(Text, nullable=True)
+    created_at = Column(BigInteger, nullable=False)
+
+
+class PromptHistoryModel(BaseModel):
+    id: str
+    prompt_id: str
+    parent_id: Optional[str] = None
+    snapshot: dict
+    user_id: str
+    commit_message: Optional[str] = None
+    created_at: int
+
+    model_config = ConfigDict(from_attributes=True)
+
+
+class PromptHistoryResponse(PromptHistoryModel):
+    """Response model with user info."""
+    user: Optional[UserResponse] = None
+
+
+class PromptHistoryTable:
+    def create_history_entry(
+        self,
+        prompt_id: str,
+        snapshot: dict,
+        user_id: str,
+        parent_id: Optional[str] = None,
+        commit_message: Optional[str] = None,
+        db: Optional[Session] = None,
+    ) -> Optional[PromptHistoryModel]:
+        """Create a new history entry (commit) for a prompt."""
+        with get_db_context(db) as db:
+            history = PromptHistory(
+                id=str(uuid.uuid4()),
+                prompt_id=prompt_id,
+                parent_id=parent_id,
+                snapshot=snapshot,
+                user_id=user_id,
+                commit_message=commit_message,
+                created_at=int(time.time()),
+            )
+            db.add(history)
+            db.commit()
+            db.refresh(history)
+            return PromptHistoryModel.model_validate(history)
+
+    def get_history_by_prompt_id(
+        self,
+        prompt_id: str,
+        limit: int = 50,
+        offset: int = 0,
+        db: Optional[Session] = None,
+    ) -> list[PromptHistoryResponse]:
+        """Get all history entries for a prompt, ordered by created_at desc."""
+        with get_db_context(db) as db:
+            entries = (
+                db.query(PromptHistory)
+                .filter(PromptHistory.prompt_id == prompt_id)
+                .order_by(PromptHistory.created_at.desc())
+                .offset(offset)
+                .limit(limit)
+                .all()
+            )
+            
+            # Get user info for each entry
+            user_ids = list(set(e.user_id for e in entries))
+            users = Users.get_users_by_user_ids(user_ids, db=db) if user_ids else []
+            users_dict = {user.id: user for user in users}
+            
+            return [
+                PromptHistoryResponse(
+                    **PromptHistoryModel.model_validate(entry).model_dump(),
+                    user=users_dict.get(entry.user_id).model_dump() if users_dict.get(entry.user_id) else None,
+                )
+                for entry in entries
+            ]
+
+    def get_history_entry_by_id(
+        self,
+        history_id: str,
+        db: Optional[Session] = None,
+    ) -> Optional[PromptHistoryModel]:
+        """Get a specific history entry by ID."""
+        with get_db_context(db) as db:
+            entry = db.query(PromptHistory).filter(PromptHistory.id == history_id).first()
+            if entry:
+                return PromptHistoryModel.model_validate(entry)
+            return None
+
+    def get_latest_history_entry(
+        self,
+        prompt_id: str,
+        db: Optional[Session] = None,
+    ) -> Optional[PromptHistoryModel]:
+        """Get the most recent history entry for a prompt."""
+        with get_db_context(db) as db:
+            entry = (
+                db.query(PromptHistory)
+                .filter(PromptHistory.prompt_id == prompt_id)
+                .order_by(PromptHistory.created_at.desc())
+                .first()
+            )
+            if entry:
+                return PromptHistoryModel.model_validate(entry)
+            return None
+
+    def get_history_count(
+        self,
+        prompt_id: str,
+        db: Optional[Session] = None,
+    ) -> int:
+        """Get the number of history entries for a prompt."""
+        with get_db_context(db) as db:
+            return (
+                db.query(PromptHistory)
+                .filter(PromptHistory.prompt_id == prompt_id)
+                .count()
+            )
+
+    def compute_diff(
+        self,
+        from_id: str,
+        to_id: str,
+        db: Optional[Session] = None,
+    ) -> Optional[dict]:
+        """Compute diff between two history entries."""
+        with get_db_context(db) as db:
+            from_entry = db.query(PromptHistory).filter(PromptHistory.id == from_id).first()
+            to_entry = db.query(PromptHistory).filter(PromptHistory.id == to_id).first()
+            
+            if not from_entry or not to_entry:
+                return None
+            
+            from_snapshot = from_entry.snapshot
+            to_snapshot = to_entry.snapshot
+            
+            # Compute diff for content field
+            from_content = from_snapshot.get("content", "")
+            to_content = to_snapshot.get("content", "")
+            
+            diff_lines = list(difflib.unified_diff(
+                from_content.splitlines(keepends=True),
+                to_content.splitlines(keepends=True),
+                fromfile=f"v{from_id[:8]}",
+                tofile=f"v{to_id[:8]}",
+                lineterm="",
+            ))
+            
+            return {
+                "from_id": from_id,
+                "to_id": to_id,
+                "from_snapshot": from_snapshot,
+                "to_snapshot": to_snapshot,
+                "content_diff": diff_lines,
+                "name_changed": from_snapshot.get("name") != to_snapshot.get("name"),
+                "access_control_changed": from_snapshot.get("access_control") != to_snapshot.get("access_control"),
+            }
+
+    def delete_history_by_prompt_id(
+        self,
+        prompt_id: str,
+        db: Optional[Session] = None,
+    ) -> bool:
+        """Delete all history entries for a prompt."""
+        with get_db_context(db) as db:
+            db.query(PromptHistory).filter(PromptHistory.prompt_id == prompt_id).delete()
+            db.commit()
+            return True
+
+    def delete_history_entry(
+        self,
+        history_id: str,
+        db: Optional[Session] = None,
+    ) -> bool:
+        """Delete a history entry and reparent its children to grandparent."""
+        with get_db_context(db) as db:
+            entry = db.query(PromptHistory).filter_by(id=history_id).first()
+            if not entry:
+                return False
+
+            # Find children that reference this entry as parent
+            children = db.query(PromptHistory).filter_by(parent_id=history_id).all()
+
+            # Reparent children to grandparent
+            for child in children:
+                child.parent_id = entry.parent_id
+
+            db.delete(entry)
+            db.commit()
+            return True
+
+
+PromptHistories = PromptHistoryTable()
diff --git a/backend/open_webui/models/prompts.py b/backend/open_webui/models/prompts.py
index 847597bc6..42d724c65 100644
--- a/backend/open_webui/models/prompts.py
+++ b/backend/open_webui/models/prompts.py
@@ -1,4 +1,5 @@
 import time
+import uuid
 from typing import Optional
 
 from sqlalchemy.orm import Session
@@ -7,7 +8,7 @@ from open_webui.models.groups import Groups
 from open_webui.models.users import Users, UserResponse
 
 from pydantic import BaseModel, ConfigDict
-from sqlalchemy import BigInteger, Column, String, Text, JSON
+from sqlalchemy import BigInteger, Boolean, Column, String, Text, JSON
 
 from open_webui.utils.access_control import has_access
 
@@ -19,11 +20,17 @@ from open_webui.utils.access_control import has_access
 class Prompt(Base):
     __tablename__ = "prompt"
 
-    command = Column(String, primary_key=True)
+    id = Column(Text, primary_key=True)
+    command = Column(String, unique=True, index=True)
     user_id = Column(String)
-    title = Column(Text)
+    name = Column(Text)
     content = Column(Text)
-    timestamp = Column(BigInteger)
+    data = Column(JSON, nullable=True)
+    meta = Column(JSON, nullable=True)
+    is_active = Column(Boolean, default=True)
+    version_id = Column(Text, nullable=True)  # Points to active history entry
+    created_at = Column(BigInteger, nullable=True)
+    updated_at = Column(BigInteger, nullable=True)
 
     access_control = Column(JSON, nullable=True)  # Controls data access levels.
     # Defines access control rules for this entry.
@@ -44,13 +51,19 @@ class Prompt(Base):
 
 
 class PromptModel(BaseModel):
+    id: Optional[str] = None
     command: str
     user_id: str
-    title: str
+    name: str
     content: str
-    timestamp: int  # timestamp in epoch
-
+    data: Optional[dict] = None
+    meta: Optional[dict] = None
+    is_active: Optional[bool] = True
+    version_id: Optional[str] = None
+    created_at: Optional[int] = None
+    updated_at: Optional[int] = None
     access_control: Optional[dict] = None
+    
     model_config = ConfigDict(from_attributes=True)
 
 
@@ -69,21 +82,34 @@ class PromptAccessResponse(PromptUserResponse):
 
 class PromptForm(BaseModel):
     command: str
-    title: str
+    name: str  # Changed from title
     content: str
+    data: Optional[dict] = None
+    meta: Optional[dict] = None
     access_control: Optional[dict] = None
+    version_id: Optional[str] = None  # Active version
+    commit_message: Optional[str] = None  # For history tracking
 
 
 class PromptsTable:
     def insert_new_prompt(
         self, user_id: str, form_data: PromptForm, db: Optional[Session] = None
     ) -> Optional[PromptModel]:
+        now = int(time.time())
+        prompt_id = str(uuid.uuid4())
+        
         prompt = PromptModel(
-            **{
-                "user_id": user_id,
-                **form_data.model_dump(),
-                "timestamp": int(time.time()),
-            }
+            id=prompt_id,
+            user_id=user_id,
+            command=form_data.command,
+            name=form_data.name,
+            content=form_data.content,
+            data=form_data.data or {},
+            meta=form_data.meta or {},
+            access_control=form_data.access_control,
+            is_active=True,
+            created_at=now,
+            updated_at=now,
         )
 
         try:
@@ -92,26 +118,74 @@ class PromptsTable:
                 db.add(result)
                 db.commit()
                 db.refresh(result)
+                
                 if result:
+                    # Create initial history entry
+                    from open_webui.models.prompt_history import PromptHistories
+                    
+                    snapshot = {
+                        "name": form_data.name,
+                        "content": form_data.content,
+                        "command": form_data.command,
+                        "data": form_data.data or {},
+                        "meta": form_data.meta or {},
+                        "access_control": form_data.access_control,
+                    }
+                    
+                    history_entry = PromptHistories.create_history_entry(
+                        prompt_id=prompt_id,
+                        snapshot=snapshot,
+                        user_id=user_id,
+                        parent_id=None,  # Initial commit has no parent
+                        commit_message=form_data.commit_message or "Initial version",
+                        db=db,
+                    )
+                    
+                    # Set the initial version as the production version
+                    if history_entry:
+                        result.version_id = history_entry.id
+                        db.commit()
+                        db.refresh(result)
+                    
                     return PromptModel.model_validate(result)
                 else:
                     return None
         except Exception:
             return None
 
+    def get_prompt_by_id(
+        self, prompt_id: str, db: Optional[Session] = None
+    ) -> Optional[PromptModel]:
+        """Get prompt by UUID."""
+        try:
+            with get_db_context(db) as db:
+                prompt = db.query(Prompt).filter_by(id=prompt_id).first()
+                if prompt:
+                    return PromptModel.model_validate(prompt)
+                return None
+        except Exception:
+            return None
+
     def get_prompt_by_command(
         self, command: str, db: Optional[Session] = None
     ) -> Optional[PromptModel]:
         try:
             with get_db_context(db) as db:
                 prompt = db.query(Prompt).filter_by(command=command).first()
-                return PromptModel.model_validate(prompt)
+                if prompt:
+                    return PromptModel.model_validate(prompt)
+                return None
         except Exception:
             return None
 
     def get_prompts(self, db: Optional[Session] = None) -> list[PromptUserResponse]:
         with get_db_context(db) as db:
-            all_prompts = db.query(Prompt).order_by(Prompt.timestamp.desc()).all()
+            all_prompts = (
+                db.query(Prompt)
+                .filter(Prompt.is_active == True)
+                .order_by(Prompt.updated_at.desc())
+                .all()
+            )
 
             user_ids = list(set(prompt.user_id for prompt in all_prompts))
 
@@ -148,16 +222,101 @@ class PromptsTable:
         ]
 
     def update_prompt_by_command(
-        self, command: str, form_data: PromptForm, db: Optional[Session] = None
+        self, 
+        command: str, 
+        form_data: PromptForm, 
+        user_id: str,
+        db: Optional[Session] = None
     ) -> Optional[PromptModel]:
         try:
             with get_db_context(db) as db:
                 prompt = db.query(Prompt).filter_by(command=command).first()
-                prompt.title = form_data.title
+                if not prompt:
+                    return None
+                
+                # Get the latest history entry for parent_id
+                from open_webui.models.prompt_history import PromptHistories
+                latest_history = PromptHistories.get_latest_history_entry(prompt.id, db=db)
+                parent_id = latest_history.id if latest_history else None
+                
+                # Check if content changed to decide on history creation
+                content_changed = (
+                    prompt.name != form_data.name or
+                    prompt.content != form_data.content or
+                    prompt.access_control != form_data.access_control
+                )
+
+                # Update prompt fields
+                prompt.name = form_data.name
                 prompt.content = form_data.content
+                prompt.data = form_data.data or prompt.data
+                prompt.meta = form_data.meta or prompt.meta
                 prompt.access_control = form_data.access_control
-                prompt.timestamp = int(time.time())
+                if form_data.version_id is not None:
+                    prompt.version_id = form_data.version_id
+                prompt.updated_at = int(time.time())
+                
                 db.commit()
+                
+                # Create history entry only if content changed
+                if content_changed:
+                    snapshot = {
+                        "name": form_data.name,
+                        "content": form_data.content,
+                        "command": command,
+                        "data": form_data.data or {},
+                        "meta": form_data.meta or {},
+                        "access_control": form_data.access_control,
+                    }
+                    
+                    PromptHistories.create_history_entry(
+                        prompt_id=prompt.id,
+                        snapshot=snapshot,
+                        user_id=user_id,
+                        parent_id=parent_id,
+                        commit_message=form_data.commit_message,
+                        db=db,
+                    )
+                
+                return PromptModel.model_validate(prompt)
+        except Exception:
+            return None
+
+
+
+    def update_prompt_version(
+        self,
+        command: str,
+        version_id: str,
+        db: Optional[Session] = None,
+    ) -> Optional[PromptModel]:
+        """Set the active version of a prompt and restore content from that version's snapshot."""
+        try:
+            with get_db_context(db) as db:
+                prompt = db.query(Prompt).filter_by(command=command).first()
+                if not prompt:
+                    return None
+                
+                # Get the history entry to restore content from
+                from open_webui.models.prompt_history import PromptHistories
+                history_entry = PromptHistories.get_history_entry_by_id(version_id, db=db)
+                
+                if not history_entry:
+                    return None
+                
+                # Restore prompt content from the snapshot
+                snapshot = history_entry.snapshot
+                if snapshot:
+                    prompt.name = snapshot.get("name", prompt.name)
+                    prompt.content = snapshot.get("content", prompt.content)
+                    prompt.data = snapshot.get("data", prompt.data)
+                    prompt.meta = snapshot.get("meta", prompt.meta)
+                    # Note: command and access_control are not restored from snapshot
+                
+                prompt.version_id = version_id
+                prompt.updated_at = int(time.time())
+                db.commit()
+                
                 return PromptModel.model_validate(prompt)
         except Exception:
             return None
@@ -165,12 +324,40 @@ class PromptsTable:
     def delete_prompt_by_command(
         self, command: str, db: Optional[Session] = None
     ) -> bool:
+        """Soft delete a prompt by setting is_active to False."""
         try:
             with get_db_context(db) as db:
-                db.query(Prompt).filter_by(command=command).delete()
-                db.commit()
+                prompt = db.query(Prompt).filter_by(command=command).first()
+                if prompt:
+                    # Delete history first (Requirement: entire history should be deleted)
+                    from open_webui.models.prompt_history import PromptHistories
+                    PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
 
-                return True
+                    prompt.is_active = False
+                    prompt.updated_at = int(time.time())
+                    db.commit()
+                    return True
+                return False
+        except Exception:
+            return False
+
+    def hard_delete_prompt_by_command(
+        self, command: str, db: Optional[Session] = None
+    ) -> bool:
+        """Permanently delete a prompt and its history."""
+        try:
+            with get_db_context(db) as db:
+                prompt = db.query(Prompt).filter_by(command=command).first()
+                if prompt:
+                    # Delete history first
+                    from open_webui.models.prompt_history import PromptHistories
+                    PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
+                    
+                    # Delete prompt
+                    db.query(Prompt).filter_by(command=command).delete()
+                    db.commit()
+                    return True
+                return False
         except Exception:
             return False
 

From 34773e795be380df8293860aa5a98f917013c1ce Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 02:39:48 +0400
Subject: [PATCH 03/18] wip: prompt history backend integration

---
 backend/open_webui/routers/prompts.py | 262 +++++++++++++++++++++++---
 1 file changed, 238 insertions(+), 24 deletions(-)

diff --git a/backend/open_webui/routers/prompts.py b/backend/open_webui/routers/prompts.py
index 19d25685a..b0c3966be 100644
--- a/backend/open_webui/routers/prompts.py
+++ b/backend/open_webui/routers/prompts.py
@@ -8,15 +8,26 @@ from open_webui.models.prompts import (
     PromptModel,
     Prompts,
 )
+from open_webui.models.prompt_history import (
+    PromptHistories,
+    PromptHistoryModel,
+    PromptHistoryResponse,
+)
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.utils.auth import get_admin_user, get_verified_user
 from open_webui.utils.access_control import has_access, has_permission
 from open_webui.config import BYPASS_ADMIN_ACCESS_CONTROL
 from open_webui.internal.db import get_session
 from sqlalchemy.orm import Session
+from pydantic import BaseModel
+
+
+class PromptVersionUpdateForm(BaseModel):
+    version_id: str
 
 router = APIRouter()
 
+
 ############################
 # GetPrompts
 ############################
@@ -112,7 +123,7 @@ async def create_new_prompt(
 async def get_prompt_by_command(
     command: str, user=Depends(get_verified_user), db: Session = Depends(get_session)
 ):
-    prompt = Prompts.get_prompt_by_command(f"/{command}", db=db)
+    prompt = Prompts.get_prompt_by_command(command, db=db)
 
     if prompt:
         if (
@@ -128,11 +139,11 @@ async def get_prompt_by_command(
                     or has_access(user.id, "write", prompt.access_control, db=db)
                 ),
             )
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail=ERROR_MESSAGES.NOT_FOUND,
-        )
+
+    raise HTTPException(
+        status_code=status.HTTP_404_NOT_FOUND,
+        detail=ERROR_MESSAGES.NOT_FOUND,
+    )
 
 
 ############################
@@ -147,10 +158,11 @@ async def update_prompt_by_command(
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
-    prompt = Prompts.get_prompt_by_command(f"/{command}", db=db)
+    prompt = Prompts.get_prompt_by_command(command, db=db)
+
     if not prompt:
         raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
+            status_code=status.HTTP_404_NOT_FOUND,
             detail=ERROR_MESSAGES.NOT_FOUND,
         )
 
@@ -165,29 +177,30 @@ async def update_prompt_by_command(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
-    prompt = Prompts.update_prompt_by_command(f"/{command}", form_data, db=db)
-    if prompt:
-        return prompt
+    # Use the command from the found prompt
+    updated_prompt = Prompts.update_prompt_by_command(
+        prompt.command, form_data, user.id, db=db
+    )
+    if updated_prompt:
+        return updated_prompt
     else:
         raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=ERROR_MESSAGES.DEFAULT(),
         )
 
 
-############################
-# DeletePromptByCommand
-############################
-
-
-@router.delete("/command/{command}/delete", response_model=bool)
-async def delete_prompt_by_command(
-    command: str, user=Depends(get_verified_user), db: Session = Depends(get_session)
+@router.post("/command/{command}/set/version", response_model=Optional[PromptModel])
+async def set_prompt_version(
+    command: str,
+    form_data: PromptVersionUpdateForm,
+    user=Depends(get_verified_user),
+    db: Session = Depends(get_session),
 ):
-    prompt = Prompts.get_prompt_by_command(f"/{command}", db=db)
+    prompt = Prompts.get_prompt_by_command(command, db=db)
     if not prompt:
         raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
+            status_code=status.HTTP_404_NOT_FOUND,
             detail=ERROR_MESSAGES.NOT_FOUND,
         )
 
@@ -201,5 +214,206 @@ async def delete_prompt_by_command(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
-    result = Prompts.delete_prompt_by_command(f"/{command}", db=db)
+    updated_prompt = Prompts.update_prompt_version(
+        prompt.command, form_data.version_id, db=db
+    )
+    if updated_prompt:
+        return updated_prompt
+    else:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=ERROR_MESSAGES.DEFAULT(),
+        )
+
+
+############################
+# DeletePromptByCommand
+############################
+
+
+@router.delete("/command/{command}/delete", response_model=bool)
+async def delete_prompt_by_command(
+    command: str, user=Depends(get_verified_user), db: Session = Depends(get_session)
+):
+    prompt = Prompts.get_prompt_by_command(command, db=db)
+
+    if not prompt:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    if (
+        prompt.user_id != user.id
+        and not has_access(user.id, "write", prompt.access_control, db=db)
+        and user.role != "admin"
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+        )
+
+    result = Prompts.delete_prompt_by_command(prompt.command, db=db)
     return result
+
+
+############################
+# Prompt History Endpoints
+############################
+
+
+@router.get("/command/{command}/history", response_model=list[PromptHistoryResponse])
+async def get_prompt_history(
+    command: str,
+    limit: int = 50,
+    offset: int = 0,
+    user=Depends(get_verified_user),
+    db: Session = Depends(get_session),
+):
+    """Get version history for a prompt."""
+    prompt = Prompts.get_prompt_by_command(command, db=db)
+
+    if not prompt:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    # Check read access
+    if not (
+        user.role == "admin"
+        or prompt.user_id == user.id
+        or has_access(user.id, "read", prompt.access_control, db=db)
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+        )
+
+    history = PromptHistories.get_history_by_prompt_id(
+        prompt.id, limit=limit, offset=offset, db=db
+    )
+    return history
+
+
+@router.get(
+    "/command/{command}/history/{history_id}", response_model=PromptHistoryModel
+)
+async def get_prompt_history_entry(
+    command: str,
+    history_id: str,
+    user=Depends(get_verified_user),
+    db: Session = Depends(get_session),
+):
+    """Get a specific version from history."""
+    prompt = Prompts.get_prompt_by_command(command, db=db)
+
+    if not prompt:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    # Check read access
+    if not (
+        user.role == "admin"
+        or prompt.user_id == user.id
+        or has_access(user.id, "read", prompt.access_control, db=db)
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+        )
+
+    history_entry = PromptHistories.get_history_entry_by_id(history_id, db=db)
+    if not history_entry or history_entry.prompt_id != prompt.id:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    return history_entry
+
+
+@router.delete(
+    "/command/{command}/history/{history_id}", response_model=bool
+)
+async def delete_prompt_history_entry(
+    command: str,
+    history_id: str,
+    user=Depends(get_verified_user),
+    db: Session = Depends(get_session),
+):
+    """Delete a history entry. Cannot delete the active production version."""
+    prompt = Prompts.get_prompt_by_command(command, db=db)
+
+    if not prompt:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    # Check write access
+    if not (
+        user.role == "admin"
+        or prompt.user_id == user.id
+        or has_access(user.id, "write", prompt.access_control, db=db)
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+        )
+
+    # Cannot delete active production version
+    if prompt.version_id == history_id:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Cannot delete the active production version",
+        )
+
+    success = PromptHistories.delete_history_entry(history_id, db=db)
+    if not success:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    return success
+
+
+@router.get("/command/{command}/history/diff")
+async def get_prompt_diff(
+    command: str,
+    from_id: str,
+    to_id: str,
+    user=Depends(get_verified_user),
+    db: Session = Depends(get_session),
+):
+    """Get diff between two versions."""
+    prompt = Prompts.get_prompt_by_command(command, db=db)
+
+    if not prompt:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    # Check read access
+    if not (
+        user.role == "admin"
+        or prompt.user_id == user.id
+        or has_access(user.id, "read", prompt.access_control, db=db)
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+        )
+
+    diff = PromptHistories.compute_diff(from_id, to_id, db=db)
+    if not diff:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="One or both history entries not found",
+        )
+
+    return diff

From 0c79a566ac13ad47bd629a2c561d92c0cd121820 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 02:40:17 +0400
Subject: [PATCH 04/18] feat: prompt history frontend

---
 src/lib/apis/prompts/index.ts                 | 280 +++++++++-
 .../chat/MessageInput/Commands/Prompts.svelte |   6 +-
 src/lib/components/common/Badge.svelte        |   4 +-
 src/lib/components/workspace/Prompts.svelte   |   2 +-
 .../workspace/Prompts/PromptEditor.svelte     | 501 ++++++++++++++----
 .../Prompts/PromptHistoryMenu.svelte          |  83 +++
 .../(app)/workspace/prompts/edit/+page.svelte |  16 +-
 7 files changed, 768 insertions(+), 124 deletions(-)
 create mode 100644 src/lib/components/workspace/Prompts/PromptHistoryMenu.svelte

diff --git a/src/lib/apis/prompts/index.ts b/src/lib/apis/prompts/index.ts
index 4129ea62a..7cc8c1f92 100644
--- a/src/lib/apis/prompts/index.ts
+++ b/src/lib/apis/prompts/index.ts
@@ -2,9 +2,45 @@ import { WEBUI_API_BASE_URL } from '$lib/constants';
 
 type PromptItem = {
 	command: string;
-	title: string;
+	name: string;  // Changed from title
 	content: string;
+	data?: object | null;
+	meta?: object | null;
 	access_control?: null | object;
+	version_id?: string | null;  // Active version
+	commit_message?: string | null;  // For history tracking
+};
+
+type PromptHistoryItem = {
+	id: string;
+	prompt_id: string;
+	parent_id: string | null;
+	snapshot: {
+		name: string;
+		content: string;
+		command: string;
+		data: object;
+		meta: object;
+		access_control: object | null;
+	};
+	user_id: string;
+	commit_message: string | null;
+	created_at: number;
+	user?: {
+		id: string;
+		name: string;
+		email: string;
+	};
+};
+
+type PromptDiff = {
+	from_id: string;
+	to_id: string;
+	from_snapshot: object;
+	to_snapshot: object;
+	content_diff: string[];
+	name_changed: boolean;
+	access_control_changed: boolean;
 };
 
 export const createNewPrompt = async (token: string, prompt: PromptItem) => {
@@ -19,7 +55,7 @@ export const createNewPrompt = async (token: string, prompt: PromptItem) => {
 		},
 		body: JSON.stringify({
 			...prompt,
-			command: `/${prompt.command}`
+			command: prompt.command.startsWith('/') ? prompt.command.slice(1) : prompt.command
 		})
 	})
 		.then(async (res) => {
@@ -104,6 +140,8 @@ export const getPromptList = async (token: string = '') => {
 export const getPromptByCommand = async (token: string, command: string) => {
 	let error = null;
 
+	command = command.charAt(0) === '/' ? command.slice(1) : command;
+
 	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}`, {
 		method: 'GET',
 		headers: {
@@ -136,7 +174,9 @@ export const getPromptByCommand = async (token: string, command: string) => {
 export const updatePromptByCommand = async (token: string, prompt: PromptItem) => {
 	let error = null;
 
-	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${prompt.command}/update`, {
+	const command = prompt.command.charAt(0) === '/' ? prompt.command.slice(1) : prompt.command;
+
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}/update`, {
 		method: 'POST',
 		headers: {
 			Accept: 'application/json',
@@ -145,7 +185,7 @@ export const updatePromptByCommand = async (token: string, prompt: PromptItem) =
 		},
 		body: JSON.stringify({
 			...prompt,
-			command: `/${prompt.command}`
+			command: command
 		})
 	})
 		.then(async (res) => {
@@ -169,6 +209,41 @@ export const updatePromptByCommand = async (token: string, prompt: PromptItem) =
 	return res;
 };
 
+export const setProductionPromptVersion = async (
+	token: string,
+	command: string,
+	version_id: string
+) => {
+	let error = null;
+
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}/set/version`, {
+		method: 'POST',
+		headers: {
+			Accept: 'application/json',
+			'Content-Type': 'application/json',
+			Authorization: `Bearer ${token}`
+		},
+		body: JSON.stringify({
+			version_id: version_id
+		})
+	})
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			console.log(err);
+			error = err.detail;
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
 export const deletePromptByCommand = async (token: string, command: string) => {
 	let error = null;
 
@@ -202,3 +277,200 @@ export const deletePromptByCommand = async (token: string, command: string) => {
 
 	return res;
 };
+
+////////////////////////////
+// Prompt History APIs
+////////////////////////////
+
+export const getPromptHistory = async (
+	token: string,
+	command: string,
+	limit: number = 50,
+	offset: number = 0
+): Promise<PromptHistoryItem[]> => {
+	let error = null;
+
+	command = command.charAt(0) === '/' ? command.slice(1) : command;
+
+	const res = await fetch(
+		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history?limit=${limit}&offset=${offset}`,
+		{
+			method: 'GET',
+			headers: {
+				Accept: 'application/json',
+				'Content-Type': 'application/json',
+				authorization: `Bearer ${token}`
+			}
+		}
+	)
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			error = err.detail;
+			console.error(err);
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
+export const deletePromptHistoryVersion = async (
+	token: string,
+	command: string,
+	historyId: string
+): Promise<boolean> => {
+	let error = null;
+
+	command = command.charAt(0) === '/' ? command.slice(1) : command;
+
+	const res = await fetch(
+		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/${historyId}`,
+		{
+			method: 'DELETE',
+			headers: {
+				Accept: 'application/json',
+				'Content-Type': 'application/json',
+				authorization: `Bearer ${token}`
+			}
+		}
+	)
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			error = err.detail;
+			console.error(err);
+			return false;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
+export const getPromptHistoryEntry = async (
+	token: string,
+	command: string,
+	historyId: string
+): Promise<PromptHistoryItem> => {
+	let error = null;
+
+	command = command.charAt(0) === '/' ? command.slice(1) : command;
+
+	const res = await fetch(
+		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/${historyId}`,
+		{
+			method: 'GET',
+			headers: {
+				Accept: 'application/json',
+				'Content-Type': 'application/json',
+				authorization: `Bearer ${token}`
+			}
+		}
+	)
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			error = err.detail;
+			console.error(err);
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
+export const restorePromptFromHistory = async (
+	token: string,
+	command: string,
+	historyId: string,
+	commitMessage?: string
+) => {
+	let error = null;
+
+	command = command.charAt(0) === '/' ? command.slice(1) : command;
+
+	const res = await fetch(
+		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/${historyId}/restore`,
+		{
+			method: 'POST',
+			headers: {
+				Accept: 'application/json',
+				'Content-Type': 'application/json',
+				authorization: `Bearer ${token}`
+			},
+			body: JSON.stringify({
+				commit_message: commitMessage
+			})
+		}
+	)
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			error = err.detail;
+			console.error(err);
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
+export const getPromptDiff = async (
+	token: string,
+	command: string,
+	fromId: string,
+	toId: string
+): Promise<PromptDiff> => {
+	let error = null;
+
+	command = command.charAt(0) === '/' ? command.slice(1) : command;
+
+	const res = await fetch(
+		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/diff?from_id=${fromId}&to_id=${toId}`,
+		{
+			method: 'GET',
+			headers: {
+				Accept: 'application/json',
+				'Content-Type': 'application/json',
+				authorization: `Bearer ${token}`
+			}
+		}
+	)
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			error = err.detail;
+			console.error(err);
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
+
diff --git a/src/lib/components/chat/MessageInput/Commands/Prompts.svelte b/src/lib/components/chat/MessageInput/Commands/Prompts.svelte
index 5df3c4691..0da053993 100644
--- a/src/lib/components/chat/MessageInput/Commands/Prompts.svelte
+++ b/src/lib/components/chat/MessageInput/Commands/Prompts.svelte
@@ -14,7 +14,7 @@
 
 	$: filteredItems = prompts
 		.filter((p) => p.command.toLowerCase().includes(query.toLowerCase()))
-		.sort((a, b) => a.title.localeCompare(b.title));
+		.sort((a, b) => a.name.localeCompare(b.name));
 
 	$: if (query) {
 		selectedPromptIdx = 0;
@@ -42,7 +42,7 @@
 {#if filteredItems.length > 0}
 	<div class=" space-y-0.5 scrollbar-hidden">
 		{#each filteredItems as promptItem, promptIdx}
-			<Tooltip content={promptItem.title} placement="top-start">
+			<Tooltip content={promptItem.name} placement="top-start">
 				<button
 					class=" px-3 py-1 rounded-xl w-full text-left {promptIdx === selectedPromptIdx
 						? '  bg-gray-50 dark:bg-gray-800 selected-command-option-button'
@@ -62,7 +62,7 @@
 					</span>
 
 					<span class=" text-xs text-gray-600 dark:text-gray-100">
-						{promptItem.title}
+						{promptItem.name}
 					</span>
 				</button>
 			</Tooltip>
diff --git a/src/lib/components/common/Badge.svelte b/src/lib/components/common/Badge.svelte
index c1513f8b6..8327a420c 100644
--- a/src/lib/components/common/Badge.svelte
+++ b/src/lib/components/common/Badge.svelte
@@ -12,8 +12,8 @@
 </script>
 
 <div
-	class=" text-xs font-semibold {classNames[type] ??
-		classNames['info']}  w-fit px-2 rounded-sm uppercase line-clamp-1 mr-0.5"
+	class=" text-xs font-medium {classNames[type] ??
+		classNames['info']} w-fit px-1.5 py-[1px] rounded-lg uppercase line-clamp-1 mr-0.5"
 >
 	{content}
 </div>
diff --git a/src/lib/components/workspace/Prompts.svelte b/src/lib/components/workspace/Prompts.svelte
index 4a4d1b55a..4dd969405 100644
--- a/src/lib/components/workspace/Prompts.svelte
+++ b/src/lib/components/workspace/Prompts.svelte
@@ -343,7 +343,7 @@
 						<div class=" flex flex-col flex-1 space-x-4 cursor-pointer w-full pl-1">
 							<div class="flex items-center justify-between w-full">
 								<div class="flex items-center gap-2">
-									<div class="font-medium line-clamp-1 capitalize">{prompt.title}</div>
+									<div class="font-medium line-clamp-1 capitalize">{prompt.name}</div>
 									<div class="text-xs overflow-hidden text-ellipsis line-clamp-1 text-gray-500">
 										{prompt.command}
 									</div>
diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 9dc3a1a56..ddb56dada 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -4,12 +4,25 @@
 	import Textarea from '$lib/components/common/Textarea.svelte';
 	import { toast } from 'svelte-sonner';
 	import Tooltip from '$lib/components/common/Tooltip.svelte';
-	import AccessControl from '../common/AccessControl.svelte';
 	import LockClosed from '$lib/components/icons/LockClosed.svelte';
 	import AccessControlModal from '../common/AccessControlModal.svelte';
 	import { user } from '$lib/stores';
-	import { slugify } from '$lib/utils';
+	import { slugify, formatDate } from '$lib/utils';
 	import Spinner from '$lib/components/common/Spinner.svelte';
+	import Modal from '$lib/components/common/Modal.svelte';
+	import XMark from '$lib/components/icons/XMark.svelte';
+	import {
+		getPromptHistory,
+		updatePromptByCommand,
+		setProductionPromptVersion,
+		deletePromptHistoryVersion
+	} from '$lib/apis/prompts';
+	import dayjs from 'dayjs';
+	import localizedFormat from 'dayjs/plugin/localizedFormat';
+	import PromptHistoryMenu from './PromptHistoryMenu.svelte';
+	import Badge from '$lib/components/common/Badge.svelte';
+
+	dayjs.extend(localizedFormat);
 
 	export let onSubmit: Function;
 	export let edit = false;
@@ -20,22 +33,25 @@
 	const i18n = getContext('i18n');
 
 	let loading = false;
+	let showEditModal = false;
 
-	let title = '';
+	let name = '';
 	let command = '';
 	let content = '';
+	let commitMessage = '';
 
 	let accessControl = {};
-
 	let showAccessControlModal = false;
-
 	let hasManualEdit = false;
 
+	let history: any[] = [];
+	let historyLoading = false;
+	let selectedHistoryEntry: any = null;
+
 	$: if (!edit && !hasManualEdit) {
-		command = title !== '' ? slugify(title) : '';
+		command = name !== '' ? slugify(name) : '';
 	}
 
-	// Track manual edits
 	function handleCommandInput(e: Event) {
 		hasManualEdit = true;
 	}
@@ -49,11 +65,15 @@
 
 		if (validateCommandString(command)) {
 			await onSubmit({
-				title,
+				name,
 				command,
 				content,
-				access_control: accessControl
+				access_control: accessControl,
+				commit_message: commitMessage || undefined
 			});
+			showEditModal = false;
+			commitMessage = '';
+			await loadHistory();
 		} else {
 			toast.error(
 				$i18n.t('Only alphanumeric characters and hyphens are allowed in the command string.')
@@ -64,22 +84,79 @@
 	};
 
 	const validateCommandString = (inputString) => {
-		// Regular expression to match only alphanumeric characters, hyphen, and underscore
 		const regex = /^[a-zA-Z0-9-_]+$/;
-
-		// Test the input string against the regular expression
 		return regex.test(inputString);
 	};
 
+	const loadHistory = async () => {
+		if (!prompt?.command || !edit) return;
+		historyLoading = true;
+		try {
+			history = await getPromptHistory(localStorage.token, prompt.command);
+		} catch (error) {
+			console.error('Failed to load history:', error);
+			history = [];
+		}
+		historyLoading = false;
+	};
+
+	const setAsProduction = async (historyEntry: any) => {
+		if (disabled) {
+			toast.error($i18n.t('You do not have permission to edit this prompt.'));
+			return;
+		}
+
+		try {
+			await setProductionPromptVersion(localStorage.token, prompt.command, historyEntry.id);
+			// Update local prompt object to trigger reactivity
+			prompt = { ...prompt, version_id: historyEntry.id };
+			toast.success($i18n.t('Production version updated'));
+		} catch (error) {
+			toast.error(`${error}`);
+		}
+	};
+
+	const handleDeleteHistory = async (historyId: string) => {
+		if (disabled) return;
+
+		try {
+			await deletePromptHistoryVersion(localStorage.token, prompt.command, historyId);
+			toast.success($i18n.t('Version deleted'));
+			// Reload history
+			await loadHistory();
+			// Reset selection if deleted entry was selected
+			if (selectedHistoryEntry?.id === historyId) {
+				selectedHistoryEntry = history.length > 0 ? history[0] : null;
+			}
+		} catch (error) {
+			toast.error(`${error}`);
+		}
+	};
+
+	const renderDate = (timestamp: number) => {
+		const dateVal = timestamp * 1000;
+		return $i18n.t(formatDate(dateVal), {
+			LOCALIZED_TIME: dayjs(dateVal).format('LT'),
+			LOCALIZED_DATE: dayjs(dateVal).format('L')
+		});
+	};
 	onMount(async () => {
 		if (prompt) {
-			title = prompt.title;
+			name = prompt.name || '';
 			await tick();
-
 			command = prompt.command.at(0) === '/' ? prompt.command.slice(1) : prompt.command;
 			content = prompt.content;
-
 			accessControl = prompt?.access_control === undefined ? {} : prompt?.access_control;
+
+			if (edit) {
+				await loadHistory();
+				// Auto-select production version
+				if (prompt.version_id && history.length > 0) {
+					selectedHistoryEntry = history.find((h) => h.id === prompt.version_id) || history[0];
+				} else if (history.length > 0) {
+					selectedHistoryEntry = history[0];
+				}
+			}
 		}
 	});
 </script>
@@ -92,124 +169,328 @@
 	sharePublic={$user?.permissions?.sharing?.public_prompts || $user?.role === 'admin'}
 />
 
-<div class="w-full max-h-full flex justify-center">
-	<form
-		class="flex flex-col w-full mb-10"
-		on:submit|preventDefault={() => {
-			submitHandler();
-		}}
-	>
-		<div class="my-2">
-			<Tooltip
-				content={`${$i18n.t('Only alphanumeric characters and hyphens are allowed')} - ${$i18n.t(
-					'Activate this command by typing "/{{COMMAND}}" to chat input.',
-					{
-						COMMAND: command
-					}
-				)}`}
-				placement="bottom-start"
+<!-- Edit Modal -->
+<Modal size="lg" bind:show={showEditModal}>
+	<div class="px-5 pt-4 pb-5">
+		<div class="flex justify-between items-center mb-2">
+			<div class="text-lg font-medium">{$i18n.t('Edit Prompt')}</div>
+			<button
+				class="p-1 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-lg"
+				on:click={() => (showEditModal = false)}
 			>
-				<div class="flex flex-col w-full">
-					<div class="flex items-center">
-						<input
-							class="text-2xl font-medium w-full bg-transparent outline-hidden"
-							placeholder={$i18n.t('Title')}
-							bind:value={title}
-							required
-							{disabled}
-						/>
-
-						{#if disabled}
-							<div class="text-xs shrink-0 text-gray-500">
-								{$i18n.t('Read Only')}
-							</div>
-						{:else}
-							<div class="self-center shrink-0">
-								<button
-									class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2 py-1 rounded-full flex gap-1 items-center"
-									type="button"
-									on:click={() => {
-										showAccessControlModal = true;
-									}}
-								>
-									<LockClosed strokeWidth="2.5" className="size-3.5" />
-
-									<div class="text-sm font-medium shrink-0">
-										{$i18n.t('Access')}
-									</div>
-								</button>
-							</div>
-						{/if}
-					</div>
-
-					<div class="flex gap-0.5 items-center text-xs text-gray-500">
-						<div class="">/</div>
-						<input
-							class=" w-full bg-transparent outline-hidden"
-							placeholder={$i18n.t('Command')}
-							bind:value={command}
-							on:input={handleCommandInput}
-							required
-							disabled={edit || disabled}
-						/>
-					</div>
-				</div>
-			</Tooltip>
+				<XMark className="size-5" />
+			</button>
 		</div>
 
-		<div class="my-2">
-			<div class="flex w-full justify-between">
-				<div class=" self-center text-sm font-medium">{$i18n.t('Prompt Content')}</div>
+		<form on:submit|preventDefault={submitHandler}>
+			<div class="my-2">
+				<Tooltip
+					content={`${$i18n.t('Only alphanumeric characters and hyphens are allowed')} - ${$i18n.t('Activate this command by typing "/{{COMMAND}}" to chat input.', { COMMAND: command })}`}
+					placement="bottom-start"
+				>
+					<div class="flex flex-col w-full">
+						<div class="flex items-center">
+							<input
+								class="text-2xl font-medium w-full bg-transparent outline-hidden"
+								placeholder={$i18n.t('Name')}
+								bind:value={name}
+								required
+							/>
+						</div>
+						<div class="flex gap-0.5 items-center text-xs text-gray-500">
+							<div>/</div>
+							<input
+								class="w-full bg-transparent outline-hidden"
+								placeholder={$i18n.t('Command')}
+								bind:value={command}
+								on:input={handleCommandInput}
+								required
+								disabled
+							/>
+						</div>
+					</div>
+				</Tooltip>
 			</div>
 
-			<div class="mt-2">
-				<div>
+			<div class="my-2">
+				<div class="flex w-full justify-between">
+					<div class="text-gray-500 text-xs">{$i18n.t('Prompt Content')}</div>
+				</div>
+
+				<div class="mt-1">
 					<Textarea
 						className="text-sm w-full bg-transparent outline-hidden overflow-y-hidden resize-none"
 						placeholder={$i18n.t('Write a summary in 50 words that summarizes {{topic}}.')}
 						bind:value={content}
 						rows={6}
 						required
-						readonly={disabled}
 					/>
-				</div>
 
-				<div class="text-xs text-gray-400 dark:text-gray-500">
-					ⓘ {$i18n.t('Format your variables using brackets like this:')}&nbsp;<span
-						class=" text-gray-600 dark:text-gray-300 font-medium"
-						>{'{{'}{$i18n.t('variable')}{'}}'}</span
-					>.
-					{$i18n.t('Make sure to enclose them with')}
-					<span class=" text-gray-600 dark:text-gray-300 font-medium">{'{{'}</span>
-					{$i18n.t('and')}
-					<span class=" text-gray-600 dark:text-gray-300 font-medium">{'}}'}</span>.
-				</div>
+					<div class="text-xs text-gray-400 dark:text-gray-500">
+						ⓘ {$i18n.t('Format your variables using brackets like this:')}&nbsp;<span
+							class="text-gray-600 dark:text-gray-300 font-medium"
+							>{'{{'}{$i18n.t('variable')}{'}}'}</span
+						>.
+						{$i18n.t('Make sure to enclose them with')}
+						<span class="text-gray-600 dark:text-gray-300 font-medium">{'{{'}</span>
+						{$i18n.t('and')}
+						<span class="text-gray-600 dark:text-gray-300 font-medium">{'}}'}</span>.
+					</div>
 
-				<div class="text-xs text-gray-400 dark:text-gray-500 underline">
-					<a href="https://docs.openwebui.com/features/workspace/prompts" target="_blank">
-						{$i18n.t('To learn more about powerful prompt variables, click here')}
-					</a>
+					<div class="text-xs text-gray-400 dark:text-gray-500 underline">
+						<a href="https://docs.openwebui.com/features/workspace/prompts" target="_blank">
+							{$i18n.t('To learn more about powerful prompt variables, click here')}
+						</a>
+					</div>
 				</div>
 			</div>
-		</div>
 
-		<div class="my-4 flex justify-end pb-20">
-			<Tooltip content={disabled ? $i18n.t('You do not have permission to save this prompt.') : ''}>
+			<div class="mt-4 flex justify-end">
 				<button
-					class=" text-sm w-full lg:w-fit px-4 py-2 transition rounded-xl {loading || disabled
-						? ' cursor-not-allowed bg-gray-200 text-gray-500 dark:bg-gray-700 dark:text-gray-400'
-						: 'bg-black hover:bg-gray-900 text-white dark:bg-white dark:hover:bg-gray-100 dark:text-black'} flex w-full justify-center"
+					class="text-sm px-4 py-2 transition rounded-full {loading
+						? 'cursor-not-allowed bg-gray-200 text-gray-500 dark:bg-gray-700 dark:text-gray-400'
+						: 'bg-black hover:bg-gray-900 text-white dark:bg-white dark:hover:bg-gray-100 dark:text-black'} flex justify-center"
 					type="submit"
-					disabled={loading || disabled}
+					disabled={loading}
 				>
-					<div class=" self-center font-medium">{$i18n.t('Save & Create')}</div>
+					<div class="font-medium">{$i18n.t('Save')}</div>
 					{#if loading}
-						<div class="ml-1.5 self-center">
+						<div class="ml-1.5">
 							<Spinner />
 						</div>
 					{/if}
 				</button>
-			</Tooltip>
+			</div>
+		</form>
+	</div>
+</Modal>
+
+{#if edit}
+	<!-- Edit mode: Read-only view with history -->
+	<div class="w-full max-h-full">
+		<!-- Main Content -->
+		<div class="flex-1 min-w-0">
+			<!-- Header -->
+			<div class="flex items-start justify-between gap-4 mb-2">
+				<div class="min-w-0">
+					<h1 class="text-2xl font-medium truncate">{name}</h1>
+					<div class="text-sm text-gray-500 mt-0.5">/{command}</div>
+				</div>
+				<div class="flex items-center gap-2 shrink-0">
+					{#if !disabled}
+						<button
+							class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2.5 py-1.5 rounded-full flex gap-1.5 items-center text-sm border border-gray-100 dark:border-gray-800"
+							on:click={() => (showAccessControlModal = true)}
+						>
+							<LockClosed strokeWidth="2.5" className="size-3.5" />
+							{$i18n.t('Access')}
+						</button>
+						<button
+							class="px-4 py-1.5 text-sm font-medium bg-black text-white dark:bg-white dark:text-black rounded-full hover:opacity-90 transition shadow-xs"
+							on:click={() => (showEditModal = true)}
+						>
+							{$i18n.t('Edit')}
+						</button>
+					{:else}
+						<span class="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded-full"
+							>{$i18n.t('Read Only')}</span
+						>
+					{/if}
+				</div>
+			</div>
+
+			<div class="flex flex-col lg:flex-row gap-6">
+				<!-- Desktop History Sidebar -->
+				<div class="hidden lg:block w-72 shrink-0 mt-1 mb-2">
+					<div class="sticky">
+						{@render historySection()}
+					</div>
+				</div>
+
+				<!-- Prompt Content -->
+				<div class="mb-6 flex-1">
+					<div class="flex items-center justify-between mb-1">
+						<div class="flex items-center gap-2">
+							<div class="text-gray-500 text-xs">
+								{$i18n.t('Prompt Content')}
+							</div>
+							{#if selectedHistoryEntry}
+								<span
+									class="text-xs text-gray-500 font-mono bg-gray-100 dark:bg-gray-800 px-1.5 py-0.5 rounded"
+								>
+									{selectedHistoryEntry.id.slice(0, 7)}
+								</span>
+							{/if}
+						</div>
+
+						{#if selectedHistoryEntry && !disabled}
+							<div class="flex items-center gap-2">
+								{#if selectedHistoryEntry.id === prompt?.version_id}
+									<Badge type="success" content={$i18n.t('Live')} />
+								{:else}
+									<button
+										class="text-xs text-gray-500 hover:text-gray-900 dark:hover:text-gray-300 hover:underline transition"
+										on:click={() => setAsProduction(selectedHistoryEntry)}
+									>
+										{$i18n.t('Set as Production')}
+									</button>
+								{/if}
+								<PromptHistoryMenu
+									isProduction={selectedHistoryEntry.id === prompt?.version_id}
+									onDelete={() => handleDeleteHistory(selectedHistoryEntry.id)}
+									onClose={() => {}}
+								/>
+							</div>
+						{/if}
+					</div>
+					<div
+						class="bg-gray-50 dark:bg-gray-900 rounded-xl px-4 py-3 border border-gray-100 dark:border-gray-800"
+					>
+						<pre class="text-sm whitespace-pre-wrap font-mono">{selectedHistoryEntry?.snapshot
+								?.content || content}</pre>
+					</div>
+				</div>
+
+				<!-- Mobile History -->
+				<div class="lg:hidden pb-20">
+					{@render historySection()}
+				</div>
+			</div>
 		</div>
-	</form>
-</div>
+	</div>
+{:else}
+	<!-- Create mode: Form -->
+	<div class="w-full max-h-full flex justify-center">
+		<form class="flex flex-col w-full mb-10" on:submit|preventDefault={submitHandler}>
+			<div class="mb-2">
+				<Tooltip
+					content={`${$i18n.t('Only alphanumeric characters and hyphens are allowed')} - ${$i18n.t('Activate this command by typing "/{{COMMAND}}" to chat input.', { COMMAND: command })}`}
+					placement="bottom-start"
+				>
+					<div class="flex flex-col w-full">
+						<div class="flex items-center">
+							<input
+								class="text-2xl font-medium w-full bg-transparent outline-hidden"
+								placeholder={$i18n.t('Name')}
+								bind:value={name}
+								required
+							/>
+							<div class="self-center shrink-0">
+								<button
+									class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2 py-1 rounded-full flex gap-1 items-center"
+									type="button"
+									on:click={() => (showAccessControlModal = true)}
+								>
+									<LockClosed strokeWidth="2.5" className="size-3.5" />
+									<div class="text-sm font-medium shrink-0">{$i18n.t('Access')}</div>
+								</button>
+							</div>
+						</div>
+						<div class="flex gap-0.5 items-center text-xs text-gray-500">
+							<div>/</div>
+							<input
+								class="w-full bg-transparent outline-hidden"
+								placeholder={$i18n.t('Command')}
+								bind:value={command}
+								on:input={handleCommandInput}
+								required
+							/>
+						</div>
+					</div>
+				</Tooltip>
+			</div>
+
+			<div class="my-2">
+				<div class="text-gray-500 text-xs">{$i18n.t('Prompt Content')}</div>
+				<div class="mt-1">
+					<Textarea
+						className="text-sm w-full bg-transparent outline-hidden overflow-y-hidden resize-none"
+						placeholder={$i18n.t('Write a summary in 50 words that summarizes {{topic}}.')}
+						bind:value={content}
+						rows={6}
+						required
+					/>
+					<div class="text-xs text-gray-400 dark:text-gray-500">
+						ⓘ {$i18n.t('Use')}
+						<span class="font-medium text-gray-600 dark:text-gray-300"
+							>{'{{'}{$i18n.t('variable')}{'}}'}</span
+						>
+						{$i18n.t('for placeholders')}
+					</div>
+				</div>
+			</div>
+
+			<div class="my-4 flex justify-end pb-20">
+				<button
+					class="text-sm w-full lg:w-fit px-4 py-2 transition rounded-xl bg-black hover:bg-gray-900 text-white dark:bg-white dark:hover:bg-gray-100 dark:text-black flex w-full justify-center"
+					type="submit"
+					disabled={loading}
+				>
+					<div class="font-medium">{$i18n.t('Save & Create')}</div>
+					{#if loading}
+						<div class="ml-1.5">
+							<Spinner />
+						</div>
+					{/if}
+				</button>
+			</div>
+		</form>
+	</div>
+{/if}
+
+{#snippet historySection()}
+	<div>
+		<div class="flex items-center justify-between mb-2">
+			<div class="text-gray-500 text-xs">{$i18n.t('History')}</div>
+			{#if historyLoading}
+				<Spinner className="size-3" />
+			{/if}
+		</div>
+
+		{#if history.length > 0}
+			<div class="space-y-0">
+				{#each history as entry, index}
+					<div class="flex">
+						<!-- Content -->
+						<button
+							class="flex-1 text-left px-3.5 py-2 mb-1 rounded-2xl transition group
+								{selectedHistoryEntry?.id === entry.id
+								? 'bg-gray-50 dark:bg-gray-850'
+								: 'hover:bg-gray-50 dark:hover:bg-gray-850'}"
+							on:click={() => (selectedHistoryEntry = entry)}
+						>
+							<!-- Commit Message -->
+							<div class="flex items-center gap-2 mb-1">
+								<div class="text-xs text-gray-900 dark:text-white truncate">
+									{entry.commit_message || $i18n.t('Update')}
+								</div>
+								{#if entry.id === prompt?.version_id}
+									<Badge type="success" content={$i18n.t('Live')} />
+								{/if}
+							</div>
+
+							<!-- User + Time -->
+							<div class="flex items-center gap-1 text-xs text-gray-500 dark:text-gray-400">
+								{#if entry.user}
+									<img
+										src={`/api/v1/users/${entry.user.id}/profile/image`}
+										alt={entry.user.name}
+										class="size-3 rounded-full"
+										on:error={(e) => (e.target.src = '/user.png')}
+									/>
+									<span class="truncate">{entry.user.name}</span>
+									<span>•</span>
+								{/if}
+								<span class="shrink-0">{renderDate(entry.created_at)}</span>
+							</div>
+						</button>
+					</div>
+				{/each}
+			</div>
+		{:else if !historyLoading}
+			<div class="text-xs text-gray-400 text-center py-6 italic">
+				{$i18n.t('No history available')}
+			</div>
+		{/if}
+	</div>
+{/snippet}
diff --git a/src/lib/components/workspace/Prompts/PromptHistoryMenu.svelte b/src/lib/components/workspace/Prompts/PromptHistoryMenu.svelte
new file mode 100644
index 000000000..5efebdfea
--- /dev/null
+++ b/src/lib/components/workspace/Prompts/PromptHistoryMenu.svelte
@@ -0,0 +1,83 @@
+<script lang="ts">
+	import { DropdownMenu } from 'bits-ui';
+	import { flyAndScale } from '$lib/utils/transitions';
+	import { getContext, createEventDispatcher } from 'svelte';
+
+	import Dropdown from '$lib/components/common/Dropdown.svelte';
+	import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte';
+	import GarbageBin from '$lib/components/icons/GarbageBin.svelte';
+	import Tooltip from '$lib/components/common/Tooltip.svelte';
+	import EllipsisHorizontal from '$lib/components/icons/EllipsisHorizontal.svelte';
+
+	const i18n = getContext('i18n');
+
+	export let isProduction = false;
+	export let onDelete: Function;
+	export let onClose: Function;
+
+	let show = false;
+	let showDeleteConfirmDialog = false;
+</script>
+
+<ConfirmDialog
+	bind:show={showDeleteConfirmDialog}
+	title={$i18n.t('Delete Version')}
+	message={$i18n.t(
+		"Are you sure you want to delete this version? Child versions will be relinked to this version's parent."
+	)}
+	confirmLabel={$i18n.t('Delete')}
+	onConfirm={() => {
+		onDelete();
+	}}
+/>
+
+<Dropdown
+	bind:show
+	on:change={(e) => {
+		if (e.detail === false) {
+			onClose();
+		}
+	}}
+>
+	<Tooltip content={$i18n.t('More')}>
+		<slot>
+			<button
+				class="p-1 rounded-lg text-gray-500 hover:bg-gray-50 dark:hover:bg-gray-850 transition"
+			>
+				<EllipsisHorizontal className="size-5" />
+			</button>
+		</slot>
+	</Tooltip>
+
+	<div slot="content">
+		<DropdownMenu.Content
+			class="w-full max-w-[170px] rounded-2xl p-1 border border-gray-100 dark:border-gray-800 z-50 bg-white dark:bg-gray-850 dark:text-white shadow-lg"
+			sideOffset={-2}
+			side="bottom"
+			align="end"
+			transition={flyAndScale}
+		>
+			{#if isProduction}
+				<Tooltip content={$i18n.t('Cannot delete the production version')} placement="top">
+					<div
+						class="flex gap-2 items-center px-3 py-1.5 text-sm rounded-xl opacity-40 cursor-not-allowed"
+					>
+						<GarbageBin />
+						<div class="flex items-center">{$i18n.t('Delete')}</div>
+					</div>
+				</Tooltip>
+			{:else}
+				<DropdownMenu.Item
+					class="flex gap-2 items-center px-3 py-1.5 text-sm cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-800 rounded-xl"
+					on:click={() => {
+						show = false;
+						showDeleteConfirmDialog = true;
+					}}
+				>
+					<GarbageBin />
+					<div class="flex items-center">{$i18n.t('Delete')}</div>
+				</DropdownMenu.Item>
+			{/if}
+		</DropdownMenu.Content>
+	</div>
+</Dropdown>
diff --git a/src/routes/(app)/workspace/prompts/edit/+page.svelte b/src/routes/(app)/workspace/prompts/edit/+page.svelte
index d462085c7..502293b1f 100644
--- a/src/routes/(app)/workspace/prompts/edit/+page.svelte
+++ b/src/routes/(app)/workspace/prompts/edit/+page.svelte
@@ -16,15 +16,22 @@
 
 	const onSubmit = async (_prompt) => {
 		console.log(_prompt);
-		const prompt = await updatePromptByCommand(localStorage.token, _prompt).catch((error) => {
+		const updatedPrompt = await updatePromptByCommand(localStorage.token, _prompt).catch((error) => {
 			toast.error(`${error}`);
 			return null;
 		});
 
-		if (prompt) {
+		if (updatedPrompt) {
 			toast.success($i18n.t('Prompt updated successfully'));
 			await prompts.set(await getPrompts(localStorage.token));
-			await goto('/workspace/prompts');
+			// Update local prompt state to reflect the new version
+			prompt = {
+				name: updatedPrompt.name,
+				command: updatedPrompt.command,
+				content: updatedPrompt.content,
+				version_id: updatedPrompt.version_id,
+				access_control: updatedPrompt?.access_control === undefined ? {} : updatedPrompt?.access_control
+			};
 		}
 	};
 
@@ -42,9 +49,10 @@
 			if (_prompt) {
 				disabled = !_prompt.write_access ?? true;
 				prompt = {
-					title: _prompt.title,
+					name: _prompt.name,
 					command: _prompt.command,
 					content: _prompt.content,
+					version_id: _prompt.version_id,
 					access_control: _prompt?.access_control === undefined ? {} : _prompt?.access_control
 				};
 			} else {

From 6ab7d549829ce1a864f113a95f666ba17826daec Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 02:51:44 +0400
Subject: [PATCH 05/18] refac

---
 backend/open_webui/models/prompts.py          | 10 ++-
 .../workspace/Prompts/PromptEditor.svelte     | 74 +++++++------------
 2 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/backend/open_webui/models/prompts.py b/backend/open_webui/models/prompts.py
index 42d724c65..22ad884bb 100644
--- a/backend/open_webui/models/prompts.py
+++ b/backend/open_webui/models/prompts.py
@@ -89,6 +89,7 @@ class PromptForm(BaseModel):
     access_control: Optional[dict] = None
     version_id: Optional[str] = None  # Active version
     commit_message: Optional[str] = None  # For history tracking
+    is_production: Optional[bool] = True  # Whether to set new version as production
 
 
 class PromptsTable:
@@ -252,8 +253,6 @@ class PromptsTable:
                 prompt.data = form_data.data or prompt.data
                 prompt.meta = form_data.meta or prompt.meta
                 prompt.access_control = form_data.access_control
-                if form_data.version_id is not None:
-                    prompt.version_id = form_data.version_id
                 prompt.updated_at = int(time.time())
                 
                 db.commit()
@@ -269,7 +268,7 @@ class PromptsTable:
                         "access_control": form_data.access_control,
                     }
                     
-                    PromptHistories.create_history_entry(
+                    history_entry = PromptHistories.create_history_entry(
                         prompt_id=prompt.id,
                         snapshot=snapshot,
                         user_id=user_id,
@@ -277,6 +276,11 @@ class PromptsTable:
                         commit_message=form_data.commit_message,
                         db=db,
                     )
+                    
+                    # Set as production if flag is True (default)
+                    if form_data.is_production and history_entry:
+                        prompt.version_id = history_entry.id
+                        db.commit()
                 
                 return PromptModel.model_validate(prompt)
         except Exception:
diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index ddb56dada..dbc3997d8 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -39,6 +39,7 @@
 	let command = '';
 	let content = '';
 	let commitMessage = '';
+	let isProduction = true;
 
 	let accessControl = {};
 	let showAccessControlModal = false;
@@ -69,10 +70,12 @@
 				command,
 				content,
 				access_control: accessControl,
-				commit_message: commitMessage || undefined
+				commit_message: commitMessage || undefined,
+				is_production: isProduction
 			});
 			showEditModal = false;
 			commitMessage = '';
+			isProduction = true;
 			await loadHistory();
 		} else {
 			toast.error(
@@ -183,35 +186,6 @@
 		</div>
 
 		<form on:submit|preventDefault={submitHandler}>
-			<div class="my-2">
-				<Tooltip
-					content={`${$i18n.t('Only alphanumeric characters and hyphens are allowed')} - ${$i18n.t('Activate this command by typing "/{{COMMAND}}" to chat input.', { COMMAND: command })}`}
-					placement="bottom-start"
-				>
-					<div class="flex flex-col w-full">
-						<div class="flex items-center">
-							<input
-								class="text-2xl font-medium w-full bg-transparent outline-hidden"
-								placeholder={$i18n.t('Name')}
-								bind:value={name}
-								required
-							/>
-						</div>
-						<div class="flex gap-0.5 items-center text-xs text-gray-500">
-							<div>/</div>
-							<input
-								class="w-full bg-transparent outline-hidden"
-								placeholder={$i18n.t('Command')}
-								bind:value={command}
-								on:input={handleCommandInput}
-								required
-								disabled
-							/>
-						</div>
-					</div>
-				</Tooltip>
-			</div>
-
 			<div class="my-2">
 				<div class="flex w-full justify-between">
 					<div class="text-gray-500 text-xs">{$i18n.t('Prompt Content')}</div>
@@ -225,27 +199,30 @@
 						rows={6}
 						required
 					/>
-
-					<div class="text-xs text-gray-400 dark:text-gray-500">
-						ⓘ {$i18n.t('Format your variables using brackets like this:')}&nbsp;<span
-							class="text-gray-600 dark:text-gray-300 font-medium"
-							>{'{{'}{$i18n.t('variable')}{'}}'}</span
-						>.
-						{$i18n.t('Make sure to enclose them with')}
-						<span class="text-gray-600 dark:text-gray-300 font-medium">{'{{'}</span>
-						{$i18n.t('and')}
-						<span class="text-gray-600 dark:text-gray-300 font-medium">{'}}'}</span>.
-					</div>
-
-					<div class="text-xs text-gray-400 dark:text-gray-500 underline">
-						<a href="https://docs.openwebui.com/features/workspace/prompts" target="_blank">
-							{$i18n.t('To learn more about powerful prompt variables, click here')}
-						</a>
-					</div>
 				</div>
 			</div>
 
-			<div class="mt-4 flex justify-end">
+			<div class="my-2">
+				<div class="text-gray-500 text-xs">{$i18n.t('Commit Message')} ({$i18n.t('optional')})</div>
+				<div class="mt-1">
+					<input
+						class="text-sm w-full bg-transparent outline-hidden"
+						placeholder={$i18n.t('Describe what changed...')}
+						bind:value={commitMessage}
+					/>
+				</div>
+			</div>
+
+			<div class="mt-4 flex items-center justify-between">
+				<label class="flex items-center gap-2 cursor-pointer">
+					<input
+						type="checkbox"
+						bind:checked={isProduction}
+						class="w-4 h-4 rounded border-gray-300 dark:border-gray-600"
+					/>
+					<span class="text-sm text-gray-700 dark:text-gray-300">{$i18n.t('Set as Production')}</span>
+				</label>
+				<div>
 				<button
 					class="text-sm px-4 py-2 transition rounded-full {loading
 						? 'cursor-not-allowed bg-gray-200 text-gray-500 dark:bg-gray-700 dark:text-gray-400'
@@ -260,6 +237,7 @@
 						</div>
 					{/if}
 				</button>
+				</div>
 			</div>
 		</form>
 	</div>

From 44da9c65232c4ccf927f54439cd3a03b883ffdf1 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 02:57:08 +0400
Subject: [PATCH 06/18] refac

---
 backend/open_webui/routers/prompts.py         | 32 +++++++++++++++++++
 src/lib/apis/prompts/index.ts                 | 32 +++++++++++++++++++
 src/lib/components/workspace/Prompts.svelte   |  2 +-
 .../prompts/{edit => [id]}/+page.svelte       | 16 ++++++----
 4 files changed, 75 insertions(+), 7 deletions(-)
 rename src/routes/(app)/workspace/prompts/{edit => [id]}/+page.svelte (83%)

diff --git a/backend/open_webui/routers/prompts.py b/backend/open_webui/routers/prompts.py
index b0c3966be..d243b1655 100644
--- a/backend/open_webui/routers/prompts.py
+++ b/backend/open_webui/routers/prompts.py
@@ -146,6 +146,38 @@ async def get_prompt_by_command(
     )
 
 
+############################
+# GetPromptById
+############################
+
+
+@router.get("/id/{prompt_id}", response_model=Optional[PromptAccessResponse])
+async def get_prompt_by_id(
+    prompt_id: str, user=Depends(get_verified_user), db: Session = Depends(get_session)
+):
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
+
+    if prompt:
+        if (
+            user.role == "admin"
+            or prompt.user_id == user.id
+            or has_access(user.id, "read", prompt.access_control, db=db)
+        ):
+            return PromptAccessResponse(
+                **prompt.model_dump(),
+                write_access=(
+                    (user.role == "admin" and BYPASS_ADMIN_ACCESS_CONTROL)
+                    or user.id == prompt.user_id
+                    or has_access(user.id, "write", prompt.access_control, db=db)
+                ),
+            )
+
+    raise HTTPException(
+        status_code=status.HTTP_404_NOT_FOUND,
+        detail=ERROR_MESSAGES.NOT_FOUND,
+    )
+
+
 ############################
 # UpdatePromptByCommand
 ############################
diff --git a/src/lib/apis/prompts/index.ts b/src/lib/apis/prompts/index.ts
index 7cc8c1f92..2e92ff30b 100644
--- a/src/lib/apis/prompts/index.ts
+++ b/src/lib/apis/prompts/index.ts
@@ -171,6 +171,38 @@ export const getPromptByCommand = async (token: string, command: string) => {
 	return res;
 };
 
+export const getPromptById = async (token: string, promptId: string) => {
+	let error = null;
+
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/id/${promptId}`, {
+		method: 'GET',
+		headers: {
+			Accept: 'application/json',
+			'Content-Type': 'application/json',
+			authorization: `Bearer ${token}`
+		}
+	})
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.then((json) => {
+			return json;
+		})
+		.catch((err) => {
+			error = err.detail;
+
+			console.error(err);
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
 export const updatePromptByCommand = async (token: string, prompt: PromptItem) => {
 	let error = null;
 
diff --git a/src/lib/components/workspace/Prompts.svelte b/src/lib/components/workspace/Prompts.svelte
index 4dd969405..495a741f0 100644
--- a/src/lib/components/workspace/Prompts.svelte
+++ b/src/lib/components/workspace/Prompts.svelte
@@ -338,7 +338,7 @@
 				{#each filteredItems as prompt}
 					<a
 						class=" flex space-x-4 cursor-pointer text-left w-full px-3 py-2.5 dark:hover:bg-gray-850/50 hover:bg-gray-50 transition rounded-2xl"
-						href={`/workspace/prompts/edit?command=${encodeURIComponent(prompt.command)}`}
+						href={`/workspace/prompts/${prompt.id}`}
 					>
 						<div class=" flex flex-col flex-1 space-x-4 cursor-pointer w-full pl-1">
 							<div class="flex items-center justify-between w-full">
diff --git a/src/routes/(app)/workspace/prompts/edit/+page.svelte b/src/routes/(app)/workspace/prompts/[id]/+page.svelte
similarity index 83%
rename from src/routes/(app)/workspace/prompts/edit/+page.svelte
rename to src/routes/(app)/workspace/prompts/[id]/+page.svelte
index 502293b1f..2d989be49 100644
--- a/src/routes/(app)/workspace/prompts/edit/+page.svelte
+++ b/src/routes/(app)/workspace/prompts/[id]/+page.svelte
@@ -2,11 +2,11 @@
 	import { toast } from 'svelte-sonner';
 	import { goto } from '$app/navigation';
 	import { prompts } from '$lib/stores';
-	import { onMount, tick, getContext } from 'svelte';
+	import { onMount, getContext } from 'svelte';
 
 	const i18n = getContext('i18n');
 
-	import { getPromptByCommand, getPrompts, updatePromptByCommand } from '$lib/apis/prompts';
+	import { getPromptById, getPrompts, updatePromptByCommand } from '$lib/apis/prompts';
 	import { page } from '$app/stores';
 
 	import PromptEditor from '$lib/components/workspace/Prompts/PromptEditor.svelte';
@@ -14,6 +14,9 @@
 	let prompt = null;
 	let disabled = false;
 
+	// Get prompt ID from route params
+	$: promptId = $page.params.id;
+
 	const onSubmit = async (_prompt) => {
 		console.log(_prompt);
 		const updatedPrompt = await updatePromptByCommand(localStorage.token, _prompt).catch((error) => {
@@ -26,6 +29,7 @@
 			await prompts.set(await getPrompts(localStorage.token));
 			// Update local prompt state to reflect the new version
 			prompt = {
+				id: updatedPrompt.id,
 				name: updatedPrompt.name,
 				command: updatedPrompt.command,
 				content: updatedPrompt.content,
@@ -36,11 +40,10 @@
 	};
 
 	onMount(async () => {
-		const command = $page.url.searchParams.get('command');
-		if (command) {
-			const _prompt = await getPromptByCommand(
+		if (promptId) {
+			const _prompt = await getPromptById(
 				localStorage.token,
-				command.replace(/\//g, '')
+				promptId
 			).catch((error) => {
 				toast.error(`${error}`);
 				return null;
@@ -49,6 +52,7 @@
 			if (_prompt) {
 				disabled = !_prompt.write_access ?? true;
 				prompt = {
+					id: _prompt.id,
 					name: _prompt.name,
 					command: _prompt.command,
 					content: _prompt.content,

From dff014116063866c3340679569ba087a83a39901 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 02:58:23 +0400
Subject: [PATCH 07/18] refac

---
 src/routes/(app)/workspace/prompts/create/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(app)/workspace/prompts/create/+page.svelte b/src/routes/(app)/workspace/prompts/create/+page.svelte
index f6abf0e22..d88d7a0e1 100644
--- a/src/routes/(app)/workspace/prompts/create/+page.svelte
+++ b/src/routes/(app)/workspace/prompts/create/+page.svelte
@@ -46,7 +46,7 @@
 
 			clone = true;
 			prompt = {
-				title: _prompt.title,
+				name: _prompt.name || _prompt.title || 'Prompt',
 				command: _prompt.command,
 				content: _prompt.content,
 				access_control: _prompt.access_control !== undefined ? _prompt.access_control : {}
@@ -65,7 +65,7 @@
 
 			clone = true;
 			prompt = {
-				title: _prompt.title,
+				name: _prompt.name || _prompt.title || 'Prompt',
 				command: _prompt.command,
 				content: _prompt.content,
 				access_control: _prompt.access_control !== undefined ? _prompt.access_control : {}

From 5ad593e46508a3561f0188bbc73e9e41ac9b77fb Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 03:08:48 +0400
Subject: [PATCH 08/18] refac: prompt endpoints

---
 backend/open_webui/models/prompts.py          | 156 +++++++++++++-----
 backend/open_webui/routers/prompts.py         |  60 +++----
 src/lib/apis/prompts/index.ts                 |  54 +++---
 src/lib/components/workspace/Prompts.svelte   |   4 +-
 .../workspace/Prompts/PromptEditor.svelte     |   8 +-
 .../(app)/workspace/prompts/[id]/+page.svelte |   4 +-
 6 files changed, 172 insertions(+), 114 deletions(-)

diff --git a/backend/open_webui/models/prompts.py b/backend/open_webui/models/prompts.py
index 22ad884bb..537d328c3 100644
--- a/backend/open_webui/models/prompts.py
+++ b/backend/open_webui/models/prompts.py
@@ -6,12 +6,15 @@ from sqlalchemy.orm import Session
 from open_webui.internal.db import Base, JSONField, get_db, get_db_context
 from open_webui.models.groups import Groups
 from open_webui.models.users import Users, UserResponse
+from open_webui.models.prompt_history import PromptHistories
+
 
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy import BigInteger, Boolean, Column, String, Text, JSON
 
 from open_webui.utils.access_control import has_access
 
+
 ####################
 # Prompts DB Schema
 ####################
@@ -63,7 +66,7 @@ class PromptModel(BaseModel):
     created_at: Optional[int] = None
     updated_at: Optional[int] = None
     access_control: Optional[dict] = None
-    
+
     model_config = ConfigDict(from_attributes=True)
 
 
@@ -98,7 +101,7 @@ class PromptsTable:
     ) -> Optional[PromptModel]:
         now = int(time.time())
         prompt_id = str(uuid.uuid4())
-        
+
         prompt = PromptModel(
             id=prompt_id,
             user_id=user_id,
@@ -119,11 +122,8 @@ class PromptsTable:
                 db.add(result)
                 db.commit()
                 db.refresh(result)
-                
+
                 if result:
-                    # Create initial history entry
-                    from open_webui.models.prompt_history import PromptHistories
-                    
                     snapshot = {
                         "name": form_data.name,
                         "content": form_data.content,
@@ -132,7 +132,7 @@ class PromptsTable:
                         "meta": form_data.meta or {},
                         "access_control": form_data.access_control,
                     }
-                    
+
                     history_entry = PromptHistories.create_history_entry(
                         prompt_id=prompt_id,
                         snapshot=snapshot,
@@ -141,13 +141,13 @@ class PromptsTable:
                         commit_message=form_data.commit_message or "Initial version",
                         db=db,
                     )
-                    
+
                     # Set the initial version as the production version
                     if history_entry:
                         result.version_id = history_entry.id
                         db.commit()
                         db.refresh(result)
-                    
+
                     return PromptModel.model_validate(result)
                 else:
                     return None
@@ -223,28 +223,28 @@ class PromptsTable:
         ]
 
     def update_prompt_by_command(
-        self, 
-        command: str, 
-        form_data: PromptForm, 
+        self,
+        command: str,
+        form_data: PromptForm,
         user_id: str,
-        db: Optional[Session] = None
+        db: Optional[Session] = None,
     ) -> Optional[PromptModel]:
         try:
             with get_db_context(db) as db:
                 prompt = db.query(Prompt).filter_by(command=command).first()
                 if not prompt:
                     return None
-                
-                # Get the latest history entry for parent_id
-                from open_webui.models.prompt_history import PromptHistories
-                latest_history = PromptHistories.get_latest_history_entry(prompt.id, db=db)
+
+                latest_history = PromptHistories.get_latest_history_entry(
+                    prompt.id, db=db
+                )
                 parent_id = latest_history.id if latest_history else None
-                
+
                 # Check if content changed to decide on history creation
                 content_changed = (
-                    prompt.name != form_data.name or
-                    prompt.content != form_data.content or
-                    prompt.access_control != form_data.access_control
+                    prompt.name != form_data.name
+                    or prompt.content != form_data.content
+                    or prompt.access_control != form_data.access_control
                 )
 
                 # Update prompt fields
@@ -254,9 +254,9 @@ class PromptsTable:
                 prompt.meta = form_data.meta or prompt.meta
                 prompt.access_control = form_data.access_control
                 prompt.updated_at = int(time.time())
-                
+
                 db.commit()
-                
+
                 # Create history entry only if content changed
                 if content_changed:
                     snapshot = {
@@ -267,7 +267,7 @@ class PromptsTable:
                         "meta": form_data.meta or {},
                         "access_control": form_data.access_control,
                     }
-                    
+
                     history_entry = PromptHistories.create_history_entry(
                         prompt_id=prompt.id,
                         snapshot=snapshot,
@@ -276,38 +276,100 @@ class PromptsTable:
                         commit_message=form_data.commit_message,
                         db=db,
                     )
-                    
+
                     # Set as production if flag is True (default)
                     if form_data.is_production and history_entry:
                         prompt.version_id = history_entry.id
                         db.commit()
-                
+
                 return PromptModel.model_validate(prompt)
         except Exception:
             return None
 
+    def update_prompt_by_id(
+        self,
+        prompt_id: str,
+        form_data: PromptForm,
+        user_id: str,
+        db: Optional[Session] = None,
+    ) -> Optional[PromptModel]:
+        try:
+            with get_db_context(db) as db:
+                prompt = db.query(Prompt).filter_by(id=prompt_id).first()
+                if not prompt:
+                    return None
 
+                latest_history = PromptHistories.get_latest_history_entry(
+                    prompt.id, db=db
+                )
+                parent_id = latest_history.id if latest_history else None
+
+                # Check if content changed to decide on history creation
+                content_changed = (
+                    prompt.name != form_data.name
+                    or prompt.content != form_data.content
+                    or prompt.access_control != form_data.access_control
+                )
+
+                # Update prompt fields
+                prompt.name = form_data.name
+                prompt.content = form_data.content
+                prompt.data = form_data.data or prompt.data
+                prompt.meta = form_data.meta or prompt.meta
+                prompt.access_control = form_data.access_control
+                prompt.updated_at = int(time.time())
+
+                db.commit()
+
+                # Create history entry only if content changed
+                if content_changed:
+                    snapshot = {
+                        "name": form_data.name,
+                        "content": form_data.content,
+                        "command": prompt.command,
+                        "data": form_data.data or {},
+                        "meta": form_data.meta or {},
+                        "access_control": form_data.access_control,
+                    }
+
+                    history_entry = PromptHistories.create_history_entry(
+                        prompt_id=prompt.id,
+                        snapshot=snapshot,
+                        user_id=user_id,
+                        parent_id=parent_id,
+                        commit_message=form_data.commit_message,
+                        db=db,
+                    )
+
+                    # Set as production if flag is True (default)
+                    if form_data.is_production and history_entry:
+                        prompt.version_id = history_entry.id
+                        db.commit()
+
+                return PromptModel.model_validate(prompt)
+        except Exception:
+            return None
 
     def update_prompt_version(
         self,
-        command: str,
+        prompt_id: str,
         version_id: str,
         db: Optional[Session] = None,
     ) -> Optional[PromptModel]:
         """Set the active version of a prompt and restore content from that version's snapshot."""
         try:
             with get_db_context(db) as db:
-                prompt = db.query(Prompt).filter_by(command=command).first()
+                prompt = db.query(Prompt).filter_by(id=prompt_id).first()
                 if not prompt:
                     return None
-                
-                # Get the history entry to restore content from
-                from open_webui.models.prompt_history import PromptHistories
-                history_entry = PromptHistories.get_history_entry_by_id(version_id, db=db)
-                
+
+                history_entry = PromptHistories.get_history_entry_by_id(
+                    version_id, db=db
+                )
+
                 if not history_entry:
                     return None
-                
+
                 # Restore prompt content from the snapshot
                 snapshot = history_entry.snapshot
                 if snapshot:
@@ -316,11 +378,11 @@ class PromptsTable:
                     prompt.data = snapshot.get("data", prompt.data)
                     prompt.meta = snapshot.get("meta", prompt.meta)
                     # Note: command and access_control are not restored from snapshot
-                
+
                 prompt.version_id = version_id
                 prompt.updated_at = int(time.time())
                 db.commit()
-                
+
                 return PromptModel.model_validate(prompt)
         except Exception:
             return None
@@ -333,8 +395,22 @@ class PromptsTable:
             with get_db_context(db) as db:
                 prompt = db.query(Prompt).filter_by(command=command).first()
                 if prompt:
-                    # Delete history first (Requirement: entire history should be deleted)
-                    from open_webui.models.prompt_history import PromptHistories
+                    PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
+
+                    prompt.is_active = False
+                    prompt.updated_at = int(time.time())
+                    db.commit()
+                    return True
+                return False
+        except Exception:
+            return False
+
+    def delete_prompt_by_id(self, prompt_id: str, db: Optional[Session] = None) -> bool:
+        """Soft delete a prompt by setting is_active to False."""
+        try:
+            with get_db_context(db) as db:
+                prompt = db.query(Prompt).filter_by(id=prompt_id).first()
+                if prompt:
                     PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
 
                     prompt.is_active = False
@@ -353,10 +429,8 @@ class PromptsTable:
             with get_db_context(db) as db:
                 prompt = db.query(Prompt).filter_by(command=command).first()
                 if prompt:
-                    # Delete history first
-                    from open_webui.models.prompt_history import PromptHistories
                     PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
-                    
+
                     # Delete prompt
                     db.query(Prompt).filter_by(command=command).delete()
                     db.commit()
diff --git a/backend/open_webui/routers/prompts.py b/backend/open_webui/routers/prompts.py
index d243b1655..6047ba0d8 100644
--- a/backend/open_webui/routers/prompts.py
+++ b/backend/open_webui/routers/prompts.py
@@ -179,18 +179,18 @@ async def get_prompt_by_id(
 
 
 ############################
-# UpdatePromptByCommand
+# UpdatePromptById
 ############################
 
 
-@router.post("/command/{command}/update", response_model=Optional[PromptModel])
-async def update_prompt_by_command(
-    command: str,
+@router.post("/id/{prompt_id}/update", response_model=Optional[PromptModel])
+async def update_prompt_by_id(
+    prompt_id: str,
     form_data: PromptForm,
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
-    prompt = Prompts.get_prompt_by_command(command, db=db)
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
 
     if not prompt:
         raise HTTPException(
@@ -209,9 +209,9 @@ async def update_prompt_by_command(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
-    # Use the command from the found prompt
-    updated_prompt = Prompts.update_prompt_by_command(
-        prompt.command, form_data, user.id, db=db
+    # Use the ID from the found prompt
+    updated_prompt = Prompts.update_prompt_by_id(
+        prompt.id, form_data, user.id, db=db
     )
     if updated_prompt:
         return updated_prompt
@@ -222,14 +222,14 @@ async def update_prompt_by_command(
         )
 
 
-@router.post("/command/{command}/set/version", response_model=Optional[PromptModel])
+@router.post("/id/{prompt_id}/set/version", response_model=Optional[PromptModel])
 async def set_prompt_version(
-    command: str,
+    prompt_id: str,
     form_data: PromptVersionUpdateForm,
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
-    prompt = Prompts.get_prompt_by_command(command, db=db)
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
     if not prompt:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
@@ -247,7 +247,7 @@ async def set_prompt_version(
         )
 
     updated_prompt = Prompts.update_prompt_version(
-        prompt.command, form_data.version_id, db=db
+        prompt.id, form_data.version_id, db=db
     )
     if updated_prompt:
         return updated_prompt
@@ -259,15 +259,15 @@ async def set_prompt_version(
 
 
 ############################
-# DeletePromptByCommand
+# DeletePromptById
 ############################
 
 
-@router.delete("/command/{command}/delete", response_model=bool)
-async def delete_prompt_by_command(
-    command: str, user=Depends(get_verified_user), db: Session = Depends(get_session)
+@router.delete("/id/{prompt_id}/delete", response_model=bool)
+async def delete_prompt_by_id(
+    prompt_id: str, user=Depends(get_verified_user), db: Session = Depends(get_session)
 ):
-    prompt = Prompts.get_prompt_by_command(command, db=db)
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
 
     if not prompt:
         raise HTTPException(
@@ -285,7 +285,7 @@ async def delete_prompt_by_command(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
-    result = Prompts.delete_prompt_by_command(prompt.command, db=db)
+    result = Prompts.delete_prompt_by_id(prompt.id, db=db)
     return result
 
 
@@ -294,16 +294,16 @@ async def delete_prompt_by_command(
 ############################
 
 
-@router.get("/command/{command}/history", response_model=list[PromptHistoryResponse])
+@router.get("/id/{prompt_id}/history", response_model=list[PromptHistoryResponse])
 async def get_prompt_history(
-    command: str,
+    prompt_id: str,
     limit: int = 50,
     offset: int = 0,
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
     """Get version history for a prompt."""
-    prompt = Prompts.get_prompt_by_command(command, db=db)
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
 
     if not prompt:
         raise HTTPException(
@@ -329,16 +329,16 @@ async def get_prompt_history(
 
 
 @router.get(
-    "/command/{command}/history/{history_id}", response_model=PromptHistoryModel
+    "/id/{prompt_id}/history/{history_id}", response_model=PromptHistoryModel
 )
 async def get_prompt_history_entry(
-    command: str,
+    prompt_id: str,
     history_id: str,
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
     """Get a specific version from history."""
-    prompt = Prompts.get_prompt_by_command(command, db=db)
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
 
     if not prompt:
         raise HTTPException(
@@ -368,16 +368,16 @@ async def get_prompt_history_entry(
 
 
 @router.delete(
-    "/command/{command}/history/{history_id}", response_model=bool
+    "/id/{prompt_id}/history/{history_id}", response_model=bool
 )
 async def delete_prompt_history_entry(
-    command: str,
+    prompt_id: str,
     history_id: str,
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
     """Delete a history entry. Cannot delete the active production version."""
-    prompt = Prompts.get_prompt_by_command(command, db=db)
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
 
     if not prompt:
         raise HTTPException(
@@ -413,16 +413,16 @@ async def delete_prompt_history_entry(
     return success
 
 
-@router.get("/command/{command}/history/diff")
+@router.get("/id/{prompt_id}/history/diff")
 async def get_prompt_diff(
-    command: str,
+    prompt_id: str,
     from_id: str,
     to_id: str,
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
     """Get diff between two versions."""
-    prompt = Prompts.get_prompt_by_command(command, db=db)
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
 
     if not prompt:
         raise HTTPException(
diff --git a/src/lib/apis/prompts/index.ts b/src/lib/apis/prompts/index.ts
index 2e92ff30b..d058b677c 100644
--- a/src/lib/apis/prompts/index.ts
+++ b/src/lib/apis/prompts/index.ts
@@ -1,6 +1,7 @@
 import { WEBUI_API_BASE_URL } from '$lib/constants';
 
 type PromptItem = {
+	id?: string;  // Prompt ID
 	command: string;
 	name: string;  // Changed from title
 	content: string;
@@ -9,6 +10,7 @@ type PromptItem = {
 	access_control?: null | object;
 	version_id?: string | null;  // Active version
 	commit_message?: string | null;  // For history tracking
+	is_production?: boolean;  // Whether to set new version as production
 };
 
 type PromptHistoryItem = {
@@ -203,22 +205,17 @@ export const getPromptById = async (token: string, promptId: string) => {
 	return res;
 };
 
-export const updatePromptByCommand = async (token: string, prompt: PromptItem) => {
+export const updatePromptById = async (token: string, prompt: PromptItem) => {
 	let error = null;
 
-	const command = prompt.command.charAt(0) === '/' ? prompt.command.slice(1) : prompt.command;
-
-	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}/update`, {
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/id/${prompt.id}/update`, {
 		method: 'POST',
 		headers: {
 			Accept: 'application/json',
 			'Content-Type': 'application/json',
 			authorization: `Bearer ${token}`
 		},
-		body: JSON.stringify({
-			...prompt,
-			command: command
-		})
+		body: JSON.stringify(prompt)
 	})
 		.then(async (res) => {
 			if (!res.ok) throw await res.json();
@@ -243,12 +240,12 @@ export const updatePromptByCommand = async (token: string, prompt: PromptItem) =
 
 export const setProductionPromptVersion = async (
 	token: string,
-	command: string,
+	promptId: string,
 	version_id: string
 ) => {
 	let error = null;
 
-	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}/set/version`, {
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/set/version`, {
 		method: 'POST',
 		headers: {
 			Accept: 'application/json',
@@ -276,12 +273,10 @@ export const setProductionPromptVersion = async (
 	return res;
 };
 
-export const deletePromptByCommand = async (token: string, command: string) => {
+export const deletePromptById = async (token: string, promptId: string) => {
 	let error = null;
 
-	command = command.charAt(0) === '/' ? command.slice(1) : command;
-
-	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}/delete`, {
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/delete`, {
 		method: 'DELETE',
 		headers: {
 			Accept: 'application/json',
@@ -316,16 +311,14 @@ export const deletePromptByCommand = async (token: string, command: string) => {
 
 export const getPromptHistory = async (
 	token: string,
-	command: string,
+	promptId: string,
 	limit: number = 50,
 	offset: number = 0
 ): Promise<PromptHistoryItem[]> => {
 	let error = null;
 
-	command = command.charAt(0) === '/' ? command.slice(1) : command;
-
 	const res = await fetch(
-		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history?limit=${limit}&offset=${offset}`,
+		`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/history?limit=${limit}&offset=${offset}`,
 		{
 			method: 'GET',
 			headers: {
@@ -354,15 +347,13 @@ export const getPromptHistory = async (
 
 export const deletePromptHistoryVersion = async (
 	token: string,
-	command: string,
+	promptId: string,
 	historyId: string
 ): Promise<boolean> => {
 	let error = null;
 
-	command = command.charAt(0) === '/' ? command.slice(1) : command;
-
 	const res = await fetch(
-		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/${historyId}`,
+		`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/history/${historyId}`,
 		{
 			method: 'DELETE',
 			headers: {
@@ -391,15 +382,13 @@ export const deletePromptHistoryVersion = async (
 
 export const getPromptHistoryEntry = async (
 	token: string,
-	command: string,
+	promptId: string,
 	historyId: string
 ): Promise<PromptHistoryItem> => {
 	let error = null;
 
-	command = command.charAt(0) === '/' ? command.slice(1) : command;
-
 	const res = await fetch(
-		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/${historyId}`,
+		`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/history/${historyId}`,
 		{
 			method: 'GET',
 			headers: {
@@ -428,16 +417,14 @@ export const getPromptHistoryEntry = async (
 
 export const restorePromptFromHistory = async (
 	token: string,
-	command: string,
+	promptId: string,
 	historyId: string,
 	commitMessage?: string
 ) => {
 	let error = null;
 
-	command = command.charAt(0) === '/' ? command.slice(1) : command;
-
 	const res = await fetch(
-		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/${historyId}/restore`,
+		`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/history/${historyId}/restore`,
 		{
 			method: 'POST',
 			headers: {
@@ -469,16 +456,14 @@ export const restorePromptFromHistory = async (
 
 export const getPromptDiff = async (
 	token: string,
-	command: string,
+	promptId: string,
 	fromId: string,
 	toId: string
 ): Promise<PromptDiff> => {
 	let error = null;
 
-	command = command.charAt(0) === '/' ? command.slice(1) : command;
-
 	const res = await fetch(
-		`${WEBUI_API_BASE_URL}/prompts/command/${command}/history/diff?from_id=${fromId}&to_id=${toId}`,
+		`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/history/diff?from_id=${fromId}&to_id=${toId}`,
 		{
 			method: 'GET',
 			headers: {
@@ -505,4 +490,3 @@ export const getPromptDiff = async (
 	return res;
 };
 
-
diff --git a/src/lib/components/workspace/Prompts.svelte b/src/lib/components/workspace/Prompts.svelte
index 495a741f0..585b12cb4 100644
--- a/src/lib/components/workspace/Prompts.svelte
+++ b/src/lib/components/workspace/Prompts.svelte
@@ -9,7 +9,7 @@
 
 	import {
 		createNewPrompt,
-		deletePromptByCommand,
+		deletePromptById,
 		getPrompts,
 		getPromptList
 	} from '$lib/apis/prompts';
@@ -121,7 +121,7 @@
 	const deleteHandler = async (prompt) => {
 		const command = prompt.command;
 
-		const res = await deletePromptByCommand(localStorage.token, command).catch((err) => {
+		const res = await deletePromptById(localStorage.token, prompt.id).catch((err) => {
 			toast.error(err);
 			return null;
 		});
diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index dbc3997d8..732825524 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -13,7 +13,6 @@
 	import XMark from '$lib/components/icons/XMark.svelte';
 	import {
 		getPromptHistory,
-		updatePromptByCommand,
 		setProductionPromptVersion,
 		deletePromptHistoryVersion
 	} from '$lib/apis/prompts';
@@ -66,6 +65,7 @@
 
 		if (validateCommandString(command)) {
 			await onSubmit({
+				id: prompt?.id,
 				name,
 				command,
 				content,
@@ -95,7 +95,7 @@
 		if (!prompt?.command || !edit) return;
 		historyLoading = true;
 		try {
-			history = await getPromptHistory(localStorage.token, prompt.command);
+			history = await getPromptHistory(localStorage.token, prompt.id);
 		} catch (error) {
 			console.error('Failed to load history:', error);
 			history = [];
@@ -110,7 +110,7 @@
 		}
 
 		try {
-			await setProductionPromptVersion(localStorage.token, prompt.command, historyEntry.id);
+			await setProductionPromptVersion(localStorage.token, prompt.id, historyEntry.id);
 			// Update local prompt object to trigger reactivity
 			prompt = { ...prompt, version_id: historyEntry.id };
 			toast.success($i18n.t('Production version updated'));
@@ -123,7 +123,7 @@
 		if (disabled) return;
 
 		try {
-			await deletePromptHistoryVersion(localStorage.token, prompt.command, historyId);
+			await deletePromptHistoryVersion(localStorage.token, prompt.id, historyId);
 			toast.success($i18n.t('Version deleted'));
 			// Reload history
 			await loadHistory();
diff --git a/src/routes/(app)/workspace/prompts/[id]/+page.svelte b/src/routes/(app)/workspace/prompts/[id]/+page.svelte
index 2d989be49..5e75b0099 100644
--- a/src/routes/(app)/workspace/prompts/[id]/+page.svelte
+++ b/src/routes/(app)/workspace/prompts/[id]/+page.svelte
@@ -6,7 +6,7 @@
 
 	const i18n = getContext('i18n');
 
-	import { getPromptById, getPrompts, updatePromptByCommand } from '$lib/apis/prompts';
+	import { getPromptById, getPrompts, updatePromptById } from '$lib/apis/prompts';
 	import { page } from '$app/stores';
 
 	import PromptEditor from '$lib/components/workspace/Prompts/PromptEditor.svelte';
@@ -19,7 +19,7 @@
 
 	const onSubmit = async (_prompt) => {
 		console.log(_prompt);
-		const updatedPrompt = await updatePromptByCommand(localStorage.token, _prompt).catch((error) => {
+		const updatedPrompt = await updatePromptById(localStorage.token, _prompt).catch((error) => {
 			toast.error(`${error}`);
 			return null;
 		});

From 5510fa178ef28cf1a3a861c31d7d61c2ad47a729 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 03:10:29 +0400
Subject: [PATCH 09/18] refac

---
 src/lib/components/workspace/Prompts/PromptEditor.svelte | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 732825524..485efa536 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -77,6 +77,10 @@
 			commitMessage = '';
 			isProduction = true;
 			await loadHistory();
+			// Select the newest version after saving
+			if (history.length > 0) {
+				selectedHistoryEntry = history[0];
+			}
 		} else {
 			toast.error(
 				$i18n.t('Only alphanumeric characters and hyphens are allowed in the command string.')

From 8bf46dcc5d1b025c8780f11ce7506c0d21f3c024 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 03:16:34 +0400
Subject: [PATCH 10/18] refac

---
 .../workspace/Prompts/PromptEditor.svelte     | 88 ++++++++++++++-----
 1 file changed, 66 insertions(+), 22 deletions(-)

diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 485efa536..fb774e778 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -47,6 +47,9 @@
 	let history: any[] = [];
 	let historyLoading = false;
 	let selectedHistoryEntry: any = null;
+	let historyOffset = 0;
+	let historyHasMore = true;
+	const HISTORY_PAGE_SIZE = 20;
 
 	$: if (!edit && !hasManualEdit) {
 		command = name !== '' ? slugify(name) : '';
@@ -76,7 +79,7 @@
 			showEditModal = false;
 			commitMessage = '';
 			isProduction = true;
-			await loadHistory();
+			await loadHistory(true); // Reset and reload
 			// Select the newest version after saving
 			if (history.length > 0) {
 				selectedHistoryEntry = history[0];
@@ -95,18 +98,51 @@
 		return regex.test(inputString);
 	};
 
-	const loadHistory = async () => {
-		if (!prompt?.command || !edit) return;
+	const loadHistory = async (reset = false) => {
+		if (!prompt?.id || !edit) return;
+		if (historyLoading) return;
+		if (!reset && !historyHasMore) return;
+
 		historyLoading = true;
+
+		if (reset) {
+			historyOffset = 0;
+			historyHasMore = true;
+		}
+
 		try {
-			history = await getPromptHistory(localStorage.token, prompt.id);
+			const newEntries = await getPromptHistory(
+				localStorage.token,
+				prompt.id,
+				HISTORY_PAGE_SIZE,
+				historyOffset
+			);
+
+			if (reset) {
+				history = newEntries;
+			} else {
+				history = [...history, ...newEntries];
+			}
+
+			historyHasMore = newEntries.length === HISTORY_PAGE_SIZE;
+			historyOffset += newEntries.length;
 		} catch (error) {
 			console.error('Failed to load history:', error);
-			history = [];
+			if (reset) {
+				history = [];
+			}
 		}
 		historyLoading = false;
 	};
 
+	const handleHistoryScroll = (e: Event) => {
+		const target = e.target as HTMLElement;
+		const nearBottom = target.scrollHeight - target.scrollTop <= target.clientHeight + 50;
+		if (nearBottom && historyHasMore && !historyLoading) {
+			loadHistory(false);
+		}
+	};
+
 	const setAsProduction = async (historyEntry: any) => {
 		if (disabled) {
 			toast.error($i18n.t('You do not have permission to edit this prompt.'));
@@ -224,23 +260,25 @@
 						bind:checked={isProduction}
 						class="w-4 h-4 rounded border-gray-300 dark:border-gray-600"
 					/>
-					<span class="text-sm text-gray-700 dark:text-gray-300">{$i18n.t('Set as Production')}</span>
+					<span class="text-sm text-gray-700 dark:text-gray-300"
+						>{$i18n.t('Set as Production')}</span
+					>
 				</label>
 				<div>
-				<button
-					class="text-sm px-4 py-2 transition rounded-full {loading
-						? 'cursor-not-allowed bg-gray-200 text-gray-500 dark:bg-gray-700 dark:text-gray-400'
-						: 'bg-black hover:bg-gray-900 text-white dark:bg-white dark:hover:bg-gray-100 dark:text-black'} flex justify-center"
-					type="submit"
-					disabled={loading}
-				>
-					<div class="font-medium">{$i18n.t('Save')}</div>
-					{#if loading}
-						<div class="ml-1.5">
-							<Spinner />
-						</div>
-					{/if}
-				</button>
+					<button
+						class="text-sm px-4 py-2 transition rounded-full {loading
+							? 'cursor-not-allowed bg-gray-200 text-gray-500 dark:bg-gray-700 dark:text-gray-400'
+							: 'bg-black hover:bg-gray-900 text-white dark:bg-white dark:hover:bg-gray-100 dark:text-black'} flex justify-center"
+						type="submit"
+						disabled={loading}
+					>
+						<div class="font-medium">{$i18n.t('Save')}</div>
+						{#if loading}
+							<div class="ml-1.5">
+								<Spinner />
+							</div>
+						{/if}
+					</button>
 				</div>
 			</div>
 		</form>
@@ -281,7 +319,7 @@
 				</div>
 			</div>
 
-			<div class="flex flex-col lg:flex-row gap-6">
+			<div class="flex flex-col lg:flex-row gap-4">
 				<!-- Desktop History Sidebar -->
 				<div class="hidden lg:block w-72 shrink-0 mt-1 mb-2">
 					<div class="sticky">
@@ -430,7 +468,7 @@
 		</div>
 
 		{#if history.length > 0}
-			<div class="space-y-0">
+			<div class="space-y-0 max-h-96 overflow-y-auto" on:scroll={handleHistoryScroll}>
 				{#each history as entry, index}
 					<div class="flex">
 						<!-- Content -->
@@ -468,6 +506,12 @@
 						</button>
 					</div>
 				{/each}
+
+				{#if historyHasMore && historyLoading}
+					<div class="flex justify-center py-2">
+						<Spinner className="size-3" />
+					</div>
+				{/if}
 			</div>
 		{:else if !historyLoading}
 			<div class="text-xs text-gray-400 text-center py-6 italic">

From 6c76983999de2dea2746584b66b5831d9b24ddbd Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 03:21:47 +0400
Subject: [PATCH 11/18] refac

---
 .../workspace/Prompts/PromptEditor.svelte     | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index fb774e778..a870f31b0 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -5,9 +5,11 @@
 	import { toast } from 'svelte-sonner';
 	import Tooltip from '$lib/components/common/Tooltip.svelte';
 	import LockClosed from '$lib/components/icons/LockClosed.svelte';
+	import Clipboard from '$lib/components/icons/Clipboard.svelte';
+	import Check from '$lib/components/icons/Check.svelte';
 	import AccessControlModal from '../common/AccessControlModal.svelte';
 	import { user } from '$lib/stores';
-	import { slugify, formatDate } from '$lib/utils';
+	import { slugify, formatDate, copyToClipboard } from '$lib/utils';
 	import Spinner from '$lib/components/common/Spinner.svelte';
 	import Modal from '$lib/components/common/Modal.svelte';
 	import XMark from '$lib/components/icons/XMark.svelte';
@@ -49,6 +51,7 @@
 	let selectedHistoryEntry: any = null;
 	let historyOffset = 0;
 	let historyHasMore = true;
+	let contentCopied = false;
 	const HISTORY_PAGE_SIZE = 20;
 
 	$: if (!edit && !hasManualEdit) {
@@ -143,6 +146,17 @@
 		}
 	};
 
+	const copyContent = async () => {
+		const textToCopy = selectedHistoryEntry?.snapshot?.content || content;
+		const success = await copyToClipboard(textToCopy);
+		if (success) {
+			contentCopied = true;
+			setTimeout(() => {
+				contentCopied = false;
+			}, 2000);
+		}
+	};
+
 	const setAsProduction = async (historyEntry: any) => {
 		if (disabled) {
 			toast.error($i18n.t('You do not have permission to edit this prompt.'));
@@ -364,9 +378,19 @@
 						{/if}
 					</div>
 					<div
-						class="bg-gray-50 dark:bg-gray-900 rounded-xl px-4 py-3 border border-gray-100 dark:border-gray-800"
+						class="relative bg-gray-50 dark:bg-gray-900 rounded-xl px-4 py-3 border border-gray-100 dark:border-gray-800"
 					>
-						<pre class="text-sm whitespace-pre-wrap font-mono">{selectedHistoryEntry?.snapshot
+						<button
+							class="absolute top-2 right-2 p-1.5 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-800 transition"
+							on:click={copyContent}
+						>
+							{#if contentCopied}
+								<Check className="size-4 text-green-500" />
+							{:else}
+								<Clipboard className="size-4 text-gray-500" />
+							{/if}
+						</button>
+						<pre class="text-sm whitespace-pre-wrap font-mono pr-8">{selectedHistoryEntry?.snapshot
 								?.content || content}</pre>
 					</div>
 				</div>

From b7e9992d78b4e744e6262f5e22cb7e4d60a1a53b Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 03:25:29 +0400
Subject: [PATCH 12/18] refac

---
 backend/open_webui/routers/prompts.py            |  7 ++++---
 src/lib/apis/prompts/index.ts                    |  5 ++---
 .../workspace/Prompts/PromptEditor.svelte        | 16 +++++-----------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/backend/open_webui/routers/prompts.py b/backend/open_webui/routers/prompts.py
index 6047ba0d8..263bf7617 100644
--- a/backend/open_webui/routers/prompts.py
+++ b/backend/open_webui/routers/prompts.py
@@ -297,12 +297,13 @@ async def delete_prompt_by_id(
 @router.get("/id/{prompt_id}/history", response_model=list[PromptHistoryResponse])
 async def get_prompt_history(
     prompt_id: str,
-    limit: int = 50,
-    offset: int = 0,
+    page: int = 0,
     user=Depends(get_verified_user),
     db: Session = Depends(get_session),
 ):
     """Get version history for a prompt."""
+    PAGE_SIZE = 20
+    
     prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
 
     if not prompt:
@@ -323,7 +324,7 @@ async def get_prompt_history(
         )
 
     history = PromptHistories.get_history_by_prompt_id(
-        prompt.id, limit=limit, offset=offset, db=db
+        prompt.id, limit=PAGE_SIZE, offset=page * PAGE_SIZE, db=db
     )
     return history
 
diff --git a/src/lib/apis/prompts/index.ts b/src/lib/apis/prompts/index.ts
index d058b677c..b17079085 100644
--- a/src/lib/apis/prompts/index.ts
+++ b/src/lib/apis/prompts/index.ts
@@ -312,13 +312,12 @@ export const deletePromptById = async (token: string, promptId: string) => {
 export const getPromptHistory = async (
 	token: string,
 	promptId: string,
-	limit: number = 50,
-	offset: number = 0
+	page: number = 0
 ): Promise<PromptHistoryItem[]> => {
 	let error = null;
 
 	const res = await fetch(
-		`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/history?limit=${limit}&offset=${offset}`,
+		`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/history?page=${page}`,
 		{
 			method: 'GET',
 			headers: {
diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index a870f31b0..5bfbd50a1 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -49,10 +49,9 @@
 	let history: any[] = [];
 	let historyLoading = false;
 	let selectedHistoryEntry: any = null;
-	let historyOffset = 0;
+	let historyPage = 0;
 	let historyHasMore = true;
 	let contentCopied = false;
-	const HISTORY_PAGE_SIZE = 20;
 
 	$: if (!edit && !hasManualEdit) {
 		command = name !== '' ? slugify(name) : '';
@@ -109,17 +108,12 @@
 		historyLoading = true;
 
 		if (reset) {
-			historyOffset = 0;
+			historyPage = 0;
 			historyHasMore = true;
 		}
 
 		try {
-			const newEntries = await getPromptHistory(
-				localStorage.token,
-				prompt.id,
-				HISTORY_PAGE_SIZE,
-				historyOffset
-			);
+			const newEntries = await getPromptHistory(localStorage.token, prompt.id, historyPage);
 
 			if (reset) {
 				history = newEntries;
@@ -127,8 +121,8 @@
 				history = [...history, ...newEntries];
 			}
 
-			historyHasMore = newEntries.length === HISTORY_PAGE_SIZE;
-			historyOffset += newEntries.length;
+			historyHasMore = newEntries.length > 0;
+			historyPage = historyPage + 1;
 		} catch (error) {
 			console.error('Failed to load history:', error);
 			if (reset) {

From 32810b41528d55307c7edf5b91a6821eccb863e8 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 04:13:19 +0400
Subject: [PATCH 13/18] refac

---
 backend/open_webui/models/prompts.py          |  25 ++
 backend/open_webui/routers/prompts.py         |  69 +++++-
 src/lib/apis/prompts/index.ts                 |  36 ++-
 .../workspace/Prompts/PromptEditor.svelte     | 225 +++++++++++-------
 4 files changed, 270 insertions(+), 85 deletions(-)

diff --git a/backend/open_webui/models/prompts.py b/backend/open_webui/models/prompts.py
index 537d328c3..2d79cf13f 100644
--- a/backend/open_webui/models/prompts.py
+++ b/backend/open_webui/models/prompts.py
@@ -307,12 +307,14 @@ class PromptsTable:
                 # Check if content changed to decide on history creation
                 content_changed = (
                     prompt.name != form_data.name
+                    or prompt.command != form_data.command
                     or prompt.content != form_data.content
                     or prompt.access_control != form_data.access_control
                 )
 
                 # Update prompt fields
                 prompt.name = form_data.name
+                prompt.command = form_data.command
                 prompt.content = form_data.content
                 prompt.data = form_data.data or prompt.data
                 prompt.meta = form_data.meta or prompt.meta
@@ -350,6 +352,29 @@ class PromptsTable:
         except Exception:
             return None
 
+    def update_prompt_metadata(
+        self,
+        prompt_id: str,
+        name: str,
+        command: str,
+        db: Optional[Session] = None,
+    ) -> Optional[PromptModel]:
+        """Update only name and command (no history created)."""
+        try:
+            with get_db_context(db) as db:
+                prompt = db.query(Prompt).filter_by(id=prompt_id).first()
+                if not prompt:
+                    return None
+                
+                prompt.name = name
+                prompt.command = command
+                prompt.updated_at = int(time.time())
+                db.commit()
+                
+                return PromptModel.model_validate(prompt)
+        except Exception:
+            return None
+
     def update_prompt_version(
         self,
         prompt_id: str,
diff --git a/backend/open_webui/routers/prompts.py b/backend/open_webui/routers/prompts.py
index 263bf7617..639658c59 100644
--- a/backend/open_webui/routers/prompts.py
+++ b/backend/open_webui/routers/prompts.py
@@ -25,6 +25,12 @@ from pydantic import BaseModel
 class PromptVersionUpdateForm(BaseModel):
     version_id: str
 
+
+class PromptMetadataForm(BaseModel):
+    name: str
+    command: str
+
+
 router = APIRouter()
 
 
@@ -209,6 +215,15 @@ async def update_prompt_by_id(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
+    # Check for command collision if command is being changed
+    if form_data.command != prompt.command:
+        existing_prompt = Prompts.get_prompt_by_command(form_data.command, db=db)
+        if existing_prompt and existing_prompt.id != prompt.id:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Command '/{form_data.command}' is already in use by another prompt",
+            )
+
     # Use the ID from the found prompt
     updated_prompt = Prompts.update_prompt_by_id(
         prompt.id, form_data, user.id, db=db
@@ -222,7 +237,59 @@ async def update_prompt_by_id(
         )
 
 
-@router.post("/id/{prompt_id}/set/version", response_model=Optional[PromptModel])
+############################
+# UpdatePromptMetadata
+############################
+
+
+@router.post("/id/{prompt_id}/update/meta", response_model=Optional[PromptModel])
+async def update_prompt_metadata(
+    prompt_id: str,
+    form_data: PromptMetadataForm,
+    user=Depends(get_verified_user),
+    db: Session = Depends(get_session),
+):
+    """Update prompt name and command only (no history created)."""
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
+
+    if not prompt:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    if (
+        prompt.user_id != user.id
+        and not has_access(user.id, "write", prompt.access_control, db=db)
+        and user.role != "admin"
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+        )
+
+    # Check for command collision if command is being changed
+    if form_data.command != prompt.command:
+        existing_prompt = Prompts.get_prompt_by_command(form_data.command, db=db)
+        if existing_prompt and existing_prompt.id != prompt.id:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Command '/{form_data.command}' is already in use",
+            )
+
+    updated_prompt = Prompts.update_prompt_metadata(
+        prompt.id, form_data.name, form_data.command, db=db
+    )
+    if updated_prompt:
+        return updated_prompt
+    else:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=ERROR_MESSAGES.DEFAULT(),
+        )
+
+
+@router.post("/id/{prompt_id}/update/version", response_model=Optional[PromptModel])
 async def set_prompt_version(
     prompt_id: str,
     form_data: PromptVersionUpdateForm,
diff --git a/src/lib/apis/prompts/index.ts b/src/lib/apis/prompts/index.ts
index b17079085..791a98bb4 100644
--- a/src/lib/apis/prompts/index.ts
+++ b/src/lib/apis/prompts/index.ts
@@ -238,6 +238,40 @@ export const updatePromptById = async (token: string, prompt: PromptItem) => {
 	return res;
 };
 
+export const updatePromptMetadata = async (
+	token: string,
+	promptId: string,
+	name: string,
+	command: string
+) => {
+	let error = null;
+
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/update/meta`, {
+		method: 'POST',
+		headers: {
+			Accept: 'application/json',
+			'Content-Type': 'application/json',
+			authorization: `Bearer ${token}`
+		},
+		body: JSON.stringify({ name, command })
+	})
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			error = err.detail;
+			console.error(err);
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
 export const setProductionPromptVersion = async (
 	token: string,
 	promptId: string,
@@ -245,7 +279,7 @@ export const setProductionPromptVersion = async (
 ) => {
 	let error = null;
 
-	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/set/version`, {
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/id/${promptId}/update/version`, {
 		method: 'POST',
 		headers: {
 			Accept: 'application/json',
diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 5bfbd50a1..f2e9cdbf1 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -16,7 +16,8 @@
 	import {
 		getPromptHistory,
 		setProductionPromptVersion,
-		deletePromptHistoryVersion
+		deletePromptHistoryVersion,
+		updatePromptMetadata
 	} from '$lib/apis/prompts';
 	import dayjs from 'dayjs';
 	import localizedFormat from 'dayjs/plugin/localizedFormat';
@@ -53,6 +54,11 @@
 	let historyHasMore = true;
 	let contentCopied = false;
 
+	// For debounced auto-save of name/command
+	let originalName = '';
+	let originalCommand = '';
+	let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+
 	$: if (!edit && !hasManualEdit) {
 		command = name !== '' ? slugify(name) : '';
 	}
@@ -191,6 +197,41 @@
 			LOCALIZED_DATE: dayjs(dateVal).format('L')
 		});
 	};
+
+	const debouncedSaveMetadata = () => {
+		if (disabled || !edit) return;
+
+		if (debounceTimer) {
+			clearTimeout(debounceTimer);
+		}
+
+		debounceTimer = setTimeout(async () => {
+			// Skip if nothing changed
+			if (name === originalName && command === originalCommand) return;
+
+			if (!validateCommandString(command)) {
+				toast.error(
+					$i18n.t('Only alphanumeric characters and hyphens are allowed in the command string.')
+				);
+				command = originalCommand;
+				return;
+			}
+
+			try {
+				await updatePromptMetadata(localStorage.token, prompt?.id, name, command);
+				// Update originals on success
+				originalName = name;
+				originalCommand = command;
+				toast.success($i18n.t('Saved'));
+			} catch (error) {
+				toast.error(`${error}`);
+				// Revert on error (collision)
+				name = originalName;
+				command = originalCommand;
+			}
+		}, 500);
+	};
+
 	onMount(async () => {
 		if (prompt) {
 			name = prompt.name || '';
@@ -199,6 +240,10 @@
 			content = prompt.content;
 			accessControl = prompt?.access_control === undefined ? {} : prompt?.access_control;
 
+			// Store originals for revert on collision
+			originalName = name;
+			originalCommand = command;
+
 			if (edit) {
 				await loadHistory();
 				// Auto-select production version
@@ -295,87 +340,101 @@
 
 {#if edit}
 	<!-- Edit mode: Read-only view with history -->
-	<div class="w-full max-h-full">
-		<!-- Main Content -->
-		<div class="flex-1 min-w-0">
-			<!-- Header -->
-			<div class="flex items-start justify-between gap-4 mb-2">
-				<div class="min-w-0">
-					<h1 class="text-2xl font-medium truncate">{name}</h1>
-					<div class="text-sm text-gray-500 mt-0.5">/{command}</div>
+	<div class="flex flex-col w-full h-full max-h-[100dvh]">
+		<!-- Header -->
+		<div class="flex items-start justify-between gap-4 mb-2 shrink-0">
+			<div class="min-w-0 flex-1">
+				<input
+					class="text-2xl font-medium w-full bg-transparent outline-hidden"
+					placeholder={$i18n.t('Prompt Name')}
+					bind:value={name}
+					on:input={debouncedSaveMetadata}
+					{disabled}
+				/>
+				<div class="flex items-center gap-0.5 text-sm text-gray-500 mt-0.5">
+					<span>/</span>
+					<input
+						class="bg-transparent outline-hidden"
+						placeholder={$i18n.t('command')}
+						bind:value={command}
+						on:input={debouncedSaveMetadata}
+						{disabled}
+					/>
 				</div>
-				<div class="flex items-center gap-2 shrink-0">
-					{#if !disabled}
-						<button
-							class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2.5 py-1.5 rounded-full flex gap-1.5 items-center text-sm border border-gray-100 dark:border-gray-800"
-							on:click={() => (showAccessControlModal = true)}
-						>
-							<LockClosed strokeWidth="2.5" className="size-3.5" />
-							{$i18n.t('Access')}
-						</button>
-						<button
-							class="px-4 py-1.5 text-sm font-medium bg-black text-white dark:bg-white dark:text-black rounded-full hover:opacity-90 transition shadow-xs"
-							on:click={() => (showEditModal = true)}
-						>
-							{$i18n.t('Edit')}
-						</button>
-					{:else}
-						<span class="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded-full"
-							>{$i18n.t('Read Only')}</span
-						>
-					{/if}
+			</div>
+			<div class="flex items-center gap-2 shrink-0">
+				{#if !disabled}
+					<button
+						class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2.5 py-1 rounded-full flex gap-1.5 items-center text-sm border border-gray-100 dark:border-gray-800"
+						on:click={() => (showAccessControlModal = true)}
+					>
+						<LockClosed strokeWidth="2.5" className="size-3.5" />
+						{$i18n.t('Access')}
+					</button>
+					<button
+						class="px-4 py-1 text-sm font-medium bg-black text-white dark:bg-white dark:text-black rounded-full hover:opacity-90 transition shadow-xs"
+						on:click={() => (showEditModal = true)}
+					>
+						{$i18n.t('Edit')}
+					</button>
+				{:else}
+					<span class="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded-full"
+						>{$i18n.t('Read Only')}</span
+					>
+				{/if}
+			</div>
+		</div>
+
+		<div class="flex flex-col md:flex-row gap-4 flex-1 overflow-hidden pb-6">
+			<!-- Desktop History Sidebar -->
+			<div class="hidden md:flex md:flex-col w-72 shrink-0 overflow-hidden">
+				<div class="flex-1 overflow-y-auto">
+					{@render historySection()}
 				</div>
 			</div>
 
-			<div class="flex flex-col lg:flex-row gap-4">
-				<!-- Desktop History Sidebar -->
-				<div class="hidden lg:block w-72 shrink-0 mt-1 mb-2">
-					<div class="sticky">
-						{@render historySection()}
-					</div>
-				</div>
-
-				<!-- Prompt Content -->
-				<div class="mb-6 flex-1">
-					<div class="flex items-center justify-between mb-1">
-						<div class="flex items-center gap-2">
-							<div class="text-gray-500 text-xs">
-								{$i18n.t('Prompt Content')}
-							</div>
-							{#if selectedHistoryEntry}
-								<span
-									class="text-xs text-gray-500 font-mono bg-gray-100 dark:bg-gray-800 px-1.5 py-0.5 rounded"
-								>
-									{selectedHistoryEntry.id.slice(0, 7)}
-								</span>
-							{/if}
+			<!-- Prompt Content -->
+			<div class="flex-1 flex flex-col min-h-0 overflow-hidden">
+				<div class="flex items-center justify-between mb-1 shrink-0">
+					<div class="flex items-center gap-2">
+						<div class="text-gray-500 text-xs">
+							{$i18n.t('Prompt Content')}
 						</div>
-
-						{#if selectedHistoryEntry && !disabled}
-							<div class="flex items-center gap-2">
-								{#if selectedHistoryEntry.id === prompt?.version_id}
-									<Badge type="success" content={$i18n.t('Live')} />
-								{:else}
-									<button
-										class="text-xs text-gray-500 hover:text-gray-900 dark:hover:text-gray-300 hover:underline transition"
-										on:click={() => setAsProduction(selectedHistoryEntry)}
-									>
-										{$i18n.t('Set as Production')}
-									</button>
-								{/if}
-								<PromptHistoryMenu
-									isProduction={selectedHistoryEntry.id === prompt?.version_id}
-									onDelete={() => handleDeleteHistory(selectedHistoryEntry.id)}
-									onClose={() => {}}
-								/>
-							</div>
+						{#if selectedHistoryEntry}
+							<span
+								class="text-xs text-gray-500 font-mono bg-gray-100 dark:bg-gray-800 px-1.5 py-0.5 rounded"
+							>
+								{selectedHistoryEntry.id.slice(0, 7)}
+							</span>
 						{/if}
 					</div>
-					<div
-						class="relative bg-gray-50 dark:bg-gray-900 rounded-xl px-4 py-3 border border-gray-100 dark:border-gray-800"
-					>
+
+					{#if selectedHistoryEntry && !disabled}
+						<div class="flex items-center gap-2">
+							{#if selectedHistoryEntry.id === prompt?.version_id}
+								<Badge type="success" content={$i18n.t('Live')} />
+							{:else}
+								<button
+									class="text-xs text-gray-500 hover:text-gray-900 dark:hover:text-gray-300 hover:underline transition"
+									on:click={() => setAsProduction(selectedHistoryEntry)}
+								>
+									{$i18n.t('Set as Production')}
+								</button>
+							{/if}
+							<PromptHistoryMenu
+								isProduction={selectedHistoryEntry.id === prompt?.version_id}
+								onDelete={() => handleDeleteHistory(selectedHistoryEntry.id)}
+								onClose={() => {}}
+							/>
+						</div>
+					{/if}
+				</div>
+				<!-- Content container with copy button -->
+				<div class="relative flex-1 min-h-0">
+					<!-- Copy button - outside scroll area -->
+					<div class="absolute top-2 right-2 z-10">
 						<button
-							class="absolute top-2 right-2 p-1.5 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-800 transition"
+							class="p-1.5 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800 transition"
 							on:click={copyContent}
 						>
 							{#if contentCopied}
@@ -384,15 +443,15 @@
 								<Clipboard className="size-4 text-gray-500" />
 							{/if}
 						</button>
+					</div>
+					<!-- Scrollable content -->
+					<div
+						class="bg-gray-50 dark:bg-gray-900 rounded-xl px-4 py-3 border border-gray-100 dark:border-gray-800 h-full overflow-y-auto"
+					>
 						<pre class="text-sm whitespace-pre-wrap font-mono pr-8">{selectedHistoryEntry?.snapshot
 								?.content || content}</pre>
 					</div>
 				</div>
-
-				<!-- Mobile History -->
-				<div class="lg:hidden pb-20">
-					{@render historySection()}
-				</div>
 			</div>
 		</div>
 	</div>
@@ -477,8 +536,8 @@
 {/if}
 
 {#snippet historySection()}
-	<div>
-		<div class="flex items-center justify-between mb-2">
+	<div class="flex flex-col h-full">
+		<div class="flex items-center justify-between mb-2 shrink-0">
 			<div class="text-gray-500 text-xs">{$i18n.t('History')}</div>
 			{#if historyLoading}
 				<Spinner className="size-3" />
@@ -486,7 +545,7 @@
 		</div>
 
 		{#if history.length > 0}
-			<div class="space-y-0 max-h-96 overflow-y-auto" on:scroll={handleHistoryScroll}>
+			<div class="space-y-0 flex-1 overflow-y-auto" on:scroll={handleHistoryScroll}>
 				{#each history as entry, index}
 					<div class="flex">
 						<!-- Content -->
@@ -513,7 +572,7 @@
 									<img
 										src={`/api/v1/users/${entry.user.id}/profile/image`}
 										alt={entry.user.name}
-										class="size-3 rounded-full"
+										class="size-3 rounded-full mr-0.5"
 										on:error={(e) => (e.target.src = '/user.png')}
 									/>
 									<span class="truncate">{entry.user.name}</span>

From b1d5b3b28e4ca3f0165590cd264fb1a2cea54f34 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 04:17:11 +0400
Subject: [PATCH 14/18] refac

---
 src/lib/components/workspace/Prompts/PromptEditor.svelte | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index f2e9cdbf1..3c735ac1e 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -539,9 +539,6 @@
 	<div class="flex flex-col h-full">
 		<div class="flex items-center justify-between mb-2 shrink-0">
 			<div class="text-gray-500 text-xs">{$i18n.t('History')}</div>
-			{#if historyLoading}
-				<Spinner className="size-3" />
-			{/if}
 		</div>
 
 		{#if history.length > 0}
@@ -550,7 +547,7 @@
 					<div class="flex">
 						<!-- Content -->
 						<button
-							class="flex-1 text-left px-3.5 py-2 mb-1 rounded-2xl transition group
+							class="flex-1 text-left px-3.5 py-2 mb-1 rounded-xl transition group
 								{selectedHistoryEntry?.id === entry.id
 								? 'bg-gray-50 dark:bg-gray-850'
 								: 'hover:bg-gray-50 dark:hover:bg-gray-850'}"
@@ -584,7 +581,7 @@
 					</div>
 				{/each}
 
-				{#if historyHasMore && historyLoading}
+				{#if historyLoading}
 					<div class="flex justify-center py-2">
 						<Spinner className="size-3" />
 					</div>

From 1f205a84413664946b506693f735357f2e72c7e6 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 04:19:51 +0400
Subject: [PATCH 15/18] refac

---
 src/lib/components/workspace/Prompts/PromptEditor.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 3c735ac1e..09bf91af2 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -179,8 +179,8 @@
 		try {
 			await deletePromptHistoryVersion(localStorage.token, prompt.id, historyId);
 			toast.success($i18n.t('Version deleted'));
-			// Reload history
-			await loadHistory();
+			// Reload history from scratch
+			await loadHistory(true);
 			// Reset selection if deleted entry was selected
 			if (selectedHistoryEntry?.id === historyId) {
 				selectedHistoryEntry = history.length > 0 ? history[0] : null;

From f199c486a2ed133341533ee24ad1adbf2db58d66 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 24 Jan 2026 04:29:56 +0400
Subject: [PATCH 16/18] refac

---
 src/lib/components/workspace/Prompts.svelte | 24 ++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/lib/components/workspace/Prompts.svelte b/src/lib/components/workspace/Prompts.svelte
index 585b12cb4..7c8e20183 100644
--- a/src/lib/components/workspace/Prompts.svelte
+++ b/src/lib/components/workspace/Prompts.svelte
@@ -7,12 +7,7 @@
 	import { onMount, getContext, tick } from 'svelte';
 	import { WEBUI_NAME, config, prompts as _prompts, user } from '$lib/stores';
 
-	import {
-		createNewPrompt,
-		deletePromptById,
-		getPrompts,
-		getPromptList
-	} from '$lib/apis/prompts';
+	import { createNewPrompt, deletePromptById, getPrompts, getPromptList } from '$lib/apis/prompts';
 	import { capitalizeFirstLetter, slugify, copyToClipboard } from '$lib/utils';
 
 	import PromptMenu from './Prompts/PromptMenu.svelte';
@@ -29,7 +24,6 @@
 	import GarbageBin from '../icons/GarbageBin.svelte';
 	import ViewSelector from './common/ViewSelector.svelte';
 	import Badge from '$lib/components/common/Badge.svelte';
-
 	let shiftKey = false;
 
 	const i18n = getContext('i18n');
@@ -341,11 +335,11 @@
 						href={`/workspace/prompts/${prompt.id}`}
 					>
 						<div class=" flex flex-col flex-1 space-x-4 cursor-pointer w-full pl-1">
-							<div class="flex items-center justify-between w-full">
+							<div class="flex items-center justify-between w-full mb-0.5">
 								<div class="flex items-center gap-2">
 									<div class="font-medium line-clamp-1 capitalize">{prompt.name}</div>
 									<div class="text-xs overflow-hidden text-ellipsis line-clamp-1 text-gray-500">
-										{prompt.command}
+										/{prompt.command}
 									</div>
 								</div>
 								{#if !prompt.write_access}
@@ -353,7 +347,7 @@
 								{/if}
 							</div>
 
-							<div class=" text-xs">
+							<div class="flex gap-1 text-xs">
 								<Tooltip
 									content={prompt?.user?.email ?? $i18n.t('Deleted User')}
 									className="flex shrink-0"
@@ -367,6 +361,16 @@
 										})}
 									</div>
 								</Tooltip>
+
+								<div>·</div>
+
+								{#if prompt.content}
+									<Tooltip content={prompt.content} placement="top">
+										<div class="line-clamp-1">
+											{prompt.content}
+										</div>
+									</Tooltip>
+								{/if}
 							</div>
 						</div>
 						<div class="flex flex-row gap-0.5 self-center">

From 4c8d4e6dbd2bf900f634b978502b9a8733b2711f Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Mon, 26 Jan 2026 16:11:10 +0400
Subject: [PATCH 17/18] enh: prompt tags

---
 .../374d2f66af06_add_prompt_history_table.py  |  3 +
 backend/open_webui/models/prompts.py          | 31 ++++++++
 backend/open_webui/routers/prompts.py         | 18 ++++-
 src/lib/apis/prompts/index.ts                 | 33 ++++++++-
 src/lib/components/workspace/Prompts.svelte   | 26 ++++++-
 .../workspace/Prompts/PromptEditor.svelte     | 74 ++++++++++++++++---
 .../(app)/workspace/prompts/[id]/+page.svelte |  2 +
 .../workspace/prompts/create/+page.svelte     |  2 +
 8 files changed, 173 insertions(+), 16 deletions(-)

diff --git a/backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py b/backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py
index e56854a15..c61196fcb 100644
--- a/backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py
+++ b/backend/open_webui/migrations/versions/374d2f66af06_add_prompt_history_table.py
@@ -65,6 +65,7 @@ def upgrade() -> None:
         sa.Column("access_control", sa.JSON(), nullable=True),
         sa.Column("is_active", sa.Boolean(), nullable=False, server_default="1"),
         sa.Column("version_id", sa.Text(), nullable=True),
+        sa.Column("tags", sa.JSON(), nullable=True),
         sa.Column("created_at", sa.BigInteger(), nullable=False),
         sa.Column("updated_at", sa.BigInteger(), nullable=False),
     )
@@ -94,6 +95,7 @@ def upgrade() -> None:
         sa.column("access_control", sa.JSON()),
         sa.column("is_active", sa.Boolean()),
         sa.column("version_id", sa.Text()),
+        sa.column("tags", sa.JSON()),
         sa.column("created_at", sa.BigInteger()),
         sa.column("updated_at", sa.BigInteger()),
     )
@@ -134,6 +136,7 @@ def upgrade() -> None:
                 access_control=access_control,
                 is_active=True,
                 version_id=history_uuid,
+                tags=[],
                 created_at=timestamp,
                 updated_at=timestamp,
             )
diff --git a/backend/open_webui/models/prompts.py b/backend/open_webui/models/prompts.py
index 2d79cf13f..381d4109f 100644
--- a/backend/open_webui/models/prompts.py
+++ b/backend/open_webui/models/prompts.py
@@ -30,6 +30,7 @@ class Prompt(Base):
     content = Column(Text)
     data = Column(JSON, nullable=True)
     meta = Column(JSON, nullable=True)
+    tags = Column(JSON, nullable=True)
     is_active = Column(Boolean, default=True)
     version_id = Column(Text, nullable=True)  # Points to active history entry
     created_at = Column(BigInteger, nullable=True)
@@ -61,6 +62,7 @@ class PromptModel(BaseModel):
     content: str
     data: Optional[dict] = None
     meta: Optional[dict] = None
+    tags: Optional[list[str]] = None
     is_active: Optional[bool] = True
     version_id: Optional[str] = None
     created_at: Optional[int] = None
@@ -89,6 +91,7 @@ class PromptForm(BaseModel):
     content: str
     data: Optional[dict] = None
     meta: Optional[dict] = None
+    tags: Optional[list[str]] = None
     access_control: Optional[dict] = None
     version_id: Optional[str] = None  # Active version
     commit_message: Optional[str] = None  # For history tracking
@@ -110,6 +113,7 @@ class PromptsTable:
             content=form_data.content,
             data=form_data.data or {},
             meta=form_data.meta or {},
+            tags=form_data.tags or [],
             access_control=form_data.access_control,
             is_active=True,
             created_at=now,
@@ -130,6 +134,7 @@ class PromptsTable:
                         "command": form_data.command,
                         "data": form_data.data or {},
                         "meta": form_data.meta or {},
+                        "tags": form_data.tags or [],
                         "access_control": form_data.access_control,
                     }
 
@@ -310,6 +315,7 @@ class PromptsTable:
                     or prompt.command != form_data.command
                     or prompt.content != form_data.content
                     or prompt.access_control != form_data.access_control
+                    or (form_data.tags is not None and prompt.tags != form_data.tags)
                 )
 
                 # Update prompt fields
@@ -319,6 +325,10 @@ class PromptsTable:
                 prompt.data = form_data.data or prompt.data
                 prompt.meta = form_data.meta or prompt.meta
                 prompt.access_control = form_data.access_control
+                
+                if form_data.tags is not None:
+                    prompt.tags = form_data.tags
+                    
                 prompt.updated_at = int(time.time())
 
                 db.commit()
@@ -331,6 +341,7 @@ class PromptsTable:
                         "command": prompt.command,
                         "data": form_data.data or {},
                         "meta": form_data.meta or {},
+                        "tags": prompt.tags or [],
                         "access_control": form_data.access_control,
                     }
 
@@ -357,6 +368,7 @@ class PromptsTable:
         prompt_id: str,
         name: str,
         command: str,
+        tags: Optional[list[str]] = None,
         db: Optional[Session] = None,
     ) -> Optional[PromptModel]:
         """Update only name and command (no history created)."""
@@ -368,6 +380,10 @@ class PromptsTable:
                 
                 prompt.name = name
                 prompt.command = command
+                
+                if tags is not None:
+                    prompt.tags = tags
+                    
                 prompt.updated_at = int(time.time())
                 db.commit()
                 
@@ -402,6 +418,7 @@ class PromptsTable:
                     prompt.content = snapshot.get("content", prompt.content)
                     prompt.data = snapshot.get("data", prompt.data)
                     prompt.meta = snapshot.get("meta", prompt.meta)
+                    prompt.tags = snapshot.get("tags", prompt.tags)
                     # Note: command and access_control are not restored from snapshot
 
                 prompt.version_id = version_id
@@ -464,5 +481,19 @@ class PromptsTable:
         except Exception:
             return False
 
+    def get_tags(self, db: Optional[Session] = None) -> list[str]:
+        try:
+            with get_db_context(db) as db:
+                prompts = db.query(Prompt).filter_by(is_active=True).all()
+                tags = set()
+                for prompt in prompts:
+                    if prompt.tags:
+                        for tag in prompt.tags:
+                            if tag:
+                                tags.add(tag)
+                return sorted(list(tags))
+        except Exception:
+            return []
+
 
 Prompts = PromptsTable()
diff --git a/backend/open_webui/routers/prompts.py b/backend/open_webui/routers/prompts.py
index 639658c59..351500917 100644
--- a/backend/open_webui/routers/prompts.py
+++ b/backend/open_webui/routers/prompts.py
@@ -29,6 +29,7 @@ class PromptVersionUpdateForm(BaseModel):
 class PromptMetadataForm(BaseModel):
     name: str
     command: str
+    tags: Optional[list[str]] = None
 
 
 router = APIRouter()
@@ -51,6 +52,21 @@ async def get_prompts(
     return prompts
 
 
+@router.get("/tags", response_model=list[str])
+async def get_prompt_tags(
+    user=Depends(get_verified_user), db: Session = Depends(get_session)
+):
+    if user.role == "admin" and BYPASS_ADMIN_ACCESS_CONTROL:
+        return Prompts.get_tags(db=db)
+    else:
+        prompts = Prompts.get_prompts_by_user_id(user.id, "read", db=db)
+        tags = set()
+        for prompt in prompts:
+            if prompt.tags:
+                tags.update(prompt.tags)
+        return sorted(list(tags))
+
+
 @router.get("/list", response_model=list[PromptAccessResponse])
 async def get_prompt_list(
     user=Depends(get_verified_user), db: Session = Depends(get_session)
@@ -278,7 +294,7 @@ async def update_prompt_metadata(
             )
 
     updated_prompt = Prompts.update_prompt_metadata(
-        prompt.id, form_data.name, form_data.command, db=db
+        prompt.id, form_data.name, form_data.command, form_data.tags, db=db
     )
     if updated_prompt:
         return updated_prompt
diff --git a/src/lib/apis/prompts/index.ts b/src/lib/apis/prompts/index.ts
index 791a98bb4..58ab889f8 100644
--- a/src/lib/apis/prompts/index.ts
+++ b/src/lib/apis/prompts/index.ts
@@ -108,6 +108,34 @@ export const getPrompts = async (token: string = '') => {
 	return res;
 };
 
+export const getPromptTags = async (token: string = '') => {
+	let error = null;
+
+	const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/tags`, {
+		method: 'GET',
+		headers: {
+			Accept: 'application/json',
+			'Content-Type': 'application/json',
+			authorization: `Bearer ${token}`
+		}
+	})
+		.then(async (res) => {
+			if (!res.ok) throw await res.json();
+			return res.json();
+		})
+		.catch((err) => {
+			error = err.detail;
+			console.error(err);
+			return null;
+		});
+
+	if (error) {
+		throw error;
+	}
+
+	return res;
+};
+
 export const getPromptList = async (token: string = '') => {
 	let error = null;
 
@@ -242,7 +270,8 @@ export const updatePromptMetadata = async (
 	token: string,
 	promptId: string,
 	name: string,
-	command: string
+	command: string,
+	tags: string[] = []
 ) => {
 	let error = null;
 
@@ -253,7 +282,7 @@ export const updatePromptMetadata = async (
 			'Content-Type': 'application/json',
 			authorization: `Bearer ${token}`
 		},
-		body: JSON.stringify({ name, command })
+		body: JSON.stringify({ name, command, tags })
 	})
 		.then(async (res) => {
 			if (!res.ok) throw await res.json();
diff --git a/src/lib/components/workspace/Prompts.svelte b/src/lib/components/workspace/Prompts.svelte
index 7c8e20183..3d9a9acdb 100644
--- a/src/lib/components/workspace/Prompts.svelte
+++ b/src/lib/components/workspace/Prompts.svelte
@@ -7,7 +7,13 @@
 	import { onMount, getContext, tick } from 'svelte';
 	import { WEBUI_NAME, config, prompts as _prompts, user } from '$lib/stores';
 
-	import { createNewPrompt, deletePromptById, getPrompts, getPromptList } from '$lib/apis/prompts';
+	import {
+		createNewPrompt,
+		deletePromptById,
+		getPrompts,
+		getPromptList,
+		getPromptTags
+	} from '$lib/apis/prompts';
 	import { capitalizeFirstLetter, slugify, copyToClipboard } from '$lib/utils';
 
 	import PromptMenu from './Prompts/PromptMenu.svelte';
@@ -23,6 +29,7 @@
 	import XMark from '../icons/XMark.svelte';
 	import GarbageBin from '../icons/GarbageBin.svelte';
 	import ViewSelector from './common/ViewSelector.svelte';
+	import TagSelector from './common/TagSelector.svelte';
 	import Badge from '$lib/components/common/Badge.svelte';
 	let shiftKey = false;
 
@@ -34,23 +41,25 @@
 	let query = '';
 
 	let prompts = [];
+	let tags = [];
 
 	let showDeleteConfirm = false;
 	let deletePrompt = null;
 
 	let tagsContainerElement: HTMLDivElement;
 	let viewOption = '';
+	let selectedTag = '';
 	let copiedId: string | null = null;
 
 	let filteredItems = [];
 
-	$: if (prompts && query !== undefined && viewOption !== undefined) {
+	$: if (prompts && query !== undefined && viewOption !== undefined && selectedTag !== undefined) {
 		setFilteredItems();
 	}
 
 	const setFilteredItems = () => {
 		filteredItems = prompts.filter((p) => {
-			if (query === '' && viewOption === '') return true;
+			if (query === '' && viewOption === '' && selectedTag === '') return true;
 			const lowerQuery = query.toLowerCase();
 			return (
 				((p.title || '').toLowerCase().includes(lowerQuery) ||
@@ -59,7 +68,8 @@
 					(p.user?.email || '').toLowerCase().includes(lowerQuery)) &&
 				(viewOption === '' ||
 					(viewOption === 'created' && p.user_id === $user?.id) ||
-					(viewOption === 'shared' && p.user_id !== $user?.id))
+					(viewOption === 'shared' && p.user_id !== $user?.id)) &&
+				(selectedTag === '' || (p.tags && p.tags.includes(selectedTag)))
 			);
 		});
 	};
@@ -129,6 +139,7 @@
 
 	const init = async () => {
 		prompts = await getPromptList(localStorage.token);
+		tags = await getPromptTags(localStorage.token);
 		await _prompts.set(await getPrompts(localStorage.token));
 	};
 
@@ -323,6 +334,13 @@
 						await tick();
 					}}
 				/>
+
+				{#if (tags ?? []).length > 0}
+					<TagSelector
+						bind:value={selectedTag}
+						items={tags.map((tag) => ({ value: tag, label: tag }))}
+					/>
+				{/if}
 			</div>
 		</div>
 
diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 09bf91af2..b89bc3a0a 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -17,12 +17,14 @@
 		getPromptHistory,
 		setProductionPromptVersion,
 		deletePromptHistoryVersion,
-		updatePromptMetadata
+		updatePromptMetadata,
+		getPromptTags
 	} from '$lib/apis/prompts';
 	import dayjs from 'dayjs';
 	import localizedFormat from 'dayjs/plugin/localizedFormat';
 	import PromptHistoryMenu from './PromptHistoryMenu.svelte';
 	import Badge from '$lib/components/common/Badge.svelte';
+	import Tags from '$lib/components/common/Tags.svelte';
 
 	dayjs.extend(localizedFormat);
 
@@ -40,6 +42,7 @@
 	let name = '';
 	let command = '';
 	let content = '';
+	let tags = [];
 	let commitMessage = '';
 	let isProduction = true;
 
@@ -57,8 +60,11 @@
 	// For debounced auto-save of name/command
 	let originalName = '';
 	let originalCommand = '';
+	let originalTags = [];
 	let debounceTimer: ReturnType<typeof setTimeout> | null = null;
 
+	let suggestionTags = [];
+
 	$: if (!edit && !hasManualEdit) {
 		command = name !== '' ? slugify(name) : '';
 	}
@@ -80,6 +86,7 @@
 				name,
 				command,
 				content,
+				tags: tags.map((tag) => tag.name),
 				access_control: accessControl,
 				commit_message: commitMessage || undefined,
 				is_production: isProduction
@@ -207,7 +214,12 @@
 
 		debounceTimer = setTimeout(async () => {
 			// Skip if nothing changed
-			if (name === originalName && command === originalCommand) return;
+			if (
+				name === originalName &&
+				command === originalCommand &&
+				JSON.stringify(tags) === JSON.stringify(originalTags)
+			)
+				return;
 
 			if (!validateCommandString(command)) {
 				toast.error(
@@ -218,16 +230,24 @@
 			}
 
 			try {
-				await updatePromptMetadata(localStorage.token, prompt?.id, name, command);
+				await updatePromptMetadata(
+					localStorage.token,
+					prompt?.id,
+					name,
+					command,
+					tags.map((tag) => tag.name)
+				);
 				// Update originals on success
 				originalName = name;
 				originalCommand = command;
+				originalTags = tags;
 				toast.success($i18n.t('Saved'));
 			} catch (error) {
 				toast.error(`${error}`);
 				// Revert on error (collision)
 				name = originalName;
 				command = originalCommand;
+				tags = originalTags;
 			}
 		}, 500);
 	};
@@ -238,11 +258,13 @@
 			await tick();
 			command = prompt.command.at(0) === '/' ? prompt.command.slice(1) : prompt.command;
 			content = prompt.content;
+			tags = (prompt.tags || []).map((tag) => ({ name: tag }));
 			accessControl = prompt?.access_control === undefined ? {} : prompt?.access_control;
 
 			// Store originals for revert on collision
 			originalName = name;
 			originalCommand = command;
+			originalTags = tags;
 
 			if (edit) {
 				await loadHistory();
@@ -254,6 +276,11 @@
 				}
 			}
 		}
+
+		const res = await getPromptTags(localStorage.token);
+		if (res) {
+			suggestionTags = res.map((tag) => ({ name: tag }));
+		}
 	});
 </script>
 
@@ -361,9 +388,31 @@
 						{disabled}
 					/>
 				</div>
+
+				<div class="mt-2">
+					<Tags
+						{tags}
+						{suggestionTags}
+						on:add={(e) => {
+							tags = [...tags, { name: e.detail }];
+							debouncedSaveMetadata();
+						}}
+						on:delete={(e) => {
+							tags = tags.filter((tag) => tag.name !== e.detail);
+							debouncedSaveMetadata();
+						}}
+					/>
+				</div>
 			</div>
 			<div class="flex items-center gap-2 shrink-0">
 				{#if !disabled}
+					<button
+						class="px-4 py-1 text-sm font-medium bg-black text-white dark:bg-white dark:text-black rounded-full hover:opacity-90 transition shadow-xs"
+						on:click={() => (showEditModal = true)}
+					>
+						{$i18n.t('Edit')}
+					</button>
+
 					<button
 						class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2.5 py-1 rounded-full flex gap-1.5 items-center text-sm border border-gray-100 dark:border-gray-800"
 						on:click={() => (showAccessControlModal = true)}
@@ -371,12 +420,6 @@
 						<LockClosed strokeWidth="2.5" className="size-3.5" />
 						{$i18n.t('Access')}
 					</button>
-					<button
-						class="px-4 py-1 text-sm font-medium bg-black text-white dark:bg-white dark:text-black rounded-full hover:opacity-90 transition shadow-xs"
-						on:click={() => (showEditModal = true)}
-					>
-						{$i18n.t('Edit')}
-					</button>
 				{:else}
 					<span class="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded-full"
 						>{$i18n.t('Read Only')}</span
@@ -493,6 +536,19 @@
 								required
 							/>
 						</div>
+
+						<div class="mt-1">
+							<Tags
+								{tags}
+								{suggestionTags}
+								on:add={(e) => {
+									tags = [...tags, { name: e.detail }];
+								}}
+								on:delete={(e) => {
+									tags = tags.filter((tag) => tag.name !== e.detail);
+								}}
+							/>
+						</div>
 					</div>
 				</Tooltip>
 			</div>
diff --git a/src/routes/(app)/workspace/prompts/[id]/+page.svelte b/src/routes/(app)/workspace/prompts/[id]/+page.svelte
index 5e75b0099..0cbf3d4e5 100644
--- a/src/routes/(app)/workspace/prompts/[id]/+page.svelte
+++ b/src/routes/(app)/workspace/prompts/[id]/+page.svelte
@@ -34,6 +34,7 @@
 				command: updatedPrompt.command,
 				content: updatedPrompt.content,
 				version_id: updatedPrompt.version_id,
+				tags: updatedPrompt.tags,
 				access_control: updatedPrompt?.access_control === undefined ? {} : updatedPrompt?.access_control
 			};
 		}
@@ -57,6 +58,7 @@
 					command: _prompt.command,
 					content: _prompt.content,
 					version_id: _prompt.version_id,
+					tags: _prompt.tags,
 					access_control: _prompt?.access_control === undefined ? {} : _prompt?.access_control
 				};
 			} else {
diff --git a/src/routes/(app)/workspace/prompts/create/+page.svelte b/src/routes/(app)/workspace/prompts/create/+page.svelte
index d88d7a0e1..a80e1c28b 100644
--- a/src/routes/(app)/workspace/prompts/create/+page.svelte
+++ b/src/routes/(app)/workspace/prompts/create/+page.svelte
@@ -49,6 +49,7 @@
 				name: _prompt.name || _prompt.title || 'Prompt',
 				command: _prompt.command,
 				content: _prompt.content,
+				tags: _prompt.tags || [],
 				access_control: _prompt.access_control !== undefined ? _prompt.access_control : {}
 			};
 		});
@@ -68,6 +69,7 @@
 				name: _prompt.name || _prompt.title || 'Prompt',
 				command: _prompt.command,
 				content: _prompt.content,
+				tags: _prompt.tags || [],
 				access_control: _prompt.access_control !== undefined ? _prompt.access_control : {}
 			};
 		}

From 10ba2accf7c5a2105b7c9303f5f558797f18be3e Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Mon, 26 Jan 2026 16:18:49 +0400
Subject: [PATCH 18/18] refac

---
 .../workspace/Prompts/PromptEditor.svelte     | 90 +++++++++++--------
 1 file changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index b89bc3a0a..5f9a0da87 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -369,7 +369,7 @@
 	<!-- Edit mode: Read-only view with history -->
 	<div class="flex flex-col w-full h-full max-h-[100dvh]">
 		<!-- Header -->
-		<div class="flex items-start justify-between gap-4 mb-2 shrink-0">
+		<div class="flex items-start justify-between gap-4 shrink-0">
 			<div class="min-w-0 flex-1">
 				<input
 					class="text-2xl font-medium w-full bg-transparent outline-hidden"
@@ -378,7 +378,8 @@
 					on:input={debouncedSaveMetadata}
 					{disabled}
 				/>
-				<div class="flex items-center gap-0.5 text-sm text-gray-500 mt-0.5">
+
+				<div class="flex items-center gap-0.5 text-sm text-gray-500 w-full flex-1">
 					<span>/</span>
 					<input
 						class="bg-transparent outline-hidden"
@@ -388,43 +389,62 @@
 						{disabled}
 					/>
 				</div>
+			</div>
 
-				<div class="mt-2">
-					<Tags
-						{tags}
-						{suggestionTags}
-						on:add={(e) => {
-							tags = [...tags, { name: e.detail }];
-							debouncedSaveMetadata();
-						}}
-						on:delete={(e) => {
-							tags = tags.filter((tag) => tag.name !== e.detail);
-							debouncedSaveMetadata();
-						}}
-					/>
+			<div>
+				<div class="flex items-center gap-2 shrink-0 justify-end">
+					{#if !disabled}
+						<button
+							class="px-4 py-1 text-sm font-medium bg-black text-white dark:bg-white dark:text-black rounded-full hover:opacity-90 transition shadow-xs"
+							on:click={() => (showEditModal = true)}
+						>
+							{$i18n.t('Edit')}
+						</button>
+
+						<button
+							class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2.5 py-1 rounded-full flex gap-1.5 items-center text-sm border border-gray-100 dark:border-gray-800"
+							on:click={() => (showAccessControlModal = true)}
+						>
+							<LockClosed strokeWidth="2.5" className="size-3.5" />
+							{$i18n.t('Access')}
+						</button>
+					{:else}
+						<span class="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded-full"
+							>{$i18n.t('Read Only')}</span
+						>
+					{/if}
+				</div>
+
+				<div class="mt-1.5">
+					<Tooltip content={$i18n.t('Click to copy ID')}>
+						<button
+							class="text-xs text-gray-500 font-mono bg-gray-50 dark:bg-gray-850 px-2 py-1 rounded-lg cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-800 transition"
+							on:click={() => {
+								copyToClipboard(prompt.id);
+								toast.success($i18n.t('ID copied to clipboard'));
+							}}
+						>
+							{prompt.id}
+						</button>
+					</Tooltip>
 				</div>
 			</div>
-			<div class="flex items-center gap-2 shrink-0">
-				{#if !disabled}
-					<button
-						class="px-4 py-1 text-sm font-medium bg-black text-white dark:bg-white dark:text-black rounded-full hover:opacity-90 transition shadow-xs"
-						on:click={() => (showEditModal = true)}
-					>
-						{$i18n.t('Edit')}
-					</button>
+		</div>
 
-					<button
-						class="bg-gray-50 hover:bg-gray-100 text-black dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition px-2.5 py-1 rounded-full flex gap-1.5 items-center text-sm border border-gray-100 dark:border-gray-800"
-						on:click={() => (showAccessControlModal = true)}
-					>
-						<LockClosed strokeWidth="2.5" className="size-3.5" />
-						{$i18n.t('Access')}
-					</button>
-				{:else}
-					<span class="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded-full"
-						>{$i18n.t('Read Only')}</span
-					>
-				{/if}
+		<div class="mb-2 flex justify-between items-center gap-2">
+			<div class="flex-1 min-w-0">
+				<Tags
+					{tags}
+					{suggestionTags}
+					on:add={(e) => {
+						tags = [...tags, { name: e.detail }];
+						debouncedSaveMetadata();
+					}}
+					on:delete={(e) => {
+						tags = tags.filter((tag) => tag.name !== e.detail);
+						debouncedSaveMetadata();
+					}}
+				/>
 			</div>
 		</div>