From df99990be451e739007e88d23c841fb132f2b951 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 13:32:33 +0530
Subject: [PATCH 01/13] fix(*): update deployment script based on new setup

---
 .github/workflows/cd-production.yml | 2 +-
 .github/workflows/cd-staging.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index bb91a52..da47fca 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -31,5 +31,5 @@ jobs:
           aws ssm send-command \
             --instance-ids "${{ secrets.EC2_INSTANCE_ID }}" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory ${{ secrets.BUILD_DIRECTORY }} && set -e && cd ${{ secrets.BUILD_DIRECTORY }} && git pull origin main && npm ci && npm run build && sudo -u ubuntu PM2_HOME=/home/ubuntu/.pm2 /data/.nvm/versions/node/v24.11.0/bin/pm2 restart ${{ secrets.PM2_APP_NAME }}"]' \
+            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory ${{ secrets.BUILD_DIRECTORY }} && set -e && cd ${{ secrets.BUILD_DIRECTORY }} && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart ${{ secrets.PM2_APP_NAME }}"]' \
             --region ${{ secrets.AWS_REGION }}
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index dd9c2cd..ed6ffbb 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -31,5 +31,5 @@ jobs:
           aws ssm send-command \
             --instance-ids "${{ secrets.EC2_INSTANCE_ID }}" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory ${{ secrets.BUILD_DIRECTORY }} && set -e && cd ${{ secrets.BUILD_DIRECTORY }} && git pull origin main && npm ci && npm run build && sudo -u ubuntu PM2_HOME=/home/ubuntu/.pm2 /data/.nvm/versions/node/v24.11.0/bin/pm2 restart ${{ secrets.PM2_APP_NAME }}"]' \
+            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory ${{ secrets.BUILD_DIRECTORY }} && set -e && cd ${{ secrets.BUILD_DIRECTORY }} && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart ${{ secrets.PM2_APP_NAME }}"]' \
             --region ${{ secrets.AWS_REGION }}

From ee06daba843a35fd143b0d7d3072315c381a4dba Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 14:31:42 +0530
Subject: [PATCH 02/13] fix(*): refactoring

---
 .github/workflows/cd-production.yml | 11 ++++++++---
 .github/workflows/cd-staging.yml    | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index da47fca..f473d93 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -27,9 +27,14 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Deploy via SSM
