Adding catalog_source with OCI reference to list servers response#441
Merged
cutecatfann merged 2 commits intomainfrom Mar 13, 2026
Merged
Adding catalog_source with OCI reference to list servers response#441cutecatfann merged 2 commits intomainfrom
cutecatfann merged 2 commits intomainfrom
Conversation
austin5456
previously approved these changes
Mar 13, 2026
Contributor
|
Though before we merge this in, I know I called it |
Contributor
Author
|
I feel like |
Contributor
I completely agree, but I've seen it be used in other commands as |
Contributor
Author
|
Agreed, I think it does become confusing. I'll go ahead and change it, and just leave a comment that it actually means |
Contributor
austin5456
approved these changes
Mar 13, 2026
Contributor
Author
|
That is so confusing.... |
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
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.


What I did
docker mcp profile show {profileId}response (anddocker mcp server ls)docker.io/mcp/docker-mcp-catalog:latest) when a server was added from a catalog, and is omitted when the server was added directlyNew CatalogSource field added to both
db.Serverandworkingset.Serverstructs, threaded through:mapCatalogServersToWorkingSetServers(source of truth, maps fromdb.CatalogServer.CatalogRef)NewFromDb/ToDb(DB roundtrip)No schema migration required, the servers column stores JSON and the new field uses omitempty, so existing rows deserialize cleanly with an empty value.
Direct-add paths (
docker://,https://,file://) leave the field empty. Only thecatalog://resolution path populates it.Test plan
TestShowWithCatalogSource, verifies JSON and YAML output includecatalog_sourcefor catalog-sourced servers and omit it for directly-added serversTestAddServersFromCatalog, new assertions verifyCatalogSourceis set correctly for both image and remote server types added from catalogsManual testing
(not mandatory) A picture of a cute animal, if possible in relation to what you did