@acorex/modules 21.0.0-next.54 → 21.0.0-next.55

package/fesm2022/acorex-modules-ai-management.mjs

@@ -1,8 +1,8 @@
 import { AXPSessionService, AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
-import { AXPSettingsService, AXPRegionalSetting, AXPFileStorageStatus, AXPFileStorageService, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER } from '@acorex/platform/common';
+import { AXPOutputContractTranscriptSegmentService, AXPSettingsService, AXPRegionalSetting, AXPFileStorageStatus, AXPFileStorageService, AXP_AGENT_OUTPUT_CONTRACT_DEFAULT_STRUCTURED_RETRIES, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER, AXP_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_PROVIDER } from '@acorex/platform/common';
 import * as i1$1 from '@acorex/platform/core';
 import { objectKeyValueTransforms, AXPTagProvider, AXPPlatformScope, AXPComponentSlotModule, AXP_MODULE_MANIFEST_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXP_TAG_PROVIDER } from '@acorex/platform/core';
-import { AXPEntityService, AXP_ENTITY_DEFINITION_LOADER, axpCreateEntityAiToolInputDefaults } from '@acorex/platform/layout/entity';
+import { AXPEntityService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import { AXPWidgetsCatalog, AXPWidgetGroupEnum, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
 import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXPWidgetsModule } from '@acorex/platform/layout/widgets';
 import * as i0 from '@angular/core';
@@ -75,6 +75,13 @@ const RootConfig = {
             titlePlural: '@ai-management:open-ai-endpoints.entities.endpoint.plural',
             icon: 'fa-light fa-plug',
         },
+        rule: {
+            name: 'AiRule',
+            fullName: `${config.module}.AiRule`,
+            title: '@ai-management:rules.entities.rule.title',
+            titlePlural: '@ai-management:rules.entities.rule.plural',
+            icon: 'fa-light fa-list-check',
+        },
     },
 };
 //#endregion
@@ -113,11 +120,13 @@ class AXMAiManagementEntityProvider {
             case RootConfig.entities.model.name:
                 return (await import('./acorex-modules-ai-management-model.entity-DiDaXVa3.mjs')).factory();
             case RootConfig.entities.assist.name:
-                return (await import('./acorex-modules-ai-management-assist.entity-CnyoIO-Z.mjs')).assistFactory();
+                return (await import('./acorex-modules-ai-management-assist.entity-2h5KE9UH.mjs')).assistFactory();
             case RootConfig.entities.agent.name:
-                return (await import('./acorex-modules-ai-management-agent.entity-D6-0_Ms3.mjs')).agentFactory();
+                return (await import('./acorex-modules-ai-management-agent.entity-X51GLTdi.mjs')).agentFactory();
             case RootConfig.entities.openAiEndpoint.name:
                 return (await import('./acorex-modules-ai-management-open-ai-endpoint.entity-CZLNKtl0.mjs')).openAiEndpointFactory();
+            case RootConfig.entities.rule.name:
+                return (await import('./acorex-modules-ai-management-rule.entity-CQNx4QEB.mjs')).ruleFactory();
             default:
                 return null;
         }
@@ -147,6 +156,8 @@ const AXPAiManagementMenuKeys = {
     Assists: 'AiManagement:Menu:Assists',
     /** Delegated specialist agents (supervisor routing). */
     Agents: 'AiManagement:Menu:Agents',
+    /** Reusable system-prompt rules (Markdown fragments). */
+    Rules: 'AiManagement:Menu:Rules',
 };
 //#endregion
 
@@ -228,6 +239,14 @@ class AXMAiManagementMenuProvider {
                 priority: 1,
                 policy: aiMenuPolicy,
             },
+            {
+                name: AXPAiManagementMenuKeys.Rules,
+                text: '@ai-management:module.menus.rules.title',
+                path: this.entityService.createPath(module.name, RootConfig.entities.rule.name),
+                icon: RootConfig.entities.rule.icon,
+                priority: 3,
+                policy: aiMenuPolicy,
+            },
         ]);
         //#endregion
     }
@@ -644,30 +663,26 @@ const AI_MODEL_SPEECH_CATALOG_DATASOURCE_NAME = 'ai-management-model-catalog-spe
  * Registry name: {@link AI_MODEL_TTS_CATALOG_DATASOURCE_NAME}.
  */
 const AI_MODEL_TTS_CATALOG_DATASOURCE_NAME = 'ai-management-model-catalog-tts';
-/** Normalizes `modelPurposes` (and legacy `modelPurpose`) to unique non-empty slugs. */
-function normalizeModelPurposes(row) {
+/** Reads `modelPurposes` from a catalog row (API/mock must provide the array). */
+function readModelPurposes(row) {
     if (!row) {
-        return ['chat'];
+        return [];
     }
     const multi = row['modelPurposes'];
-    if (Array.isArray(multi) && multi.length > 0) {
-        const out = multi
-            .map((x) => String(x).trim())
-            .filter((x) => x.length > 0);
-        return [...new Set(out)];
-    }
-    const legacy = row['modelPurpose'];
-    if (legacy == null || legacy === '') {
-        return ['chat'];
+    if (!Array.isArray(multi)) {
+        return [];
     }
-    return [String(legacy)];
+    const out = multi
+        .map((x) => String(x).trim())
+        .filter((x) => x.length > 0);
+    return [...new Set(out)];
 }
 function modelRowHasPurpose(row, purpose) {
-    return normalizeModelPurposes(row).includes(purpose);
+    return readModelPurposes(row).includes(purpose);
 }
 /** Rows usable in chat / completion pickers: include `chat` or `vision`; not image/speech/tts-only. */
 function isChatPurposeModelRow(row) {
-    const p = normalizeModelPurposes(row);
+    const p = readModelPurposes(row);
     return p.includes('chat') || p.includes('vision');
 }
 function isImagePurposeModelRow(row) {
@@ -822,6 +837,65 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             type: Injectable
         }] });
 
+//#region ---- Imports ----
+//#endregion
+/** Registry name for transcript-segment presets ({@link AXP_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_PROVIDER}). */
+const AI_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_DATASOURCE_NAME = 'ai-management-output-contract-transcript-segment';
+//#endregion
+//#region ---- Provider ----
+class AXMOutputContractTranscriptSegmentDataSourceDefinition {
+    constructor() {
+        this.segmentService = inject(AXPOutputContractTranscriptSegmentService);
+    }
+    items() {
+        const columns = [
+            { name: 'id', title: 'ID', datatype: 'string', type: AXPWidgetsList.Editors.TextBox },
+            { name: 'title', title: 'Title', datatype: 'string', type: AXPWidgetsList.Editors.TextBox },
+        ];
+        return Promise.resolve([
+            {
+                name: AI_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_DATASOURCE_NAME,
+                title: 'AI output contract (transcript segment)',
+                source: () => new AXDataSource({
+                    key: 'id',
+                    load: async () => {
+                        const definitions = await this.segmentService.getAll();
+                        const items = definitions.map((d) => ({
+                            id: d.name,
+                            name: d.name,
+                            title: d.title,
+                            ...(d.description ? { description: d.description } : {}),
+                        }));
+                        return { items, total: items.length };
+                    },
+                    byKey: async (key) => {
+                        const definition = await this.segmentService.get(key);
+                        if (!definition) {
+                            return null;
+                        }
+                        return {
+                            id: definition.name,
+                            name: definition.name,
+                            title: definition.title,
+                            ...(definition.description ? { description: definition.description } : {}),
+                        };
+                    },
+                    pageSize: 100,
+                }),
+                columns,
+                filters: [],
+                textField: { name: 'title', title: 'Title' },
+                valueField: { name: 'id', title: 'ID' },
+            },
+        ]);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMOutputContractTranscriptSegmentDataSourceDefinition, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMOutputContractTranscriptSegmentDataSourceDefinition }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMOutputContractTranscriptSegmentDataSourceDefinition, decorators: [{
+            type: Injectable
+        }] });
+
 //#region ---- Imports ----
 //#endregion
 /**
@@ -896,6 +970,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             type: Injectable
         }] });
 
+//#region ---- Imports ----
+//#endregion
 //#region ---- Structured output ----
 /** Default max completion tokens when the AiModel row has no `maxOutputTokens` and the caller omits `maxTokens`. */
 const AXPAiAssistDefaultStructuredMaxTokens = 128_000;
@@ -935,815 +1011,87 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
 
 //#region ---- Imports ----
 //#endregion
-//#region ---- Constants ----
+//#region ---- Supervisor tool naming (display / routing) ----
 /** Prefix for supervisor-delegated specialist tools (`${AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX}${agentId}`). */
 const AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX = 'agent:';
