Merge master into main: GPU internal refactor + MCP debug mode + tooling updates#599
Open
donaldfilimon wants to merge 13 commits intomainfrom
Open
Merge master into main: GPU internal refactor + MCP debug mode + tooling updates#599donaldfilimon wants to merge 13 commits intomainfrom
donaldfilimon wants to merge 13 commits intomainfrom
Conversation
…o response
The connector backend's generateConnector was producing "[{model_id}] Processing: ..."
but the test expected "[echo/{model_id}]" to be present in the output (model_id with
no slash resolves to echo mode). Update the format string to include the echo/ prefix
so the response correctly signals echo mode to callers.
https://claude.ai/code/session_01QwcMkaGPys1uvsM245DgG6
The echo fallback in generateConnector was producing `[test-model] Processing: ...` but the test (added in 154c725) expects `[echo/test-model]` — i.e. the provider should display as "echo" when no real connector is available. Update the format string from "[{s}] Processing: {s}" to "[echo/{s}] Processing: {s}" so the output matches the intended design and unblocks the failing test. https://claude.ai/code/session_01EuZ1L2scyaDMj6WN5uNnWu
…hToConnector Merge origin/master (832ff01) which applied the [echo/{s}] format fix to the simpler generateConnector. Resolve conflict by keeping local version that includes the full dispatchToConnector implementation, which also has the same fix. https://claude.ai/code/session_01EuZ1L2scyaDMj6WN5uNnWu
Replace @alignCast/@ptrCast with @memcpy into a local variable to safely read any type T from unaligned byte buffers. The previous approach panicked at runtime when the source buffer had less alignment than T requires. https://claude.ai/code/session_01Hm9CCXPsSVVzv2MkY8vJLA
Replaced @ptrCast/@aligncast with @memcpy into a properly-aligned local variable, fixing a runtime panic when reading multi-byte types (u32, u16) from byte-aligned slices like stack arrays. https://claude.ai/code/session_01F5rsQdbiWwqKtPQW7whfnB
Remote branch independently applied the same mmap alignment fix and contains additional validated work. Prefer remote on conflicts. https://claude.ai/code/session_01F5rsQdbiWwqKtPQW7whfnB
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
Owner
Author
Owner
Author
|
@claude merge into main and handle merge changes |
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
…ee, inference tests - src/protocols/acp/mod.zig: removed duplicate isEnabled/isInitialized definitions (compile error on detached HEAD; already clean on master) - src/foundation/security/jwt.zig: removed redundant defer block that double-freed the custom StringArrayHashMap after it was already explicitly deinited, causing an integer-overflow crash in the test runner - src/inference/engine.zig + backends.zig: merged master's updated connector backend tests (UnsupportedProvider for bare model names, echo fallback for unknown providers, MissingApiKey path) https://claude.ai/code/session_01TBoMAY5iRAk9tML96wH4dg
# Conflicts: # src/foundation/security/jwt.zig # src/inference/engine.zig # src/inference/engine/backends.zig
The defer block at line 268 and the inline cleanup block at line 283 both iterated and freed the same StringArrayHashMapUnmanaged entries, then both called custom.deinit(). The defer running after the manual cleanup caused an integer overflow panic in multi_array_list on the already-freed backing storage. Remove the redundant defer; the inline cleanup after createToken is sufficient and is the intended ownership pattern. https://claude.ai/code/session_01NfzuNbjkyBYBmPCBrXyAdP
Integrates upstream fixes for ACP duplicate fns, inference backend tests, and JWT standalone tests. Local commit retains double-free fix for the custom claims defer block. https://claude.ai/code/session_01NfzuNbjkyBYBmPCBrXyAdP
Replace @ptrCast(@aligncast(...)) with a @memcpy-based read to avoid alignment panics when the backing buffer (e.g. stack-allocated [_]u8) is not aligned for the requested type. Fixes crash in core.database.formats.mmap.test.memory cursor basic. https://claude.ai/code/session_01QzFn4zwZx4wgnNKLd4AyQP
After merging remote history (unrelated branches), three files had broken state: - backends.zig: generateConnector called removed dispatchToConnector; replace with direct echo-fallback allocPrint (connector dispatch was fully removed in remote refactor) - jwt.zig: tests referenced decode/verify/isExpired/base64Url* as file-scope functions (added by remote) that weren't present after merge; add them as file-scope wrappers backed by jwt/standalone.zig helpers; fix isExpired to use wall-clock time (types.wallClockSeconds) instead of process-monotonic time.unixSeconds; add custom claim parsing to decode; restore custom-map cleanup in test to fix leak - mmap.zig (pre-merge): replace @aligncast pointer cast with @memcpy to avoid alignment panic on unaligned byte buffers (fixes core.database.formats.mmap.test.memory cursor basic crash) https://claude.ai/code/session_01QzFn4zwZx4wgnNKLd4AyQP
donaldfilimon
changed the title
Collaborator
|
@claude merge into main |
Collaborator
|
@copilot resolve the merge conflicts in this pull request |
underswitchx
added
bug
Collaborator
|
@copilot resolve the merge conflicts in this pull request |
Collaborator
|
@copilot resolve the merge conflicts in this pull request @claude |
Collaborator
|
@cursoragent ... |
Contributor
|
You need to increase your spend limit or enable usage-based billing to run background agents. Go to Cursor |
Owner
Author
|
@copilot resolve the merge conflicts in this pull request |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR merges all workspace changes from
masterintomain, including:GPU Module Refactor
src/features/gpu/tosrc/features/gpu/internal/MCP Server Enhancements
--debugflag toabi-mcpfor interactive REPL modeparseArgs()function for CLI argument handlingsrc/mcp_main_test.zigPlatform Improvements
src/platform/smc.zigsrc/test_smc.zigfor SMC functionalityTooling Updates
tools/crossbuild.shwith safe, minimal dry-run interfacetools/hf_discord_models.shto POSIX-compliant shellSet-StrictModetotools/crossbuild.ps1tools/verify_changes.shfor shell script validationtools/merge_workspaces.shfor merging workspace historiestools/ci/verify_ci.shfor CI verificationzig-abi-plugin/install-all.shfor plugin installationConfiguration & Documentation
.mcp.jsonandbuild.zig/build.shAGENTS.mdwith entry points and workflow guidanceCLAUDE.md, removedGEMINI.mdandHANDOFF.mdChanges
Merge Status
To Resolve Conflicts:
Then the PR can be merged through the GitHub UI or via: