Skip to content

fix(server): upstream's ProviderTurnStartService tests no longer need the fork's InlineShellStore #75

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tannerpolley merged 1 commit into from
Oct 21, 2026
Merged

fix(server): upstream's ProviderTurnStartService tests no longer need the fork's InlineShellStore #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 36 additions & 35 deletions apps/server/src/orchestration-v2/ProviderTurnStartService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ export class ProviderTurnStartServiceV2 extends Context.Service<
export const layer: Layer.Layer<
ProviderTurnStartServiceV2,
never,
| InlineShellStore
| EventSink.EventSinkV2
| ContextHandoffService.ContextHandoffServiceV2
| IdAllocator.IdAllocatorV2
Expand All @@ -118,7 +117,7 @@ export const layer: Layer.Layer<
> = Layer.effect(
ProviderTurnStartServiceV2,
Effect.gen(function* () {
const inlineShell = yield* InlineShellStore;
const inlineShell = yield* Effect.serviceOption(InlineShellStore);
const eventSink = yield* EventSink.EventSinkV2;
const contextHandoffService = yield* ContextHandoffService.ContextHandoffServiceV2;
const idAllocator = yield* IdAllocator.IdAllocatorV2;
Expand Down Expand Up @@ -1097,39 +1096,41 @@ export const layer: Layer.Layer<
!coveredItemIds.has(item.id) &&
historicalMessage(item) !== null,
);
const inlineSession = {
...session,
startTurn: (turnInput: Parameters<typeof session.startTurn>[0]) =>
inlineShell
.deliver(
{
threadId: projection.thread.id,
deliveryId: `start:${attempt.id}:${message.id}`,
runId: run.id,
attemptId: attempt.id,
providerTurnId: null,
messageId: message.id,
text: turnInput.message.text,
compact: message.text.trim().toLowerCase() === "/compact",
turnStart: true,
},
(text) =>
session.startTurn({ ...turnInput, message: { ...turnInput.message, text } }),
)
.pipe(
Effect.mapError((cause) =>
cause._tag === "ProviderAdapterTurnStartError"
? cause
: new ProviderAdapter.ProviderAdapterTurnStartError({
driver: session.driver,
threadId: projection.thread.id,
providerThreadId: providerThread.id,
runId: run.id,
cause,
}),
),
),
};
const inlineSession = Option.isNone(inlineShell)
? session
: {
...session,
startTurn: (turnInput: Parameters<typeof session.startTurn>[0]) =>
inlineShell.value
.deliver(
{
threadId: projection.thread.id,
deliveryId: `start:${attempt.id}:${message.id}`,
runId: run.id,
attemptId: attempt.id,
providerTurnId: null,
messageId: message.id,
text: turnInput.message.text,
compact: message.text.trim().toLowerCase() === "/compact",
turnStart: true,
},
(text) =>
session.startTurn({ ...turnInput, message: { ...turnInput.message, text } }),
)
.pipe(
Effect.mapError((cause) =>
cause._tag === "ProviderAdapterTurnStartError"
? cause
: new ProviderAdapter.ProviderAdapterTurnStartError({
driver: session.driver,
threadId: projection.thread.id,
providerThreadId: providerThread.id,
runId: run.id,
cause,
}),
),
),
};
const startWithHandoffs = Effect.fn("ProviderTurnStartService.startWithHandoffs")(
function* (turnInput: Parameters<typeof session.startTurn>[0], compact = false) {
const retryHandoff =
Expand Down