Move DynamicAgentService and AgentTemplate to common

Author: jahooma

backend/src/templates/agent-registry.ts

@@ -1,10 +1,10 @@
-import type { DynamicAgentValidationError } from './dynamic-agent-service'
-import type { AgentTemplate } from './types'
+import type { DynamicAgentValidationError } from '@codebuff/common/templates/dynamic-agent-service'
+import { dynamicAgentService } from '@codebuff/common/templates/dynamic-agent-service'
+import type { AgentTemplate } from '@codebuff/common/types/agent-template'
 
 import { ProjectFileContext } from '@codebuff/common/util/file'
 import { logger } from '../util/logger'
 import { agentTemplates as staticTemplates } from './agent-list'
-import { dynamicAgentService } from './dynamic-agent-service'
 
 export type AgentRegistry = Record<string, AgentTemplate>
 

backend/src/templates/types.ts

@@ -1,54 +1,15 @@
-import type { Model } from '@codebuff/common/constants'
-import type { ToolName } from '@codebuff/common/tools/constants'
 import type {
-  AgentState,
-  AgentTemplateType,
-  ToolResult,
-} from '@codebuff/common/types/session-state'
-import type { z } from 'zod/v4'
-import type { CodebuffToolCall } from '../tools/constants'
+  AgentTemplate,
+  StepGenerator,
+  StepHandler,
+} from '@codebuff/common/types/agent-template'
+import type { AgentTemplateType } from '@codebuff/common/types/session-state'
+import type { ToolName } from '@codebuff/common/tools/constants'
 
 import { AgentTemplateTypes } from '@codebuff/common/types/session-state'
 
-export type AgentTemplate<
-  P = string | undefined,
-  T = Record<string, any> | undefined,
-> = {
-  id: AgentTemplateType
-  displayName: string
-  model: Model
-
-  toolNames: ToolName[]
-  subagents: AgentTemplateType[]
-
-  parentPrompt?: string
-  systemPrompt: string
-  instructionsPrompt: string
-  stepPrompt: string
-  parentInstructions?: Record<string, string>
-
-  // Required parameters for spawning this agent.
-  inputSchema: {
-    prompt?: z.ZodSchema<P>
-    params?: z.ZodSchema<T>
-  }
-  includeMessageHistory: boolean
-  outputMode: 'last_message' | 'all_messages' | 'json'
-  outputSchema?: z.ZodSchema<any>
-
-  handleSteps?: StepHandler<P, T> | string // Function or string of the generator code for running in a sandbox
-}
-
-export type StepGenerator = Generator<
-  Omit<CodebuffToolCall, 'toolCallId'> | 'STEP' | 'STEP_ALL',
-  void,
-  { agentState: AgentState; toolResult: ToolResult | undefined }
->
-
-export type StepHandler<
-  P = string | undefined,
-  T = Record<string, any> | undefined,
-> = (params: { agentState: AgentState; prompt: P; params: T }) => StepGenerator
+// Re-export for backward compatibility
+export type { AgentTemplate, StepGenerator, StepHandler }
 
 const placeholderNames = [
   'AGENT_NAME',

…c/__tests__/dynamic-agent-loader.test.ts …c/__tests__/dynamic-agent-loader.test.tsbackend/src/__tests__/dynamic-agent-loader.test.ts renamed to common/src/__tests__/dynamic-agent-loader.test.ts backend/src/__tests__/dynamic-agent-loader.test.ts renamed to common/src/__tests__/dynamic-agent-loader.test.ts

@@ -1,8 +1,8 @@
 import {
   clearMockedModules,
   mockModule,
-} from '@codebuff/common/testing/mock-modules'
-import { ProjectFileContext } from '@codebuff/common/util/file'
+} from '../testing/mock-modules'
+import { ProjectFileContext } from '../util/file'
 import { afterAll, beforeAll, describe, expect, it } from 'bun:test'
 import {
   dynamicAgentService,
@@ -316,4 +316,4 @@ describe('Dynamic Agent Loader', () => {
       'git-committer' // Normalized without prefix
     )
   })
-})
+})

…/dynamic-agent-schema-validation.test.ts …/dynamic-agent-schema-validation.test.tsbackend/src/__tests__/dynamic-agent-schema-validation.test.ts renamed to common/src/__tests__/dynamic-agent-schema-validation.test.ts backend/src/__tests__/dynamic-agent-schema-validation.test.ts renamed to common/src/__tests__/dynamic-agent-schema-validation.test.ts

@@ -1,11 +1,11 @@
 import {
   clearMockedModules,
   mockModule,
-} from '@codebuff/common/testing/mock-modules'
+} from '../testing/mock-modules'
 import {
   getStubProjectFileContext,
   ProjectFileContext,
-} from '@codebuff/common/util/file'
+} from '../util/file'
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'bun:test'
 import { DynamicAgentService } from '../templates/dynamic-agent-service'
 
