Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(server): settle pending user-input requests when a Claude session stops (#5127)

Aaron Abu Usama3b54a2a574b0
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
index cc4e16eeb..1f971a612 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
@@ -4448,6 +4448,67 @@ describe("ClaudeAdapterLive", () => {
);
});
+ it.effect("stopping a session settles pending user-input waits", () => {
+ const harness = makeHarness();
+ return Effect.gen(function* () {
+ const adapter = yield* ClaudeAdapter;
+
+ yield* adapter.startSession({
+ threadId: THREAD_ID,
+ provider: ProviderDriverKind.make("claudeAgent"),
+ runtimeMode: "approval-required",
+ });
+
+ yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+ const canUseTool = harness.getLastCreateQueryInput()?.options.canUseTool;
+ assert.equal(typeof canUseTool, "function");
+ if (!canUseTool) {
+ return;
+ }
+
+ const permissionPromise = canUseTool(
+ "AskUserQuestion",
+ {
+ questions: [
+ {
+ question: "Continue?",
+ header: "Continue",
+ options: [{ label: "Yes", description: "Proceed" }],
+ multiSelect: false,
+ },
+ ],
+ },
+ { signal: new AbortController().signal, toolUseID: "tool-ask-stop" },
+ );
+
+ const requestedEvent = yield* Stream.runHead(adapter.streamEvents);
+ if (requestedEvent._tag !== "Some" || requestedEvent.value.type !== "user-input.requested") {
+ assert.fail("Expected user-input.requested event");
+ return;
+ }
+
+ // The session dies while the question is still on screen.
+ yield* adapter.stopSession(THREAD_ID);
+
+ const resolvedEvent = yield* Stream.runHead(adapter.streamEvents);
+ if (resolvedEvent._tag !== "Some" || resolvedEvent.value.type !== "user-input.resolved") {
+ assert.fail("Expected user-input.resolved event");
+ return;
+ }
+ assert.deepEqual(resolvedEvent.value.payload.answers, {});
+
+ const permissionResult = yield* Effect.promise(() => permissionPromise);
+ assert.deepEqual(permissionResult, {
+ behavior: "deny",
+ message: "User cancelled tool execution.",
+ } satisfies PermissionResult);
+ }).pipe(
+ Effect.provideService(Random.Random, makeDeterministicRandomService()),
+ Effect.provide(harness.layer),
+ );
+ });
+
it.effect("writes provider-native observability records when enabled", () => {
const nativeEvents: Array<{
event?: {
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.ts
index b8d5f71f0..5715b68a1 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.ts
@@ -194,6 +194,8 @@ function toSessionPermissionUpdates(
interface PendingUserInput {
readonly questions: ReadonlyArray<UserInputQuestion>;
readonly answers: Deferred.Deferred<ProviderUserInputAnswers>;
+ /** Unparks the waiting handler as cancelled. Session teardown must run it. */
+ readonly cancel: Effect.Effect<void>;
}
interface ToolInFlight {
@@ -3656,6 +3658,12 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
}
context.pendingApprovals.clear();
+ // Same reason as the approvals above: a request nobody can answer any more
+ // must not stay open, or the thread can never be settled.
+ for (const pending of [...context.pendingUserInputs.values()]) {
+ yield* pending.cancel;
+ }
+
if (context.turnState) {
yield* completeTurn(context, "interrupted", "Session stopped.");
}
@@ -3837,9 +3845,20 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
const answersDeferred = yield* Deferred.make<ProviderUserInputAnswers>();
let aborted = false;
+ const settleAsAborted = Effect.suspend(() => {
+ if (!pendingUserInputs.has(requestId)) {
+ return Effect.void;
+ }
+ aborted = true;
+ pendingUserInputs.delete(requestId);
+ return Deferred.succeed(answersDeferred, {} as ProviderUserInputAnswers).pipe(
+ Effect.ignore,
+ );
+ });
const pendingInput: PendingUserInput = {
questions,
answers: answersDeferred,
+ cancel: settleAsAborted,
};
// Emit user-input.requested so the UI can present the questions.
@@ -3874,12 +3893,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
// Handle abort (e.g. turn interrupted while waiting for user input).
const onAbort = () => {
- if (!pendingUserInputs.has(requestId)) {
- return;
- }
- aborted = true;
- pendingUserInputs.delete(requestId);
- runFork(Deferred.succeed(answersDeferred, {} as ProviderUserInputAnswers));
+ runFork(settleAsAborted);
};
callbackOptions.signal.addEventListener("abort", onAbort, {
once: true,