@rsconcept/rstool-mcp 0.1.5 → 0.3.0

package/README.md

@@ -44,12 +44,17 @@ Restart Cursor; the tools appear under the **rstool** server. Pin a version if y
   "mcpServers": {
     "rstool": {
       "command": "npx",
-      "args": ["-y", "@rsconcept/rstool-mcp@0.1.0"]
+      "args": ["-y", "@rsconcept/rstool-mcp@0.2.0"],
+      "env": {
+        "RSTOOL_PERSISTENCE_DIR": "C:/path/to/rstool-sessions"
+      }
     }
   }
 }
 ```
 
+Set `RSTOOL_PERSISTENCE_DIR` to keep sessions across MCP server restarts (optional).
+
 ## Configure in Claude Desktop
 
 Edit `claude_desktop_config.json` (`~/Library/Application Support/Claude/` on macOS, `%APPDATA%\Claude\` on Windows):
@@ -67,35 +72,35 @@ Edit `claude_desktop_config.json` (`~/Library/Application Support/Claude/` on ma
 
 ## Exposed tools
 
-| MCP tool | Wraps | Notes |
-|----------|-------|-------|
-| `ping` | — | Liveness + `contractVersion`. |
-| `list_methods` | — | Enumerate available tools. |
-| `create_session` | `RSToolAgent.createSession` | Optional `initial` seed. |
-| `add_or_update_constituenta` | `addOrUpdateConstituenta` | Single upsert. |
-| `analyze_expression` | `analyzeExpression` | Parser + semantic. |
-| `get_form_state` | `getFormState` | Current `SessionState`. |
-| `list_diagnostics` | `listDiagnostics` | Filterable. |
-| `commit_step` | `commitStep` | Records a `SessionRevision`. |
-| `export_session` | `exportSession` | JSON string. |
-| `import_session` | `importSession` | Restore from JSON. |
-| `set_constituenta_value` | `setConstituentaValue` | Bind interpretable. |
-| `set_constituenta_values` | `setConstituentaValues` | Batch bindings. |
-| `clear_constituenta_values` | `clearConstituentaValues` | Reset values. |
-| `get_model_state` | `getModelState` | Values + statuses. |
-| `evaluate_expression` | `evaluateExpression` | Scratch evaluation. |
-| `evaluate_constituenta` | `evaluateConstituenta` | Stored derived constituent. |
-| `recalculate_model` | `recalculateModel` | Full recompute. |
-
-Input schemas are intentionally permissive (`additionalProperties: true`) where the rstool input is structurally rich (e.g. `ConstituentaDraft`, `SessionState`); the wrapped `RSToolAgent` validates inputs at runtime and returns deterministic error responses, surfaced through `isError: true` on the MCP response.
+| MCP tool              | Wraps               | Notes                                        |
+| --------------------- | ------------------- | -------------------------------------------- |
+| `ping`                | —                   | Liveness + `contractVersion`.                |
+| `list_methods`        | —                   | Enumerate available tools.                   |
+| `ensure_session`      | `ensureSession`     | Return active session or create one.         |
+| `create_session`      | `createSession`     | Optional `initial` seed.                     |
+| `set_current_session` | `setCurrentSession` | Switch active session.                       |
+| `apply_schema_patch`  | `applySchemaPatch`  | Primary schema edit path.                    |
+| `get_session_state`   | `getSessionState`   | `detail=summary` (default) or `full`.        |
+| `analyze_expression`  | `analyzeExpression` | Scratch analysis.                            |
+| `list_diagnostics`    | `listDiagnostics`   | Optional `constituentId`.                    |
+| `commit_step`         | `commitStep`        | Records a revision.                          |
+| `export_session`      | `exportSession`     | JSON string.                                 |
+| `export_portal`       | `exportPortal`      | `kind=schema\|model`, `format=json\|object`. |
+| `import_data`         | `importData`        | `kind=auto` by default.                      |
+| `set_model_values`    | `setModelValues`    | `set[]` and/or `clear[]`.                    |
+| `get_model_state`     | `getModelState`     | Values + statuses.                           |
+| `evaluate`            | `evaluate`          | Scratch or stored constituent.               |
+| `recalculate_model`   | `recalculateModel`  | Full recompute.                              |
+
+Session tools accept optional `sessionId` (flat params, no `input` wrapper). Prefer `apply_schema_patch` for schema edits.
 
 ## Programmatic use
 
 If you want to build a custom transport (HTTP, in-process) instead of stdio:
 
 ```ts
-import { StreamableHttpServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import { buildRSToolMcpServer } from '@rsconcept/rstool-mcp';
+import { StreamableHttpServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { buildRSToolMcpServer } from "@rsconcept/rstool-mcp";
 
 const server = buildRSToolMcpServer();
 const transport = new StreamableHttpServerTransport();
@@ -105,11 +110,15 @@ await server.connect(transport);
 Or share a single `RSToolAgent` between multiple servers / requests:
 
 ```ts
-import { RSToolAgent } from '@rsconcept/rstool';
-import { buildRSToolMcpServer } from '@rsconcept/rstool-mcp';
+import { RSToolAgent } from "@rsconcept/rstool";
+import { buildRSToolMcpServer } from "@rsconcept/rstool-mcp";
 
 const tool = new RSToolAgent();
-const server = buildRSToolMcpServer({ tool, name: 'my-rstool-mcp', version: '0.2.0' });
+const server = buildRSToolMcpServer({
+  tool,
+  name: "my-rstool-mcp",
+  version: "0.2.0",
+});
 ```
 
 ## Companion docs

package/dist/bin/server.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as buildRSToolMcpServer } from "../server-CzaNBfgR.js";
+import { t as buildRSToolMcpServer } from "../server-CWm4FZFL.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 //#region src/bin/server.ts
 async function main() {

package/dist/index.d.ts

@@ -5,6 +5,8 @@ import { RSToolAgent } from "@rsconcept/rstool";
 interface BuildRSToolMcpServerOptions {
   /** Pre-built RSToolAgent. Defaults to a fresh in-memory instance. */
   tool?: RSToolAgent;
+  /** Persist sessions to this directory (also reads RSTOOL_PERSISTENCE_DIR when set). */
+  persistenceDir?: string;
   /** Server name advertised to MCP clients. */
   name?: string;
   /** Server version advertised to MCP clients. */
@@ -33,7 +35,7 @@ interface ToolDefinition {
   name: string;
   description: string;
   inputSchema: {
-    type: 'object';
+    type: "object";
     properties: Record<string, unknown>;
     required?: string[];
     additionalProperties?: boolean;

package/dist/index.js

@@ -1,2 +1,2 @@
-import { n as TOOL_DEFINITIONS, t as buildRSToolMcpServer } from "./server-CzaNBfgR.js";
+import { n as TOOL_DEFINITIONS, t as buildRSToolMcpServer } from "./server-CWm4FZFL.js";
 export { TOOL_DEFINITIONS, buildRSToolMcpServer };

package/dist/server-CWm4FZFL.js

@@ -0,0 +1,362 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
+import { RSToolAgent } from "@rsconcept/rstool";
+//#region src/tools.ts
+const sessionId = {
+	type: "string",
+	description: "Session id. Omit to use the current active session."
+};
+const agentPatchSchema = {
+	type: "object",
+	description: "Agent-friendly constituent patch. id and cstType are optional; cstType is inferred from alias prefixes X/C/S/D/A/F/P.",
+	properties: {
+		id: { type: "number" },
+		alias: { type: "string" },
+		cstType: { type: "string" },
+		definitionFormal: { type: "string" },
+		term: { type: "string" },
+		definitionText: { type: "string" },
+		convention: { type: "string" }
+	},
+	required: ["alias"]
+};
+function optionalSessionId(args) {
+	const value = args.sessionId;
+	return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function omitSessionId(args) {
+	const { sessionId: _sessionId, ...rest } = args;
+	return rest;
+}
+const TOOL_DEFINITIONS = [
+	{
+		name: "ping",
+		description: "Liveness check; returns {pong: true} and the active rstool contract version.",
+		inputSchema: {
+			type: "object",
+			properties: {},
+			additionalProperties: false
+		},
+		invoke: (tool) => ({
+			pong: true,
+			contractVersion: tool.contractVersion
+		})
+	},
+	{
+		name: "list_methods",
+		description: "List all rstool methods exposed as MCP tools.",
+		inputSchema: {
+			type: "object",
+			properties: {},
+			additionalProperties: false
+		},
+		invoke: () => TOOL_DEFINITIONS.map((definition) => definition.name)
+	},
+	{
+		name: "ensure_session",
+		description: "Return the current active session, or create one if none exists. Optional initial seed is used only when creating.",
+		inputSchema: {
+			type: "object",
+			properties: { initial: {
+				type: "object",
+				properties: {
+					alias: { type: "string" },
+					title: { type: "string" },
+					comment: { type: "string" }
+				},
+				additionalProperties: true
+			} },
+			additionalProperties: false
+		},
+		invoke: (tool, args) => tool.ensureSession(args.initial)
+	},
+	{
+		name: "create_session",
+		description: "Create a fresh in-memory rstool session and set it as the current active session.",
+		inputSchema: {
+			type: "object",
+			properties: { initial: {
+				type: "object",
+				description: "Optional partial SessionState seed (alias, title, comment).",
+				properties: {
+					alias: { type: "string" },
+					title: { type: "string" },
+					comment: { type: "string" }
+				},
+				additionalProperties: false
+			} },
+			additionalProperties: false
+		},
+		invoke: (tool, args) => tool.createSession(args.initial)
+	},
+	{
+		name: "set_current_session",
+		description: "Set the active session by id.",
+		inputSchema: {
+			type: "object",
+			properties: { sessionId },
+			required: ["sessionId"]
+		},
+		invoke: (tool, args) => tool.setCurrentSession(String(args.sessionId))
+	},
+	{
+		name: "apply_schema_patch",
+		description: "Preferred schema edit path. Batch patch with inferred ids and cstType, dependency ordering, and compact summary.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				initial: {
+					type: "object",
+					properties: {
+						alias: { type: "string" },
+						title: { type: "string" },
+						comment: { type: "string" }
+					},
+					additionalProperties: true
+				},
+				items: {
+					type: "array",
+					items: agentPatchSchema
+				},
+				mode: {
+					type: "string",
+					enum: ["atomic", "best_effort"]
+				},
+				commitMessage: { type: "string" }
+			},
+			required: ["items"]
+		},
+		invoke: (tool, args) => tool.applySchemaPatch(omitSessionId(args), optionalSessionId(args))
+	},
+	{
+		name: "get_session_state",
+		description: "Return session state. detail=summary (default): compact metadata, aliases, diagnostics. detail=full: complete SessionState clone.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				detail: {
+					type: "string",
+					enum: ["summary", "full"]
+				}
+			}
+		},
+		invoke: (tool, args) => tool.getSessionState(args.detail ?? "summary", optionalSessionId(args))
+	},
+	{
+		name: "analyze_expression",
+		description: "Parse and type-check a scratch expression without saving it. Does not record diagnostics unless recordDiagnostics=true.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				expression: { type: "string" },
+				cstType: { type: "string" },
+				recordDiagnostics: { type: "boolean" }
+			},
+			required: ["expression", "cstType"]
+		},
+		invoke: (tool, args) => tool.analyzeExpression(omitSessionId(args), optionalSessionId(args))
+	},
+	{
+		name: "list_diagnostics",
+		description: "List active diagnostics for the session (one record set per constituent, not a historical log).",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				constituentId: { type: "number" }
+			}
+		},
+		invoke: (tool, args) => {
+			const constituentId = args.constituentId;
+			const filters = typeof constituentId === "number" ? { constituentId } : void 0;
+			return tool.listDiagnostics(filters, optionalSessionId(args));
+		}
+	},
+	{
+		name: "commit_step",
+		description: "Record a session revision with an optional human-readable message.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				message: { type: "string" }
+			}
+		},
+		invoke: (tool, args) => tool.commitStep(args.message, optionalSessionId(args))
+	},
+	{
+		name: "export_session",
+		description: "Serialize the session to a JSON string suitable for import_data with kind=session.",
+		inputSchema: {
+			type: "object",
+			properties: { sessionId }
+		},
+		invoke: (tool, args) => tool.exportSession(optionalSessionId(args))
+	},
+	{
+		name: "export_portal",
+		description: "Export Portal Load-from-JSON payload. kind=schema|model; format=json (default string) or object.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				kind: {
+					type: "string",
+					enum: ["schema", "model"]
+				},
+				format: {
+					type: "string",
+					enum: ["json", "object"]
+				}
+			},
+			required: ["kind"]
+		},
+		invoke: (tool, args) => tool.exportPortal(omitSessionId(args), optionalSessionId(args))
+	},
+	{
+		name: "import_data",
+		description: "Import a session from export_session JSON, Portal schema JSON, or GET /api/rsforms/:id/details. kind=auto (default) detects the shape.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				payload: { description: "JSON string or parsed object (session export, Portal schema, or rsform details)." },
+				kind: {
+					type: "string",
+					enum: [
+						"auto",
+						"session",
+						"portal-schema",
+						"portal-details"
+					]
+				}
+			},
+			required: ["payload"]
+		},
+		invoke: (tool, args) => tool.importData(args.payload, args.kind)
+	},
+	{
+		name: "set_model_values",
+		description: "Set and/or clear interpretable model bindings. Pass set[] for bindings and clear[] for constituent ids to reset.",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				set: {
+					type: "array",
+					items: {
+						type: "object",
+						properties: {
+							target: { type: "number" },
+							type: { type: "string" },
+							value: {}
+						},
+						required: ["target", "value"]
+					}
+				},
+				clear: {
+					type: "array",
+					items: { type: "number" }
+				}
+			}
+		},
+		invoke: (tool, args) => tool.setModelValues(omitSessionId(args), optionalSessionId(args))
+	},
+	{
+		name: "get_model_state",
+		description: "Return the SessionModelState.",
+		inputSchema: {
+			type: "object",
+			properties: { sessionId }
+		},
+		invoke: (tool, args) => tool.getModelState(optionalSessionId(args))
+	},
+	{
+		name: "evaluate",
+		description: "Evaluate a scratch expression (expression + cstType) or a stored constituent (constituentId).",
+		inputSchema: {
+			type: "object",
+			properties: {
+				sessionId,
+				expression: { type: "string" },
+				cstType: { type: "string" },
+				constituentId: { type: "number" }
+			}
+		},
+		invoke: (tool, args) => tool.evaluate(omitSessionId(args), optionalSessionId(args))
+	},
+	{
+		name: "recalculate_model",
+		description: "Recompute every inferrable constituent.",
+		inputSchema: {
+			type: "object",
+			properties: { sessionId }
+		},
+		invoke: (tool, args) => tool.recalculateModel(optionalSessionId(args))
+	}
+];
+//#endregion
+//#region src/server.ts
+/**
+* Build an MCP `McpServer` instance that exposes the `@rsconcept/rstool` contract.
+*
+* The returned server is not yet connected to a transport. Wrap it with a
+* `StdioServerTransport` (for local subprocess hosts like Cursor and Claude Desktop) or
+* an HTTP transport, then call `server.connect(transport)`.
+*
+* @example
+* ```ts
+* import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+* import { buildRSToolMcpServer } from '@rsconcept/rstool-mcp';
+*
+* const server = buildRSToolMcpServer();
+* await server.connect(new StdioServerTransport());
+* ```
+*/
+function buildRSToolMcpServer(options = {}) {
+	const persistenceDir = options.persistenceDir ?? process.env.RSTOOL_PERSISTENCE_DIR;
+	const tool = options.tool ?? new RSToolAgent(persistenceDir ? { persistenceDir } : void 0);
+	const server = new McpServer({
+		name: options.name ?? "rstool-mcp",
+		version: options.version ?? "0.1.0"
+	}, { capabilities: { tools: {} } });
+	const definitionByName = new Map(TOOL_DEFINITIONS.map((definition) => [definition.name, definition]));
+	server.server.setRequestHandler(ListToolsRequestSchema, () => Promise.resolve({ tools: TOOL_DEFINITIONS.map((definition) => ({
+		name: definition.name,
+		description: definition.description,
+		inputSchema: definition.inputSchema
+	})) }));
+	server.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+		const definition = definitionByName.get(request.params.name);
+		if (!definition) return {
+			isError: true,
+			content: [{
+				type: "text",
+				text: `Unknown rstool tool: ${request.params.name}`
+			}]
+		};
+		try {
+			const result = await definition.invoke(tool, request.params.arguments ?? {});
+			return { content: [{
+				type: "text",
+				text: typeof result === "string" ? result : JSON.stringify(result, null, 2)
+			}] };
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			return {
+				isError: true,
+				content: [{
+					type: "text",
+					text: `rstool error in ${definition.name}: ${message}`
+				}]
+			};
+		}
+	});
+	return server;
+}
+//#endregion
+export { TOOL_DEFINITIONS as n, buildRSToolMcpServer as t };
+
+//# sourceMappingURL=server-CWm4FZFL.js.map

