Fix tests, extract utils for parsing agent ids

Author: jahooma

backend/src/templates/agent-registry.ts

@@ -12,38 +12,13 @@ import {
 } from '@codebuff/common/templates/agent-validation'
 import { DynamicAgentTemplate } from '@codebuff/common/types/dynamic-agent-template'
 import { DEFAULT_ORG_PREFIX } from '@codebuff/common/util/agent-name-normalization'
+import { parsePublishedAgentId } from '@codebuff/common/util/agent-id-parsing'
 
 export type AgentRegistry = Record<string, AgentTemplate>
 
 // Global database cache - only state in the system
 const databaseAgentCache = new Map<string, AgentTemplate | null>()
 
-/**
- * Parse agent ID to extract publisher, agent name, and version
- */
-export function parseAgentId(fullAgentId: string): {
-  publisherId: string
-  agentId: string
-  version?: string
-} | null {
-  // Check if it's in the publisher/agent-id[@version] format
-  const parts = fullAgentId.split('/')
-  if (parts.length !== 2) {
-    return null
-  }
-
-  const [publisherId, agentNameWithVersion] = parts
-
-  // Check for version suffix
-  const versionMatch = agentNameWithVersion.match(/^(.+)@(.+)$/)
-  if (versionMatch) {
-    const [, agentId, version] = versionMatch
-    return { publisherId, agentId, version }
-  }
-
-  return { publisherId, agentId: agentNameWithVersion }
-}
-
 /**
  * Fetch an agent from the database by publisher/agent-id[@version] format
  */
@@ -168,10 +143,12 @@ export async function getAgentTemplate(
     return databaseAgentCache.get(cacheKey) || null
   }
 
-  const parsed = parseAgentId(agentId)
+  const parsed = parsePublishedAgentId(agentId)
   if (!parsed) {
     // If agentId doesn't parse as publisher/agent format, try as codebuff/agentId
-    const codebuffParsed = parseAgentId(`${DEFAULT_ORG_PREFIX}${agentId}`)
+    const codebuffParsed = parsePublishedAgentId(
+      `${DEFAULT_ORG_PREFIX}${agentId}`,
+    )
     if (codebuffParsed) {
       const dbAgent = await fetchAgentFromDatabase(codebuffParsed)
       if (dbAgent) {

backend/src/tools/handlers/tool/spawn-agents.ts

@@ -1,10 +1,8 @@
 import { MAX_AGENT_STEPS_DEFAULT } from '@codebuff/common/constants/agents'
 import { generateCompactId } from '@codebuff/common/util/string'
+import { parseAgentId } from '@codebuff/common/util/agent-id-parsing'
 
-import {
-  getAgentTemplate,
-  parseAgentId,
-} from '../../../templates/agent-registry'
+import { getAgentTemplate } from '../../../templates/agent-registry'
 import { logger } from '../../../util/logger'
 
 import type { CodebuffToolHandlerFunction } from '../handler-function-type'
@@ -288,22 +286,27 @@ const getMatchingSpawn = (
   spawnableAgents: AgentTemplateType[],
   childFullAgentId: string,
 ) => {
-  const parsedChildAgentId = parseAgentId(childFullAgentId)
-  if (!parsedChildAgentId) return null
   const {
     publisherId: childPublisherId,
     agentId: childAgentId,
     version: childVersion,
-  } = parsedChildAgentId
+  } = parseAgentId(childFullAgentId)
+
+  if (!childAgentId) {
+    return null
+  }
 
   for (const spawnableAgent of spawnableAgents) {
-    const parsedSpawnableAgent = parseAgentId(spawnableAgent)
-    if (!parsedSpawnableAgent) continue
     const {
       publisherId: spawnablePublisherId,
       agentId: spawnableAgentId,
       version: spawnableVersion,
-    } = parsedSpawnableAgent
+    } = parseAgentId(spawnableAgent)
+
+    if (!spawnableAgentId) {
+      continue
+    }
+
     if (
       spawnableAgentId === childAgentId &&
       spawnablePublisherId === childPublisherId &&

common/src/util/agent-id-parsing.ts

@@ -0,0 +1,75 @@
+/**
+ * Parse agent ID to extract publisher, agent name, and version
+ * Supports formats:
+ * - publisher/agentId[@version]
+ * - agentId[@version] (no publisher)
+ */
+export function parseAgentId(fullAgentId: string): {
+  publisherId?: string
+  agentId?: string
+  version?: string
+} {
+  // Check if it's in the publisher/agent-id[@version] format
+  const parts = fullAgentId.split('/')
+
+  if (parts.length === 2) {
+    // Full format: publisher/agentId[@version]
+    const [publisherId, agentNameWithVersion] = parts
+
+    if (!publisherId || !agentNameWithVersion) {
+      return { publisherId: undefined, agentId: undefined, version: undefined }
+    }
+
+    // Check for version suffix
+    const versionMatch = agentNameWithVersion.match(/^(.+)@(.+)$/)
+    if (versionMatch) {
+      const [, agentId, version] = versionMatch
+      return { publisherId, agentId, version }
+    }
+
+    return { publisherId, agentId: agentNameWithVersion }
+  } else if (parts.length === 1) {
+    // Just agent name (for backward compatibility)
+    const agentNameWithVersion = parts[0]
+
+    if (!agentNameWithVersion) {
+      return { publisherId: undefined, agentId: undefined, version: undefined }
+    }
+
+    // Check for version suffix
+    const versionMatch = agentNameWithVersion.match(/^(.+)@(.+)$/)
+    if (versionMatch) {
+      const [, agentId, version] = versionMatch
+      return { publisherId: undefined, agentId, version }
+    }
+
+    return {
+      publisherId: undefined,
+      agentId: agentNameWithVersion,
+      version: undefined,
+    }
+  }
+
+  return { publisherId: undefined, agentId: undefined, version: undefined }
+}
+
+/**
+ * Parse publishded agent ID to extract publisher, agent name, and optionally version
+ *
+ * If the agent ID is not in the publisher/agent format, return null
+ */
+export function parsePublishedAgentId(fullAgentId: string): {
+  publisherId: string
+  agentId: string
+  version?: string
+} | null {
+  const { publisherId, agentId, version } = parseAgentId(fullAgentId)
+  if (!publisherId || !agentId) {
+    return null
+  }
+  return {
+    publisherId,
+    agentId,
+    version,
+  }
+}