diff --git a/.yarn/versions/766e5dea.yml b/.yarn/versions/766e5dea.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/cli/README.md b/packages/cli/README.md
index df777312da..5864d4be2a 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -22,8 +22,8 @@ CLI for SubQuery
 $ npm install -g @subql/cli
 $ subql COMMAND
 running command...
-$ subql (-v|--version|version)
-@subql/cli/3.6.2-5 linux-x64 node-v18.17.1
+$ subql (--version)
+@subql/cli/3.6.2-6 linux-x64 node-v18.17.1
 $ subql --help [COMMAND]
 USAGE
   $ subql COMMAND
@@ -59,16 +59,20 @@ Build this SubQuery project code
 
 ```
 USAGE
-  $ subql build
+  $ subql build [-f <value>] [-o <value>] [--mode production|prod|development|dev] [-s]
 
-OPTIONS
-  -f, --location=location                   local folder
-  -o, --output=output                       output folder of build e.g. dist
-  -s, --slient                              silent mode
-  --mode=(production|prod|development|dev)  [default: production]
+FLAGS
+  -f, --location=<value>  local folder
+  -o, --output=<value>    output folder of build e.g. dist
+  -s, --slient            silent mode
+  --mode=<option>         [default: production]
+                          <options: production|prod|development|dev>
+
+DESCRIPTION
+  Build this SubQuery project code
 ```
 
-_See code: [lib/commands/build.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/build.js)_
+_See code: [lib/commands/build.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/build.js)_
 
 ## `subql codegen`
 
@@ -76,14 +80,17 @@ Generate schemas for graph node
 
 ```
 USAGE
-  $ subql codegen
+  $ subql codegen [-l <value>] [-f <value>]
+
+FLAGS
+  -f, --file=<value>      specify manifest file path (will overwrite -l if both used)
+  -l, --location=<value>  [deprecated] local folder to run codegen in. please use file flag instead
 
-OPTIONS
-  -f, --file=file          specify manifest file path (will overwrite -l if both used)
-  -l, --location=location  [deprecated] local folder to run codegen in. please use file flag instead
+DESCRIPTION
+  Generate schemas for graph node
 ```
 
-_See code: [lib/commands/codegen/index.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/codegen/index.js)_
+_See code: [lib/commands/codegen/index.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/codegen/index.js)_
 
 ## `subql codegen:generate`
 
@@ -91,18 +98,22 @@ Generate Project.yaml and mapping functions based on provided ABI
 
 ```
 USAGE
-  $ subql codegen:generate
+  $ subql codegen:generate --abiPath <value> --startBlock <value> [-f <value>] [--events <value>] [--functions
+    <value>] [--address <value>]
+
+FLAGS
+  -f, --file=<value>    specify manifest file path
+  --abiPath=<value>     (required) path to abi from root
+  --address=<value>     contract address
+  --events=<value>      abi events, --events="approval, transfer"
+  --functions=<value>   abi functions,  --functions="approval, transfer"
+  --startBlock=<value>  (required) startBlock
 
-OPTIONS
-  -f, --file=file          specify manifest file path
-  --abiPath=abiPath        (required) path to abi from root
-  --address=address        contract address
-  --events=events          abi events, --events="approval, transfer"
-  --functions=functions    abi functions,  --functions="approval, transfer"
-  --startBlock=startBlock  (required) startBlock
+DESCRIPTION
+  Generate Project.yaml and mapping functions based on provided ABI
 ```
 
-_See code: [lib/commands/codegen/generate.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/codegen/generate.js)_
+_See code: [lib/commands/codegen/generate.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/codegen/generate.js)_
 
 ## `subql deployment`
 
