Skip to content

Commit 6f0b13f

Browse files
committed
Complete upstream sync adaptations and validate Claude authentication
1 parent 67d4209 commit 6f0b13f

106 files changed

Lines changed: 6846 additions & 503 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/server/src/checkpointing/CheckpointDiffQuery.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ describe("CheckpointDiffQuery.layer", () => {
7777
Layer.succeed(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
7878
getCommandReadModel: () =>
7979
Effect.die("CheckpointDiffQuery should not request the command read model"),
80+
getUserInputActivity: () => Effect.die("unused"),
8081
getSnapshot: () =>
8182
Effect.die("CheckpointDiffQuery should not request the full orchestration snapshot"),
8283
getShellSnapshot: () =>
@@ -186,6 +187,7 @@ describe("CheckpointDiffQuery.layer", () => {
186187
Layer.succeed(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
187188
getCommandReadModel: () =>
188189
Effect.die("CheckpointDiffQuery should not request the command read model"),
190+
getUserInputActivity: () => Effect.die("unused"),
189191
getSnapshot: () =>
190192
Effect.die("CheckpointDiffQuery should not request the full orchestration snapshot"),
191193
getShellSnapshot: () =>
@@ -270,6 +272,7 @@ describe("CheckpointDiffQuery.layer", () => {
270272
Layer.succeed(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
271273
getCommandReadModel: () =>
272274
Effect.die("CheckpointDiffQuery should not request the command read model"),
275+
getUserInputActivity: () => Effect.die("unused"),
273276
getSnapshot: () =>
274277
Effect.die("CheckpointDiffQuery should not request the full orchestration snapshot"),
275278
getShellSnapshot: () =>
@@ -339,6 +342,7 @@ describe("CheckpointDiffQuery.layer", () => {
339342
Layer.succeed(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
340343
getCommandReadModel: () =>
341344
Effect.die("CheckpointDiffQuery should not request the command read model"),
345+
getUserInputActivity: () => Effect.die("unused"),
342346
getSnapshot: () =>
343347
Effect.die("CheckpointDiffQuery should not request the full orchestration snapshot"),
344348
getShellSnapshot: () =>
@@ -393,6 +397,7 @@ describe("CheckpointDiffQuery.layer", () => {
393397
Layer.succeed(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
394398
getCommandReadModel: () =>
395399
Effect.die("CheckpointDiffQuery should not request the command read model"),
400+
getUserInputActivity: () => Effect.die("unused"),
396401
getSnapshot: () =>
397402
Effect.die("CheckpointDiffQuery should not request the full orchestration snapshot"),
398403
getShellSnapshot: () =>

‎apps/server/src/git/GitWorkflowService.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,9 @@ export const layer = Layer.effect(
194194
const STATUS_CACHE_TTL = Duration.seconds(1);
195195
const STATUS_CACHE_CAPACITY = 2_048;
196196
const FETCH_CACHE_TTL = Duration.seconds(1);
197-
const PR_CACHE_TTL = Duration.minutes(2);
197+
// Match the automatic settlement sweep cadence so an external merge is
198+
// observed on the next sweep instead of waiting on an older cache entry.
199+
const PR_CACHE_TTL = Duration.seconds(60);
198200
const FAILURE_BASE_TTL = Duration.seconds(20);
199201
const FAILURE_MAX_TTL = Duration.minutes(15);
200202
const failureTtl = (failures: number) =>

‎apps/server/src/orchestration/Layers/CheckpointReactor.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ function createProviderServiceHarness(
108108
const service: ProviderServiceShape = {
109109
startSession: () => unsupported(),
110110
sendTurn: () => unsupported(),
111+
compactThread: () => unsupported(),
111112
interruptTurn: () => unsupported(),
112113
respondToRequest: () => unsupported(),
113114
respondToUserInput: () => unsupported(),

‎apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ describe("OrchestrationEngine", () => {
173173
Layer.provide(
174174
Layer.succeed(ProjectionSnapshotQuery, {
175175
getCommandReadModel: () => Effect.succeed(commandReadModel),
176+
getUserInputActivity: () => Effect.die("unused"),
176177
getSnapshot: () =>
177178
Effect.sync(() => {
178179
fullSnapshotReadCount += 1;

‎apps/server/src/orchestration/Layers/OrchestrationEngine.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,19 @@ const makeOrchestrationEngine = Effect.gen(function* () {
180180
});
181181
}
182182

183+
// Command snapshots intentionally omit activity bodies. Read this
184+
// request's durable state before deciding whether an async answer is
185+
// a provider response or a new user turn.
186+
const userInputActivity =
187+
envelope.command.type === "thread.user-input.respond"
188+
? yield* projectionSnapshotQuery.getUserInputActivity(envelope.command)
189+
: Option.none();
183190
const eventBase = yield* decideOrchestrationCommand({
184191
command: envelope.command,
185192
readModel: commandReadModel,
193+
...(Option.isSome(userInputActivity)
194+
? { userInputActivity: userInputActivity.value }
195+
: {}),
186196
}).pipe(
187197
Effect.provideService(Crypto.Crypto, crypto),
188198
Effect.mapError((cause) =>

‎apps/server/src/orchestration/Layers/ProjectionPipeline.ts‎

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -435,26 +435,13 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
435435
return;
436436
}
437437

438-
const [messages, proposedPlans, activities, pendingApprovals] = yield* Effect.all([
439-
projectionThreadMessageRepository.listByThreadId({ threadId }),
440-
projectionThreadProposedPlanRepository.listByThreadId({ threadId }),
441-
projectionThreadActivityRepository.listByThreadId({ threadId }),
442-
projectionPendingApprovalRepository.listByThreadId({ threadId }),
443-
]);
444-
445-
let latestUserMessageAt: string | null = null;
446-
for (const message of messages) {
447-
if (
448-
message.role === "user" &&
449-
(latestUserMessageAt === null || message.createdAt > latestUserMessageAt)
450-
) {
451-
latestUserMessageAt = message.createdAt;
452-
}
453-
}
454-
455-
const pendingApprovalCount = pendingApprovals.filter(
456-
(approval) => approval.status === "pending",
457-
).length;
438+
const [latestUserMessageAt, proposedPlans, activities, pendingApprovalCount] =
439+
yield* Effect.all([
440+
projectionThreadMessageRepository.getLatestUserMessageAt({ threadId }),
441+
projectionThreadProposedPlanRepository.listByThreadId({ threadId }),
442+
projectionThreadActivityRepository.listByThreadId({ threadId }),
443+
projectionPendingApprovalRepository.countPendingByThreadId({ threadId }),
444+
]);
458445
const pendingUserInputCount = derivePendingUserInputCountFromActivities(activities);
459446
const hasActionableProposedPlan = deriveHasActionableProposedPlan({
460447
latestTurnId: existingRow.value.latestTurnId,
@@ -1059,6 +1046,21 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
10591046
return;
10601047

10611048
case "thread.turn-start-requested": {
1049+
const pendingTurnStart = yield* projectionTurnRepository.getPendingTurnStartByThreadId({
1050+
threadId: event.payload.threadId,
1051+
});
1052+
if (Option.isSome(pendingTurnStart)) {
1053+
const pendingMessage = yield* projectionThreadMessageRepository.getByMessageId({
1054+
messageId: pendingTurnStart.value.messageId,
1055+
});
1056+
if (
1057+
Option.isSome(pendingMessage) &&
1058+
pendingMessage.value.role === "user" &&
1059+
pendingMessage.value.text.trim().toLowerCase() === "/compact"
1060+
) {
1061+
return;
1062+
}
1063+
}
10621064
yield* projectionTurnRepository.replacePendingTurnStart({
10631065
threadId: event.payload.threadId,
10641066
messageId: event.payload.messageId,
@@ -1069,10 +1071,33 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
10691071
return;
10701072
}
10711073

1074+
case "thread.activity-appended": {
1075+
if (
1076+
event.payload.activity.kind !== "context-compaction" &&
1077+
event.payload.activity.kind !== "provider.turn.start.failed"
1078+
) {
1079+
return;
1080+
}
1081+
const pendingTurnStart = yield* projectionTurnRepository.getPendingTurnStartByThreadId(
1082+
event.payload,
1083+
);
1084+
if (
1085+
Option.isNone(pendingTurnStart) ||
1086+
String(pendingTurnStart.value.messageId) !==
1087+
extractActivityRequestId(event.payload.activity.payload)
1088+
) {
1089+
return;
1090+
}
1091+
yield* projectionTurnRepository.deletePendingTurnStartByThreadId(event.payload);
1092+
return;
1093+
}
1094+
10721095
case "thread.session-set": {
10731096
const turnId = event.payload.session.activeTurnId;
10741097
if (turnId === null || event.payload.session.status !== "running") {
10751098
if (
1099+
(event.payload.session.status === "ready" &&
1100+
event.commandId?.startsWith("server:provider-session-set:") === true) ||
10761101
event.payload.session.status === "error" ||
10771102
event.payload.session.status === "stopped" ||
10781103
event.payload.session.status === "interrupted"

‎apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
ApprovalRequestId,
23
CheckpointRef,
34
IsoDateTime,
45
MessageId,
@@ -98,6 +99,21 @@ const ProjectionThreadActivityDbRowSchema = ProjectionThreadActivity.mapFields(
9899
sequence: Schema.NullOr(NonNegativeInt),
99100
}),
100101
);
102+
103+
function mapThreadActivityRow(
104+
row: Schema.Schema.Type<typeof ProjectionThreadActivityDbRowSchema>,
105+
): OrchestrationThreadActivity {
106+
return {
107+
id: row.activityId,
108+
tone: row.tone,
109+
kind: row.kind,
110+
summary: row.summary,
111+
payload: row.payload,
112+
turnId: row.turnId,
113+
createdAt: row.createdAt,
114+
...(row.sequence !== null ? { sequence: row.sequence } : {}),
115+
};
116+
}
101117
const ProjectionThreadSessionDbRowSchema = ProjectionThreadSession;
102118
const ProjectionCheckpointDbRowSchema = ProjectionCheckpoint.mapFields(
103119
Struct.assign({
@@ -1123,6 +1139,40 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
11231139
`,
11241140
});
11251141

1142+
const getUserInputActivityRow = SqlSchema.findOneOption({
1143+
Request: Schema.Struct({ threadId: ThreadId, requestId: ApprovalRequestId }),
1144+
Result: ProjectionThreadActivityDbRowSchema,
1145+
execute: ({ threadId, requestId }) => sql`
1146+
SELECT
1147+
activity_id AS "activityId",
1148+
thread_id AS "threadId",
1149+
turn_id AS "turnId",
1150+
tone,
1151+
kind,
1152+
summary,
1153+
payload_json AS "payload",
1154+
sequence,
1155+
created_at AS "createdAt"
1156+
FROM projection_thread_activities
1157+
WHERE thread_id = ${threadId}
1158+
AND kind IN ('user-input.requested', 'user-input.resolved')
1159+
AND json_extract(payload_json, '$.requestId') = ${requestId}
1160+
ORDER BY sequence DESC, created_at DESC, activity_id DESC
1161+
LIMIT 1
1162+
`,
1163+
});
1164+
1165+
const getUserInputActivity: ProjectionSnapshotQueryShape["getUserInputActivity"] = (input) =>
1166+
getUserInputActivityRow(input).pipe(
1167+
Effect.map(Option.map(mapThreadActivityRow)),
1168+
Effect.mapError(
1169+
toPersistenceSqlOrDecodeError(
1170+
"ProjectionSnapshotQuery.getUserInputActivity:query",
1171+
"ProjectionSnapshotQuery.getUserInputActivity:decodeRow",
1172+
),
1173+
),
1174+
);
1175+
11261176
// Resolves a page of recent turns for a windowed thread detail read. Walks
11271177
// back from the exclusive (beforeAnchorAt, beforeTurnKey) keyset boundary
11281178
// (sentinels "~"/"" mean unbounded, i.e. the first page) until it has seen
@@ -2843,6 +2893,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
28432893

28442894
return {
28452895
getCommandReadModel,
2896+
getUserInputActivity,
28462897
getSnapshot,
28472898
getShellSnapshot,
28482899
getArchivedShellSnapshot,

‎apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ describe("ProviderCommandReactor", () => {
159159
readonly titleRegenerationBeforeStart?: "one" | "two";
160160
readonly interruptTurnEffect?: () => Effect.Effect<void, ProviderAdapterRequestError>;
161161
readonly stopSessionEffect?: () => Effect.Effect<void, ProviderAdapterRequestError>;
162+
readonly compactThreadEffect?: () => Effect.Effect<void, ProviderAdapterRequestError>;
162163
readonly startSessionEffect?: (
163164
session: ProviderSession,
164165
) => Effect.Effect<ProviderSession, ProviderAdapterRequestError>;
@@ -244,6 +245,9 @@ describe("ProviderCommandReactor", () => {
244245
turnId: asTurnId("turn-1"),
245246
}),
246247
);
248+
const compactThread = vi.fn<ProviderServiceShape["compactThread"]>(
249+
() => input?.compactThreadEffect?.() ?? Effect.void,
250+
);
247251
const interruptTurn = vi.fn((_: unknown) => input?.interruptTurnEffect?.() ?? Effect.void);
248252
const respondToRequest = vi.fn<ProviderServiceShape["respondToRequest"]>(() => Effect.void);
249253
const respondToUserInput = vi.fn<ProviderServiceShape["respondToUserInput"]>(() => Effect.void);
@@ -330,6 +334,7 @@ describe("ProviderCommandReactor", () => {
330334
const service: ProviderServiceShape = {
331335
startSession: startSession as ProviderServiceShape["startSession"],
332336
sendTurn: sendTurn as ProviderServiceShape["sendTurn"],
337+
compactThread,
333338
interruptTurn: interruptTurn as ProviderServiceShape["interruptTurn"],
334339
respondToRequest: respondToRequest as ProviderServiceShape["respondToRequest"],
335340
respondToUserInput: respondToUserInput as ProviderServiceShape["respondToUserInput"],
@@ -560,6 +565,7 @@ describe("ProviderCommandReactor", () => {
560565
readModel: () => Effect.runPromise(snapshotQuery.getSnapshot()),
561566
startSession,
562567
sendTurn,
568+
compactThread,
563569
interruptTurn,
564570
respondToRequest,
565571
respondToUserInput,
@@ -665,6 +671,73 @@ describe("ProviderCommandReactor", () => {
665671
expect(thread?.session?.runtimeMode).toBe("approval-required");
666672
});
667673

674+
it("routes /compact through provider compaction without starting a normal turn", async () => {
675+
const harness = await createHarness();
676+
const threadId = ThreadId.make("thread-1");
677+
const now = "2026-01-01T00:00:00.000Z";
678+
679+
await harness.runEffect(
680+
harness.engine.dispatch({
681+
type: "thread.turn.start",
682+
commandId: CommandId.make("cmd-before-compact"),
683+
threadId,
684+
message: {
685+
messageId: asMessageId("message-before-compact"),
686+
role: "user",
687+
text: "Build the feature",
688+
},
689+
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
690+
runtimeMode: "approval-required",
691+
createdAt: now,
692+
}),
693+
);
694+
await waitFor(() => harness.sendTurn.mock.calls.length === 1);
695+
await harness.runEffect(
696+
harness.engine.dispatch({
697+
type: "thread.session.set",
698+
commandId: CommandId.make("cmd-ready-before-compact"),
699+
threadId,
700+
session: {
701+
threadId,
702+
status: "ready",
703+
providerName: "codex",
704+
providerInstanceId: ProviderInstanceId.make("codex"),
705+
runtimeMode: "approval-required",
706+
activeTurnId: null,
707+
lastError: null,
708+
updatedAt: "2026-01-01T00:00:01.000Z",
709+
},
710+
createdAt: "2026-01-01T00:00:01.000Z",
711+
}),
712+
);
713+
714+
await harness.runEffect(
715+
harness.engine.dispatch({
716+
type: "thread.turn.start",
717+
commandId: CommandId.make("cmd-compact"),
718+
threadId,
719+
message: {
720+
messageId: asMessageId("message-compact"),
721+
role: "user",
722+
text: "/compact",
723+
},
724+
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
725+
runtimeMode: "approval-required",
726+
createdAt: "2026-01-01T00:00:02.000Z",
727+
}),
728+
);
729+
730+
await waitFor(() => harness.compactThread.mock.calls.length === 1);
731+
await harness.drain();
732+
expect(harness.compactThread).toHaveBeenCalledWith(
733+
threadId,
734+
undefined,
735+
asMessageId("message-compact"),
736+
);
737+
expect(harness.sendTurn).toHaveBeenCalledTimes(1);
738+
await waitFor(async () => (await harness.readModel()).threads[0]?.session?.status === "ready");
739+
});
740+
668741
effectIt.effect("projects starting before a slow provider session finishes", () =>
669742
Effect.gen(function* () {
670743
const releaseStart = yield* Deferred.make<void>();

0 commit comments

Comments
 (0)