Skip to content

Commit 81a0b1a

Browse files
committed
Merge upstream main into cursor/reconnect-retry-22024
Chat and Connections moved the reconnect UI into the composer banner hook and saved environment rows. Retry now is offered from those files while an environment is waiting to reconnect.
2 parents 88824e1 + 74541ba commit 81a0b1a

2,442 files changed

Lines changed: 58006 additions & 320140 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/check-nightly-release.test.cjs‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ for (const releaseChannel of ["stable", "nightly"]) {
6161
);
6262
assert.equal(calls.length, 0);
6363
});
64-
65-
test(`allows a manual ${releaseChannel} release from main`, async () => {
66-
const { options, calls } = releaseSourceFixture();
67-
await assertReleaseSource({ ...options, releaseChannel });
68-
assert.equal(calls[0].basehead, "candidate...main");
69-
});
7064
}
7165

7266
for (const comparisonStatus of ["behind", "diverged"]) {
@@ -79,13 +73,6 @@ for (const comparisonStatus of ["behind", "diverged"]) {
7973
});
8074
}
8175

82-
test("accepts a release commit already contained in main", async () => {
83-
for (const comparisonStatus of ["ahead", "identical"]) {
84-
const { options } = releaseSourceFixture({ comparisonStatus, eventName: "push" });
85-
await assertCommitOnDefaultBranch({ ...options, sha: "release-commit" });
86-
}
87-
});
88-
8976
function fixture({ releases = [nightly(7)], comparisonStatus = "ahead" } = {}) {
9077
const calls = [];
9178
return {
@@ -119,26 +106,6 @@ test("releases the first nightly when no nightly is published", async () => {
119106
assert.equal(await shouldReleaseNightly(options), true);
120107
});
121108

122-
test("waits six hours after publication, including manual nightlies", async () => {
123-
for (const age of [0, 3, 6 - 1 / 3600]) {
124-
const { options, calls } = fixture({ releases: [nightly(age)] });
125-
assert.equal(await shouldReleaseNightly(options), false);
126-
assert.equal(calls.length, 0);
127-
}
128-
});
129-
130-
test("releases new commits at six hours and after an idle period", async () => {
131-
for (const age of [6, 7, 24]) {
132-
const { options } = fixture({ releases: [nightly(age)] });
133-
assert.equal(await shouldReleaseNightly(options), true);
134-
}
135-
});
136-
137-
test("skips unchanged commits after the gap", async () => {
138-
const { options } = fixture({ comparisonStatus: "identical" });
139-
assert.equal(await shouldReleaseNightly(options), false);
140-
});
141-
142109
test("uses publication time, not release order or the tagged commit date", async () => {
143110
const { options } = fixture({
144111
releases: [nightly(10), nightly(1), nightly(20, { tag_name: "nightly-v0.9.0" })],
@@ -153,13 +120,6 @@ test("ignores stable releases and drafts when checking the gap", async () => {
153120
assert.equal(await shouldReleaseNightly(options), true);
154121
});
155122

156-
test("compares against the published tag, including legacy nightly tags", async () => {
157-
const tag = "nightly-v0.9.0";
158-
const { options, calls } = fixture({ releases: [nightly(7, { tag_name: tag })] });
159-
assert.equal(await shouldReleaseNightly(options), true);
160-
assert.equal(calls[0].basehead, `${tag}...new`);
161-
});
162-
163123
test("fails instead of releasing when GitHub cannot supply release state", async () => {
164124
const { options } = fixture();
165125
options.github.paginate = async () => {
@@ -211,8 +171,3 @@ test("stable releases derive the version from legacy nightly tags", async () =>
211171
});
212172
assert.equal((await resolveLatestNightlyCommit(options)).version, "0.9.0");
213173
});
214-
215-
test("stable releases fail without a published nightly", async () => {
216-
const { options } = nightlyCommitFixture({ releases: [nightly(0, { tag_name: "v1.0.0" })] });
217-
await assert.rejects(resolveLatestNightlyCommit(options), /No published nightly/);
218-
});

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// node ci-changes.cjs --paths <file> --full run every Linux job, gate only the macOS lint
66
// node ci-changes.cjs changed paths unknown: run everything
77
//
8+
// scripts/check-changed.ts requires the same decisions so local runs match CI.
9+
//
810
// Every changed path maps to workspace packages, which then pull in their
911
// dependents from package.json. A path this file does not recognize runs
1012
// everything, so a new root file or directory can only cost minutes.
@@ -201,4 +203,6 @@ function main() {
201203
for (const [key, value] of Object.entries(outputs)) console.log(`${key}=${value}`);
202204
}
203205

204-
main();
206+
module.exports = { readWorkspace, decide };
207+
208+
if (require.main === module) main();

‎.github/scripts/ci-changes.d.cts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
interface WorkspacePackage {
2+
readonly name: string;
3+
readonly dir: string;
4+
readonly hasTest: boolean;
5+
readonly deps: ReadonlyArray<string>;
6+
}
7+
8+
export function readWorkspace(): Array<WorkspacePackage>;
9+
10+
export function decide(
11+
files: ReadonlyArray<string> | null,
12+
packages: ReadonlyArray<WorkspacePackage>,
13+
full: boolean,
14+
): {
15+
affected: Array<string>;
16+
outputs: {
17+
typecheck: boolean;
18+
build: boolean;
19+
test: boolean;
20+
test_packages: string;
21+
test_web: boolean;
22+
test_server: boolean;
23+
rust: boolean;
24+
release_smoke: boolean;
25+
mobile_native: boolean;
26+
};
27+
};

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,26 @@ async function resolve({ github, context, core }) {
244244

245245
let pullNumber = source.pull_requests?.[0]?.number;
246246
if (!pullNumber) {
247-
const associated = await github.paginate(
248-
github.rest.repos.listPullRequestsAssociatedWithCommit,
249-
{ owner, repo, commit_sha: source.head_sha, per_page: 100 },
250-
);
247+
let associated;
248+
try {
249+
associated = await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
250+
owner,
251+
repo,
252+
commit_sha: source.head_sha,
253+
per_page: 100,
254+
});
255+
} catch (error) {
256+
// A force-pushed or deleted PR head can disappear before this workflow runs.
257+
if (
258+
error.status === 422 &&
259+
error.response?.data?.message === `No commit found for SHA: ${source.head_sha}`
260+
) {
261+
core.info(`Skipping CI result for unavailable commit ${source.head_sha}.`);
262+
core.setOutput("publish", "false");
263+
return;
264+
}
265+
throw error;
266+
}
251267
const matchingPulls = associated.filter(
252268
(pull) =>
253269
pull.state === "open" &&

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

Lines changed: 41 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const assert = require("node:assert/strict");
22
const test = require("node:test");
33

44
const {
5-
renderComment,
65
resolve,
76
upsertCommentForCurrentHead,
87
validateResult,
@@ -53,39 +52,6 @@ test("validates the fixed artifact schema", () => {
5352
);
5453
});
5554

56-
test("renders baseline, impact, ceiling, and ceiling changes", () => {
57-
const baseline = result();
58-
const current = result({ measuredTurnWebSocketWireBytes: 260_000 });
59-
current.providers.codex.ceiling = {
60-
...current.providers.codex.ceiling,
61-
measuredTurnWebSocketWireBytes: 330_000,
62-
};
63-
const comment = renderComment({
64-
current,
65-
baseline,
66-
currentRun: {
67-
sha: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
68-
conclusion: "success",
69-
url: "https://github.com/pingdotgg/t3code/actions/runs/2",
70-
},
71-
baselineRun: {
72-
sha: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
73-
matchesBase: true,
74-
url: "https://github.com/pingdotgg/t3code/actions/runs/1",
75-
},
76-
});
77-
78-
assert.match(comment, /Main baseline \| This PR \| Impact \| PR ceiling/);
79-
assert.match(comment, /\+9\.8 KiB \(\+4\.0%\)/);
80-
assert.match(comment, /This PR changes transfer ceilings/);
81-
assert.match(comment, /312\.5 KiB → 322\.3 KiB/);
82-
assert.match(comment, /<!-- t3-thread-transfer-report -->/);
83-
assert.match(
84-
comment,
85-
/<!-- t3-thread-transfer-result-sha:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb -->/,
86-
);
87-
});
88-
8955
test("resolves a fallback PR with a redacted head repo and exact main baseline", async () => {
9056
const outputs = {};
9157
const listWorkflowRunArtifacts = () => {};
@@ -216,6 +182,47 @@ test("does not guess when a fallback commit belongs to multiple PRs", async () =
216182
assert.equal(fetchedPull, false);
217183
});
218184

185+
test("skips a missing PR commit but preserves other lookup failures", async () => {
186+
for (const [status, message, shouldSkip] of [
187+
[422, "No commit found for SHA: old-head", true],
188+
[422, "Validation Failed", false],
189+
[403, "API rate limit exceeded", false],
190+
]) {
191+
const outputs = {};
192+
const error = Object.assign(new Error(message), {
193+
status,
194+
response: { data: { message } },
195+
});
196+
const run = resolve({
197+
github: {
198+
paginate: async () => {
199+
throw error;
200+
},
201+
rest: { repos: { listPullRequestsAssociatedWithCommit: () => {} } },
202+
},
203+
context: {
204+
repo: { owner: "pingdotgg", repo: "t3code" },
205+
payload: {
206+
workflow_run: { event: "pull_request", head_sha: "old-head", pull_requests: [] },
207+
},
208+
},
209+
core: {
210+
info: () => {},
211+
setOutput: (key, value) => {
212+
outputs[key] = value;
213+
},
214+
},
215+
});
216+
if (shouldSkip) {
217+
await run;
218+
assert.equal(outputs.publish, "false");
219+
} else {
220+
await assert.rejects(run, (caught) => caught === error);
221+
assert.deepEqual(outputs, {});
222+
}
223+
}
224+
});
225+
219226
test("does not report a passing run that skipped the server tests", async () => {
220227
const outputs = {};
221228
const listWorkflowRunArtifacts = () => {};
@@ -332,21 +339,3 @@ test("preserves a successful result when a same-SHA rerun has no artifact", asyn
332339
assert.equal(published, true);
333340
assert.equal(updatedComment, false);
334341
});
335-
336-
test("accepts V2 without comparing it to the V1 scenario", () => {
337-
const current = result();
338-
current.scenario.id = "thread-transfer-v2";
339-
current.providers.codex.ceiling = { ...current.providers.codex.ceiling, totalWireBytes: 3000000 };
340-
assert.equal(validateResult(current), current);
341-
const comment = renderComment({
342-
current,
343-
baseline: result(),
344-
currentRun: { sha: "bbbbbbbb", conclusion: "success", url: "https://example.com/current" },
345-
baselineRun: { sha: "aaaaaaaa", matchesBase: true, url: "https://example.com/baseline" },
346-
});
347-
assert.match(comment, /fixture changed/);
348-
assert.doesNotMatch(comment, /This PR changes transfer ceilings/);
349-
assert.doesNotMatch(comment, /[+-]\d+\.\d+%/);
350-
current.scenario.id = "unrecognized";
351-
assert.throws(() => validateResult(current), /not supported/);
352-
});

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ jobs:
8383
- name: Setup Vite+
8484
uses: ./.github/actions/setup-ci-deps
8585

86+
# electron's install.js (run by ensure:electron) reads this cache before it
87+
# downloads from GitHub. The key changes only with the Electron version.
88+
- name: Cache Electron download
89+
uses: actions/cache@v6
90+
with:
91+
path: ~/.cache/electron
92+
key: electron-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('node_modules/.pnpm/electron@*/node_modules/electron/package.json') }}
93+
8694
- name: Ensure Electron runtime is installed
8795
run: vp run --filter @t3tools/desktop ensure:electron
8896

@@ -132,6 +140,14 @@ jobs:
132140
- name: Setup Vite+
133141
uses: ./.github/actions/setup-ci-deps
134142

143+
# electron's install.js (run by ensure:electron) reads this cache before it
144+
# downloads from GitHub. The key changes only with the Electron version.
145+
- name: Cache Electron download
146+
uses: actions/cache@v6
147+
with:
148+
path: ~/.cache/electron
149+
key: electron-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('node_modules/.pnpm/electron@*/node_modules/electron/package.json') }}
150+
135151
- name: Ensure Electron runtime is installed
136152
id: electron
137153
run: vp run --filter @t3tools/desktop ensure:electron
@@ -222,6 +238,14 @@ jobs:
222238
- name: Setup Vite+
223239
uses: ./.github/actions/setup-ci-deps
224240

241+
# electron's install.js (run by ensure:electron) reads this cache before it
242+
# downloads from GitHub. The key changes only with the Electron version.
243+
- name: Cache Electron download
244+
uses: actions/cache@v6
245+
with:
246+
path: ~/.cache/electron
247+
key: electron-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('node_modules/.pnpm/electron@*/node_modules/electron/package.json') }}
248+
225249
- name: Ensure Electron runtime is installed
226250
run: vp run --filter @t3tools/desktop ensure:electron
227251

@@ -252,6 +276,7 @@ jobs:
252276
253277
# The web suite is the largest outside the server. In the shared Test job it
254278
# started last and ran alone for about 40s after everything else finished.
279+
# release.yml mirrors this test, test_web, and test_server split.
255280
test_web:
256281
name: Test Web
257282
needs: changes

‎.github/workflows/cursor-hygiene-webhook.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)