package/dist/server-CWm4FZFL.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-CWm4FZFL.js","names":[],"sources":["../src/tools.ts","../src/server.ts"],"sourcesContent":["/**\n * MCP tool definitions for the @rsconcept/rstool contract.\n */\n\nimport { type RSToolAgent } from \"@rsconcept/rstool\";\n\nexport interface ToolDefinition {\n  name: string;\n  description: string;\n  inputSchema: {\n    type: \"object\";\n    properties: Record<string, unknown>;\n    required?: string[];\n    additionalProperties?: boolean;\n  };\n  invoke: (\n    tool: RSToolAgent,\n    args: Record<string, unknown>,\n  ) => unknown | Promise<unknown>;\n}\n\nconst sessionId = {\n  type: \"string\",\n  description: \"Session id. Omit to use the current active session.\",\n};\n\nconst agentPatchSchema = {\n  type: \"object\",\n  description:\n    \"Agent-friendly constituent patch. id and cstType are optional; cstType is inferred from alias prefixes X/C/S/D/A/F/P.\",\n  properties: {\n    id: { type: \"number\" },\n    alias: { type: \"string\" },\n    cstType: { type: \"string\" },\n    definitionFormal: { type: \"string\" },\n    term: { type: \"string\" },\n    definitionText: { type: \"string\" },\n    convention: { type: \"string\" },\n  },\n  required: [\"alias\"],\n};\n\nfunction optionalSessionId(args: Record<string, unknown>): string | undefined {\n  const value = args.sessionId;\n  return typeof value === \"string\" && value.length > 0 ? value : undefined;\n}\n\nfunction omitSessionId(args: Record<string, unknown>): Record<string, unknown> {\n  const { sessionId: _sessionId, ...rest } = args;\n  return rest;\n}\n\nexport const TOOL_DEFINITIONS: ToolDefinition[] = [\n  {\n    name: \"ping\",\n    description:\n      \"Liveness check; returns {pong: true} and the active rstool contract version.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {},\n      additionalProperties: false,\n    },\n    invoke: (tool) => ({ pong: true, contractVersion: tool.contractVersion }),\n  },\n  {\n    name: \"list_methods\",\n    description: \"List all rstool methods exposed as MCP tools.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {},\n      additionalProperties: false,\n    },\n    invoke: () => TOOL_DEFINITIONS.map((definition) => definition.name),\n  },\n  {\n    name: \"ensure_session\",\n    description:\n      \"Return the current active session, or create one if none exists. Optional initial seed is used only when creating.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        initial: {\n          type: \"object\",\n          properties: {\n            alias: { type: \"string\" },\n            title: { type: \"string\" },\n            comment: { type: \"string\" },\n          },\n          additionalProperties: true,\n        },\n      },\n      additionalProperties: false,\n    },\n    invoke: (tool, args) => tool.ensureSession(args.initial as never),\n  },\n  {\n    name: \"create_session\",\n    description:\n      \"Create a fresh in-memory rstool session and set it as the current active session.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        initial: {\n          type: \"object\",\n          description:\n            \"Optional partial SessionState seed (alias, title, comment).\",\n          properties: {\n            alias: { type: \"string\" },\n            title: { type: \"string\" },\n            comment: { type: \"string\" },\n          },\n          additionalProperties: false,\n        },\n      },\n      additionalProperties: false,\n    },\n    invoke: (tool, args) => tool.createSession(args.initial as never),\n  },\n  {\n    name: \"set_current_session\",\n    description: \"Set the active session by id.\",\n    inputSchema: {\n      type: \"object\",\n      properties: { sessionId },\n      required: [\"sessionId\"],\n    },\n    invoke: (tool, args) => tool.setCurrentSession(String(args.sessionId)),\n  },\n  {\n    name: \"apply_schema_patch\",\n    description:\n      \"Preferred schema edit path. Batch patch with inferred ids and cstType, dependency ordering, and compact summary.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        initial: {\n          type: \"object\",\n          properties: {\n            alias: { type: \"string\" },\n            title: { type: \"string\" },\n            comment: { type: \"string\" },\n          },\n          additionalProperties: true,\n        },\n        items: { type: \"array\", items: agentPatchSchema },\n        mode: { type: \"string\", enum: [\"atomic\", \"best_effort\"] },\n        commitMessage: { type: \"string\" },\n      },\n      required: [\"items\"],\n    },\n    invoke: (tool, args) =>\n      tool.applySchemaPatch(\n        omitSessionId(args) as never,\n        optionalSessionId(args),\n      ),\n  },\n  {\n    name: \"get_session_state\",\n    description:\n      \"Return session state. detail=summary (default): compact metadata, aliases, diagnostics. detail=full: complete SessionState clone.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        detail: { type: \"string\", enum: [\"summary\", \"full\"] },\n      },\n    },\n    invoke: (tool, args) =>\n      tool.getSessionState(\n        (args.detail as \"summary\" | \"full\" | undefined) ?? \"summary\",\n        optionalSessionId(args),\n      ),\n  },\n  {\n    name: \"analyze_expression\",\n    description:\n      \"Parse and type-check a scratch expression without saving it. Does not record diagnostics unless recordDiagnostics=true.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        expression: { type: \"string\" },\n        cstType: { type: \"string\" },\n        recordDiagnostics: { type: \"boolean\" },\n      },\n      required: [\"expression\", \"cstType\"],\n    },\n    invoke: (tool, args) =>\n      tool.analyzeExpression(\n        omitSessionId(args) as never,\n        optionalSessionId(args),\n      ),\n  },\n  {\n    name: \"list_diagnostics\",\n    description:\n      \"List active diagnostics for the session (one record set per constituent, not a historical log).\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        constituentId: { type: \"number\" },\n      },\n    },\n    invoke: (tool, args) => {\n      const constituentId = args.constituentId;\n      const filters =\n        typeof constituentId === \"number\" ? { constituentId } : undefined;\n      return tool.listDiagnostics(filters, optionalSessionId(args));\n    },\n  },\n  {\n    name: \"commit_step\",\n    description:\n      \"Record a session revision with an optional human-readable message.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        message: { type: \"string\" },\n      },\n    },\n    invoke: (tool, args) =>\n      tool.commitStep(\n        args.message as string | undefined,\n        optionalSessionId(args),\n      ),\n  },\n  {\n    name: \"export_session\",\n    description:\n      \"Serialize the session to a JSON string suitable for import_data with kind=session.\",\n    inputSchema: {\n      type: \"object\",\n      properties: { sessionId },\n    },\n    invoke: (tool, args) => tool.exportSession(optionalSessionId(args)),\n  },\n  {\n    name: \"export_portal\",\n    description:\n      \"Export Portal Load-from-JSON payload. kind=schema|model; format=json (default string) or object.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        kind: { type: \"string\", enum: [\"schema\", \"model\"] },\n        format: { type: \"string\", enum: [\"json\", \"object\"] },\n      },\n      required: [\"kind\"],\n    },\n    invoke: (tool, args) =>\n      tool.exportPortal(omitSessionId(args) as never, optionalSessionId(args)),\n  },\n  {\n    name: \"import_data\",\n    description:\n      \"Import a session from export_session JSON, Portal schema JSON, or GET /api/rsforms/:id/details. kind=auto (default) detects the shape.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        payload: {\n          description:\n            \"JSON string or parsed object (session export, Portal schema, or rsform details).\",\n        },\n        kind: {\n          type: \"string\",\n          enum: [\"auto\", \"session\", \"portal-schema\", \"portal-details\"],\n        },\n      },\n      required: [\"payload\"],\n    },\n    invoke: (tool, args) =>\n      tool.importData(args.payload as string | object, args.kind as never),\n  },\n  {\n    name: \"set_model_values\",\n    description:\n      \"Set and/or clear interpretable model bindings. Pass set[] for bindings and clear[] for constituent ids to reset.\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        set: {\n          type: \"array\",\n          items: {\n            type: \"object\",\n            properties: {\n              target: { type: \"number\" },\n              type: { type: \"string\" },\n              value: {},\n            },\n            required: [\"target\", \"value\"],\n          },\n        },\n        clear: { type: \"array\", items: { type: \"number\" } },\n      },\n    },\n    invoke: (tool, args) =>\n      tool.setModelValues(\n        omitSessionId(args) as never,\n        optionalSessionId(args),\n      ),\n  },\n  {\n    name: \"get_model_state\",\n    description: \"Return the SessionModelState.\",\n    inputSchema: {\n      type: \"object\",\n      properties: { sessionId },\n    },\n    invoke: (tool, args) => tool.getModelState(optionalSessionId(args)),\n  },\n  {\n    name: \"evaluate\",\n    description:\n      \"Evaluate a scratch expression (expression + cstType) or a stored constituent (constituentId).\",\n    inputSchema: {\n      type: \"object\",\n      properties: {\n        sessionId,\n        expression: { type: \"string\" },\n        cstType: { type: \"string\" },\n        constituentId: { type: \"number\" },\n      },\n    },\n    invoke: (tool, args) =>\n      tool.evaluate(omitSessionId(args) as never, optionalSessionId(args)),\n  },\n  {\n    name: \"recalculate_model\",\n    description: \"Recompute every inferrable constituent.\",\n    inputSchema: {\n      type: \"object\",\n      properties: { sessionId },\n    },\n    invoke: (tool, args) => tool.recalculateModel(optionalSessionId(args)),\n  },\n];\n","import { McpServer } from \"@modelcontextprotocol/sdk/server/mcp.js\";\nimport {\n  CallToolRequestSchema,\n  ListToolsRequestSchema,\n} from \"@modelcontextprotocol/sdk/types.js\";\n\nimport { RSToolAgent } from \"@rsconcept/rstool\";\n\nimport { TOOL_DEFINITIONS, type ToolDefinition } from \"./tools\";\n\nexport interface BuildRSToolMcpServerOptions {\n  /** Pre-built RSToolAgent. Defaults to a fresh in-memory instance. */\n  tool?: RSToolAgent;\n  /** Persist sessions to this directory (also reads RSTOOL_PERSISTENCE_DIR when set). */\n  persistenceDir?: string;\n  /** Server name advertised to MCP clients. */\n  name?: string;\n  /** Server version advertised to MCP clients. */\n  version?: string;\n}\n\n/**\n * Build an MCP `McpServer` instance that exposes the `@rsconcept/rstool` contract.\n *\n * The returned server is not yet connected to a transport. Wrap it with a\n * `StdioServerTransport` (for local subprocess hosts like Cursor and Claude Desktop) or\n * an HTTP transport, then call `server.connect(transport)`.\n *\n * @example\n * ```ts\n * import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';\n * import { buildRSToolMcpServer } from '@rsconcept/rstool-mcp';\n *\n * const server = buildRSToolMcpServer();\n * await server.connect(new StdioServerTransport());\n * ```\n */\nexport function buildRSToolMcpServer(\n  options: BuildRSToolMcpServerOptions = {},\n): McpServer {\n  const persistenceDir =\n    options.persistenceDir ?? process.env.RSTOOL_PERSISTENCE_DIR;\n  const tool =\n    options.tool ??\n    new RSToolAgent(persistenceDir ? { persistenceDir } : undefined);\n  const server = new McpServer(\n    {\n      name: options.name ?? \"rstool-mcp\",\n      version: options.version ?? \"0.1.0\",\n    },\n    {\n      capabilities: {\n        tools: {},\n      },\n    },\n  );\n\n  const definitionByName = new Map<string, ToolDefinition>(\n    TOOL_DEFINITIONS.map((definition) => [definition.name, definition]),\n  );\n\n  server.server.setRequestHandler(ListToolsRequestSchema, () =>\n    Promise.resolve({\n      tools: TOOL_DEFINITIONS.map((definition) => ({\n        name: definition.name,\n        description: definition.description,\n        inputSchema: definition.inputSchema,\n      })),\n    }),\n  );\n\n  server.server.setRequestHandler(CallToolRequestSchema, async (request) => {\n    const definition = definitionByName.get(request.params.name);\n    if (!definition) {\n      return {\n        isError: true,\n        content: [\n          {\n            type: \"text\" as const,\n            text: `Unknown rstool tool: ${request.params.name}`,\n          },\n        ],\n      };\n    }\n\n    try {\n      const result = await definition.invoke(\n        tool,\n        request.params.arguments ?? {},\n      );\n      const text =\n        typeof result === \"string\" ? result : JSON.stringify(result, null, 2);\n      return {\n        content: [\n          {\n            type: \"text\" as const,\n            text,\n          },\n        ],\n      };\n    } catch (error) {\n      const message = error instanceof Error ? error.message : String(error);\n      return {\n        isError: true,\n        content: [\n          {\n            type: \"text\" as const,\n            text: `rstool error in ${definition.name}: ${message}`,\n          },\n        ],\n      };\n    }\n  });\n\n  return server;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsconcept/rstool-mcp",
-  "version": "0.1.5",
+  "version": "0.3.0",
   "description": "Model Context Protocol (MCP) adapter that exposes the @rsconcept/rstool RSToolAgent contract over MCP stdio. Works with Cursor, Claude Desktop, and any MCP-capable host.",
   "license": "MIT",
   "author": "IRBorisov",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@rsconcept/rstool": "^0.8.0"
