Skip to content

Commit 86f4db4

Browse files
committed
Merge latest upstream main into standalone HTML gutter fix
2 parents e6cae15 + 3e9d97a commit 86f4db4

10 files changed

Lines changed: 600 additions & 23 deletions

File tree

‎apps/mobile/src/components/ui/Toast.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function ToastContent(props: ToastProps & { readonly glassReady?: boolean }) {
9393
</AppText>
9494
) : null}
9595
</View>
96-
{inlineAction ? action : null}
96+
{inlineAction && action ? <View className="self-center">{action}</View> : null}
9797
{props.onDismiss && props.dismissMode !== "swipe" ? (
9898
<IconButton accessibilityLabel="Dismiss message" icon="xmark" onPress={props.onDismiss} />
9999
) : null}

‎apps/server/src/guest/GuestShareService.test.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
ThreadId,
1414
TurnItemId,
1515
} from "@t3tools/contracts";
16+
import * as Context from "effect/Context";
1617
import * as DateTime from "effect/DateTime";
1718
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
1819
import * as Effect from "effect/Effect";
@@ -47,6 +48,7 @@ import * as ResourceCleanupService from "../orchestration-v2/ResourceCleanupServ
4748
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
4849
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
4950
import * as ServerSettings from "../serverSettings.ts";
51+
import * as AnalyticsService from "../telemetry/AnalyticsService.ts";
5052
import * as GuestShareService from "./GuestShareService.ts";
5153

5254
const instanceId = ProviderInstanceId.make("codex");
@@ -104,6 +106,26 @@ const layerCleanup = Layer.effect(
104106
};
105107
}),
106108
).pipe(Layer.provide(layerConfig), Layer.provide(NodeServices.layer));
109+
class RecordedAnalytics extends Context.Service<
110+
RecordedAnalytics,
111+
Ref.Ref<ReadonlyArray<Readonly<Record<string, unknown>>>>
112+
>()("t3/guest/GuestShareService.test/RecordedAnalytics") {}
113+
const layerAnalytics = Layer.effectContext(
114+
Effect.gen(function* () {
115+
const recorded = yield* Ref.make<ReadonlyArray<Readonly<Record<string, unknown>>>>([]);
116+
return Context.make(RecordedAnalytics, recorded).pipe(
117+
Context.add(
118+
AnalyticsService.AnalyticsService,
119+
AnalyticsService.AnalyticsService.of({
120+
record: (event, properties) =>
121+
Ref.update(recorded, (events) => [...events, { event, ...properties }]),
122+
flush: Effect.void,
123+
recordOwners: () => Effect.void,
124+
}),
125+
),
126+
);
127+
}),
128+
);
107129
const layerTest = GuestShareService.layer.pipe(
108130
Layer.provideMerge(
109131
CommandOutputHub.layer.pipe(
@@ -113,6 +135,7 @@ const layerTest = GuestShareService.layer.pipe(
113135
Layer.provide(layerProviders),
114136
Layer.provideMerge(ServerSettings.layerTest({ guestSharingEnabled: true })),
115137
Layer.provide(layerConnect),
138+
Layer.provideMerge(layerAnalytics),
116139
Layer.provide(ServerSecretStore.layer),
117140
Layer.provideMerge(layerConfig),
118141
Layer.provideMerge(NodeServices.layer),
@@ -172,6 +195,18 @@ it.effect("spends an invite once and ends the guest stream when the owner stops
172195
}).pipe(Effect.provide(layerTest)),
173196
);
174197

198+
it.effect("counts a guest joining and sending, without their name or text", () =>
199+
Effect.gen(function* () {
200+
const { guestShares, credential } = yield* shareThread;
201+
const { token: session, shareId } = yield* guestShares.redeem({ credential, name: "Sam" });
202+
yield* guestShares.submit(session, { shareId, text: "Hello" }, []);
203+
assert.deepEqual(yield* Ref.get(yield* RecordedAnalytics), [
204+
{ event: "feature.used", feature: "guest_share.join" },
205+
{ event: "feature.used", feature: "guest_message.submit", variant: "text_only" },
206+
]);
207+
}).pipe(Effect.provide(layerTest)),
208+
);
209+
175210
it.effect("streams the owner's thread events after the share and a snapshot", () =>
176211
Effect.gen(function* () {
177212
const { orchestrator, guestShares, credential } = yield* shareThread;

‎apps/server/src/guest/GuestShareService.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import {
5858
} from "../orchestration-v2/WireProjection.ts";
5959
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
6060
import * as ServerSettings from "../serverSettings.ts";
61+
import * as AnalyticsService from "../telemetry/AnalyticsService.ts";
6162
import { guestShareView, guestThreadModel } from "./guestView.ts";
6263
import {
6364
classifyGuestUploads,
@@ -215,6 +216,7 @@ const make = Effect.gen(function* () {
215216
const fileSystem = yield* FileSystem.FileSystem;
216217
const crypto = yield* Crypto.Crypto;
217218
const secretStore = yield* ServerSecretStore.ServerSecretStore;
219+
const analytics = yield* AnalyticsService.AnalyticsService;
218220
const signingKey = yield* Effect.cached(
219221
secretStore.getOrCreateRandom(SIGNING_SECRET_NAME, 32).pipe(Effect.orDie),
220222
);
@@ -357,6 +359,8 @@ const make = Effect.gen(function* () {
357359
shareId: share.id,
358360
guestName: request.name,
359361
});
362+
// Guests have no client connection, so their events carry no surface.
363+
yield* analytics.record("feature.used", { feature: "guest_share.join" });
360364
const token = yield* signSession({ kind: "session", threadId: thread.id, shareId: share.id });
361365
return { token, shareId: share.id };
362366
});
@@ -447,6 +451,10 @@ const make = Effect.gen(function* () {
447451
text: request.text,
448452
...(attachments.length === 0 ? {} : { attachments }),
449453
}).pipe(Effect.onError(() => removeStored(attachments)));
454+
yield* analytics.record("feature.used", {
455+
feature: "guest_message.submit",
456+
variant: attachments.length === 0 ? "text_only" : "with_files",
457+
});
450458
});
451459

452460
/** Completes once the session no longer opens its share, so open reads end with it. */

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,7 @@ it.layer(layerTest)("orchestration V2 foundation persistence", (it) => {
931931
messageEvent("message-1", "streaming"),
932932
nodeEvent("node-1", "running"),
933933
itemEvent("item-1", "streaming"),
934+
itemEvent("item-middle", "still streaming"),
934935
...Array.from({ length: 501 }, (_, index) =>
935936
threadStateEvent(`history-${index}`, "thread.visited"),
936937
),

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,12 @@ export const layer: Layer.Layer<
222222

223223
const supersedableThreadEventTypes = new Set(SUPERSEDABLE_THREAD_EVENT_TYPES);
224224
const readStateThreadEventTypes = new Set(READ_STATE_THREAD_EVENT_TYPES);
225-
// Keep subagent.updated and turn-item.updated rows: slimmed payloads reference their prompts.
226-
// Bound each reader request and writer delete, including when the reader
227-
// worker is unavailable and discovery falls back to the writer.
225+
// Subagent snapshots stay intact because later rows can reference an earlier prompt.
226+
// Commanded turn items stay for command-result replay.
227+
// Small pages bound work on the reader worker and synchronous fallback.
228228
const COMPACTION_PAGE_SIZE = 50;
229229

230-
/** Retain newest and oldest keyed events to preserve client insertion order; page all events to bound sparse scans.
231-
* Keep turn-item.updated because replay assigns positions on first write. */
230+
// Keep first/latest keyed events for replay order; page every event to bound sparse scans.
232231
const compactEventStore = Effect.fn("ProjectionMaintenance.compactEventStore")(function* (
233232
betweenPages: Effect.Effect<void> = Effect.void,
234233
) {
@@ -269,6 +268,11 @@ export const layer: Layer.Layer<
269268
WHEN event.application_event_version = 2
270269
AND event.event_type IN ('message.updated', 'node.updated')
271270
THEN json_extract(event.payload_json, '$.id')
271+
WHEN event.application_event_version = 2
272+
AND event.event_type = 'turn-item.updated'
273+
AND event.command_id IS NULL
274+
AND json_extract(event.payload_json, '$.type') <> 'subagent'
275+
THEN json_extract(event.payload_json, '$.id')
272276
WHEN event.application_event_version = 2
273277
AND event.event_type = 'thread.pull-request-link-updated'
274278
THEN json_array(json_extract(event.payload_json, '$.host'),
@@ -321,7 +325,8 @@ export const layer: Layer.Layer<
321325
} else if (
322326
row.event_type === "thread.pull-request-link-updated" ||
323327
row.event_type === "message.updated" ||
324-
row.event_type === "node.updated"
328+
row.event_type === "node.updated" ||
329+
(row.event_type === "turn-item.updated" && row.entity_id !== null)
325330
) {
326331
const key = encodeEntityKey([row.event_type, row.stream_id, row.entity_id]);
327332
const candidate = oldestCandidateByEntityKey.get(key);

0 commit comments

Comments
 (0)