Skip to content

Commit df9c19b

Browse files
Merge branch 'main' into fix/sidebarv2-new-thread-tooltip-shortcut
2 parents 8a18036 + bfc69e4 commit df9c19b

24 files changed

Lines changed: 1099 additions & 365 deletions

‎apps/mobile/app.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ const config: ExpoConfig = {
161161
slug: "t3-code",
162162
platforms: ["ios", "android"],
163163
scheme: variant.scheme,
164-
version: "1.0.1",
164+
version: "1.0.2",
165165
runtimeVersion: {
166166
// Fingerprint (not appVersion) so an OTA only reaches binaries whose native
167167
// project — native deps, config plugins, AND patches/ — matches the update.

‎apps/mobile/modules/t3-terminal/ios/T3TerminalView.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,12 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate {
535535
return
536536
}
537537

538+
if buffer.isEmpty {
539+
feedData(Data("\u{1B}[3J\u{1B}[H\u{1B}[2J".utf8))
540+
lastAppliedBuffer = ""
541+
return
542+
}
543+
538544
if buffer.hasPrefix(lastAppliedBuffer) {
539545
let suffix = String(buffer.dropFirst(lastAppliedBuffer.count))
540546
feedData(Data(suffix.utf8))

‎apps/mobile/src/features/connection/ConnectionsRouteScreen.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ export function ConnectionsRouteScreen() {
5858
contentInsetAdjustmentBehavior="automatic"
5959
showsVerticalScrollIndicator={false}
6060
className="flex-1"
61-
contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
6261
contentContainerStyle={{
62+
paddingBottom: Math.max(insets.bottom, 18) + 18,
6363
paddingHorizontal: 20,
6464
paddingTop: 16,
6565
}}

‎apps/mobile/src/features/settings/SettingsAuthRouteScreen.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useAuth } from "@clerk/expo";
22
import { AuthView, UserProfileView } from "@clerk/expo/native";
33
import { StackActions, useNavigation } from "@react-navigation/native";
44
import { NativeStackScreenOptions } from "../../native/StackHeader";
5-
import { useEffect } from "react";
5+
import { useCallback, useEffect } from "react";
66
import { View } from "react-native";
77

88
import { hasCloudPublicConfig } from "../cloud/publicConfig";
@@ -21,16 +21,18 @@ export function SettingsAuthRouteScreen() {
2121

2222
function ConfiguredSettingsAuthRouteScreen() {
2323
const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
24+
const navigation = useNavigation();
25+
const handleHostBack = useCallback(() => navigation.goBack(), [navigation]);
2426

2527
return (
2628
<>
27-
<NativeStackScreenOptions options={{ title: isSignedIn ? "Account" : "Sign in" }} />
29+
<NativeStackScreenOptions options={{ headerShown: false }} />
2830
<View collapsable={false} className="flex-1 overflow-hidden bg-sheet">
2931
{isLoaded ? (
3032
isSignedIn ? (
31-
<UserProfileView isDismissible={false} />
33+
<UserProfileView isDismissible={false} onHostBack={handleHostBack} />
3234
) : (
33-
<AuthView isDismissible={false} />
35+
<AuthView isDismissible={false} onHostBack={handleHostBack} />
3436
)
3537
) : null}
3638
</View>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,9 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
235235
contentInsetAdjustmentBehavior="automatic"
236236
showsVerticalScrollIndicator={false}
237237
className="flex-1"
238-
contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
239238
contentContainerStyle={{
240239
gap: 12,
241-
paddingBottom: 8,
240+
paddingBottom: Math.max(insets.bottom, 18) + 18,
242241
paddingHorizontal: 20,
243242
paddingTop: 8,
244243
}}

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
Image,
2222
Platform,
2323
Pressable,
24+
StyleSheet,
2425
useColorScheme,
2526
View,
2627
type ViewStyle,
@@ -698,11 +699,22 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
698699
style={{
699700
paddingTop: isExpanded ? 8 : 6,
700701
paddingBottom: (props.bottomInset ?? 0) + (isExpanded ? 8 : 6),
701-
experimental_backgroundImage: isDarkMode
702-
? "linear-gradient(to bottom, rgba(0,0,0,0) 0%, rgba(0,0,0,0.6) 55%, rgba(0,0,0,0.9) 100%)"
703-
: "linear-gradient(to bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,0.6) 55%, rgba(255,255,255,0.9) 100%)",
704702
}}
705703
>
704+
{/* The backdrop gradient lives on a plain View: Reanimated's Animated.View
705+
silently drops experimental_backgroundImage on Android, which left this
706+
strip fully transparent and the feed text legible through the composer. */}
707+
<View
708+
pointerEvents="none"
709+
style={[
710+
StyleSheet.absoluteFill,
711+
{
712+
experimental_backgroundImage: isDarkMode
713+
? "linear-gradient(to bottom, rgba(0,0,0,0) 0%, rgba(0,0,0,0.6) 55%, rgba(0,0,0,0.9) 100%)"
714+
: "linear-gradient(to bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,0.6) 55%, rgba(255,255,255,0.9) 100%)",
715+
},
716+
]}
717+
/>
706718
<Animated.View
707719
className="relative w-full self-center"
708720
layout={COMPOSER_LAYOUT_TRANSITION}

‎apps/server/integration/providerService.integration.test.ts‎

Lines changed: 109 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import * as FileSystem from "effect/FileSystem";
88
import * as Layer from "effect/Layer";
99
import * as Path from "effect/Path";
1010
import * as Queue from "effect/Queue";
11+
import * as Ref from "effect/Ref";
1112
import * as Stream from "effect/Stream";
1213

1314
import { ProviderAdapterRegistry } from "../src/provider/Services/ProviderAdapterRegistry.ts";
@@ -54,35 +55,58 @@ interface IntegrationFixture {
5455
readonly layer: Layer.Layer<ProviderService, unknown, never>;
5556
}
5657

57-
const makeIntegrationFixture = Effect.gen(function* () {
58-
const cwd = yield* makeWorkspaceDirectory;
59-
const harness = yield* makeTestProviderAdapterHarness();
60-
61-
const registry = makeAdapterRegistryMock({
62-
[ProviderDriverKind.make("codex")]: harness.adapter,
63-
});
58+
interface RecordedAnalyticsEvent {
59+
readonly event: string;
60+
readonly properties: Readonly<Record<string, unknown>> | undefined;
61+
}
6462

65-
const directoryLayer = ProviderSessionDirectoryLive.pipe(
66-
Layer.provide(ProviderSessionRuntime.layer),
63+
/**
64+
* Analytics layer that keeps captured events in memory so tests can assert on
65+
* telemetry payloads. `AnalyticsService.layerTest` discards them.
66+
*/
67+
const makeRecordingAnalytics = Effect.gen(function* () {
68+
const recorded = yield* Ref.make<ReadonlyArray<RecordedAnalyticsEvent>>([]);
69+
const layer = Layer.succeed(
70+
AnalyticsService,
71+
AnalyticsService.of({
72+
record: (event, properties) =>
73+
Ref.update(recorded, (current) => [...current, { event, properties }]),
74+
flush: Effect.void,
75+
}),
6776
);
68-
69-
const shared = Layer.mergeAll(
70-
directoryLayer,
71-
Layer.succeed(ProviderAdapterRegistry, registry),
72-
ServerSettingsService.layerTest(DEFAULT_SERVER_SETTINGS),
73-
AnalyticsService.layerTest,
74-
Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers),
75-
).pipe(Layer.provide(SqlitePersistenceMemory));
76-
77-
const layer = makeProviderServiceLive().pipe(Layer.provide(shared));
78-
79-
return {
80-
cwd,
81-
harness,
82-
layer,
83-
} satisfies IntegrationFixture;
77+
return { layer, get: Ref.get(recorded) } as const;
8478
});
8579

80+
const makeIntegrationFixture = (options?: { readonly analytics?: Layer.Layer<AnalyticsService> }) =>
81+
Effect.gen(function* () {
82+
const cwd = yield* makeWorkspaceDirectory;
83+
const harness = yield* makeTestProviderAdapterHarness();
84+
85+
const registry = makeAdapterRegistryMock({
86+
[ProviderDriverKind.make("codex")]: harness.adapter,
87+
});
88+
89+
const directoryLayer = ProviderSessionDirectoryLive.pipe(
90+
Layer.provide(ProviderSessionRuntime.layer),
91+
);
92+
93+
const shared = Layer.mergeAll(
94+
directoryLayer,
95+
Layer.succeed(ProviderAdapterRegistry, registry),
96+
ServerSettingsService.layerTest(DEFAULT_SERVER_SETTINGS),
97+
options?.analytics ?? AnalyticsService.layerTest,
98+
Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers),
99+
).pipe(Layer.provide(SqlitePersistenceMemory));
100+
101+
const layer = makeProviderServiceLive().pipe(Layer.provide(shared));
102+
103+
return {
104+
cwd,
105+
harness,
106+
layer,
107+
} satisfies IntegrationFixture;
108+
});
109+
86110
const collectEventsDuring = <A, E, R>(
87111
stream: Stream.Stream<ProviderRuntimeEvent>,
88112
count: number,
@@ -126,7 +150,7 @@ const runTurn = (input: {
126150

127151
it.live("replays typed runtime fixture events", () =>
128152
Effect.gen(function* () {
129-
const fixture = yield* makeIntegrationFixture;
153+
const fixture = yield* makeIntegrationFixture();
130154

131155
yield* Effect.gen(function* () {
132156
const provider = yield* ProviderService;
@@ -161,7 +185,7 @@ it.live("replays typed runtime fixture events", () =>
161185

162186
it.live("replays file-changing fixture turn events", () =>
163187
Effect.gen(function* () {
164-
const fixture = yield* makeIntegrationFixture;
188+
const fixture = yield* makeIntegrationFixture();
165189
const { join } = yield* Path.Path;
166190
const { writeFileString } = yield* FileSystem.FileSystem;
167191

@@ -198,7 +222,7 @@ it.live("replays file-changing fixture turn events", () =>
198222

199223
it.live("runs multi-turn tool/approval flow", () =>
200224
Effect.gen(function* () {
201-
const fixture = yield* makeIntegrationFixture;
225+
const fixture = yield* makeIntegrationFixture();
202226
const { join } = yield* Path.Path;
203227
const { writeFileString } = yield* FileSystem.FileSystem;
204228

@@ -250,7 +274,7 @@ it.live("runs multi-turn tool/approval flow", () =>
250274

251275
it.live("rolls back provider conversation state only", () =>
252276
Effect.gen(function* () {
253-
const fixture = yield* makeIntegrationFixture;
277+
const fixture = yield* makeIntegrationFixture();
254278
const { join } = yield* Path.Path;
255279
const { writeFileString, readFileString } = yield* FileSystem.FileSystem;
256280

@@ -302,3 +326,59 @@ it.live("rolls back provider conversation state only", () =>
302326
}).pipe(Effect.provide(fixture.layer));
303327
}).pipe(Effect.provide(NodeServices.layer)),
304328
);
329+
330+
it.live("reports runtime mode per turn and on mode transitions", () =>
331+
Effect.gen(function* () {
332+
const analytics = yield* makeRecordingAnalytics;
333+
const fixture = yield* makeIntegrationFixture({ analytics: analytics.layer });
334+
const threadId = ThreadId.make("thread-integration-runtime-mode");
335+
336+
yield* Effect.gen(function* () {
337+
const provider = yield* ProviderService;
338+
const startSession = (runtimeMode: "approval-required" | "full-access") =>
339+
provider.startSession(threadId, {
340+
threadId,
341+
provider: ProviderDriverKind.make("codex"),
342+
providerInstanceId: codexInstanceId,
343+
cwd: fixture.cwd,
344+
runtimeMode,
345+
});
346+
347+
yield* startSession("approval-required");
348+
yield* runTurn({
349+
provider,
350+
harness: fixture.harness,
351+
threadId,
352+
userText: "supervised turn",
353+
response: { events: codexTurnTextFixture },
354+
});
355+
356+
// Toggling the mode restarts the session, which is the only place the
357+
// transition is observable.
358+
yield* startSession("full-access");
359+
yield* runTurn({
360+
provider,
361+
harness: fixture.harness,
362+
threadId,
363+
userText: "full access turn",
364+
response: { events: codexTurnTextFixture },
365+
});
366+
367+
const recorded = yield* analytics.get;
368+
369+
assert.deepEqual(
370+
recorded
371+
.filter((entry) => entry.event === "provider.turn.sent")
372+
.map((entry) => entry.properties?.runtimeMode),
373+
["approval-required", "full-access"],
374+
);
375+
376+
assert.deepEqual(
377+
recorded
378+
.filter((entry) => entry.event === "provider.runtime_mode.changed")
379+
.map((entry) => [entry.properties?.from, entry.properties?.to]),
380+
[["approval-required", "full-access"]],
381+
);
382+
}).pipe(Effect.provide(fixture.layer));
383+
}).pipe(Effect.provide(NodeServices.layer)),
384+
);

‎apps/server/src/provider/Layers/ProviderService.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
459459
adapter,
460460
instanceId,
461461
threadId: input.threadId,
462+
runtimeMode: binding.runtimeMode,
462463
isActive: true,
463464
} as const;
464465
}
@@ -468,6 +469,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
468469
adapter,
469470
instanceId,
470471
threadId: input.threadId,
472+
runtimeMode: binding.runtimeMode,
471473
isActive: false,
472474
} as const;
473475
}
@@ -480,6 +482,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
480482
adapter: recovered.adapter,
481483
instanceId,
482484
threadId: input.threadId,
485+
runtimeMode: recovered.session.runtimeMode,
483486
isActive: true,
484487
} as const;
485488
});
@@ -629,6 +632,19 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
629632
input.modelSelection.model.trim().length > 0,
630633
});
631634

635+
// Changing runtime mode restarts the session, so the transition is only
636+
// observable here, by diffing against the mode the previous session for
637+
// this thread was bound to. Recording it separately is what makes the
638+
// "started supervised, switched to full access" funnel answerable.
639+
const previousRuntimeMode = persistedBinding?.runtimeMode;
640+
if (previousRuntimeMode !== undefined && previousRuntimeMode !== input.runtimeMode) {
641+
yield* analytics.record("provider.runtime_mode.changed", {
642+
provider: sessionWithInstance.provider,
643+
from: previousRuntimeMode,
644+
to: input.runtimeMode,
645+
});
646+
}
647+
632648
return sessionWithInstance;
633649
}).pipe(
634650
withMetrics({
@@ -703,6 +719,10 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
703719
provider: routed.adapter.provider,
704720
model: input.modelSelection?.model,
705721
interactionMode: input.interactionMode,
722+
// Session-start events alone skew runtime mode toward users who toggle
723+
// often, since every toggle restarts the session. Recording it per turn
724+
// gives a usage-weighted view and lets it cross with interactionMode.
725+
runtimeMode: routed.runtimeMode,
706726
attachmentCount: input.attachments.length,
707727
hasInput: typeof input.input === "string" && input.input.trim().length > 0,
708728
});

‎apps/web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@dnd-kit/utilities": "^3.2.2",
2222
"@effect/atom-react": "catalog:",
2323
"@formkit/auto-animate": "^0.9.0",
24-
"@legendapp/list": "3.2.0",
24+
"@legendapp/list": "3.3.3",
2525
"@lexical/react": "^0.41.0",
2626
"@pierre/diffs": "catalog:",
2727
"@pierre/trees": "1.0.0-beta.4",

0 commit comments

Comments
 (0)