@rsconcept/rstool 1.6.0 → 1.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/README.md +5 -4
  2. package/dist/{agent-workflow-BTwrxOoX.d.ts → agent-workflow-DY-hfAap.d.ts} +50 -5
  3. package/dist/{analysis-DA44pfgA.d.ts → analysis-ktWFu4BY.d.ts} +2 -2
  4. package/dist/{constituenta-QY5w1x91.d.ts → constituenta-HTnFtmxt.d.ts} +3 -3
  5. package/dist/{diagnostic-C6TRoBgt.d.ts → diagnostic-CODFUU-Q.d.ts} +5 -4
  6. package/dist/diagnostic-assembly-B-6vIA5I.js.map +1 -1
  7. package/dist/{evaluation-Cd4S7-3t.d.ts → evaluation-6A7rK4t7.d.ts} +2 -2
  8. package/dist/index.d.ts +9 -9
  9. package/dist/index.js +1 -1
  10. package/dist/mappers/model-adapter.d.ts +2 -2
  11. package/dist/mappers/schema-adapter.d.ts +4 -4
  12. package/dist/mappers/types.d.ts +2 -2
  13. package/dist/models/agent-workflow.d.ts +2 -2
  14. package/dist/models/analysis.d.ts +1 -1
  15. package/dist/models/constituenta.d.ts +1 -1
  16. package/dist/models/diagnostic.d.ts +1 -1
  17. package/dist/models/evaluation.d.ts +1 -1
  18. package/dist/models/index.d.ts +9 -9
  19. package/dist/models/index.js +1 -1
  20. package/dist/models/rstool-agent.d.ts +1 -1
  21. package/dist/models/rstool-agent.js +1 -1
  22. package/dist/models/session.d.ts +1 -1
  23. package/dist/models/tool-contract.d.ts +1 -1
  24. package/dist/models/tool-contract.js +1 -1
  25. package/dist/models/tool-contract.js.map +1 -1
  26. package/dist/{models-LMyDB0md.js → models-BKmWx92e.js} +116 -3
  27. package/dist/models-BKmWx92e.js.map +1 -0
  28. package/dist/{rstool-agent-BrAFJcoE.d.ts → rstool-agent-D-w4DlEo.d.ts} +12 -8
  29. package/dist/session/session-store.d.ts +2 -2
  30. package/dist/session/session-store.js +1 -1
  31. package/dist/{session-CI4rLYby.d.ts → session-Uc_vHrq9.d.ts} +2 -2
  32. package/dist/{tool-contract-BUaDRHoO.d.ts → tool-contract-i0v2gbWs.d.ts} +13 -8
  33. package/dist/wrapper/stdio-wrapper.js +8 -2
  34. package/dist/wrapper/stdio-wrapper.js.map +1 -1
  35. package/docs/DOMAIN.md +9 -2
  36. package/docs/README.md +1 -1
  37. package/package.json +1 -1
  38. package/skills/rstool-helper/EXAMPLES.md +25 -0
  39. package/skills/rstool-helper/GUIDE.md +2 -1
  40. package/skills/rstool-helper/REFERENCE.md +51 -20
  41. package/src/index.ts +4 -1
  42. package/src/mappers/diagnostic-assembly.ts +4 -4
  43. package/src/models/agent-workflow.ts +45 -0
  44. package/src/models/index.ts +5 -9
  45. package/src/models/rstool-agent.test.ts +62 -0
  46. package/src/models/rstool-agent.ts +160 -2
  47. package/src/models/tool-contract.ts +10 -2
  48. package/src/wrapper/stdio-handler.ts +8 -1
  49. package/dist/models-LMyDB0md.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"models-BKmWx92e.js","names":[],"sources":["../src/models/portal-json.ts","../src/mappers/portal-adapter.ts","../src/mappers/diagnostics-collector.ts","../src/session/batch-apply.ts","../src/session/persistence.ts","../src/session/session-store.ts","../src/models/import-detect.ts","../src/models/rstool-agent.ts"],"sourcesContent":["import { CstType, type BasicBinding, type RSToolValue } from './common';\nimport { type ConstituentaDraft } from './constituenta';\n\nconst CST_TYPE_VALUES = new Set<string>(Object.values(CstType));\n\nfunction parsePortalCstType(value: string, alias: string): ConstituentaDraft['cstType'] {\n if (!CST_TYPE_VALUES.has(value)) {\n throw new Error(`Invalid cst_type \"${value}\" for constituent \"${alias}\"`);\n }\n return value as ConstituentaDraft['cstType'];\n}\n\n/** Portal JSON import/export format version (schema and model files). */\nexport const PORTAL_JSON_CONTRACT_VERSION = '1.0.0';\n\n/** Shared metadata block in Portal schema and model JSON files. */\nexport interface PortalImportMetadata {\n contract_version: string;\n title: string;\n alias: string;\n description: string;\n}\n\n/** Inflected or tagged surface form of a term. */\nexport interface PortalTermForm {\n text: string;\n tags: string;\n}\n\n/** One constituent in Portal schema JSON (`cst_type`, snake_case fields). */\nexport interface PortalSchemaConstituenta {\n id: number;\n alias: string;\n convention: string;\n crucial: boolean;\n cst_type: string;\n definition_formal: string;\n typification_manual: string;\n value_is_property: boolean;\n definition_raw: string;\n definition_resolved: string;\n term_raw: string;\n term_resolved: string;\n term_forms: PortalTermForm[];\n}\n\n/** Full Portal conceptual schema import/export document. */\nexport interface PortalSchemaImportData extends PortalImportMetadata {\n items: PortalSchemaConstituenta[];\n attribution: Array<{ container: number; attribute: number }>;\n}\n\n/** `GET /api/rsforms/:id/details` response (schema payload only). */\nexport interface PortalRsformDetails {\n id?: number;\n title?: string;\n alias?: string;\n description?: string;\n items: Array<{\n id: number;\n alias: string;\n cst_type: string;\n definition_formal?: string;\n term_raw?: string;\n definition_raw?: string;\n convention?: string;\n }>;\n}\n\n/** Full Portal conceptual model import/export document. */\nexport interface PortalModelImportData extends PortalImportMetadata {\n items: Array<{\n id: number;\n type: string;\n value: RSToolValue | BasicBinding;\n }>;\n}\n\n/** Map a Portal API or JSON schema item to an agent {@link ConstituentaDraft}. */\nexport function portalItemToDraft(item: {\n id: number;\n alias: string;\n cst_type: string;\n definition_formal?: string;\n term_raw?: string;\n definition_raw?: string;\n convention?: string;\n}): ConstituentaDraft {\n return {\n id: item.id,\n alias: item.alias,\n cstType: parsePortalCstType(item.cst_type, item.alias),\n definitionFormal: item.definition_formal ?? '',\n term: item.term_raw ?? '',\n definitionText: item.definition_raw ?? '',\n convention: item.convention ?? ''\n };\n}\n","import { type ConstituentaDraft } from '../models/constituenta';\nimport {\n type PortalImportMetadata,\n type PortalRsformDetails,\n type PortalSchemaImportData,\n portalItemToDraft\n} from '../models/portal-json';\nimport { type SessionState } from '../models/session';\n\ntype PortalSessionSeedInput = Partial<Pick<PortalImportMetadata, 'alias' | 'title' | 'description'>>;\n\nfunction portalMetadataToSessionSeed(data: PortalSessionSeedInput): Partial<SessionState> {\n return {\n alias: data.alias ?? '',\n title: data.title ?? '',\n comment: data.description ?? '',\n items: []\n };\n}\n\nexport function portalSchemaToSessionSeed(data: PortalSchemaImportData): Partial<SessionState> {\n return portalMetadataToSessionSeed(data);\n}\n\nexport function portalDetailsToSessionSeed(data: PortalRsformDetails): Partial<SessionState> {\n return portalMetadataToSessionSeed(data);\n}\n\nexport function portalItemsToDrafts(\n items: Array<{\n id: number;\n alias: string;\n cst_type: string;\n definition_formal?: string;\n term_raw?: string;\n definition_raw?: string;\n convention?: string;\n }>\n): ConstituentaDraft[] {\n return items.map(item => portalItemToDraft(item));\n}\n\nexport function portalSchemaToDrafts(data: PortalSchemaImportData): ConstituentaDraft[] {\n return portalItemsToDrafts(data.items);\n}\n\nexport function portalDetailsToDrafts(data: PortalRsformDetails): ConstituentaDraft[] {\n return portalItemsToDrafts(data.items);\n}\n","import { isModelIssue } from '@rsconcept/domain/library/rsmodel-api';\n\nimport { type SessionState } from '../models';\nimport {\n DiagnosticKind,\n expandCstDiagnostic,\n modelStatusDiagnostic,\n type Diagnostic\n} from './diagnostic-assembly';\nimport { ModelAdapter } from './model-adapter';\nimport { enrichSessionConstituents } from './rsform-builder';\nimport { toDiagnostic } from './types';\n\nconst modelAdapter = new ModelAdapter();\n\n/** Collect expression and schema diagnostics for a session. */\nexport function collectSchemaDiagnostics(session: SessionState): Diagnostic[] {\n const records: Diagnostic[] = [];\n\n for (const item of session.items) {\n for (const diagnostic of item.analysis.diagnostics) {\n const base = diagnostic.name\n ? diagnostic\n : toDiagnostic(diagnostic, item.definitionFormal, {\n constituentId: item.id,\n alias: item.alias\n });\n records.push({\n ...base,\n kind: DiagnosticKind.EXPRESSION,\n constituentId: base.constituentId ?? item.id,\n alias: base.alias ?? item.alias\n });\n }\n }\n\n const enriched = enrichSessionConstituents(session);\n for (const { cst } of enriched) {\n for (const diagnostic of cst.diagnostics) {\n if (diagnostic.kind !== DiagnosticKind.SCHEMA) {\n continue;\n }\n records.push(expandCstDiagnostic(cst, diagnostic));\n }\n }\n\n return records;\n}\n\n/** Collect model diagnostics for a session (requires schema items). */\nexport function collectModelDiagnostics(session: SessionState): Diagnostic[] {\n if (session.items.length === 0) {\n return [];\n }\n\n const records: Diagnostic[] = [];\n const enriched = enrichSessionConstituents(session);\n const schema = enriched.map(entry => entry.cst);\n const engine = modelAdapter.createEngine(session);\n engine.recalculateAll();\n for (const cst of schema) {\n if (!isModelIssue(engine, cst)) {\n continue;\n }\n const diagnostic = modelStatusDiagnostic(engine.getCstStatus(cst.id), cst);\n if (diagnostic) {\n records.push(diagnostic);\n }\n }\n\n return records;\n}\n\n/** Collect expression, schema, and model diagnostics for a session. */\nexport function collectSessionDiagnostics(session: SessionState): Diagnostic[] {\n return [...collectSchemaDiagnostics(session), ...collectModelDiagnostics(session)];\n}\n","import { Graph } from '@rsconcept/domain/graph/graph';\nimport { extractGlobals } from '@rsconcept/domain/rslang/api';\n\nimport { type ConstituentaDraft, type ConstituentaState } from '../models';\n\n/** Order drafts so suppliers are applied before dependents. */\nexport function orderDrafts(sessionItems: ConstituentaState[], drafts: ConstituentaDraft[]): ConstituentaDraft[] {\n const merged = new Map<number, ConstituentaDraft>();\n for (const item of sessionItems) {\n merged.set(item.id, {\n id: item.id,\n alias: item.alias,\n cstType: item.cstType,\n definitionFormal: item.definitionFormal\n });\n }\n for (const draft of drafts) {\n merged.set(draft.id, draft);\n }\n\n const graph = new Graph<number>();\n const aliasToId = new Map<string, number>();\n for (const [id, draft] of merged) {\n graph.addNode(id);\n aliasToId.set(draft.alias, id);\n }\n\n for (const [id, draft] of merged) {\n if (!draft.definitionFormal) {\n continue;\n }\n for (const alias of extractGlobals(draft.definitionFormal)) {\n const depId = aliasToId.get(alias);\n if (depId !== undefined && depId !== id) {\n graph.addEdge(depId, id);\n }\n }\n }\n\n const draftIds = new Set(drafts.map(draft => draft.id));\n const topoIds = graph.topologicalOrder().filter(id => draftIds.has(id));\n const seen = new Set(topoIds);\n const missing = drafts.filter(draft => !seen.has(draft.id)).map(draft => draft.id);\n\n const orderedIds = [...topoIds, ...missing];\n return orderedIds.map(id => drafts.find(draft => draft.id === id)!).filter(Boolean);\n}\n\n/**\n * Restore declaration order in session items after a batch apply.\n * Topological apply order is only needed for analysis; Portal JSON uses array order.\n */\nexport function reorderSessionItemsByDrafts(\n items: ConstituentaState[],\n drafts: ConstituentaDraft[],\n preBatchItemIds: ReadonlySet<number>\n): void {\n if (drafts.length === 0 || items.length === 0) {\n return;\n }\n\n const draftIds = drafts.map(draft => draft.id);\n const draftIdSet = new Set(draftIds);\n const mentioned = items.filter(item => draftIdSet.has(item.id));\n if (mentioned.length === 0) {\n return;\n }\n\n const unmentioned = items.filter(item => !draftIdSet.has(item.id));\n if (unmentioned.length === 0) {\n const byId = new Map(items.map(item => [item.id, item]));\n items.splice(0, items.length, ...draftIds.map(id => byId.get(id)!));\n return;\n }\n\n const newDrafts = drafts.filter(draft => !preBatchItemIds.has(draft.id));\n if (newDrafts.length === 0) {\n return;\n }\n\n const newIds = new Set(newDrafts.map(draft => draft.id));\n const kept = items.filter(item => !newIds.has(item.id));\n const byId = new Map(items.map(item => [item.id, item]));\n items.splice(0, items.length, ...kept, ...newDrafts.map(draft => byId.get(draft.id)!));\n}\n","import fs from 'node:fs';\nimport path from 'node:path';\n\nimport { type Diagnostic, type SessionState } from '../models';\n\nexport interface PersistedSessionEnvelope {\n state: SessionState;\n diagnostics: Diagnostic[];\n}\n\nconst CURRENT_SESSION_FILE = '_current.json';\nconst UNSAFE_SESSION_ID = /[/\\\\]|\\.\\./;\n\nfunction assertSafeSessionId(sessionId: string): void {\n if (!sessionId || UNSAFE_SESSION_ID.test(sessionId)) {\n throw new Error(`Invalid session ID: ${sessionId}`);\n }\n}\n\nexport class SessionPersistence {\n private readonly dir: string;\n\n public constructor(dir: string) {\n this.dir = dir;\n fs.mkdirSync(dir, { recursive: true });\n }\n\n public save(sessionId: string, envelope: PersistedSessionEnvelope): void {\n fs.writeFileSync(this.filePath(sessionId), JSON.stringify(envelope, null, 2), 'utf-8');\n }\n\n public load(sessionId: string): PersistedSessionEnvelope | null {\n const file = this.filePath(sessionId);\n if (!fs.existsSync(file)) {\n return null;\n }\n return JSON.parse(fs.readFileSync(file, 'utf-8')) as PersistedSessionEnvelope;\n }\n\n public delete(sessionId: string): void {\n const file = this.filePath(sessionId);\n if (fs.existsSync(file)) {\n fs.unlinkSync(file);\n }\n }\n\n public saveCurrentSessionId(sessionId: string | null): void {\n fs.writeFileSync(path.join(this.dir, CURRENT_SESSION_FILE), JSON.stringify({ sessionId }, null, 2), 'utf-8');\n }\n\n public loadCurrentSessionId(): string | null {\n const file = path.join(this.dir, CURRENT_SESSION_FILE);\n if (!fs.existsSync(file)) {\n return null;\n }\n const parsed = JSON.parse(fs.readFileSync(file, 'utf-8')) as { sessionId?: string | null };\n return parsed.sessionId ?? null;\n }\n\n private filePath(sessionId: string): string {\n assertSafeSessionId(sessionId);\n const file = path.resolve(this.dir, `${sessionId}.json`);\n const relative = path.relative(path.resolve(this.dir), file);\n if (relative.startsWith('..') || path.isAbsolute(relative)) {\n throw new Error(`Invalid session ID: ${sessionId}`);\n }\n return file;\n }\n}\n","import { randomUUID } from 'node:crypto';\n\nimport {\n CONTRACT_VERSION,\n type Diagnostic,\n type ListDiagnosticsFilters,\n type SessionHandle,\n type SessionRevision,\n type SessionState\n} from '../models';\nimport { SessionPersistence, type PersistedSessionEnvelope } from './persistence';\n\nexport interface SessionStoreOptions {\n persistenceDir?: string;\n}\n\ninterface SessionEnvelope {\n state: SessionState;\n diagnostics: Diagnostic[];\n}\n\nexport class SessionStore {\n private sessions = new Map<string, SessionEnvelope>();\n private readonly persistence: SessionPersistence | null;\n\n public constructor(options: SessionStoreOptions = {}) {\n this.persistence = options.persistenceDir ? new SessionPersistence(options.persistenceDir) : null;\n }\n\n public create(initial?: Partial<SessionState>, contractVersion?: string): SessionHandle {\n const now = new Date().toISOString();\n const sessionId = initial?.sessionId ?? randomUUID();\n const state: SessionState = {\n sessionId,\n alias: initial?.alias ?? '',\n title: initial?.title ?? '',\n comment: initial?.comment ?? '',\n createdAt: initial?.createdAt ?? now,\n updatedAt: now,\n revisions: initial?.revisions ?? [],\n items: initial?.items ?? [],\n model: initial?.model ?? { items: [] }\n };\n const envelope: SessionEnvelope = {\n state,\n diagnostics: []\n };\n this.sessions.set(sessionId, envelope);\n this.persist(sessionId, envelope);\n return {\n sessionId,\n contractVersion: contractVersion ?? CONTRACT_VERSION\n };\n }\n\n public get(sessionId: string): SessionEnvelope {\n const found = this.sessions.get(sessionId) ?? this.loadFromDisk(sessionId);\n if (!found) {\n throw new Error(`Unknown session: ${sessionId}`);\n }\n return found;\n }\n\n public has(sessionId: string): boolean {\n if (this.sessions.has(sessionId)) {\n return true;\n }\n if (!this.persistence) {\n return false;\n }\n return this.persistence.load(sessionId) !== null;\n }\n\n public replaceState(sessionId: string, nextState: SessionState): void {\n const found = this.get(sessionId);\n found.state = {\n ...nextState,\n updatedAt: new Date().toISOString()\n };\n this.persist(sessionId, found);\n }\n\n public addRevision(sessionId: string, message?: string): SessionRevision {\n const found = this.get(sessionId);\n const revision: SessionRevision = {\n revisionId: randomUUID(),\n at: new Date().toISOString(),\n message\n };\n found.state.revisions.push(revision);\n found.state.updatedAt = revision.at;\n this.persist(sessionId, found);\n return revision;\n }\n\n /** Replace active diagnostics for one constituent (or scratch when constituentId is undefined). */\n public replaceDiagnosticsForConstituent(\n sessionId: string,\n constituentId: number | undefined,\n records: Diagnostic[]\n ): void {\n const found = this.get(sessionId);\n found.diagnostics = found.diagnostics.filter(record => record.constituentId !== constituentId);\n found.diagnostics.push(...records);\n found.state.updatedAt = new Date().toISOString();\n this.persist(sessionId, found);\n }\n\n public setDiagnostics(sessionId: string, records: Diagnostic[]): void {\n const found = this.get(sessionId);\n found.diagnostics = [...records];\n found.state.updatedAt = new Date().toISOString();\n this.persist(sessionId, found);\n }\n\n public listDiagnostics(sessionId: string, filters?: ListDiagnosticsFilters): Diagnostic[] {\n const found = this.get(sessionId);\n let records = found.diagnostics;\n if (filters?.kind !== undefined) {\n records = records.filter(record => record.kind === filters.kind);\n }\n if (filters?.severity !== undefined) {\n records = records.filter(record => record.severity === filters.severity);\n }\n if (filters?.constituentId === undefined) {\n return [...records];\n }\n return records.filter(record => record.constituentId === filters.constituentId);\n }\n\n public snapshot(sessionId: string): SessionEnvelope {\n const found = this.get(sessionId);\n return structuredClone(found);\n }\n\n public restore(sessionId: string, snapshot: SessionEnvelope): void {\n this.sessions.set(sessionId, structuredClone(snapshot));\n this.persist(sessionId, this.sessions.get(sessionId)!);\n }\n\n public saveCurrentSessionId(sessionId: string | null): void {\n this.persistence?.saveCurrentSessionId(sessionId);\n }\n\n public loadCurrentSessionId(): string | null {\n return this.persistence?.loadCurrentSessionId() ?? null;\n }\n\n private loadFromDisk(sessionId: string): SessionEnvelope | null {\n const loaded = this.persistence?.load(sessionId);\n if (!loaded) {\n return null;\n }\n this.sessions.set(sessionId, loaded);\n return loaded;\n }\n\n private persist(sessionId: string, envelope: SessionEnvelope): void {\n this.persistence?.save(sessionId, envelope as PersistedSessionEnvelope);\n }\n}\n","import { type ImportDataKind } from './import-export';\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n return value !== null && typeof value === 'object' && !Array.isArray(value);\n}\n\nexport function parseImportPayload(payload: string | object): unknown {\n if (typeof payload === 'string') {\n return JSON.parse(payload) as unknown;\n }\n return payload;\n}\n\nexport function detectImportKind(data: unknown): Exclude<ImportDataKind, 'auto'> {\n if (!isRecord(data)) {\n throw new Error('Invalid import payload');\n }\n\n if ('contractVersion' in data && 'state' in data) {\n return 'session';\n }\n\n if ('contract_version' in data && Array.isArray(data.items)) {\n const items = data.items as unknown[];\n if (items.length > 0) {\n const first = items[0];\n if (isRecord(first) && 'cst_type' in first) {\n return 'portal-schema';\n }\n throw new Error('Portal model JSON cannot be imported as a schema session');\n }\n }\n\n if (Array.isArray(data.items) && data.items.length > 0) {\n const first = data.items[0];\n if (isRecord(first) && 'cst_type' in first) {\n return 'portal-details';\n }\n }\n\n throw new Error('Cannot detect import kind; pass kind explicitly');\n}\n","import {\n inlineSynthesis,\n restoreConstituentOrder,\n type SynthesizableFields\n} from '@rsconcept/domain/library/rsform-api';\nimport { type Substitution } from '@rsconcept/domain/library/rsform';\nimport {\n portalDetailsToDrafts,\n portalDetailsToSessionSeed,\n portalSchemaToDrafts,\n portalSchemaToSessionSeed\n} from '../mappers/portal-adapter';\nimport { collectModelDiagnostics, collectSchemaDiagnostics } from '../mappers/diagnostics-collector';\nimport { ModelAdapter } from '../mappers/model-adapter';\nimport { SchemaAdapter } from '../mappers/schema-adapter';\nimport { orderDrafts, reorderSessionItemsByDrafts } from '../session/batch-apply';\nimport { SessionStore } from '../session/session-store';\nimport {\n type AgentConstituentaPatch,\n type ApplySchemaPatchInput,\n type ApplySchemaPatchResult,\n type RestoreOrderResult,\n type SessionStateDetail,\n type SessionStateResult,\n type SessionSummary,\n type SynthesizeInput,\n type SynthesizeResult\n} from './agent-workflow';\nimport { type AnalysisResult, type AnalyzeExpressionInput } from './analysis';\nimport { CstType } from './common';\nimport {\n type AddOrUpdateConstituentaInput,\n type AddOrUpdateConstituentaResult,\n type ApplyConstituentsInput,\n type ApplyConstituentsResult,\n type ConstituentaDraft,\n type ConstituentaState\n} from './constituenta';\nimport { type Diagnostic, type ListDiagnosticsFilters } from './diagnostic';\nimport { type EvaluateInput, type EvaluationResult } from './evaluation';\nimport { detectImportKind, parseImportPayload } from './import-detect';\nimport { type ExportPortalInput, type ExportPortalResult, type ImportDataKind } from './import-export';\nimport { type RecalculateModelResult, type SessionModelState, type SetModelValuesInput } from './model-value';\nimport {\n PORTAL_JSON_CONTRACT_VERSION,\n type PortalModelImportData,\n type PortalRsformDetails,\n type PortalSchemaImportData\n} from './portal-json';\nimport { type SessionHandle, type SessionRevision, type SessionState } from './session';\nimport { CONTRACT_VERSION, type RSToolAgentContract, type RSToolAgentOptions } from './tool-contract';\n\nfunction normalizeImportedState(state: SessionState): SessionState {\n return {\n ...state,\n alias: state.alias ?? '',\n title: state.title ?? '',\n comment: state.comment ?? '',\n model: state.model ?? { items: [] }\n };\n}\n\nfunction portalImportMetadata(\n session: SessionState,\n kind: 'schema' | 'model'\n): Pick<PortalSchemaImportData, 'title' | 'alias' | 'description'> {\n const defaults =\n kind === 'schema' ? { title: 'Conceptual schema', alias: 'SCHEMA' } : { title: 'Conceptual model', alias: 'MODEL' };\n const title = session.title.trim();\n const alias = session.alias.trim();\n return {\n title: title.length > 0 ? title : defaults.title,\n alias: alias.length > 0 ? alias : defaults.alias,\n description: session.comment.trim()\n };\n}\n\nfunction inferCstType(alias: string): CstType {\n const prefix = alias.trim().charAt(0).toUpperCase();\n switch (prefix) {\n case 'X':\n return CstType.BASE;\n case 'C':\n return CstType.CONSTANT;\n case 'S':\n return CstType.STRUCTURED;\n case 'D':\n return CstType.TERM;\n case 'A':\n return CstType.AXIOM;\n case 'F':\n return CstType.FUNCTION;\n case 'P':\n return CstType.PREDICATE;\n case 'N':\n return CstType.NOMINAL;\n case 'T':\n return CstType.STATEMENT;\n default:\n throw new Error(`Cannot infer cstType from alias \"${alias}\"; pass cstType explicitly`);\n }\n}\n\n/**\n * Agent-facing entry point for incremental RSForm editing, analysis, diagnostics,\n * modeling, and evaluation.\n *\n * Holds in-memory (optionally persisted) sessions and delegates language work\n * to internal schema and model adapters.\n */\nexport class RSToolAgent implements RSToolAgentContract {\n public readonly contractVersion = CONTRACT_VERSION;\n private readonly sessions: SessionStore;\n private readonly adapter = new SchemaAdapter();\n private readonly evaluation = new ModelAdapter();\n private currentSessionId: string | null;\n\n /** @param options - Optional persistence directory for session storage. */\n public constructor(options: RSToolAgentOptions = {}) {\n this.sessions = new SessionStore({ persistenceDir: options.persistenceDir });\n this.currentSessionId = this.sessions.loadCurrentSessionId();\n }\n\n /** @inheritdoc */\n public ensureSession(initial?: Partial<SessionState>): SessionHandle {\n const current = this.getCurrentSession();\n return current ?? this.createSession(initial);\n }\n\n /** @inheritdoc */\n public createSession(initial?: Partial<SessionState>): SessionHandle {\n return this.trackSession(this.sessions.create(initial, this.contractVersion));\n }\n\n /** @inheritdoc */\n public getCurrentSession(): SessionHandle | null {\n if (!this.currentSessionId) {\n return null;\n }\n if (!this.sessions.has(this.currentSessionId)) {\n this.currentSessionId = null;\n this.sessions.saveCurrentSessionId(null);\n return null;\n }\n return { sessionId: this.currentSessionId, contractVersion: this.contractVersion };\n }\n\n /** @inheritdoc */\n public setCurrentSession(sessionId: string): SessionHandle {\n if (!this.sessions.has(sessionId)) {\n throw new Error(`Unknown session: ${sessionId}`);\n }\n return this.trackSession({ sessionId, contractVersion: this.contractVersion });\n }\n\n /** @inheritdoc */\n public applySchemaPatch(input: ApplySchemaPatchInput, sessionId?: string): ApplySchemaPatchResult {\n const session = sessionId\n ? { sessionId: this.resolveSessionId(sessionId), contractVersion: this.contractVersion }\n : this.ensureSession(input.initial);\n const drafts = this.resolveAgentPatches(session.sessionId, input.items);\n const result = this.applyConstituents(\n {\n drafts,\n mode: input.mode\n },\n session.sessionId\n );\n const revision =\n result.success && input.commitMessage ? this.commitStep(input.commitMessage, session.sessionId) : undefined;\n return {\n ...result,\n session,\n summary: this.buildSessionSummary(session.sessionId),\n revision\n };\n }\n\n /** @inheritdoc */\n public getSessionState(detail: SessionStateDetail = 'summary', sessionId?: string): SessionStateResult {\n if (detail === 'full') {\n const envelope = this.sessions.get(this.resolveSessionId(sessionId));\n return structuredClone(envelope.state);\n }\n return this.buildSessionSummary(sessionId);\n }\n\n /** @inheritdoc */\n public listDiagnostics(filters?: ListDiagnosticsFilters, sessionId?: string) {\n return this.sessions.listDiagnostics(this.resolveSessionId(sessionId), filters);\n }\n\n /** @inheritdoc */\n public analyzeExpression(input: AnalyzeExpressionInput, sessionId?: string): AnalysisResult {\n const id = this.resolveSessionId(sessionId);\n const envelope = this.sessions.get(id);\n const { result, diagnostics } = this.adapter.analyzeAgainstSession(envelope.state, {\n id: -1,\n alias: '_analysis',\n cstType: input.cstType,\n definitionFormal: input.expression\n });\n const sanitizedDiagnostics = diagnostics.map(item => ({ ...item, constituentId: undefined }));\n if (input.recordDiagnostics) {\n this.sessions.setDiagnostics(id, [...collectSchemaDiagnostics(envelope.state), ...sanitizedDiagnostics]);\n }\n return { ...result, diagnostics: sanitizedDiagnostics };\n }\n\n /** @inheritdoc */\n public commitStep(message?: string, sessionId?: string): SessionRevision {\n return this.sessions.addRevision(this.resolveSessionId(sessionId), message);\n }\n\n /** @inheritdoc */\n public exportSession(sessionId?: string): string {\n const envelope = this.sessions.get(this.resolveSessionId(sessionId));\n return JSON.stringify(\n {\n contractVersion: this.contractVersion,\n state: envelope.state,\n diagnostics: envelope.diagnostics\n },\n null,\n 2\n );\n }\n\n /** @inheritdoc */\n public exportPortal(input: ExportPortalInput, sessionId?: string): ExportPortalResult {\n const format = input.format ?? 'json';\n const object =\n input.kind === 'schema' ? this.buildPortalSchemaObject(sessionId) : this.buildPortalModelObject(sessionId);\n return format === 'object' ? object : JSON.stringify(object, null, 2);\n }\n\n /** @inheritdoc */\n public importData(payload: string | object, kind: ImportDataKind = 'auto'): SessionHandle {\n const parsed = parseImportPayload(payload);\n const resolvedKind = kind === 'auto' ? detectImportKind(parsed) : kind;\n\n switch (resolvedKind) {\n case 'session':\n return this.importSessionExport(parsed);\n case 'portal-schema':\n return this.importPortalSchemaData(parsed as PortalSchemaImportData);\n case 'portal-details':\n return this.importPortalDetailsData(parsed as PortalRsformDetails);\n default:\n throw new Error(`Unsupported import kind: ${resolvedKind as string}`);\n }\n }\n\n /** @inheritdoc */\n public async setModelValues(input: SetModelValuesInput, sessionId?: string): Promise<SessionModelState> {\n const id = this.resolveSessionId(sessionId);\n const snapshot = this.sessions.snapshot(id);\n\n try {\n let state = this.sessions.get(id).state;\n\n if (input.clear?.length) {\n const model = await this.evaluation.clearConstituentaValues(state, input.clear);\n state = { ...state, model };\n this.sessions.replaceState(id, state);\n }\n\n if (input.set?.length) {\n state = this.sessions.get(id).state;\n const model = await this.evaluation.setConstituentaValues(state, { items: input.set });\n state = { ...state, model };\n this.sessions.replaceState(id, state);\n this.refreshModelDiagnostics(id);\n return model;\n }\n\n this.refreshModelDiagnostics(id);\n return structuredClone(this.sessions.get(id).state.model);\n } catch (error) {\n this.sessions.restore(id, snapshot);\n throw error;\n }\n }\n\n /** @inheritdoc */\n public getModelState(sessionId?: string): SessionModelState {\n const envelope = this.sessions.get(this.resolveSessionId(sessionId));\n return structuredClone(envelope.state.model);\n }\n\n /** @inheritdoc */\n public evaluate(input: EvaluateInput, sessionId?: string): EvaluationResult {\n const envelope = this.sessions.get(this.resolveSessionId(sessionId));\n\n if (input.constituentId !== undefined) {\n return this.evaluation.evaluateConstituenta(envelope.state, input.constituentId);\n }\n\n if (input.expression !== undefined && input.cstType !== undefined) {\n return this.evaluation.evaluateExpression(envelope.state, input.expression, input.cstType);\n }\n\n throw new Error('evaluate requires constituentId or expression with cstType');\n }\n\n /** @inheritdoc */\n public recalculateModel(sessionId?: string): RecalculateModelResult {\n const id = this.resolveSessionId(sessionId);\n const envelope = this.sessions.get(id);\n const result = this.evaluation.recalculateModel(envelope.state);\n this.refreshModelDiagnostics(id);\n return result;\n }\n\n /** @inheritdoc */\n public restoreOrder(sessionId?: string): RestoreOrderResult {\n const id = this.resolveSessionId(sessionId);\n const envelope = this.sessions.get(id);\n const orderable = envelope.state.items.map(item => ({\n id: item.id,\n alias: item.alias,\n cst_type: item.cstType,\n definition_formal: item.definitionFormal\n }));\n const ordered = restoreConstituentOrder(orderable);\n const byId = new Map(envelope.state.items.map(item => [item.id, item]));\n envelope.state.items = ordered.map(item => byId.get(item.id)!);\n envelope.state.updatedAt = new Date().toISOString();\n this.sessions.replaceState(id, envelope.state);\n return {\n orderedIds: ordered.map(item => item.id),\n orderedAliases: ordered.map(item => item.alias)\n };\n }\n\n /** @inheritdoc */\n public synthesize(input: SynthesizeInput, sessionId?: string): SynthesizeResult {\n const receiverHandle = sessionId\n ? { sessionId: this.resolveSessionId(sessionId), contractVersion: this.contractVersion }\n : this.ensureSession();\n const receiverId = receiverHandle.sessionId;\n const sourceId = this.resolveSessionId(input.sourceSessionId);\n\n if (sourceId === receiverId) {\n throw new Error('synthesize: sourceSessionId must differ from the receiver session');\n }\n\n const receiverEnvelope = this.sessions.get(receiverId);\n const sourceEnvelope = this.sessions.get(sourceId);\n const snapshot = this.sessions.snapshot(receiverId);\n\n try {\n const sourceItems = this.selectSourceItems(sourceEnvelope.state.items, input.items);\n const substitutions = this.resolveSynthesisSubstitutions(\n receiverEnvelope.state.items,\n sourceItems,\n input.substitutions ?? []\n );\n\n const nextId = receiverEnvelope.state.items.reduce((max, item) => Math.max(max, item.id), 0) + 1;\n const result = inlineSynthesis({\n receiverItems: receiverEnvelope.state.items.map(toSynthesizableSessionItem),\n sourceItems: sourceItems.map(toSynthesizableSessionItem),\n substitutions,\n nextId\n });\n\n const drafts: ConstituentaDraft[] = result.items.map(item => ({\n id: item.id,\n alias: item.alias,\n cstType: item.cst_type,\n definitionFormal: item.definition_formal,\n term: item.term_resolved || item.term_raw,\n definitionText: item.definition_resolved || item.definition_raw,\n convention: item.convention\n }));\n\n receiverEnvelope.state.items = [];\n receiverEnvelope.state.model = {\n items: receiverEnvelope.state.model.items.filter(value => !result.deletedIds.has(value.id))\n };\n this.sessions.replaceState(receiverId, receiverEnvelope.state);\n\n const applied = this.applyConstituents({ drafts, mode: 'best_effort' }, receiverId);\n\n const revision = input.commitMessage ? this.commitStep(input.commitMessage, receiverId) : undefined;\n return {\n session: receiverHandle,\n summary: this.buildSessionSummary(receiverId),\n success: applied.success,\n failed: applied.failed,\n idMap: result.idMap,\n aliasMapping: result.aliasMapping,\n deletedIds: [...result.deletedIds],\n insertedIds: result.insertedIds,\n revision\n };\n } catch (error) {\n this.sessions.restore(receiverId, snapshot);\n throw error;\n }\n }\n\n private selectSourceItems(sourceItems: ConstituentaState[], aliases?: string[]): ConstituentaState[] {\n if (!aliases || aliases.length === 0) {\n return [...sourceItems];\n }\n const byAlias = new Map(sourceItems.map(item => [item.alias, item]));\n const selected: ConstituentaState[] = [];\n for (const alias of aliases) {\n const item = byAlias.get(alias);\n if (!item) {\n throw new Error(`synthesize: unknown source alias \"${alias}\"`);\n }\n selected.push(item);\n }\n return selected;\n }\n\n private resolveSynthesisSubstitutions(\n receiverItems: ConstituentaState[],\n sourceItems: ConstituentaState[],\n substitutions: SynthesizeInput['substitutions']\n ): Substitution[] {\n if (!substitutions || substitutions.length === 0) {\n return [];\n }\n\n const receiverByAlias = new Map(receiverItems.map(item => [item.alias, item]));\n const sourceByAlias = new Map(sourceItems.map(item => [item.alias, item]));\n const deletedKeys = new Set<string>();\n const resolved: Substitution[] = [];\n\n for (const row of substitutions) {\n const originalSource = sourceByAlias.get(row.original);\n const originalReceiver = receiverByAlias.get(row.original);\n const substitutionSource = sourceByAlias.get(row.substitution);\n const substitutionReceiver = receiverByAlias.get(row.substitution);\n\n let originalId: number;\n let substitutionId: number;\n let originalKey: string;\n\n // Prefer source→receiver when both sides share the same alias (typical base identification).\n // Session ids are independent, so do not compare numeric ids across sessions.\n if (originalSource && substitutionReceiver) {\n originalId = originalSource.id;\n substitutionId = substitutionReceiver.id;\n originalKey = `s:${originalId}`;\n } else if (originalReceiver && substitutionSource) {\n originalId = originalReceiver.id;\n substitutionId = substitutionSource.id;\n originalKey = `r:${originalId}`;\n } else {\n throw new Error(\n `synthesize: substitution \"${row.original}\" → \"${row.substitution}\" must pair one source alias with one receiver alias`\n );\n }\n\n if (deletedKeys.has(originalKey)) {\n throw new Error(`synthesize: constituenta \"${row.original}\" is substituted more than once`);\n }\n deletedKeys.add(originalKey);\n\n resolved.push({ original: originalId, substitution: substitutionId });\n }\n\n return resolved;\n }\n\n private addOrUpdateConstituenta(\n input: AddOrUpdateConstituentaInput,\n sessionId?: string\n ): AddOrUpdateConstituentaResult {\n const id = this.resolveSessionId(sessionId);\n const envelope = this.sessions.get(id);\n const { result, diagnostics } = this.adapter.analyzeAgainstSession(envelope.state, input.draft);\n const state = this.adapter.mergeStateWithDraft(envelope.state, input.draft, result);\n return { state, diagnostics };\n }\n\n private applyConstituents(input: ApplyConstituentsInput, sessionId?: string): ApplyConstituentsResult {\n const id = this.resolveSessionId(sessionId);\n const mode = input.mode ?? 'atomic';\n const ordered = orderDrafts(this.sessions.get(id).state.items, input.drafts);\n const preBatchItemIds = new Set(this.sessions.get(id).state.items.map(item => item.id));\n const snapshot = this.sessions.snapshot(id);\n const applied: ConstituentaState[] = [];\n const failed: ApplyConstituentsResult['failed'] = [];\n\n for (const draft of ordered) {\n const result = this.addOrUpdateConstituenta({ draft }, id);\n if (result.state.analysis.success) {\n applied.push(result.state);\n continue;\n }\n failed.push({ draft, diagnostics: result.diagnostics });\n if (mode === 'atomic') {\n this.sessions.restore(id, snapshot);\n return {\n success: false,\n applied: [],\n failed,\n diagnostics: this.sessions.listDiagnostics(id)\n };\n }\n }\n\n const envelope = this.sessions.get(id);\n reorderSessionItemsByDrafts(envelope.state.items, input.drafts, preBatchItemIds);\n this.sessions.replaceState(id, envelope.state);\n this.refreshDiagnostics(id);\n\n return {\n success: failed.length === 0,\n applied,\n failed,\n diagnostics: this.sessions.listDiagnostics(id)\n };\n }\n\n private buildSessionSummary(sessionId?: string): SessionSummary {\n const id = this.resolveSessionId(sessionId);\n const envelope = this.sessions.get(id);\n const diagnostics = this.sessions.listDiagnostics(id);\n return {\n sessionId: id,\n contractVersion: this.contractVersion,\n alias: envelope.state.alias,\n title: envelope.state.title,\n comment: envelope.state.comment,\n itemCount: envelope.state.items.length,\n modelItemCount: envelope.state.model.items.length,\n diagnosticsCount: diagnostics.length,\n items: envelope.state.items.map(item => ({\n id: item.id,\n alias: item.alias,\n cstType: item.cstType,\n analysisSuccess: item.analysis.success\n })),\n diagnostics,\n lastRevision: envelope.state.revisions.at(-1)\n };\n }\n\n private buildPortalSchemaObject(sessionId?: string): PortalSchemaImportData {\n const envelope = this.sessions.get(this.resolveSessionId(sessionId));\n return {\n contract_version: PORTAL_JSON_CONTRACT_VERSION,\n ...portalImportMetadata(envelope.state, 'schema'),\n items: envelope.state.items.map(item => ({\n id: item.id,\n alias: item.alias,\n convention: item.convention,\n crucial: false,\n cst_type: item.cstType,\n definition_formal: item.definitionFormal,\n typification_manual: '',\n value_is_property: false,\n definition_raw: item.definitionText,\n definition_resolved: item.definitionText,\n term_raw: item.term,\n term_resolved: item.term,\n term_forms: []\n })),\n attribution: []\n };\n }\n\n private buildPortalModelObject(sessionId?: string): PortalModelImportData {\n const envelope = this.sessions.get(this.resolveSessionId(sessionId));\n return {\n contract_version: PORTAL_JSON_CONTRACT_VERSION,\n ...portalImportMetadata(envelope.state, 'model'),\n items: envelope.state.model.items.map(item => ({\n id: item.id,\n type: item.type,\n value: item.value\n }))\n };\n }\n\n private importSessionExport(parsed: unknown): SessionHandle {\n if (!parsed || typeof parsed !== 'object' || !('state' in parsed)) {\n throw new Error('Invalid session export payload');\n }\n const data = parsed as {\n state: SessionState;\n diagnostics?: Diagnostic[];\n };\n const handle = this.sessions.create(normalizeImportedState(data.state), this.contractVersion);\n if (data.diagnostics?.length) {\n this.sessions.setDiagnostics(handle.sessionId, data.diagnostics);\n } else {\n this.refreshDiagnostics(handle.sessionId);\n }\n return this.trackSession(handle);\n }\n\n private importPortalSchemaData(data: PortalSchemaImportData): SessionHandle {\n const handle = this.createSession(portalSchemaToSessionSeed(data));\n this.applyConstituents({ drafts: portalSchemaToDrafts(data), mode: 'best_effort' }, handle.sessionId);\n return handle;\n }\n\n private importPortalDetailsData(data: PortalRsformDetails): SessionHandle {\n const handle = this.createSession(portalDetailsToSessionSeed(data));\n this.applyConstituents({ drafts: portalDetailsToDrafts(data), mode: 'best_effort' }, handle.sessionId);\n return handle;\n }\n\n private resolveAgentPatches(sessionId: string, patches: AgentConstituentaPatch[]): ConstituentaDraft[] {\n const items = this.sessions.get(sessionId).state.items;\n const existingByAlias = new Map(items.map(item => [item.alias, item]));\n const usedIds = new Set(items.map(item => item.id));\n let nextId = items.reduce((max, item) => Math.max(max, item.id), 0) + 1;\n\n const reserveId = (id: number): void => {\n usedIds.add(id);\n if (id >= nextId) {\n nextId = id + 1;\n }\n };\n\n const allocateId = (): number => {\n while (usedIds.has(nextId)) {\n nextId += 1;\n }\n const id = nextId;\n nextId += 1;\n usedIds.add(id);\n return id;\n };\n\n return patches.map(patch => {\n const existing = existingByAlias.get(patch.alias);\n let id: number;\n if (patch.id !== undefined) {\n id = patch.id;\n reserveId(id);\n } else if (existing !== undefined) {\n id = existing.id;\n } else {\n id = allocateId();\n }\n const draft = {\n id,\n alias: patch.alias,\n cstType: patch.cstType ?? existing?.cstType ?? inferCstType(patch.alias),\n definitionFormal: patch.definitionFormal ?? existing?.definitionFormal ?? '',\n term: patch.term ?? existing?.term ?? '',\n definitionText: patch.definitionText ?? existing?.definitionText ?? '',\n convention: patch.convention ?? existing?.convention ?? ''\n };\n existingByAlias.set(patch.alias, {\n ...draft,\n analysis: existing?.analysis ?? { success: true, type: null, valueClass: 'value', diagnostics: [] }\n });\n return draft;\n });\n }\n\n private resolveSessionId(sessionId?: string): string {\n const id = sessionId ?? this.currentSessionId;\n if (!id) {\n return this.createSession().sessionId;\n }\n if (!this.sessions.has(id)) {\n if (sessionId) {\n throw new Error(`Unknown session: ${sessionId}`);\n }\n return this.createSession().sessionId;\n }\n return id;\n }\n\n private trackSession(handle: SessionHandle): SessionHandle {\n this.currentSessionId = handle.sessionId;\n this.sessions.saveCurrentSessionId(handle.sessionId);\n return handle;\n }\n\n private refreshDiagnostics(sessionId: string): void {\n const envelope = this.sessions.get(sessionId);\n this.sessions.setDiagnostics(sessionId, collectSchemaDiagnostics(envelope.state));\n }\n\n private refreshModelDiagnostics(sessionId: string): void {\n const envelope = this.sessions.get(sessionId);\n this.sessions.setDiagnostics(sessionId, [\n ...collectSchemaDiagnostics(envelope.state),\n ...collectModelDiagnostics(envelope.state)\n ]);\n }\n}\n\nfunction toSynthesizableSessionItem(item: ConstituentaState): SynthesizableFields & { convention: string } {\n return {\n id: item.id,\n alias: item.alias,\n cst_type: item.cstType,\n definition_formal: item.definitionFormal,\n typification_manual: '',\n term_raw: item.term,\n term_resolved: item.term,\n term_forms: [],\n definition_raw: item.definitionText,\n definition_resolved: item.definitionText,\n convention: item.convention\n };\n}\n"],"mappings":"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"}