+    "@rsconcept/rstool": "^1.0.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.4",

package/src/server.test.ts

@@ -1,37 +1,37 @@
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it } from "vitest";
 
-import { buildRSToolMcpServer } from './server';
-import { TOOL_DEFINITIONS } from './tools';
+import { buildRSToolMcpServer } from "./server";
+import { TOOL_DEFINITIONS } from "./tools";
 
-describe('buildRSToolMcpServer', () => {
-  it('exposes the full rstool contract as MCP tools', () => {
+describe("buildRSToolMcpServer", () => {
+  it("exposes the rstool v2 contract as MCP tools", () => {
     const server = buildRSToolMcpServer();
     expect(server).toBeDefined();
-    expect(TOOL_DEFINITIONS.map(t => t.name)).toEqual([
-      'ping',
-      'list_methods',
-      'create_session',
-      'add_or_update_constituenta',
-      'analyze_expression',
-      'get_form_state',
-      'list_diagnostics',
-      'commit_step',
-      'export_session',
-      'import_session',
-      'set_constituenta_value',
-      'set_constituenta_values',
-      'clear_constituenta_values',
-      'get_model_state',
-      'evaluate_expression',
-      'evaluate_constituenta',
-      'recalculate_model'
+    expect(TOOL_DEFINITIONS.map((t) => t.name)).toEqual([
+      "ping",
+      "list_methods",
+      "ensure_session",
+      "create_session",
+      "set_current_session",
+      "apply_schema_patch",
+      "get_session_state",
+      "analyze_expression",
+      "list_diagnostics",
+      "commit_step",
+      "export_session",
+      "export_portal",
+      "import_data",
+      "set_model_values",
+      "get_model_state",
+      "evaluate",
+      "recalculate_model",
     ]);
   });
 
-  it('each tool has a permissive but well-formed input schema', () => {
+  it("each tool has a permissive but well-formed input schema", () => {
     for (const definition of TOOL_DEFINITIONS) {
-      expect(definition.inputSchema.type).toBe('object');
-      expect(typeof definition.description).toBe('string');
+      expect(definition.inputSchema.type).toBe("object");
+      expect(typeof definition.description).toBe("string");
       expect(definition.description.length).toBeGreaterThan(0);
     }
   });