Batch: DRY extractions for issues #504, #511, #508, #516

[aaronwong1989]

Summary

4 high-ROI DRY extractions targeting repeated code patterns across worker, messaging, session, and admin modules.

Closes #504, #511, #508, #516

Changes by Issue

#504 — messaging/stt: PersistentSTT PID tracker cleanup DRY

• Extract trackPID() and untrackPID() helpers on PersistentSTT
• Replace 3 inline copy-paste sites in start(), shutdownProcess(), kill()
• Eliminates risk of new cleanup paths forgetting PID tracking

#511 — worker/base: Terminate/Kill/Wait lock pattern DRY

• Extract withProc() (error) and withProcCode() (int, error) helpers
• Terminate/Kill use withProc, Wait uses withProcCode
• Reduces 18 Lock/Unlock calls to 6, single source of truth for lock protocol

#508 — session/store: Compact ISP violation + Upsert DRY

• Remove Compact() from Store interface (never called via interface)
• Remove pgStore Compact no-op and mockStore stub
• Extract marshalSessionJSON() and upsertTimeout() to eliminate Upsert JSON serialization duplication

#516 — admin: dual-store CRUD DRY

• Add apiKeyStoreBase with shared list/get/delete/Invalidator/SetInvalidator
• Add prepareQuery() for dialect rebind and ensureAPIKey() for key generation
• Add withLock func field to abstract write serialization (writeMu vs identity)
• SQLite/PG stores embed base, keep create/update where dialect differences are real

Testing

• make test-short — all packages pass
• make lint — 0 issues
• make build — compiles cleanly
• Pre-push hooks (gofmt, golangci-lint, go vet, module checksum, build, tests) — all passed

Commits

4 atomic commits, one per issue:

1. refactor(messaging/stt): extract trackPID/untrackPID helpers
2. refactor(worker/base): extract withProc/withProcCode helpers
3. refactor(session/store): remove Compact from Store interface + extract Upsert helpers
4. `refactor(admin): extract apiKeyStoreBase

---

Merged from #694

• docs(patrol): cron delivery retry docs + metrics (docs(patrol): 2026-06-09 文档维护 #693)

[hotplex-ai]

Code Review — hotplex-ai

Verdict: ✅ APPROVE | P0:0 P1:0 P2:0 P3:3

4 个 DRY 提取均正确保持了原始语义，无正确性/安全/并发回归。重构干净，行为等价。

P3 — 建议性清理（不阻塞合并）

1. e2e mockStore 残留 Compact 方法 (e2e/helper_test.go) — Compact 已从 session.Store 接口移除，但 e2e 测试的 mockStore 仍保留该方法。无害死代码，建议同步清理保持一致性。

2. apiKeyUserStore.writeMu 成为死字段 (internal/admin/apikey_handlers.go:131) — 重构后 writeMu 仅在构造函数中用于初始化 base.withLock，之后 apiKeyUserStore 上的 writeMu 字段不再被任何方法读取。可移除该字段以消除死代码。

3. PG create/update 跳过 withLock (internal/admin/apikey_pg_store.go) — delete 经由 base withLock（PG 下为 identity），但 create/update 直接执行未经过 withLock。当前功能无差异，但如果未来 withLock 加入 metrics/logging，PG 的写操作将被遗漏。建议统一模式或添加注释说明有意跳过。

[hotplex-ai]

Code Review — hotplex-ai

Verdict: ✅ APPROVE | P0:0 P1:0 P2:1 P3:2

DRY 重构质量高，行为完全保留，无回归风险。泛型 withProcResult[T] 设计干净，PID helpers 提取合理，session 序列化/超时统一正确。

---

P2 (1)

• docs/specs/Dual-Database-Support-Spec.md:97 — Compact 已从 session.Store 接口移除但 spec 仍记载方法数=9 并列出 Compact，需同步更新。 [80%]

P3 (2)

• internal/admin/apikey_handlers.go:73 — apiKeyStoreBase.list() 未使用 dialect.Rebind()（查询无 bind 参数故无实际影响，但与同结构体 get()/delete() 风格不一致）。 [80%]

• internal/worker/base/worker.go:74 — withProcResult 在 fn(p) 返回 error 时不清除 w.Proc——这是对旧代码行为的精确保留（旧 Wait()/Terminate()/Kill() 均如此），非回归，但值得注意：进程已退出后 Proc 引用不会被释放。 [75%]