-/** Catalog `name` of the conversation follow-up delegated agent (engine auto-invoke). */
-const AXPAI_CONVERSATION_FOLLOW_UP_AGENT_NAME = 'follow-up-prompt-generator';
-/** Default cap for main assist / direct-agent chat tool rounds (one provider call per step). */
-const AXPAI_ENGINE_DEFAULT_MAX_STEPS = 16;
-/** Default cap for delegated specialist sub-runs when the agent row has no positive `maxSteps`. */
-const AXPAI_DELEGATED_AGENT_DEFAULT_MAX_STEPS = 8;
-/** System prompt for vision OCR / document text extraction. */
-const AXPAI_DOCUMENT_VISION_EXTRACTION_SYSTEM = 'You are a precise document-reading assistant. Extract readable plain text from the attached file. Preserve headings and lists where obvious. If the content is unreadable, return a short explanation. Output plain text only, no markdown code fences.';
-/** Default user line when the caller passes an empty instruction for vision extraction. */
-const AXPAI_DOCUMENT_VISION_DEFAULT_USER_INSTRUCTION = 'Extract all readable text from this document. Return plain text only.';
-//#endregion
-//#region ---- Transcript helpers ----
-/**
- * Reads a stored-file artifact from a normalized tool handler body (`{ success, data }`) or a flat `data` object.
- */
-function axpAiExtractStoredFileArtifactFromUnknown(content) {
-    if (content == null || typeof content !== 'object' || Array.isArray(content)) {
-        return null;
-    }
-    const o = content;
-    const dataRaw = o['data'];
-    if (o['success'] === true && dataRaw != null && typeof dataRaw === 'object' && !Array.isArray(dataRaw)) {
-        return axpAiExtractStoredFileArtifactFromDataRecord(dataRaw);
-    }
-    return axpAiExtractStoredFileArtifactFromDataRecord(o);
-}
-function axpAiExtractStoredFileArtifactFromDataRecord(d) {
-    const fileId = typeof d['fileId'] === 'string' ? d['fileId'].trim() : '';
-    const mimeType = typeof d['mimeType'] === 'string' ? d['mimeType'].trim() : '';
-    if (!fileId || !mimeType) {
-        return null;
-    }
-    const nameRaw = d['name'];
-    const name = typeof nameRaw === 'string' && nameRaw.trim() ? nameRaw.trim() : undefined;
-    return { fileId, mimeType, ...(name ? { name } : {}) };
-}
-/**
- * Returns the last stored-file artifact announced in any `tool` → `tool_result` segment (delegated sub-runs, main chat).
- */
-function axpAiExtractLastStoredFileArtifactFromChatMessages(messages) {
-    let last = null;
-    for (const m of messages) {
-        if (m.role !== 'tool') {
-            continue;
-        }
-        for (const r of m.responses) {
-            if (r.type !== 'tool_result') {
-                continue;
-            }
-            const hit = axpAiExtractStoredFileArtifactFromUnknown(r.content);
-            if (hit) {
-                last = hit;
-            }
-        }
-    }
-    return last;
-}
-function axpAiCloneChatMessages(messages) {
-    try {
-        return structuredClone(messages);
-    }
-    catch {
-        return JSON.parse(JSON.stringify(messages));
-    }
-}
-/**
- * Ensures the delegated specialist transcript replays stored files in assistant `responses`
- * (not only prose that points at tool JSON).
- */
-function axpAiDelegatedSubTranscriptAppendFileArtifactFromToolResults(messages) {
-    const artifact = axpAiExtractLastStoredFileArtifactFromChatMessages(messages);
-    if (!artifact) {
-        return messages;
-    }
-    const out = axpAiCloneChatMessages(messages);
-    let lastAssistant = -1;
-    for (let i = out.length - 1; i >= 0; i--) {
-        if (out[i].role === 'assistant') {
-            lastAssistant = i;
-            break;
-        }
-    }
-    if (lastAssistant < 0) {
-        return out;
-    }
-    const msg = out[lastAssistant];
-    const duplicate = msg.responses.some((r) => r.type === 'file' && r.content.fileId === artifact.fileId && r.content.mimeType === artifact.mimeType);
-    if (duplicate) {
-        return out;
-    }
-    out[lastAssistant] = {
-        ...msg,
-        responses: [...msg.responses, { type: 'file', content: artifact }],
-    };
-    return out;
-}
-function axpAiIsDelegatedAgentResultSegment(value) {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-        return false;
-    }
-    const o = value;
-    const t = o['type'];
-    if (t === 'text' && typeof o['content'] === 'string') {
-        return true;
-    }
-    if (t === 'think' && typeof o['content'] === 'string') {
-        return true;
-    }
-    if (t === 'node') {
-        return 'content' in o;
-    }
-    if (t === 'file' && o['content'] != null && typeof o['content'] === 'object' && !Array.isArray(o['content'])) {
-        const c = o['content'];
-        return typeof c['fileId'] === 'string' && typeof c['mimeType'] === 'string';
-    }
-    if (t === 'followUp' && Array.isArray(o['content'])) {
-        return axpAiNormalizeFollowUpContent(o['content']).length > 0;
-    }
-    return false;
-}
-/**
- * Parses a JSON-like array of specialist segments (e.g. from persisted tool output). Invalid entries are skipped.
- */
-function axpAiParseDelegatedAgentResultSegmentsFromUnknown(raw) {
-    if (!Array.isArray(raw)) {
-        return [];
-    }
-    const out = [];
-    for (const item of raw) {
-        if (axpAiIsDelegatedAgentResultSegment(item)) {
-            out.push(item);
-        }
-    }
-    return out;
-}
-/**
- * Collects ordered {@link AXPAiDelegatedAgentResultSegment} from a delegated sub-run transcript
- * (excludes {@link AXPAiChatMessage.delegatedReflection} lines).
- */
-function axpAiCollectDelegatedAgentOutcomeResponses(messages) {
-    const out = [];
-    for (const m of messages) {
-        if (m.role !== 'assistant' || axpAiChatMessageIsDelegatedReflectionExcluded(m)) {
-            continue;
-        }
-        for (const r of m.responses) {
-            if (r.type === 'text' || r.type === 'think' || r.type === 'file' || r.type === 'node' || r.type === 'followUp') {
-                out.push(r);
-            }
-        }
-    }
-    return out;
-}
-/**
- * Plain text from {@link AXPAiDelegatedAgentResultSegment} (text + think only; for provider hints / markdown fallbacks).
- */
-function axpAiDelegatedAgentOutcomeResponsesPlainText(segments) {
-    const parts = [];
-    for (const s of segments) {
-        if (s.type === 'text' || s.type === 'think') {
-            const t = s.content.trim();
-            if (t.length > 0) {
-                parts.push(t);
-            }
-        }
-    }
-    return parts.join('\n\n').trim();
-}
-function axpAiChatTextMessage(role, text) {
-    return {
-        role,
-        responses: [{ type: 'text', content: text }],
-    };
-}
-function axpAiChatUserMessage(responses) {
-    return {
-        role: 'user',
-        responses,
-    };
-}
-function axpAiChatMessageGetText(message) {
-    const parts = [];
-    for (const r of message.responses) {
-        if (r.type === 'text') {
-            parts.push(r.content);
-        }
-        else if (r.type === 'node' || r.type === 'followUp') {
-            try {
-                parts.push(JSON.stringify({ type: r.type, content: r.content }));
-            }
-            catch {
-                parts.push(`[${r.type}]`);
-            }
-        }
-    }
-    return parts.join('\n\n');
-}
-/**
- * Planning-only assistant output is always internal reasoning. Provider text may be untagged;
- * the engine maps `text` responses to `think` so the transcript and UI are correct without
- * requiring `<think>` / `<think>` in the model output.
- */
-function axpAiCoercePlanningAssistantTextToThink(planningMessages) {
-    return planningMessages.map((m) => {
-        if (m.role !== 'assistant') {
-            return m;
-        }
-        return {
-            ...m,
-            responses: m.responses.map((r) => {
-                if (r.type === 'text') {
-                    return { type: 'think', content: r.content };
-                }
-                return r;
-            }),
-        };
-    });
-}
-//#region ---- Assistant plain text: embedded node JSON envelopes ----
-function isAssistantNodeTypeEnvelope(o) {
-    if (!o || typeof o !== 'object' || Array.isArray(o)) {
-        return false;
-    }
-    const r = o;
-    return r['type'] === 'node' && 'content' in r;
-}
-function isAssistantFollowUpTypeEnvelope(o) {
-    return axpAiIsDelegatedAgentResultSegment(o) && o.type === 'followUp';
-}
-/**
- * Parses one balanced `{ ... }` JSON object starting at `start` (must point at `{`).
- */
-function tryParseBalancedJsonObjectAt$1(s, start) {
-    if (s[start] !== '{') {
-        return null;
-    }
-    let depth = 0;
-    let inString = false;
-    let escape = false;
-    for (let i = start; i < s.length; i++) {
-        const c = s[i];
-        if (inString) {
-            if (escape) {
-                escape = false;
-                continue;
-            }
-            if (c === '\\') {
-                escape = true;
-                continue;
-            }
-            if (c === '"') {
-                inString = false;
-            }
-            continue;
-        }
-        if (c === '"') {
-            inString = true;
-            continue;
-        }
-        if (c === '{') {
-            depth++;
-        }
-        else if (c === '}') {
-            depth--;
-            if (depth === 0) {
-                const slice = s.slice(start, i + 1);
-                try {
-                    return { value: JSON.parse(slice), end: i + 1 };
-                }
-                catch {
-                    return null;
-                }
-            }
-        }
-    }
-    return null;
-}
-function mergeAdjacentAssistantTextResponses(seq) {
-    const out = [];
-    for (const r of seq) {
-        if (r.type !== 'text') {
-            out.push(r);
-            continue;
-        }
-        const prev = out[out.length - 1];
-        const v = r.content.trim();
-        if (!v.length) {
-            continue;
-        }
-        if (prev && prev.type === 'text') {
-            const joined = `${prev.content}\n\n${v}`.trim();
-            out[out.length - 1] = { type: 'text', content: joined };
-        }
-        else {
-            out.push({ type: 'text', content: v });
-        }
-    }
-    return out;
-}
-/**
- * Splits raw assistant prose into ordered `text` / `node` responses by detecting JSON objects
- * shaped like `{ "type": "node", "content": <AXPWidgetNode> }` anywhere in the string.
- */
-/** Removes markdown ```json fences so specialist-only JSON replies still parse as envelopes. */
-function axpAiStripMarkdownJsonFences(raw) {
-    return raw.replace(/```(?:json)?\s*([\s\S]*?)```/gi, (_match, inner) => inner.trim());
-}
-function axpAiExpandPlainAssistantTextToResponses(raw) {
-    const normalized = axpAiStripMarkdownJsonFences(raw);
-    const parts = [];
-    let i = 0;
-    const pushText = (value) => {
-        const v = value.trim();
-        if (v.length > 0) {
-            parts.push({ type: 'text', content: v });
-        }
-    };
-    while (i < normalized.length) {
-        const braceIdx = normalized.indexOf('{', i);
-        if (braceIdx < 0) {
-            pushText(normalized.slice(i));
-            break;
-        }
-        pushText(normalized.slice(i, braceIdx));
-        const parsed = tryParseBalancedJsonObjectAt$1(normalized, braceIdx);
-        if (parsed && isAssistantFollowUpTypeEnvelope(parsed.value)) {
-            const normalized = axpAiNormalizeFollowUpContent(parsed.value.content);
-            if (normalized.length > 0) {
-                parts.push({ type: 'followUp', content: normalized });
-            }
-            i = parsed.end;
-        }
-        else if (parsed && isAssistantNodeTypeEnvelope(parsed.value)) {
-            parts.push({ type: 'node', content: parsed.value.content });
-            i = parsed.end;
-        }
-        else if (parsed) {
-            pushText(normalized.slice(braceIdx, parsed.end));
-            i = parsed.end;
-        }
-        else {
-            pushText(normalized.slice(braceIdx, braceIdx + 1));
-            i = braceIdx + 1;
-        }
-    }
-    return mergeAdjacentAssistantTextResponses(parts);
-}
-//#endregion
-function axpAiChatMessagesFromProviderAssistant(text, toolCalls) {
-    const normalizeThinkingTags = (raw) => raw
-        .replace(/&lt;(\/?redacted_thinking)&gt;/gi, '<$1>')
-        .replace(/&lt;(\/?think)&gt;/gi, '<$1>');
-    const splitAssistantResponses = (raw) => {
-        const normalized = normalizeThinkingTags(raw ?? '');
-        if (!normalized) {
-            return [];
-        }
-        const out = [];
-        const appendPlainSlice = (value) => {
-            out.push(...axpAiExpandPlainAssistantTextToResponses(value));
-        };
-        const pushThink = (value) => {
-            const v = value.trim();
-            if (v.length > 0) {
-                out.push({ type: 'think', content: v });
-            }
-        };
-        const thinkRe = /<(redacted_thinking|think)>([\s\S]*?)<\/\1>/gi;
-        let last = 0;
-        let m;
-        while ((m = thinkRe.exec(normalized)) !== null) {
-            appendPlainSlice(normalized.slice(last, m.index));
-            pushThink(m[2] ?? '');
-            last = m.index + m[0].length;
-        }
-        appendPlainSlice(normalized.slice(last));
-        return mergeAdjacentAssistantTextResponses(out);
-    };
-    const parsedResponses = splitAssistantResponses(text);
-    const calls = toolCalls ?? [];
-    const out = [];
-    if (parsedResponses.length > 0) {
-        out.push({
-            role: 'assistant',
-            responses: parsedResponses,
-        });
-    }
-    for (const tc of calls) {
-        const isDelegatedAgent = axpAiParseSupervisorAgentToolName(tc.name) != null;
-        out.push({
-            role: 'assistant',
-            responses: [
-                isDelegatedAgent
-                    ? {
-                        type: 'agent',
-                        content: {
-                            command: tc.name,
-                            arguments: tc.arguments,
-                        },
-                        callId: tc.id,
-                    }
-                    : {
-                        type: 'tool',
-                        content: {
-                            command: tc.name,
-                            arguments: tc.arguments,
-                        },
-                        callId: tc.id,
-                    },
-            ],
-        });
-    }
-    if (out.length === 0) {
-        out.push(axpAiChatTextMessage('assistant', ''));
-    }
-    return out;
-}
-function axpAiToolCallFromAssistantToolMessage(message) {
-    if (message.role !== 'assistant') {
-        return null;
-    }
-    for (const r of message.responses) {
-        if (r.type === 'tool' || r.type === 'agent') {
-            const callId = r.callId?.trim() ?? '';
-            const command = r.content.command?.trim() ?? '';
-            if (!command) {
-                return null;
-            }
-            return {
-                id: callId || `call_${command}`,
-                name: command,
-                arguments: r.content.arguments,
-            };
-        }
-    }
-    return null;
-}
-function axpAiChatToolResultMessage(callId, content, toolName) {
-    const id = callId.trim();
-    return {
-        role: 'tool',
-        ...(toolName?.trim() ? { name: toolName.trim() } : {}),
-        responses: [
-            {
-                type: 'tool_result',
-                callId: id,
-                content,
-            },
-        ],
-    };
-}
-function axpAiChatAgentResultMessage(callId, content, toolName) {
-    const id = callId.trim();
-    return {
-        role: 'tool',
-        ...(toolName?.trim() ? { name: toolName.trim() } : {}),
-        responses: [
-            {
-                type: 'agent_result',
-                callId: id,
-                content,
-            },
-        ],
-    };
-}
-function axpAiNormalizeHandlerResultToToolBody(handlerResult) {
-    if (handlerResult === undefined || handlerResult === null) {
-        return { success: false, error: 'Tool returned no result.' };
-    }
-    if (typeof handlerResult === 'string') {
-        const t = handlerResult.trim();
-        if (!t) {
-            return { success: false, error: 'Tool returned an empty string.' };
-        }
-        try {
-            return JSON.parse(t);
-        }
-        catch {
-            return { success: true, data: handlerResult };
-        }
-    }
-    if (typeof handlerResult === 'object' && !Array.isArray(handlerResult)) {
-        return handlerResult;
-    }
-    return { success: true, data: handlerResult };
-}
-function axpAiChatToolOrAgentResultBodyJson(message) {
-    const tr = message.responses.find((r) => r.type === 'tool_result' || r.type === 'agent_result');
-    if (!tr || (tr.type !== 'tool_result' && tr.type !== 'agent_result')) {
-        return '';
-    }
-    try {
-        return JSON.stringify(tr.content);
-    }
-    catch {
-        return String(tr.content);
-    }
-}
-/**
- * Compact JSON string of a tool-role message’s `tool_result` body (transcript tail / logs).
- */
-function axpAiChatToolResultBodyJson(message) {
-    return axpAiChatToolOrAgentResultBodyJson(message);
-}
-//#endregion
-//#region ---- Supervisor delegated-agent helpers ----
-function axpAiSupervisorAgentToolName(agentCatalogId) {
-    return `${AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX}${agentCatalogId.trim()}`;
-}
 function axpAiParseSupervisorAgentToolName(toolName) {
     const n = toolName.trim();
     if (!n.startsWith(AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX)) {
-        return null;
-    }
-    const id = n.slice(AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX.length).trim();
-    return id.length > 0 ? id : null;
-}
-//#endregion
-//#region ---- Assistant message transforms (delegated sub-run) ----
-function axpAiMergePlainAssistantTextTurn(messages) {
-    const chunks = [];
-    for (const m of messages) {
-        if (m.role !== 'assistant') {
-            continue;
-        }
-        const textParts = m.responses
-            .filter((r) => r.type === 'text')
-            .map((r) => r.content.trim())
-            .filter((s) => s.length > 0);
-        const thinkParts = m.responses
-            .filter((r) => r.type === 'think')
-            .map((r) => r.content.trim())
-            .filter((s) => s.length > 0);
-        const serialized = axpAiChatMessageGetText(m).trim();
-        const t = textParts.join('\n\n').trim() ||
-            thinkParts.join('\n\n').trim() ||
-            serialized;
-        if (t.length > 0) {
-            chunks.push(t);
-        }
-    }
-    const joined = chunks.join('\n\n').trim();
-    if (!joined) {
-        return [];
-    }
-    return axpAiChatMessagesFromProviderAssistant(joined, undefined);
-}
-//#region ---- Follow-up normalization ----
-/** Normalizes one follow-up chip command object from model JSON. */
-function axpAiNormalizeFollowUpCommand(raw) {
-    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
-        return null;
-    }
-    const o = raw;
-    const name = typeof o['name'] === 'string' ? o['name'].trim() : '';
-    if (!name) {
-        return null;
-    }
-    if (!('options' in o)) {
-        return { name };
-    }
-    return { name, options: o['options'] };
-}
-/** Normalizes one follow-up chip row (`text` + `command`). */
-function axpAiNormalizeFollowUpItem(raw) {
-    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
-        return null;
-    }
-    const o = raw;
-    const text = typeof o['text'] === 'string' ? o['text'].trim() : '';
-    const command = axpAiNormalizeFollowUpCommand(o['command']);
-    if (!text || !command) {
-        return null;
-    }
-    return { text, command };
-}
-/** Normalizes follow-up `content` arrays; invalid rows are skipped. */
-function axpAiNormalizeFollowUpContent(raw) {
-    if (!Array.isArray(raw)) {
-        return [];
-    }
-    const out = [];
-    for (const item of raw) {
-        const row = axpAiNormalizeFollowUpItem(item);
-        if (row) {
-            out.push(row);
-        }
-    }
-    return out;
-}
-//#endregion
-//#region ---- Follow-up auto-invoke (supervisor turn) ----
-function axpAiLastUserTranscriptTextLocal(messages) {
-    for (let i = messages.length - 1; i >= 0; i--) {
-        if (messages[i].role === 'user') {
-            return axpAiChatMessageGetText(messages[i]).trim();
-        }
-    }
-    return '';
-}
-function axpAiIndexOfLastUserMessage(messages) {
-    for (let i = messages.length - 1; i >= 0; i--) {
-        if (messages[i].role === 'user') {
-            return i;
-        }
+        return null;
     }
-    return -1;
+    const id = n.slice(AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX.length).trim();
+    return id.length > 0 ? id : null;
 }
