Skip to content

feat(client): add session persistence and restoration support #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

Kedlub
Copy link

@Kedlub Kedlub commented Jun 20, 2025

Description

This feature adds client session persistence and restoration support, which is useful for environments where entire client instances cannot be persisted, such as within Temporal activities.

Key points:

  • ExportState() and ImportState() methods on client.Client
  • New mcp.ClientState type
  • SetSessionId() helper on Streamable HTTP transport
  • Unit test TestStateRestoration
  • Documentation section “Persisting & Restoring Client State” added to Client Basics

Type of Change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • MCP spec compatibility implementation
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update
  • Code refactoring (no functional changes)
  • Performance improvement
  • Tests only (no functional changes)
  • Other (please describe):

Checklist

  • My code follows the code style of this project
  • I have performed a self-review of my own code
  • I have added tests that prove my fix is effective or that my feature works
  • I have updated the documentation accordingly

Additional Information

This was created to address the requirement of restoring the session ID for Playwright MCP, which necessitates the same session ID for uninterrupted access to the same browser instance.

Summary by CodeRabbit

  • New Features
    • Added the ability to export and import client state, enabling seamless resumption of client sessions, including initialization status, request ID, capabilities, and session ID.
  • Documentation
    • Introduced a new section explaining how to persist and restore client state, with example usage for end-users.
  • Tests
    • Added tests to verify correct export and import of client state across client lifecycles.

Copy link
Contributor

coderabbitai bot commented Jun 20, 2025

Walkthrough

The changes introduce functionality for exporting and importing the internal state of the Client object, enabling state persistence and restoration. This includes new methods, a state struct, updates to the transport layer, a comprehensive test, and documentation describing usage and behavior.

Changes

Files / Areas Change Summary
client/client.go Added methods for exporting/importing client state, plus helpers for transport session ID management.
client/client_test.go Added TestStateRestoration to verify client state export/import and restoration across lifecycles.
client/transport/streamable_http.go Added SetSessionId method to allow setting session ID in StreamableHTTP transport.
mcp/types.go Introduced ClientState struct to encapsulate client initialization, request ID, capabilities, session.
www/docs/pages/clients/basics.mdx Added documentation section and example for persisting and restoring client state.

Suggested labels

area: sdk

Suggested reviewers

  • pottekkat
  • ezynda3

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (1.64.8)

Error: you are using a configuration file for golangci-lint v2 with golangci-lint v1: please use golangci-lint v2
Failed executing command with error: you are using a configuration file for golangci-lint v2 with golangci-lint v1: please use golangci-lint v2

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (2)
www/docs/pages/clients/basics.mdx (1)

332-332: Fix grammar issue.

A comma is needed after "call" for proper sentence structure.

-`ImportState()` re-hydrates those values.  After a successful call the
+`ImportState()` re-hydrates those values.  After a successful call, the
client/client.go (1)

204-227: Solid state import implementation with room for enhanced validation.

The method includes proper validation for critical scenarios and safely restores all state fields. Consider adding validation for capability consistency between export and import contexts.

Consider adding validation to ensure the imported capabilities are compatible:

 func (c *Client) ImportState(ctx context.Context, state *mcp.ClientState) error {
 	if state == nil {
 		return fmt.Errorf("state cannot be nil")
 	}

 	if c.transport == nil {
 		return fmt.Errorf("transport is not initialized")
 	}

 	if state.Initialized && state.RequestID < 0 {
 		return fmt.Errorf("invalid state: initialized client must have non-negative request ID")
 	}
+
+	// Validate that we're not importing state with incompatible protocol requirements
+	if state.Initialized && len(c.clientCapabilities.Experimental) > 0 {
+		// Could add capability compatibility checks here if needed
+	}

 	c.initialized = state.Initialized
 	c.requestID.Store(state.RequestID)
 	c.clientCapabilities = state.ClientCapabilities
 	c.serverCapabilities = state.ServerCapabilities
 	c.setTransportSessionID(state.SessionID)

 	return nil
 }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0fdb197 and 830de9f.

📒 Files selected for processing (5)
  • client/client.go (1 hunks)
  • client/client_test.go (1 hunks)
  • client/transport/streamable_http.go (1 hunks)
  • mcp/types.go (1 hunks)
  • www/docs/pages/clients/basics.mdx (1 hunks)
🧰 Additional context used
🪛 LanguageTool
www/docs/pages/clients/basics.mdx

[typographical] ~332-~332: It appears that a comma is missing.
Context: ...rates those values. After a successful call the restored client can immediately iss...

(DURING_THAT_TIME_COMMA)

🔇 Additional comments (6)
mcp/types.go (1)

1045-1062: Clean and well-designed state structure.

The ClientState struct is well-implemented with appropriate field types, clear documentation, and proper JSON serialization tags. The design effectively captures all necessary client state for persistence and restoration.

client/transport/streamable_http.go (1)

517-520: Simple and correct implementation.

The SetSessionId method is implemented correctly using atomic storage for thread safety, maintaining consistency with the existing GetSessionId method.

www/docs/pages/clients/basics.mdx (1)

300-334: Excellent documentation for the new feature.

The documentation clearly explains the state persistence functionality with practical examples and details about what data is captured. This will help users understand when and how to use this feature effectively.

client/client_test.go (1)

11-79: Comprehensive test coverage for state restoration.

The test effectively validates the complete state persistence workflow, including proper state progression after restoration. The test structure is clean and includes appropriate error handling and cleanup.

client/client.go (2)

174-189: Well-implemented state export functionality.

The ExportState method correctly captures all necessary client state using thread-safe atomic operations. The implementation is clean and follows the documented contract.


191-202: Good encapsulation of transport-specific functionality.

The helper methods properly handle the optional nature of session IDs by checking the transport type and safely handling cases where session IDs aren't supported.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant