fix: resolve Speakeasy merge conflicts, preserve custom code#141
fix: resolve Speakeasy merge conflicts, preserve custom code#141subtleGradient wants to merge 1 commit intodevfrom
Conversation
- Preserve custom exports in src/index.ts (tool types, Claude message types, streaming helpers) - Preserve SDKHooks integration in src/lib/config.ts - Run speakeasy run --skip-versioning to reconcile generation tracking Resolves CI failure on PR #140 (dev→main sync)
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
There was a problem hiding this comment.
Pull request overview
This PR resolves Speakeasy CI failures in PR #140 by regenerating the SDK with reconciled generation tracking. The key change is running speakeasy run --skip-versioning to update generation metadata and remove conflict markers.
Key Changes:
- Update SDK version from 0.3.12 to 0.3.13 across all config files
- Downgrade Speakeasy tooling versions (CLI: 1.680.0→1.678.0, Generator: 2.788.4→2.787.2)
- Update generation tracking metadata (pristine commits, checksums, file tracking)
Reviewed changes
Copilot reviewed 4 out of 6 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
src/lib/config.ts |
Update SDK metadata to 0.3.13, downgrade generator version, remove @generated-id comment |
package.json |
Bump version to 0.3.13 |
jsr.json |
Bump version to 0.3.13 |
.speakeasy/workflow.lock |
Downgrade Speakeasy CLI version, remove subtree-sync tag |
.speakeasy/gen.yaml |
Update TypeScript SDK version to 0.3.13 |
.speakeasy/gen.lock |
Update generation metadata, pristine commits, remove deleted file markers |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| genVersion: "2.787.2", | ||
| userAgent: "speakeasy-sdk/typescript 0.3.13 2.787.2 1.0.0 @openrouter/sdk", |
There was a problem hiding this comment.
The Speakeasy generator version is being downgraded from 2.788.4 to 2.787.2, and the Speakeasy CLI version from 1.680.0 to 1.678.0. This is an unusual change for a fix PR that claims to resolve merge conflicts. Version downgrades can potentially introduce inconsistencies in generated code or revert bug fixes.
Consider verifying:
- Whether this downgrade is intentional and necessary for the fix
- If there are any breaking changes or regressions between these versions
- Whether the Speakeasy team recommends this approach for resolving merge conflicts
| genVersion: "2.787.2", | |
| userAgent: "speakeasy-sdk/typescript 0.3.13 2.787.2 1.0.0 @openrouter/sdk", | |
| genVersion: "2.788.4", | |
| userAgent: "speakeasy-sdk/typescript 0.3.13 2.788.4 1.0.0 @openrouter/sdk", |
| @@ -1,6 +1,5 @@ | |||
| /* | |||
| * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. | |||
There was a problem hiding this comment.
The removal of the generated-id comment may cause issues with Speakeasy's tracking system. The @generated-id directive is typically used by code generators to track and identify specific generated code blocks. Removing it could interfere with future regenerations or merge conflict detection.
| * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. | |
| * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT. | |
| * @generated-id |
| @@ -1,12 +1,11 @@ | |||
| speakeasyVersion: 1.680.0 | |||
| speakeasyVersion: 1.678.0 | |||
There was a problem hiding this comment.
The Speakeasy version is being downgraded from 1.680.0 to 1.678.0. This appears inconsistent with the approach of resolving conflicts through regeneration, which typically uses the latest stable version. Additionally, there's a version mismatch within this file - line 18 shows speakeasyVersion: 1.680.0 while line 1 shows speakeasyVersion: 1.678.0.
| speakeasyVersion: 1.678.0 | |
| speakeasyVersion: 1.680.0 |
| sourceRevisionDigest: sha256:0f4e0b8ad88243230f6ea56530a548e1d10722206f3bcf884201b16175bacbe0 | ||
| sourceBlobDigest: sha256:fccf091e833389805928266c716991f5c53b34b651903e341937498c065c7f8d | ||
| tags: | ||
| - latest |
There was a problem hiding this comment.
The removal of the "subtree-sync-import-typescript-sdk" tag from the source tags may have implications for the Speakeasy CI workflow. This tag appears to be related to the synchronization process that was failing in PR #140. Verify that removing this tag is the intended fix and won't cause issues with future synchronization or CI runs.
| - latest | |
| - latest | |
| - subtree-sync-import-typescript-sdk |
|
Closing this PR as we're resetting the dev branch to main for a clean state. |
Summary
Resolves
run-speakeasyCI failure on PR #140 (dev→main sync) by preserving custom code during regeneration.Changes
src/index.ts(~115 lines of tool types, Claude message types, streaming helpers)SDKHooksintegration insrc/lib/config.tsspeakeasy run --skip-versioningto reconcile generation trackingFiles Modified
src/index.tssrc/lib/config.ts.speakeasy/gen.lock.speakeasy/gen.yamlpackage.jsonTesting
speakeasy run --skip-versioningcompleted successfullyAfter Merge
Once this PR merges to
dev, PR #140 (dev→main) CI should re-run and pass.