@apify/mcpc 0.1.7 → 0.1.8

package/.claude/settings.local.json

@@ -97,7 +97,18 @@
       "Bash(E2E_ISOLATED_ALL=1 TESTS=\"human-output output-invariants\" ./test/e2e/run.sh:*)",
       "Bash(E2E_ISOLATED_ALL=1 TESTS=\"output-invariants human-output\" ./test/e2e/run.sh:*)",
       "Bash(npm publish:*)",
-      "Bash(MCPC_RELEASE=1 npm publish:*)"
+      "Bash(MCPC_RELEASE=1 npm publish:*)",
+      "WebFetch(domain:www.philschmid.de)",
+      "Bash(mcpc @apify close:*)",
+      "Bash(mcpc:*)",
+      "Bash(__NEW_LINE_be84ee31121f5014__ echo \"\")",
+      "Bash(MCPC_HOME_DIR=/tmp/mcpc-test-restart ./dist/cli/index.js:*)",
+      "Bash(./dist/cli/index.js:*)",
+      "Bash(./dist/cli/index.js @test-restart close:*)",
+      "Bash(MCPC_HOME_DIR=/tmp/mcpc-test-json node:*)",
+      "Bash(MCPC_HOME_DIR=/tmp/mcpc-test-json MCPC_VERBOSE=1 node:*)",
+      "Bash(MCPC_HOME_DIR=/tmp/mcpc-test-json DEBUG=* node:*)",
+      "Bash(MCPC_HOME_DIR=/tmp/mcpc-test-new node:*)"
     ]
   }
 }

package/.idea/workspace.xml

@@ -4,17 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="84071bae-f051-424d-a0e4-1540170b1e94" name="Changes" comment="Docs">
-      <change beforePath="$PROJECT_DIR$/docs/TODOs.md" beforeDir="false" afterPath="$PROJECT_DIR$/docs/TODOs.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cli/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/cli/index.ts" afterDir="false" />
-    </list>
+    <list default="true" id="84071bae-f051-424d-a0e4-1540170b1e94" name="Changes" comment="Fixes" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="EmbeddingIndexingInfo">
-    <option name="cachedIndexableFilesCount" value="118" />
+    <option name="cachedIndexableFilesCount" value="123" />
     <option name="fileBasedEmbeddingIndicesEnabled" value="true" />
   </component>
   <component name="Git.Settings">
@@ -82,9 +79,9 @@
       <recent name="$PROJECT_DIR$/docs" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/docs" />
       <recent name="$PROJECT_DIR$/docs/images" />
       <recent name="$PROJECT_DIR$/docs/examples" />
-      <recent name="$PROJECT_DIR$/docs" />
       <recent name="$PROJECT_DIR$/test/coverage" />
       <recent name="$PROJECT_DIR$/test/playground" />
     </key>
@@ -115,135 +112,7 @@
       <workItem from="1766435124813" duration="175094000" />
       <workItem from="1767121309931" duration="139790000" />
       <workItem from="1767397304824" duration="654000" />
