Fix merge conflicts in package.json, ecosystem.config.js, brain health files, and .gitignore

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>

.github/brain/bingshuo-issues-index.json

@@ -1,11 +1,7 @@
 {
   "version": "1.0",
   "description": "冰朔主控问题索引库 — 记录已知问题、根因与排查路由",
-<<<<<<< HEAD
-  "updated_at": "2026-03-10T13:11:12.874Z",
-=======
   "updated_at": "2026-03-11T02:02:17.835Z",
->>>>>>> origin/main
   "issues": [
     {
       "id": "BS-001",
@@ -19,11 +15,7 @@
         "backend/schemas/",
         ".github/brain/routing-map.json"
       ],
-<<<<<<< HEAD
-      "last_seen": "2026-03-10",
-=======
       "last_seen": "2026-03-11",
->>>>>>> origin/main
       "source": "routing-map.json 统计"
     },
     {

.github/brain/bingshuo-system-health.json

@@ -1,11 +1,7 @@
 {
   "version": "1.0",
   "description": "冰朔主控系统健康状态",
-<<<<<<< HEAD
-  "updated_at": "2026-03-10T13:11:12.874Z",
-=======
   "updated_at": "2026-03-11T02:02:17.835Z",
->>>>>>> origin/main
   "health": {
     "brain_consistency": {
       "status": "yellow",
@@ -17,11 +13,7 @@
     },
     "workflow_health": {
       "status": "green",
-<<<<<<< HEAD
-      "detail": "31 个 workflow 已注册"
-=======
       "detail": "32 个 workflow 已注册"
->>>>>>> origin/main
     },
     "routing_health": {
       "status": "yellow",

.gitignore

@@ -3,6 +3,7 @@ node_modules/
 dist/
 build/
 .private/
+.env
 
 # persona-brain-db runtime artifacts
 persona-brain-db/brain.db

ecosystem.config.js

@@ -25,8 +25,6 @@ module.exports = {
       error_file: 'logs/error.log',
       out_file: 'logs/out.log',
     },
-<<<<<<< HEAD
-=======
     {
       name: 'api-proxy',
       script: 'backend-integration/api-proxy.js',
@@ -55,6 +53,5 @@ module.exports = {
       error_file: 'logs/persona-studio-error.log',
       out_file: 'logs/persona-studio-out.log',
     },
->>>>>>> origin/main
   ],
 };

package.json

@@ -1,23 +1,5 @@
 {
-<<<<<<< HEAD
+  "name": "guanghulab",
-  "name": "dingtalk-bot",
-  "version": "1.0.0",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
-  "dependencies": {
-    "axios": "^1.13.6",
-    "crypto-js": "^4.2.0",
-    "dingtalk-jsapi": "^3.2.8",
-    "dotenv": "^17.3.1",
-    "express": "^5.2.1"
-=======
-  "name": "nextjs",
   "version": "0.1.0",
   "private": true,
   "scripts": {
@@ -48,7 +30,11 @@
     "notion:summary": "node scripts/generate-session-summary.js"
   },
   "dependencies": {
+    "axios": "^1.13.6",
     "better-sqlite3": "^12.6.2",
+    "crypto-js": "^4.2.0",
+    "dingtalk-jsapi": "^3.2.8",
+    "dotenv": "^17.3.1",
     "express": "^5.2.1",
     "imapflow": "^1.2.12",
     "next": "15.3.8",
@@ -65,6 +51,5 @@
     "jest": "^29.7.0",
     "tailwindcss": "^4",
     "typescript": "^5"
->>>>>>> origin/main
   }
 }