From f31a01800ae1340df38b4c6862d37901a2750dce Mon Sep 17 00:00:00 2001 From: "omegent-app[bot]" <306514130+omegent-app[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2026 18:27:58 +0000 Subject: [PATCH 1/3] fix(release): handle npm errors without summaries --- patches/@changesets__cli@2.31.0.patch | 13 +++++++++++++ pnpm-lock.yaml | 5 +++-- pnpm-workspace.yaml | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 patches/@changesets__cli@2.31.0.patch diff --git a/patches/@changesets__cli@2.31.0.patch b/patches/@changesets__cli@2.31.0.patch new file mode 100644 index 0000000000..daad6bec71 --- /dev/null +++ b/patches/@changesets__cli@2.31.0.patch @@ -0,0 +1,13 @@ +diff --git a/dist/changesets-cli.cjs.js b/dist/changesets-cli.cjs.js +index 9f0bd6c5f96011be225269a71365a878cb822bb7..bdfeb1dee761de629736e750a1d3f16eb1dedadc 100644 +--- a/dist/changesets-cli.cjs.js ++++ b/dist/changesets-cli.cjs.js +@@ -870,7 +870,7 @@ async function infoAllow404(packageJson) { + // we check `npm info` before publishing but `npm info` can return stale data at times + // so we need to gracefully handle this situation + function isAlreadyPublishedError(output) { +- return output.includes("cannot publish over the previously published version"); ++ return typeof output === "string" && output.includes("cannot publish over the previously published version"); + } + // we have this so that we can do try a publish again after a publish without + // the call being wrapped in the npm request limit and causing the publishes to potentially never run diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ad7f068fe5..e710d29493 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,6 +10,7 @@ overrides: vue: ^3.5.35 patchedDependencies: + '@changesets/cli@2.31.0': fd46b35ea112fa0b09f18204478a1802aeacba0ad95bca1ee89f162674c529fa '@sendgrid/mail': 3d2dd1cd5f52d3eef1772e4be48776258a596f9277c00adf0a471f54fcd3e21a '@tanstack/query-core': c98953cf4906c12283dbf72aa23b2066fccbe5186c91cf2ae01043004cf0e3f2 ts-plugin-sort-import-suggestions: 4664506575d0f4e799401cb7140b6f15f34a6fe213da6314d68439f7e8d30561 @@ -31,7 +32,7 @@ importers: devDependencies: '@changesets/cli': specifier: ^2.31.0 - version: 2.31.0(@types/node@25.9.1) + version: 2.31.0(patch_hash=fd46b35ea112fa0b09f18204478a1802aeacba0ad95bca1ee89f162674c529fa)(@types/node@25.9.1) '@effect-app/cli': specifier: 2.1.0-beta.35 version: 2.1.0-beta.35(ioredis@5.9.3(supports-color@8.1.1)) @@ -7038,7 +7039,7 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.31.0(@types/node@25.9.1)': + '@changesets/cli@2.31.0(patch_hash=fd46b35ea112fa0b09f18204478a1802aeacba0ad95bca1ee89f162674c529fa)(@types/node@25.9.1)': dependencies: '@changesets/apply-release-plan': 7.1.1 '@changesets/assemble-release-plan': 6.0.10 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 00ba5bc447..29157c4af5 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -16,3 +16,4 @@ patchedDependencies: "@tanstack/query-core": patches/@tanstack__query-core.patch typescript@6.0.3: patches/typescript.patch "@sendgrid/mail": patches/@sendgrid__mail.patch + '@changesets/cli@2.31.0': patches/@changesets__cli@2.31.0.patch From b18d393d72dd63aa5b214fa7f9d7555a734a5a1d Mon Sep 17 00:00:00 2001 From: "omegent-app[bot]" <306514130+omegent-app[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2026 18:28:39 +0000 Subject: [PATCH 2/3] fix(release): recognize duplicate detail output --- patches/@changesets__cli@2.31.0.patch | 9 +++++++++ pnpm-lock.yaml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/patches/@changesets__cli@2.31.0.patch b/patches/@changesets__cli@2.31.0.patch index daad6bec71..543f16ccad 100644 --- a/patches/@changesets__cli@2.31.0.patch +++ b/patches/@changesets__cli@2.31.0.patch @@ -9,5 +9,14 @@ index 9f0bd6c5f96011be225269a71365a878cb822bb7..bdfeb1dee761de629736e750a1d3f16e - return output.includes("cannot publish over the previously published version"); + return typeof output === "string" && output.includes("cannot publish over the previously published version"); } +@@ -950,7 +950,7 @@ async function internalPublish(packageJson, opts, twoFactorState) { + let json = getLastJsonObjectFromString(stderr.toString()) || getLastJsonObjectFromString(stdout.toString()); + if (json !== null && json !== void 0 && json.error) { + var _json$error$detail; +- if (json.error.code === "E403" && isAlreadyPublishedError(json.error.summary)) { ++ if (json.error.code === "E403" && (isAlreadyPublishedError(json.error.summary) || isAlreadyPublishedError(json.error.detail))) { + // we don't need to log anything here, it just turned out the version was already published so we gracefully exit the publish process + return { + result: "skipped" // we have this so that we can do try a publish again after a publish without // the call being wrapped in the npm request limit and causing the publishes to potentially never run diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e710d29493..05135e0092 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ overrides: vue: ^3.5.35 patchedDependencies: - '@changesets/cli@2.31.0': fd46b35ea112fa0b09f18204478a1802aeacba0ad95bca1ee89f162674c529fa + '@changesets/cli@2.31.0': e5136a004486dae0affc2f06ccfaed6a97ef20679fb95447b54b48c4f08a9d60 '@sendgrid/mail': 3d2dd1cd5f52d3eef1772e4be48776258a596f9277c00adf0a471f54fcd3e21a '@tanstack/query-core': c98953cf4906c12283dbf72aa23b2066fccbe5186c91cf2ae01043004cf0e3f2 ts-plugin-sort-import-suggestions: 4664506575d0f4e799401cb7140b6f15f34a6fe213da6314d68439f7e8d30561 @@ -32,7 +32,7 @@ importers: devDependencies: '@changesets/cli': specifier: ^2.31.0 - version: 2.31.0(patch_hash=fd46b35ea112fa0b09f18204478a1802aeacba0ad95bca1ee89f162674c529fa)(@types/node@25.9.1) + version: 2.31.0(patch_hash=e5136a004486dae0affc2f06ccfaed6a97ef20679fb95447b54b48c4f08a9d60)(@types/node@25.9.1) '@effect-app/cli': specifier: 2.1.0-beta.35 version: 2.1.0-beta.35(ioredis@5.9.3(supports-color@8.1.1)) @@ -7039,7 +7039,7 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.31.0(patch_hash=fd46b35ea112fa0b09f18204478a1802aeacba0ad95bca1ee89f162674c529fa)(@types/node@25.9.1)': + '@changesets/cli@2.31.0(patch_hash=e5136a004486dae0affc2f06ccfaed6a97ef20679fb95447b54b48c4f08a9d60)(@types/node@25.9.1)': dependencies: '@changesets/apply-release-plan': 7.1.1 '@changesets/assemble-release-plan': 6.0.10 From 3a3d3440a2ab6b3167f2868777f0f9f085221bd7 Mon Sep 17 00:00:00 2001 From: "omegent-app[bot]" <306514130+omegent-app[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2026 18:31:13 +0000 Subject: [PATCH 3/3] fix(release): regenerate changesets patch --- patches/@changesets__cli@2.31.0.patch | 4 ++-- pnpm-lock.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/@changesets__cli@2.31.0.patch b/patches/@changesets__cli@2.31.0.patch index 543f16ccad..59eba43267 100644 --- a/patches/@changesets__cli@2.31.0.patch +++ b/patches/@changesets__cli@2.31.0.patch @@ -9,6 +9,8 @@ index 9f0bd6c5f96011be225269a71365a878cb822bb7..bdfeb1dee761de629736e750a1d3f16e - return output.includes("cannot publish over the previously published version"); + return typeof output === "string" && output.includes("cannot publish over the previously published version"); } + // we have this so that we can do try a publish again after a publish without + // the call being wrapped in the npm request limit and causing the publishes to potentially never run @@ -950,7 +950,7 @@ async function internalPublish(packageJson, opts, twoFactorState) { let json = getLastJsonObjectFromString(stderr.toString()) || getLastJsonObjectFromString(stdout.toString()); if (json !== null && json !== void 0 && json.error) { @@ -18,5 +20,3 @@ index 9f0bd6c5f96011be225269a71365a878cb822bb7..bdfeb1dee761de629736e750a1d3f16e // we don't need to log anything here, it just turned out the version was already published so we gracefully exit the publish process return { result: "skipped" - // we have this so that we can do try a publish again after a publish without - // the call being wrapped in the npm request limit and causing the publishes to potentially never run diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05135e0092..4c39c6e0ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ overrides: vue: ^3.5.35 patchedDependencies: - '@changesets/cli@2.31.0': e5136a004486dae0affc2f06ccfaed6a97ef20679fb95447b54b48c4f08a9d60 + '@changesets/cli@2.31.0': 1126571653e0973f77634264a15172e8aed646b1dfdfaa4d04c57a11d5da41ff '@sendgrid/mail': 3d2dd1cd5f52d3eef1772e4be48776258a596f9277c00adf0a471f54fcd3e21a '@tanstack/query-core': c98953cf4906c12283dbf72aa23b2066fccbe5186c91cf2ae01043004cf0e3f2 ts-plugin-sort-import-suggestions: 4664506575d0f4e799401cb7140b6f15f34a6fe213da6314d68439f7e8d30561 @@ -32,7 +32,7 @@ importers: devDependencies: '@changesets/cli': specifier: ^2.31.0 - version: 2.31.0(patch_hash=e5136a004486dae0affc2f06ccfaed6a97ef20679fb95447b54b48c4f08a9d60)(@types/node@25.9.1) + version: 2.31.0(patch_hash=1126571653e0973f77634264a15172e8aed646b1dfdfaa4d04c57a11d5da41ff)(@types/node@25.9.1) '@effect-app/cli': specifier: 2.1.0-beta.35 version: 2.1.0-beta.35(ioredis@5.9.3(supports-color@8.1.1)) @@ -7039,7 +7039,7 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.31.0(patch_hash=e5136a004486dae0affc2f06ccfaed6a97ef20679fb95447b54b48c4f08a9d60)(@types/node@25.9.1)': + '@changesets/cli@2.31.0(patch_hash=1126571653e0973f77634264a15172e8aed646b1dfdfaa4d04c57a11d5da41ff)(@types/node@25.9.1)': dependencies: '@changesets/apply-release-plan': 7.1.1 '@changesets/assemble-release-plan': 6.0.10