@rsconcept/rstool 1.3.0 → 1.4.0

package/src/mappers/schema-adapter.ts

@@ -1,4 +1,6 @@
+import { expressionDiagnostic } from './diagnostic-assembly';
 import { RSLangAnalyzer, type AnalysisFull, type ValueClass } from '@rsconcept/domain/rslang';
+import { type RSErrorDescription } from '@rsconcept/domain/rslang/error';
 import { getAnalysisFor } from '@rsconcept/domain/library/rsform-api';
 import { CstType, type RSForm } from '@rsconcept/domain/library/rsform';
 
@@ -6,33 +8,35 @@ import {
   type AnalysisResult,
   type ConstituentaDraft,
   type ConstituentaState,
-  type DiagnosticRecord,
+  type Diagnostic,
   type SessionState
 } from '../models';
-import { toPublicAnalysis, toPublicError } from './types';
+import { toPublicAnalysis } from './types';
 
 export class SchemaAdapter {
   public analyzeAgainstSession(
     session: SessionState,
     draft: ConstituentaDraft
-  ): { result: AnalysisResult; diagnostics: DiagnosticRecord[] } {
+  ): { result: AnalysisResult; diagnostics: Diagnostic[] } {
     const analyzer = this.buildAnalyzer(session);
     const schema = this.toPseudoRSFormState(session, analyzer);
     const analysis = getAnalysisFor(draft.definitionFormal, draft.cstType, schema as unknown as RSForm, draft.alias);
-    const result = toPublicAnalysis({
-      success: analysis.success,
-      type: analysis.type as Record<string, unknown> | null,
-      valueClass: analysis.valueClass,
-      errors: analysis.errors
-    });
+    const target = { constituentId: draft.id, alias: draft.alias };
+    const result = toPublicAnalysis(
+      {
+        success: analysis.success,
+        type: analysis.type as Record<string, unknown> | null,
+        valueClass: analysis.valueClass,
+        errors: analysis.errors
+      },
+      draft.definitionFormal,
+      target
+    );
     return {
       result,
-      diagnostics: analysis.errors.map(error => ({
-        sessionId: session.sessionId,
-        constituentId: draft.id,
-        expression: draft.definitionFormal,
-        error: toPublicError(error)
-      }))
+      diagnostics: analysis.errors.map(error =>
+        expressionDiagnostic(error as RSErrorDescription, draft.definitionFormal, target)
+      )
     };
   }
 

package/src/mappers/types.ts

@@ -1,8 +1,9 @@
-import { type ValueClass } from '@rsconcept/domain/rslang';
+import { DiagnosticKind, type DiagnosticTarget, expressionDiagnostic } from './diagnostic-assembly';
+import { type RSErrorDescription, type ValueClass } from '@rsconcept/domain/rslang';
 
-import { type AnalysisResult, type RSToolErrorDescription } from '../models';
+import { type AnalysisResult, type Diagnostic } from '../models';
 
-/** Minimal domain error shape before mapping to {@link RSToolErrorDescription}. */
+/** Minimal domain error shape before mapping to {@link Diagnostic}. */
 export interface DomainErrorLike {
   code: number;
   from: number;
@@ -19,21 +20,20 @@ export interface DomainAnalysisLike {
 }
 
 /** Map a domain parser/semantic error to the public diagnostic shape. */
-export function toPublicError(error: DomainErrorLike): RSToolErrorDescription {
-  return {
-    code: error.code,
-    from: error.from,
-    to: error.to,
-    params: error.params
-  };
+export function toDiagnostic(error: DomainErrorLike, expression: string, target?: DiagnosticTarget): Diagnostic {
+  return expressionDiagnostic(error as RSErrorDescription, expression, target);
 }
 
 /** Map a domain analysis result to the public {@link AnalysisResult} shape. */
-export function toPublicAnalysis(analysis: DomainAnalysisLike): AnalysisResult {
+export function toPublicAnalysis(
+  analysis: DomainAnalysisLike,
+  expression: string,
+  target?: DiagnosticTarget
+): AnalysisResult {
   return {
     success: analysis.success,
     type: analysis.type,
     valueClass: analysis.valueClass,
-    diagnostics: analysis.errors.map(toPublicError)
+    diagnostics: analysis.errors.map(error => expressionDiagnostic(error as RSErrorDescription, expression, target))
   };
 }

package/src/models/agent-workflow.ts

@@ -1,6 +1,6 @@
 import { type CstType } from './common';
 import { type ApplyConstituentsMode, type ApplyConstituentsResult, type ConstituentaDraft } from './constituenta';
-import { type DiagnosticRecord } from './diagnostic';
+import { type Diagnostic } from './diagnostic';
 import { type SessionHandle, type SessionRevision, type SessionState } from './session';
 
 /** Level of detail returned by {@link RSToolAgent.getSessionState}. */
@@ -54,7 +54,7 @@ export interface SessionSummary {
   modelItemCount: number;
   diagnosticsCount: number;
   items: SessionSummaryItem[];
-  diagnostics: DiagnosticRecord[];
+  diagnostics: Diagnostic[];
   lastRevision?: SessionRevision;
 }
 

package/src/models/analysis.ts

@@ -1,4 +1,5 @@
-import { type CstType, type RSToolErrorDescription, type ValueClass } from './common';
+import { type Diagnostic } from './diagnostic';
+import { type CstType, type ValueClass } from './common';
 
 /** Input for {@link RSToolAgent.analyzeExpression}. */
 export interface AnalyzeExpressionInput {
@@ -16,5 +17,5 @@ export interface AnalysisResult {
   /** Inferred RS type AST as a plain object, or `null` on failure. */
   type: Record<string, unknown> | null;
   valueClass: ValueClass | null;
-  diagnostics: RSToolErrorDescription[];
+  diagnostics: Diagnostic[];
 }

package/src/models/common.ts

@@ -10,15 +10,3 @@ export type { BasicBinding };
 
 /** Runtime evaluation value: number, nested array (set/tuple), or boolean 0/1. */
 export type RSToolValue = number | RSToolValue[];
-
-/** Language or validation error with source span and optional format parameters. */
-export interface RSToolErrorDescription {
-  /** Numeric error code (see {@link RSErrorCode}). */
-  code: number;
-  /** Start offset in the analyzed expression. */
-  from: number;
-  /** End offset in the analyzed expression. */
-  to: number;
-  /** Interpolation values for localized error messages. */
-  params?: readonly string[];
-}

package/src/models/constituenta.ts

@@ -1,6 +1,6 @@
 import { type AnalysisResult } from './analysis';
 import { type CstType } from './common';
-import { type DiagnosticRecord } from './diagnostic';
+import { type Diagnostic } from './diagnostic';
 
 /** Constituent payload before analysis and merge into session state. */
 export interface ConstituentaDraft {
@@ -33,7 +33,7 @@ export interface AddOrUpdateConstituentaInput {
 
 export interface AddOrUpdateConstituentaResult {
   state: ConstituentaState;
-  diagnostics: DiagnosticRecord[];
+  diagnostics: Diagnostic[];
 }
 
 /** How a multi-draft apply handles partial failures. */
@@ -48,6 +48,6 @@ export interface ApplyConstituentsInput {
 export interface ApplyConstituentsResult {
   success: boolean;
   applied: ConstituentaState[];
-  failed: Array<{ draft: ConstituentaDraft; diagnostics: DiagnosticRecord[] }>;
-  diagnostics: DiagnosticRecord[];
+  failed: Array<{ draft: ConstituentaDraft; diagnostics: Diagnostic[] }>;
+  diagnostics: Diagnostic[];
 }

package/src/models/diagnostic.ts

@@ -1,16 +1,21 @@
-import { type RSToolErrorDescription } from './common';
+import { type CstDiagnostic, DiagnosticKind, RSDiagnosticCode } from '@rsconcept/domain/library';
 
-/** Persisted diagnostic for a failed or warned expression in a session. */
-export interface DiagnosticRecord {
-  sessionId: string;
-  /** Constituent id when the diagnostic is tied to a stored item; omitted for scratch analysis. */
-  constituentId?: number;
-  /** Expression text that was analyzed. */
-  expression: string;
-  error: RSToolErrorDescription;
-}
+export {
+  type Diagnostic,
+  type DiagnosticSeverity,
+  type DiagnosticTarget,
+  expandCstDiagnostic,
+  expressionDiagnostic,
+  getDiagnosticName,
+  getDiagnosticSeverity,
+  modelStatusDiagnostic
+} from '../mappers/diagnostic-assembly';
+
+export { type CstDiagnostic, DiagnosticKind, RSDiagnosticCode };
 
 /** Filters for {@link RSToolAgent.listDiagnostics}. */
 export interface ListDiagnosticsFilters {
   constituentId?: number;
+  kind?: DiagnosticKind;
+  severity?: import('../mappers/diagnostic-assembly').DiagnosticSeverity;
 }

package/src/models/evaluation.ts

@@ -1,10 +1,5 @@
-import {
-  type BasicBinding,
-  type CstType,
-  type EvalStatus,
-  type RSToolErrorDescription,
-  type RSToolValue
-} from './common';
+import { type BasicBinding, type CstType, type EvalStatus, type RSToolValue } from './common';
+import { type Diagnostic } from './diagnostic';
 
 export interface EvaluateExpressionInput {
   expression: string;
@@ -32,5 +27,5 @@ export interface EvaluationResult {
   status: EvalStatus;
   iterations: number;
   cacheHits: number;
-  diagnostics: RSToolErrorDescription[];
+  diagnostics: Diagnostic[];
 }

package/src/models/index.ts

@@ -14,11 +14,17 @@ export {
   RSErrorCode,
   ValueClass,
   type BasicBinding,
-  type RSToolErrorDescription,
   type RSToolValue
 } from './common';
 export { type ApplyConstituentsMode, type ConstituentaDraft, type ConstituentaState } from './constituenta';
-export { type DiagnosticRecord, type ListDiagnosticsFilters } from './diagnostic';
+export {
+  type CstDiagnostic,
+  type Diagnostic,
+  DiagnosticKind,
+  type DiagnosticSeverity,
+  type ListDiagnosticsFilters,
+  RSDiagnosticCode
+} from './diagnostic';
 export { type EvaluateInput, type EvaluationResult } from './evaluation';
 export {
   type ExportFormat,

package/src/models/rstool-agent.test.ts

@@ -6,7 +6,7 @@ import { describe, expect, it } from 'vitest';
 
 import { TUPLE_ID } from '@rsconcept/domain';
 
-import { CstType, EvalStatus, RSErrorCode, RSToolAgent } from './index';
+import { CstType, EvalStatus, RSErrorCode, RSDiagnosticCode, RSToolAgent } from './index';
 
 function buildSampleForm(tool: RSToolAgent, sessionId: string) {
   tool.applySchemaPatch(
@@ -56,7 +56,7 @@ describe('RSToolAgent', () => {
       session.sessionId
     );
     expect(result.success).toBe(false);
-    expect(result.failed[0]?.diagnostics[0]?.error.code).toBe(RSErrorCode.definitionNotAllowed);
+    expect(result.failed[0]?.diagnostics[0]?.code).toBe(RSErrorCode.definitionNotAllowed);
   });
 
   it('rejects formal definition for basic sets', () => {
@@ -69,7 +69,7 @@ describe('RSToolAgent', () => {
       session.sessionId
     );
     expect(result.success).toBe(false);
-    expect(result.failed[0]?.diagnostics[0]?.error.code).toBe(RSErrorCode.definitionNotAllowed);
+    expect(result.failed[0]?.diagnostics[0]?.code).toBe(RSErrorCode.definitionNotAllowed);
   });
 
   it('returns known analysis for empty base definition', () => {
@@ -474,10 +474,68 @@ describe('RSToolAgent agent ergonomics', () => {
       { mode: 'best_effort', items: [{ alias: 'X1', cstType: CstType.BASE, definitionFormal: 'Z' }] },
       session.sessionId
     );
-    expect(tool.listDiagnostics(undefined, session.sessionId)).toHaveLength(1);
+    const expressionDiags = tool.listDiagnostics({ kind: 'expression' }, session.sessionId);
+    expect(expressionDiags).toHaveLength(1);
+    expect(expressionDiags[0]?.code).toBe(RSErrorCode.definitionNotAllowed);
 
     tool.applySchemaPatch({ items: [{ alias: 'X1', cstType: CstType.BASE, definitionFormal: '' }] }, session.sessionId);
-    expect(tool.listDiagnostics(undefined, session.sessionId)).toHaveLength(0);
+    expect(tool.listDiagnostics({ kind: 'expression' }, session.sessionId)).toHaveLength(0);
+    expect(tool.listDiagnostics({ kind: 'schema' }, session.sessionId).length).toBeGreaterThan(0);
+    expect(tool.listDiagnostics({ kind: 'model' }, session.sessionId).length).toBeGreaterThan(0);
+  });
+
+  it('reports schema homonyms and missing convention', () => {
+    const tool = new RSToolAgent();
+    const session = tool.createSession();
+    tool.applySchemaPatch(
+      {
+        items: [
+          { alias: 'X1', term: 'person', convention: 'people' },
+          { alias: 'X2', term: 'Person', convention: 'other people' }
+        ]
+      },
+      session.sessionId
+    );
+
+    const homonyms = tool.listDiagnostics({ kind: 'schema' }, session.sessionId);
+    expect(homonyms.some(record => record.code === RSDiagnosticCode.schemaHomonym)).toBe(true);
+    expect(homonyms.filter(record => record.code === RSDiagnosticCode.schemaHomonym)).toHaveLength(2);
+  });
+
+  it('reports formal duplicate definitions', () => {
+    const tool = new RSToolAgent();
+    const session = tool.createSession();
+    tool.applySchemaPatch(
+      {
+        items: [
+          { alias: 'X1', convention: 'base' },
+          { alias: 'S1', definitionFormal: 'ℬ(X1×X1)', convention: 'pairs' },
+          { alias: 'D1', definitionFormal: 'Pr1(S1)' },
+          { alias: 'D2', definitionFormal: 'Pr1(S1)' }
+        ]
+      },
+      session.sessionId
+    );
+
+    const duplicates = tool
+      .listDiagnostics({ kind: 'schema' }, session.sessionId)
+      .filter(record => record.code === RSDiagnosticCode.schemaFormalDuplicate);
+    expect(duplicates).toHaveLength(2);
+    expect(duplicates[0]?.params?.[0]).toContain('D2');
+  });
+
+  it('reports model diagnostics for empty basic sets', () => {
+    const tool = new RSToolAgent();
+    const session = tool.createSession();
+    tool.applySchemaPatch(
+      {
+        items: [{ alias: 'X1', convention: 'base', term: 'element' }]
+      },
+      session.sessionId
+    );
+
+    const modelIssues = tool.listDiagnostics({ kind: 'model' }, session.sessionId);
+    expect(modelIssues.some(record => record.code === RSDiagnosticCode.modelEmpty)).toBe(true);
   });
 
   it('does not record analyzeExpression diagnostics by default', () => {
@@ -919,6 +977,9 @@ describe('RSToolAgent modeling semantics', () => {
     const a1 = recalculated.items.find(item => item.alias === 'A1');
     expect(a1?.status).toBe(EvalStatus.AXIOM_FALSE);
     expect(a1?.value).toBe(0);
+
+    const modelIssues = tool.listDiagnostics({ kind: 'model' }, session.sessionId);
+    expect(modelIssues.some(record => record.code === RSDiagnosticCode.modelAxiomFalse)).toBe(true);
   });
 
   it('throws when evaluate input is incomplete', () => {

package/src/models/rstool-agent.ts

@@ -4,6 +4,7 @@ import {
   portalSchemaToDrafts,
   portalSchemaToSessionSeed
 } from '../mappers/portal-adapter';
+import { collectSessionDiagnostics } from '../mappers/diagnostics-collector';
 import { ModelAdapter } from '../mappers/model-adapter';
 import { SchemaAdapter } from '../mappers/schema-adapter';
 import { orderDrafts, reorderSessionItemsByDrafts } from '../session/batch-apply';
@@ -26,7 +27,7 @@ import {
   type ConstituentaDraft,
   type ConstituentaState
 } from './constituenta';
-import { type DiagnosticRecord, type ListDiagnosticsFilters } from './diagnostic';
+import { type Diagnostic, type ListDiagnosticsFilters } from './diagnostic';
 import { type EvaluateInput, type EvaluationResult } from './evaluation';
 import { detectImportKind, parseImportPayload } from './import-detect';
 import { type ExportPortalInput, type ExportPortalResult, type ImportDataKind } from './import-export';
@@ -191,11 +192,11 @@ export class RSToolAgent implements RSToolAgentContract {
       definitionFormal: input.expression
     });
     if (input.recordDiagnostics) {
-      this.sessions.replaceDiagnosticsForConstituent(
-        id,
-        undefined,
-        diagnostics.map(item => ({ ...item, constituentId: undefined }))
-      );
+      const refreshed = collectSessionDiagnostics(envelope.state);
+      this.sessions.setDiagnostics(id, [
+        ...refreshed,
+        ...diagnostics.map(item => ({ ...item, constituentId: undefined }))
+      ]);
     }
     return result;
   }
@@ -263,9 +264,11 @@ export class RSToolAgent implements RSToolAgentContract {
         const model = await this.evaluation.setConstituentaValues(state, { items: input.set });
         state = { ...state, model };
         this.sessions.replaceState(id, state);
+        this.refreshDiagnostics(id);
         return model;
       }
 
+      this.refreshDiagnostics(id);
       return structuredClone(this.sessions.get(id).state.model);
     } catch (error) {
       this.sessions.restore(id, snapshot);
@@ -296,8 +299,11 @@ export class RSToolAgent implements RSToolAgentContract {
 
   /** @inheritdoc */
   public recalculateModel(sessionId?: string): RecalculateModelResult {
-    const envelope = this.sessions.get(this.resolveSessionId(sessionId));
-    return this.evaluation.recalculateModel(envelope.state);
+    const id = this.resolveSessionId(sessionId);
+    const envelope = this.sessions.get(id);
+    const result = this.evaluation.recalculateModel(envelope.state);
+    this.refreshDiagnostics(id);
+    return result;
   }
 
   private addOrUpdateConstituenta(
@@ -308,7 +314,6 @@ export class RSToolAgent implements RSToolAgentContract {
     const envelope = this.sessions.get(id);
     const { result, diagnostics } = this.adapter.analyzeAgainstSession(envelope.state, input.draft);
     const state = this.adapter.mergeStateWithDraft(envelope.state, input.draft, result);
-    this.sessions.replaceDiagnosticsForConstituent(id, input.draft.id, diagnostics);
     return { state, diagnostics };
   }
 
@@ -342,6 +347,7 @@ export class RSToolAgent implements RSToolAgentContract {
     const envelope = this.sessions.get(id);
     reorderSessionItemsByDrafts(envelope.state.items, input.drafts, preBatchItemIds);
     this.sessions.replaceState(id, envelope.state);
+    this.refreshDiagnostics(id);
 
     return {
       success: failed.length === 0,
@@ -418,12 +424,13 @@ export class RSToolAgent implements RSToolAgentContract {
     }
     const data = parsed as {
       state: SessionState;
-      diagnostics?: DiagnosticRecord[];
+      diagnostics?: Diagnostic[];
     };
     const handle = this.sessions.create(normalizeImportedState(data.state), this.contractVersion);
     if (data.diagnostics?.length) {
       this.sessions.setDiagnostics(handle.sessionId, data.diagnostics);
     }
+    this.refreshDiagnostics(handle.sessionId);
     return this.trackSession(handle);
   }
 
@@ -509,4 +516,9 @@ export class RSToolAgent implements RSToolAgentContract {
     this.sessions.saveCurrentSessionId(handle.sessionId);
     return handle;
   }
+
+  private refreshDiagnostics(sessionId: string): void {
+    const envelope = this.sessions.get(sessionId);
+    this.sessions.setDiagnostics(sessionId, collectSessionDiagnostics(envelope.state));
+  }
 }

package/src/models/tool-contract.ts

@@ -5,14 +5,14 @@ import {
   type SessionStateResult
 } from './agent-workflow';
 import { type AnalysisResult, type AnalyzeExpressionInput } from './analysis';
-import { type DiagnosticRecord, type ListDiagnosticsFilters } from './diagnostic';
+import { type Diagnostic, type ListDiagnosticsFilters } from './diagnostic';
 import { type EvaluateInput, type EvaluationResult } from './evaluation';
 import { type ExportPortalInput, type ExportPortalResult, type ImportDataKind } from './import-export';
 import { type RecalculateModelResult, type SessionModelState, type SetModelValuesInput } from './model-value';
 import { type SessionHandle, type SessionRevision, type SessionState } from './session';
 
 /** Agent-visible contract version; bump on breaking API changes. */
-export const CONTRACT_VERSION = '2.0.0';
+export const CONTRACT_VERSION = '3.0.0';
 
 /** Options for constructing an {@link RSToolAgent}. */
 export interface RSToolAgentOptions {
@@ -48,8 +48,8 @@ export interface RSToolAgentContract {
   /** Return session summary (default) or full cloned state when `detail` is `'full'`. */
   getSessionState(detail?: SessionStateDetail, sessionId?: string): SessionStateResult;
 
-  /** List diagnostics for the session, optionally filtered by constituent. */
-  listDiagnostics(filters?: ListDiagnosticsFilters, sessionId?: string): DiagnosticRecord[];
+  /** List diagnostics for the session, optionally filtered by constituent or kind. */
+  listDiagnostics(filters?: ListDiagnosticsFilters, sessionId?: string): Diagnostic[];
 
   /** Parse and type-check an RSLang expression against the current schema context. */
   analyzeExpression(input: AnalyzeExpressionInput, sessionId?: string): AnalysisResult;

package/src/session/persistence.ts

@@ -1,11 +1,11 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-import { type DiagnosticRecord, type SessionState } from '../models';
+import { type Diagnostic, type SessionState } from '../models';
 
 export interface PersistedSessionEnvelope {
   state: SessionState;
-  diagnostics: DiagnosticRecord[];
+  diagnostics: Diagnostic[];
 }
 
 const CURRENT_SESSION_FILE = '_current.json';

package/src/session/session-store.ts

@@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto';
 
 import {
   CONTRACT_VERSION,
-  type DiagnosticRecord,
+  type Diagnostic,
   type ListDiagnosticsFilters,
   type SessionHandle,
   type SessionRevision,
@@ -16,7 +16,7 @@ export interface SessionStoreOptions {
 
 interface SessionEnvelope {
   state: SessionState;
-  diagnostics: DiagnosticRecord[];
+  diagnostics: Diagnostic[];
 }
 
 export class SessionStore {
@@ -97,7 +97,7 @@ export class SessionStore {
   public replaceDiagnosticsForConstituent(
     sessionId: string,
     constituentId: number | undefined,
-    records: DiagnosticRecord[]
+    records: Diagnostic[]
   ): void {
     const found = this.get(sessionId);
     found.diagnostics = found.diagnostics.filter(record => record.constituentId !== constituentId);
@@ -106,19 +106,26 @@ export class SessionStore {
     this.persist(sessionId, found);
   }
 
-  public setDiagnostics(sessionId: string, records: DiagnosticRecord[]): void {
+  public setDiagnostics(sessionId: string, records: Diagnostic[]): void {
     const found = this.get(sessionId);
     found.diagnostics = [...records];
     found.state.updatedAt = new Date().toISOString();
     this.persist(sessionId, found);
   }
 
-  public listDiagnostics(sessionId: string, filters?: ListDiagnosticsFilters): DiagnosticRecord[] {
+  public listDiagnostics(sessionId: string, filters?: ListDiagnosticsFilters): Diagnostic[] {
     const found = this.get(sessionId);
+    let records = found.diagnostics;
+    if (filters?.kind !== undefined) {
+      records = records.filter(record => record.kind === filters.kind);
+    }
+    if (filters?.severity !== undefined) {
+      records = records.filter(record => record.severity === filters.severity);
+    }
     if (filters?.constituentId === undefined) {
-      return [...found.diagnostics];
+      return [...records];
     }
-    return found.diagnostics.filter(record => record.constituentId === filters.constituentId);
+    return records.filter(record => record.constituentId === filters.constituentId);
   }
 
   public snapshot(sessionId: string): SessionEnvelope {

package/dist/common-DHJalS-Q.d.ts

@@ -1,22 +0,0 @@
-import { CstType as CstType$1 } from "@rsconcept/domain/library/rsform";
-import { BasicBinding, EvalStatus as EvalStatus$1 } from "@rsconcept/domain/library/rsmodel";
-import { ValueClass as ValueClass$1 } from "@rsconcept/domain/rslang";
-import { RSErrorCode } from "@rsconcept/domain/rslang/error";
-
-//#region src/models/common.d.ts
-/** Runtime evaluation value: number, nested array (set/tuple), or boolean 0/1. */
-type RSToolValue = number | RSToolValue[];
-/** Language or validation error with source span and optional format parameters. */
-interface RSToolErrorDescription {
-  /** Numeric error code (see {@link RSErrorCode}). */
-  code: number;
-  /** Start offset in the analyzed expression. */
-  from: number;
-  /** End offset in the analyzed expression. */
-  to: number;
-  /** Interpolation values for localized error messages. */
-  params?: readonly string[];
-}
-//#endregion
-export { RSToolErrorDescription as a, RSErrorCode as i, CstType$1 as n, RSToolValue as o, EvalStatus$1 as r, ValueClass$1 as s, BasicBinding as t };
-//# sourceMappingURL=common-DHJalS-Q.d.ts.map

package/dist/diagnostic-D9yl_mEL.d.ts

@@ -1,19 +0,0 @@
-import { a as RSToolErrorDescription } from "./common-DHJalS-Q.js";
-
-//#region src/models/diagnostic.d.ts
-/** Persisted diagnostic for a failed or warned expression in a session. */
-interface DiagnosticRecord {
-  sessionId: string;
-  /** Constituent id when the diagnostic is tied to a stored item; omitted for scratch analysis. */
-  constituentId?: number;
-  /** Expression text that was analyzed. */
-  expression: string;
-  error: RSToolErrorDescription;
-}
-/** Filters for {@link RSToolAgent.listDiagnostics}. */
-interface ListDiagnosticsFilters {
-  constituentId?: number;
-}
-//#endregion
-export { ListDiagnosticsFilters as n, DiagnosticRecord as t };
-//# sourceMappingURL=diagnostic-D9yl_mEL.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"model-adapter.js","names":[],"sources":["../../src/mappers/model-adapter.ts"],"sourcesContent":["import { Graph } from '@rsconcept/domain/graph/graph';\nimport { extractGlobals } from '@rsconcept/domain/rslang/api';\nimport { type ExpressionType, RSLangAnalyzer, type Value, type ValueClass } from '@rsconcept/domain/rslang';\nimport { isBaseSet } from '@rsconcept/domain/library/rsform-api';\nimport { type Constituenta, 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 ConstituentaState,\n  type EvaluationResult,\n  type RecalculateModelResult,\n  type SessionModelState,\n  type SessionState,\n  type SetConstituentaValueInput\n} from '../models';\nimport { toPublicError } from './types';\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(result.value, result.errors, result.iterations, result.cacheHits, status);\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(result.value, result.errors, result.iterations, result.cacheHits, status);\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 buildRSFormFromSession(session: SessionState): RSForm {\n  const graph = new Graph<number>();\n  const cstByAlias = new Map<string, Constituenta>();\n  const cstByID = new Map<number, Constituenta>();\n  const analyzer = new RSLangAnalyzer();\n\n  const items = session.items.map(item => {\n    const cst = toFrontendConstituenta(item);\n    cstByAlias.set(cst.alias, cst);\n    cstByID.set(cst.id, cst);\n    graph.addNode(cst.id);\n    if (item.cstType === CstType.BASE) {\n      analyzer.addBase(cst.alias);\n    }\n    if (cst.effectiveType) {\n      analyzer.setGlobal(cst.alias, cst.effectiveType, cst.analysis.valueClass as ValueClass | null);\n    }\n    return cst;\n  });\n\n  for (const cst of items) {\n    for (const alias of extractGlobals(cst.definition_formal)) {\n      const source = cstByAlias.get(alias);\n      if (source) {\n        graph.addEdge(source.id, cst.id);\n      }\n    }\n  }\n\n  return {\n    id: 0,\n    items,\n    cstByAlias,\n    cstByID,\n    graph,\n    analyzer,\n    inheritance: [],\n    attribution: [],\n    attribution_graph: graph.clone(),\n    oss: [],\n    models: [],\n    editors: [],\n    versions: [],\n    is_produced: false,\n    is_attributive: false,\n    version: 'latest'\n  } as unknown as RSForm;\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 toFrontendConstituenta(item: ConstituentaState): Constituenta {\n  const effectiveType = (item.analysis.type ?? null) as ExpressionType | null;\n  return {\n    id: item.id,\n    alias: item.alias,\n    cst_type: item.cstType,\n    definition_formal: item.definitionFormal,\n    definition_raw: item.definitionFormal,\n    definition_resolved: item.definitionFormal,\n    term_raw: item.term,\n    term_resolved: item.term,\n    term_forms: [],\n    convention: item.convention,\n    typification_manual: '',\n    value_is_property: false,\n    crucial: false,\n    attributes: [],\n    homonyms: [],\n    formalDuplicates: [],\n    analysis: {\n      success: item.analysis.success,\n      type: effectiveType,\n      valueClass: item.analysis.valueClass\n    },\n    effectiveType,\n    is_type_mismatch: false,\n    schema: 0,\n    cst_class: 'derived',\n    status: item.analysis.success ? 'verified' : 'incorrect',\n    is_template: false,\n    is_simple_expression: true,\n    parent_schema_index: 0,\n    parent_schema: null,\n    is_inherited: false,\n    has_inherited_children: false,\n    spawn: [],\n    spawn_alias: []\n  } as unknown as Constituenta;\n}\n\nfunction toPublicEvaluationResult(\n  value: Value | null,\n  errors: { code: number; from: number; to: number; params?: readonly string[] }[],\n  iterations: number,\n  cacheHits: number,\n  status: EvalStatus\n): EvaluationResult {\n  const diagnostics = errors.map(toPublicError);\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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"}