bedrock-agentcore-starter-toolkit 0.1.27__tar.gz → 0.1.28__tar.gz

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/.github/workflows/integration_testing.yml

@@ -10,7 +10,7 @@ on:
     types: [opened, synchronize, reopened]
 
 permissions:
-  contents: read 
+  contents: read
 
 jobs:
   authorization-check:
@@ -18,13 +18,13 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       approval-env: ${{ steps.collab-check.outputs.result }}
-      should-run: ${{ steps.safety-check.outputs.safe }}
+      should-run: ${{ steps.safety-check.outputs.result }}
     steps:
       - name: Checkout base branch for safety check
         uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.base.sha }}
-          
+
       - name: Safety Check - Prevent Workflow Modification Attacks
         id: safety-check
         uses: actions/github-script@v7
@@ -35,14 +35,14 @@ jobs:
               console.log('Not a pull request, proceeding');
               return 'true';
             }
-            
+
             // Get list of changed files
             const { data: files } = await github.rest.pulls.listFiles({
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: context.payload.pull_request.number,
             });
-            
+
             // Check if any workflow files or sensitive files are modified
             const dangerousPatterns = [
               /^\.github\/workflows\//,
@@ -51,18 +51,18 @@ jobs:
               /pytest\.ini$/,
               /^tests\/conftest_mock\.py$/,
             ];
