Skip to content

Commit e6b99cd

Browse files
committed
fix(providers): report steers OpenCode and Pi dropped as not delivered
OpenCode reports steers it cancels during a turn and stranded steers T3 takes back before the next turn. Pi reports a steer it rejected; Stop does not clear Pi's steer queue, so that is its only drop.
1 parent 4943e9e commit e6b99cd

4 files changed

Lines changed: 90 additions & 5 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3463,7 +3463,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
34633463
}).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
34643464
);
34653465

3466-
it.effect("takes back a stranded steer again when its first cancel failed", () =>
3466+
it.effect("retakes a stranded steer after a failed cancel, then reports it dropped", () =>
34673467
Effect.gen(function* () {
34683468
const steerId = `msg_t3_steer_${SESSION}:message:opencode2-adapter:steer`;
34693469
const cancelOut = out("session.inbox.cancel", { sessionID: SESSION, inboxID: steerId });
@@ -3505,13 +3505,17 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
35053505
event("session.execution.succeeded", { sessionID: SESSION }),
35063506
]);
35073507
const seen: Array<string> = [];
3508+
const discarded: Array<string> = [];
35083509
const ended = yield* Deferred.make<void>();
35093510
const nextEnded = yield* Deferred.make<void>();
35103511
// One consumer reads every terminal; a second reader would race it for the queue.
35113512
const thirdEnded = yield* Deferred.make<void>();
35123513
yield* runtime.events.pipe(
35133514
Stream.tap((event) =>
35143515
Effect.gen(function* () {
3516+
if (event.type === "steer.discarded") {
3517+
discarded.push(`${event.threadId} ${event.messageId} after ${seen.length}`);
3518+
}
35153519
if (event.type !== "turn.terminal") return;
35163520
seen.push(event.status);
35173521
if (seen.length === 1) yield* Deferred.succeed(ended, undefined);
@@ -3549,6 +3553,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
35493553
attemptId: RunAttemptId.make("attempt:opencode2-adapter:3"),
35503554
});
35513555
yield* Deferred.await(thirdEnded);
3556+
assert.deepEqual(discarded, [`${threadId} message:opencode2-adapter:steer after 2`]);
35523557
}).pipe(Effect.scoped),
35533558
);
35543559

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
type OrchestrationV2Subagent,
3131
type OrchestrationV2TurnItem,
3232
type OrchestrationV2UserInputQuestion,
33-
type MessageId,
33+
MessageId,
3434
type ModelSelection,
3535
type ProviderApprovalDecision,
3636
type ProviderInstanceId,
@@ -590,6 +590,10 @@ const turnPromptId = (sessionId: string, attemptId: string) =>
590590
SessionMessage.ID.make(`msg_t3_turn_${sessionId}:${attemptId}`);
591591
const steerPromptId = (sessionId: string, messageId: string) =>
592592
SessionMessage.ID.make(`msg_t3_steer_${sessionId}:${messageId}`);
593+
const steerMessageId = (sessionId: string, inboxID: string) => {
594+
const prefix = `msg_t3_steer_${sessionId}:`;
595+
return inboxID.startsWith(prefix) ? MessageId.make(inboxID.slice(prefix.length)) : undefined;
596+
};
593597

594598
const promptOf = (turn: OrchestrationV2ProviderTurn) => {
595599
const nativeId = turn.nativeTurnRef?.nativeId;
@@ -758,6 +762,13 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
758762
const emit = (event: ProviderAdapter.ProviderAdapterV2Event) =>
759763
Queue.offer(events, event).pipe(Effect.asVoid);
760764
const ownerOf = (sessionId: string) => childOwners.get(sessionId) ?? threads.get(sessionId);
765+
const reportDiscardedSteer = (state: ThreadState, inboxID: string) => {
766+
const threadId = state.providerThread.appThreadId;
767+
const messageId = steerMessageId(state.sessionId, inboxID);
768+
return threadId === null || messageId === undefined
769+
? Effect.void
770+
: emit({ type: "steer.discarded", driver, threadId, messageId });
771+
};
761772
const markUnsettled = (state: ThreadState) => {
762773
state.unsettled = true;
763774
state.unsettledStarted = busy.has(state.sessionId);
@@ -2466,7 +2477,10 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
24662477
const turn = state.active;
24672478
if (turn !== undefined && turn.steers.delete(event.data.inboxID)) {
24682479
turn.settledInbox.add(event.data.inboxID);
2469-
if (event.type === "session.inbox.cancelled") yield* endIfSettled(state, turn);
2480+
if (event.type === "session.inbox.cancelled") {
2481+
yield* reportDiscardedSteer(state, event.data.inboxID);
2482+
yield* endIfSettled(state, turn);
2483+
}
24702484
}
24712485
return;
24722486
}
@@ -2929,7 +2943,9 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
29292943
Effect.exit,
29302944
Effect.map(Exit.isSuccess),
29312945
);
2932-
if (cancelled) state.strandedSteers.delete(inboxID);
2946+
if (!cancelled) continue;
2947+
state.strandedSteers.delete(inboxID);
2948+
yield* reportDiscardedSteer(state, inboxID);
29332949
}
29342950
});
29352951

