feat(agents, sessions): implement replace functionality for agent and session updates

src/main/apiServer/routes/agents/handlers/agents.ts

@@ -1,8 +1,9 @@
 import { loggerService } from '@logger'
-import { ListAgentsResponse } from '@types'
+import { ListAgentsResponse,type ReplaceAgentRequest, type UpdateAgentRequest } from '@types'
 import { Request, Response } from 'express'
 
 import { agentService } from '../../../../services/agents'
+import type { ValidationRequest } from '../validators/zodValidator'
 
 const logger = loggerService.withContext('ApiServerAgentsHandlers')
 
@@ -263,7 +264,10 @@ export const updateAgent = async (req: Request, res: Response): Promise<Response
     logger.info(`Updating agent: ${agentId}`)
     logger.debug('Update data:', req.body)
 
-    const agent = await agentService.updateAgent(agentId, req.body)
+    const { validatedBody } = req as ValidationRequest
+    const replacePayload = (validatedBody ?? {}) as ReplaceAgentRequest
+
+    const agent = await agentService.updateAgent(agentId, replacePayload, { replace: true })
 
     if (!agent) {
       logger.warn(`Agent not found for update: ${agentId}`)
@@ -395,7 +399,10 @@ export const patchAgent = async (req: Request, res: Response): Promise<Response>
     logger.info(`Partially updating agent: ${agentId}`)
     logger.debug('Partial update data:', req.body)
 
-    const agent = await agentService.updateAgent(agentId, req.body)
+    const { validatedBody } = req as ValidationRequest
+    const updatePayload = (validatedBody ?? {}) as UpdateAgentRequest
+
+    const agent = await agentService.updateAgent(agentId, updatePayload)
 
     if (!agent) {
       logger.warn(`Agent not found for partial update: ${agentId}`)

src/main/apiServer/routes/agents/handlers/sessions.ts

@@ -1,8 +1,10 @@
 import { loggerService } from '@logger'
 import { sessionMessageService, sessionService } from '@main/services/agents'
-import { CreateSessionResponse, ListAgentSessionsResponse } from '@types'
+import { CreateSessionResponse, ListAgentSessionsResponse,type ReplaceSessionRequest } from '@types'
 import { Request, Response } from 'express'
 
+import type { ValidationRequest } from '../validators/zodValidator'
+
 const logger = loggerService.withContext('ApiServerSessionsHandlers')
 
 export const createSession = async (req: Request, res: Response): Promise<Response> => {
@@ -131,9 +133,10 @@ export const updateSession = async (req: Request, res: Response): Promise<Respon
       })
     }
 
