Skip to content

Commit b3f41a6

Browse files
Merge remote-tracking branch 'origin/main' into fix/acp-v1-images
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2 parents bf626c0 + a35fd81 commit b3f41a6

610 files changed

Lines changed: 29221 additions & 3396 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: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,15 @@ prints one JSON line; on failure it names the next command. Mobile verification
4343
includes that step unless the user prohibits it.
4444

4545
For a device you opened in an agent-device session elsewhere (a device pool,
46-
cloud, or remote host), run `vp run mobile:install <ios|android> --session <s>`
47-
from the directory you opened the session in. It installs the cached build into
48-
that session (`--abi arm64-v8a` for an ARM Android device; `--metro <url>` also
49-
opens it against Metro) and never builds.
46+
cloud, or remote host), run `vp run mobile:install <ios|android> --session <s>
47+
--config <file>` from the directory you opened the session in, passing the
48+
`--config` file from `device_open`'s `targetArgs`. Without it, a device pool's
49+
gateway refuses the install, wrongly saying agent-device is too old. It installs
50+
the cached build into that session (`--abi arm64-v8a` for an ARM Android device;
51+
pool Android emulators are x86_64, the default; `--metro <url>` also opens it
52+
against Metro). Without a cached build for this checkout it builds first, which can
53+
outlast the lease, so run `vp run mobile:install <ios|android> --prepare` (with
54+
the same `--abi`) before you open the device.
5055

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

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ jobs:
591591
name: Mobile Native Static Analysis
592592
needs: changes
593593
if: ${{ !cancelled() && needs.changes.outputs.mobile_native != 'false' }}
594-
runs-on: blacksmith-6vcpu-macos-26
594+
runs-on: blacksmith-6vcpu-macos-27
595595
timeout-minutes: 10
596596
steps:
597597
- name: Checkout

‎.github/workflows/desktop-macos-preview-publish.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ jobs:
316316
rust_target: aarch64-apple-darwin
317317
resource_key: darwin-arm64
318318
cli_archive: false
319+
untrusted_bundle: true
319320

320321
# Release assets download without a GitHub account, unlike workflow
321322
# artifacts. All preview DMGs live on one rolling prerelease tagged

‎.github/workflows/mobile-dev-client.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
ios:
220220
name: iOS simulator
221221
if: github.repository == 'pingdotgg/t3code' && (github.event_name != 'workflow_dispatch' || inputs.platform == 'ios')
222-
runs-on: blacksmith-12vcpu-macos-26
222+
runs-on: blacksmith-12vcpu-macos-27
223223
timeout-minutes: 60
224224
concurrency:
225225
group: mobile-dev-client-ios-${{ github.event_name == 'pull_request' && github.event.pull_request.number || inputs.fingerprint || github.sha }}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,8 @@ jobs:
680680
echo ":rocket: android: submitted and recorded \`$BUILD_TAG\`" >> "$GITHUB_STEP_SUMMARY"
681681
682682
# Off unless the MOBILE_IOS_LOCAL_BUILDS repository variable is `true`; the
683-
# production job only sets ios_build then. Store binaries need the final
684-
# Xcode 27.1; MOBILE_IOS_ALLOW_XCODE_RC=true accepts the release candidate.
683+
# production job only sets ios_build then. Xcode 27.1 matches the EAS build
684+
# image in eas.json.
685685
# No sticky disk: it mounts ext4 and only works on Linux runners.
686686
ios:
687687
name: iOS store build
@@ -701,7 +701,6 @@ jobs:
701701
EXPO_TOKEN: ${{ secrets.EXPO_PRODUCTION_TOKEN }}
702702
PROFILE: ${{ needs.production.outputs.ios_profile }}
703703
BUILD_TAG: mobile-ios-build/${{ needs.production.outputs.ios_profile }}/${{ needs.production.outputs.ios_version }}/${{ needs.production.outputs.ios_fingerprint }}
704-
ALLOW_XCODE_RC: ${{ vars.MOBILE_IOS_ALLOW_XCODE_RC == 'true' }}
705704
steps:
706705
- name: Checkout
707706
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
@@ -739,12 +738,9 @@ jobs:
739738
if: steps.record.outputs.built != 'true'
740739
run: |
741740
xcode=/Applications/Xcode_27.1.app
742-
if [ ! -d "$xcode" ] && [ "$ALLOW_XCODE_RC" = "true" ]; then
743-
xcode=/Applications/Xcode_27.1_Release_Candidate.app
744-
fi
745741
if [ ! -d "$xcode" ]; then
746742
ls -d /Applications/Xcode*.app
747-
echo "::error::Xcode 27.1 (final) is not on this runner. Set the MOBILE_IOS_ALLOW_XCODE_RC repository variable to true to build store binaries with the release candidate."
743+
echo "::error::Xcode 27.1 is not on this runner."
748744
exit 1
749745
fi
750746
sudo xcode-select -s "$xcode/Contents/Developer"

