Improve ability seeding (#1591)

Author: Josh-XT

agixt/Agent.py

@@ -40,6 +40,7 @@
 import binascii
 from WebhookManager import WebhookEventEmitter
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import joinedload
 
 # Initialize webhook event emitter
 webhook_emitter = WebhookEventEmitter()
@@ -50,6 +51,61 @@
 )
 
 
+_command_owner_cache = None
+
+
+def _get_command_owner_cache():
+    global _command_owner_cache
+    if _command_owner_cache is not None:
+        return _command_owner_cache
+
+    cache = {}
+    try:
+        extensions = Extensions().get_extensions()
+        for extension_data in extensions:
+            extension_name = extension_data.get("extension_name")
+            for command_data in extension_data.get("commands", []):
+                friendly_name = command_data.get("friendly_name")
+                if not friendly_name:
+                    continue
+                cache.setdefault(friendly_name.lower(), set()).add(extension_name)
+    except Exception as e:
+        logging.debug(f"Unable to build command owner cache: {e}")
+
+    _command_owner_cache = cache
+    return _command_owner_cache
+
+
+def _resolve_command_by_name(session, command_name):
+    if not command_name:
+        return None
+
+    commands = (
+        session.query(Command)
+        .options(joinedload(Command.extension))
+        .filter(Command.name == command_name)
+        .all()
+    )
+
+    if not commands:
+        return None
+    if len(commands) == 1:
+        return commands[0]
+
+    owners = _get_command_owner_cache().get(command_name.lower(), set())
+    if owners:
+        for command in commands:
+            extension_name = command.extension.name if command.extension else None
+            if extension_name in owners:
+                return command
+
+    logging.warning(
+        "Multiple database entries found for command '%s'. Defaulting to first match.",
+        command_name,
+    )
+    return commands[0]
+
+
 # Define the standalone wallet creation function
 def create_solana_wallet() -> Tuple[str, str, str]:
     """
@@ -219,7 +275,7 @@ def add_agent(agent_name, provider_settings=None, commands=None, user=DEFAULT_US
     # Handle any additional commands passed in the commands parameter
     if commands:
         for command_name, enabled in commands.items():
-            command = session.query(Command).filter_by(name=command_name).first()
+            command = _resolve_command_by_name(session, command_name)
             if command:
                 # Check if agent command already exists (from auto-enabled extensions)
                 existing_agent_command = (
@@ -1415,7 +1471,7 @@ def update_agent_config(self, new_config, config_key):
                     continue
 
                 # First try to find an existing command
-                command = session.query(Command).filter_by(name=command_name).first()
+                command = _resolve_command_by_name(session, command_name)
 
                 if not command:
                     # Check if this is a chain command

agixt/Interactions.py

@@ -327,6 +327,11 @@ async def format_prompt(
             context.append(
                 f"## Persona\n**The assistant follows a persona and uses the following guidelines and information to remain in character.**\n{persona}\nThe assistant is {self.agent_name} and is an AGiXT agent created by DevXT, empowered with AGiXT abilities."
             )
+        APP_URI = getenv("APP_URI")
+        if "localhost:" not in APP_URI:
+            context.append(
+                f"The assistant is an AGiXT agent named `{self.agent_name}` running on {APP_URI}. The assistant can access the documentation about the website at {AGIXT_URI}/docs as well as information about the open source AGiXT back end repository at https://github.com/Josh-XT/AGiXT if necessary."
+            )
         if "72" in kwargs and "42" in kwargs:
             if kwargs["72"] == True and kwargs["42"] == True:
                 kwargs["fp"] = context

agixt/SeedImports.py

@@ -1,6 +1,7 @@
 import os
 import json
 import logging
+from collections import defaultdict
 from DB import (
     get_session,
     Provider,
@@ -16,6 +17,7 @@
     Agent,
     AgentCommand,
     Chain,
+    ChainStep,
 )
 from Providers import get_providers, get_provider_options
 from Agent import add_agent
@@ -27,6 +29,65 @@
 )
 
 
+def _merge_command_duplicates(session, target_command, duplicates):
+    """Merge duplicate command rows into a target command instance."""
+
+    if not duplicates:
+        return
+
+    for duplicate in duplicates:
+        if duplicate.id == target_command.id:
+            continue
+
+        # Move agent command associations
+        agent_commands = (
+            session.query(AgentCommand)
+            .filter(AgentCommand.command_id == duplicate.id)
+            .all()
+        )
+        for agent_command in agent_commands:
+            existing_ref = (
+                session.query(AgentCommand)
+                .filter(
+                    AgentCommand.agent_id == agent_command.agent_id,
+                    AgentCommand.command_id == target_command.id,
+                )
+                .first()
+            )
+
+            if existing_ref:
+                if agent_command.state:
+                    existing_ref.state = True
+                session.delete(agent_command)
+            else:
+                agent_command.command_id = target_command.id
+
+        # Move arguments linked to the duplicate command
+        arguments = (
+            session.query(Argument).filter(Argument.command_id == duplicate.id).all()
+        )
+        for argument in arguments:
+            existing_arg = (
+                session.query(Argument)
+                .filter_by(command_id=target_command.id, name=argument.name)
+                .first()
+            )
+            if existing_arg:
+                session.delete(argument)
+            else:
+                argument.command_id = target_command.id
+
+        # Update chain steps that target the duplicate command
+        session.query(ChainStep).filter(
+            ChainStep.target_command_id == duplicate.id
+        ).update(
+            {ChainStep.target_command_id: target_command.id},
+            synchronize_session=False,
+        )
+
+        session.delete(duplicate)
+
+
 def get_extension_category(session, extension_name):
     """Get or create extension category based on extension class CATEGORY attribute"""
     from ExtensionsHub import (
@@ -134,6 +195,7 @@ def import_extensions():
 
     ext = Extensions()
     extensions_data = ext.get_extensions()
+    command_owner_map = defaultdict(set)
     # Delete "AGiXT Chains"
     if "AGiXT Chains" in extensions_data:
         del extensions_data["AGiXT Chains"]
@@ -142,6 +204,14 @@ def import_extensions():
     #     del extensions_data["Custom Automation"]
     extension_settings_data = Extensions().get_extension_settings()
 
+    for extension_data in extensions_data:
+        extension_name = extension_data["extension_name"]
+        for command in extension_data.get("commands", []):
+            friendly_name = command.get("friendly_name", "").strip()
+            if not friendly_name:
+                continue
+            command_owner_map[friendly_name.lower()].add(extension_name)
+
     # Create extension database tables during seed import
     create_extension_tables()
 
@@ -306,86 +376,60 @@ def import_extensions():
         # Process commands for this extension
         if "commands" in extension_data:
             for command_data in extension_data["commands"]:
-                if "friendly_name" not in command_data:
+                command_name = command_data.get("friendly_name")
+                if not command_name:
                     continue
 
-                command_name = command_data["friendly_name"]
-                command_description = command_data.get("description", "")
+                command_key = command_name.strip().lower()
+                shared_command = len(command_owner_map.get(command_key, set())) > 1
 
-                # Check if this command exists in a different extension (moved command)
-                existing_in_other_extension = (
+                commands_with_name = (
                     session.query(Command)
                     .join(Extension)
-                    .filter(Command.name == command_name, Extension.id != extension.id)
-                    .first()
+                    .filter(Command.name == command_name)
+                    .all()
                 )
 
-                if existing_in_other_extension:
+                command = None
+                duplicates_to_merge = []
 
-                    # Find or create command in current extension
-                    command = (
-                        session.query(Command)
-                        .filter_by(extension_id=extension.id, name=command_name)
-                        .first()
-                    )
-
-                    if not command:
-                        command = Command(
-                            extension_id=extension.id,
-                            name=command_name,
-                        )
-                        session.add(command)
-                        session.flush()
-
-                    # Update all agent command references from old to new
-                    agent_commands = (
-                        session.query(AgentCommand)
-                        .filter(
-                            AgentCommand.command_id == existing_in_other_extension.id
+                for db_command in commands_with_name:
+                    if db_command.extension_id == extension.id:
+                        if command is None:
+                            command = db_command
+                        else:
+                            duplicates_to_merge.append(db_command)
+                    elif not shared_command:
+                        duplicates_to_merge.append(db_command)
+
+                if command is None:
+                    if duplicates_to_merge:
+                        command = duplicates_to_merge.pop(0)
+                        old_extension_name = (
+                            command.extension.name if command.extension else "Unknown"
                         )
-                        .all()
-                    )
-
-                    for agent_command in agent_commands:
-                        # Check if agent already has a reference to the new command
-                        existing_ref = (
-                            session.query(AgentCommand)
-                            .filter(
-                                AgentCommand.agent_id == agent_command.agent_id,
-                                AgentCommand.command_id == command.id,
+                        if old_extension_name.lower() != extension_name.lower():
+                            logging.info(
+                                "Moving command '%s' from extension '%s' to '%s'",
+                                command_name,
+                                old_extension_name,
+                                extension_name,
                             )
-                            .first()
-                        )
-
-                        if existing_ref:
-                            # Merge - keep enabled if either was enabled
-                            if agent_command.state:
-                                existing_ref.state = True
-                            session.delete(agent_command)
-                        else:
-                            # Update to point to new command
-                            agent_command.command_id = command.id
-
-                else:
-                    # Normal case - find or create command in this extension
-                    command = (
-                        session.query(Command)
-                        .filter_by(extension_id=extension.id, name=command_name)
-                        .first()
-                    )
-
-                    if not command:
+                        command.extension_id = extension.id
+                        command.extension = extension
+                    else:
                         command = Command(
                             extension_id=extension.id,
                             name=command_name,
                         )
                         session.add(command)
                         session.flush()
 
+                _merge_command_duplicates(session, command, duplicates_to_merge)
+
                 # Process command arguments if they exist
                 if "command_args" in command_data:
                     for arg_name, arg_type in command_data["command_args"].items():
-                        # Check if argument already exists
                         existing_arg = (
                             session.query(Argument)
                             .filter_by(command_id=command.id, name=arg_name)