Merge pull request #56 from aws-samples/tool-init-error

カスタムエージェント新規登録に初期状態のツールが設定できない問題を修正

Author: daisuke-awaji

.vscode/settings.json

@@ -9,5 +9,9 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "CodeGPT.apiKey": "CodeGPT Plus Beta",
-  "CodeGPT.Autocomplete.enabled": true
+  "CodeGPT.Autocomplete.enabled": true,
+  "i18n-ally.localesPaths": [
+    "src/renderer/src/i18n",
+    "src/renderer/src/i18n/locales"
+  ]
 }

README-ja.md

@@ -19,7 +19,7 @@ Bedrock Engineer はネイティブアプリです。アプリをダウンロー
 
 MacOS:
 
-[<img src="https://img.shields.io/badge/Download_FOR_MAC-Latest%20Release-blue?style=for-the-badge&logo=apple" alt="Download Latest Release" height="40">](https://github.com/aws-samples/bedrock-engineer/releases/latest/download/bedrock-engineer-1.7.0.dmg)
+[<img src="https://img.shields.io/badge/Download_FOR_MAC-Latest%20Release-blue?style=for-the-badge&logo=apple" alt="Download Latest Release" height="40">](https://github.com/aws-samples/bedrock-engineer/releases/latest/download/bedrock-engineer-1.7.1.dmg)
 
 MacOS に最適化されていますが、Windows, Linux OS でもビルドして使用できます。不具合があるばあい、issue に起票ください。
 

README.md

@@ -19,7 +19,7 @@ Bedrock Engineer is a native app, you can download the app or build the source c
 
 MacOS:
 
-[<img src="https://img.shields.io/badge/Download_FOR_MAC-Latest%20Release-blue?style=for-the-badge&logo=apple" alt="Download Latest Release" height="40">](https://github.com/aws-samples/bedrock-engineer/releases/latest/download/bedrock-engineer-1.7.0.dmg)
+[<img src="https://img.shields.io/badge/Download_FOR_MAC-Latest%20Release-blue?style=for-the-badge&logo=apple" alt="Download Latest Release" height="40">](https://github.com/aws-samples/bedrock-engineer/releases/latest/download/bedrock-engineer-1.7.1.dmg)
 
 It is optimized for MacOS, but can also be built and used on Windows and Linux OS. If you have any problems, please report an issue.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bedrock-engineer",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Autonomous software development agent apps using Amazon Bedrock, capable of customize to create/edit files, execute commands, search the web, use knowledge base, use multi-agents, generative images and more.",
   "main": "./out/main/index.js",
   "homepage": "https://github.com/daisuke-awaji/bedrock-engineer",

src/renderer/src/constants/defaultToolSets.ts

@@ -152,7 +152,7 @@ export const getToolsForCategory = (category: string, allTools: ToolState[]): To
   const currentRegion = awsConfig?.region || ''
 
   // カテゴリに基づいてツール設定を生成
-  return allTools.map((tool) => {
+  const result = allTools.map((tool) => {
     const toolName = tool.toolSpec?.name
     if (!toolName) return { ...tool, enabled: false }
 
@@ -167,9 +167,14 @@ export const getToolsForCategory = (category: string, allTools: ToolState[]): To
       }
     }
 
+    // このツールがカテゴリに含まれるかどうか
+    const isEnabled = categoryNames.includes(toolName)
+
     return {
       ...tool,
-      enabled: categoryNames.includes(toolName)
+      enabled: isEnabled
     }
   })
+
+  return result
 }

src/renderer/src/pages/ChatPage/components/AgentForm/useAgentForm.ts

@@ -238,16 +238,18 @@ export const useAgentForm = (initialAgent?: CustomAgent, onSave?: (agent: Custom
     async (tabId: AgentFormTabId) => {
       setActiveTab(tabId)
 
-      // ツールタブへの切り替え時にMCPツールを取得
+      // ツールタブへの切り替え時
       if (tabId === 'tools') {
         console.log(
           'Switching to tools tab, fetching MCP tools with current servers:',
           formData.mcpServers?.length || 0
         )
+
+        // MCPツールを取得
         await fetchMcpTools(formData.mcpServers)
       }
     },
-    [fetchMcpTools, formData.mcpServers]
+    [fetchMcpTools, formData.mcpServers, formData.tools, agentTools, updateField]
   )
 
   // サーバー設定変更時にツールをクリア
@@ -293,14 +295,41 @@ export const useAgentForm = (initialAgent?: CustomAgent, onSave?: (agent: Custom
     (e: React.FormEvent) => {
       e.preventDefault()
       console.log('Form submitted with data:', formData)
-      if (onSave) {
+      console.log(
+        'ツール情報:',
+        formData.tools ? `${formData.tools.length}件` : '未設定',
+        formData.tools
+      )
+
+      if (formData.tools && formData.tools.length === 0) {
+        console.warn('警告: ツールが設定されていません')
+        // ここで対処: ツールが設定されていない場合はデフォルトツール設定を適用
+        const defaultTools = getDefaultToolsForCategory('all')
+        const defaultToolNames = defaultTools
+          .filter((tool) => tool.enabled)
+          .map((tool) => tool.toolSpec?.name as ToolName)
+          .filter(Boolean)
+
+        // formDataを更新
+        const updatedFormData = {
+          ...formData,
+          tools: defaultToolNames
+        }
+
+        console.log('デフォルトツールを適用:', updatedFormData.tools)
+
+        if (onSave) {
+          console.log('修正したフォームデータで保存')
+          onSave(updatedFormData)
+        }
+      } else if (onSave) {
         console.log('Calling onSave callback')
         onSave(formData)
       } else {
         console.warn('onSave callback is not provided')
       }
     },
-    [formData, onSave]
+    [formData, onSave, getDefaultToolsForCategory]
   )
 
   return {