-    // For PUT, we replace the entire resource
-    const sessionData = { ...req.body, main_agent_id: agentId }
-    const session = await sessionService.updateSession(agentId, sessionId, sessionData)
+    const { validatedBody } = req as ValidationRequest
+    const replacePayload = (validatedBody ?? {}) as ReplaceSessionRequest
+
+    const session = await sessionService.updateSession(agentId, sessionId, replacePayload)
 
     if (!session) {
       logger.warn(`Session not found for update: ${sessionId}`)

src/main/apiServer/routes/agents/index.ts

@@ -5,11 +5,13 @@ import { checkAgentExists, handleValidationErrors } from './middleware'
 import {
   validateAgent,
   validateAgentId,
+  validateAgentReplace,
   validateAgentUpdate,
   validatePagination,
   validateSession,
   validateSessionId,
   validateSessionMessage,
+  validateSessionReplace,
   validateSessionUpdate
 } from './validators'
 
@@ -152,7 +154,13 @@ const agentsRouter = express.Router()
 agentsRouter.post('/', validateAgent, handleValidationErrors, agentHandlers.createAgent)
 agentsRouter.get('/', validatePagination, handleValidationErrors, agentHandlers.listAgents)
 agentsRouter.get('/:agentId', validateAgentId, handleValidationErrors, agentHandlers.getAgent)
-agentsRouter.put('/:agentId', validateAgentId, validateAgentUpdate, handleValidationErrors, agentHandlers.updateAgent)
+agentsRouter.put(
+  '/:agentId',
+  validateAgentId,
+  validateAgentReplace,
+  handleValidationErrors,
+  agentHandlers.updateAgent
+)
 agentsRouter.patch('/:agentId', validateAgentId, validateAgentUpdate, handleValidationErrors, agentHandlers.patchAgent)
 agentsRouter.delete('/:agentId', validateAgentId, handleValidationErrors, agentHandlers.deleteAgent)
 
@@ -167,7 +175,7 @@ const createSessionsRouter = (): express.Router => {
   sessionsRouter.put(
     '/:sessionId',
     validateSessionId,
-    validateSessionUpdate,
+    validateSessionReplace,
     handleValidationErrors,
     sessionHandlers.updateSession
   )

src/main/apiServer/routes/agents/validators/agents.ts

@@ -1,4 +1,9 @@
-import { AgentIdParamSchema, CreateAgentRequestSchema, UpdateAgentRequestSchema } from '@types'
+import {
+  AgentIdParamSchema,
+  CreateAgentRequestSchema,
+  ReplaceAgentRequestSchema,
+  UpdateAgentRequestSchema
+} from '@types'
 
 import { createZodValidator } from './zodValidator'
 
@@ -6,6 +11,10 @@ export const validateAgent = createZodValidator({
   body: CreateAgentRequestSchema
 })
 
+export const validateAgentReplace = createZodValidator({
+  body: ReplaceAgentRequestSchema
+})
+
 export const validateAgentUpdate = createZodValidator({
   body: UpdateAgentRequestSchema
 })

src/main/apiServer/routes/agents/validators/sessions.ts

@@ -1,4 +1,9 @@
-import { CreateSessionRequestSchema, SessionIdParamSchema, UpdateSessionRequestSchema } from '@types'
+import {
+  CreateSessionRequestSchema,
+  ReplaceSessionRequestSchema,
+  SessionIdParamSchema,
+  UpdateSessionRequestSchema
+} from '@types'
 
 import { createZodValidator } from './zodValidator'
 
@@ -6,6 +11,10 @@ export const validateSession = createZodValidator({
   body: CreateSessionRequestSchema
 })
 
+export const validateSessionReplace = createZodValidator({
+  body: ReplaceSessionRequestSchema
+})
+
 export const validateSessionUpdate = createZodValidator({
   body: UpdateSessionRequestSchema
 })

src/main/services/agents/BaseService.ts

@@ -27,7 +27,7 @@ export abstract class BaseService {
   protected static db: LibSQLDatabase<typeof schema> | null = null
   protected static isInitialized = false
   protected static initializationPromise: Promise<void> | null = null
-  protected jsonFields: string[] = ['built_in_tools', 'mcps', 'configuration', 'accessible_paths']
+  protected jsonFields: string[] = ['built_in_tools', 'mcps', 'configuration', 'accessible_paths', 'allowed_tools']
 
   /**
    * Initialize database with retry logic and proper error handling

src/main/services/agents/services/AgentService.ts

@@ -1,7 +1,8 @@
 import path from 'node:path'
 
 import { getDataPath } from '@main/utils'
-import type {
+import {
+  AgentBaseSchema,
   AgentEntity,
   CreateAgentRequest,
   CreateAgentResponse,
@@ -111,7 +112,11 @@ export class AgentService extends BaseService {
     return { agents, total: totalResult[0].count }
   }
 
-  async updateAgent(id: string, updates: UpdateAgentRequest): Promise<UpdateAgentResponse | null> {
+  async updateAgent(
+    id: string,
+    updates: UpdateAgentRequest,
+    options: { replace?: boolean } = {}
+  ): Promise<UpdateAgentResponse | null> {
     this.ensureInitialized()
 
     // Check if agent exists
@@ -126,18 +131,20 @@ export class AgentService extends BaseService {
     const updateData: Partial<AgentRow> = {
       updated_at: now
     }
+    const replaceableFields = Object.keys(AgentBaseSchema.shape) as (keyof AgentRow)[]
+    const shouldReplace = options.replace ?? false
+
+    for (const field of replaceableFields) {
+      if (shouldReplace || Object.prototype.hasOwnProperty.call(serializedUpdates, field)) {
+        if (Object.prototype.hasOwnProperty.call(serializedUpdates, field)) {
+          const value = serializedUpdates[field as keyof typeof serializedUpdates]
+          ;(updateData as Record<string, unknown>)[field] = value ?? null
+        } else if (shouldReplace) {
+          ;(updateData as Record<string, unknown>)[field] = null
+        }
+      }
+    }
 
-    // Only update fields that are provided
-    if (serializedUpdates.name !== undefined) updateData.name = serializedUpdates.name
-    if (serializedUpdates.description !== undefined) updateData.description = serializedUpdates.description
-    if (serializedUpdates.instructions !== undefined) updateData.instructions = serializedUpdates.instructions
-    if (serializedUpdates.model !== undefined) updateData.model = serializedUpdates.model
-    if (serializedUpdates.plan_model !== undefined) updateData.plan_model = serializedUpdates.plan_model
-    if (serializedUpdates.small_model !== undefined) updateData.small_model = serializedUpdates.small_model
-    if (serializedUpdates.mcps !== undefined) updateData.mcps = serializedUpdates.mcps
-    if (serializedUpdates.configuration !== undefined) updateData.configuration = serializedUpdates.configuration
-    if (serializedUpdates.accessible_paths !== undefined)
-      updateData.accessible_paths = serializedUpdates.accessible_paths
     await this.database.update(agentsTable).set(updateData).where(eq(agentsTable.id, id))
     return await this.getAgent(id)
   }

src/main/services/agents/services/SessionService.ts

@@ -1,11 +1,12 @@
-import type {
-  AgentEntity,
-  AgentSessionEntity,
-  CreateSessionRequest,
-  CreateSessionResponse,
-  GetAgentSessionResponse,
-  ListOptions,
-  UpdateSessionRequest
+import {
+  AgentBaseSchema,
+  type AgentEntity,
+  type AgentSessionEntity,
+  type CreateSessionRequest,
+  type CreateSessionResponse,
+  type GetAgentSessionResponse,
+  type ListOptions,
+  type UpdateSessionRequest
 } from '@types'
 import { and, count, eq, type SQL } from 'drizzle-orm'
 
@@ -149,7 +150,11 @@ export class SessionService extends BaseService {
     return { sessions, total }
   }
 
-  async updateSession(agentId: string, id: string, updates: UpdateSessionRequest): Promise<GetAgentSessionResponse | null> {
+  async updateSession(
+    agentId: string,
+    id: string,
+    updates: UpdateSessionRequest
+  ): Promise<GetAgentSessionResponse | null> {
     this.ensureInitialized()
 
     // Check if session exists
@@ -167,19 +172,14 @@ export class SessionService extends BaseService {
     const updateData: Partial<SessionRow> = {
       updated_at: now
     }
+    const replaceableFields = Object.keys(AgentBaseSchema.shape) as (keyof SessionRow)[]
 
-    // Only update fields that are provided
-    if (serializedUpdates.name !== undefined) updateData.name = serializedUpdates.name
-
-    if (serializedUpdates.model !== undefined) updateData.model = serializedUpdates.model
-    if (serializedUpdates.plan_model !== undefined) updateData.plan_model = serializedUpdates.plan_model
-    if (serializedUpdates.small_model !== undefined) updateData.small_model = serializedUpdates.small_model
-
-    if (serializedUpdates.mcps !== undefined) updateData.mcps = serializedUpdates.mcps
-
-    if (serializedUpdates.configuration !== undefined) updateData.configuration = serializedUpdates.configuration
-    if (serializedUpdates.accessible_paths !== undefined)
-      updateData.accessible_paths = serializedUpdates.accessible_paths
+    for (const field of replaceableFields) {
+      if (Object.prototype.hasOwnProperty.call(serializedUpdates, field)) {
+        const value = serializedUpdates[field as keyof typeof serializedUpdates]
+        ;(updateData as Record<string, unknown>)[field] = value ?? null
+      }
+    }
 
     await this.database.update(sessionsTable).set(updateData).where(eq(sessionsTable.id, id))
 

src/renderer/src/types/agent.ts

@@ -163,6 +163,8 @@ export type CreateAgentResponse = AgentEntity
 
 export interface UpdateAgentRequest extends Partial<AgentBase> {}
 
+export type ReplaceAgentRequest = AgentBase
+
 export const GetAgentResponseSchema = AgentEntitySchema.extend({
   built_in_tools: z.array(ToolSchema).optional() // Built-in tools available to the agent
 })
@@ -250,6 +252,8 @@ export const CreateAgentRequestSchema = agentCreatableSchema.extend({
 
 export const UpdateAgentRequestSchema = AgentBaseSchema.partial()
 
+export const ReplaceAgentRequestSchema = AgentBaseSchema
+
 const sessionCreatableSchema = AgentBaseSchema.extend({
   model: z.string().min(1, 'Model is required')
 })
@@ -258,6 +262,10 @@ export const CreateSessionRequestSchema = sessionCreatableSchema
 
 export const UpdateSessionRequestSchema = sessionCreatableSchema.partial()
 
+export const ReplaceSessionRequestSchema = sessionCreatableSchema
+
+export type ReplaceSessionRequest = z.infer<typeof ReplaceSessionRequestSchema>
+
 export const CreateSessionMessageRequestSchema = z.object({
   content: z.string().min(1, 'Content must be a valid string')
 })