@@ -1,10 +1,10 @@
1
- import { a as Diagnostic, r as ListDiagnosticsFilters } from "./diagnostic-C6TRoBgt.js";
2
- import { n as AnalyzeExpressionInput, t as AnalysisResult } from "./analysis-DA44pfgA.js";
1
+ import { a as Diagnostic, r as ListDiagnosticsFilters } from "./diagnostic-CODFUU-Q.js";
2
+ import { n as AnalyzeExpressionInput, t as AnalysisResult } from "./analysis-ktWFu4BY.js";
3
3
  import { i as SessionModelState, r as RecalculateModelResult, s as SetModelValuesInput } from "./model-value-BUhr2IjA.js";
4
- import { n as SessionRevision, r as SessionState, t as SessionHandle } from "./session-CI4rLYby.js";
5
- import { a as SessionStateDetail, i as RestoreOrderResult, n as ApplySchemaPatchInput, o as SessionStateResult, r as ApplySchemaPatchResult } from "./agent-workflow-BTwrxOoX.js";
6
- import { i as EvaluationResult, r as EvaluateInput } from "./evaluation-Cd4S7-3t.js";
7
- import { a as ExportPortalInput, n as RSToolAgentContract, o as ExportPortalResult, r as RSToolAgentOptions, s as ImportDataKind } from "./tool-contract-BUaDRHoO.js";
4
+ import { n as SessionRevision, r as SessionState, t as SessionHandle } from "./session-Uc_vHrq9.js";
5
+ import { a as SessionStateDetail, d as SynthesizeResult, i as RestoreOrderResult, n as ApplySchemaPatchInput, o as SessionStateResult, r as ApplySchemaPatchResult, u as SynthesizeInput } from "./agent-workflow-DY-hfAap.js";
6
+ import { i as EvaluationResult, r as EvaluateInput } from "./evaluation-6A7rK4t7.js";
7
+ import { a as ExportPortalInput, n as RSToolAgentContract, o as ExportPortalResult, r as RSToolAgentOptions, s as ImportDataKind } from "./tool-contract-i0v2gbWs.js";
8
8
 
