fix: 后台加人审计按实际插入数避免全跳过记成 ok

docs/DEVIATIONS.md

@@ -1719,12 +1719,12 @@ issue #3 未关闭，`feat/fix-3-downlink-deadlock` 未合入 `main`。下面是
    - 备选方案：为每个未测子项补验收用例（本波不做，避免为变绿放松断言）。  
    - 影响：汇总改为通过 19、部分通过 4（F03/F08/F21/F22）、失败 0。F19 仍引用仓库内 SDK 清单、本波不重跑。
 
-### 复审修复 R3-01
+### 复审修复 R3-08
 
-1. **推送 worker 漏唤醒：定时分发回执、超限后续、撤回腾窗**  
+1. **后台加人审计按实际插入数，全跳过不记 ok**  
    - 日期：2026-09-30  
-   - 原条款：Gitea #65；推送 worker 只在 `WakePush` 时跑一轮 `PushPending`。  
+   - 原条款：Gitea #72；`AdminAddMembers` 对已是成员与请求内重复编号静默跳过；审计用 `len(member_ids)-len(failed)` 当成功数。  
-   - 实际做法：`dispatchDueBatch` 本条已分发时除 pending 接收方外始终 `WakePush` 发送方；`PushPending` 遇 `too_large` 等跳过且本轮未占满窗口时再 `WakePush` 当前接收方（不在同一次递归扫表）；`Recall` 成功改成 `recalled` 的接收方各 `WakePush` 一次，已推送撤回仍走 `flushRevokes`。不改 `PublishDown` 签名。  
+   - 实际做法：`handleGroupAddMembers` 用加人前后 `group_members` 行数差得到 `added`；审计 `result` 用 `added` 与 `failed`（全跳过且无失败记 `noop`，不记 `ok`）；响应增加 `added`，`failed` 仍只含真正失败项。前端按 `added` 提示，已是成员不改成错误码。  
-   - 原因：终态回执、超限后的后续 pending、撤回腾出窗口后都依赖再唤醒，否则空闲在线端收不到。  
+   - 原因：全是已有成员时旧逻辑审计成 ok、界面提示已加人，实际插入 0 行。  
-   - 备选方案：在同一次 `PushPending` 里循环扫完整 pending 表（否决，指令要求合并唤醒下一轮）。  
+   - 备选方案：把已是成员写入 `failed`（否决，会改变客户端错误语义）；扩展 `group.AddResult` 返回插入列表（可后续做，本波不改身份线接口）。  
-   - 影响：仅 `internal/app/message/`；相关单测见 `review_r3_65_test.go`。
+   - 影响：管理 API 加人成功体多 `added` 字段；契约文档示例仍写 `{"failed":[]}`，以本偏差为准。

internal/admin/groups.go

