fix: resolve Speakeasy merge conflicts for PR #142 #143
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 #142 (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 attempts to resolve Speakeasy CI merge conflicts by bumping the SDK version from 0.3.12 to 0.3.13 and updating generation tracking metadata. The changes preserve custom exports in src/index.ts and SDKHooks integration.
Key Changes:
- Version bump from 0.3.12 to 0.3.13 across package.json, jsr.json, and SDK metadata
- Speakeasy generation tracking updates with version downgrades
- Removal of file deletion markers from gen.lock
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 | Updates SDK_METADATA with new version 0.3.13 and downgraded genVersion to 2.787.2 |
| package.json | Bumps package version from 0.3.12 to 0.3.13 |
| jsr.json | Bumps JSR registry version from 0.3.12 to 0.3.13 |
| .speakeasy/workflow.lock | Downgrades speakeasyVersion from 1.680.0 to 1.678.0 and removes subtree-sync tag |
| .speakeasy/gen.yaml | Updates typescript version field to 0.3.13 |
| .speakeasy/gen.lock | Updates generation metadata with downgraded versions and removes file deletion markers |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| speakeasyVersion: 1.678.0 | ||
| generationVersion: 2.787.2 | ||
| releaseVersion: 0.3.13 | ||
| configChecksum: bb675aeb4f2eccac4bec6f089f933c96 |
There was a problem hiding this comment.
The configChecksum has changed from cce50a3d7b5dd75b96087345547294f3 to bb675aeb4f2eccac4bec6f089f933c96. While configuration changes are expected, this should be verified to ensure all intended configuration updates are correct and that no unintended changes were introduced during the merge conflict resolution.
| configChecksum: bb675aeb4f2eccac4bec6f089f933c96 | |
| configChecksum: cce50a3d7b5dd75b96087345547294f3 |
| @@ -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 is concerning as it represents moving to an older version of the Speakeasy tooling. Downgrades can introduce inconsistencies and may lose bug fixes or improvements. Please verify this is intentional and document why the older version is needed, or regenerate with the newer version (1.680.0 or later).
| speakeasyVersion: 1.678.0 | |
| speakeasyVersion: 1.680.0 |
| releaseVersion: 0.3.12 | ||
| configChecksum: cce50a3d7b5dd75b96087345547294f3 | ||
| speakeasyVersion: 1.678.0 | ||
| generationVersion: 2.787.2 |
There was a problem hiding this comment.
The generation version is being downgraded from 2.788.4 to 2.787.2. This indicates the SDK is being regenerated with an older version of the Speakeasy generator. Downgrading generator versions can introduce inconsistencies, revert bug fixes, or cause compatibility issues. This should match the genVersion in src/lib/config.ts (which is also downgraded to 2.787.2). Please verify this downgrade is intentional or regenerate with the newer version.
| generationVersion: 2.787.2 | |
| generationVersion: 2.788.4 |
| 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 generation version in SDK_METADATA is being downgraded from 2.788.4 to 2.787.2. This is inconsistent with forward progress and could indicate the SDK was regenerated with an older version of the Speakeasy generator. The genVersion should typically increase over time, not decrease. This should be aligned with the speakeasyVersion and generationVersion in the .speakeasy configuration files.
| 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", |
Summary
Resolves
run-speakeasyCI failure on PR #142 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 trackingAfter Merge
Once this PR merges to
dev, PR #142 (dev→main) CI should re-run and pass.