-function axpAiTranscriptTailSinceLastUser(messages) {
-    const idx = axpAiIndexOfLastUserMessage(messages);
-    return idx < 0 ? messages : messages.slice(idx);
+//#endregion
+//#region ---- Message builders (outbound / debug) ----
+function axpAiChatTextMessage(role, text) {
+    return {
+        role,
+        responses: [{ type: 'text', content: text }],
+    };
 }
-/**
- * Whether the current user turn already has a usable {@code followUp} segment from the follow-up specialist.
- */
-function axpAiTranscriptAlreadyHasFollowUpInTurn(messages, followUpAgentId) {
-    const tail = axpAiTranscriptTailSinceLastUser(messages);
-    for (const m of tail) {
-        if (m.role === 'assistant' && m.responses.some((r) => r.type === 'followUp')) {
-            return true;
-        }
-        if (m.role !== 'tool') {
-            continue;
+function axpAiChatUserMessage(responses) {
+    return {
+        role: 'user',
+        responses,
+    };
+}
+//#endregion
+//#region ---- Transcript read helpers (display only) ----
+function axpAiChatMessageGetText(message) {
+    const parts = [];
+    for (const r of message.responses) {
+        if (r.type === 'text') {
+            parts.push(r.content);
         }
-        for (const r of m.responses) {
-            if (r.type !== 'agent_result') {
-                continue;
-            }
-            const payload = r.content;
-            if (payload.success !== true || payload.data?.responses == null) {
-                continue;
-            }
-            const agentId = payload.data.agentId?.trim() ?? '';
-            const agentName = payload.data.agentName?.trim() ?? '';
-            const isFollowUpAgent = agentId === followUpAgentId.trim() || agentName === AXPAI_CONVERSATION_FOLLOW_UP_AGENT_NAME;
-            if (!isFollowUpAgent) {
-                continue;
+        else if (r.type === 'node' || r.type === 'followUp') {
+            try {
+                parts.push(JSON.stringify({ type: r.type, content: r.content }));
             }
-            if (payload.data.responses.some((s) => s.type === 'followUp')) {
-                return true;
+            catch {
+                parts.push(`[${r.type}]`);
             }
         }
     }
-    return false;
+    return parts.join('\n\n');
 }
-const AXPAI_GREETING_ONLY_USER_RE = /^(?:hi|hello|hey|howdy|thanks|thank\s*you|ok(?:ay)?|bye|goodbye|سلام|درود|وقت\s*بخیر|ممنون|متشکرم|مرسی)(?:[!.\s?،]*)*$/iu;
-/**
- * Engine may auto-call the follow-up specialist after the supervisor finishes, unless the turn is trivial.
- */
-function axpAiShouldAutoInvokeFollowUpAgent(messages) {
-    const userText = axpAiLastUserTranscriptTextLocal(messages).trim();
-    if (userText.length === 0) {
-        return false;
-    }
-    if (AXPAI_GREETING_ONLY_USER_RE.test(userText)) {
-        return false;
-    }
-    const tail = axpAiTranscriptTailSinceLastUser(messages);
-    for (const m of tail) {
-        if (m.role !== 'assistant' || axpAiChatMessageIsDelegatedReflectionExcluded(m)) {
-            continue;
-        }
-        const plain = m.responses
-            .filter((r) => r.type === 'text')
-            .map((r) => r.content.trim())
-            .join('\n')
-            .trim();
-        const serialized = axpAiChatMessageGetText(m).trim();
-        if (plain.length > 0 || serialized.length > 0) {
-            return true;
-        }
-        if (m.responses.some((r) => r.type === 'node' || r.type === 'file')) {
-            return true;
-        }
-    }
-    return false;
+function axpAiChatMessageIsDelegatedReflectionExcluded(message) {
+    return message.delegatedReflection === true;
 }
-/** Builds the `query` argument for an automatic follow-up specialist sub-run. */
-function axpAiBuildAutoFollowUpAgentQuery(messages) {
-    const userText = axpAiLastUserTranscriptTextLocal(messages);
-    const tail = axpAiTranscriptTailSinceLastUser(messages);
-    const answerParts = [];
-    for (const m of tail) {
-        if (m.role !== 'assistant' || axpAiChatMessageIsDelegatedReflectionExcluded(m)) {
-            continue;
-        }
-        const t = axpAiChatMessageGetText(m).trim();
-        if (t.length > 0) {
-            answerParts.push(t);
-        }
+/** Reads typed specialist segments from a normalized {@code agent_result} payload. */
+function axpAiDelegatedAgentResultSegments(payload) {
+    if (payload.success !== true || !Array.isArray(payload.data?.responses)) {
+        return [];
     }
-    const answer = answerParts.join('\n\n').trim().slice(0, 4000);
-    return [
-        'Propose 2–5 short next-step chips for the user after this exchange.',
-        '',
-        `User message: ${userText}`,
-        '',
-        answer.length > 0 ? `Assistant answer so far:\n${answer}` : 'Assistant answer so far: (none yet)',
-    ].join('\n');
+    return payload.data.responses;
 }
-//#endregion
-/**
- * Appends delegated {@code followUp} / {@code node} / {@code file} segments from tool {@code agent_result}
- * lines onto the final supervisor assistant message when the model omitted them.
- */
-function axpAiReconcileSupervisorFinalAssistantWithDelegatedOutcomes(messages) {
-    let lastAssistantIdx = -1;
-    for (let i = messages.length - 1; i >= 0; i--) {
-        const m = messages[i];
-        if (m.role !== 'assistant' || axpAiChatMessageIsDelegatedReflectionExcluded(m)) {
-            continue;
-        }
-        if (m.responses.some((r) => r.type === 'text' || r.type === 'node' || r.type === 'file' || r.type === 'followUp')) {
-            lastAssistantIdx = i;
-            break;
-        }
-    }
-    if (lastAssistantIdx < 0) {
-        return messages;
-    }
-    const delegatedStructured = [];
-    for (const m of messages) {
-        if (m.role !== 'tool') {
-            continue;
-        }
-        for (const r of m.responses) {
-            if (r.type !== 'agent_result') {
-                continue;
-            }
-            const payload = r.content;
-            if (payload.success !== true || payload.data?.responses == null) {
-                continue;
-            }
-            for (const seg of payload.data.responses) {
-                if (seg.type === 'followUp' || seg.type === 'node' || seg.type === 'file') {
-                    delegatedStructured.push(seg);
-                }
+/** Plain text from specialist segments (text + think) for debug / preview UI. */
+function axpAiDelegatedAgentOutcomeResponsesPlainText(segments) {
+    const parts = [];
+    for (const s of segments) {
+        if (s.type === 'text' || s.type === 'think') {
+            const t = s.content.trim();
+            if (t.length > 0) {
+                parts.push(t);
             }
         }
     }
-    if (delegatedStructured.length === 0) {
-        return messages;
-    }
-    const last = messages[lastAssistantIdx];
-    let followUpPresent = last.responses.some((r) => r.type === 'followUp');
-    let nodePresent = last.responses.some((r) => r.type === 'node');
-    const fileIds = new Set(last.responses
-        .filter((r) => r.type === 'file')
-        .map((r) => r.content.fileId));
-    const toAppend = [];
-    for (const seg of delegatedStructured) {
-        if (seg.type === 'followUp' && !followUpPresent) {
-            toAppend.push(seg);
-            followUpPresent = true;
-        }
-        else if (seg.type === 'node' && !nodePresent) {
-            toAppend.push(seg);
-            nodePresent = true;
-        }
-        else if (seg.type === 'file' && !fileIds.has(seg.content.fileId)) {
-            toAppend.push(seg);
-            fileIds.add(seg.content.fileId);
-        }
+    return parts.join('\n\n').trim();
+}
+function axpAiChatToolResultBodyJson(message) {
+    return axpAiChatToolOrAgentResultBodyJson(message);
+}
+function axpAiChatToolOrAgentResultBodyJson(message) {
+    const tr = message.responses.find((r) => r.type === 'tool_result' || r.type === 'agent_result');
+    if (!tr || (tr.type !== 'tool_result' && tr.type !== 'agent_result')) {
+        return '';
     }
-    if (toAppend.length === 0) {
-        return messages;
+    try {
+        return JSON.stringify(tr.content);
     }
-    const out = [...messages];
-    out[lastAssistantIdx] = {
-        ...last,
-        responses: [...last.responses, ...toAppend],
-    };
-    return out;
-}
-function axpAiPruneAssistantPiecesToFirstToolOnly(messages) {
-    const out = [];
-    let keptTool = false;
-    for (const m of messages) {
-        if (m.role !== 'assistant') {
-            out.push(m);
-            continue;
-        }
-        const idx = m.responses.findIndex((r) => r.type === 'tool' || r.type === 'agent');
-        if (idx < 0) {
-            out.push(m);
-            continue;
-        }
-        if (!keptTool) {
-            out.push({
-                ...m,
-                responses: m.responses.slice(0, idx + 1),
-            });
-            keptTool = true;
-        }
+    catch {
+        return String(tr.content);
     }
-    return out;
-}
-function axpAiChatDelegatedReflectionAssistantMessage(reflectionText) {
-    return {
-        role: 'assistant',
-        delegatedReflection: true,
-        responses: [{ type: 'text', content: reflectionText }],
-    };
-}
-function axpAiChatMessageIsDelegatedReflectionExcluded(message) {
-    return message.delegatedReflection === true;
 }
 //#endregion
 
@@ -2737,6 +2085,211 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             args: [{ providedIn: 'root' }]
         }] });
 
+//#region ---- Imports ----
+//#endregion
+const STRUCTURED_OUTPUT_KINDS$1 = new Set(['object', 'array']);
+function usesStructuredFinalize(kind) {
+    return STRUCTURED_OUTPUT_KINDS$1.has(kind);
+}
+//#endregion
+//#region ---- Retry defaults ----
+/** Default structured retry count for a contract kind when `structuredRetries` is omitted. */
+function defaultRetriesForKind(kind) {
+    if (kind === 'string') {
+        return 0;
+    }
+    return AXPAI_AGENT_OUTPUT_CONTRACT_DEFAULT_STRUCTURED_RETRIES;
+}
+//#endregion
+//#region ---- Derive provider format ----
+function isJsonSchemaLike(value) {
+    return value != null && typeof value === 'object' && !Array.isArray(value);
+}
+function parseResponseFormat(raw) {
+    if (raw == null || typeof raw !== 'object' || Array.isArray(raw)) {
+        return undefined;
+    }
+    const o = raw;
+    const t = o['type'];
+    if (t === 'text') {
+        return { type: 'text' };
+    }
+    if (t === 'json_object') {
+        return { type: 'json_object' };
+    }
+    if (t === 'json_schema' && isJsonSchemaLike(o['schema'])) {
+        const name = typeof o['name'] === 'string' ? o['name'].trim() : undefined;
+        const strict = o['strict'] === true;
+        return {
+            type: 'json_schema',
+            schema: o['schema'],
+            ...(name && name.length > 0 ? { name } : {}),
+            ...(strict ? { strict: true } : {}),
+        };
+    }
+    return undefined;
+}
+/**
+ * Maps an effective output contract to a provider request hint.
+ * Explicit {@link AXPAiAgentOutputContract.providerResponseFormat} wins; otherwise derived from `kind` + `schema`.
+ */
+function deriveProviderResponseFormat(contract) {
+    if (contract.providerResponseFormat) {
+        return contract.providerResponseFormat;
+    }
+    if (!usesStructuredFinalize(contract.kind)) {
+        return undefined;
+    }
+    if (contract.schema && isJsonSchemaLike(contract.schema)) {
+        const segment = resolveOutputTranscriptSegment(contract);
+        const name = contract.schemaName?.trim() ||
+            (segment === 'node' ? 'widget_layout' : segment === 'followUp' ? 'follow_up' : 'structured_output');
+        return {
+            type: 'json_schema',
+            schema: contract.schema,
+            name,
+            strict: contract.schemaStrict === true,
+        };
+    }
+    return { type: 'json_object' };
+}
+function parseJsonSchemaLike(raw) {
+    if (!isJsonSchemaLike(raw)) {
+        return undefined;
+    }
+    return raw;
+}
+//#endregion
+
+//#region ---- Imports ----
+/** @see {@link AXP_AGENT_OUTPUT_CONTRACT_DEFAULT_STRUCTURED_RETRIES} */
+const AXPAI_AGENT_OUTPUT_CONTRACT_DEFAULT_STRUCTURED_RETRIES = AXP_AGENT_OUTPUT_CONTRACT_DEFAULT_STRUCTURED_RETRIES;
+//#endregion
+//#region ---- Resolve helpers ----
+const STRUCTURED_OUTPUT_KINDS = new Set(['object', 'array']);
+function isOutputKind(value) {
+    return value === 'string' || value === 'object' || value === 'array';
+}
+function isTranscriptSegment(value) {
+    return value === 'text' || value === 'node' || value === 'followUp';
+}
+/** Resolved transcript mapping for an object contract (defaults to `text`). */
+function resolveOutputTranscriptSegment(contract) {
+    if (contract.kind !== 'object') {
+        return 'text';
+    }
+    return contract.transcriptSegment ?? 'text';
+}
+//#endregion
+//#region ---- Parser ----
+/**
+ * Normalizes persisted `outputContract` (object or JSON string from entity forms).
+ * Returns `null` when absent or invalid (engine treats as implicit `string`).
+ */
+function parseAgentOutputContract(raw) {
+    let value = raw;
+    if (typeof raw === 'string') {
+        const t = raw.trim();
+        if (!t.length) {
+            return null;
+        }
+        try {
+            value = JSON.parse(t);
+        }
+        catch {
+            return null;
+        }
+    }
+    if (value == null || typeof value !== 'object' || Array.isArray(value)) {
+        return null;
+    }
+    const o = value;
+    const kind = o['kind'];
+    if (!isOutputKind(kind)) {
+        return null;
+    }
+    const instruction = typeof o['instruction'] === 'string' ? o['instruction'].trim() : undefined;
+    const schemaSummary = typeof o['schemaSummary'] === 'string' ? o['schemaSummary'].trim() : undefined;
+    const validationCommandName = typeof o['validationCommandName'] === 'string' ? o['validationCommandName'].trim() : undefined;
+    const schema = parseJsonSchemaLike(o['schema']);
+    const schemaName = typeof o['schemaName'] === 'string' ? o['schemaName'].trim() : undefined;
+    const schemaStrict = o['schemaStrict'] === true;
+    const providerResponseFormat = parseResponseFormat(o['providerResponseFormat']);
+    const transcriptSegment = kind === 'object' && isTranscriptSegment(o['transcriptSegment']) ? o['transcriptSegment'] : undefined;
+    let structuredRetries;
+    if (typeof o['structuredRetries'] === 'number' && !Number.isNaN(o['structuredRetries'])) {
+        structuredRetries = Math.max(0, Math.min(10, Math.floor(o['structuredRetries'])));
+    }
+    return {
+        kind,
+        ...(transcriptSegment ? { transcriptSegment } : {}),
+        ...(instruction && instruction.length > 0 ? { instruction } : {}),
+        ...(schemaSummary && schemaSummary.length > 0 ? { schemaSummary } : {}),
+        ...(schema ? { schema } : {}),
+        ...(schemaName && schemaName.length > 0 ? { schemaName } : {}),
+        ...(schemaStrict ? { schemaStrict: true } : {}),
+        ...(validationCommandName && validationCommandName.length > 0 ? { validationCommandName } : {}),
+        ...(structuredRetries !== undefined ? { structuredRetries } : {}),
+        ...(providerResponseFormat ? { providerResponseFormat } : {}),
+    };
+}
+/** Resolved contract for engine (never null; defaults to string). */
+function resolveAgentOutputContract(raw) {
+    const parsed = parseAgentOutputContract(raw);
+    if (parsed) {
+        return parsed;
+    }
+    return { kind: 'string' };
+}
+function axpAiAgentOutputContractUsesStructuredFinalize(contract) {
+    return STRUCTURED_OUTPUT_KINDS.has(contract.kind);
+}
+/** Structured kinds omit the string role baseline (Markdown prose hint) in the mock engine. */
+function axpAiAgentOutputContractOmitsRoleBaseline(contract) {
+    return axpAiAgentOutputContractUsesStructuredFinalize(contract);
+}
+function axpAiAgentOutputContractStructuredRetryCap(contract) {
+    if (!axpAiAgentOutputContractUsesStructuredFinalize(contract)) {
+        return 0;
+    }
+    if (typeof contract.structuredRetries === 'number') {
+        return Math.max(0, Math.min(10, Math.floor(contract.structuredRetries)));
+    }
+    return AXPAI_AGENT_OUTPUT_CONTRACT_DEFAULT_STRUCTURED_RETRIES;
+}
+//#endregion
+
+//#region ---- Imports ----
+//#endregion
+//#region ---- Legacy → contract ----
+/**
+ * Maps legacy `expectStructuredOutput` flags to an {@link AXPAiAgentOutputContract}, or returns explicit `outputContract`.
+ */
+function outputContractFromAssistRunInput(input) {
+    if (input.outputContract) {
+        const parsed = parseAgentOutputContract(input.outputContract);
+        if (parsed) {
+            return parsed;
+        }
+    }
+    if (!input.expectStructuredOutput) {
+        return null;
+    }
+    const instruction = input.structuredOutputInstruction?.trim();
+    const schemaSummary = input.structuredOutputSchemaSummary?.trim();
+    let structuredRetries;
+    if (typeof input.maxStructuredRetries === 'number' && !Number.isNaN(input.maxStructuredRetries)) {
+        structuredRetries = Math.max(0, Math.min(10, Math.floor(input.maxStructuredRetries)));
+    }
+    return {
+        kind: 'object',
+        ...(instruction && instruction.length > 0 ? { instruction } : {}),
+        ...(schemaSummary && schemaSummary.length > 0 ? { schemaSummary } : {}),
+        ...(structuredRetries !== undefined ? { structuredRetries } : {}),
+    };
+}
+//#endregion
+
 //#region ---- Transcript ----
 /**
  * Text segments from the last assistant message (`type: 'text'` only).
@@ -3101,82 +2654,248 @@ function parseStructuredAssistantWithLocalRepair(raw) {
     if (v !== undefined) {
         return v;
     }
-    return undefined;
+    return undefined;
+}
+/**
+ * Tries combined assistant text, then each text segment from last to first (models often put JSON only in the last paragraph).
+ */
+function parseStructuredAssistantWithSegmentFallback(combined, segments) {
+    let v = parseStructuredAssistantWithLocalRepair(combined);
+    if (v !== undefined) {
+        return v;
+    }
+    const seen = new Set();
+    const mark = stripAssistantThinkingXml(combined).trim();
+    if (mark.length > 0) {
+        seen.add(mark);
+    }
+    for (let i = segments.length - 1; i >= 0; i--) {
+        const seg = stripAssistantThinkingXml(segments[i] ?? '').trim();
+        if (!seg.length || seen.has(seg)) {
+            continue;
+        }
+        seen.add(seg);
+        v = parseStructuredAssistantWithLocalRepair(seg);
+        if (v !== undefined) {
+            return v;
+        }
+    }
+    return undefined;
+}
+//#endregion
+
+//#region ---- Imports ----
+//#endregion
+//#region ---- Validator ----
+function typeMatches(schemaType, value) {
+    if (schemaType === undefined) {
+        return true;
+    }
+    switch (schemaType) {
+        case 'object':
+            return value != null && typeof value === 'object' && !Array.isArray(value);
+        case 'array':
+            return Array.isArray(value);
+        case 'string':
+            return typeof value === 'string';
+        case 'number':
+            return typeof value === 'number' && !Number.isNaN(value);
+        case 'integer':
+            return typeof value === 'number' && Number.isInteger(value);
+        case 'boolean':
+            return typeof value === 'boolean';
+        case 'null':
+            return value === null;
+        default:
+            return true;
+    }
+}
+function validateNode(schema, value, path, errors) {
+    if (schema.enum && schema.enum.length > 0) {
+        if (!schema.enum.some((e) => Object.is(e, value))) {
+            errors.push({ path, message: `Value is not one of the allowed enum values.` });
+            return;
+        }
+    }
+    if (!typeMatches(schema.type, value)) {
+        errors.push({
+            path,
+            message: `Expected type "${schema.type ?? 'any'}", got ${value === null ? 'null' : typeof value}.`,
+        });
+        return;
+    }
+    if (schema.type === 'object' && value != null && typeof value === 'object' && !Array.isArray(value)) {
+        const o = value;
+        const props = schema.properties ?? {};
+        const required = schema.required ?? [];
+        for (const key of required) {
+            if (!(key in o) || o[key] === undefined) {
+                errors.push({ path: path ? `${path}.${key}` : key, message: 'Required property is missing.' });
+            }
+        }
+        for (const [key, propSchema] of Object.entries(props)) {
+            if (key in o && o[key] !== undefined) {
+                validateNode(propSchema, o[key], path ? `${path}.${key}` : key, errors);
+            }
+        }
+        if (schema.additionalProperties === false) {
+            for (const key of Object.keys(o)) {
+                if (!(key in props)) {
+                    errors.push({
+                        path: path ? `${path}.${key}` : key,
+                        message: 'Additional property is not allowed.',
+                    });
+                }
+            }
+        }
+        else if (schema.additionalProperties && typeof schema.additionalProperties === 'object') {
+            for (const [key, val] of Object.entries(o)) {
+                if (!(key in props)) {
+                    validateNode(schema.additionalProperties, val, path ? `${path}.${key}` : key, errors);
+                }
+            }
+        }
+    }
+    if (schema.type === 'array' && Array.isArray(value) && schema.items) {
+        const itemSchema = Array.isArray(schema.items) ? schema.items[0] : schema.items;
+        if (itemSchema) {
+            value.forEach((item, index) => {
+                validateNode(itemSchema, item, `${path}[${index}]`, errors);
+            });
+        }
+    }
 }
 /**
- * Tries combined assistant text, then each text segment from last to first (models often put JSON only in the last paragraph).
+ * Validates a value against a minimal JSON Schema subset (types, required, enum, properties, items).
  */
-function parseStructuredAssistantWithSegmentFallback(combined, segments) {
-    let v = parseStructuredAssistantWithLocalRepair(combined);
-    if (v !== undefined) {
-        return v;
-    }
-    const seen = new Set();
-    const mark = stripAssistantThinkingXml(combined).trim();
-    if (mark.length > 0) {
-        seen.add(mark);
-    }
-    for (let i = segments.length - 1; i >= 0; i--) {
-        const seg = stripAssistantThinkingXml(segments[i] ?? '').trim();
-        if (!seg.length || seen.has(seg)) {
-            continue;
-        }
-        seen.add(seg);
-        v = parseStructuredAssistantWithLocalRepair(seg);
-        if (v !== undefined) {
-            return v;
-        }
+function validateJsonSchemaMini(schema, value) {
+    const errors = [];
+    validateNode(schema, value, '', errors);
+    if (errors.length > 0) {
+        return { ok: false, errors };
     }
-    return undefined;
+    return { ok: true };
 }
 //#endregion
 
 //#region ---- Imports ----
-function hasAnyStructuredContent(combined, segments) {
-    if (combined.trim().length > 0) {
-        return true;
+//#endregion
+//#region ---- Parse + validate ----
+function defaultParseCommandEnvelope(raw) {
+    if (raw == null || typeof raw !== 'object' || Array.isArray(raw)) {
+        return { valid: false, errorMessage: 'Validation command returned an invalid envelope.' };
     }
-    if (!segments?.length) {
-        return false;
+    const o = raw;
+    if (o['success'] !== true) {
+        const err = typeof o['error'] === 'string' ? o['error'] : 'Validation command failed.';
+        return { valid: false, errorMessage: err };
     }
-    return segments.some((s) => (s ?? '').trim().length > 0);
+    const data = o['data'];
+    if (!data?.valid) {
+        const errs = Array.isArray(data?.errors) ? data.errors.join('; ') : 'Layout validation failed.';
+        return { valid: false, errorMessage: errs };
+    }
+    const normalized = typeof data.normalizedJson === 'string' ? data.normalizedJson.trim() : '';
+    return { valid: true, ...(normalized.length > 0 ? { normalizedJson: normalized } : {}) };
 }
 /**
- * Parses JSON from assistant text (including lightweight local repair), then optionally runs a custom validator.
- *
- * @param textSegmentsFallback - When provided, each segment is tried after combined text (last segment first); helps when prose and JSON sit in separate assistant text blocks.
+ * Parses assistant text and validates against contract schema, registry command, and optional custom validator.
  */
-async function validateStructuredAssistantResponse(assistantPlainText, structuredValidator, textSegmentsFallback) {
-    if (!hasAnyStructuredContent(assistantPlainText, textSegmentsFallback)) {
+async function validateAgainstContract(params) {
+    const { contract, assistantPlainText, textSegmentsFallback } = params;
+    if (!axpAiAgentOutputContractUsesStructuredFinalize(contract)) {
+        const trimmed = stripAssistantThinkingXml(assistantPlainText).trim();
+        if (!trimmed.length && !(textSegmentsFallback?.some((s) => (s ?? '').trim().length > 0))) {
+            return {
+                ok: false,
+                errors: [{ phase: 'parse', message: 'Assistant returned empty output.' }],
+            };
+        }
+        return { ok: true, value: trimmed };
+    }
+    const combined = stripAssistantThinkingXml(assistantPlainText);
+    const parsed = parseStructuredAssistantWithSegmentFallback(combined, textSegmentsFallback ?? []);
+    if (parsed === undefined) {
         return {
             ok: false,
-            errorMessage: 'Assistant returned empty output.',
-            failurePhase: 'parse',
+            errors: [
+                {
+                    phase: 'parse',
+                    message: 'Could not parse assistant output as JSON (expected a JSON object or array; optional markdown fence; segment fallback and local repair also failed).',
+                },
+            ],
         };
     }
-    const parsed = parseStructuredAssistantWithSegmentFallback(assistantPlainText, textSegmentsFallback ?? []);
-    if (parsed === undefined) {
+    let value = parsed;
+    if (contract.kind === 'array' && !Array.isArray(value)) {
         return {
             ok: false,
-            errorMessage: 'Could not parse assistant output as JSON (expected a JSON object or array; optional markdown fence; segment fallback, local repair, and truncation repair also failed).',
-            failurePhase: 'parse',
+            errors: [{ phase: 'validator', message: 'Expected a JSON array as the root value.' }],
         };
     }
-    if (!structuredValidator) {
-        return { ok: true, value: parsed };
-    }
-    try {
-        const value = await structuredValidator(parsed);
-        return { ok: true, value };
-    }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
+    if (contract.kind === 'object' && (value == null || typeof value !== 'object' || Array.isArray(value))) {
         return {
             ok: false,
-            errorMessage: msg.trim().length > 0 ? msg : 'Structured validation failed.',
-            failurePhase: 'validator',
+            errors: [{ phase: 'validator', message: 'Expected a JSON object as the root value.' }],
         };
     }
+    if (contract.schema) {
+        const schemaResult = validateJsonSchemaMini(contract.schema, value);
+        if (!schemaResult.ok) {
+            const message = schemaResult.errors.map((e) => `${e.path || '(root)'}: ${e.message}`).join('; ');
+            return {
+                ok: false,
+                errors: [{ phase: 'validator', message, details: schemaResult.errors }],
+            };
+        }
+    }
+    const cmd = contract.validationCommandName?.trim();
+    if (cmd && params.commandExecutor) {
+        try {
+            const raw = await params.commandExecutor.execute(cmd, { json: value });
+            const parseEnvelope = params.parseCommandEnvelope ?? defaultParseCommandEnvelope;
+            const envelope = parseEnvelope(raw);
+            if (!envelope.valid) {
+                return {
+                    ok: false,
+                    errors: [
+                        {
+                            phase: 'validator',
+                            message: envelope.errorMessage ?? 'Validation command failed.',
+                        },
+                    ],
+                };
+            }
+            if (envelope.normalizedJson) {
+                try {
+                    value = JSON.parse(envelope.normalizedJson);
+                }
+                catch {
+                    value = envelope.normalizedJson;
+                }
+            }
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            return {
+                ok: false,
+                errors: [{ phase: 'validator', message: msg.trim().length > 0 ? msg : 'Validation command failed.' }],
+            };
+        }
+    }
+    if (params.structuredValidator) {
+        try {
+            value = await params.structuredValidator(value);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            return {
+                ok: false,
+                errors: [{ phase: 'validator', message: msg.trim().length > 0 ? msg : 'Structured validation failed.' }],
+            };
+        }
+    }
+    return { ok: true, value };
 }
 //#endregion
 
@@ -3224,9 +2943,9 @@ function truncateForStructuredOutputError(text) {
  * Runs the engine, validates JSON (+ optional custom validator), and appends user retry messages on failure.
  */
 async function runStructuredOutputPipeline(params) {
-    const maxAttempts = params.retryOnInvalidStructure
-        ? 1 + Math.max(0, params.maxStructuredRetries)
-        : 1;
+    const retryCap = params.maxStructuredRetries ?? axpAiAgentOutputContractStructuredRetryCap(params.contract);
+    const maxAttempts = params.retryOnInvalidStructure ? 1 + Math.max(0, retryCap) : 1;
+    const schemaSummary = params.structuredOutputSchemaSummary?.trim() || params.contract.schemaSummary?.trim();
     let messages = params.initialMessages;
     let mergedUsage;
     let lastProvider;
@@ -3261,7 +2980,13 @@ async function runStructuredOutputPipeline(params) {
                 code: 'duplicate_assistant_output',
             });
         }
-        const validation = await validateStructuredAssistantResponse(structuredParts.combined, params.structuredValidator, structuredParts.segments);
+        const validation = await validateAgainstContract({
+            contract: params.contract,
+            assistantPlainText: structuredParts.combined,
+            textSegmentsFallback: structuredParts.segments,
+            structuredValidator: params.structuredValidator,
+            commandExecutor: params.commandExecutor,
+        });
         if (validation.ok) {
             const structuredRunRaw = {
                 kind: 'structured-output',
@@ -3271,26 +2996,31 @@ async function runStructuredOutputPipeline(params) {
                 lastProviderResult: lastProvider,
             };
             return {
+                success: true,
+                outputKind: params.contract.kind,
                 text: displayText,
+                data: validation.value,
                 structured: validation.value,
+                messages: result.messages,
                 structuredRunRaw,
             };
         }
+        const firstError = validation.errors[0];
         prevFailureStructuredFingerprint = structuredFingerprint;
-        prevFailurePhase = validation.failurePhase;
+        prevFailurePhase = firstError?.phase;
         const canRetry = params.retryOnInvalidStructure && attempt < maxAttempts;
         if (!canRetry) {
             throw new AXPAiStructuredOutputError({
                 message: `Structured output validation failed after ${attempt} attempt(s).`,
                 attempts: attempt,
                 lastAssistantText: truncateForStructuredOutputError(displayText),
-                validationMessage: validation.errorMessage,
+                validationMessage: firstError?.message ?? 'Validation failed.',
                 code: 'validation_exhausted',
             });
         }
         messages = [
             ...result.messages,
-            axpAiChatTextMessage('user', buildStructuredOutputRetryUserText(validation.errorMessage, params.structuredOutputSchemaSummary, validation.failurePhase)),
+            axpAiChatTextMessage('user', buildStructuredOutputRetryUserText(firstError?.message ?? 'Validation failed.', schemaSummary, firstError?.phase ?? 'parse')),
         ];
     }
     throw new AXPAiStructuredOutputError({
@@ -3303,6 +3033,76 @@ async function runStructuredOutputPipeline(params) {
 }
 //#endregion
 
+//#region ---- Imports ----
+//#endregion
+//#region ---- Segment id ----
+function isOutputContractSegmentId(value) {
+    return value === 'text' || value === 'node' || value === 'followUp';
+}
+//#endregion
+class AXPAiOutputContractResolveService {
+    constructor() {
+        //#region ---- Dependencies ----
+        this.segmentService = inject(AXPOutputContractTranscriptSegmentService);
+    }
+    //#endregion
+    //#region ---- Public API ----
+    /**
+     * Resolves a persisted agent/assist `outputContract` value (segment id string)
+     * or a full contract object (runtime / programmatic).
+     */
+    async resolveFromPersisted(raw) {
+        if (raw == null) {
+            return null;
+        }
+        if (typeof raw === 'string') {
+            const id = raw.trim();
+            if (!id.length) {
+                return null;
+            }
+            if (isOutputContractSegmentId(id)) {
+                return (await this.segmentService.getContractPreset(id)) ?? null;
+            }
+            return parseAgentOutputContract(raw);
+        }
+        if (typeof raw === 'object' && !Array.isArray(raw)) {
+            return parseAgentOutputContract(raw);
+        }
+        return null;
+    }
+    /**
+     * Effective contract for one engine turn.
+     * Priority: runtime > input > agent > assist > `{ kind: 'string' }`.
+     */
+    async resolveEffective(params) {
+        const runtime = await this.resolveFromPersisted(params.runtime);
+        if (runtime) {
+            return runtime;
+        }
+        const input = await this.resolveFromPersisted(params.input);
+        if (input) {
+            return input;
+        }
+        const agent = await this.resolveFromPersisted(params.agent);
+        if (agent) {
+            return agent;
+        }
+        const assist = await this.resolveFromPersisted(params.assist);
+        if (assist) {
+            return assist;
+        }
+        return resolveAgentOutputContract(null);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPAiOutputContractResolveService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPAiOutputContractResolveService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPAiOutputContractResolveService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
 //#region ---- Imports ----
 //#endregion
 //#region ---- Assist prompt run loading dialog ----
@@ -3383,6 +3183,7 @@ class AXPAiManagerService extends AXPAiAssistService {
         super(...arguments);
         //#region ---- Services & Dependencies ----
         this.aiEngine = inject(AXPAiEngine);
+        this.outputContractResolve = inject(AXPAiOutputContractResolveService);
         this.entityService = inject(AXPEntityService);
         this.settings = inject(AXPSettingsService);
         this.runtimeContextBuilder = inject(AXPAiPlatformRuntimeContextBuilder);
@@ -3448,6 +3249,22 @@ class AXPAiManagerService extends AXPAiAssistService {
         }
         return this.getEffectiveAssist();
     }
+    /**
+     * Primary catalog model transport for an assist (`modelId` row).
+     */
+    async getAssistPrimaryChatTransport(assistId) {
+        const assist = await this.getAssistForChat(assistId);
+        const modelEntityId = assist.modelId?.trim();
+        if (!modelEntityId) {
+            return undefined;
+        }
+        const model = await this.modelEntityData.byKey(modelEntityId);
+        const raw = String(model?.chatTransport ?? '').toLowerCase();
+        if (raw === 'openai' || raw === 'gemini' || raw === 'demis') {
+            return raw;
+        }
+        return undefined;
+    }
     //#endregion
     //#region ---- Engine delegation ----
     /**
@@ -3499,32 +3316,48 @@ class AXPAiManagerService extends AXPAiAssistService {
         const platformRuntimeContext = mergePlatformRuntimeContext(baseCtx, input.platformRuntimeNotes ?? null);
         const directAgentId = input.directAgentId?.trim();
         let assistId = input.assistId?.trim();
+        const assistRow = !directAgentId && !assistId
+            ? await this.getEffectiveAssist()
+            : await this.getAssistForChat(assistId);
         if (!directAgentId && !assistId) {
-            const assist = await this.getEffectiveAssist();
-            assistId = assist.id;
-        }
+            assistId = assistRow.id;
+        }
+        const agentRow = directAgentId ? await this.agentEntityData.byKey(directAgentId) : null;
+        const inputContract = outputContractFromAssistRunInput(input);
+        const effectiveOutputContract = await this.outputContractResolve.resolveEffective({
+            input: inputContract,
+            assist: assistRow.outputContract,
+            agent: agentRow?.outputContract,
+        });
+        const usesStructuredPipeline = input.expectStructuredOutput === true ||
+            axpAiAgentOutputContractUsesStructuredFinalize(effectiveOutputContract);
         const messages = buildChatMessages(input);
         const catalogMax = await this.resolveCatalogMaxOutputTokens(assistId, directAgentId);
         const effectiveMaxTokens = input.maxTokens ?? catalogMax ?? AXPAiAssistDefaultStructuredMaxTokens;
         const runOptions = {
             platformRuntimeContext,
+            outputContract: effectiveOutputContract,
             ...(directAgentId ? { directAgentId } : { assistId: assistId }),
             ...(input.maxSteps !== undefined ? { maxSteps: input.maxSteps } : {}),
             ...(input.temperature !== undefined ? { temperature: input.temperature } : {}),
             maxTokens: effectiveMaxTokens,
         };
-        if (!input.expectStructuredOutput) {
+        if (!usesStructuredPipeline) {
             const result = await this.runEngine({ ...runOptions, messages });
             const text = extractLastAssistantPlainText(result.messages);
             return {
+                success: true,
+                outputKind: effectiveOutputContract.kind,
                 text,
                 raw: { usageTotals: result.usageTotals, lastProviderResult: result.lastProviderResult },
+                messages: result.messages,
             };
         }
         const retryOnInvalidStructure = input.retryOnInvalidStructure !== false;
         const maxStructuredRetries = input.maxStructuredRetries ?? AXPAiAssistDefaultMaxStructuredRetries;
         const structuredMaxTokens = input.structuredOutputMaxTokens ?? effectiveMaxTokens;
         const pipelineResult = await runStructuredOutputPipeline({
+            contract: effectiveOutputContract,
             initialMessages: messages,
             executeRun: (nextMessages) => this.runEngine({ ...runOptions, maxTokens: structuredMaxTokens, messages: nextMessages }),
             maxStructuredRetries,
@@ -3533,8 +3366,13 @@ class AXPAiManagerService extends AXPAiAssistService {
             structuredOutputSchemaSummary: input.structuredOutputSchemaSummary,
         });
         return {
+            success: pipelineResult.success,
+            outputKind: pipelineResult.outputKind,
             text: pipelineResult.text,
             structured: pipelineResult.structured,
+            data: pipelineResult.data,
+            validationErrors: pipelineResult.validationErrors,
+            messages: pipelineResult.messages,
             raw: pipelineResult.structuredRunRaw,
         };
     }
@@ -3561,6 +3399,7 @@ class AXPAiManagerService extends AXPAiAssistService {
                     maxSteps: options.maxSteps,
                     temperature: options.temperature,
                     maxTokens: options.maxTokens,
+                    outputContract: options.outputContract,
                     expectStructuredOutput: options.expectStructuredOutput,
                     structuredOutputInstruction: options.structuredOutputInstruction,
                     platformRuntimeNotes: options.platformRuntimeNotes,
@@ -3795,6 +3634,51 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             type: Injectable
         }] });
 
+//#region ---- Imports ----
+//#endregion
+//#region ---- Built-in segment definitions ----
+/** Single source for entity select options and DI segment presets. */
+const AXM_BUILTIN_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_DEFINITIONS = [
+    {
+        name: 'text',
+        title: '@ai-management:agents.entities.agent.fields.output-contract.transcript-segment.options.text',
+        applicableKinds: ['object'],
+        contract: {
+            kind: 'object',
+            transcriptSegment: 'text',
+            structuredRetries: 2,
+        },
+    },
+    {
+        name: 'node',
+        title: '@ai-management:agents.entities.agent.fields.output-contract.transcript-segment.options.node',
+        applicableKinds: ['object'],
+        contract: {
+            kind: 'object',
+            transcriptSegment: 'node',
+            structuredRetries: 3,
+        },
+    },
+    {
+        name: 'followUp',
+        title: '@ai-management:agents.entities.agent.fields.output-contract.transcript-segment.options.follow-up',
+        applicableKinds: ['object'],
+        contract: {
+            kind: 'object',
+            transcriptSegment: 'followUp',
+            structuredRetries: 2,
+        },
+    },
+];
+//#endregion
+//#region ---- Provider ----
+class AXMBuiltinOutputContractTranscriptSegmentProvider {
+    provide() {
+        return AXM_BUILTIN_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_DEFINITIONS;
+    }
+}
+//#endregion
+
 //#region ---- Imports ----
 //#endregion
 //#region ---- Routes ----
@@ -3837,11 +3721,21 @@ class AXMAiManagementModule {
                 useClass: AXMAiManagementSettingProvider,
                 multi: true,
             },
+            {
+                provide: AXP_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_PROVIDER,
+                useClass: AXMBuiltinOutputContractTranscriptSegmentProvider,
+                multi: true,
+            },
             {
                 provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
                 useClass: AXMAiModelCatalogDataSourceDefinition,
                 multi: true,
             },
+            {
+                provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
+                useClass: AXMOutputContractTranscriptSegmentDataSourceDefinition,
+                multi: true,
+            },
             {
                 provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
                 useClass: AXMAiAgentCatalogDataSourceDefinition,
@@ -3912,11 +3806,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                             useClass: AXMAiManagementSettingProvider,
                             multi: true,
                         },
+                        {
+                            provide: AXP_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_PROVIDER,
+                            useClass: AXMBuiltinOutputContractTranscriptSegmentProvider,
+                            multi: true,
+                        },
                         {
                             provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
                             useClass: AXMAiModelCatalogDataSourceDefinition,
                             multi: true,
                         },
+                        {
+                            provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
+                            useClass: AXMOutputContractTranscriptSegmentDataSourceDefinition,
+                            multi: true,
+                        },
                         {
                             provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
                             useClass: AXMAiAgentCatalogDataSourceDefinition,
@@ -4020,82 +3924,6 @@ function axpAiDelegatedAgentPromptPreview(argumentsValue) {
 }
 //#endregion
 
-//#region ---- AI tool command args ----
-/**
- * Recursively parses string values that look like JSON objects or arrays, then
- * normalizes nested values the same way.
- *
- * LLM tool calls often stringify nested payloads (e.g. `__context__` for
- * `Entity:Create`). Use this before passing args to the command or query service
- * from AI paths only — not inside generic command infrastructure.
- *
- * @param toolName When set, command-specific AI defaults from command definitions are merged (e.g. `Entity:Create` redirect).
- */
-function normalizeAiToolCommandArgs(value, toolName) {
-    const normalized = normalizeLikelyJsonStringValuesRecursive(value);
-    return applyAiToolInputDefaultsByCommandName(toolName, normalized);
-}
-function normalizeLikelyJsonStringValuesRecursive(value) {
-    if (value === null || value === undefined) {
-        return value;
-    }
-    if (typeof value === 'string') {
-        const trimmed = value.trim();
-        if ((trimmed.startsWith('{') && trimmed.endsWith('}')) ||
-            (trimmed.startsWith('[') && trimmed.endsWith(']'))) {
-            try {
-                const parsed = JSON.parse(trimmed);
-                return normalizeLikelyJsonStringValuesRecursive(parsed);
-            }
-            catch {
-                return value;
-            }
-        }
-        return value;
-    }
-    if (Array.isArray(value)) {
-        return value.map((item) => normalizeLikelyJsonStringValuesRecursive(item));
-    }
-    if (typeof value === 'object') {
-        const obj = value;
-        const out = {};
-        for (const key of Object.keys(obj)) {
-            out[key] = normalizeLikelyJsonStringValuesRecursive(obj[key]);
-        }
-        return out;
-    }
-    return value;
-}
-function applyAiToolInputDefaultsByCommandName(toolName, payload) {
-    if (toolName !== 'Entity:Create') {
-        return payload;
-    }
-    return mergeEntityCreateAiToolDefaults(payload);
-}
-/** Applies `axpCreateEntityAiToolInputDefaults` so AI flows do not trigger post-create navigation. */
-function mergeEntityCreateAiToolDefaults(payload) {
-    if (payload == null || typeof payload !== 'object' || Array.isArray(payload)) {
-        return payload;
-    }
-    const p = payload;
-    const ctx = p['__context__'] ?? {};
-    const opts = ctx['options'] ?? {};
-    const proc = opts['process'] ?? {};
-    const defProcess = axpCreateEntityAiToolInputDefaults.__context__.options.process;
-    p['__context__'] = {
-        ...ctx,
-        options: {
-            ...opts,
-            process: {
-                ...proc,
-                ...defProcess,
-            },
-        },
-    };
-    return p;
-}
-//#endregion
-
 //#region ---- Imports ----
 //#endregion
 /** Maximum length for assist initial transcript text after HTML strip (characters). */
@@ -4558,6 +4386,97 @@ function getAiChatCommandLlmParametersOverride(commandName) {
 }
 //#endregion
 
+//#region ---- Imports ----
+//#endregion
+
+//#region ---- Imports ----
+function contractFromUnknown(raw) {
+    if (raw == null) {
+        return null;
+    }
+    if (typeof raw === 'object' && !Array.isArray(raw) && 'kind' in raw) {
+        const parsed = parseAgentOutputContract(raw);
+        if (parsed) {
+            return parsed;
+        }
+    }
+    return parseAgentOutputContract(raw);
+}
+/**
+ * Resolves the effective output contract for one engine turn.
+ *
+ * Priority: runtime > input > agent > assist > `{ kind: 'string' }`.
+ */
+function resolveEffectiveOutputContract(params) {
+    const runtime = contractFromUnknown(params.runtime);
+    if (runtime) {
+        return runtime;
+    }
+    const input = contractFromUnknown(params.input);
+    if (input) {
+        return input;
+    }
+    const agent = contractFromUnknown(params.agent);
+    if (agent) {
+        return agent;
+    }
+    const assist = contractFromUnknown(params.assist);
+    if (assist) {
+        return assist;
+    }
+    return resolveAgentOutputContract(null);
+}
+//#endregion
+
+//#region ---- Imports ----
+function hasAnyStructuredContent(combined, segments) {
+    if (combined.trim().length > 0) {
+        return true;
+    }
+    if (!segments?.length) {
+        return false;
+    }
+    return segments.some((s) => (s ?? '').trim().length > 0);
+}
+/**
+ * Parses JSON from assistant text (including lightweight local repair), then optionally runs a custom validator.
+ *
+ * @param textSegmentsFallback - When provided, each segment is tried after combined text (last segment first); helps when prose and JSON sit in separate assistant text blocks.
+ */
+async function validateStructuredAssistantResponse(assistantPlainText, structuredValidator, textSegmentsFallback) {
+    if (!hasAnyStructuredContent(assistantPlainText, textSegmentsFallback)) {
+        return {
+            ok: false,
+            errorMessage: 'Assistant returned empty output.',
+            failurePhase: 'parse',
+        };
+    }
+    const parsed = parseStructuredAssistantWithSegmentFallback(assistantPlainText, textSegmentsFallback ?? []);
+    if (parsed === undefined) {
+        return {
+            ok: false,
+            errorMessage: 'Could not parse assistant output as JSON (expected a JSON object or array; optional markdown fence; segment fallback, local repair, and truncation repair also failed).',
+            failurePhase: 'parse',
+        };
+    }
+    if (!structuredValidator) {
+        return { ok: true, value: parsed };
+    }
+    try {
+        const value = await structuredValidator(parsed);
+        return { ok: true, value };
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        return {
+            ok: false,
+            errorMessage: msg.trim().length > 0 ? msg : 'Structured validation failed.',
+            failurePhase: 'validator',
+        };
+    }
+}
+//#endregion
+
 //#region ---- Imports ----
 //#endregion
 /**
@@ -4592,7 +4511,7 @@ class AXPAiAssistChatModelCatalogService {
             id: x.id,
             name: x.name?.trim() ?? '',
             title: resolveMultiLanguageString((x.title ?? x.name ?? x.id), this.localeId).trim() || x.id,
-            modelPurposes: normalizeModelPurposes(x),
+            modelPurposes: readModelPurposes(x),
             chatTransport: x.chatTransport,
             maxContextTokens: typeof x.maxContextTokens === 'number' && x.maxContextTokens > 0
                 ? x.maxContextTokens
@@ -4688,5 +4607,5 @@ function modelItemSupportsChatCatalogPurpose(m, purpose) {
  * Generated bundle index. Do not edit.
  */
 
-export { AIMANAGEMENT_CHAT_GENERATE_IMAGE_COMMAND_KEY, AIMANAGEMENT_CHAT_SYNTHESIZE_SPEECH_COMMAND_KEY, AIMANAGEMENT_CHAT_TRANSCRIBE_SPEECH_COMMAND_KEY, AIMANAGEMENT_EXTRACT_DOCUMENT_TEXT_COMMAND_KEY, AIMANAGEMENT_STRUCTURED_TEXT_COMPLETION_COMMAND_KEY, AI_AGENT_CATALOG_DATASOURCE_NAME, AI_CHAT_ATTACHMENT_CATEGORY, AI_CHAT_ATTACHMENT_REF_TYPE, AI_CHAT_GENERATED_IMAGE_REF_TYPE, AI_CHAT_GENERATED_SPEECH_REF_TYPE, AI_COMMAND_REGISTRY_CATALOG_DATASOURCE_NAME, AI_GENERATED_IMAGE_MAX_REMOTE_URL_IN_TOOL, AI_MODEL_CATALOG_DATASOURCE_NAME, AI_MODEL_IMAGE_CATALOG_DATASOURCE_NAME, AI_MODEL_SPEECH_CATALOG_DATASOURCE_NAME, AI_MODEL_TTS_CATALOG_DATASOURCE_NAME, AI_QUERY_REGISTRY_CATALOG_DATASOURCE_NAME, AXMAiAgentCatalogDataSourceDefinition, AXMAiAssistPermissionKeys, AXMAiAssistPromptBoxComponent, AXMAiAssistPromptBoxService, AXMAiCommandRegistryCatalogDataSourceDefinition, AXMAiManagementEntityProvider, AXMAiManagementMenuProvider, AXMAiManagementModule, AXMAiModelCatalogDataSourceDefinition, AXMAiQueryRegistryCatalogDataSourceDefinition, AXMPermissionDefinitionProvider, AXMPermissionsKeys, AXPAI_CONVERSATION_FOLLOW_UP_AGENT_NAME, AXPAI_DELEGATED_AGENT_DEFAULT_MAX_STEPS, AXPAI_DOCUMENT_VISION_DEFAULT_USER_INSTRUCTION, AXPAI_DOCUMENT_VISION_EXTRACTION_SYSTEM, AXPAI_ENGINE_DEFAULT_MAX_STEPS, AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX, AXPAiAssistChatModelCatalogService, AXPAiAssistDefaultMaxStructuredRetries, AXPAiAssistDefaultStructuredMaxTokens, AXPAiAssistService, AXPAiChatToolRunContextService, AXPAiDefaultModelPickerService, AXPAiEngine, AXPAiManagementMenuKeys, AXPAiManagementSettings, AXPAiManagerService, AXPAiPlatformRuntimeContextBuilder, AXPAiStructuredOutputError, AiManagementManifest, RootConfig, axpAiAssistInitialMessagesToTranscript, axpAiAssistStarterPromptLabels, axpAiAssistStarterPromptTexts, axpAiBuildAutoFollowUpAgentQuery, axpAiChatAgentResultMessage, axpAiChatDelegatedReflectionAssistantMessage, axpAiChatMessageGetText, axpAiChatMessageIsDelegatedReflectionExcluded, axpAiChatMessagesFromProviderAssistant, axpAiChatTextMessage, axpAiChatToolOrAgentResultBodyJson, axpAiChatToolResultBodyJson, axpAiChatToolResultMessage, axpAiChatUserMessage, axpAiCoercePlanningAssistantTextToThink, axpAiCollectDelegatedAgentOutcomeResponses, axpAiDelegatedAgentOutcomeResponsesPlainText, axpAiDelegatedAgentPromptPreview, axpAiDelegatedSubTranscriptAppendFileArtifactFromToolResults, axpAiExtractLastStoredFileArtifactFromChatMessages, axpAiExtractStoredFileArtifactFromUnknown, axpAiMergePlainAssistantTextTurn, axpAiNormalizeFollowUpCommand, axpAiNormalizeFollowUpContent, axpAiNormalizeFollowUpItem, axpAiNormalizeHandlerResultToToolBody, axpAiParseDelegatedAgentResultSegmentsFromUnknown, axpAiParseSupervisorAgentToolName, axpAiPruneAssistantPiecesToFirstToolOnly, axpAiReconcileSupervisorFinalAssistantWithDelegatedOutcomes, axpAiShouldAutoInvokeFollowUpAgent, axpAiStripAssistInitialHtmlToPlain, axpAiSupervisorAgentToolName, axpAiToolCallFromAssistantToolMessage, axpAiTranscriptAlreadyHasFollowUpInTurn, blobOrFileFromImageResult, getAiChatCommandLlmParametersOverride, isChatPurposeModelRow, isImagePurposeModelRow, isSpeechPurposeModelRow, isTtsPurposeModelRow, loadAssistPermissionRows, modelRowHasPurpose, normalizeAiToolCommandArgs, normalizeModelPurposes, persistAiChatAttachmentImage, persistAiGeneratedImage, persistAiGeneratedSpeech };
+export { AIMANAGEMENT_CHAT_GENERATE_IMAGE_COMMAND_KEY, AIMANAGEMENT_CHAT_SYNTHESIZE_SPEECH_COMMAND_KEY, AIMANAGEMENT_CHAT_TRANSCRIBE_SPEECH_COMMAND_KEY, AIMANAGEMENT_EXTRACT_DOCUMENT_TEXT_COMMAND_KEY, AIMANAGEMENT_STRUCTURED_TEXT_COMPLETION_COMMAND_KEY, AI_AGENT_CATALOG_DATASOURCE_NAME, AI_CHAT_ATTACHMENT_CATEGORY, AI_CHAT_ATTACHMENT_REF_TYPE, AI_CHAT_GENERATED_IMAGE_REF_TYPE, AI_CHAT_GENERATED_SPEECH_REF_TYPE, AI_COMMAND_REGISTRY_CATALOG_DATASOURCE_NAME, AI_GENERATED_IMAGE_MAX_REMOTE_URL_IN_TOOL, AI_MODEL_CATALOG_DATASOURCE_NAME, AI_MODEL_IMAGE_CATALOG_DATASOURCE_NAME, AI_MODEL_SPEECH_CATALOG_DATASOURCE_NAME, AI_MODEL_TTS_CATALOG_DATASOURCE_NAME, AI_OUTPUT_CONTRACT_TRANSCRIPT_SEGMENT_DATASOURCE_NAME, AI_QUERY_REGISTRY_CATALOG_DATASOURCE_NAME, AXMAiAgentCatalogDataSourceDefinition, AXMAiAssistPermissionKeys, AXMAiAssistPromptBoxComponent, AXMAiAssistPromptBoxService, AXMAiCommandRegistryCatalogDataSourceDefinition, AXMAiManagementEntityProvider, AXMAiManagementMenuProvider, AXMAiManagementModule, AXMAiModelCatalogDataSourceDefinition, AXMAiQueryRegistryCatalogDataSourceDefinition, AXMOutputContractTranscriptSegmentDataSourceDefinition, AXMPermissionDefinitionProvider, AXMPermissionsKeys, AXPAI_AGENT_OUTPUT_CONTRACT_DEFAULT_STRUCTURED_RETRIES, AXPAI_SUPERVISOR_AGENT_TOOL_PREFIX, AXPAiAssistChatModelCatalogService, AXPAiAssistDefaultMaxStructuredRetries, AXPAiAssistDefaultStructuredMaxTokens, AXPAiAssistService, AXPAiChatToolRunContextService, AXPAiDefaultModelPickerService, AXPAiEngine, AXPAiManagementMenuKeys, AXPAiManagementSettings, AXPAiManagerService, AXPAiOutputContractResolveService, AXPAiPlatformRuntimeContextBuilder, AXPAiStructuredOutputError, AiManagementManifest, RootConfig, axpAiAgentOutputContractOmitsRoleBaseline, axpAiAgentOutputContractStructuredRetryCap, axpAiAgentOutputContractUsesStructuredFinalize, axpAiAssistInitialMessagesToTranscript, axpAiAssistStarterPromptLabels, axpAiAssistStarterPromptTexts, axpAiChatMessageGetText, axpAiChatMessageIsDelegatedReflectionExcluded, axpAiChatTextMessage, axpAiChatToolOrAgentResultBodyJson, axpAiChatToolResultBodyJson, axpAiChatUserMessage, axpAiDelegatedAgentOutcomeResponsesPlainText, axpAiDelegatedAgentPromptPreview, axpAiDelegatedAgentResultSegments, axpAiParseSupervisorAgentToolName, axpAiStripAssistInitialHtmlToPlain, blobOrFileFromImageResult, buildStructuredOutputRetryUserText, defaultRetriesForKind, deriveProviderResponseFormat, extractLastAssistantPlainText, extractLastAssistantStructuredParts, extractLastAssistantTextSegments, getAiChatCommandLlmParametersOverride, isChatPurposeModelRow, isImagePurposeModelRow, isSpeechPurposeModelRow, isTtsPurposeModelRow, loadAssistPermissionRows, modelRowHasPurpose, parseAgentOutputContract, parseJsonSchemaLike, parseResponseFormat, persistAiChatAttachmentImage, persistAiGeneratedImage, persistAiGeneratedSpeech, readModelPurposes, resolveAgentOutputContract, resolveEffectiveOutputContract, resolveOutputTranscriptSegment, validateAgainstContract, validateJsonSchemaMini, validateStructuredAssistantResponse };
 //# sourceMappingURL=acorex-modules-ai-management.mjs.map