@rsconcept/rstool 0.10.2 → 1.0.0

package/dist/wrapper/stdio-wrapper.js

@@ -1,25 +1,25 @@
 #!/usr/bin/env node
-import { t as RSToolAgent } from "../rstool-agent-BZi5jO1y.js";
+import { t as RSToolAgent } from "../rstool-agent-kijHA9ML.js";
 import readline from "node:readline";
 //#region src/wrapper/stdio-wrapper.ts
-const tool = new RSToolAgent();
+const persistenceDir = process.env.RSTOOL_PERSISTENCE_DIR;
+const tool = new RSToolAgent(persistenceDir ? { persistenceDir } : {});
 const METHODS = [
+	"ensureSession",
 	"createSession",
-	"addOrUpdateConstituenta",
-	"analyzeExpression",
-	"getFormState",
+	"getCurrentSession",
+	"setCurrentSession",
+	"applySchemaPatch",
+	"getSessionState",
 	"listDiagnostics",
+	"analyzeExpression",
 	"commitStep",
 	"exportSession",
-	"exportPortalSchema",
-	"exportPortalModel",
-	"importSession",
-	"setConstituentaValue",
-	"setConstituentaValues",
-	"clearConstituentaValues",
+	"exportPortal",
+	"importData",
+	"setModelValues",
 	"getModelState",
-	"evaluateExpression",
-	"evaluateConstituenta",
+	"evaluate",
 	"recalculateModel"
 ];
 function writeResponse(response) {
@@ -37,6 +37,14 @@ function requiredString(input, key) {
 	if (typeof value !== "string" || value.length === 0) throw new Error(`Missing or invalid "${key}"`);
 	return value;
 }
+function optionalSessionId(input) {
+	const value = input.sessionId;
+	return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function omitSessionId(input) {
+	const { sessionId: _sessionId, ...rest } = input;
+	return rest;
+}
 async function handleRequest(request) {
 	try {
 		const params = asObject(request.params);
@@ -44,97 +52,99 @@ async function handleRequest(request) {
 			case "ping": return {
 				id: request.id,
 				ok: true,
-				result: { pong: true }
+				result: {
+					pong: true,
+					contractVersion: tool.contractVersion
+				}
 			};
 			case "methods": return {
 				id: request.id,
 				ok: true,
 				result: METHODS
 			};
-			case "createSession": return {
+			case "ensureSession": return {
 				id: request.id,
 				ok: true,
-				result: tool.createSession(params.initial)
+				result: tool.ensureSession(params.initial)
 			};
-			case "addOrUpdateConstituenta": return {
-				id: request.id,
-				ok: true,
-				result: tool.addOrUpdateConstituenta(requiredString(params, "sessionId"), params.input)
-			};
-			case "analyzeExpression": return {
+			case "createSession": return {
 				id: request.id,
 				ok: true,
-				result: tool.analyzeExpression(requiredString(params, "sessionId"), params.input)
+				result: tool.createSession(params.initial)
 			};
-			case "getFormState": return {
+			case "getCurrentSession": return {
 				id: request.id,
 				ok: true,
-				result: tool.getFormState(requiredString(params, "sessionId"))
+				result: tool.getCurrentSession()
 			};
-			case "listDiagnostics": return {
+			case "setCurrentSession": return {
 				id: request.id,
 				ok: true,
-				result: tool.listDiagnostics(requiredString(params, "sessionId"), params.filters)
+				result: tool.setCurrentSession(requiredString(params, "sessionId"))
 			};
-			case "commitStep": return {
+			case "applySchemaPatch": return {
 				id: request.id,
 				ok: true,
-				result: tool.commitStep(requiredString(params, "sessionId"), params.message)
+				result: tool.applySchemaPatch(omitSessionId(params), optionalSessionId(params))
 			};
-			case "exportSession": return {
+			case "getSessionState": return {
 				id: request.id,
 				ok: true,
-				result: tool.exportSession(requiredString(params, "sessionId"))
+				result: tool.getSessionState(params.detail ?? "summary", optionalSessionId(params))
 			};
-			case "exportPortalSchema": return {
+			case "listDiagnostics": {
+				const constituentId = params.constituentId;
+				const filters = typeof constituentId === "number" ? { constituentId } : params.filters;
+				return {
+					id: request.id,
+					ok: true,
+					result: tool.listDiagnostics(filters, optionalSessionId(params))
+				};
+			}
+			case "analyzeExpression": return {
 				id: request.id,
 				ok: true,
-				result: tool.exportPortalSchema(requiredString(params, "sessionId"))
+				result: tool.analyzeExpression(omitSessionId(params), optionalSessionId(params))
 			};
-			case "exportPortalModel": return {
+			case "commitStep": return {
 				id: request.id,
 				ok: true,
-				result: tool.exportPortalModel(requiredString(params, "sessionId"))
+				result: tool.commitStep(params.message, optionalSessionId(params))
 			};
-			case "importSession": return {
+			case "exportSession": return {
 				id: request.id,
 				ok: true,
-				result: tool.importSession(requiredString(params, "payload"))
+				result: tool.exportSession(optionalSessionId(params))
 			};
-			case "setConstituentaValue": return {
+			case "exportPortal": return {
 				id: request.id,
 				ok: true,
-				result: await tool.setConstituentaValue(requiredString(params, "sessionId"), params.input)
+				result: tool.exportPortal(omitSessionId(params), optionalSessionId(params))
 			};
-			case "setConstituentaValues": return {
+			case "importData": return {
 				id: request.id,
 				ok: true,
-				result: await tool.setConstituentaValues(requiredString(params, "sessionId"), params.input)
+				result: tool.importData(params.payload, params.kind)
 			};
-			case "clearConstituentaValues": return {
+			case "setModelValues": return {
 				id: request.id,
 				ok: true,
-				result: await tool.clearConstituentaValues(requiredString(params, "sessionId"), params.input)
+				result: await tool.setModelValues(omitSessionId(params), optionalSessionId(params))
 			};
 			case "getModelState": return {
 				id: request.id,
 				ok: true,
-				result: tool.getModelState(requiredString(params, "sessionId"))
-			};
-			case "evaluateExpression": return {
-				id: request.id,
-				ok: true,
-				result: tool.evaluateExpression(requiredString(params, "sessionId"), params.input)
+				result: tool.getModelState(optionalSessionId(params))
 			};
-			case "evaluateConstituenta": return {
+			case "evaluate": return {
 				id: request.id,
 				ok: true,
-				result: tool.evaluateConstituenta(requiredString(params, "sessionId"), params.input)
+				result: tool.evaluate(omitSessionId(params), optionalSessionId(params))
 			};
 			case "recalculateModel": return {
 				id: request.id,
 				ok: true,
-				result: tool.recalculateModel(requiredString(params, "sessionId"))
+				result: tool.recalculateModel(optionalSessionId(params))
 			};
 			default: return {
 				id: request.id ?? null,

package/dist/wrapper/stdio-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"stdio-wrapper.js","names":[],"sources":["../../src/wrapper/stdio-wrapper.ts"],"sourcesContent":["#!/usr/bin/env node\nimport readline from 'node:readline';\n\nimport { RSToolAgent } from '../models/rstool-agent';\n\ninterface StdioRequest {\n  id: string | number;\n  method: string;\n  params?: unknown;\n}\n\ninterface StdioResponse {\n  id: string | number | null;\n  ok: boolean;\n  result?: unknown;\n  error?: {\n    code: string;\n    message: string;\n    details?: unknown;\n  };\n}\n\nconst tool = new RSToolAgent();\n\nconst METHODS = [\n  'createSession',\n  'addOrUpdateConstituenta',\n  'analyzeExpression',\n  'getFormState',\n  'listDiagnostics',\n  'commitStep',\n  'exportSession',\n  'exportPortalSchema',\n  'exportPortalModel',\n  'importSession',\n  'setConstituentaValue',\n  'setConstituentaValues',\n  'clearConstituentaValues',\n  'getModelState',\n  'evaluateExpression',\n  'evaluateConstituenta',\n  'recalculateModel'\n] as const;\n\nfunction writeResponse(response: StdioResponse): void {\n  if (!process.stdout.writable || process.stdout.destroyed || process.stdout.writableEnded) {\n    return;\n  }\n  try {\n    process.stdout.write(`${JSON.stringify(response)}\\n`);\n  } catch {\n    // The client might have already closed stdout (EPIPE). Safe to ignore.\n  }\n}\n\nfunction asObject(value: unknown): Record<string, unknown> {\n  if (!value || typeof value !== 'object' || Array.isArray(value)) {\n    return {};\n  }\n  return value as Record<string, unknown>;\n}\n\nfunction requiredString(input: Record<string, unknown>, key: string): string {\n  const value = input[key];\n  if (typeof value !== 'string' || value.length === 0) {\n    throw new Error(`Missing or invalid \"${key}\"`);\n  }\n  return value;\n}\n\nasync function handleRequest(request: StdioRequest): Promise<StdioResponse> {\n  try {\n    const params = asObject(request.params);\n    switch (request.method) {\n      case 'ping':\n        return { id: request.id, ok: true, result: { pong: true } };\n      case 'methods':\n        return { id: request.id, ok: true, result: METHODS };\n      case 'createSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.createSession(params.initial as never)\n        };\n      case 'addOrUpdateConstituenta':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.addOrUpdateConstituenta(requiredString(params, 'sessionId'), params.input as never)\n        };\n      case 'analyzeExpression':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.analyzeExpression(requiredString(params, 'sessionId'), params.input as never)\n        };\n      case 'getFormState':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.getFormState(requiredString(params, 'sessionId'))\n        };\n      case 'listDiagnostics':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.listDiagnostics(requiredString(params, 'sessionId'), params.filters as never)\n        };\n      case 'commitStep':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.commitStep(requiredString(params, 'sessionId'), params.message as string | undefined)\n        };\n      case 'exportSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.exportSession(requiredString(params, 'sessionId'))\n        };\n      case 'exportPortalSchema':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.exportPortalSchema(requiredString(params, 'sessionId'))\n        };\n      case 'exportPortalModel':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.exportPortalModel(requiredString(params, 'sessionId'))\n        };\n      case 'importSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.importSession(requiredString(params, 'payload'))\n        };\n      case 'setConstituentaValue':\n        return {\n          id: request.id,\n          ok: true,\n          result: await tool.setConstituentaValue(requiredString(params, 'sessionId'), params.input as never)\n        };\n      case 'setConstituentaValues':\n        return {\n          id: request.id,\n          ok: true,\n          result: await tool.setConstituentaValues(requiredString(params, 'sessionId'), params.input as never)\n        };\n      case 'clearConstituentaValues':\n        return {\n          id: request.id,\n          ok: true,\n          result: await tool.clearConstituentaValues(requiredString(params, 'sessionId'), params.input as never)\n        };\n      case 'getModelState':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.getModelState(requiredString(params, 'sessionId'))\n        };\n      case 'evaluateExpression':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.evaluateExpression(requiredString(params, 'sessionId'), params.input as never)\n        };\n      case 'evaluateConstituenta':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.evaluateConstituenta(requiredString(params, 'sessionId'), params.input as never)\n        };\n      case 'recalculateModel':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.recalculateModel(requiredString(params, 'sessionId'))\n        };\n      default:\n        return {\n          id: request.id ?? null,\n          ok: false,\n          error: {\n            code: 'METHOD_NOT_FOUND',\n            message: `Unknown method: ${request.method}`\n          }\n        };\n    }\n  } catch (error) {\n    return {\n      id: request.id ?? null,\n      ok: false,\n      error: {\n        code: 'INTERNAL_ERROR',\n        message: error instanceof Error ? error.message : 'Unknown error',\n        details: error\n      }\n    };\n  }\n}\n\nconst input = readline.createInterface({\n  input: process.stdin,\n  crlfDelay: Infinity\n});\n\nwriteResponse({\n  id: null,\n  ok: true,\n  result: {\n    ready: true,\n    wrapper: 'rstool-stdio',\n    contractVersion: tool.contractVersion\n  }\n});\n\ninput.on('line', line => {\n  if (!line.trim()) {\n    return;\n  }\n  try {\n    const request = JSON.parse(line) as StdioRequest;\n    if (!('id' in request) || !('method' in request)) {\n      throw new Error('Request must include \"id\" and \"method\"');\n    }\n    void handleRequest(request).then(writeResponse);\n  } catch (error) {\n    writeResponse({\n      id: null,\n      ok: false,\n      error: {\n        code: 'BAD_REQUEST',\n        message: error instanceof Error ? error.message : 'Invalid JSON'\n      }\n    });\n  }\n});\n"],"mappings":"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"}
+{"version":3,"file":"stdio-wrapper.js","names":[],"sources":["../../src/wrapper/stdio-wrapper.ts"],"sourcesContent":["#!/usr/bin/env node\nimport readline from 'node:readline';\n\nimport { RSToolAgent } from '../models/rstool-agent';\n\ninterface StdioRequest {\n  id: string | number;\n  method: string;\n  params?: unknown;\n}\n\ninterface StdioResponse {\n  id: string | number | null;\n  ok: boolean;\n  result?: unknown;\n  error?: {\n    code: string;\n    message: string;\n    details?: unknown;\n  };\n}\n\nconst persistenceDir = process.env.RSTOOL_PERSISTENCE_DIR;\nconst tool = new RSToolAgent(persistenceDir ? { persistenceDir } : {});\n\nconst METHODS = [\n  'ensureSession',\n  'createSession',\n  'getCurrentSession',\n  'setCurrentSession',\n  'applySchemaPatch',\n  'getSessionState',\n  'listDiagnostics',\n  'analyzeExpression',\n  'commitStep',\n  'exportSession',\n  'exportPortal',\n  'importData',\n  'setModelValues',\n  'getModelState',\n  'evaluate',\n  'recalculateModel'\n] as const;\n\nfunction writeResponse(response: StdioResponse): void {\n  if (!process.stdout.writable || process.stdout.destroyed || process.stdout.writableEnded) {\n    return;\n  }\n  try {\n    process.stdout.write(`${JSON.stringify(response)}\\n`);\n  } catch {\n    // The client might have already closed stdout (EPIPE). Safe to ignore.\n  }\n}\n\nfunction asObject(value: unknown): Record<string, unknown> {\n  if (!value || typeof value !== 'object' || Array.isArray(value)) {\n    return {};\n  }\n  return value as Record<string, unknown>;\n}\n\nfunction requiredString(input: Record<string, unknown>, key: string): string {\n  const value = input[key];\n  if (typeof value !== 'string' || value.length === 0) {\n    throw new Error(`Missing or invalid \"${key}\"`);\n  }\n  return value;\n}\n\nfunction optionalSessionId(input: Record<string, unknown>): string | undefined {\n  const value = input.sessionId;\n  return typeof value === 'string' && value.length > 0 ? value : undefined;\n}\n\nfunction omitSessionId(input: Record<string, unknown>): Record<string, unknown> {\n  const { sessionId: _sessionId, ...rest } = input;\n  return rest;\n}\n\nasync function handleRequest(request: StdioRequest): Promise<StdioResponse> {\n  try {\n    const params = asObject(request.params);\n    switch (request.method) {\n      case 'ping':\n        return { id: request.id, ok: true, result: { pong: true, contractVersion: tool.contractVersion } };\n      case 'methods':\n        return { id: request.id, ok: true, result: METHODS };\n      case 'ensureSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.ensureSession(params.initial as never)\n        };\n      case 'createSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.createSession(params.initial as never)\n        };\n      case 'getCurrentSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.getCurrentSession()\n        };\n      case 'setCurrentSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.setCurrentSession(requiredString(params, 'sessionId'))\n        };\n      case 'applySchemaPatch':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.applySchemaPatch(omitSessionId(params) as never, optionalSessionId(params))\n        };\n      case 'getSessionState':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.getSessionState(\n            (params.detail as 'summary' | 'full' | undefined) ?? 'summary',\n            optionalSessionId(params)\n          )\n        };\n      case 'listDiagnostics': {\n        const constituentId = params.constituentId;\n        const filters = typeof constituentId === 'number' ? { constituentId } : (params.filters as never);\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.listDiagnostics(filters, optionalSessionId(params))\n        };\n      }\n      case 'analyzeExpression':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.analyzeExpression(omitSessionId(params) as never, optionalSessionId(params))\n        };\n      case 'commitStep':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.commitStep(params.message as string | undefined, optionalSessionId(params))\n        };\n      case 'exportSession':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.exportSession(optionalSessionId(params))\n        };\n      case 'exportPortal':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.exportPortal(omitSessionId(params) as never, optionalSessionId(params))\n        };\n      case 'importData':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.importData(params.payload as string | object, params.kind as never)\n        };\n      case 'setModelValues':\n        return {\n          id: request.id,\n          ok: true,\n          result: await tool.setModelValues(omitSessionId(params) as never, optionalSessionId(params))\n        };\n      case 'getModelState':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.getModelState(optionalSessionId(params))\n        };\n      case 'evaluate':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.evaluate(omitSessionId(params) as never, optionalSessionId(params))\n        };\n      case 'recalculateModel':\n        return {\n          id: request.id,\n          ok: true,\n          result: tool.recalculateModel(optionalSessionId(params))\n        };\n      default:\n        return {\n          id: request.id ?? null,\n          ok: false,\n          error: {\n            code: 'METHOD_NOT_FOUND',\n            message: `Unknown method: ${request.method}`\n          }\n        };\n    }\n  } catch (error) {\n    return {\n      id: request.id ?? null,\n      ok: false,\n      error: {\n        code: 'INTERNAL_ERROR',\n        message: error instanceof Error ? error.message : 'Unknown error',\n        details: error\n      }\n    };\n  }\n}\n\nconst input = readline.createInterface({\n  input: process.stdin,\n  crlfDelay: Infinity\n});\n\nwriteResponse({\n  id: null,\n  ok: true,\n  result: {\n    ready: true,\n    wrapper: 'rstool-stdio',\n    contractVersion: tool.contractVersion\n  }\n});\n\ninput.on('line', line => {\n  if (!line.trim()) {\n    return;\n  }\n  try {\n    const request = JSON.parse(line) as StdioRequest;\n    if (!('id' in request) || !('method' in request)) {\n      throw new Error('Request must include \"id\" and \"method\"');\n    }\n    void handleRequest(request).then(writeResponse);\n  } catch (error) {\n    writeResponse({\n      id: null,\n      ok: false,\n      error: {\n        code: 'BAD_REQUEST',\n        message: error instanceof Error ? error.message : 'Invalid JSON'\n      }\n    });\n  }\n});\n"],"mappings":"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"}

package/docs/CONSTITUENTA.md

@@ -1,6 +1,6 @@
 # Конституенты
 
-Читай перед `addOrUpdateConstituenta`.
+Читай перед `applySchemaPatch`.
 
 ## Поля
 
@@ -28,7 +28,7 @@
 - `axiom` / `A#` — аксиома; нужна типизация `Logic`.
 - `statement` / `T#` — высказывание; нужна типизация `Logic`.
 
-В модели `basic`, `constant`, `structure` можно интерпретировать через `setConstituentaValue`. `term`, `axiom`, `statement` вычисляются и напрямую не задаются.
+В модели `basic`, `constant`, `structure` можно интерпретировать через `setModelValues`. `term`, `function`, `predicate`, `axiom`, `statement` вычисляются и напрямую не задаются.
 
 ## Различие родовой структуры и терма
 

package/docs/DIAGNOSTICS.md

@@ -1,6 +1,6 @@
 # Диагностика
 
-Читай, когда `analyzeExpression`, `addOrUpdateConstituenta`, `listDiagnostics` или `evaluate*`
+Читай, когда `analyzeExpression`, `applySchemaPatch`, `listDiagnostics` или `evaluate`
 вернули диагностику. Источник истины по кодам — `@rsconcept/domain/src/rslang/error.ts`.
 
 ## Где лежит диагностика
@@ -8,15 +8,16 @@
 У rstool два представления одной и той же ошибки.
 
 - **Плоское** `RSToolErrorDescription` — в `AnalysisResult.diagnostics` (из `analyzeExpression`
-  и `addOrUpdateConstituenta(...).analysis`) и в `EvaluationResult.diagnostics`:
+  и анализа конституент после `applySchemaPatch`) и в `EvaluationResult.diagnostics`:
   - `code` — числовой `RSErrorCode`.
   - `from`, `to` — полуинтервал `[from, to)` в `definitionFormal` (или в выражении вычисления).
   - `params?` — позиционный массив строк-аргументов сообщения (см. таблицы ниже).
 - **Обёрнутое** `DiagnosticRecord` — только из `listDiagnostics`:
   - `sessionId`, `expression` — исходное выражение.
   - `error` — то же `RSToolErrorDescription` (`code`/`from`/`to`/`params`) **вложено**, читай `record.error.code`.
-  - `constituentId?` — id конституенты. У диагностик от `addOrUpdateConstituenta` он есть;
-    у черновиков `analyzeExpression` он `undefined`. Фильтруй `listDiagnostics(sessionId, { constituentId })`.
+  - `constituentId?` — id конституенты. У диагностик сохранённых конституент он есть;
+    у черновиков `analyzeExpression` он `undefined`. Фильтруй `listDiagnostics({ constituentId })`
+    или `listDiagnostics({ constituentId }, sessionId)`.
 
 ## Класс и префикс кода
 
@@ -36,19 +37,20 @@
 
 ## Parser
 
-| Код      | Имя                      | `params`                  | Исправление                                                                      |
-| :------- | :----------------------- | :------------------------ | :------------------------------------------------------------------------------- |
-| `0x8400` | `unknownSyntax`          | —                         | Неопределённая синтаксическая ошибка: проверь операторы, скобки, идентификаторы. |
-| `0x8409` | `bracketMismatch`        | `[expected, actual]`      | Закрой ожидаемой скобкой `expected` вместо `actual`.                             |
-| `0x840A` | `doubleParenthesis`      | —                         | Убери лишнюю внешнюю пару `(( … ))`.                                             |
-| `0x840B` | `missingOpenBracket`     | `[bracket]`               | Непарная закрывающая `bracket`: убери её или добавь открывающую.                 |
-| `0x840C` | `missingCloseBracket`    | `[bracket]`               | Непарная открывающая `bracket`: убери её или добавь закрывающую.                 |
-| `0x8415` | `expectedLocal`          | —                         | Ожидалось имя локальной переменной.                                              |
-| `0x8416` | `expectedType`           | `[expectedClass, actual]` | Несоответствие класса выражения ожидаемому.                                      |
-| `0x8417` | `invalidFilterSyntax`    | —                         | Синтаксис `Fi`: `Fi1[D1](S1)`, `Fi1,2[D1,D2](S1)` или `Fi1,2[D3](S1)`.           |
-| `0x8418` | `expectedFunctionBody`   | —                         | Нужно тело функции после `[параметры]`.                                          |
-| `0x8419` | `expectedExpressionBody` | —                         | Нужно теоретико-множественное тело функции (ТФ).                                 |
-| `0x841A` | `expectedLogicBody`      | —                         | Нужно логическое тело функции.                                                   |
+| Код      | Имя                      | `params`                  | Исправление                                                                           |
+| :------- | :----------------------- | :------------------------ | :------------------------------------------------------------------------------------ |
+| `0x8400` | `unknownSyntax`          | —                         | Неопределённая синтаксическая ошибка: проверь операторы, скобки, идентификаторы.      |
+| `0x8401` | `forbiddenCharacter`     | `[character]`             | Символ не входит в язык родов структур (напр. `^` для степени). Удали или замени его. |
+| `0x8409` | `bracketMismatch`        | `[expected, actual]`      | Закрой ожидаемой скобкой `expected` вместо `actual`.                                  |
+| `0x840A` | `doubleParenthesis`      | —                         | Убери лишнюю внешнюю пару `(( … ))`.                                                  |
+| `0x840B` | `missingOpenBracket`     | `[bracket]`               | Непарная закрывающая `bracket`: убери её или добавь открывающую.                      |
+| `0x840C` | `missingCloseBracket`    | `[bracket]`               | Непарная открывающая `bracket`: убери её или добавь закрывающую.                      |
+| `0x8415` | `expectedLocal`          | —                         | Ожидалось имя локальной переменной.                                                   |
+| `0x8416` | `expectedType`           | `[expectedClass, actual]` | Несоответствие класса выражения ожидаемому.                                           |
+| `0x8417` | `invalidFilterSyntax`    | —                         | Синтаксис `Fi`: `Fi1[D1](S1)`, `Fi1,2[D1,D2](S1)` или `Fi1,2[D3](S1)`.                |
+| `0x8418` | `expectedFunctionBody`   | —                         | Нужно тело функции после `[параметры]`.                                               |
+| `0x8419` | `expectedExpressionBody` | —                         | Нужно теоретико-множественное тело функции (ТФ).                                      |
+| `0x841A` | `expectedLogicBody`      | —                         | Нужно логическое тело функции.                                                        |
 
 ## Предупреждения
 
@@ -127,7 +129,7 @@
 | `0x8100` | `calcUnknownError`        | —                  | Непредвиденная ошибка вычисления.                                      |
 | `0x8101` | `setOverflow`             | `[limit]`          | Превышен предел числа элементов `limit`: упрости выражение или данные. |
 | `0x8102` | `booleanBaseLimit`        | `[limit]`          | Превышен предел базы степенного множества `limit`.                     |
-| `0x8103` | `calcGlobalMissing`       | `[name]`           | Нет значения для `name`: задай `setConstituentaValue(s)`.              |
+| `0x8103` | `calcGlobalMissing`       | `[name]`           | Нет значения для `name`: задай через `setModelValues`.                 |
 | `0x8104` | `iterationsLimit`         | `[limit]`          | Превышен предел итераций `limit`.                                      |
 | `0x8105` | `calcInvalidDebool`       | —                  | `debool` получил не синглетон.                                         |
 | `0x8106` | `iterateInfinity`         | —                  | Итерация по бесконечному множеству.                                    |

package/docs/MODEL-TESTING.md

@@ -15,13 +15,13 @@
 
 `basic`, `constant`, `structure` можно интерпретировать напрямую. `term`, `function`, `predicate`, `axiom`, `statement` должны вычисляться из формулы, поэтому их напрямую не задавай.
 
-Пример формы данных:
+Пример формы данных (`setModelValues` — асинхронный, нужен `await`):
 
 ```ts
 import { TUPLE_ID } from '@rsconcept/domain';
 
-tool.setConstituentaValues(sessionId, {
-  items: [
+await tool.setModelValues({
+  set: [
     { target: 1, value: { 0: 'ann', 1: 'bob', 2: 'cat' } },
     {
       target: 2,

package/docs/PORTAL-API.md

@@ -224,19 +224,24 @@ curl.exe -s "https://api.portal.acconcept.ru/api/rsforms/856/details"
 ## Как перенести КС в rstool
 
 1. Получи `GET /api/rsforms/:id/details`.
-2. Создай `createSession({ title, alias, comment: description })`.
-3. Иди по `items[]` в порядке ответа API.
-4. Для каждого элемента вызови `addOrUpdateConstituenta(sessionId, { draft })`.
-5. Проверь `listDiagnostics(sessionId)`.
-6. Работай локально: анализ, правки, вычисления, маленькая КМ.
-7. Для сохранения рабочей сессии используй `exportSession`.
-8. Для загрузки схемы обратно в Portal используй `exportPortalSchema`.
+2. Вызови `importData(JSON.stringify(payload))` — auto определит `portal-details`; для Load from JSON — `importData(payload, 'portal-schema')`.
+3. Проверь `listDiagnostics()` (после `importData` сессия уже текущая).
+4. Работай локально: анализ, правки, вычисления, маленькая КМ.
+5. Для сохранения рабочей сессии используй `exportSession`.
+6. Для загрузки схемы обратно в Portal используй `exportPortal({ kind: 'schema' })`.
 
-Portal JSON из `/details` **не является** форматом `exportSession` и не передаётся
-в `importSession` напрямую. Его нужно перенести через `addOrUpdateConstituenta`
-или через отдельный адаптер, если он появится в контракте.
+Альтернатива: `createSession` + `applySchemaPatch` с массивом `items`.
 
-Минимальный маппинг:
+Portal JSON из `/details` **не является** форматом `exportSession`; используй `importData`, не передавай его как session export.
+
+Минимальный импорт:
+
+```ts
+const session = tool.importData(JSON.stringify(portal));
+tool.listDiagnostics();
+```
+
+Пакетный маппинг через `applySchemaPatch`:
 
 ```ts
 const session = tool.createSession({
@@ -245,9 +250,9 @@ const session = tool.createSession({
   comment: portal.description
 });
 
-for (const item of portal.items) {
-  tool.addOrUpdateConstituenta(session.sessionId, {
-    draft: {
+tool.applySchemaPatch(
+  {
+    items: portal.items.map(item => ({
       id: item.id,
       alias: item.alias,
       cstType: item.cst_type,
@@ -255,9 +260,10 @@ for (const item of portal.items) {
       term: item.term_raw ?? '',
       definitionText: item.definition_raw ?? '',
       convention: item.convention ?? ''
-    }
-  });
-}
+    }))
+  },
+  session.sessionId
+);
 ```
 
 ## Практика для агентов
@@ -294,5 +300,5 @@ path.write_text(json.dumps(payload, ensure_ascii=False, indent=2), encoding='utf
 - Не парси HTML SPA.
 - Не запрашивай UI напрямую, используй преобразованные API запросы.
 - Не предлагай авторизацию через session cookie или `sessionid` в curl.
-- Не передавай `/details` JSON в `importSession`.
+- Не передавай `/details` JSON в `importData` с `kind: 'session'`.
 - Не запрашивай `/details`, если нужны только метаданные.

package/examples/README.md

@@ -30,7 +30,7 @@ npx tsx node_modules/@rsconcept/rstool/examples/agent-client.ts
 | `build-rsform.ts`  | Сборка RSForm → `rsform-session.json`           |
 | `build-rsmodel.ts` | Демо-модель и проверки → `rsmodel-session.json` |
 
-Готовые `*-session.json` — снимки `exportSession` для `importSession` и тестов. Пересобрать: соответствующий `build-*.ts` перезапишет файл рядом с собой.
+Готовые `*-session.json` — снимки `exportSession` для `importData` и тестов. Пересобрать: соответствующий `build-*.ts` перезапишет файл рядом с собой.
 
 ## Темы и npm-скрипты
 

package/examples/agent-client.ts

@@ -1,4 +1,4 @@
-import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput, type AnalyzeExpressionInput } from '../src';
+import { CstType, RSToolWrapperClient, type AnalyzeExpressionInput } from '../src';
 
 interface CreateSessionResult {
   sessionId: string;
@@ -13,41 +13,16 @@ async function runExample() {
     const session = await client.call<CreateSessionResult>('createSession');
     console.log('Session created:', session);
 
-    const baseInput: AddOrUpdateConstituentaInput = {
-      draft: {
-        id: 1,
-        alias: 'X1',
-        cstType: CstType.BASE,
-        definitionFormal: ''
-      }
-    };
-    await client.call('addOrUpdateConstituenta', {
-      sessionId: session.sessionId,
-      input: baseInput
-    });
-
-    const upsertInput: AddOrUpdateConstituentaInput = {
-      draft: {
-        id: 2,
-        alias: 'D1',
-        cstType: CstType.TERM,
-        definitionFormal: '1+2'
-      }
-    };
-    const upsert = await client.call('addOrUpdateConstituenta', {
-      sessionId: session.sessionId,
-      input: upsertInput
+    await client.call('applySchemaPatch', {
+      items: [{ alias: 'X1' }, { alias: 'D1', definitionFormal: '1+2' }]
     });
-    console.log('Upsert result:', upsert);
 
-    await client.call('setConstituentaValue', {
-      sessionId: session.sessionId,
-      input: { target: 1, value: { 0: 'zero', 1: 'one' } }
+    await client.call('setModelValues', {
+      set: [{ target: 1, value: { 0: 'zero', 1: 'one' } }]
     });
 
-    const evalResult = await client.call('evaluateConstituenta', {
-      sessionId: session.sessionId,
-      input: { constituentId: 2 }
+    const evalResult = await client.call('evaluate', {
+      constituentId: 2
     });
     console.log('Evaluation result:', evalResult);
 
@@ -55,16 +30,11 @@ async function runExample() {
       expression: '(',
       cstType: CstType.TERM
     };
-    const analysis = await client.call('analyzeExpression', {
-      sessionId: session.sessionId,
-      input: analyzeInput
-    });
-    console.log('Analysis result:', analysis);
+    const analysis = await client.call<{ diagnostics: unknown[] }>('analyzeExpression', analyzeInput);
+    console.log('Scratch analysis diagnostics:', analysis.diagnostics.length);
 
-    const diagnostics = await client.call('listDiagnostics', {
-      sessionId: session.sessionId
-    });
-    console.log('Diagnostics count:', Array.isArray(diagnostics) ? diagnostics.length : diagnostics);
+    const sessionDiagnostics = await client.call<unknown[]>('listDiagnostics', {});
+    console.log('Session diagnostics count:', sessionDiagnostics.length);
   } finally {
     await client.close();
   }

package/examples/build-chocolate-nim-rsform.ts

@@ -1,7 +1,9 @@
 import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
-import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../src';
+import { CstType, RSToolWrapperClient, type AgentConstituentaPatch } from '../src';
+
+type DraftBatch = { draft: AgentConstituentaPatch };
 
 import { DEFAULT_RSFORM_SESSION_PATH } from './chocolate-nim/constants';
 
@@ -18,7 +20,7 @@ async function run() {
     await client.waitUntilReady();
     const session = await client.call<{ sessionId: string; contractVersion: string }>('createSession');
 
-    const drafts: AddOrUpdateConstituentaInput[] = [
+    const drafts: DraftBatch[] = [
       {
         draft: {
           id: 1,
@@ -271,22 +273,25 @@ async function run() {
       }
     ];
 
-    for (const input of drafts) {
-      const result = await client.call<{
-        state: { alias: string; analysis: { success: boolean } };
-        diagnostics: unknown[];
-      }>('addOrUpdateConstituenta', {
-        sessionId: session.sessionId,
-        input
-      });
-      const ok = result.state.analysis.success;
-      const diagCount = result.diagnostics?.length ?? 0;
-      console.log(`${input.draft.alias}: ${ok ? 'OK' : 'FAIL'} (${diagCount} diagnostics)`);
-      if (!ok) {
-        const diags = await client.call('listDiagnostics', { sessionId: session.sessionId });
-        console.log(JSON.stringify(diags, null, 2));
-        throw new Error(`${input.draft.alias}: analysis failed (${diagCount} diagnostics)`);
-      }
+    const patch = await client.call<{
+      success: boolean;
+      diagnostics: unknown[];
+      failed: Array<{ draft: { alias: string }; diagnostics: unknown[] }>;
+      summary: { items: Array<{ alias: string; analysisSuccess: boolean }> };
+    }>('applySchemaPatch', {
+      sessionId: session.sessionId,
+      mode: 'atomic',
+      items: drafts.map(entry => entry.draft)
+    });
+
+    for (const item of patch.summary.items) {
+      console.log(`${item.alias}: ${item.analysisSuccess ? 'OK' : 'FAIL'}`);
+    }
+    if (!patch.success) {
+      const diags = await client.call('listDiagnostics', { sessionId: session.sessionId });
+      console.log(JSON.stringify(diags, null, 2));
+      const failedAlias = patch.failed[0]?.draft.alias ?? 'unknown';
+      throw new Error(`${failedAlias}: analysis failed`);
     }
 
     await client.call('commitStep', {

package/examples/chocolate-nim/build-rsform.ts

@@ -1,7 +1,9 @@
 import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
-import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../../src';
+import { CstType, RSToolWrapperClient, type AgentConstituentaPatch } from '../../src';
+
+type DraftBatch = { draft: AgentConstituentaPatch };
 
 import { DEFAULT_RSFORM_SESSION_PATH } from './constants';
 
@@ -18,7 +20,7 @@ async function run() {
     await client.waitUntilReady();
     const session = await client.call<{ sessionId: string; contractVersion: string }>('createSession');
 
-    const drafts: AddOrUpdateConstituentaInput[] = [
+    const drafts: DraftBatch[] = [
       {
         draft: {
           id: 1,
@@ -271,22 +273,25 @@ async function run() {
       }
     ];
 
-    for (const input of drafts) {
-      const result = await client.call<{
-        state: { alias: string; analysis: { success: boolean } };
-        diagnostics: unknown[];
-      }>('addOrUpdateConstituenta', {
-        sessionId: session.sessionId,
-        input
-      });
-      const ok = result.state.analysis.success;
-      const diagCount = result.diagnostics?.length ?? 0;
-      console.log(`${input.draft.alias}: ${ok ? 'OK' : 'FAIL'} (${diagCount} diagnostics)`);
-      if (!ok) {
-        const diags = await client.call('listDiagnostics', { sessionId: session.sessionId });
-        console.log(JSON.stringify(diags, null, 2));
-        throw new Error(`${input.draft.alias}: analysis failed (${diagCount} diagnostics)`);
-      }
+    const patch = await client.call<{
+      success: boolean;
+      diagnostics: unknown[];
+      failed: Array<{ draft: { alias: string }; diagnostics: unknown[] }>;
+      summary: { items: Array<{ alias: string; analysisSuccess: boolean }> };
+    }>('applySchemaPatch', {
+      sessionId: session.sessionId,
+      mode: 'atomic',
+      items: drafts.map(entry => entry.draft)
+    });
+
+    for (const item of patch.summary.items) {
+      console.log(`${item.alias}: ${item.analysisSuccess ? 'OK' : 'FAIL'}`);
+    }
+    if (!patch.success) {
+      const diags = await client.call('listDiagnostics', { sessionId: session.sessionId });
+      console.log(JSON.stringify(diags, null, 2));
+      const failedAlias = patch.failed[0]?.draft.alias ?? 'unknown';
+      throw new Error(`${failedAlias}: analysis failed`);
     }
 
     await client.call('commitStep', {