Fix merge conflicts and resolve inconsistencies

.dockerignore

@@ -0,0 +1,19 @@
+# Ignore node_modules from the build context
+node_modules
+
+# Ignore logs and temporary files
+*.log
+*.tmp
+.DS_Store
+
+# Ignore Git files and metadata
+.gitignore
+
+# Ignore IDE and editor config files
+.vscode
+.idea
+*.swp
+
+# Ignore build artifacts from the host
+dist
+build

.github/workflows/block-mini.yml

@@ -0,0 +1,60 @@
+name: Block Minified JavaScript/TypeScript
+
+on:
+  pull_request:
+    branches: ["main", "develop", "*"]
+  push:
+    branches: ["main", "develop", "*"]
+
+jobs:
+  block-minified-code:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Detect potential minified code
+        shell: bash
+        run: |
+          echo "Scanning for potential minified JS/TS code..."
+
+          # We'll look in .ts, .tsx, .js, .jsx files, skipping common build dirs.
+          FILES=$(find . \
+            \( -name 'node_modules' -prune \) -o \
+            \( -name 'dist' -prune \) -o \
+            \( -name 'build' -prune \) -o \
+            -type f \( -name '*.ts' -o -name '*.tsx' -o -name '*.js' -o -name '*.jsx' \) \
+            -print)
+
+          if [ -z "$FILES" ]; then
+            echo "No relevant JS/TS files found."
+            exit 0
+          fi
+
+          THRESHOLD=1000
+          VIOLATIONS=0
+
+          for file in $FILES; do
+            # Use grep -En to capture line number and text
+            # If any line is ≥ THRESHOLD chars, we store those lines in RESULTS
+            RESULTS=$(grep -En ".{${THRESHOLD},}" "$file" || true)
+            if [ -n "$RESULTS" ]; then
+              # We have potential minified lines
+              while IFS= read -r match; do
+                # 'match' will be something like "1234:the entire matched line"
+                LINENUM=$(echo "$match" | cut -d: -f1)
+                # If you want the text, you can do:
+                # MATCHED_LINE=$(echo "$match" | cut -d: -f2-)
+
+                echo "::error file=$file,line=$LINENUM::Detected potential minified code (≥ $THRESHOLD chars)."
+              done <<< "$RESULTS"
+              VIOLATIONS=1
+            fi
+          done
+
+          if [ "$VIOLATIONS" -eq 1 ]; then
+            echo "ERROR: Minified code detected. Please remove or exclude it."
+            exit 1
+          else
+            echo "No minified code detected."
+          fi

.github/workflows/generate-readme-translations.yml

@@ -24,6 +24,15 @@ jobs:
                         { code: "TH", name: "Thai" },
                         { code: "TR", name: "Turkish" },
                         { code: "VI", name: "Vietnamese" },
+                        { code: "AR", name: "Arabic" },
+                        { code: "RS", name: "Srpski" },
+                        { code: "TG", name: "Tagalog" },
+                        { code: "PL", name: "Polski" },
+                        { code: "HU", name: "Hungarian" },
+                        { code: "FA", name: "Persian" },
+                        { code: "RO", name: "Romanian" },
+                        { code: "GR", name: "Greek" },
+                        { code: "NL", name: "Dutch" },
                     ]
         permissions:
             contents: write
@@ -53,7 +62,7 @@ jobs:
                             "content_path": "README.md"
                           }
                         ],
-                        "save_path": "README_${{ matrix.language.code }}.md",
+                        save_path: "i18n/readme/README_${{ matrix.language.code }}.md",
                         "model": "gpt-4o"
                       }
 

.github/workflows/greetings.yml

@@ -12,5 +12,5 @@ jobs:
             - uses: actions/first-interaction@v1
               with:
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  issue-message: "Hello @${{ github.actor }}! Welcome to the ai16z community. Thank you for opening your first issue; we appreciate your contribution. You are now a ai16z contributor!"
-                  pr-message: "Hi @${{ github.actor }}! Welcome to the ai16z community. Thanks for submitting your first pull request; your efforts are helping us accelerate towards AGI. We'll review it shortly. You are now a ai16z contributor!"
+                  issue-message: "Hello @${{ github.actor }}! Welcome to the elizaOS community. Thank you for opening your first issue; we appreciate your contribution. You are now an elizaOS contributor!"
+                  pr-message: "Hi @${{ github.actor }}! Welcome to the elizaOS community. Thanks for submitting your first pull request; your efforts are helping us accelerate towards AGI. We'll review it shortly. You are now an elizaOS contributor!"

