@rsconcept/rstool 1.7.1 → 2.0.0

package/README.md

@@ -2,11 +2,11 @@
 
 Agent-facing library for **incremental RSForm construction**, **RSLang expression analysis**, **diagnostics**, **modeling**, and **evaluation**. It wraps [`@rsconcept/domain`](https://www.npmjs.com/package/@rsconcept/domain) with a deterministic session contract and a stdio JSON wrapper for LLM agents. MCP hosts can use it through [`@rsconcept/rstool-mcp`](https://www.npmjs.com/package/@rsconcept/rstool-mcp).
 
-**Contract version:** `3.2.0` — see [skills/rstool-helper/REFERENCE.md](./skills/rstool-helper/REFERENCE.md) for the full v3 API.
+**Contract version:** `3.3.0` — see [skills/rstool-runtime/REFERENCE.md](./skills/rstool-runtime/REFERENCE.md) for the full v3 API.
 
 ## Agent skill
 
-RS language + rstool workflows for agents: `skills/rstool-helper/` (`GUIDE.md`, `REFERENCE.md`, `EXAMPLES.md`) and `docs/` (`DOMAIN.md`, `CONCEPTUAL-SCHEMA.md`, `SYNTAX.md`, …). A **thin** entry skill is installed into the project’s agent skills folder; see [Installing the agent skill](#installing-the-agent-skill) below.
+Agents build conceptual schemas that answer the user's request, not just pass the analyzer. The router skill `skills/rstool/` picks the scenario and names the stage skills (`skills/rs-scope`, `rs-core`, `rs-explicate`, `rs-interpret`, `rs-review`, `rs-synthesis`, `rs-explain`, `rs-portal`, `rstool-runtime`). The method is in `docs/METHOD.md`; a schema brief (`docs/BRIEF.md`) holds the expressiveness requirements, decisions and labelled scenarios, checked by `skills/scripts/check-brief.ts`. Only a **stub** of the router is installed into the project; see [Installing the agent skill](#installing-the-agent-skill) below.
 
 ## Install
 
@@ -26,7 +26,7 @@ The agent should read and follow:
 
 `node_modules/@rsconcept/rstool/skills/INSTALL.md`
 
-That copies `skills/rstool-helper/SKILL.md` from the package into your host’s project skills directory (for example `.agents/skills/rstool-helper/SKILL.md`). Full guidance stays in the package (`skills/rstool-helper/GUIDE.md`, `docs/*.md`) and is read from `node_modules` when needed.
+The procedure is agent-neutral: the agent adds a routing line to the project `AGENTS.md` (or the instructions file its host loads) and, if its host loads a project skills folder, a stub `rstool/SKILL.md` there (name, description and a path into `node_modules`; `npx rstool-skills install --dir <skills-dir>`). The skills and `docs/*.md` stay in the package and are read from `node_modules` when needed, so nothing is re-copied after an update.
 
 Details: `skills/README.md`.
 
@@ -77,7 +77,7 @@ Maintainers: see [PUBLISHING.md](./PUBLISHING.md) for npm release steps.
 - If a session method is called without an active session, rstool creates one lazily.
 - On startup, a ready handshake is printed.
 
-Supported methods (contract `3.2.0`):
+Supported methods (contract `3.3.0`):
 
 - `ping`
 - `methods`
@@ -100,7 +100,7 @@ Supported methods (contract `3.2.0`):
 - `restoreOrder`
 - `synthesize`
 
-Params are **flat** at the top level (no `params.input` wrapper). Optional `sessionId` sits alongside method fields.
+Params are **flat** at the top level (no `params.input` wrapper). Optional `sessionId` sits alongside method fields. `listDiagnostics` takes flat `constituentId` / `kind` / `severity` filters (a legacy nested `filters` object is still accepted).
 
 Example `createSession`:
 
@@ -113,7 +113,7 @@ Request:
 Response:
 
 ```json
-{ "id": "1", "ok": true, "result": { "sessionId": "...", "contractVersion": "3.2.0" } }
+{ "id": "1", "ok": true, "result": { "sessionId": "...", "contractVersion": "3.3.0" } }
 ```
 
 Example `applySchemaPatch`:
@@ -142,7 +142,7 @@ Response:
   "ok": true,
   "result": {
     "success": true,
-    "session": { "sessionId": "...", "contractVersion": "3.2.0" },
+    "session": { "sessionId": "...", "contractVersion": "3.3.0" },
     "summary": { "itemCount": 3 }
   }
 }

package/dist/index.js

@@ -1,7 +1,7 @@
 import { toDiagnostic, toPublicAnalysis } from "./mappers/types.js";
 import { CstType, EvalStatus, RSErrorCode, ValueClass } from "./models/common.js";
 import { DiagnosticKind, RSDiagnosticCode } from "./models/diagnostic.js";
-import { r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "./models-DG2uTaV_.js";
+import { r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "./models-D06g8LId.js";
 import { CONTRACT_VERSION } from "./models/tool-contract.js";
 import { RSToolWrapperClient } from "./wrapper/client.js";
 export { CONTRACT_VERSION, CstType, DiagnosticKind, EvalStatus, PORTAL_JSON_CONTRACT_VERSION, RSDiagnosticCode, RSErrorCode, RSToolAgent, RSToolWrapperClient, ValueClass, toDiagnostic, toPublicAnalysis };

package/dist/mappers/model-adapter.d.ts

@@ -5,7 +5,7 @@ import "../models/index.js";
 import { CstType } from "@rsconcept/domain/library/rsform";
 import { RSEngine } from "@rsconcept/domain/library/rsengine";
 //#region src/mappers/model-adapter.d.ts
-declare class ModelAdapter {
+export declare class ModelAdapter {
   setConstituentaValue(session: SessionState, input: SetConstituentaValueInput): Promise<SessionModelState>;
   setConstituentaValues(session: SessionState, input: {
     items: SetConstituentaValueInput[];
@@ -15,8 +15,12 @@ declare class ModelAdapter {
   evaluateConstituenta(session: SessionState, constituentId: number): EvaluationResult;
   recalculateModel(session: SessionState): RecalculateModelResult;
   createEngine(session: SessionState): RSEngine;
+  /**
+   * Computes values of inferrable constituents referenced by a scratch expression (directly or
+   * through `F#` / `P#` bodies). A fresh engine only holds interpreted `X#` / `C#` / `S#` values.
+   */
+  private prepareReferencedValues;
   private validateSetInput;
 }
 //#endregion
-export { ModelAdapter };
 //# sourceMappingURL=model-adapter.d.ts.map

package/dist/mappers/model-adapter.js

@@ -1,8 +1,10 @@
 import { r as expressionDiagnostic, t as DiagnosticKind } from "../diagnostic-assembly-B-r0NyHL.js";
-import { t as buildRSFormFromSession } from "../rsform-builder-DKwZfJvN.js";
+import { t as buildRSFormFromSession } from "../rsform-builder-BlXEe5Ow.js";
 import { EvalStatus } from "@rsconcept/domain/library/rsmodel";
 import { isBaseSet } from "@rsconcept/domain/library/rsform-api";
 import { isInferrable, isInterpretable, toBasicBinding, validateBasicBindingData, validateValueData } from "@rsconcept/domain/library/rsmodel-api";
+import { extractGlobals } from "@rsconcept/domain/rslang/api";
+import { normalizeValue } from "@rsconcept/domain/rslang/eval/value-api";
 import { RSEngine } from "@rsconcept/domain/library/rsengine";
 //#region src/mappers/model-adapter.ts
 const SESSION_MODEL_ID = 0;
@@ -14,7 +16,11 @@ var ModelAdapter = class {
 		if (isBaseSet(frontendType)) {
 			const binding = toBasicBinding(input.value);
 			await engine.setBasicValue(input.target, binding);
-		} else await engine.setStructureValue(input.target, input.value);
+		} else {
+			const value = structuredClone(input.value);
+			normalizeValue(value);
+			await engine.setStructureValue(input.target, value);
+		}
 		session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 		return structuredClone(session.model);
 	}
@@ -31,7 +37,9 @@ var ModelAdapter = class {
 		return structuredClone(session.model);
 	}
 	evaluateExpression(session, expression, cstType) {
-		const result = this.createEngine(session).evaluateExpression(expression, cstType);
+		const engine = this.createEngine(session);
+		this.prepareReferencedValues(engine, session, expression);
+		const result = engine.evaluateExpression(expression, cstType);
 		const status = result.value === null ? result.errors.length > 0 ? EvalStatus.EVAL_FAIL : EvalStatus.EMPTY : EvalStatus.HAS_DATA;
 		return toPublicEvaluationResult(result.value, result.errors, result.iterations, result.cacheHits, status, expression);
 	}
@@ -63,6 +71,23 @@ var ModelAdapter = class {
 		engine.loadData(schema, model);
 		return engine;
 	}
+	/**
+	* Computes values of inferrable constituents referenced by a scratch expression (directly or
+	* through `F#` / `P#` bodies). A fresh engine only holds interpreted `X#` / `C#` / `S#` values.
+	*/
+	prepareReferencedValues(engine, session, expression) {
+		const schema = engine.schema;
+		if (!schema) return;
+		const globals = extractGlobals(expression);
+		const referenced = session.items.filter((item) => globals.has(item.alias)).map((item) => item.id);
+		if (referenced.length === 0) return;
+		const required = /* @__PURE__ */ new Set([...referenced, ...schema.graph.expandAllInputs(referenced)]);
+		for (const cstID of schema.graph.topologicalOrder()) {
+			if (!required.has(cstID)) continue;
+			const cst = schema.cstByID.get(cstID);
+			if (cst && isInferrable(cst.cst_type)) engine.calculateCst(cstID);
+		}
+	}
 	validateSetInput(session, input) {
 		const cst = session.items.find((item) => item.id === input.target);
 		if (!cst) throw new Error(`Unknown constituent: ${input.target}`);

package/dist/mappers/model-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-adapter.js","names":[],"sources":["../../src/mappers/model-adapter.ts"],"sourcesContent":["import { DiagnosticKind, expressionDiagnostic } from './diagnostic-assembly';\nimport { type RSErrorDescription, type Value } from '@rsconcept/domain/rslang';\nimport { isBaseSet } from '@rsconcept/domain/library/rsform-api';\nimport { CstType, type RSForm } from '@rsconcept/domain/library/rsform';\nimport { RSEngine, type RSEngineServices } from '@rsconcept/domain/library/rsengine';\nimport { type BasicBinding, EvalStatus, type RSModel } from '@rsconcept/domain/library/rsmodel';\nimport {\n  isInferrable,\n  isInterpretable,\n  toBasicBinding,\n  validateBasicBindingData,\n  validateValueData\n} from '@rsconcept/domain/library/rsmodel-api';\n\nimport {\n  type EvaluationResult,\n  type RecalculateModelResult,\n  type SessionModelState,\n  type SessionState,\n  type SetConstituentaValueInput\n} from '../models';\nimport { buildRSFormFromSession } from './rsform-builder';\n\nconst SESSION_MODEL_ID = 0;\n\nexport class ModelAdapter {\n  public async setConstituentaValue(\n    session: SessionState,\n    input: SetConstituentaValueInput\n  ): Promise<SessionModelState> {\n    this.validateSetInput(session, input);\n    const engine = this.createEngine(session);\n    const cst = session.items.find(item => item.id === input.target)!;\n    const frontendType = cst.cstType;\n\n    if (isBaseSet(frontendType)) {\n      const binding = toBasicBinding(input.value as Record<string | number, string>);\n      await engine.setBasicValue(input.target, binding);\n    } else {\n      await engine.setStructureValue(input.target, input.value as Value);\n    }\n    session.updatedAt = new Date().toISOString();\n    return structuredClone(session.model);\n  }\n\n  public async setConstituentaValues(\n    session: SessionState,\n    input: { items: SetConstituentaValueInput[] }\n  ): Promise<SessionModelState> {\n    for (const item of input.items) {\n      await this.setConstituentaValue(session, item);\n    }\n    return structuredClone(session.model);\n  }\n\n  public async clearConstituentaValues(session: SessionState, ids: number[]): Promise<SessionModelState> {\n    const engine = this.createEngine(session);\n    for (const id of ids) {\n      await engine.resetValue(id);\n      session.updatedAt = new Date().toISOString();\n    }\n    return structuredClone(session.model);\n  }\n\n  public evaluateExpression(session: SessionState, expression: string, cstType: CstType): EvaluationResult {\n    const engine = this.createEngine(session);\n    const result = engine.evaluateExpression(expression, cstType);\n    const status =\n      result.value === null\n        ? result.errors.length > 0\n          ? EvalStatus.EVAL_FAIL\n          : EvalStatus.EMPTY\n        : EvalStatus.HAS_DATA;\n    return toPublicEvaluationResult(\n      result.value,\n      result.errors,\n      result.iterations,\n      result.cacheHits,\n      status,\n      expression\n    );\n  }\n\n  public evaluateConstituenta(session: SessionState, constituentId: number): EvaluationResult {\n    const cst = session.items.find(item => item.id === constituentId);\n    if (!cst) {\n      throw new Error(`Unknown constituent: ${constituentId}`);\n    }\n    const engine = this.createEngine(session);\n    const result = engine.calculateCst(constituentId);\n    const status = engine.getCstStatus(constituentId);\n    return toPublicEvaluationResult(\n      result.value,\n      result.errors,\n      result.iterations,\n      result.cacheHits,\n      status,\n      cst.definitionFormal,\n      { constituentId: cst.id, alias: cst.alias }\n    );\n  }\n\n  public recalculateModel(session: SessionState): RecalculateModelResult {\n    const engine = this.createEngine(session);\n    engine.recalculateAll();\n    const items = session.items.map(item => ({\n      id: item.id,\n      alias: item.alias,\n      value: engine.getCstValue(item.id) as number | number[] | null,\n      status: engine.getCstStatus(item.id)\n    }));\n    return { items };\n  }\n\n  public createEngine(session: SessionState): RSEngine {\n    const schema = buildRSFormFromSession(session);\n    const model = buildRSModelFromSession(session);\n    const engine = new RSEngine(SESSION_MODEL_ID, createInMemoryServices(session));\n    engine.loadData(schema, model);\n    return engine;\n  }\n\n  private validateSetInput(session: SessionState, input: SetConstituentaValueInput): void {\n    const cst = session.items.find(item => item.id === input.target);\n    if (!cst) {\n      throw new Error(`Unknown constituent: ${input.target}`);\n    }\n    const frontendType = cst.cstType;\n    if (!isInterpretable(frontendType)) {\n      throw new Error(`Constituent ${cst.alias} is not interpretable`);\n    }\n    if (isInferrable(frontendType)) {\n      throw new Error(`Constituent ${cst.alias} is inferrable and cannot be set directly`);\n    }\n    if (isBaseSet(frontendType)) {\n      if (!validateBasicBindingData(input.value)) {\n        throw new Error(`Invalid basic binding for ${cst.alias}`);\n      }\n      return;\n    }\n    if (!validateValueData(input.value)) {\n      throw new Error(`Invalid structured value for ${cst.alias}`);\n    }\n  }\n}\n\nfunction createInMemoryServices(session: SessionState): RSEngineServices {\n  return {\n    setCstValue: async ({ data }) => {\n      for (const item of data) {\n        const entry = {\n          id: item.target,\n          type: item.type,\n          value: item.data as Value | BasicBinding\n        };\n        const index = session.model.items.findIndex(existing => existing.id === item.target);\n        if (index === -1) {\n          session.model.items.push(entry);\n        } else {\n          session.model.items[index] = entry;\n        }\n      }\n    },\n    clearValues: async ({ data }) => {\n      const ids = new Set(data.items);\n      session.model.items = session.model.items.filter(item => !ids.has(item.id));\n    }\n  };\n}\n\nfunction buildRSModelFromSession(session: SessionState): RSModel {\n  return {\n    id: SESSION_MODEL_ID,\n    schema: 0,\n    editors: [],\n    items: session.model.items.map(item => ({\n      id: item.id,\n      type: item.type,\n      value: item.value as Value | BasicBinding\n    }))\n  } as unknown as RSModel;\n}\n\nfunction toPublicEvaluationResult(\n  value: Value | null,\n  errors: RSErrorDescription[],\n  iterations: number,\n  cacheHits: number,\n  status: EvalStatus,\n  expression: string,\n  target?: { constituentId?: number; alias?: string }\n): EvaluationResult {\n  const diagnostics = errors.map(error => ({\n    ...expressionDiagnostic(error, expression, target),\n    kind: DiagnosticKind.MODEL\n  }));\n  return {\n    success: diagnostics.length === 0 && value !== null,\n    value: value as EvaluationResult['value'],\n    status,\n    iterations,\n    cacheHits,\n    diagnostics\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"model-adapter.js","names":[],"sources":["../../src/mappers/model-adapter.ts"],"sourcesContent":["import { DiagnosticKind, expressionDiagnostic } from './diagnostic-assembly';\nimport { type RSErrorDescription, type Value } from '@rsconcept/domain/rslang';\nimport { extractGlobals } from '@rsconcept/domain/rslang/api';\nimport { normalizeValue } from '@rsconcept/domain/rslang/eval/value-api';\nimport { isBaseSet } from '@rsconcept/domain/library/rsform-api';\nimport { CstType, type RSForm } from '@rsconcept/domain/library/rsform';\nimport { RSEngine, type RSEngineServices } from '@rsconcept/domain/library/rsengine';\nimport { type BasicBinding, EvalStatus, type RSModel } from '@rsconcept/domain/library/rsmodel';\nimport {\n  isInferrable,\n  isInterpretable,\n  toBasicBinding,\n  validateBasicBindingData,\n  validateValueData\n} from '@rsconcept/domain/library/rsmodel-api';\n\nimport {\n  type EvaluationResult,\n  type RecalculateModelResult,\n  type SessionModelState,\n  type SessionState,\n  type SetConstituentaValueInput\n} from '../models';\nimport { buildRSFormFromSession } from './rsform-builder';\n\nconst SESSION_MODEL_ID = 0;\n\nexport class ModelAdapter {\n  public async setConstituentaValue(\n    session: SessionState,\n    input: SetConstituentaValueInput\n  ): Promise<SessionModelState> {\n    this.validateSetInput(session, input);\n    const engine = this.createEngine(session);\n    const cst = session.items.find(item => item.id === input.target)!;\n    const frontendType = cst.cstType;\n\n    if (isBaseSet(frontendType)) {\n      const binding = toBasicBinding(input.value as Record<string | number, string>);\n      await engine.setBasicValue(input.target, binding);\n    } else {\n      // Set operations in the evaluator assume canonical form (sorted, deduplicated);\n      // agents may pass elements in arbitrary order.\n      const value = structuredClone(input.value) as Value;\n      normalizeValue(value);\n      await engine.setStructureValue(input.target, value);\n    }\n    session.updatedAt = new Date().toISOString();\n    return structuredClone(session.model);\n  }\n\n  public async setConstituentaValues(\n    session: SessionState,\n    input: { items: SetConstituentaValueInput[] }\n  ): Promise<SessionModelState> {\n    for (const item of input.items) {\n      await this.setConstituentaValue(session, item);\n    }\n    return structuredClone(session.model);\n  }\n\n  public async clearConstituentaValues(session: SessionState, ids: number[]): Promise<SessionModelState> {\n    const engine = this.createEngine(session);\n    for (const id of ids) {\n      await engine.resetValue(id);\n      session.updatedAt = new Date().toISOString();\n    }\n    return structuredClone(session.model);\n  }\n\n  public evaluateExpression(session: SessionState, expression: string, cstType: CstType): EvaluationResult {\n    const engine = this.createEngine(session);\n    this.prepareReferencedValues(engine, session, expression);\n    const result = engine.evaluateExpression(expression, cstType);\n    const status =\n      result.value === null\n        ? result.errors.length > 0\n          ? EvalStatus.EVAL_FAIL\n          : EvalStatus.EMPTY\n        : EvalStatus.HAS_DATA;\n    return toPublicEvaluationResult(\n      result.value,\n      result.errors,\n      result.iterations,\n      result.cacheHits,\n      status,\n      expression\n    );\n  }\n\n  public evaluateConstituenta(session: SessionState, constituentId: number): EvaluationResult {\n    const cst = session.items.find(item => item.id === constituentId);\n    if (!cst) {\n      throw new Error(`Unknown constituent: ${constituentId}`);\n    }\n    const engine = this.createEngine(session);\n    const result = engine.calculateCst(constituentId);\n    const status = engine.getCstStatus(constituentId);\n    return toPublicEvaluationResult(\n      result.value,\n      result.errors,\n      result.iterations,\n      result.cacheHits,\n      status,\n      cst.definitionFormal,\n      { constituentId: cst.id, alias: cst.alias }\n    );\n  }\n\n  public recalculateModel(session: SessionState): RecalculateModelResult {\n    const engine = this.createEngine(session);\n    engine.recalculateAll();\n    const items = session.items.map(item => ({\n      id: item.id,\n      alias: item.alias,\n      value: engine.getCstValue(item.id) as number | number[] | null,\n      status: engine.getCstStatus(item.id)\n    }));\n    return { items };\n  }\n\n  public createEngine(session: SessionState): RSEngine {\n    const schema = buildRSFormFromSession(session);\n    const model = buildRSModelFromSession(session);\n    const engine = new RSEngine(SESSION_MODEL_ID, createInMemoryServices(session));\n    engine.loadData(schema, model);\n    return engine;\n  }\n\n  /**\n   * Computes values of inferrable constituents referenced by a scratch expression (directly or\n   * through `F#` / `P#` bodies). A fresh engine only holds interpreted `X#` / `C#` / `S#` values.\n   */\n  private prepareReferencedValues(engine: RSEngine, session: SessionState, expression: string): void {\n    const schema = engine.schema;\n    if (!schema) {\n      return;\n    }\n    const globals = extractGlobals(expression);\n    const referenced = session.items.filter(item => globals.has(item.alias)).map(item => item.id);\n    if (referenced.length === 0) {\n      return;\n    }\n    const required = new Set([...referenced, ...schema.graph.expandAllInputs(referenced)]);\n    for (const cstID of schema.graph.topologicalOrder()) {\n      if (!required.has(cstID)) {\n        continue;\n      }\n      const cst = schema.cstByID.get(cstID);\n      if (cst && isInferrable(cst.cst_type)) {\n        engine.calculateCst(cstID);\n      }\n    }\n  }\n\n  private validateSetInput(session: SessionState, input: SetConstituentaValueInput): void {\n    const cst = session.items.find(item => item.id === input.target);\n    if (!cst) {\n      throw new Error(`Unknown constituent: ${input.target}`);\n    }\n    const frontendType = cst.cstType;\n    if (!isInterpretable(frontendType)) {\n      throw new Error(`Constituent ${cst.alias} is not interpretable`);\n    }\n    if (isInferrable(frontendType)) {\n      throw new Error(`Constituent ${cst.alias} is inferrable and cannot be set directly`);\n    }\n    if (isBaseSet(frontendType)) {\n      if (!validateBasicBindingData(input.value)) {\n        throw new Error(`Invalid basic binding for ${cst.alias}`);\n      }\n      return;\n    }\n    if (!validateValueData(input.value)) {\n      throw new Error(`Invalid structured value for ${cst.alias}`);\n    }\n  }\n}\n\nfunction createInMemoryServices(session: SessionState): RSEngineServices {\n  return {\n    setCstValue: async ({ data }) => {\n      for (const item of data) {\n        const entry = {\n          id: item.target,\n          type: item.type,\n          value: item.data as Value | BasicBinding\n        };\n        const index = session.model.items.findIndex(existing => existing.id === item.target);\n        if (index === -1) {\n          session.model.items.push(entry);\n        } else {\n          session.model.items[index] = entry;\n        }\n      }\n    },\n    clearValues: async ({ data }) => {\n      const ids = new Set(data.items);\n      session.model.items = session.model.items.filter(item => !ids.has(item.id));\n    }\n  };\n}\n\nfunction buildRSModelFromSession(session: SessionState): RSModel {\n  return {\n    id: SESSION_MODEL_ID,\n    schema: 0,\n    editors: [],\n    items: session.model.items.map(item => ({\n      id: item.id,\n      type: item.type,\n      value: item.value as Value | BasicBinding\n    }))\n  } as unknown as RSModel;\n}\n\nfunction toPublicEvaluationResult(\n  value: Value | null,\n  errors: RSErrorDescription[],\n  iterations: number,\n  cacheHits: number,\n  status: EvalStatus,\n  expression: string,\n  target?: { constituentId?: number; alias?: string }\n): EvaluationResult {\n  const diagnostics = errors.map(error => ({\n    ...expressionDiagnostic(error, expression, target),\n    kind: DiagnosticKind.MODEL\n  }));\n  return {\n    success: diagnostics.length === 0 && value !== null,\n    value: value as EvaluationResult['value'],\n    status,\n    iterations,\n    cacheHits,\n    diagnostics\n  };\n}\n"],"mappings":"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"}

package/dist/mappers/schema-adapter.d.ts

@@ -6,7 +6,7 @@ import "../models/index.js";
 import { RSForm } from "@rsconcept/domain/library/rsform";
 import { RSLangAnalyzer } from "@rsconcept/domain/rslang";
 //#region src/mappers/schema-adapter.d.ts
-declare class SchemaAdapter {
+export declare class SchemaAdapter {
   analyzeAgainstSession(session: SessionState, draft: ConstituentaDraft): {
     result: AnalysisResult;
     diagnostics: Diagnostic[];
@@ -20,5 +20,4 @@ declare class SchemaAdapter {
   private toAnalysisSchema;
 }
 //#endregion
-export { SchemaAdapter };
 //# sourceMappingURL=schema-adapter.d.ts.map

package/dist/mappers/schema-adapter.js

@@ -1,5 +1,5 @@
 import { toPublicAnalysis } from "./types.js";
-import { t as buildRSFormFromSession } from "../rsform-builder-DKwZfJvN.js";
+import { t as buildRSFormFromSession } from "../rsform-builder-BlXEe5Ow.js";
 import { getAnalysisFor } from "@rsconcept/domain/library/rsform-api";
 //#region src/mappers/schema-adapter.ts
 var SchemaAdapter = class {

package/dist/mappers/types.d.ts

@@ -4,7 +4,7 @@ import "../models/index.js";
 import { RSErrorDescription, ValueClass } from "@rsconcept/domain/rslang";
 //#region src/mappers/types.d.ts
 /** Minimal domain error shape before mapping to {@link Diagnostic}. */
-interface DomainErrorLike {
+export interface DomainErrorLike {
   code: number;
   from: number;
   to: number;
@@ -12,16 +12,15 @@ interface DomainErrorLike {
   stack?: RSErrorDescription['stack'];
 }
 /** Minimal domain analysis shape before mapping to {@link AnalysisResult}. */
-interface DomainAnalysisLike {
+export interface DomainAnalysisLike {
   success: boolean;
   type: Record<string, unknown> | null;
   valueClass: ValueClass | null;
   errors: DomainErrorLike[];
 }
 /** Map a domain parser/semantic error to the public diagnostic shape. */
-declare function toDiagnostic(error: DomainErrorLike, expression: string, target?: DiagnosticTarget): Diagnostic;
+export declare function toDiagnostic(error: DomainErrorLike, expression: string, target?: DiagnosticTarget): Diagnostic;
 /** Map a domain analysis result to the public {@link AnalysisResult} shape. */
-declare function toPublicAnalysis(analysis: DomainAnalysisLike, expression: string, target?: DiagnosticTarget): AnalysisResult;
+export declare function toPublicAnalysis(analysis: DomainAnalysisLike, expression: string, target?: DiagnosticTarget): AnalysisResult;
 //#endregion
-export { DomainAnalysisLike, DomainErrorLike, toDiagnostic, toPublicAnalysis };
 //# sourceMappingURL=types.d.ts.map

package/dist/models/index.js

@@ -1,5 +1,5 @@
 import { CstType, EvalStatus, RSErrorCode, ValueClass } from "./common.js";
 import { DiagnosticKind, RSDiagnosticCode } from "./diagnostic.js";
-import { i as portalItemToDraft, r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "../models-DG2uTaV_.js";
+import { i as portalItemToDraft, r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "../models-D06g8LId.js";
 import { CONTRACT_VERSION } from "./tool-contract.js";
 export { CONTRACT_VERSION, CstType, DiagnosticKind, EvalStatus, PORTAL_JSON_CONTRACT_VERSION, RSDiagnosticCode, RSErrorCode, RSToolAgent, ValueClass, portalItemToDraft };

package/dist/models/rstool-agent.js

@@ -1,2 +1 @@
-import { t as RSToolAgent } from "../models-DG2uTaV_.js";
-export { RSToolAgent };
+export { t as RSToolAgent } from "../models-D06g8LId.js";

package/dist/{models-DG2uTaV_.js → models-D06g8LId.js}

@@ -2,14 +2,14 @@ import { n as expandCstDiagnostic, o as modelStatusDiagnostic, t as DiagnosticKi
 import { toDiagnostic } from "./mappers/types.js";
 import { CstType } from "./models/common.js";
 import "./models/diagnostic.js";
-import { n as enrichSessionConstituents } from "./rsform-builder-DKwZfJvN.js";
+import { n as enrichSessionConstituents } from "./rsform-builder-BlXEe5Ow.js";
 import { ModelAdapter } from "./mappers/model-adapter.js";
 import { SchemaAdapter } from "./mappers/schema-adapter.js";
 import { CONTRACT_VERSION } from "./models/tool-contract.js";
 import { inlineSynthesis, restoreConstituentOrder } from "@rsconcept/domain/library/rsform-api";
 import { isModelIssue } from "@rsconcept/domain/library/rsmodel-api";
-import { Graph } from "@rsconcept/domain/graph/graph";
 import { extractGlobals } from "@rsconcept/domain/rslang/api";
+import { Graph } from "@rsconcept/domain/graph/graph";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
@@ -548,12 +548,13 @@ var RSToolAgent = class {
 	restoreOrder(sessionId) {
 		const id = this.resolveSessionId(sessionId);
 		const envelope = this.sessions.get(id);
-		const ordered = restoreConstituentOrder(envelope.state.items.map((item) => ({
+		const orderable = envelope.state.items.map((item) => ({
 			id: item.id,
 			alias: item.alias,
 			cst_type: item.cstType,
 			definition_formal: item.definitionFormal
-		})));
+		}));
+		const ordered = restoreConstituentOrder(orderable);
 		const byId = new Map(envelope.state.items.map((item) => [item.id, item]));
 		envelope.state.items = ordered.map((item) => byId.get(item.id));
 		envelope.state.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -877,4 +878,4 @@ function toSynthesizableSessionItem(item) {
 //#endregion
 export { portalItemToDraft as i, SessionStore as n, PORTAL_JSON_CONTRACT_VERSION as r, RSToolAgent as t };
 
-//# sourceMappingURL=models-DG2uTaV_.js.map
+//# sourceMappingURL=models-D06g8LId.js.map