Skip to content

Commit c12426b

Browse files
committed
chore: merge origin/main into feat/wave3b-agent-config-demo
Resolves textual conflicts in manifest.yaml and docs-links.json (keeps both open-gen-ui* from main and agent-config from this branch). Accepts main's deletion of generated shell*/src/data/*.json (now gitignored). Bumps langgraph-python feature/demo count test from 32 to 33.
2 parents b51bd01 + 415e371 commit c12426b

174 files changed

Lines changed: 13246 additions & 29848 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/workflows/showcase_capture-previews.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ jobs:
106106
echo "slugs=$CHANGED" >> $GITHUB_OUTPUT
107107
echo "Changed packages: $CHANGED"
108108
109+
- name: Generate registry
110+
run: |
111+
cd showcase/scripts
112+
npm ci --silent
113+
npx tsx generate-registry.ts
114+
109115
- name: Capture previews
110116
run: |
111117
ARGS=""
@@ -140,7 +146,7 @@ jobs:
140146
echo "No registry changes"
141147
exit 0
142148
fi
143-
git add registry.json
149+
git add -f registry.json
144150
git commit -m "Update preview URLs in registry"
145151
# Rebase-and-retry loop: the capture job can take ~30 minutes,
146152
# during which other commits routinely land on main. Without

.github/workflows/showcase_deploy.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,14 @@ jobs:
168168
- 'showcase/packages/*/manifest.yaml'
169169
shell_dashboard:
170170
- 'showcase/shell-dashboard/**'
171+
- 'showcase/shared/**'
172+
- 'showcase/scripts/**'
173+
- 'showcase/packages/*/manifest.yaml'
171174
shell_docs:
172175
- 'showcase/shell-docs/**'
176+
- 'showcase/shared/**'
177+
- 'showcase/scripts/**'
178+
- 'showcase/packages/*/manifest.yaml'
173179
174180
- name: Build service matrix
175181
id: build-matrix
@@ -218,7 +224,7 @@ jobs:
218224
{"dispatch_name":"starter-spring-ai","filter_key":"starter_spring_ai","context":"showcase/starters/spring-ai","image":"showcase-starter-spring-ai","railway_id":"3559ece3-7ba3-41ac-b24c-1f780133ec58","timeout":15,"lfs":false,"build_args":"","dockerfile":"","health_path":"/api/health"},
219225
{"dispatch_name":"starter-strands","filter_key":"starter_strands","context":"showcase/starters/strands","image":"showcase-starter-strands","railway_id":"06db2bb8-e15d-4c6a-97ad-e14777c92d9f","timeout":15,"lfs":false,"build_args":"","dockerfile":"","health_path":"/api/health"},
220226
{"dispatch_name":"shell-dojo","filter_key":"shell_dojo","context":".","image":"showcase-shell-dojo","railway_id":"7ad1ece7-2228-49cd-8a78-bddf30322907","timeout":10,"lfs":false,"build_args":"","dockerfile":"showcase/shell-dojo/Dockerfile","health_path":"/"},
221-
{"dispatch_name":"shell-dashboard","filter_key":"shell_dashboard","context":".","image":"showcase-shell-dashboard","railway_id":"4d5dfd74-be61-40b2-8564-b53b7dd4c15b","timeout":10,"lfs":true,"build_args_sha":"${{ github.sha }}","build_args_branch":"${{ github.ref_name }}","dockerfile":"showcase/shell-dashboard/Dockerfile","health_path":"/"},
227+
{"dispatch_name":"shell-dashboard","filter_key":"shell_dashboard","context":".","image":"showcase-shell-dashboard","railway_id":"4d5dfd74-be61-40b2-8564-b53b7dd4c15b","timeout":10,"lfs":true,"build_args_sha":"${{ github.sha }}","build_args_branch":"${{ github.ref_name }}","build_args_pb_url":"https://showcase-pocketbase-production.up.railway.app","build_args_shell_url":"https://showcase.copilotkit.ai","dockerfile":"showcase/shell-dashboard/Dockerfile","health_path":"/"},
222228
{"dispatch_name":"shell-docs","filter_key":"shell_docs","context":".","image":"showcase-shell-docs","railway_id":"7badfb8d-4228-414c-9145-b4026803714f","timeout":10,"lfs":true,"build_args_sha":"${{ github.sha }}","build_args_branch":"${{ github.ref_name }}","dockerfile":"showcase/shell-docs/Dockerfile","health_path":"/"}
223229
]'
224230
@@ -333,6 +339,12 @@ jobs:
333339
ARGS="COMMIT_SHA=${{ matrix.service.build_args_sha }}"
334340
ARGS="${ARGS}"$'\n'"BRANCH=${{ matrix.service.build_args_branch }}"
335341
fi
342+
if [ -n "${{ matrix.service.build_args_pb_url }}" ]; then
343+
ARGS="${ARGS:+${ARGS}$'\n'}NEXT_PUBLIC_POCKETBASE_URL=${{ matrix.service.build_args_pb_url }}"
344+
fi
345+
if [ -n "${{ matrix.service.build_args_shell_url }}" ]; then
346+
ARGS="${ARGS:+${ARGS}$'\n'}NEXT_PUBLIC_SHELL_URL=${{ matrix.service.build_args_shell_url }}"
347+
fi
336348
# Use delimiter to safely pass multiline value
337349
echo "args<<BUILDARGS_EOF" >> $GITHUB_OUTPUT
338350
echo "$ARGS" >> $GITHUB_OUTPUT