@@ -15,7 +15,7 @@ describe('Dynamic Agent Schema Validation', () => {
 
   beforeAll(() => {
     // Mock logger to avoid console output during tests
-    mockModule('@codebuff/backend/util/logger', () => ({
+    mockModule('../util/logger', () => ({
       logger: {
         debug: () => {},
         warn: () => {},
@@ -382,4 +382,4 @@ describe('Dynamic Agent Schema Validation', () => {
       ).toBeUndefined()
     })
   })
-})
+})

…rc/__tests__/handlesteps-parsing.test.ts …rc/__tests__/handlesteps-parsing.test.tsbackend/src/__tests__/handlesteps-parsing.test.ts renamed to common/src/__tests__/handlesteps-parsing.test.ts backend/src/__tests__/handlesteps-parsing.test.ts renamed to common/src/__tests__/handlesteps-parsing.test.ts

@@ -1,9 +1,9 @@
 import {
   DynamicAgentConfigSchema,
   DynamicAgentTemplate,
-} from '@codebuff/common/types/dynamic-agent-template'
-import { AgentState } from '@codebuff/common/types/session-state'
-import { ProjectFileContext } from '@codebuff/common/util/file'
+} from '../types/dynamic-agent-template'
+import { AgentState } from '../types/session-state'
+import { ProjectFileContext } from '../util/file'
 import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
 import { dynamicAgentService } from '../templates/dynamic-agent-service'
 
@@ -135,7 +135,7 @@ describe('handleSteps Parsing Tests', () => {
   test('should require set_output tool for handleSteps with json output mode', () => {
     const {
       DynamicAgentTemplateSchema,
-    } = require('@codebuff/common/types/dynamic-agent-template')
+    } = require('../types/dynamic-agent-template')
 
     const agentConfig = {
       id: 'test-agent',
@@ -226,4 +226,4 @@ describe('handleSteps Parsing Tests', () => {
     expect(result.templates['test-agent'].handleSteps).toBe(expectedStringified)
     expect(typeof result.templates['test-agent'].handleSteps).toBe('string')
   })
-})
+})

…d/src/templates/dynamic-agent-service.ts …n/src/templates/dynamic-agent-service.tsbackend/src/templates/dynamic-agent-service.ts renamed to common/src/templates/dynamic-agent-service.ts backend/src/templates/dynamic-agent-service.ts renamed to common/src/templates/dynamic-agent-service.ts

@@ -1,21 +1,20 @@
 import * as path from 'path'
 
-import { ToolName } from '@codebuff/common/tools/constants'
-import { DynamicAgentTemplate } from '@codebuff/common/types/dynamic-agent-template'
-import { AgentTemplateType } from '@codebuff/common/types/session-state'
-import { filterValidAgentTemplates } from '@codebuff/common/util/agent-file-utils'
-import { normalizeAgentNames } from '@codebuff/common/util/agent-name-normalization'
+import { ToolName } from '../tools/constants'
+import { AgentTemplate } from '../types/agent-template'
+import { DynamicAgentTemplate } from '../types/dynamic-agent-template'
+import { AgentTemplateType } from '../types/session-state'
+import { filterValidAgentTemplates } from '../util/agent-file-utils'
+import { normalizeAgentNames } from '../util/agent-name-normalization'
 import {
   formatParentInstructionsError,
   formatSubagentError,
   validateParentInstructions,
   validateSubagents,
-} from '@codebuff/common/util/agent-template-validation'
-import { ProjectFileContext } from '@codebuff/common/util/file'
-import { convertJsonSchemaToZod } from 'zod-from-json-schema'
-
+} from '../util/agent-template-validation'
+import { ProjectFileContext } from '../util/file'
 import { logger } from '../util/logger'
-import { AgentTemplate } from './types'
+import { convertJsonSchemaToZod } from 'zod-from-json-schema'
 
 export interface DynamicAgentValidationError {
   filePath: string
@@ -411,4 +410,4 @@ export class DynamicAgentService {
 }
 
 // Export a singleton instance
-export const dynamicAgentService = new DynamicAgentService()
+export const dynamicAgentService = new DynamicAgentService()

common/src/types/agent-template.ts

@@ -0,0 +1,48 @@
+import type { Model } from '../constants'
+import type { ToolName } from '../tools/constants'
+import type {
+  AgentState,
+  AgentTemplateType,
+  ToolResult,
+} from './session-state'
+import type { z } from 'zod/v4'
+
+export type AgentTemplate<
+  P = string | undefined,
+  T = Record<string, any> | undefined,
+> = {
+  id: AgentTemplateType
+  displayName: string
+  model: Model
+
+  toolNames: ToolName[]
+  subagents: AgentTemplateType[]
+
+  parentPrompt?: string
+  systemPrompt: string
+  instructionsPrompt: string
+  stepPrompt: string
+  parentInstructions?: Record<string, string>
+
+  // Required parameters for spawning this agent.
+  inputSchema: {
+    prompt?: z.ZodSchema<P>
+    params?: z.ZodSchema<T>
+  }
+  includeMessageHistory: boolean
+  outputMode: 'last_message' | 'all_messages' | 'json'
+  outputSchema?: z.ZodSchema<any>
+
+  handleSteps?: StepHandler<P, T> | string // Function or string of the generator code for running in a sandbox
+}
+
+export type StepGenerator = Generator<
+  Omit<any, 'toolCallId'> | 'STEP' | 'STEP_ALL', // Generic tool call type
+  void,
+  { agentState: AgentState; toolResult: ToolResult | undefined }
+>
+
+export type StepHandler<
+  P = string | undefined,
+  T = Record<string, any> | undefined,
+> = (params: { agentState: AgentState; prompt: P; params: T }) => StepGenerator