Skip to content

fix(server): skip native sessions during bulk import #15634

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

Merged
juliusmarminge merged 7 commits into from
Oct 19, 2026
Merged

fix(server): skip native sessions during bulk import #15634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c0e1c9
fix(server): skip native sessions during bulk import
maria-rcks Oct 4, 2026
2744869
fix(server): treat owned session imports as benign no-ops
maria-rcks Oct 4, 2026
e9a6018
merge origin/main
maria-rcks Oct 9, 2026
916812f
Merge remote-tracking branch 'origin/main' into fix/round2-wide-10933
juliusmarminge Oct 19, 2026
74bc1b8
test(server): cover native session import ownership and retries
juliusmarminge Oct 19, 2026
0babaa4
fix(server): restore native session import compilation
juliusmarminge Oct 19, 2026
f385bf0
test(server): model native owner IDs in importer coverage
juliusmarminge Oct 19, 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
23 changes: 23 additions & 0 deletions apps/server/src/orchestration-v2/EventSink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,20 @@ export type EventSinkV2Error = typeof EventSinkV2Error.Type;

export interface EventSinkV2Shape {
readonly write: (input: {
/** Return no events if another thread owns this native session at commit time. */
readonly unlessNativeThreadOwned?: Pick<
OrchestrationV2ProviderThread,
"driver" | "providerInstanceId" | "appThreadId" | "nativeThreadRef"
>;
readonly guardPendingUserInputCancellations?: boolean;
readonly commandId?: CommandId;
readonly events: ReadonlyArray<OrchestrationV2DomainEvent>;
}) => Effect.Effect<ReadonlyArray<OrchestrationV2StoredEvent>, EventSinkV2Error>;
readonly writeWithEffects: (input: {
readonly unlessNativeThreadOwned?: Pick<
OrchestrationV2ProviderThread,
"driver" | "providerInstanceId" | "appThreadId" | "nativeThreadRef"
>;
readonly guardPendingUserInputCancellations?: boolean;
readonly commandId?: CommandId;
readonly events: ReadonlyArray<OrchestrationV2DomainEvent>;
Expand Down Expand Up @@ -369,6 +378,20 @@ const layerBase: Layer.Layer<

return yield* commitThenPublish(
Effect.gen(function* () {
// Check ownership in the same transaction that claims the native session.
const imported = input.unlessNativeThreadOwned;
if (imported?.nativeThreadRef != null) {
const owners = yield* sql`
SELECT provider_thread_id
FROM orchestration_v2_projection_provider_threads
WHERE driver = ${imported.driver}
AND provider_instance_id = ${imported.providerInstanceId}
AND thread_id IS NOT ${imported.appThreadId}
AND json_extract(payload_json, '$.nativeThreadRef.nativeId') = ${imported.nativeThreadRef.nativeId}
LIMIT 1
`;
if (owners.length > 0) return [];
}
const normalized = yield* normalizeEvents(
input.guardPendingUserInputCancellations === true
? yield* guardUserInputCancellations(input.events)
Expand Down
Loading
Loading