@@ -110,34 +121,42 @@ Deploy to hosted service
 
 ```
 USAGE
-  $ subql deployment
-
-OPTIONS
-  -d, --useDefaults                        Use default values for indexerVersion, queryVersion, dictionary, endpoint
-  --deploymentID=deploymentID              Enter deployment ID
-  --dict=dict                              Enter dictionary
-  --disableHistorical                      Disable Historical Data
-  --endpoint=endpoint                      Enter endpoint
-  --indexerBatchSize=indexerBatchSize      Enter batchSize from 1 to 30
-  --indexerSubscription                    Enable Indexer subscription
-  --indexerUnsafe                          Enable indexer unsafe
-  --indexerVersion=indexerVersion          Enter indexer-version
-  --indexerWorkers=indexerWorkers          Enter worker threads from 1 to 30
-  --ipfsCID=ipfsCID                        Enter IPFS CID
-  --options=deploy|promote|delete
-  --org=org                                Enter organization name
-  --projectName=projectName                Enter project name
-  --project_name=project_name              Enter project name
-  --queryAggregate                         Enable Aggregate
-  --queryMaxConnection=queryMaxConnection  Enter MaxConnection from 1 to 10
-  --querySubscription                      Enable Query subscription
-  --queryTimeout=queryTimeout              Enter timeout from 1000ms to 60000ms
-  --queryUnsafe                            Enable indexer unsafe
-  --queryVersion=queryVersion              Enter query-version
-  --type=(stage|primary)                   [default: primary]
-```
-
-_See code: [lib/commands/deployment/index.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/deployment/index.js)_
+  $ subql deployment [--options deploy|promote|delete] [--org <value>] [--projectName <value>] [--ipfsCID
+    <value>] [--type stage|primary] [--indexerVersion <value>] [--queryVersion <value>] [--dict <value>] [--endpoint
+    <value>] [--indexerUnsafe] [--indexerBatchSize <value>] [--indexerSubscription] [--disableHistorical]
+    [--indexerWorkers <value>] [--queryUnsafe] [--querySubscription] [--queryTimeout <value>] [--queryMaxConnection
+    <value>] [--queryAggregate] [-d] [--project_name <value>] [--deploymentID <value>]
+
+FLAGS
+  -d, --useDefaults             Use default values for indexerVersion, queryVersion, dictionary, endpoint
+  --deploymentID=<value>        Enter deployment ID
+  --dict=<value>                Enter dictionary
+  --disableHistorical           Disable Historical Data
+  --endpoint=<value>            Enter endpoint
+  --indexerBatchSize=<value>    Enter batchSize from 1 to 30
+  --indexerSubscription         Enable Indexer subscription
+  --indexerUnsafe               Enable indexer unsafe
+  --indexerVersion=<value>      Enter indexer-version
+  --indexerWorkers=<value>      Enter worker threads from 1 to 30
+  --ipfsCID=<value>             Enter IPFS CID
+  --options=<option>            <options: deploy|promote|delete>
+  --org=<value>                 Enter organization name
+  --projectName=<value>         Enter project name
+  --project_name=<value>        Enter project name
+  --queryAggregate              Enable Aggregate
+  --queryMaxConnection=<value>  Enter MaxConnection from 1 to 10
+  --querySubscription           Enable Query subscription
+  --queryTimeout=<value>        Enter timeout from 1000ms to 60000ms
+  --queryUnsafe                 Enable indexer unsafe
+  --queryVersion=<value>        Enter query-version
+  --type=<option>               [default: primary]
+                                <options: stage|primary>
+
+DESCRIPTION
+  Deploy to hosted service
+```
+
+_See code: [lib/commands/deployment/index.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/deployment/index.js)_
 
 ## `subql deployment:delete`
 
@@ -145,15 +164,18 @@ Delete Deployment
 
 ```
 USAGE
-  $ subql deployment:delete
+  $ subql deployment:delete [--org <value>] [--project_name <value>] [--deploymentID <value>]
 
-OPTIONS
-  --deploymentID=deploymentID  Enter deployment ID
-  --org=org                    Enter organization name
-  --project_name=project_name  Enter project name
+FLAGS
+  --deploymentID=<value>  Enter deployment ID
+  --org=<value>           Enter organization name
+  --project_name=<value>  Enter project name
+
+DESCRIPTION
+  Delete Deployment
 ```
 
-_See code: [lib/commands/deployment/delete.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/deployment/delete.js)_
+_See code: [lib/commands/deployment/delete.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/deployment/delete.js)_
 
 ## `subql deployment:deploy`
 
@@ -161,31 +183,39 @@ Deployment to hosted service
 
 ```
 USAGE
-  $ subql deployment:deploy
-
-OPTIONS
-  -d, --useDefaults                        Use default values for indexerVersion, queryVersion, dictionary, endpoint
-  --dict=dict                              Enter dictionary
-  --disableHistorical                      Disable Historical Data
-  --endpoint=endpoint                      Enter endpoint
-  --indexerBatchSize=indexerBatchSize      Enter batchSize from 1 to 30
-  --indexerSubscription                    Enable Indexer subscription
-  --indexerUnsafe                          Enable indexer unsafe
-  --indexerVersion=indexerVersion          Enter indexer-version
-  --indexerWorkers=indexerWorkers          Enter worker threads from 1 to 30
-  --ipfsCID=ipfsCID                        Enter IPFS CID
-  --org=org                                Enter organization name
-  --projectName=projectName                Enter project name
-  --queryAggregate                         Enable Aggregate
-  --queryMaxConnection=queryMaxConnection  Enter MaxConnection from 1 to 10
-  --querySubscription                      Enable Query subscription
-  --queryTimeout=queryTimeout              Enter timeout from 1000ms to 60000ms
-  --queryUnsafe                            Enable indexer unsafe
-  --queryVersion=queryVersion              Enter query-version
-  --type=(stage|primary)                   [default: primary]
-```
-
-_See code: [lib/commands/deployment/deploy.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/deployment/deploy.js)_
+  $ subql deployment:deploy [--org <value>] [--projectName <value>] [--ipfsCID <value>] [--type stage|primary]
+    [--indexerVersion <value>] [--queryVersion <value>] [--dict <value>] [--endpoint <value>] [--indexerUnsafe]
+    [--indexerBatchSize <value>] [--indexerSubscription] [--disableHistorical] [--indexerWorkers <value>]
+    [--queryUnsafe] [--querySubscription] [--queryTimeout <value>] [--queryMaxConnection <value>] [--queryAggregate]
+    [-d]
+
+FLAGS
+  -d, --useDefaults             Use default values for indexerVersion, queryVersion, dictionary, endpoint
+  --dict=<value>                Enter dictionary
+  --disableHistorical           Disable Historical Data
+  --endpoint=<value>            Enter endpoint
+  --indexerBatchSize=<value>    Enter batchSize from 1 to 30
+  --indexerSubscription         Enable Indexer subscription
+  --indexerUnsafe               Enable indexer unsafe
+  --indexerVersion=<value>      Enter indexer-version
+  --indexerWorkers=<value>      Enter worker threads from 1 to 30
+  --ipfsCID=<value>             Enter IPFS CID
+  --org=<value>                 Enter organization name
+  --projectName=<value>         Enter project name
+  --queryAggregate              Enable Aggregate
+  --queryMaxConnection=<value>  Enter MaxConnection from 1 to 10
+  --querySubscription           Enable Query subscription
+  --queryTimeout=<value>        Enter timeout from 1000ms to 60000ms
+  --queryUnsafe                 Enable indexer unsafe
+  --queryVersion=<value>        Enter query-version
+  --type=<option>               [default: primary]
+                                <options: stage|primary>
+
+DESCRIPTION
+  Deployment to hosted service
+```
+
+_See code: [lib/commands/deployment/deploy.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/deployment/deploy.js)_
 
 ## `subql deployment:promote`
 
@@ -193,15 +223,18 @@ Promote Deployment
 
 ```
 USAGE
-  $ subql deployment:promote
+  $ subql deployment:promote [--org <value>] [--project_name <value>] [--deploymentID <value>]
+
+FLAGS
+  --deploymentID=<value>  Enter deployment ID
+  --org=<value>           Enter organization name
+  --project_name=<value>  Enter project name
 
-OPTIONS
-  --deploymentID=deploymentID  Enter deployment ID
-  --org=org                    Enter organization name
-  --project_name=project_name  Enter project name
+DESCRIPTION
+  Promote Deployment
 ```
 
-_See code: [lib/commands/deployment/promote.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/deployment/promote.js)_
+_See code: [lib/commands/deployment/promote.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/deployment/promote.js)_
 
 ## `subql help [COMMAND]`
 
@@ -209,13 +242,16 @@ display help for subql
 
 ```
 USAGE
-  $ subql help [COMMAND]
+  $ subql help [COMMAND] [--all]
 
 ARGUMENTS
   COMMAND  command to show help for
 
-OPTIONS
+FLAGS
   --all  see all commands in CLI
+
+DESCRIPTION
+  display help for subql
 ```
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.3.1/src/commands/help.ts)_
@@ -226,20 +262,23 @@ Initialize a scaffold subquery project
 
 ```
 USAGE
-  $ subql init [PROJECTNAME]
+  $ subql init [PROJECTNAME] [-f] [-l <value>] [--install-dependencies] [--npm] [--abiPath <value>]
 
 ARGUMENTS
   PROJECTNAME  Give the starter project name
 
-OPTIONS
+FLAGS
   -f, --force
-  -l, --location=location  local folder to create the project in
-  --abiPath=abiPath        path to abi file
-  --install-dependencies   Install dependencies as well
-  --npm                    Force using NPM instead of yarn, only works with `install-dependencies` flag
+  -l, --location=<value>  local folder to create the project in
+  --abiPath=<value>       path to abi file
+  --install-dependencies  Install dependencies as well
+  --npm                   Force using NPM instead of yarn, only works with `install-dependencies` flag
+
+DESCRIPTION
+  Initialize a scaffold subquery project
 ```
 
-_See code: [lib/commands/init.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/init.js)_
+_See code: [lib/commands/init.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/init.js)_
 
 ## `subql migrate`
 
@@ -247,15 +286,18 @@ Migrate Subquery project manifest to v1.0.0
 
 ```
 USAGE
-  $ subql migrate
+  $ subql migrate [-f] [--file <value>] [-l <value>]
 
-OPTIONS
+FLAGS
   -f, --force
-  -l, --location=location  local folder to run migrate in
-  --file=file
+  -l, --location=<value>  local folder to run migrate in
+  --file=<value>
+
+DESCRIPTION
+  Migrate Subquery project manifest to v1.0.0
 ```
 
-_See code: [lib/commands/migrate.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/migrate.js)_
+_See code: [lib/commands/migrate.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/migrate.js)_
 
 ## `subql multi-chain:add`
 
@@ -263,16 +305,18 @@ Add new chain manifest to multi-chain configuration
 
 ```
 USAGE
-  $ subql multi-chain:add
+  $ subql multi-chain:add [-f <value>] [-c <value>]
 
-OPTIONS
-  -c, --chainManifestPath=chainManifestPath  path to the new chain manifest
+FLAGS
+  -c, --chainManifestPath=<value>  path to the new chain manifest
+  -f, --multichain=<value>         [default: /home/runner/work/subql/subql/packages/cli] specify multichain manifest
+                                   file path
 
-  -f, --multichain=multichain                [default: /home/runner/work/subql/subql/packages/cli] specify multichain
-                                             manifest file path
+DESCRIPTION
+  Add new chain manifest to multi-chain configuration
 ```
 
-_See code: [lib/commands/multi-chain/add.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/multi-chain/add.js)_
+_See code: [lib/commands/multi-chain/add.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/multi-chain/add.js)_
 
 ## `subql project`
 
@@ -280,21 +324,25 @@ Create/Delete project
 
 ```
 USAGE
-  $ subql project
+  $ subql project [--options create|delete] [--org <value>] [--projectName <value>] [--gitRepo <value>]
+    [--logoURL <value>] [--subtitle <value>] [--description <value>] [--apiVersion <value>] [--dedicatedDB <value>]
+
+FLAGS
+  --apiVersion=<value>   [default: 2] Enter api version
+  --dedicatedDB=<value>  Enter dedicated DataBase
+  --description=<value>  Enter description
+  --gitRepo=<value>      Enter git repository
+  --logoURL=<value>      Enter logo URL
+  --options=<option>     <options: create|delete>
+  --org=<value>          Enter organization name
+  --projectName=<value>  Enter project name
+  --subtitle=<value>     Enter subtitle
 
-OPTIONS
-  --apiVersion=apiVersion    [default: 2] Enter api version
-  --dedicatedDB=dedicatedDB  Enter dedicated DataBase
-  --description=description  Enter description
-  --gitRepo=gitRepo          Enter git repository
-  --logoURL=logoURL          Enter logo URL
-  --options=create|delete
-  --org=org                  Enter organization name
-  --projectName=projectName  Enter project name
-  --subtitle=subtitle        Enter subtitle
+DESCRIPTION
+  Create/Delete project
 ```
 
-_See code: [lib/commands/project/index.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/project/index.js)_
+_See code: [lib/commands/project/index.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/project/index.js)_
 
 ## `subql project:create-project`
 
