Skip to content

SDK regeneration - #182

Merged
kraenhansen merged 5 commits into
mainfrom
fern-bot/2026-10-27_22-30-20_524
Oct 27, 2026
Merged

kraenhansen merged 5 commits into
mainfrom
fern-bot/2026-10-27_22-30-20_524

Conversation

@fern-api

@fern-api fern-api Bot commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

Automated SDK generation by Fern


✅ Customizations automatically preserved, but 14 files need your attention.

Action required: 14 files with unresolved customization conflicts

The new generation changed code you previously customized. Non-conflicting customizations have been applied automatically. The following files need manual resolution:

File Your customization Why it conflicted
Cargo.lock fix(deps): patch two advisories; keep the verification script The new generation changed the same lines you edited
Cargo.lock Alpha build The new generation changed the same lines you edited
Cargo.toml Alpha build The new generation changed the same lines you edited
dist-workspace.toml Customer customizations (composite) This customization was from a previous generation
Cargo.lock feat: tag CLI requests with the command that made them (#132) This customization was from a previous generation
Cargo.toml feat: tag CLI requests with the command that made them (#132) The new generation changed the same lines you edited
Cargo.lock feat: Make intent mandatory for agents (#148) This customization was from a previous generation
Cargo.toml feat: Make intent mandatory for agents (#148) This customization was from a previous generation
Cargo.lock Make intent optional (#150) This customization was from a previous generation
Cargo.lock feat: add onboard init, connect, check and test for agent-led setup (#154) This customization was from a previous generation
Cargo.toml fix: onboard flags that survive npx, and check that the app loads the key (1.5.1) (#159) The new generation changed the same lines you edited
Cargo.lock fix: bump rustls-webpki to 0.103.16 for RUSTSEC-2026-0382 (#174) This customization was from a previous generation
Cargo.lock fix: the browser's approval reaches onboard on Windows (1.7.1) (#167) This customization was from a previous generation
Cargo.toml fix: the browser's approval reaches onboard on Windows (1.7.1) (#167) This customization was from a previous generation

How to resolve

  1. Check out this branch:
    git fetch origin && git checkout -b fern-bot/2026-10-27_22-30-20_524 origin/fern-bot/2026-10-27_22-30-20_524
    Or if you don't have the repo cloned:
    git clone https://github.com/elevenlabs/cli.git && cd cli && git checkout -b fern-bot/2026-10-27_22-30-20_524 origin/fern-bot/2026-10-27_22-30-20_524
  2. Run: fern replay resolve
  3. Open the conflicting files in your editor — you'll see standard merge conflict markers
  4. Resolve using your editor's merge tools (VS Code, IntelliJ, etc.)
  5. Run: fern replay resolve again to finalize
  6. Push your changes

Your resolved customizations will be remembered on future SDK generations.
If you merge this PR without resolving, your unresolved customizations will conflict again on the next generation.

fern-api Bot and others added 5 commits October 27, 2026 22:30
Generated by Fern
CLI Version: unknown
Generators:
  - fernapi/fern-cli-generator: 0.38.4
Patches applied (4):
  - patch-3324bcc8: build: publish prereleases to homebrew and scoop
  - patch-3acf25c9: feat: Adds new say command (#143)
  - patch-0d14627a: fix: don't send Authorization alongside an explicit API key (#153)
  - patch-ab3cae7d: fix: onboard check finds the key file by name in a monorepo package (1.5.2) (#160)

Patches with unresolved conflicts (10):
  - patch-809b383f: fix(deps): patch two advisories; keep the verification script
  - patch-590ac6e0: Alpha build
  - patch-composite-7dd8e976: Customer customizations (composite)
  - patch-147b7f4d: feat: tag CLI requests with the command that made them (#132)
  - patch-2fb0d577: feat: Make intent mandatory for agents (#148)
  - patch-3866acd2: Make intent optional (#150)
  - patch-68caee9a: feat: add onboard init, connect, check and test for agent-led setup (#154)
  - patch-d0001ac9: fix: onboard flags that survive npx, and check that the app loads the key (1.5.1) (#159)
  - patch-c6e92222: fix: bump rustls-webpki to 0.103.16 for RUSTSEC-2026-0382 (#174)
  - patch-ef424569: fix: the browser's approval reaches onboard on Windows (1.7.1) (#167)
    Run `fern-replay resolve` to apply these customizations.
Fern replay reverted both to generator defaults again: rustls-webpki 0.103.13
(RUSTSEC-2026-0382), the rand 0.10 family, and publish-prereleases = true.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kraenhansen
kraenhansen merged commit 51f18be into main Oct 27, 2026
16 checks passed
kraenhansen added a commit that referenced this pull request Oct 28, 2026
windows-smoke.yml has no generated counterpart, so a regeneration deletes it
(#182).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kraenhansen added a commit that referenced this pull request Oct 28, 2026
patch-3324bcc8 replayed the alpha-era publish-prereleases = true onto every
regeneration (#166, #182). The generator's template omits the key, so
cargo-dist's default of false applies once the patch is gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kraenhansen added a commit that referenced this pull request Oct 28, 2026
* fix: keep regeneration from deleting the windows-smoke workflow

windows-smoke.yml has no generated counterpart, so a regeneration deletes it
(#182).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix: stop Fern Replay re-enabling prerelease publishing

patch-3324bcc8 replayed the alpha-era publish-prereleases = true onto every
regeneration (#166, #182). The generator's template omits the key, so
cargo-dist's default of false applies once the patch is gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* [fern-replay] Resolved conflicts

Patches replayed:
  - patch-809b383f: fix(deps): patch two advisories; keep the verification script
  - patch-composite-7dd8e976: Customer customizations (composite)
  - patch-3acf25c9: feat: Adds new say command (#143)
  - patch-3866acd2: Make intent optional (#150)
  - patch-0d14627a: fix: don't send Authorization alongside an explicit API key (#153)
  - patch-68caee9a: feat: add onboard init, connect, check and test for agent-led setup (#154)
  - patch-d0001ac9: fix: onboard flags that survive npx, and check that the app loads the key (1.5.1) (#159)
  - patch-ab3cae7d: fix: onboard check finds the key file by name in a monorepo package (1.5.2) (#160)
  - patch-c6e92222: fix: bump rustls-webpki to 0.103.16 for RUSTSEC-2026-0382 (#174)
  - patch-ef424569: fix: the browser's approval reaches onboard on Windows (1.7.1) (#167)

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant