Skip to content

Commit a37a027

Browse files
wxk66trae-solo-agent [origin=mobile]
authored andcommitted
chore: merge main into simplified chinese localization
2 parents f2f32e3 + 701e13c commit a37a027

733 files changed

Lines changed: 32273 additions & 3735 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.

‎.github/scripts/ci-changes.cjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const INERT = [
1414

1515
// Shared test setup and vendored mobile dependencies affect every package.
1616
const RUNS_EVERYTHING = [
17-
/^packages\/shared\/src\/(HostProcess|testing\/longTempDir)\.ts$/,
17+
/^packages\/shared\/src\/(HostProcess|testing\/(longTempDir|providerEnv))\.ts$/,
1818
/^apps\/mobile\/deps\//,
1919
];
2020

‎.github/scripts/thread-transfer-report.cjs‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -300,18 +300,28 @@ async function resolve({ github, context, core }) {
300300
core.setOutput("publish", "false");
301301
return;
302302
}
303-
const workflowRuns = await github.paginate(github.rest.actions.listWorkflowRuns, {
304-
owner,
305-
repo,
306-
workflow_id: source.workflow_id,
307-
branch: pull.base.ref,
308-
event: "push",
309-
status: "success",
310-
per_page: 100,
311-
});
303+
// One page each for the exact base and the newest runs; paging through
304+
// every successful main run costs up to ten requests to keep 20.
305+
const listRuns = async (filters) => {
306+
const { data } = await github.rest.actions.listWorkflowRuns({
307+
owner,
308+
repo,
309+
workflow_id: source.workflow_id,
310+
branch: pull.base.ref,
311+
event: "push",
312+
status: "success",
313+
per_page: 20,
314+
...filters,
315+
});
316+
return data.workflow_runs;
317+
};
318+
const [baseRuns, recentRuns] = await Promise.all([
319+
listRuns({ head_sha: pull.base.sha }),
320+
listRuns({}),
321+
]);
312322
const orderedRuns = [
313-
...workflowRuns.filter((run) => run.head_sha === pull.base.sha),
314-
...workflowRuns.filter((run) => run.head_sha !== pull.base.sha),
323+
...baseRuns,
324+
...recentRuns.filter((run) => run.head_sha !== pull.base.sha),
315325
].slice(0, 20);
316326

317327
let baselineRun;

‎.github/scripts/thread-transfer-report.test.cjs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,18 @@ test("validates the fixed artifact schema", () => {
5555
test("resolves a fallback PR with a redacted head repo and exact main baseline", async () => {
5656
const outputs = {};
5757
const listWorkflowRunArtifacts = () => {};
58-
const listWorkflowRuns = () => {};
58+
// The exact base run sits far past the newest page of main CI runs.
59+
const mainRuns = Array.from({ length: 1_000 }, (_, index) => ({
60+
id: 1_000 - index,
61+
head_sha: index === 900 ? "base-sha" : `main-sha-${index}`,
62+
}));
63+
const listWorkflowRuns = async ({ head_sha, per_page }) => ({
64+
data: {
65+
workflow_runs: mainRuns
66+
.filter((run) => head_sha === undefined || run.head_sha === head_sha)
67+
.slice(0, per_page),
68+
},
69+
});
5970
const listPullRequestsAssociatedWithCommit = () => {};
6071
const github = {
6172
paginate: async (method, input) => {
@@ -77,9 +88,6 @@ test("resolves a fallback PR with a redacted head repo and exact main baseline",
7788
},
7889
];
7990
}
80-
if (method === listWorkflowRuns) {
81-
return [{ id: 1, head_sha: "base-sha" }];
82-
}
8391
throw new Error("unexpected pagination call");
8492
},
8593
rest: {
@@ -123,7 +131,7 @@ test("resolves a fallback PR with a redacted head repo and exact main baseline",
123131
assert.equal(outputs.publish, "true");
124132
assert.equal(outputs.pull_number, "5350");
125133
assert.equal(outputs.pr_artifact, "true");
126-
assert.equal(outputs.baseline_run_id, "1");
134+
assert.equal(outputs.baseline_run_id, "100");
127135
assert.equal(outputs.baseline_matches_base, "true");
128136
});
129137

‎.github/workflows/pr-vouch.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ permissions:
2020
jobs:
2121
collect-targets:
2222
name: Collect PR targets
23+
# Most comments are not recheck commands; skip them before a runner starts.
24+
if: >-
25+
github.event_name != 'issue_comment' ||
26+
(github.event.issue.pull_request && contains(github.event.comment.body, '/recheck-vouch'))
2327
runs-on: ubuntu-24.04
2428
outputs:
2529
targets: ${{ steps.collect.outputs.targets }}

‎.github/workflows/release.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,12 @@ jobs:
395395
(github.event_name != 'schedule' || needs.resolve_commit.outputs.has_changes == 'true')
396396
runs-on: blacksmith-8vcpu-ubuntu-2404
397397
timeout-minutes: 5
398+
# Previews build any branch, but production admits only main and v* tags.
399+
# The empty name runs previews with no environment, so their Clerk and relay
400+
# ids come from .env.example. Everything else matches nightly: the tracing
401+
# read below needs only repository-level Cloudflare credentials.
398402
environment:
399-
name: production
403+
name: ${{ inputs.channel != 'preview' && 'production' || '' }}
400404
outputs:
401405
clerk_publishable_key: ${{ steps.public_config.outputs.clerk_publishable_key }}
402406
clerk_jwt_template: ${{ steps.public_config.outputs.clerk_jwt_template }}
@@ -462,9 +466,19 @@ jobs:
462466
- id: public_config
463467
name: Resolve production relay public config
464468
shell: bash
469+
env:
470+
PREVIEW: ${{ inputs.channel == 'preview' }}
465471
run: |
466472
set -euo pipefail
467473
474+
if [[ "$PREVIEW" == "true" ]]; then
475+
env_example() { sed -n "s|^T3CODE_$1=||p" .env.example; }
476+
CLERK_PUBLISHABLE_KEY="$(env_example CLERK_PUBLISHABLE_KEY)"
477+
CLERK_JWT_TEMPLATE="$(env_example CLERK_JWT_TEMPLATE)"
478+
CLERK_CLI_OAUTH_CLIENT_ID="$(env_example CLERK_CLI_OAUTH_CLIENT_ID)"
479+
RELAY_DOMAIN="$(sed -n 's|^T3CODE_RELAY_URL=https://||p' .env.example)"
480+
fi
481+
468482
relay_domain="${RELAY_DOMAIN:-}"
469483
if [[ -z "$relay_domain" && -n "${RELAY_API_ZONE_NAME:-}" ]]; then
470484
relay_domain="relay.$RELAY_API_ZONE_NAME"

‎apps/desktop/scripts/main-process-bundle.test.mjs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as NodeFSP from "node:fs/promises";
33
import * as NodeOS from "node:os";
44
import * as NodePath from "node:path";
55
import * as NodeVM from "node:vm";
6+
import * as NodeURL from "node:url";
67
import { build } from "vite-plus/pack";
78
import { assert, it } from "vite-plus/test";
89

@@ -114,18 +115,16 @@ it("loads the emitted packaged boot entry and backend cache preload", async () =
114115
const directory = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-desktop-boot-"));
115116
try {
116117
const entries = ["src/boot.ts", "src/compileCache.ts"];
117-
await NodeFSP.mkdir(NodePath.join(directory, "src"));
118-
await Promise.all(
119-
entries.map((entry) =>
120-
NodeFSP.copyFile(new URL(`../${entry}`, import.meta.url), NodePath.join(directory, entry)),
121-
),
122-
);
123118
assert.ok(Array.isArray(desktopConfig.pack));
124119
for (const packConfig of desktopConfig.pack) {
125120
if (!Array.isArray(packConfig.entry)) continue;
126121
if (!packConfig.entry.some((entry) => entries.includes(entry))) continue;
127122
await build({
128123
...packConfig,
124+
entry: packConfig.entry.map((entry) =>
125+
NodeURL.fileURLToPath(new URL(`../${entry}`, import.meta.url)),
126+
),
127+
outDir: NodePath.join(directory, "dist-electron"),
129128
config: false,
130129
cwd: directory,
131130
tsconfig: false,

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,16 @@ const bootstrap = Effect.gen(function* () {
245245
}
246246
yield* primaryBackend.start;
247247
yield* logBootstrapInfo("bootstrap backend start requested");
248+
// WSL-only fallback can change the primary endpoint before readiness.
249+
const config = yield* primaryBackend.currentConfig;
250+
if (
251+
!environment.isDevelopment &&
252+
!settings.wslOnly &&
253+
Option.isSome(config) &&
254+
Option.isNone(config.value.preflightFailure)
255+
) {
256+
yield* desktopWindow.ensureMain;
257+
}
248258
yield* appActivation.start.pipe(
249259
Effect.tap(() => logBootstrapInfo("desktop app control socket ready")),
250260
Effect.catch((error) => logStartupError("desktop app control socket unavailable", { error })),

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

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import * as Layer from "effect/Layer";
55
import * as Ref from "effect/Ref";
66
import * as TestClock from "effect/testing/TestClock";
77

8+
import * as HostProcess from "@t3tools/shared/HostProcess";
9+
810
import type * as Electron from "electron";
911

1012
import * as ElectronApp from "../electron/ElectronApp.ts";
@@ -20,6 +22,7 @@ function layerElectronApp(
2022
appListeners: Map<string, (...args: readonly unknown[]) => void>,
2123
quit: Effect.Effect<void> = Effect.void,
2224
exit: (code: number) => Effect.Effect<void> = () => Effect.void,
25+
relaunch: (options: Electron.RelaunchOptions) => Effect.Effect<void> = () => Effect.void,
2326
) {
2427
const registerListener = (eventName: string, listener: (...args: readonly unknown[]) => void) =>
2528
Effect.acquireRelease(
@@ -41,7 +44,7 @@ function layerElectronApp(
4144
requestSingleInstanceLock: Effect.succeed(true),
4245
quit,
4346
exit,
44-
relaunch: () => Effect.void,
47+
relaunch,
4548
setPath: () => Effect.void,
4649
setName: () => Effect.void,
4750
setAboutPanelOptions: () => Effect.void,
@@ -224,6 +227,50 @@ describe("DesktopLifecycle", () => {
224227
}),
225228
);
226229

230+
it.effect("relaunches without the app link that launched it", () =>
231+
Effect.gen(function* () {
232+
const relaunched = yield* Deferred.make<Electron.RelaunchOptions>();
233+
const layerEnvironment = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
234+
platform: "linux",
235+
isDevelopment: false,
236+
} as DesktopEnvironment.DesktopEnvironment["Service"]);
237+
const layer = DesktopLifecycle.layer.pipe(
238+
Layer.provideMerge(
239+
layerElectronApp(
240+
new Map(),
241+
Effect.void,
242+
() => Effect.void,
243+
(options) => Deferred.succeed(relaunched, options).pipe(Effect.asVoid),
244+
),
245+
),
246+
Layer.provideMerge(layerElectronTheme),
247+
Layer.provideMerge(layerElectronWindow()),
248+
Layer.provideMerge(layerDesktopWindow()),
249+
Layer.provideMerge(layerEnvironment),
250+
Layer.provideMerge(DesktopShutdown.layer),
251+
Layer.provideMerge(DesktopState.layer),
252+
);
253+
254+
const options = yield* Effect.gen(function* () {
255+
const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
256+
yield* (yield* DesktopShutdown.DesktopShutdown).markComplete;
257+
yield* lifecycle.relaunch("network access changed");
258+
return yield* Deferred.await(relaunched);
259+
}).pipe(
260+
Effect.provide(layer),
261+
Effect.provideService(HostProcess.ExecutablePath, "/opt/T3 Code/t3code"),
262+
Effect.provideService(HostProcess.Arguments, [
263+
"/opt/T3 Code/t3code",
264+
"--no-sandbox",
265+
"T3CODE://pair?token=spent",
266+
"t3code://new?prompt=hello",
267+
]),
268+
);
269+
270+
assert.deepEqual(options, { execPath: "/opt/T3 Code/t3code", args: ["--no-sandbox"] });
271+
}),
272+
);
273+
227274
it.effect("exits on a repeated quit only once shutdown has stalled", () =>
228275
Effect.gen(function* () {
229276
const appListeners = new Map<string, (...args: readonly unknown[]) => void>();

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ import * as Scope from "effect/Scope";
99

1010
import type * as Electron from "electron";
1111

12+
import * as HostProcess from "@t3tools/shared/HostProcess";
13+
1214
import * as DesktopEnvironment from "./DesktopEnvironment.ts";
1315
import { makeComponentLogger } from "./DesktopObservability.ts";
1416
import * as DesktopShutdown from "./DesktopShutdown.ts";
1517
import * as ElectronApp from "../electron/ElectronApp.ts";
18+
import * as ElectronProtocol from "../electron/ElectronProtocol.ts";
1619
import * as ElectronTheme from "../electron/ElectronTheme.ts";
1720
import * as ElectronWindow from "../electron/ElectronWindow.ts";
1821
import * as DesktopState from "./DesktopState.ts";
@@ -223,9 +226,12 @@ export const make = DesktopLifecycle.of({
223226
yield* electronApp.exit(75);
224227
return;
225228
}
229+
// Startup already acted on the app link that launched it; passing it on replays it.
230+
const appLinkPrefix = `${ElectronProtocol.getDesktopScheme(environment.isDevelopment)}:`;
231+
const args = yield* HostProcess.Arguments;
226232
yield* electronApp.relaunch({
227-
execPath: process.execPath,
228-
args: process.argv.slice(1),
233+
execPath: yield* HostProcess.ExecutablePath,
234+
args: args.slice(1).filter((arg) => !arg.toLowerCase().startsWith(appLinkPrefix)),
229235
});
230236
yield* electronApp.exit(0);
231237
}).pipe(

0 commit comments

Comments
 (0)