Skip to content

Commit 22925de

Browse files
committed
Overlay branch overlay/steer-not-delivered on top of origin/main via Merge
# Conflicts: # apps/mobile/src/features/threads/ThreadFeed.tsx # apps/web/src/components/chat/TimelineUserMessageRow.tsx # packages/client-runtime/src/userMessage.test.ts # packages/client-runtime/src/userMessage.ts # packages/provider-core/src/server/ProviderAdapter.ts * apps/mobile/src/features/threads/ThreadFeed.tsx * apps/mobile/src/lib/threadActivity.ts * apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts * apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts * apps/server/src/orchestration-v2/ProviderEventIngestor.ts * apps/server/src/orchestration-v2/ProviderSessionManager.test.ts * apps/server/src/orchestration-v2/ProviderSessionManager.ts * apps/server/src/orchestration-v2/RunExecutionService.ts * apps/web/src/components/chat/TimelineUserMessageRow.tsx * apps/web/src/session-logic.ts * apps/web/src/types.ts * packages/client-runtime/src/userMessage.test.ts * packages/client-runtime/src/userMessage.ts * packages/provider-core/src/server/ProviderAdapter.ts * packages/provider-opencode/src/server/v2/adapter.ts * packages/provider-pi/src/server/adapter.test.ts * packages/provider-pi/src/server/adapter.ts • 5073bb6d46 Overlay branch overlay/steer-not-delivered on top of origin/main via Merge |\ | • e6b99cd fix(providers): report steers OpenCode and Pi dropped as not delivered | • 4943e9e feat(orchestration): show steers a provider dropped as not delivered • | becf853 fix(web): PDF search finds phrases that wrap across lines (pingdotgg#25702) • | 68339a0 refactor(mobile): pull request list, filters and viewed files without synchronizing effects (pingdotgg#25614) • | a2398c2 refactor(mobile): thread inspector mode is derived, not synced (pingdotgg#25682) • | 9bc0c33 refactor(mobile): settings use web's pages and groups (pingdotgg#25686) • | 5432d8e refactor(web): drafts promote from the draft store, not from route effects (pingdotgg#25615)
2 parents becf853 + e6b99cd commit 22925de

18 files changed

Lines changed: 367 additions & 58 deletions

