Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix: redact the owed sync's failure log and report members it leaves behind in the run's status

garrytan4158b67ad110
diff --git a/src/core/persistence/worktree-refresh.ts b/src/core/persistence/worktree-refresh.ts
index e6ec31b742..7760d54108 100644
--- a/src/core/persistence/worktree-refresh.ts
+++ b/src/core/persistence/worktree-refresh.ts
@@ -680,11 +680,13 @@ export async function refreshWorktree(engine: BrainEngine, sourceId: string, opt
throw failure;
}
if (opts.dryRun) return result;
- const owed = await syncAfterUnfinishedRefresh(engine, sourceId, opts, new Set(result.synced.map(member => member.source_id))).catch(owedSyncFailed(sourceId));
+ const done = new Set([...result.synced, ...(result.sync_blocked ?? [])].map(member => member.source_id));
+ const owed = await syncAfterUnfinishedRefresh(engine, sourceId, opts, done).catch(owedSyncFailed(sourceId));
if (!owed.synced.length) return result;
const blocked = [...(result.sync_blocked ?? []), ...owed.blocked];
const next = [result.next, ...owed.resume].filter(Boolean).join(' ; ');
- return { ...result, synced: [...result.synced, ...owed.synced], ...(blocked.length ? { sync_blocked: blocked } : {}), ...(next ? { next } : {}) };
+ return { ...result, status: blocked.length ? 'sync_blocked' : owed.resume.length ? 'sync_deferred' : result.status,
+ synced: [...result.synced, ...owed.synced], ...(blocked.length ? { sync_blocked: blocked } : {}), ...(next ? { next } : {}) };
}
/**
@@ -717,7 +719,7 @@ async function syncAfterUnfinishedRefresh(engine: BrainEngine, sourceId: string,
for (const [index, member] of lagging.entries()) {
const resume = `gbrain sync --source ${member} --no-pull`;
const result = await sync.member(engine, member, lagging.length - index).catch((error): MemberSync => ({ status: 'blocked', blocked: { source_id: member,
- code: error instanceof OperationError ? error.code : 'storage_error', message: error instanceof Error ? error.message : String(error), resume } }));
+ code: error instanceof OperationError ? error.code : 'storage_error', message: redact(error instanceof Error ? error.message : String(error)), resume } }));
const commit = await lastCommit(engine, member);
owed.synced.push({ source_id: member, status: result.status, last_commit: commit });
if (result.blocked) owed.blocked.push(result.blocked);
@@ -729,7 +731,7 @@ type OwedSync = { synced: RefreshMemberSync[]; blocked: RefreshSyncBlocked[]; re
const NO_OWED_SYNC: OwedSync = { synced: [], blocked: [], resume: [] };
const NO_OWED_SYNC_AFTER = new Set(['invalid_params', 'refresh_in_progress', 'internal_error']);
const owedSyncFailed = (sourceId: string) => (error: unknown): OwedSync => {
- console.error(`[gbrain] the sync owed after an unfinished refresh of ${sourceId} failed (${error instanceof Error ? error.message : String(error)}); its members' next sync or refresh run retries it.`);
+ console.error(redact(`[gbrain] the sync owed after an unfinished refresh of ${sourceId} failed (${error instanceof Error ? error.message : String(error)}); its members' next sync or refresh run retries it.`));
return NO_OWED_SYNC;
};
const consumerConfig = (engine: BrainEngine) => loadConfig() ?? { engine: engine.kind };
diff --git a/test/refresh-barrier-held-after-abort.test.ts b/test/refresh-barrier-held-after-abort.test.ts
index 07c33a48c5..b4aceb9e94 100644
--- a/test/refresh-barrier-held-after-abort.test.ts
+++ b/test/refresh-barrier-held-after-abort.test.ts
@@ -8,7 +8,7 @@
* names the imported revision it replaced, an add_timeline_entry applies on top.
* Seams: the real refresh state machine and managed sync; GBRAIN_REFRESH_BARRIER; PGLite, and Postgres when DATABASE_URL is set.
*/
-import { afterAll, afterEach, beforeAll, beforeEach, expect, test } from 'bun:test';
+import { afterAll, afterEach, beforeAll, beforeEach, expect, spyOn, test } from 'bun:test';
import { randomUUID } from 'node:crypto';
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
@@ -181,6 +181,7 @@ test('GST-1853: a member the owed sync leaves behind HEAD is named with its resu
expect(refused?.message).toContain(resume);
const resumed = await refreshWorktree(f.engine, f.alpha, { resume: true, syncBudgetMs: 0 });
expect(resumed.synced.map(member => member.source_id)).toContain(f.alpha);
+ expect(['sync_blocked', 'sync_deferred']).toContain(resumed.status);
expect(resumed.next ?? '').toContain(resume);
}), 180_000);
@@ -192,3 +193,22 @@ test('GST-1853: a refusal of the run\'s own arguments runs no owed sync', () =>
expect(refused?.message).not.toContain('ended without completing');
expect(await f.lastCommit(f.alpha)).toBe(before);
}), 180_000);
+
+test('GST-1853: an owed sync that fails is logged with connection details redacted, and the refusal still stands', () => each(async f => {
+ await abortedByScan(f);
+ const secret = 'pw-example-not-real';
+ const executeRaw = f.engine.executeRaw.bind(f.engine);
+ const logged: string[] = [];
+ const error = spyOn(console, 'error').mockImplementation((...args: unknown[]) => { logged.push(args.map(String).join(' ')); });
+ (f.engine as { executeRaw: unknown }).executeRaw = (sql: string, params?: unknown[]) => sql.startsWith('SELECT state,source_ids FROM persistence_worktree_refreshes')
+ ? Promise.reject(new Error(`connect failed: postgresql://owner:${secret}@db.example.invalid:5432/brain`)) : executeRaw(sql, params as never);
+ try {
+ await expect(refreshWorktree(f.engine, f.alpha)).rejects.toMatchObject({ code: 'refresh_diverged' });
+ } finally {
+ delete (f.engine as { executeRaw?: unknown }).executeRaw;
+ error.mockRestore();
+ }
+ const owed = logged.filter(line => line.includes('the sync owed after an unfinished refresh'));
+ expect(owed).toHaveLength(1);
+ expect(owed[0]).not.toContain(secret);
+}), 180_000);