Resolved merge conflicts, keeping current version

Author: lessuselesss

.eslintrc.json

@@ -1,11 +1,6 @@
 {
-  "plugins": [
-    "@stylistic"
-  ],
-  "extends": [
-    "next/core-web-vitals",
-    "plugin:@stylistic/recommended-extends"
-  ],
+  "plugins": ["@stylistic"],
+  "extends": ["next/core-web-vitals", "plugin:@stylistic/recommended-extends"],
   "rules": {
     "@stylistic/indent": [
       "error",
@@ -28,20 +23,11 @@
         }
       }
     ],
-    "@stylistic/eol-last": [
-      "error",
-      "always"
-    ],
+    "@stylistic/eol-last": ["error", "always"],
     "@stylistic/multiline-ternary": "off",
-    "@stylistic/semi": [
-      "error",
-      "always"
-    ],
+    "@stylistic/semi": ["error", "always"],
     "@stylistic/quotes": "off",
     "@stylistic/comma-dangle": "off",
-    "@stylistic/brace-style": [
-      "error",
-      "1tbs"
-    ]
+    "@stylistic/brace-style": ["error", "1tbs"]
   }
-}
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ""
-labels: "bug"
-assignees: ""
+title: ''
+labels: 'bug'
+assignees: ''
 ---
 
 **Describe the bug**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ""
-labels: "enhancement"
-assignees: ""
+title: ''
+labels: 'enhancement'
+assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**

.github/workflows/image.yaml

@@ -22,7 +22,7 @@ jobs:
       packages: write
       attestations: write
       id-token: write
-      # 
+      #
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -50,12 +50,11 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      
-      # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)." 
+
+      # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)."
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:
           subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
           subject-digest: ${{ steps.push.outputs.digest }}
           push-to-registry: true
-      

.gitignore

@@ -50,5 +50,9 @@ tsup.config.bundled_*.mjs
 
 .turbo
 
+<<<<<<< Updated upstream
 coverage
 .eslintcache
+=======
+coverage
+>>>>>>> Stashed changes

.nvmrc

@@ -1 +1 @@
-v23.3.0
+v23.3.0

.pre-commit-config.yaml

@@ -0,0 +1,29 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+      - id: check-merge-conflict
+
+  # Nix code formatting
+  - repo: https://github.com/nix-community/alejandra
+    rev: 3.0.0
+    hooks:
+      - id: alejandra
+        # Alejandra is an opinionated Nix code formatter optimized for speed and consistency
+
+  # Nix linting/static analysis
+  - repo: https://github.com/astro/deadnix
+    rev: v1.2.1
+    hooks:
+      - id: deadnix
+        # Scans for dead/unused code in .nix files
+
+  - repo: https://github.com/nix-community/statix
+    rev: v0.5.8
+    hooks:
+      - id: statix
+        # Lints for and fixes antipatterns in Nix code

.vscode/launch.json

@@ -1,16 +1,16 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch via pnpm",
-            "runtimeExecutable": "pnpm",
-            "runtimeArgs": ["run", "dev"],
-            "skipFiles": ["<node_internals>/**"]
-        }
-    ]
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch via pnpm",
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["run", "dev"],
+      "skipFiles": ["<node_internals>/**"]
+    }
+  ]
 }

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< Updated upstream
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": "explicit"
     },
@@ -44,4 +45,52 @@
     "[shellscript]": {
         "editor.defaultFormatter": "foxundermoon.shell-format"
     }
-}
+}
+=======
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.insertSpaces": true,
+  "editor.detectIndentation": false,
+  "editor.tabSize": 4,
+  "eslint.format.enable": true,
+  "javascript.format.enable": false,
+  "typescript.format.enable": false,
+  "files.trimTrailingWhitespace": true,
+  "editor.trimAutoWhitespace": true,
+  "cadence.test.maxConcurrency": 5,
+  "cadence.customConfigPath": "packages/plugin-flow/flow.json",
+  "[properties]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "vscode.json-language-features"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+  },
+  "[scss]": {
+    "editor.defaultFormatter": "vscode.css-language-features"
+  },
+  "[dotenv]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "files.associations": {
+    "*.css": "tailwindcss"
+  },
+  "[shellscript]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  }
+}
+>>>>>>> Stashed changes

.vscode/tasks.json

@@ -1,16 +1,14 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "typescript",
-            "tsconfig": "packages/core/tsconfig.json",
-            "problemMatcher": [
-                "$tsc"
-            ],
-            "label": "tsbuild",
-            "group": "build"
-        }
-    ]
-}
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "typescript",
+      "tsconfig": "packages/core/tsconfig.json",
+      "problemMatcher": ["$tsc"],
+      "label": "tsbuild",
+      "group": "build"
+    }
+  ]
+}

CONTRIBUTING.md

@@ -15,30 +15,35 @@ By contributing to Eliza, you agree that your contributions will be licensed und
 
 We believe in the power of the OODA Loop - a decision-making framework that emphasizes speed and adaptability. OODA stands for:
 
--   **Observe**: Gather information and insights about the project, the community, and the broader AI ecosystem.
--   **Orient**: Analyze your observations to identify opportunities for contribution and improvement.
--   **Decide**: Choose a course of action based on your analysis. This could be proposing a new feature, fixing a bug, or creating content.
--   **Act**: Execute your decision and share your work with the community.
+- **Observe**: Gather information and insights about the project, the community, and the broader AI ecosystem.
+- **Orient**: Analyze your observations to identify opportunities for contribution and improvement.
+- **Decide**: Choose a course of action based on your analysis. This could be proposing a new feature, fixing a bug, or creating content.
+- **Act**: Execute your decision and share your work with the community.
 
 ## How to Contribute
 
 ### For Developers
 
 1. **Extend Eliza's Capabilities**
 
-    - Develop new actions, evaluators, and providers
-    - Improve existing components and modules
+   - Develop new actions, evaluators, and providers
+   - Improve existing components and modules
 
 2. **Enhance Infrastructure**
 
-    - Review open issues and submit PRs
-    - Test and update documentation
-    - Optimize performance
-    - Improve deployment solutions
+   - Review open issues and submit PRs
+   - Test and update documentation
+   - Optimize performance
+   - Improve deployment solutions
 
 3. Fork the repo and create your branch from `main`.
+<<<<<<< Updated upstream
     1. The name of the branch should start with the issue number and be descriptive of the changes you are making.
     2. Example: 9999--add-test-for-bug-123
+=======
+   1. The name of the branch should start with the issue number and be descriptive of the changes you are making.
+   1. eg. 40--add-test-for-bug-123
+>>>>>>> Stashed changes
 4. If you've added code that should be tested, add tests.
 5. Ensure the test suite passes.
 6. Make sure your code lints.
@@ -48,45 +53,45 @@ We believe in the power of the OODA Loop - a decision-making framework that emph
 
 ### Git Commit Messages
 
--   Use the present tense ("Add feature" not "Added feature")
--   Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
--   Limit the first line to 72 characters or less
--   Reference issues and pull requests liberally after the first line
+- Use the present tense ("Add feature" not "Added feature")
+- Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
+- Limit the first line to 72 characters or less
+- Reference issues and pull requests liberally after the first line
 
 ### JavaScript Styleguide
 
--   All JavaScript must adhere to [JavaScript Standard Style](https://standardjs.com/).
+- All JavaScript must adhere to [JavaScript Standard Style](https://standardjs.com/).
 
 ### TypeScript Styleguide
 
--   All TypeScript must adhere to [TypeScript Standard Style](https://github.com/standard/ts-standard).
+- All TypeScript must adhere to [TypeScript Standard Style](https://github.com/standard/ts-standard).
 
 ### Documentation Styleguide
 
--   Use [Markdown](https://daringfireball.net/projects/markdown/) for documentation.
+- Use [Markdown](https://daringfireball.net/projects/markdown/) for documentation.
 
 ## Additional Notes
 
 ### Issue and Pull Request Labels
 
 This section lists the labels we use to help us track and manage issues and pull requests.
 
--   `bug` - Issues that are bugs.
--   `enhancement` - Issues that are feature requests.
--   `documentation` - Issues or pull requests related to documentation.
--   `good first issue` - Good for newcomers.
+- `bug` - Issues that are bugs.
+- `enhancement` - Issues that are feature requests.
+- `documentation` - Issues or pull requests related to documentation.
+- `good first issue` - Good for newcomers.
 
 ## Getting Help
 
--   Join [Discord](https://discord.gg/ai16z)
--   Check [FAQ](docs/community/faq.md)
--   Create GitHub issues
+- Join [Discord](https://discord.gg/ai16z)
+- Check [FAQ](docs/community/faq.md)
+- Create GitHub issues
 
 ## Additional Resources
 
--   [Local Development Guide](docs/guides/local-development.md)
--   [Configuration Guide](docs/guides/configuration.md)
--   [API Documentation](docs/api)
+- [Local Development Guide](docs/guides/local-development.md)
+- [Configuration Guide](docs/guides/configuration.md)
+- [API Documentation](docs/api)
 
 ## Contributor Guide
 
@@ -102,19 +107,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 Examples of behavior that contributes to creating a positive environment include:
 
--   Using welcoming and inclusive language
--   Being respectful of differing viewpoints and experiences
--   Gracefully accepting constructive criticism
--   Focusing on what is best for the community
--   Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior include:
 
--   The use of sexualized language or imagery and unwelcome sexual attention or advances
--   Trolling, insulting/derogatory comments, and personal or political attacks
--   Public or private harassment
--   Publishing others' private information without explicit permission
--   Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
 #### Our Responsibilities