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
24 changes: 22 additions & 2 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17766,7 +17766,18 @@ describe("ClaudeAdapterV2 background wake turns", () => {
),
);

it.effect("settles a continuation turn immediately when no wake output is buffered", () =>
it.effect.each([
{
name: "settles a continuation turn immediately when no wake output is buffered",
nativeThreadHasTurns: true,
prompted: false,
},
{
name: "prompts with a continuation's text when it starts a new Claude session",
nativeThreadHasTurns: false,
prompted: true,
},
])("$name", ({ nativeThreadHasTurns, prompted }) =>
Effect.gen(function* () {
const harness = yield* makeWakeHarness;
const now = yield* DateTime.now;
Expand All @@ -17777,13 +17788,22 @@ describe("ClaudeAdapterV2 background wake turns", () => {
providerThread: harness.providerThread,
now,
attemptId: RunAttemptId.make("attempt-claude-wake-3"),
text: "Background task completed.",
text: "Recovered history\n\nBackground task completed.",
attachments: [],
nativeThreadHasTurns,
messageCreatedBy: "agent",
messageCreationSource: "provider",
}),
);

if (prompted) {
assert.lengthOf(harness.offeredMessages, 1);
assert.include(
JSON.stringify(harness.offeredMessages[0]?.message.content),
"Recovered history",
);
return;
}
yield* harness.awaitTerminal(1);
assert.equal(harness.terminalEvents()[0]?.status, "completed");
assert.lengthOf(harness.offeredMessages, 0);
Expand Down
46 changes: 38 additions & 8 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12838,6 +12838,21 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
live.selection = selection;
});

const shouldResumeNativeSession = Effect.fn("ClaudeAdapterV2.shouldResumeNativeSession")(
function* (
turnInput: ProviderAdapter.ProviderAdapterV2TurnInput,
nativeThreadId: string,
resumeSessionAt: string | undefined,
) {
// Idle release loses openedNativeThreads; persisted turns still require resume to avoid "already in use".
return (
resumeSessionAt !== undefined ||
(yield* Ref.get(openedNativeThreads)).has(nativeThreadId) ||
(turnInput.nativeThreadHasTurns ?? turnInput.providerTurnOrdinal > 1)
);
},
);

const openQuery = Effect.fnUntraced(function* (
turnInput: ProviderAdapter.ProviderAdapterV2TurnInput,
nativeThreadId: string,
Expand Down Expand Up @@ -12981,12 +12996,11 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
}
}

const openedWithResume = (yield* Ref.get(openedNativeThreads)).has(nativeThreadId);
// Idle release loses openedNativeThreads; persisted turns still require resume to avoid "already in use".
const hasPersistedProviderTurn =
turnInput.nativeThreadHasTurns ?? turnInput.providerTurnOrdinal > 1;
const shouldResume =
resumeSessionAt !== undefined || openedWithResume || hasPersistedProviderTurn;
const shouldResume = yield* shouldResumeNativeSession(
turnInput,
nativeThreadId,
resumeSessionAt,
);
const gitHubReadGate = Option.isSome(serverSettings)
? yield* serverSettings.value.getSettings.pipe(
Effect.map((settings) => settings.enableAgentGitHubReadGate),
Expand Down Expand Up @@ -13258,10 +13272,26 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
});

const startTurn = Effect.fn("ClaudeAdapterV2.startTurn")(
function* (turnInput: ProviderAdapter.ProviderAdapterV2TurnInput) {
function* (requestedTurn: ProviderAdapter.ProviderAdapterV2TurnInput) {
modelCatalog = yield* loadModelCatalog;
const startedAt = yield* DateTime.now;
const nativeThreadId = yield* getNativeThreadId(turnInput.providerThread);
const nativeThreadId = yield* getNativeThreadId(requestedTurn.providerThread);
const live = yield* Ref.get(queryContext);
// A new session has no wake output to drain, and Claude saves no conversation it was never prompted with.
const continuationStartsSession =
isClaudeProviderContinuationTurn(requestedTurn) &&
!(live?.nativeThreadId === nativeThreadId && !live.stopping) &&
!(yield* shouldResumeNativeSession(
requestedTurn,
nativeThreadId,
yield* getNativeConversationHeadId(requestedTurn.providerThread),
));
const turnInput = continuationStartsSession
? {
...requestedTurn,
message: { ...requestedTurn.message, creationSource: "server" as const },
}
: requestedTurn;
const nativeTurnId = `turn:${turnInput.attemptId}`;
// Use fresh uuids: native sessions can outlive this database, and Claude skips previously recorded prompts.
const promptUuid = isClaudeProviderContinuationTurn(turnInput)
Expand Down
Loading