.github/workflows/static_quality.yml

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
with:
3838
ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
3939
token: ${{ secrets.GITHUB_TOKEN }}
40+
# Full history so we can diff HEAD against the current base branch
41+
# tip to scope the formatter to PR-changed files.
42+
fetch-depth: 0
4043

4144
- name: Setup pnpm
4245
uses: pnpm/action-setup@v4
@@ -53,17 +56,53 @@ jobs:
5356
- name: Install dependencies
5457
run: pnpm install --frozen-lockfile
5558

59+
- name: Collect PR-changed files for formatting
60+
if: github.event_name == 'pull_request'
61+
id: changed
62+
run: |
63+
base_ref="${{ github.event.pull_request.base.ref }}"
64+
# Fetch the current tip of the base branch so the merge-base tracks
65+
# main as it advances (using the PR's stored base.sha would pull in
66+
# every file main has touched since the PR opened).
67+
git fetch --no-tags origin "$base_ref"
68+
# Scope to files changed between the current base-branch merge-base
69+
# and HEAD so advances on main don't drag unrelated files into the
70+
# PR. Restrict to oxfmt-supported extensions so oxfmt never errors
71+
# on an unknown target. Canonical list lives upstream in oxfmt
72+
# (https://github.com/oxc-project/oxc-formatter) — update here when
73+
# oxfmt adds a new format.
74+
git diff --name-only --diff-filter=ACMR "origin/$base_ref"...HEAD -- \
75+
'*.js' '*.jsx' '*.ts' '*.tsx' '*.mjs' '*.cjs' \
76+
'*.json' '*.jsonc' '*.json5' \
77+
'*.md' '*.mdx' \
78+
'*.css' '*.yml' '*.yaml' '*.html' '*.vue' \
79+
> .pr-format-files.txt
80+
: > .pr-format-files.existing.txt
81+
while IFS= read -r f; do
82+
[ -n "$f" ] && [ -f "$f" ] && printf '%s\n' "$f" >> .pr-format-files.existing.txt
83+
done < .pr-format-files.txt
84+
count=$(wc -l < .pr-format-files.existing.txt | tr -d ' ')
85+
echo "count=$count" >> "$GITHUB_OUTPUT"
86+
echo "PR-changed format candidates: $count"
87+
cat .pr-format-files.existing.txt
88+
5689
- name: Run formatter (check on push, fix on PR)
5790
run: |
5891
if [ "${{ github.event_name }}" = "pull_request" ]; then
59-
if ! pnpm run format; then
92+
if [ "${{ steps.changed.outputs.count }}" = "0" ]; then
93+
echo "No formattable files changed in this PR — skipping oxfmt."
94+
exit 0
95+
fi
96+
if ! xargs -a .pr-format-files.existing.txt pnpm exec oxfmt --write; then
6097
echo "::warning::Formatter exited with error — auto-fix may be incomplete"
6198
fi
6299
if [ -n "$(git diff --name-only)" ]; then
63100
echo "format_fixed=true" >> $GITHUB_ENV
64101
fi
102+
xargs -a .pr-format-files.existing.txt pnpm exec oxfmt --check
103+
else
104+
pnpm run check-format
65105
fi
66-
pnpm run check-format
67106
68107
- name: Commit formatting fixes
69108
if: >-

.github/workflows/test_smoke-starter-deployed.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ jobs:
6969
run: npm ci
7070
working-directory: showcase/tests
7171

72+
- name: Generate registry data
73+
run: |
74+
cd showcase/scripts && npm ci && node node_modules/tsx/dist/cli.mjs generate-registry.ts
75+
7276
- name: Install Playwright
7377
working-directory: showcase/tests
7478
run: npx playwright install chromium --with-deps

0 commit comments

Comments
 (0)