feat(java-on-aws-aiagent): enhance clipboard copy and bedrock agent support

Author: Yuriy Bezsonov

apps/aiagent/src/main/resources/static/chat.js

@@ -169,15 +169,36 @@ function escapeHtml(unsafe) {
 
 function copyMessageContent(button) {
     const text = button.getAttribute('data-copy-text');
-    navigator.clipboard.writeText(text).then(() => {
-        const originalText = button.innerHTML;
-        button.innerHTML = '✓ Copied';
-        button.classList.add('copied');
-        setTimeout(() => {
-            button.innerHTML = originalText;
-            button.classList.remove('copied');
-        }, 2000);
-    }).catch(() => {});
+
+    if (navigator.clipboard && window.isSecureContext) {
+        navigator.clipboard.writeText(text).then(() => {
+            showCopySuccess(button);
+        }).catch(() => fallbackCopy(text, button));
+    } else {
+        fallbackCopy(text, button);
+    }
+}
+
+function fallbackCopy(text, button) {
+    const textarea = document.createElement('textarea');
+    textarea.value = text;
+    textarea.style.position = 'fixed';
+    textarea.style.opacity = '0';
+    document.body.appendChild(textarea);
+    textarea.select();
+    document.execCommand('copy');
+    document.body.removeChild(textarea);
+    showCopySuccess(button);
+}
+
+function showCopySuccess(button) {
+    const originalText = button.innerHTML;
+    button.innerHTML = '✓ Copied';
+    button.classList.add('copied');
+    setTimeout(() => {
+        button.innerHTML = originalText;
+        button.classList.remove('copied');
+    }, 2000);
 }
 
 async function sendMessage(message, config, auth) {
@@ -300,11 +321,11 @@ async function processStreamingResponse(response, loadingId = null) {
             }
 
             const chunk = decoder.decode(value, { stream: true });
-            
+
             if (isSSE === null) {
                 isSSE = chunk.trimStart().startsWith('data:');
             }
-            
+
             if (isSSE) {
                 buffer += chunk;
                 const lines = buffer.split('\n');

infra/cdk/src/main/java/sample/com/WorkshopStack.java

@@ -30,6 +30,8 @@ public class WorkshopStack extends Stack {
                 # Resolution for when creating the first service in the account
                 aws iam create-service-linked-role --aws-service-name ecs.amazonaws.com 2>/dev/null || true
                 aws iam create-service-linked-role --aws-service-name elasticloadbalancing.amazonaws.com 2>/dev/null || true
+                aws iam create-service-linked-role --aws-service-name network.bedrock-agentcore.amazonaws.com 2>/dev/null || true
+                aws iam create-service-linked-role --aws-service-name runtime-identity.bedrock-agentcore.amazonaws.com 2>/dev/null || true
         """;
 
     public WorkshopStack(final Construct scope, final String id, final StackProps props) {
@@ -257,12 +259,10 @@ public WorkshopStack(final Construct scope, final String id, final StackProps pr
                             CMD ["nginx", "-g", "daemon off;"]
                             EOF
 
-                            # Build and push placeholder to both repos (create-on-push creates repos)
+                            # Build and push placeholder image (create-on-push creates repo)
                             docker build -t placeholder /tmp
-                            for REPO in aiagent mcpserver1; do
-                              docker tag placeholder $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPO:latest
-                              docker push $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPO:latest
-                            done
+                            docker tag placeholder $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/aiagent:latest
+                            docker push $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/aiagent:latest
                     """;
 
                 CodeBuild placeholderImageBuild = new CodeBuild(this, "PlaceholderImageBuild",

infra/cfn/java-spring-ai-agents-stack.yaml

@@ -714,7 +714,7 @@ Resources:
         Fn::GetAtt:
           - CodeBuildRoleE9A44575
           - Arn
-      ContentHash: "1769256801727"
+      ContentHash: "1769285698737"
       ProjectName:
         Ref: CodeBuildProjectA0FF5539
       ServiceToken:
@@ -801,12 +801,12 @@ Resources:
       Environment:
         ComputeType: BUILD_GENERAL1_MEDIUM
         EnvironmentVariables:
-          - Name: TEMPLATE_TYPE
-            Type: PLAINTEXT
-            Value: java-spring-ai-agents
           - Name: GIT_BRANCH
             Type: PLAINTEXT
             Value: main
+          - Name: TEMPLATE_TYPE
+            Type: PLAINTEXT
+            Value: java-spring-ai-agents
         Image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: false
@@ -835,6 +835,8 @@ Resources:
                   # Resolution for when creating the first service in the account
                   aws iam create-service-linked-role --aws-service-name ecs.amazonaws.com 2>/dev/null || true
                   aws iam create-service-linked-role --aws-service-name elasticloadbalancing.amazonaws.com 2>/dev/null || true
+                  aws iam create-service-linked-role --aws-service-name network.bedrock-agentcore.amazonaws.com 2>/dev/null || true
+                  aws iam create-service-linked-role --aws-service-name runtime-identity.bedrock-agentcore.amazonaws.com 2>/dev/null || true
         Type: NO_SOURCE
       TimeoutInMinutes: 30
       VpcConfig:
@@ -2404,7 +2406,7 @@ Resources:
         Fn::GetAtt:
           - PlaceholderImageBuildRole66BA72FE
           - Arn
-      ContentHash: "1769256802083"
+      ContentHash: "1769285699069"
       ProjectName:
         Ref: PlaceholderImageBuildProjectC08F4D66
       ServiceToken:
@@ -2524,12 +2526,10 @@ Resources:
                   CMD ["nginx", "-g", "daemon off;"]
                   EOF
 
-                  # Build and push placeholder to both repos (create-on-push creates repos)
+                  # Build and push placeholder image (create-on-push creates repo)
                   docker build -t placeholder /tmp
-                  for REPO in aiagent mcpserver1; do
-                    docker tag placeholder $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPO:latest
-                    docker push $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$REPO:latest
-                  done
+                  docker tag placeholder $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/aiagent:latest
+                  docker push $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/aiagent:latest
         Type: NO_SOURCE
       TimeoutInMinutes: 30
       VpcConfig:
@@ -3558,7 +3558,7 @@ Resources:
             - Ref: AWS::AccountId
             - "-"
             - Ref: AWS::Region
-            - "-20260124131321"
+            - "-20260124211458"
       PublicAccessBlockConfiguration:
         BlockPublicAcls: true
         BlockPublicPolicy: true

infra/scripts/templates/java-spring-ai-agents.sh

@@ -20,6 +20,19 @@ else
     exit 1
 fi
 
+# Phase 2: Simplify p10k prompt (remove vcs, kubecontext, aws)
+log_info "Phase 2: Simplifying p10k prompt..."
+P10K_FILE="$HOME/.p10k.zsh"
+if [[ -f "$P10K_FILE" ]]; then
+    # Remove vcs from left prompt
+    sed -i '' "s/POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir vcs newline prompt_char)/POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir newline prompt_char)/" "$P10K_FILE"
+    # Remove kubecontext and aws from right prompt
+    sed -i '' "s/POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status command_execution_time background_jobs kubecontext aws newline)/POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status command_execution_time background_jobs newline)/" "$P10K_FILE"
+    log_success "p10k prompt simplified"
+else
+    log_warning "p10k.zsh not found, skipping prompt customization"
+fi
+
 log_success "Java-Spring-AI-Agents workshop post-deploy setup completed successfully!"
 
 # Emit for bootstrap summary