Skip to content

Commit f5056c4

Browse files
committed
fix(cursor): fail live Tasks when the last sendTurn prompt errors
A transport or session/prompt failure after task.started left background Tasks running. Drain events and finish those Tasks as failed when this is the last in-flight prompt.
1 parent 3e71a7d commit f5056c4

3 files changed

Lines changed: 82 additions & 1 deletion

File tree

‎apps/server/scripts/acp-mock-agent.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,9 @@ const program = Effect.gen(function* () {
650650
},
651651
},
652652
});
653+
if (failPrompt) {
654+
return yield* AcpError.AcpRequestError.internalError("Mock prompt failure");
655+
}
653656
if (!hangPromptForever) {
654657
const completeAfterMs =
655658
Number.isFinite(promptDelayMs) && promptDelayMs > 0 ? promptDelayMs + 200 : 80;

‎apps/server/src/provider/Layers/CursorAdapter.test.ts‎

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,73 @@ cursorAdapterTestLayer("CursorAdapterLive", (it) => {
16941694
}).pipe(TestClock.withLive),
16951695
);
16961696

1697+
it.effect("fails live tasks when the last prompt errors after task.started", () =>
1698+
Effect.gen(function* () {
1699+
const adapter = yield* CursorAdapter;
1700+
const serverSettings = yield* ServerSettingsService;
1701+
const threadId = ThreadId.make("cursor-task-prompt-fail");
1702+
const runtimeEvents: Array<ProviderRuntimeEvent> = [];
1703+
const taskStarted = yield* Deferred.make<void>();
1704+
const taskCompleted = yield* Deferred.make<void>();
1705+
1706+
const wrapperPath = yield* Effect.promise(() =>
1707+
makeMockAgentWrapper({
1708+
T3_ACP_EMIT_TASK_SUBAGENT: "1",
1709+
T3_ACP_FAIL_PROMPT: "1",
1710+
}),
1711+
);
1712+
yield* serverSettings.updateSettings({ providers: { cursor: { binaryPath: wrapperPath } } });
1713+
1714+
yield* Stream.runForEach(adapter.streamEvents, (event) =>
1715+
Effect.gen(function* () {
1716+
if (String(event.threadId) !== String(threadId)) {
1717+
return;
1718+
}
1719+
runtimeEvents.push(event);
1720+
if (event.type === "task.started") {
1721+
yield* Deferred.succeed(taskStarted, undefined).pipe(Effect.ignore);
1722+
}
1723+
if (event.type === "task.completed") {
1724+
yield* Deferred.succeed(taskCompleted, undefined).pipe(Effect.ignore);
1725+
}
1726+
}),
1727+
).pipe(Effect.forkChild);
1728+
1729+
yield* adapter.startSession({
1730+
threadId,
1731+
provider: ProviderDriverKind.make("cursor"),
1732+
cwd: process.cwd(),
1733+
runtimeMode: "full-access",
1734+
modelSelection: { instanceId: ProviderInstanceId.make("cursor"), model: "default" },
1735+
});
1736+
1737+
const error = yield* adapter
1738+
.sendTurn({
1739+
threadId,
1740+
input: "spawn a reviewer",
1741+
attachments: [],
1742+
})
1743+
.pipe(Effect.flip);
1744+
assert.equal(error._tag, "ProviderAdapterRequestError");
1745+
yield* Deferred.await(taskStarted).pipe(Effect.timeout("10 seconds"));
1746+
yield* Deferred.await(taskCompleted).pipe(Effect.timeout("10 seconds"));
1747+
1748+
const taskEvents = runtimeEvents.filter(
1749+
(event) => event.type === "task.started" || event.type === "task.completed",
1750+
);
1751+
assert.equal(taskEvents.filter((event) => event.type === "task.completed").length, 1);
1752+
const failed = taskEvents.find((event) => event.type === "task.completed");
1753+
if (failed?.type === "task.completed") {
1754+
assert.equal(failed.payload.status, "failed");
1755+
assert.equal(failed.payload.title, "Ship reviewer-subagent");
1756+
assert.equal(failed.payload.role, "reviewer-subagent");
1757+
}
1758+
assert.isFalse(runtimeEvents.some((event) => event.type === "turn.completed"));
1759+
1760+
yield* adapter.stopSession(threadId);
1761+
}).pipe(TestClock.withLive),
1762+
);
1763+
16971764
it.effect("keeps live tasks running when a superseded prompt is cancelled", () =>
16981765
Effect.gen(function* () {
16991766
const adapter = yield* CursorAdapter;
@@ -1763,7 +1830,10 @@ cursorAdapterTestLayer("CursorAdapterLive", (it) => {
17631830
assert.equal(completed[0].payload.role, "reviewer-subagent");
17641831
}
17651832
const types = turnEvents.map((event) => event.type);
1766-
assert.isFalse(turnEvents.some((event) => event.type === "item.updated"), types.join(","));
1833+
assert.isFalse(
1834+
turnEvents.some((event) => event.type === "item.updated"),
1835+
types.join(","),
1836+
);
17671837
const settledAt = types.lastIndexOf("turn.completed");
17681838
const completedAt = types.lastIndexOf("task.completed");
17691839
assert.isBelow(completedAt, settledAt);

‎apps/server/src/provider/Layers/CursorAdapter.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,6 +1274,14 @@ export function makeCursorAdapter(
12741274
resumeCursor: ctx.session.resumeCursor,
12751275
};
12761276
}).pipe(
1277+
Effect.tapError(() =>
1278+
Effect.gen(function* () {
1279+
yield* Effect.ignore(ctx.acp.drainEvents);
1280+
if (ctx.promptsInFlight === 1) {
1281+
yield* finishLiveTasks(ctx, "failed");
1282+
}
1283+
}),
1284+
),
12771285
Effect.ensuring(
12781286
Effect.sync(() => {
12791287
ctx.promptsInFlight = Math.max(0, ctx.promptsInFlight - 1);

0 commit comments

Comments
 (0)