Skip to content

Commit 06fd08e

Browse files
authored
chore: merge upstream t3code to 20012eb (pingdotgg#200)
Merges `pingdotgg/t3code` `20012ebd8` (33 commits, base `0cf482b08`) into the fork. Landed 211 files, the same 211 that upstream changed in the range. The fork delta is 756 files. ## Conflicts (7) - `.github/workflows/ci.yml` (converged): upstream split the old `check` job into separate jobs (pingdotgg#14025). The Moatless spec-check step now runs after `vpr typecheck` in the `typecheck` job. - `AGENTS.md` (decide): kept the fork's shape. Upstream's pingdotgg#14613 rule ("services, thin transports") is folded into the `apps/server` line, along with its link to `effect-services.md`. - `Sidebar.tsx` (converged): the memo dependency list is the union of the fork's `isBrowsing`/`showsClosed` and upstream's `workingShelfEnabled`. - `DraftHeroHeadline.tsx`, `SidebarThreadHeader.tsx` (converged): takes upstream's "Add project" label and keeps the `FEATURES.projectManagement` gates. - `third-party-licenses.config.json` (converged): upstream's copy, with the fork's `khroma`/`fastdom`/`strictdom` overrides added back at the end. - `pnpm-lock.yaml` (theirs): taken from upstream, then re-derived with `install.mjs`. ## Fork changes in this merge - `projects.createNew` now declares `UnsupportedMethodError` (the ADD from `unsupported-methods.mjs`). - `<ProviderUpdatesAction />` in `ProviderSettingsPanel.tsx` is now gated on `FEATURES.providerConfiguration`, because it calls `server.updateProvider`, which Moatless refuses. Moatless publishes no `versionAdvisory`, so the button would render nothing anyway. - Updated `docs/fork/inventory.json`, `upstream-merge-inventory.md`, `gaps.md` and `upstream-merge-log.md`. ## Usable as-is - pingdotgg#13926: beta Working sidebar section. It is a client setting. - pingdotgg#14635: cloned projects show their favicon. - pingdotgg#14548: hotkey settings record plain keys and Tab. The keybindings page is gated off in the fork, so this has no visible effect here. - pingdotgg#14700 (PR checks layout), pingdotgg#14675 (Docker icon), pingdotgg#14710 (removes outdated settings text), pingdotgg#13426 (terminal toggle spacing). - Mobile (Expo SDK 58 and related), desktop, release, CI, docs and marketing commits do not affect the web fork. ## Unsupported in Moatless / needs implementation - pingdotgg#14527 `projects.createNew` + `ServerConfig.newProjectsRoot`: create a project from just a name. The command palette entries hide themselves while `newProjectsRoot` is absent. Moatless needs to implement the method and report a root; then delete the union entry. - pingdotgg#14678 `server.updateProvider` "update every machine": already unsupported. Now gated behind `providerConfiguration`. ## Backend behavior to consider reproducing in Moatless - pingdotgg#14542: "Restart agent session" in cmd+k calls `server.refreshProviders` with `fresh: true` so skills and plugins are rescanned. Moatless serves the method, but it may not honor `fresh`. - pingdotgg#14673: background GitHub polling batched into GraphQL queries, about 74% fewer calls. Also adds an optional `PullRequestSummary.stack`. - pingdotgg#14540: a Claude subagent with its own model is attributed to that model, not the parent's. ## Verification The full `verify.mjs` run passed all 10 checks. `@t3tools/mobile` failed in the parallel test run and passed when run on its own, which points to load rather than the merge. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- Moatless task: https://moatless.soaplabstest.com/tasks/eb08321e-6aab-41b3-b1a9-018b50a335c9
2 parents 7ff66cd + 9c3d75b commit 06fd08e

215 files changed

Lines changed: 8208 additions & 4476 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ Start `vp run dev:client` from `apps/mobile`, or reuse a healthy Metro belonging
4646
to this checkout. Open its printed development-client URL with AgentDevice
4747
`open com.t3tools.t3code.dev <url>` and all returned target arguments.
4848
The device must be able to reach both Metro and the isolated backend.
49+
Append `&disableAutoLaunch=1&disableFab=1` to the development-client URL query
50+
when developer chrome would obscure screenshots or taps; the SDK 58 dev client
51+
applies these preferences before the app loads.
4952

5053
## Pair and verify
5154

‎.github/workflows/ci.yml‎

Lines changed: 157 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ concurrency:
1414
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
1515

1616
jobs:
17-
check:
18-
name: Check
17+
# Lint, typecheck, and the desktop build each get a runner so they run side by
18+
# side instead of one after another. The `Check` job at the end of this file
19+
# passes only when every other job does.
20+
lint:
21+
name: Lint
1922
runs-on: blacksmith-8vcpu-ubuntu-2404
2023
timeout-minutes: 10
2124
steps:
@@ -52,6 +55,29 @@ jobs:
5255
- name: Check
5356
run: vp check
5457

58+
typecheck:
59+
name: Typecheck
60+
runs-on: blacksmith-8vcpu-ubuntu-2404
61+
timeout-minutes: 10
62+
steps:
63+
- name: Checkout
64+
uses: actions/checkout@v6
65+
with:
66+
sparse-checkout: |
67+
/*
68+
!/.repos/
69+
sparse-checkout-cone-mode: false
70+
71+
- name: Setup Vite+
72+
uses: voidzero-dev/setup-vp@v1
73+
with:
74+
node-version-file: package.json
75+
cache: true
76+
run-install: true
77+
78+
- name: Ensure Electron runtime is installed
79+
run: vp run --filter @t3tools/desktop ensure:electron
80+
5581
- name: Typecheck
5682
run: vpr typecheck
5783

@@ -68,24 +94,60 @@ jobs:
6894
if: vars.MOATLESS_API_URL != ''
6995
run: node packages/moatless-api/scripts/checkSpecFreshness.mjs --url "${{ vars.MOATLESS_API_URL }}"
7096

97+
build:
98+
name: Build
99+
runs-on: blacksmith-8vcpu-ubuntu-2404
100+
timeout-minutes: 10
101+
steps:
102+
- name: Checkout
103+
uses: actions/checkout@v6
104+
with:
105+
sparse-checkout: |
106+
/*
107+
!/.repos/
108+
sparse-checkout-cone-mode: false
109+
71110
- uses: ./.github/actions/setup-apt-mirrors
72111

73-
- name: Install browser secret helper build libraries
112+
# Runs in the background while Vite+ installs; the step before the build waits for it.
113+
- name: Start installing browser secret helper build libraries
74114
run: |
75115
sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
76-
sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
116+
(
117+
set +e
118+
sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
119+
echo "$?" > "$RUNNER_TEMP/apt-status"
120+
) > "$RUNNER_TEMP/apt.log" 2>&1 < /dev/null &
121+
122+
- name: Setup Vite+
123+
uses: voidzero-dev/setup-vp@v1
124+
with:
125+
node-version-file: package.json
126+
cache: true
127+
run-install: true
128+
129+
- name: Ensure Electron runtime is installed
130+
run: vp run --filter @t3tools/desktop ensure:electron
131+
132+
- name: Finish installing browser secret helper build libraries
133+
timeout-minutes: 5
134+
run: |
135+
until test -s "$RUNNER_TEMP/apt-status"; do sleep 1; done
136+
cat "$RUNNER_TEMP/apt.log"
137+
exit "$(cat "$RUNNER_TEMP/apt-status")"
77138
78139
- name: Build desktop pipeline
79140
run: vp run build:desktop
80141

81142
- name: Verify preload bundle output
82143
run: node apps/desktop/scripts/verify-preload-bundle.mjs
83144

84-
# Everything except `t3` (apps/server). `--parallel` drops the package
85-
# dependency ordering that `vp run` applies by default: these `test` tasks
86-
# declare no `dependsOn` and resolve workspace deps from source, so ordering
87-
# only bought us idle runners between dependency layers. The concurrency
88-
# limit stays at the default 4 so peak load per runner is unchanged.
145+
# Everything except `t3` (apps/server) and the web app, which has its own job
146+
# below. `--parallel` drops the package dependency ordering that `vp run`
147+
# applies by default: these `test` tasks declare no `dependsOn` and resolve
148+
# workspace deps from source, so ordering only bought us idle runners between
149+
# dependency layers. The concurrency limit stays at the default 4 so peak load
150+
# per runner is unchanged.
89151
test:
90152
name: Test
91153
runs-on: blacksmith-8vcpu-ubuntu-2404
@@ -99,6 +161,19 @@ jobs:
99161
!/.repos/
100162
sparse-checkout-cone-mode: false
101163

164+
- uses: ./.github/actions/setup-apt-mirrors
165+
166+
# The desktop tests compile the browser secret helper. The install runs in
167+
# the background while Vite+ installs; the step before the tests waits for it.
168+
- name: Start installing browser secret helper build libraries
169+
run: |
170+
sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
171+
(
172+
set +e
173+
sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
174+
echo "$?" > "$RUNNER_TEMP/apt-status"
175+
) > "$RUNNER_TEMP/apt.log" 2>&1 < /dev/null &
176+
102177
- name: Setup Vite+
103178
uses: voidzero-dev/setup-vp@v1
104179
with:
@@ -109,34 +184,61 @@ jobs:
109184
- name: Ensure Electron runtime is installed
110185
run: vp run --filter @t3tools/desktop ensure:electron
111186

112-
- uses: ./.github/actions/setup-apt-mirrors
113-
114-
- name: Install browser secret helper build libraries
115-
run: |
116-
sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
117-
sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
118-
119187
- name: Test preview artifact validation
120188
run: python3 -B .github/scripts/stage-preview-bundle.test.py
121189

122190
- name: Test nightly release checks
123191
run: node --test .github/scripts/check-nightly-release.test.cjs
124192

193+
- name: Finish installing browser secret helper build libraries
194+
timeout-minutes: 5
195+
run: |
196+
until test -s "$RUNNER_TEMP/apt-status"; do sleep 1; done
197+
cat "$RUNNER_TEMP/apt.log"
198+
exit "$(cat "$RUNNER_TEMP/apt-status")"
199+
200+
- name: Test
201+
run: vp run --parallel --concurrency-limit 4 --filter '!t3' --filter '!@t3tools/monorepo' --filter '!@t3tools/web' test
202+
203+
# The web suite is the largest outside the server. In the shared Test job it
204+
# started last and ran alone for about 40s after everything else finished.
205+
test_web:
206+
name: Test Web
207+
runs-on: blacksmith-8vcpu-ubuntu-2404
208+
timeout-minutes: 10
209+
steps:
210+
- name: Checkout
211+
uses: actions/checkout@v6
212+
with:
213+
sparse-checkout: |
214+
/*
215+
!/.repos/
216+
sparse-checkout-cone-mode: false
217+
218+
- name: Setup Vite+
219+
uses: voidzero-dev/setup-vp@v1
220+
with:
221+
node-version-file: package.json
222+
cache: true
223+
run-install: true
224+
125225
- name: Test
126-
run: vp run --parallel --concurrency-limit 4 --filter '!t3' --filter '!@t3tools/monorepo' test
226+
run: vp run --filter @t3tools/web test
127227

128-
# apps/server sets `fileParallelism: false`, so its 239 files run strictly
228+
# apps/server sets `fileParallelism: false`, so its test files run strictly
129229
# one at a time. Sharding spreads them over separate runners instead of
130230
# separate workers, so no two server test files ever share a machine and the
131-
# isolation that flag buys is preserved exactly.
231+
# isolation that flag buys is preserved exactly. One file at a time keeps
232+
# about 1.5 cores busy, so 4 vCPU runners lose nothing against 8. The shards
233+
# split files by recorded duration (apps/server/src/testUtils/weightedShardSequencer.ts).
132234
test_server:
133235
name: Test Server ${{ matrix.shard }}
134-
runs-on: blacksmith-8vcpu-ubuntu-2404
236+
runs-on: blacksmith-4vcpu-ubuntu-2404
135237
timeout-minutes: 10
136238
strategy:
137239
fail-fast: false
138240
matrix:
139-
shard: [1, 2, 3]
241+
shard: [1, 2, 3, 4, 5, 6]
140242
steps:
141243
- name: Checkout
142244
uses: actions/checkout@v6
@@ -360,3 +462,37 @@ jobs:
360462
361463
- name: Exercise release-only workflow steps
362464
run: node scripts/release-smoke.ts
465+
466+
# Branch protection requires this job by its name, `Check`. It fails when any
467+
# other job fails, is cancelled, or is skipped without a reason, so splitting
468+
# or resharding jobs needs no ruleset change. Add every new job to `needs`.
469+
# `always()` rather than `!cancelled()`: a skipped job reports success to
470+
# branch protection, so a cancelled run must still produce a failing check.
471+
check:
472+
name: Check
473+
if: ${{ always() }}
474+
needs:
475+
[
476+
lint,
477+
typecheck,
478+
build,
479+
test,
480+
test_web,
481+
test_server,
482+
rust,
483+
mobile_native_changes,
484+
mobile_native_static_analysis,
485+
release_smoke,
486+
]
487+
runs-on: blacksmith-2vcpu-ubuntu-2404
488+
timeout-minutes: 5
489+
steps:
490+
- name: Require every job to pass
491+
env:
492+
RESULTS: ${{ toJSON(needs) }}
493+
run: |
494+
echo "$RESULTS" | jq -r 'to_entries[] | "\(.key): \(.value.result)"'
495+
# Only the macOS lint skips on purpose, when no native mobile code changed.
496+
echo "$RESULTS" | jq -e 'all(to_entries[];
497+
.value.result == "success"
498+
or (.key == "mobile_native_static_analysis" and .value.result == "skipped"))' > /dev/null

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ jobs:
284284
concurrency:
285285
group: desktop-macos-preview-${{ needs.resolve.outputs.pr_number }}-build
286286
cancel-in-progress: true
287+
# release-desktop.yml asks for actions: read (its Windows builds list artifacts).
288+
permissions:
289+
actions: read
290+
contents: read
287291
uses: ./.github/workflows/release-desktop.yml
288292
secrets:
289293
CSC_LINK: ${{ secrets.CSC_LINK }}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ jobs:
6666
if: steps.expo-token.outputs.present == 'true'
6767
uses: expo/expo-github-action@v8
6868
with:
69-
eas-version: latest
69+
# eas-cli 22 renamed `project` to `app` in build JSON, and
70+
# continuous-deploy-fingerprint still reads `build.project.ownerAccount`.
71+
# Unpin once https://github.com/expo/expo-github-action/issues/358 is fixed.
72+
eas-version: 21.8.0
7073
token: ${{ secrets.EXPO_TOKEN }}
7174
# npm, not pnpm: this only installs eas-cli into the action's own
7275
# tool dir, and pnpm 11 hard-fails that install on dtrace-provider's

0 commit comments

Comments
 (0)