feat: add support for publishing external servers to collections by subomi · Pull Request #2332 · speakeasy-api/gram

subomi · 2026-04-21T13:17:33Z

Follow up to #2299. We are removing the frontend restriction of installing servers from the catalogue more than once; instead, servers can be reinstalled as forks both from the catalogue and from a collection.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

vercel · 2026-04-21T13:17:38Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
gram-docs-redirect	Ready	Preview, Comment	Apr 21, 2026 6:03pm

changeset-bot · 2026-04-21T13:17:39Z

🦋 Changeset detected

Latest commit: 562d18e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages

Name	Type
dashboard	Minor
@gram/client	Minor
server	Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

speakeasybot · 2026-04-21T13:22:14Z

🚀 Preview Environment (PR #2332)

Preview URL: https://pr-2332.dev.getgram.ai

Component	Status	Details	Updated (UTC)
✅ Database	Ready	Existing database reused	2026-04-21 18:09:09.
✅ Images	Available	Container images ready	2026-04-21 18:08:50.

_{Gram Preview Bot}

claude

Claude Code Review

This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.

_{Tip: disable this comment in your organization's Code Review settings.}

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>

devin-ai-integration

Devin Review found 2 new potential issues.

View 13 additional findings in Devin Review.

devin-ai-integration · 2026-04-21T16:54:33Z

    } else {
      setPhase("configure");
    }
-  }, [servers, existingSpecifiers]);
+  }, [servers, isServerAlreadyInstalled]);


🟡 Partition useEffect can reset user name edits when async useListToolsets data arrives during configure phase

The partition useEffect at client/dashboard/src/pages/catalog/useExternalMcpReleaseWorkflow.ts:238 depends on isServerAlreadyInstalled, which is re-created whenever existingSpecifiers or existingToolsetIds change. Because existingSpecifiers now incorporates data from useListToolsets (a new async data source added by this PR), it can change AFTER the initial partition has already run and the user has started editing server names.

Concrete scenario: a collection-backed server is already installed in the target project via toolsetOrigin but NOT via externalMcps. Initially, useListToolsets hasn't loaded, so isServerAlreadyInstalled returns false → name is set to the base name (e.g., "My Server"). The user starts typing a custom name. Then useListToolsets resolves, existingSpecifiers updates, isServerAlreadyInstalled changes identity → the effect re-runs → name is overwritten with the fork prefill ("My Server Copy"), losing the user's edits.

The phaseRef guard only protects deploying/complete/error phases — the configure phase is intentionally left unguarded, so this re-partition runs.

(Refers to lines 238-281)

Prompt for agents

The partition useEffect in useExternalMcpReleaseWorkflow (lines 238-281) re-runs whenever isServerAlreadyInstalled changes, which now happens when useListToolsets data loads. This can overwrite user name edits during the configure phase. Possible approaches: 1. Track whether the user has manually edited any names (e.g., a hasUserEdited ref). If they have, skip the re-partition or merge changes carefully — only update the installed flag and fork name prefix for untouched entries. 2. Instead of re-running the full partition, apply the installed-state change incrementally: update existing configs in-place to add the fork suffix if they weren't already marked as installed, without touching user-edited names. 3. Ensure useListToolsets data is warm before the dialog opens (e.g., by calling it in the parent component like CatalogDetail or CollectionDetail), so the partition effect runs once with complete data. The fix should preserve the current behavior where the phaseRef guard prevents re-partition after deployment starts.

Was this helpful? React with 👍 or 👎 to provide feedback.

devin-ai-integration

Devin Review found 1 new potential issue.

View 13 additional findings in Devin Review.

devin-ai-integration · 2026-04-21T18:16:18Z

          evolveForm: {
            deploymentId: latestDeployment?.id,
            nonBlocking: true,
-            upsertExternalMcps: serverConfigs.map((config) => {
-              const slug = generateSlug(config.server.registrySpecifier);
-              return {
-                registryId: config.server.registryId,
-                organizationMcpCollectionRegistryId:
-                  config.server.organizationMcpCollectionRegistryId,
-                name: config.name,
-                slug,
-                registryServerSpecifier: config.server.registrySpecifier,
-                selectedRemotes:
-                  config.selectedRemotes?.map((r) => r.url) ??
-                  config.server.remotes?.map((r) => r.url),
-              };
-            }),
+            upsertExternalMcps: serverConfigs.map((config) => ({
+              registryId: config.server.registryId,
+              organizationMcpCollectionRegistryId:
+                config.server.organizationMcpCollectionRegistryId,
+              name: config.name,
+              slug: generateSlug(config.name),
+              registryServerSpecifier: config.server.registrySpecifier,
+              selectedRemotes:
+                config.selectedRemotes?.map((r) => r.url) ??
+                config.server.remotes?.map((r) => r.url),
+            })),
          },
        },
        undefined,


