Merge dev to main

.github/workflows/pr-docker-compose-healthcheck.yml

@@ -0,0 +1,152 @@
+name: PR Docker Compose Healthcheck
+
+# 驗證 docker-compose.yml 的 healthcheck 配置在 Alpine 容器中正常工作
+on:
+  pull_request:
+    branches:
+      - main
+      - dev
+    paths:
+      - 'docker-compose.yml'
+      - 'docker/Dockerfile.backend'
+      - 'docker/Dockerfile.frontend'
+      - '.github/workflows/pr-docker-compose-healthcheck.yml'
+
+jobs:
+  healthcheck-test:
+    name: Test Docker Compose Healthcheck
+    runs-on: ubuntu-22.04
+    timeout-minutes: 10
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Create minimal .env for testing
+        run: |
+          cat > .env <<EOF
+          # Minimal config for healthcheck testing
+          NOFX_BACKEND_PORT=8080
+          NOFX_FRONTEND_PORT=3000
+          NOFX_TIMEZONE=UTC
+          DATA_ENCRYPTION_KEY=test-key-32-chars-minimum-length
+          JWT_SECRET=test-jwt-secret-minimum-32-chars
+          EOF
+
+      - name: Create minimal config.json
+        run: |
+          cat > config.json <<EOF
+          {
+            "ai_models": [],
+            "exchanges": [],
+            "traders": []
+          }
+          EOF
+
+      - name: Start services with docker compose
+        run: |
+          docker compose up -d
+          echo "✅ Services started, waiting for healthcheck..."
+
+      - name: Wait for healthcheck start_period
+        run: |
+          echo "⏳ Waiting 70 seconds for healthcheck start_period to complete..."
+          sleep 70
+
+      - name: Verify backend healthcheck
+        run: |
+          echo "🔍 Checking backend container health..."
+
+          BACKEND_HEALTH=$(docker inspect nofx-trading --format='{{.State.Health.Status}}')
+          echo "Backend health status: $BACKEND_HEALTH"
+
+          if [ "$BACKEND_HEALTH" != "healthy" ]; then
+            echo "❌ Backend container is not healthy!"
+            echo "Health status: $BACKEND_HEALTH"
+            echo ""
+            echo "Health logs:"
+            docker inspect nofx-trading --format='{{json .State.Health}}' | jq
+            echo ""
+            echo "Container logs:"
+            docker logs nofx-trading
+            exit 1
+          fi
+
+          echo "✅ Backend container is healthy"
+
+      - name: Verify frontend healthcheck
+        run: |
+          echo "🔍 Checking frontend container health..."
+
+          FRONTEND_HEALTH=$(docker inspect nofx-frontend --format='{{.State.Health.Status}}')
+          echo "Frontend health status: $FRONTEND_HEALTH"
+
+          if [ "$FRONTEND_HEALTH" != "healthy" ]; then
+            echo "❌ Frontend container is not healthy!"
+            echo "Health status: $FRONTEND_HEALTH"
+            echo ""
+            echo "Health logs:"
+            docker inspect nofx-frontend --format='{{json .State.Health}}' | jq
+            echo ""
+            echo "Container logs:"
+            docker logs nofx-frontend
+            exit 1
+          fi
+
+          echo "✅ Frontend container is healthy"
+
+      - name: Verify healthcheck commands are Alpine-compatible
+        run: |
+          echo "🔍 Verifying healthcheck commands use Alpine-compatible tools..."
+
+          # Check that docker-compose.yml uses wget (not curl)
+          if grep -q 'test:.*curl' docker-compose.yml; then
+            echo "❌ ERROR: docker-compose.yml uses 'curl' which doesn't exist in Alpine!"
+            echo ""
+            echo "Alpine Linux (used by our containers) includes 'wget' but not 'curl'."
+            echo "Please use 'wget --no-verbose --tries=1 --spider' instead."
+            exit 1
+          fi
+
+          if ! grep -q 'test:.*wget' docker-compose.yml; then
+            echo "⚠️  WARNING: No wget healthcheck found in docker-compose.yml"
+          else
+            echo "✅ Healthcheck uses Alpine-compatible 'wget' command"
+          fi
+
+      - name: Test healthcheck commands inside containers
+        run: |
+          echo "🧪 Testing healthcheck commands directly..."
+
+          # Test backend healthcheck command
+          echo "Testing backend healthcheck..."
+          docker exec nofx-trading wget --no-verbose --tries=1 --spider http://localhost:8080/api/health
+          echo "✅ Backend healthcheck command works"
+
+          # Test frontend healthcheck command
+          echo "Testing frontend healthcheck..."
+          docker exec nofx-frontend wget --no-verbose --tries=1 --spider http://127.0.0.1/health
+          echo "✅ Frontend healthcheck command works"
+
+      - name: Show container status
+        if: always()
+        run: |
+          echo "📊 Final container status:"
+          docker ps --format "table {{.Names}}\t{{.Status}}"
+
+      - name: Show logs on failure
+        if: failure()
+        run: |
+          echo "📋 Backend logs:"
+          docker logs nofx-trading
+          echo ""
+          echo "📋 Frontend logs:"
+          docker logs nofx-frontend
+
+      - name: Cleanup
+        if: always()
+        run: |
+          docker compose down -v
+          rm -f .env config.json

