Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
78e7f36
fix: bind canvas ownership to the tracker whose graph is loaded
christian-byrne Sep 10, 2026
9ad0a9a
fix: fail closed while replacing canvas ownership
christian-byrne Sep 13, 2026
2522b1b
test: cover canvas ownership review cases
christian-byrne Sep 14, 2026
a1257a0
test: keep canvas owner regression active
christian-byrne Sep 15, 2026
40df1dc
fix: preserve canvas ownership during graph transitions
ampagent Sep 19, 2026
5433fda
refactor(workflow): isolate canvas ownership state
christian-byrne Oct 11, 2026
4bcc006
fix: invalidate canvas ownership after the beforeLoadGraph hook
christian-byrne Oct 17, 2026
218abae
docs: define the three canvas-ownership states
christian-byrne Oct 17, 2026
fb74747
Revert "docs: define the three canvas-ownership states"
christian-byrne Oct 17, 2026
65cdf71
fix(workflow): harden canvas ownership regression
christian-byrne Oct 18, 2026
b9b69ee
docs(architecture): claim canvas ownership state
christian-byrne Oct 18, 2026
9a360e1
refactor(workflow): sequence canvas replacement in service
christian-byrne Oct 18, 2026
839e645
Merge remote-tracking branch 'origin/main' into oploop-816f-17331
christian-byrne Oct 20, 2026
3e950d6
fix: skip preload capture for unowned canvas
christian-byrne Oct 22, 2026
1cc1e83
chore: prepare workflow ownership merge resolution
christian-byrne Oct 30, 2026
52ee54d
Merge branch 'main' into hp/qaf-68-store-switch-wrong-graph
christian-byrne Oct 30, 2026
b3969a3
docs: regenerate workflow architecture boundary
christian-byrne Oct 30, 2026
f772057
Merge branch 'main' into hp/qaf-68-store-switch-wrong-graph
christian-byrne Oct 30, 2026
b171a8d
Merge main into PM-875 canvas-ownership binding
christian-byrne Nov 1, 2026
9a83002
chore: keep graph-load resolution comment-free
christian-byrne Nov 1, 2026
7da045a
Merge remote-tracking branch 'origin/main' into codex/oploop1071-fe17…
christian-byrne Nov 1, 2026
f701b5d
fix: do not mark unedited saved workflows unsaved after a reload (#22…
christian-byrne Nov 1, 2026
e048fff
fix: show HDR dropdown previews for annotated output and temp values …
jaeone94 Nov 1, 2026
070eb3e
fix(telemetry): stop paging when page-evaluated code runs an unknown …
christian-byrne Nov 1, 2026
7520340
fix: let the tracked .amp/services.yaml be staged again (#22575)
christian-byrne Nov 1, 2026
df42cac
fix: restore the latest workflow tabs after a reload on Cloud (#22574)
christian-byrne Nov 1, 2026
ba88404
fix(agent): make the tour's workflow card match what the panel does (…
christian-byrne Nov 1, 2026
08fa386
fix(billing): render usage-log tooltips from an explicit param allowl…
mattmillerai Nov 1, 2026
81f0493
fix(extensions): drop ?safe from the URL once the boot has read it (#…
christian-byrne Nov 1, 2026
338941a
test(telemetry): pin the direct-caller rule for evaluated command cal…
christian-byrne Nov 1, 2026
202961c
DPLAT-2852 fix(account-core): keep auto_top_up_setup on the capabilit…
dante01yoon Nov 1, 2026
80260c4
FRONT-3740 fix(billing): gate local pricing-table actions on billing …
dante01yoon Nov 1, 2026
dc21f88
fix(workspace): report a 401 deployment listing as a denied warning (…
dante01yoon Nov 1, 2026
387206e
FRONT-3674 feat(billing): say "Verify by {time}" when the top-up serv…
dante01yoon Nov 1, 2026
c9c150d
FRONT-3626 feat(billing): show the plan allowance on the Credits card…
dante01yoon Nov 1, 2026
fe9aec3
FRONT-3626 fix(billing): say "This plan has ended." without an end da…
dante01yoon Nov 1, 2026
7f909f4
feat(errors): View details opens only the groups the toast covers (DE…
christian-byrne Nov 1, 2026
39422ae
test(agent): run the entry lifecycle test on the default ComfyUI buil…
christian-byrne Nov 1, 2026
3482fa2
fix(agent): report a node's actual widgets when a CRDT widget write i…
christian-byrne Nov 1, 2026
ab4de6b
ci: merge backports only when approved at the current head (#22569)
christian-byrne Nov 1, 2026
a3835d8
fix: fail locale regeneration when a declared command loses its Engli…
christian-byrne Nov 1, 2026
9ceb4ce
fix(agent): re-send the canvas whenever an unsaved tab's remembered w…
christian-byrne Nov 1, 2026
76c46a8
test(agent): refresh batched layout recording (#22373)
christian-byrne Nov 1, 2026
5de875c
feat(agent): resolve reply shortcuts against the user's own keybindin…
christian-byrne Nov 1, 2026
8e8370e
refactor(errors): require group keys for a View details request (DES-…
christian-byrne Nov 1, 2026
8da0fae
fix(agent): gate selected-node starter prompt (#21924)
christian-byrne Nov 1, 2026
b0e8fcd
fix: keep the audio preview button in sync when playback starts elsew…
christian-byrne Nov 1, 2026
4534133
fix: guard URL.parse and URL.canParse, lint older-browser APIs (#22452)
christian-byrne Nov 1, 2026
a8bfbee
FRONT-3770 account-core 1.0.0-alpha.5 (#22627)
comfy-pr-bot Nov 1, 2026
e35fcd7
refactor: make the DynamicGroup allocation-bound check an assertion (…
christian-byrne Nov 1, 2026
c06b617
fix(agent): add diagnostic context to the live-graph node-id-remint r…
christian-byrne Nov 1, 2026
f669649
fix(agent): open the / skill picker when ComfyUI hosts the agent (BE-…
skishore23 Nov 1, 2026
1029196
fix(agent): keep every latest-turn tool call and thinking time in the…
mattmillerai Nov 1, 2026
e9a04f4
fix(widgets): re-resolve multi-output job items when paged output cou…
hphproton Nov 1, 2026
52eaf5a
fix(ci): pin merge-reports Playwright to the lockfile version (#22268)
mattmillerai Nov 1, 2026
7f33876
test(agent): apply the remaining onboarding review nits from #21857 (…
christian-byrne Nov 1, 2026
7ad5f8b
FE-3349 docs(adr): define as-received server facts and accept ADR-004…
dante01yoon Nov 1, 2026
9dd9b35
test(cloud): cover the shared request status retry end to end (#22512)
dante01yoon Nov 1, 2026
d41c1e3
fix(agent): close the composer asset preview on Escape without stoppi…
skishore23 Nov 1, 2026
24cc0ce
DPLAT-2852 ingest-types 1.4.0 (#22444)
dante01yoon Nov 1, 2026
47d1cf4
fix: keep the canvas rendering after a failed first frame (#22273)
christian-byrne Nov 1, 2026
76dd88f
test(agent): cover attached workflow import (BE-24642) (#22634)
christian-byrne Nov 1, 2026
67ebf2a
test: keep the video record command test independent of ~/.bashrc (#2…
christian-byrne Nov 1, 2026
4ffb6aa
test(agent): preserve user-local command replies (#22635)
christian-byrne Nov 1, 2026
cc82e6c
refactor: route agent widget writes through BaseWidget.setValue (#21752)
DrJKL Nov 1, 2026
1f9d059
ci: stop cancelled E2E runs from overwriting the PR's Playwright sect…
christian-byrne Nov 1, 2026
56413b2
test(agent): assert the paywall Subscribe dialog renders pricing cont…
christian-byrne Nov 1, 2026
7ad9953
feat(widgets): expand a multiline text widget into a text editor dial…
shrimbly Nov 1, 2026
31addf7
ci: fold check explainers into the collapsed report box (#22473)
christian-byrne Nov 1, 2026
c2da4c8
fix(agent): mark after-configure writes as load provenance (#22628)
christian-byrne Nov 1, 2026
9580dff
fix(workflow): stop deleting an unsaved tab's draft on a same-path sa…
christian-byrne Nov 1, 2026
9065563
fix: remove unnecessary async component boundaries (#22643)
DrJKL Nov 1, 2026
9c5fa55
fix(assets): send include_public explicitly from model pickers and ou…
christian-byrne Nov 2, 2026
1db22ea
test(agent): pin the fake clock in the conversation veil timing test …
christian-byrne Nov 2, 2026
8651848
perf(telemetry): report how long the tab was hidden during startup (#…
christian-byrne Nov 2, 2026
86ad4b3
refactor(agent): move tab-title and tab-activity wiring into a compos…
christian-byrne Nov 2, 2026
8135e4c
fix(ci): allow a manual backport re-check on a finished PR (#22488)
christian-byrne Nov 2, 2026
9a58ff9
test(design-system): give the icon sizing build test a 30 s timeout (…
christian-byrne Nov 2, 2026
816ea98
fix(agent): load an unopened unsaved tab before the workflow picker s…
christian-byrne Nov 2, 2026
3265ba4
chore: bump ecosystem matrix corpus pins (#22687)
comfy-pr-bot Nov 2, 2026
cdbb0cb
fix(agent): keep a settled snapshot read from taking a later turn's r…
christian-byrne Nov 2, 2026
9542447
fix(i18n): keep hand-written Russian plural forms on locale regenerat…
christian-byrne Nov 2, 2026
eb77703
fix(agent): make the tour card outline and arrow easy to see (#22695)
christian-byrne Nov 2, 2026
aa8c161
fix(agent): Local paywall copy no longer says the user spent credits …
christian-byrne Nov 2, 2026
c52b477
fix: bound PNG text chunk scans by chunk and buffer length (#22690)
jaeone94 Nov 2, 2026
f767099
fix: stop PNG chunk parsing at IEND (#22701)
jaeone94 Nov 2, 2026
e4bf62d
feat(telemetry): report sends the agent session refuses before the tu…
christian-byrne Nov 2, 2026
ace70c7
refactor(billing): route every workspace to workspace billing (#22647)
wei-hai Nov 2, 2026
544360c
ci: time out unit test jobs after 20 minutes (#22707)
jaeone94 Nov 2, 2026
dcb6476
refactor(billing): delete the legacy billing adapter (#22655)
wei-hai Nov 2, 2026
1af9270
[chore] Update Ingest API types from cloud@54a1ddc0 (#22354)
comfy-pr-bot Nov 2, 2026
5d175fc
test: harden workflow and sidebar readiness (#22328)
DrJKL Nov 2, 2026
f710711
refactor(billing): remove the legacy /customers billing helpers (#22657)
wei-hai Nov 2, 2026
adaacde
refactor(billing): remove the per-workspace billing rail plumbing (#2…
wei-hai Nov 2, 2026
cd2efb1
feat(canvas): L hides or shows every link on the selected nodes (DES-…
shrimbly Nov 2, 2026
a2866ae
chore(deps): override tinypool to 2.1.2 (BE-22503) (#22389)
luke-mino-altherr Nov 2, 2026
d93736e
fix(deps): bump dompurify 3.4.13 → 3.4.17 (BE-22956) (#21826)
luke-mino-altherr Nov 2, 2026
aa13e7b
test: drop the body reset the shared test setup already does (#22357)
christian-byrne Nov 2, 2026
e724492
refactor: fold the reconnect placeholder check with reduceAllNodes (#…
christian-byrne Nov 2, 2026
a5418f6
feat(architecture): allow cross-domain imports without declared edges…
DrJKL Nov 2, 2026
9d03d6f
fix(agent): stamp a held human edit above what it has received (PM-21…
christian-byrne Nov 2, 2026
dbc9340
fix(billing): recheck pricing access after the catalog fetch in the d…
wei-hai Nov 2, 2026
e876139
refactor: move node-def V2 schema, migration and input-spec interpret…
DrJKL Nov 2, 2026
917b85b
1.61.0 (#22726)
comfy-pr-bot Nov 2, 2026
03dfefe
chore: update development toolchain and pnpm (#22469)
DrJKL Nov 2, 2026
bc6ce5c
fix(test-recorder): show the Record toolbar on Playwright 1.63 (#21539)
lovelybbq Nov 2, 2026
546bbe2
feat(architecture): remove architectural roles from the domain catalo…
DrJKL Nov 3, 2026
85add0d
fix: match node header right padding to the collapse toggle inset (#2…
jaeone94 Nov 3, 2026
268cb14
fix(architecture): route enforced-domain deep imports through public …
DrJKL Nov 3, 2026
661e1e4
fix(workspace): offer only ready deployments for a workflow's missing…
benceruleanlu Nov 3, 2026
dd96e2e
chore: enable new Vue, Playwright, and Stylelint rules (#22749)
DrJKL Nov 3, 2026
68b76a7
chore: disallow returned values in Playwright tests (#22755)
DrJKL Nov 3, 2026
9855fac
fix(agent): say the canvas isn't ready when a send is held for it (PM…
christian-byrne Nov 3, 2026
e3ce31f
test(onboarding): pin the first-run nudge placement with a snapshot (…
christian-byrne Nov 3, 2026
c76f916
fix(agent-crdt): track unconfirmed bind targets as unsynced (FRONT-35…
christian-byrne Nov 3, 2026
d5049a6
FRONT-3796 refactor(account-core): move Billing tab section rules int…
dante01yoon Nov 3, 2026
d5841ab
FRONT-3738 feat(billing): show the auto top-up block to members (#22696)
dante01yoon Nov 3, 2026
ee386d7
M4 feat(billing): show refused Add credits disabled with the served r…
dante01yoon Nov 3, 2026
f26b76e
FRONT-3793 feat(account-ui): package the Add credits dialog in the Bi…
dante01yoon Nov 3, 2026
92c8b0e
docs: say which workflow publishes the frontend to PyPI (#22703)
christian-byrne Nov 3, 2026
a8c2ace
fix: report a refused DynamicGroup restore from a remote DynamicCombo…
jaeone94 Nov 3, 2026
bc5998c
fix(agent): clamp a never-resolved tool-call spinner on transport dis…
christian-byrne Nov 3, 2026
266ffa5
fix: keep a late image preview load off another workflow's node (#21341)
christian-byrne Nov 3, 2026
0e3b2b0
feat(litegraph): prove a node's widget form rather than deriving it (…
christian-byrne Nov 3, 2026
5d8e08b
fix(agent): start a new chat with an empty composer (#21588)
christian-byrne Nov 3, 2026
06130fb
test(cloud): record finished capability reads in the status retry hel…
dante01yoon Nov 3, 2026
b94759f
[chore] Update Ingest API types from cloud@6f5f6f00 (#22718)
comfy-pr-bot Nov 3, 2026
6dd3d82
fix(agent): bind the workflow a followed chat opens (FRONT-3804) (#22…
christian-byrne Nov 3, 2026
5ecce1c
fix(agent): keep a restored finished turn's Worked label (FRONT-3803)…
christian-byrne Nov 3, 2026
1ca01f9
feat(agent): show a card when the agent turns a node pack off, on, or…
christian-byrne Nov 3, 2026
e29d67c
fix(ci): report an empty backport cherry-pick as already backported (…
christian-byrne Nov 3, 2026
1d094f1
test(agent): cover host-minted widget forms (#22788)
christian-byrne Nov 3, 2026
e87eb1d
Merge origin/main into hp/qaf-68-store-switch-wrong-graph
christian-byrne Nov 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 16 additions & 11 deletions .github/actions/explain-check/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ runs:
{
printf '## %s %s: %s\n' "$INPUT_ICON" "$INPUT_TITLE" "$badge"

if [ -n "$INPUT_HEADLINE" ]; then
printf '\n%s\n' "$INPUT_HEADLINE"
fi

run_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
case "$INPUT_STATUS" in
fail|warn)
Expand All @@ -111,20 +107,29 @@ runs:
;;
esac

has_findings=''
if [ -n "$INPUT_DETAILS_FILE" ] && [ -s "$INPUT_DETAILS_FILE" ]; then
printf '\n<details>\n<summary>Findings and check details</summary>\n\n'
cat "$INPUT_DETAILS_FILE"
printf '\n\n</details>\n'
has_findings=1
fi

if [ -n "$INPUT_HEADLINE" ] || [ -n "$has_findings" ] || [ -n "$INPUT_DOCS" ]; then
printf '\n<details>\n<summary>Findings and check details</summary>\n'
if [ -n "$INPUT_HEADLINE" ]; then
printf '\n%s\n' "$INPUT_HEADLINE"
fi
if [ -n "$has_findings" ]; then
printf '\n%s\n' "$(cat "$INPUT_DETAILS_FILE")"
fi
if [ -n "$INPUT_DOCS" ]; then
printf '\nFull docs: %s\n' "$INPUT_DOCS"
fi
printf '\n</details>\n'
fi

if [ -n "$INPUT_REPRODUCE" ]; then
printf '\n<details>\n<summary>Reproduce locally</summary>\n\n'
printf '```bash\n%s\n```\n\n</details>\n' "$INPUT_REPRODUCE"
fi

if [ -n "$INPUT_DOCS" ]; then
printf '\nFull docs: %s\n' "$INPUT_DOCS"
fi
} > "$out"

echo "file=$out" >> "$GITHUB_OUTPUT"
Expand Down
7 changes: 6 additions & 1 deletion .github/actions/repo-checks/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: 'Repository consistency checks'
description: >
Runs dependency-cycle, unused-code, locale integrity, follower-invariant and ADR checks. Shared by
Runs dependency-cycle, unused-code, locale integrity, command-locale coverage, follower-invariant
and ADR checks. Shared by
ci-lint-format.yaml (PR) and ci-lint-format-queue.yaml (merge queue). The
caller is responsible for a blobless full-history checkout (locale:check
fetches source blobs from git history) and frontend setup.
Expand All @@ -24,6 +25,10 @@ runs:
shell: bash
run: pnpm locale:check

- name: Verify every declared command has an English locale entry
shell: bash
run: pnpm command-locales:check

- name: Verify ADR naming
shell: bash
run: pnpm adr:check
Expand Down
32 changes: 28 additions & 4 deletions .github/workflows/backport-auto-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
echo "::group::PR #${pr}"

info=$(GH_TOKEN="$READ_TOKEN" gh pr view "$pr" --repo "$GH_REPO" \
--json number,state,isDraft,labels,baseRefName,reviewDecision,mergeStateStatus 2>/dev/null || echo '')
--json number,state,isDraft,labels,baseRefName,reviewDecision,mergeStateStatus,headRefOid 2>/dev/null || echo '')
if [ -z "$info" ]; then
echo "Could not read PR #${pr} — skipping."; echo "::endgroup::"; continue
fi
Expand All @@ -139,8 +139,8 @@ jobs:
echo "::endgroup::"; continue
fi
case "$base" in
cloud/*|core/*) : ;;
*) echo "Base '$base' is not a release branch — skipping."; echo "::endgroup::"; continue ;;
cloud/1.56|core/1.56|cloud/1.57|core/1.57|cloud/1.58|core/1.58|cloud/1.59|core/1.59) : ;;
*) echo "Base '$base' is not an active release branch — skipping."; echo "::endgroup::"; continue ;;
esac

# Ready = approved AND GitHub says it's mergeable with required checks green.
Expand All @@ -157,6 +157,30 @@ jobs:
echo "::endgroup::"; continue
fi

head=$(echo "$info" | jq -r '.headRefOid')
if ! reviews=$(GH_TOKEN="$READ_TOKEN" gh api "repos/${GH_REPO}/pulls/${pr}/reviews" --paginate 2>&1); then
echo "Could not read reviews for PR #${pr}: ${reviews}"
echo "::endgroup::"; continue
fi
head_approvers=$(echo "$reviews" | jq -rs --arg head "$head" '
[.[][] | select(.state != "COMMENTED" and .state != "PENDING")]
| group_by(.user.login) | map(last)
| .[] | select(.state == "APPROVED" and .commit_id == $head) | .user.login' 2>/dev/null || true)
approved_at_head=false
for login in $head_approvers; do
if ! permission=$(GH_TOKEN="$READ_TOKEN" gh api "repos/${GH_REPO}/collaborators/${login}/permission" --jq '.permission' 2>&1); then
echo "Could not read permission for reviewer ${login} on PR #${pr}: ${permission}"
continue
fi
case "$permission" in
admin|maintain|write) approved_at_head=true; break ;;
esac
done
if [ "$approved_at_head" != "true" ]; then
echo "Approved, but no approval at head ${head} — waiting for a re-approval."
echo "::endgroup::"; continue
fi

echo "PR #${pr} is ready — attempting squash merge."
attempt=0
max=3
Expand All @@ -165,7 +189,7 @@ jobs:
attempt=$((attempt + 1))
# A concurrent run (or a human) may have merged it already.
if is_merged "$pr"; then merged=true; break; fi
if out=$(GH_TOKEN="$MERGE_TOKEN" gh pr merge "$pr" --repo "$GH_REPO" --squash 2>&1); then
if out=$(GH_TOKEN="$MERGE_TOKEN" gh pr merge "$pr" --repo "$GH_REPO" --squash --match-head-commit "$head" 2>&1); then
merged=true; break
fi
echo "Merge attempt ${attempt}/${max} failed: ${out}"
Expand Down
31 changes: 27 additions & 4 deletions .github/workflows/ci-tests-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,34 @@ jobs:
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
sparse-checkout: /package.json
sparse-checkout: |
/package.json
/pnpm-lock.yaml
sparse-checkout-cone-mode: false
persist-credentials: false

- name: Install pnpm
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10

- name: Read locked Playwright version
id: playwright-version
run: |
set -euo pipefail
version=$(awk '
in_entry && !/^ / { in_entry = 0 }
/^importers:/ { in_importers = 1; next }
in_importers && /^[^ ]/ { exit }
in_importers && /^ [^ ]/ { in_root = ($0 == " .:"); next }
in_root && /^ .@playwright\/test.:$/ { in_entry = 1; next }
in_entry && /^ version: / { sub(/^ version: /, ""); sub(/\(.*/, ""); print; exit }
' pnpm-lock.yaml)
if [[ -z "$version" ]]; then
echo "Could not read the @playwright/test version from pnpm-lock.yaml" >&2
exit 1
fi
echo "Using @playwright/test@$version from pnpm-lock.yaml"
echo "version=$version" >> "$GITHUB_OUTPUT"

- name: Download blob reports
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
Expand All @@ -411,12 +432,14 @@ jobs:
merge-multiple: true

- name: Merge into HTML Report
env:
PLAYWRIGHT_VERSION: ${{ steps.playwright-version.outputs.version }}
run: |
# Generate HTML report
pnpm dlx @playwright/test merge-reports --reporter=html ./all-blob-reports
pnpm dlx "@playwright/test@$PLAYWRIGHT_VERSION" merge-reports --reporter=html ./all-blob-reports
# Generate JSON report separately with explicit output path
PLAYWRIGHT_JSON_OUTPUT_NAME=playwright-report/report.json \
pnpm dlx @playwright/test merge-reports --reporter=json ./all-blob-reports
pnpm dlx "@playwright/test@$PLAYWRIGHT_VERSION" merge-reports --reporter=json ./all-blob-reports

- name: Upload HTML report
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
Expand Down Expand Up @@ -518,7 +541,7 @@ jobs:
cancel-in-progress: false
if: >-
${{
always() &&
!cancelled() &&
needs.preflight.result == 'success' &&
needs.changes.outputs.should-run == 'true' &&
github.event_name == 'pull_request' &&
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-tests-unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
needs: changes
if: ${{ needs.changes.outputs.should-run == 'true' }}
runs-on: ubuntu-latest
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -63,6 +64,7 @@ jobs:
needs: changes
if: ${{ needs.changes.outputs.should-run == 'true' }}
runs-on: ubuntu-latest
timeout-minutes: 20
permissions:
contents: read
steps:
Expand Down Expand Up @@ -98,6 +100,7 @@ jobs:
test-report:
needs: [test-shards, test-packages]
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v7

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/i18n-update-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jobs:
run: pnpm collect-i18n
env:
PLAYWRIGHT_TEST_URL: http://localhost:5173
- name: Verify no command locale was pruned
run: pnpm command-locales:check
- name: Update translations
id: translate
# continue-on-error so completed entry files (written and recorded in
Expand Down
37 changes: 25 additions & 12 deletions .github/workflows/pr-backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ jobs:
echo "::error::PR #${{ inputs.pr_number }} is not merged. Only merged PRs can be backported."
exit 1
fi

# Validate PR has needs-backport label
if ! gh pr view "${{ inputs.pr_number }}" --json labels --jq '.labels[].name' | grep -q "needs-backport"; then
echo "::error::PR #${{ inputs.pr_number }} does not have 'needs-backport' label."
exit 1
fi
env:
GH_REPO: ${{ github.repository }}

Expand Down Expand Up @@ -295,6 +289,7 @@ jobs:
run: |
FAILED=""
SUCCESS=""
ALREADY_APPLIED=""

# Get PR data for manual triggers
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
Expand Down Expand Up @@ -367,12 +362,22 @@ jobs:
# Return to main (keep the branch, we need it for PR)
git checkout main || git checkout -f main
else
# Get conflict info
CONFLICTS=$(git diff --name-only --diff-filter=U | tr '\n' ',')
CHANGES_ALREADY_ON_TARGET=false
if [ -z "${CONFLICTS}" ] &&
git rev-parse -q --verify CHERRY_PICK_HEAD >/dev/null &&
git diff --cached --quiet HEAD; then
CHANGES_ALREADY_ON_TARGET=true
fi
git cherry-pick --abort || true

echo "::error::Cherry-pick failed due to conflicts"
FAILED="${FAILED}${TARGET_BRANCH}:conflicts:${CONFLICTS} "
if [ "$CHANGES_ALREADY_ON_TARGET" = true ]; then
echo "::notice::${TARGET_BRANCH} already has the changes from ${MERGE_COMMIT}, skipping backport"
ALREADY_APPLIED="${ALREADY_APPLIED}${TARGET_BRANCH} "
else
echo "::error::Cherry-pick failed due to conflicts"
FAILED="${FAILED}${TARGET_BRANCH}:conflicts:${CONFLICTS} "
fi

# Clean up the failed branch
git checkout main || git checkout -f main
Expand All @@ -384,6 +389,7 @@ jobs:

echo "success=${SUCCESS}" >> $GITHUB_OUTPUT
echo "failed=${FAILED}" >> $GITHUB_OUTPUT
echo "already-applied=${ALREADY_APPLIED}" >> $GITHUB_OUTPUT

# Do not exit non-zero when only some targets failed: the clean
# backports must still get their PRs (next step) and the conflicts
Expand Down Expand Up @@ -463,8 +469,11 @@ jobs:
if: >-
!cancelled() &&
steps.filter-targets.outputs.skip != 'true' &&
steps.backport.outputs.failed != ''
(steps.backport.outputs.failed != '' ||
steps.backport.outputs.already-applied != '')
env:
FAILED_TARGETS: ${{ steps.backport.outputs.failed }}
ALREADY_APPLIED_TARGETS: ${{ steps.backport.outputs.already-applied }}
FORCE_RERUN: >-
${{ github.event_name == 'workflow_dispatch' && inputs.force_rerun
|| 'false' }}
Expand Down Expand Up @@ -535,11 +544,11 @@ jobs:
notify() {
local body="$1"
local context="$2"
local title="${3:-Backport of #${PR_NUMBER} to ${target} failed}"
if gh pr comment "${PR_NUMBER}" --body "${body}"; then
return
fi
echo "::warning::Could not comment on PR #${PR_NUMBER} (${context}); opening a tracking issue instead."
local title="Backport of #${PR_NUMBER} to ${target} failed"
gh issue create --title "${title}" --body "${body}" --label backport \
|| gh issue create --title "${title}" --body "${body}" \
|| echo "::warning::Also failed to open a tracking issue for #${PR_NUMBER} (${context})."
Expand Down Expand Up @@ -568,7 +577,11 @@ jobs:
)' <<<"${comments}${issues}" >/dev/null
}

for failure in ${{ steps.backport.outputs.failed }}; do
for target in ${ALREADY_APPLIED_TARGETS}; do
notify "@${PR_AUTHOR} \`${target}\` already has the changes from \`${MERGE_COMMIT}\`, so no backport PR was opened." "changes already on ${target}" "Backport of #${PR_NUMBER} to ${target} not needed"
done

for failure in ${FAILED_TARGETS}; do
IFS=':' read -r target reason conflicts <<< "${failure}"

SAFE_TARGET=$(echo "$target" | tr '/' '-')
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ vitest.config.*.timestamp*
# Weekly docs check output
/output.txt

.amp
# Amp local state stays ignored; the tracked orb service config must stay addable
.amp/*
!.amp/services.yaml
# Registry census working tree (scripts/registry-census) - corpus, lockfile, results
.census/
# Ecosystem matrix fixture (scripts/registry-census/build_matrix.py) - generated per-pack specs
Expand Down
35 changes: 35 additions & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,37 @@
"comfy/no-es2023-array-copy-method": "error"
}
},
{
"files": [
"apps/**/*.{js,mjs,cjs,ts,mts,cts,vue}",
"src/**/*.{js,mjs,cjs,ts,mts,cts,vue}",
"packages/**/*.{js,mjs,cjs,ts,mts,cts,vue}"
],
"excludeFiles": [
"**/*.{test,spec}.{ts,tsx}",
"packages/api-client/src/abortSignal.ts"
],
"rules": {
"no-restricted-properties": [
"error",
{
"object": "AbortSignal",
"property": "any",
"message": "Crashes on Chrome < 116. Use combineAbortSignals from @comfyorg/api-client/abortSignal."
},
{
"object": "URL",
"property": "parse",
"message": "Crashes on Chrome < 126. Use parseUrl from @/utils/urlSafety, or try/catch around new URL() in packages."
},
{
"object": "URL",
"property": "canParse",
"message": "Crashes on Chrome < 120. Use parseUrl from @/utils/urlSafety, or try/catch around new URL() in packages."
}
]
}
},
{
"files": [
"src/**/*.{ts,tsx,vue}",
Expand Down Expand Up @@ -749,9 +780,12 @@
"playwright/no-eval": "error",
"playwright/no-focused-test": "error",
"playwright/no-force-option": "error",
"playwright/no-identical-title": "error",
"playwright/no-export": "error",
"playwright/no-networkidle": "error",
"playwright/no-page-pause": "error",
"playwright/no-skipped-test": "error",
"playwright/no-test-return-statement": "error",
"playwright/no-unsafe-references": "error",
"playwright/no-unused-locators": "error",
"playwright/no-useless-await": "error",
Expand All @@ -765,6 +799,7 @@
"playwright/prefer-to-have-length": "error",
"playwright/prefer-web-first-assertions": "error",
"playwright/prefer-native-locators": "error",
"playwright/require-annotation-reason": "error",
"playwright/require-to-pass-timeout": "error",
"playwright/valid-expect": "error",
"playwright/valid-expect-in-promise": "error",
Expand Down
1 change: 1 addition & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"shorthand-property-no-redundant-values": true,
"selector-pseudo-element-colon-notation": "double",
"no-duplicate-selectors": true,
"selector-no-unmatchable": true,
"font-weight-notation": "numeric",
"length-zero-no-unit": true,
"color-no-invalid-hex": true,
Expand Down
Loading
Loading