resolve: keep origin/main for all merge conflicts in brain/docs files
Resolved merge conflicts in 4 files (20 total conflict sections): - .github/brain/repo-snapshot.md (7 conflicts) - .github/brain/repo-map.json (8 conflicts) - .github/brain/bingshuo-master-brain.md (4 conflicts) - .github/persona-brain/memory.json (1 conflict) All conflicts resolved by keeping origin/main (newer) content: - Timestamp: 2026-03-11 (vs 2026-03-10) - Workflows: 32 (vs 31) - Scripts: 27 (vs 26) - Added zhuyuan-daily-agent entries - Added daily_selfcheck data in memory.json - m15-cloud-drive: 4 files with README (vs 3 without) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
c6b2a2be0a
commit
1d48cad804
|
|
@ -1,12 +1,7 @@
|
||||||
# 冰朔主控神经系统 · 核心主控大脑 v1.0
|
# 冰朔主控神经系统 · 核心主控大脑 v1.0
|
||||||
|
|
||||||
> 本文件为冰朔主控神经系统的总控脑文件。
|
> 本文件为冰朔主控神经系统的总控脑文件。
|
||||||
<<<<<<< HEAD
|
|
||||||
> 最后编译时间:2026-03-10T13:11:12.875Z
|
|
||||||
=======
|
|
||||||
> 最后编译时间:2026-03-11T02:02:17.836Z
|
> 最后编译时间:2026-03-11T02:02:17.836Z
|
||||||
>>>>>>> origin/main
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## A. 系统角色结构
|
## A. 系统角色结构
|
||||||
|
|
@ -60,12 +55,7 @@
|
||||||
|
|
||||||
### 仓库统计
|
### 仓库统计
|
||||||
- 功能模块:10 个
|
- 功能模块:10 个
|
||||||
<<<<<<< HEAD
|
|
||||||
- Workflow:31 个
|
|
||||||
=======
|
|
||||||
- Workflow:32 个
|
- Workflow:32 个
|
||||||
>>>>>>> origin/main
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## D. 当前系统真相源
|
## D. 当前系统真相源
|
||||||
|
|
@ -93,11 +83,7 @@
|
||||||
|
|
||||||
> 本区块由 master-brain-compiler 自动编译。
|
> 本区块由 master-brain-compiler 自动编译。
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
- **编译时间**:2026-03-10T13:11:12.875Z
|
|
||||||
=======
|
|
||||||
- **编译时间**:2026-03-11T02:02:17.836Z
|
- **编译时间**:2026-03-11T02:02:17.836Z
|
||||||
>>>>>>> origin/main
|
|
||||||
- **脑文件规则版本**:v3.0
|
- **脑文件规则版本**:v3.0
|
||||||
- **脑文件完整性**:✅ 完整
|
- **脑文件完整性**:✅ 完整
|
||||||
|
|
||||||
|
|
@ -119,11 +105,7 @@
|
||||||
|--------|------|------|
|
|--------|------|------|
|
||||||
| 🟡 brain_consistency | yellow | 主仓库脑文件完整,但与 persona-studio 脑文件的同步状态待验证 |
|
| 🟡 brain_consistency | yellow | 主仓库脑文件完整,但与 persona-studio 脑文件的同步状态待验证 |
|
||||||
| 🟢 deployment_health | green | deploy-to-server.yml 与 deploy-pages.yml 均存在 |
|
| 🟢 deployment_health | green | deploy-to-server.yml 与 deploy-pages.yml 均存在 |
|
||||||
<<<<<<< HEAD
|
|
||||||
| 🟢 workflow_health | green | 31 个 workflow 已注册 |
|
|
||||||
=======
|
|
||||||
| 🟢 workflow_health | green | 32 个 workflow 已注册 |
|
| 🟢 workflow_health | green | 32 个 workflow 已注册 |
|
||||||
>>>>>>> origin/main
|
|
||||||
| 🟡 routing_health | yellow | HLI 接口覆盖率 33.3%(7/21) |
|
| 🟡 routing_health | yellow | HLI 接口覆盖率 33.3%(7/21) |
|
||||||
| 🟢 docs_entry_health | green | docs/index.html 存在 |
|
| 🟢 docs_entry_health | green | docs/index.html 存在 |
|
||||||
| 🟡 persona_studio_health | yellow | 前后端结构存在,端到端对话链路待验证 |
|
| 🟡 persona_studio_health | yellow | 前后端结构存在,端到端对话链路待验证 |
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,14 @@
|
||||||
{
|
{
|
||||||
"description": "铸渊图书馆目录 · Library Catalog for 铸渊 (Zhùyuān)",
|
"description": "铸渊图书馆目录 · Library Catalog for 铸渊 (Zhùyuān)",
|
||||||
"version": "2.0",
|
"version": "2.0",
|
||||||
<<<<<<< HEAD
|
|
||||||
"generated_at": "2026-03-10T13:11:27.110Z",
|
|
||||||
=======
|
|
||||||
"generated_at": "2026-03-11T02:03:30.090Z",
|
"generated_at": "2026-03-11T02:03:30.090Z",
|
||||||
>>>>>>> origin/main
|
|
||||||
"generated_by": "scripts/generate-repo-map.js",
|
"generated_by": "scripts/generate-repo-map.js",
|
||||||
"repo": "qinfendebingshuo/guanghulab",
|
"repo": "qinfendebingshuo/guanghulab",
|
||||||
"stats": {
|
"stats": {
|
||||||
"zones": 13,
|
"zones": 13,
|
||||||
"total_modules": 10,
|
"total_modules": 10,
|
||||||
<<<<<<< HEAD
|
|
||||||
"total_workflows": 31,
|
|
||||||
"total_scripts": 26,
|
|
||||||
=======
|
|
||||||
"total_workflows": 32,
|
"total_workflows": 32,
|
||||||
"total_scripts": 27,
|
"total_scripts": 27,
|
||||||
>>>>>>> origin/main
|
|
||||||
"total_dev_nodes": 8,
|
"total_dev_nodes": 8,
|
||||||
"hli_interfaces": 21,
|
"hli_interfaces": 21,
|
||||||
"hli_implemented": 7,
|
"hli_implemented": 7,
|
||||||
|
|
@ -386,8 +377,6 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
"file": "zhuyuan-daily-agent.yml",
|
"file": "zhuyuan-daily-agent.yml",
|
||||||
"name": "🤖 铸渊巡检 Agent · 每日自动巡检与修复",
|
"name": "🤖 铸渊巡检 Agent · 每日自动巡检与修复",
|
||||||
"triggers": [
|
"triggers": [
|
||||||
|
|
@ -396,7 +385,6 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
>>>>>>> origin/main
|
|
||||||
"file": "zhuyuan-daily-selfcheck.yml",
|
"file": "zhuyuan-daily-selfcheck.yml",
|
||||||
"name": "铸渊 · 每日自检",
|
"name": "铸渊 · 每日自检",
|
||||||
"triggers": [
|
"triggers": [
|
||||||
|
|
@ -420,11 +408,7 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
<<<<<<< HEAD
|
|
||||||
"item_count": 31
|
|
||||||
=======
|
|
||||||
"item_count": 32
|
"item_count": 32
|
||||||
>>>>>>> origin/main
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"zone_id": "SCRIPTS",
|
"zone_id": "SCRIPTS",
|
||||||
|
|
@ -511,12 +495,9 @@
|
||||||
"file": "update-readme-bulletin.js"
|
"file": "update-readme-bulletin.js"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
"file": "zhuyuan-daily-agent.js"
|
"file": "zhuyuan-daily-agent.js"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
>>>>>>> origin/main
|
|
||||||
"file": "zhuyuan-daily-selfcheck.js"
|
"file": "zhuyuan-daily-selfcheck.js"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -526,11 +507,7 @@
|
||||||
"file": "zhuyuan-module-protocol.js"
|
"file": "zhuyuan-module-protocol.js"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
<<<<<<< HEAD
|
|
||||||
"item_count": 26
|
|
||||||
=======
|
|
||||||
"item_count": 27
|
"item_count": 27
|
||||||
>>>>>>> origin/main
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"zone_id": "SRC",
|
"zone_id": "SRC",
|
||||||
|
|
@ -634,13 +611,8 @@
|
||||||
{
|
{
|
||||||
"module_id": "M15",
|
"module_id": "M15",
|
||||||
"dir": "m15-cloud-drive",
|
"dir": "m15-cloud-drive",
|
||||||
<<<<<<< HEAD
|
|
||||||
"files": 3,
|
|
||||||
"has_readme": false
|
|
||||||
=======
|
|
||||||
"files": 4,
|
"files": 4,
|
||||||
"has_readme": true
|
"has_readme": true
|
||||||
>>>>>>> origin/main
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"module_id": "M18",
|
"module_id": "M18",
|
||||||
|
|
@ -1337,13 +1309,10 @@
|
||||||
"zhuyuan-brain-sync": [
|
"zhuyuan-brain-sync": [
|
||||||
"WORKFLOWS::zhuyuan-brain-sync.yml"
|
"WORKFLOWS::zhuyuan-brain-sync.yml"
|
||||||
],
|
],
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
"zhuyuan-daily-agent": [
|
"zhuyuan-daily-agent": [
|
||||||
"WORKFLOWS::zhuyuan-daily-agent.yml",
|
"WORKFLOWS::zhuyuan-daily-agent.yml",
|
||||||
"SCRIPTS::zhuyuan-daily-agent.js"
|
"SCRIPTS::zhuyuan-daily-agent.js"
|
||||||
],
|
],
|
||||||
>>>>>>> origin/main
|
|
||||||
"zhuyuan-daily-selfcheck": [
|
"zhuyuan-daily-selfcheck": [
|
||||||
"WORKFLOWS::zhuyuan-daily-selfcheck.yml",
|
"WORKFLOWS::zhuyuan-daily-selfcheck.yml",
|
||||||
"SCRIPTS::zhuyuan-daily-selfcheck.js"
|
"SCRIPTS::zhuyuan-daily-selfcheck.js"
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,5 @@
|
||||||
# 铸渊图书馆快照 · Repo Snapshot
|
# 铸渊图书馆快照 · Repo Snapshot
|
||||||
<<<<<<< HEAD
|
|
||||||
> 生成于 2026-03-10 21:11 CST · 每次 push 自动更新 · 铸渊唤醒时优先读取此文件
|
|
||||||
=======
|
|
||||||
> 生成于 2026-03-11 10:03 CST · 每次 push 自动更新 · 铸渊唤醒时优先读取此文件
|
> 生成于 2026-03-11 10:03 CST · 每次 push 自动更新 · 铸渊唤醒时优先读取此文件
|
||||||
>>>>>>> origin/main
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 📊 仓库总览(一眼全局)
|
## 📊 仓库总览(一眼全局)
|
||||||
|
|
@ -13,20 +8,11 @@
|
||||||
|------|------|
|
|------|------|
|
||||||
| 区域总数 | 13 个区域 |
|
| 区域总数 | 13 个区域 |
|
||||||
| 功能模块 | 10 个 (m01~m18) |
|
| 功能模块 | 10 个 (m01~m18) |
|
||||||
<<<<<<< HEAD
|
|
||||||
| 工作流 | 31 个 GitHub Actions |
|
|
||||||
| 脚本 | 26 个执行脚本 |
|
|
||||||
| 开发者节点 | 8 人 |
|
|
||||||
| HLI 接口覆盖率 | 7/21 (33%) |
|
|
||||||
| 快照生成时间 | 2026-03-10 21:11 CST |
|
|
||||||
=======
|
|
||||||
| 工作流 | 32 个 GitHub Actions |
|
| 工作流 | 32 个 GitHub Actions |
|
||||||
| 脚本 | 27 个执行脚本 |
|
| 脚本 | 27 个执行脚本 |
|
||||||
| 开发者节点 | 8 人 |
|
| 开发者节点 | 8 人 |
|
||||||
| HLI 接口覆盖率 | 7/21 (33%) |
|
| HLI 接口覆盖率 | 7/21 (33%) |
|
||||||
| 快照生成时间 | 2026-03-11 10:03 CST |
|
| 快照生成时间 | 2026-03-11 10:03 CST |
|
||||||
>>>>>>> origin/main
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 🗺️ 图书馆全区地图
|
## 🗺️ 图书馆全区地图
|
||||||
|
|
@ -42,20 +28,12 @@
|
||||||
**关键词**: persona · identity · dev-status · 人格 · 开发者状态
|
**关键词**: persona · identity · dev-status · 人格 · 开发者状态
|
||||||
|
|
||||||
### ⚡ 自动化工作流(WORKFLOWS)
|
### ⚡ 自动化工作流(WORKFLOWS)
|
||||||
<<<<<<< HEAD
|
|
||||||
**路径**: `.github/workflows` · **数量**: 31 项
|
|
||||||
=======
|
|
||||||
**路径**: `.github/workflows` · **数量**: 32 项
|
**路径**: `.github/workflows` · **数量**: 32 项
|
||||||
>>>>>>> origin/main
|
|
||||||
**描述**: 所有 GitHub Actions 工作流定义
|
**描述**: 所有 GitHub Actions 工作流定义
|
||||||
**关键词**: workflow · actions · ci · automation · 工作流 · 自动化
|
**关键词**: workflow · actions · ci · automation · 工作流 · 自动化
|
||||||
|
|
||||||
### 🔧 执行脚本库(SCRIPTS)
|
### 🔧 执行脚本库(SCRIPTS)
|
||||||
<<<<<<< HEAD
|
|
||||||
**路径**: `scripts` · **数量**: 26 项
|
|
||||||
=======
|
|
||||||
**路径**: `scripts` · **数量**: 27 项
|
**路径**: `scripts` · **数量**: 27 项
|
||||||
>>>>>>> origin/main
|
|
||||||
**描述**: 铸渊所有执行手脚 · 自动化脚本
|
**描述**: 铸渊所有执行手脚 · 自动化脚本
|
||||||
**关键词**: script · node · js · 脚本 · 执行 · runner
|
**关键词**: script · node · js · 脚本 · 执行 · runner
|
||||||
|
|
||||||
|
|
@ -138,10 +116,7 @@
|
||||||
| `update-readme-bulletin.yml` | 📢 更新系统公告区 | push, schedule(0 1 * * *), manual |
|
| `update-readme-bulletin.yml` | 📢 更新系统公告区 | push, schedule(0 1 * * *), manual |
|
||||||
| `update-repo-map.yml` | 铸渊 · 图书馆目录自动更新 | push, schedule(0 0 * * *), manual |
|
| `update-repo-map.yml` | 铸渊 · 图书馆目录自动更新 | push, schedule(0 0 * * *), manual |
|
||||||
| `zhuyuan-brain-sync.yml` | 铸渊 · Brain Sync | push |
|
| `zhuyuan-brain-sync.yml` | 铸渊 · Brain Sync | push |
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
| `zhuyuan-daily-agent.yml` | 🤖 铸渊巡检 Agent · 每日自动巡检与修复 | schedule(0 14 * * *), manual |
|
| `zhuyuan-daily-agent.yml` | 🤖 铸渊巡检 Agent · 每日自动巡检与修复 | schedule(0 14 * * *), manual |
|
||||||
>>>>>>> origin/main
|
|
||||||
| `zhuyuan-daily-selfcheck.yml` | 铸渊 · 每日自检 | schedule(0 0 * * *), manual |
|
| `zhuyuan-daily-selfcheck.yml` | 铸渊 · 每日自检 | schedule(0 0 * * *), manual |
|
||||||
| `zhuyuan-issue-reply.yml` | 铸渊 · Issue 自动回复 | issues, issue_comment |
|
| `zhuyuan-issue-reply.yml` | 铸渊 · Issue 自动回复 | issues, issue_comment |
|
||||||
| `zhuyuan-pr-review.yml` | 铸渊 · PR Review | pull_request |
|
| `zhuyuan-pr-review.yml` | 铸渊 · PR Review | pull_request |
|
||||||
|
|
@ -173,10 +148,7 @@
|
||||||
- `scripts/update-brain.js`
|
- `scripts/update-brain.js`
|
||||||
- `scripts/update-memory.js`
|
- `scripts/update-memory.js`
|
||||||
- `scripts/update-readme-bulletin.js`
|
- `scripts/update-readme-bulletin.js`
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
- `scripts/zhuyuan-daily-agent.js`
|
- `scripts/zhuyuan-daily-agent.js`
|
||||||
>>>>>>> origin/main
|
|
||||||
- `scripts/zhuyuan-daily-selfcheck.js`
|
- `scripts/zhuyuan-daily-selfcheck.js`
|
||||||
- `scripts/zhuyuan-issue-reply.js`
|
- `scripts/zhuyuan-issue-reply.js`
|
||||||
- `scripts/zhuyuan-module-protocol.js`
|
- `scripts/zhuyuan-module-protocol.js`
|
||||||
|
|
@ -242,11 +214,7 @@
|
||||||
- `m10-cloud/` — 4 个文件 (有README)
|
- `m10-cloud/` — 4 个文件 (有README)
|
||||||
- `m11-module/` — 4 个文件 (有README)
|
- `m11-module/` — 4 个文件 (有README)
|
||||||
- `m12-kanban/` — 1 个文件 (有README)
|
- `m12-kanban/` — 1 个文件 (有README)
|
||||||
<<<<<<< HEAD
|
|
||||||
- `m15-cloud-drive/` — 3 个文件
|
|
||||||
=======
|
|
||||||
- `m15-cloud-drive/` — 4 个文件 (有README)
|
- `m15-cloud-drive/` — 4 个文件 (有README)
|
||||||
>>>>>>> origin/main
|
|
||||||
- `m18-health-check/` — 6 个文件 (有README)
|
- `m18-health-check/` — 6 个文件 (有README)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -85,17 +85,6 @@
|
||||||
"type": "ci_run",
|
"type": "ci_run",
|
||||||
"description": "CI完成 · schema 3/17 · 路由 4 个",
|
"description": "CI完成 · schema 3/17 · 路由 4 个",
|
||||||
"by": "GitHub Actions"
|
"by": "GitHub Actions"
|
||||||
<<<<<<< HEAD
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"last_updated": "2026-03-10T12:38:40.221Z",
|
|
||||||
"total_schemas_created": 3,
|
|
||||||
"total_routes_implemented": 4,
|
|
||||||
"hli_coverage": "3/17",
|
|
||||||
"total_ci_runs": 7,
|
|
||||||
"last_broadcast_received": "2026-03-10T12:38:40.268Z",
|
|
||||||
"active_rules_version": "v1.1"
|
|
||||||
=======
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"date": "2026-03-10",
|
"date": "2026-03-10",
|
||||||
|
|
@ -122,6 +111,4 @@
|
||||||
"brain_integrity": "ok",
|
"brain_integrity": "ok",
|
||||||
"schema_coverage": "3/17",
|
"schema_coverage": "3/17",
|
||||||
"pending_broadcasts": 1
|
"pending_broadcasts": 1
|
||||||
}
|
}}
|
||||||
>>>>>>> origin/main
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue