Skip to content

Commit 003e6a8

Browse files
fix(threads): align queued settlement and bulk filing checks
1 parent dbe2459 commit 003e6a8

3 files changed

Lines changed: 71 additions & 5 deletions

File tree

‎apps/server/src/orchestration-v2/ProjectionStore.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5513,7 +5513,10 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
55135513
LEFT JOIN orchestration_v2_projection_runs r ON r.run_id = (
55145514
SELECT latest.run_id FROM orchestration_v2_projection_runs latest
55155515
WHERE latest.thread_id = t.thread_id
5516-
AND latest.status <> 'queued'
5516+
AND NOT (
5517+
latest.status = 'queued'
5518+
AND json_extract(latest.payload_json, '$.queueHeld') IS 1
5519+
)
55175520
ORDER BY latest.ordinal DESC, latest.run_id DESC
55185521
LIMIT 1
55195522
)

‎apps/server/src/orchestration-v2/SettleWhenIdle.test.ts‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,71 @@ it.effect("a held automatic run cannot hide background work or prevent settlemen
647647
}).pipe(Effect.provide(testLayer)),
648648
);
649649

650+
it.effect.each([undefined, false, true])(
651+
"SQL and memory settlement candidates agree for queued runs (queueHeld: %s)",
652+
(queueHeld) =>
653+
Effect.gen(function* () {
654+
const f = yield* fixture();
655+
yield* f.settle();
656+
yield* f.setRun("completed");
657+
yield* f.setBackground("dynamic_tool", "running");
658+
const queuedAt = DateTime.add(f.now, { seconds: 1 });
659+
const queuedRunId = RunId.make("run:settlement:queued");
660+
yield* f.sink.write({
661+
events: [
662+
{
663+
id: EventId.make("event:settlement:queued"),
664+
type: "run.updated",
665+
threadId: f.threadId,
666+
occurredAt: queuedAt,
667+
payload: {
668+
...f.run,
669+
id: queuedRunId,
670+
ordinal: 2,
671+
status: "queued",
672+
...(queueHeld === undefined ? {} : { queueHeld }),
673+
requestedAt: queuedAt,
674+
startedAt: null,
675+
completedAt: null,
676+
},
677+
},
678+
],
679+
});
680+
681+
const memory = yield* ProjectionStore.ProjectionStoreV2.pipe(
682+
Effect.provide(ProjectionStore.layerMemory),
683+
);
684+
const eventStore = yield* EventStore.EventStoreV2;
685+
yield* eventStore
686+
.read({ threadId: f.threadId })
687+
.pipe(Stream.runForEach(({ event }) => memory.apply(event)));
688+
689+
const sqlCandidates = yield* f.projections.getSettlementCandidates(f.threadId, true);
690+
const memoryCandidates = yield* memory.getSettlementCandidates(f.threadId, true);
691+
assert.lengthOf(sqlCandidates, 1);
692+
assert.lengthOf(memoryCandidates, 1);
693+
const sqlCandidate = sqlCandidates[0]!;
694+
const memoryCandidate = memoryCandidates[0]!;
695+
for (const key of [
696+
"latestRunId",
697+
"status",
698+
"latestRunRequestedAt",
699+
"latestRunStartedAt",
700+
"latestRunCompletedAt",
701+
"pendingBackgroundTasks",
702+
] as const) {
703+
assert.deepEqual(sqlCandidate[key], memoryCandidate[key], key);
704+
}
705+
assert.equal(sqlCandidate.latestRunId, queueHeld === true ? f.run.id : queuedRunId);
706+
assert.equal(sqlCandidate.status, queueHeld === true ? "completed" : "queued");
707+
if (queueHeld === true) {
708+
assert.isNotEmpty(sqlCandidate.pendingBackgroundTasks);
709+
} else {
710+
assert.isEmpty(sqlCandidate.pendingBackgroundTasks);
711+
}
712+
}).pipe(Effect.provide(testLayer)),
713+
);
714+
650715
it.effect.each([false, true])("a queued user message blocks filing (held: %s)", (held) =>
651716
Effect.gen(function* () {
652717
const f = yield* fixture();

‎apps/web/src/components/Sidebar.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4329,9 +4329,7 @@ export default function Sidebar() {
43294329
const thread = threadByKeyRef.current.get(threadKey);
43304330
return thread ? [thread] : [];
43314331
});
4332-
const settlingThreads = selectedThreads.filter(
4333-
(thread) => thread.settledOverride !== "settled",
4334-
);
4332+
const settlingThreads = selectedThreads.filter((thread) => !isFiledAsSettled(thread));
43354333
const canSnoozeSelection = selectedThreads.every(
43364334
(thread) =>
43374335
serverConfigs.get(thread.environmentId)?.environment.capabilities.threadSnooze === true &&
@@ -4426,7 +4424,7 @@ export default function Sidebar() {
44264424
const current = threadByKeyRef.current.get(
44274425
scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
44284426
);
4429-
return current && current.settledOverride !== "settled" ? [current] : [];
4427+
return current && !isFiledAsSettled(current) ? [current] : [];
44304428
})
44314429
: selectedThreads;
44324430
if (clicked.value === "settle" && actionTargets.length === 0) return;

0 commit comments

Comments
 (0)