Skip to content

Commit 4943e9e

Browse files
committed
feat(orchestration): show steers a provider dropped as not delivered
A steer sent during a turn that the user then stopped never reached the agent, but the thread still showed it as a normal "Steer". Users had no way to tell the agent never read it. Adds a `steer.discarded` provider event. The session manager persists it directly (the run has often settled by then), and the ingestor flips the steer's user_message item to `cancelled` once. Web and mobile show such a steer as "Not delivered" through a shared `resolveSteerMarker` helper in client-runtime, which replaces mobile's own badge helper. Each adapter reports its own drops.
1 parent 27e0c68 commit 4943e9e

14 files changed

Lines changed: 280 additions & 54 deletions

File tree

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ import { KeyboardAwareLegendList } from "@legendapp/list/keyboard";
2828
import { useViewabilityAmount, type LegendListRef } from "@legendapp/list/react-native";
2929
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
3030
import type { HandoffEndpoints } from "@t3tools/client-runtime/handoff";
31-
import { resolveUserMessagePresentation } from "@t3tools/client-runtime/user-message";
31+
import {
32+
resolveSteerMarker,
33+
resolveUserMessagePresentation,
34+
} from "@t3tools/client-runtime/user-message";
3235
import { canForkProjectedAssistantItem } from "@t3tools/client-runtime/state/thread-workflows";
3336
import type { ThreadCheckpointSummary } from "@t3tools/client-runtime/state/thread-checkpoints";
3437
import { formatDiffCount } from "@t3tools/client-runtime/diff-count";
@@ -268,7 +271,6 @@ import {
268271
resolveWorkspaceRelativeFilePath,
269272
} from "../files/filePath";
270273
import { waitForThreadShellReady } from "./threadForkNavigation";
271-
import { resolveUserMessageIntentBadge } from "./userMessageIntentBadge";
272274
import { fileChipClipboardPath, fileChipMenu, resolveFileChipTarget } from "./fileChipMenu";
273275
import { useFileChipShare } from "./useFileChipShare";
274276
import {
@@ -1432,7 +1434,7 @@ function renderFeedEntry(
14321434
const foldRowId = presentation.attribution === "agent" ? `agent:${message.id}` : null;
14331435
const foldExpanded = foldRowId !== null && (props.expandedWorkRows[foldRowId] ?? false);
14341436
const bubbleBodyVisible = foldRowId === null || foldExpanded;
1435-
const intentBadge = resolveUserMessageIntentBadge(message.inputIntent);
1437+
const intentBadge = resolveSteerMarker(message);
14361438
const referenceIds = new Set(
14371439
collectComposerContextReferences(message.text).map((reference) => reference.contextId),
14381440
);
@@ -1583,10 +1585,14 @@ function renderFeedEntry(
15831585
{intentBadge ? (
15841586
<View
15851587
accessible
1586-
accessibilityLabel={intentBadge.accessibilityLabel}
1588+
accessibilityLabel={`${intentBadge.label}. ${intentBadge.description}`}
15871589
className="flex-row items-center gap-1"
15881590
>
1589-
<SymbolView name="arrow.uturn.forward" size={12} tintColor={iconSubtleColor} />
1591+
<SymbolView
1592+
name={intentBadge.delivered ? "arrow.uturn.forward" : "slash.circle"}
1593+
size={12}
1594+
tintColor={iconSubtleColor}
1595+
/>
15901596
<Text className="font-t3-medium text-xs text-foreground-secondary">
15911597
{intentBadge.label}
15921598
</Text>

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎apps/mobile/src/lib/threadActivity.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ export interface ThreadFeedMessage {
137137
readonly runId: RunId | null;
138138
readonly streaming: boolean;
139139
readonly inputIntent?: OrchestrationV2UserMessageInputIntent;
140+
readonly undelivered?: true;
140141
readonly createdBy?: OrchestrationV2Actor;
141142
readonly creationSource?: OrchestrationV2CreationSource;
142143
readonly scheduledTaskId?: ScheduledTaskId;
@@ -2151,6 +2152,7 @@ export function buildThreadFeed(
21512152
...(item.type === "user_message"
21522153
? {
21532154
inputIntent: item.inputIntent,
2155+
...(item.status === "cancelled" ? { undelivered: true as const } : {}),
21542156
createdBy: item.createdBy,
21552157
creationSource: item.creationSource,
21562158
...(item.scheduledTaskId ? { scheduledTaskId: item.scheduledTaskId } : {}),

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,72 @@ layer("ProviderEventIngestorV2", (it) => {
417417
}),
418418
);
419419

420+
it.effect("marks a steer its provider dropped as not delivered, once", () =>
421+
Effect.gen(function* () {
422+
const now = yield* DateTime.now;
423+
const eventSink = yield* EventSink.EventSinkV2;
424+
const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
425+
const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2;
426+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
427+
const threadEvent = yield* threadCreatedEvent(now);
428+
const threadId = threadEvent.threadId;
429+
const providerSessionId = yield* idAllocator.allocate.providerSession({
430+
providerInstanceId: modelSelection.instanceId,
431+
threadId,
432+
});
433+
const messageId = MessageId.make("message:steer-discarded");
434+
const steer: OrchestrationV2TurnItem = {
435+
createdBy: "user",
436+
creationSource: "web",
437+
id: idAllocator.derive.userTurnItem({ messageId }),
438+
threadId,
439+
runId: null,
440+
nodeId: null,
441+
providerThreadId: null,
442+
providerTurnId: null,
443+
nativeItemRef: null,
444+
parentItemId: null,
445+
ordinal: 1,
446+
status: "completed",
447+
title: null,
448+
startedAt: now,
449+
completedAt: now,
450+
updatedAt: now,
451+
type: "user_message",
452+
messageId,
453+
inputIntent: "steer",
454+
text: "use the other branch",
455+
attachments: [],
456+
};
457+
yield* eventSink.write({
458+
events: [
459+
threadEvent,
460+
{
461+
id: yield* idAllocator.allocate.event({ threadId }),
462+
type: "turn-item.updated",
463+
threadId,
464+
occurredAt: now,
465+
payload: steer,
466+
},
467+
],
468+
});
469+
const discard = (discarded: MessageId) =>
470+
ingestor.ingestNormalized({
471+
providerSessionId,
472+
providerInstanceId: modelSelection.instanceId,
473+
threadId,
474+
event: { type: "steer.discarded", driver: CODEX_DRIVER, threadId, messageId: discarded },
475+
});
476+
477+
assert.lengthOf(yield* discard(messageId), 1);
478+
assert.isEmpty(yield* discard(messageId));
479+
assert.isEmpty(yield* discard(MessageId.make("message:never-sent")));
480+
const stored = yield* projectionStore.getTurnItem({ threadId, itemId: steer.id });
481+
assert.equal(stored?.status, "cancelled");
482+
assert.equal(stored?.type === "user_message" ? stored.text : null, steer.text);
483+
}),
484+
);
485+
420486
it.effect("rolls back runs a provider rewound off its active branch", () =>
421487
Effect.gen(function* () {
422488
const now = yield* DateTime.now;

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,24 @@ export const layer: Layer.Layer<
643643
nodeId: input.event.turnItem.nodeId,
644644
}),
645645
];
646+
case "steer.discarded": {
647+
const steer = yield* projections.getTurnItem({
648+
threadId: input.event.threadId,
649+
itemId: idAllocator.derive.userTurnItem({ messageId: input.event.messageId }),
650+
});
651+
if (steer?.type !== "user_message" || steer.status === "cancelled") return [];
652+
const updatedAt = yield* DateTime.now;
653+
return [
654+
yield* makeDomainEvent(input, {
655+
type: "turn-item.updated",
656+
threadId: steer.threadId,
657+
payload: { ...steer, status: "cancelled", updatedAt },
658+
runId: steer.runId,
659+
nodeId: steer.nodeId,
660+
occurredAt: updatedAt,
661+
}),
662+
];
663+
}
646664
case "runtime_request.updated":
647665
return [
648666
yield* makeDomainEvent(input, {

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import { assert, it } from "@effect/vitest";
44
import { AgentScope } from "@t3tools/shared/AgentScope";
55
import {
66
EnvironmentId,
7+
MessageId,
78
type ModelSelection,
89
type OrchestrationV2AppThread,
910
type OrchestrationV2DomainEvent,
1011
type OrchestrationV2ProviderCapabilities,
1112
type OrchestrationV2ProviderSession,
1213
type OrchestrationV2ProviderThread,
14+
type OrchestrationV2TurnItem,
1315
type Project,
1416
ProjectId,
1517
ProviderDriverKind,
@@ -2945,6 +2947,93 @@ it.effect("ProviderSessionManagerV2 persists session-scoped runtime requests wit
29452947
}),
29462948
);
29472949

2950+
it.effect("ProviderSessionManagerV2 persists a dropped steer without a run", () =>
2951+
Effect.gen(function* () {
2952+
const state = yield* Ref.make(emptyState);
2953+
const effect = Effect.gen(function* () {
2954+
const eventSink = yield* EventSink.EventSinkV2;
2955+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
2956+
const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
2957+
const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
2958+
const now = yield* DateTime.now;
2959+
const projectId = yield* idAllocator.allocate.project({
2960+
fixtureName: "provider-session-manager-dropped-steer",
2961+
});
2962+
const threadId = yield* idAllocator.allocate.thread({
2963+
fixtureName: "provider-session-manager-dropped-steer",
2964+
projectId,
2965+
});
2966+
const providerSessionId = yield* idAllocator.allocate.providerSession({
2967+
providerInstanceId: modelSelection.instanceId,
2968+
threadId,
2969+
});
2970+
const messageId = MessageId.make("message:provider-session-manager-dropped-steer");
2971+
const steer: OrchestrationV2TurnItem = {
2972+
createdBy: "user",
2973+
creationSource: "web",
2974+
id: idAllocator.derive.userTurnItem({ messageId }),
2975+
threadId,
2976+
runId: null,
2977+
nodeId: null,
2978+
providerThreadId: null,
2979+
providerTurnId: null,
2980+
nativeItemRef: null,
2981+
parentItemId: null,
2982+
ordinal: 1,
2983+
status: "completed",
2984+
title: null,
2985+
startedAt: now,
2986+
completedAt: now,
2987+
updatedAt: now,
2988+
type: "user_message",
2989+
messageId,
2990+
inputIntent: "steer",
2991+
text: "never read",
2992+
attachments: [],
2993+
};
2994+
yield* eventSink.write({
2995+
events: [
2996+
yield* makeThreadCreatedEvent({ idAllocator, threadId, now }),
2997+
{
2998+
id: yield* idAllocator.allocate.event({ threadId }),
2999+
type: "turn-item.updated",
3000+
threadId,
3001+
occurredAt: now,
3002+
payload: steer,
3003+
},
3004+
],
3005+
});
3006+
yield* manager.open({
3007+
threadId,
3008+
providerSessionId,
3009+
modelSelection,
3010+
runtimePolicy,
3011+
});
3012+
const afterSequence = yield* eventSink.latestSequence({ threadId });
3013+
const persistedFiber = yield* eventSink.stream({ threadId, afterSequence }).pipe(
3014+
Stream.filter((stored) => stored.event.type === "turn-item.updated"),
3015+
Stream.take(1),
3016+
Stream.runCollect,
3017+
Effect.forkScoped,
3018+
);
3019+
const adapterEvents = (yield* Ref.get(state)).eventQueues.get(String(providerSessionId));
3020+
assert.isDefined(adapterEvents);
3021+
yield* Queue.offer(adapterEvents!, {
3022+
type: "steer.discarded",
3023+
driver: CODEX_DRIVER,
3024+
threadId,
3025+
messageId,
3026+
});
3027+
yield* Fiber.join(persistedFiber);
3028+
3029+
const stored = yield* projectionStore.getTurnItem({ threadId, itemId: steer.id });
3030+
assert.equal(stored?.status, "cancelled");
3031+
});
3032+
3033+
yield* effect.pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 1000 })));
3034+
}),
3035+
);
3036+
29483037
it.effect(
29493038
"ProviderSessionManagerV2 opens one shared runtime, broadcasts events, and detaches threads independently",
29503039
() =>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,13 @@ function sessionKey(providerSessionId: ProviderSessionId): string {
248248
return String(providerSessionId);
249249
}
250250

251-
function sessionScopedRuntimeRequestThreadId(
251+
function sessionScopedEventThreadId(
252252
event: ProviderAdapter.ProviderAdapterV2Event,
253253
): ThreadId | undefined {
254254
switch (event.type) {
255+
// A stop usually discards steers after the run settled and its subscriber left.
256+
case "steer.discarded":
257+
return event.threadId;
255258
case "runtime_request.updated":
256259
return event.runtimeRequest.providerTurnId === null ? event.threadId : undefined;
257260
case "node.updated":
@@ -1992,7 +1995,7 @@ export const layerWithOptions = (
19921995
// (project trust, login, or session-switch hooks). Persist
19931996
// their runless request artifacts directly so the normal T3
19941997
// request UI can answer them and unblock session setup.
1995-
const threadId = sessionScopedRuntimeRequestThreadId(event);
1998+
const threadId = sessionScopedEventThreadId(event);
19961999
if (threadId !== undefined) {
19972000
yield* Effect.gen(function* () {
19982001
const current = (yield* Ref.get(sessions)).get(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,9 @@ export function routeProviderEvent(
481481
}
482482
case "message.updated":
483483
return [ownsRun(event.message.runId) || ownsChildThread(event.message.threadId), state];
484+
case "steer.discarded":
485+
// The session manager persists these itself; the run may already be gone.
486+
return [false, state];
484487
case "turn_item.updated": {
485488
if (ownsRun(event.turnItem.runId) || ownsChildThread(event.turnItem.threadId)) {
486489
return [true, state];

0 commit comments

Comments
 (0)