🚩 Fork deployment relies on evolveDeployment upsert keying on slug, not specifier

The fork flow sends upsertExternalMcps entries with a NEW slug (e.g., "my-server-copy") but the SAME registryServerSpecifier as the original install (e.g., "org/my-server"). For forks to work correctly, evolveDeployment must upsert by slug (creating a new attachment row) rather than by registryServerSpecifier (which would update the original). The tests at useExternalMcpReleaseWorkflow.test.ts:881-895 confirm this expectation. If the server-side upsert key is the specifier rather than the slug, the fork would silently overwrite the original attachment. The test mocking makes this hard to verify end-to-end — worth confirming the server-side evolve implementation uses slug as the upsert key.

(Refers to lines 552-573)

Was this helpful? React with 👍 or 👎 to provide feedback.

The server-side evolve correctly uses slug (not registry_server_specifier) as the upsert key.

feat: add toolset origins support

71aa692

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

github-actions Bot added the preview Spawn a preview environment label Apr 21, 2026

subomi changed the title ~~feat: add toolset origins support~~ feat: add support for publishing external servers to collections Apr 21, 2026

chore: resolve merge conflicts in auto-generated files

2a6850d

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

vercel Bot deployed to Preview April 21, 2026 13:22 View deployment

chore: regen

7aa6360

vercel Bot deployed to Preview April 21, 2026 13:26 View deployment

chore: fixed linter issues

ab3eb4b

vercel Bot deployed to Preview April 21, 2026 13:54 View deployment

chore: clean up

05d1c69

vercel Bot deployed to Preview April 21, 2026 14:06 View deployment

subomi marked this pull request as ready for review April 21, 2026 14:06

subomi requested review from a team as code owners April 21, 2026 14:06

claude Bot reviewed Apr 21, 2026

View reviewed changes

This comment was marked as resolved.

Sign in to view

chore: remove second pop up

b01c61f

vercel Bot deployed to Preview April 21, 2026 14:38 View deployment

This comment was marked as resolved.

Sign in to view

subomi and others added 2 commits April 21, 2026 16:06

Update client/dashboard/src/components/mcp/MCPTableRow.tsx

ae6ef57

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Update client/dashboard/src/components/mcp/MCPCard.tsx

7b06a6f

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>

vercel Bot deployed to Preview April 21, 2026 15:06 View deployment

This comment was marked as resolved.

Sign in to view

resolve broken slug

a9e46ec

vercel Bot deployed to Preview April 21, 2026 15:45 View deployment

This comment was marked as resolved.

Sign in to view

fix: correct slug matching.

48a106e

vercel Bot deployed to Preview April 21, 2026 16:44 View deployment

devin-ai-integration Bot reviewed Apr 21, 2026

View reviewed changes

clean ups

562d18e

vercel Bot deployed to Preview April 21, 2026 18:03 View deployment

devin-ai-integration Bot reviewed Apr 21, 2026

View reviewed changes

alx-xo approved these changes Apr 21, 2026

View reviewed changes

subomi merged commit d8c6ce1 into main Apr 21, 2026
31 checks passed

subomi deleted the toolset-origins branch April 21, 2026 20:39

github-actions Bot locked and limited conversation to collaborators Apr 21, 2026

Conversation

subomi commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel Bot commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot Bot commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

speakeasybot commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚀 Preview Environment (PR #2332)

Uh oh!

claude Bot left a comment

Choose a reason for hiding this comment

Claude Code Review

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

devin-ai-integration Bot left a comment

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration Bot Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

devin-ai-integration Bot left a comment

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration Bot Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

subomi Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

subomi commented Apr 21, 2026 •

edited

Loading

vercel Bot commented Apr 21, 2026 •

edited

Loading

changeset-bot Bot commented Apr 21, 2026 •

edited

Loading

speakeasybot commented Apr 21, 2026 •

edited

Loading