.github/workflows/smoke-tests.yml

@@ -10,17 +10,24 @@ on:
 jobs:
     smoke-tests:
         runs-on: ubuntu-latest
+        container:
+            image: node:23-bullseye
         steps:
             - uses: actions/checkout@v4
 
-            - uses: pnpm/action-setup@v3
+            - name: Cache pnpm
+              uses: actions/cache@v4
               with:
-                  version: 9.15.0
+                  path: |
+                      ~/.pnpm-store
+                      **/node_modules
+                  key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+                  restore-keys: ${{ runner.os }}-pnpm-
 
-            - uses: actions/setup-node@v4
+            - name: Setup pnpm
+              uses: pnpm/action-setup@v3
               with:
-                  node-version: "23.3.0"
-                  cache: "pnpm"
+                  version: 9.15.0
 
             - name: Run smoke tests
               run: pnpm run smokeTests

.gitignore

@@ -52,6 +52,8 @@ tsup.config.bundled_*.mjs
 .turbo
 .cursorrules
 .pnpm-store
+instructions.md
+wallet_data.txt
 
 coverage
 .eslintcache
@@ -60,6 +62,4 @@ agent/content
 
 eliza.manifest
 eliza.manifest.sgx
-eliza.sig
-packages/plugin-pyth-data/docs
-packages/plugin-pyth-data/old_code
+eliza.sig

CHANGELOG.md

