Skip to content

Commit 1af8726

Browse files
juliusmarmingecodex
juliusmarminge
and
codex
committed
Complete Expo 56 relay integration and align Clerk packages
Co-authored-by: codex <codex@users.noreply.github.com>
1 parent 32c3c2a commit 1af8726

7 files changed

Lines changed: 67 additions & 32 deletions

File tree

‎apps/mobile/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"dependencies": {
3838
"@callstack/liquid-glass": "^0.7.1",
39-
"@clerk/expo": "^3.2.16",
39+
"@clerk/expo": "^3.3.0",
4040
"@effect/atom-react": "catalog:",
4141
"@expo-google-fonts/dm-sans": "^0.4.2",
4242
"@expo/ui": "~56.0.8",

‎apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/// <reference types="node" />
2+
13
import * as NodeCrypto from "node:crypto";
24

35
import { beforeEach, vi } from "vitest";

‎apps/mobile/src/features/cloud/dpop.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/// <reference types="node" />
2+
13
import * as NodeCrypto from "node:crypto";
24

35
import { vi } from "vitest";

‎apps/mobile/src/widgets/AgentActivity.tsx‎

Lines changed: 55 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export interface AgentActivityProps {
4040

4141
function AgentActivity(
4242
props: AgentActivityProps,
43-
_environment: LiveActivityEnvironment,
43+
environment: LiveActivityEnvironment,
4444
): LiveActivityLayout {
4545
"widget";
4646

@@ -49,8 +49,13 @@ function AgentActivity(
4949
const row2 = props.activities[2];
5050
const updatedAt = formatAgentActivityUpdatedAtLabel(props.updatedAt);
5151
const activeLabel = `${props.activeCount} active`;
52-
const tint =
53-
row0?.phase === "waiting_for_approval" || row0?.phase === "waiting_for_input"
52+
const isLight = environment.colorScheme === "light";
53+
const primaryForeground = isLight ? "#0f172a" : "#ffffff";
54+
const secondaryForeground = isLight ? "#475569" : "#cbd5e1";
55+
const mutedForeground = isLight ? "#64748b" : "#94a3b8";
56+
const tint = environment.isLuminanceReduced
57+
? secondaryForeground
58+
: row0?.phase === "waiting_for_approval" || row0?.phase === "waiting_for_input"
5459
? "#f97316"
5560
: row0?.phase === "failed"
5661
? "#ef4444"
@@ -61,10 +66,14 @@ function AgentActivity(
6166
<VStack modifiers={[padding({ all: 14 })]}>
6267
<HStack>
6368
<VStack>
64-
<Text modifiers={[font({ weight: "bold", size: 15 }), foregroundStyle("#ffffff")]}>
69+
<Text
70+
modifiers={[font({ weight: "bold", size: 15 }), foregroundStyle(primaryForeground)]}
71+
>
6572
{props.title}
6673
</Text>
67-
<Text modifiers={[font({ size: 12 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
74+
<Text
75+
modifiers={[font({ size: 12 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
76+
>
6877
{props.subtitle}
6978
</Text>
7079
</VStack>
@@ -79,13 +88,15 @@ function AgentActivity(
7988
<Text
8089
modifiers={[
8190
font({ weight: "bold", size: 13 }),
82-
foregroundStyle("#ffffff"),
91+
foregroundStyle(primaryForeground),
8392
lineLimit(1),
8493
]}
8594
>
8695
{row0.threadTitle}
8796
</Text>
88-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
97+
<Text
98+
modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
99+
>
89100
{row0.projectTitle} - {row0.modelTitle}
90101
</Text>
91102
</VStack>
@@ -101,13 +112,15 @@ function AgentActivity(
101112
<Text
102113
modifiers={[
103114
font({ weight: "bold", size: 13 }),
104-
foregroundStyle("#ffffff"),
115+
foregroundStyle(primaryForeground),
105116
lineLimit(1),
106117
]}
107118
>
108119
{row1.threadTitle}
109120
</Text>
110-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
121+
<Text
122+
modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
123+
>
111124
{row1.projectTitle} - {row1.modelTitle}
112125
</Text>
113126
</VStack>
@@ -123,13 +136,15 @@ function AgentActivity(
123136
<Text
124137
modifiers={[
125138
font({ weight: "bold", size: 13 }),
126-
foregroundStyle("#ffffff"),
139+
foregroundStyle(primaryForeground),
127140
lineLimit(1),
128141
]}
129142
>
130143
{row2.threadTitle}
131144
</Text>
132-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
145+
<Text
146+
modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
147+
>
133148
{row2.projectTitle} - {row2.modelTitle}
134149
</Text>
135150
</VStack>
@@ -139,15 +154,17 @@ function AgentActivity(
139154
</Text>
140155
</HStack>
141156
) : null}
142-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#94a3b8")]}>
157+
<Text modifiers={[font({ size: 11 }), foregroundStyle(mutedForeground)]}>
143158
Updated {updatedAt}
144159
</Text>
145160
</VStack>
146161
),
147162
bannerSmall: (
148163
<VStack modifiers={[padding({ all: 12 })]}>
149164
<HStack>
150-
<Text modifiers={[font({ weight: "bold", size: 13 }), foregroundStyle("#ffffff")]}>
165+
<Text
166+
modifiers={[font({ weight: "bold", size: 13 }), foregroundStyle(primaryForeground)]}
167+
>
151168
{props.title}
152169
</Text>
153170
<Spacer minLength={6} />
@@ -160,13 +177,15 @@ function AgentActivity(
160177
<Text
161178
modifiers={[
162179
font({ weight: "bold", size: 12 }),
163-
foregroundStyle("#ffffff"),
180+
foregroundStyle(primaryForeground),
164181
lineLimit(1),
165182
]}
166183
>
167184
{row0.threadTitle}
168185
</Text>
169-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
186+
<Text
187+
modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
188+
>
170189
{row0.projectTitle} - {row0.status}
171190
</Text>
172191
</VStack>
@@ -194,17 +213,23 @@ function AgentActivity(
194213
expandedCenter: row0 ? (
195214
<VStack>
196215
<Text
197-
modifiers={[font({ weight: "bold", size: 12 }), foregroundStyle("#ffffff"), lineLimit(1)]}
216+
modifiers={[
217+
font({ weight: "bold", size: 12 }),
218+
foregroundStyle(primaryForeground),
219+
lineLimit(1),
220+
]}
198221
>
199222
{row0.threadTitle}
200223
</Text>
201-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
224+
<Text modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}>
202225
{row0.projectTitle} - {row0.status}
203226
</Text>
204227
</VStack>
205228
) : null,
206229
expandedTrailing: (
207-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1")]}>Updated {updatedAt}</Text>
230+
<Text modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground)]}>
231+
Updated {updatedAt}
232+
</Text>
208233
),
209234
expandedBottom: (
210235
<VStack modifiers={[padding({ all: 8 })]}>
@@ -214,13 +239,15 @@ function AgentActivity(
214239
<Text
215240
modifiers={[
216241
font({ weight: "bold", size: 13 }),
217-
foregroundStyle("#ffffff"),
242+
foregroundStyle(primaryForeground),
218243
lineLimit(1),
219244
]}
220245
>
221246
{row0.threadTitle}
222247
</Text>
223-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
248+
<Text
249+
modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
250+
>
224251
{row0.projectTitle} - {row0.modelTitle}
225252
</Text>
226253
</VStack>
@@ -236,13 +263,15 @@ function AgentActivity(
236263
<Text
237264
modifiers={[
238265
font({ weight: "bold", size: 13 }),
239-
foregroundStyle("#ffffff"),
266+
foregroundStyle(primaryForeground),
240267
lineLimit(1),
241268
]}
242269
>
243270
{row1.threadTitle}
244271
</Text>
245-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
272+
<Text
273+
modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
274+
>
246275
{row1.projectTitle} - {row1.modelTitle}
247276
</Text>
248277
</VStack>
@@ -258,13 +287,15 @@ function AgentActivity(
258287
<Text
259288
modifiers={[
260289
font({ weight: "bold", size: 13 }),
261-
foregroundStyle("#ffffff"),
290+
foregroundStyle(primaryForeground),
262291
lineLimit(1),
263292
]}
264293
>
265294
{row2.threadTitle}
266295
</Text>
267-
<Text modifiers={[font({ size: 11 }), foregroundStyle("#cbd5e1"), lineLimit(1)]}>
296+
<Text
297+
modifiers={[font({ size: 11 }), foregroundStyle(secondaryForeground), lineLimit(1)]}
298+
>
268299
{row2.projectTitle} - {row2.modelTitle}
269300
</Text>
270301
</VStack>

‎apps/web/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
},
1515
"dependencies": {
1616
"@base-ui/react": "^1.4.1",
17-
"@clerk/clerk-js": "^6.12.1",
18-
"@clerk/react": "^6.7.1",
17+
"@clerk/clerk-js": "^6.13.0",
18+
"@clerk/react": "^6.7.2",
1919
"@dnd-kit/core": "^6.3.1",
2020
"@dnd-kit/modifiers": "^9.0.0",
2121
"@dnd-kit/sortable": "^10.0.0",

‎bun.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infra/relay/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"typecheck": "tsc --noEmit"
1212
},
1313
"dependencies": {
14-
"@clerk/backend": "^3.4.13",
14+
"@clerk/backend": "^3.4.14",
1515
"@distilled.cloud/cloudflare": "^0.21.5",
1616
"@effect/sql-pg": "catalog:",
1717
"@t3tools/client-runtime": "workspace:*",

0 commit comments

Comments
 (0)