@sublang/slc 0.15.0 → 0.16.0

package/dist/verify-coverage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify-coverage.d.ts","sourceRoot":"","sources":["../src/verify-coverage.ts"],"names":[],"mappings":"AA8BA,OAAO,EAeL,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAErB,sEAAsE;AACtE,eAAO,MAAM,aAAa,YAAY,CAAC;AAavC,iFAAiF;AACjF,qBAAa,wBAAyB,SAAQ,KAAK;IACjD,cAGC;CACF;AAyDD,6DAA6D;AAC7D,UAAU,WAAW;IACnB,MAAM,EAAE,iBAAiB,GAAG;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,OAAO,CAAC,eAAe,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,GAAG,WAAW,CAAC;IAC3E,mEAAmE;IACnE,eAAe,CAAC,EAAE;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACnC,CAAC;IACF,4EAA4E;IAC5E,IAAI,CAAC,EAAE,qBAAqB,CAAC;CAC9B;AAyBD,UAAU,qBAAqB;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjC;AAqJD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,OAAO,GAAG,WAAW,CAwB3D;AAopCD,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAU/D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,CAAC,GAAG,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,OAAO,EAC7D,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,WAAW,GAAE,SAAS,OAAO,EAAO,GACnC,OAAO,CAST;AAg6DD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,CA+IjE;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,OAAO,EAClB,IAAI,GAAE;IACJ,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4EAA4E;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAC;CACf,GACL,OAAO,CAAC,MAAM,EAAE,CAAC,CAkCnB;AAyvBD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CA8BT;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAmBnD"}
+{"version":3,"file":"verify-coverage.d.ts","sourceRoot":"","sources":["../src/verify-coverage.ts"],"names":[],"mappings":"AA8BA,OAAO,EAeL,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAErB,sEAAsE;AACtE,eAAO,MAAM,aAAa,YAAY,CAAC;AAavC,iFAAiF;AACjF,qBAAa,wBAAyB,SAAQ,KAAK;IACjD,cAGC;CACF;AAyDD,6DAA6D;AAC7D,UAAU,WAAW;IACnB,MAAM,EAAE,iBAAiB,GAAG;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,OAAO,CAAC,eAAe,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,GAAG,WAAW,CAAC;IAC3E,mEAAmE;IACnE,eAAe,CAAC,EAAE;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACnC,CAAC;IACF,4EAA4E;IAC5E,IAAI,CAAC,EAAE,qBAAqB,CAAC;CAC9B;AAyBD,UAAU,qBAAqB;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjC;AAqJD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,OAAO,GAAG,WAAW,CAwB3D;AAirCD,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAU/D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,CAAC,GAAG,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,OAAO,EAC7D,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,WAAW,GAAE,SAAS,OAAO,EAAO,GACnC,OAAO,CAST;AAg6DD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,CAqLjE;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,OAAO,EAClB,IAAI,GAAE;IACJ,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4EAA4E;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAC;CACf,GACL,OAAO,CAAC,MAAM,EAAE,CAAC,CAkCnB;AAo0BD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CA8BT;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAoBnD"}

package/dist/verify-coverage.js

@@ -285,18 +285,20 @@ function initializedCoverageContext(machine, dynamic) {
     };
 }
 /** The `Output shall include` clause a result description declares. */
