Skip to content

Commit 1e36275

Browse files
Merge remote-tracking branch 'origin/main' into takeover/23966
2 parents a6dd79c + 3816296 commit 1e36275

89 files changed

Lines changed: 2351 additions & 440 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/skills/test-t3-mobile/SKILL.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ when inspecting or seeding SQLite. Stop the test server before fixture writes.
3131
From the checkout being tested on the selected device host, run:
3232

3333
```bash
34-
node scripts/mobile-native-client.ts ensure <ios|android> <device-id>
34+
vp run mobile:install <ios|android> <device-id>
3535
```
3636

37-
This reuses a matching native client or builds and installs one. Authorized
38-
mobile verification includes that build step unless the user prohibits it.
37+
This installs the dev client for the checkout's native fingerprint: from the
38+
device, the local cache, or the shared cache in seconds, building once only
39+
when no machine has that fingerprint yet (5-15 minutes, logged to the file it
40+
names). The device id may be omitted when exactly one device is booted. It
41+
prints one JSON line; on failure it names the next command. Authorized mobile
42+
verification includes that step unless the user prohibits it.
3943

4044
Start `vp run dev:client` from `apps/mobile`, or reuse a healthy Metro belonging
4145
to this checkout. Open its printed development-client URL with AgentDevice

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,18 @@ jobs:
420420
env:
421421
T3CODE_TRANSFER_BUDGET_REPORT_PATH: ${{ runner.temp }}/t3code-transfer-budget.md
422422
T3CODE_TRANSFER_BUDGET_RESULT_PATH: ${{ runner.temp }}/thread-transfer-result.json
423-
run: vp run --filter t3 test --shard ${{ matrix.shard }}/${{ strategy.job-total }}
423+
run: >-
424+
vp run test:cached -- --shard ${{ matrix.shard }}/${{ strategy.job-total }}
425+
--uncached apps/server/integration/transferBudgetV2.integration.test.ts
426+
--verify-hits 1 --report "${{ runner.temp }}/test-cache-${{ matrix.shard }}.json" apps/server
427+
428+
- name: Upload test cache measurements
429+
if: always() && steps.changes.outputs.test_server != 'false'
430+
uses: actions/upload-artifact@v7
431+
with:
432+
name: test-cache-${{ matrix.shard }}
433+
path: ${{ runner.temp }}/test-cache-${{ matrix.shard }}.json
434+
if-no-files-found: error
424435

425436
# integration/transferBudgetV2.integration.test.ts writes the report; exactly one shard
426437
# produces these files. Gating the upload on their presence keeps a

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ An empty database is a bad test. Seed your worktree's `.t3` with a copy of real
134134

135135
- Upon request, user-visible frontend changes should get one integrated pass in a real client: `test-t3-app` for web, `test-t3-mobile` for mobile. The primary agent does this once after integrating. Subagents do not launch their own dev servers. Ask permission before doing computer use or spinning up browsers.
136136

137-
For authorized mobile verification, a missing or outdated native client is a build step, not a blocker. Run `node scripts/mobile-native-client.ts ensure <ios|android> <device-id>` on the simulator host before starting Metro. It checks the local Expo fingerprint and builds/installs when needed. See `test-t3-mobile` for the full workflow.
137+
For authorized mobile verification, a missing or outdated native client is an install step, not a blocker. Run `vp run mobile:install <ios|android> [device-id]` on the device host before starting Metro; it targets the only booted simulator or connected Android device when the id is omitted. It installs the dev client for this checkout's native fingerprint from the shared cache in seconds and builds only when no machine has built it yet, so prefer it over `expo run:*`, `xcodebuild`, or `gradlew`, which rebuild from scratch. Its stdout is one JSON line; build output goes to the log it names. See `test-t3-mobile` for the full workflow.
138138

139139
## Pull requests
140140

‎apps/mobile/README.md‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,28 @@ repository-root `.env` or `.env.local`, not an `apps/mobile/.env` file. See
2222

2323
## Development
2424

25-
For simulator/emulator development, select and boot a device, then ensure its native client matches
26-
this checkout before starting Metro:
25+
For simulator, emulator, or Android phone development, boot or connect a device, then install the
26+
native client that matches this checkout before starting Metro:
2727

2828
```bash
29-
node ../../scripts/mobile-native-client.ts ensure ios <simulator-udid>
30-
# Or: node ../../scripts/mobile-native-client.ts ensure android <emulator-serial>
29+
vp run mobile:install ios [simulator-udid]
30+
# Or: vp run mobile:install android [emulator-or-phone-serial]
3131
vp run dev:client
3232
```
3333