‎.github/workflows/mobile-showcase-screenshots.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
ios:
4646
name: iPhone, iPhone Duo, and iPad 13
4747
if: inputs.platform == 'all' || inputs.platform == 'ios'
48-
runs-on: blacksmith-12vcpu-macos-26
48+
runs-on: blacksmith-12vcpu-macos-27
4949
# Capturing every palette multiplies the device matrix by six, and only the
5050
# one native build is shared between them.
5151
timeout-minutes: ${{ inputs.theme == 'all' && 300 || 60 }}

‎.github/workflows/release-desktop.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ on:
7070
required: false
7171
default: false
7272
type: boolean
73+
# Whether the JS bundle came from a pull request. This job holds the
74+
# signing secrets, so packaging then skips every step that runs the bundle.
75+
untrusted_bundle:
76+
required: false
77+
default: false
78+
type: boolean
7379
# A runner of the target's own platform and architecture, for a `runner`
7480
# that cannot execute the target. The build job skips everything that
7581
# runs the packaged binaries, and a second job runs it there.
@@ -134,6 +140,14 @@ jobs:
134140
T3CODE_CLERK_CLI_OAUTH_CLIENT_ID: ${{ inputs.clerk_cli_oauth_client_id }}
135141
T3CODE_RELAY_URL: ${{ inputs.relay_url }}
136142
steps:
143+
# The launch check and the CLI archive smoke test both run the bundle.
144+
- name: Reject running an untrusted bundle
145+
if: inputs.untrusted_bundle && (inputs.launch_check || inputs.cli_archive)
146+
shell: bash
147+
run: |
148+
echo "::error::untrusted_bundle cannot be combined with launch_check or cli_archive, which run the bundle."
149+
exit 1
150+
137151
# This repository is public, so Git needs no credentials. checkout's
138152
# credential cleanup runs submodule foreach even with submodules disabled,
139153
# which fails on the orphaned gitlinks in our vendored .repos tree.
@@ -573,6 +587,7 @@ jobs:
573587
pnpm_config_prefer_offline: "true"
574588
T3CODE_DESKTOP_REUSE_RESOURCE_MONITOR: true
575589
T3CODE_DESKTOP_REUSE_LINUX_CAPTURE_HELPERS: ${{ steps.capture_helper_cache.outputs.cache-hit == 'true' }}
590+
T3CODE_DESKTOP_UNTRUSTED_BUNDLE: ${{ inputs.untrusted_bundle }}
576591
CSC_LINK: ${{ secrets.CSC_LINK }}
577592
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
578593
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}

‎apps/desktop/src/app/DesktopApp.test.ts‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ it.effect.each([false, true])(
8686
const historyStarted = yield* Deferred.make<void>();
8787
const releaseHistory = yield* Deferred.make<void>();
8888
const quitting = yield* Ref.make(false);
89+
const tokenRequested = yield* Deferred.make<void>();
8990
const events: string[] = [];
9091
const record = (event: string) =>
9192
Effect.sync(() => {
@@ -144,7 +145,7 @@ it.effect.each([false, true])(
144145
configure: Effect.void,
145146
} as PreviewPasskeys.PreviewPasskeys["Service"]),
146147
Effect.provideService(DesktopApplicationMenu.DesktopApplicationMenu, {
147-
configure: Effect.void,
148+
configure: record("menu"),
148149
}),
149150
Effect.provideService(DesktopUpdates.DesktopUpdates, {
150151
configure: Effect.void,
@@ -222,7 +223,12 @@ it.effect.each([false, true])(
222223
Layer.mock(DesktopClientSettings.DesktopClientSettings, {}),
223224
Layer.mock(DesktopConnectionCatalogStore.DesktopConnectionCatalogStore, {}),
224225
Layer.mock(DesktopIpc.DesktopIpc, {}),
225-
Layer.mock(DesktopLocalEnvironmentAuth.DesktopLocalEnvironmentAuth, {}),
226+
Layer.mock(DesktopLocalEnvironmentAuth.DesktopLocalEnvironmentAuth, {
227+
getBearerToken: record("token").pipe(
228+
Effect.andThen(Deferred.succeed(tokenRequested, undefined)),
229+
Effect.as("token"),
230+
),
231+
}),
226232
Layer.mock(DesktopManagedPolicy.DesktopManagedPolicy, {}),
227233
Layer.succeed(DesktopPrimaryPaste.DesktopPrimaryPaste, { enabled: true }),
228234
Layer.mock(DesktopSshEnvironment.DesktopSshEnvironment, {}),
@@ -253,7 +259,13 @@ it.effect.each([false, true])(
253259
);
254260
yield* Deferred.await(registrationStarted);
255261
yield* Deferred.await(windowStarted);
256-
assert.deepEqual(events, ["identity", "ready", "identity", "backend", "window"]);
262+
yield* Deferred.await(tokenRequested);
263+
// The backend spawns before menus, and its token is minted without waiting for the renderer.
264+
assert.deepEqual(
265+
events.filter((event) => event !== "token"),
266+
["identity", "ready", "identity", "backend", "menu", "window"],
267+
);
268+
assert.isAbove(events.indexOf("token"), events.indexOf("backend"));
257269
assert.isFalse(yield* Deferred.isDone(registrationStopped));
258270
const shutdown = yield* DesktopShutdown.DesktopShutdown;
259271
yield* shutdown.request;

‎apps/desktop/src/app/DesktopApp.ts‎

Lines changed: 81 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import * as PreviewPasskeys from "../preview/Passkeys.ts";
2222
import * as DesktopBackendManager from "../backend/DesktopBackendManager.ts";
2323
import * as DesktopBackendPool from "../backend/DesktopBackendPool.ts";
2424
import * as DesktopHomeOwner from "../backend/DesktopHomeOwner.ts";
25+
import * as DesktopLocalEnvironmentAuth from "../backend/DesktopLocalEnvironmentAuth.ts";
2526
import * as DesktopEnvironment from "./DesktopEnvironment.ts";
2627
import * as DesktopLegacyLocalStorage from "./DesktopLegacyLocalStorage.ts";
2728
import * as DesktopLifecycle from "./DesktopLifecycle.ts";
@@ -168,13 +169,12 @@ const stopAllPoolInstances = Effect.fn("desktop.app.stopAllPoolInstances")(
168169
},
169170
);
170171

171-
const bootstrap = Effect.gen(function* () {
172+
// Spawns the local backend as soon as the protocol, IPC, and legacy storage that every window needs exist.
173+
const startLocalBackend = Effect.gen(function* () {
172174
const state = yield* DesktopState.DesktopState;
173175
const environment = yield* DesktopEnvironment.DesktopEnvironment;
174176
const desktopSettings = yield* DesktopAppSettings.DesktopAppSettings;
175177
const desktopWindow = yield* DesktopWindow.DesktopWindow;
176-
const snapShot = yield* DesktopSnapShot.DesktopSnapShot;
177-
const appActivation = yield* DesktopAppActivation.DesktopAppActivation;
178178
yield* logBootstrapInfo("bootstrap start");
179179

180180
const settings = yield* desktopSettings.get;
@@ -193,32 +193,13 @@ const bootstrap = Effect.gen(function* () {
193193
yield* (yield* DesktopAppIdentity.DesktopAppIdentity).resolveUserDataPath,
194194
);
195195

196-
yield* snapShot.initialize;
197-
// Only the user's own login shell PATH shows every t3 a new terminal runs; a fresh install has
198-
// no cached one. Without it, the command is left to Settings.
199-
const installCli = (yield* DesktopCliCommand.DesktopCliCommand).installOnFirstLaunch;
200-
yield* Effect.forkScoped(
201-
(yield* DesktopShellEnvironment.DesktopShellEnvironment).awaitUserShellDiscovery.pipe(
202-
Effect.flatMap((found) =>
203-
found || environment.platform === "win32"
204-
? installCli
205-
: logBootstrapInfo("skipped installing the t3 command without the shell PATH"),
206-
),
207-
),
208-
);
209-
210196
if (!settings.localEnvironmentEnabled) {
211197
yield* logBootstrapInfo("bootstrap skipping local environment (disabled in settings)");
212-
if (!(yield* Ref.get(state.quitting))) {
213-
yield* desktopWindow.createMainIfBackendReady;
214-
}
215-
return;
198+
return false;
216199
}
217200

218-
const pool = yield* DesktopBackendPool.DesktopBackendPool;
219-
const primaryBackend = yield* pool.primary;
201+
const primaryBackend = yield* (yield* DesktopBackendPool.DesktopBackendPool).primary;
220202
const serverExposure = yield* DesktopServerExposure.DesktopServerExposure;
221-
const wslBackend = yield* DesktopWslBackend.DesktopWslBackend;
222203

223204
if (environment.isDevelopment && Option.isNone(environment.configuredBackendPort)) {
224205
return yield* new DesktopDevelopmentBackendPortRequiredError();
@@ -237,7 +218,8 @@ const bootstrap = Effect.gen(function* () {
237218
"This T3 home is unavailable",
238219
DesktopHomeOwner.homeOwnedMessage(owner),
239220
);
240-
return yield* (yield* ElectronApp.ElectronApp).quit;
221+
yield* (yield* ElectronApp.ElectronApp).quit;
222+
return false;
241223
}
242224

243225
const backendPortSelection = yield* resolveDesktopBackendPort(environment.configuredBackendPort);
@@ -275,29 +257,73 @@ const bootstrap = Effect.gen(function* () {
275257
);
276258
}
277259

278-
if (!(yield* Ref.get(state.quitting))) {
279-
if (settings.wslOnly === true && settings.wslBackendEnabled === true) {
280-
yield* desktopWindow.showConnectingSplash;
281-
}
282-
yield* primaryBackend.start;
283-
yield* logBootstrapInfo("bootstrap backend start requested");
284-
// WSL-only fallback can change the primary endpoint before readiness.
285-
const config = yield* primaryBackend.currentConfig;
286-
if (
287-
!environment.isDevelopment &&
288-
!settings.wslOnly &&
289-
Option.isSome(config) &&
290-
Option.isNone(config.value.preflightFailure)
291-
) {
292-
yield* desktopWindow.ensureMain;
260+
if (yield* Ref.get(state.quitting)) {
261+
return false;
262+
}
263+
if (settings.wslOnly === true && settings.wslBackendEnabled === true) {
264+
yield* desktopWindow.showConnectingSplash;
265+
}
266+
yield* primaryBackend.start;
267+
yield* logBootstrapInfo("bootstrap backend start requested");
268+
// The renderer asks for this token first; minting it at readiness saves a round trip.
269+
yield* Effect.forkScoped(
270+
(yield* DesktopLocalEnvironmentAuth.DesktopLocalEnvironmentAuth).getBearerToken.pipe(
271+
Effect.ignore,
272+
),
273+
);
274+
return true;
275+
}).pipe(Effect.withSpan("desktop.startLocalBackend"));
276+
277+
const bootstrap = Effect.fn("desktop.bootstrap")(function* (backendStarted: boolean) {
278+
const state = yield* DesktopState.DesktopState;
279+
const environment = yield* DesktopEnvironment.DesktopEnvironment;
280+
const desktopSettings = yield* DesktopAppSettings.DesktopAppSettings;
281+
const desktopWindow = yield* DesktopWindow.DesktopWindow;
282+
const snapShot = yield* DesktopSnapShot.DesktopSnapShot;
283+
const appActivation = yield* DesktopAppActivation.DesktopAppActivation;
284+
const settings = yield* desktopSettings.get;
285+
if (settings.localEnvironmentEnabled && (!backendStarted || (yield* Ref.get(state.quitting)))) {
286+
return;
287+
}
288+
289+
yield* snapShot.initialize;
290+
// Only the user's own login shell PATH shows every t3 a new terminal runs; a fresh install has
291+
// no cached one. Without it, the command is left to Settings.
292+
const installCli = (yield* DesktopCliCommand.DesktopCliCommand).installOnFirstLaunch;
293+
yield* Effect.forkScoped(
294+
(yield* DesktopShellEnvironment.DesktopShellEnvironment).awaitUserShellDiscovery.pipe(
295+
Effect.flatMap((found) =>
296+
found || environment.platform === "win32"
297+
? installCli
298+
: logBootstrapInfo("skipped installing the t3 command without the shell PATH"),
299+
),
300+
),
301+
);
302+
303+
if (!settings.localEnvironmentEnabled) {
304+
if (!(yield* Ref.get(state.quitting))) {
305+
yield* desktopWindow.createMainIfBackendReady;
293306
}
294-
yield* appActivation.start.pipe(
295-
Effect.tap(() => logBootstrapInfo("desktop app control socket ready")),
296-
Effect.catch((error) => logStartupError("desktop app control socket unavailable", { error })),
297-
);
298-
yield* Effect.forkScoped(wslBackend.reconcile);
307+
return;
299308
}
300-
}).pipe(Effect.withSpan("desktop.bootstrap"));
309+
310+
const primaryBackend = yield* (yield* DesktopBackendPool.DesktopBackendPool).primary;
311+
// WSL-only fallback can change the primary endpoint before readiness.
312+
const config = yield* primaryBackend.currentConfig;
313+
if (
314+
!environment.isDevelopment &&
315+
!settings.wslOnly &&
316+
Option.isSome(config) &&
317+
Option.isNone(config.value.preflightFailure)
318+
) {
319+
yield* desktopWindow.ensureMain;
320+
}
321+
yield* appActivation.start.pipe(
322+
Effect.tap(() => logBootstrapInfo("desktop app control socket ready")),
323+
Effect.catch((error) => logStartupError("desktop app control socket unavailable", { error })),
324+
);
325+
yield* Effect.forkScoped((yield* DesktopWslBackend.DesktopWslBackend).reconcile);
326+
});
301327

302328
const startup = Effect.gen(function* () {
303329
const appIdentity = yield* DesktopAppIdentity.DesktopAppIdentity;
@@ -369,14 +395,20 @@ const startup = Effect.gen(function* () {
369395
});
370396
}
371397
yield* appIdentity.configure;
372-
yield* previewPasskeys.configure;
373-
yield* applicationMenu.configure;
398+
// Sets canInstallUpdates, which the backend bootstrap payload reads.
374399
yield* updates.configure;
375400
yield* DesktopRemoteUpdates.listen;
376401
yield* DesktopStartupRecovery.listen;
402+
const backendStarted = yield* startLocalBackend.pipe(
403+
Effect.catchCause((cause) => fatalStartupCause("bootstrap", cause)),
404+
);
405+
yield* previewPasskeys.configure;
406+
yield* applicationMenu.configure;
377407
// Portal identity is prepared pre-ready; MIME helpers must not gate the backend or window.
378408
yield* linuxUrlHandler.register.pipe(Effect.forkScoped);
379-
yield* bootstrap.pipe(Effect.catchCause((cause) => fatalStartupCause("bootstrap", cause)));
409+
yield* bootstrap(backendStarted).pipe(
410+
Effect.catchCause((cause) => fatalStartupCause("bootstrap", cause)),
411+
);
380412
}).pipe(Effect.withSpan("desktop.startup"));
381413

382414
const scopedProgram = Effect.scoped(

‎apps/desktop/src/app/DesktopCliShim.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const fakeAppImage = (canMount = true, app = REPORTER) => {
5656
`echo $$ >'${root}/mounter.pid'`,
5757
canMount ? `echo '${image}'` : 'echo "Cannot mount AppImage"; exit 1',
5858
// Like the FUSE runtime, any of these unmounts. fd 3 reports to the test when it is open.
59-
`trap 'echo unmounted >&3 2>/dev/null; touch "${root}/unmounted"; exit 0' TERM HUP INT`,
59+
"trap 'echo unmounted >&3 2>/dev/null; exit 0' TERM HUP INT",
6060
"trap 'echo mounted >&3 2>/dev/null' WINCH",
6161
"while :; do sleep 0.05; done",
6262
"",

0 commit comments

Comments
 (0)