Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix: queue the Wakeshift forget before ending a removed principal's watches

garrytan29ff14a6dd06
diff --git a/src/core/wakeshift/forget.ts b/src/core/wakeshift/forget.ts
index 80ff1a5540..95fc175e06 100644
--- a/src/core/wakeshift/forget.ts
+++ b/src/core/wakeshift/forget.ts
@@ -20,18 +20,18 @@ export type ForgetTarget = { member: string } | { kind: 'oauth_client' | 'legacy
export async function forgetWakePrincipal(sql: SqlQuery, who: ForgetTarget): Promise<{ ended: number; queued: number }> {
try {
if ('member' in who) {
- const ended = await sql`UPDATE wake_subscriptions SET state = 'ended', last_error = 'principal_revoked', lease_until = NULL, updated_at = now()
- WHERE member_id = ${who.member} AND state = 'open' RETURNING id`;
const queued = await sql`INSERT INTO wake_forgets (wake_user) SELECT DISTINCT wake_user FROM wake_subscriptions WHERE member_id = ${who.member}
ON CONFLICT (wake_user) WHERE state = 'pending' DO NOTHING RETURNING id`;
+ const ended = await sql`UPDATE wake_subscriptions SET state = 'ended', last_error = 'principal_revoked', lease_until = NULL, updated_at = now()
+ WHERE member_id = ${who.member} AND state = 'open' RETURNING id`;
await sql`DELETE FROM wake_terms_acceptances WHERE principal_key = ${`member:${who.member}`}`;
return { ended: ended.length, queued: queued.length };
}
- const ended = await sql`UPDATE wake_subscriptions SET state = 'ended', last_error = 'principal_revoked', lease_until = NULL, updated_at = now()
- WHERE principal_kind = ${who.kind} AND principal_id = ${who.id} AND state = 'open' RETURNING id`;
const queued = await sql`INSERT INTO wake_forgets (wake_user) SELECT DISTINCT wake_user FROM wake_subscriptions
WHERE principal_kind = ${who.kind} AND principal_id = ${who.id} AND member_id IS NULL
ON CONFLICT (wake_user) WHERE state = 'pending' DO NOTHING RETURNING id`;
+ const ended = await sql`UPDATE wake_subscriptions SET state = 'ended', last_error = 'principal_revoked', lease_until = NULL, updated_at = now()
+ WHERE principal_kind = ${who.kind} AND principal_id = ${who.id} AND state = 'open' RETURNING id`;
await sql`DELETE FROM wake_terms_acceptances WHERE principal_key = ${`${who.kind}:${who.id}`}`;
return { ended: ended.length, queued: queued.length };
} catch (e) {
diff --git a/test/wakeshift-emit-connect.serial.test.ts b/test/wakeshift-emit-connect.test.ts
similarity index 100%
rename from test/wakeshift-emit-connect.serial.test.ts
rename to test/wakeshift-emit-connect.test.ts
diff --git a/test/wakeshift-pr2.serial.test.ts b/test/wakeshift-pr2.serial.test.ts
index f840c9dc66..2de48a23c4 100644
--- a/test/wakeshift-pr2.serial.test.ts
+++ b/test/wakeshift-pr2.serial.test.ts
@@ -397,6 +397,16 @@ describe('forget on remove', () => {
expect(new Set(paths('/users/forget').map(c => c.body.user)).size).toBe(2);
});
+ test('a forget that cannot be queued leaves the watch open instead of ending it unforgotten', async () => {
+ await addClient('client-f2');
+ await call('watch_job', { id: await seedJob() }, client('client-f2'));
+ const real = sqlQueryForEngine(engine);
+ const failing: typeof real = (strings, ...values) =>
+ strings.join('').includes('INSERT INTO wake_forgets') ? Promise.reject(new Error('transient')) : real(strings, ...values);
+ expect(await inHome(() => forgetWakePrincipal(failing, { kind: 'oauth_client', id: 'client-f2' }))).toEqual({ ended: 0, queued: 0 });
+ expect(await engine.executeRaw('SELECT state FROM wake_subscriptions')).toEqual([{ state: 'open' }]);
+ });
+
test('removing an already-removed member queues its forget again, so a forget lost after the tombstone is recovered', async () => {
await addMember('alice-example');
await addClient('client-r', 'alice-example');