feat: multi-account user scope isolation

crates/aionui-ai-agent/src/capability/first_message_injector.rs

@@ -11,6 +11,8 @@ use crate::capability::skill_manager::{AcpSkillManager, prepare_first_message_wi
 
 /// Configuration for the first-message injector.
 pub struct InjectionConfig<'a> {
+    /// Core user that owns the conversation and its user-scoped skills.
+    pub user_id: &'a str,
     /// Preset context (assistant-level system prompt injection).
     pub preset_context: Option<&'a str>,
     /// Resolved skill names (snapshot from `conversation.extra.skills`).
@@ -42,7 +44,7 @@ pub async fn inject_first_message_prefix(
         };
     }
 
-    let skills = manager.discover_by_names(config.skills).await;
+    let skills = manager.discover_by_names_for_user(config.user_id, config.skills).await;
     let has_context = config.preset_context.is_some_and(|s| !s.is_empty());
     if skills.is_empty() && !has_context {
         return content.to_string();
@@ -89,6 +91,7 @@ mod tests {
             "Hello",
             &mgr,
             InjectionConfig {
+                user_id: "system_default_user",
                 preset_context: Some("Be concise."),
                 skills: &[],
                 native_skill_support: true,
@@ -110,6 +113,7 @@ mod tests {
             "Hello",
             &mgr,
             InjectionConfig {
+                user_id: "system_default_user",
                 preset_context: None,
                 skills: &[],
                 native_skill_support: true,
@@ -129,6 +133,7 @@ mod tests {
             "Hello",
             &mgr,
             InjectionConfig {
+                user_id: "system_default_user",
                 preset_context: None,
                 skills: &[],
                 native_skill_support: false,
@@ -148,6 +153,7 @@ mod tests {
             "Go.",
             &mgr,
             InjectionConfig {
+                user_id: "system_default_user",
                 preset_context: Some("Rule 1."),
                 skills: &[],
                 native_skill_support: false,
@@ -184,6 +190,7 @@ mod tests {
             "Hello",
             &mgr,
             InjectionConfig {
+                user_id: "system_default_user",
                 preset_context: None,
                 skills: &["cron".to_owned()],
                 native_skill_support: false,
@@ -205,6 +212,7 @@ mod tests {
             "Do stuff",
             &mgr,
             InjectionConfig {
+                user_id: "system_default_user",
                 preset_context: Some("Custom rule"),
                 skills: &["cron".to_owned()],
                 native_skill_support: true,

crates/aionui-ai-agent/src/capability/skill_manager/mod.rs

@@ -92,7 +92,17 @@ impl AcpSkillManager {
         enabled_skills: Option<&[String]>,
         exclude_builtin_skills: Option<&[String]>,
     ) -> Vec<SkillIndex> {
-        let items = match self.list_available_skills().await {
+        self.discover_skills_for_user("system_default_user", enabled_skills, exclude_builtin_skills)
+            .await
+    }
+
+    pub async fn discover_skills_for_user(
+        &self,
+        user_id: &str,
+        enabled_skills: Option<&[String]>,
+        exclude_builtin_skills: Option<&[String]>,
+    ) -> Vec<SkillIndex> {
+        let items = match self.list_available_skills_for_user(user_id).await {
             Ok(v) => v,
             Err(e) => {
                 warn!(error = %e, "Failed to list skills via extension service");
@@ -159,6 +169,10 @@ impl AcpSkillManager {
     /// auto-inject/opt-in). Returns the resulting index. Used by the
     /// snapshot-driven first-message injector.
     pub async fn discover_by_names(&self, names: &[String]) -> Vec<SkillIndex> {
+        self.discover_by_names_for_user("system_default_user", names).await
+    }
+
+    pub async fn discover_by_names_for_user(&self, user_id: &str, names: &[String]) -> Vec<SkillIndex> {
         // Always reset state so repeated calls produce a deterministic cache.
         if names.is_empty() {
             let mut cache = self.cache.write().await;
@@ -167,7 +181,7 @@ impl AcpSkillManager {
             *discovered = true;
             return Vec::new();
         }
-        let items = match self.list_available_skills().await {
+        let items = match self.list_available_skills_for_user(user_id).await {
             Ok(v) => v,
             Err(e) => {
                 warn!(error = %e, "discover_by_names: list_available_skills failed");
@@ -205,11 +219,12 @@ impl AcpSkillManager {
             .collect()
     }
 
-    async fn list_available_skills(
+    async fn list_available_skills_for_user(
         &self,
+        user_id: &str,
     ) -> Result<Vec<aionui_extension::SkillListItem>, aionui_extension::ExtensionError> {
         if let Some(repo) = &self.skill_repo {
-            aionui_extension::list_available_skills_with_repo(&self.paths, repo.as_ref()).await
+            aionui_extension::list_available_skills_with_repo_for_user(&self.paths, repo.as_ref(), user_id).await
         } else {
             aionui_extension::list_available_skills(&self.paths).await
         }