Skip to content

Commit e901f82

Browse files
committed
fix(server): sync requested browser verification with main
2 parents e3e6b9d + 36dac68 commit e901f82

46 files changed

Lines changed: 2532 additions & 194 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
name: Mobile EAS Preview (Fork)
2+
3+
# EAS previews for fork PRs. This runs the PR's code with an Expo token: the
4+
# app config and plugins run on this runner, and native builds run on EAS
5+
# with preview signing credentials. The label is the maintainer's sign-off
6+
# that they reviewed that code, so it covers exactly the commit it was applied
7+
# to: this pins that commit and consumes the label before running anything. A
8+
# later push deploys nothing until the label is applied again.
9+
#
10+
# Same-repo PRs deploy on every push while labeled, via mobile-eas-preview.yml.
11+
12+
on:
13+
pull_request_target:
14+
types: [labeled]
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
preview:
21+
name: EAS Preview
22+
if: >-
23+
github.event.pull_request.head.repo.full_name != github.repository &&
24+
github.event.label.name == '🚀 Mobile Continuous Deployment'
25+
runs-on: blacksmith-8vcpu-ubuntu-2404
26+
concurrency:
27+
group: mobile-eas-preview-fork-${{ github.event.pull_request.number }}
28+
cancel-in-progress: true
29+
permissions:
30+
contents: read
31+
pull-requests: write
32+
env:
33+
APP_VARIANT: preview
34+
NODE_OPTIONS: --max-old-space-size=8192
35+
MOBILE_VERSION_POLICY: fingerprint
36+
steps:
37+
# If a maintainer removed the label first, that removal wins.
38+
- id: consume
39+
name: Consume the deployment label
40+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
41+
with:
42+
script: |
43+
try {
44+
await github.rest.issues.removeLabel({
45+
owner: context.repo.owner,
46+
repo: context.repo.repo,
47+
issue_number: context.payload.pull_request.number,
48+
name: context.payload.label.name,
49+
});
50+
core.setOutput("consumed", "true");
51+
} catch (error) {
52+
if (error.status !== 404) throw error;
53+
core.info("The label was removed before this run could consume it. Skipping.");
54+
core.setOutput("consumed", "false");
55+
}
56+
57+
- id: expo-token
58+
name: Check for EXPO_PREVIEW_TOKEN
59+
if: steps.consume.outputs.consumed == 'true'
60+
env:
61+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
62+
run: |
63+
if [ -n "$EXPO_TOKEN" ]; then
64+
echo "present=true" >> "$GITHUB_OUTPUT"
65+
else
66+
echo "present=false" >> "$GITHUB_OUTPUT"
67+
echo "EXPO_PREVIEW_TOKEN is not set; skipping EAS preview."
68+
fi
69+
70+
# The head SHA from the label event, not the branch, so a push after the
71+
# label cannot swap in unreviewed code. No credentials stay in .git for
72+
# the PR's scripts to read.
73+
- name: Checkout reviewed commit
74+
if: steps.expo-token.outputs.present == 'true'
75+
uses: actions/checkout@v6
76+
with:
77+
ref: ${{ github.event.pull_request.head.sha }}
78+
fetch-depth: 0
79+
persist-credentials: false
80+
# No sparse-checkout: see mobile-eas-preview.yml.
81+
82+
# No caches: pull_request_target saves them under main's scope, where
83+
# trusted workflows with other secrets would restore what PR code wrote.
84+
- name: Setup Vite+
85+
if: steps.expo-token.outputs.present == 'true'
86+
uses: voidzero-dev/setup-vp@v1
87+
with:
88+
node-version-file: package.json
89+
cache: false
90+
run-install: |
91+
args:
92+
- --filter=@t3tools/mobile...
93+
94+
- name: Expose pnpm
95+
if: steps.expo-token.outputs.present == 'true'
96+
run: |
97+
pnpm_version="$(node --print "require('./package.json').packageManager.split('@').pop()")"
98+
vp_pnpm_bin="$HOME/.vite-plus/package_manager/pnpm/$pnpm_version/pnpm/bin"
99+
echo "$vp_pnpm_bin" >> "$GITHUB_PATH"
100+
"$vp_pnpm_bin/pnpm" --version
101+
102+
- name: Setup EAS
103+
if: steps.expo-token.outputs.present == 'true'
104+
uses: expo/expo-github-action@v8
105+
with:
106+
# Pinned and installed with npm for the same reasons as mobile-eas-preview.yml.
107+
eas-version: 21.8.0
108+
eas-cache: false
109+
token: ${{ secrets.EXPO_PREVIEW_TOKEN }}
110+
packager: npm
111+
112+
- name: Pull preview environment variables
113+
if: steps.expo-token.outputs.present == 'true'
114+
working-directory: apps/mobile
115+
env:
116+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
117+
run: |
118+
eas env:pull preview --non-interactive
119+
# See mobile-eas-preview.yml: keeps Android build and OTA fingerprints matching.
120+
node --input-type=module <<'NODE'
121+
import { appendFileSync, readFileSync } from "node:fs";
122+
import { parseEnv } from "node:util";
123+
const env = parseEnv(readFileSync(".env.local", "utf8"));
124+
const googleServicesFile = env.T3CODE_ANDROID_GOOGLE_SERVICES_FILE;
125+
if (googleServicesFile) {
126+
appendFileSync(process.env.GITHUB_ENV, `T3CODE_ANDROID_GOOGLE_SERVICES_FILE=${googleServicesFile}\n`);
127+
}
128+
NODE
129+
130+
- name: Deploy with fingerprint check
131+
if: steps.expo-token.outputs.present == 'true'
132+
uses: expo/expo-github-action/continuous-deploy-fingerprint@main
133+
env:
134+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
135+
RUNNER_DEBUG: "1"
136+
# The action only comments for pull_request events; this hook gives
137+
# it the PR under pull_request_target. Without it, it skips the comment.
138+
EXPO_TEST_GITHUB_PULL: ${{ github.event.pull_request.number }}
139+
with:
140+
profile: preview:dev
141+
branch: pr-${{ github.event.pull_request.number }}
142+
platform: all
143+
environment: preview
144+
working-directory: apps/mobile
145+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/mobile-eas-preview.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ on:
77
jobs:
88
preview:
99
name: EAS Preview
10+
# Fork PRs deploy one reviewed commit per label through mobile-eas-preview-fork.yml.
1011
if: |
12+
github.event.pull_request.head.repo.full_name == github.repository &&
1113
contains(github.event.pull_request.labels.*.name, '🚀 Mobile Continuous Deployment') &&
1214
(github.event.action != 'labeled' || github.event.label.name == '🚀 Mobile Continuous Deployment')
1315
runs-on: blacksmith-8vcpu-ubuntu-2404
@@ -23,15 +25,15 @@ jobs:
2325
MOBILE_VERSION_POLICY: fingerprint
2426
steps:
2527
- id: expo-token
26-
name: Check for EXPO_TOKEN
28+
name: Check for EXPO_PREVIEW_TOKEN
2729
env:
28-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
30+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
2931
run: |
3032
if [ -n "$EXPO_TOKEN" ]; then
3133
echo "present=true" >> "$GITHUB_OUTPUT"
3234
else
3335
echo "present=false" >> "$GITHUB_OUTPUT"
34-
echo "EXPO_TOKEN is not available; skipping EAS preview."
36+
echo "EXPO_PREVIEW_TOKEN is not available; skipping EAS preview."
3537
fi
3638
3739
- name: Checkout
@@ -70,7 +72,7 @@ jobs:
7072
# continuous-deploy-fingerprint still reads `build.project.ownerAccount`.
7173
# Unpin once https://github.com/expo/expo-github-action/issues/358 is fixed.
7274
eas-version: 21.8.0
73-
token: ${{ secrets.EXPO_TOKEN }}
75+
token: ${{ secrets.EXPO_PREVIEW_TOKEN }}
7476
# npm, not pnpm: this only installs eas-cli into the action's own
7577
# tool dir, and pnpm 11 hard-fails that install on dtrace-provider's
7678
# ignored build script (no allowBuilds config outside the repo).
@@ -80,7 +82,7 @@ jobs:
8082
if: steps.expo-token.outputs.present == 'true'
8183
working-directory: apps/mobile
8284
env:
83-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
85+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
8486
run: |
8587
eas env:pull preview --non-interactive
8688
# EAS Update disables dotenv loading. Keep the downloaded native config
@@ -99,7 +101,7 @@ jobs:
99101
if: steps.expo-token.outputs.present == 'true'
100102
uses: expo/expo-github-action/continuous-deploy-fingerprint@main
101103
env:
102-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
104+
EXPO_TOKEN: ${{ secrets.EXPO_PREVIEW_TOKEN }}
103105
# The Expo action otherwise suppresses the EAS command's failure output.
104106
RUNNER_DEBUG: "1"
105107
with:

‎.github/workflows/mobile-eas-production.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ jobs:
9797
- id: expo-token
9898
name: Check for EXPO_TOKEN
9999
env:
100-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
100+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
101101
run: |
102102
if [ -n "$EXPO_TOKEN" ]; then
103103
echo "present=true" >> "$GITHUB_OUTPUT"
104104
else
105105
echo "present=false" >> "$GITHUB_OUTPUT"
106-
echo "EXPO_TOKEN is not available; skipping EAS production job."
106+
echo "EXPO_PRODUCTION_TOKEN is not available; skipping EAS production job."
107107
fi
108108
109109
- id: version_app_token
@@ -149,7 +149,7 @@ jobs:
149149
uses: expo/expo-github-action@v8
150150
with:
151151
eas-version: latest
152-
token: ${{ secrets.EXPO_TOKEN }}
152+
token: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
153153
# npm, not pnpm: this only installs eas-cli into the action's own
154154
# tool dir, and pnpm 11 hard-fails that install on dtrace-provider's
155155
# ignored build script (no allowBuilds config outside the repo).
@@ -159,7 +159,7 @@ jobs:
159159
if: steps.expo-token.outputs.present == 'true'
160160
working-directory: apps/mobile
161161
env:
162-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
162+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
163163
run: |
164164
eas env:pull production --non-interactive
165165
# EAS commands skip dotenv, and the Android fingerprint hashes this
@@ -244,7 +244,7 @@ jobs:
244244
if: steps.expo-token.outputs.present == 'true' && github.event_name == 'workflow_dispatch' && inputs.mode == 'build'
245245
working-directory: apps/mobile
246246
env:
247-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
247+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
248248
MOBILE_BUILD_PROFILE: ${{ inputs.profile || 'production' }}
249249
run: eas build --platform ${{ inputs.platform }} --profile "$MOBILE_BUILD_PROFILE" --auto-submit --non-interactive --no-wait
250250