9
9
  //#region src/models/rstool-agent.d.ts
10
10
  /**
@@ -15,7 +15,7 @@ import { a as ExportPortalInput, n as RSToolAgentContract, o as ExportPortalResu
15
15
  * to internal schema and model adapters.
16
16
  */
17
17
  declare class RSToolAgent implements RSToolAgentContract {
18
- readonly contractVersion = "3.1.0";
18
+ readonly contractVersion = "3.2.0";
19
19
  private readonly sessions;
20
20
  private readonly adapter;
21
21
  private readonly evaluation;
@@ -56,6 +56,10 @@ declare class RSToolAgent implements RSToolAgentContract {
56
56
  recalculateModel(sessionId?: string): RecalculateModelResult;
57
57
  /** @inheritdoc */
58
58
  restoreOrder(sessionId?: string): RestoreOrderResult;
59
+ /** @inheritdoc */
60
+ synthesize(input: SynthesizeInput, sessionId?: string): SynthesizeResult;
61
+ private selectSourceItems;
62
+ private resolveSynthesisSubstitutions;
59
63
  private addOrUpdateConstituenta;
60
64
  private applyConstituents;
61
65
  private buildSessionSummary;
@@ -72,4 +76,4 @@ declare class RSToolAgent implements RSToolAgentContract {
72
76
  }
73
77
  //#endregion
74
78
  export { RSToolAgent as t };
75
- //# sourceMappingURL=rstool-agent-BrAFJcoE.d.ts.map
79
+ //# sourceMappingURL=rstool-agent-D-w4DlEo.d.ts.map
@@ -1,5 +1,5 @@
1
- import { a as Diagnostic, r as ListDiagnosticsFilters } from "../diagnostic-C6TRoBgt.js";
2
- import { n as SessionRevision, r as SessionState, t as SessionHandle } from "../session-CI4rLYby.js";
1
+ import { a as Diagnostic, r as ListDiagnosticsFilters } from "../diagnostic-CODFUU-Q.js";
2
+ import { n as SessionRevision, r as SessionState, t as SessionHandle } from "../session-Uc_vHrq9.js";
3
3
  //#region src/session/session-store.d.ts
4
4
  interface SessionStoreOptions {
5
5
  persistenceDir?: string;
@@ -1,2 +1,2 @@
1
- import { n as SessionStore } from "../models-LMyDB0md.js";
1
+ import { n as SessionStore } from "../models-BKmWx92e.js";
2
2
  export { SessionStore };
@@ -1,4 +1,4 @@
1
- import { s as ConstituentaState } from "./constituenta-QY5w1x91.js";
1
+ import { s as ConstituentaState } from "./constituenta-HTnFtmxt.js";
2
2
  import { i as SessionModelState } from "./model-value-BUhr2IjA.js";
3
3
 
4
4
  //#region src/models/session.d.ts
@@ -35,4 +35,4 @@ interface SessionState {
35
35
  }
36
36
  //#endregion
37
37
  export { SessionRevision as n, SessionState as r, SessionHandle as t };
38
- //# sourceMappingURL=session-CI4rLYby.d.ts.map
38
+ //# sourceMappingURL=session-Uc_vHrq9.d.ts.map
@@ -1,11 +1,11 @@
1
- import { a as Diagnostic, r as ListDiagnosticsFilters } from "./diagnostic-C6TRoBgt.js";
1
+ import { a as Diagnostic, r as ListDiagnosticsFilters } from "./diagnostic-CODFUU-Q.js";
2
2
  import { a as RSToolValue, t as BasicBinding } from "./common-D6TFl6l_.js";
3
- import { n as AnalyzeExpressionInput, t as AnalysisResult } from "./analysis-DA44pfgA.js";
4
- import { o as ConstituentaDraft } from "./constituenta-QY5w1x91.js";
3
+ import { n as AnalyzeExpressionInput, t as AnalysisResult } from "./analysis-ktWFu4BY.js";
4
+ import { o as ConstituentaDraft } from "./constituenta-HTnFtmxt.js";
5
5
  import { i as SessionModelState, r as RecalculateModelResult, s as SetModelValuesInput } from "./model-value-BUhr2IjA.js";
6
- import { n as SessionRevision, r as SessionState, t as SessionHandle } from "./session-CI4rLYby.js";
7
- import { a as SessionStateDetail, i as RestoreOrderResult, n as ApplySchemaPatchInput, o as SessionStateResult, r as ApplySchemaPatchResult } from "./agent-workflow-BTwrxOoX.js";
8
- import { i as EvaluationResult, r as EvaluateInput } from "./evaluation-Cd4S7-3t.js";
6
+ import { n as SessionRevision, r as SessionState, t as SessionHandle } from "./session-Uc_vHrq9.js";
7
+ import { a as SessionStateDetail, d as SynthesizeResult, i as RestoreOrderResult, n as ApplySchemaPatchInput, o as SessionStateResult, r as ApplySchemaPatchResult, u as SynthesizeInput } from "./agent-workflow-DY-hfAap.js";
8
+ import { i as EvaluationResult, r as EvaluateInput } from "./evaluation-6A7rK4t7.js";
9
9
 
10
10
  //#region src/models/portal-json.d.ts
11
11
  /** Portal JSON import/export format version (schema and model files). */
@@ -103,7 +103,7 @@ type ExportPortalResult = string | PortalSchemaImportData | PortalModelImportDat
103
103
  //#endregion
104
104
  //#region src/models/tool-contract.d.ts
105
105
  /** Agent-visible contract version; bump on breaking API changes. */
106
- declare const CONTRACT_VERSION = "3.1.0";
106
+ declare const CONTRACT_VERSION = "3.2.0";
107
107
  /** Options for constructing an {@link RSToolAgent}. */
108
108
  interface RSToolAgentOptions {
109
109
  /** When set, sessions are persisted to this directory and survive process restarts. */
@@ -163,7 +163,12 @@ interface RSToolAgentContract {
163
163
  * otherwise stable against type/kernel preferred ranks.
164
164
  */
165
165
  restoreOrder(sessionId?: string): RestoreOrderResult;
166
+ /**
167
+ * Synthesis by embedding: merge constituents from another session into the receiver,
168
+ * then apply an identification table.
169
+ */
170
+ synthesize(input: SynthesizeInput, sessionId?: string): SynthesizeResult;
166
171
  }
167
172
  //#endregion
168
173
  export { ExportPortalInput as a, PortalExportKind as c, PortalModelImportData as d, PortalRsformDetails as f, portalItemToDraft as g, PortalTermForm as h, ExportFormat as i, PORTAL_JSON_CONTRACT_VERSION as l, PortalSchemaImportData as m, RSToolAgentContract as n, ExportPortalResult as o, PortalSchemaConstituenta as p, RSToolAgentOptions as r, ImportDataKind as s, CONTRACT_VERSION as t, PortalImportMetadata as u };
169
- //# sourceMappingURL=tool-contract-BUaDRHoO.d.ts.map
174
+ //# sourceMappingURL=tool-contract-i0v2gbWs.d.ts.map
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as RSToolAgent } from "../models-LMyDB0md.js";
2
+ import { t as RSToolAgent } from "../models-BKmWx92e.js";
3
3
  import readline from "node:readline";
4
4
  //#region src/wrapper/stdio-handler.ts
5
5
  const STDIO_METHODS = [
@@ -19,7 +19,8 @@ const STDIO_METHODS = [
19
19
  "getModelState",
20
20
  "evaluate",
21
21
  "recalculateModel",
22
- "restoreOrder"
22
+ "restoreOrder",
23
+ "synthesize"
23
24
  ];
24
25
  function asObject(value) {
25
26
  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
@@ -144,6 +145,11 @@ async function handleStdioRequest(tool, request) {
144
145
  ok: true,
145
146
  result: tool.restoreOrder(optionalSessionId(params))
146
147
  };
148
+ case "synthesize": return {
149
+ id: request.id,
150
+ ok: true,
151
+ result: tool.synthesize(omitSessionId(params), optionalSessionId(params))
152
+ };
147
153
  default: return {
148
154
  id: request.id ?? null,
149
155
  ok: false,
@@ -1 +1 @@
1
- {"version":3,"file":"stdio-wrapper.js","names":[],"sources":["../../src/wrapper/stdio-handler.ts","../../src/wrapper/stdio-wrapper.ts"],"sourcesContent":["import type { RSToolAgent } from '../models/rstool-agent';\n\nexport interface StdioRequest {\n id: string | number;\n method: string;\n params?: unknown;\n}\n\nexport interface StdioResponse {\n id: string | number | null;\n ok: boolean;\n result?: unknown;\n error?: {\n code: string;\n message: string;\n details?: unknown;\n };\n}\n\nexport const STDIO_METHODS = [\n 'ensureSession',\n 'createSession',\n 'getCurrentSession',\n 'setCurrentSession',\n 'applySchemaPatch',\n 'getSessionState',\n 'listDiagnostics',\n 'analyzeExpression',\n 'commitStep',\n 'exportSession',\n 'exportPortal',\n 'importData',\n 'setModelValues',\n 'getModelState',\n 'evaluate',\n 'recalculateModel',\n 'restoreOrder'\n] as const;\n\nfunction asObject(value: unknown): Record<string, unknown> {\n if (!value || typeof value !== 'object' || Array.isArray(value)) {\n return {};\n }\n return value as Record<string, unknown>;\n}\n\nfunction requiredString(input: Record<string, unknown>, key: string): string {\n const value = input[key];\n if (typeof value !== 'string' || value.length === 0) {\n throw new Error(`Missing or invalid \"${key}\"`);\n }\n return value;\n}\n\nfunction optionalSessionId(input: Record<string, unknown>): string | undefined {\n const value = input.sessionId;\n return typeof value === 'string' && value.length > 0 ? value : undefined;\n}\n\nfunction omitSessionId(input: Record<string, unknown>): Record<string, unknown> {\n const { sessionId: _sessionId, ...rest } = input;\n return rest;\n}\n\nexport async function handleStdioRequest(tool: RSToolAgent, request: StdioRequest): Promise<StdioResponse> {\n try {\n const params = asObject(request.params);\n switch (request.method) {\n case 'ping':\n return { id: request.id, ok: true, result: { pong: true, contractVersion: tool.contractVersion } };\n case 'methods':\n return { id: request.id, ok: true, result: STDIO_METHODS };\n case 'ensureSession':\n return {\n id: request.id,\n ok: true,\n result: tool.ensureSession(params.initial as never)\n };\n case 'createSession':\n return {\n id: request.id,\n ok: true,\n result: tool.createSession(params.initial as never)\n };\n case 'getCurrentSession':\n return {\n id: request.id,\n ok: true,\n result: tool.getCurrentSession()\n };\n case 'setCurrentSession':\n return {\n id: request.id,\n ok: true,\n result: tool.setCurrentSession(requiredString(params, 'sessionId'))\n };\n case 'applySchemaPatch':\n return {\n id: request.id,\n ok: true,\n result: tool.applySchemaPatch(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'getSessionState':\n return {\n id: request.id,\n ok: true,\n result: tool.getSessionState(\n (params.detail as 'summary' | 'full' | undefined) ?? 'summary',\n optionalSessionId(params)\n )\n };\n case 'listDiagnostics': {\n const constituentId = params.constituentId;\n const filters = typeof constituentId === 'number' ? { constituentId } : (params.filters as never);\n return {\n id: request.id,\n ok: true,\n result: tool.listDiagnostics(filters, optionalSessionId(params))\n };\n }\n case 'analyzeExpression':\n return {\n id: request.id,\n ok: true,\n result: tool.analyzeExpression(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'commitStep':\n return {\n id: request.id,\n ok: true,\n result: tool.commitStep(params.message as string | undefined, optionalSessionId(params))\n };\n case 'exportSession':\n return {\n id: request.id,\n ok: true,\n result: tool.exportSession(optionalSessionId(params))\n };\n case 'exportPortal':\n return {\n id: request.id,\n ok: true,\n result: tool.exportPortal(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'importData':\n return {\n id: request.id,\n ok: true,\n result: tool.importData(params.payload as string | object, params.kind as never)\n };\n case 'setModelValues':\n return {\n id: request.id,\n ok: true,\n result: await tool.setModelValues(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'getModelState':\n return {\n id: request.id,\n ok: true,\n result: tool.getModelState(optionalSessionId(params))\n };\n case 'evaluate':\n return {\n id: request.id,\n ok: true,\n result: tool.evaluate(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'recalculateModel':\n return {\n id: request.id,\n ok: true,\n result: tool.recalculateModel(optionalSessionId(params))\n };\n case 'restoreOrder':\n return {\n id: request.id,\n ok: true,\n result: tool.restoreOrder(optionalSessionId(params))\n };\n default:\n return {\n id: request.id ?? null,\n ok: false,\n error: {\n code: 'METHOD_NOT_FOUND',\n message: `Unknown method: ${request.method}`\n }\n };\n }\n } catch (error) {\n return {\n id: request.id ?? null,\n ok: false,\n error: {\n code: 'INTERNAL_ERROR',\n message: error instanceof Error ? error.message : 'Unknown error',\n details: error\n }\n };\n }\n}\n","#!/usr/bin/env node\nimport readline from 'node:readline';\n\nimport { RSToolAgent } from '../models/rstool-agent';\nimport { handleStdioRequest, type StdioRequest, type StdioResponse } from './stdio-handler';\n\nconst persistenceDir = process.env.RSTOOL_PERSISTENCE_DIR;\nconst tool = new RSToolAgent(persistenceDir ? { persistenceDir } : {});\n\nfunction writeResponse(response: StdioResponse): void {\n if (!process.stdout.writable || process.stdout.destroyed || process.stdout.writableEnded) {\n return;\n }\n try {\n process.stdout.write(`${JSON.stringify(response)}\\n`);\n } catch {\n // The client might have already closed stdout (EPIPE). Safe to ignore.\n }\n}\n\nconst input = readline.createInterface({\n input: process.stdin,\n crlfDelay: Infinity\n});\n\nwriteResponse({\n id: null,\n ok: true,\n result: {\n ready: true,\n wrapper: 'rstool-stdio',\n contractVersion: tool.contractVersion\n }\n});\n\ninput.on('line', line => {\n if (!line.trim()) {\n return;\n }\n try {\n const request = JSON.parse(line) as StdioRequest;\n if (!('id' in request) || !('method' in request)) {\n throw new Error('Request must include \"id\" and \"method\"');\n }\n void handleStdioRequest(tool, request).then(writeResponse);\n } catch (error) {\n writeResponse({\n id: null,\n ok: false,\n error: {\n code: 'BAD_REQUEST',\n message: error instanceof Error ? error.message : 'Invalid JSON'\n }\n });\n }\n});\n"],"mappings":"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"}
1
+ {"version":3,"file":"stdio-wrapper.js","names":[],"sources":["../../src/wrapper/stdio-handler.ts","../../src/wrapper/stdio-wrapper.ts"],"sourcesContent":["import type { RSToolAgent } from '../models/rstool-agent';\n\nexport interface StdioRequest {\n id: string | number;\n method: string;\n params?: unknown;\n}\n\nexport interface StdioResponse {\n id: string | number | null;\n ok: boolean;\n result?: unknown;\n error?: {\n code: string;\n message: string;\n details?: unknown;\n };\n}\n\nexport const STDIO_METHODS = [\n 'ensureSession',\n 'createSession',\n 'getCurrentSession',\n 'setCurrentSession',\n 'applySchemaPatch',\n 'getSessionState',\n 'listDiagnostics',\n 'analyzeExpression',\n 'commitStep',\n 'exportSession',\n 'exportPortal',\n 'importData',\n 'setModelValues',\n 'getModelState',\n 'evaluate',\n 'recalculateModel',\n 'restoreOrder',\n 'synthesize'\n] as const;\n\nfunction asObject(value: unknown): Record<string, unknown> {\n if (!value || typeof value !== 'object' || Array.isArray(value)) {\n return {};\n }\n return value as Record<string, unknown>;\n}\n\nfunction requiredString(input: Record<string, unknown>, key: string): string {\n const value = input[key];\n if (typeof value !== 'string' || value.length === 0) {\n throw new Error(`Missing or invalid \"${key}\"`);\n }\n return value;\n}\n\nfunction optionalSessionId(input: Record<string, unknown>): string | undefined {\n const value = input.sessionId;\n return typeof value === 'string' && value.length > 0 ? value : undefined;\n}\n\nfunction omitSessionId(input: Record<string, unknown>): Record<string, unknown> {\n const { sessionId: _sessionId, ...rest } = input;\n return rest;\n}\n\nexport async function handleStdioRequest(tool: RSToolAgent, request: StdioRequest): Promise<StdioResponse> {\n try {\n const params = asObject(request.params);\n switch (request.method) {\n case 'ping':\n return { id: request.id, ok: true, result: { pong: true, contractVersion: tool.contractVersion } };\n case 'methods':\n return { id: request.id, ok: true, result: STDIO_METHODS };\n case 'ensureSession':\n return {\n id: request.id,\n ok: true,\n result: tool.ensureSession(params.initial as never)\n };\n case 'createSession':\n return {\n id: request.id,\n ok: true,\n result: tool.createSession(params.initial as never)\n };\n case 'getCurrentSession':\n return {\n id: request.id,\n ok: true,\n result: tool.getCurrentSession()\n };\n case 'setCurrentSession':\n return {\n id: request.id,\n ok: true,\n result: tool.setCurrentSession(requiredString(params, 'sessionId'))\n };\n case 'applySchemaPatch':\n return {\n id: request.id,\n ok: true,\n result: tool.applySchemaPatch(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'getSessionState':\n return {\n id: request.id,\n ok: true,\n result: tool.getSessionState(\n (params.detail as 'summary' | 'full' | undefined) ?? 'summary',\n optionalSessionId(params)\n )\n };\n case 'listDiagnostics': {\n const constituentId = params.constituentId;\n const filters = typeof constituentId === 'number' ? { constituentId } : (params.filters as never);\n return {\n id: request.id,\n ok: true,\n result: tool.listDiagnostics(filters, optionalSessionId(params))\n };\n }\n case 'analyzeExpression':\n return {\n id: request.id,\n ok: true,\n result: tool.analyzeExpression(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'commitStep':\n return {\n id: request.id,\n ok: true,\n result: tool.commitStep(params.message as string | undefined, optionalSessionId(params))\n };\n case 'exportSession':\n return {\n id: request.id,\n ok: true,\n result: tool.exportSession(optionalSessionId(params))\n };\n case 'exportPortal':\n return {\n id: request.id,\n ok: true,\n result: tool.exportPortal(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'importData':\n return {\n id: request.id,\n ok: true,\n result: tool.importData(params.payload as string | object, params.kind as never)\n };\n case 'setModelValues':\n return {\n id: request.id,\n ok: true,\n result: await tool.setModelValues(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'getModelState':\n return {\n id: request.id,\n ok: true,\n result: tool.getModelState(optionalSessionId(params))\n };\n case 'evaluate':\n return {\n id: request.id,\n ok: true,\n result: tool.evaluate(omitSessionId(params) as never, optionalSessionId(params))\n };\n case 'recalculateModel':\n return {\n id: request.id,\n ok: true,\n result: tool.recalculateModel(optionalSessionId(params))\n };\n case 'restoreOrder':\n return {\n id: request.id,\n ok: true,\n result: tool.restoreOrder(optionalSessionId(params))\n };\n case 'synthesize':\n return {\n id: request.id,\n ok: true,\n result: tool.synthesize(omitSessionId(params) as never, optionalSessionId(params))\n };\n default:\n return {\n id: request.id ?? null,\n ok: false,\n error: {\n code: 'METHOD_NOT_FOUND',\n message: `Unknown method: ${request.method}`\n }\n };\n }\n } catch (error) {\n return {\n id: request.id ?? null,\n ok: false,\n error: {\n code: 'INTERNAL_ERROR',\n message: error instanceof Error ? error.message : 'Unknown error',\n details: error\n }\n };\n }\n}\n","#!/usr/bin/env node\nimport readline from 'node:readline';\n\nimport { RSToolAgent } from '../models/rstool-agent';\nimport { handleStdioRequest, type StdioRequest, type StdioResponse } from './stdio-handler';\n\nconst persistenceDir = process.env.RSTOOL_PERSISTENCE_DIR;\nconst tool = new RSToolAgent(persistenceDir ? { persistenceDir } : {});\n\nfunction writeResponse(response: StdioResponse): void {\n if (!process.stdout.writable || process.stdout.destroyed || process.stdout.writableEnded) {\n return;\n }\n try {\n process.stdout.write(`${JSON.stringify(response)}\\n`);\n } catch {\n // The client might have already closed stdout (EPIPE). Safe to ignore.\n }\n}\n\nconst input = readline.createInterface({\n input: process.stdin,\n crlfDelay: Infinity\n});\n\nwriteResponse({\n id: null,\n ok: true,\n result: {\n ready: true,\n wrapper: 'rstool-stdio',\n contractVersion: tool.contractVersion\n }\n});\n\ninput.on('line', line => {\n if (!line.trim()) {\n return;\n }\n try {\n const request = JSON.parse(line) as StdioRequest;\n if (!('id' in request) || !('method' in request)) {\n throw new Error('Request must include \"id\" and \"method\"');\n }\n void handleStdioRequest(tool, request).then(writeResponse);\n } catch (error) {\n writeResponse({\n id: null,\n ok: false,\n error: {\n code: 'BAD_REQUEST',\n message: error instanceof Error ? error.message : 'Invalid JSON'\n }\n });\n }\n});\n"],"mappings":"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"}
package/docs/DOMAIN.md CHANGED
@@ -55,10 +55,17 @@
55
55
  - **Основание** — конституента, из которой формально порождают новые термы.
56
56
  - **Порожденная конституента** — построена из основания без новой предметной договоренности.
57
57
 
58
- ## ОСС и синтез
58
+ ## Синтез
59
59
 
60
+ - **Синтез** — общее название операций объединения концептуальных схем через таблицу отождествлений.
61
+ - **Встраивание** — вставка конституент одной КС в другую (с опциональной таблицей отождествлений). В Portal UI — «Встраивание схемы»; в rstool — метод `synthesize`.
62
+ - **Отождествление** — замена одной конституенты другой по таблице отождествлений.
63
+
64
+ ## ОСС
65
+
66
+ - **Операционная схема синтеза (`ОСС`)** — граф загрузок и синтезов КС.
60
67
  - **Загрузка** добавляет внешнюю или собственную КС в ОСС.
61
- - **Синтез** строит новую КС из операций-аргументов через таблицу отождествлений.
68
+ - **Синтез (операция ОСС)** строит новую КС из операций-аргументов через таблицу отождествлений.
62
69
  - **Наследованные конституенты** пришли из исходных схем; их определения обычно read-only.
63
70
  - **Сквозные изменения** идут от исходной конституенты к наследникам.
64
71
  - **Ромбовидный синтез** использует КС с общими предками; чаще требует ручного отождествления дублей.
package/docs/README.md CHANGED
@@ -6,7 +6,7 @@
6
6
 
7
7
  ## Какой файл читать
8
8
 
9
- - **DOMAIN.md** — термины Portal: конституента, неопределяемые и производные понятия, ядро/тело КС, интерпретация, ОСС, синтез.
9
+ - **DOMAIN.md** — термины Portal: конституента, неопределяемые и производные понятия, ядро/тело КС, интерпретация, синтез / встраивание, ОСС.
10
10
  - **CONCEPTUAL-SCHEMA.md** — проектирование и ревью концептуальных схем (в т.ч. терм-функция вместо множества пар).
11
11
  - **CONSTITUENTA.md** — структура и правила конституент.
12
12
  - **BASE-SELECTION.md** — выбор основания: `X#`, `C#` или `Z`.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsconcept/rstool",
3
- "version": "1.6.0",
3
+ "version": "1.7.0",
4
4
  "description": "Agent-facing library for incremental RSForm construction, RSLang analysis, diagnostics, modeling, and evaluation. Wraps @rsconcept/domain with a deterministic session contract.",
5
5
  "license": "MIT",
6
6
  "author": "IRBorisov",
@@ -255,6 +255,31 @@ const forPortal = tool.exportPortal({ kind: 'schema' });
255
255
 
256
256
  Не передавай `/details` с `kind: 'session'`. REST и curl — [PORTAL-API.md](../../docs/PORTAL-API.md).
257
257
 
258
+ ## Встраивание схемы (синтез)
259
+
260
+ ```ts
261
+ const receiver = tool.createSession({ title: 'Base' });
262
+ tool.applySchemaPatch({ items: [{ alias: 'X1', term: 'человек' }] }, receiver.sessionId);
263
+
264
+ const source = tool.createSession({ title: 'Donor' });
265
+ tool.applySchemaPatch(
266
+ {
267
+ items: [
268
+ { alias: 'X1', term: 'персона' },
269
+ { alias: 'S1', definitionFormal: 'ℬ(X1)' }
270
+ ]
271
+ },
272
+ source.sessionId
273
+ );
274
+
275
+ tool.setCurrentSession(receiver.sessionId);
276
+ tool.synthesize({
277
+ sourceSessionId: source.sessionId,
278
+ substitutions: [{ original: 'X1', substitution: 'X1' }] // source X1 → receiver X1
279
+ });
280
+ // receiver: X1 (человек), S1 = ℬ(X1) — импортированный X1 отождествлён и удалён
281
+ ```
282
+
258
283
  ## Образец текста ревью (не код)
259
284
 
260
285
  После [воркфлоу ревью](GUIDE.md#ревью--оценка-готовой-кс) ответ может выглядеть так:
@@ -14,7 +14,7 @@
14
14
 
15
15
  ## Быстрый контракт для агента
16
16
 
17
- - Library API: `tool.applySchemaPatch(input, sessionId?)` — единственный путь правки схемы.
17
+ - Library API: `tool.applySchemaPatch(input, sessionId?)` — основной путь правки схемы; `synthesize` — встраивание конституент из другой сессии (синтез с таблицей отождествлений).
18
18
  - Stdio/MCP: **плоские** `params` — поля метода и optional `sessionId` на одном уровне (без `params.input`).
19
19
  - Состояние: `getSessionState()` (summary) или `getSessionState('full')`.
20
20
  - Импорт/экспорт Portal: `importData`, `exportPortal({ kind })`.
@@ -225,6 +225,7 @@ kind `auto` (default) определит `portal-details` или `portal-schema`
225
225
  | `convention` | конвенция |
226
226
  | `comment` | комментарий |
227
227
  | `applySchemaPatch` | правка схемы |
228
+ | `synthesize` | встраивание / синтез схем |
228
229
  | `analyzeExpression` | проверка / анализ выражения |
229
230
  | `listDiagnostics`, `diagnostics` | диагностики |
230
231
  | `setModelValues`, `getModelState` | интерпретация, значения модели |
@@ -5,7 +5,7 @@
5
5
  ## Контракт rstool
6
6
 
7
7
  - Пакет: `@rsconcept/rstool`
8
- - Версия контракта: `3.1.0` (`CONTRACT_VERSION`)
8
+ - Версия контракта: `3.2.0` (`CONTRACT_VERSION`)
9
9
  - Основной класс: `RSToolAgent`
10
10
  - Публичные импорты: `@rsconcept/rstool` и `@rsconcept/rstool/wrapper`
11
11
  - Опции: `new RSToolAgent({ persistenceDir? })` — каталог для сохранения сессий между перезапусками (stdio/MCP: `RSTOOL_PERSISTENCE_DIR`)
@@ -14,25 +14,26 @@
14
14
 
15
15
  ### Методы library API
16
16
 
17
- | Метод | Назначение |
18
- | ---------------------------------------------- | ------------------------------------------- |
19
- | `ensureSession(initial?)` | Вернуть текущую сессию или создать новую |
20
- | `createSession(initial?)` | Новая in-memory сессия (становится текущей) |
21
- | `getCurrentSession()` | Текущая активная сессия или `null` |
22
- | `setCurrentSession(sessionId)` | Сделать сессию текущей |
23
- | `applySchemaPatch(input, sessionId?)` | Единственный путь правки схемы |
24
- | `getSessionState(detail?, sessionId?)` | `summary` (default) или `full` |
25
- | `listDiagnostics(filters?, sessionId?)` | Активные диагностики |
26
- | `analyzeExpression(input, sessionId?)` | Разбор без сохранения |
27
- | `commitStep(message?, sessionId?)` | Ревизия |
28
- | `exportSession(sessionId?)` | JSON-строка сессии |
29
- | `exportPortal({ kind, format? }, sessionId?)` | Portal Load from JSON |
30
- | `importData(payload, kind?)` | Импорт сессии / Portal |
31
- | `setModelValues({ set?, clear? }, sessionId?)` | Значения модели (**async** — `await`) |
32
- | `getModelState(sessionId?)` | Состояние интерпретации |
33
- | `evaluate(input, sessionId?)` | Scratch или конституента |
34
- | `recalculateModel(sessionId?)` | Пересчёт производных |
35
- | `restoreOrder(sessionId?)` | Упорядочить конституенты (топология + семантика) |
17
+ | Метод | Назначение |
18
+ | ---------------------------------------------- | ------------------------------------------------------------------ |
19
+ | `ensureSession(initial?)` | Вернуть текущую сессию или создать новую |
20
+ | `createSession(initial?)` | Новая in-memory сессия (становится текущей) |
21
+ | `getCurrentSession()` | Текущая активная сессия или `null` |
22
+ | `setCurrentSession(sessionId)` | Сделать сессию текущей |
23
+ | `applySchemaPatch(input, sessionId?)` | Единственный путь правки схемы |
24
+ | `getSessionState(detail?, sessionId?)` | `summary` (default) или `full` |
25
+ | `listDiagnostics(filters?, sessionId?)` | Активные диагностики |
26
+ | `analyzeExpression(input, sessionId?)` | Разбор без сохранения |
27
+ | `commitStep(message?, sessionId?)` | Ревизия |
28
+ | `exportSession(sessionId?)` | JSON-строка сессии |
29
+ | `exportPortal({ kind, format? }, sessionId?)` | Portal Load from JSON |
30
+ | `importData(payload, kind?)` | Импорт сессии / Portal |
31
+ | `setModelValues({ set?, clear? }, sessionId?)` | Значения модели (**async** — `await`) |
32
+ | `getModelState(sessionId?)` | Состояние интерпретации |
33
+ | `evaluate(input, sessionId?)` | Scratch или конституента |
34
+ | `recalculateModel(sessionId?)` | Пересчёт производных |
35
+ | `restoreOrder(sessionId?)` | Упорядочить конституенты (топология + семантика) |
36
+ | `synthesize(input, sessionId?)` | Синтез (встраивание): слить другую сессию + таблица отождествлений |
36
37
 
37
38
  Служебные (stdio / MCP): `ping` / `pong`+`contractVersion`; `methods` / `list_methods`.
38
39
 
@@ -61,6 +62,7 @@ Stdio использует **camelCase** имён методов (как library
61
62
  | `evaluate` | `evaluate` |
62
63
  | `recalculateModel` | `recalculate_model` |
63
64
  | `restoreOrder` | `restore_order` |
65
+ | `synthesize` | `synthesize` |
64
66
 
65
67
  ## `applySchemaPatch`
66
68
 
@@ -171,6 +173,35 @@ const { orderedAliases } = tool.restoreOrder();
171
173
  // → { orderedIds: number[], orderedAliases: string[] }
172
174
  ```
173
175
 
176
+ ## `synthesize`
177
+
178
+ **Синтез** в rstool сейчас — это **встраивание** схемы: вставка конституент из другой сессии в текущую с опциональной таблицей отождествлений (как «Встраивание схемы» в Portal UI).
179
+
180
+ ```ts
181
+ const receiver = tool.createSession();
182
+ const source = tool.createSession();
183
+ tool.applySchemaPatch({ items: [{ alias: 'X1' }] }, source.sessionId);
184
+
185
+ tool.setCurrentSession(receiver.sessionId);
186
+ tool.synthesize({
187
+ sourceSessionId: source.sessionId,
188
+ // items?: ['X1'], // optional subset of source aliases
189
+ substitutions: [{ original: 'X1', substitution: 'X1' }], // source → receiver
190
+ commitMessage: 'merge'
191
+ });
192
+ ```
193
+
194
+ **Вход**
195
+
196
+ | Поле | Смысл |
197
+ | ----------------- | --------------------------------------------------------------------------------------------- |
198
+ | `sourceSessionId` | Сессия-источник (не должна совпадать с receiver) |
199
+ | `items?` | Алиасы конституент источника; пусто / omit — все |
200
+ | `substitutions?` | Таблица отождествлений по алиасам: в каждой строке один алиас источника и один алиас receiver |
201
+ | `commitMessage?` | Ревизия после успеха |
202
+
203
+ Алиасы импорта перенумеровываются при непустом receiver (`X1` → `X2`, …). Формулы и текстовые ссылки обновляются. Результат: `summary`, `idMap`, `aliasMapping`, `deletedIds`, `insertedIds`, и опционально `revision` (если был `commitMessage`). Также `success` / `failed` — как у `applySchemaPatch` (режим best-effort после встраивания).
204
+
174
205
  ## `importData` / `exportSession` / `exportPortal`
175
206
 
176
207
  ### `importData(payload, kind?)`
package/src/index.ts CHANGED
@@ -54,6 +54,9 @@ export {
54
54
  type SessionSummaryItem,
55
55
  type SessionState,
56
56
  type SetConstituentaValueInput,
57
- type SetModelValuesInput
57
+ type SetModelValuesInput,
58
+ type SynthesisSubstitution,
59
+ type SynthesizeInput,
60
+ type SynthesizeResult
58
61
  } from './models';
59
62
  export { RSToolWrapperClient, type RSToolWrapperClientOptions, type WrapperResponse } from './wrapper/client';
@@ -1,10 +1,10 @@
1
1
  import {
2
- type Constituenta,
3
2
  type CstDiagnostic,
4
3
  DiagnosticKind,
5
4
  modelStatusCstDiagnostic,
6
5
  RSDiagnosticCode
7
6
  } from '@rsconcept/domain/library';
7
+ import { type DiagnosticSourceFields } from '@rsconcept/domain/library/rsform-api';
8
8
  import { EvalStatus } from '@rsconcept/domain/library/rsmodel';
9
9
  import { isCritical, RSErrorCode, type RSErrorDescription } from '@rsconcept/domain/rslang/error';
10
10
 
@@ -43,7 +43,7 @@ export function getDiagnosticSeverity(code: number): DiagnosticSeverity {
43
43
  return isCritical(code as RSErrorCode) ? 'error' : 'warning';
44
44
  }
45
45
 
46
- export function expandCstDiagnostic(cst: Constituenta, diagnostic: CstDiagnostic): Diagnostic {
46
+ export function expandCstDiagnostic(cst: DiagnosticSourceFields, diagnostic: CstDiagnostic): Diagnostic {
47
47
  const expression = expressionForCstDiagnostic(cst, diagnostic);
48
48
  return {
49
49
  ...diagnostic,
@@ -76,12 +76,12 @@ export function expressionDiagnostic(
76
76
  };
77
77
  }
78
78
 
79
- export function modelStatusDiagnostic(status: EvalStatus, cst: Constituenta): Diagnostic | null {
79
+ export function modelStatusDiagnostic(status: EvalStatus, cst: DiagnosticSourceFields): Diagnostic | null {
80
80
  const base = modelStatusCstDiagnostic(status, cst.cst_type);
81
81
  return base ? expandCstDiagnostic(cst, base) : null;
82
82
  }
83
83
 
84
- function expressionForCstDiagnostic(cst: Constituenta, diagnostic: CstDiagnostic): string {
84
+ function expressionForCstDiagnostic(cst: DiagnosticSourceFields, diagnostic: CstDiagnostic): string {
85
85
  switch (diagnostic.code) {
86
86
  case RSDiagnosticCode.schemaHomonym:
87
87
  case RSDiagnosticCode.schemaMissingTerm: