Consolidate 5 plugins into AgentKit and SaaSKit (v2.0.0) by saif-at-scalekit · Pull Request #20 · scalekit-inc/claude-code-authstack

saif-at-scalekit · 2026-05-08T14:18:54Z

Summary

Restructures the marketplace from 5 separate plugins into 2 focused plugins: AgentKit and SaaSKit.

This PR incorporates the work from #19 (docs/agent-auth-hybrid-layout) and builds the full restructure on top.

Backward Compatibility

Old plugin names are preserved as symlinks so existing install commands keep working:

Old name (symlink)	Points to	Rationale
`plugins/agent-auth`	`agentkit`	Direct rename
`plugins/full-stack-auth`	`saaskit`	Consolidated into SaaSKit
`plugins/mcp-auth`	`saaskit`	MCP server auth is now part of SaaSKit
`plugins/modular-sso`	`saaskit`	SSO is now part of SaaSKit
`plugins/modular-scim`	`saaskit`	SCIM is now part of SaaSKit

Tested: claude plugin install agent-auth@scalekit-auth-stack resolves through the symlink and loads AgentKit skills. Claude Code's marketplace uses git clone, which preserves symlinks on disk.

The install script (scripts/install_claude_marketplace.sh) now:

Installs both agentkit and saaskit (previously only installed agent-auth)
Cleans up old v1.x plugin names on reinstall

Namespace Change

All slash commands now use /agentkit: or /saaskit: namespace

AgentKit (5 skills)

Renamed from agent-auth, adopting Scalekit AgentKit branding with docs/ + rules/ + thin skills/ content model.

Skill	Purpose
`integrating-agentkit`	Core AgentKit integration
`discovering-connector-tools`	Live tool metadata discovery
`exposing-agentkit-via-mcp`	Configure AgentKit MCP endpoint
`production-readiness-agentkit`	Production checklist
`scalekit-code-doctor`	Generate and review Scalekit code with verified SDK signatures

SaaSKit (13 skills)

New plugin consolidating FSA, SSO, SCIM, and MCP server auth into one coherent surface.

Skill	Consolidates
`implementing-saaskit`	Core auth flow (+ Go, Spring Boot, Laravel reference files)
`managing-saaskit-sessions`	Session management
`implementing-access-control`	RBAC and permissions
`implementing-saaskit-python`	Django + FastAPI + Flask (merged)
`implementing-saaskit-nextjs`	Next.js App Router
`implementing-modular-sso`	SSO + admin portal (merged)
`implementing-scim-provisioning`	SCIM directory sync
`adding-mcp-oauth`	MCP server auth (+ FastMCP, Express, FastAPI refs)
`adding-api-auth`	API keys + client credentials (merged)
`migrating-to-saaskit`	Migration from Auth0/Firebase/Cognito/custom
`production-readiness-saaskit`	Unified production checklist (4 sources merged)
`testing-auth-setup`	Validate auth integration via dryrun CLI
`scalekit-code-doctor`	Generate and review Scalekit code with verified SDK signatures

Content model

Both plugins follow: docs/ (canonical documentation) + rules/ (cross-cutting guidance) + thin skills/ (routing layers pointing to docs)

Cleanup in this PR

Removed legacy test-tool.md command alias
Removed 42 static agent-connectors/*.md files — pointed to docs.scalekit.com/agentkit/connectors/ instead
Renamed providers.md → connectors.md to match product terminology
Renamed building-agentkit-mcp-server → exposing-agentkit-via-mcp (configuring, not building)
Renamed discovering-agentkit-tools → discovering-connector-tools (tools belong to connectors)
Converted dryrun command → testing-auth-setup skill (discoverable via natural language)
Fixed saaskit/hooks/hooks.json — type was on wrong nesting level

Pre-merge Coordination Checklist

These items should be coordinated before or shortly after merging this PR.
Old names still work via symlinks, so there is no hard deadline — but docs should reference the new names going forward.

1. docs.scalekit.com (developer-docs repo)

Claude Code install templates — update to use new plugin names:

src/components/templates/coding-agents/_agentkit-claude-code.mdx — agent-auth@ → agentkit@
src/components/templates/coding-agents/_fsa-claude-code.mdx — full-stack-auth@ → saaskit@
src/components/templates/coding-agents/_mcp-auth-claude-code.mdx — mcp-auth@ → saaskit@
src/components/templates/coding-agents/_sso-claude-code.mdx — modular-sso@ → saaskit@
src/components/templates/coding-agents/_scim-claude-code.mdx — modular-scim@ → saaskit@

GitHub Copilot CLI and Codex templates — same pattern:

_agentkit-github-copilot-cli.mdx / _agentkit-codex.mdx
_fsa-github-copilot-cli.mdx / _fsa-codex.mdx
_mcp-auth-github-copilot-cli.mdx / _mcp-auth-codex.mdx
_sso-github-copilot-cli.mdx / _sso-codex.mdx
_scim-github-copilot-cli.mdx / _scim-codex.mdx

Docs pages with inline install commands:

Config files:

src/configs/agent-instructions.ts
src/configs/llms.config.ts

2. scalekit.com marketing pages

Homepage (scalekit.com) — has inline Claude plugin install commands with old names
/agent-auth product page — has agent-auth@scalekit-auth-stack install command
/product-updates/add-scalekit-from-your-coding-agent — has old install commands

3. scalekit.com blog posts

/blog/outbound-prospecting-agent-development — has agent-auth@scalekit-auth-stack
Audit other blog posts for old plugin install commands

4. Scalekit dashboard app (app.scalekit.com)

app/scalekit-web-ui/src/pages/Quickstart/snippets.ts — has old plugin install commands
Check onboarding/quickstart flows in the dashboard for old plugin names

5. build-with-ai/skills repo (scalekit-inc/skills)

17 files reference old plugin names:

6. Third-party listings

These are external and may update automatically, but worth tracking:

LobeHub skills marketplace (lobehub.com/skills/scalekit-inc-skills-setup-scalekit)
claudemarketplaces.com plugin listing
dev.to posts by scalekit-inc

7. Install script — Windows compatibility

install.sh uses bash (set -euo pipefail, curl, tar, mktemp) — does not work on Windows
Add a PowerShell equivalent (install.ps1) or cross-platform alternative
Or document that Windows users should use the manual /plugin marketplace add method

8. Post-merge verification

Verify symlinks resolve correctly via claude --plugin-dir (tested locally)
Verify symlinks resolve correctly via marketplace git clone (tested end-to-end)
Test fresh install: /plugin marketplace add scalekit-inc/claude-code-authstack → /plugin install agentkit@scalekit-auth-stack
Test fresh install: /plugin install saaskit@scalekit-auth-stack
Test backward compat: /plugin install agent-auth@scalekit-auth-stack (should resolve via symlink)
Verify --plugin-dir local testing works for both plugins

Shift the agent-auth plugin toward a Tessl-like docs/skills/rules layout so durable AgentKit guidance is separated from Claude-specific runtime files. This makes live metadata the documented source of truth for tools while keeping existing connector notes available as secondary references. Co-authored-by: Cursor <cursoragent@cursor.com>

Raise the agent-auth plugin manifest to 2.0.0 so the hybrid AgentKit reorganization can ship as a major update and users can pick up the new version cleanly. Co-authored-by: Cursor <cursoragent@cursor.com>

Add a one-line Claude Code installer that adds the marketplace, installs the agent-auth plugin, and points users to enable auto-update. Also thread official docs.scalekit.com AgentKit links through the new canonical docs so the plugin can point back to the published product documentation. Co-authored-by: Cursor <cursoragent@cursor.com>

Add the stable llms.txt and sitemap-0.xml links to the main Claude Code auth stack docs and the canonical agent-auth docs entrypoints so users and agents have clear fallback indexes into published Scalekit documentation. Co-authored-by: Cursor <cursoragent@cursor.com>

Move the live AgentKit discovery and execution workflow into the testing skill so the plugin follows the modern skills-first structure. Keep `/test-tool` only as a legacy compatibility alias to preserve older usage without making `commands/` the source of truth. Co-authored-by: Cursor <cursoragent@cursor.com>

Restructure the marketplace from 5 separate plugins (agent-auth, full-stack-auth, mcp-auth, modular-sso, modular-scim) into 2 focused plugins: AgentKit (AI agent authentication) and SaaSKit (B2B SaaS auth). AgentKit (5 skills): - Renamed from agent-auth, adopting Scalekit AgentKit branding - Added docs/ + rules/ content model from PR #19 - Skills: integrating, discovering tools, testing tools, MCP server, production readiness SaaSKit (11 skills): - New plugin consolidating FSA, SSO, SCIM, and MCP server auth - 13 docs files including framework guides (Python, Next.js, Go, Spring Boot, Laravel) - Thin skills routing into docs/ layer - Skills: core auth, sessions, access control, SSO, SCIM, MCP OAuth, API auth, Python frameworks, Next.js, migration, production readiness - Consolidated agents, commands, hooks, and references from all 4 source plugins Both plugins at version 2.0.0 with the docs/ + rules/ + thin skills/ content model.

…onnectors

The Scalekit MCP server at mcp.scalekit.com provides tool discovery, auth link generation, and tool execution natively. The testing skill forced users to set up env vars, remember slash command syntax, and wait for a Python script — all to get the same result. Updated discovering-connector-tools, integrating-agentkit, and docs to point to the MCP server as the live playground.

… mcp-helper Removed 3 agents that don't justify being separate agents: - sdk-version-advisor: just a lookup, skills already cover SDK install - session-management-reviewer: preserved as references/session-management-patterns.md - scalekit-mcp-helper: 22 lines, MCP server + skills cover this Also removed duplicate setup-scalekit from agentkit (kept in saaskit). Remaining agents: setup-scalekit, scalekit-mcp-auth-troubleshooter.

…uidance

Per-connector docs (scopes, quirks, tool categories) were present in cursor and codex but missing from claude-code. Copied full set to maintain parity across all auth stacks.

Per-connector docs are unmaintainable — live AgentKit metadata and docs.scalekit.com/agentkit/connectors/ are the source of truth.

…pdate

…n dirs marketplace.json still listed the old 5 plugins (mcp-auth, agent-auth, modular-sso, modular-scim, full-stack-auth). After merge, claude plugin install agentkit@scalekit-auth-stack would fail because the marketplace manifest didn't know about agentkit or saaskit. - Replace 5 old plugin entries with agentkit + saaskit - Update marketplace description - Remove 5 old plugin directories (other repos already cleaned up)

The old 5 plugin names (agent-auth, mcp-auth, full-stack-auth, modular-sso, modular-scim) were symlinks to the new consolidated plugins (agentkit, saaskit). They were accidentally removed. Restore symlinks so both old and new install commands work: claude plugin install agent-auth@scalekit-auth-stack (old, still works) claude plugin install agentkit@scalekit-auth-stack (new, preferred) marketplace.json now lists all 7 names — 2 primary + 5 aliases.

Add the scalekit-code-doctor skill (SKILL.md + references) to both agentkit and saaskit plugins. This cross-cutting developer tool skill enables code generation and review with verified Scalekit SDK signatures across all four SDKs (Node, Python, Go, Java) and REST API.

Adds a UserPromptSubmit hook that calls the Scalekit CLI to check if the agentkit plugin is outdated. The CLI handles caching (8h TTL), GitHub API calls, semver comparison, and output formatting. - Silent when up to date - One-line message when outdated - Cross-platform: npx works on Windows, macOS, Linux - 15s timeout covers npx package resolution

UserPromptSubmit fires on every single prompt, adding npx latency to every message. SessionStart fires once when a session begins or resumes, which is the right frequency for a version check.

…lekit Inc.

…ng-auth-setup skill

Old skill names (add-auth-fastmcp, express-mcp-server, fastapi-fastmcp) were renamed to adding-mcp-oauth during consolidation. Update links to point to the correct SKILL.md and framework-specific reference files.

/mcp/authentication -> /authenticate/mcp/quickstart/

All 18 skills updated with quality improvements: - Removed verbose meta-commentary, added verification commands - Added concrete code examples from scalekit-code-doctor references - Consolidated duplicated content into reference files - Improved descriptions with specific trigger terms New reference files added for scalekit-code-doctor (EXAMPLE-REPOS.md).

… skills - install.sh: make plugin install idempotent (|| true); fix post-install message - agentkit plugin.json: update stale homepage URL to /agentkit/overview/ - scim-provisioning: pip install scalekit-sdk → scalekit-sdk-python - adding-mcp-oauth: Scalekit → ScalekitClient (import + constructor) - connectors/README.md: remove false claim about deleted connector notes - CHANGELOG.md: fix wrong skill names, wrong count, Removed → Aliased - agentkit README: add missing scalekit-code-doctor skill - saaskit README: add missing testing-auth-setup and scalekit-code-doctor skills Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…, dedup - implementing-modular-sso: fix access token expiry 24h → 5min (configurable) - implementing-saaskit-python: add django-reference.md and flask-reference.md - agentkit: remove duplicate scalekit-code-doctor; point README to /saaskit:scalekit-code-doctor - agentkit/saaskit README: fix invalid shell install command (claude /plugin → /plugin inside REPL) - agentkit README: document MCP OAuth 2.1 auth behavior and troubleshooting steps - root README: add Windows install caveat (install.sh requires macOS/Linux/WSL) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Addresses CTO review issue #6 — new users facing 13 overlapping choices with no entry point. Both /agentkit:setup and /saaskit:setup ask 2-3 questions about framework and use case, then route to the right skill. Covers orientation (concepts table), environment setup steps, and cross-skill navigation. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

- implementing-saaskit-nextjs: scalekit.io → scalekit.com in env URL - docs/frameworks/laravel.md: scalekit.io → scalekit.com - docs/frameworks/nextjs.md: scalekit.io → scalekit.com - implementing-saaskit/laravel-reference.md: scalekit.io → scalekit.com - implementing-modular-sso: validate_token → validate_access_token_and_get_claims (Python) - implementing-access-control SKILL.md: decode_access_token → validate_access_token_and_get_claims - docs/access-control.md: decode_access_token → validate_access_token_and_get_claims - adding-mcp-oauth SKILL.md: validate_token → validate_access_token_and_get_claims (Python middleware) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…lization - Node: Scalekit → ScalekitClient in express-reference and bring-your-own-auth - SCIM: getPrimaryDirectoryByOrganizationId → listDirectories pattern - SCIM webhook: fix try/catch on bool return, use raw body for signature verification - MCP server: use sub-client methods (organization.createOrganization etc.) - auth-flows: getLogoutUrl positional args → options object - sso.md: replace process.env in browser with literal constant - Python: dict options → typed AuthorizationUrlOptions/LogoutUrlOptions classes - Env var: SCALEKIT_ENV_URL → SCALEKIT_ENVIRONMENT_URL - Domain: .scalekit.io → .scalekit.com in .env.example

…uncated agent file - Strip .md suffix from 22 docs.scalekit.com URLs - SCALEKIT_ENV_URL → SCALEKIT_ENVIRONMENT_URL (41 remaining instances) - Fix Python module shadowing: scalekit = scalekit.client.ScalekitClient → sk_client = ScalekitClient - Complete truncated scalekit-mcp-auth-troubleshooter section 8 + add section 9 - Remove 5 [web:NN] citation markers from troubleshooter agent

…rnal imports, Go SDK path

…ct→AuthorizationUrlOptions in flask/django refs

ravibits · 2026-05-22T09:07:08Z

Code review

Found 3 issues:

install.sh swallows plugin install failures — both claude plugin install lines use || true, so network errors, version mismatches, and marketplace failures are silently discarded. The success banner on line 31 always prints regardless, telling developers their plugins are installed when they may not be.

claude-code-authstack/scripts/install.sh

Lines 27 to 33 in 158a073

    
           claude plugin install agentkit@scalekit-auth-stack || true 
        
           claude plugin install saaskit@scalekit-auth-stack || true 
        
           cat <<EOF 
        
           Installed Scalekit Auth Stack for Claude Code.

agentkit/.env.example uses wrong environment variable name — SCALEKIT_ENV_URL (line 1) does not match SCALEKIT_ENVIRONMENT_URL used in every skill, setup guide, and SDK call. A developer who copies from .env.example will set the wrong variable and get silent auth failures.

claude-code-authstack/plugins/agentkit/.env.example

Lines 1 to 3 in 158a073

    
           SCALEKIT_ENV_URL=https://your-env.scalekit.dev 
        
           SCALEKIT_CLIENT_ID=skc_your_client_id 
        
           SCALEKIT_CLIENT_SECRET=your_client_secret

integrating-agentkit/SKILL.md references a non-existent skill — line 288 routes users to sk-actions-custom-provider to create custom connectors, but this skill does not exist in the plugin. Following this instruction gives a "skill not found" error.

claude-code-authstack/plugins/agentkit/skills/integrating-agentkit/SKILL.md

Lines 286 to 288 in 158a073

    
           - Use the Scalekit MCP server (`https://mcp.scalekit.com`) to validate a tool call interactively. 
        
           - Use `exposing-agentkit-via-mcp` when the user wants AgentKit tools exposed over MCP. 
        
           - Use `sk-actions-custom-provider` to create custom connectors.

🤖 Generated with Claude Code

_{- If this code review was useful, please react with 👍. Otherwise, react with 👎.}

…et_logout_url - get_authorization_url: pass AuthorizationUrlOptions object, not dict - get_logout_url: pass LogoutUrlOptions object, not bare kwargs Both methods use attribute access internally — dicts/kwargs crash at runtime.

…k refs

…ferences)

saif-shines and others added 6 commits May 5, 2026 21:20

chore: bump agent-auth plugin to v2

93e21f5

Raise the agent-auth plugin manifest to 2.0.0 so the hybrid AgentKit reorganization can ship as a major update and users can pick up the new version cleanly. Co-authored-by: Cursor <cursoragent@cursor.com>

saif-at-scalekit mentioned this pull request May 8, 2026

docs: reorganize agent-auth around canonical docs #19

Closed

2 tasks

saif-shines added 23 commits May 10, 2026 20:52

remove legacy test-tool.md command alias

d504572

remove static agent-connectors, point to docs.scalekit.com/agentkit/c…

a19062f

…onnectors

rename providers.md to connectors.md to match product terminology

18027a6

rename building-agentkit-mcp-server to exposing-agentkit-via-mcp

f8d7e7c

convert dryrun command to testing-auth-setup skill

8ac436b

rename discovering-agentkit-tools to discovering-connector-tools

a46d364

fix saaskit hooks.json: move type to inner hook object

ab4a570

add backward-compat symlinks for old plugin names

4fa8430

install both plugins, clean up old v1.x names on reinstall

137b8f7

add .mcp.json to saaskit plugin for Scalekit MCP server

0bacb87

rename scripts/install_claude_marketplace.sh to scripts/install.sh

9b026ca

Improve post-install message with plugin activation and auto-update g…

fcc24b2

…uidance

Simplify post-install message to focus on what to look for, not UI steps

52f1b56

Make bootstrap installer resilient to missing execute bit in tarball

7e1e9b0

Add 43 agent-connectors reference docs to agentkit

f3bbff4

Per-connector docs (scopes, quirks, tool categories) were present in cursor and codex but missing from claude-code. Copied full set to maintain parity across all auth stacks.

Remove agent-connectors directory, point to live docs instead

e59be45

Per-connector docs are unmaintainable — live AgentKit metadata and docs.scalekit.com/agentkit/connectors/ are the source of truth.

fix: remove and re-add marketplace to ensure latest version on reinstall

1a6532a

fix: use local path for marketplace when running from git checkout

a427f95

fix: revert local checkout detection, keep CLI commands for install

f63b950

fix: restore install.sh to original state

64aa2b1

fix: handle already-registered marketplace gracefully, suggest auto-u…

ac938ae

…pdate

saif-shines added 4 commits May 13, 2026 22:33

fix: update marketplace on re-run instead of just suggesting it

986112f

saif-at-scalekit mentioned this pull request May 15, 2026

Rename auth stack plugins to AgentKit / SaaSKit across docs scalekit-inc/developer-docs#692

Open

saif-shines added 3 commits May 15, 2026 17:11

fix: use SessionStart instead of UserPromptSubmit for version check

97cfac0

UserPromptSubmit fires on every single prompt, adding npx latency to every message. SessionStart fires once when a session begins or resumes, which is the right frequency for a version check.

Remove SessionStart version-check hook from agentkit plugin

dfa2a0d

ravibits reviewed May 19, 2026

View reviewed changes

Comment thread .claude-plugin/marketplace.json Outdated

Comment thread .claude-plugin/marketplace.json Outdated

Comment thread plugins/agentkit/.claude-plugin/plugin.json Outdated

fix: update 40+ connectors to 100+ and standardize author name to Sca…

2bb39c5

…lekit Inc.

saif-at-scalekit requested a review from ravibits May 20, 2026 07:57

saif-shines and others added 13 commits May 20, 2026 13:28

feat: add Scalekit CLI install step to setup-scalekit agent and testi…

f3ff04a

…ng-auth-setup skill

fix: update broken skill paths in bring-your-own-auth reference

7abf99b

Old skill names (add-auth-fastmcp, express-mcp-server, fastapi-fastmcp) were renamed to adding-mcp-oauth during consolidation. Update links to point to the correct SKILL.md and framework-specific reference files.

fix: update stale MCP docs URL in bring-your-own-auth

ff9e9ca

/mcp/authentication -> /authenticate/mcp/quickstart/

fix: scalekit.auth sub-client, getLogoutUrl signature, sameSite, inte…

8b659a3

…rnal imports, Go SDK path

fix: SK_ENV_URL→SCALEKIT_ENVIRONMENT_URL in MCP OAuth refs, Python di…

605fe35

…ct→AuthorizationUrlOptions in flask/django refs

fix: decodeToken→validateAccessTokenAndGetClaims in access-control

158a073

saif-shines added 3 commits May 22, 2026 16:57

fix: AuthorizationUrlOptions takes no constructor args in django/flas…

2e36fa3

…k refs

fix: AuthorizationUrlOptions in IdP-initiated login (django, flask re…

9f5cf64

…ferences)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate 5 plugins into AgentKit and SaaSKit (v2.0.0)#20

Consolidate 5 plugins into AgentKit and SaaSKit (v2.0.0)#20
saif-at-scalekit wants to merge 53 commits into
mainfrom
restructure/agentkit-saaskit-consolidation

saif-at-scalekit commented May 8, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ravibits commented May 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

saif-at-scalekit commented May 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Backward Compatibility

Namespace Change

AgentKit (5 skills)

SaaSKit (13 skills)

Content model

Cleanup in this PR

Pre-merge Coordination Checklist

1. docs.scalekit.com (developer-docs repo)

2. scalekit.com marketing pages

3. scalekit.com blog posts

4. Scalekit dashboard app (app.scalekit.com)

5. build-with-ai/skills repo (scalekit-inc/skills)

6. Third-party listings

7. Install script — Windows compatibility

8. Post-merge verification

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ravibits commented May 22, 2026

Code review

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

saif-at-scalekit commented May 8, 2026 •

edited

Loading