@@ -1312,7 +1312,7 @@
 - Add OLLAMA as Model Provider  [\#221](https://github.com/elizaOS/eliza/pull/221) ([o-on-x](https://github.com/o-on-x))
 - lazy load llama [\#220](https://github.com/elizaOS/eliza/pull/220) ([lalalune](https://github.com/lalalune))
 - Implement grok beta [\#216](https://github.com/elizaOS/eliza/pull/216) ([MeDott29](https://github.com/MeDott29))
-- Abstracts Eliza into a Package to enble publishing onto NPM along with plugin system [\#214](https://github.com/elizaOS/eliza/pull/214) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
+- Abstracts Eliza into a Package to enable publishing onto NPM along with plugin system [\#214](https://github.com/elizaOS/eliza/pull/214) ([ponderingdemocritus](https://github.com/ponderingdemocritus))
 - add the template overrides [\#207](https://github.com/elizaOS/eliza/pull/207) ([lalalune](https://github.com/lalalune))
 - Shaw fix characters paths, .ts requirement and missings args [\#204](https://github.com/elizaOS/eliza/pull/204) ([lalalune](https://github.com/lalalune))
 - Fix Discord Voice and DMs [\#203](https://github.com/elizaOS/eliza/pull/203) ([lalalune](https://github.com/lalalune))

Dockerfile

@@ -1,43 +1,62 @@
 # Use a specific Node.js version for better reproducibility
 FROM node:23.3.0-slim AS builder
 
-# Install pnpm globally and install necessary build tools
+# Install pnpm globally and necessary build tools
 RUN npm install -g [email protected] && \
     apt-get update && \
-    apt-get install -y git python3 make g++ && \
+    apt-get upgrade -y && \
+    apt-get install -y \
+        git \
+        python3 \
+        python3-pip \
+        curl \
+        node-gyp \
+        ffmpeg \
+        libtool-bin \
+        autoconf \
+        automake \
+        libopus-dev \
+        make \
+        g++ \
+        build-essential \
+        libcairo2-dev \
+        libjpeg-dev \
+        libpango1.0-dev \
+        libgif-dev \
+        openssl \
+        libssl-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # Set Python 3 as the default python
-RUN ln -s /usr/bin/python3 /usr/bin/python
+RUN ln -sf /usr/bin/python3 /usr/bin/python
 
 # Set the working directory
 WORKDIR /app
 
-# Copy package.json and other configuration files
-COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc turbo.json ./
+# Copy application code
+COPY . .
 
-# Copy the rest of the application code
-COPY agent ./agent
-COPY packages ./packages
-COPY scripts ./scripts
-COPY characters ./characters
+# Install dependencies
+RUN pnpm install --no-frozen-lockfile
 
-# Install dependencies and build the project
-RUN pnpm install \
-    && pnpm build-docker \
-    && pnpm prune --prod
+# Build the project
+RUN pnpm run build && pnpm prune --prod
 
-# Create a new stage for the final image
+# Final runtime image
 FROM node:23.3.0-slim
 
-# Install runtime dependencies if needed
+# Install runtime dependencies
 RUN npm install -g [email protected] && \
     apt-get update && \
-    apt-get install -y git python3 && \
+    apt-get install -y \
+        git \
+        python3 \
+        ffmpeg && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Set the working directory
 WORKDIR /app
 
 # Copy built artifacts and production dependencies from the builder stage
@@ -47,9 +66,14 @@ COPY --from=builder /app/.npmrc ./
 COPY --from=builder /app/turbo.json ./
 COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/agent ./agent
+COPY --from=builder /app/client ./client
+COPY --from=builder /app/lerna.json ./
 COPY --from=builder /app/packages ./packages
 COPY --from=builder /app/scripts ./scripts
 COPY --from=builder /app/characters ./characters
 
-# Set the command to run the application
-CMD ["pnpm", "start"]
+# Expose necessary ports
+EXPOSE 3000 5173
+
+# Command to start the application
+CMD ["sh", "-c", "pnpm start & pnpm start:client"]

Dockerfile.docs

@@ -1,63 +1,43 @@
 # syntax=docker/dockerfile:1
 
-## Modified version of https://docusaurus.community/knowledge/deployment/docker/
-
 # Stage 1: Base image.
 ## Start with a base image containing NodeJS so we can build Docusaurus.
 FROM node:23.3.0-slim AS base
 ## Disable colour output from yarn to make logs easier to read.
-
-## https://pnpm.io/docker
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-
 ENV FORCE_COLOR=0
 ## Enable corepack.
 RUN corepack enable
 ## Set the working directory to `/opt/docusaurus`.
 WORKDIR /opt/docusaurus
 
-## Required by docusaurus: [ERROR] Loading of version failed for version current
-RUN apt-get update && apt-get install -y git 
-
+# Stage 2a: Development mode.
 FROM base AS dev
 ## Set the working directory to `/opt/docusaurus`.
 WORKDIR /opt/docusaurus
 ## Expose the port that Docusaurus will run on.
 EXPOSE 3000
 ## Run the development server.
-CMD [ -d "node_modules" ] && npm run start -- --host 0.0.0.0 --poll 1000 || pnpm install && pnpm run start -- --host 0.0.0.0 --poll 1000
+CMD [ -d "node_modules" ] && pnpm start -- --host 0.0.0.0 --poll 1000 || pnpm install && pnpm start -- --host 0.0.0.0 --poll 1000
 
 # Stage 2b: Production build mode.
-FROM base AS preprod
+FROM base AS prod
 ## Set the working directory to `/opt/docusaurus`.
 WORKDIR /opt/docusaurus
 
-## This is in case someone needs to build the lock file 
-#RUN apt install python-is-python3 g++ make -y
-
-COPY docs/package.json /opt/docusaurus/package.json
-COPY docs/package-lock.json /opt/docusaurus/package-lock.json
-
-FROM preprod AS prod
-
-## Install dependencies with `--immutable` to ensure reproducibility.
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install 
-
-## Copy over the source code.
 COPY docs/ /opt/docusaurus/
 COPY packages/ /opt/packages/
 
 ## Required buy docusaurus [ERROR] Loading of version failed for version current
 COPY .git/ /opt/.git/
 
-# Build from sources
-RUN pnpm run build
+## Install dependencies with `--frozen-lockfile` to ensure reproducibility.
+RUN pnpm install --no-frozen-lockfile
+## Build the static site.
+RUN pnpm build
 
 # Stage 3a: Serve with `docusaurus serve`.
 FROM prod AS serve
 ## Expose the port that Docusaurus will run on.
 EXPOSE 3000
 ## Run the production server.
-CMD ["npm", "run", "serve", "--", "--host", "0.0.0.0", "--no-open"]
-
+CMD ["pnpm", "run", "serve", "--host", "0.0.0.0", "--no-open"]