@@ -3227,7 +3243,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
32273243
wake.dropped = true;
32283244
for (const childId of wake.children) retire(childId);
32293245
}
3230-
for (let grew = retired.size > 0; grew;) {
3246+
for (let grew = retired.size > 0; grew; ) {
32313247
grew = false;
32323248
for (const [childId, info] of announced) {
32333249
if (info.parentID === undefined || !retired.has(info.parentID)) continue;

‎packages/provider-pi/src/server/adapter.test.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3967,6 +3967,56 @@ describe("PiAdapterV2", () => {
39673967
}).pipe(Effect.scoped, Effect.provide(layerTest)),
39683968
);
39693969

3970+
it.effect("reports a steer Pi rejected as dropped", () =>
3971+
Effect.gen(function* () {
3972+
const fake = yield* makeFakePi;
3973+
const { runtime, takeEvent } = yield* openRuntime(fake);
3974+
const providerThread = yield* runtime.ensureThread({
3975+
threadId: THREAD_ID,
3976+
modelSelection: modelSelection("default"),
3977+
runtimePolicy,
3978+
});
3979+
yield* startTurn(runtime, providerThread);
3980+
yield* fake.takeRequest("prompt");
3981+
const running = yield* takeEvent(
3982+
(event) =>
3983+
event.type === "provider_turn.updated" && event.providerTurn.status === "running",
3984+
);
3985+
const providerTurnId =
3986+
running.type === "provider_turn.updated" ? running.providerTurn.id : undefined;
3987+
assert.isDefined(providerTurnId);
3988+
yield* fake.emit({ type: "agent_start" });
3989+
yield* fake.emit({ type: "response", command: "prompt", success: true });
3990+
yield* runtime.steerTurn({
3991+
threadId: THREAD_ID,
3992+
runId: RunId.make("run:thread-pi-test:1"),
3993+
providerThread,
3994+
providerTurnId: providerTurnId!,
3995+
message: {
3996+
messageId: "message:thread-pi-test:rejected-steer" as never,
3997+
text: "Also check the logs",
3998+
attachments: [],
3999+
createdBy: "user",
4000+
creationSource: "web",
4001+
},
4002+
});
4003+
yield* fake.takeRequest("prompt");
4004+
yield* fake.emit({
4005+
type: "response",
4006+
command: "prompt",
4007+
success: false,
4008+
error: "steer refused",
4009+
});
4010+
const discarded = yield* takeEvent((event) => event.type === "steer.discarded");
4011+
assert.deepEqual(
4012+
discarded.type === "steer.discarded"
4013+
? [discarded.threadId, discarded.messageId]
4014+
: undefined,
4015+
[THREAD_ID, "message:thread-pi-test:rejected-steer"],
4016+
);
4017+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
4018+
);
4019+
39704020
it.effect("ignores an idle snapshot made stale by a steer", () =>
39714021
Effect.gen(function* () {
39724022
const fake = yield* makeFakePi;

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
defaultInstanceIdForDriver,
88
ProviderDriverKind,
99
type ChatAttachment,
10+
type MessageId,
1011
type ModelSelection,
1112
type OrchestrationV2ExecutionNode,
1213
type OrchestrationV2ProviderCapabilities,
@@ -22,6 +23,7 @@ import {
2223
type ProviderApprovalDecision,
2324
type ProviderInstanceId,
2425
type OrchestrationV2ProviderTurnTokenUsage,
26+
type ThreadId,
2527
} from "@t3tools/contracts";
2628
import { PiSettings } from "../settings.ts";
2729
import * as Cause from "effect/Cause";
@@ -580,6 +582,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
580582
const pendingPromptResponses: Array<{
581583
readonly providerTurnId: OrchestrationV2ProviderTurn["id"];
582584
readonly kind: "turn_start" | "steer";
585+
readonly steer?: { readonly threadId: ThreadId; readonly messageId: MessageId };
583586
}> = [];
584587
const pendingCompactResponses: Array<{
585588
readonly providerTurnId: OrchestrationV2ProviderTurn["id"];
@@ -2012,6 +2015,13 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
20122015
yield* Effect.logWarning("Pi rejected a steer message.", {
20132016
errorLength: recordString(event, "error")?.length,
20142017
});
2018+
if (pendingPrompt?.steer !== undefined) {
2019+
yield* emit({
2020+
type: "steer.discarded",
2021+
driver: PI_PROVIDER,
2022+
...pendingPrompt.steer,
2023+
});
2024+
}
20152025
return;
20162026
}
20172027
const failedTurn =
@@ -2657,6 +2667,10 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
26572667
pendingPromptResponses.push({
26582668
providerTurnId: turn.providerTurn.id,
26592669
kind: "steer",
2670+
steer: {
2671+
threadId: steerInput.threadId,
2672+
messageId: steerInput.message.messageId,
2673+
},
26602674
});
26612675
}
26622676
turn.settleProbeGeneration += 1;

0 commit comments

Comments
 (0)