Agent display names separate from slugified IDs, bump v0.1.38

Author: aemiguel

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lore-core"
-version = "0.1.37"
+version = "0.1.38"
 edition = "2024"
 autobins = false
 

src/api.rs

@@ -1585,7 +1585,7 @@ async fn create_agent_token(
     let admin = require_admin(&state, &headers)?;
     let owner = UserName::new(&payload.owner)?;
     let created = state.auth.create_agent_token(NewAgentToken {
-        name: payload.name,
+        display_name: payload.name,
         owner: owner.clone(),
         grants: payload
             .grants
@@ -2591,7 +2591,7 @@ async fn create_agent_from_ui(
     // Validate the user can grant these permissions
     validate_user_grants(&state, &session.user, &grants)?;
     let created = state.auth.create_agent_token(NewAgentToken {
-        name: form.name.clone(),
+        display_name: form.name.clone(),
         owner: session.user.username.clone(),
         grants,
     })?;
@@ -2602,12 +2602,12 @@ async fn create_agent_from_ui(
             name: session.user.username.as_str().to_string(),
         },
         "create agent",
-        Some(form.name.clone()),
+        Some(created.stored.name.clone()),
         None,
     )?;
     Ok(Redirect::to(&format!(
         "/ui/agents?selected={}&created_token={}&flash=Agent%20created.%20Copy%20the%20token%20now.",
-        urlencoding::encode(&form.name),
+        urlencoding::encode(&created.stored.name),
         urlencoding::encode(&created.token),
     ))
     .into_response())
@@ -4586,8 +4586,13 @@ fn block_matches_filters(block: &Block, filters: &BlockFilterOptions) -> bool {
 }
 
 fn agent_token_summary(token: StoredAgentToken) -> AgentTokenSummary {
+    let display_name = token
+        .display_name
+        .clone()
+        .unwrap_or_else(|| token.name.clone());
     AgentTokenSummary {
         name: token.name,
+        display_name,
         owner: token.owner.map(|u| u.as_str().to_string()),
         grants: token.grants,
         created_at: token.created_at,

src/auth.rs

@@ -40,6 +40,8 @@ pub struct NewSession {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct StoredAgentToken {
     pub name: String,
+    #[serde(default)]
+    pub display_name: Option<String>,
     pub token_hash: String,
     #[serde(default)]
     pub owner: Option<UserName>,
@@ -49,14 +51,20 @@ pub struct StoredAgentToken {
 
 #[derive(Debug, Clone)]
 pub struct NewAgentToken {
-    pub name: String,
+    pub display_name: String,
     pub owner: UserName,
     pub grants: Vec<ProjectGrant>,
 }
 
 impl NewAgentToken {
+    pub fn slug(&self) -> String {
+        slugify_agent_name(&self.display_name)
+    }
+
     pub fn validate(&self) -> Result<()> {
-        validate_agent_token_name(&self.name)?;
+        validate_agent_display_name(&self.display_name)?;
+        let slug = self.slug();
+        validate_agent_token_name(&slug)?;
         if self.grants.is_empty() {
             return Err(LoreError::Validation(
                 "agent token must grant at least one project permission".into(),
@@ -457,9 +465,10 @@ impl LocalAuthStore {
 
     pub fn create_agent_token(&self, token: NewAgentToken) -> Result<CreatedAgentToken> {
         token.validate()?;
+        let slug = token.slug();
         let mut tokens = self.load_agent_tokens()?;
         if tokens.iter().any(|existing| {
-            existing.name == token.name
+            existing.name == slug
                 && existing.owner.as_ref() == Some(&token.owner)
         }) {
             return Err(LoreError::Validation("agent already exists".into()));
@@ -469,7 +478,8 @@ impl LocalAuthStore {
         grants.sort_by(|a, b| a.project.cmp(&b.project));
         let raw_token = format!("lore_at_{}_{}", Uuid::new_v4(), Uuid::new_v4());
         let stored = StoredAgentToken {
-            name: token.name,
+            name: slug,
+            display_name: Some(token.display_name),
             token_hash: hash_agent_token(&raw_token),
             owner: Some(token.owner),
             grants,
@@ -860,6 +870,51 @@ fn validate_password(password: &str) -> Result<()> {
     Ok(())
 }
 
+fn validate_agent_display_name(name: &str) -> Result<()> {
+    if name.is_empty() || name.len() > MAX_AGENT_TOKEN_NAME_LEN {
+        return Err(LoreError::Validation(format!(
+            "agent name must be 1..={MAX_AGENT_TOKEN_NAME_LEN} characters"
+        )));
+    }
+    if !name
+        .chars()
+        .all(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '-' | '_' | '.' | ' '))
+    {
+        return Err(LoreError::Validation(
+            "agent name must contain only letters, digits, spaces, '.', '_' or '-'".into(),
+        ));
+    }
+    Ok(())
+}
+
+fn slugify_agent_name(display_name: &str) -> String {
+    let slug: String = display_name
+        .chars()
+        .map(|ch| {
+            if ch.is_ascii_alphanumeric() || matches!(ch, '-' | '_' | '.') {
+                ch.to_ascii_lowercase()
+            } else {
+                '-'
+            }
+        })
+        .collect();
+    // Collapse consecutive hyphens
+    let mut result = String::with_capacity(slug.len());
+    let mut prev_hyphen = false;
+    for ch in slug.chars() {
+        if ch == '-' {
+            if !prev_hyphen {
+                result.push(ch);
+            }
+            prev_hyphen = true;
+        } else {
+            result.push(ch);
+            prev_hyphen = false;
+        }
+    }
+    result.trim_matches('-').to_string()
+}
+
 fn validate_agent_token_name(name: &str) -> Result<()> {
     if name.is_empty() || name.len() > MAX_AGENT_TOKEN_NAME_LEN {
         return Err(LoreError::Validation(format!(
@@ -1084,7 +1139,7 @@ mod tests {
 
         let created = auth
             .create_agent_token(NewAgentToken {
-                name: "worker-alpha".into(),
+                display_name: "worker-alpha".into(),
                 owner: UserName::new("admin").unwrap(),
                 grants: vec![ProjectGrant {
                     project: ProjectName::new("alpha.docs").unwrap(),

src/ui.rs

@@ -292,6 +292,7 @@ pub struct ProjectListEntry {
 #[derive(Debug, Clone, Serialize)]
 pub struct AgentTokenSummary {
     pub name: String,
+    pub display_name: String,
     pub owner: Option<String>,
     pub grants: Vec<ProjectGrant>,
     pub created_at: time::OffsetDateTime,
@@ -1525,7 +1526,7 @@ pub fn render_agents_page(
                     </a>"#,
                     escape_attribute(&agent.name),
                     cls,
-                    escape_text(&agent.name),
+                    escape_text(&agent.display_name),
                     escape_text(&grant_label),
                 )
             })
@@ -1659,7 +1660,7 @@ pub fn render_agents_page(
 
             format!(
                 r##"<section class="panel" style="margin-top: var(--s-5);">
-                <div class="panel-header"><h2>{name}</h2><p>{owner}-{name}</p></div>
+                <div class="panel-header"><h2>{display_name}</h2><p>{owner}-{slug}</p></div>
 
                 <div class="panel-header"><h3>Configuration</h3></div>
                 <form method="post" action="/ui/agents/{name_attr}/grants" id="edit-grants-form">
@@ -1711,7 +1712,8 @@ pub fn render_agents_page(
                   </form>
                 </div>
               </section>"##,
-                name = escape_text(&agent.name),
+                display_name = escape_text(&agent.display_name),
+                slug = escape_text(&agent.name),
                 owner = escape_text(username),
                 name_attr = escape_attribute(&agent.name),
                 csrf_token = escape_attribute(csrf_token),
@@ -3259,7 +3261,7 @@ fn render_user_card(user: &UiUserSummary, agents: &[AgentTokenSummary], csrf_tok
                     .join(", ");
                 format!(
                     r#"<li><span class="meta-code">{}</span> <span style="font-size:0.82rem; color:var(--fg-muted);">{}</span></li>"#,
-                    escape_text(&agent.name),
+                    escape_text(&agent.display_name),
                     escape_text(&grants),
                 )
             })