34-
The helper compares a local Expo fingerprint and the installed binary with its last successful
35-
build record. It builds and installs missing, stale, or unverified clients and reuses matching ones.
36-
Use `check` instead of `ensure` for a read-only decision: exit 0 means compatible, 2 means a build is
37-
needed, and 1 means an operational error. Run it on the simulator host; no EAS login is required.
38-
An externally installed client is unverified until the helper builds it once.
34+
The device argument can be omitted when exactly one device is booted or connected. The helper
35+
compares this checkout's Expo fingerprint and the installed binary with its last install record,
36+
and reuses a matching client. Otherwise it installs the build for that fingerprint from
37+
`~/.cache/t3code/native-clients/artifacts`, then the shared task cache, and builds only when
38+
neither has it. One iOS simulator build serves every iPhone and iPad simulator, and one APK per
39+
ABI (x86_64 or arm64-v8a) serves every emulator and phone of that ABI. Build output goes to the
40+
log file it prints (`T3_NATIVE_CLIENT_VERBOSE=1` streams it instead). Builds are shared back when
41+
your task-cache login (`bash infra/task-cache/install.sh`) can write. `T3_NATIVE_CLIENT_CACHE=read`
42+
skips the upload and `off` skips the shared cache. Physical iPhones still use `vp run ios:dev`.
43+
44+
For a read-only decision, run `node ../../scripts/mobile-native-client.ts check <ios|android>
45+
[device]`: exit 0 means compatible, 2 means an install is needed, and 1 means an operational error.
46+
An externally installed client is unverified until the helper installs it once.
3947

4048
Start Metro for an already verified dev client:
4149

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,14 @@ function AutoSettleSettingsRows() {
179179
<SettingsSection title="Usage limits">
180180
<SettingsSwitchRow
181181
icon="clock"
182-
label="Auto-resume limited threads"
182+
label="Resume after usage limits"
183183
value={uniformMobileSetting(displayTargets, "autoResumeLimitedThreads")}
184184
disabled={disabled}
185185
onValueChange={(value) => writeToAll({ autoResumeLimitedThreads: value })}
186186
/>
187187
<SettingsSwitchRow
188188
icon="clock"
189-
label="Snooze limited threads"
189+
label="Snooze until limits reset"
190190
value={uniformMobileSetting(displayTargets, "snoozeLimitedThreads")}
191191
disabled={disabled}
192192
onValueChange={(value) => writeToAll({ snoozeLimitedThreads: value })}

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -601,13 +601,8 @@ function cancelledAppOwnedTask(
601601
};
602602
}
603603

