@valbuild/shared 0.136.3 → 0.136.10

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @valbuild/shared
 
+## 0.136.10
+
+### Patch Changes
+
+- [#743](https://github.com/valbuild/val/pull/743) [`fef29b0`](https://github.com/valbuild/val/commit/fef29b0d9e826e4e7e63a3ae61553137a3f9d280) Thanks [@freekh](https://github.com/freekh)! - Saving no longer gets stuck on "Changes cannot be saved: something else keeps changing them first" when another editor has an unpublished change and later work has been published.
+
+  A new change is now written on top of the latest change the content service has registered, which it reports alongside the list of pending changes, instead of the last change this deployment was shown. Since changes can be published independently, those two can differ for good: an unpublished change can sit before published ones that the running deployment already contains. The Studio and the MCP tools both name the reported head, and fall back to the old behaviour against a content service that does not report one.
+
+## 0.136.8
+
+### Patch Changes
+
+- Updated dependencies [[`35577be`](https://github.com/valbuild/val/commit/35577be50981fec35fc27ee9435a092a26909395)]:
+  - @valbuild/core@0.136.8
+
 ## 0.136.3
 
 ### Patch Changes

package/dist/declarations/src/internal/ApiRoutes.d.ts

@@ -439,6 +439,7 @@ export declare const Api: {
                     patches: z.ZodArray<z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>>;
                     appliedPatches: z.ZodOptional<z.ZodArray<z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>>>;
                     headCommitSha: z.ZodOptional<z.ZodString>;
+                    headPatchId: z.ZodOptional<z.ZodNullable<z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>>>;
                     commits: z.ZodArray<z.ZodObject<{
                         commitSha: z.ZodString;
                         clientCommitSha: z.ZodNullable<z.ZodString>;

package/dist/declarations/src/internal/chainHead.d.ts

@@ -0,0 +1,24 @@
+import type { PatchId } from "@valbuild/core";
+/**
+ * The patch a new write names as its parent: the HEAD of the chain, or `null`
+ * when the chain is empty and the write goes on the base.
+ *
+ * The head the server REPORTS (`headPatchId`) when it reports one, and not the
+ * last patch it listed. The list — `/applicable/patches`, and `/stat` on top of
+ * it — leaves out patches the running deployment already contains, and since
+ * patch groups a publish can ship later patches while an earlier one stays
+ * pending (another author's change that nets to nothing can never be published
+ * at all). The last listed id is then behind the head for good, and the content
+ * service accepts a write only on the head, so every save naming it is refused
+ * — and a re-sync returns the same list. What fixed it in the Studio before
+ * this existed was discarding the other author's change.
+ *
+ * `null` is a REPORTED empty chain, not "unknown". `undefined` is a server
+ * that reports no head (`fs` mode, which ignores the parent anyway, or a
+ * content service that predates the field), and only then does this fall back
+ * to the last listed id.
+ *
+ * One rule for both writers, the Studio's `PatchSync` and the MCP's
+ * `deriveParentRef`, so they cannot come to name different parents.
+ */
+export declare function chainHeadOf(reportedHead: PatchId | null | undefined, listed: readonly PatchId[]): PatchId | null;

package/dist/declarations/src/internal/index.d.ts

@@ -6,6 +6,7 @@ export * from "./ValUrls.js";
 export * from "./ApiRoutes.js";
 export * from "./schema/compatibility.js";
 export * from "./newestCommitSha.js";
+export * from "./chainHead.js";
 export * from "./zod/Patch.js";
 export * from "./sessionStorage.js";
 export * from "./SharedValConfig.js";

package/internal/dist/valbuild-shared-internal.cjs.dev.js

@@ -1984,6 +1984,13 @@ var Api = {
            * carries back to `/save` to say which world it decided against.
            */
           headCommitSha: zod.z.string().optional(),
+          /**
+           * The head of the PATCH CHAIN: the last patch registered on the
+           * branch, published or not. `null` when there is none. What a
+           * new patch names as its parent — see `chainHeadOf`. Optional: a
+           * content service that predates it sends nothing.
+           */
+          headPatchId: PatchId.nullable().optional(),
           commits: zod.z.array(ValCommit),
           /**
            * The publishes the content service knows about.
@@ -4060,6 +4067,36 @@ function newestCommitSha(commits) {
   return (_newest$commitSha = (_newest = newest) === null || _newest === void 0 ? void 0 : _newest.commitSha) !== null && _newest$commitSha !== void 0 ? _newest$commitSha : null;
 }
 
+/**
+ * The patch a new write names as its parent: the HEAD of the chain, or `null`
+ * when the chain is empty and the write goes on the base.
+ *
+ * The head the server REPORTS (`headPatchId`) when it reports one, and not the
+ * last patch it listed. The list — `/applicable/patches`, and `/stat` on top of
+ * it — leaves out patches the running deployment already contains, and since
+ * patch groups a publish can ship later patches while an earlier one stays
+ * pending (another author's change that nets to nothing can never be published
+ * at all). The last listed id is then behind the head for good, and the content
+ * service accepts a write only on the head, so every save naming it is refused
+ * — and a re-sync returns the same list. What fixed it in the Studio before
+ * this existed was discarding the other author's change.
+ *
+ * `null` is a REPORTED empty chain, not "unknown". `undefined` is a server
+ * that reports no head (`fs` mode, which ignores the parent anyway, or a
+ * content service that predates the field), and only then does this fall back
+ * to the last listed id.
+ *
+ * One rule for both writers, the Studio's `PatchSync` and the MCP's
+ * `deriveParentRef`, so they cannot come to name different parents.
+ */
+function chainHeadOf(reportedHead, listed) {
+  var _listed;
+  if (reportedHead !== undefined) {
+    return reportedHead;
+  }
+  return (_listed = listed[listed.length - 1]) !== null && _listed !== void 0 ? _listed : null;
+}
+
 var SharedValConfig = zod.z.object({
   contentHostUrl: zod.z.string().optional(),
   appHostUrl: zod.z.string().optional(),
@@ -7454,6 +7491,7 @@ exports.buildFileRefValue = buildFileRefValue;
 exports.buildImageGalleryPatch = buildImageGalleryPatch;
 exports.buildRemoveImageGalleryEntryPatch = buildRemoveImageGalleryEntryPatch;
 exports.buildSearchIndex = buildSearchIndex;
+exports.chainHeadOf = chainHeadOf;
 exports.checkCompatibility = checkCompatibility;
 exports.chooseEncoded = chooseEncoded;
 exports.concatModulePath = concatModulePath;

package/internal/dist/valbuild-shared-internal.cjs.prod.js

@@ -1984,6 +1984,13 @@ var Api = {
            * carries back to `/save` to say which world it decided against.
            */
           headCommitSha: zod.z.string().optional(),
+          /**
+           * The head of the PATCH CHAIN: the last patch registered on the
+           * branch, published or not. `null` when there is none. What a
+           * new patch names as its parent — see `chainHeadOf`. Optional: a
+           * content service that predates it sends nothing.
+           */
+          headPatchId: PatchId.nullable().optional(),
           commits: zod.z.array(ValCommit),
           /**
            * The publishes the content service knows about.
@@ -4060,6 +4067,36 @@ function newestCommitSha(commits) {
   return (_newest$commitSha = (_newest = newest) === null || _newest === void 0 ? void 0 : _newest.commitSha) !== null && _newest$commitSha !== void 0 ? _newest$commitSha : null;
 }
 
+/**
+ * The patch a new write names as its parent: the HEAD of the chain, or `null`
+ * when the chain is empty and the write goes on the base.
+ *
+ * The head the server REPORTS (`headPatchId`) when it reports one, and not the
+ * last patch it listed. The list — `/applicable/patches`, and `/stat` on top of
+ * it — leaves out patches the running deployment already contains, and since
+ * patch groups a publish can ship later patches while an earlier one stays
+ * pending (another author's change that nets to nothing can never be published
+ * at all). The last listed id is then behind the head for good, and the content
+ * service accepts a write only on the head, so every save naming it is refused
+ * — and a re-sync returns the same list. What fixed it in the Studio before
+ * this existed was discarding the other author's change.
+ *
+ * `null` is a REPORTED empty chain, not "unknown". `undefined` is a server
+ * that reports no head (`fs` mode, which ignores the parent anyway, or a
+ * content service that predates the field), and only then does this fall back
+ * to the last listed id.
+ *
+ * One rule for both writers, the Studio's `PatchSync` and the MCP's
+ * `deriveParentRef`, so they cannot come to name different parents.
+ */
+function chainHeadOf(reportedHead, listed) {
+  var _listed;
+  if (reportedHead !== undefined) {
+    return reportedHead;
+  }
+  return (_listed = listed[listed.length - 1]) !== null && _listed !== void 0 ? _listed : null;
+}
+
 var SharedValConfig = zod.z.object({
   contentHostUrl: zod.z.string().optional(),
   appHostUrl: zod.z.string().optional(),
@@ -7454,6 +7491,7 @@ exports.buildFileRefValue = buildFileRefValue;
 exports.buildImageGalleryPatch = buildImageGalleryPatch;
 exports.buildRemoveImageGalleryEntryPatch = buildRemoveImageGalleryEntryPatch;
 exports.buildSearchIndex = buildSearchIndex;
+exports.chainHeadOf = chainHeadOf;
 exports.checkCompatibility = checkCompatibility;
 exports.chooseEncoded = chooseEncoded;
 exports.concatModulePath = concatModulePath;

package/internal/dist/valbuild-shared-internal.esm.js

@@ -1977,6 +1977,13 @@ var Api = {
            * carries back to `/save` to say which world it decided against.
            */
           headCommitSha: z.string().optional(),
+          /**
+           * The head of the PATCH CHAIN: the last patch registered on the
+           * branch, published or not. `null` when there is none. What a
+           * new patch names as its parent — see `chainHeadOf`. Optional: a
+           * content service that predates it sends nothing.
+           */
+          headPatchId: PatchId.nullable().optional(),
           commits: z.array(ValCommit),
           /**
            * The publishes the content service knows about.
@@ -4053,6 +4060,36 @@ function newestCommitSha(commits) {
   return (_newest$commitSha = (_newest = newest) === null || _newest === void 0 ? void 0 : _newest.commitSha) !== null && _newest$commitSha !== void 0 ? _newest$commitSha : null;
 }
 
+/**
+ * The patch a new write names as its parent: the HEAD of the chain, or `null`
+ * when the chain is empty and the write goes on the base.
+ *
+ * The head the server REPORTS (`headPatchId`) when it reports one, and not the
+ * last patch it listed. The list — `/applicable/patches`, and `/stat` on top of
+ * it — leaves out patches the running deployment already contains, and since
+ * patch groups a publish can ship later patches while an earlier one stays
+ * pending (another author's change that nets to nothing can never be published
+ * at all). The last listed id is then behind the head for good, and the content
+ * service accepts a write only on the head, so every save naming it is refused
+ * — and a re-sync returns the same list. What fixed it in the Studio before
+ * this existed was discarding the other author's change.
+ *
+ * `null` is a REPORTED empty chain, not "unknown". `undefined` is a server
+ * that reports no head (`fs` mode, which ignores the parent anyway, or a
+ * content service that predates the field), and only then does this fall back
+ * to the last listed id.
+ *
+ * One rule for both writers, the Studio's `PatchSync` and the MCP's
+ * `deriveParentRef`, so they cannot come to name different parents.
+ */
+function chainHeadOf(reportedHead, listed) {
+  var _listed;
+  if (reportedHead !== undefined) {
+    return reportedHead;
+  }
+  return (_listed = listed[listed.length - 1]) !== null && _listed !== void 0 ? _listed : null;
+}
+
 var SharedValConfig = z.object({
   contentHostUrl: z.string().optional(),
   appHostUrl: z.string().optional(),
@@ -7349,4 +7386,4 @@ function parse(schema, body, call) {
   return parsed.data;
 }
 
-export { AA_LARGE, AA_TEXT, Api, BRAND_CONTRAST_PAIRS, BinaryFileRef, CodeOptions, ColorOptions, DEFAULT_ERROR_MESSAGE, DateOptions, ENCODE_DEFAULTS, ENCODE_MIME_TYPE_OF, FileOptions, HistoricalCommit, HistoricalModule, HistoricalPatchSet, HistoryError, ImageEncodeOption, ImageOptions, JSONValue, JSON_ENTRIES_BATCH_MAX, ModuleComparison, NEVER_ENCODED, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchGroup, PatchId, PatchJSON, PublishProtocolError, RAMP_STEPS, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, RestoreVerdict, RichTextOptions, SCHEMA_SOURCE_FIXES, SerializedArraySchema, SerializedBooleanSchema, SerializedCodeSchema, SerializedColorSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedDiscriminatedUnionSchema, SerializedEnumSchema, SerializedFileSchema, SerializedImageSchema, SerializedKeyOfSchema, SerializedLiteralSchema, SerializedLocaleSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedRecordSchema, SerializedRichTextSchema, SerializedRouteSchema, SerializedSchema, SerializedSettingsSchema, SerializedStringSchema, SerializedValViewSchema, SharedValConfig, VAL_ENABLE_COOKIE_NAME, VAL_GREEN_RAMP, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValCommit, ValDeployment, accentRamp, buildDuplicatePatch, buildEmptyAtPathPatch, buildFileRefValue, buildImageGalleryPatch, buildRemoveImageGalleryEntryPatch, buildSearchIndex, checkCompatibility, chooseEncoded, concatModulePath, contrastRatio, createRegExpFromPattern, createSearchIndex, createValClient, declaredLocales, describeContainerAtPath, emptyOf, explainIncompatible, filterBlockingValidationErrors, filterRoutesByPatterns, findSimilar, fitWithin, flattenRichText, getErrorMessageFromUnknownJson, getFilenameFromRef, getInlineImgInfo, getKeyOfRecordAt, getRefParts, getRoutesOf, getRoutesWithModulePaths, getSourceAt, indexModule, isMimeTypeAccepted, isRemoteSchema, isSchemaSourceFixError, isSkippedSource, keyOfRecordPath, levenshtein, localeAt, memoizePerRequest, newestCommitSha, parseArtifacts, parseBuildTarget, parseDeclare, parseProblems, parseProjectSource, parsePromote, parsePublishToken, parseStatus, parseVerify, partitionValidationErrors, performSearch, relativeLuminance, remirrorToRichTextSource, removeModule, resolveEncodeSettings, resolvePairGround, resolveSchemaSourceFixForError, resolveSchemaSourceFixes, resolveSerializedSchemaAtPath, richTextToRemirror, safeParsePatch, sourcePathOfChild, themeCustomProperties, toolNames, traverseSchemaSource, urlOf, validateRoutePatterns, withExtension };
+export { AA_LARGE, AA_TEXT, Api, BRAND_CONTRAST_PAIRS, BinaryFileRef, CodeOptions, ColorOptions, DEFAULT_ERROR_MESSAGE, DateOptions, ENCODE_DEFAULTS, ENCODE_MIME_TYPE_OF, FileOptions, HistoricalCommit, HistoricalModule, HistoricalPatchSet, HistoryError, ImageEncodeOption, ImageOptions, JSONValue, JSON_ENTRIES_BATCH_MAX, ModuleComparison, NEVER_ENCODED, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchGroup, PatchId, PatchJSON, PublishProtocolError, RAMP_STEPS, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, RestoreVerdict, RichTextOptions, SCHEMA_SOURCE_FIXES, SerializedArraySchema, SerializedBooleanSchema, SerializedCodeSchema, SerializedColorSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedDiscriminatedUnionSchema, SerializedEnumSchema, SerializedFileSchema, SerializedImageSchema, SerializedKeyOfSchema, SerializedLiteralSchema, SerializedLocaleSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedRecordSchema, SerializedRichTextSchema, SerializedRouteSchema, SerializedSchema, SerializedSettingsSchema, SerializedStringSchema, SerializedValViewSchema, SharedValConfig, VAL_ENABLE_COOKIE_NAME, VAL_GREEN_RAMP, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValCommit, ValDeployment, accentRamp, buildDuplicatePatch, buildEmptyAtPathPatch, buildFileRefValue, buildImageGalleryPatch, buildRemoveImageGalleryEntryPatch, buildSearchIndex, chainHeadOf, checkCompatibility, chooseEncoded, concatModulePath, contrastRatio, createRegExpFromPattern, createSearchIndex, createValClient, declaredLocales, describeContainerAtPath, emptyOf, explainIncompatible, filterBlockingValidationErrors, filterRoutesByPatterns, findSimilar, fitWithin, flattenRichText, getErrorMessageFromUnknownJson, getFilenameFromRef, getInlineImgInfo, getKeyOfRecordAt, getRefParts, getRoutesOf, getRoutesWithModulePaths, getSourceAt, indexModule, isMimeTypeAccepted, isRemoteSchema, isSchemaSourceFixError, isSkippedSource, keyOfRecordPath, levenshtein, localeAt, memoizePerRequest, newestCommitSha, parseArtifacts, parseBuildTarget, parseDeclare, parseProblems, parseProjectSource, parsePromote, parsePublishToken, parseStatus, parseVerify, partitionValidationErrors, performSearch, relativeLuminance, remirrorToRichTextSource, removeModule, resolveEncodeSettings, resolvePairGround, resolveSchemaSourceFixForError, resolveSchemaSourceFixes, resolveSerializedSchemaAtPath, richTextToRemirror, safeParsePatch, sourcePathOfChild, themeCustomProperties, toolNames, traverseSchemaSource, urlOf, validateRoutePatterns, withExtension };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.136.3",
+  "version": "0.136.10",
   "private": false,
   "description": "Val shared types and utilities",
   "repository": {
@@ -37,7 +37,7 @@
     "flexsearch": "^0.8.212",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.136.1"
+    "@valbuild/core": "0.136.8"
   },
   "files": [
     "CHANGELOG.md",