fix: include poci servers in catalog-next legacy catalog import

When converting a legacy catalog to catalog-next format,
`createCatalogFromLegacyCatalog` only handled `server` and `remote`
types, silently dropping `poci` servers (e.g. curl, ffmpeg, docker).
This caused poci servers to disappear from the Docker Desktop catalog
when the MCPWorkingSets feature flag was enabled.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jchangx

pkg/catalog_next/catalog.go

@@ -52,7 +52,7 @@ const (
 const CommunityRegistryCatalogRef = "mcp/community-registry:latest"
 
 type Server struct {
-	Type  workingset.ServerType `yaml:"type" json:"type" validate:"required,oneof=registry image remote"`
+	Type  workingset.ServerType `yaml:"type" json:"type" validate:"required,oneof=registry image remote poci"`
 	Tools []string              `yaml:"tools,omitempty" json:"tools,omitempty"`
 	// Policy describes the policy decision for this server.
 	Policy *policy.Decision `yaml:"policy,omitempty" json:"policy,omitempty"`
@@ -85,6 +85,7 @@ func NewFromDb(dbCatalog *db.Catalog) CatalogWithDigest {
 		if server.ServerType == "remote" {
 			servers[i].Endpoint = server.Endpoint
 		}
+		// poci servers don't need image/endpoint/source — tools contain inline container specs
 		if server.Snapshot != nil {
 			servers[i].Snapshot = &workingset.ServerSnapshot{
 				Server: server.Snapshot.Server,

pkg/catalog_next/create.go

@@ -168,6 +168,15 @@ func createCatalogFromLegacyCatalog(ctx context.Context, legacyCatalogURL string
 			}
 			s.Snapshot.Server.Name = name
 			servers = append(servers, s)
+		} else if server.Type == "poci" {
+			s := Server{
+				Type: workingset.ServerTypePoci,
+				Snapshot: &workingset.ServerSnapshot{
+					Server: server,
+				},
+			}
+			s.Snapshot.Server.Name = name
+			servers = append(servers, s)
 		}
 	}
 

pkg/catalog_next/create_test.go

@@ -405,6 +405,97 @@ registry:
 	assert.Equal(t, "Another test server", catalog.Servers[1].Snapshot.Server.Description)
 }
 
+func TestCreateFromLegacyCatalogWithPociServers(t *testing.T) {
+	dao := setupTestDB(t)
+	ctx := t.Context()
+
+	// Create a temporary legacy catalog file with server, remote, and poci types
+	tempDir := t.TempDir()
+	catalogFile := filepath.Join(tempDir, "test-catalog.yaml")
+
+	legacyCatalogYAML := `name: test-catalog
+registry:
+  my-server:
+    title: "My Server"
+    type: "server"
+    image: "docker/test-server:latest"
+    description: "A regular server"
+  my-remote:
+    title: "My Remote"
+    type: "remote"
+    description: "A remote server"
+    remote:
+      url: "https://remote.example.com/mcp"
+  curl:
+    title: "Curl"
+    type: "poci"
+    description: "Standard curl tool."
+    tools:
+      - name: curl
+        description: "Run a curl command."
+        container:
+          image: "alpine/curl"
+          command:
+            - "{{args|into}}"
+  ffmpeg:
+    title: "FFmpeg"
+    type: "poci"
+    description: "Use ffmpeg to process video files."
+    tools:
+      - name: ffmpeg
+        description: "run the ffmpeg command"
+        container:
+          image: "linuxserver/ffmpeg:version-7.1-cli"
+          command:
+            - "{{args|into}}"
+`
+
+	err := os.WriteFile(catalogFile, []byte(legacyCatalogYAML), 0o644)
+	require.NoError(t, err)
+
+	// Create catalog from legacy catalog
+	output := captureStdout(t, func() {
+		err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), "test/poci-test:latest", []string{}, "", catalogFile, "", "Poci Test Catalog", false)
+		require.NoError(t, err)
+	})
+
+	assert.Contains(t, output, "Catalog test/poci-test:latest created")
+
+	// Verify the catalog was created
+	catalogs, err := dao.ListCatalogs(ctx)
+	require.NoError(t, err)
+	assert.Len(t, catalogs, 1)
+
+	catalog := NewFromDb(&catalogs[0])
+	assert.Equal(t, "Poci Test Catalog", catalog.Title)
+	assert.Len(t, catalog.Servers, 4)
+
+	// Verify all server types are present (order may vary due to map iteration)
+	serversByName := map[string]Server{}
+	for _, s := range catalog.Servers {
+		serversByName[s.Snapshot.Server.Name] = s
+	}
+
+	// Verify poci servers
+	curlServer := serversByName["curl"]
+	assert.Equal(t, workingset.ServerTypePoci, curlServer.Type)
+	assert.Equal(t, "Curl", curlServer.Snapshot.Server.Title)
+	assert.Equal(t, "Standard curl tool.", curlServer.Snapshot.Server.Description)
+	assert.Empty(t, curlServer.Image)
+
+	ffmpegServer := serversByName["ffmpeg"]
+	assert.Equal(t, workingset.ServerTypePoci, ffmpegServer.Type)
+	assert.Equal(t, "FFmpeg", ffmpegServer.Snapshot.Server.Title)
+	assert.Empty(t, ffmpegServer.Image)
+
+	// Verify other types still work
+	remoteServer := serversByName["my-remote"]
+	assert.Equal(t, workingset.ServerTypeRemote, remoteServer.Type)
+
+	imageServer := serversByName["my-server"]
+	assert.Equal(t, workingset.ServerTypeImage, imageServer.Type)
+}
+
 func TestCreateFromLegacyCatalogWithRemoveExistingWithSameContent(t *testing.T) {
 	dao := setupTestDB(t)
 	ctx := t.Context()

pkg/catalog_next/server.go

@@ -253,6 +253,8 @@ func printServersHuman(catalogRef, catalogTitle string, catalogPolicy *policy.De
 			fmt.Printf("    Source: %s\n", server.Source)
 		case workingset.ServerTypeRemote:
 			fmt.Printf("    Endpoint: %s\n", server.Endpoint)
+		case workingset.ServerTypePoci:
+			// poci servers have no top-level image/endpoint; tools define containers inline
 		}
 		if showPolicy {
 			fmt.Printf("    Policy: %s\n", policycli.StatusMessage(server.Policy))

pkg/db/migrations/007_add_poci_support.up.sql

@@ -0,0 +1,23 @@
+-- Add support for poci server type
+-- SQLite doesn't support modifying CHECK constraints, so we need to recreate the table
+
+CREATE TABLE catalog_server_new (
+  id integer primary key,
+  server_type text check(server_type in ('registry', 'image', 'remote', 'poci')),
+  tools text CHECK (json_valid(tools)),
+  source text,
+  image text,
+  endpoint text,
+  snapshot text CHECK (json_valid(snapshot)),
+  catalog_ref text not null,
+  foreign key (catalog_ref) references catalog(ref) on delete cascade
+);
+
+-- Copy existing data
+INSERT INTO catalog_server_new (id, server_type, tools, source, image, endpoint, snapshot, catalog_ref)
+SELECT id, server_type, tools, source, image, endpoint, snapshot, catalog_ref
+FROM catalog_server;
+
+DROP TABLE catalog_server;
+
+ALTER TABLE catalog_server_new RENAME TO catalog_server;

pkg/workingset/workingset.go

@@ -46,11 +46,12 @@ const (
 	ServerTypeRegistry ServerType = "registry"
 	ServerTypeImage    ServerType = "image"
 	ServerTypeRemote   ServerType = "remote"
+	ServerTypePoci     ServerType = "poci"
 )
 
 // Server represents a server configuration in a working set
 type Server struct {
-	Type    ServerType     `yaml:"type" json:"type" validate:"required,oneof=registry image remote"`
+	Type    ServerType     `yaml:"type" json:"type" validate:"required,oneof=registry image remote poci"`
 	Config  map[string]any `yaml:"config,omitempty" json:"config,omitempty"`
 	Secrets string         `yaml:"secrets,omitempty" json:"secrets,omitempty"`
 	Tools   ToolList       `yaml:"tools,omitempty" json:"tools"` // See IsZero() below
@@ -530,6 +531,12 @@ func ResolveFile(ctx context.Context, value string) ([]Server, error) {
 				Secrets:  "default",
 				Snapshot: &ServerSnapshot{Server: server},
 			}
+		} else if server.Type == "poci" && server.Image == "" {
+			serversResolved[i] = Server{
+				Type:     ServerTypePoci,
+				Secrets:  "default",
+				Snapshot: &ServerSnapshot{Server: server},
+			}
 		} else if server.Type == "remote" {
 			serversResolved[i] = Server{
 				Type:     ServerTypeRemote,