gnhf jobrunr#38: Реализован 15.6.1 Agent assignment per role — V36 миграция role_agent_config, RoleAgentConfig entity/repository/service с hierarchy fallback и кэшем, интеграция model override через весь pipeline (ChatRestController→SseStreamingService→ChatService), REST API endpoints для управления, 26 новых тестов, все 1147 тестов зелёные

Author: a-simeshin

javaclaw-api/javaclaw-api-admin/src/main/java/ai/javaclaw/api/admin/users/RoleController.java

@@ -1,5 +1,7 @@
 package ai.javaclaw.api.admin.users;
 
+import ai.javaclaw.agent.config.RoleAgentConfig;
+import ai.javaclaw.agent.config.RoleAgentConfigService;
 import ai.javaclaw.users.CustomRole;
 import ai.javaclaw.users.CustomRoleService;
 import ai.javaclaw.users.Permission;
@@ -22,9 +24,11 @@
 public class RoleController {
 
     private final CustomRoleService roleService;
+    private final RoleAgentConfigService agentConfigService;
 
-    public RoleController(CustomRoleService roleService) {
+    public RoleController(CustomRoleService roleService, RoleAgentConfigService agentConfigService) {
         this.roleService = roleService;
+        this.agentConfigService = agentConfigService;
     }
 
     @GetMapping
@@ -90,6 +94,68 @@ public record UpdateDescriptionRequest(String description) {}
 
     public record SetPermissionsRequest(List<String> permissions) {}
 
+    // --- Agent config endpoints (15.6.1) ---
+
+    @GetMapping("/{name}/agent-config")
+    public ResponseEntity<AgentConfigDto> getAgentConfig(@PathVariable String name) {
+        return agentConfigService
+                .getForRole(name)
+                .map(this::toAgentConfigDto)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
+    }
+
+    @GetMapping("/agent-configs")
+    public List<AgentConfigDto> listAgentConfigs() {
+        return agentConfigService.listAll().stream().map(this::toAgentConfigDto).toList();
+    }
+
+    @PutMapping("/{name}/agent-config")
+    public ResponseEntity<AgentConfigDto> saveAgentConfig(
+            @PathVariable String name, @RequestBody SaveAgentConfigRequest request) {
+        RoleAgentConfig saved = agentConfigService.save(
+                name,
+                request.modelId(),
+                request.thinkingEnabled() != null ? request.thinkingEnabled() : false,
+                request.thinkingBudget() != null ? request.thinkingBudget() : 10000,
+                request.fallbackModels(),
+                request.maxContextTokens() != null ? request.maxContextTokens() : 200000);
+        return ResponseEntity.ok(toAgentConfigDto(saved));
+    }
+
+    @DeleteMapping("/{name}/agent-config")
+    public ResponseEntity<Void> deleteAgentConfig(@PathVariable String name) {
+        agentConfigService.delete(name);
+        return ResponseEntity.noContent().build();
+    }
+
+    private AgentConfigDto toAgentConfigDto(RoleAgentConfig config) {
+        return new AgentConfigDto(
+                config.role(),
+                config.modelId(),
+                config.thinkingEnabled(),
+                config.thinkingBudget(),
+                config.fallbackModels(),
+                config.fallbackModelList(),
+                config.maxContextTokens());
+    }
+
+    public record AgentConfigDto(
+            String role,
+            String modelId,
+            boolean thinkingEnabled,
+            int thinkingBudget,
+            String fallbackModels,
+            List<String> fallbackModelList,
+            int maxContextTokens) {}
+
+    public record SaveAgentConfigRequest(
+            String modelId,
+            Boolean thinkingEnabled,
+            Integer thinkingBudget,
+            String fallbackModels,
+            Integer maxContextTokens) {}
+
     @org.springframework.web.bind.annotation.ExceptionHandler(IllegalArgumentException.class)
     public ResponseEntity<java.util.Map<String, String>> handleBadRequest(IllegalArgumentException ex) {
         return ResponseEntity.badRequest().body(java.util.Map.of("error", ex.getMessage()));

javaclaw-api/javaclaw-api-chat/src/main/java/ai/javaclaw/api/chat/controller/ChatRestController.java

@@ -1,5 +1,6 @@
 package ai.javaclaw.api.chat.controller;
 
+import ai.javaclaw.agent.config.RoleAgentConfigService;
 import ai.javaclaw.agent.quota.AgentQuotaService;
 import ai.javaclaw.api.chat.controller.dto.ChatSendRequest;
 import ai.javaclaw.api.chat.service.SseStreamingService;
@@ -40,6 +41,7 @@ public class ChatRestController {
     private final ConversationEnsurer conversationEnsurer;
     private final UserResolver userResolver;
     private final AgentQuotaService agentQuotaService;
+    private final RoleAgentConfigService roleAgentConfigService;
 
     @PostMapping(value = "/send", produces = "text/plain;charset=UTF-8")
     public ResponseEntity<ResponseBodyEmitter> send(
@@ -55,9 +57,11 @@ public ResponseEntity<ResponseBodyEmitter> send(
         } catch (RateLimitExceededException e) {
             return ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS).build();
         }
+        final String userRole = userResolver.resolveUserRole(principal.getName());
+        final String modelOverride = roleAgentConfigService.resolveModelForRole(userRole);
         conversationEnsurer.ensureExistsForUser(conversationId, userId);
         conversationEnsurer.touch(conversationId, request.content());
-        streamingService.stream(emitter, conversationId, userId, request.content());
+        streamingService.stream(emitter, conversationId, userId, request.content(), modelOverride);
         return ResponseEntity.ok()
                 .header(VERCEL_STREAM_HEADER, VERCEL_STREAM_VERSION)
                 .header("x-conversation-id", conversationId)

javaclaw-api/javaclaw-api-chat/src/main/java/ai/javaclaw/api/chat/service/SseStreamingService.java

@@ -146,6 +146,24 @@ public void stream(
             final String conversationId,
             final String userId,
             final String userContent) {
+        stream(emitter, conversationId, userId, userContent, null);
+    }
+
+    /**
+     * Streams the agent's response with per-user prompt support and role-based model override.
+     *
+     * @param emitter цель для записи SSE-событий
+     * @param conversationId идентификатор разговора
+     * @param userId идентификатор пользователя для per-user промптов, может быть null
+     * @param userContent сообщение пользователя
+     * @param modelOverride модель для использования вместо дефолтной, может быть null
+     */
+    public void stream(
+            final ResponseBodyEmitter emitter,
+            final String conversationId,
+            final String userId,
+            final String userContent,
+            final String modelOverride) {
         final Object lock = new Object();
         final ScheduledFuture<?> heartbeat = heartbeatScheduler.scheduleAtFixedRate(
                 () -> sendHeartbeat(emitter, lock),
@@ -156,7 +174,7 @@ public void stream(
         emitter.onTimeout(() -> heartbeat.cancel(false));
         emitter.onError(ex -> heartbeat.cancel(false));
 
-        streamExecutor.execute(() -> runStream(emitter, lock, conversationId, userId, userContent));
+        streamExecutor.execute(() -> runStream(emitter, lock, conversationId, userId, userContent, modelOverride));
     }
 
     /**
@@ -177,7 +195,8 @@ private void runStream(
             final Object lock,
             final String conversationId,
             final String userId,
-            final String userContent) {
+            final String userContent,
+            final String modelOverride) {
         final String messageId = "msg_" + UUID.randomUUID();
         final String textBlockId = "text_" + UUID.randomUUID();
         final String reasoningBlockId = "reasoning_" + UUID.randomUUID();
@@ -195,7 +214,7 @@ private void runStream(
                     lock,
                     VercelSseEvent.MessageStart.builder().messageId(messageId).build());
 
-            chatService.stream(conversationId, userId, userContent)
+            chatService.stream(conversationId, userId, userContent, modelOverride)
                     .takeUntilOther(cancelSink.asMono())
                     .doOnNext(response -> {
                         if (response == null

javaclaw-api/javaclaw-api-chat/src/test/java/ai/javaclaw/api/chat/controller/ChatRestControllerTest.java

@@ -11,6 +11,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
+import ai.javaclaw.agent.config.RoleAgentConfigService;
 import ai.javaclaw.agent.quota.AgentQuotaService;
 import ai.javaclaw.api.chat.error.SseExceptionHandler;
 import ai.javaclaw.api.chat.service.SseStreamingService;
@@ -30,6 +31,7 @@ class ChatRestControllerTest {
     private ConversationEnsurer conversationEnsurer;
     private UserResolver userResolver;
     private AgentQuotaService agentQuotaService;
+    private RoleAgentConfigService roleAgentConfigService;
     private MockMvc mockMvc;
 
     @BeforeEach
@@ -38,9 +40,11 @@ void setUp() {
         conversationEnsurer = mock(ConversationEnsurer.class);
         userResolver = mock(UserResolver.class);
         agentQuotaService = mock(AgentQuotaService.class);
+        roleAgentConfigService = mock(RoleAgentConfigService.class);
         when(userResolver.resolveUserId("admin")).thenReturn("admin-uuid");
-        mockMvc = standaloneSetup(
-                        new ChatRestController(streamingService, conversationEnsurer, userResolver, agentQuotaService))
+        when(userResolver.resolveUserRole("admin")).thenReturn("ADMIN");
+        mockMvc = standaloneSetup(new ChatRestController(
+                        streamingService, conversationEnsurer, userResolver, agentQuotaService, roleAgentConfigService))
                 .defaultRequest(post("/").principal(adminPrincipal()))
                 .setControllerAdvice(new SseExceptionHandler())
                 .build();
@@ -53,7 +57,7 @@ private static Principal adminPrincipal() {
     @Test
     void postSendReturnsOkWithVercelHeader() throws Exception {
         when(streamingService.createEmitter()).thenReturn(new ResponseBodyEmitter(5000L));
-        doNothing().when(streamingService).stream(any(), anyString(), anyString(), anyString());
+        doNothing().when(streamingService).stream(any(), anyString(), anyString(), anyString(), any());
 
         mockMvc.perform(post("/api/chat/send")
                         .contentType(MediaType.APPLICATION_JSON)
@@ -62,7 +66,7 @@ void postSendReturnsOkWithVercelHeader() throws Exception {
                 .andExpect(header().string("x-vercel-ai-data-stream", "v1"))
                 .andExpect(header().string("Content-Type", "text/plain;charset=UTF-8"));
 
-        verify(streamingService).stream(any(), anyString(), anyString(), anyString());
+        verify(streamingService).stream(any(), anyString(), anyString(), anyString(), any());
         verify(conversationEnsurer).ensureExistsForUser("web", "admin-uuid");
         verify(conversationEnsurer).touch("web", "hello");
     }
@@ -86,7 +90,7 @@ void postSendGeneratesDefaultConversationIdWhenBlank() throws Exception {
                         .content("{\"content\":\"hello\"}"))
                 .andExpect(status().isOk());
 
-        verify(streamingService).stream(any(), anyString(), anyString(), anyString());
+        verify(streamingService).stream(any(), anyString(), anyString(), anyString(), any());
     }
 
     @Test

javaclaw-api/javaclaw-api-chat/src/test/java/ai/javaclaw/api/chat/service/SseStreamingServiceTest.java

@@ -145,7 +145,8 @@ void streamEmitsReasoningDeltasForThinkingMetadata() throws Exception {
                 new ChatResponse(List.of(new Generation(thinkingMsg2))),
                 new ChatResponse(List.of(new Generation(signatureMsg))),
                 new ChatResponse(List.of(new Generation(textMsg))));
-        when(chatService.stream(eq("think-test"), isNull(), eq("why?"))).thenReturn(flux);
+        when(chatService.stream(eq("think-test"), isNull(), eq("why?"), isNull()))
+                .thenReturn(flux);
 
         final SseStreamingService service = new SseStreamingService(
                 chatService,
@@ -198,7 +199,7 @@ void streamHandlesTextOnlyWithoutReasoning() throws Exception {
         final Flux<ChatResponse> flux = Flux.just(
                 new ChatResponse(List.of(new Generation(textMsg1))),
                 new ChatResponse(List.of(new Generation(textMsg2))));
-        when(chatService.stream(eq("text-test"), isNull(), eq("hi"))).thenReturn(flux);
+        when(chatService.stream(eq("text-test"), isNull(), eq("hi"), isNull())).thenReturn(flux);
 
         final SseStreamingService service = new SseStreamingService(
                 chatService,
@@ -234,7 +235,8 @@ void streamClosesUnfinishedReasoningBlock() throws Exception {
         final Flux<ChatResponse> flux = Flux.just(
                 new ChatResponse(List.of(new Generation(thinkingMsg))),
                 new ChatResponse(List.of(new Generation(textMsg))));
-        when(chatService.stream(eq("unfinished-think"), isNull(), eq("q"))).thenReturn(flux);
+        when(chatService.stream(eq("unfinished-think"), isNull(), eq("q"), isNull()))
+                .thenReturn(flux);
 
         final SseStreamingService service = new SseStreamingService(
                 chatService,
@@ -302,7 +304,8 @@ void cancelTerminatesActiveStream() throws Exception {
         // Slow flux that emits tokens with delays — simulates long LLM response
         final Flux<ChatResponse> slowFlux = Flux.interval(Duration.ofMillis(50))
                 .map(i -> new ChatResponse(java.util.List.of(new Generation(new AssistantMessage("token" + i)))));
-        when(chatService.stream(eq("cancel-test"), isNull(), eq("hello"))).thenReturn(slowFlux);
+        when(chatService.stream(eq("cancel-test"), isNull(), eq("hello"), isNull()))
+                .thenReturn(slowFlux);
 
         final SseStreamingService service = new SseStreamingService(
                 chatService,

javaclaw-core/src/main/java/ai/javaclaw/agent/config/RoleAgentConfig.java

@@ -0,0 +1,66 @@
+package ai.javaclaw.agent.config;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+import org.springframework.lang.Nullable;
+
+/**
+ * Per-role agent configuration: which model to use, thinking settings, fallback chain.
+ * Stored in {@code role_agent_config} table (V36 migration).
+ *
+ * <p>If {@code modelId} is null, the system default model is used for that role.
+ */
+@Table("role_agent_config")
+public record RoleAgentConfig(
+        @Id String id,
+        @Column("role") String role,
+        @Nullable @Column("model_id") String modelId,
+        @Column("thinking_enabled") boolean thinkingEnabled,
+        @Column("thinking_budget") int thinkingBudget,
+        @Nullable @Column("fallback_models") String fallbackModels,
+        @Column("max_context_tokens") int maxContextTokens) {
+
+    /** Create a new config (id generated by DB). */
+    public static RoleAgentConfig create(
+            String role,
+            @Nullable String modelId,
+            boolean thinkingEnabled,
+            int thinkingBudget,
+            @Nullable String fallbackModels,
+            int maxContextTokens) {
+        return new RoleAgentConfig(
+                null, role, modelId, thinkingEnabled, thinkingBudget, fallbackModels, maxContextTokens);
+    }
+
+    /** Returns fallback models as a list (comma-separated in DB). */
+    public java.util.List<String> fallbackModelList() {
+        if (fallbackModels == null || fallbackModels.isBlank()) {
+            return java.util.List.of();
+        }
+        return java.util.Arrays.stream(fallbackModels.split(","))
+                .map(String::trim)
+                .filter(s -> !s.isEmpty())
+                .toList();
+    }
+
+    /** Returns a copy with updated fields. */
+    public RoleAgentConfig withModelId(@Nullable String modelId) {
+        return new RoleAgentConfig(
+                id, role, modelId, thinkingEnabled, thinkingBudget, fallbackModels, maxContextTokens);
+    }
+
+    public RoleAgentConfig withThinking(boolean enabled, int budget) {
+        return new RoleAgentConfig(id, role, modelId, enabled, budget, fallbackModels, maxContextTokens);
+    }
+
+    public RoleAgentConfig withFallbackModels(@Nullable String fallbackModels) {
+        return new RoleAgentConfig(
+                id, role, modelId, thinkingEnabled, thinkingBudget, fallbackModels, maxContextTokens);
+    }
+
+    public RoleAgentConfig withMaxContextTokens(int maxContextTokens) {
+        return new RoleAgentConfig(
+                id, role, modelId, thinkingEnabled, thinkingBudget, fallbackModels, maxContextTokens);
+    }
+}

javaclaw-core/src/main/java/ai/javaclaw/agent/config/RoleAgentConfigRepository.java

@@ -0,0 +1,23 @@
+package ai.javaclaw.agent.config;
+
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jdbc.repository.query.Modifying;
+import org.springframework.data.jdbc.repository.query.Query;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.data.repository.query.Param;
+
+/** Spring Data JDBC repository for role_agent_config table (V36). */
+public interface RoleAgentConfigRepository extends ListCrudRepository<RoleAgentConfig, String> {
+
+    Optional<RoleAgentConfig> findByRole(String role);
+
+    boolean existsByRole(String role);
+
+    @Modifying
+    @Query("DELETE FROM role_agent_config WHERE role = :role")
+    void deleteByRole(@Param("role") String role);
+
+    @Query("SELECT * FROM role_agent_config ORDER BY role")
+    List<RoleAgentConfig> findAllOrdered();
+}