File tree

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { scopeThreadRef } from "@t3tools/client-runtime/environment";
3232
import type { HandoffEndpoints } from "@t3tools/client-runtime/handoff";
3333
import {
3434
IDLE_COMPACTING_LABELS,
35+
resolveSteerMarker,
3536
resolveUserMessagePresentation,
3637
} from "@t3tools/client-runtime/user-message";
3738
import { canForkProjectedAssistantItem } from "@t3tools/client-runtime/state/thread-workflows";
@@ -258,7 +259,6 @@ import {
258259
resolveWorkspaceRelativeFilePath,
259260
} from "../files/filePath";
260261
import { waitForThreadShellReady } from "./threadForkNavigation";
261-
import { resolveUserMessageIntentBadge } from "./userMessageIntentBadge";
262262
import { fileChipClipboardPath, fileChipMenu, resolveFileChipTarget } from "./fileChipMenu";
263263
import { useFileChipShare } from "./useFileChipShare";
264264
import { useOpenLinkedThread } from "./useOpenLinkedThread";
@@ -1525,7 +1525,7 @@ function renderFeedEntry(
15251525
const foldRowId = presentation.attribution === "agent" ? `agent:${message.id}` : null;
15261526
const foldExpanded = foldRowId !== null && (props.expandedWorkRows[foldRowId] ?? false);
15271527
const bubbleBodyVisible = foldRowId === null || foldExpanded;
1528-
const intentBadge = resolveUserMessageIntentBadge(message.inputIntent);
1528+
const intentBadge = resolveSteerMarker(message);
15291529
const referenceIds = new Set(
15301530
collectComposerContextReferences(message.text).map((reference) => reference.contextId),
15311531
);
@@ -1680,10 +1680,14 @@ function renderFeedEntry(
16801680
{intentBadge ? (
16811681
<View
16821682
accessible
1683-
accessibilityLabel={intentBadge.accessibilityLabel}
1683+
accessibilityLabel={`${intentBadge.label}. ${intentBadge.description}`}
16841684
className="flex-row items-center gap-1"
16851685
>
1686-
<SymbolView name="arrow.uturn.forward" size={12} tintColor={iconSubtleColor} />
1686+
<SymbolView
1687+
name={intentBadge.delivered ? "arrow.uturn.forward" : "slash.circle"}
1688+
size={12}
1689+
tintColor={iconSubtleColor}
1690+
/>
16871691
<Text className="font-t3-medium text-xs text-foreground-secondary">
16881692
{intentBadge.label}
16891693
</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
@@ -139,6 +139,7 @@ export interface ThreadFeedMessage {
139139
readonly runId: RunId | null;
140140
readonly streaming: boolean;
141141
readonly inputIntent?: OrchestrationV2UserMessageInputIntent;
142+
readonly undelivered?: true;
142143
readonly createdBy?: OrchestrationV2Actor;
143144
readonly creationSource?: OrchestrationV2CreationSource;
144145
readonly scheduledTaskId?: ScheduledTaskId;
@@ -2241,6 +2242,7 @@ export function buildThreadFeed(
22412242
...(item.type === "user_message"
22422243
? {
22432244
inputIntent: item.inputIntent,
2245+
...(item.status === "cancelled" ? { undelivered: true as const } : {}),
22442246
createdBy: item.createdBy,
22452247
creationSource: item.creationSource,
22462248
...(item.scheduledTaskId ? { scheduledTaskId: item.scheduledTaskId } : {}),

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

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

3553-
it.effect("takes back a stranded steer again when its first cancel failed", () =>
3553+
it.effect("retakes a stranded steer after a failed cancel, then reports it dropped", () =>
35543554
Effect.gen(function* () {
35553555
const steerId = `msg_t3_steer_${SESSION}:message:opencode2-adapter:steer`;
35563556
const cancelOut = out("session.inbox.cancel", { sessionID: SESSION, inboxID: steerId });
@@ -3592,13 +3592,17 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
35923592
event("session.execution.succeeded", { sessionID: SESSION }),
35933593
]);
35943594
const seen: Array<string> = [];
3595+
const discarded: Array<string> = [];
35953596
const ended = yield* Deferred.make<void>();
35963597
const nextEnded = yield* Deferred.make<void>();
35973598
// One consumer reads every terminal; a second reader would race it for the queue.
35983599
const thirdEnded = yield* Deferred.make<void>();
35993600
yield* runtime.events.pipe(
36003601
Stream.tap((event) =>
36013602
Effect.gen(function* () {
3603+
if (event.type === "steer.discarded") {
3604+
discarded.push(`${event.threadId} ${event.messageId} after ${seen.length}`);
3605+
}
36023606
if (event.type !== "turn.terminal") return;
36033607
seen.push(event.status);
36043608
if (seen.length === 1) yield* Deferred.succeed(ended, undefined);
@@ -3636,6 +3640,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
36363640
attemptId: RunAttemptId.make("attempt:opencode2-adapter:3"),
36373641
});
36383642
yield* Deferred.await(thirdEnded);
3643+
assert.deepEqual(discarded, [`${threadId} message:opencode2-adapter:steer after 2`]);
36393644
}).pipe(Effect.scoped),
36403645
);
36413646

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,72 @@ layer("ProviderEventIngestorV2", (it) => {
468468
}),
469469
);
470470

471+
it.effect("marks a steer its provider dropped as not delivered, once", () =>
472+
Effect.gen(function* () {
473+
const now = yield* DateTime.now;
474+
const eventSink = yield* EventSink.EventSinkV2;
475+
const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
476+
const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2;
477+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
478+
const threadEvent = yield* threadCreatedEvent(now);
479+
const threadId = threadEvent.threadId;
480+
const providerSessionId = yield* idAllocator.allocate.providerSession({
481+
providerInstanceId: modelSelection.instanceId,
482+
threadId,
483+
});
484+
const messageId = MessageId.make("message:steer-discarded");
485+
const steer: OrchestrationV2TurnItem = {
486+
createdBy: "user",
487+
creationSource: "web",
488+
id: idAllocator.derive.userTurnItem({ messageId }),
489+
threadId,
490+
runId: null,
491+
nodeId: null,
492+
providerThreadId: null,
493+
providerTurnId: null,
494+
nativeItemRef: null,
495+
parentItemId: null,
496+
ordinal: 1,
497+
status: "completed",
498+
title: null,
499+
startedAt: now,
500+
completedAt: now,
501+
updatedAt: now,
502+
type: "user_message",
503+
messageId,
504+
inputIntent: "steer",
505+
text: "use the other branch",
506+
attachments: [],
507+
};
508+
yield* eventSink.write({
509+
events: [
510+
threadEvent,
511+
{
512+
id: yield* idAllocator.allocate.event({ threadId }),
513+
type: "turn-item.updated",
514+
threadId,
515+
occurredAt: now,
516+
payload: steer,
517+
},
518+
],
519+
});
520+
const discard = (discarded: MessageId) =>
521+
ingestor.ingestNormalized({
522+
providerSessionId,
523+
providerInstanceId: modelSelection.instanceId,
524+
threadId,
525+
event: { type: "steer.discarded", driver: CODEX_DRIVER, threadId, messageId: discarded },
526+
});
527+
528+
assert.lengthOf(yield* discard(messageId), 1);
529+
assert.isEmpty(yield* discard(messageId));
530+
assert.isEmpty(yield* discard(MessageId.make("message:never-sent")));
531+
const stored = yield* projectionStore.getTurnItem({ threadId, itemId: steer.id });
532+
assert.equal(stored?.status, "cancelled");
533+
assert.equal(stored?.type === "user_message" ? stored.text : null, steer.text);
534+
}),
535+
);
536+
471537
it.effect("rolls back runs a provider rewound off its active branch", () =>
472538
Effect.gen(function* () {
473539
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
@@ -661,6 +661,24 @@ export const layer: Layer.Layer<
661661
nodeId: input.event.turnItem.nodeId,
662662
}),
663663
];
664+
case "steer.discarded": {
665+
const steer = yield* projections.getTurnItem({
666+
threadId: input.event.threadId,
667+
itemId: idAllocator.derive.userTurnItem({ messageId: input.event.messageId }),
668+
});
669+
if (steer?.type !== "user_message" || steer.status === "cancelled") return [];
670+
const updatedAt = yield* DateTime.now;
671+
return [
672+
yield* makeDomainEvent(input, {
673+
type: "turn-item.updated",
674+
threadId: steer.threadId,
675+
payload: { ...steer, status: "cancelled", updatedAt },
676+
runId: steer.runId,
677+
nodeId: steer.nodeId,
678+
occurredAt: updatedAt,
679+
}),
680+
];
681+
}
664682
case "runtime_request.updated":
665683
return [
666684
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,
@@ -2985,6 +2987,93 @@ it.effect("ProviderSessionManagerV2 persists session-scoped runtime requests wit
29852987
}),
29862988
);
29872989

2990+
it.effect("ProviderSessionManagerV2 persists a dropped steer without a run", () =>
2991+
Effect.gen(function* () {
2992+
const state = yield* Ref.make(emptyState);
2993+
const effect = Effect.gen(function* () {
2994+
const eventSink = yield* EventSink.EventSinkV2;
2995+
const idAllocator = yield* IdAllocator.IdAllocatorV2;
2996+
const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
2997+
const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
2998+
const now = yield* DateTime.now;
2999+
const projectId = yield* idAllocator.allocate.project({
3000+
fixtureName: "provider-session-manager-dropped-steer",
3001+
});
3002+
const threadId = yield* idAllocator.allocate.thread({
3003+
fixtureName: "provider-session-manager-dropped-steer",
3004+
projectId,
3005+
});
3006+
const providerSessionId = yield* idAllocator.allocate.providerSession({
3007+
providerInstanceId: modelSelection.instanceId,
3008+
threadId,
3009+
});
3010+
const messageId = MessageId.make("message:provider-session-manager-dropped-steer");
3011+
const steer: OrchestrationV2TurnItem = {
3012+
createdBy: "user",
3013+
creationSource: "web",
3014+
id: idAllocator.derive.userTurnItem({ messageId }),
3015+
threadId,
3016+
runId: null,
3017+
nodeId: null,
3018+
providerThreadId: null,
3019+
providerTurnId: null,
3020+
nativeItemRef: null,
3021+
parentItemId: null,
3022+
ordinal: 1,
3023+
status: "completed",
3024+
title: null,
3025+
startedAt: now,
3026+
completedAt: now,
3027+
updatedAt: now,
3028+
type: "user_message",
3029+
messageId,
3030+
inputIntent: "steer",
3031+
text: "never read",
3032+
attachments: [],
3033+
};
3034+
yield* eventSink.write({
3035+
events: [
3036+
yield* makeThreadCreatedEvent({ idAllocator, threadId, now }),
3037+
{
3038+
id: yield* idAllocator.allocate.event({ threadId }),
3039+
type: "turn-item.updated",
3040+
threadId,
3041+
occurredAt: now,
3042+
payload: steer,
3043+
},
3044+
],
3045+
});
3046+
yield* manager.open({
3047+
threadId,
3048+
providerSessionId,
3049+
modelSelection,
3050+
runtimePolicy,
3051+
});
3052+
const afterSequence = yield* eventSink.latestSequence({ threadId });
3053+
const persistedFiber = yield* eventSink.stream({ threadId, afterSequence }).pipe(
3054+
Stream.filter((stored) => stored.event.type === "turn-item.updated"),
3055+
Stream.take(1),
3056+
Stream.runCollect,
3057+
Effect.forkScoped,
3058+
);
3059+
const adapterEvents = (yield* Ref.get(state)).eventQueues.get(String(providerSessionId));
3060+
assert.isDefined(adapterEvents);
3061+
yield* Queue.offer(adapterEvents!, {
3062+
type: "steer.discarded",
3063+
driver: CODEX_DRIVER,
3064+
threadId,
3065+
messageId,
3066+
});
3067+
yield* Fiber.join(persistedFiber);
3068+
3069+
const stored = yield* projectionStore.getTurnItem({ threadId, itemId: steer.id });
3070+
assert.equal(stored?.status, "cancelled");
3071+
});
3072+
3073+
yield* effect.pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 1000 })));
3074+
}),
3075+
);
3076+
29883077
it.effect(
29893078
"ProviderSessionManagerV2 opens one shared runtime, broadcasts events, and detaches threads independently",
29903079
() =>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,13 @@ function sessionKey(providerSessionId: ProviderSessionId): string {
243243
return String(providerSessionId);
244244
}
245245

246-
function sessionScopedRuntimeRequestThreadId(
246+
function sessionScopedEventThreadId(
247247
event: ProviderAdapter.ProviderAdapterV2Event,
248248
): ThreadId | undefined {
249249
switch (event.type) {
250+
// A stop usually discards steers after the run settled and its subscriber left.
251+
case "steer.discarded":
252+
return event.threadId;
250253
case "runtime_request.updated":
251254
return event.runtimeRequest.providerTurnId === null ? event.threadId : undefined;
252255
case "node.updated":
@@ -1940,7 +1943,7 @@ export const layerWithOptions = (
19401943
// (project trust, login, or session-switch hooks). Persist
19411944
// their runless request artifacts directly so the normal T3
19421945
// request UI can answer them and unblock session setup.
1943-
const threadId = sessionScopedRuntimeRequestThreadId(event);
1946+
const threadId = sessionScopedEventThreadId(event);
19441947
if (threadId !== undefined) {
19451948
yield* Effect.gen(function* () {
19461949
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
@@ -478,6 +478,9 @@ export function routeProviderEvent(
478478
}
479479
case "message.updated":
480480
return [ownsRun(event.message.runId) || ownsChildThread(event.message.threadId), state];
481+
case "steer.discarded":
482+
// The session manager persists these itself; the run may already be gone.
483+
return [false, state];
481484
case "turn_item.updated": {
482485
if (ownsRun(event.turnItem.runId) || ownsChildThread(event.turnItem.threadId)) {
483486
return [true, state];

0 commit comments

Comments
 (0)