@gogitcms/editor 0.33.0 → 0.34.1

package/app/src/App.tsx

@@ -1904,16 +1904,24 @@ function CmsView({
   // the moment someone is about to publish another project's work is the moment
   // to say so — not a banner they scrolled past on the way here.
   const totalChanges = changeSummary.reduce((n, s) => n + s.count, 0);
+  // Why pressing Apply opens a change request rather than merging, when it
+  // does. Stated before they commit, so nobody expects a merge that will not
+  // happen. A protected target comes first: it holds for whoever presses the
+  // button, and the server escalates on it regardless of project access, so
+  // the partial-access wording would be the wrong explanation of the same
+  // outcome. Absent for an ordinary direct merge.
+  const applyTargetBranch = repo.branches.find((b) => b.id === targetBranchId);
+  const applyReviewReason = applyTargetBranch?.protected
+    ? `${applyTargetBranch.name} is protected, so this opens a change request for review.`
+    : branch.requiresChangeRequest
+      ? `You can't publish every project here, so this opens a change request for review.`
+      : undefined;
   const applySummaryText = changeSummary.length
     ? `${totalChanges} change${totalChanges === 1 ? "" : "s"} across ` +
       `${changeSummary.length} ${changeSummary.length === 1 ? "collection" : "collections"}` +
       (branchSpansProjects
         ? ` in ${changedProjects.length} projects — ${changedProjects.map(projectLabelFor).join(", ")}. ` +
-          (branch.requiresChangeRequest
-            // They cannot publish all of it, so say what pressing Apply actually
-            // does rather than letting them expect a merge that will not happen.
-            ? `You can't publish every project here, so this opens a change request for review.`
-            : `Merging publishes all of them.`)
+          (applyReviewReason ?? `Merging publishes all of them.`)
         : "")
     : undefined;
 
@@ -2228,6 +2236,7 @@ function CmsView({
       canApplyChanges={changeSummary.length > 0 && !hasUnresolvedConflicts}
       applyOpen={applyOpen}
       applySummary={applySummaryText}
+      applyReviewReason={applyReviewReason}
       applyProgress={applyProgress}
       applyConflictCount={conflicts.filter((c) => !c.resolution).length}
       onConfirmApply={onConfirmApply}

package/app/vendor/design-system/src/__tests__/ApplyChangesModal.test.tsx

@@ -146,3 +146,51 @@ test("failure surfaces the error and a dismiss button", () => {
   expect(screen.getByTestId("merge-error")).toHaveTextContent("main moved while merging");
   expect(screen.getByTestId("apply-dismiss")).toBeInTheDocument();
 });
+
+test("with a review reason the confirmation step promises a review, not a merge commit", () => {
+  render(
+    wrap(
+      <ApplyChangesModal
+        {...branches}
+        reviewReason="main is protected, so this opens a change request for review."
+        onConfirm={() => {}}
+        onClose={() => {}}
+      />,
+    ),
+  );
+
+  const confirm = screen.getByTestId("apply-confirm");
+  // The run will stop before the push, so the copy must not describe one.
+  expect(confirm).not.toHaveTextContent("pushes a merge commit");
+  expect(confirm).not.toHaveTextContent("is then deleted");
+  expect(screen.getByTestId("apply-confirm-review")).toHaveTextContent("opens a pull request for review");
+  expect(confirm).toHaveTextContent("Nothing is pushed to origin/main until it is approved");
+  expect(confirm).toHaveTextContent("main is protected");
+});
+
+test("needs_review without code conflicts explains the review instead of listing files", () => {
+  const onCreateChangeRequest = jest.fn();
+  render(
+    wrap(
+      <ApplyChangesModal
+        {...branches}
+        reviewReason="main is protected, so this opens a change request for review."
+        progress={{ ...base, status: "needs_review", step: "merging", escalationFiles: [] }}
+        onCreateChangeRequest={onCreateChangeRequest}
+        onClose={() => {}}
+      />,
+    ),
+  );
+
+  const panel = screen.getByTestId("merge-needs-review");
+  // No conflict: it is not called one, and no empty file list is drawn.
+  expect(panel).not.toHaveTextContent("Code conflicts need a developer");
+  expect(panel).toHaveTextContent("This merge needs a review");
+  expect(screen.getByTestId("merge-needs-review-reason")).toHaveTextContent("nothing was pushed to main");
+  expect(screen.getByTestId("merge-needs-review-reason")).toHaveTextContent("main is protected");
+
+  // The same escalation flow: an explanation, then a change request.
+  fireEvent.change(screen.getByTestId("change-request-explanation"), { target: { value: "Spring copy" } });
+  fireEvent.click(screen.getByTestId("create-change-request-submit"));
+  expect(onCreateChangeRequest).toHaveBeenCalledWith("Spring copy");
+});

package/app/vendor/design-system/src/components/ApplyChangesModal.tsx

@@ -35,6 +35,15 @@ export type ApplyChangesModalProps = {
   progress?: MergeProgress;
   /** A short summary of what will be merged, shown on the confirmation step. */
   summary?: string;
+  /**
+   * Why this apply cannot push to the target directly and opens a change
+   * request instead — the target is protected, or the caller cannot publish
+   * every project on the branch. When set, the confirmation step describes the
+   * review that will happen rather than a merge commit that will not, and the
+   * needs_review panel gives this reason when there are no code conflicts to
+   * list. Absent for an ordinary direct merge.
+   */
+  reviewReason?: string;
   /** Number of unresolved conflicts, shown on the conflicted state. */
   conflictCount?: number;
   /**
@@ -99,7 +108,7 @@ function StepRow({ label, state }: { label: string; state: "done" | "active" | "
  * (spinner → green check), then shows a success panel with the commit + stats,
  * or an error. Read-only: it reflects a run the host drives via a subscription.
  */
-export function ApplyChangesModal({ sourceBranch, targetBranch, progress, summary, conflictCount, changeRequestOpen, changeRequestUrl, creatingChangeRequest, onConfirm, onReviewConflicts, onCreateChangeRequest, onViewChangeRequest, onClose, onDone }: ApplyChangesModalProps) {
+export function ApplyChangesModal({ sourceBranch, targetBranch, progress, summary, reviewReason, conflictCount, changeRequestOpen, changeRequestUrl, creatingChangeRequest, onConfirm, onReviewConflicts, onCreateChangeRequest, onViewChangeRequest, onClose, onDone }: ApplyChangesModalProps) {
   const t = useTheme();
   const done = onDone ?? onClose;
   const [explanation, setExplanation] = useState("");
@@ -121,6 +130,13 @@ export function ApplyChangesModal({ sourceBranch, targetBranch, progress, summar
   const status = progress?.status;
   const conflicted = status === "conflicted";
   const needsReview = status === "needs_review";
+  // A needs_review run either lists code files a developer must resolve, or
+  // lists nothing because the merge was clean and simply may not be pushed by
+  // this run (a protected target, or partial project access). The two need
+  // different words: the second is not a conflict and naming it one would send
+  // the editor looking for files that are not there.
+  const escalationFiles = progress?.escalationFiles ?? [];
+  const codeConflicts = escalationFiles.length > 0;
   const terminal = status === "succeeded" || status === "failed" || conflicted || needsReview;
   const current = progress ? stepOrder[progress.step] : 0;
 
@@ -201,30 +217,63 @@ export function ApplyChangesModal({ sourceBranch, targetBranch, progress, summar
           // Confirmation step: spell out the irreversible, outward-facing effects
           // before anything is pushed to the remote.
           <View testID="apply-confirm" style={{ gap: t.space(3) }}>
-            <Text variant="body" color="secondary">
-              {`This merges ${sourceBranch} into ${targetBranch}, commits the result, and pushes a merge commit to origin/${targetBranch}.`}
-            </Text>
-            <Text variant="body" color="secondary">
-              {`${sourceBranch} is then deleted. This can’t be undone.`}
-            </Text>
+            {reviewReason ? (
+              // The run will stop before the push, so promising a merge commit
+              // on origin here would be describing something that will not
+              // happen. Say what will: a review, and nothing on the target
+              // until it is approved.
+              <>
+                <Text variant="body" color="secondary" testID="apply-confirm-review">
+                  {`This merges ${sourceBranch} into ${targetBranch} in the CMS and opens a pull request for review. Nothing is pushed to origin/${targetBranch} until it is approved.`}
+                </Text>
+                <Text variant="body" color="secondary">{reviewReason}</Text>
+              </>
+            ) : (
+              <>
+                <Text variant="body" color="secondary">
+                  {`This merges ${sourceBranch} into ${targetBranch}, commits the result, and pushes a merge commit to origin/${targetBranch}.`}
+                </Text>
+                <Text variant="body" color="secondary">
+                  {`${sourceBranch} is then deleted. This can’t be undone.`}
+                </Text>
+              </>
+            )}
             {summary ? <Text variant="monoSm" color="tertiary">{summary}</Text> : null}
           </View>
         ) : needsReview ? (
-          // Content merged, but code/config files conflict. A content editor can't
-          // resolve these — collect an explanation and escalate to a developer.
+          // Content merged, but the run may not push it. Either code/config
+          // files conflict — a content editor can't resolve these — or the
+          // target can't take a direct push from this run. Both collect an
+          // explanation and escalate through a pull request.
           <View testID="merge-needs-review" style={{ gap: t.space(3) }}>
-            <View style={{ flexDirection: "row", alignItems: "center", gap: t.space(2) }}>
-              <Icon name="gitPullRequest" size={16} color={t.color.diffDelFg} />
-              <Text variant="body" weight="medium">Code conflicts need a developer</Text>
-            </View>
-            <Text variant="body" color="secondary">
-              {`The content merged cleanly, but these files changed on both ${sourceBranch} and ${targetBranch} and need a developer to resolve:`}
-            </Text>
-            <View style={{ gap: 2, padding: t.space(2), borderRadius: t.radius.md, backgroundColor: t.color.diffDelBg }}>
-              {(progress?.escalationFiles ?? []).map((f) => (
-                <Text key={f} variant="monoSm" color={t.color.diffDelFg} testID={`escalation-file-${f}`}>{f}</Text>
-              ))}
-            </View>
+            {codeConflicts ? (
+              <>
+                <View style={{ flexDirection: "row", alignItems: "center", gap: t.space(2) }}>
+                  <Icon name="gitPullRequest" size={16} color={t.color.diffDelFg} />
+                  <Text variant="body" weight="medium">Code conflicts need a developer</Text>
+                </View>
+                <Text variant="body" color="secondary">
+                  {`The content merged cleanly, but these files changed on both ${sourceBranch} and ${targetBranch} and need a developer to resolve:`}
+                </Text>
+                <View style={{ gap: 2, padding: t.space(2), borderRadius: t.radius.md, backgroundColor: t.color.diffDelBg }}>
+                  {escalationFiles.map((f) => (
+                    <Text key={f} variant="monoSm" color={t.color.diffDelFg} testID={`escalation-file-${f}`}>{f}</Text>
+                  ))}
+                </View>
+              </>
+            ) : (
+              <>
+                <View style={{ flexDirection: "row", alignItems: "center", gap: t.space(2) }}>
+                  <Icon name="gitPullRequest" size={16} color={t.color.textSecondary} />
+                  <Text variant="body" weight="medium">This merge needs a review</Text>
+                </View>
+                <Text variant="body" color="secondary" testID="merge-needs-review-reason">
+                  {`The content merged cleanly and nothing was pushed to ${targetBranch}. ` +
+                    (reviewReason ?? `Someone with the authority to publish it has to approve it.`) +
+                    ` Opening a change request creates a pull request for that review.`}
+                </Text>
+              </>
+            )}
             <Input
               value={explanation}
               onChangeText={setExplanation}

package/app/vendor/design-system/src/components/ContentBrowser.tsx

@@ -483,6 +483,9 @@ export type ContentBrowserProps = {
   canApplyChanges?: boolean;
   applyOpen?: boolean;
   applySummary?: string;
+  // Why applying opens a change request instead of merging (see
+  // ApplyChangesModal.reviewReason). Absent for a direct merge.
+  applyReviewReason?: string;
   applyProgress?: MergeProgress;
   applyConflictCount?: number;
   onConfirmApply?: () => void;
@@ -3767,6 +3770,7 @@ function ApplyModalOverlay(props: ContentBrowserProps) {
       sourceBranch={props.workspace.branch}
       targetBranch={props.targetBranch ?? props.defaultBranch ?? ""}
       summary={props.applySummary}
+      reviewReason={props.applyReviewReason}
       progress={props.applyProgress}
       conflictCount={props.applyConflictCount}
       changeRequestOpen={props.changeRequestOpen}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@gogitcms/editor",
-  "version": "0.33.0",
+  "version": "0.34.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gogitcms/editor",
-      "version": "0.33.0",
+      "version": "0.34.1",
       "dependencies": {
         "@apollo/client": "^3.11.8",
         "@handlewithcare/react-prosemirror": "^3.2.7",
@@ -47,11 +47,11 @@
         "node": ">=20"
       },
       "optionalDependencies": {
-        "@gogitcms/gitcms-local-darwin-arm64": "0.33.0",
-        "@gogitcms/gitcms-local-darwin-x64": "0.33.0",
-        "@gogitcms/gitcms-local-linux-arm64": "0.33.0",
-        "@gogitcms/gitcms-local-linux-x64": "0.33.0",
-        "@gogitcms/gitcms-local-win32-x64": "0.33.0"
+        "@gogitcms/gitcms-local-darwin-arm64": "0.34.1",
+        "@gogitcms/gitcms-local-darwin-x64": "0.34.1",
+        "@gogitcms/gitcms-local-linux-arm64": "0.34.1",
+        "@gogitcms/gitcms-local-linux-x64": "0.34.1",
+        "@gogitcms/gitcms-local-win32-x64": "0.34.1"
       }
     },
     "node_modules/@apollo/client": {
@@ -751,9 +751,9 @@
       }
     },
     "node_modules/@gogitcms/gitcms-local-darwin-arm64": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-arm64/-/gitcms-local-darwin-arm64-0.33.0.tgz",
-      "integrity": "sha512-LHNaFak+lrHWPK159o+O+tFZ04v17jUUFAe4l38c4Rn4YvIRbOZABgolXGkOe3+Tv9cqlwU/NpQzFyBEY6zAeg==",
+      "version": "0.34.1",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-arm64/-/gitcms-local-darwin-arm64-0.34.1.tgz",
+      "integrity": "sha512-zphjPnMkZeuK5q8vQO3pJEbyH5ADAqhLwzLXxUlbrYfX9ivMZaq5pg/JxDhpccYr0bIAQJahRnjIcQuxwaPqvw==",
       "cpu": [
         "arm64"
       ],
@@ -764,9 +764,9 @@
       ]
     },
     "node_modules/@gogitcms/gitcms-local-darwin-x64": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-x64/-/gitcms-local-darwin-x64-0.33.0.tgz",
-      "integrity": "sha512-oUNSUJeP+kp1/Hht1oxP15H6Tix3pV4ZYPfajHXqo3sl5nWBtjuJfVoIdHxNQPgichho6+KKD19hY0fjsWOKtA==",
+      "version": "0.34.1",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-darwin-x64/-/gitcms-local-darwin-x64-0.34.1.tgz",
+      "integrity": "sha512-E+Ll9Vo2YliKCPuVPzZrz/FJrVc6vabdBiBMSHYjbgREJ8fR38mmzftEmzebNG7KGzV1JoOEEk05x7xYprtXuA==",
       "cpu": [
         "x64"
       ],
@@ -777,9 +777,9 @@
       ]
     },
     "node_modules/@gogitcms/gitcms-local-linux-x64": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-linux-x64/-/gitcms-local-linux-x64-0.33.0.tgz",
-      "integrity": "sha512-D6L5EmaS98P697xaJp6BGfZoX95F6f7WH3idxa0GYnMu1zn0uTsrk5yTyPwpIAmNfs7ikXfqH4d33iWf4uP6Xw==",
+      "version": "0.34.1",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-linux-x64/-/gitcms-local-linux-x64-0.34.1.tgz",
+      "integrity": "sha512-jGZmM79kjoQl7iuSudZlEoc2oA/Hy3ie5SU47BfDF89/3g5hHQpIKf8RcEy2oLGYaO1ghEGy1ekQ+4Cc9KHKdw==",
       "cpu": [
         "x64"
       ],
@@ -790,9 +790,9 @@
       ]
     },
     "node_modules/@gogitcms/gitcms-local-win32-x64": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-win32-x64/-/gitcms-local-win32-x64-0.33.0.tgz",
-      "integrity": "sha512-4PEuN3bE8yEbdRAt3Tiakl0cg7cU3XbQFJN0OPwhawXDkWi55sDzlmgqfEeg9DoCgOhu1VLcxMUwcJRDVqL5DA==",
+      "version": "0.34.1",
+      "resolved": "https://registry.npmjs.org/@gogitcms/gitcms-local-win32-x64/-/gitcms-local-win32-x64-0.34.1.tgz",
+      "integrity": "sha512-VfJVJCZJgjU3TLfYCvwjfZFp9TDDMjtBtBAI4RMJevXyexxBsa9D1/0np8UaMS/kXGNqJPZZfFZxvnh5ABlprg==",
       "cpu": [
         "x64"
       ],
@@ -978,9 +978,9 @@
       }
     },
     "node_modules/@posthog/types": {
-      "version": "1.407.2",
-      "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.407.2.tgz",
-      "integrity": "sha512-F/x/qlZSGiianCEZlZ9XRYHUYffH07Zv+1oOllxAw15ifObagxSZzc2IneZE01eFqPl2OmoNuY86ER5Uyvy8Zw==",
+      "version": "1.408.0",
+      "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.408.0.tgz",
+      "integrity": "sha512-xMY8QrRKsTYu4A4Of7XF/xEt0HcnZOWwnICm3do7tGKA0lTlnnr4YW0AHQN1Uv2P3BDqf5GQoqh91MKE+dgdcA==",
       "license": "MIT"
     },
     "node_modules/@react-native/asset-utils": {
@@ -4058,14 +4058,14 @@
       "license": "MIT"
     },
     "node_modules/posthog-js": {
-      "version": "1.424.1",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.424.1.tgz",
-      "integrity": "sha512-5jJ3PWPDbJ255gcIgANRGt83npqb6hNwgmDt67PmaNMW3ZRTo+arlooEJaSC+poAAJHgsAU4VL0NJ9i/rvmd5g==",
+      "version": "1.425.0",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.425.0.tgz",
+      "integrity": "sha512-HwbWI1PPFsVQjuFSmRoZioruw2DuIinH37AV9xu8iT2dUIgeBJYOGSv7VQbPSGtH/DeyxCv04UnMAdNKeBSJWg==",
       "license": "(Apache-2.0 AND MIT)",
       "dependencies": {
         "@posthog/browser-common": "^0.7.1",
         "@posthog/core": "^1.50.2",
-        "@posthog/types": "^1.407.1",
+        "@posthog/types": "^1.408.0",
         "core-js": "^3.49.0",
         "dompurify": "^3.4.13",
         "fflate": "^0.4.8",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gogitcms/editor",
-  "version": "0.33.0",
+  "version": "0.34.1",
   "description": "Terminal UI for setting up and running the Go·Git CMS content editor",
   "type": "module",
   "bin": {
@@ -65,10 +65,10 @@
     "@gogitcms/frontend": "workspace:*"
   },
   "optionalDependencies": {
-    "@gogitcms/gitcms-local-darwin-arm64": "0.33.0",
-    "@gogitcms/gitcms-local-darwin-x64": "0.33.0",
-    "@gogitcms/gitcms-local-linux-arm64": "0.33.0",
-    "@gogitcms/gitcms-local-linux-x64": "0.33.0",
-    "@gogitcms/gitcms-local-win32-x64": "0.33.0"
+    "@gogitcms/gitcms-local-darwin-arm64": "0.34.1",
+    "@gogitcms/gitcms-local-darwin-x64": "0.34.1",
+    "@gogitcms/gitcms-local-linux-arm64": "0.34.1",
+    "@gogitcms/gitcms-local-linux-x64": "0.34.1",
+    "@gogitcms/gitcms-local-win32-x64": "0.34.1"
   }
 }