-const OUTPUT_CLAUSE = /Output shall include\s+(.+)$/;
-/** Every backticked `field:` property named inside that clause. */
-const REQUIRED_FIELD = /`([A-Za-z_$][A-Za-z0-9_$]*):/g;
+const OUTPUT_CLAUSE = /(?:Output shall include|输出应包含)\s*(.*)$/s;
+/** Every plain or annotated backticked identifier field inside that clause. */
+const REQUIRED_FIELD = /`([A-Za-z_$][A-Za-z0-9_$]*)(?::[^`]*)?`/g;
 /** Structured fields named by the generic Captain result contracts. */
 const STRUCTURED_RESULT_FIELD = /\b(response|question|remainingPlan|nextPlaybookId|nextPlaybookInput)\b/g;
 function requiredFields(description) {
-    const clause = OUTPUT_CLAUSE.exec(description)?.[1] ?? '';
+    const clause = OUTPUT_CLAUSE.exec(description)?.[1];
+    // An explicit clause owns the payload schema. Generic Captain words in the
+    // preceding outcome prose must not invent extra fields in a closed record.
+    // Preserve older Captain descriptions that predate explicit output clauses.
     return [
         ...new Set([
-            ...[...clause.matchAll(REQUIRED_FIELD)].map((match) => match[1]),
-            ...[...description.matchAll(STRUCTURED_RESULT_FIELD)].map((match) => match[1]),
-        ]),
+            ...(clause ?? description).matchAll(clause === undefined ? STRUCTURED_RESULT_FIELD : REQUIRED_FIELD),
+        ].map((match) => match[1])),
     ];
 }
 function synthesizedFieldValue(field) {
@@ -623,6 +625,7 @@ function persistedSnapshotWithContext(provided, context) {
 function makeActor(machine, script, playbookScript = () => null, restoredContext, observeTransition) {
     coverageCheckpoint();
     const coverageErrors = [];
+    const coverageTransitions = [];
     const workActor = fromPromise(async ({ input, self, }) => {
         const output = await script(input ?? {}, self.id);
         if (output === null)
@@ -671,7 +674,18 @@ function makeActor(machine, script, playbookScript = () => null, restoredContext
                     }
                     const source = transition.source;
                     const target = transition.target;
-                    observeTransition?.({
+                    const event = inspection.event;
+                    const arms = source?.transitions?.get(typeof event === 'object' && event !== null
+                        ? String(event.type)
+                        : '');
+                    const observed = {
+                        root: source === provided.root,
+                        ...(typeof event === 'object' && event !== null
+                            ? { event: event }
+                            : {}),
+                        ...(arms === undefined
+                            ? {}
+                            : { armIndex: arms.indexOf(transition) }),
                         ...(typeof source === 'object' &&
                             source !== null &&
                             typeof source.id === 'string'
@@ -684,7 +698,9 @@ function makeActor(machine, script, playbookScript = () => null, restoredContext
                                 ? [candidate.id]
                                 : [])
                             : [],
-                    });
+                    };
+                    coverageTransitions.push(observed);
+                    observeTransition?.(observed);
                 }
             }
             const event = inspection.event;
@@ -703,6 +719,9 @@ function makeActor(machine, script, playbookScript = () => null, restoredContext
     Object.defineProperty(actor, 'coverageErrors', {
         value: coverageErrors,
     });
+    Object.defineProperty(actor, 'coverageTransitions', {
+        value: coverageTransitions,
+    });
     actor.subscribe({ error: () => { } });
     actor.start();
     coverageCheckpoint();
@@ -2330,11 +2349,27 @@ export function fsmCoverageTestTimeout(fsmModule) {
         : playbooks.reduce((total, playbook) => total +
             transitionArms(playbook.invocation.onDone).length +
             transitionArms(playbook.invocation.onError).length, 0);
+    if (!controller) {
+        for (const [index, arm] of transitionArms((config.on ?? {})[INTERRUPT_EVENT]).entries()) {
+            const targetName = rawArmTarget(arm);
+            const target = targetName === undefined
+                ? undefined
+                : stateRefForTarget(refs, targetName);
+            const captain = captains.find((candidate) => target !== undefined && sameStateRef(candidate.ref, target));
+            if (captain !== undefined &&
+                captain.binding.actor !== 'script' &&
+                !interruptDriveForRef(machine, refs, captain.ref, captainPublicStateId(captain), [], index).satisfiable)
+                pathSearches += 1;
+        }
+    }
     for (const captain of captains) {
         const resultKeys = Object.keys(captain.binding.result);
         const guardedDoneArms = transitionArms(captain.invocation.onDone).filter((arm) => armGuard(arm) !== undefined).length;
         const errorArms = transitionArms(captain.invocation.onError).length;
-        if (!controller && rootInterruptProbes === 0) {
+        if (!controller &&
+            (rootInterruptProbes === 0 ||
+                (captain.binding.actor !== 'script' &&
+                    !interruptDriveForRef(machine, refs, captain.ref, captainInterruptTarget(captain)).satisfiable))) {
             pathSearches +=
                 resultKeys.length +
                     (resultKeys.includes(NEEDS_BOSS_REPLY) ? 1 : 0) +
@@ -2559,6 +2594,45 @@ async function runFsmCoverage(fsmModule, sourceText) {
             }
             const drive = interruptDriveForRef(machine, refs, target, targetId, sourceCandidates, armIndex);
             if (!drive.satisfiable) {
+                if (!isController &&
+                    targetCaptain !== undefined &&
+                    targetCaptain.binding.actor !== 'script') {
+                    const guard = orderedArmPredicate(machine, transitionArms((machine.config.on ?? {})[INTERRUPT_EVENT]), armIndex);
+                    const reached = await searchCoverageEntry(machine, { kind: 'acting', value: targetCaptain }, refs, captains, playbooks, sourceCandidates, async (actor) => {
+                        try {
+                            if (guard === undefined ||
+                                !guard.run({
+                                    context: actor.getSnapshot().context,
+                                    event: drive.event,
+                                }))
+                                return false;
+                        }
+                        catch {
+                            coverageCheckpoint();
+                            return false;
+                        }
+                        const before = actor.coverageTransitions.length;
+                        actor.send(drive.event);
+                        const completed = await settle(actor, atState(target));
+                        return (completed &&
+                            actor.coverageTransitions
+                                .slice(before)
+                                .some((transition) => transition.root &&
+                                transition.armIndex === armIndex &&
+                                transition.event === drive.event &&
+                                transition.targetIds.includes(resolvedStateNode(machine, target)?.id ?? '')));
+                    });
+                    if (reached.covered)
+                        continue;
+                    if (reached.inputFailure !== undefined) {
+                        findings.push(`${INTERRUPT_EVENT} target ${arm.target}: ${reached.inputFailure}`);
+                        continue;
+                    }
+                    if (reached.limitation !== undefined) {
+                        findings.push(`${INTERRUPT_EVENT} target ${arm.target}: ${reached.limitation}`);
+                        continue;
+                    }
+                }
                 findings.push(`${INTERRUPT_EVENT} target ${arm.target} is unsatisfiable under context/event probing`);
                 continue;
             }
@@ -2608,7 +2682,10 @@ async function runFsmCoverage(fsmModule, sourceText) {
         return findings;
     for (const captain of captains) {
         await coverageYield();
-        if (!canJump && !isController) {
+        if (!isController &&
+            (!canJump ||
+                (captain.binding.actor !== 'script' &&
+                    !interruptDriveForRef(machine, refs, captain.ref, captainInterruptTarget(captain), sourceCandidates).satisfiable))) {
             findings.push(...(await probeNonPreemptiveActor(machine, captain, refs, captains, playbooks, [...stateCandidates, ...sourceCandidates])));
             continue;
         }
@@ -3021,9 +3098,10 @@ export async function emitFsmCoverageTest(opts) {
         fsmSourceFile: `./${opts.basename}.fsm.ts`,
         verifyModule: opts.verifyModule ?? VERIFY_MODULE,
     });
-    await mkdir(opts.artifactDir, { recursive: true });
+    if (opts.write === undefined)
+        await mkdir(opts.artifactDir, { recursive: true });
     const path = join(opts.artifactDir, `${opts.basename}.fsm.coverage.test.ts`);
-    await writeFile(path, content);
+    await (opts.write ?? writeFile)(path, content);
     return {
         path,
         diagnostics: findings.map((finding) => `fsm coverage: ${finding}`),