@avocadostudio-ai/orchestrator-core 0.6.0 → 0.8.0

package/dist/http/publish-actions.d.ts

@@ -74,7 +74,7 @@ export declare function loadPublishedForDiff(opts: {
     logger: Logger;
 }): Promise<{
     pages: PageDoc[];
-    siteConfig: SiteConfig | null;
+    siteConfig: SiteConfig | null | undefined;
     source: PublishedPagesSource;
 }>;
 /**

package/dist/http/publish-actions.js

@@ -68,7 +68,8 @@ async function readPublishedJsonFile() {
 export async function loadPublishedForDiff(opts) {
     const { siteOrigin, logger } = opts;
     let remotePages = null;
-    let remoteSiteConfig = null;
+    /** `undefined` = the site did not say. See `PublishedContent`. */
+    let remoteSiteConfig;
     if (siteOrigin) {
         try {
             const res = await fetch(`${siteOrigin.replace(/\/+$/, "")}/api/editor/pages`, {
@@ -78,7 +79,13 @@ export async function loadPublishedForDiff(opts) {
                 const data = (await res.json());
                 if (Array.isArray(data.pages)) {
                     remotePages = data.pages;
-                    remoteSiteConfig = data.siteConfig ?? null;
+                    /*
+                     * Absent and `null` are different answers and must stay different.
+                     * `null` is the site saying it publishes no header config; absent is
+                     * an editor API that does not report one at all, which is most of
+                     * them — an Astro site returns `{pages}` and nothing else.
+                     */
+                    remoteSiteConfig = "siteConfig" in data ? (data.siteConfig ?? null) : undefined;
                 }
             }
             else {
@@ -89,17 +96,29 @@ export async function loadPublishedForDiff(opts) {
             logger.warn({ siteOrigin, err: String(err) }, "publish/diff: site fetch failed, falling back");
         }
     }
-    // Hot path: remote returned both pages and siteConfig.
-    if (remotePages && remoteSiteConfig) {
+    // Hot path: the remote answered about both.
+    if (remotePages && remoteSiteConfig !== undefined) {
         return { pages: remotePages, siteConfig: remoteSiteConfig, source: "site" };
     }
-    // Either the remote didn't run, didn't include siteConfig (older SDK or
-    // site dev not yet restarted), or didn't include pages. Read the JSON file
-    // to backfill the missing pieces — without it, a missing siteConfig would
-    // be misread as "header added · all fields" on every publish-diff load.
+    // Either the remote didn't run, didn't mention siteConfig, or didn't include
+    // pages. Read the JSON file to backfill the missing pieces — without it, a
+    // missing siteConfig would be misread as "header added · all fields" on
+    // every publish-diff load.
     const fromFile = await readPublishedJsonFile();
     const pages = remotePages ?? fromFile.pages;
-    const siteConfig = remoteSiteConfig ?? fromFile.siteConfig;
+    /*
+     * The file is `apps/site`'s published content, so it may only answer for
+     * `apps/site`. When the remote supplied the pages it is the authority on its
+     * own header config, and a site that did not mention one has not said it has
+     * none — it has said nothing, which `publishDiffAction` reads as "no header
+     * change" rather than as a change.
+     *
+     * Backfilling here instead is what made every diff for a site whose editor
+     * API returns only `{pages}` report the bundled demo's name, logo, navGroups
+     * and navLabels as the "before" — seven changed fields, all of them
+     * describing a site nobody had asked about.
+     */
+    const siteConfig = remotePages ? undefined : (remoteSiteConfig ?? fromFile.siteConfig);
     if (pages)
         return { pages, siteConfig, source: remotePages ? "site" : "file" };
     logger.warn("publish/diff: falling back to in-memory publishedPages — diff may be inaccurate");

package/dist/ops/ops-engine.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { blockSchemas, operationSchema, validateBlockProps, findManifestSchemaIssue, isChrome, getMediaFields, isInBlockCatalogue, catalogueBlockTypes, mapSemanticThemeTokens, generateItemId, isRichTextDoc, fromMarkdown, mergeRichTextDoc } from "@avocadostudio-ai/shared";
+import { blockSchemas, operationSchema, validateBlockProps, findManifestSchemaIssue, isChrome, getMediaFields, isInBlockCatalogue, catalogueBlockTypes, mapSemanticThemeTokens, generateItemId, isRichTextDoc, fromMarkdown, mergeRichTextDoc, resolveManifestFieldMeta } from "@avocadostudio-ai/shared";
 import { normalizeRouteCandidate } from "../nlp/intent-helpers.js";
 import { pageIdFromSlug, pageTitleFromSlug } from "../nlp/plan-normalizer.js";
 import { OperationError, toErrorDetail as _unifiedToErrorDetail } from "../errors.js";
@@ -692,6 +692,49 @@ function _validateWithManifestIfPresent(manifestByType, blockType, nextProps) {
     }
     return propCheck.data;
 }
+/**
+ * A row added to a polymorphic list must say which shape it is.
+ *
+ * A list whose field meta carries a `discriminator` holds several shapes, and
+ * the row's value for that key is the only thing that says which. A row that
+ * omits it is not a row with one field missing: it is a row that corresponds to
+ * nothing the site can draw, and on a CMS that stores each row as its own
+ * document — `component` in Storyblok, `_type` in Sanity — it cannot be
+ * constructed at all. An adapter's only choices are to drop it or to guess.
+ *
+ * Dropping it is what happened. Asked for a statistics section, a planner added
+ * a card grid and filled it with four rows carrying every declared field and no
+ * `component`; the adapter skipped all four; **the page rendered the grid's
+ * heading over empty white space**, and the only trace anywhere was a
+ * `console.warn` in a dev server log. The manifest had the answer the whole
+ * time — the list declares its discriminator and names the types it admits.
+ *
+ * So reject it here, in the same place and the same category as an unknown
+ * prop, where the failure is loud and lands at the moment of the mistake with
+ * the admissible types in the message.
+ *
+ * Only omission is rejected. A value naming no branch is left alone on purpose:
+ * `itemFieldsByType` is derived from a schema that may enumerate fewer types
+ * than the CMS has, and `resolveListItemFields` already falls back to the union
+ * for exactly that case. Rejecting there would refuse rows a site can render.
+ */
+function _requireListDiscriminator(manifestByType, blockType, listKey, item) {
+    const definition = manifestByType.get(blockType);
+    if (!definition)
+        return;
+    const listField = resolveManifestFieldMeta(definition).listFields[listKey];
+    const discriminator = listField?.discriminator;
+    if (!discriminator)
+        return;
+    const value = item[discriminator];
+    if (typeof value === "string" && value.length > 0)
+        return;
+    if (typeof value === "number" || typeof value === "boolean")
+        return;
+    const admissible = Object.keys(listField.itemFieldsByType ?? {}).filter((t) => t.length > 0);
+    const choices = admissible.length > 0 ? `: ${admissible.join(", ")}` : "";
+    throw new OperationError(`A new ${listKey} row must set "${discriminator}", which names its type${choices}`, { category: "schema_violation" });
+}
 function _requireManifestComponent(manifestByType, blockType, operationName) {
     if (manifestByType.size === 0)
         return;
@@ -1207,6 +1250,7 @@ async function _applyOpsAtomicallyUnsafe(session, ops, options) {
                 // (id included), and a duplicate id would make every later id lookup
                 // silently resolve to the first occurrence.
                 const newItem = structuredClone(op.item);
+                _requireListDiscriminator(manifestByType, block.type, op.listKey, newItem);
                 if (typeof newItem.id !== "string" ||
                     newItem.id.length === 0 ||
                     _itemIndexById(nextList, newItem.id) !== -1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avocadostudio-ai/orchestrator-core",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
@@ -22,20 +22,8 @@
     "openai": "^4.87.1",
     "sharp": "^0.34.5",
     "zod": "^4.3.6",
-    "@avocadostudio-ai/migration-sdk": "^0.6.0",
-    "@avocadostudio-ai/shared": "^0.6.0"
-  },
-  "peerDependencies": {
-    "googleapis": "^171.4.0",
-    "@google/genai": "^1.46.0"
-  },
-  "peerDependenciesMeta": {
-    "googleapis": {
-      "optional": true
-    },
-    "@google/genai": {
-      "optional": true
-    }
+    "@avocadostudio-ai/shared": "^0.8.0",
+    "@avocadostudio-ai/migration-sdk": "^0.8.0"
   },
   "devDependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.220",
@@ -70,12 +58,23 @@
   "license": "Apache-2.0",
   "homepage": "https://docs.avocadostudio.dev",
   "bugs": {
-    "url": "https://github.com/avocadostudio-ai/avocado/issues"
+    "url": "https://docs.avocadostudio.dev"
+  },
+  "peerDependencies": {
+    "googleapis": "^171.4.0",
+    "@google/genai": "^1.46.0",
+    "@anthropic-ai/claude-agent-sdk": ">=0.3.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/avocadostudio-ai/avocado.git",
-    "directory": "packages/orchestrator-core"
+  "peerDependenciesMeta": {
+    "googleapis": {
+      "optional": true
+    },
+    "@google/genai": {
+      "optional": true
+    },
+    "@anthropic-ai/claude-agent-sdk": {
+      "optional": true
+    }
   },
   "scripts": {
     "typecheck": "tsc --noEmit",