.github/workflows/pr-template-suggester.yml

@@ -6,6 +6,7 @@ on:
 
 permissions:
   pull-requests: write
+  issues: write
   contents: read
 
 jobs:

.gitignore

@@ -30,25 +30,10 @@ Thumbs.db
 # 环境变量
 .env
 config.json
-<<<<<<< HEAD
-config.db
-.tool-versions
-=======
 config.db*
 nofx.db
 configbak.json
 
-# 生产配置
-nginx/
-certs/
-beta_codes.txt
-
-# 密钥文件
-keys/
-*.key
-*.pem
->>>>>>> beta
-
 # 决策日志
 decision_logs/
 coin_pool_cache/
@@ -59,9 +44,6 @@ web/node_modules/
 node_modules/
 web/dist/
 web/.vite/
-<<<<<<< HEAD
-web/yarn.lock
-=======
 
 # ESLint 临时报告文件（调试时生成，不纳入版本控制）
 eslint-*.json
@@ -140,4 +122,4 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
->>>>>>> beta
+PR_DESCRIPTION.md

CONTRIBUTING.md

@@ -469,7 +469,6 @@ Reviewers will check:
 
 - [Project Roadmap](docs/roadmap/README.md)
 - [Architecture Documentation](docs/architecture/README.md)
-- [API Documentation](docs/api/README.md)
 - [Deployment Guide](docs/getting-started/docker-deploy.en.md)
 
 ---

README.md

@@ -8,8 +8,6 @@
 
 **Languages:** [English](README.md) | [中文](docs/i18n/zh-CN/README.md) | [Українська](docs/i18n/uk/README.md) | [Русский](docs/i18n/ru/README.md) | [日本語](docs/i18n/ja/README.md)
 
-**Official Twitter:** [@nofx_ai](https://x.com/nofx_ai)
-
 **📚 Documentation:** [Docs Home](docs/README.md) | [Getting Started](docs/getting-started/README.md) | [Prompt Writing Guide](docs/prompt-guide.md) ([中文](docs/prompt-guide.zh-CN.md)) | [Changelog](CHANGELOG.md) | [Contributing](CONTRIBUTING.md) | [Security](SECURITY.md)
 
 ---
@@ -31,7 +29,6 @@
 - [🧠 AI Self-Learning](#-ai-self-learning-example)
 - [📊 Web Interface Features](#-web-interface-features)
 - [🎛️ API Endpoints](#️-api-endpoints)
-- [🔐 Admin Mode (Single-User)](#-admin-mode-single-user) 
 - [⚠️ Important Risk Warnings](#️-important-risk-warnings)
 - [🛠️ Common Issues](#️-common-issues)
 - [📈 Performance Tips](#-performance-optimization-tips)
@@ -56,15 +53,12 @@
 ### 👥 Core Team
 
 - **Tinkle** - [@Web3Tinkle](https://x.com/Web3Tinkle)
-- **Zack** - [@0x_ZackH](https://x.com/0x_ZackH)
 
 ### 💼 Seed Funding Round Open
 
-We are currently raising our **seed round**. 
-
-**For investment inquiries**, please DM **Tinkle** or **Zack** via Twitter.
+We are currently raising our **seed round**.
 
-**For partnerships and collaborations**, please DM our official Twitter [@nofx_ai](https://x.com/nofx_ai).
+**For investment inquiries**, please DM **Tinkle** via Twitter.
 
 ---
 
@@ -245,48 +239,6 @@ NOFX is built with a modern, modular architecture:
 
 ---
 
-## 🔐 Admin Mode (Single-User)
-
-For self-hosted or single-tenant setups, NOFX supports a strict admin-only mode that disables public features and requires an admin password for all access.
-
-### How it works
-- All API endpoints require a valid JWT when `admin_mode=true`, except:
-  - `GET /api/health`
-  - `GET /api/config`
-  - `POST /api/admin-login`
-- Logout invalidates the current token via an in-memory blacklist (sufficient for single instance; use Redis for multi-instance – see Notes).
-
-### Quick setup
-1) Set flags in `config.json`:
-```jsonc
-{
-  // ... other config
-  "admin_mode": true,
-  "jwt_secret": "YOUR_JWT_SCR" 
-}
-```
-
-2) Provide required environment variables:
-- `NOFX_ADMIN_PASSWORD` — plaintext admin password (only used at startup to derive a bcrypt hash)
-
-Docker Compose example (already wired):
-```yaml
-services:
-  nofx:
-    environment:
-      - NOFX_ADMIN_PASSWORD=${NOFX_ADMIN_PASSWORD}
-```
-
-1) Login flow (admin mode):
-- Open the web UI → you’ll be redirected to the login page
-- Enter admin password → the server returns a JWT
-- The UI stores the token and authenticates subsequent API calls
-
-### Notes
-- Token lifetime: 24h. On logout, tokens are blacklisted in-memory until expiry. For multi-instance deployments, use a shared store (e.g., Redis) to sync the blacklist.
-
----
-
 ## 💰 Register Binance Account (Save on Fees!)
 
 Before using this system, you need a Binance Futures account. **Use our referral link to save on trading fees:**