Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/server/src/kin/lead/KinStop.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ describe("KinStop", () => {
}>`SELECT json, priority FROM kin_events WHERE org_id = ${orgId} AND tag = 'resume' ORDER BY event_id`;
assert.lengthOf(resumes, 1);
assert.strictEqual(resumes[0]!.priority, "P0");
assert.match(JSON.parse(resumes[0]!.json).eventId, /^resume-[a-f0-9]{32}$/);
assert.isTrue(paused.paused);
assert.include(JSON.parse(resumes[0]!.json), {
_tag: "resume",
Expand Down
6 changes: 4 additions & 2 deletions apps/server/src/kin/lead/KinStop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import * as Chat from "../chat/KinChatRepository.ts";
import { KinPresence, syncQueued } from "../reply/KinPresence.ts";
import type * as Routines from "../triggers/routines.ts";
import * as Queue from "./KinEventQueue.ts";
import { hashedEventId } from "./eventIds.ts";
import { isOrgOwner, isOrgPaused, STOP_REASON } from "./orgState.ts";
import * as WorkerEnvironment from "./workerEnvironment.ts";

Expand Down Expand Up @@ -317,15 +318,16 @@ const make = Effect.gen(function* () {
a.receivedAt - b.receivedAt ||
(a.eventId < b.eventId ? -1 : a.eventId > b.eventId ? 1 : 0),
);
const eventId = `resume:${cleared.pausedAt}:${lead.agentId}`;
const dedupeKey = `resume:${cleared.pausedAt}:${lead.agentId}`;
const eventId = hashedEventId("resume", dedupeKey);
yield* queue.enqueue(
yield* decodeEvent({
_tag: "resume",
orgId: input.orgId,
agentId: lead.agentId,
eventId,
receivedAt: iso(now),
dedupeKey: eventId,
dedupeKey,
provenance: { _tag: "system" },
pausedAt: iso(cleared.pausedAt),
expired: {
Expand Down
6 changes: 3 additions & 3 deletions apps/server/src/kin/lead/WorkerTracker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
KinAgentId,
KinAuthor,
KinChatId,
KinEventId,
KinOrgId,
type KinPersonId,
KinTaskCardState,
Expand All @@ -18,6 +17,7 @@ import {
ThreadId,
type WorkerReport,
} from "@t3tools/contracts";
import { hashedEventId } from "./eventIds.ts";
import { formatThreadLink } from "@t3tools/shared/threadLinks";
import * as Clock from "effect/Clock";
import * as Context from "effect/Context";
Expand Down Expand Up @@ -257,15 +257,15 @@ const make = Effect.gen(function* () {
endedAt: number,
report: WorkerReport,
) {
const eventId = KinEventId.make(key);
const eventId = hashedEventId(key.slice(0, key.indexOf(":")), key);
yield* queue
.enqueue({
_tag: "worker.report",
orgId: worker.orgId,
eventId,
agentId: worker.agentId,
receivedAt: DateTime.makeUnsafe(endedAt),
dedupeKey: eventId,
dedupeKey: key,
provenance: yield* author(worker),
workerId: worker.workerId,
report,
Expand Down
10 changes: 8 additions & 2 deletions apps/server/src/kin/lead/Workers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,13 @@ it.effect(
assert.lengthOf(events, 2);
const byWorker = new Map(events.map((item) => [item.event.workerId, item]));
assert.strictEqual(byWorker.get(done.workerId)!.priority, "P1");
assert.strictEqual(byWorker.get(done.workerId)!.event.eventId, `worker-report:${doneRun}`);
assert.strictEqual(
byWorker.get(done.workerId)!.event.dedupeKey,
`worker-report:${doneRun}`,
);
// The memory writer refuses any other character in the wake-up's event ids.
for (const item of events)
assert.match(item.event.eventId, /^worker-(report|abandoned)-[a-f0-9]{32}$/);
assert.deepStrictEqual(byWorker.get(done.workerId)!.event.report, published(report));
const synthesized = byWorker.get(cancelled.workerId)!.event.report;
assert.deepInclude(synthesized, {
Expand Down Expand Up @@ -1295,7 +1301,7 @@ it.effect(
const last = yield* remote.finish(threadId, "completed", reportReply);
yield* settled(tracker, ctx.orgId, worker.workerId);
assert.deepStrictEqual(
(yield* reports(ctx.sql, ctx.orgId)).map((item) => item.event.eventId),
(yield* reports(ctx.sql, ctx.orgId)).map((item) => item.event.dedupeKey),
[`worker-report:${last}`],
);
}),
Expand Down
9 changes: 9 additions & 0 deletions apps/server/src/kin/lead/eventIds.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// @effect-diagnostics-next-line nodeBuiltinImport:off -- a pure, synchronous id hash; Digest would add a service.
import * as NodeCrypto from "node:crypto";
import { KinEventId } from "@t3tools/contracts";

/** The memory writer accepts only `[a-zA-Z0-9_-]` in event ids, so a readable key is hashed. */
export const hashedEventId = (prefix: string, key: string) =>
KinEventId.make(
`${prefix}-${NodeCrypto.createHash("sha256").update(key).digest("hex").slice(0, 32)}`,
);