604-
/**
605-
* Whether a message sent into a delegated child may become a follow-up task the parent hears
606-
* back from. Besides a person or agent writing to the child, a provider wake counts, such as a
607-
* background command finishing: the child acts on it after its original result was delivered.
608-
* A monitor update does not, since it reports progress rather than asking for new work.
609-
* Dispatch takes the parent's lock for exactly these, because intake writes the parent.
610-
*/
604+
// Provider wakes can start follow-up work; monitor updates only report progress.
605+
// Dispatch takes the parent's lock for follow-ups because intake writes the parent.
611606
function mayStartSubagentFollowup(
612607
command: Extract<OrchestrationV2Command, { readonly type: "message.dispatch" }>,
613608
): boolean {

‎apps/web/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@
398398
body {
399399
background: #ffffff;
400400
color: #262626;
401-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", system-ui, sans-serif;
401+
font-family:
402+
-apple-system, BlinkMacSystemFont, "Inter Variable", "Segoe UI", system-ui, sans-serif;
402403
}
403404

404405
html.dark body {

‎apps/web/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"@dnd-kit/sortable": "^10.0.0",
2323
"@dnd-kit/utilities": "^3.2.2",
2424
"@effect/atom-react": "catalog:",
25+
"@fontsource-variable/inter": "^5.3.0",
2526
"@formkit/auto-animate": "^0.9.0",
2627
"@legendapp/list": "catalog:",
2728
"@noble/hashes": "catalog:",

‎apps/web/src/appearanceFonts.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from "@t3tools/contracts";
1212

1313
export const DEFAULT_SANS_FONT_STACK =
14-
'-apple-system, BlinkMacSystemFont, "Segoe UI", system-ui, sans-serif';
14+
'-apple-system, BlinkMacSystemFont, "Inter Variable", "Segoe UI", system-ui, sans-serif';
1515

1616
// Some engines map `ui-monospace` to a proportional font, so prefer concrete names.
1717
export const DEFAULT_CODE_FONT_STACK =

‎apps/web/src/components/BranchToolbar.tsx‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,7 @@ const RunContextSelector = memo(function RunContextSelector({
225225
<Tooltip>
226226
<TooltipTrigger render={<span className="inline-flex shrink-0" />}>
227227
<WorkspaceIcon
228-
className={
229-
isPanel
230-
? THREAD_DETAILS_PANEL_ICON_CLASS
231-
: cn("size-3 shrink-0", showEnvironmentIndicator && "mx-0!")
232-
}
228+
className={isPanel ? THREAD_DETAILS_PANEL_ICON_CLASS : "size-3 shrink-0 mx-0!"}
233229
/>
234230
</TooltipTrigger>
235231
<TooltipPopup>
@@ -241,29 +237,39 @@ const RunContextSelector = memo(function RunContextSelector({
241237
</TooltipPopup>
242238
</Tooltip>
243239
);
244-
const icon = showEnvironmentIndicator ? (
240+
const environmentIcon = (
241+
<Tooltip>
242+
<TooltipTrigger render={<span className="inline-flex shrink-0" />}>
243+
{autoEnvironmentLabel ? (
244+
<ScaleIcon
245+
className={isPanel ? THREAD_DETAILS_PANEL_ICON_CLASS : "size-3 shrink-0 mx-0!"}
246+
aria-hidden="true"
247+
/>
248+
) : (
249+
<EnvironmentMachineIcon
250+
kind={activeEnvironment?.machine ?? "server"}
251+
// Wide machine glyphs need a little more box to match the square row icons.
252+
className={
253+
isPanel
254+
? cn(THREAD_DETAILS_PANEL_ICON_CLASS, "-mx-px size-4.5")
255+
: "size-3 shrink-0 mx-0!"
256+
}
257+
/>
258+
)}
259+
</TooltipTrigger>
260+
<TooltipPopup>{autoEnvironmentLabel ?? activeEnvironment?.label ?? "Run on"}</TooltipPopup>
261+
</Tooltip>
262+
);
263+
const icon = !showEnvironmentIndicator ? (
264+
workspaceIcon
265+
) : isPanel ? (
266+
environmentIcon
267+
) : (
245268
// Button's SVG margins consume 4px of the gap; mx-0! restores the intended 2px.
246269
<span className="inline-flex shrink-0 items-center gap-0.5">
247-
<Tooltip>
248-
<TooltipTrigger render={<span className="inline-flex shrink-0" />}>
249-
{autoEnvironmentLabel ? (
250-
<ScaleIcon
251-
className={isPanel ? THREAD_DETAILS_PANEL_ICON_CLASS : "size-3 shrink-0 mx-0!"}
252-
aria-hidden="true"
253-
/>
254-
) : (
255-
<EnvironmentMachineIcon
256-
kind={activeEnvironment?.machine ?? "server"}
257-
className={isPanel ? THREAD_DETAILS_PANEL_ICON_CLASS : "size-3 shrink-0 mx-0!"}
258-
/>
259-
)}
260-
</TooltipTrigger>
261-
<TooltipPopup>{autoEnvironmentLabel ?? activeEnvironment?.label ?? "Run on"}</TooltipPopup>
262-
</Tooltip>
270+
{environmentIcon}
263271
{workspaceIcon}
264272
</span>
265-
) : (
266-
workspaceIcon
267273
);
268274
const triggerContent = (
269275
<>
@@ -272,14 +278,16 @@ const RunContextSelector = memo(function RunContextSelector({
272278
{autoEnvironmentLabel ??
273279
(showEnvironmentIndicator ? (activeEnvironment?.label ?? "Run on") : workspaceLabel)}
274280
</ComposerContextLabel>
281+
{/* Trailing in the panel, so every row label starts on the same edge. */}
282+
{isPanel && showEnvironmentIndicator ? workspaceIcon : null}
275283
</>
276284
);
277285

278286
if (isLocked) {
279287
return (
280288
<span
281289
className={cn(
282-
"inline-flex h-7 min-w-0 max-w-[48%] flex-initial items-center justify-start gap-1 rounded-md border border-transparent px-1.75 font-normal text-muted-foreground/70 text-xs sm:h-6",
290+
"inline-flex h-7 min-w-0 max-w-[48%] flex-initial items-center justify-start gap-1 rounded-md border border-transparent px-1.75 font-normal text-foreground/70 text-xs sm:h-6 dark:text-muted-foreground",
283291
isPanel && "max-w-full",
284292
isPanel && THREAD_DETAILS_PANEL_LOCKED_ROW_CLASS,
285293
)}
@@ -313,7 +321,7 @@ const RunContextSelector = memo(function RunContextSelector({
313321
].join(" ")}
314322
>
315323
{triggerContent}
316-
{!isPanel ? <ChevronDownIcon className="size-3 shrink-0 opacity-50" /> : null}
324+
{!isPanel ? <ChevronDownIcon className="size-3 shrink-0 mx-0!" /> : null}
317325
</MenuTrigger>
318326
<MenuPopup
319327
align="start"
@@ -748,7 +756,7 @@ export const BranchToolbar = memo(function BranchToolbar({
748756
ref={setStripElement}
749757
data-compact={labelsOverflow ? "" : undefined}
750758
className={cn(
751-
"gap-1 text-xs font-normal text-muted-foreground/70",
759+
"gap-1 text-xs font-normal text-foreground/70 dark:text-muted-foreground",
752760
// Hide empty non-Git strips while retaining host width so controls can reappear as the chat grows.
753761
!contextStripVisible && "pointer-events-none invisible absolute inset-x-0 top-full",
754762
)}

0 commit comments

Comments
 (0)