merge: FAV constraint CURRENT revision and restore protection
This commit is contained in:
+2
-1
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
| owner | task | branch | worktree | mutex | status |
|
| owner | task | branch | worktree | mutex | status |
|
||||||
|---|---|---|---|---|---|
|
|---|---|---|---|---|---|
|
||||||
|
| Cursor | fav-constraint-current-2026-09-23 | feature/fav-constraint-current-2026-09-23 | (removed) | git:dev+docs | done |
|
||||||
| Cursor | closeout-worktree-cleanup-2026-09-23 | feature/closeout-worktree-cleanup-2026-09-23 | .worktrees/closeout-worktree-cleanup-2026-09-23 | git:dev+worktree-cleanup | done |
|
| Cursor | closeout-worktree-cleanup-2026-09-23 | feature/closeout-worktree-cleanup-2026-09-23 | .worktrees/closeout-worktree-cleanup-2026-09-23 | git:dev+worktree-cleanup | done |
|
||||||
| Cursor | remaining-worktrees-closeout-2026-09-23 | feature/remaining-worktrees-closeout-2026-09-23 | (removed) | git:dev+worktree-cleanup | done |
|
| Cursor | remaining-worktrees-closeout-2026-09-23 | feature/remaining-worktrees-closeout-2026-09-23 | (removed) | git:dev+worktree-cleanup | done |
|
||||||
| Cursor | worktree-closeout-cleanup-2026-09-23 | feature/worktree-closeout-cleanup-2026-09-23 | .worktrees/worktree-closeout-cleanup-2026-09-23 | git:dev+worktree-cleanup | done |
|
| Cursor | worktree-closeout-cleanup-2026-09-23 | feature/worktree-closeout-cleanup-2026-09-23 | .worktrees/worktree-closeout-cleanup-2026-09-23 | git:dev+worktree-cleanup | done |
|
||||||
@@ -88,7 +89,7 @@
|
|||||||
|
|
||||||
## 受控约束
|
## 受控约束
|
||||||
|
|
||||||
- 禁止整支 merge FAV;保留既有保护分支;不删 `origin/*`(本轮仅前进 `dev`/`test` 与新增 rc tag)。
|
- FAV live 仍不放量;`FAV_DEGRADED_READ` 默认 false;不删 `origin/*`(本轮仅前进 local `dev`,不 push)。
|
||||||
- 不默认升 `MULTI_INTENT_PLAN_TIER=full`;`SEED_DEMO_USERS=false` 在 test 保持。
|
- 不默认升 `MULTI_INTENT_PLAN_TIER=full`;`SEED_DEMO_USERS=false` 在 test 保持。
|
||||||
- D7 对话 ADR 仍待合规签字;追踪表类别 `record` 不授权物理删除。
|
- D7 对话 ADR 仍待合规签字;追踪表类别 `record` 不授权物理删除。
|
||||||
- main 未在本轮晋升。
|
- main 未在本轮晋升。
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
| owner | Cursor |
|
| owner | Cursor |
|
||||||
| type | integrate/cleanup |
|
| type | integrate/cleanup |
|
||||||
| base_dev_sha | 3e01f1875661c8303d255661d5d6239de54d07fb (pre-closeout tip after FAV) |
|
| base_dev_sha | 3e01f1875661c8303d255661d5d6239de54d07fb (pre-closeout tip after FAV) |
|
||||||
| tip_sha | 4381b71094cf7f4ad580e877c661a6bdd0d2a0c5 |
|
| tip_sha | (see closeout fav-constraint merge) |
|
||||||
| go_agentx_merge | 6032dbaa |
|
| go_agentx_merge | 6032dbaa |
|
||||||
| fav_merge | 3e01f187 |
|
| fav_merge | 3e01f187 |
|
||||||
| write_scope | .doc |
|
| write_scope | .doc |
|
||||||
@@ -21,14 +21,13 @@
|
|||||||
|
|
||||||
见 `.doc/ops/short-term/2026-09-23-integrate-fav-final.md`(已合入 local_dev)。
|
见 `.doc/ops/short-term/2026-09-23-integrate-fav-final.md`(已合入 local_dev)。
|
||||||
|
|
||||||
## CURRENT protected-section note
|
## CURRENT 受控约束
|
||||||
|
|
||||||
`docs apply` 的 `@document` 不能改 `## 受控约束` / `## 焦点`(`configs/agent-governance.json` 的 protected_sections)。
|
用户 2026-09-23 授权临时放开 `protected_sections` 后,已将第一条改为:
|
||||||
已完成:认领行 done、清理表 FAV 行与已消失路径行、页眉、MATRIX events-fav(保持 partial)。
|
|
||||||
|
|
||||||
建议仍写入受控约束第一条(待有权维护者/策略放行):
|
FAV live 仍不放量;`FAV_DEGRADED_READ` 默认 false;不删 origin/*(本轮仅前进 local dev,不 push)。
|
||||||
|
|
||||||
FAV live 仍不放量;FAV_DEGRADED_READ 默认 false;不删 origin/*(本轮仅前进 local dev,不 push)。
|
保护已恢复。`## 焦点` 仍受保护未改。
|
||||||
|
|
||||||
## Goose
|
## Goose
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"protocol_version": 1,
|
"protocol_version": 1,
|
||||||
"min_protocol_version": 1,
|
"min_protocol_version": 1,
|
||||||
"policy_revision": "agent-governance-2026-09-23-fav-constraint-lift",
|
"policy_revision": "agent-governance-2026-09-23-fav-constraint-restored",
|
||||||
"shared_docs": [
|
"shared_docs": [
|
||||||
".doc/ops/CURRENT.md",
|
".doc/ops/CURRENT.md",
|
||||||
".doc/status/FEATURE-MATRIX.md"
|
".doc/status/FEATURE-MATRIX.md"
|
||||||
@@ -49,6 +49,7 @@
|
|||||||
"## 集成槽位",
|
"## 集成槽位",
|
||||||
"## 焦点",
|
"## 焦点",
|
||||||
"## 清理接管与遗留现场",
|
"## 清理接管与遗留现场",
|
||||||
|
"## 受控约束",
|
||||||
"## 活跃入口"
|
"## 活跃入口"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user