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
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ import {
} from "../src/orchestration/Services/OrchestrationEngine.ts";
import { ThreadDeletionReactor } from "../src/orchestration/Services/ThreadDeletionReactor.ts";
import * as ThreadSettlementReactor from "../src/orchestration/ThreadSettlementReactor.ts";
import * as SessionSpendGuardReactor from "../src/orchestration/SessionSpendGuardReactor.ts";
import * as PullRequestSyncReactor from "../src/orchestration/PullRequestSyncReactor.ts";
import * as ThreadPullRequestReactor from "../src/orchestration/ThreadPullRequestReactor.ts";
import { OrchestrationReactor } from "../src/orchestration/Services/OrchestrationReactor.ts";
Expand Down Expand Up @@ -421,6 +422,12 @@ export const makeOrchestrationIntegrationHarness = (
drain: Effect.void,
}),
),
Layer.provideMerge(
Layer.succeed(SessionSpendGuardReactor.SessionSpendGuardReactor, {
start: () => Effect.void,
drain: Effect.void,
}),
),
Layer.provideMerge(
Layer.succeed(PullRequestSyncReactor.PullRequestSyncReactor, {
start: () => Effect.void,
Expand Down
11 changes: 11 additions & 0 deletions apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ProviderCommandReactor } from "../Services/ProviderCommandReactor.ts";
import { ProviderRuntimeIngestionService } from "../Services/ProviderRuntimeIngestion.ts";
import { ThreadDeletionReactor } from "../Services/ThreadDeletionReactor.ts";
import * as ThreadSettlementReactor from "../ThreadSettlementReactor.ts";
import * as SessionSpendGuardReactor from "../SessionSpendGuardReactor.ts";
import * as PullRequestSyncReactor from "../PullRequestSyncReactor.ts";
import * as ThreadPullRequestReactor from "../ThreadPullRequestReactor.ts";
import { OrchestrationReactor } from "../Services/OrchestrationReactor.ts";
Expand Down Expand Up @@ -95,6 +96,15 @@ describe("OrchestrationReactor", () => {
drain: Effect.void,
}),
),
Layer.provideMerge(
Layer.succeed(SessionSpendGuardReactor.SessionSpendGuardReactor, {
start: () => {
started.push("session-spend-guard-reactor");
return Effect.void;
},
drain: Effect.void,
}),
),
Layer.provideMerge(
Layer.succeed(PullRequestSyncReactor.PullRequestSyncReactor, {
start: () => {
Expand Down Expand Up @@ -128,6 +138,7 @@ describe("OrchestrationReactor", () => {
"thread-deletion-reactor",
"thread-pull-request-reactor",
"thread-settlement-reactor",
"session-spend-guard-reactor",
"pull-request-sync-reactor",
"agent-awareness-relay",
"storage-cleanup",
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 @@ -10,6 +10,7 @@ import { ProviderCommandReactor } from "../Services/ProviderCommandReactor.ts";
import { ProviderRuntimeIngestionService } from "../Services/ProviderRuntimeIngestion.ts";
import { ThreadDeletionReactor } from "../Services/ThreadDeletionReactor.ts";
import * as ThreadSettlementReactor from "../ThreadSettlementReactor.ts";
import * as SessionSpendGuardReactor from "../SessionSpendGuardReactor.ts";
import * as PullRequestSyncReactor from "../PullRequestSyncReactor.ts";
import * as ThreadPullRequestReactor from "../ThreadPullRequestReactor.ts";
import * as AgentAwarenessRelay from "../../relay/AgentAwarenessRelay.ts";
Expand All @@ -21,6 +22,7 @@ export const makeOrchestrationReactor = Effect.gen(function* () {
const checkpointReactor = yield* CheckpointReactor;
const threadDeletionReactor = yield* ThreadDeletionReactor;
const threadSettlementReactor = yield* ThreadSettlementReactor.ThreadSettlementReactor;
const sessionSpendGuardReactor = yield* SessionSpendGuardReactor.SessionSpendGuardReactor;
const pullRequestSyncReactor = yield* PullRequestSyncReactor.PullRequestSyncReactor;
const threadPullRequestReactor = yield* ThreadPullRequestReactor.ThreadPullRequestReactor;
const agentAwarenessRelay = yield* AgentAwarenessRelay.AgentAwarenessRelay;
Expand All @@ -33,6 +35,7 @@ export const makeOrchestrationReactor = Effect.gen(function* () {
yield* threadDeletionReactor.start();
yield* threadPullRequestReactor.start();
yield* threadSettlementReactor.start();
yield* sessionSpendGuardReactor.start();
yield* pullRequestSyncReactor.start();
yield* agentAwarenessRelay.start();
yield* storageCleanup.start();
Expand Down
29 changes: 28 additions & 1 deletion apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1469,6 +1469,31 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
`,
});

const listThreadActivityRowsByThreadAndKindsUnbounded = SqlSchema.findAll({
Request: ThreadActivityKindsLookupInput,
Result: ProjectionThreadActivityDbRowSchema,
execute: ({ threadId, activityKinds }) =>
sql`
SELECT
activity_id AS "activityId",
thread_id AS "threadId",
turn_id AS "turnId",
tone,
kind,
summary,
payload_json AS "payload",
sequence,
created_at AS "createdAt"
FROM projection_thread_activities
WHERE thread_id = ${threadId}
AND ${sql.in("kind", activityKinds)}
ORDER BY
sequence ASC,
created_at ASC,
activity_id ASC
`,
});

const getUserInputActivityRow = SqlSchema.findOneOption({
Request: Schema.Struct({ threadId: ThreadId, requestId: ApprovalRequestId }),
Result: ProjectionThreadActivityDbRowSchema,
Expand Down Expand Up @@ -3442,7 +3467,9 @@ pending_approval_requests AS (
: listThreadActivityRowsByThreadWindow({ threadId, ...bounds })
: activityRead.query.activityKinds.length === 0
? Effect.succeed([])
: listThreadActivityRowsByThreadAndKinds({
: (activityRead.query.unboundedActivities === true
? listThreadActivityRowsByThreadAndKindsUnbounded
: listThreadActivityRowsByThreadAndKinds)({
threadId,
activityKinds: activityRead.query.activityKinds,
})
Expand Down
Loading