Skip to content

Commit b4ca413

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-33638
2 parents e0bc83b + 871b009 commit b4ca413

9 files changed

Lines changed: 232 additions & 9 deletions

File tree

‎apps/mobile/src/features/threads/ThreadFeed.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,10 @@ function renderFeedEntry(
19141914
const bubbleBodyVisible = foldRowId === null || foldExpanded;
19151915
const intentBadge = props.userMessageGrouping.continuesSteer
19161916
? null
1917-
: resolveUserMessageIntentBadge(message.inputIntent);
1917+
: resolveUserMessageIntentBadge(
1918+
message.inputIntent,
1919+
message.projectedItem?.item.status === "pending",
1920+
);
19181921
const referenceIds = new Set(
19191922
collectComposerContextReferences(message.text).map((reference) => reference.contextId),
19201923
);

‎apps/mobile/src/features/threads/userMessageIntentBadge.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ export interface UserMessageIntentBadgePresentation {
77

88
export function resolveUserMessageIntentBadge(
99
intent: OrchestrationV2UserMessageInputIntent | undefined,
10+
unread = false,
1011
): UserMessageIntentBadgePresentation | null {
12+
if (unread && (intent === "steer" || intent === "promoted_queued_to_steer")) {
13+
return {
14+
label: "Steer · waiting to be read",
15+
accessibilityLabel:
16+
"Steer waiting for the agent to read it after the running command finishes",
17+
};
18+
}
1119
switch (intent) {
1220
case "steer":
1321
return {

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,6 +1642,73 @@ layer("ProviderEventIngestorV2", (it) => {
16421642
}),
16431643
);
16441644

1645+
it.effect("keeps a steered message pending until the provider reports it read", () =>
1646+
Effect.gen(function* () {
1647+
const now = yield* DateTime.now;
1648+
const eventSink = yield* EventSink.EventSinkV2;
1649+
const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
1650+
const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2;
1651+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
1652+
const threadEvent = yield* threadCreatedEvent(now);
1653+
const providerSessionId = yield* idAllocator.allocate.providerSession({
1654+
providerInstanceId: modelSelection.instanceId,
1655+
threadId: threadEvent.threadId,
1656+
});
1657+
const runId = RunId.make("run:steer-read");
1658+
const messageId = MessageId.make("message:steer-read");
1659+
const steer: OrchestrationV2TurnItem = {
1660+
id: idAllocator.derive.userTurnItem({ messageId }),
1661+
threadId: threadEvent.threadId,
1662+
runId,
1663+
nodeId: null,
1664+
providerThreadId: null,
1665+
providerTurnId: null,
1666+
nativeItemRef: null,
1667+
parentItemId: null,
1668+
ordinal: 1,
1669+
status: "completed",
1670+
title: null,
1671+
startedAt: now,
1672+
completedAt: now,
1673+
updatedAt: now,
1674+
type: "user_message",
1675+
createdBy: "user",
1676+
creationSource: "web",
1677+
messageId,
1678+
inputIntent: "steer",
1679+
text: "Steer behind a command",
1680+
attachments: [],
1681+
};
1682+
yield* eventSink.write({ events: [threadEvent] });
1683+
const ingest = (event: ProviderAdapter.ProviderAdapterV2Event) =>
1684+
ingestor.ingestNormalized({
1685+
providerSessionId,
1686+
providerInstanceId: modelSelection.instanceId,
1687+
threadId: threadEvent.threadId,
1688+
event,
1689+
});
1690+
const projected = projectionStore.getTurnItem({
1691+
threadId: threadEvent.threadId,
1692+
itemId: steer.id,
1693+
});
1694+
const steerUpdated = (status: "pending" | "completed") =>
1695+
ingest({
1696+
type: "steer.updated",
1697+
driver: CODEX_DRIVER,
1698+
threadId: threadEvent.threadId,
1699+
runId,
1700+
messageId,
1701+
status,
1702+
});
1703+
1704+
yield* ingest({ type: "turn_item.updated", driver: CODEX_DRIVER, turnItem: steer });
1705+
yield* steerUpdated("pending");
1706+
assert.deepInclude(yield* projected, { status: "pending", completedAt: null });
1707+
yield* steerUpdated("completed");
1708+
assert.equal((yield* projected)?.status, "completed");
1709+
}),
1710+
);
1711+
16451712
it.effect("stores a bounded copy of a large file-change diff in both SQLite tables", () =>
16461713
Effect.gen(function* () {
16471714
const now = yield* DateTime.now;

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,35 @@ export const layer: Layer.Layer<
616616
}),
617617
];
618618
}
619+
case "steer.updated": {
620+
const item = yield* projections.getTurnItem({
621+
threadId: input.event.threadId,
622+
itemId: idAllocator.derive.userTurnItem({ messageId: input.event.messageId }),
623+
});
624+
if (
625+
item?.type !== "user_message" ||
626+
item.status === input.event.status ||
627+
(item.status !== "pending" && item.status !== "completed")
628+
) {
629+
return [];
630+
}
631+
const occurredAt = yield* DateTime.now;
632+
return [
633+
yield* makeDomainEvent(input, {
634+
type: "turn-item.updated",
635+
threadId: item.threadId,
636+
payload: {
637+
...item,
638+
status: input.event.status,
639+
completedAt: input.event.status === "pending" ? null : occurredAt,
640+
updatedAt: occurredAt,
641+
},
642+
runId: item.runId,
643+
nodeId: item.nodeId,
644+
occurredAt,
645+
}),
646+
];
647+
}
619648
case "background_work.updated":
620649
return [];
621650
case "command_output.delta":

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,8 @@ export function routeProviderEvent(
488488
}
489489
case "message.updated":
490490
return [ownsRun(event.message.runId) || ownsChildThread(event.message.threadId), state];
491+
case "steer.updated":
492+
return [ownsRun(event.runId), state];
491493
case "turn_item.updated": {
492494
if (ownsRun(event.turnItem.runId) || ownsChildThread(event.turnItem.threadId)) {
493495
return [true, state];

‎apps/web/src/components/chat/TimelineUserMessageRow.tsx‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,10 @@ function AutomationMessageRow({ row }: { row: Extract<TimelineRow, { kind: "mess
296296
<div className="group flex flex-col items-end gap-1" data-user-message-attribution="automation">
297297
{row.message.inputIntent === "steer" ||
298298
row.message.inputIntent === "promoted_queued_to_steer" ? (
299-
<UserMessageIntentMarker intent={row.message.inputIntent} />
299+
<UserMessageIntentMarker
300+
intent={row.message.inputIntent}
301+
unread={row.projectedItem?.item.status === "pending"}
302+
/>
300303
) : null}
301304
<div
302305
className={cn(
@@ -845,7 +848,10 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
845848
{(row.message.inputIntent === "steer" ||
846849
row.message.inputIntent === "promoted_queued_to_steer") &&
847850
!row.continuesSteer ? (
848-
<UserMessageIntentMarker intent={row.message.inputIntent} />
851+
<UserMessageIntentMarker
852+
intent={row.message.inputIntent}
853+
unread={row.projectedItem?.item.status === "pending"}
854+
/>
849855
) : null}
850856
{mediaAboveText ? (
851857
<div className="flex max-w-[80%] justify-end">
@@ -1048,8 +1054,10 @@ const ACTIONS_REVEAL_CLASS_NAME =
10481054

10491055
function UserMessageIntentMarker({
10501056
intent,
1057+
unread,
10511058
}: {
10521059
readonly intent: "steer" | "promoted_queued_to_steer";
1060+
readonly unread: boolean;
10531061
}) {
10541062
return (
10551063
<Tooltip>
@@ -1062,12 +1070,14 @@ function UserMessageIntentMarker({
10621070
}
10631071
>
10641072
<Redo2Icon aria-hidden="true" className="size-3" />
1065-
Steer
1073+
{unread ? "Steer · waiting to be read" : "Steer"}
10661074
</TooltipTrigger>
10671075
<TooltipPopup side="top">
1068-
{intent === "promoted_queued_to_steer"
1069-
? "Originally queued, then promoted to steer the active turn"
1070-
: "Steered the active turn"}
1076+
{unread
1077+
? "Waiting for the agent to read this. It reads steers between steps, after a running command finishes."
1078+
: intent === "promoted_queued_to_steer"
1079+
? "Originally queued, then promoted to steer the active turn"
1080+
: "Steered the active turn"}
10711081
</TooltipPopup>
10721082
</Tooltip>
10731083
);

‎packages/provider-core/src/server/ProviderAdapter.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,15 @@ export const ProviderAdapterV2Event = Schema.Union([
126126
driver: ProviderDriverKind,
127127
turnItem: OrchestrationV2TurnItem,
128128
}),
129+
/** A steer the provider queued stays `pending` until the agent reads it; `cancelled` if dropped unread. */
130+
Schema.Struct({
131+
type: Schema.Literal("steer.updated"),
132+
driver: ProviderDriverKind,
133+
threadId: ThreadId,
134+
runId: RunId,
135+
messageId: MessageId,
136+
status: Schema.Literals(["pending", "completed", "cancelled"]),
137+
}),
129138
// Start before the root terminal; clear only after the final covered projection.
130139
// Consumer lifetime cannot depend on a producer probe that runs ahead of its queue.
131140
Schema.Struct({

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

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,9 @@ const makeFakePi: Effect.Effect<FakePi> = Effect.gen(function* () {
306306
"Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.",
307307
};
308308
}
309-
return base;
309+
return promptDisposition && isStreaming
310+
? { ...base, data: { disposition: "queued" } }
311+
: base;
310312
case "get_available_models":
311313
return { ...base, data: { models } };
312314
case "new_session": {
@@ -5225,6 +5227,62 @@ describe("PiAdapterV2", () => {
52255227
}).pipe(Effect.scoped, Effect.provide(layerTest)),
52265228
);
52275229

5230+
it.effect.each([
5231+
{ outcome: "Pi reads it", status: "completed" },
5232+
{ outcome: "Stop clears it unread", status: "cancelled" },
5233+
] as const)("reports a queued steer unread until $outcome", ({ status }) =>
5234+
Effect.gen(function* () {
5235+
const fake = yield* makeFakePi;
5236+
fake.setClearQueue({ steering: ["Steer behind a command"], followUp: [] });
5237+
fake.setStreaming(false);
5238+
const { runtime, takeEvent } = yield* openRuntime(fake);
5239+
const providerThread = yield* runtime.ensureThread({
5240+
threadId: THREAD_ID,
5241+
modelSelection: modelSelection("default"),
5242+
runtimePolicy,
5243+
});
5244+
yield* startTurn(runtime, providerThread);
5245+
yield* fake.takeRequest("prompt");
5246+
const running = yield* takeEvent(
5247+
(event) =>
5248+
event.type === "provider_turn.updated" && event.providerTurn.status === "running",
5249+
);
5250+
const providerTurnId =
5251+
running.type === "provider_turn.updated" ? running.providerTurn.id : undefined;
5252+
assert.isDefined(providerTurnId);
5253+
fake.setStreaming(true);
5254+
yield* fake.emit({ type: "agent_start" });
5255+
5256+
const messageId = "message:thread-pi-test:queued-steer" as never;
5257+
yield* runtime.steerTurn({
5258+
threadId: THREAD_ID,
5259+
runId: RunId.make("run:thread-pi-test:1"),
5260+
providerThread,
5261+
providerTurnId: providerTurnId!,
5262+
message: {
5263+
messageId,
5264+
text: "Steer behind a command",
5265+
attachments: [],
5266+
createdBy: "user",
5267+
creationSource: "web",
5268+
},
5269+
});
5270+
const queued = yield* takeEvent((event) => event.type === "steer.updated");
5271+
assert.deepInclude(queued, { messageId, status: "pending" });
5272+
5273+
if (status === "completed") {
5274+
yield* fake.emit({ type: "message_start", message: { role: "user" } });
5275+
} else {
5276+
yield* runtime.interruptTurn({ providerThread, providerTurnId: providerTurnId! });
5277+
yield* fake.takeRequest("abort");
5278+
fake.setStreaming(false);
5279+
yield* fake.emit({ type: "agent_settled", aborted: true });
5280+
}
5281+
const settled = yield* takeEvent((event) => event.type === "steer.updated");
5282+
assert.deepInclude(settled, { messageId, status });
5283+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
5284+
);
5285+
52285286
it.effect("ignores an idle snapshot made stale by a steer", () =>
52295287
Effect.gen(function* () {
52305288
const fake = yield* makeFakePi;

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

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
type OrchestrationV2UserInputQuestion,
2222
type ProviderApprovalDecision,
2323
type ProviderInstanceId,
24+
type MessageId,
2425
type OrchestrationV2ProviderTurnTokenUsage,
2526
} from "@t3tools/contracts";
2627
import { PiSettings } from "../settings.ts";
@@ -374,6 +375,8 @@ interface ActivePiTurn {
374375
activeProviderRetry: PiProviderRetryState | null;
375376
failure: ReturnType<typeof makeProviderFailure> | null;
376377
rejectedPromptFailure: ReturnType<typeof makeProviderFailure> | null;
378+
/** Steers Pi queued in send order; it reads them at a step boundary, after running tools return. */
379+
readonly unreadSteers: Array<MessageId>;
377380
stopTreeRefs?: PiTurnTreeRefs | null;
378381
}
379382

@@ -411,6 +414,7 @@ interface PiPromptSend {
411414
readonly providerTurnId: OrchestrationV2ProviderTurn["id"];
412415
readonly kind: "turn_start" | "steer";
413416
readonly record: PiRpcRecord;
417+
readonly messageId?: MessageId;
414418
}
415419

416420
interface PiThreadState {
@@ -625,6 +629,20 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
625629
const emit = (event: ProviderAdapter.ProviderAdapterV2Event) =>
626630
Queue.offer(events, event).pipe(Effect.asVoid);
627631

632+
const emitSteerStatus = (
633+
turn: ActivePiTurn,
634+
messageId: MessageId,
635+
status: "pending" | "completed" | "cancelled",
636+
) =>
637+
emit({
638+
type: "steer.updated",
639+
driver: PI_PROVIDER,
640+
threadId: turn.turnInput.threadId,
641+
runId: turn.turnInput.runId,
642+
messageId,
643+
status,
644+
});
645+
628646
const updateProviderSession =
629647
/* Provider events include streaming deltas; avoid a span for each update. */
630648
Effect.fnUntraced(function* (
@@ -1713,6 +1731,10 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
17131731
}
17141732
}
17151733
yield* cancelPendingPrompts(completedAt);
1734+
// Stop clears Pi's queue, so an unread steer was dropped; otherwise Pi read it before settling.
1735+
for (const messageId of turn.unreadSteers.splice(0)) {
1736+
yield* emitSteerStatus(turn, messageId, interrupted ? "cancelled" : "completed");
1737+
}
17161738
const treeRefs =
17171739
turn.stopTreeRefs !== undefined ? turn.stopTreeRefs : yield* captureTurnTreeRefs();
17181740
const tokenUsage = readUsage
@@ -1931,10 +1953,15 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
19311953
return;
19321954
}
19331955
case "message_start": {
1934-
if (turn !== null && recordString(event["message"], "role") === "assistant") {
1956+
const role = recordString(event["message"], "role");
1957+
if (turn !== null && role === "assistant") {
19351958
turn.sawAgentActivity = true;
19361959
turn.messageOrdinal += 1;
19371960
}
1961+
const readSteer = role === "user" ? turn?.unreadSteers.shift() : undefined;
1962+
if (turn !== null && readSteer !== undefined) {
1963+
yield* emitSteerStatus(turn, readSteer, "completed");
1964+
}
19381965
return;
19391966
}
19401967
case "message_update": {
@@ -2227,6 +2254,14 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
22272254
yield* scheduleSettleProbe(responseTurn, true);
22282255
}
22292256
if (event["success"] === true) {
2257+
if (
2258+
pendingPrompt?.messageId !== undefined &&
2259+
responseTurn !== null &&
2260+
recordString(recordField(event, "data"), "disposition") === "queued"
2261+
) {
2262+
responseTurn.unreadSteers.push(pendingPrompt.messageId);
2263+
yield* emitSteerStatus(responseTurn, pendingPrompt.messageId, "pending");
2264+
}
22302265
// Command-only prompts emit no agent_settled; probe idle and re-queue behind preceding native events.
22312266
if (
22322267
pendingPrompt?.kind === "turn_start" &&
@@ -2802,6 +2837,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
28022837
activeProviderRetry: null,
28032838
failure: null,
28042839
rejectedPromptFailure: null,
2840+
unreadSteers: [],
28052841
};
28062842
// Lock only install/send/start events; correlated setup must leave the pump free for dialogs.
28072843
yield* Effect.gen(function* () {
@@ -2928,6 +2964,7 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
29282964
yield* sendPrompt({
29292965
providerTurnId: turn.providerTurn.id,
29302966
kind: "steer",
2967+
messageId: steerInput.message.messageId,
29312968
record: {
29322969
type: "prompt",
29332970
message: payload.message,

0 commit comments

Comments
 (0)