Skip to content

Commit df677a0

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-33670
2 parents ae9b5ed + 6c9adfb commit df677a0

17 files changed

Lines changed: 1193 additions & 150 deletions

‎apps/mobile/src/features/usage/UsageRouteScreen.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function UsageScreen(props: {
249249
onSelect={setView}
250250
size="compact"
251251
role="tab"
252-
className="w-60"
252+
className="flex-1"
253253
/>
254254
</View>
255255
) : (

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
type ProjectId,
1313
ThreadId,
1414
} from "@t3tools/contracts";
15-
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
1615
import * as ProviderCommitBatch from "./ProviderCommitBatch.ts";
1716
import * as Context from "effect/Context";
1817
import * as DateTime from "effect/DateTime";
@@ -79,9 +78,10 @@ const CurrentProviderBatch = Context.Reference<ProviderBatchPublication | undefi
7978
);
8079

8180
export interface EventSinkV2Shape {
82-
readonly consumeProviderEvents: <E, R, E2, R2>(
83-
source: Stream.Stream<ProviderAdapter.ProviderAdapterV2Event, E, R>,
84-
process: (event: ProviderAdapter.ProviderAdapterV2Event) => Effect.Effect<void, E2, R2>,
81+
/** Items that are not provider snapshots, such as a consumer's own control items, never batch. */
82+
readonly consumeProviderEvents: <A extends { readonly type: string }, E, R, E2, R2>(
83+
source: Stream.Stream<A, E, R>,
84+
process: (event: A) => Effect.Effect<void, E2, R2>,
8585
after: Effect.Effect<boolean, E2, R2>,
8686
canBatch: Effect.Effect<boolean, never, R2>,
8787
) => Effect.Effect<

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4158,6 +4158,12 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
41584158
...(existing.endedWatch?.owedChecks !== undefined && {
41594159
owedChecks: existing.endedWatch.owedChecks,
41604160
}),
4161+
...(existing.endedWatch?.awaitingApproval !== undefined && {
4162+
awaitingApproval: existing.endedWatch.awaitingApproval,
4163+
}),
4164+
...(existing.endedWatch?.approvalAnnounced !== undefined && {
4165+
approvalAnnounced: existing.endedWatch.approvalAnnounced,
4166+
}),
41614167
...(existing.endedWatch?.checksAwaitedSince !== undefined && {
41624168
checksAwaitedSince: existing.endedWatch.checksAwaitedSince,
41634169
}),

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
21
import * as Cause from "effect/Cause";
32
import * as Clock from "effect/Clock";
43
import * as Config from "effect/Config";
@@ -19,8 +18,7 @@ export const enabled = Config.Boolean("T3CODE_PROVIDER_COMMIT_BATCHING").pipe(
1918
Effect.orDie,
2019
);
2120

22-
type Event = ProviderAdapter.ProviderAdapterV2Event;
23-
const isSnapshot = (event: Event) =>
21+
const isSnapshot = (event: { readonly type: string }) =>
2422
event.type === "node.updated" ||
2523
event.type === "message.updated" ||
2624
event.type === "turn_item.updated" ||
@@ -232,9 +230,9 @@ export const make = Effect.fn("ProviderCommitBatch.make")(function* (
232230
),
233231
);
234232
});
235-
const consume = Effect.fnUntraced(function* <E, R, E2, R2>(
236-
source: Stream.Stream<Event, E, R>,
237-
process: (event: Event) => Effect.Effect<void, E2, R2>,
233+
const consume = Effect.fnUntraced(function* <A extends { readonly type: string }, E, R, E2, R2>(
234+
source: Stream.Stream<A, E, R>,
235+
process: (event: A) => Effect.Effect<void, E2, R2>,
238236
after: Effect.Effect<boolean, E2, R2>,
239237
canBatch: Effect.Effect<boolean, never, R2> = Effect.succeed(true),
240238
) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ function watchesEqual(left: ThreadPullRequestWatch, right: ThreadPullRequestWatc
178178
left.passed === right.passed &&
179179
left.passedChecks.join("\n") === right.passedChecks.join("\n") &&
180180
(left.owedChecks ?? []).join("\n") === (right.owedChecks ?? []).join("\n") &&
181+
(left.awaitingApproval ?? []).join("\n") === (right.awaitingApproval ?? []).join("\n") &&
182+
(left.approvalAnnounced ?? false) === (right.approvalAnnounced ?? false) &&
181183
left.remarksThrough === right.remarksThrough &&
182184
left.remarkIds.join("\n") === right.remarkIds.join("\n") &&
183185
left.conflicting === right.conflicting &&

0 commit comments

Comments
 (0)