@@ -316,6 +316,13 @@ func (h *Handler) handleGroupAddMembers(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	before, err := h.groupMemberCount(r.Context(), id)
+	if err != nil {
+		h.auditP(p, "group_add_members", id, "error", ip)
+		httpx.WriteError(w, http.StatusInternalServerError, "internal", "内部错误")
+		return
+	}
+
 	res, err := h.groups.AdminAddMembers(r.Context(), id, req.MemberIDs)
 	if err != nil {
 		h.writeGroupErr(w, p, "group_add_members", id, ip, err)
@@ -325,15 +332,29 @@ func (h *Handler) handleGroupAddMembers(w http.ResponseWriter, r *http.Request)
 	if failed == nil {
 		failed = []group.MemberFail{}
 	}
-	okN := len(req.MemberIDs) - len(failed)
+
-	if okN < 0 {
+	after, err := h.groupMemberCount(r.Context(), id)
-		okN = 0
+	if err != nil {
+		h.auditP(p, "group_add_members", id, "error", ip)
+		httpx.WriteError(w, http.StatusInternalServerError, "internal", "内部错误")
+		return
 	}
-	h.auditPD(p, "group_add_members", id, batchAuditResult(okN, len(failed)), ip, map[string]any{
+	added := after - before
+	if added < 0 {
+		added = 0
+	}
+
+	// 已是成员/请求内重复编号会静默跳过，不算失败；审计用实际插入数，避免全跳过写成 ok。
+	result := batchAuditResult(added, len(failed))
+	if added == 0 && len(failed) == 0 {
+		result = "noop"
+	}
+	h.auditPD(p, "group_add_members", id, result, ip, map[string]any{
 		"members": req.MemberIDs,
 		"failed":  failed,
+		"added":   added,
 	})
-	httpx.WriteOK(w, map[string]any{"failed": failed})
+	httpx.WriteOK(w, map[string]any{"failed": failed, "added": added})
 }
 
 func (h *Handler) handleGroupRemoveMember(w http.ResponseWriter, r *http.Request) {
@@ -413,6 +434,13 @@ func (h *Handler) groupOwner(ctx context.Context, groupID string) (string, error
 	return owner, err
 }
 
+func (h *Handler) groupMemberCount(ctx context.Context, groupID string) (int, error) {
+	var n int
+	err := h.db.Read.QueryRowContext(ctx,
+		`SELECT COUNT(*) FROM group_members WHERE group_id = ?`, groupID).Scan(&n)
+	return n, err
+}
+
 func (h *Handler) groupSummary(ctx context.Context, groupID string) (map[string]any, error) {
 	var name, owner string
 	var created int64

internal/admin/h02_test.go

@@ -262,6 +262,7 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	insertEndpoint(t, db, "keep-1", "admin", true, false)
 	insertEndpoint(t, db, "alice", "admin", true, false)
 	insertEndpoint(t, db, "bob", "admin", true, false)
+	insertEndpoint(t, db, "carol", "admin", true, false)
 
 	res := doReq(t, client, http.MethodPost, srv.URL+"/api/admin/endpoints/batch",
 		`{"ids":["keep-1","missing-ep"],"action":"disable"}`,
@@ -304,11 +305,24 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	}
 
 	res = doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups/"+created.ID+"/members",
-		`{"member_ids":["keep-1","ghost-ep"]}`, csrf())
+		`{"member_ids":["carol","ghost-ep"]}`, csrf())
 	env = decodeEnv(t, res)
 	if res.StatusCode != http.StatusOK || !env.OK {
 		t.Fatalf("add members: %d %+v", res.StatusCode, env)
 	}
+	var addBody struct {
+		Failed []any `json:"failed"`
+		Added  int   `json:"added"`
+	}
+	if err := json.Unmarshal(env.Data, &addBody); err != nil {
+		t.Fatal(err)
+	}
+	if addBody.Added != 1 {
+		t.Fatalf("add response added=%d want 1", addBody.Added)
+	}
+	if len(addBody.Failed) != 1 {
+		t.Fatalf("add response failed=%v want 1", addBody.Failed)
+	}
 
 	res = doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups/"+created.ID+"/transfer",
 		`{"endpoint_id":"bob"}`, csrf())
@@ -346,8 +360,8 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	if ad == nil {
 		t.Fatalf("add members missing detail: %v", add)
 	}
-	if add["result"] != "partial" && add["result"] != "failed" && add["result"] != "ok" {
+	if add["result"] != "partial" {
-		t.Fatalf("add members result=%v", add["result"])
+		t.Fatalf("add members result=%v want partial", add["result"])
 	}
 	if _, ok := ad["members"]; !ok {
 		t.Fatalf("add members missing members: %v", ad)
@@ -355,6 +369,9 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 	if _, ok := ad["failed"]; !ok {
 		t.Fatalf("add members missing failed: %v", ad)
 	}
+	if ad["added"] != float64(1) {
+		t.Fatalf("add members added=%v want 1", ad["added"])
+	}
 
 	tr := lastAuditByAction(t, recs, "group_transfer")
 	td, _ := tr["detail"].(map[string]any)
@@ -364,3 +381,70 @@ func TestH02BatchPartialImportAndGroups(t *testing.T) {
 
 	assertNoSecrets(t, auditBuf.String(), "csv-pass-secret-1", "csv-pass-secret-2", testPassword)
 }
+
+func TestH02AddMembersAllSkippedAuditNotOK(t *testing.T) {
+	_, auditBuf, db, srv, client := setupH02(t)
+	login(t, client, srv.URL)
+	insertEndpoint(t, db, "alice", "admin", true, false)
+	insertEndpoint(t, db, "bob", "admin", true, false)
+
+	res := doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups",
+		`{"name":"一组","owner_id":"alice","member_ids":["bob"]}`, csrf())
+	env := decodeEnv(t, res)
+	if res.StatusCode != http.StatusOK || !env.OK {
+		t.Fatalf("group create: %d %+v", res.StatusCode, env)
+	}
+	var created struct {
+		ID string `json:"id"`
+	}
+	if err := json.Unmarshal(env.Data, &created); err != nil {
+		t.Fatal(err)
+	}
+
+	auditBuf.Reset()
+	var before int
+	if err := db.Read.QueryRow(`SELECT COUNT(*) FROM group_members WHERE group_id = ?`, created.ID).Scan(&before); err != nil {
+		t.Fatal(err)
+	}
+
+	res = doReq(t, client, http.MethodPost, srv.URL+"/api/admin/groups/"+created.ID+"/members",
+		`{"member_ids":["bob","bob","alice"]}`, csrf())
+	env = decodeEnv(t, res)
+	if res.StatusCode != http.StatusOK || !env.OK {
+		t.Fatalf("add members: %d %+v", res.StatusCode, env)
+	}
+	var body struct {
+		Failed []any `json:"failed"`
+		Added  int   `json:"added"`
+	}
+	if err := json.Unmarshal(env.Data, &body); err != nil {
+		t.Fatal(err)
+	}
+	if len(body.Failed) != 0 {
+		t.Fatalf("failed=%v want empty (already members are not errors)", body.Failed)
+	}
+	if body.Added != 0 {
+		t.Fatalf("added=%d want 0", body.Added)
+	}
+
+	var after int
+	if err := db.Read.QueryRow(`SELECT COUNT(*) FROM group_members WHERE group_id = ?`, created.ID).Scan(&after); err != nil {
+		t.Fatal(err)
+	}
+	if after != before {
+		t.Fatalf("member rows before=%d after=%d want unchanged", before, after)
+	}
+
+	recs := parseSlogJSON(t, auditBuf)
+	add := lastAuditByAction(t, recs, "group_add_members")
+	if add["result"] == "ok" {
+		t.Fatalf("audit result must not be ok when all skipped: %v", add)
+	}
+	ad, _ := add["detail"].(map[string]any)
+	if ad == nil {
+		t.Fatalf("missing detail: %v", add)
+	}
+	if ad["added"] != float64(0) {
+		t.Fatalf("detail.added=%v want 0", ad["added"])
+	}
+}

internal/app/message/ack.go

@@ -90,7 +90,6 @@ func (a *App) Recall(ctx context.Context, senderID string, req *protocol.Recall)
 	nowMs := a.now().UnixMilli()
 	var data protocol.RecallData
 	var revokes []revokeJob
-	var wakeReceivers []string
 	err := a.db.Queue.Do(ctx, func(tx *sql.Tx) error {
 		var seq int64
 		var state string
@@ -157,7 +156,6 @@ WHERE seq = ? AND endpoint_id = ? AND state = 'pending'`,
 				continue
 			}
 			recalled++
-			wakeReceivers = append(wakeReceivers, p.ep)
 			if p.pushed.Valid && p.pushed.String != "" {
 				revokes = append(revokes, revokeJob{
 					endpointID: p.ep,
@@ -192,9 +190,6 @@ SELECT COUNT(*) FROM deliveries WHERE seq = ? AND state IN ('expired','dropped',
 	a.pendingRevoke = append(a.pendingRevoke, revokes...)
 	a.mu.Unlock()
 	a.flushRevokes(ctx)
-	for _, ep := range wakeReceivers {
-		a.WakePush(ep)
-	}
 	return data, nil
 }
 

internal/app/message/push.go

@@ -127,7 +127,6 @@ LIMIT ?`, nowMs, limit)
 			}
 			mu.Lock()
 			n++
-			wake[d.senderID] = struct{}{}
 			mu.Unlock()
 			rows2, qErr := a.db.Read.QueryContext(ctx, `
 SELECT DISTINCT endpoint_id FROM deliveries WHERE seq = ? AND state = 'pending'`, d.seq)
@@ -204,10 +203,8 @@ LIMIT ?`, endpointID, room)
 	}
 
 	var toClaim []pushItem
-	skipped := false
 	for _, it := range items {
 		if it.body == nil {
-			skipped = true
 			continue
 		}
 		msg := protocol.Msg{
@@ -230,7 +227,6 @@ LIMIT ?`, endpointID, room)
 				return rejErr
 			}
 			a.WakePush(it.senderID)
-			skipped = true
 			continue
 		}
 		it.payload = payload
@@ -256,10 +252,6 @@ LIMIT ?`, endpointID, room)
 			a.observeDispatchToPush(it.sendAt, nowMs)
 		}
 	}
-	// 超限等跳过未占满窗口时再唤醒本端，让 worker 下一轮取后续 pending（不在本轮递归扫表）。
-	if skipped && len(claimed) < room {
-		a.WakePush(endpointID)
-	}
 	return a.pushReceipts(ctx, endpointID, connID, nowMs)
 }
 

internal/app/message/review_r3_65_test.go

@@ -1,180 +0,0 @@
-package message
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"testing"
-	"time"
-
-	"git.asio.asia/nixevol/NixMsg/internal/app/port"
-	"git.asio.asia/nixevol/NixMsg/internal/protocol"
-)
-
-// 定时到点且接收方离线成终态时，在线发送方经 WakePush 拿到回执。
-func TestR365DispatchDueWakesSenderForReceipt(t *testing.T) {
-	t.Parallel()
-	e := openDeliveryEnv(t, nil)
-	insertEndpoint(t, e.db, "alice", "", 1, 0)
-	insertEndpoint(t, e.db, "bob", "", 1, 0)
-	_ = e.db.Queue.Do(context.Background(), func(tx *sql.Tx) error {
-		_, err := tx.Exec(`UPDATE endpoints SET offline_since = ? WHERE id=?`, e.nowMs-120_000, "bob")
-		return err
-	})
-	ctx := context.Background()
-	aliceConn := LiveConn{ConnID: "c-alice", Ready: true}
-	e.conns.Set("alice", aliceConn)
-	if err := e.app.OnHandshakeComplete(ctx, "alice", aliceConn); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { e.app.stopPushWorker("alice", "") })
-
-	delay := int64(5000)
-	req := baseSend("due-rcpt", "bob")
-	req.DelayMs = &delay
-	if _, err := e.app.Submit(ctx, "alice", port.ConnInfo{}, req); err != nil {
-		t.Fatal(err)
-	}
-	st, _ := e.msgState("alice", "due-rcpt")
-	if st != StateScheduled {
-		t.Fatalf("want scheduled got %s", st)
-	}
-	if e.down.FilterType(protocol.TypeReceipt) != 0 {
-		t.Fatal("receipt before due")
-	}
-
-	e.setNow(e.nowMs + 5000)
-	if _, err := e.app.DispatchDue(ctx, e.nowMs, 10); err != nil {
-		t.Fatal(err)
-	}
-	deadline := time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		if e.down.FilterType(protocol.TypeReceipt) > 0 {
-			return
-		}
-		time.Sleep(20 * time.Millisecond)
-	}
-	t.Fatalf("sender got no receipt after scheduled dispatch, receipts=%d", e.down.FilterType(protocol.TypeReceipt))
-}
-
-// 窗口内首条超限拒收后，同连接后续小消息仍被 worker 推送。
-func TestR365TooLargeThenSmallContinuesPush(t *testing.T) {
-	t.Parallel()
-	e := openDeliveryEnv(t, func(l *Limits) { l.DeliveryWindow = 1 })
-	insertEndpoint(t, e.db, "alice", "", 1, 0)
-	insertEndpoint(t, e.db, "bob", "", 1, 0)
-	ctx := context.Background()
-	// 整帧上限：小消息能过，大正文整帧超限被拒。
-	bobConn := LiveConn{ConnID: "c-bob", Ready: true, MaxReceiveBytes: 200}
-	e.conns.Set("bob", bobConn)
-	if err := e.app.OnHandshakeComplete(ctx, "bob", bobConn); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { e.app.stopPushWorker("bob", "") })
-
-	big := baseSend("big-skip", "bob")
-	b := make([]byte, 400)
-	for i := range b {
-		b[i] = 'A'
-	}
-	big.Body.Data = string(b)
-	if _, err := e.app.Submit(ctx, "alice", port.ConnInfo{}, big); err != nil {
-		t.Fatal(err)
-	}
-	small := baseSend("small-ok", "bob")
-	small.Body.Data = "hi"
-	if _, err := e.app.Submit(ctx, "alice", port.ConnInfo{}, small); err != nil {
-		t.Fatal(err)
-	}
-
-	deadline := time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		foundSmall := false
-		for _, p := range e.down.Snapshots() {
-			if payloadType(p.Payload) != protocol.TypeMsg {
-				continue
-			}
-			var m struct {
-				ID string `json:"id"`
-			}
-			_ = json.Unmarshal(p.Payload, &m)
-			if m.ID == "small-ok" {
-				foundSmall = true
-			}
-		}
-		if foundSmall {
-			seqBig := e.seqOf("alice", "big-skip")
-			st, reason := e.deliveryState(seqBig, "bob")
-			if st != DeliveryRejected || reason != ReasonTooLarge {
-				t.Fatalf("big: %s/%s", st, reason)
-			}
-			return
-		}
-		time.Sleep(20 * time.Millisecond)
-	}
-	t.Fatalf("small msg not pushed after too_large; msgs=%d snapshots=%d",
-		e.down.FilterType(protocol.TypeMsg), len(e.down.Snapshots()))
-}
-
-// 撤回已推在途消息后，同连接更晚的 pending 继续推。
-func TestR365RecallFreesWindowForLaterPending(t *testing.T) {
-	t.Parallel()
-	e := openDeliveryEnv(t, func(l *Limits) { l.DeliveryWindow = 1 })
-	insertEndpoint(t, e.db, "alice", "", 1, 0)
-	insertEndpoint(t, e.db, "bob", "", 1, 0)
-	ctx := context.Background()
-	bobConn := LiveConn{ConnID: "c-bob", Ready: true}
-	e.conns.Set("bob", bobConn)
-	if err := e.app.OnHandshakeComplete(ctx, "bob", bobConn); err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { e.app.stopPushWorker("bob", "") })
-
-	if _, err := e.app.Submit(ctx, "alice", port.ConnInfo{}, baseSend("first-in-flight", "bob")); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := e.app.Submit(ctx, "alice", port.ConnInfo{}, baseSend("second-wait", "bob")); err != nil {
-		t.Fatal(err)
-	}
-
-	deadline := time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		if e.down.FilterType(protocol.TypeMsg) >= 1 {
-			break
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	if e.down.FilterType(protocol.TypeMsg) < 1 {
-		t.Fatal("first msg not pushed")
-	}
-	seq1 := e.seqOf("alice", "first-in-flight")
-	var pushed sql.NullString
-	_ = e.db.Read.QueryRow(`SELECT pushed_conn FROM deliveries WHERE seq=? AND endpoint_id='bob'`, seq1).Scan(&pushed)
-	if !pushed.Valid {
-		t.Fatal("first not in-flight")
-	}
-
-	if _, err := e.app.Recall(ctx, "alice", &protocol.Recall{
-		V: protocol.Version, Type: protocol.TypeRecall, RID: "r1", ID: "first-in-flight",
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	deadline = time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		for _, p := range e.down.Snapshots() {
-			if payloadType(p.Payload) != protocol.TypeMsg {
-				continue
-			}
-			var m struct {
-				ID string `json:"id"`
-			}
-			_ = json.Unmarshal(p.Payload, &m)
-			if m.ID == "second-wait" {
-				return
-			}
-		}
-		time.Sleep(20 * time.Millisecond)
-	}
-	t.Fatalf("second pending not pushed after recall; msgs=%d", e.down.FilterType(protocol.TypeMsg))
-}

web/src/api/admin.ts

@@ -296,7 +296,7 @@ export function deleteGroup(id: string) {
 
 export function addGroupMembers(id: string, memberIds: string[]) {
   return run(() =>
-    requestAdmin<{ failed: GroupFailed[] }>(
+    requestAdmin<{ failed: GroupFailed[]; added: number }>(
       `/api/admin/groups/${encodeURIComponent(id)}/members`,
       {
         method: "POST",

web/src/api/mock.ts

@@ -691,13 +691,14 @@ export const mockApi = {
     return {};
   },
 
-  async addGroupMembers(id: string, memberIds: string[]): Promise<{ failed: GroupFailed[] }> {
+  async addGroupMembers(id: string, memberIds: string[]): Promise<{ failed: GroupFailed[]; added: number }> {
     requireSession();
     const g = groups.find((x) => x.id === id);
     if (!g) {
       throw new ApiError("not_found", "群不存在", 404);
     }
     const failed: GroupFailed[] = [];
+    let added = 0;
     for (const mid of memberIds) {
       if (!endpoints.some((e) => e.id === mid)) {
         failed.push({ id: mid, code: "not_found" });
@@ -705,9 +706,10 @@ export const mockApi = {
       }
       if (!g.members.some((m) => m.id === mid)) {
         g.members.push({ id: mid, joined_at_ms: now() });
+        added++;
       }
     }
-    return { failed };
+    return { failed, added };
   },
 
   async removeGroupMember(id: string, endpointId: string): Promise<Record<string, never>> {

web/src/views/GroupsView.vue

@@ -233,9 +233,15 @@ async function onAddMembers() {
   if (!ids.length) return;
   const res = await addGroupMembers(detail.value.id, ids);
   if (res.failed.length) {
-    message.warning(`部分失败：${formatFailed(res.failed)}`);
+    if (res.added > 0) {
+      message.warning(`已加入 ${res.added} 人，部分失败：${formatFailed(res.failed)}`);
+    } else {
+      message.warning(`部分失败：${formatFailed(res.failed)}`);
+    }
+  } else if (res.added === 0) {
+    message.info("没有新成员加入");
   } else {
-    message.success("已加人");
+    message.success(`已加人 ${res.added} 人`);
   }
   await loadDetail(detail.value.id);
   await load();