memrelay
c8de7be73e
MemRelay-Operation: checkpoint-save:h07-merge-h02-checkpoint-22b94ec MemRelay-Resource: d97af7ae-e4e1-4cc6-9615-f7a8f0ea973a
40 lines
1.4 KiB
Markdown
40 lines
1.4 KiB
Markdown
---
|
||
title: Checkpoint 2026-09-30 07:39:34 UTC [06c6918237]
|
||
type: checkpoint
|
||
permalink: main/projects/25464650-ed5d-440e-b362-190f2852d451/checkpoint-2026-09-30-07-39-34-utc-06c6918237
|
||
stable_id: d97af7ae-e4e1-4cc6-9615-f7a8f0ea973a
|
||
scope: project
|
||
memory_type: checkpoint
|
||
project_id: 25464650-ed5d-440e-b362-190f2852d451
|
||
usage_profile_id: 0c9feb46-d06e-43cd-9ef0-c5813c84a998
|
||
status: active
|
||
revision: 1
|
||
request_id: h07-merge-h02-checkpoint-22b94ec
|
||
created_at: '2026-09-30T07:39:34.652431+00:00'
|
||
updated_at: '2026-09-30T07:39:34.652431+00:00'
|
||
tags:
|
||
- ready-to-merge
|
||
- lane/admin
|
||
- H-07
|
||
- H-02
|
||
---
|
||
|
||
## H-07 已 merge H-02 审计并推送（未 merge main）
|
||
|
||
- **工作树**：`E:\\code\\NixMsg-wt\\r2-h07`
|
||
- **分支**：`feat/fix-h07-reset-kick`
|
||
- **HEAD**：`22b94ec` `merge: admin-web H-02 audit`（已普通推送 origin）
|
||
- 父母：`cedd57b`（H-07）+ `afe6a77`（origin/feat/fix-admin-web H-02）
|
||
- 未 merge main
|
||
|
||
## 冲突处理
|
||
- `docs/DEVIATIONS.md`：保留 H-02 与 H-07 两节
|
||
- `internal/admin/endpoints.go`：踢线失败仍回退 KickEndpoint；审计改用 H-02 `auditP`，result=`ok_kick_failed`
|
||
- `endpoints_test.go`：审计断言改走独立 AuditLogger
|
||
- serve.go 无冲突，AuditLogger + kick 钩子均保留
|
||
|
||
## 验证
|
||
`go test ./internal/admin/ ./internal/broker/ -count=1` 通过（admin 2.8s，broker 6.2s）
|
||
|
||
## 给下个会话
|
||
HEAD=`22b94ec`；不要合 main；不要占用 r2-h。 |