Skip to content

feat(server): add exact-session conditional dispatch #11972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lioryasur wants to merge 4 commits into from
Closed

feat(server): add exact-session conditional dispatch #11972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
133941c
feat(server): add exact-session conditional dispatch
lioryasur Sep 15, 2026
f078151
fix(server): close conditional admission and cancellation races
lioryasur Sep 15, 2026
4ab11d9
fix(server): retain runtime fence identity and allow idle Claude admi…
lioryasur Sep 15, 2026
a5fdcc9
fix(server): retain session identity during ordinary turn preparation
lioryasur Sep 15, 2026
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/integration/OrchestrationEngineHarness.integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ export const makeOrchestrationIntegrationHarness = (
Layer.provideMerge(runtimeServicesLayer),
Layer.provideMerge(orchestrationReactorLayer),
Layer.provideMerge(providerRegistryLayer),
Layer.provideMerge(OrchestrationCommandReceiptRepositoryLive),
Layer.provide(persistenceLayer),
Layer.provideMerge(RepositoryIdentityResolver.layer),
Layer.provideMerge(ServerSettingsService.layerTest()),
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/orchestration/Layers/ProjectionPipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
yield* projectionThreadSessionRepository.upsert({
threadId: event.payload.threadId,
status: event.payload.session.status,
providerSessionId: event.payload.session.providerSessionId ?? null,
providerName: event.payload.session.providerName,
providerInstanceId: event.payload.session.providerInstanceId ?? null,
runtimeMode: event.payload.session.runtimeMode,
Expand Down
2 changes: 2 additions & 0 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
threadId: ThreadId.make("thread-1"),
status: "running",
providerName: "codex",
providerSessionId: "provider-session-1",
runtimeMode: "approval-required",
activeTurnId: asTurnId("turn-1"),
lastError: null,
Expand Down Expand Up @@ -617,6 +618,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
threadId: ThreadId.make("thread-1"),
status: "running",
providerName: "codex",
providerSessionId: "provider-session-1",
runtimeMode: "approval-required",
activeTurnId: asTurnId("turn-1"),
lastError: null,
Expand Down
16 changes: 4 additions & 12 deletions apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ function mapSessionRow(
return {
threadId: row.threadId,
status: row.status,
...(row.providerSessionId != null ? { providerSessionId: row.providerSessionId } : {}),
providerName: row.providerName,
...(row.providerInstanceId !== null ? { providerInstanceId: row.providerInstanceId } : {}),
runtimeMode: row.runtimeMode,
Expand Down Expand Up @@ -1253,6 +1254,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
threads.title,
threads.title_state_json AS "titleState",
sessions.thread_id AS "threadId",
sessions.provider_session_id AS "providerSessionId",
sessions.status,
sessions.provider_name AS "providerName",
sessions.provider_instance_id AS "providerInstanceId",
Expand Down Expand Up @@ -1571,6 +1573,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
sql`
SELECT
thread_id AS "threadId",
provider_session_id AS "providerSessionId",
status,
provider_name AS "providerName",
provider_instance_id AS "providerInstanceId",
Expand Down Expand Up @@ -2240,18 +2243,7 @@ pending_approval_requests AS (

for (const row of sessionRows) {
updatedAt = maxIso(updatedAt, row.updatedAt);
sessionsByThread.set(row.threadId, {
threadId: row.threadId,
status: row.status,
providerName: row.providerName,
...(row.providerInstanceId !== null
? { providerInstanceId: row.providerInstanceId }
: {}),
runtimeMode: row.runtimeMode,
activeTurnId: row.activeTurnId,
lastError: row.lastError,
updatedAt: row.updatedAt,
});
sessionsByThread.set(row.threadId, mapSessionRow(row));
}

const repositoryIdentities = yield* resolveRepositoryIdentitiesForProjects(
Expand Down
Loading
Loading