@@ -255,7 +255,7 @@ jobs:
255255
if: steps.expo-token.outputs.present == 'true' && (github.event_name == 'push' || inputs.mode == 'update')
256256
working-directory: apps/mobile
257257
env:
258-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
258+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
259259
PLATFORM: ${{ inputs.platform || 'all' }}
260260
run: |
261261
if [ "$PLATFORM" = "all" ]; then platforms="ios android"; else platforms="$PLATFORM"; fi
@@ -275,7 +275,7 @@ jobs:
275275
if: steps.expo-token.outputs.present == 'true' && github.event_name == 'workflow_dispatch' && inputs.mode == 'update'
276276
working-directory: apps/mobile
277277
env:
278-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
278+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
279279
MOBILE_BUILD_PROFILE: ${{ inputs.profile || 'production' }}
280280
OTA_MESSAGE: ${{ inputs.message || format('Production OTA ({0})', github.sha) }}
281281
run: |
@@ -299,7 +299,7 @@ jobs:
299299
if: steps.expo-token.outputs.present == 'true' && github.event_name == 'push'
300300
working-directory: apps/mobile
301301
env:
302-
EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
302+
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
303303
run: |
304304
failed=0
305305
message="$(git log -1 --pretty=%s | head -c 120) ($(git rev-parse --short=9 HEAD))"

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

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,16 @@ function renderFeedEntry(
15961596
const visibleAttachments = attachments.filter(
15971597
(attachment) => isImageAttachment(attachment) || !inlineAttachmentIds.has(attachment.id),
15981598
);
1599+
// Images sent without words show as images, not as a bubble around them.
1600+
const mediaOnly =
1601+
foldRowId === null &&
1602+
presentation.attribution !== "guest" &&
1603+
presentation.text.trim() === "" &&
1604+
visibleAttachments.length + (entry.pendingMessage?.attachments.length ?? 0) > 0 &&
1605+
visibleAttachments.every(isImageAttachment) &&
1606+
(entry.pendingMessage?.attachments ?? []).every(
1607+
(attachment) => attachment.type === "image",
1608+
);
15991609
return (
16001610
<Animated.View
16011611
className="mb-5 items-end"
@@ -1612,13 +1622,13 @@ function renderFeedEntry(
16121622
<View
16131623
className="min-w-0 rounded-[20px]"
16141624
style={{
1615-
backgroundColor: userBubbleColor,
1625+
backgroundColor: mediaOnly ? undefined : userBubbleColor,
16161626
maxWidth: props.duoColumns ? "85%" : props.userBubbleMaxWidth,
16171627
...(!bubbleBodyVisible
16181628
? null
16191629
: hasReviewCommentContext
16201630
? { width: props.reviewCommentBubbleWidth }
1621-
: hasWideBlock || foldExpanded
1631+
: hasWideBlock || foldExpanded || (mediaOnly && visibleAttachments.length > 0)
16221632
? { width: props.duoColumns ? "85%" : props.userBubbleMaxWidth }
16231633
: null),
16241634
}}
@@ -1640,7 +1650,13 @@ function renderFeedEntry(
16401650
/>
16411651
) : null}
16421652
{bubbleBodyVisible ? (
1643-
<View className={cn("gap-2 px-3.5 pb-2.5", foldRowId === null && "pt-2.5")}>
1653+
<View
1654+
className={cn(
1655+
"gap-2",
1656+
!mediaOnly && "px-3.5 pb-2.5",
1657+
!mediaOnly && foldRowId === null && "pt-2.5",
1658+
)}
1659+
>
16441660
{entry.pendingMessage?.attachments.map((attachment) =>
16451661
attachment.type === "image" && attachment.uploadedAttachmentId ? (
16461662
<MessageAttachmentImage
@@ -1649,7 +1665,11 @@ function renderFeedEntry(
16491665
attachmentId={attachment.uploadedAttachmentId}
16501666
name={attachment.name}
16511667
mimeType={attachment.mimeType}
1652-
className="h-[140px] w-[180px] rounded-[14px]"
1668+
className={
1669+
mediaOnly
1670+
? "h-[140px] w-[180px] rounded-[20px]"
1671+
: "h-[140px] w-[180px] rounded-[14px]"
1672+
}
16531673
onPressPreview={props.onPressPreview}
16541674
/>
16551675
) : attachment.type === "image" ? (
@@ -1668,7 +1688,7 @@ function renderFeedEntry(
16681688
>
16691689
<Image
16701690
source={{ uri: attachment.previewUri }}
1671-
style={{ width: 180, height: 140, borderRadius: 14 }}
1691+
style={{ width: 180, height: 140, borderRadius: mediaOnly ? 20 : 14 }}
16721692
/>
16731693
</Pressable>
16741694
) : (
@@ -1689,7 +1709,10 @@ function renderFeedEntry(
16891709
className={
16901710
inlineAttachmentIds.size
16911711
? "h-24 w-24 rounded-[14px] bg-user-bubble-foreground/15"
1692-
: "aspect-[1.3] w-full rounded-[14px] bg-user-bubble-foreground/15"
1712+
: mediaOnly
1713+
? // Matches the bubble's corners; native borders sit inside, so the edge adds no size.
1714+
"aspect-[1.3] w-full rounded-[20px] border border-border bg-user-bubble-foreground/15"
1715+
: "aspect-[1.3] w-full rounded-[14px] bg-user-bubble-foreground/15"
16931716
}
16941717
onPressPreview={props.onPressPreview}
16951718
/>
@@ -1707,7 +1730,7 @@ function renderFeedEntry(
17071730
})}
17081731
</View>
17091732
) : null}
1710-
{message.text.trim().length > 0 ? (
1733+
{presentation.text.trim().length > 0 ? (
17111734
<MarkdownImageAvailableWidthContext
17121735
value={props.userBubbleMaxWidth - USER_BUBBLE_HORIZONTAL_PADDING * 2}
17131736
>

‎apps/mobile/src/features/threads/threadQueueControlPresentation.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { EnvironmentId, RunId, ThreadId } from "@t3tools/contracts";
22
import { assistantCitationsToPlainText } from "@t3tools/shared/assistantCitations";
3+
import { isAttachmentOnlyBootstrapPrompt } from "@t3tools/shared/composerContextReferences";
34

45
export const REMOVE_QUEUED_MESSAGE_ACCESSIBILITY_LABEL = "Remove queued message";
56

@@ -35,7 +36,9 @@ export function resolveThreadQueueRowControls(input: {
3536
canSend: mutationEnabled && (input.canPromoteToSteer || input.canSendNow) && !isEditing,
3637
dismissAccessibilityLabel: REMOVE_QUEUED_MESSAGE_ACCESSIBILITY_LABEL,
3738
// Editing and sending keep the original text so quoted citations stay linked.
38-
displayText: assistantCitationsToPlainText(input.text),
39+
displayText: isAttachmentOnlyBootstrapPrompt(input.text)
40+
? ""
41+
: assistantCitationsToPlainText(input.text),
3942
isEditing,
4043
};
4144
}

0 commit comments

Comments
 (0)