Update specs

Author: Yuriy Bezsonov

.kiro/specs/arm64-code-editor-support/design.md

@@ -217,18 +217,40 @@ Common settings shared by both IDEs:
 #!/bin/bash
 # Common IDE settings - sourced by vscode.sh and code-editor.sh
 
-# Extensions for Java workshops
-EXTENSIONS="AmazonWebServices.aws-toolkit-vscode,vscjava.vscode-java-pack,ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools,esbenp.prettier-vscode,shardulm94.trailing-spaces"
+# Extensions to install
+EXTENSIONS="vscjava.vscode-java-pack,ms-azuretools.vscode-docker,ms-kubernetes-tools.vscode-kubernetes-tools"
+
+# Extensions to uninstall (pre-installed but unwanted)
+EXTENSIONS_UNINSTALL="AmazonWebServices.aws-toolkit-vscode,AmazonWebServices.amazon-q-vscode"
 
 # Default workspace folder
 DEFAULT_WORKSPACE="/home/ec2-user/environment"
 
+# Uninstall extensions using provided binary
+# Usage: uninstall_ide_extensions <binary_command> <user>
+uninstall_ide_extensions() {
+    local binary_cmd="$1"
+    local user="$2"
+
+    IFS=',' read -ra extension_array <<< "$EXTENSIONS_UNINSTALL"
+    for extension in "${extension_array[@]}"; do
+        extension=$(echo "$extension" | xargs)
+        if [ -n "$extension" ]; then
+            echo "Uninstalling extension: $extension"
+            sudo -u $user $binary_cmd --uninstall-extension $extension 2>/dev/null || true
+        fi
+    done
+}
+
 # Install extensions using provided binary
 # Usage: install_ide_extensions <binary_command> <user>
 install_ide_extensions() {
     local binary_cmd="$1"
     local user="$2"
 
+    # First uninstall unwanted extensions
+    uninstall_ide_extensions "$binary_cmd" "$user"
+
     IFS=',' read -ra extension_array <<< "$EXTENSIONS"
     for extension in "${extension_array[@]}"; do
         extension=$(echo "$extension" | xargs)
@@ -280,15 +302,18 @@ configure_default_workspace "/home/ec2-user/.local/share/code-server/coder.json"
 
 **File:** `java-on-aws/infra/scripts/ide/code-editor.sh` (NEW)
 
-Minimal setup - use AWS Code Editor defaults, only configure:
+Setup includes:
 - Installation with checksum verification
 - Token auth
+- Settings.json (workspace trust disabled, terminal on startup, telemetry off, AWS Toolkit/Q popups suppressed)
 - Extensions (via shared function)
-- Default workspace (via shared function)
+- Default workspace folder (via shared function - coder.json)
 - Caddy proxy
 - Systemd service
 
-**No custom settings.json** - use Code Editor defaults initially.
+**Note:** Two separate configs control the startup experience:
+1. **coder.json** - sets which folder opens in the file explorer (`~/environment`)
+2. **settings.json** - sets what opens in the editor area (`"workbench.startupEditor": "terminal"`)
 
 ```bash
 #!/bin/bash
@@ -305,10 +330,22 @@ CODE_EDITOR_PORT="8889"
 sudo -u $CODE_EDITOR_USER mkdir -p "/home/${CODE_EDITOR_USER}/.code-editor-server/data"
 echo -n "$IDE_PASSWORD" > "/home/${CODE_EDITOR_USER}/.code-editor-server/data/token"
 
+# Settings.json - disable trust dialog, open terminal on startup, suppress popups
+sudo -u $CODE_EDITOR_USER tee "$settings_dir/settings.json" << 'EOF'
+{
+  "security.workspace.trust.enabled": false,
+  "workbench.startupEditor": "terminal",
+  "telemetry.telemetryLevel": "off",
+  "aws.telemetry": false,
+  "aws.suppressPrompts": { ... },
+  "amazonQ.showWalkthrough": false
+}
+EOF
+
 # Extensions
 install_ide_extensions "/home/${CODE_EDITOR_USER}/.local/bin/code-editor-server" "$CODE_EDITOR_USER"
 
-# Default workspace
+# Default workspace folder (coder.json)
 configure_default_workspace "/home/${CODE_EDITOR_USER}/.code-editor-server/data/coder.json" "$CODE_EDITOR_USER"
 
 # Caddy (same as vscode.sh)

.kiro/specs/arm64-code-editor-support/requirements.md

@@ -56,17 +56,16 @@ This feature adds ARM64 (Graviton) architecture support to the workshop IDE infr
 
 ### Requirement 4: Extension Installation Enhancement
 
-**User Story:** As a workshop participant, I want the IDE to have all necessary extensions pre-installed, so that I can start coding immediately without manual setup.
+**User Story:** As a workshop participant, I want the IDE to have all necessary extensions pre-installed and unwanted pre-installed extensions removed, so that I can start coding immediately without distractions.
 
 #### Acceptance Criteria
 
-1. WHEN installing extensions THEN the System SHALL install AWS Toolkit extension (AmazonWebServices.aws-toolkit-vscode)
-2. WHEN installing extensions THEN the System SHALL install Java Extension Pack (vscjava.vscode-java-pack)
-3. WHEN installing extensions THEN the System SHALL install Docker extension (ms-azuretools.vscode-docker)
-4. WHEN installing extensions THEN the System SHALL install Kubernetes extension (ms-kubernetes-tools.vscode-kubernetes-tools)
-5. WHEN installing extensions THEN the System SHALL install Prettier extension (esbenp.prettier-vscode)
-6. WHEN installing extensions THEN the System SHALL install Trailing Spaces extension (shardulm94.trailing-spaces)
-7. WHEN extension installation fails THEN the System SHALL log the failure and continue with remaining extensions
+1. WHEN installing extensions THEN the System SHALL install Java Extension Pack (vscjava.vscode-java-pack)
+2. WHEN installing extensions THEN the System SHALL install Docker extension (ms-azuretools.vscode-docker)
+3. WHEN installing extensions THEN the System SHALL install Kubernetes extension (ms-kubernetes-tools.vscode-kubernetes-tools)
+4. WHEN extension installation fails THEN the System SHALL log the failure and continue with remaining extensions
+5. WHEN configuring Code Editor THEN the System SHALL uninstall pre-installed AWS Toolkit extension (AmazonWebServices.aws-toolkit-vscode)
+6. WHEN configuring Code Editor THEN the System SHALL uninstall pre-installed Amazon Q extension (AmazonWebServices.amazon-q-vscode)
 
 ### Requirement 5: Kiro CLI Installation
 
@@ -108,3 +107,4 @@ This feature adds ARM64 (Graviton) architecture support to the workshop IDE infr
 1. WHEN installing extensions THEN the System SHALL use a shared function that accepts the IDE binary path as parameter
 2. WHEN the shared function is called THEN the System SHALL use retry logic for resilience
 3. WHEN the shared function is called THEN the System SHALL support both code-server and code-editor-server binaries
+4. WHEN the shared function is called THEN the System SHALL first uninstall unwanted extensions before installing new ones

.kiro/specs/arm64-code-editor-support/tasks.md

@@ -1,15 +1,15 @@
 # Implementation Plan
 
-- [ ] 1. Add IdeArch and IdeType support to CDK Ide construct
-  - [ ] 1.1 Create IdeArch enum in Ide.java
+- [x] 1. Add IdeArch and IdeType support to CDK Ide construct
+  - [x] 1.1 Create IdeArch enum in Ide.java
     - Add enum with ARM64 and X86_64 values
     - Include helper methods for AWS and uname values
     - _Requirements: 1.1_
-  - [ ] 1.2 Create IdeType enum in Ide.java
+  - [x] 1.2 Create IdeType enum in Ide.java
     - Add enum with CODE_EDITOR and VSCODE values
     - Include scriptName helper method
     - _Requirements: 3.1_
-  - [ ] 1.3 Add ideArch and ideType properties to IdeProps
+  - [x] 1.3 Add ideArch and ideType properties to IdeProps
     - Add ideArch field with ARM64 default
     - Add ideType field with CODE_EDITOR default
     - Create static instance type lists for each architecture
@@ -18,146 +18,152 @@
     - Add builder methods for ideArch and ideType
     - Comment out old instance type list for reference
     - _Requirements: 1.2, 1.3, 1.5, 7.1, 7.2_
-  - [ ] 1.4 Update UserData to export ARCH and IDE_TYPE
+  - [x] 1.4 Update UserData to export ARCH and IDE_TYPE
     - Modify userdata.sh template to include ARCH and IDE_TYPE exports
     - Pass ideArch and ideType values from CDK to UserData
     - _Requirements: 1.4, 2.1_
-  - [ ] 1.5 Write property test for ideArch → instance types mapping
+  - [x] 1.5 Write property test for ideArch → instance types mapping
     - **Property 1: Architecture determines instance types**
     - **Validates: Requirements 1.2, 1.3, 7.1, 7.2**
 
-- [ ] 2. Add architecture detection to base.sh
-  - [ ] 2.1 Add architecture detection and normalization
+- [x] 2. Add architecture detection to base.sh
+  - [x] 2.1 Add architecture detection and normalization
     - Read ARCH from environment or detect via uname
     - Create ARCH_K8S, ARCH_SAM, ARCH_GENERIC, ARCH_YQ variables
     - _Requirements: 2.1_
-  - [ ] 2.2 Update kubectl download URL
+  - [x] 2.2 Update kubectl download URL
     - Use ARCH_K8S variable in download URL
     - _Requirements: 2.2_
-  - [ ] 2.3 Update SAM CLI download URL
+  - [x] 2.3 Update SAM CLI download URL
     - Use ARCH_SAM variable in download URL
     - _Requirements: 2.3_
-  - [ ] 2.4 Update eks-node-viewer download URL
+  - [x] 2.4 Update eks-node-viewer download URL
     - Use ARCH_GENERIC variable in download URL
     - _Requirements: 2.4_
-  - [ ] 2.5 Update SOCI snapshotter download URL
+  - [x] 2.5 Update SOCI snapshotter download URL
     - Use ARCH_K8S variable (amd64/arm64) in download URL
     - _Requirements: 2.5_
-  - [ ] 2.6 Update yq download URL
+  - [x] 2.6 Update yq download URL
     - Use ARCH_YQ variable in download URL
     - _Requirements: 2.6_
-  - [ ] 2.7 Update Java path for ARM64
+  - [x] 2.7 Update Java path for ARM64
     - Handle different Java paths for aarch64 vs x86_64
     - _Requirements: 2.1_
 
-- [ ] 3. Checkpoint - Verify architecture detection works
+- [x] 3. Checkpoint - Verify architecture detection works
   - Ensure all tests pass, ask the user if questions arise.
 
-- [ ] 4. Create ide-settings.sh with common IDE configuration
-  - [ ] 4.1 Create ide-settings.sh file
-    - Define EXTENSIONS variable with full list
+- [x] 4. Create ide-settings.sh with common IDE configuration
+  - [x] 4.1 Create ide-settings.sh file
+    - Define EXTENSIONS variable with extensions to install
+    - Define EXTENSIONS_UNINSTALL variable with pre-installed extensions to remove
     - Define DEFAULT_WORKSPACE variable
-    - _Requirements: 4.1-4.6_
-  - [ ] 4.2 Add install_ide_extensions function
+    - _Requirements: 4.1-4.4_
+  - [x] 4.2 Add uninstall_ide_extensions function
+    - Accept binary command and user as parameters
+    - Loop through EXTENSIONS_UNINSTALL and remove each
+    - _Requirements: 4.5, 4.6_
+  - [x] 4.3 Add install_ide_extensions function
     - Accept binary command and user as parameters
+    - First call uninstall_ide_extensions to remove unwanted extensions
     - Loop through extensions with retry logic
-    - _Requirements: 4.7, 8.1, 8.2, 8.3_
-  - [ ] 4.3 Add configure_default_workspace function
+    - _Requirements: 4.4, 8.1, 8.2, 8.3, 8.4_
+  - [x] 4.4 Add configure_default_workspace function
     - Accept coder.json path and user as parameters
     - Create workspace config if not exists
     - _Requirements: 4.1_
 
-- [ ] 5. Create code-editor.sh for AWS Code Editor
-  - [ ] 5.1 Add code-editor installation function
+- [x] 5. Create code-editor.sh for AWS Code Editor
+  - [x] 5.1 Add code-editor installation function
     - Download manifest from code-editor.amazonaws.com
     - Support ARM64 and x64 architectures
     - _Requirements: 3.1_
-  - [ ] 5.2 Add checksum verification
+  - [x] 5.2 Add checksum verification
     - Verify SHA256 checksum against manifest
     - Fail with clear error on mismatch
     - _Requirements: 3.2_
-  - [ ] 5.3 Add installation to user's .local directory
+  - [x] 5.3 Add installation to user's .local directory
     - Extract to ~/.local/lib/code-editor-VERSION/
     - Create symlink in ~/.local/bin/
     - _Requirements: 3.3_
-  - [ ] 5.4 Add systemd service configuration
+  - [x] 5.4 Add systemd service configuration
     - Create code-editor@.service unit file
     - Configure for port 8889
     - Accept server license terms
     - _Requirements: 3.4, 3.5_
-  - [ ] 5.5 Add token authentication setup
+  - [x] 5.5 Add token authentication setup
     - Create ~/.code-editor-server/data/token file
     - Write IDE_PASSWORD to token file
     - _Requirements: 6.1_
-  - [ ] 5.6 Add Caddy proxy configuration
+  - [x] 5.6 Add Caddy proxy configuration
     - Configure Caddy to proxy port 8889
     - Same config as vscode.sh
     - _Requirements: 3.6_
-  - [ ] 5.7 Source ide-settings.sh and call shared functions
+  - [x] 5.7 Source ide-settings.sh and call shared functions
     - Call install_ide_extensions with code-editor-server
     - Call configure_default_workspace
     - _Requirements: 4.1-4.7_
 
-- [ ] 6. Update vscode.sh to use shared settings
-  - [ ] 6.1 Source ide-settings.sh
+- [x] 6. Update vscode.sh to use shared settings
+  - [x] 6.1 Source ide-settings.sh
     - Remove inline EXTENSIONS variable
     - Source ide-settings.sh at top of file
     - _Requirements: 4.1-4.6_
-  - [ ] 6.2 Use install_ide_extensions function
+  - [x] 6.2 Use install_ide_extensions function
     - Replace inline extension loop with function call
     - Pass "code-server" and "ec2-user"
     - _Requirements: 4.7_
-  - [ ] 6.3 Use configure_default_workspace function
+  - [x] 6.3 Use configure_default_workspace function
     - Replace inline coder.json creation with function call
     - _Requirements: 4.1_
 
-- [ ] 7. Update bootstrap.sh for IDE selection
-  - [ ] 7.1 Read IDE_TYPE from environment
+- [x] 7. Update bootstrap.sh for IDE selection
+  - [x] 7.1 Read IDE_TYPE from environment
     - Use IDE_TYPE from UserData (set by CDK)
     - Default to "code-editor" if not set
     - _Requirements: 3.1_
-  - [ ] 7.2 Add dynamic code alias to workshop.sh
+  - [x] 7.2 Add dynamic code alias to workshop.sh
     - Set alias based on IDE_TYPE
     - code-editor: /home/ec2-user/.local/bin/code-editor-server
     - vscode: code-server
     - _Requirements: 3.4_
-  - [ ] 7.3 Update IDE setup call
+  - [x] 7.3 Update IDE setup call
     - Change from hardcoded vscode.sh to ${IDE_TYPE}.sh
     - _Requirements: 3.1_
 
-- [ ] 8. Update shell.sh for both IDEs
-  - [ ] 8.1 Update .zshrc code alias
+- [x] 8. Update shell.sh for both IDEs
+  - [x] 8.1 Update .zshrc code alias
     - Add dynamic alias that detects installed IDE
     - Check for code-editor-server first, then code-server
     - _Requirements: 3.4_
-  - [ ] 8.2 Update settings.json zsh configuration
+  - [x] 8.2 Update settings.json zsh configuration
     - Check both code-server and code-editor settings.json paths
     - Update whichever exists
     - _Requirements: 3.4_
 
-- [ ] 9. Add Kiro CLI installation to base.sh
-  - [ ] 9.1 Add install_kiro_cli function
+- [x] 9. Add Kiro CLI installation to base.sh
+  - [x] 9.1 Add install_kiro_cli function
     - Download and run Kiro CLI installer
     - Use retry_optional for resilience
     - _Requirements: 5.1_
-  - [ ] 9.2 Add version verification
+  - [x] 9.2 Add version verification
     - Check kiro-cli --version after install
     - Log warning if verification fails
     - _Requirements: 5.2, 5.3_
-  - [ ] 9.3 Call install_kiro_cli in base.sh
+  - [x] 9.3 Call install_kiro_cli in base.sh
     - Add to end of base.sh before shell setup
     - _Requirements: 5.1_
 
-- [ ] 10. Checkpoint - Test full bootstrap
+- [x] 10. Checkpoint - Test full bootstrap
   - Ensure all tests pass, ask the user if questions arise.
 
-- [ ] 11. Update CDK URL output for conditional token-based access
-  - [ ] 11.1 Modify Ide.java URL output based on IdeType
+- [x] 11. Update CDK URL output for conditional token-based access
+  - [x] 11.1 Modify Ide.java URL output based on IdeType
     - For CODE_EDITOR: Include ?folder= and ?tkn= parameters
     - Format: https://domain/?folder=/home/ec2-user/environment&tkn=PASSWORD
     - For VSCODE: Standard URL without token (password via login page)
     - Format: https://domain/
     - _Requirements: 6.2, 6.3_
 
-- [ ] 12. Final Checkpoint - Verify complete setup
+- [x] 12. Final Checkpoint - Verify complete setup
   - Ensure all tests pass, ask the user if questions arise.