Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import {
type OrchestrationEngineShape,
} from "../src/orchestration/Services/OrchestrationEngine.ts";
import { ThreadDeletionReactor } from "../src/orchestration/Services/ThreadDeletionReactor.ts";
import { QueuedTurnDrainReactor } from "../src/orchestration/Services/QueuedTurnDrainReactor.ts";
import { OrchestrationReactor } from "../src/orchestration/Services/OrchestrationReactor.ts";
import { ProjectionSnapshotQuery } from "../src/orchestration/Services/ProjectionSnapshotQuery.ts";
import {
Expand Down Expand Up @@ -358,6 +359,12 @@ export const makeOrchestrationIntegrationHarness = (
Layer.provideMerge(runtimeIngestionLayer),
Layer.provideMerge(providerCommandReactorLayer),
Layer.provideMerge(checkpointReactorLayer),
Layer.provideMerge(
Layer.succeed(QueuedTurnDrainReactor, {
start: () => Effect.void,
drain: Effect.void,
}),
),
Layer.provideMerge(
Layer.succeed(ThreadDeletionReactor, {
start: () => Effect.void,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ describe("OrchestrationEngine", () => {
archivedAt: null,
deletedAt: null,
messages: [],
queuedTurns: [],
proposedPlans: [],
activities: [],
checkpoints: [],
Expand All @@ -160,6 +161,7 @@ describe("OrchestrationEngine", () => {
threads: projectionSnapshot.threads.map((thread) => ({
...thread,
messages: [],
queuedTurns: [],
proposedPlans: [],
activities: [],
checkpoints: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { CheckpointReactor } from "../Services/CheckpointReactor.ts";
import { ProviderCommandReactor } from "../Services/ProviderCommandReactor.ts";
import { ProviderRuntimeIngestionService } from "../Services/ProviderRuntimeIngestion.ts";
import { ThreadDeletionReactor } from "../Services/ThreadDeletionReactor.ts";
import { QueuedTurnDrainReactor } from "../Services/QueuedTurnDrainReactor.ts";
import { OrchestrationReactor } from "../Services/OrchestrationReactor.ts";
import { makeOrchestrationReactor } from "./OrchestrationReactor.ts";

Expand All @@ -22,7 +23,7 @@ describe("OrchestrationReactor", () => {
runtime = null;
});

it("starts provider ingestion, provider command, checkpoint, and thread deletion reactors", async () => {
it("starts provider ingestion, provider command, queue drain, checkpoint, and thread deletion reactors", async () => {
const started: string[] = [];

runtime = ManagedRuntime.make(
Expand All @@ -45,6 +46,15 @@ describe("OrchestrationReactor", () => {
drain: Effect.void,
}),
),
Layer.provideMerge(
Layer.succeed(QueuedTurnDrainReactor, {
start: () => {
started.push("queued-turn-drain-reactor");
return Effect.void;
},
drain: Effect.void,
}),
),
Layer.provideMerge(
Layer.succeed(CheckpointReactor, {
start: () => {
Expand Down Expand Up @@ -73,6 +83,7 @@ describe("OrchestrationReactor", () => {
expect(started).toEqual([
"provider-runtime-ingestion",
"provider-command-reactor",
"queued-turn-drain-reactor",
"checkpoint-reactor",
"thread-deletion-reactor",
]);
Expand Down
3 changes: 3 additions & 0 deletions apps/server/src/orchestration/Layers/OrchestrationReactor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,20 @@ import {
import { CheckpointReactor } from "../Services/CheckpointReactor.ts";
import { ProviderCommandReactor } from "../Services/ProviderCommandReactor.ts";
import { ProviderRuntimeIngestionService } from "../Services/ProviderRuntimeIngestion.ts";
import { QueuedTurnDrainReactor } from "../Services/QueuedTurnDrainReactor.ts";
import { ThreadDeletionReactor } from "../Services/ThreadDeletionReactor.ts";

export const makeOrchestrationReactor = Effect.gen(function* () {
const providerRuntimeIngestion = yield* ProviderRuntimeIngestionService;
const providerCommandReactor = yield* ProviderCommandReactor;
const checkpointReactor = yield* CheckpointReactor;
const queuedTurnDrainReactor = yield* QueuedTurnDrainReactor;
const threadDeletionReactor = yield* ThreadDeletionReactor;

const start: OrchestrationReactorShape["start"] = Effect.fn("start")(function* () {
yield* providerRuntimeIngestion.start();
yield* providerCommandReactor.start();
yield* queuedTurnDrainReactor.start();
yield* checkpointReactor.start();
yield* threadDeletionReactor.start();
});
Expand Down
75 changes: 75 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionPipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import {
type OrchestrationEvent,
ThreadId,
} from "@t3tools/contracts";
import {
getQueuedTurnLifecycleOperation,
type QueuedTurnLifecycleOperation,
} from "@t3tools/shared/orchestrationQueue";
import * as Effect from "effect/Effect";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
Expand All @@ -16,6 +20,7 @@ import { toPersistenceSqlError, type ProjectionRepositoryError } from "../../per
import { OrchestrationEventStore } from "../../persistence/Services/OrchestrationEventStore.ts";
import { ProjectionPendingApprovalRepository } from "../../persistence/Services/ProjectionPendingApprovals.ts";
import { ProjectionProjectRepository } from "../../persistence/Services/ProjectionProjects.ts";
import { ProjectionQueuedTurnRepository } from "../../persistence/Services/ProjectionQueuedTurns.ts";
import { ProjectionStateRepository } from "../../persistence/Services/ProjectionState.ts";
import { ProjectionThreadActivityRepository } from "../../persistence/Services/ProjectionThreadActivities.ts";
import { type ProjectionThreadActivity } from "../../persistence/Services/ProjectionThreadActivities.ts";
Expand All @@ -35,6 +40,7 @@ import {
import { ProjectionThreadRepository } from "../../persistence/Services/ProjectionThreads.ts";
import { ProjectionPendingApprovalRepositoryLive } from "../../persistence/Layers/ProjectionPendingApprovals.ts";
import { ProjectionProjectRepositoryLive } from "../../persistence/Layers/ProjectionProjects.ts";
import { ProjectionQueuedTurnRepositoryLive } from "../../persistence/Layers/ProjectionQueuedTurns.ts";
import { ProjectionStateRepositoryLive } from "../../persistence/Layers/ProjectionState.ts";
import { ProjectionThreadActivityRepositoryLive } from "../../persistence/Layers/ProjectionThreadActivities.ts";
import { ProjectionThreadMessageRepositoryLive } from "../../persistence/Layers/ProjectionThreadMessages.ts";
Expand Down Expand Up @@ -62,6 +68,7 @@ export const ORCHESTRATION_PROJECTOR_NAMES = {
threadActivities: "projection.thread-activities",
threadSessions: "projection.thread-sessions",
threadTurns: "projection.thread-turns",
queuedTurns: "projection.queued-turns",
checkpoints: "projection.checkpoints",
pendingApprovals: "projection.pending-approvals",
} as const;
Expand Down Expand Up @@ -456,6 +463,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const projectionThreadSessionRepository = yield* ProjectionThreadSessionRepository;
const projectionTurnRepository = yield* ProjectionTurnRepository;
const projectionPendingApprovalRepository = yield* ProjectionPendingApprovalRepository;
const projectionQueuedTurnRepository = yield* ProjectionQueuedTurnRepository;

const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
Expand Down Expand Up @@ -980,6 +988,67 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
});
});

const updateQueuedTurnStatus = Effect.fn("updateQueuedTurnStatus")(function* (
operation: Extract<QueuedTurnLifecycleOperation, { kind: "update" }>,
) {
const existing = yield* projectionQueuedTurnRepository.getByQueueItemId({
queueItemId: operation.queueItemId,
});
if (Option.isNone(existing)) {
return;
}
yield* projectionQueuedTurnRepository.upsert({
...existing.value,
...operation.patch,
});
});

const applyQueuedTurnsProjection: ProjectorDefinition["apply"] = Effect.fn(
"applyQueuedTurnsProjection",
)(function* (event, _attachmentSideEffects) {
switch (event.type) {
case "thread.turn-queued":
case "thread.queued-turn-send-started":
case "thread.queued-turn-resolved":
case "thread.queued-turn-requeued":
case "thread.queued-turn-send-failed": {
const operation = getQueuedTurnLifecycleOperation(event);
switch (operation.kind) {
case "upsert":
yield* projectionQueuedTurnRepository.upsert({
queueItemId: operation.queuedTurn.queueItemId,
threadId: operation.threadId,
request: operation.queuedTurn.request,
status: operation.queuedTurn.status,
failureReason: operation.queuedTurn.failureReason,
createdAt: operation.queuedTurn.createdAt,
updatedAt: operation.queuedTurn.updatedAt,
});
return;

case "update":
yield* updateQueuedTurnStatus(operation);
return;

case "delete":
yield* projectionQueuedTurnRepository.deleteByQueueItemId({
queueItemId: operation.queueItemId,
});
return;
}
}

case "thread.deleted":
yield* projectionQueuedTurnRepository.deleteByThreadId({
threadId: event.payload.threadId,
});
return;

default:
return;
}
});

const applyThreadTurnsProjection: ProjectorDefinition["apply"] = Effect.fn(
"applyThreadTurnsProjection",
)(function* (event, _attachmentSideEffects) {
Expand All @@ -988,6 +1057,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
yield* projectionTurnRepository.replacePendingTurnStart({
threadId: event.payload.threadId,
messageId: event.payload.messageId,
queueItemId: event.payload.queueItemId ?? null,
sourceProposedPlanThreadId: event.payload.sourceProposedPlan?.threadId ?? null,
sourceProposedPlanId: event.payload.sourceProposedPlan?.planId ?? null,
requestedAt: event.payload.createdAt,
Expand Down Expand Up @@ -1387,6 +1457,10 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
name: ORCHESTRATION_PROJECTOR_NAMES.threadTurns,
apply: applyThreadTurnsProjection,
},
{
name: ORCHESTRATION_PROJECTOR_NAMES.queuedTurns,
apply: applyQueuedTurnsProjection,
},
{
name: ORCHESTRATION_PROJECTOR_NAMES.checkpoints,
apply: applyCheckpointsProjection,
Expand Down Expand Up @@ -1500,6 +1574,7 @@ export const OrchestrationProjectionPipelineLive = Layer.effect(
Layer.provideMerge(ProjectionThreadActivityRepositoryLive),
Layer.provideMerge(ProjectionThreadSessionRepositoryLive),
Layer.provideMerge(ProjectionTurnRepositoryLive),
Layer.provideMerge(ProjectionQueuedTurnRepositoryLive),
Layer.provideMerge(ProjectionPendingApprovalRepositoryLive),
Layer.provideMerge(ProjectionStateRepositoryLive),
);
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
updatedAt: "2026-02-24T00:00:05.000Z",
},
],
queuedTurns: [],
proposedPlans: [
{
id: "plan-1",
Expand Down
Loading
Loading