diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts index 05dc1cf30df..b5b0bc607d7 100644 --- a/packages/core/src/session/projector.ts +++ b/packages/core/src/session/projector.ts @@ -197,7 +197,7 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* ( .insert(SessionMessageTable) .values( rows.map((row) => ({ - id: SessionMessage.ID.create(), + id: SessionMessage.ID.make(`${SessionMessage.ID.fromEvent(event.id)}_${row.seq}`), session_id: event.data.sessionID, type: row.type, seq: row.seq, diff --git a/packages/core/test/session-create.test.ts b/packages/core/test/session-create.test.ts index 432d3df1277..b8a346361ac 100644 --- a/packages/core/test/session-create.test.ts +++ b/packages/core/test/session-create.test.ts @@ -402,6 +402,41 @@ describe("Session.create", () => { }), ) + it.effect("replays a fork with stable projected identities", () => + Effect.gen(function* () { + const session = yield* Session.Service + const bus = yield* Bus.Service + const { db } = yield* Database.Service + const parent = yield* session.create({ location, title: "Parent" }) + yield* session.prompt({ sessionID: parent.id, text: "First", resume: false }) + yield* SessionInbox.promote(db, bus, parent.id, "steer") + yield* session.synthetic({ sessionID: parent.id, text: "Second", resume: false }) + yield* SessionInbox.promote(db, bus, parent.id, "steer") + const forked = yield* session.fork({ sessionID: parent.id, boundary: { type: "through" } }) + const original = (yield* session.context(forked.id)).map((message) => message.id) + const recorded = yield* db + .select() + .from(EventTable) + .where(eq(EventTable.aggregate_id, forked.id)) + .get() + .pipe(Effect.orDie) + if (!recorded) return yield* Effect.die(new Error("Fork event not found")) + + yield* bus.remove(forked.id) + yield* db.delete(SessionTable).where(eq(SessionTable.id, forked.id)).run().pipe(Effect.orDie) + yield* bus.replay({ + id: recorded.id, + created: recorded.created, + aggregateID: recorded.aggregate_id, + seq: recorded.seq, + type: recorded.type, + data: recorded.data, + }) + + expect((yield* session.context(forked.id)).map((message) => message.id)).toEqual(original) + }), + ) + it.effect("does not copy a running assistant into a fork", () => Effect.gen(function* () { const session = yield* Session.Service