@rsconcept/rstool 0.7.2 → 0.8.1

package/examples/{build-sample-rsform.ts → sample/build-rsform.ts}

@@ -1,7 +1,7 @@
 import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
-import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../src';
+import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../../src';
 
 async function run() {
   const client = new RSToolWrapperClient({
@@ -76,7 +76,7 @@ async function run() {
     const exported = await client.call<string>('exportSession', {
       sessionId: session.sessionId
     });
-    const outputPath = resolve(process.cwd(), 'examples', 'sample-rsform-session.json');
+    const outputPath = resolve(process.cwd(), 'examples', 'sample', 'rsform-session.json');
     await writeFile(outputPath, exported, 'utf8');
     console.log(`Sample RSForm exported: ${outputPath}`);
   } finally {

package/examples/{build-sample-rsmodel.ts → sample/build-rsmodel.ts}

@@ -1,10 +1,9 @@
 import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
-import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../src';
+import { TUPLE_ID } from '@rsconcept/domain';
 
-/** Tuple marker in structured values. */
-const TUPLE_ID = -111;
+import { CstType, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../../src';
 
 async function run() {
   const client = new RSToolWrapperClient({
@@ -92,7 +91,7 @@ async function run() {
     const exported = await client.call<string>('exportSession', {
       sessionId: session.sessionId
     });
-    const outputPath = resolve(process.cwd(), 'examples', 'sample-rsmodel-session.json');
+    const outputPath = resolve(process.cwd(), 'examples', 'sample', 'rsmodel-session.json');
     await writeFile(outputPath, exported, 'utf8');
     console.log(`Sample RSModel exported: ${outputPath}`);
   } finally {

package/examples/template-apply/build-rsform.ts

@@ -0,0 +1,236 @@
+import { writeFile } from 'node:fs/promises';
+import { resolve } from 'node:path';
+
+import { TUPLE_ID } from '@rsconcept/domain';
+
+import { CstType, EvalStatus, RSToolWrapperClient, type AddOrUpdateConstituentaInput } from '../../src';
+
+import {
+  D1_ID,
+  D2_ID,
+  DEFAULT_RSFORM_SESSION_PATH,
+  F_IMAGE_ID,
+  F_SOURCES_ID,
+  P_FUNCTION_ID,
+  S1_ID,
+  S2_ID,
+  T1_ID,
+  X1_ID,
+  X2_ID
+} from './constants';
+
+/**
+ * Учебная схема: применение шаблонов БВ (rsforms/42) к предметной области.
+ * Подстановка R1→X1 (сотрудники), R2→X2 (проекты), σ→S1/S2.
+ */
+const X1_BINDING = { 0: 'Алиса', 1: 'Боб', 2: 'Кэрол' } as const;
+const X2_BINDING = { 0: 'ПроектA', 1: 'ПроектB' } as const;
+
+/** S1: назначение сотрудников на проекты. */
+const S1_VALUE = [
+  [TUPLE_ID, 0, 0],
+  [TUPLE_ID, 0, 1],
+  [TUPLE_ID, 1, 0]
+] as const;
+
+/** S2: подчинённость (цепочка 0→1→2). */
+const S2_VALUE = [
+  [TUPLE_ID, 0, 1],
+  [TUPLE_ID, 1, 2]
+] as const;
+
+async function buildSchema(client: RSToolWrapperClient): Promise<string> {
+  const session = await client.call<{ sessionId: string }>('createSession');
+
+  const drafts: AddOrUpdateConstituentaInput[] = [
+    {
+      draft: {
+        id: T1_ID,
+        alias: 'T1',
+        cstType: CstType.STATEMENT,
+        definitionFormal: '1=1',
+        term: 'Применение шаблонов банка выражений',
+        convention:
+          'Подстановка радикалов БВ: R1→X1, R2→X2. Отношение σ→S1 или S2. Примеры: БВ F6→F_IMAGE, БВ F20→F_SOURCES, БВ P5→P_FUNCTION'
+      }
+    },
+    {
+      draft: {
+        id: X1_ID,
+        alias: 'X1',
+        cstType: CstType.BASE,
+        definitionFormal: '',
+        term: 'сотрудники'
+      }
+    },
+    {
+      draft: {
+        id: X2_ID,
+        alias: 'X2',
+        cstType: CstType.BASE,
+        definitionFormal: '',
+        term: 'проекты'
+      }
+    },
+    {
+      draft: {
+        id: S1_ID,
+        alias: 'S1',
+        cstType: CstType.STRUCTURED,
+        definitionFormal: 'ℬ(X1×X2)',
+        term: 'назначение на проект',
+        convention: 'σ в шаблонах БВ для бинарных отношений двух множеств'
+      }
+    },
+    {
+      draft: {
+        id: S2_ID,
+        alias: 'S2',
+        cstType: CstType.STRUCTURED,
+        definitionFormal: 'ℬ(X1×X1)',
+        term: 'подчинённость',
+        convention: 'σ в шаблонах БВ для бинарных отношений на одном множестве'
+      }
+    },
+    {
+      draft: {
+        id: F_IMAGE_ID,
+        alias: 'F_IMAGE',
+        cstType: CstType.FUNCTION,
+        definitionFormal: '[α∈X1, σ∈ℬ(X1×X2)] Pr2(Fi1[{α}](σ))',
+        term: 'проекты сотрудника',
+        convention: 'БВ F6: R1→X1, R2→X2'
+      }
+    },
+    {
+      draft: {
+        id: F_SOURCES_ID,
+        alias: 'F_SOURCES',
+        cstType: CstType.FUNCTION,
+        definitionFormal: '[σ∈ℬ(X1×X1)] Pr1(σ) \\ Pr2(σ)',
+        term: 'вершины без предшественников',
+        convention: 'БВ F20 (истоки графа подчинённости)'
+      }
+    },
+    {
+      draft: {
+        id: P_FUNCTION_ID,
+        alias: 'P_FUNCTION',
+        cstType: CstType.PREDICATE,
+        definitionFormal: '[α∈ℬ(X1), σ∈ℬ(X1×X2)] card(Pr1(σ)) = card(σ) & Pr1(σ) = α',
+        term: 'тотальная функция X1→X2',
+        convention: 'БВ P5'
+      }
+    },
+    {
+      draft: {
+        id: D1_ID,
+        alias: 'D1',
+        cstType: CstType.TERM,
+        definitionFormal: 'Pr2(Fi1[X1](S1))',
+        term: 'все назначенные проекты',
+        convention: 'БВ F9: образ множества X1 по S1'
+      }
+    },
+    {
+      draft: {
+        id: D2_ID,
+        alias: 'D2',
+        cstType: CstType.TERM,
+        definitionFormal: 'Pr1(S2) \\ Pr2(S2)',
+        term: 'глава иерархии',
+        convention: 'БВ F20: применение к S2 (развёрнуто в D2, т.к. вызов F# в терме не анализируется)'
+      }
+    }
+  ];
+
+  for (const input of drafts) {
+    const result = await client.call<{
+      state: { analysis: { success: boolean } };
+      diagnostics: unknown[];
+    }>('addOrUpdateConstituenta', {
+      sessionId: session.sessionId,
+      input
+    });
+    if (!result.state.analysis.success) {
+      throw new Error(`${input.draft.alias}: analysis failed`);
+    }
+    console.log(`${input.draft.alias}: OK`);
+  }
+
+  await client.call('commitStep', {
+    sessionId: session.sessionId,
+    message: 'Применение шаблонов БВ: сотрудники, проекты, F6/F9/F20/P5'
+  });
+
+  return session.sessionId;
+}
+
+async function verifyModel(client: RSToolWrapperClient, schemaJson: string) {
+  const imported = await client.call<{ sessionId: string }>('importSession', {
+    payload: schemaJson
+  });
+
+  await client.call('setConstituentaValues', {
+    sessionId: imported.sessionId,
+    input: {
+      items: [
+        { target: X1_ID, value: X1_BINDING },
+        { target: X2_ID, value: X2_BINDING },
+        { target: S1_ID, value: S1_VALUE },
+        { target: S2_ID, value: S2_VALUE }
+      ]
+    }
+  });
+
+  const recalculated = await client.call<{
+    items: { id: number; alias: string; value: unknown; status: number }[];
+  }>('recalculateModel', {
+    sessionId: imported.sessionId
+  });
+
+  const d1 = recalculated.items.find(item => item.id === D1_ID);
+  const d2 = recalculated.items.find(item => item.id === D2_ID);
+
+  console.log('D1 (все проекты):', d1);
+  console.log('D2 (истоки S2):', d2);
+
+  if (!Array.isArray(d1?.value) || !d1.value.includes(0) || !d1.value.includes(1)) {
+    throw new Error(`Expected D1 to include projects 0 and 1; got ${JSON.stringify(d1)}`);
+  }
+
+  if (!Array.isArray(d2?.value) || d2.value.length !== 1 || d2.value[0] !== 0) {
+    throw new Error(`Expected D2 = {0}; got ${JSON.stringify(d2)}`);
+  }
+
+  if (d1?.status !== EvalStatus.HAS_DATA) {
+    throw new Error(`Expected D1 status HAS_DATA; got ${d1?.status}`);
+  }
+
+  console.log('Model verification: OK');
+}
+
+async function run() {
+  const client = new RSToolWrapperClient({
+    cwd: resolve(process.cwd())
+  });
+
+  try {
+    await client.waitUntilReady();
+    const sessionId = await buildSchema(client);
+
+    const exported = await client.call<string>('exportSession', { sessionId });
+    const outputPath = resolve(process.cwd(), DEFAULT_RSFORM_SESSION_PATH);
+    await writeFile(outputPath, exported, 'utf8');
+    console.log(`Exported: ${outputPath}`);
+
+    await verifyModel(client, exported);
+  } finally {
+    await client.close();
+  }
+}
+
+run().catch(error => {
+  console.error(error);
+  process.exit(1);
+});

package/examples/template-apply/constants.ts

@@ -0,0 +1,13 @@
+/** Constituent ids in template-apply RSForm (instantiation of БВ rsforms/42). */
+export const T1_ID = 1;
+export const X1_ID = 2;
+export const X2_ID = 3;
+export const S1_ID = 4;
+export const S2_ID = 5;
+export const F_IMAGE_ID = 6;
+export const F_SOURCES_ID = 7;
+export const P_FUNCTION_ID = 8;
+export const D1_ID = 9;
+export const D2_ID = 10;
+
+export const DEFAULT_RSFORM_SESSION_PATH = 'examples/template-apply/rsform-session.json';

package/examples/template-apply/rsform-session.json

@@ -0,0 +1,333 @@
+{
+  "contractVersion": "1.4.0",
+  "state": {
+    "sessionId": "04678669-0343-4a1c-8238-3f0de2fc12f7",
+    "alias": "",
+    "title": "",
+    "comment": "",
+    "createdAt": "2026-06-22T11:29:09.607Z",
+    "updatedAt": "2026-06-22T11:29:09.628Z",
+    "revisions": [
+      {
+        "revisionId": "b577a24d-20ff-4056-992e-7662cb2e56cf",
+        "at": "2026-06-22T11:29:09.628Z",
+        "message": "Применение шаблонов БВ: сотрудники, проекты, F6/F9/F20/P5"
+      }
+    ],
+    "items": [
+      {
+        "id": 1,
+        "alias": "T1",
+        "cstType": "statement",
+        "definitionFormal": "1=1",
+        "term": "Применение шаблонов банка выражений",
+        "convention": "Подстановка радикалов БВ: R1→X1, R2→X2. Отношение σ→S1 или S2. Примеры: БВ F6→F_IMAGE, БВ F20→F_SOURCES, БВ P5→P_FUNCTION",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 6
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 2,
+        "alias": "X1",
+        "cstType": "basic",
+        "definitionFormal": "",
+        "term": "сотрудники",
+        "definitionText": "",
+        "convention": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 5,
+            "base": {
+              "typeID": 3,
+              "baseID": "X1"
+            }
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 3,
+        "alias": "X2",
+        "cstType": "basic",
+        "definitionFormal": "",
+        "term": "проекты",
+        "definitionText": "",
+        "convention": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 5,
+            "base": {
+              "typeID": 3,
+              "baseID": "X2"
+            }
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 4,
+        "alias": "S1",
+        "cstType": "structure",
+        "definitionFormal": "ℬ(X1×X2)",
+        "term": "назначение на проект",
+        "convention": "σ в шаблонах БВ для бинарных отношений двух множеств",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 5,
+            "base": {
+              "typeID": 4,
+              "factors": [
+                {
+                  "typeID": 3,
+                  "baseID": "X1"
+                },
+                {
+                  "typeID": 3,
+                  "baseID": "X2"
+                }
+              ]
+            }
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 5,
+        "alias": "S2",
+        "cstType": "structure",
+        "definitionFormal": "ℬ(X1×X1)",
+        "term": "подчинённость",
+        "convention": "σ в шаблонах БВ для бинарных отношений на одном множестве",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 5,
+            "base": {
+              "typeID": 4,
+              "factors": [
+                {
+                  "typeID": 3,
+                  "baseID": "X1"
+                },
+                {
+                  "typeID": 3,
+                  "baseID": "X1"
+                }
+              ]
+            }
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 6,
+        "alias": "F_IMAGE",
+        "cstType": "function",
+        "definitionFormal": "[α∈X1, σ∈ℬ(X1×X2)] Pr2(Fi1[{α}](σ))",
+        "term": "проекты сотрудника",
+        "convention": "БВ F6: R1→X1, R2→X2",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 7,
+            "result": {
+              "typeID": 5,
+              "base": {
+                "typeID": 3,
+                "baseID": "X2"
+              }
+            },
+            "args": [
+              {
+                "alias": "α",
+                "type": {
+                  "typeID": 3,
+                  "baseID": "X1"
+                }
+              },
+              {
+                "alias": "σ",
+                "type": {
+                  "typeID": 5,
+                  "base": {
+                    "typeID": 4,
+                    "factors": [
+                      {
+                        "typeID": 3,
+                        "baseID": "X1"
+                      },
+                      {
+                        "typeID": 3,
+                        "baseID": "X2"
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 7,
+        "alias": "F_SOURCES",
+        "cstType": "function",
+        "definitionFormal": "[σ∈ℬ(X1×X1)] Pr1(σ) \\ Pr2(σ)",
+        "term": "вершины без предшественников",
+        "convention": "БВ F20 (истоки графа подчинённости)",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 7,
+            "result": {
+              "typeID": 5,
+              "base": {
+                "typeID": 3,
+                "baseID": "X1"
+              }
+            },
+            "args": [
+              {
+                "alias": "σ",
+                "type": {
+                  "typeID": 5,
+                  "base": {
+                    "typeID": 4,
+                    "factors": [
+                      {
+                        "typeID": 3,
+                        "baseID": "X1"
+                      },
+                      {
+                        "typeID": 3,
+                        "baseID": "X1"
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 8,
+        "alias": "P_FUNCTION",
+        "cstType": "predicate",
+        "definitionFormal": "[α∈ℬ(X1), σ∈ℬ(X1×X2)] card(Pr1(σ)) = card(σ) & Pr1(σ) = α",
+        "term": "тотальная функция X1→X2",
+        "convention": "БВ P5",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 8,
+            "result": {
+              "typeID": 6
+            },
+            "args": [
+              {
+                "alias": "α",
+                "type": {
+                  "typeID": 5,
+                  "base": {
+                    "typeID": 3,
+                    "baseID": "X1"
+                  }
+                }
+              },
+              {
+                "alias": "σ",
+                "type": {
+                  "typeID": 5,
+                  "base": {
+                    "typeID": 4,
+                    "factors": [
+                      {
+                        "typeID": 3,
+                        "baseID": "X1"
+                      },
+                      {
+                        "typeID": 3,
+                        "baseID": "X2"
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 9,
+        "alias": "D1",
+        "cstType": "term",
+        "definitionFormal": "Pr2(Fi1[X1](S1))",
+        "term": "все назначенные проекты",
+        "convention": "БВ F9: образ множества X1 по S1",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 5,
+            "base": {
+              "typeID": 3,
+              "baseID": "X2"
+            }
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 10,
+        "alias": "D2",
+        "cstType": "term",
+        "definitionFormal": "Pr1(S2) \\ Pr2(S2)",
+        "term": "глава иерархии",
+        "convention": "БВ F20: применение к S2 (развёрнуто в D2, т.к. вызов F# в терме не анализируется)",
+        "definitionText": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 5,
+            "base": {
+              "typeID": 3,
+              "baseID": "X1"
+            }
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      }
+    ],
+    "model": {
+      "items": []
+    }
+  },
+  "diagnostics": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsconcept/rstool",
-  "version": "0.7.2",
+  "version": "0.8.1",
   "description": "Agent-facing library for incremental RSForm construction, RSLang analysis, diagnostics, modeling, and evaluation. Wraps @rsconcept/domain with a deterministic session contract and stdio wrapper.",
   "license": "MIT",
   "author": "IRBorisov",
@@ -56,15 +56,21 @@
     "test": "vitest run",
     "wrapper": "tsx src/wrapper/stdio-wrapper.ts",
     "example:client": "tsx examples/agent-client.ts",
-    "example:build-schema": "tsx examples/build-sample-rsform.ts",
-    "example:build-rsmodel": "tsx examples/build-sample-rsmodel.ts",
-    "example:build-kinship-schema": "tsx examples/build-kinship-rsform.ts",
-    "example:build-kinship-rsmodel": "tsx examples/build-kinship-rsmodel.ts",
+    "example:build-schema": "tsx examples/sample/build-rsform.ts",
+    "example:build-rsmodel": "tsx examples/sample/build-rsmodel.ts",
+    "example:build-kinship-schema": "tsx examples/kinship/build-rsform.ts",
+    "example:build-kinship-rsmodel": "tsx examples/kinship/build-rsmodel.ts",
+    "example:build-chocolate-nim-schema": "tsx examples/chocolate-nim/build-rsform.ts",
+    "example:build-chocolate-nim-rsmodel": "tsx examples/chocolate-nim/build-rsmodel.ts",
+    "example:build-movd-schema": "tsx examples/movd/build-rsform.ts",
+    "example:build-movd-rsmodel": "tsx examples/movd/build-rsmodel.ts",
+    "example:build-expression-bank-schema": "tsx examples/expression-bank/build-rsform.ts",
+    "example:build-template-apply-schema": "tsx examples/template-apply/build-rsform.ts",
     "kinship:cli": "tsx examples/kinship/cli.ts",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@rsconcept/domain": "^1.4.0"
+    "@rsconcept/domain": "^1.4.3"
   },
   "devDependencies": {
     "@types/node": "^25.9.4",

package/skills/rstool-helper/EXAMPLES.md

@@ -20,7 +20,7 @@ tool.addOrUpdateConstituenta(sessionId, {
     alias: 'S1',
     cstType: CstType.STRUCTURED,
     definitionFormal: 'ℬ(X1×X1)',
-    convention: 'Элементы — пары (родитель, потомок); родитель, потомок ∈ X1.'
+    convention: 'Множество пар: родитель и его ребёнок из людей. Порядок в паре задаётся конвенцией.'
   }
 });
 
@@ -71,9 +71,9 @@ console.log(scratch.success, scratch.value); // true, 3
 Синтаксис верен, но смысл неочевиден — собери маленькую модель и проверь значение.
 
 ```ts
+import { TUPLE_ID } from '@rsconcept/domain';
 import { CstType, EvalStatus, RSToolAgent } from '@rsconcept/rstool';
 
-const TUPLE_ID = -111;
 const tool = new RSToolAgent();
 const { sessionId } = tool.createSession();