jsfe 1.7.1 → 1.7.3

package/README.md

@@ -769,6 +769,11 @@ return aiResponse;
   is already repaired: the next turn starts with fresh intent detection. Log or record the error;
   no rollback is needed. A deliberate `RETURN ''` (which ends every flow) is not flagged.
 
+Native FORM collection in 1.7.2 acknowledges an unreadable answer once, then yields the current
+utterance while retaining its draft. Explicit recovery metadata distinguishes resumption, required
+restart, unknown-action hold and no promised recovery; business completion remains independent.
+See the [retry/yield/recovery contract](docs/forms.md#retry-yield-and-recovery-contract-172).
+
 ### Host Responsibilities: Tool Calls, Cancellation and Concurrency
 
 A flow can take actions in the outside world through `CALL-TOOL` — charge a card, send an SMS,

package/dist/forms/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/forms/contracts.js"],"names":[],"mappings":"AAaA;;;IAGC;AACD;;;;;EAGC;AACD,qGAAqG;AACrG;;QAmCC;AAeD;;;QAEC;AACD;;;;;;;QAMC;AACD;;;QAGC;AACD;;;;;;;QA8BC;AAED,mHAAmH;AACnH,kDAgBC;AAED,+GAA+G;AAC/G;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsEC"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/forms/contracts.js"],"names":[],"mappings":"AAcA;;;IAGC;AACD;;;;;EAGC;AACD,qGAAqG;AACrG;;QAqCC;AAgBD;;;QAEC;AACD;;;;;;;QAMC;AACD;;;QAGC;AACD;;;;;;;QA8BC;AAED,mHAAmH;AACnH,kDAgBC;AAED,+GAA+G;AAC/G;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwEC"}

package/dist/forms/contracts.js

@@ -1,4 +1,5 @@
 /** Build-time contracts for conversational flows. Transport operations remain registered tools. */
+import { INPUT_PROPOSALS_REQUIREMENT, hasInputProposals, proposalRuntimeSteps } from './proposal-runtime.js';
 import { ACTION_TOOLS } from './action-tools.js';
 import { normalizeHostRequirements } from '../host/capabilities.js';
 import { validateActionProjection, actionProjectionExpression } from './action-projection.js';
@@ -66,7 +67,9 @@ export function linkFormSchemas(flows, { externalFlows = [] } = {}) {
                 parameters.push(input.schema ? { name: input.name, type: 'object', jsonSchema: objectSchema(input.schema.inputs), description: input.description || input.label || input.name }
                     : { name: input.name, type: 'string', ...(input.profile.kind === 'choice' && !input.profile.accept_other ? { enum: input.profile.choices.map(c => c.key) } : {}), description: input.description || input.label || input.name });
             }
-        return { ...flow, parameters, variables: { ...flow.variables, inputs: { ...flow.variables.inputs, value: inputs } } };
+        const linked = { ...flow, parameters, variables: { ...flow.variables, inputs: { ...flow.variables.inputs, value: inputs } } };
+        // Descendant schemas are linked after declaration; propagate their runtime requirement to the root entry.
+        return flow.variables?.contract ? declared(linked, flow.variables.contract.value) : { ...linked, steps: proposalRuntimeSteps(flow.id, linked.steps, hasInputProposals(inputs) ? [INPUT_PROPOSALS_REQUIREMENT] : []) };
     });
 }
 function declared(flow, contract) {
@@ -79,12 +82,13 @@ function declared(flow, contract) {
         ...(step.type === 'FLOW' && step.callType === 'replace' ? { initializeDefaults: step.initializeDefaults ?? true } : {}),
         ...(step.branches ? { branches: Object.fromEntries(Object.entries(step.branches).map(([key, branch]) => [key, replacementDefaults(branch)])) } : {}),
         ...(step.onFail ? { onFail: replacementDefaults(step.onFail) } : {}) });
+    const requirements = [...normalizeHostRequirements(contract.requires, flow.id), ...(hasInputProposals(flow.variables?.inputs?.value) ? [INPUT_PROPOSALS_REQUIREMENT] : [])];
     const metadata = { version: 1, ...contract, parametersFrom: 'parameters' };
