@rsconcept/rstool 1.3.0 → 1.4.1

package/examples/sample/build-rsform.ts

@@ -1,8 +1,12 @@
 import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
+import { TUPLE_ID } from '@rsconcept/domain';
+
 import { CstType, RSToolWrapperClient, type AgentConstituentaPatch, type ApplySchemaPatchResult } from '../../src';
 
+import { assertCleanDiagnostics } from '../diagnostics-utils';
+
 async function run() {
   const client = new RSToolWrapperClient({
     cwd: resolve(process.cwd())
@@ -13,13 +17,21 @@ async function run() {
     const session = await client.call<{ sessionId: string; contractVersion: string }>('createSession');
 
     const items: AgentConstituentaPatch[] = [
-      { id: 1, alias: 'X1', cstType: CstType.BASE, definitionFormal: '' },
-      { id: 2, alias: 'C1', cstType: CstType.CONSTANT, definitionFormal: '' },
+      { id: 1, alias: 'X1', cstType: CstType.BASE, definitionFormal: '', term: 'element', convention: 'people' },
+      {
+        id: 2,
+        alias: 'C1',
+        cstType: CstType.CONSTANT,
+        definitionFormal: '',
+        term: 'count',
+        convention: 'natural numbers'
+      },
       {
         id: 3,
         alias: 'S1',
         cstType: CstType.STRUCTURED,
         definitionFormal: 'ℬ(X1×X1)',
+        term: 'parent-child pairs',
         convention: 'Pairs (parent, child) over X1.'
       },
       { id: 4, alias: 'D1', cstType: CstType.TERM, definitionFormal: 'Pr1(S1)' },
@@ -33,7 +45,35 @@ async function run() {
     for (const item of result.summary.items) {
       console.log(`Added ${item.alias}`);
     }
-    console.log(`Patch diagnostics: ${result.diagnostics.length}`);
+    const diags = await client.call<Array<{ kind: string; error: { code: number } }>>('listDiagnostics', {
+      sessionId: session.sessionId
+    });
+    const counts = { expression: 0, schema: 0, model: 0 };
+    for (const record of diags) {
+      if (record.kind in counts) {
+        counts[record.kind as keyof typeof counts] += 1;
+      }
+    }
+    console.log(
+      `Patch diagnostics: ${result.diagnostics.length} (expression ${counts.expression}, schema ${counts.schema}, model ${counts.model})`
+    );
+
+    await client.call('setModelValues', {
+      sessionId: session.sessionId,
+      set: [
+        { target: 1, value: { 0: 'alice', 1: 'bob' } },
+        { target: 2, value: { 0: 'zero', 1: 'one', 2: 'two' } },
+        { target: 3, value: [[TUPLE_ID, 0, 1]] }
+      ]
+    });
+    await client.call('recalculateModel', { sessionId: session.sessionId });
+
+    await assertCleanDiagnostics(
+      client,
+      session.sessionId,
+      new Map(items.map(item => [item.id!, item.alias])),
+      'sample RSForm'
+    );
 
     await client.call('commitStep', {
       sessionId: session.sessionId,

package/examples/sample/build-rsmodel.ts

@@ -5,6 +5,8 @@ import { TUPLE_ID } from '@rsconcept/domain';
 
 import { CstType, RSToolWrapperClient, type AgentConstituentaPatch } from '../../src';
 
+import { assertCleanDiagnostics } from '../diagnostics-utils';
+
 async function run() {
   const client = new RSToolWrapperClient({
     cwd: resolve(process.cwd())
@@ -15,13 +17,28 @@ async function run() {
     const session = await client.call<{ sessionId: string; contractVersion: string }>('createSession');
 
     const items: AgentConstituentaPatch[] = [
-      { id: 1, alias: 'X1', cstType: CstType.BASE, definitionFormal: '' },
-      { id: 2, alias: 'C1', cstType: CstType.CONSTANT, definitionFormal: '' },
+      {
+        id: 1,
+        alias: 'X1',
+        cstType: CstType.BASE,
+        definitionFormal: '',
+        term: 'element',
+        convention: 'people'
+      },
+      {
+        id: 2,
+        alias: 'C1',
+        cstType: CstType.CONSTANT,
+        definitionFormal: '',
+        term: 'count',
+        convention: 'natural numbers'
+      },
       {
         id: 3,
         alias: 'S1',
         cstType: CstType.STRUCTURED,
         definitionFormal: 'ℬ(X1×X1)',
+        term: 'parent-child pairs',
         convention: 'Pairs (parent, child) over X1.'
       },
       { id: 4, alias: 'D1', cstType: CstType.TERM, definitionFormal: 'Pr1(S1)' },
@@ -64,6 +81,13 @@ async function run() {
       recalculatedItems.map(item => ({ alias: item.alias, status: item.status }))
     );
 
+    await assertCleanDiagnostics(
+      client,
+      session.sessionId,
+      new Map(items.map(item => [item.id!, item.alias])),
+      'sample RSModel'
+    );
+
     await client.call('commitStep', {
       sessionId: session.sessionId,
       message: 'Built sample RSModel'

package/examples/sample/rsform-session.json

@@ -1,16 +1,16 @@
 {
-  "contractVersion": "2.0.0",
+  "contractVersion": "2.1.0",
   "state": {
-    "sessionId": "a03eec4c-6519-4088-9d8c-0a9c11611583",
+    "sessionId": "eceb8650-bdf9-48a4-8ba4-5f397ae6d68b",
     "alias": "",
     "title": "",
     "comment": "",
-    "createdAt": "2026-07-01T21:33:21.321Z",
-    "updatedAt": "2026-07-01T21:33:21.332Z",
+    "createdAt": "2026-07-06T14:49:41.608Z",
+    "updatedAt": "2026-07-06T14:49:41.649Z",
     "revisions": [
       {
-        "revisionId": "4ec113d2-1d28-4bac-bed8-6a593bb6b0e2",
-        "at": "2026-07-01T21:33:21.332Z",
+        "revisionId": "5b8e8140-b659-4125-b3ac-1e2e937d817c",
+        "at": "2026-07-06T14:49:41.649Z",
         "message": "Built sample RSForm"
       }
     ],
@@ -20,9 +20,9 @@
         "alias": "X1",
         "cstType": "basic",
         "definitionFormal": "",
-        "term": "",
+        "term": "element",
         "definitionText": "",
-        "convention": "",
+        "convention": "people",
         "analysis": {
           "success": true,
           "type": {
@@ -41,9 +41,9 @@
         "alias": "C1",
         "cstType": "constant",
         "definitionFormal": "",
-        "term": "",
+        "term": "count",
         "definitionText": "",
-        "convention": "",
+        "convention": "natural numbers",
         "analysis": {
           "success": true,
           "type": {
@@ -65,7 +65,7 @@
         "alias": "S1",
         "cstType": "structure",
         "definitionFormal": "ℬ(X1×X1)",
-        "term": "",
+        "term": "parent-child pairs",
         "definitionText": "",
         "convention": "Pairs (parent, child) over X1.",
         "analysis": {
@@ -130,7 +130,36 @@
       }
     ],
     "model": {
-      "items": []
+      "items": [
+        {
+          "id": 1,
+          "type": "basic",
+          "value": {
+            "0": "alice",
+            "1": "bob"
+          }
+        },
+        {
+          "id": 2,
+          "type": "basic",
+          "value": {
+            "0": "zero",
+            "1": "one",
+            "2": "two"
+          }
+        },
+        {
+          "id": 3,
+          "type": "ℬ(X1×X1)",
+          "value": [
+            [
+              -111,
+              0,
+              1
+            ]
+          ]
+        }
+      ]
     }
   },
   "diagnostics": []

package/examples/sample/rsmodel-session.json

@@ -1,32 +1,36 @@
 {
-  "contractVersion": "2.0.0",
+  "contractVersion": "2.1.0",
   "state": {
-    "sessionId": "4de6414b-d6a7-45c9-b950-2e622e0caa0e",
+    "sessionId": "3cf269f7-edd8-4bba-bce0-12c2b0c2e51f",
     "alias": "",
     "title": "",
     "comment": "",
-    "createdAt": "2026-07-01T17:13:04.299Z",
-    "updatedAt": "2026-07-01T17:13:04.322Z",
+    "createdAt": "2026-07-06T14:49:44.425Z",
+    "updatedAt": "2026-07-06T14:49:44.479Z",
     "revisions": [
       {
-        "revisionId": "9a11d6ff-a181-4680-b706-1507d776c5ac",
-        "at": "2026-07-01T17:13:04.322Z",
+        "revisionId": "3226c676-ab84-4e0c-aa02-bce15b9555ae",
+        "at": "2026-07-06T14:49:44.479Z",
         "message": "Built sample RSModel"
       }
     ],
     "items": [
       {
-        "id": 5,
-        "alias": "A1",
-        "cstType": "axiom",
-        "definitionFormal": "1=1",
-        "term": "",
+        "id": 1,
+        "alias": "X1",
+        "cstType": "basic",
+        "definitionFormal": "",
+        "term": "element",
         "definitionText": "",
-        "convention": "",
+        "convention": "people",
         "analysis": {
           "success": true,
           "type": {
-            "typeID": 6
+            "typeID": 5,
+            "base": {
+              "typeID": 3,
+              "baseID": "X1"
+            }
           },
           "valueClass": "value",
           "diagnostics": []
@@ -37,9 +41,9 @@
         "alias": "C1",
         "cstType": "constant",
         "definitionFormal": "",
-        "term": "",
+        "term": "count",
         "definitionText": "",
-        "convention": "",
+        "convention": "natural numbers",
         "analysis": {
           "success": true,
           "type": {
@@ -56,33 +60,12 @@
           "diagnostics": []
         }
       },
-      {
-        "id": 1,
-        "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": "S1",
         "cstType": "structure",
         "definitionFormal": "ℬ(X1×X1)",
-        "term": "",
+        "term": "parent-child pairs",
         "definitionText": "",
         "convention": "Pairs (parent, child) over X1.",
         "analysis": {
@@ -127,6 +110,23 @@
           "valueClass": "value",
           "diagnostics": []
         }
+      },
+      {
+        "id": 5,
+        "alias": "A1",
+        "cstType": "axiom",
+        "definitionFormal": "1=1",
+        "term": "",
+        "definitionText": "",
+        "convention": "",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 6
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
       }
     ],
     "model": {

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

@@ -20,13 +20,7 @@ import {
   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;
+import { assertCleanDiagnostics } from '../diagnostics-utils';
 
 /** S1: назначение сотрудников на проекты. */
 const S1_VALUE = [
@@ -41,6 +35,21 @@ const S2_VALUE = [
   [TUPLE_ID, 1, 2]
 ] as const;
 
+const X1_BINDING = { 0: 'Алиса', 1: 'Боб', 2: 'Кэрол' } as const;
+const X2_BINDING = { 0: 'ПроектA', 1: 'ПроектB' } as const;
+
+function bindTemplateValues(sessionId: string) {
+  return {
+    sessionId,
+    set: [
+      { target: X1_ID, value: X1_BINDING },
+      { target: X2_ID, value: X2_BINDING },
+      { target: S1_ID, value: S1_VALUE },
+      { target: S2_ID, value: S2_VALUE }
+    ]
+  };
+}
+
 async function buildSchema(client: RSToolWrapperClient): Promise<string> {
   const session = await client.call<{ sessionId: string }>('createSession');
 
@@ -62,7 +71,8 @@ async function buildSchema(client: RSToolWrapperClient): Promise<string> {
         alias: 'X1',
         cstType: CstType.BASE,
         definitionFormal: '',
-        term: 'сотрудники'
+        term: 'сотрудники',
+        convention: 'Множество сотрудников; подстановка R1→X1 в шаблонах БВ'
       }
     },
     {
@@ -71,7 +81,8 @@ async function buildSchema(client: RSToolWrapperClient): Promise<string> {
         alias: 'X2',
         cstType: CstType.BASE,
         definitionFormal: '',
-        term: 'проекты'
+        term: 'проекты',
+        convention: 'Множество проектов; подстановка R2→X2 в шаблонах БВ'
       }
     },
     {
@@ -163,6 +174,16 @@ async function buildSchema(client: RSToolWrapperClient): Promise<string> {
     console.log(`${item.alias}: OK`);
   }
 
+  await client.call('setModelValues', bindTemplateValues(session.sessionId));
+  await client.call('recalculateModel', { sessionId: session.sessionId });
+
+  await assertCleanDiagnostics(
+    client,
+    session.sessionId,
+    new Map(drafts.map(entry => [entry.draft.id!, entry.draft.alias])),
+    'template-apply'
+  );
+
   await client.call('commitStep', {
     sessionId: session.sessionId,
     message: 'Применение шаблонов БВ: сотрудники, проекты, F6/F9/F20/P5'
@@ -176,15 +197,7 @@ async function verifyModel(client: RSToolWrapperClient, schemaJson: string) {
     payload: schemaJson
   });
 
-  await client.call('setModelValues', {
-    sessionId: imported.sessionId,
-    set: [
-      { target: X1_ID, value: X1_BINDING },
-      { target: X2_ID, value: X2_BINDING },
-      { target: S1_ID, value: S1_VALUE },
-      { target: S2_ID, value: S2_VALUE }
-    ]
-  });
+  await client.call('setModelValues', bindTemplateValues(imported.sessionId));
 
   const recalculated = await client.call<{
     items: { id: number; alias: string; value: unknown; status: number }[];

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

@@ -1,35 +1,52 @@
 {
-  "contractVersion": "2.0.0",
+  "contractVersion": "2.1.0",
   "state": {
-    "sessionId": "b72f75c0-4f17-4bef-9ff3-913ea16191db",
+    "sessionId": "12bfc7a5-ad35-42b0-9d25-1ea8c8f6588d",
     "alias": "",
     "title": "",
     "comment": "",
-    "createdAt": "2026-07-01T17:12:54.696Z",
-    "updatedAt": "2026-07-01T17:12:54.714Z",
+    "createdAt": "2026-07-06T14:50:08.453Z",
+    "updatedAt": "2026-07-06T14:50:08.531Z",
     "revisions": [
       {
-        "revisionId": "e85ad551-0aa0-42d9-b55d-01719aed6533",
-        "at": "2026-07-01T17:12:54.714Z",
+        "revisionId": "2b60fe39-9343-467f-b334-3101b39dcde0",
+        "at": "2026-07-06T14:50:08.531Z",
         "message": "Применение шаблонов БВ: сотрудники, проекты, F6/F9/F20/P5"
       }
     ],
     "items": [
       {
-        "id": 3,
-        "alias": "X2",
+        "id": 1,
+        "alias": "T1",
+        "cstType": "statement",
+        "definitionFormal": "1=1",
+        "term": "Применение шаблонов банка выражений",
+        "definitionText": "",
+        "convention": "Подстановка радикалов БВ: R1→X1, R2→X2. Отношение σ→S1 или S2. Примеры: БВ F6→F_IMAGE, БВ F20→F_SOURCES, БВ P5→P_FUNCTION",
+        "analysis": {
+          "success": true,
+          "type": {
+            "typeID": 6
+          },
+          "valueClass": "value",
+          "diagnostics": []
+        }
+      },
+      {
+        "id": 2,
+        "alias": "X1",
         "cstType": "basic",
         "definitionFormal": "",
-        "term": "проекты",
+        "term": "сотрудники",
         "definitionText": "",
-        "convention": "",
+        "convention": "Множество сотрудников; подстановка R1→X1 в шаблонах БВ",
         "analysis": {
           "success": true,
           "type": {
             "typeID": 5,
             "base": {
               "typeID": 3,
-              "baseID": "X2"
+              "baseID": "X1"
             }
           },
           "valueClass": "value",
@@ -37,20 +54,20 @@
         }
       },
       {
-        "id": 2,
-        "alias": "X1",
+        "id": 3,
+        "alias": "X2",
         "cstType": "basic",
         "definitionFormal": "",
-        "term": "сотрудники",
+        "term": "проекты",
         "definitionText": "",
-        "convention": "",
+        "convention": "Множество проектов; подстановка R2→X2 в шаблонах БВ",
         "analysis": {
           "success": true,
           "type": {
             "typeID": 5,
             "base": {
               "typeID": 3,
-              "baseID": "X1"
+              "baseID": "X2"
             }
           },
           "valueClass": "value",
@@ -117,27 +134,6 @@
           "diagnostics": []
         }
       },
-      {
-        "id": 10,
-        "alias": "D2",
-        "cstType": "term",
-        "definitionFormal": "Pr1(S2) \\ Pr2(S2)",
-        "term": "глава иерархии",
-        "definitionText": "",
-        "convention": "БВ F20: применение к S2 (развёрнуто в D2, т.к. вызов F# в терме не анализируется)",
-        "analysis": {
-          "success": true,
-          "type": {
-            "typeID": 5,
-            "base": {
-              "typeID": 3,
-              "baseID": "X1"
-            }
-          },
-          "valueClass": "value",
-          "diagnostics": []
-        }
-      },
       {
         "id": 6,
         "alias": "F_IMAGE",
@@ -308,17 +304,21 @@
         }
       },
       {
-        "id": 1,
-        "alias": "T1",
-        "cstType": "statement",
-        "definitionFormal": "1=1",
-        "term": "Применение шаблонов банка выражений",
+        "id": 10,
+        "alias": "D2",
+        "cstType": "term",
+        "definitionFormal": "Pr1(S2) \\ Pr2(S2)",
+        "term": "глава иерархии",
         "definitionText": "",
-        "convention": "Подстановка радикалов БВ: R1→X1, R2→X2. Отношение σ→S1 или S2. Примеры: БВ F6→F_IMAGE, БВ F20→F_SOURCES, БВ P5→P_FUNCTION",
+        "convention": "БВ F20: применение к S2 (развёрнуто в D2, т.к. вызов F# в терме не анализируется)",
         "analysis": {
           "success": true,
           "type": {
-            "typeID": 6
+            "typeID": 5,
+            "base": {
+              "typeID": 3,
+              "baseID": "X1"
+            }
           },
           "valueClass": "value",
           "diagnostics": []
@@ -326,7 +326,62 @@
       }
     ],
     "model": {
-      "items": []
+      "items": [
+        {
+          "id": 2,
+          "type": "basic",
+          "value": {
+            "0": "Алиса",
+            "1": "Боб",
+            "2": "Кэрол"
+          }
+        },
+        {
+          "id": 3,
+          "type": "basic",
+          "value": {
+            "0": "ПроектA",
+            "1": "ПроектB"
+          }
+        },
+        {
+          "id": 4,
+          "type": "ℬ(X1×X1)",
+          "value": [
+            [
+              -111,
+              0,
+              0
+            ],
+            [
+              -111,
+              0,
+              1
+            ],
+            [
+              -111,
+              1,
+              0
+            ]
+          ]
+        },
+        {
+          "id": 5,
+          "type": "ℬ(X1×X1)",
+          "value": [
+            [
+              -111,
+              0,
+              1
+            ],
+            [
+              -111,
+              1,
+              2
+            ]
+          ]
+        }
+      ]
     }
   },
   "diagnostics": []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsconcept/rstool",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Agent-facing library for incremental RSForm construction, RSLang analysis, diagnostics, modeling, and evaluation. Wraps @rsconcept/domain with a deterministic session contract.",
   "license": "MIT",
   "author": "IRBorisov",
@@ -51,7 +51,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@rsconcept/domain": "1.8.1"
+    "@rsconcept/domain": "2.0.2"
   },
   "devDependencies": {
     "@types/node": "^26.1.0",
@@ -82,6 +82,7 @@
     "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",
+    "example:audit-diagnostics": "tsx examples/audit-diagnostics.ts",
     "kinship:cli": "tsx examples/kinship/cli.ts"
   }
 }

package/skills/rstool-helper/EXAMPLES.md

@@ -1,4 +1,4 @@
-# RSLang и rstool — примеры (контракт 2.0)
+# RSLang и rstool — примеры (контракт 2.1)
 
 ## Схема: batch patch
 
@@ -50,6 +50,8 @@ const analysis = tool.analyzeExpression({
 const summary = tool.getSessionState(); // compact
 const full = tool.getSessionState('full'); // SessionState clone
 const diags = tool.listDiagnostics();
+const schemaIssues = tool.listDiagnostics({ kind: 'schema' });
+const modelIssues = tool.listDiagnostics({ kind: 'model' });
 ```
 
 ## Модель и вычисление