yarramate 1.28.0 → 1.30.0

package/dist/adapters/visual/wire.d.ts

@@ -37,6 +37,20 @@ export interface VisualQuestionEntry {
      */
     readonly trigger?: readonly CatalogueCondition[];
 }
+/**
+ * The next load-bearing open question (#534, ADR 0154): the row `design`
+ * would serve first, by design's own rule (the first open question in wave
+ * order, then catalogue order within the wave; a subject-scoped question
+ * names the first open subject it is open for). Computed host-side beside
+ * the overlay so both hosts and the browser agree on which row it is, and
+ * nobody re-derives the rule from the lists.
+ */
+export interface VisualNextQuestion extends VisualQuestionEntry {
+    readonly wave: string;
+    /** The subject it is open for; absent for a workspace-scoped question. */
+    readonly subjectId?: string;
+    readonly subjectName?: string;
+}
 /**
  * The interrogation report, folded for drawing (#292).
  *
@@ -48,6 +62,13 @@ export interface VisualQuestionEntry {
 export interface VisualInterrogationOverlay {
     /** `id@version` of the catalogue that asked. */
     readonly catalogue: string;
+    /**
+     * Every catalogue in the composed set, `id@version` each, in resolution
+     * order (#530, ADR 0129) - present only when composition happened, the way
+     * the report carries it. The footer names them all; `catalogue` alone is
+     * the base and stays for readers that predate this.
+     */
+    readonly catalogues?: readonly string[];
     /** Engine condition-semantics version (ADR 0106), carried so a consumer
      * can tell "the model moved" from "the engine moved". */
     readonly semantics: string;
@@ -56,6 +77,12 @@ export interface VisualInterrogationOverlay {
     readonly workspace: readonly VisualQuestionEntry[];
     /** Open questions per qualified subject id — `CanvasNode.id`'s space. */
     readonly subjects: Readonly<Record<string, readonly VisualQuestionEntry[]>>;
+    /**
+     * The one to ask next (#534). Absent when nothing is open, or when the
+     * host that built this overlay predates the field: a reader treats absence
+     * as "no next question", never as a fault.
+     */
+    readonly next?: VisualNextQuestion;
 }
 /** The resolved graph a session renders, as the browser receives it. */
 export interface VisualRenderedModel {

package/dist/adapters/visual/workspace-model.js

@@ -132,6 +132,10 @@ dismissed = []) => {
         .map(({ questionId, subject }) => `${questionId}\u0000${subject}`));
     const workspace = [];
     const subjects = {};
+    // The first row kept is the next question (#534): the loop already walks
+    // waves in order and questions in catalogue order, which is `design`'s
+    // rule, so "first kept" is the rule and not a second one.
+    let next;
     for (const wave of report.waves) {
         for (const question of wave.questions) {
             if (!question.open)
@@ -149,30 +153,41 @@ dismissed = []) => {
                 trigger: question.trigger,
             };
             if (question.subjects === undefined) {
-                workspace.push({
+                const row = {
                     ...base,
                     scope: "workspace",
                     question: question.question,
-                });
+                };
+                workspace.push(row);
+                next ??= { ...row, wave: wave.id };
                 continue;
             }
             for (const subject of question.subjects) {
                 if (dismissedForSubject.has(`${question.id}\u0000${subject.id}`)) {
                     continue;
                 }
-                (subjects[subject.id] ??= []).push({
+                const row = {
                     ...base,
                     scope: "subject",
                     question: subject.question,
-                });
+                };
+                (subjects[subject.id] ??= []).push(row);
+                next ??= {
+                    ...row,
+                    wave: wave.id,
+                    subjectId: subject.id,
+                    ...(subject.name === undefined ? {} : { subjectName: subject.name }),
+                };
             }
         }
     }
     return {
         catalogue: report.catalogue,
+        ...(report.catalogues === undefined ? {} : { catalogues: report.catalogues }),
         semantics: report.semantics,
         workspace,
         subjects,
+        ...(next === undefined ? {} : { next }),
     };
 };
 /**