build: release v6.276.0

.github/workflows/deploy-ecs-prod.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 4096
       ecs-cluster-name: 'formsg-prod-ecs'
       ecs-service-name: 'formsg-prod-ecs-service'

.github/workflows/deploy-ecs-stg-alt.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-alt-ecs'
       ecs-service-name: 'formsg-stg-alt-ecs-service'

.github/workflows/deploy-ecs-stg-alt2.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-alt2-ecs'
       ecs-service-name: 'formsg-stg-alt2-ecs-service'

.github/workflows/deploy-ecs-stg-alt3.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-alt3-ecs'
       ecs-service-name: 'formsg-stg-alt3-ecs-service'

.github/workflows/deploy-ecs-stg.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-ecs'
       ecs-service-name: 'formsg-stg-ecs-service'

.github/workflows/deploy-ecs-uat.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-uat-ecs'
       ecs-service-name: 'formsg-uat-ecs-service'

.github/workflows/deploy-ecs.yml

@@ -71,6 +71,10 @@ on:
         description: 'FormSG SDK mode'
         required: true
         type: string
+      formsg-app-reserved-cpu:
+        description: 'FormSG app reserved CPU units'
+        required: true
+        type: number
       dd-env:
         description: 'Datadog environment'
         required: true
@@ -184,6 +188,7 @@ jobs:
         run: |
           sed -i "s/<AWS_ACCOUNT_ID>/${{ secrets.aws-account-id }}/g" ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<DD_ENV>/${{ inputs.dd-env }}/g' ${{ inputs.ecs-task-definition-path }}
+          sed -i 's/<FORMSG_APP_RESERVED_CPU>/${{ inputs.formsg-app-reserved-cpu }}/g' ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<CPU>/${{ inputs.ecs-cpu }}/g' ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<MEMORY>/${{ inputs.ecs-memory }}/g' ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<ENVIRONMENT_SITE_NAME>/${{ inputs.environment-site-name }}/g' ${{ inputs.ecs-task-definition-path }}

CHANGELOG.md

