@llm4ts/shell 2.47.1 → 2.48.0

package/flows/lib/epic-mvp.js

@@ -83,6 +83,7 @@ export const mvpPlanInstructions = (epicId, guidance, orientation) => [
     "  `acceptance` outcome, and none depends on a parked one.",
     "- Prefer fewer, thinner stories: the thinnest end-to-end path that works.",
     "- Items an approved brief marks deferred or dropped are parked, never planned.",
+    "- Leave `testsDeferred` out: every MVP story is written test-first.",
     'Add `"later":[…]` to each story and `"parked":[…]` beside `"stories"` in the JSON.'
 ].join("\n");
 /** The MVP planner: writes `mvp-cut.json` beside the plan with the stories parked whole. */

package/flows/lib/epic-stories.js

@@ -750,7 +750,8 @@ export const storyJsonSchema = {
         readFirst: { type: "array", items: { type: "string" } },
         acceptance: { type: "array", items: { type: "string" } },
         provides: { type: "array", items: { type: "string" } },
-        testsChange: { type: "boolean" }
+        testsChange: { type: "boolean" },
+        testsDeferred: { type: "string" }
     },
     required: [
         "id",
@@ -797,6 +798,10 @@ orientation) => [
     "- `testsChange`: true only for a story whose job includes deleting, skipping or rewriting",
     "  existing tests (a migration of a test suite, a removed feature). Every other story leaves",
     "  it out: the gates fail a story that deletes a test file or adds a skip marker.",
+    "- `testsDeferred`: only for a story whose code runs nowhere but a live runtime the repository",
+    "  cannot host in a test (IBM ACE message flows and ESQL, a mainframe transaction): one",
+    "  sentence naming that runtime. The judge then does not ask it for tests. Never set it because",
+    "  tests are hard to write; every other story leaves it out and owns its test files.",
     "- `owned` sets are pairwise DISJOINT: no path prefix appears under two stories.",
     "- Shared surfaces (the kit, the theme, house rules) are never edited by a feature story. A new",
     "  shared component is its own story, and every story using it depends on it.",
@@ -998,10 +1003,15 @@ export const storyDimensions = [
  * a partial score elsewhere is a Warning a follow-up round can close.
  */
 export const judgeSeverity = (name, score) => name === "provides" || score <= 0 ? "Critical" : "Warning";
+/** The dimensions a story is held to: all of them, less `tests` when the plan deferred them. */
+export const judgedDimensionsOf = (story) => storyDimensions
+    .map((dimension) => dimension.name)
+    .filter((name) => story.testsDeferred === undefined || name !== "tests");
 const subBar = (scored, story) => ReviewResult.make({
     issues: scored.scores
-        .filter((score) => score.score <
-        (storyDimensions.find((dimension) => dimension.name === score.name)?.maxScore ?? 2))
+        .filter((score) => judgedDimensionsOf(story).includes(score.name) &&
+        score.score <
+            (storyDimensions.find((dimension) => dimension.name === score.name)?.maxScore ?? 2))
         .map((score) => ReviewIssue.make({
         severity: judgeSeverity(score.name, score.score),
         title: `judge[${story.id}]: ${score.name} scored ${score.score}`,
@@ -1009,6 +1019,13 @@ const subBar = (scored, story) => ReviewResult.make({
     })),
     summary: `judge:${story.id}`
 });
+/** What a judge is told about a story the plan exempted from tests; nothing otherwise. */
+export const testsDeferredLines = (reason) => reason === undefined
+    ? []
+    : [
+        `Tests deferred by the plan: ${reason}`,
+        "No test file is expected; do not mark any dimension down for its absence."
+    ];
 /**
  * What the story judge reads beside the diff: the story, and what every
  * story it depends on provides. Without the dependencies the judge cannot
@@ -1039,6 +1056,7 @@ export const storyJudgeQuery = (story, plan, subject = "diff") => {
         `Provides: ${story.provides.join(", ") || "(none)"}`,
         `Owned paths: ${story.owned.join(", ")}`,
         `Shared read-only: ${story.sharedReadOnly.join(", ") || "(none)"}`,
+        ...testsDeferredLines(story.testsDeferred),
         ...(dependencies.length === 0
             ? []
             : [

package/flows/lib/story-board.js

@@ -17,10 +17,10 @@ import { answerKey, decideRule, decisionKey, publishBlackboardRun, runErrorToFlo
 import { cap } from "@llm4ts/flow/Context";
 import { FlowLlmError } from "@llm4ts/flow/FlowError";
 import { JudgmentObserved, publishJudgmentObserved } from "@llm4ts/flow/FlowEvents";
-import { certaintyOf, decide, judgmentOf } from "@llm4ts/flow/Judgment";
+import { certaintyOf, Decision, decide, judgmentOf } from "@llm4ts/flow/Judgment";
 import { ReviewIssue, ReviewResult } from "@llm4ts/flow/Review";
 import { dependenciesOf } from "@llm4ts/flow/StoryPlan";
-import { storyDimensions } from "./epic-stories.js";
+import { storyDimensions, testsDeferredLines } from "./epic-stories.js";
 export class StoryBrief extends Schema.Class("StoryBrief")({
     id: Schema.String,
     title: Schema.String,
@@ -29,7 +29,8 @@ export class StoryBrief extends Schema.Class("StoryBrief")({
     provides: Schema.Array(Schema.String),
     owned: Schema.Array(Schema.String),
     sharedReadOnly: Schema.Array(Schema.String),
-    dependencies: Schema.Array(Schema.Struct({ id: Schema.String, provides: Schema.Array(Schema.String) }))
+    dependencies: Schema.Array(Schema.Struct({ id: Schema.String, provides: Schema.Array(Schema.String) })),
+    testsDeferred: Schema.optionalKey(Schema.String)
 }) {
 }
 export const storyBriefOf = (story, plan) => StoryBrief.make({
@@ -45,7 +46,8 @@ export const storyBriefOf = (story, plan) => StoryBrief.make({
         : dependenciesOf(plan, story.id).flatMap((id) => {
             const dependency = plan.story(id);
             return dependency === undefined ? [] : [{ id, provides: dependency.provides }];
-        })
+        }),
+    ...(story.testsDeferred === undefined ? {} : { testsDeferred: story.testsDeferred })
 });
 // ---- Facts ------------------------------------------------------------------
 export const storyBrief = makeKey("story.brief", StoryBrief);
@@ -53,6 +55,7 @@ export const storyDiff = makeKey("story.diff", Schema.String);
 export const houseRules = makeKey("story.houseRules", Schema.String);
 export const mergeable = makeKey("story.mergeable", Schema.Boolean);
 export const issues = makeKey("story.issues", Schema.Array(ReviewIssue));
+const decisions = makeKey("story.decisions", Schema.Array(Decision));
 /** One judged answer and one decision per story dimension, keyed by the dimension's name. */
 const judged = (name) => answerKey(`judge.${name}`);
 const decided = (name) => decisionKey(`decision.${name}`);
@@ -86,6 +89,7 @@ export const stateOf = (brief, diff, rules) => [
     `Provides: ${brief.provides.join(", ") || "(none)"}`,
     `Owned paths: ${brief.owned.join(", ")}`,
     `Shared read-only: ${brief.sharedReadOnly.join(", ") || "(none)"}`,
+    ...testsDeferredLines(brief.testsDeferred),
     ...(brief.dependencies.length === 0
         ? []
         : [
@@ -122,25 +126,34 @@ export const makeStoryBoard = (policy) => {
             return answer?.type === "score" ? [d.answer.of(answer)] : [];
         })
     });
-    const decisions = dimensions.map((d) => decideRule({
+    const deciders = dimensions.map((d) => decideRule({
         name: `decide-${d.dimension.name}`,
         answer: d.answer,
         decision: d.decision,
         ...(policy === undefined ? {} : { policy })
     }));
+    // The four decisions as one fact, so the bar can also read the brief.
+    const joined = derive({
+        name: "decisions",
+        condition: all(provides.decision, scope.decision, houseStyle.decision, tests.decision),
+        produces: [decisions],
+        derive: (verdicts) => [decisions.of(verdicts)]
+    });
     const bar = derive({
         name: "bar",
-        condition: all(provides.answer, scope.answer, houseStyle.answer, tests.answer, provides.decision, scope.decision, houseStyle.decision, tests.decision),
+        condition: all(storyBrief, provides.answer, scope.answer, houseStyle.answer, tests.answer, decisions),
         produces: [mergeable, issues],
-        derive: ([a1, a2, a3, a4, v1, v2, v3, v4]) => {
+        derive: ([brief, a1, a2, a3, a4, verdicts]) => {
             const found = [];
             const answers = [a1, a2, a3, a4];
-            const verdicts = [v1, v2, v3, v4];
             dimensions.forEach((d, index) => {
                 const answer = answers[index];
                 const verdict = verdicts[index];
                 if (answer === undefined || verdict === undefined || answer.type !== "score")
                     return;
+                // The plan deferred this story's tests (it runs only in a live runtime).
+                if (d === tests && brief.testsDeferred !== undefined)
+                    return;
                 if (answer.score < passingScore) {
                     found.push(ReviewIssue.make({
                         severity: "Critical",
@@ -163,7 +176,7 @@ export const makeStoryBoard = (policy) => {
         name: "story-board",
         imports: [storyBrief, storyDiff, houseRules],
         exports: [mergeable, issues],
-        rules: [storyJudge, ...decisions, bar]
+        rules: [storyJudge, ...deciders, joined, bar]
     });
 };
 /**

package/kits/j2ee-nextjs/packs/j2ee-nextjs-spa/pack.md

@@ -2,7 +2,7 @@
 
 source: jsp
 scaffold: ../../scaffolds/nextjs-spa
-sources: .*\.(jsp|java|xml)
+sources: .*\.(jsp|jspf|js|java|xml)$
 spec-schema: pagespec
 programs: .*\.jsp
 specs-dir: docs/modernization/specs
@@ -27,54 +27,131 @@ setup: pnpm install --offline
 
 ## Coverage: servlet-url
 
-files: .*web\.xml
+files: .*web\.xml$
 unit: <url-pattern>([^<]+)</url-pattern>
 
 ## Coverage: jsp-form
 
-files: .*\.jsp
+files: .*\.jsp$
 unit: action="([^"]+)"
 
 ## Coverage: jsp-ajax
 
-files: .*\.jsp
+files: .*\.jsp$
 unit: url:\s*['"]([^'"]+)['"]
 
 ## Survey: jsp-include
 
-files: .*\.jsp
+files: .*\.jsp$
 unit: <jsp:include page="([^"]+)"
 
+## Survey: jsp-static-include
+
+files: .*\.jspf?$
+unit: <%@\s*include\s+file="([^"]+)"
+
 ## Survey: servlet-class
 
-files: .*web\.xml
+files: .*web\.xml$
 unit: <servlet-class>[a-z.]*\.([A-Za-z0-9]+)</servlet-class>
 
 ## Node: ajax-call
 
-files: .*\.(jsp|js)
+files: .*\.(jsp|js)$
 pattern: (?:["']?url["']?\s*:\s*|\$\.(?:get|post|getJSON)\(\s*)['"](?<name>[^'"]+)['"]
 attrs: url=name
 
 ## Node: form
 
-files: .*\.jsp
+files: .*\.jsp$
 pattern: <(?:[a-z]+:)?[Ff][Oo][Rr][Mm]\b[^>]*\b[Aa][Cc][Tt][Ii][Oo][Nn]=["'](?<name>[^"']+)["']
 attrs: url=name
 
 ## Node: servlet-mapping
 
-files: .*web\.xml
+files: .*web\.xml$
 pattern: <servlet-mapping>\s*<servlet-name>(?<name>[^<]+)</servlet-name>\s*<url-pattern>(?<url>[^<]+)</url-pattern>
 descriptor: yes
 
 ## Node: servlet-decl
 
-files: .*web\.xml
+files: .*web\.xml$
 pattern: <servlet>(?:(?!</servlet>)[\s\S])*?<servlet-name>(?<name>[^<]+)</servlet-name>(?:(?!</servlet>)[\s\S])*?<servlet-class>(?:[a-z0-9_]+\.)*(?<class>[A-Za-z0-9_]+)</servlet-class>
 descriptor: yes
 anchor: class
 
+## Node: rest-resource
+
+files: .*\.java$
+pattern: @(?:Path|RequestMapping)\(\s*(?:value\s*=\s*)?"(?<url>[^"]+)"\s*\)(?:\s*@\w+(?:\([^)]*\))?)*\s*public\s+(?:abstract\s+)?class\s+(?<name>\w+)
+
+## Node: java-bean
+
+files: .*\.java$
+pattern: @(?:Named|ManagedBean|Stateless|Stateful|Singleton|Component|Service|Controller)\b(?:\([^)]*\))?(?:\s*@\w+(?:\([^)]*\))?)*\s*public\s+class\s+(?<name>\w+)
+
+## Node: el-bean-ref
+
+files: .*\.jspf?$
+pattern: \$\{(?<name>[a-z]\w*)\.
+
+## Edge: jsp-usebean
+
+files: .*\.jspf?$
+pattern: <jsp:useBean\b[^>]*\bclass="(?:[\w]+\.)*(?<to>\w+)"
+unknown: drop
+
+## Edge: jsp-static-call
+
+files: .*\.jspf?$
+pattern: \b(?<to>[A-Z][A-Za-z0-9]+)\.[a-z]\w*\(
+unknown: drop
+
+## Edge: jsp-new
+
+files: .*\.jspf?$
+pattern: \bnew\s+(?<to>[A-Z]\w*)\s*\(
+unknown: drop
+
+## Node: servlet-jsp
+
+files: .*web\.xml$
+pattern: <servlet>(?:(?!</servlet>)[\s\S])*?<servlet-name>(?<name>[^<]+)</servlet-name>(?:(?!</servlet>)[\s\S])*?<jsp-file>(?<page>[^<]+)</jsp-file>
+descriptor: yes
+anchor: page
+
+## Edge: jsp-form-to-page
+
+files: .*\.jsp$
+pattern: <(?:[a-z]+:)?[Ff][Oo][Rr][Mm]\b[^>]*\b[Aa][Cc][Tt][Ii][Oo][Nn]=["'](?<to>[^"'?]+\.jsp)
+from: form
+unknown: drop
+
+## Edge: jsp-ajax-to-page
+
+files: .*\.(jsp|js)$
+pattern: (?:["']?url["']?\s*:\s*|\$\.(?:get|post|getJSON)\(\s*)['"](?<to>[^'"?]+\.jsp)
+from: ajax-call
+unknown: drop
+
+## Edge: java-import
+
+files: .*\.java$
+pattern: ^import\s+(?:static\s+)?[\w.]*\.(?<to>[A-Z]\w*)\s*;
+unknown: drop
+
+## Edge: java-new
+
+files: .*\.java$
+pattern: \bnew\s+(?<to>[A-Z]\w*)\s*[<(]
+unknown: drop
+
+## Edge: java-static-call
+
+files: .*\.java$
+pattern: \b(?<to>[A-Z]\w+)\.[a-z]\w*\(
+unknown: drop
+
 ## Join: jsp-ajax-target
 
 from: ajax-call.url
@@ -87,13 +164,31 @@ from: form.url
 to: servlet-mapping.url
 match: url
 
+## Join: jsp-ajax-rest
+
+from: ajax-call.url
+to: rest-resource.url
+match: url-path
+
+## Join: jsp-el-bean
+
+from: el-bean-ref.name
+to: java-bean.name
+match: exact-ci
+
 ## Join: servlet-wiring
 
 from: servlet-mapping.name
 to: servlet-decl.name
 scope: file
 
+## Join: servlet-wiring
+
+from: servlet-mapping.name
+to: servlet-jsp.name
+scope: file
+
 ## Consolidate
 
-- cluster: jsp-form-action, jsp-ajax-target
-- context: jsp-include
+- cluster: jsp-form-action, jsp-ajax-target, jsp-form-to-page, jsp-ajax-to-page, jsp-ajax-rest
+- context: jsp-include, jsp-static-include

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llm4ts/shell",
-  "version": "2.47.1",
+  "version": "2.48.0",
   "description": "Interactive shell and CLI for llm4ts: flow discovery, run-a-flow, and view",
   "license": "MIT",
   "type": "module",
@@ -61,9 +61,9 @@
   "dependencies": {
     "@effect/platform-node": "4.0.0",
     "@effect/platform-node-shared": "4.0.0",
-    "@llm4ts/core": "2.47.1",
-    "@llm4ts/flow": "2.47.1",
-    "@llm4ts/runner": "2.47.1"
+    "@llm4ts/flow": "2.48.0",
+    "@llm4ts/core": "2.48.0",
+    "@llm4ts/runner": "2.48.0"
   },
   "peerDependencies": {
     "effect": "4.0.0"