Add basic working set support #204

cmrigney · 2025-10-23T21:31:37Z

Working Sets

Working sets allow you to organize and manage collections of MCP servers as a single unit.

See docs/working-sets.md for more info and limitations of the current implementation.

Tests will be coming in a follow up PR.

Quickstart

# Enable the feature
docker mcp feature enable working-sets

# Create a working set
docker mcp workingset create --name dev-tools \
  --server docker://mcp/fetch

# Use it with the gateway
docker mcp gateway run --working-set dev-tools

bobbyhouse · 2025-10-28T15:51:07Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2025-10-28T15:57:15Z

pkg/db/workingset.go

+func (servers *ServerList) Scan(value any) error {
+	str, ok := value.(string)
+	if !ok {
+		return errors.New("failed to scan server list")
+	}
+	return json.Unmarshal([]byte(str), &servers)
+}
+
+func (secrets SecretMap) Value() (driver.Value, error) {
+	b, err := json.Marshal(secrets)
+	if err != nil {
+		return nil, err
+	}
+	return string(b), nil
+}
+
+func (secrets *SecretMap) Scan(value any) error {
+	str, ok := value.(string)
+	if !ok {
+		return errors.New("failed to scan secret list")
+	}
+	return json.Unmarshal([]byte(str), &secrets)


Fix Scan implementations to populate ServerList/SecretMap

Both ServerList.Scan and SecretMap.Scan pass &servers/&secrets to json.Unmarshal. Because servers is already a pointer (*ServerList), passing the address of that pointer gives **ServerList and json.Unmarshal only updates the local pointer variable, leaving the caller’s slice/map unchanged. Any read from the database will therefore return empty server and secret lists even though the JSON is valid. Unmarshal directly into the pointer (json.Unmarshal(..., servers) and json.Unmarshal(..., secrets)) so that retrieved working sets contain their stored values.

Useful? React with 👍 / 👎.

I'm not totally sure why, but this does already work as is. I'll update it anyway.

bobbyhouse · 2025-10-28T16:18:40Z

pkg/workingset/workingset.go

+		}
+	}
+
+	return "", fmt.Errorf("failed to create working set id: %w", err)


Suggested change

return "", fmt.Errorf("failed to create working set id: %w", err)

return "", fmt.Errorf("failed to create working set id")

Good catch! I trusted AI too much on that one lol

bobbyhouse · 2025-10-28T16:21:09Z

pkg/workingset/create.go

+	} else {
+		id, err = createWorkingSetID(ctx, name, dao)
+		if err != nil {
+			return fmt.Errorf("failed to create working set id: %w", err)


Suggested change

return fmt.Errorf("failed to create working set id: %w", err)

return fmt.Errorf("failed to create working set id: %w", id)

This one is actually correct, since we want to wrap the error given. id will just be blank if there's an error.

bobbyhouse · 2025-10-28T16:29:37Z

pkg/workingset/create.go

+		workingSet.Servers[i] = s
+	}
+
+	if err := workingSet.Validate(); err != nil {


question: should we validate server uniqueness?

The db does have the id as the primary key, which ensures primary key uniqueness. Is there something else you were also thinking of?

bobbyhouse · 2025-10-28T17:03:00Z

pkg/db/workingset.go

+	if !ok {
+		return errors.New("failed to scan secret list")
+	}
+	return json.Unmarshal([]byte(str), &secrets)


question: Better to use secrets instead of &secrets?

I wasn't able to actually uncover a bug here because json.Unmarshal will automatically deference pointers until it gets the value.

Ah, that explains why both work. I'll switch it.

bobbyhouse · 2025-10-28T17:03:57Z

pkg/db/workingset.go

+	if !ok {
+		return errors.New("failed to scan server list")
+	}
+	return json.Unmarshal([]byte(str), &servers)


question: Better to use servers instead of &servers?

cmrigney and others added 22 commits October 6, 2025 16:48

Add workingset types and config read/write.

07b8134

Add test commands

bea14e9

Use a sqlite database for working sets. Add import/export commands.

6107e0e

Vendor modules.

2aee5bb

Refactor oci things to make it reusable.

56e6128

Some small refactoring.

39a44db

New working set commands: push, pull, show, ls

75e0926

Add json and yaml for list formats.

4c1825d

Add create command. Use constant version for working set.

ad2713f

Fix push.

adf3024

Bare bones gateway with working sets.

c695554

add working set to client connect.

e2a40aa

Add command to remove workingset (#199)

0fc9e29

Alias remove to rm.

8d82c6b

Better message when working set list is empty.

ec3277d

Add message after importing or exporting working set.

db6293d

Add working sets feature flag.

5b239c1

Add validation to working sets.

c30b905

vendor modules.

56a21c7

Clean up todos.

7ff0b87

Hide client connect working set behind feature.

df5933f

Add docs for working sets.

7527207

cmrigney requested a review from a team as a code owner October 23, 2025 21:31

cmrigney added 6 commits October 24, 2025 11:00

Merge branch 'main' into workingsets

de5b417

Fixes after merging main.

cbf129c

Merge branch 'main' into workingsets

092172d

Update docs.

19169da

Fix most lint errors.

499fe4c

Fix lint errors.

8818624

chatgpt-codex-connector bot reviewed Oct 28, 2025

View reviewed changes

bobbyhouse reviewed Oct 28, 2025

View reviewed changes

bobbyhouse approved these changes Oct 28, 2025

View reviewed changes

CR feedback.

20e5cd0

cmrigney merged commit aa873b5 into main Oct 29, 2025
8 checks passed

cmrigney deleted the workingsets branch October 29, 2025 14:35

cmrigney mentioned this pull request Oct 30, 2025

Add tests for working sets #210

Merged

	return "", fmt.Errorf("failed to create working set id: %w", err)
	return "", fmt.Errorf("failed to create working set id")

	return fmt.Errorf("failed to create working set id: %w", err)
	return fmt.Errorf("failed to create working set id: %w", id)

Add basic working set support #204

Add basic working set support #204

Conversation

cmrigney commented Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Working Sets

Quickstart

Uh oh!

bobbyhouse commented Oct 28, 2025

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bobbyhouse Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bobbyhouse Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

cmrigney commented Oct 23, 2025 •

edited

Loading

bobbyhouse Oct 28, 2025 •

edited

Loading

bobbyhouse Oct 28, 2025 •

edited

Loading