@@ -302,20 +350,24 @@ Create Project on Hosted Service
 
 ```
 USAGE
-  $ subql project:create-project
+  $ subql project:create-project [--org <value>] [--projectName <value>] [--gitRepo <value>] [--logoURL <value>] [--subtitle
+    <value>] [--description <value>] [--apiVersion <value>] [--dedicatedDB <value>]
 
-OPTIONS
-  --apiVersion=apiVersion    [default: 2] Enter api version
-  --dedicatedDB=dedicatedDB  Enter dedicated DataBase
-  --description=description  Enter description
-  --gitRepo=gitRepo          Enter git repository
-  --logoURL=logoURL          Enter logo URL
-  --org=org                  Enter organization name
-  --projectName=projectName  Enter project name
-  --subtitle=subtitle        Enter subtitle
+FLAGS
+  --apiVersion=<value>   [default: 2] Enter api version
+  --dedicatedDB=<value>  Enter dedicated DataBase
+  --description=<value>  Enter description
+  --gitRepo=<value>      Enter git repository
+  --logoURL=<value>      Enter logo URL
+  --org=<value>          Enter organization name
+  --projectName=<value>  Enter project name
+  --subtitle=<value>     Enter subtitle
+
+DESCRIPTION
+  Create Project on Hosted Service
 ```
 
-_See code: [lib/commands/project/create-project.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/project/create-project.js)_
+_See code: [lib/commands/project/create-project.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/project/create-project.js)_
 
 ## `subql project:delete-project`
 
@@ -323,14 +375,17 @@ Delete Project on Hosted Service
 
 ```
 USAGE
-  $ subql project:delete-project
+  $ subql project:delete-project [--org <value>] [--projectName <value>]
+
+FLAGS
+  --org=<value>          Enter organization name
+  --projectName=<value>  Enter project name
 
-OPTIONS
-  --org=org                  Enter organization name
-  --projectName=projectName  Enter project name
+DESCRIPTION
+  Delete Project on Hosted Service
 ```
 
-_See code: [lib/commands/project/delete-project.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/project/delete-project.js)_
+_See code: [lib/commands/project/delete-project.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/project/delete-project.js)_
 
 ## `subql publish`
 
@@ -338,15 +393,18 @@ Upload this SubQuery project to IPFS
 
 ```
 USAGE
-  $ subql publish
+  $ subql publish [-f <value>] [--ipfs <value>] [-o]
 
-OPTIONS
-  -f, --location=location  from project or manifest path
-  -o, --output             Output IPFS CID
-  --ipfs=ipfs              IPFS gateway endpoint
+FLAGS
+  -f, --location=<value>  from project or manifest path
+  -o, --output            Output IPFS CID
+  --ipfs=<value>          IPFS gateway endpoint
+
+DESCRIPTION
+  Upload this SubQuery project to IPFS
 ```
 
-_See code: [lib/commands/publish.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/publish.js)_
+_See code: [lib/commands/publish.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/publish.js)_
 
 ## `subql validate`
 
@@ -354,20 +412,20 @@ Check a folder or github repo is a validate subquery project
 
 ```
 USAGE
-  $ subql validate
-
-OPTIONS
-  -l, --location=location                                                   local folder, github repo url or IPFS cid
-
-  --ipfs=ipfs                                                               [default: https://unauthipfs.subquery.networ
-                                                                            k/ipfs/api/v0] IPFS gateway endpoint, used
-                                                                            for validating projects on IPFS
-
-  --network-family=(Substrate|Cosmos|Algorand|Ethereum|Flare|Near|Stellar)
-
+  $ subql validate [-l <value>] [--ipfs <value>] [--silent] [--network-family
+    Substrate|Cosmos|Algorand|Ethereum|Flare|Near|Stellar]
+
+FLAGS
+  -l, --location=<value>     local folder, github repo url or IPFS cid
+  --ipfs=<value>             [default: https://unauthipfs.subquery.network/ipfs/api/v0] IPFS gateway endpoint, used for
+                             validating projects on IPFS
+  --network-family=<option>  <options: Substrate|Cosmos|Algorand|Ethereum|Flare|Near|Stellar>
   --silent
+
+DESCRIPTION
+  Check a folder or github repo is a validate subquery project
 ```
 
-_See code: [lib/commands/validate.js](https://github.com/packages/cli/blob/v3.6.2-5/lib/commands/validate.js)_
+_See code: [lib/commands/validate.js](https://github.com/packages/cli/blob/v3.6.2-6/lib/commands/validate.js)_
 
 <!-- commandsstop -->
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f7a68f37c0..1519ae03fb 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@subql/cli",
   "description": "cli for subquery",
-  "version": "3.6.2-5",
+  "version": "3.6.2-6",
   "author": "Ian He",
   "bin": {
     "subql": "./bin/run"
@@ -93,5 +93,5 @@
   "resolutions": {
     "node-fetch": "2.6.7"
   },
-  "stableVersion": "3.6.2-4"
+  "stableVersion": "3.6.2-5"
 }