-      <workItem from="1767400124038" duration="5456000" />
-    </task>
-    <task id="LOCAL-00301" summary="Writing">
-      <option name="closed" value="true" />
-      <created>1767256060393</created>
-      <option name="number" value="00301" />
-      <option name="presentableId" value="LOCAL-00301" />
-      <option name="project" value="LOCAL" />
-      <updated>1767256060393</updated>
-    </task>
-    <task id="LOCAL-00302" summary="Writing">
-      <option name="closed" value="true" />
-      <created>1767256636124</created>
-      <option name="number" value="00302" />
-      <option name="presentableId" value="LOCAL-00302" />
-      <option name="project" value="LOCAL" />
-      <updated>1767256636124</updated>
-    </task>
-    <task id="LOCAL-00303" summary="Tests">
-      <option name="closed" value="true" />
-      <created>1767256961080</created>
-      <option name="number" value="00303" />
-      <option name="presentableId" value="LOCAL-00303" />
-      <option name="project" value="LOCAL" />
-      <updated>1767256961080</updated>
-    </task>
-    <task id="LOCAL-00304" summary="Renamed &quot;session&quot; to &quot;connect&quot;, it's feels better">
-      <option name="closed" value="true" />
-      <created>1767257359213</created>
-      <option name="number" value="00304" />
-      <option name="presentableId" value="LOCAL-00304" />
-      <option name="project" value="LOCAL" />
-      <updated>1767257359213</updated>
-    </task>
-    <task id="LOCAL-00305" summary="Fixed --timeout">
-      <option name="closed" value="true" />
-      <created>1767258330178</created>
-      <option name="number" value="00305" />
-      <option name="presentableId" value="LOCAL-00305" />
-      <option name="project" value="LOCAL" />
-      <updated>1767258330178</updated>
-    </task>
-    <task id="LOCAL-00306" summary="Fixes">
-      <option name="closed" value="true" />
-      <created>1767258961101</created>
-      <option name="number" value="00306" />
-      <option name="presentableId" value="LOCAL-00306" />
-      <option name="project" value="LOCAL" />
-      <updated>1767258961101</updated>
-    </task>
-    <task id="LOCAL-00307" summary="Writing">
-      <option name="closed" value="true" />
-      <created>1767260069457</created>
-      <option name="number" value="00307" />
-      <option name="presentableId" value="LOCAL-00307" />
-      <option name="project" value="LOCAL" />
-      <updated>1767260069457</updated>
-    </task>
-    <task id="LOCAL-00308" summary="Cosmetic">
-      <option name="closed" value="true" />
-      <created>1767260684183</created>
-      <option name="number" value="00308" />
-      <option name="presentableId" value="LOCAL-00308" />
-      <option name="project" value="LOCAL" />
-      <updated>1767260684183</updated>
-    </task>
-    <task id="LOCAL-00309" summary="Implemented --proxy command">
-      <option name="closed" value="true" />
-      <created>1767260968448</created>
-      <option name="number" value="00309" />
-      <option name="presentableId" value="LOCAL-00309" />
-      <option name="project" value="LOCAL" />
-      <updated>1767260968448</updated>
-    </task>
-    <task id="LOCAL-00310" summary="Writing and tests">
-      <option name="closed" value="true" />
-      <created>1767262727887</created>
-      <option name="number" value="00310" />
-      <option name="presentableId" value="LOCAL-00310" />
-      <option name="project" value="LOCAL" />
-      <updated>1767262727887</updated>
-    </task>
-    <task id="LOCAL-00311" summary="Writing">
-      <option name="closed" value="true" />
-      <created>1767262976779</created>
-      <option name="number" value="00311" />
-      <option name="presentableId" value="LOCAL-00311" />
-      <option name="project" value="LOCAL" />
-      <updated>1767262976779</updated>
-    </task>
-    <task id="LOCAL-00312" summary="Tests and nits">
-      <option name="closed" value="true" />
-      <created>1767263177871</created>
-      <option name="number" value="00312" />
-      <option name="presentableId" value="LOCAL-00312" />
-      <option name="project" value="LOCAL" />
-      <updated>1767263177871</updated>
-    </task>
-    <task id="LOCAL-00313" summary="Final touches">
-      <option name="closed" value="true" />
-      <created>1767264480849</created>
-      <option name="number" value="00313" />
-      <option name="presentableId" value="LOCAL-00313" />
-      <option name="project" value="LOCAL" />
-      <updated>1767264480849</updated>
-    </task>
-    <task id="LOCAL-00314" summary="Final touches">
-      <option name="closed" value="true" />
-      <created>1767264631473</created>
-      <option name="number" value="00314" />
-      <option name="presentableId" value="LOCAL-00314" />
-      <option name="project" value="LOCAL" />
-      <updated>1767264631473</updated>
-    </task>
-    <task id="LOCAL-00315" summary="Final touches">
-      <option name="closed" value="true" />
-      <created>1767295534266</created>
-      <option name="number" value="00315" />
-      <option name="presentableId" value="LOCAL-00315" />
-      <option name="project" value="LOCAL" />
-      <updated>1767295534266</updated>
-    </task>
-    <task id="LOCAL-00316" summary="More tests">
-      <option name="closed" value="true" />
-      <created>1767300734831</created>
-      <option name="number" value="00316" />
-      <option name="presentableId" value="LOCAL-00316" />
-      <option name="project" value="LOCAL" />
-      <updated>1767300734831</updated>
+      <workItem from="1767400124038" duration="58650000" />
     </task>
     <task id="LOCAL-00317" summary="Writing">
       <option name="closed" value="true" />
@@ -509,7 +378,135 @@
       <option name="project" value="LOCAL" />
       <updated>1767467232772</updated>
     </task>