@@ -4,17 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v6.275.0](https://github.com/opengovsg/FormSG/compare/v6.275.0...v6.275.0)
+#### [v6.276.0](https://github.com/opengovsg/FormSG/compare/v6.275.0...v6.276.0)
 
-- chore: remove clamav [`#8914`](https://github.com/opengovsg/FormSG/pull/8914)
+- fix: replace id with _id for text and vision mfb prompts [`#8530`](https://github.com/opengovsg/FormSG/pull/8530)
+- fix(deps): bump libphonenumber-js from 1.12.29 to 1.12.31 in /shared [`#8935`](https://github.com/opengovsg/FormSG/pull/8935)
+- build(deps): bump validator from 13.15.20 to 13.15.22 in /frontend [`#8936`](https://github.com/opengovsg/FormSG/pull/8936)
+- fix(deps): bump validator from 13.15.20 to 13.15.23 [`#8937`](https://github.com/opengovsg/FormSG/pull/8937)
+- build(deps): bump mdast-util-to-hast from 13.1.0 to 13.2.1 in /frontend [`#8934`](https://github.com/opengovsg/FormSG/pull/8934)
+- feat: reserve cpu for formsg app [`#8933`](https://github.com/opengovsg/FormSG/pull/8933)
+- build: merge v6.275.0 back to develop [`#8927`](https://github.com/opengovsg/FormSG/pull/8927)
+- build: release v6.275.0 [`#8926`](https://github.com/opengovsg/FormSG/pull/8926)
 
 #### [v6.275.0](https://github.com/opengovsg/FormSG/compare/v6.274.0...v6.275.0)
 
 > 27 November 2025
 
+- chore: remove clamav [`#8914`](https://github.com/opengovsg/FormSG/pull/8914)
 - build: merge v6.274.0 back to develop [`#8924`](https://github.com/opengovsg/FormSG/pull/8924)
 - build: release v6.274.0 [`#8923`](https://github.com/opengovsg/FormSG/pull/8923)
-- chore: bump version to v6.275.0 [`589c458`](https://github.com/opengovsg/FormSG/commit/589c458848a15d4ba4426be63235319364b0fef0)
+- chore: bump version to v6.275.0 [`6fb3fb2`](https://github.com/opengovsg/FormSG/commit/6fb3fb26605e231f51a8e67c4bf21636cc353676)
 
 #### [v6.274.0](https://github.com/opengovsg/FormSG/compare/v6.273.0...v6.274.0)
 
@@ -386,6 +394,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build(deps): bump next from 15.3.4 to 15.5.2 in /react-email-preview [`#8660`](https://github.com/opengovsg/FormSG/pull/8660)
 - fix(deps): bump next from 15.3.4 to 15.5.2 [`#8661`](https://github.com/opengovsg/FormSG/pull/8661)
 - build(deps-dev): bump vite from 5.4.19 to 5.4.20 in /frontend [`#8686`](https://github.com/opengovsg/FormSG/pull/8686)
+- fix: home number fields are added to the draft despite not being modified  [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
 - Revert "feat: save draft v1.0 (#8091)" [`ef00908`](https://github.com/opengovsg/FormSG/commit/ef00908c4fa711b8022f06a59595d13ec24d2963)
 - Revert "fix: home number fields are added to the draft despite not being modified  (#8704)" [`8ceffce`](https://github.com/opengovsg/FormSG/commit/8ceffce1e0485fa4623cb941dd1042f73bedd5f6)
 - chore: bump version to v6.242.0 [`49cfc58`](https://github.com/opengovsg/FormSG/commit/49cfc582734a9110861ec37aa14932753639e334)
@@ -394,11 +403,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 > 16 September 2025
 
-- fix: home number fields are added to the draft despite not being modified  [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
 - feat: save draft v1.0 [`#8091`](https://github.com/opengovsg/FormSG/pull/8091)
 - build: merge release v6.240.0 to develop [`#8695`](https://github.com/opengovsg/FormSG/pull/8695)
 - build: release v6.240.0 [`#8693`](https://github.com/opengovsg/FormSG/pull/8693)
-- chore: bump version to v6.241.0 [`13345f3`](https://github.com/opengovsg/FormSG/commit/13345f3eabe3c954d90b8ec10ca4e15c6b709b68)
+- chore: bump version to v6.241.0 [`8572128`](https://github.com/opengovsg/FormSG/commit/8572128021278843f40d95dd30722a2f81370e5d)
 
 #### [v6.240.0](https://github.com/opengovsg/FormSG/compare/v6.239.0...v6.240.0)
 
@@ -1224,6 +1232,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build: merge release v6.178.2 to develop [`#8111`](https://github.com/opengovsg/FormSG/pull/8111)
 - build: release v6.178.2 [`#8110`](https://github.com/opengovsg/FormSG/pull/8110)
 - fix: also match amount paid [`#8109`](https://github.com/opengovsg/FormSG/pull/8109)
+- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
+- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
 - chore: bump version to v6.179.0 [`1247426`](https://github.com/opengovsg/FormSG/commit/1247426080ba2254a33c8efb3deb51c6cd9f7e9e)
 - chore: bump version to v6.178.2 [`618bdff`](https://github.com/opengovsg/FormSG/commit/618bdffa52a73fca82c53283ee7868390af42c91)
 - chore: bump version to v6.180.0 [`13b3fc4`](https://github.com/opengovsg/FormSG/commit/13b3fc4c696810eb1c58a54edf4d583894022b52)
@@ -1232,15 +1242,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 > 13 February 2025
 
-- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
-- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
 - feat: address field [`#7966`](https://github.com/opengovsg/FormSG/pull/7966)
 - feat(mrf-admin-view): hawkeye v1.0 [`#7965`](https://github.com/opengovsg/FormSG/pull/7965)
 - fix(deps): bump zod from 3.24.1 to 3.24.2 in /shared [`#8101`](https://github.com/opengovsg/FormSG/pull/8101)
 - fix: failing test for new joi validation [`#8098`](https://github.com/opengovsg/FormSG/pull/8098)
 - build: release v6.178.1 to develop [`#8096`](https://github.com/opengovsg/FormSG/pull/8096)
 - build: merge release v6.178.0 to develop [`#8093`](https://github.com/opengovsg/FormSG/pull/8093)
-- chore: bump version to v6.179.0 [`9ace3f2`](https://github.com/opengovsg/FormSG/commit/9ace3f23a41f089356ba43013a71d5e996748777)
+- chore: bump version to v6.179.0 [`affeb5f`](https://github.com/opengovsg/FormSG/commit/affeb5f3ed0c9add243c763ebf02905f35e91bca)
 
 #### [v6.178.2](https://github.com/opengovsg/FormSG/compare/v6.178.1...v6.178.2)
 
@@ -1311,40 +1319,44 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - * fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared (#8021) [`#8039`](https://github.com/opengovsg/FormSG/pull/8039)
 - fix(deps): bump zod from 3.23.8 to 3.24.1 in /shared [`#7996`](https://github.com/opengovsg/FormSG/pull/7996)
 - fix(deps): bump type-fest from 4.30.2 to 4.32.0 in /shared [`#8037`](https://github.com/opengovsg/FormSG/pull/8037)
+- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
+- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
+- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
+- fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
+- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
+- chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
 - chore: bump version to v6.175.0 [`d31bb97`](https://github.com/opengovsg/FormSG/commit/d31bb9717625d365d6798a51d8235b5acdab706c)
 
 #### [v6.174.0](https://github.com/opengovsg/FormSG/compare/v6.173.1...v6.174.0)
 
 > 13 January 2025
 
-- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
-- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
-- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
 - fix: only show fixed translations for supported forms [`#8038`](https://github.com/opengovsg/FormSG/pull/8038)
 - feat(iframe): add frame messaging for paysg [`#7979`](https://github.com/opengovsg/FormSG/pull/7979)
 - chore: mongoose, nanoid packages update [`#8000`](https://github.com/opengovsg/FormSG/pull/8000)
 - build: merge release v6.173.0 to develop [`#8034`](https://github.com/opengovsg/FormSG/pull/8034)
 - fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared [`#8021`](https://github.com/opengovsg/FormSG/pull/8021)
-- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
+- chore: bump version to v6.174.0 [`22b1122`](https://github.com/opengovsg/FormSG/commit/22b1122e8e15dbb8ca4c69c1d6c026a865d3b67c)
 
 #### [v6.173.1](https://github.com/opengovsg/FormSG/compare/v6.173.0...v6.173.1)
 
 > 13 January 2025
 
 - fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
 - * fix(deps): bump fp-ts from 2.16.8 to 2.16.9 (#8017) [`#8027`](https://github.com/opengovsg/FormSG/pull/8027)
+- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
 - chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
+- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
 
 #### [v6.173.0](https://github.com/opengovsg/FormSG/compare/v6.172.0...v6.173.0)
 
 > 7 January 2025
 
-- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
 - feat: multi lang feature [`#8022`](https://github.com/opengovsg/FormSG/pull/8022)
 - fix(deps): bump fp-ts from 2.16.8 to 2.16.9 [`#8017`](https://github.com/opengovsg/FormSG/pull/8017)
 - build: merge release v6.172.0 to develop [`#8016`](https://github.com/opengovsg/FormSG/pull/8016)
 - build: release v6.172.0 [`#8015`](https://github.com/opengovsg/FormSG/pull/8015)
-- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
+- chore: bump version to v6.173.0 [`1cb7772`](https://github.com/opengovsg/FormSG/commit/1cb7772374249830091d1fb3278a035957d23bcb)
 
 #### [v6.172.0](https://github.com/opengovsg/FormSG/compare/v6.171.0...v6.172.0)
 

deploy/ecs-task-definition.json

@@ -6,6 +6,7 @@
       "portMappings": [
         { "containerPort": 4545, "hostPort": 4545, "protocol": "tcp" }
       ],
+      "cpu": "<FORMSG_APP_RESERVED_CPU>", 
       "environment": [
         { "name": "DD_SERVICE", "value": "formsg" }, 
         { "name": "DD_ENV", "value": "<DD_ENV>" }

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.275.0",
+  "version": "6.276.0",
   "homepage": ".",
   "type": "module",
   "private": true,
@@ -91,7 +91,7 @@
     "type-fest": "^4.17.0",
     "typescript": "^5.4.5",
     "use-draggable-scroll": "^0.1.0",
-    "validator": "^13.15.20",
+    "validator": "^13.15.22",
     "vite-plugin-node-stdlib-browser": "^0.2.1",
     "zustand": "^4.1.1"
   },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.275.0",
+  "version": "6.276.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <[email protected]>"
@@ -153,7 +153,7 @@
     "ulid": "^2.3.0",
     "uuid": "^11.1.0",
     "uuid-by-string": "^4.0.0",
-    "validator": "^13.15.20",
+    "validator": "^13.15.23",
     "winston": "^3.13.0",
     "winston-cloudwatch": "^6.3.0",
     "zod": "^3.24.3"

src/app/modules/form/admin-form/admin-form.assistance.service.ts

@@ -311,7 +311,7 @@ export const createFormFieldsUsingTextPrompt = ({
 > => {
   return generateAndsendTextPromptToModel({
     userPrompt,
-    formId: form.id,
+    formId: form._id,
   })
     .andThen((modelResponse) => {
       if (!modelResponse) {
@@ -496,7 +496,7 @@ export const createFormFieldsUsingVisionPrompt = ({
   | FieldNotFoundError
 > => {
   return generateAndSendVisionPromptToModel({
-    formId: form.id,
+    formId: form._id,
     imageDataUrls,
   })
     .andThen((modelResponse) => {