Skip to content

Commit 5ac202a

Browse files
AlexChambersclaude
andcommitted
fix(server): resolve merge with main and satisfy new lint rules
Drop duplicate imports left by the auto-merge, remove issue numbers from comments, and drive the abandoned-question test's abort through Effect.abortSignal instead of a hand-built AbortController. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 0cec5ad commit 5ac202a

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,10 +1470,11 @@ describe("ClaudeAdapterV2 abandoned questions", () => {
14701470
);
14711471
const canUseTool = openedOptions?.canUseTool;
14721472
assert.isFunction(canUseTool);
1473-
const controller = new AbortController();
1473+
const abortScope = yield* Scope.make();
1474+
const signal = yield* Effect.abortSignal.pipe(Scope.provide(abortScope));
14741475
const requestUpdates = yield* runtime.events.pipe(
14751476
Stream.filter((event) => event.type === "runtime_request.updated"),
1476-
Stream.tap(() => Effect.sync(() => controller.abort())),
1477+
Stream.tap(() => Scope.close(abortScope, Exit.void)),
14771478
Stream.take(2),
14781479
Stream.runCollect,
14791480
Effect.forkScoped,
@@ -1495,7 +1496,7 @@ describe("ClaudeAdapterV2 abandoned questions", () => {
14951496
],
14961497
},
14971498
{
1498-
signal: controller.signal,
1499+
signal,
14991500
toolUseID: "tool-abandoned-question",
15001501
requestId: "request-abandoned-question",
15011502
},

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6914,7 +6914,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
69146914

69156915
// A steer offered with priority "now" aborts a pending permission
69166916
// callback, and Claude asks again as a new request. Left pending, the
6917-
// old card takes answers Claude no longer waits for (#15517).
6917+
// old card takes answers Claude no longer waits for.
69186918
const cancelAbandonedRequest = Effect.fnUntraced(function* (artifacts: {
69196919
readonly node: OrchestrationV2ExecutionNode;
69206920
readonly request: OrchestrationV2RuntimeRequest;

‎apps/server/src/orchestration-v2/ThreadManagementService.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ import {
1111
type OrchestrationV2StoredEvent,
1212
type OrchestrationV2ThreadProjection,
1313
ProjectId,
14-
ProviderDriverKind,
1514
ProviderInstanceId,
16-
ProviderSessionId,
1715
ProviderTurnId,
1816
RunId,
1917
RuntimeRequestId,
2018
ThreadId,
2119
} from "@t3tools/contracts";
22-
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
2320
import * as Deferred from "effect/Deferred";
2421
import * as DateTime from "effect/DateTime";
2522
import * as Option from "effect/Option";

‎apps/server/src/orchestration-v2/ThreadManagementService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ function latestSteerableRun(
527527
}
528528

529529
// Steering into a turn blocked on the user's answer can abort the question,
530-
// and the provider asks it again with the user's typed answers gone (#15517).
530+
// and the provider asks it again with the user's typed answers gone.
531531
function runAwaitsUser(
532532
projection: Pick<OrchestrationV2ThreadProjection, "providerTurns" | "runtimeRequests">,
533533
run: OrchestrationV2Run,

0 commit comments

Comments
 (0)