diff --git a/src/main/apiServer/routes/agents/handlers/agents.ts b/src/main/apiServer/routes/agents/handlers/agents.ts
index 6e35f12c8..dc9e4ecf5 100644
--- a/src/main/apiServer/routes/agents/handlers/agents.ts
+++ b/src/main/apiServer/routes/agents/handlers/agents.ts
@@ -1,5 +1,5 @@
 import { loggerService } from '@logger'
-import { AgentModelValidationError, agentService } from '@main/services/agents'
+import { AgentModelValidationError, agentService, sessionService } from '@main/services/agents'
 import { ListAgentsResponse, type ReplaceAgentRequest, type UpdateAgentRequest } from '@types'
 import { Request, Response } from 'express'
 
@@ -20,7 +20,8 @@ const modelValidationErrorBody = (error: AgentModelValidationError) => ({
  * /v1/agents:
  *   post:
  *     summary: Create a new agent
- *     description: Creates a new autonomous agent with the specified configuration
+ *     description: Creates a new autonomous agent with the specified configuration and automatically
+ *       provisions an initial session that mirrors the agent's settings.
  *     tags: [Agents]
  *     requestBody:
  *       required: true
@@ -55,8 +56,37 @@ export const createAgent = async (req: Request, res: Response): Promise<Response
 
     const agent = await agentService.createAgent(req.body)
 
-    logger.info(`Agent created successfully: ${agent.id}`)
-    return res.status(201).json(agent)
+    try {
+      logger.info(`Agent created successfully: ${agent.id}`)
+      logger.info(`Creating default session for new agent: ${agent.id}`)
+
+      await sessionService.createSession(agent.id, {})
+
+      logger.info(`Default session created for agent: ${agent.id}`)
+      return res.status(201).json(agent)
+    } catch (sessionError: any) {
+      logger.error('Failed to create default session for new agent, rolling back agent creation', {
+        agentId: agent.id,
+        error: sessionError
+      })
+
+      try {
+        await agentService.deleteAgent(agent.id)
+      } catch (rollbackError: any) {
+        logger.error('Failed to roll back agent after session creation failure', {
+          agentId: agent.id,
+          error: rollbackError
+        })
+      }
+
+      return res.status(500).json({
+        error: {
+          message: `Failed to create default session for agent: ${sessionError.message}`,
+          type: 'internal_error',
+          code: 'agent_session_creation_failed'
+        }
+      })
+    }
   } catch (error: any) {
     if (error instanceof AgentModelValidationError) {
       logger.warn('Agent model validation error during create:', {
diff --git a/src/main/apiServer/routes/agents/handlers/sessions.ts b/src/main/apiServer/routes/agents/handlers/sessions.ts
index c164b26ea..36f307fbb 100644
--- a/src/main/apiServer/routes/agents/handlers/sessions.ts
+++ b/src/main/apiServer/routes/agents/handlers/sessions.ts
@@ -285,6 +285,32 @@ export const deleteSession = async (req: Request, res: Response): Promise<Respon
     }
 
     logger.info(`Session deleted successfully: ${sessionId}`)
+
+    const { total } = await sessionService.listSessions(agentId, { limit: 1 })
+
+    if (total === 0) {
+      logger.info(`No remaining sessions for agent ${agentId}, creating default session`)
+      try {
+        const fallbackSession = await sessionService.createSession(agentId, {})
+        logger.info('Default session created after deleting last session', {
+          agentId,
+          sessionId: fallbackSession?.id
+        })
+      } catch (recoveryError: any) {
+        logger.error('Failed to recreate session after deleting last session', {
+          agentId,
+          error: recoveryError
+        })
+        return res.status(500).json({
+          error: {
+            message: `Failed to recreate session after deletion: ${recoveryError.message}`,
+            type: 'internal_error',
+            code: 'session_recovery_failed'
+          }
+        })
+      }
+    }
+
     return res.status(204).send()
   } catch (error: any) {
     logger.error('Error deleting session:', error)
diff --git a/src/main/services/agents/services/SessionMessageService.ts b/src/main/services/agents/services/SessionMessageService.ts
index 1687f4042..64897ca2b 100644
--- a/src/main/services/agents/services/SessionMessageService.ts
+++ b/src/main/services/agents/services/SessionMessageService.ts
@@ -68,15 +68,23 @@ class TextStreamAccumulator {
       }
       case 'tool-call':
         if (part.toolCallId) {
+          const legacyPart = part as typeof part & {
+            args?: unknown
+            providerMetadata?: { raw?: { input?: unknown } }
+          }
           this.toolCalls.set(part.toolCallId, {
             toolName: part.toolName,
-            input: part.input ?? part.providerMetadata?.raw?.input
+            input: part.input ?? legacyPart.args ?? legacyPart.providerMetadata?.raw?.input
           })
         }
         break
       case 'tool-result':
         if (part.toolCallId) {
-          this.toolResults.set(part.toolCallId, part.output)
+          const legacyPart = part as typeof part & {
+            result?: unknown
+            providerMetadata?: { raw?: unknown }
+          }
+          this.toolResults.set(part.toolCallId, part.output ?? legacyPart.result ?? legacyPart.providerMetadata?.raw)
         }
         break
       default:
diff --git a/src/main/services/agents/services/SessionService.ts b/src/main/services/agents/services/SessionService.ts
index 7495a99d8..fc833aa2b 100644
--- a/src/main/services/agents/services/SessionService.ts
+++ b/src/main/services/agents/services/SessionService.ts
@@ -29,7 +29,10 @@ export class SessionService extends BaseService {
     await BaseService.initialize()
   }
 
-  async createSession(agentId: string, req: CreateSessionRequest): Promise<GetAgentSessionResponse | null> {
+  async createSession(
+    agentId: string,
+    req: Partial<CreateSessionRequest> = {}
+  ): Promise<GetAgentSessionResponse | null> {
     this.ensureInitialized()
 
     // Validate agent exists - we'll need to import AgentService for this check
diff --git a/src/renderer/src/components/Popups/agent/AgentModal.tsx b/src/renderer/src/components/Popups/agent/AgentModal.tsx
index 76ddfa2ee..8d0a41e98 100644
--- a/src/renderer/src/components/Popups/agent/AgentModal.tsx
+++ b/src/renderer/src/components/Popups/agent/AgentModal.tsx
@@ -1,5 +1,6 @@
 import {
   Button,
+  Chip,
   cn,
   Form,
   Input,
@@ -10,17 +11,27 @@ import {
   ModalHeader,
   Select,
   SelectedItemProps,
+  SelectedItems,
   SelectItem,
   Textarea,
   useDisclosure
 } from '@heroui/react'
 import { loggerService } from '@logger'
+import type { Selection } from '@react-types/shared'
 import ClaudeIcon from '@renderer/assets/images/models/claude.png'
 import { getModelLogo } from '@renderer/config/models'
 import { useAgents } from '@renderer/hooks/agents/useAgents'
 import { useApiModels } from '@renderer/hooks/agents/useModels'
 import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
-import { AddAgentForm, AgentEntity, AgentType, BaseAgentForm, isAgentType, UpdateAgentForm } from '@renderer/types'
+import {
+  AddAgentForm,
+  AgentEntity,
+  AgentType,
+  BaseAgentForm,
+  isAgentType,
+  Tool,
+  UpdateAgentForm
+} from '@renderer/types'
 import { ChangeEvent, FormEvent, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -37,17 +48,20 @@ interface AgentTypeOption extends BaseOption {
 
 type Option = AgentTypeOption | ModelOption
 
-const buildAgentForm = (existing?: AgentEntity): BaseAgentForm => ({
+type AgentWithTools = AgentEntity & { tools?: Tool[] }
+
+const buildAgentForm = (existing?: AgentWithTools): BaseAgentForm => ({
   type: existing?.type ?? 'claude-code',
   name: existing?.name ?? 'Claude Code',
   description: existing?.description,
   instructions: existing?.instructions,
   model: existing?.model ?? 'claude-4-sonnet',
-  accessible_paths: existing?.accessible_paths ? [...existing.accessible_paths] : []
+  accessible_paths: existing?.accessible_paths ? [...existing.accessible_paths] : [],
+  allowed_tools: existing?.allowed_tools ? [...existing.allowed_tools] : []
 })
 
 interface BaseProps {
-  agent?: AgentEntity
+  agent?: AgentWithTools
 }
 
 interface TriggerProps extends BaseProps {
@@ -83,7 +97,7 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
   const updateAgent = useUpdateAgent()
   // hard-coded. We only support anthropic for now.
   const { models } = useApiModels({ providerType: 'anthropic' })
-  const isEditing = (agent?: AgentEntity) => agent !== undefined
+  const isEditing = (agent?: AgentWithTools) => agent !== undefined
 
   const [form, setForm] = useState<BaseAgentForm>(() => buildAgentForm(agent))
 
@@ -93,6 +107,26 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
     }
   }, [agent, isOpen])
 
+  const availableTools = useMemo(() => agent?.tools ?? [], [agent?.tools])
+  const selectedToolKeys = useMemo(() => new Set(form.allowed_tools), [form.allowed_tools])
+
+  useEffect(() => {
+    if (!availableTools.length) {
+      return
+    }
+
+    setForm((prev) => {
+      const validTools = prev.allowed_tools.filter((id) => availableTools.some((tool) => tool.id === id))
+      if (validTools.length === prev.allowed_tools.length) {
+        return prev
+      }
+      return {
+        ...prev,
+        allowed_tools: validTools
+      }
+    })
+  }, [availableTools])
+
   // add supported agents type here.
   const agentConfig = useMemo(
     () =>
@@ -160,6 +194,45 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
     }))
   }, [])
 
+  const onAllowedToolsChange = useCallback(
+    (keys: Selection) => {
+      setForm((prev) => {
+        if (keys === 'all') {
+          return {
+            ...prev,
+            allowed_tools: availableTools.map((tool) => tool.id)
+          }
+        }
+
+        const next = Array.from(keys).map(String)
+        const filtered = availableTools.length
+          ? next.filter((id) => availableTools.some((tool) => tool.id === id))
+          : next
+
+        return {
+          ...prev,
+          allowed_tools: filtered
+        }
+      })
+    },
+    [availableTools]
+  )
+
+  const renderSelectedTools = useCallback((items: SelectedItems<Tool>) => {
+    if (!items.length) {
+      return null
+    }
+    return (
+      <div className="flex flex-wrap gap-2">
+        {items.map((item) => (
+          <Chip key={item.key} size="sm" variant="flat" className="max-w-[160px] truncate">
+            {item.data?.name ?? item.textValue ?? item.key}
+          </Chip>
+        ))}
+      </div>
+    )
+  }, [])
+
   const addAccessiblePath = useCallback(async () => {
     try {
       const selected = await window.api.file.selectFolder()
@@ -246,7 +319,8 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
           description: form.description,
           instructions: form.instructions,
           model: form.model,
-          accessible_paths: [...form.accessible_paths]
+          accessible_paths: [...form.accessible_paths],
+          allowed_tools: [...form.allowed_tools]
         } satisfies UpdateAgentForm
 
         updateAgent(updatePayload)
@@ -258,7 +332,8 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
           description: form.description,
           instructions: form.instructions,
           model: form.model,
-          accessible_paths: [...form.accessible_paths]
+          accessible_paths: [...form.accessible_paths],
+          allowed_tools: [...form.allowed_tools]
         } satisfies AddAgentForm
         addAgent(newAgent)
         logger.debug('Added agent', newAgent)
@@ -276,6 +351,7 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
       form.description,
       form.instructions,
       form.accessible_paths,
+      form.allowed_tools,
       agent,
       onClose,
       t,
@@ -347,6 +423,31 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
                     value={form.description ?? ''}
                     onValueChange={onDescChange}
                   />
+                  <Select
+                    selectionMode="multiple"
+                    selectedKeys={selectedToolKeys}
+                    onSelectionChange={onAllowedToolsChange}
+                    label={t('agent.session.allowed_tools.label')}
+                    placeholder={t('agent.session.allowed_tools.placeholder')}
+                    description={
+                      availableTools.length
+                        ? t('agent.session.allowed_tools.helper')
+                        : t('agent.session.allowed_tools.empty')
+                    }
+                    isDisabled={!availableTools.length}
+                    items={availableTools}
+                    renderValue={renderSelectedTools}>
+                    {(tool) => (
+                      <SelectItem key={tool.id} textValue={tool.name}>
+                        <div className="flex flex-col">
+                          <span className="text-sm font-medium">{tool.name}</span>
+                          {tool.description ? (
+                            <span className="text-xs text-foreground-500">{tool.description}</span>
+                          ) : null}
+                        </div>
+                      </SelectItem>
+                    )}
+                  </Select>
                   <div className="space-y-2">
                     <div className="flex items-center justify-between">
                       <span className="font-medium text-foreground text-sm">
diff --git a/src/renderer/src/components/Popups/agent/SessionModal.tsx b/src/renderer/src/components/Popups/agent/SessionModal.tsx
index 64f8b1e62..3682b7eeb 100644
--- a/src/renderer/src/components/Popups/agent/SessionModal.tsx
+++ b/src/renderer/src/components/Popups/agent/SessionModal.tsx
@@ -1,5 +1,6 @@
 import {
   Button,
+  Chip,
   cn,
   Form,
   Input,
@@ -16,12 +17,20 @@ import {
   useDisclosure
 } from '@heroui/react'
 import { loggerService } from '@logger'
+import type { Selection } from '@react-types/shared'
 import { getModelLogo } from '@renderer/config/models'
 import { useAgent } from '@renderer/hooks/agents/useAgent'
 import { useApiModels } from '@renderer/hooks/agents/useModels'
 import { useSessions } from '@renderer/hooks/agents/useSessions'
 import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
-import { AgentEntity, AgentSessionEntity, BaseSessionForm, CreateSessionForm, UpdateSessionForm } from '@renderer/types'
+import {
+  AgentEntity,
+  AgentSessionEntity,
+  BaseSessionForm,
+  CreateSessionForm,
+  Tool,
+  UpdateSessionForm
+} from '@renderer/types'
 import { ChangeEvent, FormEvent, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -32,7 +41,10 @@ const logger = loggerService.withContext('SessionAgentPopup')
 
 type Option = ModelOption
 
-const buildSessionForm = (existing?: AgentSessionEntity, agent?: AgentEntity): BaseSessionForm => ({
+type AgentWithTools = AgentEntity & { tools?: Tool[] }
+type SessionWithTools = AgentSessionEntity & { tools?: Tool[] }
+
+const buildSessionForm = (existing?: SessionWithTools, agent?: AgentWithTools): BaseSessionForm => ({
   name: existing?.name ?? agent?.name ?? 'Claude Code',
   description: existing?.description ?? agent?.description,
   instructions: existing?.instructions ?? agent?.instructions,
@@ -41,12 +53,17 @@ const buildSessionForm = (existing?: AgentSessionEntity, agent?: AgentEntity): B
     ? [...existing.accessible_paths]
     : agent?.accessible_paths
       ? [...agent.accessible_paths]
+      : [],
+  allowed_tools: existing?.allowed_tools
+    ? [...existing.allowed_tools]
+    : agent?.allowed_tools
+      ? [...agent.allowed_tools]
       : []
 })
 
 interface BaseProps {
   agentId: string
-  session?: AgentSessionEntity
+  session?: SessionWithTools
   onSessionCreated?: (session: AgentSessionEntity) => void
 }
 
@@ -102,6 +119,27 @@ export const SessionModal: React.FC<Props> = ({
     }
   }, [session, agent, isOpen])
 
+  const availableTools = useMemo(() => session?.tools ?? agent?.tools ?? [], [agent?.tools, session?.tools])
+  const selectedToolKeys = useMemo(() => new Set(form.allowed_tools ?? []), [form.allowed_tools])
+
+  useEffect(() => {
+    if (!availableTools.length) {
+      return
+    }
+
+    setForm((prev) => {
+      const allowed = prev.allowed_tools ?? []
+      const validTools = allowed.filter((id) => availableTools.some((tool) => tool.id === id))
+      if (validTools.length === allowed.length) {
+        return prev
+      }
+      return {
+        ...prev,
+        allowed_tools: validTools
+      }
+    })
+  }, [availableTools])
+
   const Item = useCallback(({ item }: { item: SelectedItemProps<BaseOption> }) => <Option option={item.data} />, [])
 
   const renderOption = useCallback(
@@ -130,6 +168,50 @@ export const SessionModal: React.FC<Props> = ({
     }))
   }, [])
 
+  const onAllowedToolsChange = useCallback(
+    (keys: Selection) => {
+      setForm((prev) => {
+        const existing = prev.allowed_tools ?? []
+        if (keys === 'all') {
+          return {
+            ...prev,
+            allowed_tools: availableTools.map((tool) => tool.id)
+          }
+        }
+
+        const next = Array.from(keys).map(String)
+        const filtered = availableTools.length
+          ? next.filter((id) => availableTools.some((tool) => tool.id === id))
+          : next
+
+        if (existing.length === filtered.length && existing.every((id) => filtered.includes(id))) {
+          return prev
+        }
+
+        return {
+          ...prev,
+          allowed_tools: filtered
+        }
+      })
+    },
+    [availableTools]
+  )
+
+  const renderSelectedTools = useCallback((items: SelectedItems<Tool>) => {
+    if (!items.length) {
+      return null
+    }
+    return (
+      <div className="flex flex-wrap gap-2">
+        {items.map((item) => (
+          <Chip key={item.key} size="sm" variant="flat" className="max-w-[160px] truncate">
+            {item.data?.name ?? item.textValue ?? item.key}
+          </Chip>
+        ))}
+      </div>
+    )
+  }, [])
+
   const modelOptions = useMemo(() => {
     // mocked data. not final version
     return (models ?? []).map((model) => ({
@@ -183,7 +265,8 @@ export const SessionModal: React.FC<Props> = ({
             description: form.description,
             instructions: form.instructions,
             model: form.model,
-            accessible_paths: [...form.accessible_paths]
+            accessible_paths: [...form.accessible_paths],
+            allowed_tools: [...(form.allowed_tools ?? [])]
           } satisfies UpdateSessionForm
 
           updateSession(updatePayload)
@@ -194,7 +277,8 @@ export const SessionModal: React.FC<Props> = ({
             description: form.description,
             instructions: form.instructions,
             model: form.model,
-            accessible_paths: [...form.accessible_paths]
+            accessible_paths: [...form.accessible_paths],
+            allowed_tools: [...(form.allowed_tools ?? [])]
           } satisfies CreateSessionForm
           const createdSession = await createSession(newSession)
           if (createdSession) {
@@ -215,6 +299,7 @@ export const SessionModal: React.FC<Props> = ({
       form.description,
       form.instructions,
       form.accessible_paths,
+      form.allowed_tools,
       session,
       onClose,
       onSessionCreated,
@@ -274,6 +359,31 @@ export const SessionModal: React.FC<Props> = ({
                     value={form.description ?? ''}
                     onValueChange={onDescChange}
                   />
+                  <Select
+                    selectionMode="multiple"
+                    selectedKeys={selectedToolKeys}
+                    onSelectionChange={onAllowedToolsChange}
+                    label={t('agent.session.allowed_tools.label')}
+                    placeholder={t('agent.session.allowed_tools.placeholder')}
+                    description={
+                      availableTools.length
+                        ? t('agent.session.allowed_tools.helper')
+                        : t('agent.session.allowed_tools.empty')
+                    }
+                    isDisabled={!availableTools.length}
+                    items={availableTools}
+                    renderValue={renderSelectedTools}>
+                    {(tool) => (
+                      <SelectItem key={tool.id} textValue={tool.name}>
+                        <div className="flex flex-col">
+                          <span className="text-sm font-medium">{tool.name}</span>
+                          {tool.description ? (
+                            <span className="text-xs text-foreground-500">{tool.description}</span>
+                          ) : null}
+                        </div>
+                      </SelectItem>
+                    )}
+                  </Select>
                   <Textarea label={t('common.prompt')} value={form.instructions ?? ''} onValueChange={onInstChange} />
                 </ModalBody>
                 <ModalFooter className="w-full">
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index b7cba46a9..b28d3bc35 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "Add a session"
       },
+      "allowed_tools": {
+        "empty": "No tools available for this agent.",
+        "helper": "Choose which tools are pre-approved. Unselected tools require approval before use.",
+        "label": "Allowed tools",
+        "placeholder": "Select allowed tools"
+      },
       "create": {
         "error": {
           "failed": "Failed to add a session"
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index d7287036a..e6ec135a0 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "添加会话"
       },
+      "allowed_tools": {
+        "empty": "当前智能体暂无可用工具。",
+        "helper": "选择预先授权的工具，未选中的工具在使用时需要手动审批。",
+        "label": "允许的工具",
+        "placeholder": "选择允许使用的工具"
+      },
       "create": {
         "error": {
           "failed": "添加会话失败"
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index fbe922dbe..269ef98b3 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "新增會議"
       },
+      "allowed_tools": {
+        "empty": "目前此代理沒有可用的工具。",
+        "helper": "選擇預先授權的工具，未選取的工具在使用時需要手動審批。",
+        "label": "允許的工具",
+        "placeholder": "選擇允許使用的工具"
+      },
       "create": {
         "error": {
           "failed": "無法新增工作階段"
diff --git a/src/renderer/src/i18n/translate/el-gr.json b/src/renderer/src/i18n/translate/el-gr.json
index 8af53b669..5fd6d5a57 100644
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "Προσθήκη συνεδρίας"
       },
+      "allowed_tools": {
+        "empty": "Δεν υπάρχουν διαθέσιμα εργαλεία για αυτόν τον agent.",
+        "helper": "Επιλέξτε ποια εργαλεία είναι προεγκεκριμένα. Τα μη επιλεγμένα θα χρειαστούν έγκριση πριν από τη χρήση.",
+        "label": "Επιτρεπόμενα εργαλεία",
+        "placeholder": "Επιλέξτε επιτρεπόμενα εργαλεία"
+      },
       "create": {
         "error": {
           "failed": "Αποτυχία προσθήκης συνεδρίας"
diff --git a/src/renderer/src/i18n/translate/es-es.json b/src/renderer/src/i18n/translate/es-es.json
index 0be385d74..416921fbb 100644
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "Agregar una sesión"
       },
+      "allowed_tools": {
+        "empty": "No hay herramientas disponibles para este agente.",
+        "helper": "Elige qué herramientas quedan preaprobadas. Las no seleccionadas requerirán aprobación manual antes de usarse.",
+        "label": "Herramientas permitidas",
+        "placeholder": "Selecciona las herramientas permitidas"
+      },
       "create": {
         "error": {
           "failed": "Error al añadir una sesión"
diff --git a/src/renderer/src/i18n/translate/fr-fr.json b/src/renderer/src/i18n/translate/fr-fr.json
index 93209acb5..38502d5f1 100644
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "Ajouter une session"
       },
+      "allowed_tools": {
+        "empty": "Aucun outil disponible pour cet agent.",
+        "helper": "Choisissez les outils préapprouvés. Les outils non sélectionnés nécessiteront une approbation avant utilisation.",
+        "label": "Outils autorisés",
+        "placeholder": "Sélectionner les outils autorisés"
+      },
       "create": {
         "error": {
           "failed": "Échec de l'ajout d'une session"
diff --git a/src/renderer/src/i18n/translate/ja-jp.json b/src/renderer/src/i18n/translate/ja-jp.json
index d23b5d15c..1c8743b21 100644
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "セッションを追加"
       },
+      "allowed_tools": {
+        "empty": "このエージェントが利用できるツールはありません。",
+        "helper": "事前承認済みのツールを選択します。未選択のツールは使用時に承認が必要になります。",
+        "label": "許可されたツール",
+        "placeholder": "許可するツールを選択"
+      },
       "create": {
         "error": {
           "failed": "セッションの追加に失敗しました"
diff --git a/src/renderer/src/i18n/translate/pt-pt.json b/src/renderer/src/i18n/translate/pt-pt.json
index 728347565..3106c19c8 100644
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "Adicionar uma sessão"
       },
+      "allowed_tools": {
+        "empty": "Não há ferramentas disponíveis para este agente.",
+        "helper": "Escolha quais ferramentas ficam pré-autorizadas. As não selecionadas exigirão aprovação antes do uso.",
+        "label": "Ferramentas permitidas",
+        "placeholder": "Selecione as ferramentas permitidas"
+      },
       "create": {
         "error": {
           "failed": "Falha ao adicionar uma sessão"
diff --git a/src/renderer/src/i18n/translate/ru-ru.json b/src/renderer/src/i18n/translate/ru-ru.json
index 59ff59243..78a9ffab5 100644
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@@ -44,6 +44,12 @@
       "add": {
         "title": "Добавить сеанс"
       },
+      "allowed_tools": {
+        "empty": "Для этого агента нет доступных инструментов.",
+        "helper": "Выберите инструменты с предварительным допуском. Неотмеченные инструменты потребуют подтверждения перед использованием.",
+        "label": "Разрешённые инструменты",
+        "placeholder": "Выберите разрешённые инструменты"
+      },
       "create": {
         "error": {
           "failed": "Не удалось добавить сеанс"
diff --git a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/WriteTool.tsx b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/WriteTool.tsx
index 8b5e116ef..08644c1c5 100644
--- a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/WriteTool.tsx
+++ b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/WriteTool.tsx
@@ -4,7 +4,7 @@ import { FileText } from 'lucide-react'
 import { ToolTitle } from './GenericTools'
 import type { WriteToolInput, WriteToolOutput } from './types'
 
-export function WriteTool({ input, output }: { input: WriteToolInput; output?: WriteToolOutput }) {
+export function WriteTool({ input }: { input: WriteToolInput; output?: WriteToolOutput }) {
   return (
     <AccordionItem
       key="tool"
diff --git a/src/renderer/src/pages/home/Tabs/components/Sessions.tsx b/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
index dc2263661..c8c30dcf5 100644
--- a/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
@@ -1,7 +1,6 @@
 import { Alert, Button, Spinner } from '@heroui/react'
 import { useAgent } from '@renderer/hooks/agents/useAgent'
 import { useSessions } from '@renderer/hooks/agents/useSessions'
-import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
 import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useAppDispatch } from '@renderer/store'
 import {
@@ -27,7 +26,6 @@ const Sessions: React.FC<SessionsProps> = ({ agentId }) => {
   const { t } = useTranslation()
   const { agent } = useAgent(agentId)
   const { sessions, isLoading, error, deleteSession, createSession } = useSessions(agentId)
-  const updateSession = useUpdateSession(agentId)
   const { chat } = useRuntime()
   const { activeSessionId, sessionWaiting } = chat
   const dispatch = useAppDispatch()
@@ -70,7 +68,7 @@ const Sessions: React.FC<SessionsProps> = ({ agentId }) => {
       }
       dispatch(setSessionWaitingAction({ id, value: false }))
     },
-    [agentId, deleteSession, dispatch, sessions]
+    [agentId, deleteSession, dispatch, sessions, t]
   )
 
   const currentActiveSessionId = activeSessionId[agentId]
diff --git a/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx b/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
index 6506be9cb..1ee1ffcb0 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
@@ -1,13 +1,14 @@
-import { Button, Tooltip } from '@heroui/react'
+import { Button, Chip, Select as HeroSelect, SelectedItems, SelectItem, Tooltip } from '@heroui/react'
 import { loggerService } from '@logger'
+import type { Selection } from '@react-types/shared'
 import { ApiModelLabel } from '@renderer/components/ApiModelLabel'
 import { useApiModels } from '@renderer/hooks/agents/useModels'
 import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
-import { AgentEntity, UpdateAgentForm } from '@renderer/types'
+import { GetAgentResponse, Tool, UpdateAgentForm } from '@renderer/types'
 import { Input, Select } from 'antd'
 import { DefaultOptionType } from 'antd/es/select'
 import { Plus } from 'lucide-react'
-import { FC, useCallback, useMemo, useState } from 'react'
+import { FC, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { AgentLabel, SettingsContainer, SettingsItem, SettingsTitle } from './shared'
@@ -15,7 +16,7 @@ import { AgentLabel, SettingsContainer, SettingsItem, SettingsTitle } from './sh
 const logger = loggerService.withContext('AgentEssentialSettings')
 
 interface AgentEssentialSettingsProps {
-  agent: AgentEntity | undefined | null
+  agent: GetAgentResponse | undefined | null
   update: ReturnType<typeof useUpdateAgent>
 }
 
@@ -23,6 +24,9 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
   const { t } = useTranslation()
   const [name, setName] = useState<string>((agent?.name ?? '').trim())
   const { models } = useApiModels({ providerType: 'anthropic' })
+  const availableTools = useMemo(() => agent?.tools ?? [], [agent?.tools])
+  const [allowedToolIds, setAllowedToolIds] = useState<string[]>([])
+  const selectedToolKeys = useMemo<Selection>(() => new Set<string>(allowedToolIds), [allowedToolIds])
 
   const updateName = (name: string) => {
     if (!agent) return
@@ -42,6 +46,14 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
     [agent, update]
   )
 
+  const updateAllowedTools = useCallback(
+    (allowed_tools: UpdateAgentForm['allowed_tools']) => {
+      if (!agent) return
+      update({ id: agent.id, allowed_tools })
+    },
+    [agent, update]
+  )
+
   const modelOptions = useMemo(() => {
     return models.map((model) => ({
       value: model.id,
@@ -49,6 +61,27 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
     })) satisfies DefaultOptionType[]
   }, [models])
 
+  useEffect(() => {
+    if (!agent) {
+      setAllowedToolIds((prev) => (prev.length === 0 ? prev : []))
+      return
+    }
+
+    const allowed = agent.allowed_tools ?? []
+    const filtered = availableTools.length
+      ? allowed.filter((id) => availableTools.some((tool) => tool.id === id))
+      : allowed
+
+    setAllowedToolIds((prev) => {
+      const prevSet = new Set(prev)
+      const isSame = filtered.length === prevSet.size && filtered.every((id) => prevSet.has(id))
+      if (isSame) {
+        return prev
+      }
+      return filtered
+    })
+  }, [agent, availableTools])
+
   const addAccessiblePath = useCallback(async () => {
     if (!agent) return
 
@@ -83,6 +116,53 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
     [agent, t, updateAccessiblePaths]
   )
 
+  const renderSelectedTools = useCallback((items: SelectedItems<Tool>) => {
+    if (!items.length) {
+      return null
+    }
+
+    return (
+      <div className="flex flex-wrap gap-2">
+        {items.map((item) => (
+          <Chip key={item.key} size="sm" variant="flat" className="max-w-[160px] truncate">
+            {item.data?.name ?? item.textValue ?? item.key}
+          </Chip>
+        ))}
+      </div>
+    )
+  }, [])
+
+  const onAllowedToolsChange = useCallback(
+    (keys: Selection) => {
+      if (!agent) return
+
+      const nextIds = keys === 'all' ? availableTools.map((tool) => tool.id) : Array.from(keys).map(String)
+      const filtered = availableTools.length
+        ? nextIds.filter((id) => availableTools.some((tool) => tool.id === id))
+        : nextIds
+
+      setAllowedToolIds((prev) => {
+        const prevSet = new Set(prev)
+        const isSame = filtered.length === prevSet.size && filtered.every((id) => prevSet.has(id))
+        if (isSame) {
+          return prev
+        }
+        return filtered
+      })
+
+      const previous = agent.allowed_tools ?? []
+      const previousSet = new Set(previous)
+      const isSameSelection = filtered.length === previousSet.size && filtered.every((id) => previousSet.has(id))
+
+      if (isSameSelection) {
+        return
+      }
+
+      updateAllowedTools(filtered)
+    },
+    [agent, availableTools, updateAllowedTools]
+  )
+
   if (!agent) return null
 
   return (
@@ -117,6 +197,31 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
           placeholder={t('common.placeholders.select.model')}
         />
       </SettingsItem>
+      <SettingsItem>
+        <SettingsTitle>{t('agent.session.allowed_tools.label')}</SettingsTitle>
+        <HeroSelect
+          aria-label={t('agent.session.allowed_tools.label')}
+          selectionMode="multiple"
+          selectedKeys={selectedToolKeys}
+          onSelectionChange={onAllowedToolsChange}
+          placeholder={t('agent.session.allowed_tools.placeholder')}
+          description={
+            availableTools.length ? t('agent.session.allowed_tools.helper') : t('agent.session.allowed_tools.empty')
+          }
+          isDisabled={!availableTools.length}
+          items={availableTools}
+          renderValue={renderSelectedTools}
+          className="max-w-xl">
+          {(tool) => (
+            <SelectItem key={tool.id} textValue={tool.name}>
+              <div className="flex flex-col">
+                <span className="text-sm font-medium">{tool.name}</span>
+                {tool.description ? <span className="text-xs text-foreground-500">{tool.description}</span> : null}
+              </div>
+            </SelectItem>
+          )}
+        </HeroSelect>
+      </SettingsItem>
       <SettingsItem>
         <SettingsTitle
           actions={
diff --git a/src/renderer/src/types/agent.ts b/src/renderer/src/types/agent.ts
index d3e429842..bf414c785 100644
--- a/src/renderer/src/types/agent.ts
+++ b/src/renderer/src/types/agent.ts
@@ -169,6 +169,7 @@ export type BaseAgentForm = {
   instructions?: string
   model: string
   accessible_paths: string[]
+  allowed_tools: string[]
 }
 
 export type AddAgentForm = Omit<BaseAgentForm, 'id'> & { id?: never }
diff --git a/src/renderer/src/utils/mcp-tools.ts b/src/renderer/src/utils/mcp-tools.ts
index 417509434..6914868d4 100644
--- a/src/renderer/src/utils/mcp-tools.ts
+++ b/src/renderer/src/utils/mcp-tools.ts
@@ -108,7 +108,12 @@ export function openAIToolsToMcpTool(
 export async function callBuiltInTool(toolResponse: MCPToolResponse): Promise<MCPCallToolResponse | undefined> {
   logger.info(`[BuiltIn] Calling Built-in Tool: ${toolResponse.tool.name}`, toolResponse.tool)
 
-  if (toolResponse.tool.name === 'think') {
+  if (
+    toolResponse.tool.name === 'think' &&
+    typeof toolResponse.arguments === 'object' &&
+    toolResponse.arguments !== null &&
+    !Array.isArray(toolResponse.arguments)
+  ) {
     const thought = toolResponse.arguments?.thought
     return {
       isError: false,
diff --git a/tests/renderer.setup.ts b/tests/renderer.setup.ts
index ea4057eca..fab761fae 100644
--- a/tests/renderer.setup.ts
+++ b/tests/renderer.setup.ts
@@ -14,13 +14,21 @@ vi.mock('@logger', async () => {
   }
 })
 
-vi.mock('axios', () => ({
-  default: {
+vi.mock('axios', () => {
+  const defaultAxiosMock = {
     get: vi.fn().mockResolvedValue({ data: {} }), // Mocking axios GET request
     post: vi.fn().mockResolvedValue({ data: {} }) // Mocking axios POST request
     // You can add other axios methods like put, delete etc. as needed
   }
-}))
+
+  const isAxiosError = (error: unknown): error is { isAxiosError?: boolean } =>
+    Boolean((error as { isAxiosError?: boolean } | undefined)?.isAxiosError)
+
+  return {
+    default: defaultAxiosMock,
+    isAxiosError
+  }
+})
 
 vi.stubGlobal('electron', {
   ipcRenderer: {