fix: Merge conflicts with develop

Author: slkzgm

.env.example

@@ -166,6 +166,14 @@ LARGE_GAIANET_SERVER_URL=       # Default: https://qwen72b.gaia.domains/v1
 GAIANET_EMBEDDING_MODEL=
 USE_GAIANET_EMBEDDING=          # Set to TRUE for GAIANET/768, leave blank for local
 
+# Volcengine Configuration
+VOLENGINE_API_URL=              # Volcengine API Endpoint, Default: https://open.volcengineapi.com/api/v3/
+VOLENGINE_MODEL=
+SMALL_VOLENGINE_MODEL=          # Default: doubao-lite-128k
+MEDIUM_VOLENGINE_MODEL=         # Default: doubao-pro-128k
+LARGE_VOLENGINE_MODEL=          # Default: doubao-pro-256k
+VOLENGINE_EMBEDDING_MODEL=      # Default: doubao-embedding
+
 # EVM
 EVM_PRIVATE_KEY=
 EVM_PROVIDER_URL=

.github/pull_request_template.md

@@ -1,15 +1,15 @@
-<!-- Use this template by filling in information and copy and pasting relevant items out of the html comments. -->
+<!-- Use this template by filling in information and copying and pasting relevant items out of the HTML comments. -->
 
-# Relates to:
+# Relates to
 
 <!-- LINK TO ISSUE OR TICKET -->
 
-<!-- This risks section is to be filled out before final review and merge. -->
+<!-- This risks section must be filled out before the final review and merge. -->
 
 # Risks
 
 <!--
-Low, medium, large. List what kind of risks, and what could be effected.
+Low, medium, large. List what kind of risks and what could be affected.
 -->
 
 # Background
@@ -25,7 +25,7 @@ Features (non-breaking change which adds functionality)
 Updates (new versions of included code)
 -->
 
-<!-- This "Why" section is most relevant if there is no linked issue explaining why. If there is a related issue it might make sense to skip this why section. -->
+<!-- This "Why" section is most relevant if there are no linked issues explaining why. If there is a related issue, it might make sense to skip this why section. -->
 <!--
 ## Why are we doing this? Any context or related work?
 -->
@@ -35,10 +35,10 @@ Updates (new versions of included code)
 <!--
 My changes do not require a change to the project documentation.
 My changes require a change to the project documentation.
-If a docs change is needed: I have updated the documentation accordingly.
+If documentation change is needed: I have updated the documentation accordingly.
 -->
 
-<!-- Please show how you tested the PR. This will really help if the PR needs to be retested, and probably help the PR get merged quicker. -->
+<!-- Please show how you tested the PR. This will really help if the PR needs to be retested and probably help the PR get merged quicker. -->
 
 # Testing
 
@@ -47,7 +47,7 @@ If a docs change is needed: I have updated the documentation accordingly.
 ## Detailed testing steps
 
 <!--
-None, automated tests are fine.
+None: Automated tests are acceptable.
 -->
 
 <!--
@@ -63,22 +63,22 @@ None, automated tests are fine.
 ### After
 -->
 
-<!-- If there is anything about the deploy, please make a note. -->
+<!-- If there is anything about the deployment, please make a note. -->
 <!--
 # Deploy Notes
 -->
 
-<!--  Copy and paste commandline output. -->
+<!--  Copy and paste command line output. -->
 <!--
 ## Database changes
 -->
 
-<!--  If there is something more than the automated steps, please specifiy deploy instructions. -->
+<!--  Please specify deploy instructions if there is something more than the automated steps. -->
 <!--
 ## Deployment instructions
 -->
 
-<!-- If you are on Discord, please join https://discord.gg/ai16z and state your Discord username here for contribute role and join us in #development-feed -->
+<!-- If you are on Discord, please join https://discord.gg/ai16z and state your Discord username here for the contributor role and join us in #development-feed -->
 <!--
 ## Discord username
 

.github/workflows/jsdoc-automation.yml

@@ -22,6 +22,11 @@ on:
         required: true
         default: ''
         type: string
+      branch:
+        description: 'Target branch for PR (defaults to develop)'
+        required: false
+        default: 'develop'
+        type: string
 
 jobs:
   generate-docs:
@@ -49,7 +54,7 @@ jobs:
           run_install: false
 
       - name: Update lockfile
-        working-directory: packages/jsdoc-automation
+        working-directory: scripts/jsdoc-automation
         run: |
           echo "Updating lockfile..."
           pnpm install --no-frozen-lockfile
@@ -63,11 +68,11 @@ jobs:
         run: pnpm install --no-frozen-lockfile
 
       - name: Install package dependencies
-        working-directory: packages/jsdoc-automation
+        working-directory: scripts/jsdoc-automation
         run: pnpm install --no-frozen-lockfile
 
       - name: Run documentation generator
-        working-directory: packages/jsdoc-automation
+        working-directory: scripts/jsdoc-automation
         run: |
           echo "Node version: $(node --version)"
           echo "NPM version: $(npm --version)"
@@ -78,4 +83,5 @@ jobs:
           INPUT_ROOT_DIRECTORY: ${{ inputs.root_directory }}
           INPUT_PULL_NUMBER: ${{ inputs.pull_number }}
           INPUT_EXCLUDED_DIRECTORIES: ${{ inputs.excluded_directories }}
-          INPUT_REVIEWERS: ${{ inputs.reviewers }}
+          INPUT_REVIEWERS: ${{ inputs.reviewers }}
+          INPUT_BRANCH: ${{ inputs.branch }}

.github/workflows/stale.yml

@@ -12,13 +12,23 @@ jobs:
       issues: write
       pull-requests: write
 
+    env:
+      DAYS_BEFORE_STALE: 30  # Define the days-before-stale value
+      DAYS_BEFORE_CLOSE: 7   # Define the days-before-close value
+
     steps:
     - uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue has been automatically marked as stale due to inactivity.'
-        stale-pr-message: 'This pull request has been automatically marked as stale due to inactivity.'
+        stale-issue-message: |
+          This issue has been automatically marked as stale due to ${{
+          env.DAYS_BEFORE_STALE }} days of inactivity.
+          If no further activity occurs within ${{ env.DAYS_BEFORE_CLOSE }} days, it will be closed automatically. Please take action if this issue is still relevant.
+        stale-pr-message: |
+          This pull request has been automatically marked as stale due to ${{
+          env.DAYS_BEFORE_STALE }} days of inactivity.
+          If no further activity occurs within ${{ env.DAYS_BEFORE_CLOSE }} days, it will be closed automatically. Please take action if this pull request is still relevant.
         stale-issue-label: 'no-issue-activity'
         stale-pr-label: 'no-pr-activity'
-        days-before-stale: 30  # Marks issues and PRs as stale after X days of inactivity
-        days-before-close: 7  # Closes issues and PRs X days after being marked as stale
+        days-before-stale: ${{ env.DAYS_BEFORE_STALE }}  
+        days-before-close: ${{ env.DAYS_BEFORE_CLOSE }}  

.gitignore

@@ -49,6 +49,7 @@ packages/plugin-coinbase/src/plugins/transactions.csv
 tsup.config.bundled_*.mjs
 
 .turbo
+.cursorrules
 
 coverage
 .eslintcache