-            
-            const dangerousFiles = files.filter(file => 
+
+            const dangerousFiles = files.filter(file =>
               dangerousPatterns.some(pattern => pattern.test(file.filename))
             );
-            
+
             if (dangerousFiles.length > 0) {
               console.log('⚠️ SECURITY: PR modifies sensitive files:');
               dangerousFiles.forEach(f => console.log(`  - ${f.filename}`));
               console.log('Manual review required before running integration tests');
               return 'false';
             }
-            
+
             console.log('✓ Safety check passed - no sensitive files modified');
             return 'true';
 
@@ -116,24 +116,24 @@ jobs:
          role-to-assume: ${{ secrets.AGENTCORE_INTEG_TEST_ROLE }}
          aws-region: us-west-2
          mask-aws-account-id: true
-         
+
       - name: Checkout PR head commit
         uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           persist-credentials: false
-          
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-          
+
       - name: Install dependencies
         run: |
           pip install -e .
           pip install --no-cache-dir pytest click
-          
+
       - name: Run integration tests
         env:
           AWS_REGION: us-west-2
@@ -165,4 +165,4 @@ jobs:
           echo "  - Workflow modification attacks"
           echo "  - Secret exfiltration"
           echo "  - Test manipulation"
-          exit 1
+          exit 1

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
   # PRE-COMMIT STAGE (Fast, Auto-fixing)
   # Runs on every commit
   # ========================================
-  
+
   # uv lock file management
   - repo: https://github.com/astral-sh/uv-pre-commit
     rev: 0.7.13
@@ -98,4 +98,4 @@ ci:
   submodules: false
 
 default_install_hook_types: [pre-commit, pre-push]
-default_stages: [pre-commit]
+default_stages: [pre-commit]

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.1.28] - 2025-10-31
+
+### Changes
+
+- fix: prevent incorrect entrypoint inference when multiple candidates exist (#313) (c011ebf)
+- docs: update quickstart example for agentcore-strands CI integration (#311) (ba056fb)
+- fix: correct workflow output reference for external PR tests (#307) (a6d0bc1)
+- chore: bump version to 0.1.27 (#309) (a501bcf)
+
 ## [0.1.27] - 2025-10-29
 
 ### Changes

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bedrock-agentcore-starter-toolkit
-Version: 0.1.27
+Version: 0.1.28
 Summary: A starter toolkit for using Bedrock AgentCore
 Project-URL: Homepage, https://github.com/aws/bedrock-agentcore-starter-toolkit
 Project-URL: Bug Tracker, https://github.com/aws/bedrock-agentcore-starter-toolkit/issues

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/documentation/docs/examples/agentcore-quickstart-example.md

@@ -8,10 +8,11 @@ For Gateway and Identity features, see the [Gateway quickstart](https://github.c
 
 ## Prerequisites
 
-- **AWS Permissions**: Root users or privileged roles (such as admins) can skip this step. Others need to attach the [starter toolkit policy](https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/runtime-permissions.html#runtime-permissions-starter-toolkit) and [AmazonBedrockAgentCoreFullAccess](https://docs.aws.amazon.com/aws-managed-policy/latest/reference/BedrockAgentCoreFullAccess.html) managed policy.
-- [AWS CLI version 2.0 or later](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html) configured (`aws configure`)
-- **Amazon Bedrock model access enabled for Claude 3.7 Sonnet** (Go to AWS Console → Bedrock → Model access → Enable "Claude 3.7 Sonnet" in your region). For information about using a different model with Strands Agents, see the Model Providers section in the [Strands Agents SDK](https://strandsagents.com/latest/documentation/docs/) documentation.
-- Python 3.10 or newer
+Before you start, make sure you have:
+
+- **AWS permissions**: AWS root users or users with privileged roles (such as the AdministratorAccess role) can skip this step. Others need to attach the [starter toolkit policy](https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/runtime-permissions.html#runtime-permissions-starter-toolkit) and [AmazonBedrockAgentCoreFullAccess](https://docs.aws.amazon.com/aws-managed-policy/latest/reference/BedrockAgentCoreFullAccess.html) managed policy.
+- **AWS CLI version 2.0 or later**: Configure the AWS CLI using `aws configure`. For more information, see the [AWS Command Line Interface User Guide for Version 2](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html).
+- **Python 3.10 or newer**
 
 > **Important: Ensure AWS Region Consistency**
 >
@@ -21,18 +22,20 @@ For Gateway and Identity features, see the [Gateway quickstart](https://github.c
 > - The region where you've enabled Bedrock model access
 > - All resources created during deployment will use this region
 
-### Installation (version 0.1.21 or later)
+### Install the AgentCore starter toolkit
+
+Install the AgentCore starter toolkit:
 
 ```bash
 # Create virtual environment
 python -m venv .venv
 source .venv/bin/activate  # On Windows: .venv\Scripts\activate
 
-# Install required packages
-pip install bedrock-agentcore-starter-toolkit strands-agents boto3
+# Install required packages (version 0.1.21 or later)
+pip install "bedrock-agentcore-starter-toolkit>=0.1.21" strands-agents strands-agents-tools boto3
 ```
 
-## Step 1A: Create a New Agent
+## Step 1: Create the agent
 
 Create `agentcore_starter_strands.py`:
 
@@ -41,10 +44,10 @@ Create `agentcore_starter_strands.py`:
 Strands Agent sample with AgentCore
 """
 import os
-from strands import Agent, tool
+from strands import Agent
+from strands_tools.code_interpreter import AgentCoreCodeInterpreter
 from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig, RetrievalConfig
 from bedrock_agentcore.memory.integrations.strands.session_manager import AgentCoreMemorySessionManager
-from bedrock_agentcore.tools.code_interpreter_client import CodeInterpreter
 from bedrock_agentcore.runtime import BedrockAgentCoreApp
 
 app = BedrockAgentCoreApp()
@@ -53,64 +56,44 @@ MEMORY_ID = os.getenv("BEDROCK_AGENTCORE_MEMORY_ID")
 REGION = os.getenv("AWS_REGION")
 MODEL_ID = "us.anthropic.claude-3-7-sonnet-20250219-v1:0"
 
-ci_sessions = {}
-current_session = None
-
-@tool
-def calculate(code: str) -> str:
-    """Execute Python code for calculations or analysis."""
-    session_id = current_session or 'default'
-
-    if session_id not in ci_sessions:
-        ci_sessions[session_id] = {
-            'client': CodeInterpreter(REGION),
-            'session_id': None
-        }
-
-    ci = ci_sessions[session_id]
-    if not ci['session_id']:
-        ci['session_id'] = ci['client'].start(
-            name=f"session_{session_id[:30]}",
-            session_timeout_seconds=1800
-        )
-
-    result = ci['client'].invoke("executeCode", {
-        "code": code,
-        "language": "python"
-    })
-
-    for event in result.get("stream", []):
-        if stdout := event.get("result", {}).get("structuredContent", {}).get("stdout"):
-            return stdout
-    return "Executed"
-
 @app.entrypoint
 def invoke(payload, context):
-    global current_session
-
-    if not MEMORY_ID:
-        return {"error": "Memory not configured"}
-
-    actor_id = context.headers.get('X-Amzn-Bedrock-AgentCore-Runtime-Custom-Actor-Id', 'user') if hasattr(context, 'headers') else 'user'
-
-    session_id = getattr(context, 'session_id', 'default')
-    current_session = session_id
+    actor_id = "quickstart-user"
+
+    # Get runtime session ID for isolation
+    session_id = getattr(context, 'session_id', None)
+
+    # Configure memory if available
+    session_manager = None
+    if MEMORY_ID:
+        memory_config = AgentCoreMemoryConfig(
+            memory_id=MEMORY_ID,
+            session_id=session_id or 'default',
+            actor_id=actor_id,
+            retrieval_config={
+                f"/users/{actor_id}/facts": RetrievalConfig(top_k=3, relevance_score=0.5),
+                f"/users/{actor_id}/preferences": RetrievalConfig(top_k=3, relevance_score=0.5)
+            }
+        )
+        session_manager = AgentCoreMemorySessionManager(memory_config, REGION)
 
-    memory_config = AgentCoreMemoryConfig(
-        memory_id=MEMORY_ID,
-        session_id=session_id,
-        actor_id=actor_id,
-        retrieval_config={
-            f"/users/{actor_id}/facts": RetrievalConfig(top_k=3, relevance_score=0.5),
-            f"/users/{actor_id}/preferences": RetrievalConfig(top_k=3, relevance_score=0.5)
-        }
+    # Create Code Interpreter with runtime session binding
+    code_interpreter = AgentCoreCodeInterpreter(
+        region=REGION,
+        session_name=session_id,
+        auto_create=True
     )
 
     agent = Agent(
         model=MODEL_ID,
-        session_manager=AgentCoreMemorySessionManager(memory_config, REGION),
-        system_prompt="You are a helpful assistant. Use tools when appropriate.",
-        tools=[calculate]
+        session_manager=session_manager,
+        system_prompt="""You are a helpful assistant with code execution capabilities. Use tools when appropriate.
+Response format when using code:
+1. Brief explanation of your approach
+2. Code block showing the executed code
+3. Results and analysis
+""",
+        tools=[code_interpreter.code_interpreter]
     )
 
     result = agent(payload.get("prompt", ""))
@@ -125,21 +108,22 @@ Create `requirements.txt`:
 ```text
 strands-agents
 bedrock-agentcore
+strands-agents-tools
 ```
 
-## Step 1B: Transform an Existing Agent to be Compatible with Runtime
+## Step 2: Configure and deploy the agent
 
-1. Import the Runtime App with from bedrock_agentcore.runtime import BedrockAgentCoreApp
-2. Initialize the App in your code with app = BedrockAgentCoreApp()
-3. Decorate the invocation function with the @app.entrypoint decorator
-4. Create a requirements.txt file with needed packages. Note: if strands-tools is detected, the correct library to add is strands-agents-tools
-5. Let AgentCore Runtime control the running of the agent with app.run() 
+In this step, you'll use the AgentCore CLI to configure and deploy your agent.
 
-## Step 2: Configure and Deploy
+### Configure the agent
 
-The AgentCore CLI automates deployment with provisioning.
+Configure the agent with memory and execution settings:
 
-### Configure the Agent
+**For this tutorial**: When prompted for the execution role, press Enter to auto-create a new role with all required permissions for the Runtime, Memory, Code Interpreter, and Observability features. When prompted for long-term memory, type **yes**.
+
+> **Note**
+>
+> If the memory configuration prompts do not appear during `agentcore configure`, refer to the [Troubleshooting](#troubleshooting) section (Memory configuration not appearing) for instructions on how to check whether the correct toolkit version is installed.
 
 ```bash
 agentcore configure -e agentcore_starter_strands.py
@@ -148,21 +132,20 @@ agentcore configure -e agentcore_starter_strands.py
 
 # 1. Execution Role: Press Enter to auto-create or provide existing role ARN/name
 # 2. ECR Repository: Press Enter to auto-create or provide existing ECR URI
-# 3. OAuth Configuration: Configure OAuth authorizer? (yes/no) - Type `no` for this tutorial
-# 4. Request Header Allowlist: Configure request header allowlist? (yes/no) - Type `no` for this tutorial
-# 5. Memory Configuration:
+# 3. Requirements File: Confirm the detected requirements.txt file or specify a different path
+# 4. OAuth Configuration: Configure OAuth authorizer? (yes/no) - Type `no` for this tutorial
+# 5. Request Header Allowlist: Configure request header allowlist? (yes/no) - Type `no` for this tutorial
+# 6. Memory Configuration:
 #    - If existing memories found: Choose from list or press Enter to create new
-#    - If creating new: Enable long-term memory extraction? (yes/no) - Type `yes` for this tutorial
-#    - Note: Short-term memory is always enabled by default
-# If interactive mode fails, use "--non-interactive" for default configs
+#    - If creating new: Press Enter to create new memory
+#        - Enable long-term memory extraction? (yes/no) - Type `yes` for this tutorial
+#.   - Type 's' to skip memory setup
 ```
-**For this tutorial**: When prompted for the execution role, press Enter to auto-create a new role with all required permissions for Runtime, Memory, Code Interpreter, and Observability. When prompted for long-term memory, type **yes** for this tutorial.
-
-**Note**: If the memory configuration prompts do not appear during `agentcore configure`, refer to the [Troubleshooting](#troubleshooting) section (Memory Configuration Not Appearing) to ensure the correct toolkit version is installed.
-
 
 ### Deploy to AgentCore
 
+Launch your agent to the AgentCore runtime environment:
+
 ```bash
 agentcore launch
 
@@ -176,9 +159,18 @@ agentcore launch
 ```
 
 **Expected output:**
+During launch, you'll see memory creation progress with elapsed time indicators. Memory provisioning may take around 2-5 minutes to activate:
 
 ```text
-✅ Memory created: agentcore_starter_strands_mem-abc123
+Creating memory resource for agent: agentcore_starter_strands
+⏳ Creating memory resource (this may take 30-180 seconds)...
+Created memory: agentcore_starter_strands_mem-abc123
+Waiting for memory agentcore_starter_strands_mem-abc123 to return to ACTIVE state...
+⏳ Memory: CREATING (61s elapsed)
+⏳ Memory: CREATING (92s elapsed)
+⏳ Memory: CREATING (123s elapsed)
+✅ Memory is ACTIVE (took 159s)
+✅ Memory created and active: agentcore_starter_strands_mem-abc123
 Observability is enabled, configuring Transaction Search...
 ✅ Transaction Search configured: resource_policy, trace_destination, indexing_rule
 🔍 GenAI Observability Dashboard:
@@ -187,48 +179,40 @@ Observability is enabled, configuring Transaction Search...
 Agent ARN: arn:aws:bedrock-agentcore:us-west-2:123456789:runtime/agentcore_starter_strands-xyz
 ```
 
-**If deployment encounters errors or behaves unexpectedly**, check your configuration:
+If the deployment encounters errors or behaves unexpectedly, check your configuration:
 ```bash
 cat .bedrock_agentcore.yaml  # Review deployed configuration
 agentcore status              # Verify resource provisioning status
 ```
+
 Refer to the [Troubleshooting](#troubleshooting) section if you see any issues.
 
 ## Step 3: Monitor Deployment
 
-Check deployment status:
+Check the agent's deployment status:
 
 ```bash
 agentcore status
 
 # Shows:
 #   Memory ID: agentcore_starter_strands_mem-abc123
-#   Memory Status: CREATING (if still provisioning)
-#   Memory Type: STM+LTM (provisioning...) (if creating with LTM)
 #   Memory Type: STM+LTM (3 strategies) (when active with strategies)
 #   Memory Type: STM only (if configured without LTM)
 #   Observability: Enabled
 ```
 
-**Note**: LTM strategies require 2-5 minutes to activate. STM is provisioned immediately if LTM is not selected.
-
 ## Step 4: Test Memory and Code Interpreter
 
+In this section, you'll test your agent's memory capabilities and code execution features.
+
 ### Test Short-Term Memory (STM)
 
-Testing within a single session:
+Test short-term memory within a single session:
 
 ```bash
 # Store information (session IDs must be 33+ characters)
 agentcore invoke '{"prompt": "Remember that my favorite agent platform is AgentCore"}'
 
-# If invoked too early (memory still provisioning), you'll see:
-# "Memory is still provisioning (current status: CREATING).
-#  Long-term memory extraction takes 60-180 seconds to activate.
-#
-#  Please wait and check status with:
-#    agentcore status"
-
 # Retrieve within same session
 agentcore invoke '{"prompt": "What is my favorite agent platform?"}'
 
@@ -236,16 +220,20 @@ agentcore invoke '{"prompt": "What is my favorite agent platform?"}'
 # "Your favorite agent platform is AgentCore."
 ```
 
-### Test Long-Term Memory (LTM) - Cross-Session Persistence
+### Test long-term memory – cross-session persistence
+
+Long-term memory (LTM) lets information persist across different sessions. This requires waiting for long-term memory to be extracted before starting a new session.
 
-LTM enables information persistence across different sessions. This requires waiting for LTM extraction after storing information.
+Test long-term memory by starting a session:
 
 ```bash
 # Session 1: Store facts
 agentcore invoke '{"prompt": "My email is user@example.com and I am an AgentCore user"}'
 ```
 
-Wait for extraction that runs in the background by AgentCore. This typically takes 10-30 seconds. If you do not see the facts, wait a few more seconds and try again.
+After invoking the agent, AgentCore runs in the background to perform an extraction. Wait for the extraction to finish. This typically takes 10-30 seconds. If you do not see any facts, wait a few more seconds.
+
+Start another session:
 
 ```bash
 sleep 20
@@ -260,6 +248,8 @@ agentcore invoke '{"prompt": "Tell me about myself?"}' --session-id $SESSION_ID
 
 ### Test Code Interpreter
 
+Test AgentCore Code Interpreter:
+
 ```bash
 # Store data
 agentcore invoke '{"prompt": "My dataset has values: 23, 45, 67, 89, 12, 34, 56."}'
@@ -272,7 +262,9 @@ agentcore invoke '{"prompt": "Create a text-based bar chart visualization showin
 
 ## Step 5: View Traces and Logs
 
-### Access CloudWatch Dashboard
+In this section, you'll use observability features to monitor your agent's performance.
+
+### Access the Amazon CloudWatch dashboard
 
 Navigate to the GenAI Observability dashboard to view end-to-end request traces including agent execution tracking, memory retrieval operations, code interpreter executions, agent reasoning steps, and latency breakdown by component. The dashboard provides a service map view showing agent runtime connections to Memory and Code Interpreter services with request flow visualization and latency metrics, as well as detailed X-Ray traces for debugging and performance analysis.
 
@@ -282,10 +274,12 @@ agentcore status
 
 # Navigate to the URL shown, or go directly to:
 # https://console.aws.amazon.com/cloudwatch/home?region=us-west-2#gen-ai-observability/agent-core
-# Note: Replace the region
+# Note: Replace the Region
 ```
 
-### View Agent Runtime Logs
+### View AgentCore Runtime logs
+
+Access detailed AgentCore Runtime logs for debugging and monitoring:
 
 ```bash
 # The correct log paths are shown in the invoke or status output
@@ -302,15 +296,17 @@ aws logs tail /aws/bedrock-agentcore/runtimes/AGENT_ID-DEFAULT --log-stream-name
 aws logs tail /aws/bedrock-agentcore/runtimes/AGENT_ID-DEFAULT --log-stream-name-prefix "YYYY/MM/DD/[runtime-logs]" --since 1h
 ```
 
-## Clean Up
+## Clean up
+
+Remove all resources created during this tutorial:
 
 ```bash
 agentcore destroy
 
 # Removes:
-#   - Runtime endpoint and agent
-#   - Memory resources (STM + LTM)
-#   - ECR repository and images
+#   - AgentCore Runtime endpoint and agent
+#   - AgentCore Memory resources (short- and long-term memory)
+#   - Amazon ECR repository and images
 #   - IAM roles (if auto-created)
 #   - CloudWatch log groups (optional)
 ```
@@ -407,12 +403,6 @@ pip install --no-cache-dir "bedrock-agentcore-starter-toolkit>=0.1.21" strands-a
 <details>
 <summary><strong>Memory Issues</strong></summary>
 
-**"Memory status is not active" error:**
-
-- Run `agentcore status` to check memory status
-- If showing "provisioning", wait 2-3 minutes
-- Retry after status shows "STM+LTM (3 strategies)"
-
 **Cross-session memory not working:**
 
 - Verify LTM is active (not "provisioning")

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bedrock-agentcore-starter-toolkit"
-version = "0.1.27"
+version = "0.1.28"
 description = "A starter toolkit for using Bedrock AgentCore"
 readme = "README.md"
 requires-python = ">=3.10"

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/src/bedrock_agentcore_starter_toolkit/cli/runtime/commands.py

@@ -162,20 +162,28 @@ def _detect_entrypoint_in_source(source_path: str, non_interactive: bool = False
     # Use operations layer for detection
     detected = detect_entrypoint(source_dir)
 
-    if not detected:
-        # No fallback prompt - fail with clear error message
+    if len(detected) == 0:
+        # No files found - error
         rel_source = get_relative_path(source_dir)
         _handle_error(
             f"No entrypoint file found in {rel_source}\n"
             f"Expected one of: main.py, agent.py, app.py, __main__.py\n"
             f"Please specify full file path (e.g., {rel_source}/your_agent.py)"
         )
+    elif len(detected) > 1:
+        # Multiple files found - error with list
+        rel_source = get_relative_path(source_dir)
+        files_list = ", ".join(f.name for f in detected)
+        _handle_error(
+            f"Multiple entrypoint files found in {rel_source}: {files_list}\n"
+            f"Please specify full file path (e.g., {rel_source}/main.py)"
+        )
 
-    # Show detection and confirm
-    rel_entrypoint = get_relative_path(detected)
+    # Exactly one file - show detection and confirm
+    rel_entrypoint = get_relative_path(detected[0])
 
     _print_success(f"Using entrypoint file: [cyan]{rel_entrypoint}[/cyan]")
-    return str(detected)
+    return str(detected[0])
 
 
 # Define options at module level to avoid B008

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/src/bedrock_agentcore_starter_toolkit/operations/runtime/configure.py

@@ -60,26 +60,30 @@ def get_relative_path(path: Path, base: Optional[Path] = None) -> str:
         return str(path_obj)
 
 
-def detect_entrypoint(source_path: Path) -> Optional[Path]:
-    """Detect entrypoint file in source directory.
+def detect_entrypoint(source_path: Path) -> List[Path]:
+    """Detect entrypoint files in source directory.
 
     Args:
         source_path: Directory to search for entrypoint
 
     Returns:
-        Path to detected entrypoint file, or None if not found
+        List of detected entrypoint files (empty list if none found)
     """
     ENTRYPOINT_CANDIDATES = ["agent.py", "app.py", "main.py", "__main__.py"]
 
     source_dir = Path(source_path)
+    found_files = []
+
     for candidate in ENTRYPOINT_CANDIDATES:
         candidate_path = source_dir / candidate
         if candidate_path.exists():
+            found_files.append(candidate_path)
             log.debug("Detected entrypoint: %s", candidate_path)
-            return candidate_path
 
-    log.debug("No entrypoint found in %s", source_path)
-    return None
+    if not found_files:
+        log.debug("No entrypoint found in %s", source_path)
+
+    return found_files
 
 
 def detect_requirements(source_path: Path):

{bedrock_agentcore_starter_toolkit-0.1.27 → bedrock_agentcore_starter_toolkit-0.1.28}/tests/operations/runtime/test_configure.py

@@ -2290,7 +2290,7 @@ class TestHelperFunctions:
         empty_dir.mkdir()
 
         result = detect_entrypoint(empty_dir)
-        assert result is None
+        assert result == []
 
     def test_detect_entrypoint_finds_agent_py(self, tmp_path):
         """Test detect_entrypoint finds agent.py."""
@@ -2300,7 +2300,9 @@ class TestHelperFunctions:
         agent_file.write_text("# agent")
 
         result = detect_entrypoint(test_dir)
-        assert result == agent_file
+        assert isinstance(result, list)
+        assert len(result) == 1
+        assert result[0] == agent_file
 
     def test_detect_entrypoint_finds_app_py(self, tmp_path):
         """Test detect_entrypoint finds app.py when agent.py doesn't exist."""
@@ -2310,7 +2312,9 @@ class TestHelperFunctions:
         app_file.write_text("# app")
 
         result = detect_entrypoint(test_dir)
-        assert result == app_file
+        assert isinstance(result, list)
+        assert len(result) == 1
+        assert result[0] == app_file
 
     def test_detect_entrypoint_finds_main_py(self, tmp_path):
         """Test detect_entrypoint finds main.py when agent.py and app.py don't exist."""
@@ -2320,10 +2324,12 @@ class TestHelperFunctions:
         main_file.write_text("# main")
 
         result = detect_entrypoint(test_dir)
-        assert result == main_file
+        assert isinstance(result, list)
+        assert len(result) == 1
+        assert result[0] == main_file
 
     def test_detect_entrypoint_priority_order(self, tmp_path):
-        """Test detect_entrypoint follows priority order: agent.py > app.py > main.py."""
+        """Test detect_entrypoint returns all matching files in priority order."""
         test_dir = tmp_path / "test"
         test_dir.mkdir()
 
@@ -2336,8 +2342,12 @@ class TestHelperFunctions:
         main_file.write_text("# main")
 
         result = detect_entrypoint(test_dir)
-        # Should find agent.py first (highest priority)
-        assert result == agent_file
+        # Should return all three files in priority order
+        assert isinstance(result, list)
+        assert len(result) == 3
+        assert result[0] == agent_file  # First in priority
+        assert result[1] == app_file  # Second in priority
+        assert result[2] == main_file  # Third in priority
 
     def test_infer_agent_name_with_py_extension(self, tmp_path):
         """Test infer_agent_name removes .py extension."""