canopycms 0.6.0 → 0.7.1

package/dist/cli/cli.js

@@ -1227,7 +1227,7 @@ CanopyCMS worker run-once (mode: ${mode}, auth: ${authMode})
   }
   console.log("\nDone");
 }
-var __defProp2, __getOwnPropNames2, __esm2, __export2, active, init_logger, scalarFieldTypes, markdownFieldTypes, primitiveFieldTypes, fieldTypes, init_types, SAFE_HTML_TAGS, COMPONENT_NAME, MDX_BINDINGS, FORBIDDEN_ATTRIBUTES, init_mdx_allowlist, fieldBaseSchema, selectOptionSchema, referenceOptionSchema, primitiveFieldSchema, mdxPropAllowSchema, mdxAllowlistSchema, markdownFieldSchema, ASPECT_RATIO_RE, imageFieldSchema, selectFieldSchema, referenceSortFieldSchema, referenceFieldSchema, fieldHolder, blockSchema, blockFieldSchema, objectFieldSchema, inlineGroupFieldSchema, customFieldSchema, knownFieldSchema, fieldSchema, init_field, relativePathSchema, entryTypeSchema, collectionSchema, init_collection, SENTINEL_BASE, DOT_SEGMENT, init_sanitize_href, uploadTargetUrlSchema, previewPrefixSchema, init_url, mediaSchema, init_media, defaultBranchAccessSchema, defaultPathAccessLevelSchema, defaultPathAccessLevelsSchema, defaultPathAccessSchema, defaultBaseBranchSchema, defaultRemoteNameSchema, defaultRemoteUrlSchema, gitBotAuthorNameSchema, gitBotAuthorEmailSchema, githubTokenEnvVarSchema, operatingModeSchema, deployedAsSchema, contentRootSchema, sourceRootSchema, basePathSchema, deploymentNameSchema, devContentSyncSchema, devConfigSchema, editorConfigSchema, seoFieldNameSchema, seoSchema, CanopyConfigSchema, DEFAULT_PROD_WORKSPACE, init_config, init_config2, init_error2, init_fs2, templates_exports, __dirname, TEMPLATES_DIR, SCAFFOLD_STACK_NAME, init_templates, project_detect_exports, COMMANDS, MAX_WORKSPACE_DEPTH, PLACEHOLDER_GITHUB_REPO, CDK_DEPENDENCIES, init_project_detect, task_queue_config_exports, init_task_queue_config, envFlag, LOG_LEVELS, DebugLogger, testLogger, init_debug, init_atomic_write, DEFAULT_MAX_RETRIES, nullLogger, init_task_queue, cms_task_queue_exports, debugLogger, cmsTaskQueueLogger, init_cms_task_queue, ProdClientSafeStrategy, DevClientSafeStrategy, warned, VALID_DEPLOYMENT_NAME, isValidDeploymentName, ProdStrategy, DevStrategy, strategyCache;
+var __defProp2, __getOwnPropNames2, __esm2, __export2, active, init_logger, scalarFieldTypes, markdownFieldTypes, primitiveFieldTypes, fieldTypes, init_types, SAFE_HTML_TAGS, COMPONENT_NAME, MDX_BINDINGS, FORBIDDEN_ATTRIBUTES, init_mdx_allowlist, fieldBaseSchema, selectOptionSchema, referenceOptionSchema, primitiveFieldSchema, mdxPropAllowSchema, mdxAllowlistSchema, markdownFieldSchema, ASPECT_RATIO_RE, imageFieldSchema, selectFieldSchema, referenceSortFieldSchema, referenceFieldSchema, fieldHolder, blockSchema, blockFieldSchema, objectFieldSchema, inlineGroupFieldSchema, customFieldSchema, knownFieldSchema, fieldSchema, init_field, relativePathSchema, entryTypeSchema, collectionSchema, init_collection, SENTINEL_BASE, DOT_SEGMENT, init_sanitize_href, uploadTargetUrlSchema, previewPrefixSchema, editorUrlSchema, init_url, mediaSchema, init_media, defaultBranchAccessSchema, defaultPathAccessLevelSchema, defaultPathAccessLevelsSchema, defaultPathAccessSchema, defaultBaseBranchSchema, defaultRemoteNameSchema, defaultRemoteUrlSchema, gitBotAuthorNameSchema, gitBotAuthorEmailSchema, githubTokenEnvVarSchema, operatingModeSchema, deployedAsSchema, contentRootSchema, sourceRootSchema, basePathSchema, deploymentNameSchema, devContentSyncSchema, devConfigSchema, editorConfigSchema, seoFieldNameSchema, seoSchema, CanopyConfigSchema, DEFAULT_PROD_WORKSPACE, init_config, init_config2, init_error2, init_fs2, templates_exports, __dirname, TEMPLATES_DIR, SCAFFOLD_STACK_NAME, init_templates, project_detect_exports, COMMANDS, MAX_WORKSPACE_DEPTH, PLACEHOLDER_GITHUB_REPO, CDK_DEPENDENCIES, init_project_detect, task_queue_config_exports, init_task_queue_config, envFlag, LOG_LEVELS, DebugLogger, testLogger, init_debug, init_atomic_write, DEFAULT_MAX_RETRIES, nullLogger, init_task_queue, cms_task_queue_exports, debugLogger, cmsTaskQueueLogger, init_cms_task_queue, ProdClientSafeStrategy, DevClientSafeStrategy, warned, VALID_DEPLOYMENT_NAME, isValidDeploymentName, ProdStrategy, DevStrategy, strategyCache;
 var init_init = __esm({
   "dist/cli/init.js"() {
     "use strict";
@@ -1542,6 +1542,14 @@ var init_init = __esm({
         previewPrefixSchema = z3.string().trim().refine((value) => isHttpUrlOrSameOriginPath(value), {
           message: 'editor.previewPrefix must be an absolute http(s) URL or a site-relative path beginning with a single "/", with no query or fragment'
         });
+        editorUrlSchema = z3.string().trim().refine((value) => {
+          if (!isHttpUrlOrSameOriginPath(value) || !/^https?:\/\//i.test(value))
+            return false;
+          const url = new URL(value);
+          return !url.username && !url.password;
+        }, {
+          message: "editorUrl must be an absolute http(s) URL with no credentials, query or fragment"
+        });
       }
     });
     init_media = __esm2({
@@ -1684,6 +1692,7 @@ var init_init = __esm({
           contentRoot: contentRootSchema.default("content"),
           sourceRoot: sourceRootSchema.optional(),
           basePath: basePathSchema,
+          editorUrl: editorUrlSchema.optional(),
           unauthenticatedStatus: z5.union([z5.literal(401), z5.literal(419)]).optional(),
           danglingReferences: z5.enum(["error", "warn"]).optional(),
           editor: editorConfigSchema.optional(),
@@ -2237,6 +2246,84 @@ var init_github_app_manifest = __esm({
   }
 });
 
+// dist/cli/github-app-output.js
+import pc from "picocolors";
+function colorsFor(stream) {
+  const { NO_COLOR, FORCE_COLOR, TERM } = process.env;
+  if (NO_COLOR)
+    return pc.createColors(false);
+  if (FORCE_COLOR)
+    return pc.createColors(FORCE_COLOR !== "0" && FORCE_COLOR !== "false");
+  return pc.createColors(Boolean(stream.isTTY) && TERM !== "dumb");
+}
+function recoveryPreamble() {
+  return [
+    outColors.bold(outColors.yellow("If this goes wrong after you click Create")),
+    "  The App will exist, but this command will not have its private key. To recover, either:",
+    "    \u2022 delete the App in its settings and re-run this command, or",
+    '    \u2022 open the App, scroll to "Private keys" and click "Generate a private key". The',
+    "      .pem it downloads is your only chance to save it.",
+    outColors.dim('  (Not the "client secret" a few sections above: that is for OAuth user flows, is unused\n  by this App, and fails confusingly when used to sign.)'),
+    ""
+  ].join("\n");
+}
+function registrationMessage(input) {
+  const width = Math.max(...Object.keys(CANOPY_APP_PERMISSIONS).map((name) => name.length));
+  const permissions = Object.entries(CANOPY_APP_PERMISSIONS).map(([name, level]) => `  ${name.padEnd(width)}  ${outColors.bold(level)}`);
+  return [
+    outColors.bold(`Registering "${input.name}" for ${input.owner}/${input.repo}`),
+    "",
+    `${outColors.bold("Permissions")} ${outColors.dim("(the part that matters)")}`,
+    ...permissions,
+    "",
+    `${outColors.bold("Private key")} goes to ${input.destination}`,
+    outColors.dim("  If that fails you are asked for somewhere else before the key is discarded."),
+    "",
+    step(1, "Open this file in a browser:"),
+    "",
+    `   ${link(input.formFile)}`,
+    "",
+    "   The browser matters, twice over. It must be:",
+    `     \u2022 ${outColors.bold("logged in to GitHub")} as an owner of ${input.owner}`,
+    `     \u2022 running ${outColors.bold("on this machine")}: the redirect returns to 127.0.0.1:${input.callbackPort}, which only a local browser can reach`,
+    outColors.dim("   An embedded or app-internal browser bounces off the GitHub login wall and appears\n   to do nothing when you click Create."),
+    "",
+    "   The page posts the manifest to GitHub, which shows the App pre-filled with exactly",
+    "   those permissions. Review them and click Create.",
+    "",
+    outColors.dim(`Waiting for GitHub to redirect back (up to ${input.timeoutMinutes} minutes)...`)
+  ].join("\n");
+}
+function deploymentSettingsMessage(appId, installationId) {
+  return [
+    "",
+    outColors.bold("Set these on your deployment"),
+    "",
+    `  GITHUB_APP_ID=${appId}`,
+    `  GITHUB_APP_INSTALLATION_ID=${installationId ?? "<run `verify` to read it>"}`,
+    `  GITHUB_APP_PRIVATE_KEY_SECRET_ARN=<wherever you just put the key>`,
+    "",
+    outColors.dim('  Both ids are numeric. The App ID is NOT the "Client ID" (`Iv1.\u2026`) shown beside it,\n  and the installation id is NOT the App ID: an App installed twice has one App ID\n  and two installation ids.'),
+    "",
+    outColors.bold("Re-check this any time, without creating anything"),
+    `  canopycms init-github-app verify --app-id ${appId} --key-file <path>`
+  ].join("\n");
+}
+var outColors, errColors, tick, failMark, cross, link, step;
+var init_github_app_output = __esm({
+  "dist/cli/github-app-output.js"() {
+    "use strict";
+    init_github_app_manifest();
+    outColors = colorsFor(process.stdout);
+    errColors = colorsFor(process.stderr);
+    tick = (text3) => `${outColors.green("\u2713")} ${text3}`;
+    failMark = errColors.red("\u2717");
+    cross = (text3) => `${failMark} ${text3}`;
+    link = (url, palette = outColors) => palette.cyan(palette.underline(url));
+    step = (n, text3) => outColors.bold(outColors.cyan(`${n}.`) + ` ${text3}`);
+  }
+});
+
 // dist/cli/prompt.js
 import { createInterface } from "node:readline";
 function readLineOnce(prompt) {
@@ -2464,10 +2551,13 @@ var init_github_app_exports = {};
 __export(init_github_app_exports, {
   appJwt: () => appJwt,
   appManifest: () => appManifest,
+  appSettingsUrl: () => appSettingsUrl,
   creationForm: () => creationForm,
   handOffKey: () => handOffKey,
   handOffWithRetry: () => handOffWithRetry,
   initGitHubApp: () => initGitHubApp,
+  installStepMessage: () => installStepMessage,
+  keyNotStoredMessage: () => keyNotStoredMessage,
   manifestPostUrl: () => manifestPostUrl,
   parseKeyRetryAnswer: () => parseKeyRetryAnswer,
   startCallbackServer: () => startCallbackServer
@@ -2479,8 +2569,33 @@ import { mkdtemp, rm, writeFile as writeFile2 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path10 from "node:path";
 import { Readable } from "node:stream";
+function appsBaseUrl(target) {
+  return target.isOrganization ? `https://github.com/organizations/${encodeURIComponent(target.owner)}/settings/apps` : "https://github.com/settings/apps";
+}
+function appSettingsUrl(target, slug) {
+  return `${appsBaseUrl(target)}/${encodeURIComponent(slug)}`;
+}
+function keyNotStoredMessage(target, created) {
+  return `
+${errColors.bold(errColors.red("Stopping here:"))} the App exists but its key was not stored, so installing it now
+  would achieve nothing. To recover, open the App and generate a private key from
+  its "Private keys" section, then run \`verify\`; or delete the App and start again.
+
+  GITHUB_APP_ID=${created.id}
+  App settings: ${link(appSettingsUrl(target, created.slug), errColors)}`;
+}
+function installStepMessage(target, slug) {
+  return `
+${step(2, `Install it on ${target.owner}/${target.repo}:`)}
+
+   ${link(`${appSettingsUrl(target, slug)}/installations`)}
+
+   That page shows an Install button first \u2014 the repository picker only appears after
+   you click it. Choose "Only select repositories" and pick that one repository.
+`;
+}
 function manifestPostUrl(target, state) {
-  const base = target.isOrganization ? `https://github.com/organizations/${encodeURIComponent(target.owner)}/settings/apps/new` : "https://github.com/settings/apps/new";
+  const base = `${appsBaseUrl(target)}/new`;
   return `${base}?state=${encodeURIComponent(state)}`;
 }
 function appManifest(target, redirectUrl, name = appName(target.repo)) {
@@ -2784,7 +2899,7 @@ async function handOffWithRetry(pem, destination) {
     const result = await handOffKey(pem, attempt);
     if (result.stored) {
       console.log(`
-  private key: ${result.detail}`);
+${tick(`Private key: ${result.detail}`)}`);
       return true;
     }
     console.error(`
@@ -2884,41 +2999,41 @@ No installation of this App found on ${target.owner}/${target.repo} (HTTP ${foun
   }
   const installation = found.body;
   console.log(`
-  installation ${installation.id} on ${target.owner}/${target.repo}`);
+${outColors.bold(`Installation ${installation.id}`)} on ${target.owner}/${target.repo}`);
   const findings = readbackVerdict(installation);
   if (findings.length === 0) {
-    console.log("  grant matches exactly what this package needs:");
+    console.log("  The grant matches exactly what this package needs:");
     for (const [name, level] of Object.entries(CANOPY_APP_PERMISSIONS)) {
-      console.log(`    \u2713 ${name}: ${level}`);
+      console.log(`    ${tick(`${name}: ${level}`)}`);
     }
   } else {
     for (const finding of findings) {
-      console.error(`    \u2717 ${finding.message}`);
+      console.error(`    ${cross(finding.message)}`);
     }
   }
   let installationsOk = false;
   const installations = await installationCount(jwt);
   if (installations === null) {
-    console.error(`    \u2717 could not list this App's installations, so "installed once" is UNCHECKED.
+    console.error(`    ${failMark} could not list this App's installations, so "installed once" is UNCHECKED.
       Reported as a failure rather than passed over: this is the check that observes
       the one-App-per-site rule, and an unread check is not a satisfied one.`);
   } else if (installations === 1) {
     installationsOk = true;
-    console.log("    \u2713 installed once, so this key reaches no other account");
+    console.log(`    ${tick("installed once, so this key reaches no other account")}`);
   } else if (installations > 1) {
-    console.error(`    \u2717 this App is installed ${installations} times, and should be installed ONCE.
+    console.error(`    ${failMark} this App is installed ${installations} times, and should be installed ONCE.
       Its private key is App-level: whoever holds it can mint a token for any of
       those installations. Register a separate App per site instead, and remove
       the installations that do not belong to this one.`);
   } else {
-    console.error(`    \u2717 GitHub reports ${installations} installations of this App, yet one was just read
+    console.error(`    ${failMark} GitHub reports ${installations} installations of this App, yet one was just read
       back for this repository. Something is inconsistent; re-run before trusting it.`);
   }
   const mint = await proveTokenMint(jwt, installation.id, target.repo);
   if (mint.ok) {
-    console.log(`    \u2713 installation token ${mint.detail}`);
+    console.log(`    ${tick(`installation token ${mint.detail}`)}`);
   } else {
-    console.error(`    \u2717 could not mint an installation token \u2014 ${mint.detail}
+    console.error(`    ${failMark} could not mint an installation token \u2014 ${mint.detail}
       If that message says the requested permissions are not granted to this
       installation, that is a GitHub behaviour rather than a bug here: adding a
       permission to an App does NOT apply to existing installations until an account
@@ -2994,7 +3109,7 @@ async function createCommand(options) {
     console.log(`! Could not check whether the name "${name}" is already taken, so this is unverified.
 `);
   }
-  console.log('IF THIS GOES WRONG AFTER YOU CLICK CREATE, read this first:\n  The App will exist and this command will not have its private key. That is\n  recoverable. Either:\n    - delete the App in its settings and re-run this command, or\n    - open the App, scroll to "Private keys", and click "Generate a private key".\n      It downloads a .pem and that is the only chance to save it. This is NOT the\n      "client secret" listed a few sections above: that is for OAuth user flows, is\n      unused by this App, and fails confusingly when used to sign.\n');
+  console.log(recoveryPreamble());
   const state = randomUUID();
   let formDir;
   let callback;
@@ -3017,29 +3132,15 @@ async function createCommand(options) {
     formDir = await mkdtemp(path10.join(tmpdir(), "canopycms-app-"));
     const formFile = path10.join(formDir, `create-${slug}.html`);
     await writeFile2(formFile, creationForm(postUrl, manifest), { mode: 384, flag: "wx" });
-    console.log(`Registering "${name}" for ${target.owner}/${target.repo}.
-
-Its permissions, which is the part that matters:
-
-${JSON.stringify(CANOPY_APP_PERMISSIONS, null, 2)}
-
-The key will go to ${describeDestination(destination)} \u2014 and if that fails you will
-be asked for somewhere else before it is discarded.
-
-1. Open this file in a browser:
-
-     ${formFile}
-
-   The browser matters, twice over. It must be LOGGED IN TO GITHUB as an owner of
-   ${target.owner}, and it must be running on THIS machine \u2014 the redirect comes back to
-   127.0.0.1:${callback.port}, which only a local browser can reach. An embedded or
-   app-internal browser bounces off the GitHub login wall and simply appears to do
-   nothing when you click Create.
-
-   The page posts the manifest to GitHub, which shows you the App pre-filled with
-   exactly those permissions. Review them and click Create.
-
-Waiting for GitHub to redirect back (up to ${CALLBACK_TIMEOUT_MS / 6e4} minutes)...`);
+    console.log(registrationMessage({
+      name,
+      owner: target.owner,
+      repo: target.repo,
+      destination: describeDestination(destination),
+      formFile,
+      callbackPort: callback.port,
+      timeoutMinutes: CALLBACK_TIMEOUT_MS / 6e4
+    }));
     let code;
     try {
       code = await callback.code;
@@ -3054,32 +3155,20 @@ ${getErrorMessage(err2)}.
   See the recovery note printed above if the App was in fact created.`);
       return 1;
     }
-    console.log("  got the manifest code; exchanging it for the App credentials");
+    console.log(`
+${tick("Got the manifest code; exchanging it for the App credentials")}`);
     const created = await convertManifest(code);
     if (!created) {
       console.error('  the exchange failed, so this command never received the private key.\n\n  Do NOT simply re-run `create`: it submits a fresh manifest and would register a\n  SECOND App. The App you just created almost certainly exists \u2014 open it, generate\n  a key from its "Private keys" section (see the recovery note above), and then run\n  `canopycms init-github-app verify`. Delete the App instead if you would rather\n  start over.');
       return 1;
     }
-    console.log(`  created App ${created.slug} (id ${created.id}) \u2014 private key captured; sending it to ${describeDestination(destination)}`);
+    console.log(tick(`Created App ${outColors.bold(created.slug)} (id ${created.id}); private key captured, sending it to ${describeDestination(destination)}`));
     const stored = await handOffWithRetry(created.pem, destination);
     if (!stored) {
-      console.error(`
-Stopping here: the App exists but its key was not stored, so installing it now
-  would achieve nothing. To recover, open the App and generate a private key from
-  its "Private keys" section, then run \`verify\`; or delete the App and start again.
-
-  GITHUB_APP_ID=${created.id}
-  App settings: https://github.com/settings/apps/${created.slug}`);
+      console.error(keyNotStoredMessage(target, created));
       return 1;
     }
-    console.log(`
-2. Install it on ${target.owner}/${target.repo}:
-
-     https://github.com/settings/apps/${created.slug}/installations
-
-   That page shows an Install button first \u2014 the repository picker only appears after
-   you click it. Choose "Only select repositories" and pick that one repository.
-`);
+    console.log(installStepMessage(target, created.slug));
     await pressEnter("   Press Enter once it is installed.");
     let readback;
     try {
@@ -3090,19 +3179,7 @@ Stopping here: the App exists but its key was not stored, so installing it now
   This says nothing about the App or the key \u2014 re-run \`canopycms init-github-app verify\`.`);
       readback = { ok: false, installationId: null };
     }
-    console.log(`
-Set these on your deployment:
-
-  GITHUB_APP_ID=${created.id}
-  GITHUB_APP_INSTALLATION_ID=${readback.installationId ?? "<run `verify` to read it>"}
-  GITHUB_APP_PRIVATE_KEY_SECRET_ARN=<wherever you just put the key>
-
-  Both ids are numeric. The App ID is NOT the "Client ID" (\`Iv1.\u2026\`) shown beside it,
-  and the installation id is NOT the App ID \u2014 an App installed twice has one App ID
-  and two installation ids.
-
-Re-check this any time, without creating anything:
-  canopycms init-github-app verify --app-id ${created.id} --key-file <path>`);
+    console.log(deploymentSettingsMessage(created.id, readback.installationId));
     return stored && readback.ok ? 0 : 1;
   } finally {
     callback.close();
@@ -3147,6 +3224,7 @@ var init_init_github_app = __esm({
     init_error();
     init_github_auth();
     init_github_app_manifest();
+    init_github_app_output();
     init_prompt();
     CALLBACK_TIMEOUT_MS = 10 * 60 * 1e3;
     REQUEST_TIMEOUT_MS = 3e4;
@@ -3710,6 +3788,70 @@ function isBlockStructuralKey(key) {
 function createDebugLogger2(options) {
   return new DebugLogger2(options);
 }
+function startOf(node) {
+  return node?.position?.start.offset;
+}
+function endOf(node) {
+  return node?.position?.end.offset;
+}
+function apply(source, edits, from = 0, to = source.length) {
+  let out = "";
+  let at = from;
+  for (const edit of [...edits].sort((a, b) => a.start - b.start)) {
+    if (edit.start < at || edit.end > to)
+      continue;
+    out += source.slice(at, edit.start) + edit.text;
+    at = edit.end;
+  }
+  return out + source.slice(at, to);
+}
+function underscoreStarts(node) {
+  const bare = startOf(node) === startOf(node.children?.[0]);
+  if (node.type === "link" && !bare || node.type === "linkReference")
+    return [];
+  if (node.type === "text" || node.type === "mdxTextExpression") {
+    const start = startOf(node);
+    return start !== void 0 && (node.value ?? "").includes("_") ? [start] : [];
+  }
+  return (node.children ?? []).flatMap(underscoreStarts);
+}
+function orderedNumber(numbers, index) {
+  const [first = 1, second, third] = numbers;
+  if (index === 0)
+    return first;
+  const ones = numbers.length > 1 && second === 1 && (first !== 0 || numbers.length < 3 || third === 1);
+  return ones ? 1 : first + index;
+}
+function restyleMarkdown(source, tree, fixed, readsBack) {
+  if (source.startsWith("\uFEFF"))
+    return void 0;
+  const blocks = tree.children ?? [];
+  const groups = blocks.map(() => []);
+  new Restyler(source).children(tree, [], [], fixed, (index) => groups[index] ?? []);
+  const changed = groups.filter((group) => group.length > 0);
+  if (changed.length === 0)
+    return void 0;
+  let kept = [];
+  let best;
+  let budget = 8 * Math.ceil(Math.log2(changed.length + 1)) + 8;
+  const attempt = (tried) => {
+    if (budget-- <= 0)
+      return;
+    const trial = [...kept, ...tried.flat()];
+    const text3 = apply(source, trial);
+    const parsed = readsBack(text3);
+    if (parsed !== void 0) {
+      kept = trial;
+      best = { text: text3, tree: parsed };
+    } else if (tried.length > 1) {
+      const half = Math.ceil(tried.length / 2);
+      attempt(tried.slice(0, half));
+      attempt(tried.slice(half));
+    }
+  };
+  attempt(changed);
+  return best;
+}
 function snapshotDocument(doc) {
   const items = /* @__PURE__ */ new Map();
   const visitNode = (node) => {
@@ -3823,15 +3965,15 @@ function canonical(node) {
 function kindOf(node) {
   return `${node.type}:${String(node.ordered ?? "")}:${String(node.checked ?? "")}`;
 }
-function startOf(node) {
+function startOf2(node) {
   return node?.position?.start.offset;
 }
-function endOf(node) {
+function endOf2(node) {
   return node?.position?.end.offset;
 }
 function sliceOf(text3, node) {
-  const start = startOf(node);
-  const end = endOf(node);
+  const start = startOf2(node);
+  const end = endOf2(node);
   return start === void 0 || end === void 0 ? void 0 : text3.slice(start, end);
 }
 function reindent(text3, from, to) {
@@ -3895,12 +4037,12 @@ function leadWidth(text3, offset) {
   return /^(?: |[-*+](?= )|\d{1,9}[.)](?= )|\[[ xX]\](?= ))*$/.test(lead) ? lead.length : void 0;
 }
 function gapBetween(text3, a, b) {
-  const end = endOf(a);
-  const start = startOf(b);
+  const end = endOf2(a);
+  const start = startOf2(b);
   return end === void 0 || start === void 0 ? void 0 : text3.slice(end, start);
 }
 function listMarkers(text3, items, ordered) {
-  const firstStart = startOf(items[0]);
+  const firstStart = startOf2(items[0]);
   if (firstStart === void 0)
     return void 0;
   if (!ordered) {
@@ -3913,16 +4055,14 @@ function listMarkers(text3, items, ordered) {
   const first = numberAt(firstStart);
   if (first === null)
     return void 0;
-  const start = Number(first[1]);
   const delimiter = first[2] ?? ".";
   const padTo = first[1]?.startsWith("0") ? first[1].length : 0;
-  const second = items.length > 1 ? numberAt(startOf(items[1])) : null;
-  const step = second !== null && Number(second[1]) === start ? 0 : 1;
+  const typed = items.map((item) => Number(numberAt(startOf2(item))?.[1]));
   return (itemText, index) => {
     const current = /^\d{1,9}[.)]/.exec(itemText);
     if (current === null)
       return void 0;
-    const marker = `${String(start + step * index).padStart(padTo, "0")}${delimiter}`;
+    const marker = `${String(orderedNumber(typed, index)).padStart(padTo, "0")}${delimiter}`;
     if (marker.length !== current[0].length && itemText.includes("\n"))
       return void 0;
     return marker + itemText.slice(current[0].length);
@@ -3938,22 +4078,56 @@ function preserveMarkdownSource(original, updated, format) {
     return updated;
   }
 }
+function diskBlocks(oNodes, nNodes) {
+  const oKeys = oNodes.map(canonical);
+  const nKeys = nNodes.map(canonical);
+  const pairs = matchSequences(oKeys, nKeys);
+  const fromDisk = new Set(pairs.map(([, ni]) => ni));
+  const matched = new Set(pairs.map(([oi]) => oi));
+  const unmatched = /* @__PURE__ */ new Map();
+  oKeys.forEach((key, index) => {
+    if (!matched.has(index))
+      unmatched.set(key, (unmatched.get(key) ?? 0) + 1);
+  });
+  nKeys.forEach((key, index) => {
+    const left = unmatched.get(key) ?? 0;
+    if (fromDisk.has(index) || left === 0)
+      return;
+    unmatched.set(key, left - 1);
+    fromDisk.add(index);
+  });
+  return fromDisk;
+}
 function splice(original, updated, format) {
-  const before = parse(original, format);
+  const before = original === void 0 ? void 0 : parse(original, format);
   const after = parse(updated, format);
-  if (before === void 0 || after === void 0)
+  if (after === void 0)
     return void 0;
   const target = canonical(after);
-  for (const deep of [true, false]) {
-    const candidate = new Splicer(original, updated, deep).body(before, after);
-    if (candidate === void 0)
-      continue;
-    const reparsed = parse(candidate, format);
-    if (reparsed !== void 0 && canonical(reparsed) === target)
-      return candidate;
-    log2.debug("markdown-body-splice", "splice does not read back as the edit", { deep });
+  const fromDisk = diskBlocks(before?.children ?? [], after.children);
+  const restyled = restyleMarkdown(updated, after, (index) => fromDisk.has(index), (text3) => {
+    const tree = parse(text3, format);
+    return tree !== void 0 && canonical(tree) === target ? tree : void 0;
+  });
+  if (original === void 0 || before === void 0)
+    return restyled?.text;
+  const asSent = { text: updated, tree: after };
+  const edits = restyled === void 0 || restyled.text === updated ? [asSent] : [restyled, asSent];
+  for (const edit of edits) {
+    for (const deep of [true, false]) {
+      const candidate = new Splicer(original, edit.text, deep).body(before, edit.tree);
+      if (candidate === void 0)
+        continue;
+      const reparsed = parse(candidate, format);
+      if (reparsed !== void 0 && canonical(reparsed) === target)
+        return candidate;
+      log2.debug("markdown-body-splice", "splice does not read back as the edit", {
+        deep,
+        restyled: edit !== asSent
+      });
+    }
   }
-  return void 0;
+  return restyled?.text;
 }
 function createNode(ctx, value, asKey = false) {
   const node = ctx.doc.createNode(value);
@@ -4238,7 +4412,7 @@ function writesFrontmatter(data) {
 }
 function bodyToWrite(body, data, format, existingRaw) {
   const priorBody = existingRaw === void 0 ? void 0 : extractBody(existingRaw);
-  const spliced = priorBody === void 0 ? body : preserveMarkdownSource(priorBody, body, format);
+  const spliced = preserveMarkdownSource(priorBody, body, format);
   if (!writesFrontmatter(data)) {
     const flush = spliced.replace(/^(?:\r?\n)+/, "");
     return /^\uFEFF?---/.test(flush) ? `
@@ -7832,7 +8006,7 @@ async function generateAIContentCLI(options) {
   console.log(`  Output: ${result.outputDir}
 `);
 }
-var __defProp3, __getOwnPropNames3, __esm3, __export3, init_error3, init_atomic_write2, init_field_traversal, ITEM_KEY, ITEM_KEY_PATTERN, isItemKey, BASE58, isListField, init_item_keys, active2, init_logger2, SENTINEL_BASE2, DOT_SEGMENT2, init_sanitize_href2, init_normalize, ROOT_COLLECTION_ID, init_types2, normalizePathValue, flattenSchema, init_flatten, scalarFieldTypes2, markdownFieldTypes2, primitiveFieldTypes2, fieldTypes2, init_types22, SAFE_HTML_TAGS2, COMPONENT_NAME2, MDX_BINDINGS2, FORBIDDEN_ATTRIBUTES2, init_mdx_allowlist2, fieldBaseSchema2, selectOptionSchema2, referenceOptionSchema2, primitiveFieldSchema2, mdxPropAllowSchema2, mdxAllowlistSchema2, markdownFieldSchema2, ASPECT_RATIO_RE2, imageFieldSchema2, selectFieldSchema2, referenceSortFieldSchema2, referenceFieldSchema2, fieldHolder2, blockSchema2, blockFieldSchema2, objectFieldSchema2, inlineGroupFieldSchema2, customFieldSchema2, knownFieldSchema2, fieldSchema2, init_field2, relativePathSchema2, entryTypeSchema2, collectionSchema2, init_collection2, uploadTargetUrlSchema2, previewPrefixSchema2, init_url2, mediaSchema2, init_media2, defaultBranchAccessSchema2, defaultPathAccessLevelSchema2, defaultPathAccessLevelsSchema2, defaultPathAccessSchema2, defaultBaseBranchSchema2, defaultRemoteNameSchema2, defaultRemoteUrlSchema2, gitBotAuthorNameSchema2, gitBotAuthorEmailSchema2, githubTokenEnvVarSchema2, operatingModeSchema2, deployedAsSchema2, contentRootSchema2, sourceRootSchema2, basePathSchema2, deploymentNameSchema2, devContentSyncSchema2, devConfigSchema2, editorConfigSchema2, seoFieldNameSchema2, seoSchema2, CanopyConfigSchema2, DEFAULT_PROD_WORKSPACE2, init_config3, SERVER_MODE_ENV_VAR, BROWSER_MODE_ENV_VAR, warned2, init_mode_env, forEachReferenceField, init_validation, ProdClientSafeStrategy2, DevClientSafeStrategy2, clientStrategyCache, init_client_safe_strategy, warned3, VALID_DEPLOYMENT_NAME2, isValidDeploymentName2, init_deployment_name, init_config22, ProdStrategy2, DevStrategy2, strategyCache2, init_client_unsafe_strategy, operating_mode_exports, init_operating_mode, task_queue_config_exports2, init_task_queue_config2, worker_status_exports, WORKER_STATUS_FILE, init_worker_status, BLOCK_DISCRIMINATOR_KEYS, BLOCK_STRUCTURAL_KEYS, envFlag2, LOG_LEVELS2, DebugLogger2, testLogger2, END, FRESH, LINE_WIDTH, MIN_LINE_WIDTH, SourceSplicer, log2, MAX_LCS_CELLS, Splicer, log22, EVIDENCE_MAX_DEPTH, log3, locks, PROVISIONING_LOCK_STALE_MS, sleep, META_DIR, CONTENT_WRITE_LOCK_NAME, DEFAULT_CONTENT_WRITE_LOCK_WAIT_MS, ContentWriteLockBusyError, sleep2, CONTENT_WRITE_LOCK_STALE_MS, heldRoots, getFormatExtension, isDataOnlyFormat, asRecord, DEFAULT_SEO_FIELD_NAMES, asRecord2, asText, asFlag, asImageUrl, asOgType, asTwitterCard, RESTRICTED_REFERENCE_MARKER, SEO_GROUP_FIELDS, MAX_WARNED, warned4, SchemaUnavailableError, BASE58_PATTERN, CONTENT_ID_PATTERN, PHYSICAL_SEGMENT_PATTERN, isValidId, EMPTY_LOGICAL_PATH, ContentIdIndex, parseTypedFilename, CONTENT_EXTENSIONS, registry, finalization, log4, META_DIR2, entryTypeMetaSchema, collectionMetaSchema, rootCollectionMetaSchema, fingerprints, editDistance, closestName, forEachEntryType, collectEntryTypeNames, validateReferenceEntryTypes, isDeployedStatic, isBuildMode, readsFromCheckout, STATIC_DEPLOY_USER, storage, log5, BaseBranchUnresolvedError, NETWORK_SCHEME_PATTERN, TRANSPORT_HELPER_PATTERN, LEADING_OPTION_PATTERN, WINDOWS_DRIVE_PATTERN, COLON_BEFORE_SLASH_PATTERN, MISSING_REMOTE_REF_REASONS, CANOPY_META_DIR, SCHEMA_CACHE_VERSION, MTIME_CHECK_DEBOUNCE_MS, SCHEMA_CACHE_FILE, SCHEMA_GENERATION_RESOURCE, reportedIssues, BranchSchemaCache, RESOURCE, RESERVED_SETTINGS_BRANCH_PREFIX, BranchPathError, resolveContentBranchesRoot, ContentStoreError, ContentConflictError, EntryGoneError, BranchSyncingError, DuplicateContentIdError, UrlPathConflictError, isEmptyFieldValue, DEFAULT_INDEX_FRESHNESS_INTERVAL_MS, FORCED_REFRESH_MIN_INTERVAL_MS, STALE_LOOKUP, isMissingReference, createReferenceResolveCache, ContentStore, ATTR_CONTENT, BLOCK_PREFIX, BLOCK_SUFFIX, BLOCK_RESTORE_RE, INLINE_PREFIX, INLINE_SUFFIX, INLINE_RESTORE_RE, DEFAULT_REFERENCE_RENDERING, FLAT_CELL_TYPES, log6, BASE58_CHAR, ENTRY_LINK_PATTERN, INLINE_LINK_TARGET, BranchMetadataCorruptError, BRANCH_META_DIR, BRANCH_META_FILE, branchMetadataFilePath, UNKNOWN_TIME, enumOf, branchMetadataShape, branchMetadataSchema, branchMetadataFileSchema, log7, REGISTRY_FILE, REGISTRY_STALE_FILE, REGISTRY_TEMP_FILE, REGISTRY_VERSION, RESOURCE2, GET_MISS_REFRESH_MIN_INTERVAL_MS, snapshotSchema, reportedUnreadable, BranchRegistry, log8, OccWriteConflictError, CURRENT_SCHEMA_VERSION, BranchMetadataConflictError, BranchMetadataFileManager, loadBranchContext, log9, GIT_ENV_PASSTHROUGH, FORCE_C_LOCALE, GIT_NETWORK_ENV_PASSTHROUGH, NO_AUTO_GC_CONFIG, REMOTE_GIT_CONFIG, REMOTE_GIT_MAX_LOOSE_OBJECTS, REMOTE_GIT_MAX_PACKS, PARALLEL_CHECKOUT_ARGS, remoteInitLocks, GITHUB_TRACKING_REF_PREFIX, GitConflictError, GitRemoteRefMissingError, RemoteNotReadyError, SettingsRemoteUnreadableError, SettingsBranchDivergedError, SETTINGS_BRANCH_FILES, SettingsBranchHasContentHistoryError, GitManager, PUBLISH_LOCK_WAIT_MS, CREATE_RESIDUE_MIN_QUIET_MS, STAGING_MAX_AGE_MS, REPAIR_MAX_AGE_MS, DELETING_MAX_AGE_MS, SETTINGS_TRASH_MAX_AGE_MS, BranchProvisioningBusyError, BranchDirOccupiedError, STAGING_PREFIX, REPAIR_PREFIX, TRASH_PREFIX, stagingDirName, NO_GIT, RENAME_BLOCKED, SPARSE_CONE_RECORD, defaultSink, sink, ProvisionLog, testHooks, provisionsInFlight, BranchWorkspaceManager, log10, normalizePath, readEntryData, createReferenceResolver, withoutUnavailableEntries, resolveCollectionItemReferences, looksLikeMalformedEntry, listCollectionEntries, MAX_INPUT_PIXELS, CROP_PRECISION, KNOWN_FIELD_TYPES, STRING_FIELD_TYPES, selectOptionValues, GENERATED_RECORD_FILENAME, SAFE_BUILD_ID, BUILD_ID_RULE, jiti;
+var __defProp3, __getOwnPropNames3, __esm3, __export3, init_error3, init_atomic_write2, init_field_traversal, ITEM_KEY, ITEM_KEY_PATTERN, isItemKey, BASE58, isListField, init_item_keys, active2, init_logger2, SENTINEL_BASE2, DOT_SEGMENT2, init_sanitize_href2, init_normalize, ROOT_COLLECTION_ID, init_types2, normalizePathValue, flattenSchema, init_flatten, scalarFieldTypes2, markdownFieldTypes2, primitiveFieldTypes2, fieldTypes2, init_types22, SAFE_HTML_TAGS2, COMPONENT_NAME2, MDX_BINDINGS2, FORBIDDEN_ATTRIBUTES2, init_mdx_allowlist2, fieldBaseSchema2, selectOptionSchema2, referenceOptionSchema2, primitiveFieldSchema2, mdxPropAllowSchema2, mdxAllowlistSchema2, markdownFieldSchema2, ASPECT_RATIO_RE2, imageFieldSchema2, selectFieldSchema2, referenceSortFieldSchema2, referenceFieldSchema2, fieldHolder2, blockSchema2, blockFieldSchema2, objectFieldSchema2, inlineGroupFieldSchema2, customFieldSchema2, knownFieldSchema2, fieldSchema2, init_field2, relativePathSchema2, entryTypeSchema2, collectionSchema2, init_collection2, uploadTargetUrlSchema2, previewPrefixSchema2, editorUrlSchema2, init_url2, mediaSchema2, init_media2, defaultBranchAccessSchema2, defaultPathAccessLevelSchema2, defaultPathAccessLevelsSchema2, defaultPathAccessSchema2, defaultBaseBranchSchema2, defaultRemoteNameSchema2, defaultRemoteUrlSchema2, gitBotAuthorNameSchema2, gitBotAuthorEmailSchema2, githubTokenEnvVarSchema2, operatingModeSchema2, deployedAsSchema2, contentRootSchema2, sourceRootSchema2, basePathSchema2, deploymentNameSchema2, devContentSyncSchema2, devConfigSchema2, editorConfigSchema2, seoFieldNameSchema2, seoSchema2, CanopyConfigSchema2, DEFAULT_PROD_WORKSPACE2, init_config3, SERVER_MODE_ENV_VAR, BROWSER_MODE_ENV_VAR, warned2, init_mode_env, forEachReferenceField, init_validation, ProdClientSafeStrategy2, DevClientSafeStrategy2, clientStrategyCache, init_client_safe_strategy, warned3, VALID_DEPLOYMENT_NAME2, isValidDeploymentName2, init_deployment_name, init_config22, ProdStrategy2, DevStrategy2, strategyCache2, init_client_unsafe_strategy, operating_mode_exports, init_operating_mode, task_queue_config_exports2, init_task_queue_config2, worker_status_exports, WORKER_STATUS_FILE, init_worker_status, BLOCK_DISCRIMINATOR_KEYS, BLOCK_STRUCTURAL_KEYS, envFlag2, LOG_LEVELS2, DebugLogger2, testLogger2, MARKDOWN_EXPORT_OPTIONS, BULLETS, DELIMITERS, EMPHASIS, STRONG, RULE, WORD_CHAR, GAP, Restyler, END, FRESH, LINE_WIDTH, MIN_LINE_WIDTH, SourceSplicer, log2, MAX_LCS_CELLS, Splicer, log22, EVIDENCE_MAX_DEPTH, log3, locks, PROVISIONING_LOCK_STALE_MS, sleep, META_DIR, CONTENT_WRITE_LOCK_NAME, DEFAULT_CONTENT_WRITE_LOCK_WAIT_MS, ContentWriteLockBusyError, sleep2, CONTENT_WRITE_LOCK_STALE_MS, heldRoots, getFormatExtension, isDataOnlyFormat, asRecord, DEFAULT_SEO_FIELD_NAMES, asRecord2, asText, asFlag, asImageUrl, asOgType, asTwitterCard, RESTRICTED_REFERENCE_MARKER, SEO_GROUP_FIELDS, MAX_WARNED, warned4, SchemaUnavailableError, BASE58_PATTERN, CONTENT_ID_PATTERN, PHYSICAL_SEGMENT_PATTERN, isValidId, parseTypedFilename, EMPTY_LOGICAL_PATH, ENTRY_EXTENSIONS, ContentIdIndex, CONTENT_EXTENSIONS, registry, finalization, log4, META_DIR2, entryTypeMetaSchema, collectionMetaSchema, rootCollectionMetaSchema, fingerprints, editDistance, closestName, forEachEntryType, collectEntryTypeNames, validateReferenceEntryTypes, isDeployedStatic, isBuildMode, readsFromCheckout, STATIC_DEPLOY_USER, storage, log5, BaseBranchUnresolvedError, NETWORK_SCHEME_PATTERN, TRANSPORT_HELPER_PATTERN, LEADING_OPTION_PATTERN, WINDOWS_DRIVE_PATTERN, COLON_BEFORE_SLASH_PATTERN, MISSING_REMOTE_REF_REASONS, CANOPY_META_DIR, SCHEMA_CACHE_VERSION, MTIME_CHECK_DEBOUNCE_MS, SCHEMA_CACHE_FILE, SCHEMA_GENERATION_RESOURCE, reportedIssues, BranchSchemaCache, RESOURCE, RESERVED_SETTINGS_BRANCH_PREFIX, BranchPathError, resolveContentBranchesRoot, ContentStoreError, ContentConflictError, EntryGoneError, BranchSyncingError, DuplicateContentIdError, UrlPathConflictError, isEmptyFieldValue, DEFAULT_INDEX_FRESHNESS_INTERVAL_MS, FORCED_REFRESH_MIN_INTERVAL_MS, STALE_LOOKUP, isMissingReference, createReferenceResolveCache, ContentStore, ATTR_CONTENT, BLOCK_PREFIX, BLOCK_SUFFIX, BLOCK_RESTORE_RE, INLINE_PREFIX, INLINE_SUFFIX, INLINE_RESTORE_RE, DEFAULT_REFERENCE_RENDERING, FLAT_CELL_TYPES, log6, BASE58_CHAR, ENTRY_LINK_PATTERN, INLINE_LINK_TARGET, BranchMetadataCorruptError, BRANCH_META_DIR, BRANCH_META_FILE, branchMetadataFilePath, UNKNOWN_TIME, enumOf, branchMetadataShape, branchMetadataSchema, branchMetadataFileSchema, log7, REGISTRY_FILE, REGISTRY_STALE_FILE, REGISTRY_TEMP_FILE, REGISTRY_VERSION, RESOURCE2, GET_MISS_REFRESH_MIN_INTERVAL_MS, snapshotSchema, reportedUnreadable, BranchRegistry, log8, OccWriteConflictError, CURRENT_SCHEMA_VERSION, BranchMetadataConflictError, BranchMetadataFileManager, loadBranchContext, log9, GIT_ENV_PASSTHROUGH, FORCE_C_LOCALE, GIT_NETWORK_ENV_PASSTHROUGH, NO_AUTO_GC_CONFIG, REMOTE_GIT_CONFIG, REMOTE_GIT_MAX_LOOSE_OBJECTS, REMOTE_GIT_MAX_PACKS, PARALLEL_CHECKOUT_ARGS, remoteInitLocks, GITHUB_TRACKING_REF_PREFIX, GitConflictError, GitRemoteRefMissingError, RemoteNotReadyError, SettingsRemoteUnreadableError, SettingsBranchDivergedError, SETTINGS_BRANCH_FILES, SettingsBranchHasContentHistoryError, GitManager, PUBLISH_LOCK_WAIT_MS, CREATE_RESIDUE_MIN_QUIET_MS, STAGING_MAX_AGE_MS, REPAIR_MAX_AGE_MS, DELETING_MAX_AGE_MS, SETTINGS_TRASH_MAX_AGE_MS, BranchProvisioningBusyError, BranchDirOccupiedError, STAGING_PREFIX, REPAIR_PREFIX, TRASH_PREFIX, stagingDirName, NO_GIT, RENAME_BLOCKED, SPARSE_CONE_RECORD, defaultSink, sink, ProvisionLog, testHooks, provisionsInFlight, BranchWorkspaceManager, log10, normalizePath, readEntryData, createReferenceResolver, withoutUnavailableEntries, resolveCollectionItemReferences, looksLikeMalformedEntry, listCollectionEntries, MAX_INPUT_PIXELS, CROP_PRECISION, KNOWN_FIELD_TYPES, STRING_FIELD_TYPES, selectOptionValues, GENERATED_RECORD_FILENAME, SAFE_BUILD_ID, BUILD_ID_RULE, jiti;
 var init_generate_ai_content = __esm({
   "dist/cli/generate-ai-content.js"() {
     "use strict";
@@ -8285,6 +8459,14 @@ var init_generate_ai_content = __esm({
         previewPrefixSchema2 = z42.string().trim().refine((value) => isHttpUrlOrSameOriginPath2(value), {
           message: 'editor.previewPrefix must be an absolute http(s) URL or a site-relative path beginning with a single "/", with no query or fragment'
         });
+        editorUrlSchema2 = z42.string().trim().refine((value) => {
+          if (!isHttpUrlOrSameOriginPath2(value) || !/^https?:\/\//i.test(value))
+            return false;
+          const url = new URL(value);
+          return !url.username && !url.password;
+        }, {
+          message: "editorUrl must be an absolute http(s) URL with no credentials, query or fragment"
+        });
       }
     });
     init_media2 = __esm3({
@@ -8427,6 +8609,7 @@ var init_generate_ai_content = __esm({
           contentRoot: contentRootSchema2.default("content"),
           sourceRoot: sourceRootSchema2.optional(),
           basePath: basePathSchema2,
+          editorUrl: editorUrlSchema2.optional(),
           unauthenticatedStatus: z6.union([z6.literal(401), z6.literal(419)]).optional(),
           danglingReferences: z6.enum(["error", "warn"]).optional(),
           editor: editorConfigSchema2.optional(),
@@ -8796,6 +8979,360 @@ var init_generate_ai_content = __esm({
     });
     init_error3();
     init_error3();
+    MARKDOWN_EXPORT_OPTIONS = {
+      listItemIndent: "one",
+      bullet: "-",
+      emphasis: "_",
+      strong: "*",
+      rule: "-"
+    };
+    BULLETS = [MARKDOWN_EXPORT_OPTIONS.bullet, "*"];
+    DELIMITERS = [".", ")"];
+    EMPHASIS = MARKDOWN_EXPORT_OPTIONS.emphasis;
+    STRONG = MARKDOWN_EXPORT_OPTIONS.strong.repeat(2);
+    RULE = MARKDOWN_EXPORT_OPTIONS.rule.repeat(3);
+    WORD_CHAR = /[^\s\p{P}\p{S}]/u;
+    GAP = /^[ \t>]*(?:\r?\n[ \t>]*)+$/;
+    Restyler = class {
+      constructor(source) {
+        this.source = source;
+        this.listMarker = /* @__PURE__ */ new Map();
+        this.underscores = /* @__PURE__ */ new Map();
+      }
+      /** Edits for `node` and everything under it, given its ancestors (nearest last). */
+      collect(node, ancestors, out) {
+        const inside = [...ancestors, node];
+        switch (node.type) {
+          case "emphasis":
+            this.emphasis(node, ancestors, out);
+            break;
+          case "strong":
+            this.strong(node, out);
+            break;
+          case "text":
+            this.text(node, ancestors, out);
+            return;
+          case "thematicBreak":
+            this.replaceWhole(node, this.ruleIn(ancestors), out);
+            return;
+          case "code":
+            this.fence(node, out);
+            return;
+          case "heading":
+            this.heading(node, inside, out);
+            return;
+          case "table":
+            this.table(node, inside, out);
+            return;
+          default:
+            break;
+        }
+        this.children(node, inside, out);
+      }
+      /**
+       * Edits for `parent`'s children and the gaps between them. `fixed` names children whose text
+       * must stay as it is (untouched top-level blocks); their lists still count for alternation.
+       */
+      children(parent, inside, out, fixed = () => false, outFor = () => out) {
+        const children = parent.children ?? [];
+        const markers = this.listMarkers(children, fixed);
+        children.forEach((child, index) => {
+          if (fixed(index))
+            return;
+          const edits = outFor(index);
+          const marker = markers.get(child);
+          if (marker !== void 0)
+            this.list(child, marker, edits);
+          this.collect(child, inside, edits);
+        });
+        const always = parent.type === "root" || parent.type === "blockquote";
+        const spaced = always || parent.type === "list" || parent.type === "listItem";
+        if (!spaced)
+          return;
+        for (let index = 1; index < children.length; index++) {
+          if (fixed(index) && fixed(index - 1))
+            continue;
+          this.gap(children[index - 1], children[index], always, outFor(fixed(index) ? index - 1 : index));
+        }
+      }
+      /** The marker each list among `children` takes: its own, then alternating with the one before. */
+      listMarkers(children, fixed) {
+        const markers = /* @__PURE__ */ new Map();
+        let previous;
+        children.forEach((child, index) => {
+          if (child.type !== "list") {
+            previous = void 0;
+            return;
+          }
+          const ordered = Boolean(child.ordered);
+          const current = this.markerOf(child);
+          if (current === void 0) {
+            previous = void 0;
+            return;
+          }
+          let marker = current;
+          if (!fixed(index)) {
+            const choices = ordered ? DELIMITERS : BULLETS;
+            const next = children[index + 1];
+            const nextFixed = next?.type === "list" && Boolean(next.ordered) === ordered && fixed(index + 1) ? this.markerOf(next) : void 0;
+            const before = previous?.ordered === ordered ? previous.marker : void 0;
+            marker = choices.find((choice) => choice !== before && choice !== nextFixed) ?? current;
+            markers.set(child, marker);
+          }
+          this.listMarker.set(child, marker);
+          previous = { ordered, marker };
+        });
+        return markers;
+      }
+      /**
+       * A rule's text: `---`, but inside a list Prettier writes `***`, or `---` when the list takes
+       * the alternate marker.
+       */
+      ruleIn(ancestors) {
+        const list = [...ancestors].reverse().find((a) => a.type === "list");
+        if (list === void 0)
+          return RULE;
+        const marker = this.listMarker.get(list);
+        return marker === BULLETS[0] || marker === DELIMITERS[0] ? "***" : RULE;
+      }
+      /** A list's bullet, or its ordered delimiter, read from its first item. */
+      markerOf(list) {
+        const at = startOf(list.children?.[0]);
+        if (at === void 0)
+          return void 0;
+        if (!list.ordered)
+          return this.source[at];
+        return /^\d{1,9}([.)])/.exec(this.source.slice(at, at + 10))?.[1];
+      }
+      /** Item markers: the list's bullet or delimiter, and Prettier's numbering where widths allow. */
+      list(list, marker, out) {
+        const items = list.children ?? [];
+        const starts = items.map(startOf);
+        if (!list.ordered) {
+          for (const at of starts) {
+            if (at !== void 0 && this.source[at] !== marker) {
+              out.push({ start: at, end: at + 1, text: marker });
+            }
+          }
+          return;
+        }
+        const numbers = starts.map((at) => at === void 0 ? null : /^(\d{1,9})[.)]/.exec(this.source.slice(at, at + 11)));
+        const typed = numbers.map((match) => Number(match?.[1]));
+        const renumber = numbers.every((match, i) => match !== null && String(orderedNumber(typed, i)).length === match[1]?.length);
+        numbers.forEach((match, i) => {
+          const at = starts[i];
+          if (match === null || at === void 0)
+            return;
+          const digits = match[1] ?? "";
+          const wanted = renumber ? String(orderedNumber(typed, i)) : digits;
+          if (wanted !== digits || match[0].slice(-1) !== marker) {
+            out.push({ start: at, end: at + match[0].length, text: wanted + marker });
+          }
+        });
+      }
+      /**
+       * The gap between two siblings with exactly one blank line, kept in the container's own
+       * prefix and line ending; where `always` is false, only a gap that had a blank line.
+       */
+      gap(a, b, always, out) {
+        const end = this.contentEnd(a);
+        const start = startOf(b);
+        if (end === void 0 || start === void 0)
+          return;
+        const gap = this.source.slice(end, start);
+        if (!GAP.test(gap))
+          return;
+        const lines = gap.split(/\r?\n/);
+        if (!always && lines.length < 3)
+          return;
+        const eol = gap.includes("\r\n") ? "\r\n" : "\n";
+        const prefix = lines[lines.length - 1] ?? "";
+        const together = a?.type === "definition" && b?.type === "definition";
+        const text3 = together ? eol + prefix : eol + prefix.trimEnd() + eol + prefix;
+        if (text3 !== gap)
+          out.push({ start: end, end: start, text: text3 });
+      }
+      /**
+       * Where `node`'s last line of content ends: a list's position runs on over the blank lines
+       * after it, which in a block quote are lines of `>`.
+       */
+      contentEnd(node) {
+        const start = startOf(node);
+        let end = endOf(node);
+        if (start === void 0 || end === void 0)
+          return end;
+        for (; ; ) {
+          const lineStart = this.source.lastIndexOf("\n", end - 1);
+          if (lineStart <= start || !/^[ \t>]*$/.test(this.source.slice(lineStart + 1, end)))
+            break;
+          end = this.source[lineStart - 1] === "\r" ? lineStart - 1 : lineStart;
+        }
+        return end;
+      }
+      emphasis(node, ancestors, out) {
+        const start = startOf(node);
+        const end = endOf(node);
+        if (start === void 0 || end === void 0)
+          return;
+        const open = this.source[start];
+        if (open !== this.source[end - 1] || open !== "*" && open !== "_")
+          return;
+        const marker = ancestors.some((a) => a.type === "emphasis") || this.besideWord(start, end) || this.afterUnderscore(start, ancestors) ? "*" : EMPHASIS;
+        if (open === marker)
+          return;
+        out.push({ start, end: start + 1, text: marker }, { start: end - 1, end, text: marker });
+      }
+      strong(node, out) {
+        const start = startOf(node);
+        const end = endOf(node);
+        if (start === void 0 || end === void 0)
+          return;
+        if (this.source.slice(start, start + 2) !== "__" || this.source.slice(end - 2, end) !== "__") {
+          return;
+        }
+        out.push({ start, end: start + 2, text: STRONG }, { start: end - 2, end, text: STRONG });
+      }
+      /** Whether the characters past the markers around `[start, end)` include a word character. */
+      besideWord(start, end) {
+        const markers = "*_";
+        let before = start - 1;
+        while (before >= 0 && markers.includes(this.source[before] ?? ""))
+          before--;
+        let after = end;
+        while (after < this.source.length && markers.includes(this.source[after] ?? ""))
+          after++;
+        return WORD_CHAR.test(this.source[before] ?? " ") || WORD_CHAR.test(this.source[after] ?? " ");
+      }
+      afterUnderscore(start, ancestors) {
+        const block = [...ancestors].reverse().find((a) => a.type === "paragraph" || a.type === "heading" || a.type === "tableCell");
+        if (block === void 0)
+          return false;
+        let starts = this.underscores.get(block);
+        if (starts === void 0) {
+          starts = underscoreStarts(block);
+          this.underscores.set(block, starts);
+        }
+        const link2 = [...ancestors].reverse().find((a) => a.type === "link" || a.type === "linkReference");
+        const inLink = (link2?.children ?? []).flatMap(underscoreStarts);
+        return [...starts, ...inLink].some((at) => at < start);
+      }
+      text(node, ancestors, out) {
+        const start = startOf(node);
+        const end = endOf(node);
+        if (start === void 0 || end === void 0)
+          return;
+        const raw = this.source.slice(start, end);
+        for (const match of raw.matchAll(/[ \t]+(?=\r?\n)/g)) {
+          out.push({ start: start + match.index, end: start + match.index + match[0].length, text: "" });
+        }
+        if (ancestors.some((a) => a.type === "link" || a.type === "linkReference"))
+          return;
+        const block = [...ancestors].reverse().find((a) => a.type === "paragraph" || a.type === "heading" || a.type === "tableCell");
+        const blockStart = startOf(block);
+        const blockEnd = endOf(block);
+        if (blockStart === void 0 || blockEnd === void 0)
+          return;
+        if (/\$|\[\[/.test(this.source.slice(blockStart, blockEnd)))
+          return;
+        for (const match of raw.matchAll(/(?<=[\p{L}\p{N}])\\_(?=[\p{L}\p{N}])/gu)) {
+          out.push({ start: start + match.index, end: start + match.index + 1, text: "" });
+        }
+      }
+      replaceWhole(node, text3, out) {
+        const start = startOf(node);
+        const end = endOf(node);
+        if (start === void 0 || end === void 0)
+          return;
+        if (this.source.slice(start, end) !== text3)
+          out.push({ start, end, text: text3 });
+      }
+      /** A `~~~` fence as backticks, when nothing inside it would end a backtick fence. */
+      fence(node, out) {
+        const start = startOf(node);
+        const end = endOf(node);
+        if (start === void 0 || end === void 0)
+          return;
+        const raw = this.source.slice(start, end);
+        const close = /(?:\r?\n)[ \t>]*(~{3,})[ \t]*$/.exec(raw);
+        if (!/^~~~(?!~)[^`\n]*\n/.test(raw) || close?.[1] === void 0 || raw.includes("`"))
+          return;
+        const closeAt = start + close.index + close[0].indexOf("~");
+        out.push({ start, end: start + 3, text: "```" }, { start: closeAt, end: closeAt + close[1].length, text: "```" });
+      }
+      /** A one-line heading as `# x`, its content with its own edits. */
+      heading(node, inside, out) {
+        const inner = [];
+        this.children(node, inside, inner);
+        const children = node.children ?? [];
+        const start = startOf(node);
+        const end = endOf(node);
+        const contentStart = startOf(children[0]);
+        const contentEnd = endOf(children[children.length - 1]);
+        if (start === void 0 || end === void 0 || contentStart === void 0 || contentEnd === void 0 || /[\r\n]/.test(this.source.slice(contentStart, contentEnd))) {
+          out.push(...inner);
+          return;
+        }
+        const content = apply(this.source, inner, contentStart, contentEnd);
+        const text3 = `${"#".repeat(node.depth ?? 1)} ${content}`;
+        if (text3 !== this.source.slice(start, end))
+          out.push({ start, end, text: text3 });
+        else
+          out.push(...inner);
+      }
+      /** A table padded to its columns, as Prettier pads it; its cells keep their own text. */
+      table(node, inside, out) {
+        const start = startOf(node);
+        const end = endOf(node);
+        if (start === void 0 || end === void 0)
+          return;
+        const prefix = this.source.slice(this.source.lastIndexOf("\n", start - 1) + 1, start);
+        const inner = [];
+        const rows = (node.children ?? []).map((row) => (row.children ?? []).map((cell) => {
+          const edits = [];
+          this.children(cell, [...inside, row, cell], edits);
+          inner.push(...edits);
+          const content = cell.children ?? [];
+          const from = startOf(content[0]);
+          const to = endOf(content[content.length - 1]);
+          return from === void 0 || to === void 0 ? "" : apply(this.source, edits, from, to);
+        }));
+        const plain = rows.every((row) => row.every((cell) => /^[\x20-\x7e]*$/.test(cell)));
+        if (!plain || !/^[ \t>]*$/.test(prefix)) {
+          out.push(...inner);
+          return;
+        }
+        const align = node.align ?? [];
+        const columns = Math.max(...rows.map((row) => row.length), align.length);
+        const widths = Array.from({ length: columns }, (_, c) => Math.max(3, ...rows.map((row) => row[c]?.length ?? 0)));
+        const pad = (text22, c) => {
+          const room = (widths[c] ?? 3) - text22.length;
+          if (align[c] === "right")
+            return " ".repeat(room) + text22;
+          if (align[c] === "center") {
+            const left = Math.floor(room / 2);
+            return " ".repeat(left) + text22 + " ".repeat(room - left);
+          }
+          return text22 + " ".repeat(room);
+        };
+        const delimiter = widths.map((width, c) => {
+          const a = align[c];
+          if (a === "left")
+            return `:${"-".repeat(width - 1)}`;
+          if (a === "right")
+            return `${"-".repeat(width - 1)}:`;
+          if (a === "center")
+            return `:${"-".repeat(width - 2)}:`;
+          return "-".repeat(width);
+        });
+        const line = (cells) => `| ${cells.join(" | ")} |`;
+        const lines = rows.map((row) => line(row.map(pad)));
+        lines.splice(1, 0, line(delimiter));
+        const eol = this.source.slice(start, end).includes("\r\n") ? "\r\n" : "\n";
+        const text3 = lines.join(eol + prefix);
+        if (text3 !== this.source.slice(start, end))
+          out.push({ start, end, text: text3 });
+      }
+    };
     END = Symbol("end");
     FRESH = Symbol("fresh");
     LINE_WIDTH = 80;
@@ -9127,8 +9664,8 @@ var init_generate_ai_content = __esm({
       body(before, after) {
         const oNodes = before.children ?? [];
         const nNodes = after.children ?? [];
-        const first = startOf(oNodes[0]);
-        const last = endOf(oNodes[oNodes.length - 1]);
+        const first = startOf2(oNodes[0]);
+        const last = endOf2(oNodes[oNodes.length - 1]);
         if (first === void 0 || last === void 0 || nNodes.length === 0)
           return void 0;
         const o = { text: this.original, indent: "" };
@@ -9236,9 +9773,9 @@ var init_generate_ai_content = __esm({
       item(o, oItem, n, nItem) {
         const oChildren = oItem.children ?? [];
         const nChildren = nItem.children ?? [];
-        const oStart = startOf(oItem);
-        const oContent = startOf(oChildren[0]);
-        const nContent = startOf(nChildren[0]);
+        const oStart = startOf2(oItem);
+        const oContent = startOf2(oChildren[0]);
+        const nContent = startOf2(nChildren[0]);
         if (oStart === void 0 || oContent === void 0 || nContent === void 0)
           return void 0;
         const prefix = o.text.slice(oStart, oContent);
@@ -9417,7 +9954,32 @@ var init_generate_ai_content = __esm({
     isValidId = isValidContentId;
     init_error3();
     init_logger2();
+    parseTypedFilename = (filename, entryTypes) => {
+      if (filename.startsWith("."))
+        return null;
+      const lastDot = filename.lastIndexOf(".");
+      if (lastDot === -1)
+        return null;
+      const nameWithoutExt = filename.slice(0, lastDot);
+      const parts = nameWithoutExt.split(".");
+      if (parts.length < 3)
+        return null;
+      const potentialType = parts[0];
+      if (entryTypes && !entryTypes.some((e) => e.name === potentialType)) {
+        return null;
+      }
+      const id = parts[parts.length - 1];
+      if (!isValidId(id))
+        return null;
+      const slug = parts.slice(1, -1).join(".").toLowerCase();
+      return {
+        type: potentialType,
+        slug,
+        id
+      };
+    };
     EMPTY_LOGICAL_PATH = "";
+    ENTRY_EXTENSIONS = new Set(Object.keys({ md: true, mdx: true, json: true, yaml: true }).map((format) => getFormatExtension(format)));
     ContentIdIndex = class {
       constructor(root) {
         this.idToLocation = /* @__PURE__ */ new Map();
@@ -9705,30 +10267,6 @@ var init_generate_ai_content = __esm({
       }
     };
     init_error3();
-    parseTypedFilename = (filename, entryTypes) => {
-      if (filename.startsWith("."))
-        return null;
-      const lastDot = filename.lastIndexOf(".");
-      if (lastDot === -1)
-        return null;
-      const nameWithoutExt = filename.slice(0, lastDot);
-      const parts = nameWithoutExt.split(".");
-      if (parts.length < 3)
-        return null;
-      const potentialType = parts[0];
-      if (entryTypes && !entryTypes.some((e) => e.name === potentialType)) {
-        return null;
-      }
-      const id = parts[parts.length - 1];
-      if (!isValidId(id))
-        return null;
-      const slug = parts.slice(1, -1).join(".").toLowerCase();
-      return {
-        type: potentialType,
-        slug,
-        id
-      };
-    };
     CONTENT_EXTENSIONS = [".md", ".mdx", ".json", ".yaml"];
     registry = /* @__PURE__ */ new Map();
     finalization = new FinalizationRegistry(({ rootKey, ref }) => {
@@ -11322,6 +11860,7 @@ var init_generate_ai_content = __esm({
       pullRequestNumber: z72.number().int().optional(),
       submittedAt: z72.string().optional(),
       pushedToGitHubAt: z72.string().optional(),
+      editorUrl: z72.string().optional(),
       syncStatus: enumOf({
         synced: "synced",
         "pending-sync": "pending-sync",
@@ -12375,7 +12914,7 @@ var init_generate_ai_content = __esm({
               throw cleanupErr;
           }
         }
-        const step = (name, run) => options.provisionLog ? options.provisionLog.step(name, run) : run();
+        const step2 = (name, run) => options.provisionLog ? options.provisionLog.step(name, run) : run();
         const identity = managedWorkspaceConfig(options.gitBotAuthorName, options.gitBotAuthorEmail);
         let justCloned = false;
         let resolvedRemoteUrl;
@@ -12388,9 +12927,9 @@ var init_generate_ai_content = __esm({
             sourceRoot: options.sourceRoot,
             allowNetworkRemoteInProd: options.allowNetworkRemoteInProd
           });
-          await step("clone", () => _GitManager.cloneWorkspace(remoteUrl, options.workspacePath, baseBranch, {
+          await step2("clone", () => _GitManager.cloneWorkspace(remoteUrl, options.workspacePath, baseBranch, {
             remoteName,
-            noCheckout: options.branchType === "content",
+            noCheckout: true,
             config: identity
           }));
           justCloned = true;
@@ -12403,7 +12942,7 @@ var init_generate_ai_content = __esm({
           skipIndexMarker: options.branchType === "orphan"
         });
         if (!justCloned) {
-          await step("config", async () => {
+          await step2("config", async () => {
             await git.ensureLocalConfig(identity);
             const remoteUrl = await _GitManager.resolveRemoteUrl({
               mode: options.mode,
@@ -12421,19 +12960,19 @@ var init_generate_ai_content = __esm({
         }
         if (options.branchType === "orphan") {
           try {
-            await step("checkout", () => git.createOrphanSettingsBranch(options.branchName, {}));
+            await step2("checkout", () => git.createOrphanSettingsBranch(options.branchName, {}));
           } catch (err2) {
             if (err2 instanceof SettingsRemoteUnreadableError && !resolvedRemoteUrl) {
               throw await _GitManager.remoteNotReadyError(options.mode) ?? err2;
             }
             throw err2;
           }
-          await step("exclude", () => git.ensureGitExclude("*.lock"));
+          await step2("exclude", () => git.ensureGitExclude("*.lock"));
         } else {
-          await step("checkout", () => justCloned ? git.checkoutFreshClone(options.branchName) : git.checkoutBranch(options.branchName));
+          await step2("checkout", () => justCloned ? git.checkoutFreshClone(options.branchName) : git.checkoutBranch(options.branchName));
           const pattern = options.gitExcludePattern;
           if (pattern) {
-            await step("exclude", () => git.ensureGitExclude(pattern));
+            await step2("exclude", () => git.ensureGitExclude(pattern));
           }
         }
         return git;
@@ -12858,7 +13397,7 @@ var init_generate_ai_content = __esm({
           log9.debug("git", "Checked out the remote settings branch", { branchName });
           return;
         }
-        await this.git.raw(["checkout", "--orphan", branchName]);
+        await this.git.raw(["switch", "--orphan", branchName]);
         await this.git.raw(["rm", "-r", "-f", "-q", "--sparse", "--ignore-unmatch", "--", "."]);
         const leftover = (await this.git.raw(["ls-files"])).trim();
         if (leftover) {
@@ -15575,7 +16114,7 @@ var init_collection3 = __esm({
 
 // dist/config/schemas/url.js
 import { z as z12 } from "zod";
-var uploadTargetUrlSchema3, previewPrefixSchema3;
+var uploadTargetUrlSchema3, previewPrefixSchema3, editorUrlSchema3;
 var init_url3 = __esm({
   "dist/config/schemas/url.js"() {
     "use strict";
@@ -15586,6 +16125,14 @@ var init_url3 = __esm({
     previewPrefixSchema3 = z12.string().trim().refine((value) => isHttpUrlOrSameOriginPath3(value), {
       message: 'editor.previewPrefix must be an absolute http(s) URL or a site-relative path beginning with a single "/", with no query or fragment'
     });
+    editorUrlSchema3 = z12.string().trim().refine((value) => {
+      if (!isHttpUrlOrSameOriginPath3(value) || !/^https?:\/\//i.test(value))
+        return false;
+      const url = new URL(value);
+      return !url.username && !url.password;
+    }, {
+      message: "editorUrl must be an absolute http(s) URL with no credentials, query or fragment"
+    });
   }
 });
 
@@ -15822,6 +16369,7 @@ var init_config4 = __esm({
       contentRoot: contentRootSchema3.default("content"),
       sourceRoot: sourceRootSchema3.optional(),
       basePath: basePathSchema3,
+      editorUrl: editorUrlSchema3.optional(),
       unauthenticatedStatus: z14.union([z14.literal(401), z14.literal(419)]).optional(),
       danglingReferences: z14.enum(["error", "warn"]).optional(),
       editor: editorConfigSchema3.optional(),
@@ -16463,6 +17011,23 @@ var init_id = __esm({
   }
 });
 
+// dist/utils/format.js
+var getFormatExtension2;
+var init_format = __esm({
+  "dist/utils/format.js"() {
+    "use strict";
+    getFormatExtension2 = (format) => {
+      if (format === "md")
+        return ".md";
+      if (format === "mdx")
+        return ".mdx";
+      if (format === "yaml")
+        return ".yaml";
+      return ".json";
+    };
+  }
+});
+
 // dist/content-id-index.js
 function extractIdFromFilename2(filename) {
   if (filename.startsWith(".")) {
@@ -16506,10 +17071,13 @@ function extractSlugFromFilename2(filename, entryTypeName) {
   }
   return filename.toLowerCase();
 }
+var ENTRY_EXTENSIONS2;
 var init_content_id_index = __esm({
   "dist/content-id-index.js"() {
     "use strict";
     init_id();
+    init_format();
+    ENTRY_EXTENSIONS2 = new Set(Object.keys({ md: true, mdx: true, json: true, yaml: true }).map((format) => getFormatExtension2(format)));
   }
 });
 
@@ -17693,6 +18261,7 @@ var init_branch_metadata_file = __esm({
       pullRequestNumber: z18.number().int().optional(),
       submittedAt: z18.string().optional(),
       pushedToGitHubAt: z18.string().optional(),
+      editorUrl: z18.string().optional(),
       syncStatus: enumOf2({
         synced: "synced",
         "pending-sync": "pending-sync",