-    <option name="localTasksCounter" value="350" />
+    <task id="LOCAL-00350" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1767495856786</created>
+      <option name="number" value="00350" />
+      <option name="presentableId" value="LOCAL-00350" />
+      <option name="project" value="LOCAL" />
+      <updated>1767495856786</updated>
+    </task>
+    <task id="LOCAL-00351" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1767496287506</created>
+      <option name="number" value="00351" />
+      <option name="presentableId" value="LOCAL-00351" />
+      <option name="project" value="LOCAL" />
+      <updated>1767496287506</updated>
+    </task>
+    <task id="LOCAL-00352" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1767501783702</created>
+      <option name="number" value="00352" />
+      <option name="presentableId" value="LOCAL-00352" />
+      <option name="project" value="LOCAL" />
+      <updated>1767501783702</updated>
+    </task>
+    <task id="LOCAL-00353" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1767555748507</created>
+      <option name="number" value="00353" />
+      <option name="presentableId" value="LOCAL-00353" />
+      <option name="project" value="LOCAL" />
+      <updated>1767555748507</updated>
+    </task>
+    <task id="LOCAL-00354" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1767561058376</created>
+      <option name="number" value="00354" />
+      <option name="presentableId" value="LOCAL-00354" />
+      <option name="project" value="LOCAL" />
+      <updated>1767561058377</updated>
+    </task>
+    <task id="LOCAL-00355" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1767949515517</created>
+      <option name="number" value="00355" />
+      <option name="presentableId" value="LOCAL-00355" />
+      <option name="project" value="LOCAL" />
+      <updated>1767949515517</updated>
+    </task>
+    <task id="LOCAL-00356" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1767950436457</created>
+      <option name="number" value="00356" />
+      <option name="presentableId" value="LOCAL-00356" />
+      <option name="project" value="LOCAL" />
+      <updated>1767950436457</updated>
+    </task>
+    <task id="LOCAL-00357" summary="Docs">
+      <option name="closed" value="true" />
+      <created>1768313561028</created>
+      <option name="number" value="00357" />
+      <option name="presentableId" value="LOCAL-00357" />
+      <option name="project" value="LOCAL" />
+      <updated>1768313561028</updated>
+    </task>
+    <task id="LOCAL-00358" summary="TS code mode draft">
+      <option name="closed" value="true" />
+      <created>1768313607831</created>
+      <option name="number" value="00358" />
+      <option name="presentableId" value="LOCAL-00358" />
+      <option name="project" value="LOCAL" />
+      <updated>1768313607831</updated>
+    </task>
+    <task id="LOCAL-00359" summary="Improved session expiration handling">
+      <option name="closed" value="true" />
+      <created>1768314790513</created>
+      <option name="number" value="00359" />
+      <option name="presentableId" value="LOCAL-00359" />
+      <option name="project" value="LOCAL" />
+      <updated>1768314790513</updated>
+    </task>
+    <task id="LOCAL-00360" summary="Fixed incorrect flagging of expired sessions as dead">
+      <option name="closed" value="true" />
+      <created>1768469231118</created>
+      <option name="number" value="00360" />
+      <option name="presentableId" value="LOCAL-00360" />
+      <option name="project" value="LOCAL" />
+      <updated>1768469231118</updated>
+    </task>
+    <task id="LOCAL-00361" summary="Copy">
+      <option name="closed" value="true" />
+      <created>1768470113068</created>
+      <option name="number" value="00361" />
+      <option name="presentableId" value="LOCAL-00361" />
+      <option name="project" value="LOCAL" />
+      <updated>1768470113068</updated>
+    </task>
+    <task id="LOCAL-00362" summary="Fixed help">
+      <option name="closed" value="true" />
+      <created>1768473976578</created>
+      <option name="number" value="00362" />
+      <option name="presentableId" value="LOCAL-00362" />
+      <option name="project" value="LOCAL" />
+      <updated>1768473976578</updated>
+    </task>
+    <task id="LOCAL-00363" summary="Nits">
+      <option name="closed" value="true" />
+      <created>1768474365832</created>
+      <option name="number" value="00363" />
+      <option name="presentableId" value="LOCAL-00363" />
+      <option name="project" value="LOCAL" />
+      <updated>1768474365832</updated>
+    </task>
+    <task id="LOCAL-00364" summary="Require explicit restart when server rejects MCP session ID&#10;&#10;Remove automatic reconnection when server rejects session ID during bridge restart. Session is now marked as 'expired' and user must explicitly run 'mcpc @session restart' to create a fresh session.">
+      <option name="closed" value="true" />
+      <created>1769003190833</created>
+      <option name="number" value="00364" />
+      <option name="presentableId" value="LOCAL-00364" />
+      <option name="project" value="LOCAL" />
+      <updated>1769003190833</updated>
+    </task>
+    <task id="LOCAL-00365" summary="Fixes">
+      <option name="closed" value="true" />
+      <created>1769003457187</created>
+      <option name="number" value="00365" />
+      <option name="presentableId" value="LOCAL-00365" />
+      <option name="project" value="LOCAL" />
+      <updated>1769003457187</updated>
+    </task>
+    <option name="localTasksCounter" value="366" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -616,12 +613,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Fixed handling --schema for outputSchema" />
-    <MESSAGE value="Tests" />
-    <MESSAGE value="Renamed &quot;session&quot; to &quot;connect&quot;, it's feels better" />
-    <MESSAGE value="Fixed --timeout" />
-    <MESSAGE value="Implemented --proxy command" />
-    <MESSAGE value="Writing and tests" />
     <MESSAGE value="Tests and nits" />
     <MESSAGE value="More tests" />
     <MESSAGE value="Renamed &quot;dead&quot; to &quot;crashed&quot; session, final touches" />
@@ -638,9 +629,15 @@
     <MESSAGE value="Cosmetic" />
     <MESSAGE value="New gif in README" />
     <MESSAGE value="Cosmetic improvements" />
+    <MESSAGE value="Docs" />
+    <MESSAGE value="TS code mode draft" />
+    <MESSAGE value="Improved session expiration handling" />
+    <MESSAGE value="Fixed incorrect flagging of expired sessions as dead" />
+    <MESSAGE value="Copy" />
+    <MESSAGE value="Fixed help" />
     <MESSAGE value="Nits" />
+    <MESSAGE value="Require explicit restart when server rejects MCP session ID&#10;&#10;Remove automatic reconnection when server rejects session ID during bridge restart. Session is now marked as 'expired' and user must explicitly run 'mcpc @session restart' to create a fresh session." />
     <MESSAGE value="Fixes" />
-    <MESSAGE value="Docs" />
-    <option name="LAST_COMMIT_MESSAGE" value="Docs" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixes" />
   </component>
 </project>

package/README.md

@@ -10,13 +10,13 @@ After all, UNIX-compatible shell script is THE most universal coding language.
 ![mcpc screenshot](https://raw.githubusercontent.com/apify/mcpc/main/docs/images/mcpc-demo.gif)
 
 **Key features:**
-- 🌎 **Highly compatible** - Works with any MCP server over Streamable HTTP or stdio.
+- 🌎 **Compatible** - Works with any MCP server over Streamable HTTP or stdio.
 - 🔄 **Persistent sessions** - Keep multiple server connections alive simultaneously.
-- 🚀 **Zero setup** - Connect to remote servers instantly with just a URL.
 - 🔧 **Strong MCP support** - Instructions, tools, resources, prompts, dynamic discovery.
-- 🔌 **JSON output** - Easy integration with `jq`, scripts, and other CLI tools.
-- 🤖 **AI-friendly** - Designed for both function calling and code mode with sandboxing.
+- 🔌 **Code mode** - JSON output enables integration with CLI tools like `jq` and scripting.
+- 🤖 **AI sandboxing** - MCP proxy server to securely access authenticated sessions from AI-generated code.
 - 🔒 **Secure** - Full OAuth 2.1 support, OS keychain for credentials storage.
+- 🪶 **Lightweight** - Minimal dependencies, works on Mac/Win/Linux, doesn't use LLMs on its own.
 
 
 ## Table of contents
@@ -36,6 +36,7 @@ After all, UNIX-compatible shell script is THE most universal coding language.
 - [Security](#security)
 - [Errors](#errors)
 - [Development](#development)
+- [Related work](#related-work)
 - [License](#license)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -101,7 +102,7 @@ Options:
   -H, --header <header>         HTTP header for remote MCP server (can be repeated)
   -v, --version                 Output the version number
   --verbose                     Enable debug logging
-  --profile <name>              OAuth profile for the server ("default" if skipped)
+  --profile <name>              OAuth profile for the server ("default" if not provided)
   --schema <file>               Validate tool/prompt schema against expected schema
   --schema-mode <mode>          Schema validation mode: strict, compatible (default), ignore
   --timeout <seconds>           Request timeout in seconds (default: 300)
@@ -115,14 +116,14 @@ Targets:
   <config-entry>                Entry in MCP config file specified by --config (e.g. "fs")
   <server-url>                  Remote MCP server URL (e.g. "mcp.apify.com")
 
-Management commands (<target> missing):
-  login                         Create OAuth profile with credentials to access remote server
+Management commands:
+  login                         Create OAuth profile with credentials for remote server
   logout                        Remove OAuth profile for remote server
   connect @<session>            Connect to server and create named persistent session
-  restart @<session>            Kill and restart a session
-  close @<session>              Close a session
+  restart                       Kill and restart a session
+  close                         Close a session
 
-MCP commands (<target> provided):
+MCP server commands:
   help                          Show server info ("help" can be omitted)
   shell                         Open interactive shell
   tools-list                    Send "tools/list" MCP request...
@@ -138,12 +139,13 @@ MCP commands (<target> provided):
   resources-templates-list
   logging-set-level <level>
   ping
-
+  
+Run "mcpc" (without <target>) to show available sessions and profiles.
 ```
 
-### Management commands
+### General actions
 
-When `<target>` is missing, `mcpc` provides general management commands.
+When `<target>` is omitted, `mcpc` provides general actions:
 
 ```bash
 # List all sessions and OAuth profiles (also in JSON mode)
@@ -154,15 +156,13 @@ mcpc --json
 mcpc --help
 mcpc --version
 
-# Clean expired sessions and old log files
+# Clean expired sessions and old log files (see below for details)
 mcpc --clean
 ```
 
-For additional management commands, see [OAuth profiles](#oauth-profiles) and [Cleanup](#cleanup).
-
 ### Targets
 
-To connect to an MCP server, you need to specify a `<target>`, which can be one of (in order of precedence):
+To connect and interact with an MCP server, you need to specify a `<target>`, which can be one of (in this order of precedence):
 
 - **Entry in a config file** (e.g. `--config .vscode/mcp.json filesystem`) - see [Config file](#mcp-server-config-file)
 - **Remote MCP server URL** (e.g. `https://mcp.apify.com`)
@@ -178,7 +178,7 @@ connects, and enables you to interact with it.
 
 ### MCP commands
 
-Examples of sending MCP commands to various targets:
+When `<target>` is provided, `mcpc` sends MCP requests to the target server:
 
 ```bash
 # Server from config file (stdio)
@@ -1057,11 +1057,26 @@ The main `mcpc` process doesn't save log files, but supports [verbose mode](#ver
 
 ## Development
 
-The initial version of `mcpc` was developed by [Jan Curn](https://x.com/jancurn) of [Apify](https://apify.com)
+The initial version of `mcpc` was developed and [launched by Jan Curn](https://x.com/jancurn/status/2007144080959291756) of [Apify](https://apify.com)
 with the help of Claude Code, during late nights over Christmas 2025 in North Beach, San Francisco.
 
 See [CONTRIBUTING](./CONTRIBUTING.md) for development setup, architecture overview, and contribution guidelines.
 
+## Related work
+
+- https://github.com/steipete/mcporter
+- https://github.com/philschmid/mcp-cli (https://www.philschmid.de/mcp-cli)
+- https://github.com/chrishayuk/mcp-cli
+- https://github.com/wong2/mcp-cli
+- https://github.com/f/mcptools
+- https://github.com/adhikasp/mcp-client-cli
+- https://github.com/mattzcarey/cloudflare-mcp 
+- https://github.com/TeamSparkAI/mcpGraph
+- https://platform.claude.com/docs/en/agents-and-tools/tool-use/tool-search-tool (https://x.com/trq212/status/2011523109871108570)
+- https://cursor.com/blog/dynamic-context-discovery
+- https://www.anthropic.com/engineering/code-execution-with-mcp
+- https://blog.cloudflare.com/code-mode/
+
 ## License
 
 Apache-2.0 - see [LICENSE](./LICENSE) for details.

package/dist/bridge/index.js

@@ -3,7 +3,7 @@ import { createServer } from 'net';
 import { unlink } from 'fs/promises';
 import { createMcpClient } from '../core/index.js';
 import { createLogger, setVerbose, initFileLogger, closeFileLogger } from '../lib/index.js';
-import { fileExists, getBridgesDir, getSocketPath, ensureDir, cleanupOrphanedLogFiles } from '../lib/index.js';
+import { fileExists, getBridgesDir, getSocketPath, ensureDir, cleanupOrphanedLogFiles, isSessionExpiredError } from '../lib/index.js';
 import { ClientError, NetworkError } from '../lib/index.js';
 import { loadSessions, updateSession } from '../lib/sessions.js';
 import { OAuthTokenManager } from '../lib/auth/oauth-token-manager.js';
@@ -195,6 +195,15 @@ class BridgeProcess {
             catch (error) {
                 logger.error('Bridge startup failed, will stay alive briefly for CLI to receive error:', error);
                 this.mcpClientReadyRejecter(error);
+                if (isSessionExpiredError(error.message)) {
+                    logger.warn('Session ID was rejected by server, marking session as expired');
+                    try {
+                        await updateSession(this.options.sessionName, { status: 'expired' });
+                    }
+                    catch (updateError) {
+                        logger.error('Failed to mark session as expired:', updateError);
+                    }
+                }
                 this.setupSignalHandlers();
                 setTimeout(() => {
                     logger.info('Shutting down after startup failure');
@@ -269,6 +278,7 @@ class BridgeProcess {
                 sampling: {},
             },
             ...(this.authProvider && { authProvider: this.authProvider }),
+            ...(this.options.mcpSessionId && { mcpSessionId: this.options.mcpSessionId }),
             listChanged: {
                 tools: {
                     autoRefresh: true,
@@ -305,10 +315,14 @@ class BridgeProcess {
             verbose: this.options.verbose || false,
         };
         logger.debug('Calling createMcpClient with authProvider:', !!clientConfig.authProvider);
+        if (clientConfig.mcpSessionId) {
+            logger.info(`Attempting session resumption with MCP-Session-Id: ${clientConfig.mcpSessionId}`);
+        }
         this.client = await createMcpClient(clientConfig);
         logger.info('Connected to MCP server');
         logger.debug('MCP client created successfully, authProvider was:', !!clientConfig.authProvider);
         const serverDetails = await this.client.getServerDetails();
+        const newMcpSessionId = this.client.getMcpSessionId();
         const sessionUpdate = {
             lastSeenAt: new Date().toISOString(),
         };
@@ -318,6 +332,10 @@ class BridgeProcess {
         if (serverDetails.serverInfo) {
             sessionUpdate.serverInfo = serverDetails.serverInfo;
         }
+        if (newMcpSessionId) {
+            sessionUpdate.mcpSessionId = newMcpSessionId;
+            logger.info(`MCP-Session-Id saved for resumption: ${newMcpSessionId}`);
+        }
         await updateSession(this.options.sessionName, sessionUpdate);
     }
     async startProxyServer() {
@@ -378,13 +396,7 @@ class BridgeProcess {
         }
     }
     handlePossibleExpiration(error) {
-        const errorMessage = error.message.toLowerCase();
-        const isExpired = (errorMessage.includes('404') && !errorMessage.includes('tool')) ||
-            errorMessage.includes('session expired') ||
-            errorMessage.includes('session not found') ||
-            errorMessage.includes('invalid session') ||
-            errorMessage.includes('session is no longer valid');
-        if (isExpired) {
+        if (isSessionExpiredError(error.message)) {
             logger.warn('Session appears to be expired, marking as expired and shutting down');
             this.markSessionExpiredAndExit().catch((e) => {
                 logger.error('Failed to mark session as expired:', e);
@@ -681,7 +693,7 @@ class BridgeProcess {
 async function main() {
     const args = process.argv.slice(2);
     if (args.length < 2) {
-        console.error('Usage: mcpc-bridge <sessionName> <transportConfigJson> [--verbose] [--profile <name>] [--proxy-host <host>] [--proxy-port <port>]');
+        console.error('Usage: mcpc-bridge <sessionName> <transportConfigJson> [--verbose] [--profile <name>] [--proxy-host <host>] [--proxy-port <port>] [--mcp-session-id <id>]');
         process.exit(1);
     }
     const sessionName = args[0];
@@ -702,6 +714,11 @@ async function main() {
             proxyConfig = { host, port };
         }
     }
+    let mcpSessionId;
+    const mcpSessionIdIndex = args.indexOf('--mcp-session-id');
+    if (mcpSessionIdIndex !== -1 && args[mcpSessionIdIndex + 1]) {
+        mcpSessionId = args[mcpSessionIdIndex + 1];
+    }
     try {
         const bridgeOptions = {
             sessionName,
@@ -714,6 +731,9 @@ async function main() {
         if (proxyConfig) {
             bridgeOptions.proxyConfig = proxyConfig;
         }
+        if (mcpSessionId) {
+            bridgeOptions.mcpSessionId = mcpSessionId;
+        }
         const bridge = new BridgeProcess(bridgeOptions);
         await bridge.start();
     }