shazhou/united-workforce
8
0
Fork 0
Code Issues 8 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(cli): race condition in thread rm + flaky test' (#266) from fix/265-flaky-thread-rm into main

Browse Source
This commit is contained in:
xiaomo
2026-05-15 00:21:16 +00:00
parent 71ccf8d03c 942ff4b1a4
commit e7987c4cd7
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli-workflow/__tests__/thread-cli.test.ts
+3
View File
@@ -180,6 +180,9 @@ describe("cli thread commands", () => {
} }
expect(threads.value.some((l) => l.includes(threadId))).toBe(true); expect(threads.value.some((l) => l.includes(threadId))).toBe(true);
const runningPath = join(storageRoot, "logs", added.value.hash, `${threadId}.running`);
await waitUntilRunningFileAbsent(runningPath, 120);
const shown = await cmdThreadShow(storageRoot, threadId); const shown = await cmdThreadShow(storageRoot, threadId);
expect(shown.ok).toBe(true); expect(shown.ok).toBe(true);
if (!shown.ok) { if (!shown.ok) {
packages/cli-workflow/src/commands/thread/rm.ts
+7 -7
View File
@@ -18,13 +18,13 @@ export async function cmdThreadRemove(
return err(`thread not found: ${threadId}`); return err(`thread not found: ${threadId}`);
} }
if (resolved.source === "active") { // Always clear both stores: between resolve and delete the worker may finish and
await removeThreadEntry(resolved.bundleDir, threadId); // move the thread from threads.json into history; branching only on resolved.source
} else { // would skip history removal and leave a dangling row.
const hist = await removeThreadHistoryEntries(resolved.bundleDir, threadId); await removeThreadEntry(resolved.bundleDir, threadId);
if (!hist.ok) { const hist = await removeThreadHistoryEntries(resolved.bundleDir, threadId);
return hist; if (!hist.ok) {
} return hist;
} }
const infoPath = join(storageRoot, "logs", resolved.bundleHash, `${threadId}.info.jsonl`); const infoPath = join(storageRoot, "logs", resolved.bundleHash, `${threadId}.info.jsonl`);