-    if (contract.requires !== undefined)
+    if (requirements.length || contract.requires !== undefined)
         Object.defineProperty(metadata, 'requires', {
-            value: normalizeHostRequirements(contract.requires, flow.id), enumerable: true, writable: false, configurable: false,
+            value: normalizeHostRequirements(requirements, flow.id), enumerable: true, writable: false, configurable: false,
         });
-    return { ...flow, steps: flow.steps.map(replacementDefaults), variables: { ...flow.variables, contract: value(metadata) } };
+    return { ...flow, steps: proposalRuntimeSteps(flow.id, flow.steps.map(replacementDefaults), requirements), variables: { ...flow.variables, contract: value(metadata) } };
 }
 export function defineWorker({ contract, ...flow }) {
     return declared({ scope: 'isolated', version: '1.0.0', ...flow }, contract);
@@ -114,7 +118,7 @@ export function definePerformer({ performs, contract, prepare, present, project
         call('prepare', prepare, { form: '{{form_instance}}' }),
         set('request', 'pf_request', 'cargo.actionRequest'),
         set('select', 'pf_action', 'selectFormAction(cargo, form_instance, performs)'),
-        when('bad_request', "!(pf_action === null || pf_action && typeof pf_action === 'object' && pf_action.action) || pf_action !== null && (!pf_request || typeof pf_request !== 'object')", { id: `${spec.id}_prepare_failed`, type: 'FLOW', value: 'give-up', callType: 'reboot', parameters: { context: '{{exit_context}}', context_es: '{{exit_context_es}}' } }),
+        when('bad_request', "!(pf_action === null || pf_action && typeof pf_action === 'object' && pf_action.action) || pf_action !== null && (!pf_request || typeof pf_request !== 'object')", { id: `${spec.id}_prepare_failed`, type: 'FLOW', value: 'give-up', callType: 'reboot', recovery: { version: 1, mode: 'none', reason: 'performer_request_invalid' }, parameters: { context: '{{exit_context}}', context_es: '{{exit_context_es}}' } }),
         set('proposal', 'pf_record', "pf_action ? prepareFormAction(cargo, form_instance, pf_action, pf_request) : null"),
     ];
     const flow = formFlow({ ...spec, confirm, confirmation_condition: "pf_action !== null && pf_action && typeof pf_action === 'object'",
@@ -187,10 +191,16 @@ export function validateFlowContracts(flows, tools = [], { externalFlows = [], r
                 for (const name of deps)
                     if (!name.startsWith('cargo.') && !name.startsWith('form.') && !fieldNames.has(name))
                         fail(flow.id, `unknown dependency ${name}`);
+                for (const name of [...Object.keys(spec.proposal?.when || {}), ...(spec.proposal?.unless || [])])
+                    if (!name.startsWith('cargo.') && !name.startsWith('form.') && !fieldNames.has(name))
+                        fail(flow.id, `unknown proposal condition ${name}`);
                 graph.set(spec.name, deps);
                 for (const key of ['form', 'validator', 'prepare', 'refresh', 'after', 'answer_precheck', 'answer_validator', 'on_exhausted'])
                     if (spec[key] && !ids.has(spec[key]))
                         fail(flow.id, `unknown ${key} worker ${spec[key]}`);
+                for (const reference of [spec.proposal?.prepare, spec.proposal?.on_declined, ...(spec.proposal?.interrupts || []).map(event => event.flow)])
+                    if (reference && !ids.has(reference))
+                        fail(flow.id, `unknown proposal worker ${reference}`);
             }
             const visited = new Set(), active = new Set();
             const visit = name => { if (active.has(name))

package/dist/forms/flows.d.ts

@@ -417,8 +417,8 @@ export const FLOWS: ({
         };
     })[];
 } | {
+    steps: any;
     variables: any;
-    steps: any[];
     prompt?: undefined;
     prompt_es?: undefined;
     primary?: boolean | undefined;
@@ -432,6 +432,7 @@ export const FLOWS: ({
     };
     parameters: any[];
 } | {
+    steps: any;
     variables: any;
     id: string;
     name: string;
@@ -442,136 +443,8 @@ export const FLOWS: ({
         type: string;
         description: string;
     }[];
-    steps: ({
-        id: any;
-        type: string;
-        variable: any;
-        value: any;
-    } | {
-        parameters?: any;
-        initializeDefaults?: boolean | undefined;
-        id: any;
-        type: string;
-        value: any;
-        callType: string;
-    } | {
-        id: any;
-        type: string;
-        branches: {
-            [x: string]: any;
-            default: {
-                id: any;
-                type: string;
-                variable: any;
-                value: any;
-            };
-        };
-    } | {
-        id: string;
-        type: string;
-        branches: {
-            'condition: rf_next_form': {
-                parameters?: any;
-                initializeDefaults?: boolean | undefined;
-                id: any;
-                type: string;
-                value: any;
-                callType: string;
-            };
-            default: {
-                parameters?: any;
-                initializeDefaults?: boolean | undefined;
-                id: any;
-                type: string;
-                value: any;
-                callType: string;
-            };
-        };
-    })[];
-} | {
-    variables: any;
-    id: string;
-    name: string;
-    version: string;
-    scope: string;
-    description: string;
-    parameters: {
-        name: string;
-        type: string;
-        description: string;
-    }[];
-    steps: ({
-        id: any;
-        type: string;
-        variable: any;
-        value: any;
-    } | {
-        parameters?: any;
-        initializeDefaults?: boolean | undefined;
-        id: any;
-        type: string;
-        value: any;
-        callType: string;
-    } | {
-        id: any;
-        type: string;
-        branches: {
-            [x: string]: any;
-            default: {
-                id: any;
-                type: string;
-                variable: any;
-                value: any;
-            };
-        };
-    } | {
-        id: string;
-        type: string;
-        branches: {
-            'condition: pm_keys.length > 0': {
-                parameters?: any;
-                initializeDefaults?: boolean | undefined;
-                id: any;
-                type: string;
-                value: any;
-                callType: string;
-            };
-            'condition: pm_flow': {
-                parameters?: any;
-                initializeDefaults?: boolean | undefined;
-                id: any;
-                type: string;
-                value: any;
-                callType: string;
-            };
-            "condition: pm_key === 'done'": {
-                id: string;
-                type: string;
-                value: string;
-                value_es: string;
-                outcome: string;
-            };
-            "condition: /[a-z\u00E1\u00E9\u00ED\u00F3\u00FA\u00FC\u00F1]/i.test(String(cargo.choiceText || ''))": {
-                id: string;
-                type: string;
-            };
-            "condition: retry !== '1'": {
-                parameters?: any;
-                initializeDefaults?: boolean | undefined;
-                id: any;
-                type: string;
-                value: any;
-                callType: string;
-            };
-            default: {
-                id: string;
-                type: string;
-                value: string;
-                value_es: string;
-            };
-        };
-    })[];
 } | {
+    steps: any;
     variables: any;
     id: string;
     name: string;
@@ -582,30 +455,5 @@ export const FLOWS: ({
         name: string;
         type: string;
     }[];
-    steps: ({
-        id: any;
-        type: string;
-        variable: any;
-        value: any;
-    } | {
-        parameters?: any;
-        initializeDefaults?: boolean | undefined;
-        id: any;
-        type: string;
-        value: any;
-        callType: string;
-    } | {
-        id: any;
-        type: string;
-        branches: {
-            [x: string]: any;
-            default: {
-                id: any;
-                type: string;
-                variable: any;
-                value: any;
-            };
-        };
-    })[];
 })[];
 //# sourceMappingURL=flows.d.ts.map

package/dist/forms/flows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flows.d.ts","sourceRoot":"","sources":["../../src/forms/flows.js"],"names":[],"mappings":"AAsFA;;;;;;GAMG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2DC;AACD;;;GAGG;AACH;;;;;;EAGC;AAiSD,wHAAwH;AACxH,wEAaC;AACD,4FAA4F;AAC5F;;;EAYC;AACD,sGAAsG;AACtG;;;EAOC;AAlcM,6CAAuG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAknB9G;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAOG"}
+{"version":3,"file":"flows.d.ts","sourceRoot":"","sources":["../../src/forms/flows.js"],"names":[],"mappings":"AA0FA;;;;;;GAMG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6DC;AACD;;;GAGG;AACH;;;;;;EAGC;AA8VD,wHAAwH;AACxH,wEAaC;AACD,4FAA4F;AAC5F;;;EAYC;AACD,sGAAsG;AACtG;;;EAOC;AAjgBM,6CAAuG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkrB9G;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAOG"}