Skip to content

Commit 92d4233

Browse files
chore(lint): enforce abortControllerInEffect
1 parent 7d287a4 commit 92d4233

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,12 +1008,9 @@ describe("ClaudeAdapterV2 approval cancellation", () => {
10081008
decision: ProviderApprovalDecision;
10091009
feedback?: string;
10101010
}>();
1011-
const controller = new AbortController();
1012-
controller.abort();
1013-
10141011
const result = yield* ClaudeAdapterV2.awaitClaudeApprovalDecision(
10151012
decision,
1016-
controller.signal,
1013+
AbortSignal.abort(),
10171014
);
10181015

10191016
assert.deepEqual(result, { decision: "cancel" });
@@ -1364,14 +1361,14 @@ describe("ClaudeAdapterV2 resume compaction", () => {
13641361
Stream.runHead,
13651362
Effect.forkScoped,
13661363
);
1367-
const controller = new AbortController();
1364+
const signal = yield* Effect.abortSignal;
13681365
const dialog = yield* Effect.promise(() =>
13691366
callback!(
13701367
{
13711368
dialogKind: "resume_return",
13721369
payload: { sessionAgeMinutes: 90, estimatedTokens: 120000 },
13731370
},
1374-
{ signal: controller.signal, requestId: "dialog-resume-1" },
1371+
{ signal, requestId: "dialog-resume-1" },
13751372
),
13761373
).pipe(Effect.forkScoped);
13771374
const event = yield* Fiber.join(requestEvent);
@@ -1387,16 +1384,14 @@ describe("ClaudeAdapterV2 resume compaction", () => {
13871384
});
13881385
assert.deepEqual(yield* Fiber.join(dialog), { behavior: "completed", result: "compact" });
13891386

1390-
const cancelledController = new AbortController();
1391-
cancelledController.abort();
13921387
assert.deepEqual(
13931388
yield* Effect.promise(() =>
13941389
callback!(
13951390
{
13961391
dialogKind: "resume_return",
13971392
payload: { sessionAgeMinutes: 90, estimatedTokens: 120000 },
13981393
},
1399-
{ signal: cancelledController.signal, requestId: "dialog-resume-2" },
1394+
{ signal: AbortSignal.abort(), requestId: "dialog-resume-2" },
14001395
),
14011396
),
14021397
{ behavior: "cancelled" },

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ describe.skipIf(HostProcess.Platform.defaultValue() === "win32")("Claude CLI pro
196196
args: [],
197197
cwd: dir,
198198
env: process.env,
199+
// @effect-diagnostics-next-line abortControllerInEffect:off - This crash fixture closes pipes itself; aborting on test teardown raises an unrelated process error.
199200
signal: new AbortController().signal,
200201
}) as NodeChildProcess.ChildProcess;
201202
yield* Effect.addFinalizer(() =>

‎apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ it.effect.each(deliveries)(
139139
const sdkMessages = yield* Queue.unbounded<SDKMessage>();
140140
const offers: SDKUserMessage[] = [];
141141
const nativeQueue: SDKUserMessage[] = [];
142+
// @effect-diagnostics-next-line abortControllerInEffect:off - The fake SDK interrupts its batch independently of the test fiber.
142143
const batchAbort = new AbortController();
143144
const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
144145
instanceId: modelSelection.instanceId,

‎packages/provider-opencode/src/server/adapter.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -983,6 +983,7 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
983983
if (settledNativeRequestIds.size >= 2_048) settledNativeRequestIds.clear();
984984
settledNativeRequestIds.add(nativeRequestId);
985985
};
986+
// @effect-diagnostics-next-line abortControllerInEffect:off - Session closure aborts this stream independently of the creation fiber.
986987
const abortController = new AbortController();
987988
let closing = false;
988989
let hasConnected = false;
@@ -3159,6 +3160,7 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
31593160
admissionMessageObserved: false,
31603161
idleDuringAdmission: false,
31613162
admissionSettled: Deferred.makeUnsafe<void>(),
3163+
// @effect-diagnostics-next-line abortControllerInEffect:off - Turn interruption owns prompt admission cancellation.
31623164
admissionAbortController: new AbortController(),
31633165
};
31643166
if (turn.admissionMessageId !== null)
@@ -3325,6 +3327,7 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
33253327
turn.admissionMessageObserved = false;
33263328
turn.idleDuringAdmission = false;
33273329
turn.admissionSettled = Deferred.makeUnsafe<void>();
3330+
// @effect-diagnostics-next-line abortControllerInEffect:off - Steering replaces the admission request independently of this command fiber.
33283331
turn.admissionAbortController = new AbortController();
33293332
if (turn.admissionMessageId !== null)
33303333
turn.usage.promptMessageIds.add(turn.admissionMessageId);

‎tsconfig.base.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"namespaceImportPackages": ["@effect/platform-node", "effect"],
2525
"effectFn": ["span", "inferred-span", "suggested-span"],
2626
"diagnosticSeverity": {
27+
"abortControllerInEffect": "error",
2728
"runEffectInsideEffect": "error",
2829
"flatMapConditionalToFilterOrFail": "error",
2930
"catchConditionalRefailToCatchIf": "error",

0 commit comments

Comments
 (0)