+        env:
+          BUILD_DIRECTORY: ${{ secrets.BUILD_DIRECTORY }}
+          APP_NAME: ${{ secrets.PM2_APP_NAME }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
         run: |
           aws ssm send-command \
-            --instance-ids "${{ secrets.EC2_INSTANCE_ID }}" \
+            --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory ${{ secrets.BUILD_DIRECTORY }} && set -e && cd ${{ secrets.BUILD_DIRECTORY }} && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart ${{ secrets.PM2_APP_NAME }}"]' \
-            --region ${{ secrets.AWS_REGION }}
+            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart $APP_NAME"]' \
+            --region $AWS_REGION
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index ed6ffbb..1cfc491 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -27,9 +27,14 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Deploy via SSM
+        env:
+          BUILD_DIRECTORY: ${{ secrets.BUILD_DIRECTORY }}
+          APP_NAME: ${{ secrets.PM2_APP_NAME }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
         run: |
           aws ssm send-command \
-            --instance-ids "${{ secrets.EC2_INSTANCE_ID }}" \
+            --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory ${{ secrets.BUILD_DIRECTORY }} && set -e && cd ${{ secrets.BUILD_DIRECTORY }} && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart ${{ secrets.PM2_APP_NAME }}"]' \
-            --region ${{ secrets.AWS_REGION }}
+            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart $APP_NAME"]' \
+            --region $AWS_REGION

From f00d5a9c7fb69e680aaf7a0a05d91be2e37c1743 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 15:32:19 +0530
Subject: [PATCH 03/13] fix(*): added the scripts

---
 .github/workflows/cd-production.yml | 3 ++-
 .github/workflows/cd-staging.yml    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index f473d93..99784ee 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -32,9 +32,10 @@ jobs:
           APP_NAME: ${{ secrets.PM2_APP_NAME }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
           INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
+          ROOT_USER: ${{ secrets.USER }}
         run: |
           aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart $APP_NAME"]' \
+            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && $ROOT_USER && pm2 restart $APP_NAME"]' \
             --region $AWS_REGION
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 1cfc491..4046d3b 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -32,9 +32,10 @@ jobs:
           APP_NAME: ${{ secrets.PM2_APP_NAME }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
           INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
+          ROOT_USER: ${{ secrets.USER }}
         run: |
           aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && su - ec2-user && pm2 restart $APP_NAME"]' \
+            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && $ROOT_USER && pm2 restart $APP_NAME"]' \
             --region $AWS_REGION

From 826b6c9d8e4059d026e8511a51c6d5ee2dd8c523 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 16:30:34 +0530
Subject: [PATCH 04/13] fix(*): update the environment name

---
 .github/workflows/cd-production.yml | 2 +-
 .github/workflows/cd-staging.yml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index 99784ee..ec8e76b 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    environment: AWS_PRODUCTION_ENV
+    environment: AWS_ENV
 
     permissions:
       packages: write
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 4046d3b..486d753 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    environment: AWS_STAGING_ENV
+    environment: AWS_ENV
 
     permissions:
       packages: write
@@ -31,7 +31,7 @@ jobs:
           BUILD_DIRECTORY: ${{ secrets.BUILD_DIRECTORY }}
           APP_NAME: ${{ secrets.PM2_APP_NAME }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
-          INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
+          INSTANCE_ID: ${{ secrets.EC2_STAGING_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
           aws ssm send-command \

From cf9397b4f0ebdc39726108e247359506bdfc4fc2 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 18:51:49 +0530
Subject: [PATCH 05/13] chore: test deployment script

---
 .github/workflows/cd-staging.yml | 2 +-
 app/lib/constants.ts             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 486d753..4bb07a2 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -3,7 +3,7 @@ name: Deploy Kaapi to EC2 Staging
 on:
   push:
     branches:
-      - main # Deploy only when changes are pushed to the main branch
+      - build/update-deployment-script # Deploy only when changes are pushed to the main branch
 
 jobs:
   deploy:
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index fde30b1..625342e 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -5,7 +5,7 @@
 import { ConfigBlob } from "@/app/lib/types/promptEditor";
 import { ToastType } from "@/app/components/Toast";
 
-export const APP_NAME = "Kaapi Konsole";
+export const APP_NAME = "Kaapi Konsole V1";
 
 export const STORAGE_KEYS = {
   API_KEYS: "kaapi_api_keys",

From 1965d2ead05605fc433f97237992d515f5ca09ef Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:11:12 +0530
Subject: [PATCH 06/13] fix(*): update the script

---
 .github/workflows/cd-production.yml | 5 +++--
 .github/workflows/cd-staging.yml    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index ec8e76b..4454cd1 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -34,8 +34,9 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
+          REMOTE_CMD="export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:\$PATH && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
           aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && $ROOT_USER && pm2 restart $APP_NAME"]' \
-            --region $AWS_REGION
+            --parameters commands="[\"$REMOTE_CMD\"]" \
+            --region "$AWS_REGION"
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 4bb07a2..3e7775e 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -34,8 +34,9 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_STAGING_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
+          REMOTE_CMD="export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:\$PATH && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
           aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
-            --parameters 'commands=["export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:$PATH && git config --global --add safe.directory $BUILD_DIRECTORY && set -e && cd $BUILD_DIRECTORY && git pull origin main && npm ci && npm run build && $ROOT_USER && pm2 restart $APP_NAME"]' \
-            --region $AWS_REGION
+            --parameters commands="[\"$REMOTE_CMD\"]" \
+            --region "$AWS_REGION"

From a3bde7d63af2f66ca4d585b40bd7d4fe67f5866f Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:23:29 +0530
Subject: [PATCH 07/13] fix(*): update the script

---
 .github/workflows/cd-production.yml | 28 +++++++++++++++++++++++++---
 .github/workflows/cd-staging.yml    | 28 +++++++++++++++++++++++++---
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index 4454cd1..0fc052d 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -27,6 +27,7 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Deploy via SSM
+        id: ssm
         env:
           BUILD_DIRECTORY: ${{ secrets.BUILD_DIRECTORY }}
           APP_NAME: ${{ secrets.PM2_APP_NAME }}
@@ -34,9 +35,30 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:\$PATH && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
-          aws ssm send-command \
+          REMOTE_CMD="export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
+          CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
             --parameters commands="[\"$REMOTE_CMD\"]" \
-            --region "$AWS_REGION"
+            --region "$AWS_REGION" \
+            --query 'Command.CommandId' \
+            --output text)
+          echo "cmd_id=$CMD_ID" >> "$GITHUB_OUTPUT"
+
+      - name: Wait for SSM command to finish
+        env:
+          INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
+          CMD_ID: ${{ steps.ssm.outputs.cmd_id }}
+        run: |
+          WAIT_EXIT=0
+          aws ssm wait command-executed \
+            --command-id "$CMD_ID" \
+            --instance-id "$INSTANCE_ID" || WAIT_EXIT=$?
+
+          aws ssm get-command-invocation \
+            --command-id "$CMD_ID" \
+            --instance-id "$INSTANCE_ID" \
+            --query '{Status:Status,Stdout:StandardOutputContent,Stderr:StandardErrorContent}' \
+            --output json
+
+          exit $WAIT_EXIT
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 3e7775e..23efed1 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -27,6 +27,7 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
 
       - name: Deploy via SSM
+        id: ssm
         env:
           BUILD_DIRECTORY: ${{ secrets.BUILD_DIRECTORY }}
           APP_NAME: ${{ secrets.PM2_APP_NAME }}
@@ -34,9 +35,30 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_STAGING_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export HOME=/home/ubuntu && export PATH=/data/.nvm/versions/node/v24.11.0/bin:\$PATH && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
-          aws ssm send-command \
+          REMOTE_CMD="export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
+          CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
             --parameters commands="[\"$REMOTE_CMD\"]" \
-            --region "$AWS_REGION"
+            --region "$AWS_REGION" \
+            --query 'Command.CommandId' \
+            --output text)
+          echo "cmd_id=$CMD_ID" >> "$GITHUB_OUTPUT"
+
+      - name: Wait for SSM command to finish
+        env:
+          INSTANCE_ID: ${{ secrets.EC2_STAGING_INSTANCE_ID }}
+          CMD_ID: ${{ steps.ssm.outputs.cmd_id }}
+        run: |
+          WAIT_EXIT=0
+          aws ssm wait command-executed \
+            --command-id "$CMD_ID" \
+            --instance-id "$INSTANCE_ID" || WAIT_EXIT=$?
+
+          aws ssm get-command-invocation \
+            --command-id "$CMD_ID" \
+            --instance-id "$INSTANCE_ID" \
+            --query '{Status:Status,Stdout:StandardOutputContent,Stderr:StandardErrorContent}' \
+            --output json
+
+          exit $WAIT_EXIT

From bfd9e20332da9bec761e04685d29210223061048 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:26:21 +0530
Subject: [PATCH 08/13] fix(*): update the script

---
 .github/workflows/cd-production.yml | 2 +-
 .github/workflows/cd-staging.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index 0fc052d..79c1419 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -35,7 +35,7 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
+          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
           CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 23efed1..1672320 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -35,7 +35,7 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_STAGING_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
+          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
           CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \

From e8e5560c498471279a7db9bf6063f3cb36955f28 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:30:25 +0530
Subject: [PATCH 09/13] fix(*): fix the sudo command

---
 .github/workflows/cd-production.yml | 2 +-
 .github/workflows/cd-staging.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index 79c1419..a599d92 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -35,7 +35,7 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
+          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo - ${ROOT_USER} pm2 restart ${APP_NAME}"
           CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 1672320..8fd92f3 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -35,7 +35,7 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_STAGING_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -u ${ROOT_USER} pm2 restart ${APP_NAME}"
+          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo - ${ROOT_USER} pm2 restart ${APP_NAME}"
           CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \

From 8df68b2f3a961dd588440dc2796aaf71f7a53d64 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:34:12 +0530
Subject: [PATCH 10/13] fix(*): fix the sudo command

---
 .github/workflows/cd-production.yml | 2 +-
 .github/workflows/cd-staging.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index a599d92..2958a79 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -35,7 +35,7 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo - ${ROOT_USER} pm2 restart ${APP_NAME}"
+          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -iu ${ROOT_USER} pm2 restart ${APP_NAME}"
           CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index 8fd92f3..f0e03ef 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -35,7 +35,7 @@ jobs:
           INSTANCE_ID: ${{ secrets.EC2_STAGING_INSTANCE_ID }}
           ROOT_USER: ${{ secrets.USER }}
         run: |
-          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo - ${ROOT_USER} pm2 restart ${APP_NAME}"
+          REMOTE_CMD="export HOME=/home/$ROOT_USER && export NVM_DIR="/home/$ROOT_USER/.nvm" && [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" && git config --global --add safe.directory ${BUILD_DIRECTORY} && set -e && cd ${BUILD_DIRECTORY} && git pull origin main && npm ci && npm run build && sudo -iu ${ROOT_USER} pm2 restart ${APP_NAME}"
           CMD_ID=$(aws ssm send-command \
             --instance-ids "$INSTANCE_ID" \
             --document-name "AWS-RunShellScript" \

From 69376116c4e32c32e262abd4d457e27759db0ddc Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:37:20 +0530
Subject: [PATCH 11/13] fix(*): revert the testing changes

---
 app/lib/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index 625342e..fde30b1 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -5,7 +5,7 @@
 import { ConfigBlob } from "@/app/lib/types/promptEditor";
 import { ToastType } from "@/app/components/Toast";
 
-export const APP_NAME = "Kaapi Konsole V1";
+export const APP_NAME = "Kaapi Konsole";
 
 export const STORAGE_KEYS = {
   API_KEYS: "kaapi_api_keys",

From 758c840e0cf2ed07b5d17b22557b5b2fa5be3323 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:39:19 +0530
Subject: [PATCH 12/13] fix: test production script

---
 .github/workflows/cd-production.yml | 6 ++++--
 .github/workflows/cd-staging.yml    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index 2958a79..91803a4 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -2,8 +2,10 @@ name: Deploy Kaapi to EC2 Production
 
 on:
   push:
-    tags:
-      - "v*" # Deploy only when tags like v1.0.0, v2.1.0, etc., are created
+    branches:
+      - build/update-deployment-script # Deploy only when changes are pushed to the main branch
+    # tags:
+    #   - "v*" # Deploy only when tags like v1.0.0, v2.1.0, etc., are created
 
 jobs:
   deploy:
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
index f0e03ef..b9ec2c5 100644
--- a/.github/workflows/cd-staging.yml
+++ b/.github/workflows/cd-staging.yml
@@ -3,7 +3,7 @@ name: Deploy Kaapi to EC2 Staging
 on:
   push:
     branches:
-      - build/update-deployment-script # Deploy only when changes are pushed to the main branch
+      - main # Deploy only when changes are pushed to the main branch
 
 jobs:
   deploy:

From 4ea7ea9f521395ba03d896bcee5f70d0d525d8b9 Mon Sep 17 00:00:00 2001
From: Ayush8923 <80516839+Ayush8923@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:41:55 +0530
Subject: [PATCH 13/13] fix: revert the production script changes

---
 .github/workflows/cd-production.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cd-production.yml b/.github/workflows/cd-production.yml
index 91803a4..2958a79 100644
--- a/.github/workflows/cd-production.yml
+++ b/.github/workflows/cd-production.yml
@@ -2,10 +2,8 @@ name: Deploy Kaapi to EC2 Production
 
 on:
   push:
-    branches:
-      - build/update-deployment-script # Deploy only when changes are pushed to the main branch
-    # tags:
-    #   - "v*" # Deploy only when tags like v1.0.0, v2.1.0, etc., are created
+    tags:
+      - "v*" # Deploy only when tags like v1.0.0, v2.1.0, etc., are created
 
 jobs:
   deploy: