Merge branch 'main' into feat/agent-builder

Author: maekawataiki

CONTRIBUTING.md

@@ -35,6 +35,11 @@ To send us a pull request, please:
 5. Send us a pull request, answering any default questions in the pull request interface.
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
+For detailed development guidelines including linting and code style requirements, please refer to:
+
+- [DEVELOPMENT.md (English)](docs/en/DEVELOPMENT.md)
+- [DEVELOPMENT.md (日本語)](docs/ja/DEVELOPMENT.md)
+
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 

docs/en/DEVELOPMENT.md

@@ -52,6 +52,45 @@ npm run web:dev
 
 If executed successfully, it will start at http://localhost:5173, so please try accessing it from your browser.
 
+## Linting and Code Style
+
+This project uses **ESLint** and **Prettier** to enforce code quality and consistent style.
+
+### ESLint Configuration
+
+- **Config files**: ESLint configurations are located in each package directory:
+  - `packages/web/.eslintrc.cjs` (Frontend)
+  - `packages/cdk/.eslintrc.cjs` (CDK/Infrastructure)
+  - `browser-extension/.eslintrc.json` (Browser Extension)
+- **Base rules**: We extend commonly used configs:
+  - `eslint:recommended`
+  - `plugin:@typescript-eslint/recommended`
+  - `plugin:react-hooks/recommended` (for React code)
+  - `plugin:tailwindcss/recommended` (for frontend)
+- **Key rules enforced**:
+  - Unused imports/variables
+  - React Hooks rules (e.g., `exhaustive-deps`)
+  - Japanese string detection (i18n compliance)
+  - YAML formatting and key sorting
+
+### Running ESLint
+
+Before committing, run:
+
+```bash
+npm run lint
+```
+
+To automatically fix issues:
+
+```bash
+npm run web:lint:fix  # For frontend code
+```
+
+### Pre-commit Hook
+
+This repository uses [Husky](https://typicode.github.io/husky) for git hooks. Linting runs automatically on `git commit` via `lint-staged`.
+
 ## When Submitting a Pull Request
 
 We welcome Pull Requests for bug fixes and feature improvements :tada:
@@ -72,6 +111,12 @@ If you want to ignore this error and create a Draft PR, add the `--no-verify` op
 git commit -m "xxx" --no-verify
 ```
 
+### Review Standards
+
+- Lint rules are used as **review criteria**.
+- Please ensure your code passes linting before opening a PR to avoid unnecessary review cycles.
+- Consistent style improves readability and reduces back-and-forth in code review.
+
 Also, if there are changes to the CDK, check the snapshots with the following command and update them:
 
 ```bash

docs/ja/DEVELOPMENT.md

@@ -53,6 +53,45 @@ npm run web:dev
 
 正常に実行されれば http://localhost:5173 で起動しますので、ブラウザからアクセスしてみてください。
 
+## Lint とコードスタイル
+
+このプロジェクトでは、コード品質と一貫したスタイルを保つために **ESLint** と **Prettier** を使用しています。
+
+### ESLint の設定
+
+- **設定ファイルの場所**: ESLint の設定は各パッケージディレクトリに配置されています:
+  - `packages/web/.eslintrc.cjs` (フロントエンド)
+  - `packages/cdk/.eslintrc.cjs` (CDK/インフラ)
+  - `browser-extension/.eslintrc.json` (ブラウザ拡張)
+- **ベースルール**: 以下の一般的な設定を拡張しています:
+  - `eslint:recommended`
+  - `plugin:@typescript-eslint/recommended`
+  - `plugin:react-hooks/recommended` (React コード用)
+  - `plugin:tailwindcss/recommended` (フロントエンド用)
+- **主要なルール**:
+  - 未使用のインポート/変数の検出
+  - React Hooks のルール (例: `exhaustive-deps`)
+  - 日本語文字列の検出 (i18n 対応)
+  - YAML のフォーマットとキーのソート
+
+### ESLint の実行
+
+コミット前に以下を実行してください:
+
+```bash
+npm run lint
+```
+
+自動修正を行う場合:
+
+```bash
+npm run web:lint:fix  # フロントエンドコード用
+```
+
+### Pre-commit フック
+
+このリポジトリでは [Husky](https://typicode.github.io/husky) を使用して Git フックを管理しています。`git commit` 時に `lint-staged` 経由で自動的に lint が実行されます。
+
 ## Pull Request を出す場合
 
 バグ修正や機能改善などの Pull Request は歓迎しております :tada:
@@ -73,6 +112,12 @@ npm run web:dev
 git commit -m "xxx" --no-verify
 ```
 
+### レビュー基準
+
+- Lint ルールは**レビュー基準**として使用されます。
+- 不要なレビューサイクルを避けるため、PR を開く前にコードが lint を通過することを確認してください。
+- 一貫したスタイルは可読性を向上させ、コードレビューでのやり取りを減らします。
+
 もしCDK に変更があれば以下のコマンドでスナップショットの確認を行いスナップショットを更新してください。
 
 ```bash

package-lock.json

@@ -77,8 +77,9 @@
     "crossAccountBedrockRoleArn": "",
     "useCaseBuilderEnabled": true,
     "closedNetworkMode": false,
-    "closedNetworkAppIpv4Cidr": "10.0.0.0/16",
-    "closedNetworkUserIpv4Cidr": "10.1.0.0/16",
+    "closedNetworkVpcIpv4Cidr": "10.0.0.0/16",
+    "closedNetworkVpcId": null,
+    "closedNetworkSubnetIds": null,
     "closedNetworkCertificateArn": null,
     "closedNetworkDomainName": null,
     "closedNetworkCreateTestEnvironment": true,

packages/cdk/cdk.json

@@ -9,7 +9,7 @@
 from strands import Agent as StrandsAgent
 from strands.models import BedrockModel
 
-from .config import extract_model_info, get_system_prompt
+from .config import extract_model_info, get_max_iterations, get_system_prompt
 from .tools import ToolManager
 from .types import Message, ModelInfo
 from .utils import (
@@ -21,16 +21,32 @@
 logger.setLevel(logging.INFO)
 
 
+class IterationLimitExceededError(Exception):
+    """Exception raised when iteration limit is exceeded"""
+
+    pass
+
+
 class AgentManager:
     """Manages Strands agent creation and execution."""
 
     def __init__(self):
         self.tool_manager = ToolManager()
+        self.max_iterations = get_max_iterations()
+        self.iteration_count = 0
 
     def set_session_info(self, session_id: str, trace_id: str):
         """Set session and trace IDs"""
         self.tool_manager.set_session_info(session_id, trace_id)
 
+    def iteration_limit_handler(self, **ev):
+        if ev.get("init_event_loop"):
+            self.iteration_count = 0
+        if ev.get("start_event_loop"):
+            self.iteration_count += 1
+            if self.iteration_count > self.max_iterations:
+                raise IterationLimitExceededError(f"Event loop reached maximum iteration count ({self.max_iterations}). Please contact the administrator.")
+
     async def process_request_streaming(
         self,
         messages: list[Message] | list[dict[str, Any]],
@@ -82,6 +98,7 @@ async def process_request_streaming(
                 messages=processed_messages,
                 model=bedrock_model,
                 tools=tools,
+                callback_handler=self.iteration_limit_handler,
             )
 
             async for event in agent.stream_async(processed_prompt):

packages/cdk/lambda-python/generic-agent-core-runtime/src/agent.py

@@ -13,6 +13,8 @@
 
 WORKSPACE_DIR = "/tmp/ws"
 
+DEFAULT_MAX_ITERATIONS = 20
+
 FIXED_SYSTEM_PROMPT = f"""## About File Output
 - You are running on AWS Bedrock AgentCore. Therefore, when writing files, always write them under `{WORKSPACE_DIR}`.
 - Similarly, if you need a workspace, please use the `{WORKSPACE_DIR}` directory. Do not ask the user about their current workspace. It's always `{WORKSPACE_DIR}`.
@@ -71,3 +73,12 @@ def extract_model_info(model_info: Any) -> tuple[str, str]:
         region = model_info.get("region", aws_creds.get("AWS_REGION", "us-east-1"))
 
     return model_id, region
+
+
+def get_max_iterations() -> int:
+    """Get maximum iterations from environment or default to {DEFAULT_MAX_ITERATIONS}"""
+    try:
+        return int(os.environ.get("MAX_ITERATIONS", DEFAULT_MAX_ITERATIONS))
+    except ValueError:
+        logger.warning(f"Invalid MAX_ITERATIONS value. Defaulting to {DEFAULT_MAX_ITERATIONS}.")
+        return DEFAULT_MAX_ITERATIONS

packages/cdk/lambda-python/generic-agent-core-runtime/src/config.py

@@ -108,13 +108,21 @@ export const defaultVideoGenerationModel: Model = {
 };
 
 // Model Params
-const CLAUDE_4_5_DEFAULT_PARAMS: ConverseInferenceParams = {
+const CLAUDE_SONNET_4_DEFAULT_PARAMS: ConverseInferenceParams = {
   inferenceConfig: {
     maxTokens: 64000,
     temperature: 1,
   },
 };
 
+const CLAUDE_OPUS_4_DEFAULT_PARAMS: ConverseInferenceParams = {
+  inferenceConfig: {
+    maxTokens: 32000,
+    temperature: 1,
+    topP: 0.999,
+  },
+};
+
 const CLAUDE_3_5_DEFAULT_PARAMS: ConverseInferenceParams = {
   inferenceConfig: {
     maxTokens: 8192,
@@ -472,9 +480,7 @@ const createConverseCommandInput = (
       ...params.inferenceConfig,
       temperature: 1, // reasoning requires temperature to be 1
       topP: undefined, // reasoning does not require topP
-      maxTokens:
-        (model.modelParameters?.reasoningConfig?.budgetTokens || 0) +
-        (params.inferenceConfig?.maxTokens || 0),
+      maxTokens: params.inferenceConfig?.maxTokens,
     };
     converseCommandInput.additionalModelRequestFields = {
       reasoning_config: {
@@ -929,79 +935,79 @@ export const BEDROCK_TEXT_GEN_MODELS: {
   };
 } = {
   'us.anthropic.claude-opus-4-1-20250805-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_OPUS_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'us.anthropic.claude-opus-4-20250514-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_OPUS_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'global.anthropic.claude-sonnet-4-5-20250929-v1:0': {
-    defaultParams: CLAUDE_4_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'us.anthropic.claude-sonnet-4-5-20250929-v1:0': {
-    defaultParams: CLAUDE_4_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'eu.anthropic.claude-sonnet-4-5-20250929-v1:0': {
-    defaultParams: CLAUDE_4_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'jp.anthropic.claude-sonnet-4-5-20250929-v1:0': {
-    defaultParams: CLAUDE_4_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'global.anthropic.claude-sonnet-4-20250514-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'us.anthropic.claude-sonnet-4-20250514-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'eu.anthropic.claude-sonnet-4-20250514-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'apac.anthropic.claude-sonnet-4-20250514-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
@@ -1041,23 +1047,23 @@ export const BEDROCK_TEXT_GEN_MODELS: {
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'us.anthropic.claude-3-7-sonnet-20250219-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'eu.anthropic.claude-3-7-sonnet-20250219-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,
     extractConverseOutput: extractConverseOutput,
     extractConverseStreamOutput: extractConverseStreamOutput,
   },
   'apac.anthropic.claude-3-7-sonnet-20250219-v1:0': {
-    defaultParams: CLAUDE_3_5_DEFAULT_PARAMS,
+    defaultParams: CLAUDE_SONNET_4_DEFAULT_PARAMS,
     usecaseParams: USECASE_DEFAULT_PARAMS,
     createConverseCommandInput: createConverseCommandInput,
     createConverseStreamCommandInput: createConverseStreamCommandInput,