Skip to content

Commit 69737ad

Browse files
authored
Merge branch 'main' into fix/project-settings-group-rename
2 parents 95b5b83 + 5d76653 commit 69737ad

296 files changed

Lines changed: 15285 additions & 1841 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/VOUCHED.td‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,41 @@
1010
#
1111
# Keep entries sorted alphabetically.
1212
github:adityavardhansharma
13+
github:arhxam
1314
github:bil0000
1415
github:binbandit
16+
github:Brechard
1517
github:chrisdeeming
1618
github:chuks-qua
1719
github:cursoragent
20+
github:D3OXY
1821
github:eggfriedrice24
22+
github:extoci
1923
github:gbarros-dev
2024
github:gfsaaser24
2125
github:github-actions[bot]
2226
github:gsimone
27+
github:GuilhermeVieiraDev
2328
github:hwanseoc
29+
github:jakeleventhal
2430
github:jamesx0416
2531
github:jappyjan
2632
github:jasonLaster
2733
github:JoeEverest
2834
github:justsomelegs
35+
github:kridaydave
36+
github:lnieuwenhuis
37+
github:Lucenx9
2938
github:mackinleysmith
3039
github:maria-rcks
40+
github:mwolson
3141
github:nmggithub
3242
github:Noojuno
3343
github:notkainoa
3444
github:PatrickBauer
3545
github:pc-style
46+
github:PixPMusic
47+
github:PollyGlot
3648
github:RakshithBhat03
3749
github:realAhmedRoach
3850
github:Rishet11
@@ -43,6 +55,8 @@ github:shivamhwp
4355
github:StiensWout
4456
github:SunkenInTime
4557
github:tarik02
58+
github:tris203
4659
github:UtkarshUsername
4760
github:Yash-Singh1
61+
github:yashranaway
4862
github:Ymit24
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
name: Desktop macOS Preview
2+
3+
on:
4+
pull_request:
5+
types: [labeled, synchronize, reopened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
11+
concurrency:
12+
group: desktop-macos-preview-${{ github.event.pull_request.number }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
build:
17+
name: Build macOS Apple Silicon preview
18+
if: >-
19+
github.event.pull_request.head.repo.full_name == github.repository &&
20+
contains(github.event.pull_request.labels.*.name, 'preview:mac') &&
21+
(github.event.action != 'labeled' || github.event.label.name == 'preview:mac')
22+
runs-on: blacksmith-12vcpu-macos-26
23+
timeout-minutes: 30
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v6
27+
with:
28+
ref: ${{ github.event.pull_request.head.sha }}
29+
sparse-checkout: |
30+
/*
31+
!/.repos/
32+
sparse-checkout-cone-mode: false
33+
34+
- name: Setup Vite+
35+
uses: voidzero-dev/setup-vp@v1
36+
with:
37+
node-version-file: package.json
38+
cache: true
39+
run-install: false
40+
41+
- name: Install desktop dependencies
42+
run: vp install --filter=@t3tools/desktop... --filter=t3... --filter=@t3tools/scripts...
43+
44+
- name: Cache resource monitor
45+
id: resource_monitor_cache
46+
uses: actions/cache@v6
47+
with:
48+
path: native/resource-monitor/target/aarch64-apple-darwin/release/t3-resource-monitor
49+
key: resource-monitor-aarch64-apple-darwin-${{ hashFiles('native/resource-monitor/Cargo.lock', 'native/resource-monitor/Cargo.toml', 'native/resource-monitor/src/**') }}
50+
51+
- name: Setup Rust
52+
if: steps.resource_monitor_cache.outputs.cache-hit != 'true'
53+
uses: dtolnay/rust-toolchain@stable
54+
with:
55+
targets: aarch64-apple-darwin
56+
57+
- id: version
58+
name: Set preview version and public configuration
59+
shell: bash
60+
env:
61+
PR_NUMBER: ${{ github.event.pull_request.number }}
62+
run: |
63+
set -euo pipefail
64+
65+
base_version="$(node -p "require('./apps/desktop/package.json').version")"
66+
preview_version="${base_version}-pr.${PR_NUMBER}.${GITHUB_RUN_NUMBER}"
67+
node scripts/update-release-package-versions.ts "$preview_version"
68+
cp .env.example .env
69+
70+
echo "version=$preview_version" >> "$GITHUB_OUTPUT"
71+
72+
- id: build
73+
name: Build unsigned macOS DMG
74+
shell: bash
75+
env:
76+
T3CODE_DESKTOP_REUSE_RESOURCE_MONITOR: ${{ steps.resource_monitor_cache.outputs.cache-hit == 'true' }}
77+
PREVIEW_VERSION: ${{ steps.version.outputs.version }}
78+
run: |
79+
set -euo pipefail
80+
81+
vp run dist:desktop:artifact \
82+
--platform mac \
83+
--target dmg \
84+
--arch arm64 \
85+
--build-version "$PREVIEW_VERSION" \
86+
--verbose
87+
88+
shopt -s nullglob
89+
dmg_files=(release/*.dmg)
90+
if (( ${#dmg_files[@]} != 1 )); then
91+
printf 'Expected one DMG, found %s.\n' "${#dmg_files[@]}" >&2
92+
exit 1
93+
fi
94+
printf 'dmg_name=%s\n' "$(basename "${dmg_files[0]}")" >> "$GITHUB_OUTPUT"
95+
96+
- id: upload
97+
name: Upload macOS DMG
98+
uses: actions/upload-artifact@v7
99+
with:
100+
path: release/*.dmg
101+
if-no-files-found: error
102+
archive: false
103+
overwrite: true
104+
retention-days: 7
105+
106+
- name: Comment download link
107+
uses: actions/github-script@v8
108+
env:
109+
ARTIFACT_URL: ${{ steps.upload.outputs.artifact-url }}
110+
DMG_NAME: ${{ steps.build.outputs.dmg_name }}
111+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
112+
PREVIEW_VERSION: ${{ steps.version.outputs.version }}
113+
with:
114+
script: |
115+
const { data: pullRequest } = await github.rest.pulls.get({
116+
owner: context.repo.owner,
117+
repo: context.repo.repo,
118+
pull_number: context.payload.pull_request.number,
119+
});
120+
if (pullRequest.head.sha !== process.env.HEAD_SHA) {
121+
core.info("Skipping the outdated macOS preview comment.");
122+
return;
123+
}
124+
125+
const marker = "<!-- desktop-macos-preview -->";
126+
const body = [
127+
marker,
128+
"### macOS preview",
129+
"",
130+
`[Download Apple Silicon DMG](${process.env.ARTIFACT_URL})`,
131+
"",
132+
`Version: ${process.env.PREVIEW_VERSION}`,
133+
`Commit: ${process.env.HEAD_SHA.slice(0, 7)}`,
134+
"",
135+
"Unsigned build. Clear quarantine before opening:",
136+
"```sh",
137+
`xattr -d com.apple.quarantine ~/Downloads/${process.env.DMG_NAME}`,
138+
"```",
139+
"",
140+
"The download requires GitHub access and expires after 7 days.",
141+
].join("\n");
142+
143+
const { data: comments } = await github.rest.issues.listComments({
144+
owner: context.repo.owner,
145+
repo: context.repo.repo,
146+
issue_number: context.payload.pull_request.number,
147+
per_page: 100,
148+
});
149+
const existing = comments.find((comment) => comment.body?.includes(marker));
150+
151+
if (existing) {
152+
await github.rest.issues.updateComment({
153+
owner: context.repo.owner,
154+
repo: context.repo.repo,
155+
comment_id: existing.id,
156+
body,
157+
});
158+
} else {
159+
await github.rest.issues.createComment({
160+
owner: context.repo.owner,
161+
repo: context.repo.repo,
162+
issue_number: context.payload.pull_request.number,
163+
body,
164+
});
165+
}

‎.github/workflows/release.yml‎

Lines changed: 63 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ jobs:
100100
cache: true
101101
run-install: true
102102

103-
- name: Ensure Electron runtime is installed
104-
run: vp run --filter @t3tools/desktop ensure:electron
105-
106103
- id: release_meta
107104
name: Resolve release version
108105
shell: bash
@@ -157,6 +154,40 @@ jobs:
157154
fi
158155
fi
159156
157+
- id: previous_tag
158+
name: Resolve previous release tag
159+
run: |
160+
node scripts/resolve-previous-release-tag.ts \
161+
--channel "${{ steps.release_meta.outputs.release_channel }}" \
162+
--current-tag "${{ steps.release_meta.outputs.tag }}" \
163+
--github-output
164+
165+
quality:
166+
name: Release quality checks
167+
needs: [preflight]
168+
if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' }}
169+
runs-on: blacksmith-8vcpu-ubuntu-2404
170+
timeout-minutes: 10
171+
steps:
172+
- name: Checkout
173+
uses: actions/checkout@v6
174+
with:
175+
ref: ${{ needs.preflight.outputs.ref }}
176+
sparse-checkout: |
177+
/*
178+
!/.repos/
179+
sparse-checkout-cone-mode: false
180+
181+
- name: Setup Vite+
182+
uses: voidzero-dev/setup-vp@v1
183+
with:
184+
node-version-file: package.json
185+
cache: true
186+
run-install: true
187+
188+
- name: Ensure Electron runtime is installed
189+
run: vp run --filter @t3tools/desktop ensure:electron
190+
160191
- name: Check
161192
run: vp check
162193

@@ -166,14 +197,6 @@ jobs:
166197
- name: Test
167198
run: vp run test
168199

169-
- id: previous_tag
170-
name: Resolve previous release tag
171-
run: |
172-
node scripts/resolve-previous-release-tag.ts \
173-
--channel "${{ steps.release_meta.outputs.release_channel }}" \
174-
--current-tag "${{ steps.release_meta.outputs.tag }}" \
175-
--github-output
176-
177200
relay_public_config:
178201
name: Resolve T3 Connect public config
179202
needs: preflight
@@ -385,14 +408,34 @@ jobs:
385408
uses: voidzero-dev/setup-vp@v1
386409
with:
387410
node-version-file: package.json
388-
cache: true
389-
run-install: |
390-
args:
391-
- --filter=@t3tools/desktop...
392-
- --filter=t3...
393-
- --filter=@t3tools/scripts...
411+
cache: ${{ matrix.platform != 'win' }}
412+
run-install: false
413+
414+
- name: Resolve Windows package cache path
415+
if: matrix.platform == 'win'
416+
id: package_cache_path
417+
shell: pwsh
418+
run: '"path=$(vp pm cache dir)" >> $env:GITHUB_OUTPUT'
419+
420+
- name: Cache Windows packages
421+
if: matrix.platform == 'win'
422+
uses: actions/cache@v6
423+
with:
424+
path: ${{ steps.package_cache_path.outputs.path }}
425+
key: windows-release-packages-v1-${{ matrix.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
426+
427+
- name: Install desktop dependencies
428+
run: vp install --filter=@t3tools/desktop... --filter=t3... --filter=@t3tools/scripts...
429+
430+
- name: Cache resource monitor
431+
id: resource_monitor_cache
432+
uses: actions/cache@v6
433+
with:
434+
path: native/resource-monitor/target/${{ matrix.rust_target }}/release/t3-resource-monitor${{ matrix.platform == 'win' && '.exe' || '' }}
435+
key: resource-monitor-${{ matrix.rust_target }}-${{ hashFiles('native/resource-monitor/Cargo.lock', 'native/resource-monitor/Cargo.toml', 'native/resource-monitor/src/**') }}
394436

395437
- name: Setup Rust
438+
if: steps.resource_monitor_cache.outputs.cache-hit != 'true'
396439
uses: dtolnay/rust-toolchain@stable
397440
with:
398441
targets: ${{ matrix.rust_target }}
@@ -518,6 +561,7 @@ jobs:
518561
- name: Build desktop artifact
519562
shell: bash
520563
env:
564+
T3CODE_DESKTOP_REUSE_RESOURCE_MONITOR: ${{ steps.resource_monitor_cache.outputs.cache-hit == 'true' }}
521565
CSC_LINK: ${{ secrets.CSC_LINK }}
522566
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
523567
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
@@ -664,8 +708,8 @@ jobs:
664708

665709
publish_cli:
666710
name: Publish CLI to npm
667-
needs: [preflight, relay_public_config, build]
668-
if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' && needs.relay_public_config.result == 'success' && needs.build.result == 'success' }}
711+
needs: [preflight, relay_public_config, quality, build]
712+
if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' && needs.relay_public_config.result == 'success' && needs.quality.result == 'success' && needs.build.result == 'success' }}
669713
runs-on: ubuntu-24.04 # blacksmith-8vcpu-ubuntu-2404
670714
timeout-minutes: 10
671715
permissions:

‎.macroscope/approvability.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use Macroscope's default approvability criteria.

‎.macroscope/check-run-agents/ui-consistency.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ The goal is not to minimize CSS or class counts at any cost. The goal is to put
4747
- light-only declarations use `@variant light`;
4848
- raw `.dark` should remain only in the `dark` and `light` custom-variant definitions.
4949
- Preserve custom themes and runtime token bridges. Removing a variable or selector is safe only when all runtime, inspector, generated, and theme-palette consumers are accounted for.
50+
- Contrast and accessibility settings that target app chrome must derive from semantic color tokens. Do not apply `filter` to `html`, `body`, or the app root: it also changes user media, previews, terminals, glass backdrop ownership, and view-transition snapshots.
51+
- Preserve alpha and surface ownership when deriving contrast tokens. Soften translucent borders and inputs toward transparent rather than an opaque canvas, use a modest semantic-foreground mix for stronger borders, and adjust card, popover, accent, secondary, and message foregrounds against their own surfaces when the base foreground changes.
52+
- Runtime-adjusted roles must be ordinary custom properties shared by the Tailwind bridge, global CSS, imperative style strings, and bridge snapshots sent to other renderers. Audit literal `var(--foreground)`, `var(--border)`, and related role reads so headings, markdown chrome, menus, previews, and utilities do not split into adjusted and unadjusted colors.
5053
- Inspect emitted production CSS after unusual variants, arbitrary selectors, nested pseudo-elements, or attribute matching. Source syntax that looks valid is insufficient.
5154
- Flag malformed or empty emitted selectors such as empty `:is()` or `:not(:is())`, selector branches that can never match their own class attribute, and transformations that silently drop the intended rule.
5255
- Prefer source-level logic over clever selectors when behavior depends on consumer-provided class strings. Preserve `MenuPopup`'s current defaulting contract: a string `className` containing a `w-*`, `min-w-*`, or `max-w-*` utility after variant prefixes are stripped suppresses `min-w-32`; a string without one and a functional/non-string `className` keep the default. Arbitrary width values count as width utilities, and the consumer class must be merged last so it retains control. Do not replace this with a raw class-attribute substring selector.

‎apps/desktop/src/settings/DesktopClientSettings.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
1313
import * as DesktopClientSettings from "./DesktopClientSettings.ts";
1414

1515
const clientSettings: ClientSettings = {
16+
appearanceContrast: 100,
1617
browserDefaultViewport: { _tag: "preset", width: 1024, height: 600, presetId: "nest-hub" },
1718
browserDefaultZoomFactor: 1.25,
1819
browserDefaultAppearance: "dark",
@@ -35,6 +36,7 @@ const clientSettings: ClientSettings = {
3536
fontSmoothing: true,
3637
glassOpacity: 80,
3738
planModeEnabled: false,
39+
showSkillsInSlashMenu: false,
3840
providerModelPreferences: {},
3941
sidebarAutoSettleAfterDays: 3,
4042
sidebarAutoSettleOnMerge: true,

‎apps/desktop/src/updates/releaseNotes.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ describe("normalizeDesktopUpdateReleaseNotes", () => {
5858
});
5959

6060
it("does not throw on out-of-range numeric entities and keeps the literal", () => {
61-
expect(() =>
62-
normalizeDesktopUpdateReleaseNotes("- Broken entity &#9999999999;", "1.0.0"),
63-
).not.toThrow();
6461
const notes = normalizeDesktopUpdateReleaseNotes("- Broken entity &#9999999999;", "1.0.0");
6562
expect(notes).toEqual([{ version: "1.0.0", items: ["Broken entity &#9999999999;"] }]);
6663
});

‎apps/marketing/vercel.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import type { VercelConfig } from "@vercel/config/v1";
22

33
export const config: VercelConfig = {
4+
git: {
5+
deploymentEnabled: false,
6+
},
47
installCommand: "npm install -g vite-plus && vp install --filter '@t3tools/marketing...'",
58
buildCommand: "vp run --filter @t3tools/marketing build",
69
outputDirectory: "dist",

0 commit comments

Comments
 (0)