Refactor agent loading and validation logic

- Modified npm-app to load local agents only when no specific agent is requested using Promise pattern
- Improved agent validation in agent-registry by validating with original agentId first
- Enhanced code formatting in websocket-action for better readability

🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>

Author: brandonkachen

backend/src/templates/agent-registry.ts

@@ -100,44 +100,45 @@ async function fetchAgentFromDatabase(parsedAgentId: {
 
     const rawAgentData = agentConfig.data as DynamicAgentTemplate
 
-    // Ensure the agent has the full publisher/agent-id@version as its ID
-    const agentDataWithId = {
-      ...rawAgentData,
-      id: `${publisherId}/${agentId}@${agentConfig.version}`,
-    }
-
-    // Use validateSingleAgent to convert to AgentTemplate type
-    const validationResult = validateSingleAgent(agentDataWithId, {
-      filePath: `${publisherId}/${agentId}@${agentConfig.version}`,
-      skipSubagentValidation: true,
-    })
+    // Validate the raw agent data with the original agentId (not full identifier)
+    const validationResult = validateSingleAgent(
+      { ...rawAgentData, id: agentId },
+      {
+        filePath: `${publisherId}/${agentId}@${agentConfig.version}`,
+        skipSubagentValidation: true,
+      },
+    )
 
     if (!validationResult.success) {
       logger.error(
         {
           publisherId,
           agentId,
           version: agentConfig.version,
-          fullAgentId: agentDataWithId.id,
           error: validationResult.error,
         },
         'fetchAgentFromDatabase: Agent validation failed',
       )
       return null
     }
 
+    // Set the correct full agent ID for the final template
+    const agentTemplate = {
+      ...validationResult.agentTemplate!,
+      id: `${publisherId}/${agentId}@${agentConfig.version}`,
+    }
+
     logger.debug(
       {
         publisherId,
         agentId,
         version: agentConfig.version,
-        fullAgentId: agentDataWithId.id,
-        agentConfig,
+        fullAgentId: agentTemplate.id,
       },
       'fetchAgentFromDatabase: Successfully loaded and validated agent from database',
     )
 
-    return validationResult.agentTemplate!
+    return agentTemplate
   } catch (error) {
     logger.error(
       { publisherId, agentId, version, error },

backend/src/websockets/websocket-action.ts

@@ -234,7 +234,8 @@ export const callMainPrompt = async (
   const { fileContext } = action.sessionState
 
   // Assemble local agent templates from fileContext
-  const { agentTemplates: localAgentTemplates } = assembleLocalAgentTemplates(fileContext)
+  const { agentTemplates: localAgentTemplates } =
+    assembleLocalAgentTemplates(fileContext)
 
   const result = await mainPrompt(ws, action, {
     userId,

npm-app/src/index.ts

@@ -53,17 +53,23 @@ async function codebuff({
 
   const initFileContextPromise = initProjectFileContextWithWorker(projectRoot)
 
+  // Only load local agents if no specific agent is requested
+  const loadLocalAgentsPromise = new Promise<void>((resolve) => {
+    if (!agent) {
+      loadLocalAgents({ verbose: true }).then(() => {
+        const codebuffConfig = loadCodebuffConfig()
+        displayLoadedAgents(codebuffConfig)
+      })
+    }
+    resolve()
+  })
+
   const readyPromise = Promise.all([
     initFileContextPromise,
     processCleanupPromise,
-
-    loadLocalAgents({ verbose: true }).then(() =>
-      displayLoadedAgents(codebuffConfig),
-    ),
+    loadLocalAgentsPromise,
   ])
 
-  const codebuffConfig = loadCodebuffConfig()
-
   // Initialize the CLI singleton
   CLI.initialize(readyPromise, {
     git,
@@ -74,6 +80,7 @@ async function codebuff({
     print,
     trace,
   })
+
   const cli = CLI.getInstance()
 
   await cli.printInitialPrompt({ initialInput, runInitFlow })