@c4a/context-cli 0.5.39-beta.1 → 0.5.39-beta.3

package/cli.js

@@ -28425,8 +28425,8 @@ function stripEvidenceUrls(text5) {
 }
 var URL_RE, TRAILING_URL_PUNCTUATION_RE, TRACKING_QUERY_PARAM_RE;
 var init_evidenceUrls = __esm(() => {
-  URL_RE = /https?:\/\/[^\s)\]}>"'）】》」』，。；：！？]+/giu;
-  TRAILING_URL_PUNCTUATION_RE = /[.,;:!?)\]\}>"'，。；：！？）】》」』]+$/u;
+  URL_RE = /https?:\/\/[^\s`*)\]}>"'）】》」』，。；：！？]+/giu;
+  TRAILING_URL_PUNCTUATION_RE = /[`*.,;:!?)\]\}>"'，。；：！？）】》」』]+$/u;
   TRACKING_QUERY_PARAM_RE = /^(?:utm_|fbclid$|gclid$|mc_cid$|mc_eid$)/iu;
 });
 
@@ -52772,7 +52772,7 @@ function rejectLegacy(path13, message) {
     }]
   });
 }
-function stringValue(value) {
+function stringValue2(value) {
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
 function stringArray2(value) {
@@ -54856,6 +54856,7 @@ var init_alignWorkflowSchemas = __esm(() => {
         "CLI compiles section_groups[] into canonical sections[] and generates section_id values.",
         "nodes[].planned_sections defaults to the distinct section_groups[].section_kind values for that owner. Nodes with no section_groups must explicitly set planned_sections: [] to express no-write intent.",
         "section_groups[] only accepts block_ids[]. Do not use source_window_ids, ranges, headings, or heading globs for Section evidence selection.",
+        "section_groups[].block_ids may express one semantic grouping, but finalized ownership splits non-contiguous citation-eligible runs into draft-ready section plans. During compile, keep those emitted draft_action_templates separate unless one Section truly consumes every intervening citation-eligible block.",
         "Every owned/shared citation evidence block selected by ownership_groups[] must appear in some section_groups[].block_ids, unless it is explicitly reclassified as context_only or ignored.",
         "ownership_groups[].scope must be exactly one of: {source_id}, {source_id, structural_role}, or {block_ids}. Do not add except clauses or arbitrary filter expressions.",
         "Ownership precedence is block_ids > source_id + structural_role > source_id; same specificity uses later group; explicit block_ownership[] patches override all groups.",
@@ -55009,7 +55010,8 @@ var init_alignWorkflowSchemas = __esm(() => {
         ...TERM_ENTITY_NOTES,
         "Use align-segments.generation_policy when choosing node.title, node.summary, rationale prose, and planned Section wording.",
         "nodes[].contains_parent is the only hierarchy field; edges[] only accepts depends_on.",
-        "domain nodes need domain_gate; unresolved or weak domain gates are downgraded to entity.",
+        "domain nodes need domain_gate with resolvable child_refs; invalid domain gates block validation instead of being auto-downgraded to entity. If the evidence is not a grouping scope, submit entity with agent-chosen tags.",
+        "action nodes need action_probe and structured action_gate.inference_sources; invalid action gates block validation instead of being auto-downgraded to entity. If the evidence is not a repeatable process, submit entity or write the process wording as a Section under its owner.",
         "When align-segments.incremental.mode is incremental, finalize preserves previous finalized ownership for unscanned sources. The current decision should describe only the scanned evidence while referencing previous active Nodes when needed.",
         "In incremental mode, absence of an old Node or edge is not a deletion signal; use a full align, drop source, or explicit structure correction path for removals.",
         "Incremental finalize may reference previous active Nodes from nodes[].contains_parent, edges[].from/to, domain_gate.child_refs, and block_ownership owners/visible_to/primary_owner. Do not redeclare an old parent/domain just to attach new children.",
@@ -55166,7 +55168,7 @@ function isNavigationExternalReference(block) {
   return externalReferenceDisposition(block) === "navigation_reference";
 }
 function ownershipDefaultForBlock(raw, blockId, block) {
-  const role = stringValue(raw.ownership_role);
+  const role = stringValue2(raw.ownership_role);
   if (role !== "owned" && role !== "shared") {
     return { ...raw, block_id: blockId };
   }
@@ -55176,14 +55178,14 @@ function ownershipDefaultForBlock(raw, blockId, block) {
     const visibleTo2 = uniqueStrings3([
       ...stringArray2(raw.visible_to),
       ...stringArray2(raw.owners),
-      ...stringValue(raw.primary_owner) !== undefined ? [stringValue(raw.primary_owner)] : []
+      ...stringValue2(raw.primary_owner) !== undefined ? [stringValue2(raw.primary_owner)] : []
     ]);
     const next2 = {
       ...raw,
       block_id: blockId,
       ownership_role: structuralDefaultRole,
       visible_to: visibleTo2,
-      reason: stringValue(raw.reason) ?? `mechanical ${structuralRole} block does not need Section citation`,
+      reason: stringValue2(raw.reason) ?? `mechanical ${structuralRole} block does not need Section citation`,
       provenance: "cli_demote"
     };
     Reflect.deleteProperty(next2, "owners");
@@ -55195,14 +55197,14 @@ function ownershipDefaultForBlock(raw, blockId, block) {
   const visibleTo = uniqueStrings3([
     ...stringArray2(raw.visible_to),
     ...stringArray2(raw.owners),
-    ...stringValue(raw.primary_owner) !== undefined ? [stringValue(raw.primary_owner)] : []
+    ...stringValue2(raw.primary_owner) !== undefined ? [stringValue2(raw.primary_owner)] : []
   ]);
   const next = {
     ...raw,
     block_id: blockId,
     ownership_role: "context_only",
     visible_to: visibleTo,
-    reason: stringValue(raw.reason) ?? "navigation/reference-only block kept as context_only",
+    reason: stringValue2(raw.reason) ?? "navigation/reference-only block kept as context_only",
     provenance: "cli_demote"
   };
   Reflect.deleteProperty(next, "owners");
@@ -55239,7 +55241,7 @@ function expandOwnershipDefaults(input) {
     blocks.push(blockId);
     blocksBySource.set(sourceId, blocks);
   }
-  const explicitBlockIds = new Set(input.blockOwnership.filter(isRecord18).map((entry) => stringValue(entry.block_id)).filter((blockId) => blockId !== undefined));
+  const explicitBlockIds = new Set(input.blockOwnership.filter(isRecord18).map((entry) => stringValue2(entry.block_id)).filter((blockId) => blockId !== undefined));
   const issues = [];
   const defaultsBySource = new Set;
   const expanded = [];
@@ -55256,7 +55258,7 @@ function expandOwnershipDefaults(input) {
       });
       return;
     }
-    const sourceId = stringValue(raw.source_id);
+    const sourceId = stringValue2(raw.source_id);
     if (sourceId === undefined) {
       issues.push({
         path: `block_ownership_defaults[${index2}].source_id`,
@@ -55327,8 +55329,8 @@ function normalizeOwnership(value, refs, slugs, coverableBlockIds, coverableBloc
       push2(`block_ownership[${index2}]`, "block ownership must be an object");
       return;
     }
-    const blockId = stringValue(raw.block_id);
-    const rawRole = stringValue(raw.ownership_role);
+    const blockId = stringValue2(raw.block_id);
+    const rawRole = stringValue2(raw.ownership_role);
     const role = rawRole !== undefined && ["owned", "shared", "context_only", "ignored", "unresolved"].includes(rawRole) ? rawRole : undefined;
     if (blockId === undefined) {
       push2(`block_ownership[${index2}].block_id`, "block_id is required", { availableBlockIds: coverableBlockIds });
@@ -55435,7 +55437,7 @@ ${BLOCK_OWNERSHIP_CANONICAL_SHAPES.unresolved}`
       });
       entryHasIssues = true;
     }
-    const rawPrimaryOwner = stringValue(raw.primary_owner);
+    const rawPrimaryOwner = stringValue2(raw.primary_owner);
     const primaryOwner = rawPrimaryOwner === undefined ? undefined : tryResolve(rawPrimaryOwner, `block_ownership[${index2}].primary_owner`);
     if (role === "shared" && (owners.length < 2 || primaryOwner === undefined)) {
       push2(`block_ownership[${index2}].primary_owner`, "shared block must have at least two owners and primary_owner", {
@@ -55477,8 +55479,8 @@ ${BLOCK_OWNERSHIP_CANONICAL_SHAPES.unresolved}`
       });
       entryHasIssues = true;
     }
-    const reason = stringValue(raw.reason);
-    const provenance = stringValue(raw.provenance);
+    const reason = stringValue2(raw.reason);
+    const provenance = stringValue2(raw.provenance);
     if ((role === "shared" || role === "unresolved") && reason === undefined) {
       push2(`block_ownership[${index2}].reason`, `${role} block requires reason`, {
         reasonCode: "missing-ownership-reason",
@@ -55487,7 +55489,7 @@ ${BLOCK_OWNERSHIP_CANONICAL_SHAPES.unresolved}`
       });
       entryHasIssues = true;
     }
-    const questionId = stringValue(raw.question_id);
+    const questionId = stringValue2(raw.question_id);
     if (role === "unresolved" && questionId === undefined) {
       push2(`block_ownership[${index2}].question_id`, "unresolved block requires question_id", {
         reasonCode: "missing-question-id",
@@ -55553,7 +55555,7 @@ var init_alignStructureOwnership = __esm(() => {
 });
 
 // src/workflow/alignBlockStructuralRole.ts
-function stringValue2(value) {
+function stringValue3(value) {
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
 function blockText(block) {
@@ -55612,7 +55614,7 @@ function isNavigationReferenceQuote(blockKind, lines) {
   return blockKind === "quote" && lines.length > 0 && lines.every((line) => isExternalReferenceLine(stripMarkdownQuotePrefix(line)));
 }
 function alignBlockStructuralRole(block) {
-  const blockKind = stringValue2(block.block_kind);
+  const blockKind = stringValue3(block.block_kind);
   const text6 = blockText(block);
   if (text6 === undefined)
     return "content";
@@ -59330,6 +59332,7 @@ var init_compileDraftSourceRefs = __esm(() => {
   CONTIGUITY_SKIPPABLE_STRUCTURAL_ROLES = new Set([
     "embed_tag",
     "embedded_asset",
+    "heading_only",
     "navigation_reference",
     "marker_quote"
   ]);
@@ -59808,6 +59811,42 @@ var init_compileDraftTemplateValidation = __esm(() => {
   init_compileTemplateDetection();
 });
 
+// src/workflow/markdownFormatSignals.ts
+function markdownListItemCount(value) {
+  return [...value.matchAll(MARKDOWN_LIST_ITEM_RE)].length;
+}
+function markdownFormatSignals(value) {
+  if (typeof value !== "string" || value.trim().length === 0) {
+    return { format_sensitive: false };
+  }
+  const containsList = markdownListItemCount(value) >= 2;
+  const containsTable = TABLE_SEPARATOR_RE.test(value);
+  const containsFencedCode = FENCED_CODE_RE.test(value);
+  return {
+    format_sensitive: containsList || containsTable || containsFencedCode,
+    ...containsList ? { contains_markdown_list: true } : {},
+    ...containsTable ? { contains_markdown_table: true } : {},
+    ...containsFencedCode ? { contains_fenced_code: true } : {}
+  };
+}
+function collapsedMarkdownListLikely(input) {
+  const rawListItems = markdownListItemCount(input.raw);
+  if (rawListItems < 2)
+    return false;
+  const contentLineListItems = markdownListItemCount(input.content);
+  if (contentLineListItems >= rawListItems)
+    return false;
+  const compact2 = input.content.replace(/\s+/g, " ").trim();
+  const bulletFragments = compact2.match(/(?:^|\s)(?:[-*+]\s+|\d+[.)]\s+)\S/gu) ?? [];
+  return bulletFragments.length >= 2;
+}
+var MARKDOWN_LIST_ITEM_RE, FENCED_CODE_RE, TABLE_SEPARATOR_RE;
+var init_markdownFormatSignals = __esm(() => {
+  MARKDOWN_LIST_ITEM_RE = /^\s{0,6}(?:[-*+]\s+|\d+[.)]\s+)\S/mgu;
+  FENCED_CODE_RE = /(?:^|\n)\s{0,6}(?:```|~~~)/u;
+  TABLE_SEPARATOR_RE = /^\s*\|?(?:\s*:?-{3,}:?\s*\|)+\s*:?-{3,}:?\s*\|?\s*$/mu;
+});
+
 // src/workflow/compileDraftWarningHints.ts
 function pushSummaryWarnings(input) {
   const content3 = input.content;
@@ -59832,6 +59871,19 @@ function pushSummaryWarnings(input) {
   }
   if (summary2 === undefined)
     return;
+  if (PLACEHOLDER_SUMMARY_RE.test(summary2.trim())) {
+    input.state.warnings.push({
+      code: "compile-section-summary-placeholder",
+      severity: "warning",
+      message: `${input.label}.summary looks like a generated placeholder, not a reader/query summary.`,
+      next_action: `Replace ${input.label}.summary with a meaningful short summary, or omit summary entirely. Empty summary is better than a template placeholder.`,
+      path: `${input.label}.summary`,
+      diagnostics: {
+        submitted_summary: summary2,
+        summary_policy: "summary is optional reader/query aid; omit it when no meaningful summary is available"
+      }
+    });
+  }
   if (/\r|\n/u.test(summary2) || /```|~~~|^#{1,6}\s|^\s*[-*+]\s/mu.test(summary2)) {
     input.state.warnings.push({
       code: "compile-section-summary-format",
@@ -59962,18 +60014,56 @@ function collectDraftPlannedSectionWarnings(output, context, state) {
     });
   }
 }
+function pushMarkdownListFormatWarning(input) {
+  if (input.content === undefined || input.sourceRefs.length === 0)
+    return;
+  const requested = new Set(input.sourceRefs);
+  const affected = input.context.raw_snippets.filter((snippet) => typeof snippet.source_ref === "string" && requested.has(snippet.source_ref) && collapsedMarkdownListLikely({ raw: snippet.quote, content: input.content })).map((snippet) => ({
+    source_ref: snippet.source_ref,
+    block_id: snippet.block_id,
+    line_range: snippet.line_range,
+    raw_list_items: markdownListItemCount(snippet.quote)
+  }));
+  if (affected.length === 0)
+    return;
+  input.state.warnings.push({
+    code: "compile-markdown-list-format-collapsed",
+    severity: "warning",
+    message: `${input.label}.content may have collapsed a cited multi-line Markdown list into one line.`,
+    next_action: "If this was not an intentional prose summary, rerun the listed request_full_text command(s) and patch content to preserve the source list line breaks. The CLI will not rewrite content automatically.",
+    path: `${input.label}.content`,
+    diagnostics: {
+      affected_source_refs: affected,
+      request_full_text_commands: affected.map((item) => typeof item.block_id === "string" ? `context compile context ${input.context.node.slug} --request-full-text ${item.block_id} --view text --format json` : undefined).filter((command) => command !== undefined)
+    }
+  });
+}
+function collectDraftMarkdownFormatWarnings(output, context, state) {
+  for (const [index2, action] of output.actions.entries()) {
+    if (action.op === "add") {
+      pushMarkdownListFormatWarning({ state, context, content: action.content, sourceRefs: sourceRefsForAction(action), label: `actions[${index2}]` });
+    } else if (action.op === "update") {
+      pushMarkdownListFormatWarning({ state, context, content: action.content, sourceRefs: sourceRefsForAction(action), label: `actions[${index2}]` });
+    } else if (action.op === "supersede") {
+      pushMarkdownListFormatWarning({ state, context, content: action.new.content, sourceRefs: sourceRefsForAction(action), label: `actions[${index2}].new` });
+    }
+  }
+}
 function collectCompileDraftWarnings(output, context) {
   const state = { warnings: [] };
   collectDraftSummaryWarnings(output, state);
   collectDraftLanguageWarnings(output, context, state);
   collectDraftPlannedSectionWarnings(output, context, state);
+  collectDraftMarkdownFormatWarnings(output, context, state);
   return state.warnings;
 }
-var SUMMARY_RECOMMENDED_CONTENT_CHARS = 500, SUMMARY_MAX_CHARS = 280, SUMMARY_HINT_SEVERITY = "info", CJK_RE3, ENGLISH_WORD_RE;
+var SUMMARY_RECOMMENDED_CONTENT_CHARS = 500, SUMMARY_MAX_CHARS = 280, SUMMARY_HINT_SEVERITY = "info", CJK_RE3, ENGLISH_WORD_RE, PLACEHOLDER_SUMMARY_RE;
 var init_compileDraftWarningHints = __esm(() => {
   init_generationPolicy();
+  init_markdownFormatSignals();
   CJK_RE3 = /[\u3400-\u9fff]/gu;
   ENGLISH_WORD_RE = /\b[A-Za-z][A-Za-z-]{2,}\b/gu;
+  PLACEHOLDER_SUMMARY_RE = /^(?:description|spec|warning|principle|decision|incident|example|changelog|comparison|faq)?\s*section\s+covering\s+\d+\s+evidence\s+blocks?\s*(?:\(s\))?\.?$/iu;
 });
 
 // src/workflow/compileDraftValidation.ts
@@ -60851,12 +60941,12 @@ var init_agentHintRegistry = __esm(() => {
     "align-candidate-ledger-invalid-op",
     "align-candidate-ops-input-invalid",
     "align-candidate-ops-segment-mismatch",
-    "align-action-downgraded-to-entity",
+    "align-action-gate-invalid",
     "align-blocks-read-incomplete",
     "align-coarse-read-required",
     "align-coarse-read-segment-mismatch",
     "align-decision-ledger-invalid",
-    "align-domain-downgraded-to-entity",
+    "align-domain-gate-invalid",
     "align-entity-tag-term-mixed-with-a-b",
     "align-finalize-node-without-citation-evidence",
     "align-finalize-unplanned-evidence-blocks",
@@ -60866,10 +60956,12 @@ var init_agentHintRegistry = __esm(() => {
     "align-ownership-default-cli-demoted",
     "align-pending-relation-refs",
     "align-read-plan-ready",
+    "align-section-plan-crosses-headings",
     "align-section-plans-auto-split-contiguous-runs",
     "align-section-non-citable-blocks-ignored",
     "align-source-bundle-budget-fallback",
     "align-source-bundle-raw-c4a-sentinel-escaped",
+    "align-source-bundle-use-read-plan",
     "align-finalize-patch-invalid",
     "align-ownership-patch-base-digest-stale",
     "align-ownership-patch-invalid",
@@ -60923,6 +61015,7 @@ var init_agentHintRegistry = __esm(() => {
     "compile-cycle-input-required",
     "compile-draft-invalid",
     "compile-draft-input-required",
+    "compile-draft-patch-cycle-required",
     "compile-draft-patch-invalid",
     "compile-draft-patch-retired-field",
     "compile-draft-patch-ready",
@@ -60931,9 +61024,11 @@ var init_agentHintRegistry = __esm(() => {
     "compile-extract-normalized-match",
     "compile-lead-in-guidance",
     "compile-lead-in-skipped",
+    "compile-markdown-list-format-collapsed",
     "compile-missing-refers-to-node",
     "compile-mode-required",
     "compile-modes-conflict",
+    "compile-planned-section-fragment-review",
     "compile-node-type-guidance",
     "compile-node-no-citation-evidence",
     "compile-node-no-write-placeholder",
@@ -60950,6 +61045,7 @@ var init_agentHintRegistry = __esm(() => {
     "compile-section-kind-outside-plan",
     "compile-section-summary-format",
     "compile-section-summary-language",
+    "compile-section-summary-placeholder",
     "compile-section-summary-recommended",
     "compile-section-summary-too-long",
     "compile-source-refs-draft-scaffold-available",
@@ -61007,6 +61103,8 @@ var init_agentHintRegistry = __esm(() => {
     "raw-snapshot-pending-compile",
     "ready-no-op-review",
     "ready-review-output",
+    "prepare-candidates-index",
+    "reconcile-apply-consumes-ready-review",
     "reconcile-prepare-draft-mode-invalid",
     "reconcile-validate-compile-mode-required",
     "reconcile-validate-decisions-required",
@@ -61115,17 +61213,17 @@ var init_agentHintRegistry = __esm(() => {
       command: "context schema align-structure-intent --view minimal --format json"
     },
     {
-      code: "align-domain-downgraded-to-entity",
-      severity: "warning",
-      description: "A submitted Domain node was finalized as an Entity because its Domain gate was missing or referenced unresolved children.",
-      trigger: "Align validation/finalize normalizes a node_type=domain proposal through domain_downgrade.",
+      code: "align-domain-gate-invalid",
+      severity: "error",
+      description: "A submitted Domain node is missing a valid domain_gate with resolvable child refs.",
+      trigger: "Align validation/finalize rejects node_type=domain when domain_gate.scope_blocks, child_refs, grouping_reason, or resolvable children are missing.",
       command: "context schema align-structure-intent --view minimal --format json"
     },
     {
-      code: "align-action-downgraded-to-entity",
-      severity: "warning",
-      description: "A submitted Action node was finalized as an Entity because action probe/gate evidence was insufficient.",
-      trigger: "Align validation/finalize normalizes a node_type=action proposal through action_downgrade.",
+      code: "align-action-gate-invalid",
+      severity: "error",
+      description: "A submitted Action node is missing action_probe or structured action_gate evidence.",
+      trigger: "Align validation/finalize rejects node_type=action when action_probe.has_steps_or_phases or action_gate.inference_sources is missing.",
       command: "context schema align-structure-intent --view minimal --format json"
     },
     {
@@ -61135,6 +61233,13 @@ var init_agentHintRegistry = __esm(() => {
       trigger: "Agent submits canonical align-structure-decision to validate/finalize instead of align-structure-intent.",
       command: "context schema align-structure-intent --view minimal --format json"
     },
+    {
+      code: "align-section-plan-crosses-headings",
+      severity: "warning",
+      description: "A planned Section spans multiple source heading paths; the CLI reports the risky shape without rewriting the agent's grouping.",
+      trigger: "Align validate/finalize sees one section plan whose block_ids cross source heading boundaries.",
+      command: "context schema align-structure-intent --view minimal --format json"
+    },
     {
       code: "section-plan-non-contiguous",
       severity: "error",
@@ -61156,6 +61261,13 @@ var init_agentHintRegistry = __esm(() => {
       trigger: "The legacy flag form selected multiple compile modes together.",
       command: "context compile scan --format json"
     },
+    {
+      code: "compile-planned-section-fragment-review",
+      severity: "info",
+      description: "Adjacent planned Sections under the same source heading may be over-fragmented.",
+      trigger: "The source-refs view sees a single-block planned group next to a larger or list-like planned group with the same owner, source, and heading path.",
+      command: "context compile context <slug> --view source-refs --format json"
+    },
     {
       code: "compile-section-kind-outside-plan",
       severity: "warning",
@@ -61282,6 +61394,20 @@ var init_agentHintRegistry = __esm(() => {
       trigger: "accept-safe-defaults sees items with duplicate, supersede, conflict, unknown-input, or confirmation blockers.",
       command: "context reconcile review"
     },
+    {
+      code: "prepare-candidates-index",
+      severity: "info",
+      description: "The default prepare candidates view is an index and requires item-level drilldown before judging relation.",
+      trigger: "context workflow show --payload prepare --view candidates is called without --item-id or --candidate-id.",
+      command: "context workflow show --payload prepare --view candidates --item-id <item-id> --unwrap --format json"
+    },
+    {
+      code: "reconcile-apply-consumes-ready-review",
+      severity: "error",
+      description: "reconcile apply was called with decisions input even though apply consumes the current ready review artifact.",
+      trigger: "context reconcile apply receives --decisions.",
+      command: "context reconcile apply --format json"
+    },
     {
       code: "example-code-prose-summary",
       severity: "warning",
@@ -61308,7 +61434,7 @@ var init_agentHintRegistry = __esm(() => {
       severity: "error",
       description: "A proposed write combines facts that should be split across separate evidence blocks.",
       trigger: "source_support candidates indicate multiple evidence blocks are needed for independently supported claims.",
-      command: "context compile draft-patch <slug> --input -"
+      command: "context compile cycle <slug> --input - --format json"
     }
   ];
   DETAILED_AGENT_HINT_BY_CODE = new Map(DETAILED_AGENT_HINTS.map((entry) => [entry.code, entry]));
@@ -62415,6 +62541,9 @@ function draftSessionError(message, hint = {}) {
     }]
   });
 }
+function compileDraftPatchSubmitCommand(options = {}) {
+  return options.submitCommand ?? "context compile cycle <slug> --input - --format json";
+}
 function cloneAction(action) {
   if (action.op === "supersede")
     return { ...action, new: { ...action.new } };
@@ -62502,9 +62631,79 @@ function compileDraftPatchCorrectShape() {
     }]
   }, null, 2);
 }
+function isCompileDraftPatchLikeInput(value) {
+  if (!isRecord29(value))
+    return false;
+  if (Array.isArray(value.operations))
+    return true;
+  if (typeof value.schema_version === "string" && value.schema_version.startsWith("compile.draft-patch."))
+    return true;
+  if (Array.isArray(value.patches))
+    return true;
+  return false;
+}
+function compileDraftPatchShapeIssues(value) {
+  const issues = [];
+  if (!isRecord29(value)) {
+    return [{
+      path: "$",
+      message: "compile draft patch payload must be an object",
+      expected: { operations: "non-empty array" },
+      current_value: value
+    }];
+  }
+  if (value.schema_version !== undefined && value.schema_version !== COMPILE_DRAFT_PATCH_SCHEMA_VERSION) {
+    issues.push({
+      path: "schema_version",
+      message: `schema_version may be omitted; when present it must be ${COMPILE_DRAFT_PATCH_SCHEMA_VERSION}`,
+      expected: COMPILE_DRAFT_PATCH_SCHEMA_VERSION,
+      current_value: value.schema_version
+    });
+  }
+  if (value.actions !== undefined) {
+    issues.push({
+      path: "actions",
+      message: "compile draft patch payload uses operations[]",
+      expected: "operations[]",
+      current_value: value.actions
+    });
+  }
+  if (value.patches !== undefined) {
+    issues.push({
+      path: "patches",
+      message: "compile draft patch payload uses operations[]",
+      expected: "operations[]",
+      current_value: value.patches
+    });
+  }
+  if (!Array.isArray(value.operations) || value.operations.length === 0) {
+    issues.push({
+      path: "operations",
+      message: "operations[] is required and must contain at least one patch operation",
+      expected: [{ op: "replace_action", action_id: "act_001", action: {} }],
+      current_value: value.operations
+    });
+  }
+  return issues;
+}
+function throwCompileDraftPatchShapeError(issues, options = {}) {
+  const first = issues[0];
+  const message = first?.message ?? "compile draft patch payload must use operations[]";
+  const command = compileDraftPatchSubmitCommand(options);
+  throw draftSessionError(message, {
+    command,
+    next_action: "Submit a compile-draft-patch payload with operations[] to the compile cycle command.",
+    correct_shape: compileDraftPatchCorrectShape(),
+    diagnostics: {
+      current_schema_version: COMPILE_DRAFT_PATCH_SCHEMA_VERSION,
+      command,
+      issues
+    }
+  });
+}
 function parsePatchOp(operation, path13) {
   if (operation.op === "replace") {
-    throw draftSessionError(`${path13}.op "replace" is JSON Patch style; use replace_action with action_id, not path`, {
+    throw draftSessionError(`${path13}.op must be replace_action|remove_action|add_action`, {
       next_action: "Run context compile draft-status <slug> --format json, copy the action_id for the action to revise, then submit replace_action with action.",
       command: "context schema compile-draft-patch",
       path: `${path13}.op`,
@@ -62542,19 +62741,16 @@ function assertPatchActionId(value, path13) {
     }
   });
 }
-function parseCompileDraftPatch(value) {
+function parseCompileDraftPatch(value, options = {}) {
+  const shapeIssues = compileDraftPatchShapeIssues(value);
+  if (shapeIssues.length > 0)
+    throwCompileDraftPatchShapeError(shapeIssues, options);
   if (!isRecord29(value))
     throw draftSessionError("compile draft patch must be an object");
-  if (value.patches !== undefined) {
-    throw draftSessionError("compile draft patch field patches is not supported; use operations[]");
-  }
-  if (value.schema_version !== undefined && value.schema_version !== COMPILE_DRAFT_PATCH_SCHEMA_VERSION) {
-    throw draftSessionError(`schema_version must be ${COMPILE_DRAFT_PATCH_SCHEMA_VERSION}`);
-  }
-  if (!Array.isArray(value.operations) || value.operations.length === 0) {
-    throw draftSessionError("compile draft patch must contain non-empty operations[]");
-  }
-  const operations = value.operations.map((operation, index2) => {
+  const operationsInput = value.operations;
+  if (!Array.isArray(operationsInput))
+    throwCompileDraftPatchShapeError(compileDraftPatchShapeIssues(value), options);
+  const operations = operationsInput.map((operation, index2) => {
     const path13 = `operations[${index2}]`;
     if (!isRecord29(operation))
       throw draftSessionError(`${path13} must be an object`);
@@ -63734,6 +63930,24 @@ function filterCurrentDraftCandidates(input) {
   }));
   return { candidates, filtered: input.candidates.length - candidates.length };
 }
+function sameCycleAppliedSectionIds(input) {
+  if (input.since === undefined)
+    return new Set;
+  return new Set(input.records.flatMap((record) => {
+    const node3 = record.node ?? record.target?.node;
+    const sectionId = record.target?.section_id;
+    if (record.mode !== "compile" || node3 !== input.node || typeof sectionId !== "string" || compareTemporal(record.applied_at, input.since) !== 1) {
+      return [];
+    }
+    return [sectionId];
+  }));
+}
+function filterSameCycleAppliedCandidates(input) {
+  if (input.sectionIds.size === 0)
+    return { candidates: [...input.candidates], filtered: 0 };
+  const candidates = input.candidates.filter((candidate) => !input.sectionIds.has(candidate.section_id));
+  return { candidates, filtered: input.candidates.length - candidates.length };
+}
 function sectionOutputSnapshot(nodeSlug, section) {
   return {
     node: nodeSlug,
@@ -63963,6 +64177,11 @@ async function prepareCompileReconcileContext(input) {
   const challengeReceipt = recordedChallenges(challengePayloads);
   const { index: index2 } = await prepareRetrieval(input);
   const ledger = await readSemanticLedger(input.ctxDir);
+  const sameCycleAppliedSections = sameCycleAppliedSectionIds({
+    records: ledger.document.decisions,
+    node: node3,
+    ...input.workflowStartedAt !== undefined ? { since: input.workflowStartedAt } : {}
+  });
   const restoredArchiveCandidates = await restoredArchiveCandidatesForNode(input.ctxDir, node3);
   const sources = await loadSources(input.ctxDir);
   const sourceById = new Map(sources.sources.map((source2) => [source2.id, source2]));
@@ -64031,6 +64250,10 @@ async function prepareCompileReconcileContext(input) {
       activeSectionIds,
       proposed: temporal.proposed
     });
+    const sameCycleFiltered = filterSameCycleAppliedCandidates({
+      candidates: draftFiltered.candidates,
+      sectionIds: sameCycleAppliedSections
+    });
     resolvedItems.push({
       item_id: itemId,
       ...typeof action.action_id === "string" ? { action_id: action.action_id, draft_action_id: action.action_id } : {},
@@ -64040,11 +64263,16 @@ async function prepareCompileReconcileContext(input) {
       proposed: temporal.proposed,
       ...defaultDecision !== undefined ? { default_decision: defaultDecision } : {},
       ...target !== undefined ? { target } : {},
-      candidates: stripCompileRelationHints(draftFiltered.candidates),
+      candidates: stripCompileRelationHints(sameCycleFiltered.candidates),
       retrieval: draftFiltered.filtered > 0 ? {
         ...recalled.retrieval,
-        returned_candidates: Math.max(0, recalled.retrieval.returned_candidates - draftFiltered.filtered),
-        self_draft_candidates_filtered: draftFiltered.filtered
+        returned_candidates: Math.max(0, recalled.retrieval.returned_candidates - draftFiltered.filtered - sameCycleFiltered.filtered),
+        self_draft_candidates_filtered: draftFiltered.filtered,
+        ...sameCycleFiltered.filtered > 0 ? { same_cycle_candidates_filtered: sameCycleFiltered.filtered } : {}
+      } : sameCycleFiltered.filtered > 0 ? {
+        ...recalled.retrieval,
+        returned_candidates: Math.max(0, recalled.retrieval.returned_candidates - sameCycleFiltered.filtered),
+        same_cycle_candidates_filtered: sameCycleFiltered.filtered
       } : recalled.retrieval,
       previous_decisions: recentSemanticLedgerRecords(ledger.document.decisions, (record) => record.mode === "compile" && (record.node === node3 || record.target?.node === node3)),
       ...evidence !== undefined ? { evidence } : {},
@@ -64108,6 +64336,7 @@ var init_prepareCompile = __esm(() => {
   init_compileDraftReferenceHints();
   init_compileNode();
   init_sectionFingerprints();
+  init_temporal();
   init_sources();
   init_shared();
   init_evidence();
@@ -64512,7 +64741,8 @@ async function prepareReconcileContext(input) {
         ...input.node !== undefined ? { node: input.node } : {},
         ...input.draftPath !== undefined ? { draftPath: input.draftPath } : {},
         ...input.draft !== undefined ? { draft: input.draft } : {},
-        ...input.draftDigest !== undefined ? { draftDigest: input.draftDigest } : {}
+        ...input.draftDigest !== undefined ? { draftDigest: input.draftDigest } : {},
+        ...input.workflowStartedAt !== undefined ? { workflowStartedAt: input.workflowStartedAt } : {}
       });
     }
     case "drop": {
@@ -66193,6 +66423,44 @@ var defaultRunner = (args2) => new Promise((resolve6, reject) => {
     resolve6({ stdout, stderr, exitCode: code3 });
   });
 });
+var docsFetchCapabilitiesCache = new WeakMap;
+async function detectDocsFetchCapabilities(runner) {
+  const result = await runner(["docs", "+fetch", "--help"]).catch(() => ({
+    stdout: "",
+    stderr: "",
+    exitCode: 1
+  }));
+  const help = `${result.stdout}
+${result.stderr}`;
+  const supportsApiVersion = result.exitCode === 0 && /\s--api-version\b/u.test(help);
+  return {
+    apiVersion: supportsApiVersion ? "v2" : "v1",
+    supportsDocFormatMarkdown: result.exitCode === 0 && /\s--doc-format\b/u.test(help)
+  };
+}
+function resolveDocsFetchPlan(requested, runner) {
+  if (requested === "v1" || requested === "v2")
+    return Promise.resolve({ apiVersion: requested });
+  let capabilitiesPromise = docsFetchCapabilitiesCache.get(runner);
+  if (capabilitiesPromise === undefined) {
+    capabilitiesPromise = detectDocsFetchCapabilities(runner);
+    docsFetchCapabilitiesCache.set(runner, capabilitiesPromise);
+  }
+  return capabilitiesPromise.then((capabilities) => ({
+    apiVersion: capabilities.apiVersion,
+    ...capabilities.apiVersion === "v2" && capabilities.supportsDocFormatMarkdown ? { docFormat: "markdown" } : {}
+  }));
+}
+function docsFetchFailureMessage(stderr, apiVersion) {
+  const trimmed = stderr.trim();
+  const base = `${LARK_BIN} docs +fetch failed (auth / permission / unsupported doc type): ${trimmed}`;
+  const mentionsV2 = /api-version|--api-version|v2|deprecated|lark-cli update/iu.test(stderr);
+  if (apiVersion === "v1" && mentionsV2) {
+    return `${base}
+Detected docs API v2 guidance from lark-cli. Upgrade @larksuite/cli and run \`lark-cli update\`; newer docs +fetch supports \`--api-version v2\`.`;
+  }
+  return base;
+}
 function parseDocsFetchPayload(stdout) {
   const trimmed = stdout.trim();
   if (trimmed.length === 0) {
@@ -66213,25 +66481,144 @@ function parseDocsFetchPayload(stdout) {
   }
   return envelope;
 }
+function stringValue(value) {
+  return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+function decodeXmlEntities(value) {
+  return value.replace(/&lt;/gu, "<").replace(/&gt;/gu, ">").replace(/&quot;/gu, '"').replace(/&#39;/gu, "'").replace(/&apos;/gu, "'").replace(/&amp;/gu, "&");
+}
+function xmlInlineText(xml) {
+  const withLinks = xml.replace(/<a\b[^>]*\bhref=(["'])(.*?)\1[^>]*>([\s\S]*?)<\/a>/giu, (_match, _quote, href, label) => {
+    const text5 = xmlInlineText(label);
+    return text5.length > 0 ? `[${text5}](${decodeXmlEntities(href)})` : decodeXmlEntities(href);
+  });
+  return decodeXmlEntities(withLinks.replace(/<!\[CDATA\[([\s\S]*?)\]\]>/gu, "$1").replace(/<br\s*\/?>/giu, `
+`).replace(/<[^>]+>/gu, "").replace(/[ \t\r\n]+/gu, " ").trim());
+}
+function renderXmlTable(tableXml) {
+  const rows = [...tableXml.matchAll(/<(?:tr|table_row|table-row)\b[^>]*>([\s\S]*?)<\/(?:tr|table_row|table-row)>/giu)].map((row) => {
+    const rowXml = row[1] ?? "";
+    return [...rowXml.matchAll(/<(?:th|td|table_cell|table-cell)\b[^>]*>([\s\S]*?)<\/(?:th|td|table_cell|table-cell)>/giu)].map((cell) => xmlInlineText(cell[1] ?? "").replace(/\|/gu, "\\|"));
+  }).filter((cells) => cells.length > 0);
+  if (rows.length === 0)
+    return xmlInlineText(tableXml);
+  const width = Math.max(...rows.map((row) => row.length));
+  const normalized = rows.map((row) => [...row, ...Array.from({ length: width - row.length }, () => "")]);
+  const header = normalized[0] ?? [];
+  const separator = header.map(() => "---");
+  const bodyRows = normalized.slice(1);
+  return [header, separator, ...bodyRows].map((row) => `| ${row.join(" | ")} |`).join(`
+`);
+}
+function renderDocxXmlToMarkdown(xml) {
+  const tableBlocks = [];
+  const withoutTables = xml.replace(/<table\b[^>]*>[\s\S]*?<\/table>/giu, (tableXml) => {
+    const marker = `
+
+@@C4A_DOCX_TABLE_${tableBlocks.length}@@
+
+`;
+    tableBlocks.push(renderXmlTable(tableXml));
+    return marker;
+  });
+  const titleMatch = /<title\b[^>]*>([\s\S]*?)<\/title>/iu.exec(withoutTables);
+  const title = titleMatch ? xmlInlineText(titleMatch[1] ?? "") : undefined;
+  let body2 = withoutTables.replace(/<\?xml[\s\S]*?\?>/giu, "").replace(/<title\b[^>]*>[\s\S]*?<\/title>/giu, "").replace(/<h([1-6])\b[^>]*>([\s\S]*?)<\/h\1>/giu, (_match, level, content3) => {
+    const text5 = xmlInlineText(content3);
+    return text5.length > 0 ? `
+
+${"#".repeat(Number(level))} ${text5}
+
+` : `
+
+`;
+  }).replace(/<heading\b[^>]*\blevel=(["'])([1-6])\1[^>]*>([\s\S]*?)<\/heading>/giu, (_match, _quote, level, content3) => {
+    const text5 = xmlInlineText(content3);
+    return text5.length > 0 ? `
+
+${"#".repeat(Number(level))} ${text5}
+
+` : `
+
+`;
+  }).replace(/<(?:p|paragraph|div|section)\b[^>]*>/giu, `
+
+`).replace(/<\/(?:p|paragraph|div|section)>/giu, `
+
+`).replace(/<li\b[^>]*>/giu, `
+- `).replace(/<\/li>/giu, `
+`).replace(/<br\s*\/?>/giu, `
+`).replace(/<a\b[^>]*\bhref=(["'])(.*?)\1[^>]*>([\s\S]*?)<\/a>/giu, (_match, _quote, href, label) => {
+    const text5 = xmlInlineText(label);
+    return text5.length > 0 ? `[${text5}](${decodeXmlEntities(href)})` : decodeXmlEntities(href);
+  }).replace(/<[^>]+>/gu, "").replace(/@@C4A_DOCX_TABLE_(\d+)@@/gu, (_match, index2) => `
+
+${tableBlocks[Number(index2)] ?? ""}
+
+`);
+  body2 = decodeXmlEntities(body2).split(/\n/gu).map((line) => line.trimEnd()).join(`
+`).replace(/\n{3,}/gu, `
+
+`).trim();
+  return [title !== undefined && title.length > 0 ? `# ${title}` : "", body2].filter((part) => part.length > 0).join(`
+
+`);
+}
+function payloadShapeSummary(payload) {
+  const keys = Object.keys(payload).sort().join(", ") || "(none)";
+  const document4 = payload.document;
+  if (document4 && typeof document4 === "object") {
+    const documentKeys = Object.keys(document4).sort().join(", ") || "(none)";
+    return `top-level keys: ${keys}; document keys: ${documentKeys}`;
+  }
+  return `top-level keys: ${keys}`;
+}
+function extractDocsFetchContent(payload) {
+  const document4 = payload.document && typeof payload.document === "object" ? payload.document : undefined;
+  const title = stringValue(payload.title) ?? stringValue(document4?.title);
+  const markdown = stringValue(payload.markdown) ?? stringValue(document4?.markdown);
+  const withTitle = (result) => title === undefined ? result : { ...result, title };
+  if (markdown !== undefined)
+    return withTitle({ body: markdown, recognizedShape: true });
+  const documentContent = stringValue(document4?.content);
+  if (documentContent !== undefined) {
+    const body2 = /^\s*</u.test(documentContent) ? renderDocxXmlToMarkdown(documentContent) : documentContent;
+    return withTitle({ body: body2, recognizedShape: true });
+  }
+  return withTitle({
+    recognizedShape: payload.title !== undefined || payload.markdown !== undefined || document4?.title !== undefined || document4?.markdown !== undefined || document4?.content !== undefined
+  });
+}
 async function fetchFeishuDoc(input, runner = defaultRunner) {
   const chunks = [];
   let title;
+  let unsupportedShape;
+  const docsFetchPlan = await resolveDocsFetchPlan(input.docsApiVersion ?? "auto", runner);
   let nextOffset;
   for (let page = 0;page < MAX_FETCH_PAGES; page++) {
     const args2 = ["docs", "+fetch", "--doc", input.url, "--format", "json"];
+    if (docsFetchPlan.apiVersion === "v2") {
+      args2.push("--api-version", "v2");
+    }
+    if (docsFetchPlan.docFormat === "markdown") {
+      args2.push("--doc-format", "markdown");
+    }
     if (nextOffset !== undefined) {
       args2.push("--offset", String(nextOffset));
     }
     const result = await runner(args2);
     if (result.exitCode !== 0) {
-      throw new LarkCliError(`${LARK_BIN} docs +fetch failed (auth / permission / unsupported doc type): ${result.stderr.trim()}`, result.exitCode, result.stderr);
+      throw new LarkCliError(docsFetchFailureMessage(result.stderr, docsFetchPlan.apiVersion), result.exitCode, result.stderr);
     }
     const payload = parseDocsFetchPayload(result.stdout);
-    if (page === 0 && typeof payload.title === "string") {
-      title = payload.title;
+    const extracted = extractDocsFetchContent(payload);
+    if (page === 0 && extracted.title !== undefined) {
+      title = extracted.title;
     }
-    if (typeof payload.markdown === "string" && payload.markdown.length > 0) {
-      chunks.push(payload.markdown);
+    if (extracted.body !== undefined && extracted.body.length > 0) {
+      chunks.push(extracted.body);
+    } else if (!extracted.recognizedShape && unsupportedShape === undefined) {
+      unsupportedShape = payloadShapeSummary(payload);
     }
     if (payload.has_more !== true)
       break;
@@ -66247,6 +66634,9 @@ async function fetchFeishuDoc(input, runner = defaultRunner) {
 
 `);
   if (body2.trim().length === 0 && (title === undefined || title.length === 0)) {
+    if (unsupportedShape !== undefined) {
+      throw new LarkCliError(`${LARK_BIN} docs +fetch returned an unsupported payload shape (${unsupportedShape}). Expected data.markdown or data.document.content; this is a format adapter issue, not a permission error.`, 0, "");
+    }
     throw new LarkCliError("document is empty — it may not exist or you lack permission", 0, "");
   }
   if (title !== undefined && title.length > 0 && !/^#\s/.test(body2)) {
@@ -68516,7 +68906,15 @@ function projectedWorkspaceFileFromInput(ctxDir, filePath, input) {
   }
   return { filePath, relativePath, root: root2 };
 }
-function attachProjectedContainsLists(ctxDir, rendered) {
+function isOwnedOnlyByCurrentCodeSource(node3, sourceIds) {
+  if (node3 === undefined || node3.node.sources.length === 0)
+    return false;
+  return node3.node.sources.every((source2) => sourceIds.has(sourceIdWithoutVersion(source2)));
+}
+async function attachProjectedContainsLists(ctxDir, rendered, sourceIds) {
+  const existingFiles = await readWorkspaceNodeFiles(ctxDir);
+  const existingNodesBySlug = new Map(flattenWorkspaceNodes(existingFiles).map((node3) => [node3.parsed.node.id, node3.parsed]));
+  const existingContainsByParent = new Map(existingFiles.map((file) => [file.root.node.id, file.root.containsList]));
   const containsByParent = new Map;
   for (const [slug, item] of rendered) {
     if (!slug.includes("/"))
@@ -68537,13 +68935,23 @@ function attachProjectedContainsLists(ctxDir, rendered) {
     ]);
   }
   return new Map([...rendered.entries()].map(([slug, item]) => {
-    const entries = containsByParent.get(slug);
-    if (entries === undefined || entries.length === 0)
+    const generatedEntries = containsByParent.get(slug) ?? [];
+    const existingEntries = existingContainsByParent.get(slug) ?? item.input.containsList ?? [];
+    if (existingEntries.length === 0 && generatedEntries.length === 0)
       return [slug, item];
+    const merged = new Map;
+    for (const entry of existingEntries) {
+      const existingNode = existingNodesBySlug.get(entry.slug);
+      if (isOwnedOnlyByCurrentCodeSource(existingNode, sourceIds))
+        continue;
+      merged.set(entry.slug, entry);
+    }
+    for (const entry of generatedEntries)
+      merged.set(entry.slug, entry);
     return [slug, {
       input: {
         ...item.input,
-        containsList: [...entries].sort((left, right) => left.slug.localeCompare(right.slug))
+        containsList: sortContainsEntries([...merged.values()])
       }
     }];
   }));
@@ -68557,7 +68965,7 @@ async function projectedWorkspaceFiles(ctxDir, rendered) {
   return [...byPath.values()];
 }
 async function projectedRenderContext(plan) {
-  const renderedWithContains = attachProjectedContainsLists(plan.state.ctxDir, plan.rendered);
+  const renderedWithContains = await attachProjectedContainsLists(plan.state.ctxDir, plan.rendered, new Set(plan.sources));
   const [files, currentEdges, currentExternals, renderConfig] = await Promise.all([
     projectedWorkspaceFiles(plan.state.ctxDir, renderedWithContains),
     loadKnowledgeGraphEdges(plan.state.ctxDir),
@@ -68622,7 +69030,7 @@ async function renderCodeProjectionPlanFromState(state) {
     state
   };
   const renderContext = await projectedRenderContext(initialPlan);
-  const renderedWithContains = attachProjectedContainsLists(state.ctxDir, rendered);
+  const renderedWithContains = await attachProjectedContainsLists(state.ctxDir, rendered, new Set(initialPlan.sources));
   const nodes = [];
   for (const item of pending) {
     const input = renderedWithContains.get(item.slug)?.input ?? item.input;
@@ -80329,8 +80737,8 @@ function reviewAgentHints(input) {
       code: "split-by-evidence-blocks",
       severity: "error",
       message: `${splitByEvidenceBlockCount} unsupported decision(s) appear to combine facts from multiple evidence blocks.`,
-      next_action: "Split the proposed content into one draft action per source_support.evidence_block_candidates[] entry, then rerun prepare/review. If the draft session is available, patch only the affected action with context compile draft-patch <slug> --input -.",
-      command: "context compile draft-patch <slug> --input -"
+      next_action: "Split the proposed content into one draft action per source_support.evidence_block_candidates[] entry, then rerun prepare/review. If the draft session is available, submit a compile-draft-patch payload through context compile cycle <slug> --input - --format json.",
+      command: "context compile cycle <slug> --input - --format json"
     });
   }
   const contentShapeIssueCount = input.issues.filter((issue2) => issue2.severity === "error" && issue2.path.includes(".proposed") && issue2.path.endsWith(".content") && issue2.message.startsWith("content must")).length;
@@ -80824,7 +81232,7 @@ function assertDelegatedDecisionsAllowed(input) {
 
 // src/reconcile/reviewSourceSupport.ts
 init_sourceSupport();
-var FENCED_CODE_RE = /(^|\n)\s*(```|~~~)/u;
+var FENCED_CODE_RE2 = /(^|\n)\s*(```|~~~)/u;
 function preparedSupportContentMatches(input) {
   return typeof input.item?.proposed?.content === "string" && input.item.proposed.content === input.content || typeof input.item?.default_decision?.proposed?.content === "string" && input.item.default_decision.proposed.content === input.content;
 }
@@ -81040,9 +81448,9 @@ function needsExampleDetailPreservationWarning(input) {
     return false;
   if (supportKind(input.decision, input.item) !== "example")
     return false;
-  if (!FENCED_CODE_RE.test(citedTextForDecision2(input.decision, input.item)))
+  if (!FENCED_CODE_RE2.test(citedTextForDecision2(input.decision, input.item)))
     return false;
-  return !FENCED_CODE_RE.test(input.decision.proposed?.content ?? "");
+  return !FENCED_CODE_RE2.test(input.decision.proposed?.content ?? "");
 }
 function exampleDetailPreservationWarning(input) {
   return {
@@ -83391,6 +83799,26 @@ function prepareCandidateRows(context, options = {}) {
   }
   return rows;
 }
+function candidateIndexRows(context) {
+  return context.items.map((item) => ({
+    item_id: item.item_id,
+    ...item.action_id !== undefined ? { action_id: item.action_id } : {},
+    ...item.action_op_index !== undefined ? { action_op_index: item.action_op_index } : {},
+    ...item.action_selector !== undefined ? { action_selector: item.action_selector } : {},
+    status: item.status ?? "pending",
+    target: item.target,
+    candidates: item.candidates.length,
+    candidate_count: item.candidates.length,
+    ...item.source_support !== undefined ? {
+      source_support: {
+        verdict: item.source_support.verdict,
+        missing_hard_terms_count: item.source_support.missing_hard_terms.length,
+        missing_content_terms_count: item.source_support.missing_content_terms.length
+      }
+    } : {},
+    ...item.candidates.length > 0 ? { candidate_detail_command: prepareCandidateDetailCommand(item.item_id) } : {}
+  }));
+}
 function candidateViewHowToExplore(options, tokenBudget) {
   const baseCommand = [
     "context workflow show --payload prepare --view candidates",
@@ -83409,6 +83837,35 @@ function candidateViewHowToExplore(options, tokenBudget) {
   ];
 }
 function projectPrepareCandidates(context, options = {}) {
+  if (options.itemId === undefined && options.candidateId === undefined) {
+    const rows2 = candidateIndexRows(context);
+    const page = paginate(rows2, options);
+    return {
+      schema_version: context.schema_version,
+      mode: context.mode,
+      workspace: context.workspace,
+      target: context.target,
+      view: "candidates",
+      mode_hint: "index",
+      filters: {},
+      counts: {
+        items: context.items.length,
+        candidates: context.items.reduce((sum, item) => sum + item.candidates.length, 0),
+        items_with_candidates: context.items.filter((item) => item.candidates.length > 0).length,
+        shown: page.items.length
+      },
+      item_id_field: "item_id",
+      items: page.items,
+      ...page.page !== undefined ? { page: page.page } : {},
+      agent_hints: [{
+        code: "prepare-candidates-index",
+        severity: "info",
+        message: "Default candidates view lists prepare items and candidate counts only.",
+        next_action: "Use candidate_detail_command or --item-id <item-id> to inspect one item's candidate Section content before judging relation.",
+        command: "context workflow show --payload prepare --view candidates --item-id <item-id> --unwrap --format json"
+      }]
+    };
+  }
   const tokenBudget = parseTokenBudgetOption(options.tokenBudget);
   const rows = prepareCandidateRows(context, options);
   return {
@@ -83499,6 +83956,40 @@ function sourceSupportMissingTerms2(support) {
     }))
   };
 }
+function sourceSupportSummary(support) {
+  return {
+    verdict: support.verdict,
+    ...support.reason_code !== undefined ? { reason_code: support.reason_code } : {},
+    matched: support.matched_term_count,
+    total: support.content_term_count,
+    required: support.required_term_count,
+    missing_hard_terms_count: support.missing_hard_terms.length,
+    missing_content_terms_count: support.missing_content_terms.length,
+    ...support.missing_terms !== undefined ? { missing_terms_count: support.missing_terms.length } : {},
+    ...support.evidence_block_candidates !== undefined ? { evidence_block_candidates: support.evidence_block_candidates.length } : {},
+    ...support.evidence_block_source_ref !== undefined ? { evidence_block_source_ref: support.evidence_block_source_ref } : {},
+    ...support.evidence_block_line_range !== undefined ? { evidence_block_line_range: support.evidence_block_line_range } : {},
+    ...support.merged_from_source_refs !== undefined ? { merged_source_ref_count: support.merged_from_source_refs.length } : {},
+    ...support.merge_kind !== undefined ? { merge_kind: support.merge_kind } : {}
+  };
+}
+function sourceSupportDetail(support, projection) {
+  if (projection === "summary")
+    return sourceSupportSummary(support);
+  return {
+    verdict: support.verdict,
+    ...support.reason_code !== undefined ? { reason_code: support.reason_code } : {},
+    matched: support.matched_term_count,
+    total: support.content_term_count,
+    required: support.required_term_count,
+    ...sourceSupportFailureTerms(support),
+    ...sourceSupportMissingTerms2(support),
+    ...support.evidence_block_source_ref !== undefined ? { evidence_block_source_ref: support.evidence_block_source_ref } : {},
+    ...support.evidence_block_line_range !== undefined ? { evidence_block_line_range: support.evidence_block_line_range } : {},
+    ...support.merged_from_source_refs !== undefined ? { merged_from_source_refs: support.merged_from_source_refs } : {},
+    ...support.merge_kind !== undefined ? { merge_kind: support.merge_kind } : {}
+  };
+}
 function nextDecisionsTemplate(context) {
   return context.next_decisions_template ?? {
     schema_version: context.schema_version,
@@ -83630,6 +84121,8 @@ function requirePrepareIssueStatus(value) {
 function compactPrepareItem(item, input = {}) {
   const proposed = isRecord35(item.proposed) ? item.proposed : {};
   const safeDefaultBlockers = computeSafeDefaultBlockers(item, input.mode ?? "compile");
+  const candidates = item.candidates.length;
+  const sourceSupportProjection = input.sourceSupportProjection ?? "summary";
   return {
     item_id: item.item_id,
     ...item.action_id !== undefined ? { action_id: item.action_id } : {},
@@ -83647,21 +84140,13 @@ function compactPrepareItem(item, input = {}) {
     ...item.default_decision !== undefined ? { default_decision: { relation: item.default_decision.relation, action: item.default_decision.action } } : {},
     ...safeDefaultBlockers.length > 0 ? { safe_default_blockers: safeDefaultBlockers } : {},
     ...item.source_support !== undefined ? {
-      source_support: {
-        verdict: item.source_support.verdict,
-        matched: item.source_support.matched_term_count,
-        total: item.source_support.content_term_count,
-        required: item.source_support.required_term_count,
-        ...sourceSupportFailureTerms(item.source_support),
-        ...sourceSupportMissingTerms2(item.source_support),
-        ...item.source_support.evidence_block_source_ref !== undefined ? { evidence_block_source_ref: item.source_support.evidence_block_source_ref } : {},
-        ...item.source_support.merged_from_source_refs !== undefined ? { merged_from_source_refs: item.source_support.merged_from_source_refs } : {},
-        ...item.source_support.merge_kind !== undefined ? { merge_kind: item.source_support.merge_kind } : {}
-      }
+      source_support: sourceSupportDetail(item.source_support, sourceSupportProjection)
     } : {},
     ...item.temporal_prior !== undefined ? { temporal_prior: item.temporal_prior } : {},
-    candidates: item.candidates.length,
-    ...item.candidates.length > 0 ? {
+    candidates,
+    candidate_count: candidates,
+    item_detail_command: `context workflow show --payload prepare --view issues --item-id ${item.item_id} --unwrap --format json`,
+    ...candidates > 0 ? {
       candidate_detail_command: prepareCandidateDetailCommand(item.item_id)
     } : {},
     previous_decisions: item.previous_decisions.length,
@@ -83670,6 +84155,7 @@ function compactPrepareItem(item, input = {}) {
         profile: item.retrieval.profile,
         returned_candidates: item.retrieval.returned_candidates,
         ...item.retrieval.self_draft_candidates_filtered !== undefined ? { self_draft_candidates_filtered: item.retrieval.self_draft_candidates_filtered } : {},
+        ...item.retrieval.same_cycle_candidates_filtered !== undefined ? { same_cycle_candidates_filtered: item.retrieval.same_cycle_candidates_filtered } : {},
         truncated: item.retrieval.truncated,
         ...item.retrieval.blocked !== undefined ? { blocked: item.retrieval.blocked } : {},
         ...item.retrieval.blocked_reason !== undefined ? { blocked_reason: item.retrieval.blocked_reason } : {}
@@ -83682,7 +84168,10 @@ function issuePrepareItem(item, input = {}) {
   const issueStatus = prepareIssueStatus(item);
   if (issueStatus === undefined)
     return null;
-  const compact2 = compactPrepareItem(item, input);
+  const compact2 = compactPrepareItem(item, {
+    ...input,
+    sourceSupportProjection: "issue"
+  });
   if (support === undefined)
     return { ...compact2, issue_status: issueStatus };
   return {
@@ -84747,7 +85236,7 @@ function registerReconcileCommand(program2) {
       }
     });
   });
-  reconcile.command("apply").description("Apply semantic decisions to active knowledge and record the ledger after verify").option("--format <format>", "json | yaml", "json").addHelpText("after", [
+  reconcile.command("apply").description("Apply semantic decisions to active knowledge and record the ledger after verify").option("--format <format>", "json | yaml", "json").addOption(new Option("--decisions <path>", "invalid for apply; apply consumes the ready review artifact").hideHelp()).addHelpText("after", [
     "",
     "Apply consumes the current workflow scope's unique ready immutable review artifact.",
     "Do not pass hand-edited decisions or review-output files to apply.",
@@ -84760,6 +85249,18 @@ function registerReconcileCommand(program2) {
       stateRequirement: "state-required",
       flags: {},
       run: async (ctx) => {
+        if (typeof options.decisions === "string") {
+          throw new ContextError(ExitCode.UserError, "reconcile apply does not accept --decisions", {
+            category: ErrorCategory.UserInputInvalid,
+            agent_hints: [{
+              code: "reconcile-apply-consumes-ready-review",
+              severity: "error",
+              message: "context reconcile apply reads the current workflow's ready immutable review artifact; it does not read semantic decisions from stdin.",
+              next_action: "Run plain context reconcile apply for the current workflow scope.",
+              command: "context reconcile apply --format json"
+            }]
+          });
+        }
         const ctxDir = requireWorkspace2(ctx.ctxDir, "reconcile apply");
         const currentArtifact = await readUniqueReadyReviewArtifactForCurrent(ctxDir);
         const currentWorkflow = await readReadyCurrentWorkflow(ctxDir, "reconcile apply");
@@ -86757,6 +87258,14 @@ function activeContentSourceIds(value) {
 function sourcePlanById(value) {
   return new Map(sourcePlanRows(value).map((source2) => [source2.source_id, source2]));
 }
+function resolveSourceBundleSourceId(value, sourceIdOrAlias) {
+  if (sourceIdOrAlias === undefined)
+    return;
+  const plans = sourcePlanRows(value);
+  if (plans.some((source2) => source2.source_id === sourceIdOrAlias))
+    return sourceIdOrAlias;
+  return plans.find((source2) => source2.source_alias === sourceIdOrAlias)?.source_id ?? sourceIdOrAlias;
+}
 function sourceBundleCommand(record, options = {}, format = "text") {
   const parts = ["--view source-bundle"];
   if (options.sourceId !== undefined)
@@ -86771,19 +87280,16 @@ function sourceBundleCommand(record, options = {}, format = "text") {
     parts.push(`--page-size ${shellQuote(options.pageSize)}`);
   if (options.pageToken !== undefined)
     parts.push(`--page-token ${shellQuote(options.pageToken)}`);
-  if (options.tokenBudget !== undefined)
-    parts.push(`--token-budget ${shellQuote(options.tokenBudget)}`);
-  if (options.budget !== undefined)
-    parts.push(`--budget ${shellQuote(options.budget)}`);
   return workflowPayloadShowCommand(record, [parts.join(" "), "--unwrap", `--format ${format}`]);
 }
 function sourceBundleScopeBlocks(value, options) {
   const activeIds = activeAlignSourceIds(value);
+  const selectedSourceId = resolveSourceBundleSourceId(value, options.sourceId);
   const windows = alignWindowRows(value);
   const selectedWindows = typeof options.windowId === "string" ? resolveWindowSelectors(windows, options.windowId) : [];
   const windowBlockIds = selectedWindows.length === 0 ? undefined : new Set(selectedWindows.flatMap((window2) => window2.block_ids));
   const range = parseOrdinalRange(options.range);
-  return alignBlockRows(value).filter((block) => typeof block.source_id === "string" && activeIds.has(block.source_id) && (options.sourceId === undefined || block.source_id === options.sourceId) && (windowBlockIds === undefined || typeof block.block_id === "string" && windowBlockIds.has(block.block_id)) && headingMatches(block.heading_path, options.heading) && (range === undefined || block.ordinal_in_source >= range.start && block.ordinal_in_source <= range.end));
+  return alignBlockRows(value).filter((block) => typeof block.source_id === "string" && activeIds.has(block.source_id) && (selectedSourceId === undefined || block.source_id === selectedSourceId) && (windowBlockIds === undefined || typeof block.block_id === "string" && windowBlockIds.has(block.block_id)) && headingMatches(block.heading_path, options.heading) && (range === undefined || block.ordinal_in_source >= range.start && block.ordinal_in_source <= range.end));
 }
 function estimateSourceBundleBlocksBudget(blocks) {
   const sourceIds = new Set(blocks.map((block) => block.source_id).filter((sourceId) => typeof sourceId === "string"));
@@ -86836,6 +87342,25 @@ function withSourceBundleRecommendedPageSize(value, options) {
   const pageSize = sourceBundleRecommendedPageSize(value, options);
   return pageSize === undefined ? options : { ...options, pageSize };
 }
+function sourceBundleScopeFitsBudget(value, options) {
+  const budget = estimateSourceBundleBlocksBudget(sourceBundleScopeBlocks(value, options));
+  return budget.safe === true;
+}
+function firstSourceWindowId(value, sourceId) {
+  if (sourceId === undefined)
+    return;
+  const first = alignWindowRows(value).filter((window2) => window2.source_id === sourceId && typeof window2.window_id === "string").sort((left, right) => (typeof right.token_estimate === "number" ? right.token_estimate : 0) - (typeof left.token_estimate === "number" ? left.token_estimate : 0))[0];
+  return typeof first?.window_id === "string" ? first.window_id : undefined;
+}
+function sourceBundlePreferredScopeForSource(value, sourceId) {
+  const sourceScope = { sourceId };
+  if (sourceBundleScopeFitsBudget(value, sourceScope))
+    return sourceScope;
+  const windowId = firstSourceWindowId(value, sourceId);
+  if (windowId !== undefined)
+    return withSourceBundleRecommendedPageSize(value, { windowId });
+  return withSourceBundleRecommendedPageSize(value, sourceScope);
+}
 function sourceBundleBudget(sourcePlans) {
   const tokenEstimate4 = sourcePlans.reduce((sum, source2) => sum + source2.bundle_token_estimate, 0);
   const blockCount = sourcePlans.reduce((sum, source2) => sum + source2.block_count, 0);
@@ -86865,17 +87390,13 @@ function routeKindForReadPlan(value, bundleSafe, firstSource) {
   if (routeMode === "batched_review_required") {
     if (firstSource === undefined)
       return "batched_route";
-    return firstSource.window_count > 1 ? "window_drilldown" : "source_drilldown";
+    return sourceBundleScopeFitsBudget(value, { sourceId: firstSource.source_id }) ? "source_drilldown" : "window_drilldown";
   }
   if (bundleSafe)
     return "source_bundle";
-  return firstSource !== undefined && firstSource.window_count > 1 && firstSource.largest_window_tokens < firstSource.token_estimate ? "window_drilldown" : "source_drilldown";
-}
-function firstWindowId(value, sourceId) {
-  if (sourceId === undefined)
-    return;
-  const first = alignWindowRows(value).filter((window2) => window2.source_id === sourceId && typeof window2.window_id === "string").sort((left, right) => (typeof right.token_estimate === "number" ? right.token_estimate : 0) - (typeof left.token_estimate === "number" ? left.token_estimate : 0))[0];
-  return typeof first?.window_id === "string" ? first.window_id : undefined;
+  if (firstSource === undefined)
+    return "source_drilldown";
+  return sourceBundleScopeFitsBudget(value, { sourceId: firstSource.source_id }) ? "source_drilldown" : "window_drilldown";
 }
 function readPlanNextAction(record, value, routeKind, firstSource) {
   if (routeKind === "no_align_needed") {
@@ -86894,11 +87415,10 @@ function readPlanNextAction(record, value, routeKind, firstSource) {
     };
   }
   if (routeKind === "window_drilldown") {
-    const windowId = firstWindowId(value, firstSource?.source_id);
-    if (windowId !== undefined) {
+    if (firstSource !== undefined) {
       return {
         kind: "show_view",
-        command: sourceBundleCommand(record, withSourceBundleRecommendedPageSize(value, { windowId })),
+        command: sourceBundleCommand(record, sourceBundlePreferredScopeForSource(value, firstSource.source_id)),
         reason_code: "align-read-plan-window-drilldown",
         blocking: true
       };
@@ -86907,7 +87427,7 @@ function readPlanNextAction(record, value, routeKind, firstSource) {
   if (firstSource !== undefined) {
     return {
       kind: "show_view",
-      command: sourceBundleCommand(record, withSourceBundleRecommendedPageSize(value, { sourceId: firstSource.source_id })),
+      command: sourceBundleCommand(record, { sourceId: firstSource.source_id }),
       reason_code: "align-read-plan-source-drilldown",
       blocking: true
     };
@@ -87090,7 +87610,7 @@ function activeWindowQueue(value) {
     return String(left.window_id).localeCompare(String(right.window_id));
   });
 }
-function nextWindowAfter(value, windowSelector) {
+function nextWindowReadAfter(value, windowSelector) {
   const selected = resolveWindowSelectors(alignWindowRows(value), windowSelector);
   const selectedIds = new Set(selected.map((window2) => window2.window_id));
   const queue = activeWindowQueue(value);
@@ -87100,9 +87620,18 @@ function nextWindowAfter(value, windowSelector) {
       lastIndex = index2;
   }
   if (lastIndex < 0)
-    return;
+    return {};
+  const currentSourceId = queue[lastIndex]?.source_id;
+  if (typeof currentSourceId === "string") {
+    const sameSourceNext = queue.slice(lastIndex + 1).find((window2) => window2.source_id === currentSourceId);
+    if (typeof sameSourceNext?.window_id === "string")
+      return { windowId: sameSourceNext.window_id };
+    const nextSource = nextSourceAfter(value, currentSourceId);
+    if (nextSource !== undefined)
+      return { sourceId: nextSource };
+  }
   const next = queue[lastIndex + 1];
-  return typeof next?.window_id === "string" ? next.window_id : undefined;
+  return typeof next?.window_id === "string" ? { windowId: next.window_id } : {};
 }
 function firstSourceId(blocks) {
   const first = blocks.find((block) => typeof block.source_id === "string");
@@ -87172,7 +87701,7 @@ function sourceBundleNextAction(record, value, options, blocks, complete, pageNe
     if (nextSource !== undefined) {
       return {
         kind: "show_view",
-        command: sourceBundleCommand(record, withSourceBundleRecommendedPageSize(value, { sourceId: nextSource })),
+        command: sourceBundleCommand(record, sourceBundlePreferredScopeForSource(value, nextSource)),
         reason_code: "align-source-bundle-next-source",
         blocking: true
       };
@@ -87180,15 +87709,23 @@ function sourceBundleNextAction(record, value, options, blocks, complete, pageNe
     return partialScopeTerminalAction(record, routeMode, "align-source-bundle-last-source");
   }
   if (options.windowId !== undefined) {
-    const nextWindow = nextWindowAfter(value, options.windowId);
-    if (nextWindow !== undefined) {
+    const nextRead = nextWindowReadAfter(value, options.windowId);
+    if (nextRead.windowId !== undefined) {
       return {
         kind: "show_view",
-        command: sourceBundleCommand(record, withSourceBundleRecommendedPageSize(value, { windowId: nextWindow })),
+        command: sourceBundleCommand(record, withSourceBundleRecommendedPageSize(value, { windowId: nextRead.windowId })),
         reason_code: "align-source-bundle-next-window",
         blocking: true
       };
     }
+    if (nextRead.sourceId !== undefined) {
+      return {
+        kind: "show_view",
+        command: sourceBundleCommand(record, sourceBundlePreferredScopeForSource(value, nextRead.sourceId)),
+        reason_code: "align-source-bundle-next-source-after-window",
+        blocking: true
+      };
+    }
     return partialScopeTerminalAction(record, routeMode, "align-source-bundle-last-window");
   }
   if (options.heading !== undefined || options.range !== undefined) {
@@ -87197,7 +87734,7 @@ function sourceBundleNextAction(record, value, options, blocks, complete, pageNe
     if (nextSource !== undefined) {
       return {
         kind: "show_view",
-        command: sourceBundleCommand(record, withSourceBundleRecommendedPageSize(value, { sourceId: nextSource })),
+        command: sourceBundleCommand(record, sourceBundlePreferredScopeForSource(value, nextSource)),
         reason_code: "align-source-bundle-next-source-after-scope",
         blocking: true
       };
@@ -87227,6 +87764,8 @@ function estimateBundleTokens(blocks, renderedBytes) {
   return Math.max(sourceTokenEstimate + annotationTokenEstimate, Math.ceil(renderedBytes / 2));
 }
 function nextFallbackOptions(value, options) {
+  if (!hasSemanticSourceBundleScope(options))
+    return;
   const currentPageSize = parsePositiveIntegerOption(options.pageSize, "--page-size");
   if (currentPageSize === undefined) {
     const recommended = sourceBundleRecommendedPageSize(value, options);
@@ -87237,6 +87776,28 @@ function nextFallbackOptions(value, options) {
     return { ...options, pageSize: String(Math.max(1, Math.floor(currentPageSize / 2))) };
   return;
 }
+function hasSemanticSourceBundleScope(options) {
+  return options.sourceId !== undefined || options.windowId !== undefined || options.heading !== undefined || options.range !== undefined;
+}
+function normalizeSourceBundleOptions(value, options) {
+  const sourceId = resolveSourceBundleSourceId(value, options.sourceId);
+  if (sourceId === undefined)
+    return options;
+  return sourceId === options.sourceId ? options : { ...options, sourceId };
+}
+function safeSourceBundleBudgets(options) {
+  const requestedByteBudget = parsePositiveIntegerOption(options.budget, "--budget");
+  const requestedTokenBudget = options.tokenBudget !== undefined ? parseTokenBudgetOption(options.tokenBudget) : undefined;
+  const byteBudget = Math.min(requestedByteBudget ?? SOURCE_BUNDLE_DEFAULT_BYTE_BUDGET, SOURCE_BUNDLE_DEFAULT_BYTE_BUDGET);
+  const tokenBudget = Math.min(requestedTokenBudget ?? AGENT_VIEW_SIZE_POLICY.acceptable.maxTokens, AGENT_VIEW_SIZE_POLICY.acceptable.maxTokens);
+  return {
+    byteBudget,
+    tokenBudget,
+    ...requestedByteBudget !== undefined ? { requestedByteBudget } : {},
+    ...requestedTokenBudget !== undefined ? { requestedTokenBudget } : {},
+    clamped: requestedByteBudget !== undefined && requestedByteBudget > SOURCE_BUNDLE_DEFAULT_BYTE_BUDGET || requestedTokenBudget !== undefined && requestedTokenBudget > AGENT_VIEW_SIZE_POLICY.acceptable.maxTokens
+  };
+}
 function bundleOmittedText(input) {
   const full = [
     renderC4aTextAnnotation("bundle-omitted", {
@@ -87245,7 +87806,10 @@ function bundleOmittedText(input) {
       ...input.estimatedBytes !== undefined ? { estimated_bytes: input.estimatedBytes } : {},
       ...input.byteBudget !== undefined ? { byte_budget: input.byteBudget } : {},
       ...input.estimatedTokens !== undefined ? { estimated_tokens: input.estimatedTokens } : {},
-      ...input.tokenBudget !== undefined ? { token_budget: input.tokenBudget } : {}
+      ...input.tokenBudget !== undefined ? { token_budget: input.tokenBudget } : {},
+      ...input.budgetClamped === true ? { budget_clamped: true } : {},
+      ...input.requestedByteBudget !== undefined ? { requested_byte_budget: input.requestedByteBudget } : {},
+      ...input.requestedTokenBudget !== undefined ? { requested_token_budget: input.requestedTokenBudget } : {}
     }),
     renderC4aTextAnnotation("next-action", input.nextAction),
     ""
@@ -87341,6 +87905,7 @@ function renderSourceBundleText(input) {
 }
 function compactAlignSegmentSourceBundle(record, value, options) {
   validateSourceBundleScope(record, options);
+  const normalizedOptions = normalizeSourceBundleOptions(value, options);
   if (activeAlignSourceIds(value).size === 0) {
     const nextAction2 = { kind: "start_compile_scan", command: COMPILE_SCAN_COMMAND, reason_code: "align-source-bundle-no-active-source" };
     return {
@@ -87353,8 +87918,33 @@ function compactAlignSegmentSourceBundle(record, value, options) {
       read_scope_complete: false
     };
   }
-  const allBlocks = sourceBundleScopeBlocks(value, options);
-  if ((options.sourceId !== undefined || options.windowId !== undefined || options.heading !== undefined || options.range !== undefined) && allBlocks.length === 0) {
+  if (!hasSemanticSourceBundleScope(normalizedOptions) && (normalizedOptions.pageSize !== undefined || normalizedOptions.pageToken !== undefined)) {
+    const nextAction2 = {
+      kind: "show_view",
+      command: workflowPayloadShowCommand(record, ["--view read-plan", "--unwrap", "--format json"]),
+      reason_code: "align-source-bundle-unscoped-pagination-disabled",
+      blocking: true
+    };
+    return {
+      view_schema_version: ALIGN_SOURCE_BUNDLE_VIEW_SCHEMA_VERSION,
+      mode: "source-bundle",
+      text: bundleOmittedText({ reasonCode: "source_bundle_unscoped_pagination_disabled", nextAction: nextAction2 }),
+      bundle_omitted: true,
+      reason_code: "source_bundle_unscoped_pagination_disabled",
+      next_action: nextAction2,
+      read_scope_complete: false,
+      filters: compactFilters(normalizedOptions),
+      agent_hints: [{
+        code: "align-source-bundle-use-read-plan",
+        severity: "warning",
+        message: "Unscoped source-bundle pagination is disabled because it encourages reconstructing a large batch outside the workflow plan.",
+        next_action: "Run next_action.command and follow the scoped source-bundle command chosen by read-plan.",
+        command: nextAction2.command
+      }]
+    };
+  }
+  const allBlocks = sourceBundleScopeBlocks(value, normalizedOptions);
+  if (hasSemanticSourceBundleScope(normalizedOptions) && allBlocks.length === 0) {
     const nextAction2 = {
       kind: "show_view",
       command: workflowPayloadShowCommand(record, ["--view read-plan", "--unwrap", "--format json"]),
@@ -87369,13 +87959,13 @@ function compactAlignSegmentSourceBundle(record, value, options) {
       reason_code: "source_bundle_scope_empty",
       next_action: nextAction2,
       read_scope_complete: false,
-      filters: compactFilters(options)
+      filters: compactFilters(normalizedOptions)
     };
   }
-  const page = paginate(allBlocks, options);
+  const page = paginate(allBlocks, normalizedOptions);
   const pageNextToken = typeof page.page?.next_token === "string" ? page.page.next_token : undefined;
-  const complete = sourceBundleScopeComplete(value, page.items, options, pageNextToken !== undefined);
-  const nextAction = sourceBundleNextAction(record, value, options, page.items, complete, pageNextToken);
+  const complete = sourceBundleScopeComplete(value, page.items, normalizedOptions, pageNextToken !== undefined);
+  const nextAction = sourceBundleNextAction(record, value, normalizedOptions, page.items, complete, pageNextToken);
   const rendered = renderSourceBundleText({
     value,
     blocks: page.items,
@@ -87383,17 +87973,22 @@ function compactAlignSegmentSourceBundle(record, value, options) {
     readScopeComplete: complete,
     ...page.page !== undefined ? { page: page.page } : {}
   });
-  const byteBudget = parsePositiveIntegerOption(options.budget, "--budget") ?? SOURCE_BUNDLE_DEFAULT_BYTE_BUDGET;
-  const tokenBudget = options.tokenBudget !== undefined ? parseTokenBudgetOption(options.tokenBudget) : AGENT_VIEW_SIZE_POLICY.acceptable.maxTokens;
+  const budget = safeSourceBundleBudgets(normalizedOptions);
+  const { byteBudget, tokenBudget } = budget;
   const estimatedBytes = Buffer.byteLength(rendered.text, "utf8");
   const estimatedTokens = estimateBundleTokens(page.items, estimatedBytes);
   if (estimatedBytes > byteBudget || estimatedTokens > tokenBudget) {
-    const fallbackOptions = nextFallbackOptions(value, options);
-    const fallbackAction = fallbackOptions === undefined ? {
+    const fallbackOptions = nextFallbackOptions(value, normalizedOptions);
+    const fallbackAction = !hasSemanticSourceBundleScope(normalizedOptions) ? {
+      kind: "show_view",
+      command: workflowPayloadShowCommand(record, ["--view read-plan", "--unwrap", "--format json"]),
+      reason_code: "align-source-bundle-return-read-plan",
+      blocking: true
+    } : fallbackOptions === undefined ? {
       kind: "show_view",
       command: workflowPayloadShowCommand(record, [
         "--view block-index",
-        ...options.sourceId !== undefined ? [`--source ${shellQuote(options.sourceId)}`] : [],
+        ...normalizedOptions.sourceId !== undefined ? [`--source ${shellQuote(normalizedOptions.sourceId)}`] : [],
         "--unwrap",
         "--format json"
       ]),
@@ -87414,6 +88009,9 @@ function compactAlignSegmentSourceBundle(record, value, options) {
         byteBudget,
         estimatedTokens,
         tokenBudget,
+        budgetClamped: budget.clamped,
+        ...budget.requestedByteBudget !== undefined ? { requestedByteBudget: budget.requestedByteBudget } : {},
+        ...budget.requestedTokenBudget !== undefined ? { requestedTokenBudget: budget.requestedTokenBudget } : {},
         nextAction: fallbackAction
       }),
       bundle_omitted: true,
@@ -87421,6 +88019,11 @@ function compactAlignSegmentSourceBundle(record, value, options) {
       byte_budget: byteBudget,
       estimated_tokens: estimatedTokens,
       token_budget: tokenBudget,
+      ...budget.clamped ? {
+        budget_clamped: true,
+        ...budget.requestedByteBudget !== undefined ? { requested_byte_budget: budget.requestedByteBudget } : {},
+        ...budget.requestedTokenBudget !== undefined ? { requested_token_budget: budget.requestedTokenBudget } : {}
+      } : {},
       next_action: fallbackAction,
       read_scope_complete: false,
       agent_hints: [{
@@ -87434,12 +88037,12 @@ function compactAlignSegmentSourceBundle(record, value, options) {
           byte_budget: byteBudget,
           estimated_tokens: estimatedTokens,
           token_budget: tokenBudget,
-          feedback: "If this fallback seems too conservative during testing, report estimated_tokens/token_budget, estimated_bytes/byte_budget, and any override values you tried.",
-          override_flags: {
-            byte_budget: "--budget <bytes>",
-            token_budget: "--token-budget <tokens>"
-          },
-          override_policy: "Only raise these budgets when the user is explicitly testing bundle size behavior; report the estimates and requested override values."
+          ...budget.clamped ? {
+            budget_clamped: true,
+            requested_byte_budget: budget.requestedByteBudget,
+            requested_token_budget: budget.requestedTokenBudget
+          } : {},
+          feedback: "If this fallback seems too conservative during testing, report estimated_tokens/token_budget and estimated_bytes/byte_budget. Source-bundle keeps generated commands inside the agent-safe budget policy."
         }
       }]
     };
@@ -87448,10 +88051,15 @@ function compactAlignSegmentSourceBundle(record, value, options) {
     view_schema_version: ALIGN_SOURCE_BUNDLE_VIEW_SCHEMA_VERSION,
     mode: "source-bundle",
     format: "c4a-annotated-text",
-    filters: compactFilters(options),
+    filters: compactFilters(normalizedOptions),
     text: rendered.text,
     text_bytes: estimatedBytes,
     estimated_tokens: estimatedTokens,
+    ...budget.clamped ? {
+      budget_clamped: true,
+      ...budget.requestedByteBudget !== undefined ? { requested_byte_budget: budget.requestedByteBudget } : {},
+      ...budget.requestedTokenBudget !== undefined ? { requested_token_budget: budget.requestedTokenBudget } : {}
+    } : {},
     read_scope_complete: complete,
     raw_c4a_sentinel_escaped: rendered.collisionEscaped,
     ...rendered.collisionEscapedBlockIds.length > 0 ? {
@@ -88116,7 +88724,7 @@ function coverageRows(value) {
     const row = {
       candidate_id: candidateId2,
       issue_type: issueType,
-      node_slug: stringValue3(candidate.node_slug, "unknown"),
+      node_slug: stringValue4(candidate.node_slug, "unknown"),
       signal: coverageSignal(candidate),
       why_flagged: whyFlagged(candidate),
       source_ref_count: sourceRefs2.length,
@@ -88232,7 +88840,7 @@ function compareCoverageGroups(a, b) {
   return signalRank(b.signal) - signalRank(a.signal) || a.issue_type.localeCompare(b.issue_type) || b.count - a.count;
 }
 function coverageSignal(candidate) {
-  return stringValue3(candidate.signal, "unknown");
+  return stringValue4(candidate.signal, "unknown");
 }
 function whyFlagged(candidate) {
   const direct = strings(candidate.why_flagged);
@@ -88277,7 +88885,7 @@ function strings(value) {
 function isRecord37(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function stringValue3(value, fallback) {
+function stringValue4(value, fallback) {
   return typeof value === "string" && value.length > 0 ? value : fallback;
 }
 function setString(target, key, value) {
@@ -88302,6 +88910,7 @@ function headingMatches2(path13, input) {
 
 // src/commands/workflowNodeContextPayloadViews.ts
 init_workflowPayloadStore();
+init_markdownFormatSignals();
 var SOURCE_REFS_SELECTION_POLICY = {
   id: "source-refs-v2",
   order: [
@@ -88358,6 +88967,7 @@ function nodeContextSourceRefRows(value) {
     const quotePreview = previewText(snippet.quote);
     const quoteText = normalizedPreviewBasis(snippet.quote);
     const quoteCharCount = quoteText?.length;
+    const formatSignals = markdownFormatSignals(snippet.quote);
     const blockId = typeof snippet.block_id === "string" ? snippet.block_id : undefined;
     const sourceId = typeof snippet.source_id === "string" ? snippet.source_id : undefined;
     const finalizedOwnershipRole = typeof snippet.finalized_ownership_role === "string" ? snippet.finalized_ownership_role : undefined;
@@ -88380,6 +88990,10 @@ function nodeContextSourceRefRows(value) {
       ...quoteCharCount !== undefined ? { quote_char_count: quoteCharCount } : {},
       ...quotePreview !== undefined ? { preview_char_count: quotePreview.length } : {},
       ...quotePreview !== undefined && quoteCharCount !== undefined ? { preview_is_complete: quotePreview.length >= quoteCharCount } : {},
+      ...formatSignals.format_sensitive ? {
+        ...formatSignals,
+        quote_preview_preserves_line_breaks: false
+      } : {},
       ...node3 !== undefined && blockId !== undefined && canRequestFullTextForSnippet(snippet) ? { request_full_text_command: `context compile context ${shellQuote(node3)} --request-full-text ${shellQuote(blockId)} --view text --format json` } : {}
     };
   });
@@ -88635,26 +89249,28 @@ function sanitizeNodeContextValue(value) {
   };
 }
 function compactPreparePayload(value, view, options = {}) {
-  const wantsIssueDetail = view === "issues" && (options.status !== undefined || options.itemId !== undefined || options.pageSize !== undefined || options.pageToken !== undefined);
+  const wantsIssueDetail = view === "issues" && options.itemId !== undefined;
+  const shouldDefaultPage = view === "summary" || view === "issues" || view === "candidates" && options.itemId === undefined && options.candidateId === undefined;
+  const pagedOptions = shouldDefaultPage && options.pageSize === undefined ? { ...options, pageSize: "20" } : options;
   const projected = projectPrepareContext(value, view, {
-    ...options.status !== undefined ? { status: options.status } : {},
-    ...options.itemId !== undefined ? { itemId: options.itemId } : {},
-    ...options.candidateId !== undefined ? { candidateId: options.candidateId } : {},
-    ...options.pageSize !== undefined ? { pageSize: options.pageSize } : {},
-    ...options.pageToken !== undefined ? { pageToken: options.pageToken } : {},
-    ...options.tokenBudget !== undefined ? { tokenBudget: options.tokenBudget } : {},
+    ...pagedOptions.status !== undefined ? { status: pagedOptions.status } : {},
+    ...pagedOptions.itemId !== undefined ? { itemId: pagedOptions.itemId } : {},
+    ...pagedOptions.candidateId !== undefined ? { candidateId: pagedOptions.candidateId } : {},
+    ...pagedOptions.pageSize !== undefined ? { pageSize: pagedOptions.pageSize } : {},
+    ...pagedOptions.pageToken !== undefined ? { pageToken: pagedOptions.pageToken } : {},
+    ...pagedOptions.tokenBudget !== undefined ? { tokenBudget: pagedOptions.tokenBudget } : {},
     ...wantsIssueDetail ? { detail: true } : {}
   });
   if (!isRecord36(projected))
     return { value: projected };
-  if (view !== "issues")
+  if (view === "candidates")
     return projected;
-  const issueItems = asRecords(projected.items);
-  const page = paginate(issueItems, options);
+  const projectedItems = asRecords(projected.items);
+  const page = paginate(projectedItems, pagedOptions);
   const existingFilters = isRecord36(projected.filters) ? projected.filters : {};
   const filters = {
     ...existingFilters,
-    ...compactFilters(options)
+    ...compactFilters(pagedOptions)
   };
   return {
     ...projected,
@@ -89491,7 +90107,13 @@ function writeWorkflowShowOutput(input) {
     return;
   }
   const metadata2 = workflowPayloadMetadata(input.record);
-  const compactValue = input.view === undefined ? undefined : compactWorkflowPayloadView(input.record, input.view, input.viewOptions);
+  const rawCompactValue = input.view === undefined ? undefined : compactWorkflowPayloadView(input.record, input.view, input.viewOptions);
+  const compactValue = input.view !== undefined && rawCompactValue !== undefined ? withPagedNextCommand({
+    record: input.record,
+    view: input.view,
+    viewOptions: input.viewOptions,
+    value: rawCompactValue
+  }) : rawCompactValue;
   const availableViews = workflowPayloadAvailableViews(input.record.payload);
   const viewGuide = input.view === undefined && !input.metadataOnly && !input.unwrap ? workflowPayloadViewGuide(input.record) : {};
   const shouldOmitFullValue = input.view === undefined && !input.metadataOnly && !input.unwrap && availableViews.length > 0;
@@ -90096,7 +90718,7 @@ init_alignBlockStructuralRole();
 function isRecord39(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function stringValue4(value) {
+function stringValue5(value) {
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
 function assertKnownEvidenceBlocks(input) {
@@ -90259,7 +90881,7 @@ function normalizeUnresolved(value) {
   return Array.isArray(value) ? value.filter(isRecord39) : [];
 }
 function validateUnresolvedQuestions(input) {
-  const questionIds = new Set(input.unresolved.map((item) => stringValue4(item.question_id)).filter((item) => item !== undefined));
+  const questionIds = new Set(input.unresolved.map((item) => stringValue5(item.question_id)).filter((item) => item !== undefined));
   input.blockOwnership.forEach((item, index2) => {
     if (item.ownership_role !== "unresolved")
       return;
@@ -90814,9 +91436,9 @@ function parseNodes(value) {
   return value.map((raw, index2) => {
     if (!isRecord18(raw))
       reject(`nodes[${index2}]`, "node must be an object");
-    const rawSlug = stringValue(raw.slug);
-    const rawHint = stringValue(raw.llm_slug_hint);
-    const slugBase = rawSlug ?? (rawHint !== undefined ? slugBaseFromHint(rawHint) : undefined) ?? stringValue(raw.title);
+    const rawSlug = stringValue2(raw.slug);
+    const rawHint = stringValue2(raw.llm_slug_hint);
+    const slugBase = rawSlug ?? (rawHint !== undefined ? slugBaseFromHint(rawHint) : undefined) ?? stringValue2(raw.title);
     if (!slugBase)
       reject(`nodes[${index2}].slug`, "slug, llm_slug_hint, or title is required");
     const slug = rawSlug !== undefined ? rawSlug.split("/").map((part) => slugify(part)).filter(Boolean).join("/") : slugify(slugBase);
@@ -90836,16 +91458,16 @@ function parseNodes(value) {
         } : {}
       });
     }
-    const llmSlugHint = stringValue(raw.llm_slug_hint);
-    const containsParent = stringValue(raw.contains_parent);
-    const containsParentRef = stringValue(raw.contains_parent_ref);
-    const summary3 = stringValue(raw.summary);
+    const llmSlugHint = stringValue2(raw.llm_slug_hint);
+    const containsParent = stringValue2(raw.contains_parent);
+    const containsParentRef = stringValue2(raw.contains_parent_ref);
+    const summary3 = stringValue2(raw.summary);
     return {
       slug,
       ...llmSlugHint !== undefined ? { llm_slug_hint: llmSlugHint } : {},
       node_type: nodeType,
       tags,
-      title: stringValue(raw.title) ?? slug,
+      title: stringValue2(raw.title) ?? slug,
       ...raw.contains_parent === null ? { contains_parent: null } : {},
       ...containsParent !== undefined ? { contains_parent: containsParent } : {},
       ...containsParentRef !== undefined ? { contains_parent_ref: containsParentRef } : {},
@@ -90895,33 +91517,6 @@ function validateInferenceSources(gate, path13) {
     }
   }
 }
-function downgradeReason(node3) {
-  if (node3.action_probe?.has_steps_or_phases !== true)
-    return "action_probe lacks explicit steps or phases";
-  if (node3.action_gate === undefined)
-    return "action gate lacks structured inference sources";
-  return null;
-}
-function downgradeNode(node3, warningKind, reason) {
-  return {
-    node: {
-      ...node3,
-      node_type: "entity",
-      tags: node3.tags.length > 0 && !node3.tags.some((tag) => ACTION_KIND_VALUES.includes(tag)) ? node3.tags : ["term"]
-    },
-    warning: {
-      kind: warningKind,
-      node_slug: node3.slug,
-      reason,
-      original_proposal: {
-        node_type: node3.node_type,
-        title: node3.title,
-        rationale: node3.summary ?? ""
-      },
-      evidence_blocks: node3.evidence_blocks
-    }
-  };
-}
 function scopeNameEntityWarning(node3) {
   if (node3.node_type !== "entity")
     return null;
@@ -90940,6 +91535,92 @@ function scopeNameEntityWarning(node3) {
     evidence_blocks: node3.evidence_blocks
   };
 }
+function gateRepairOptions(type) {
+  return type === "domain" ? [
+    "If this is a Domain, add domain_gate.scope_blocks, domain_gate.child_refs, and domain_gate.grouping_reason with resolvable child_refs.",
+    "If this is not a Domain, resubmit it as node_type=entity and choose the concrete Entity tag yourself; CLI will not auto-pick tags."
+  ] : [
+    "If this is an Action, add action_probe plus action_gate.inference_sources with actor, outcome_or_goal, repeatability_or_plan, and answerability evidence.",
+    "If this is not an Action, resubmit it as node_type=entity or move the process wording into a Section under the owning Node; CLI will not auto-pick tags."
+  ];
+}
+function normalizeDomainGate(input) {
+  const gate = input.node.domain_gate;
+  const rawChildRefs = Array.isArray(gate?.child_refs) ? gate.child_refs : undefined;
+  const childRefs = rawChildRefs?.map((ref) => typeof ref === "string" ? ref.trim() : "") ?? [];
+  const unresolvedChildRefs = childRefs.filter((ref) => ref.length === 0 || !input.refs.has(ref) && !input.allSlugs.has(ref));
+  const validGate = gate !== undefined && Array.isArray(gate.scope_blocks) && rawChildRefs !== undefined && typeof gate.grouping_reason === "string" && childRefs.length === rawChildRefs.length && unresolvedChildRefs.length === 0;
+  if (!validGate) {
+    const missing = [
+      gate === undefined ? "domain_gate" : undefined,
+      gate !== undefined && !Array.isArray(gate.scope_blocks) ? "domain_gate.scope_blocks" : undefined,
+      rawChildRefs === undefined ? "domain_gate.child_refs" : undefined,
+      gate !== undefined && typeof gate.grouping_reason !== "string" ? "domain_gate.grouping_reason" : undefined,
+      unresolvedChildRefs.length > 0 ? "domain_gate.child_refs.resolvable" : undefined
+    ].filter((item) => item !== undefined);
+    reject(rawChildRefs === undefined || unresolvedChildRefs.length > 0 ? `nodes[${input.nodeIndex}].domain_gate.child_refs` : `nodes[${input.nodeIndex}].domain_gate`, "node_type=domain requires a valid domain_gate; CLI does not auto-downgrade invalid Domain nodes to entity", {
+      hintCode: "align-domain-gate-invalid",
+      reasonCode: "align-domain-gate-invalid",
+      schemaLookup: "context schema align-structure-intent --view minimal --format json",
+      repairOptions: gateRepairOptions("domain"),
+      availableNodeRefs: nodeRefsForHint(input.refs),
+      availableNodeSlugs: [...input.allSlugs],
+      diagnostics: {
+        missing_or_invalid: missing,
+        unresolved_child_refs: unresolvedChildRefs,
+        submitted_node_type: "domain",
+        auto_downgrade: false
+      }
+    });
+  }
+  const canonicalChildRefs = childRefs.map((ref) => input.refs.get(ref) ?? ref);
+  const duplicateChildRef = canonicalChildRefs.find((ref, refIndex) => canonicalChildRefs.indexOf(ref) !== refIndex);
+  if (duplicateChildRef !== undefined) {
+    reject(`nodes[${input.nodeIndex}].domain_gate.child_refs`, `domain_gate.child_refs contains duplicate child "${duplicateChildRef}"`, {
+      reasonCode: "duplicate-domain-child-ref",
+      failedRef: duplicateChildRef,
+      availableNodeRefs: nodeRefsForHint(input.refs),
+      availableNodeSlugs: [...input.allSlugs]
+    });
+  }
+  return {
+    ...input.node,
+    domain_gate: {
+      ...gate,
+      child_refs: canonicalChildRefs
+    }
+  };
+}
+function validateActionGate(node3, nodeIndex) {
+  if (node3.action_probe?.has_steps_or_phases !== true) {
+    reject(`nodes[${nodeIndex}].action_probe.has_steps_or_phases`, "node_type=action requires action_probe.has_steps_or_phases=true; CLI does not auto-downgrade invalid Action nodes to entity", {
+      hintCode: "align-action-gate-invalid",
+      reasonCode: "align-action-gate-invalid",
+      schemaLookup: "context schema align-structure-intent --view minimal --format json",
+      repairOptions: gateRepairOptions("action"),
+      diagnostics: {
+        missing_or_invalid: ["action_probe.has_steps_or_phases"],
+        submitted_node_type: "action",
+        auto_downgrade: false
+      }
+    });
+  }
+  const gate = node3.action_gate;
+  if (gate === undefined) {
+    reject(`nodes[${nodeIndex}].action_gate`, "node_type=action requires action_gate.inference_sources; CLI does not auto-downgrade invalid Action nodes to entity", {
+      hintCode: "align-action-gate-invalid",
+      reasonCode: "align-action-gate-invalid",
+      schemaLookup: "context schema align-structure-intent --view minimal --format json",
+      repairOptions: gateRepairOptions("action"),
+      diagnostics: {
+        missing_or_invalid: ["action_gate.inference_sources"],
+        submitted_node_type: "action",
+        auto_downgrade: false
+      }
+    });
+  }
+  validateInferenceSources(gate, `nodes[${nodeIndex}].action_gate`);
+}
 function normalizeNodes(nodes, refs, allSlugs, previousTypes) {
   const warnings = [];
   const normalized = nodes.map((node3, index2) => {
@@ -90956,46 +91637,10 @@ function normalizeNodes(nodes, refs, allSlugs, previousTypes) {
       });
     }
     if (next.node_type === "domain") {
-      const gate = next.domain_gate;
-      const rawChildRefs = Array.isArray(gate?.child_refs) ? gate.child_refs : undefined;
-      const childRefs = rawChildRefs?.map((ref) => typeof ref === "string" ? ref.trim() : "") ?? [];
-      const validGate = gate !== undefined && Array.isArray(gate.scope_blocks) && rawChildRefs !== undefined && typeof gate.grouping_reason === "string" && childRefs.length === rawChildRefs.length && childRefs.every((ref) => ref.length > 0 && (refs.has(ref) || allSlugs.has(ref)));
-      if (!validGate) {
-        const downgraded = downgradeNode(next, "domain_downgrade", "domain_gate is missing or references unresolved child refs");
-        next = downgraded.node;
-        warnings.push(downgraded.warning);
-      } else {
-        const canonicalChildRefs = childRefs.map((ref) => refs.get(ref) ?? ref);
-        const duplicateChildRef = canonicalChildRefs.find((ref, refIndex) => canonicalChildRefs.indexOf(ref) !== refIndex);
-        if (duplicateChildRef !== undefined) {
-          reject(`nodes[${index2}].domain_gate.child_refs`, `domain_gate.child_refs contains duplicate child "${duplicateChildRef}"`, {
-            reasonCode: "duplicate-domain-child-ref",
-            failedRef: duplicateChildRef,
-            availableNodeRefs: nodeRefsForHint(refs),
-            availableNodeSlugs: [...allSlugs]
-          });
-        }
-        next = {
-          ...next,
-          domain_gate: {
-            ...gate,
-            child_refs: canonicalChildRefs
-          }
-        };
-      }
+      next = normalizeDomainGate({ node: next, nodeIndex: index2, refs, allSlugs });
     }
     if (next.node_type === "action") {
-      const reason = downgradeReason(next);
-      if (reason !== null) {
-        const downgraded = downgradeNode(next, "action_downgrade", reason);
-        next = downgraded.node;
-        warnings.push(downgraded.warning);
-      } else {
-        const gate = next.action_gate;
-        if (gate === undefined)
-          reject(`nodes[${index2}].action_gate`, "action_gate is required");
-        validateInferenceSources(gate, `nodes[${index2}].action_gate`);
-      }
+      validateActionGate(next, index2);
     }
     const previousType = previousTypes.get(next.slug);
     if (previousType !== undefined && previousType !== next.node_type) {
@@ -91075,7 +91720,7 @@ function normalizeSections(value, refs, currentSlugs) {
   return value.map((raw, index2) => {
     if (!isRecord18(raw))
       reject(`sections[${index2}]`, "section must be an object");
-    const rawOwner = stringValue(raw.owner);
+    const rawOwner = stringValue2(raw.owner);
     if (rawOwner === undefined)
       reject(`sections[${index2}].owner`, `sections[${index2}].owner is required`);
     const owner = refs.get(rawOwner);
@@ -91094,9 +91739,9 @@ function normalizeSections(value, refs, currentSlugs) {
         availableNodeSlugs: [...currentSlugs]
       });
     }
-    const rationale = stringValue(raw.rationale);
+    const rationale = stringValue2(raw.rationale);
     return {
-      section_id: stringValue(raw.section_id) ?? `planned_section_${index2 + 1}`,
+      section_id: stringValue2(raw.section_id) ?? `planned_section_${index2 + 1}`,
       owner,
       section_kind: raw.section_kind,
       block_ids: stringArray2(raw.block_ids),
@@ -91114,8 +91759,8 @@ function normalizeEdges(value, refs, slugs) {
     if (raw.edge_type !== "depends_on" && raw.type !== "depends_on") {
       rejectLegacy(`edges[${index2}].edge_type`, `document edge type must be depends_on; allowed runtime EdgeType values are ${EDGE_TYPES.join("|")}`);
     }
-    const from = resolveRef2(refs, stringValue(raw.from_ref) ?? stringValue(raw.from), `edges[${index2}].from_ref`);
-    const to = resolveRef2(refs, stringValue(raw.to_ref) ?? stringValue(raw.to), `edges[${index2}].to_ref`);
+    const from = resolveRef2(refs, stringValue2(raw.from_ref) ?? stringValue2(raw.from), `edges[${index2}].from_ref`);
+    const to = resolveRef2(refs, stringValue2(raw.to_ref) ?? stringValue2(raw.to), `edges[${index2}].to_ref`);
     if (!from || !to || !slugs.has(from) || !slugs.has(to)) {
       reject(`edges[${index2}]`, "edge endpoints must reference finalized nodes", {
         reasonCode: "unknown-edge-endpoint",
@@ -91123,10 +91768,10 @@ function normalizeEdges(value, refs, slugs) {
         availableNodeSlugs: [...slugs]
       });
     }
-    const fromRef = stringValue(raw.from_ref);
-    const toRef = stringValue(raw.to_ref);
-    const confidence = stringValue(raw.confidence);
-    const rationale = stringValue(raw.rationale);
+    const fromRef = stringValue2(raw.from_ref);
+    const toRef = stringValue2(raw.to_ref);
+    const confidence = stringValue2(raw.confidence);
+    const rationale = stringValue2(raw.rationale);
     return {
       edge_type: "depends_on",
       from,
@@ -91225,7 +91870,7 @@ function normalizeAlignStructureDecision(input) {
   });
   const unresolved = normalizeUnresolved(input.payload.unresolved);
   validateUnresolvedQuestions({ blockOwnership, unresolved, reject });
-  const artifactKind = stringValue(input.payload.artifact_kind);
+  const artifactKind = stringValue2(input.payload.artifact_kind);
   const auditWarnings = Array.isArray(input.payload.audit_warnings) ? input.payload.audit_warnings.filter((warning) => isRecord18(warning) && typeof warning.kind === "string" && typeof warning.reason === "string") : [];
   return {
     schema_version: ALIGN_STRUCTURE_DECISION_SCHEMA_VERSION,
@@ -91258,16 +91903,16 @@ var CITABLE_OWNERSHIP_ROLES = new Set(["owned", "shared"]);
 function isRecord40(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function stringValue5(value) {
+function stringValue6(value) {
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
 function stringArray6(value) {
   return Array.isArray(value) ? value.filter((item) => typeof item === "string" && item.trim().length > 0).map((item) => item.trim()) : [];
 }
 function normalizedNodeSlug(rawNode) {
-  const rawSlug = stringValue5(rawNode.slug);
-  const rawHint = stringValue5(rawNode.llm_slug_hint);
-  const slugBase = rawSlug ?? (rawHint !== undefined ? rawHint.replace(/^local:/u, "") : undefined) ?? stringValue5(rawNode.title);
+  const rawSlug = stringValue6(rawNode.slug);
+  const rawHint = stringValue6(rawNode.llm_slug_hint);
+  const slugBase = rawSlug ?? (rawHint !== undefined ? rawHint.replace(/^local:/u, "") : undefined) ?? stringValue6(rawNode.title);
   if (slugBase === undefined)
     return;
   const slug = rawSlug !== undefined ? rawSlug.split("/").map((part) => slugify(part)).filter(Boolean).join("/") : slugify(slugBase);
@@ -91296,7 +91941,7 @@ function nodeReferenceIndex(rawDecision, context) {
       continue;
     slugs.add(slug);
     setRef2(slug, slug);
-    setRef2(stringValue5(rawNode.llm_slug_hint), slug);
+    setRef2(stringValue6(rawNode.llm_slug_hint), slug);
   }
   return { refs, slugs };
 }
@@ -91371,8 +92016,8 @@ function ownershipRolesByBlock(rawDecision, context) {
   for (const raw of ownershipInput) {
     if (!isRecord40(raw))
       continue;
-    const blockId = stringValue5(raw.block_id);
-    const role = stringValue5(raw.ownership_role);
+    const blockId = stringValue6(raw.block_id);
+    const role = stringValue6(raw.ownership_role);
     if (blockId !== undefined && role !== undefined && ["owned", "shared", "context_only", "ignored", "unresolved"].includes(role)) {
       roles.set(blockId, role);
     }
@@ -91404,7 +92049,7 @@ function collectSectionIssues(rawDecision, context, issues, ownershipRoles) {
       issues.push({
         path: `sections[${index2}].block_ids`,
         reason_code: "non-coverable-block",
-        message: `section "${stringValue5(rawSection.section_id) ?? index2}" includes non-coverable block_ids`,
+        message: `section "${stringValue6(rawSection.section_id) ?? index2}" includes non-coverable block_ids`,
         diagnostics: citationEligibilityDiagnostics(blockIds, context.segments, citationEligible)
       });
       return;
@@ -91413,7 +92058,7 @@ function collectSectionIssues(rawDecision, context, issues, ownershipRoles) {
       issues.push({
         path: `sections[${index2}].block_ids`,
         reason_code: nonCitable.length === blockIds.length ? "section-plan-no-citable-blocks" : "section-plan-non-citable-blocks",
-        message: nonCitable.length === blockIds.length ? `section "${stringValue5(rawSection.section_id) ?? index2}" has no citation-eligible block_ids after excluding supporting context` : `section "${stringValue5(rawSection.section_id) ?? index2}" includes supporting-context block_ids that cannot support citations`,
+        message: nonCitable.length === blockIds.length ? `section "${stringValue6(rawSection.section_id) ?? index2}" has no citation-eligible block_ids after excluding supporting context` : `section "${stringValue6(rawSection.section_id) ?? index2}" includes supporting-context block_ids that cannot support citations`,
         diagnostics: citationEligibilityDiagnostics(blockIds, context.segments, citationEligible)
       });
       return;
@@ -91426,8 +92071,8 @@ function collectOwnershipIssues(rawDecision, context, issues, nodeRefs) {
   ownership.forEach((raw, index2) => {
     if (!isRecord40(raw))
       return;
-    const blockId = stringValue5(raw.block_id);
-    const role = stringValue5(raw.ownership_role);
+    const blockId = stringValue6(raw.block_id);
+    const role = stringValue6(raw.ownership_role);
     if (blockId !== undefined && !coverable.has(blockId)) {
       issues.push({
         path: `block_ownership[${index2}].block_id`,
@@ -91465,7 +92110,7 @@ function collectSupplementalIssues(rawDecision, context) {
   for (const [index2, rawNode] of (Array.isArray(rawDecision.nodes) ? rawDecision.nodes : []).entries()) {
     if (!isRecord40(rawNode))
       continue;
-    const nodeType = stringValue5(rawNode.node_type);
+    const nodeType = stringValue6(rawNode.node_type);
     if (nodeType !== undefined && NODE_TYPES.includes(nodeType) && Array.isArray(rawNode.planned_sections)) {
       for (const kind of stringArray6(rawNode.planned_sections)) {
         if (!isSectionKindMountable(nodeType, kind)) {
@@ -91497,17 +92142,17 @@ function isAlignStructureIntentPayload(value) {
   return isRecord18(value) && value.schema_version === ALIGN_STRUCTURE_INTENT_SCHEMA_VERSION;
 }
 function stableNodeSlug(raw) {
-  const rawSlug = stringValue(raw.slug);
+  const rawSlug = stringValue2(raw.slug);
   if (rawSlug !== undefined)
     return rawSlug.split("/").map((part) => slugify(part)).filter(Boolean).join("/");
-  const hint = stringValue(raw.llm_slug_hint);
+  const hint = stringValue2(raw.llm_slug_hint);
   if (hint !== undefined)
     return slugify(hint.replace(/^local:/u, ""));
-  const title = stringValue(raw.title);
+  const title = stringValue2(raw.title);
   return title !== undefined ? slugify(title) : undefined;
 }
 function nodeRefs(raw) {
-  return [stableNodeSlug(raw), stringValue(raw.slug), stringValue(raw.llm_slug_hint)].filter((value) => value !== undefined && value.length > 0);
+  return [stableNodeSlug(raw), stringValue2(raw.slug), stringValue2(raw.llm_slug_hint)].filter((value) => value !== undefined && value.length > 0);
 }
 function distinctStrings(values2) {
   const seen = new Set;
@@ -91584,8 +92229,8 @@ function compileSections(input) {
         });
       }
     }
-    const owner = stringValue(group.owner);
-    const kind = stringValue(group.section_kind);
+    const owner = stringValue2(group.owner);
+    const kind = stringValue2(group.section_kind);
     if (owner !== undefined && kind !== undefined) {
       const existing = sectionsByOwner.get(owner) ?? [];
       existing.push(kind);
@@ -91610,7 +92255,7 @@ function compileSections(input) {
       section_kind: kind,
       block_ids: blockIds,
       ...Array.isArray(group.refers_to_nodes) ? { refers_to_nodes: distinctStrings(stringArray2(group.refers_to_nodes)) } : {},
-      ...stringValue(group.rationale) !== undefined ? { rationale: stringValue(group.rationale) } : {}
+      ...stringValue2(group.rationale) !== undefined ? { rationale: stringValue2(group.rationale) } : {}
     };
   });
   const nodes = rawNodes.map((node3, index2) => {
@@ -91672,7 +92317,7 @@ function throwIntentIssues(issues) {
   throwStructureIssues(issues.map(withIntentIssueContext));
 }
 function roleOf(record, block, applyDefaultDemotion = false) {
-  const role = stringValue(record?.ownership_role);
+  const role = stringValue2(record?.ownership_role);
   if (applyDefaultDemotion && (role === "owned" || role === "shared") && block !== undefined) {
     return defaultOwnershipRoleForStructuralRole(block.structural_role) ?? role;
   }
@@ -91695,6 +92340,7 @@ function compileOwnership(input) {
   }
   const sourceDefaults = new Map;
   const groupExplicit = new Map;
+  const ownershipNoopGroups = [];
   groups.forEach((group, index2) => {
     const scope = isRecord18(group.scope) ? group.scope : undefined;
     if (scope === undefined) {
@@ -91706,8 +92352,8 @@ function compileOwnership(input) {
       return;
     }
     const blockIds = stringArray2(scope.block_ids);
-    const sourceId = stringValue(scope.source_id);
-    const structuralRole = stringValue(scope.structural_role);
+    const sourceId = stringValue2(scope.source_id);
+    const structuralRole = stringValue2(scope.structural_role);
     const hasBlockIds = blockIds.length > 0;
     const sourceOnly = sourceId !== undefined && structuralRole === undefined && !hasBlockIds;
     const sourceRole = sourceId !== undefined && structuralRole !== undefined && !hasBlockIds;
@@ -91746,6 +92392,17 @@ function compileOwnership(input) {
     }
     const selected = explicitBlocks ? blockIds.map((blockId) => blockById2.get(blockId)).filter((block) => block !== undefined) : (blocksBySource.get(sourceId) ?? []).filter((block) => block.structural_role === structuralRole);
     if (selected.length === 0) {
+      if (sourceRole && defaultOwnershipRoleForStructuralRole(structuralRole) !== undefined) {
+        ownershipNoopGroups.push({
+          index: index2,
+          source_id: sourceId,
+          structural_role: structuralRole,
+          reason_code: "align-intent-ownership-scope-redundant",
+          message: "No matching coverable blocks remain for this structural role; the source-wide default/automatic ownership policy already handles this non-content role when present.",
+          next_action: "Remove this ownership_groups[] entry unless you need an explicit block_ownership[] override for a specific block."
+        });
+        return;
+      }
       input.issues.push({
         path: `ownership_groups[${index2}].scope`,
         message: "ownership group scope matched no coverable blocks",
@@ -91794,7 +92451,7 @@ function compileOwnership(input) {
     finalRoles.set(blockId, roleOf(entry.record, block));
   }
   for (const patch of explicitPatches) {
-    const blockId = stringValue(patch.block_id);
+    const blockId = stringValue2(patch.block_id);
     if (blockId !== undefined)
       finalRoles.set(blockId, roleOf(patch, blockById2.get(blockId)));
   }
@@ -91802,6 +92459,7 @@ function compileOwnership(input) {
     blockOwnershipDefaults: defaults,
     blockOwnership: [...groupExplicitRows, ...explicitPatches],
     ownershipGroupCount: groups.length,
+    ownershipNoopGroups,
     finalRoles
   };
 }
@@ -91916,8 +92574,327 @@ function compileAlignStructureIntent(input) {
       section_groups: sections.sectionGroupCount,
       ownership_groups: ownership.ownershipGroupCount,
       ownership_defaults: ownership.blockOwnershipDefaults.length,
-      ownership_exceptions: ownership.blockOwnership.length
+      ownership_exceptions: ownership.blockOwnership.length,
+      ...ownership.ownershipNoopGroups.length > 0 ? { ownership_noop_groups: ownership.ownershipNoopGroups } : {}
+    }
+  };
+}
+// src/commands/workflowAlignEnvelope.ts
+init_currentWorkflow();
+init_nextActionEnvelope();
+var ALIGN_FINALIZE_COMMAND = "context align finalize --input - --format json";
+var ALIGN_VALIDATE_COMMAND2 = "context align validate --input - --format json";
+var ALIGN_COARSE_READ_COMMAND2 = "context align coarse-read --input - --format json";
+var ALIGN_CANDIDATE_OPS_COMMAND = "context align ops --input - --format json";
+var ALIGN_RESCAN_COMMAND = "context align scan --format json";
+var COMPILE_SCAN_COMMAND2 = "context compile scan --format json";
+var ALIGN_READ_PLAN_COMMAND = "context workflow show --payload align-segments --view read-plan --unwrap --format json";
+var ALIGN_SOURCE_BUNDLE_COMMAND = "context workflow show --payload align-segments --view source-bundle --unwrap --format text";
+function alignWorkflowEnvelopeContext(state, digest2) {
+  return {
+    id: state.workflow_id,
+    workflow_id: state.workflow_id,
+    family: state.family,
+    stage: state.stage,
+    terminal: state.stage === "finalized" || state.stage === "closed" || state.stage === "abandoned",
+    scope_id: workflowScope(state),
+    ...digest2 !== undefined ? { digest: digest2 } : {}
+  };
+}
+function alignRouteId(route) {
+  return route.mode;
+}
+function routeReasonBreach(threshold) {
+  if (threshold.value > threshold.recommended_max)
+    return "recommended_max";
+  if (threshold.value > threshold.direct_max)
+    return "direct_max";
+  return;
+}
+function routeReason(indicator, threshold) {
+  const breach = routeReasonBreach(threshold);
+  if (breach === undefined)
+    return;
+  return {
+    indicator,
+    value: threshold.value,
+    direct_max: threshold.direct_max,
+    recommended_max: threshold.recommended_max,
+    breach
+  };
+}
+function alignRouteSummary(route) {
+  return {
+    id: alignRouteId(route),
+    hard_gate: route.hard_gate,
+    reasons: Object.entries(route.thresholds).map(([indicator, threshold]) => routeReason(indicator, threshold)).filter((reason) => reason !== undefined)
+  };
+}
+function alignSegmentsViews() {
+  return [
+    {
+      id: "read-plan",
+      purpose: "Read the compact align reading plan and follow its single next_action command.",
+      evidence_role: "primary",
+      expected: true,
+      budget_safety: "compact",
+      command: ALIGN_READ_PLAN_COMMAND
+    },
+    {
+      id: "source-bundle",
+      purpose: "Read the near-source text bundle only when read-plan recommends it.",
+      evidence_role: "primary",
+      expected: false,
+      budget_safety: "paged",
+      command: ALIGN_SOURCE_BUNDLE_COMMAND
+    },
+    {
+      id: "blocks",
+      purpose: "Drill into paged align block JSON only when read-plan or source-bundle asks for a scoped fallback.",
+      evidence_role: "primary",
+      expected: false,
+      budget_safety: "paged",
+      command: "context workflow show --payload align-segments --view blocks --page-size 10 --token-budget 8000 --unwrap --format json"
+    },
+    {
+      id: "block-index",
+      purpose: "List block ids, ordinals, structural roles, and heading paths without text.",
+      evidence_role: "supporting",
+      expected: false,
+      budget_safety: "compact",
+      command: "context workflow show --payload align-segments --view block-index --unwrap --format json"
+    },
+    {
+      id: "source-mapping",
+      purpose: "Inspect source to block mapping without full block text.",
+      evidence_role: "supporting",
+      expected: false,
+      budget_safety: "compact",
+      command: "context workflow show --payload align-segments --view source-mapping --unwrap --format json"
+    },
+    {
+      id: "pending-relation-refs",
+      purpose: "Inspect explicit Parent/Children/Related markdown relation refs before deciding contains_parent or domain child refs.",
+      evidence_role: "supporting",
+      expected: false,
+      budget_safety: "compact",
+      command: "context workflow show --payload align-segments --view pending-relation-refs --unwrap --format json"
+    },
+    {
+      id: "windows",
+      purpose: "Page source windows to choose narrower block reads for large sources.",
+      evidence_role: "supporting",
+      expected: false,
+      budget_safety: "paged",
+      command: "context workflow show --payload align-segments --view windows --page-size 10 --compact-hints --unwrap --format json"
+    },
+    {
+      id: "segment",
+      purpose: "Read compact align segment summary and route metadata.",
+      evidence_role: "diagnostic",
+      expected: false,
+      budget_safety: "compact",
+      command: "context workflow show --payload align-segments --view segment --unwrap --format json"
     }
+  ];
+}
+function alignInspectCommands() {
+  return {
+    read_plan: ALIGN_READ_PLAN_COMMAND,
+    summary: "context workflow show --payload align-segments --view segment --unwrap --format json",
+    pending_relation_refs: "context workflow show --payload align-segments --view pending-relation-refs --unwrap --format json"
+  };
+}
+function alignInspectCommandTemplates() {
+  return {
+    source_bundle: ALIGN_SOURCE_BUNDLE_COMMAND,
+    source_pending_relation_refs: "context workflow show --payload align-segments --view pending-relation-refs --source <source-id> --unwrap --format json",
+    source_block_index: "context workflow show --payload align-segments --view block-index --source <source-id> --unwrap --format json",
+    heading_block_index: "context workflow show --payload align-segments --view block-index --heading <heading-prefix> --unwrap --format json",
+    source_blocks: "context workflow show --payload align-segments --view blocks --source <source-id> --page-size 10 --token-budget 8000 --unwrap --format json",
+    heading_blocks: "context workflow show --payload align-segments --view blocks --heading <heading-prefix> --page-size 10 --token-budget 8000 --unwrap --format json",
+    block_detail: "context workflow show --payload align-segments --view blocks --window <window-id|src-N:M[,selector...]> --page-size 10 --token-budget 8000 --unwrap --format json"
+  };
+}
+function classifyAlignWindow(input) {
+  if (input.tokenEstimate > 8000 || input.blockCount > 30 || input.multiSubsection)
+    return "complex";
+  if (input.tokenEstimate > 3000 || input.blockCount > 12)
+    return "moderate";
+  return "simple";
+}
+function readStrategyForComplexity(complexity) {
+  if (complexity === "complex")
+    return "drill_by_window_or_heading_before_deciding_structure";
+  if (complexity === "moderate")
+    return "read_budgeted_blocks_then_expand_selected_windows";
+  return "read_budgeted_blocks_directly";
+}
+function alignSourceComplexitySummaries(segments) {
+  const coverableBlockIds = new Set(segments.coverage.coverable_block_ids);
+  return segments.sources.map((source2) => {
+    const coverableBlocks2 = source2.blocks.filter((block) => coverableBlockIds.has(block.block_id));
+    const largestWindowTokens = source2.windows.reduce((max, window2) => Math.max(max, window2.token_estimate), 0);
+    const sourceComplexity = source2.windows.some((window2) => classifyAlignWindow({
+      tokenEstimate: window2.token_estimate,
+      blockCount: window2.block_ids.length,
+      multiSubsection: window2.multi_subsection === true
+    }) === "complex") || source2.windows.length > 6 || coverableBlocks2.length > 50 ? "complex" : source2.windows.some((window2) => classifyAlignWindow({
+      tokenEstimate: window2.token_estimate,
+      blockCount: window2.block_ids.length,
+      multiSubsection: window2.multi_subsection === true
+    }) === "moderate") || source2.windows.length > 3 || coverableBlocks2.length > 20 ? "moderate" : "simple";
+    return {
+      source_id: source2.source_id,
+      block_count: source2.blocks.length,
+      coverable_block_count: coverableBlocks2.length,
+      window_count: source2.windows.length,
+      total_tokens: source2.total_tokens,
+      largest_window_tokens: largestWindowTokens,
+      complexity_class: sourceComplexity,
+      suggested_read_strategy: readStrategyForComplexity(sourceComplexity),
+      windows: source2.windows.map((window2) => {
+        const complexity = classifyAlignWindow({
+          tokenEstimate: window2.token_estimate,
+          blockCount: window2.block_ids.length,
+          multiSubsection: window2.multi_subsection === true
+        });
+        return {
+          window_id: window2.window_id,
+          block_count: window2.block_ids.length,
+          token_estimate: window2.token_estimate,
+          line_start: window2.line_start,
+          line_end: window2.line_end,
+          heading_path: window2.heading_path,
+          complexity_class: complexity,
+          suggested_read_strategy: readStrategyForComplexity(complexity)
+        };
+      })
+    };
+  });
+}
+function pendingRelationRefsCount2(segments) {
+  return segments.sources.reduce((sum, source2) => sum + (source2.pending_relation_refs?.length ?? 0), 0);
+}
+function alignComplexityDiagnostics(input) {
+  const automaticOwnershipAdjustments = automaticOwnershipAdjustmentCandidates(input.segments);
+  const relationRefsCount = pendingRelationRefsCount2(input.segments);
+  return {
+    summary: {
+      route_mode: input.route.mode,
+      complexity: input.route.complexity,
+      source_count: input.route.thresholds.source_count.value,
+      coverable_block_count: input.route.thresholds.coverable_block_count.value,
+      estimated_coverable_tokens: input.route.thresholds.estimated_coverable_tokens.value,
+      largest_window_tokens: input.route.thresholds.largest_window_tokens.value,
+      estimated_response_chars: input.route.thresholds.estimated_response_chars.value,
+      windows: input.segments.sources.reduce((sum, source2) => sum + source2.windows.length, 0),
+      structural_changes: input.structuralChanges,
+      content_only_changes: input.contentOnlyChanges,
+      ...relationRefsCount > 0 ? { pending_relation_refs: relationRefsCount } : {}
+    },
+    ...relationRefsCount > 0 ? {
+      warnings: [{
+        code: "align-pending-relation-refs",
+        severity: "info",
+        message: `${relationRefsCount} explicit Parent/Children/Related markdown relation ref(s) were detected.`,
+        detail_view_command: "context workflow show --payload align-segments --view pending-relation-refs --unwrap --format json"
+      }]
+    } : {},
+    automatic_ownership_adjustments: compactAutomaticOwnershipAdjustments(automaticOwnershipAdjustments, {
+      ...input.automaticOwnershipDetailCommand !== undefined ? { detailCommand: input.automaticOwnershipDetailCommand } : {}
+    })
+  };
+}
+function alignNextActionForRoute(input) {
+  if (input.hasWork) {
+    return {
+      kind: "show_view",
+      command: ALIGN_READ_PLAN_COMMAND,
+      reason_code: `${input.route.mode}-read-plan`,
+      blocking: true
+    };
+  }
+  if (input.contentOnlyChanges > 0) {
+    return {
+      kind: "start_compile_scan",
+      command: COMPILE_SCAN_COMMAND2,
+      reason_code: "align-content-only-changes"
+    };
+  }
+  return {
+    kind: "stop_noop",
+    reason_code: "align-no-structural-work"
+  };
+}
+function alignAllowedActionsForNextAction(nextAction) {
+  if (nextAction.kind === "show_view")
+    return ["show_view"];
+  if (nextAction.kind === "submit_structure_decision")
+    return ["show_view", "submit_structure_decision"];
+  if (nextAction.kind === "validate_align_decision")
+    return ["show_view", "validate_align_decision"];
+  if (nextAction.kind === "submit_coarse_read")
+    return ["show_view", "submit_coarse_read"];
+  if (nextAction.kind === "submit_candidate_ops")
+    return ["show_view", "submit_candidate_ops"];
+  if (nextAction.kind === "abandon_or_rescan")
+    return ["show_view", "abandon", "rescan"];
+  if (nextAction.kind === "start_compile_scan")
+    return ["show_view"];
+  return;
+}
+function createAlignRouteEnvelope(input) {
+  const allowedActions = alignAllowedActionsForNextAction(input.nextAction);
+  const views = input.nextAction.kind === "stop_noop" || input.nextAction.kind === "start_compile_scan" ? undefined : alignSegmentsViews();
+  return createNextActionEnvelope({
+    workflow: alignWorkflowEnvelopeContext(input.workflowState),
+    route: alignRouteSummary(input.route),
+    ...allowedActions !== undefined ? { allowed_actions: allowedActions } : {},
+    next_action: input.nextAction,
+    ...views !== undefined ? { views } : {},
+    ...input.diagnostics !== undefined ? { diagnostics: input.diagnostics } : {}
+  });
+}
+function alignDirectFinalizeNextAction(reasonCode = "align-route-direct-finalize", inputSchema = "align-structure-intent") {
+  return {
+    kind: "submit_structure_decision",
+    command: ALIGN_FINALIZE_COMMAND,
+    input_schema: inputSchema,
+    reason_code: reasonCode,
+    blocking: true
+  };
+}
+function alignValidateNextAction(reasonCode = "align-validate-repair-required", inputSchema = "align-structure-intent") {
+  return {
+    kind: "validate_align_decision",
+    command: ALIGN_VALIDATE_COMMAND2,
+    input_schema: inputSchema,
+    reason_code: reasonCode,
+    blocking: true
+  };
+}
+function alignBatchedNextAction(kind) {
+  return kind === "submit_candidate_ops" ? {
+    kind,
+    command: ALIGN_CANDIDATE_OPS_COMMAND,
+    input_schema: "align-candidate-ops",
+    reason_code: "align-route-batched-review-required",
+    blocking: true
+  } : {
+    kind,
+    command: ALIGN_COARSE_READ_COMMAND2,
+    input_schema: "align-coarse-read",
+    reason_code: "align-route-batched-review-required",
+    blocking: true
+  };
+}
+function alignAbandonOrRescanNextAction(reasonCode) {
+  return {
+    kind: "abandon_or_rescan",
+    command: ALIGN_RESCAN_COMMAND,
+    reason_code: reasonCode,
+    blocking: true
   };
 }
 
@@ -91970,7 +92947,7 @@ function unplannedEvidenceIssues(input) {
     reason_code: input.inputSchema === "align-structure-intent" ? "align-intent-unplanned-evidence-blocks" : "align-finalize-unplanned-evidence-blocks",
     message: `${unplanned.length} owned/shared citation evidence block(s) are not included in any planned Section.`,
     diagnostics: {
-      target_path: path13,
+      target_field: path13,
       unplanned_evidence_block_ids: blockIds,
       unplanned_evidence_blocks: unplanned.slice(0, 12).map(unplannedEvidenceBlockContext),
       unplanned_evidence_blocks_omitted: Math.max(0, unplanned.length - 12),
@@ -92014,6 +92991,132 @@ function unplannedEvidenceBlockContext(block) {
     ...block.text_preview !== undefined ? { text_preview: block.text_preview } : {}
   };
 }
+function sameHeadingPath2(left, right) {
+  return left.length === right.length && left.every((item, index2) => item === right[index2]);
+}
+function commonHeadingPrefix(groups) {
+  if (groups.length === 0)
+    return [];
+  const first = groups[0].heading_path;
+  const prefix = [];
+  for (let index2 = 0;index2 < first.length; index2 += 1) {
+    const value = first[index2];
+    if (value === undefined || groups.some((group) => group.heading_path[index2] !== value))
+      break;
+    prefix.push(value);
+  }
+  return prefix;
+}
+function splitSectionPlanByHeadingPath(ownership, plan) {
+  const blockById2 = new Map(ownership.sources.flatMap((source2) => source2.blocks.map((block) => [block.block_id, block])));
+  const groups = [];
+  for (const blockId of plan.block_ids) {
+    const block = blockById2.get(blockId);
+    if (block === undefined)
+      continue;
+    const previous3 = groups.at(-1);
+    if (previous3 !== undefined && sameHeadingPath2(previous3.heading_path, block.heading_path)) {
+      previous3.block_ids.push(blockId);
+      if (previous3.line_range !== undefined)
+        previous3.line_range[1] = block.line_end;
+      continue;
+    }
+    groups.push({
+      heading_path: [...block.heading_path],
+      block_ids: [blockId],
+      source_id: block.source_id,
+      line_range: [block.line_start, block.line_end]
+    });
+  }
+  return groups;
+}
+function sectionPlanCrossHeadingHints(input) {
+  const spans = (input.ownership.section_plans ?? []).map((plan) => ({ plan, heading_groups: splitSectionPlanByHeadingPath(input.ownership, plan) })).filter((item) => item.heading_groups.length > 1);
+  if (spans.length === 0)
+    return [];
+  const targetField = input.inputSchema === "align-structure-intent" ? "section_groups" : "sections";
+  const classifiedSpans = spans.map((span) => ({
+    ...span,
+    shared_heading: commonHeadingPrefix(span.heading_groups)
+  }));
+  const examplesFor = (items, input2) => items.slice(0, 5).map(({ plan, heading_groups: headingGroups, shared_heading: sharedHeading }) => {
+    return {
+      section_id: plan.section_id,
+      owner: plan.owner,
+      section_kind: plan.section_kind,
+      heading_group_count: headingGroups.length,
+      ...sharedHeading.length > 0 ? { shared_heading: sharedHeading } : {},
+      heading_groups: headingGroups.map((group) => ({
+        heading_path: group.heading_path,
+        block_ids: group.block_ids,
+        ...group.source_id !== undefined ? { source_id: group.source_id } : {},
+        ...group.line_range !== undefined ? { line_range: group.line_range } : {}
+      })),
+      ...input2.includeSplitPayload ? { suggested_split_payload: headingGroups.map((group) => ({
+        owner: plan.owner,
+        section_kind: plan.section_kind,
+        block_ids: group.block_ids,
+        rationale: `Evidence under ${group.heading_path.join(" > ") || "<root>"}.`
+      })) } : {}
+    };
+  });
+  const sharedParent = classifiedSpans.filter((item) => item.shared_heading.length > 0);
+  const unrelated = classifiedSpans.filter((item) => item.shared_heading.length === 0);
+  const hints = [];
+  if (sharedParent.length > 0) {
+    hints.push({
+      code: "align-section-plan-crosses-headings",
+      severity: "info",
+      message: `${sharedParent.length} planned section(s) span sibling source headings under a shared parent heading. Semantic aggregation is allowed when the Section intentionally covers that parent topic.`,
+      next_action: `Continue if each ${targetField} entry is one coherent semantic Section for the shared parent topic. Split only when the sibling headings should become independently drafted Sections.`,
+      command: "context schema align-structure-intent --view minimal --format json",
+      diagnostics: {
+        section_count: sharedParent.length,
+        target_field: targetField,
+        heading_relationship: "shared_parent",
+        examples: examplesFor(sharedParent, { includeSplitPayload: false }),
+        examples_omitted: Math.max(0, sharedParent.length - 5)
+      }
+    });
+  }
+  if (unrelated.length > 0) {
+    hints.push({
+      code: "align-section-plan-crosses-headings",
+      severity: "warning",
+      message: `${unrelated.length} planned section(s) cross unrelated source heading boundaries. CLI will not rewrite the grouping; review whether this was intentional.`,
+      next_action: `If accidental, split ${targetField} by the suggested heading groups and rerun align validate/finalize. If intentional, continue; compile source-refs will still expose separate draft templates for heading-boundary runs.`,
+      command: "context schema align-structure-intent --view minimal --format json",
+      diagnostics: {
+        section_count: unrelated.length,
+        target_field: targetField,
+        heading_relationship: "unrelated_parent",
+        examples: examplesFor(unrelated, { includeSplitPayload: true }),
+        examples_omitted: Math.max(0, unrelated.length - 5)
+      }
+    });
+  }
+  return hints;
+}
+function sectionPlanAutoSplitAgentHints(ownership) {
+  const splitPlans = (ownership.section_plans ?? []).filter((plan) => plan.split_reason !== undefined && typeof plan.origin_section_id === "string");
+  if (splitPlans.length === 0)
+    return [];
+  const originSectionIds = [...new Set(splitPlans.map((plan) => plan.origin_section_id))].sort();
+  const splitReasons = [...new Set(splitPlans.flatMap((plan) => plan.split_reason === undefined ? [] : [plan.split_reason]))].sort();
+  return [{
+    code: "align-section-plans-auto-split-contiguous-runs",
+    severity: "info",
+    message: `${originSectionIds.length} align planned section(s) will be split into ${splitPlans.length} draft-ready section plan(s) by citation continuity.`,
+    next_action: "Continue. During compile, use the emitted section_plans/source-refs draft_action_templates as separate draft actions by default; origin_section_id preserves the original align grouping.",
+    command: COMPILE_SCAN_COMMAND2,
+    diagnostics: {
+      origin_section_ids: originSectionIds,
+      split_section_plan_count: originSectionIds.length,
+      emitted_section_plan_count: splitPlans.length,
+      split_reasons: splitReasons
+    }
+  }];
+}
 function agentHintsForCitationAdvisories(issues) {
   return issues.map((issue2) => ({
     code: issue2.code,
@@ -92027,40 +93130,6 @@ function agentHintsForCitationAdvisories(issues) {
 }
 function agentHintsForAuditWarnings(warnings) {
   return warnings.flatMap((warning) => {
-    if (warning.kind === "domain_downgrade") {
-      return [{
-        code: "align-domain-downgraded-to-entity",
-        severity: "warning",
-        message: `Node "${warning.node_slug ?? "<unknown>"}" was finalized as an entity because ${warning.reason}. context status counts finalized node types, not submitted proposals.`,
-        next_action: "Continue if an atomic placeholder/term is acceptable. If this should remain a Domain, revise domain_gate.child_refs to resolvable child Node slugs and rerun align validate/finalize.",
-        command: "context schema align-structure-intent --view minimal --format json",
-        ...warning.node_slug !== undefined ? { target_node: warning.node_slug } : {},
-        ...warning.evidence_blocks !== undefined ? { available_block_ids: warning.evidence_blocks } : {},
-        diagnostics: {
-          finalized_node_type: "entity",
-          status_count_source: "finalized_node_type",
-          reason: warning.reason,
-          ...warning.original_proposal !== undefined ? { original_proposal: warning.original_proposal } : {}
-        }
-      }];
-    }
-    if (warning.kind === "action_downgrade") {
-      return [{
-        code: "align-action-downgraded-to-entity",
-        severity: "warning",
-        message: `Node "${warning.node_slug ?? "<unknown>"}" was finalized as an entity because ${warning.reason}. context status counts finalized node types, not submitted proposals.`,
-        next_action: "Continue if the evidence describes a subject rather than a repeatable process. If this should remain an Action, add explicit action_probe/action_gate evidence and rerun align validate/finalize.",
-        command: "context schema align-structure-intent --view minimal --format json",
-        ...warning.node_slug !== undefined ? { target_node: warning.node_slug } : {},
-        ...warning.evidence_blocks !== undefined ? { available_block_ids: warning.evidence_blocks } : {},
-        diagnostics: {
-          finalized_node_type: "entity",
-          status_count_source: "finalized_node_type",
-          reason: warning.reason,
-          ...warning.original_proposal !== undefined ? { original_proposal: warning.original_proposal } : {}
-        }
-      }];
-    }
     if (warning.kind === "scope_name_entity_hint") {
       return [{
         code: "align-scope-name-entity-warning",
@@ -92335,6 +93404,8 @@ function validateAlignStructureDecisionWithContext(input) {
   const auditHints = built === undefined ? errorHints : [
     ...errorHints,
     ...canonicalDecisionDirectHint(input.rawDecision),
+    ...sectionPlanAutoSplitAgentHints(built.ownership),
+    ...sectionPlanCrossHeadingHints({ ownership: built.ownership, inputSchema: built.inputSchema }),
     ...agentHintsForAuditWarnings(built.decision.audit_warnings),
     ...agentHintsForCitationAdvisories(built.citationAdvisories),
     ...agentHintsForCliDemotions(cliDemotions)
@@ -92364,325 +93435,6 @@ function validateAlignStructureDecisionWithContext(input) {
   };
 }
 
-// src/commands/workflowAlignEnvelope.ts
-init_currentWorkflow();
-init_nextActionEnvelope();
-var ALIGN_FINALIZE_COMMAND = "context align finalize --input - --format json";
-var ALIGN_VALIDATE_COMMAND2 = "context align validate --input - --format json";
-var ALIGN_COARSE_READ_COMMAND2 = "context align coarse-read --input - --format json";
-var ALIGN_CANDIDATE_OPS_COMMAND = "context align ops --input - --format json";
-var ALIGN_RESCAN_COMMAND = "context align scan --format json";
-var COMPILE_SCAN_COMMAND2 = "context compile scan --format json";
-var ALIGN_READ_PLAN_COMMAND = "context workflow show --payload align-segments --view read-plan --unwrap --format json";
-var ALIGN_SOURCE_BUNDLE_COMMAND = "context workflow show --payload align-segments --view source-bundle --unwrap --format text";
-function alignWorkflowEnvelopeContext(state, digest2) {
-  return {
-    id: state.workflow_id,
-    workflow_id: state.workflow_id,
-    family: state.family,
-    stage: state.stage,
-    terminal: state.stage === "finalized" || state.stage === "closed" || state.stage === "abandoned",
-    scope_id: workflowScope(state),
-    ...digest2 !== undefined ? { digest: digest2 } : {}
-  };
-}
-function alignRouteId(route) {
-  return route.mode;
-}
-function routeReasonBreach(threshold) {
-  if (threshold.value > threshold.recommended_max)
-    return "recommended_max";
-  if (threshold.value > threshold.direct_max)
-    return "direct_max";
-  return;
-}
-function routeReason(indicator, threshold) {
-  const breach = routeReasonBreach(threshold);
-  if (breach === undefined)
-    return;
-  return {
-    indicator,
-    value: threshold.value,
-    direct_max: threshold.direct_max,
-    recommended_max: threshold.recommended_max,
-    breach
-  };
-}
-function alignRouteSummary(route) {
-  return {
-    id: alignRouteId(route),
-    hard_gate: route.hard_gate,
-    reasons: Object.entries(route.thresholds).map(([indicator, threshold]) => routeReason(indicator, threshold)).filter((reason) => reason !== undefined)
-  };
-}
-function alignSegmentsViews() {
-  return [
-    {
-      id: "read-plan",
-      purpose: "Read the compact align reading plan and follow its single next_action command.",
-      evidence_role: "primary",
-      expected: true,
-      budget_safety: "compact",
-      command: ALIGN_READ_PLAN_COMMAND
-    },
-    {
-      id: "source-bundle",
-      purpose: "Read the near-source text bundle only when read-plan recommends it.",
-      evidence_role: "primary",
-      expected: false,
-      budget_safety: "paged",
-      command: ALIGN_SOURCE_BUNDLE_COMMAND
-    },
-    {
-      id: "blocks",
-      purpose: "Drill into paged align block JSON only when read-plan or source-bundle asks for a scoped fallback.",
-      evidence_role: "primary",
-      expected: false,
-      budget_safety: "paged",
-      command: "context workflow show --payload align-segments --view blocks --page-size 10 --token-budget 8000 --unwrap --format json"
-    },
-    {
-      id: "block-index",
-      purpose: "List block ids, ordinals, structural roles, and heading paths without text.",
-      evidence_role: "supporting",
-      expected: false,
-      budget_safety: "compact",
-      command: "context workflow show --payload align-segments --view block-index --unwrap --format json"
-    },
-    {
-      id: "source-mapping",
-      purpose: "Inspect source to block mapping without full block text.",
-      evidence_role: "supporting",
-      expected: false,
-      budget_safety: "compact",
-      command: "context workflow show --payload align-segments --view source-mapping --unwrap --format json"
-    },
-    {
-      id: "pending-relation-refs",
-      purpose: "Inspect explicit Parent/Children/Related markdown relation refs before deciding contains_parent or domain child refs.",
-      evidence_role: "supporting",
-      expected: false,
-      budget_safety: "compact",
-      command: "context workflow show --payload align-segments --view pending-relation-refs --unwrap --format json"
-    },
-    {
-      id: "windows",
-      purpose: "Page source windows to choose narrower block reads for large sources.",
-      evidence_role: "supporting",
-      expected: false,
-      budget_safety: "paged",
-      command: "context workflow show --payload align-segments --view windows --page-size 10 --compact-hints --unwrap --format json"
-    },
-    {
-      id: "segment",
-      purpose: "Read compact align segment summary and route metadata.",
-      evidence_role: "diagnostic",
-      expected: false,
-      budget_safety: "compact",
-      command: "context workflow show --payload align-segments --view segment --unwrap --format json"
-    }
-  ];
-}
-function alignInspectCommands() {
-  return {
-    read_plan: ALIGN_READ_PLAN_COMMAND,
-    summary: "context workflow show --payload align-segments --view segment --unwrap --format json",
-    pending_relation_refs: "context workflow show --payload align-segments --view pending-relation-refs --unwrap --format json"
-  };
-}
-function alignInspectCommandTemplates() {
-  return {
-    source_bundle: ALIGN_SOURCE_BUNDLE_COMMAND,
-    source_pending_relation_refs: "context workflow show --payload align-segments --view pending-relation-refs --source <source-id> --unwrap --format json",
-    source_block_index: "context workflow show --payload align-segments --view block-index --source <source-id> --unwrap --format json",
-    heading_block_index: "context workflow show --payload align-segments --view block-index --heading <heading-prefix> --unwrap --format json",
-    source_blocks: "context workflow show --payload align-segments --view blocks --source <source-id> --page-size 10 --token-budget 8000 --unwrap --format json",
-    heading_blocks: "context workflow show --payload align-segments --view blocks --heading <heading-prefix> --page-size 10 --token-budget 8000 --unwrap --format json",
-    block_detail: "context workflow show --payload align-segments --view blocks --window <window-id|src-N:M[,selector...]> --page-size 10 --token-budget 8000 --unwrap --format json"
-  };
-}
-function classifyAlignWindow(input) {
-  if (input.tokenEstimate > 8000 || input.blockCount > 30 || input.multiSubsection)
-    return "complex";
-  if (input.tokenEstimate > 3000 || input.blockCount > 12)
-    return "moderate";
-  return "simple";
-}
-function readStrategyForComplexity(complexity) {
-  if (complexity === "complex")
-    return "drill_by_window_or_heading_before_deciding_structure";
-  if (complexity === "moderate")
-    return "read_budgeted_blocks_then_expand_selected_windows";
-  return "read_budgeted_blocks_directly";
-}
-function alignSourceComplexitySummaries(segments) {
-  const coverableBlockIds = new Set(segments.coverage.coverable_block_ids);
-  return segments.sources.map((source2) => {
-    const coverableBlocks2 = source2.blocks.filter((block) => coverableBlockIds.has(block.block_id));
-    const largestWindowTokens = source2.windows.reduce((max, window2) => Math.max(max, window2.token_estimate), 0);
-    const sourceComplexity = source2.windows.some((window2) => classifyAlignWindow({
-      tokenEstimate: window2.token_estimate,
-      blockCount: window2.block_ids.length,
-      multiSubsection: window2.multi_subsection === true
-    }) === "complex") || source2.windows.length > 6 || coverableBlocks2.length > 50 ? "complex" : source2.windows.some((window2) => classifyAlignWindow({
-      tokenEstimate: window2.token_estimate,
-      blockCount: window2.block_ids.length,
-      multiSubsection: window2.multi_subsection === true
-    }) === "moderate") || source2.windows.length > 3 || coverableBlocks2.length > 20 ? "moderate" : "simple";
-    return {
-      source_id: source2.source_id,
-      block_count: source2.blocks.length,
-      coverable_block_count: coverableBlocks2.length,
-      window_count: source2.windows.length,
-      total_tokens: source2.total_tokens,
-      largest_window_tokens: largestWindowTokens,
-      complexity_class: sourceComplexity,
-      suggested_read_strategy: readStrategyForComplexity(sourceComplexity),
-      windows: source2.windows.map((window2) => {
-        const complexity = classifyAlignWindow({
-          tokenEstimate: window2.token_estimate,
-          blockCount: window2.block_ids.length,
-          multiSubsection: window2.multi_subsection === true
-        });
-        return {
-          window_id: window2.window_id,
-          block_count: window2.block_ids.length,
-          token_estimate: window2.token_estimate,
-          line_start: window2.line_start,
-          line_end: window2.line_end,
-          heading_path: window2.heading_path,
-          complexity_class: complexity,
-          suggested_read_strategy: readStrategyForComplexity(complexity)
-        };
-      })
-    };
-  });
-}
-function pendingRelationRefsCount2(segments) {
-  return segments.sources.reduce((sum, source2) => sum + (source2.pending_relation_refs?.length ?? 0), 0);
-}
-function alignComplexityDiagnostics(input) {
-  const automaticOwnershipAdjustments = automaticOwnershipAdjustmentCandidates(input.segments);
-  const relationRefsCount = pendingRelationRefsCount2(input.segments);
-  return {
-    summary: {
-      route_mode: input.route.mode,
-      complexity: input.route.complexity,
-      source_count: input.route.thresholds.source_count.value,
-      coverable_block_count: input.route.thresholds.coverable_block_count.value,
-      estimated_coverable_tokens: input.route.thresholds.estimated_coverable_tokens.value,
-      largest_window_tokens: input.route.thresholds.largest_window_tokens.value,
-      estimated_response_chars: input.route.thresholds.estimated_response_chars.value,
-      windows: input.segments.sources.reduce((sum, source2) => sum + source2.windows.length, 0),
-      structural_changes: input.structuralChanges,
-      content_only_changes: input.contentOnlyChanges,
-      ...relationRefsCount > 0 ? { pending_relation_refs: relationRefsCount } : {}
-    },
-    ...relationRefsCount > 0 ? {
-      warnings: [{
-        code: "align-pending-relation-refs",
-        severity: "info",
-        message: `${relationRefsCount} explicit Parent/Children/Related markdown relation ref(s) were detected.`,
-        detail_view_command: "context workflow show --payload align-segments --view pending-relation-refs --unwrap --format json"
-      }]
-    } : {},
-    automatic_ownership_adjustments: compactAutomaticOwnershipAdjustments(automaticOwnershipAdjustments, {
-      ...input.automaticOwnershipDetailCommand !== undefined ? { detailCommand: input.automaticOwnershipDetailCommand } : {}
-    })
-  };
-}
-function alignNextActionForRoute(input) {
-  if (input.hasWork) {
-    return {
-      kind: "show_view",
-      command: ALIGN_READ_PLAN_COMMAND,
-      reason_code: `${input.route.mode}-read-plan`,
-      blocking: true
-    };
-  }
-  if (input.contentOnlyChanges > 0) {
-    return {
-      kind: "start_compile_scan",
-      command: COMPILE_SCAN_COMMAND2,
-      reason_code: "align-content-only-changes"
-    };
-  }
-  return {
-    kind: "stop_noop",
-    reason_code: "align-no-structural-work"
-  };
-}
-function alignAllowedActionsForNextAction(nextAction) {
-  if (nextAction.kind === "show_view")
-    return ["show_view"];
-  if (nextAction.kind === "submit_structure_decision")
-    return ["show_view", "submit_structure_decision"];
-  if (nextAction.kind === "validate_align_decision")
-    return ["show_view", "validate_align_decision"];
-  if (nextAction.kind === "submit_coarse_read")
-    return ["show_view", "submit_coarse_read"];
-  if (nextAction.kind === "submit_candidate_ops")
-    return ["show_view", "submit_candidate_ops"];
-  if (nextAction.kind === "abandon_or_rescan")
-    return ["show_view", "abandon", "rescan"];
-  if (nextAction.kind === "start_compile_scan")
-    return ["show_view"];
-  return;
-}
-function createAlignRouteEnvelope(input) {
-  const allowedActions = alignAllowedActionsForNextAction(input.nextAction);
-  const views = input.nextAction.kind === "stop_noop" || input.nextAction.kind === "start_compile_scan" ? undefined : alignSegmentsViews();
-  return createNextActionEnvelope({
-    workflow: alignWorkflowEnvelopeContext(input.workflowState),
-    route: alignRouteSummary(input.route),
-    ...allowedActions !== undefined ? { allowed_actions: allowedActions } : {},
-    next_action: input.nextAction,
-    ...views !== undefined ? { views } : {},
-    ...input.diagnostics !== undefined ? { diagnostics: input.diagnostics } : {}
-  });
-}
-function alignDirectFinalizeNextAction(reasonCode = "align-route-direct-finalize", inputSchema = "align-structure-intent") {
-  return {
-    kind: "submit_structure_decision",
-    command: ALIGN_FINALIZE_COMMAND,
-    input_schema: inputSchema,
-    reason_code: reasonCode,
-    blocking: true
-  };
-}
-function alignValidateNextAction(reasonCode = "align-validate-repair-required", inputSchema = "align-structure-intent") {
-  return {
-    kind: "validate_align_decision",
-    command: ALIGN_VALIDATE_COMMAND2,
-    input_schema: inputSchema,
-    reason_code: reasonCode,
-    blocking: true
-  };
-}
-function alignBatchedNextAction(kind) {
-  return kind === "submit_candidate_ops" ? {
-    kind,
-    command: ALIGN_CANDIDATE_OPS_COMMAND,
-    input_schema: "align-candidate-ops",
-    reason_code: "align-route-batched-review-required",
-    blocking: true
-  } : {
-    kind,
-    command: ALIGN_COARSE_READ_COMMAND2,
-    input_schema: "align-coarse-read",
-    reason_code: "align-route-batched-review-required",
-    blocking: true
-  };
-}
-function alignAbandonOrRescanNextAction(reasonCode) {
-  return {
-    kind: "abandon_or_rescan",
-    command: ALIGN_RESCAN_COMMAND,
-    reason_code: reasonCode,
-    blocking: true
-  };
-}
-
 // src/commands/workflowAlignValidationViews.ts
 init_cliFeedback();
 init_errors();
@@ -92987,24 +93739,6 @@ function agentHintsForFinalizeIssues(issues) {
     };
   });
 }
-function sectionPlanAutoSplitAgentHints(ownership) {
-  const splitPlans = (ownership.section_plans ?? []).filter((plan) => plan.split_reason === "non_contiguous_citation_eligible_blocks" && typeof plan.origin_section_id === "string");
-  if (splitPlans.length === 0)
-    return [];
-  const originSectionIds = [...new Set(splitPlans.map((plan) => plan.origin_section_id))].sort();
-  return [{
-    code: "align-section-plans-auto-split-contiguous-runs",
-    severity: "info",
-    message: `${originSectionIds.length} align planned section(s) were split into ${splitPlans.length} contiguous draft-ready section plan(s).`,
-    next_action: "Continue to compile scan; use the emitted section_plans/source-refs draft_action_templates. origin_section_id preserves the original align grouping.",
-    command: COMPILE_SCAN_COMMAND2,
-    diagnostics: {
-      origin_section_ids: originSectionIds,
-      split_section_plan_count: originSectionIds.length,
-      emitted_section_plan_count: splitPlans.length
-    }
-  }];
-}
 function alignFinalizeCompileHandoffHint() {
   return {
     code: "align-finished-next-compile",
@@ -93160,11 +93894,9 @@ async function finalizeAlignStructureDecisionCommand(input) {
     decision,
     segments: finalizeContext.segments
   });
-  const sectionPlanAutoSplitHints = sectionPlanAutoSplitAgentHints(ownership);
-  const sectionPlanAutoSplitCount = (ownership.section_plans ?? []).filter((plan) => plan.split_reason === "non_contiguous_citation_eligible_blocks").length;
+  const sectionPlanAutoSplitCount = (ownership.section_plans ?? []).filter((plan) => plan.split_reason !== undefined).length;
   const auditHints = [
     ...validation.auditHints,
-    ...sectionPlanAutoSplitHints,
     alignFinalizeCompileHandoffHint()
   ];
   const automaticOwnershipAdjustments = automaticOwnershipAdjustmentsFromDemotions(cliDemotions);
@@ -94338,7 +95070,7 @@ function buildStructureProposalStarter(segments) {
           recommended_no_write_shape: {
             planned_sections: [],
             ownership: "context_only_or_ignored",
-            node_type_hint: "domain_if_children_resolve_else_entity_term",
+            node_type_hint: "domain_if_children_resolve_else_agent_chosen_entity",
             ...titleHint !== undefined ? { title_hint: titleHint } : {},
             rationale: "This source only carries relation/navigation or explicit no-detail placeholder text. Keep a Node only when the graph/slug is useful; do not create owned citation evidence or an active Section from these blocks."
           }
@@ -95936,7 +96668,7 @@ async function nodeCycleCoverageGate(input) {
       coverage_ratio: ratio,
       high_signal_unresolved: highSignalUnresolved.length,
       candidate_samples: candidateSamples,
-      patch_draft_command: `context compile draft-patch ${shellQuote(input.slug)} --input - --format json`,
+      patch_draft_command: `context compile cycle ${shellQuote(input.slug)} --input - --format json`,
       skip_unresolved_command: skipCommand
     }
   };
@@ -95980,7 +96712,7 @@ function isBlockingWeakSourceSupport(item) {
     return true;
   return support.reason_code !== undefined && support.reason_code !== "weak.soft_diff";
 }
-function sourceSupportSummary(context) {
+function sourceSupportSummary2(context) {
   return {
     supported: context.items.filter((item) => item.source_support?.verdict === "supported").length,
     weak: context.items.filter((item) => item.source_support?.verdict === "weak").length,
@@ -96421,10 +97153,6 @@ function formatDraftPlanHeadline(result) {
 function shellQuote2(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
-function formatDraftPatchHeadline(result) {
-  const counts = actionCounts(result);
-  return `${counts.total} actions parsed; draft patched; continue cycle required`;
-}
 function compileCycleContinueCommand(slug) {
   return `context compile cycle ${shellQuote2(slug)} --continue --format json`;
 }
@@ -96464,7 +97192,7 @@ function draftPlanBody(input) {
   lines.push("**Next options**:");
   lines.push("- continue: `/context:compile`");
   if (draftDigest !== undefined) {
-    lines.push(`- revise: \`context compile draft-patch ${shellQuote2(slug)} --input -\``);
+    lines.push(`- revise: \`context compile cycle ${shellQuote2(slug)} --input - --format json\``);
     lines.push(`- continue patched draft: \`${compileCycleContinueCommand(slug)}\``);
     lines.push(`- primitive: \`context reconcile prepare --mode compile --node ${shellQuote2(slug)} --view summary --format json\``);
   } else if (saved) {
@@ -96788,7 +97516,7 @@ function throwCompileDraftRecoveredError(input) {
   delete detail.category;
   delete detail.summary;
   const draftStatusCommand = `context compile draft-status ${input.slug} --format json`;
-  const patchCommand = `context compile draft-patch ${input.slug} --input - --format json`;
+  const patchCommand = `context compile cycle ${input.slug} --input - --format json`;
   const reasonCode = typeof input.error.detail?.reason_code === "string" ? input.error.detail.reason_code : "compile-draft-validation-failed";
   const envelope = createNextActionEnvelope({
     allowed_actions: ["show_view", "patch_payload"],
@@ -96944,7 +97672,8 @@ async function runCompileNodeCycle(input) {
     mode: "compile",
     node: input.slug,
     draft: normalizedDraft,
-    draftDigest: draftPayload.digest
+    draftDigest: draftPayload.digest,
+    workflowStartedAt: input.workflowState.created_at
   });
   const preparedWorkflow = await advanceCurrentWorkflow({
     ctxDir: input.ctxDir,
@@ -96994,7 +97723,7 @@ async function runCompileNodeCycle(input) {
   const narrowingSummary = sourceRefNarrowingOutput(narrowingHints, "advisory_no_action_required", input.slug);
   if (!review.ready_to_apply) {
     const cycleIssues = review.issues;
-    const supportSummary = sourceSupportSummary(context);
+    const supportSummary = sourceSupportSummary2(context);
     const reconcileSummary = reconcileStatusSummary(context);
     const issueStatus = prepareIssueStatus2({
       sourceSupport: supportSummary,
@@ -97206,7 +97935,7 @@ async function runCompileNodeCycle(input) {
       },
       available_actions: [{
         action: "patch_draft",
-        command: `context compile draft-patch ${shellQuote(input.slug)} --input - --format json`
+        command: `context compile cycle ${shellQuote(input.slug)} --input - --format json`
       }, {
         action: "inspect_coverage",
         command: coverageGate.detailCommand
@@ -97469,7 +98198,7 @@ function rejectRetiredDraftPatchFields(patchInput, slug) {
   if (issues.length === 0)
     return;
   const first = issues[0];
-  const command = `context compile draft-patch ${slug} --input - --format json`;
+  const command = `context compile cycle ${slug} --input - --format json`;
   const envelope = createNextActionEnvelope({
     allowed_actions: ["show_view", "patch_payload"],
     next_action: {
@@ -97506,7 +98235,7 @@ function rejectRetiredDraftPatchFields(patchInput, slug) {
       code: "compile-draft-patch-retired-field",
       severity: "error",
       message: first.message,
-      next_action: "Patch actions must use content plus optional summary and source_refs[]; remove retired body/detail/raw and extractive fields.",
+      next_action: "Patch actions must use content plus optional summary and source_refs[] or source_block_ids[]. Submit the corrected compile-draft-patch payload through context compile cycle.",
       command,
       node_slug: slug,
       path: first.path,
@@ -97516,12 +98245,6 @@ function rejectRetiredDraftPatchFields(patchInput, slug) {
 }
 
 // src/commands/compileNodeCycleInput.ts
-function isRecord43(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isCompileDraftPatchInput(value) {
-  return isRecord43(value) && Array.isArray(value.operations);
-}
 async function resolveNodeCycleInput(input) {
   if (input.continueSaved === true) {
     const payload2 = await readWorkflowPayloadByDigest({
@@ -97538,7 +98261,7 @@ async function resolveNodeCycleInput(input) {
       ...session2.agent_hints !== undefined ? { agentHints: session2.agent_hints } : {}
     };
   }
-  if (!isCompileDraftPatchInput(input.value)) {
+  if (!isCompileDraftPatchLikeInput(input.value)) {
     return { draft: input.value };
   }
   const payload = await readWorkflowPayloadByDigest({
@@ -97550,7 +98273,9 @@ async function resolveNodeCycleInput(input) {
   });
   const session = parseCompileDraftSession(payload.value);
   assertCompileDraftSessionNode(session, input.slug);
-  const patch = parseCompileDraftPatch(input.value);
+  const patch = parseCompileDraftPatch(input.value, {
+    submitCommand: `context compile cycle ${shellQuote(input.slug)} --input - --format json`
+  });
   rejectRetiredDraftPatchFields(input.value, input.slug);
   const patched = applyCompileDraftPatch({
     session,
@@ -97708,6 +98433,9 @@ function draftActionTemplate(kind, rows) {
     source_refs: rows.map((row) => row.source_ref)
   };
 }
+function uniqueStrings5(values2) {
+  return [...new Set(values2)].sort();
+}
 function citationEligibleOrdinals(context) {
   const ordinalByBlock = new Map;
   const rowsBySource = new Map;
@@ -97722,26 +98450,39 @@ function citationEligibleOrdinals(context) {
   }
   return { ordinalByBlock, rowsBySource };
 }
-function splitContiguousRuns(rows, ordinalByBlock) {
+function splitDraftRuns(rows, ordinalByBlock) {
   const runs = [];
+  const splitReasons = new Set;
   let current = [];
   let previousSource;
   let previousOrdinal;
+  let previousHeadingPath;
   for (const row of rows) {
     const key = sourceKey(row);
     const ordinal = blockKey(row) === null ? undefined : ordinalByBlock.get(blockKey(row));
     const contiguous = current.length > 0 && previousSource === key && previousOrdinal !== undefined && ordinal !== undefined && ordinal === previousOrdinal + 1;
-    if (current.length > 0 && !contiguous) {
+    const sameHeading2 = previousHeadingPath !== undefined && sameHeadingPath3(previousHeadingPath, row.heading_path);
+    if (current.length > 0 && (!contiguous || !sameHeading2)) {
+      splitReasons.add(contiguous ? "heading_path_changed" : "non_contiguous_citation_eligible_blocks");
       runs.push(current);
       current = [];
     }
     current.push(row);
     previousSource = key;
     previousOrdinal = ordinal;
+    previousHeadingPath = row.heading_path;
   }
   if (current.length > 0)
     runs.push(current);
-  return runs;
+  return { runs, splitReasons: [...splitReasons].sort() };
+}
+function sameHeadingPath3(left, right) {
+  return left.length === right.length && left.every((item, index2) => item === right[index2]);
+}
+function headingPathKey(value) {
+  if (!Array.isArray(value) || !value.every((item) => typeof item === "string"))
+    return;
+  return value.join("\x00");
 }
 function interveningBlockIds(input) {
   const result = new Set;
@@ -97774,6 +98515,49 @@ function recordArray(value) {
 function splitRunCount(group) {
   return numberValue(group.contiguous_run_count) ?? recordArray(group.contiguous_runs).length;
 }
+function stringArray9(value) {
+  return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
+function groupNumber(value, key) {
+  return numberValue(value[key]) ?? 0;
+}
+function groupHasMarkdownList(value) {
+  return value.contains_markdown_list === true || recordArray(value.contiguous_runs).some((run2) => run2.contains_markdown_list === true);
+}
+function groupFragmentReviewExamples(sectionGroups) {
+  const examples = [];
+  for (let index2 = 0;index2 < sectionGroups.length - 1; index2 += 1) {
+    const current = sectionGroups[index2];
+    const next = sectionGroups[index2 + 1];
+    if (current.owner !== next.owner)
+      continue;
+    const currentHeading = headingPathKey(current.heading_path);
+    const nextHeading = headingPathKey(next.heading_path);
+    if (currentHeading === undefined || currentHeading !== nextHeading)
+      continue;
+    const currentSources = stringArray9(current.source_ids);
+    const nextSources = stringArray9(next.source_ids);
+    if (currentSources.length !== 1 || nextSources.length !== 1 || currentSources[0] !== nextSources[0])
+      continue;
+    const currentBlocks = stringArray9(current.block_ids);
+    const nextBlocks = stringArray9(next.block_ids);
+    const currentSmall = groupNumber(current, "citation_block_count") <= 1 && currentBlocks.length <= 1 && !groupHasMarkdownList(current);
+    const nextLooksLarger = groupNumber(next, "citation_block_count") > 1 || groupHasMarkdownList(next);
+    if (!currentSmall || !nextLooksLarger)
+      continue;
+    examples.push({
+      section_id: current.section_id,
+      next_section_id: next.section_id,
+      owner: current.owner,
+      heading_path: current.heading_path,
+      source_ids: currentSources,
+      block_ids: currentBlocks,
+      next_block_ids: nextBlocks,
+      reason: groupHasMarkdownList(next) ? "single-block section is adjacent to a list-like section under the same heading" : "single-block section is adjacent to a larger section under the same heading"
+    });
+  }
+  return examples;
+}
 function plannedSectionSourceRefGroups(context, rows) {
   const plans = context.finalized_ownership?.groups.section_plans ?? [];
   if (plans.length === 0)
@@ -97787,9 +98571,12 @@ function plannedSectionSourceRefGroups(context, rows) {
     });
     const citationRows = resolvedRows.filter((row) => row.citation_eligible);
     const sourceRefs2 = citationRows.map((row) => row.source_ref);
+    const headingPaths = uniqueStrings5(citationRows.map((row) => row.heading_path.join("\x00")));
+    const sourceIds = uniqueStrings5(citationRows.flatMap((row) => typeof row.source_id === "string" ? [row.source_id] : []));
+    const containsMarkdownList = citationRows.some((row) => row.contains_markdown_list === true);
     const missingBlockIds = plan.block_ids.filter((blockId) => !rowByBlockId.has(blockId));
     const nonCitationBlockIds = resolvedRows.filter((row) => !row.citation_eligible).flatMap((row) => typeof row.block_id === "string" ? [row.block_id] : []);
-    const runs = splitContiguousRuns(citationRows, ordinals.ordinalByBlock);
+    const { runs, splitReasons } = splitDraftRuns(citationRows, ordinals.ordinalByBlock);
     const templates = runs.map((run2) => draftActionTemplate(plan.section_kind, run2));
     const status = missingBlockIds.length > 0 || nonCitationBlockIds.length > 0 || sourceRefs2.length === 0 ? "needs-attention" : runs.length > 1 ? "ready_with_splits" : "ready";
     const intervening = runs.length > 1 ? interveningBlockIds({
@@ -97804,14 +98591,27 @@ function plannedSectionSourceRefGroups(context, rows) {
       section_kind: plan.section_kind,
       status,
       block_ids: [...plan.block_ids],
+      citation_block_count: citationRows.length,
+      ...sourceIds.length > 0 ? { source_ids: sourceIds } : {},
+      ...headingPaths.length === 1 ? { heading_path: headingPaths[0].split("\x00") } : headingPaths.length > 1 ? { heading_paths: headingPaths.map((path14) => path14.split("\x00")) } : {},
+      ...containsMarkdownList ? { contains_markdown_list: true } : {},
       source_refs: sourceRefs2,
       ...plan.refers_to_nodes !== undefined ? { refers_to_nodes: [...plan.refers_to_nodes] } : {},
       ...missingBlockIds.length > 0 ? { missing_block_ids: missingBlockIds } : {},
       ...nonCitationBlockIds.length > 0 ? { non_citation_block_ids: nonCitationBlockIds } : {},
       ...runs.length > 1 ? {
         contiguous_run_count: runs.length,
+        draft_run_count: runs.length,
         intervening_citation_eligible_block_ids: intervening,
-        split_reason: "non_contiguous_citation_eligible_blocks",
+        split_reason: splitReasons.includes("non_contiguous_citation_eligible_blocks") ? "non_contiguous_citation_eligible_blocks" : "heading_path_changed",
+        split_reasons: splitReasons,
+        ...splitReasons.includes("heading_path_changed") ? {
+          heading_path_runs: runs.map((run2, index2) => ({
+            run_index: index2 + 1,
+            heading_path: run2[0]?.heading_path ?? [],
+            block_ids: run2.flatMap((row) => typeof row.block_id === "string" ? [row.block_id] : [])
+          }))
+        } : {},
         ...siblingCoveredIntervening.length > 0 ? {
           sibling_bridge_reason: "intervening_blocks_are_planned_by_sibling_sections",
           sibling_bridge_block_ids: siblingCoveredIntervening
@@ -97820,13 +98620,32 @@ function plannedSectionSourceRefGroups(context, rows) {
       contiguous_runs: runs.map((run2, index2) => ({
         run_index: index2 + 1,
         block_ids: run2.flatMap((row) => typeof row.block_id === "string" ? [row.block_id] : []),
-        source_refs: run2.map((row) => row.source_ref)
+        source_refs: run2.map((row) => row.source_ref),
+        ...run2[0]?.heading_path !== undefined ? { heading_path: run2[0].heading_path } : {},
+        ...run2.some((row) => row.contains_markdown_list === true) ? { contains_markdown_list: true } : {}
       })),
       draft_action_templates: templates,
       ...status === "ready_with_splits" ? {} : { draft_action_template: templates[0] ?? draftActionTemplate(plan.section_kind, []) }
     };
   });
 }
+function plannedSectionFragmentReviewHint(input) {
+  const examples = groupFragmentReviewExamples(input.sectionGroups);
+  if (examples.length === 0)
+    return;
+  return {
+    code: "compile-planned-section-fragment-review",
+    severity: "info",
+    message: `${examples.length} adjacent planned section pair(s) may be over-fragmented under the same source heading.`,
+    next_action: "Review these pairs before drafting. If a small lead-in and the following section are one knowledge unit, intentionally combine them in the draft or revise align; otherwise keep the planned groups separate.",
+    command: input.detailCommand,
+    diagnostics: {
+      pair_count: examples.length,
+      examples: examples.slice(0, 8),
+      examples_omitted: Math.max(0, examples.length - 8)
+    }
+  };
+}
 function plannedSectionSplitRequiredHint(input) {
   const sectionGroups = input.sectionGroups ?? plannedSectionSourceRefGroups(input.context, nodeContextSourceRefRows(input.context));
   const splitGroups = sectionGroups.filter((group) => group.status === "ready_with_splits");
@@ -97842,7 +98661,7 @@ function plannedSectionSplitRequiredHint(input) {
     code: "compile-planned-section-groups-require-split",
     severity: "info",
     message: `Node has ${sectionGroups.length} planned section group(s); ${splitGroups.length} must be split into separate draft actions${bridgeSuffix}.`,
-    next_action: "Read source-refs view before drafting; copy each planned_section_groups[].draft_action_templates entry as a separate draft action. Do not merge templates or contiguous runs.",
+    next_action: "Read source-refs view before drafting; copy each planned_section_groups[].draft_action_templates entry as a separate draft action. Do not merge templates, citation-gap runs, or heading-boundary runs.",
     command: input.detailCommand,
     diagnostics: {
       planned_section_groups_count: sectionGroups.length,
@@ -98262,7 +99081,7 @@ var COMMON_DOTTED_IDENTIFIER_ROOTS = new Set([
   "Buffer"
 ]);
 var CODE_ROOT_SUFFIX_RE = /(?:API|Api|Service|Client|Controller|Repository|Manager|Handler|Factory|Provider|Module|Model|Config|Store|Router|Adapter|Component|Context|Runtime|Engine)$/u;
-function stringValue6(value) {
+function stringValue7(value) {
   return typeof value === "string" && value.length > 0 ? value : undefined;
 }
 function numberValue2(value) {
@@ -98271,11 +99090,23 @@ function numberValue2(value) {
 function booleanValue(value) {
   return typeof value === "boolean" ? value : undefined;
 }
+function optionalBooleanField(key, value) {
+  return typeof value === "boolean" ? { [key]: value } : {};
+}
+function formatFields(row) {
+  return {
+    ...optionalBooleanField("format_sensitive", row.format_sensitive),
+    ...optionalBooleanField("contains_markdown_list", row.contains_markdown_list),
+    ...optionalBooleanField("contains_markdown_table", row.contains_markdown_table),
+    ...optionalBooleanField("contains_fenced_code", row.contains_fenced_code),
+    ...optionalBooleanField("quote_preview_preserves_line_breaks", row.quote_preview_preserves_line_breaks)
+  };
+}
 function quotePreview(row) {
-  return stringValue6(row.quote_preview) ?? stringValue6(row.quote);
+  return stringValue7(row.quote_preview) ?? stringValue7(row.quote);
 }
 function quoteFullText(row) {
-  return stringValue6(row.quote_full_text);
+  return stringValue7(row.quote_full_text);
 }
 function literalTexts(row) {
   const fullText = quoteFullText(row);
@@ -98305,9 +99136,9 @@ function contextRole(row) {
   return "framing";
 }
 function mapCitable(row) {
-  const sourceRef = stringValue6(row.source_ref);
-  const sourceId = stringValue6(row.source_id);
-  const blockId = stringValue6(row.block_id);
+  const sourceRef = stringValue7(row.source_ref);
+  const sourceId = stringValue7(row.source_id);
+  const blockId = stringValue7(row.block_id);
   if (row.citation_eligible !== true || sourceRef === undefined || sourceId === undefined || blockId === undefined) {
     return;
   }
@@ -98327,19 +99158,20 @@ function mapCitable(row) {
     ...quoteCharCount !== undefined ? { quote_char_count: quoteCharCount } : {},
     ...previewCharCount !== undefined ? { preview_char_count: previewCharCount } : {},
     ...previewIsComplete !== undefined ? { preview_is_complete: previewIsComplete } : {},
+    ...formatFields(row),
     ...selector !== undefined ? { selector } : {}
   };
 }
 function mapSupporting(row) {
-  const sourceRef = stringValue6(row.source_ref);
-  const sourceId = stringValue6(row.source_id);
-  const blockId = stringValue6(row.block_id);
+  const sourceRef = stringValue7(row.source_ref);
+  const sourceId = stringValue7(row.source_id);
+  const blockId = stringValue7(row.block_id);
   if (row.citation_eligible === true || sourceRef === undefined || sourceId === undefined || blockId === undefined) {
     return;
   }
   const role = contextRole(row);
   const preview = quotePreview(row);
-  const structuralRole = stringValue6(row.structural_role);
+  const structuralRole = stringValue7(row.structural_role);
   const quoteCharCount = numberValue2(row.quote_char_count);
   const previewCharCount = numberValue2(row.preview_char_count);
   const previewIsComplete = booleanValue(row.preview_is_complete);
@@ -98355,12 +99187,13 @@ function mapSupporting(row) {
     ...preview !== undefined ? { quote_preview: preview } : {},
     ...quoteCharCount !== undefined ? { quote_char_count: quoteCharCount } : {},
     ...previewCharCount !== undefined ? { preview_char_count: previewCharCount } : {},
-    ...previewIsComplete !== undefined ? { preview_is_complete: previewIsComplete } : {}
+    ...previewIsComplete !== undefined ? { preview_is_complete: previewIsComplete } : {},
+    ...formatFields(row)
   };
 }
 function literalBase(row) {
-  const sourceRef = stringValue6(row.source_ref);
-  const blockId = stringValue6(row.block_id);
+  const sourceRef = stringValue7(row.source_ref);
+  const blockId = stringValue7(row.block_id);
   return {
     ...sourceRef !== undefined ? { source_ref: sourceRef } : {},
     ...blockId !== undefined ? { block_id: blockId } : {}
@@ -98489,11 +99322,32 @@ function plannedTemplateActions(sectionGroups) {
 function scaffoldUsage() {
   return "Fill each action.content, adjust kind when needed, keep source_block_ids as the citation shorthand, and keep every scaffold action / planned_section_groups[].draft_action_templates entry as a separate draft action. Do not merge multiple planned groups, templates, or contiguous runs into one action; non-contiguous evidence will be rejected. Submit the actions with context compile cycle <node> --input - --format json, or context compile draft <node> --input - for manual review.";
 }
+function stringArray10(value) {
+  return Array.isArray(value) ? value.filter((item) => typeof item === "string" && item.length > 0) : [];
+}
+function formatSensitiveMetadata(action, rows) {
+  const blockIds = new Set(stringArray10(action.source_block_ids));
+  const sourceRefs2 = new Set(stringArray10(action.source_refs));
+  const selected = rows.filter((row) => row.format_sensitive === true && (typeof row.block_id === "string" && blockIds.has(row.block_id) || typeof row.source_ref === "string" && sourceRefs2.has(row.source_ref)));
+  if (selected.length === 0)
+    return {};
+  const sensitiveBlockIds = selected.map((row) => row.block_id).filter((blockId) => typeof blockId === "string" && blockId.length > 0);
+  const commands = selected.map((row) => row.request_full_text_command).filter((command) => typeof command === "string" && command.length > 0);
+  return {
+    format_sensitive_block_ids: sensitiveBlockIds,
+    request_full_text_commands: commands,
+    content_source_hint: "Use request_full_text output for user-facing Markdown content from these block_ids; quote_preview is compact and does not preserve line breaks."
+  };
+}
+function formatSensitiveBlockIds(rows) {
+  return rows.filter((row) => row.format_sensitive === true).map((row) => row.block_id).filter((blockId) => typeof blockId === "string" && blockId.length > 0);
+}
 function sourceRefsDraftScaffold(input) {
   const requested = new Set(input.requestedBlockIds ?? []);
   const plannedActions = requested.size === 0 ? plannedTemplateActions(input.sectionGroups) : [];
   if (plannedActions.length > 0) {
     const evidence2 = input.compact === true ? undefined : compileEvidenceFields(input.rows);
+    const formatSensitiveIds2 = formatSensitiveBlockIds(input.rows);
     return {
       schema_version: COMPILE_DRAFT_SCHEMA_VERSION,
       node_slug: input.context.node.slug,
@@ -98504,17 +99358,25 @@ function sourceRefsDraftScaffold(input) {
         planned_section_groups: input.sectionGroups.filter((group) => group.status === "ready" || group.status === "ready_with_splits").map((group) => group.section_id).filter((sectionId2) => typeof sectionId2 === "string")
       },
       usage: scaffoldUsage(),
+      ...formatSensitiveIds2.length > 0 ? {
+        format_sensitive_block_ids: formatSensitiveIds2,
+        content_source_hint: "Format-sensitive block_ids contain Markdown lists, tables, or fenced code. Use request_full_text_commands before filling user-facing content from quote previews."
+      } : {},
       ...evidence2 !== undefined ? {
         citable_source_refs: evidence2.citable_source_refs,
         supporting_context_refs: evidence2.supporting_context_refs,
         required_preserved_literals: evidence2.required_preserved_literals
       } : {},
-      actions: plannedActions.map((action) => ({ ...action }))
+      actions: plannedActions.map((action) => ({
+        ...action,
+        ...formatSensitiveMetadata(action, input.rows)
+      }))
     };
   }
   const selectedRows = input.rows.filter((row) => row.citation_eligible === true && typeof row.source_ref === "string" && (requested.size === 0 || typeof row.block_id === "string" && requested.has(row.block_id)));
   const kind = defaultScaffoldSectionKind(input.context);
   const evidence = input.compact === true ? undefined : compileEvidenceFields(selectedRows);
+  const formatSensitiveIds = formatSensitiveBlockIds(selectedRows);
   return {
     schema_version: COMPILE_DRAFT_SCHEMA_VERSION,
     node_slug: input.context.node.slug,
@@ -98525,6 +99387,10 @@ function sourceRefsDraftScaffold(input) {
       ...requested.size > 0 ? { requested_block_ids: [...requested] } : {}
     },
     usage: scaffoldUsage(),
+    ...formatSensitiveIds.length > 0 ? {
+      format_sensitive_block_ids: formatSensitiveIds,
+      content_source_hint: "Format-sensitive block_ids contain Markdown lists, tables, or fenced code. Use request_full_text_commands before filling user-facing content from quote previews."
+    } : {},
     ...evidence !== undefined ? {
       citable_source_refs: evidence.citable_source_refs,
       supporting_context_refs: evidence.supporting_context_refs,
@@ -98534,7 +99400,8 @@ function sourceRefsDraftScaffold(input) {
       op: "add",
       kind,
       content: "",
-      source_block_ids: typeof row.block_id === "string" ? [row.block_id] : []
+      source_block_ids: typeof row.block_id === "string" ? [row.block_id] : [],
+      ...formatSensitiveMetadata({ source_block_ids: typeof row.block_id === "string" ? [row.block_id] : [] }, selectedRows)
     }))
   };
 }
@@ -98563,8 +99430,15 @@ function compactDraftScaffoldGroup(group) {
     "missing_block_ids",
     "non_citation_block_ids",
     "contiguous_run_count",
+    "citation_block_count",
+    "source_ids",
+    "heading_path",
+    "heading_paths",
+    "contains_markdown_list",
     "intervening_citation_eligible_block_ids",
     "split_reason",
+    "split_reasons",
+    "heading_path_runs",
     "sibling_bridge_reason",
     "sibling_bridge_block_ids",
     "contiguous_runs",
@@ -98632,7 +99506,7 @@ function sourceRefsSectionGroupHint(sectionGroups) {
     code: "compile-source-refs-planned-section-groups",
     severity: "info",
     message: "planned_section_groups is the primary source-refs authoring path for finalized align section plans.",
-    next_action: splitCount > 0 ? "Copy each planned_section_groups[].draft_action_templates entry as a separate draft action; split groups already avoid non-contiguous citation-eligible blocks and may use source_block_ids shorthand. Do not merge templates or contiguous runs." : "Copy each planned_section_groups[].draft_action_templates entry as a separate draft action; fill content from the cited evidence and keep source_block_ids shorthand when present. Do not merge planned groups/templates.",
+    next_action: splitCount > 0 ? "Copy each planned_section_groups[].draft_action_templates entry as a separate draft action; split groups already avoid non-contiguous citation-eligible blocks and may use source_block_ids shorthand. Do not merge by default; only intentionally combine adjacent templates when a fragment-review hint flags them and the evidence is one knowledge unit." : "Copy each planned_section_groups[].draft_action_templates entry as a separate draft action; fill content from the cited evidence and keep source_block_ids shorthand when present. Do not merge by default; only intentionally combine adjacent groups when a fragment-review hint flags them and the evidence is one knowledge unit.",
     diagnostics: {
       planned_section_groups: sectionGroups.length,
       split_planned_section_groups: splitCount
@@ -98643,7 +99517,7 @@ function sourceRefsDenseHintWithSectionGroups(hint, sectionGroups) {
   return {
     ...hint,
     message: `${hint.message} planned_section_groups are available for finalized align section plans.`,
-    next_action: "Use planned_section_groups[].draft_action_templates first, keeping each template as a separate draft action. Fallback may split finer only when a planned group is missing, needs attention, or you intentionally need finer-grained Sections; do not merge planned groups/templates.",
+    next_action: "Use planned_section_groups[].draft_action_templates first, keeping each template as a separate draft action by default. Fallback may split finer only when a planned group is missing, needs attention, or you intentionally need finer-grained Sections; combine adjacent templates only when fragment-review evidence shows one knowledge unit.",
     diagnostics: {
       ...hint.diagnostics ?? {},
       planned_section_groups_available: true,
@@ -98653,6 +99527,11 @@ function sourceRefsDenseHintWithSectionGroups(hint, sectionGroups) {
 }
 function sourceRefsViewHints(input) {
   const sectionGroupHints = sourceRefsSectionGroupHint(input.sectionGroups);
+  const fragmentReviewHint = plannedSectionFragmentReviewHint({
+    sectionGroups: input.sectionGroups,
+    detailCommand: input.detailCommand
+  });
+  const fragmentHints = fragmentReviewHint === undefined ? [] : [fragmentReviewHint];
   if (input.sectionGroups.length === 0) {
     return [...input.projectedHints, input.scaffoldHint];
   }
@@ -98665,7 +99544,7 @@ function sourceRefsViewHints(input) {
       nonDenseHints.push(hint);
     }
   }
-  return [...nonDenseHints, ...sectionGroupHints, ...denseHints, input.scaffoldHint];
+  return [...nonDenseHints, ...sectionGroupHints, ...fragmentHints, ...denseHints, input.scaffoldHint];
 }
 function compileCycleCommand(slug) {
   return `context compile cycle ${shellQuote(slug)} --input - --format json`;
@@ -98761,7 +99640,12 @@ function writeCompileSourceRefs(context, format, options = {}) {
     command: sourceRefsIndex,
     detail_view_command: sourceRefsDetail
   };
-  const viewHints = sourceRefsViewHints({ projectedHints, sectionGroups, scaffoldHint });
+  const viewHints = sourceRefsViewHints({
+    projectedHints,
+    sectionGroups,
+    scaffoldHint,
+    detailCommand: sourceRefsDetail
+  });
   const envelope = sourceRefsNextActionEnvelope({
     context,
     ...options.workflowState !== undefined ? { workflowState: options.workflowState } : {},
@@ -99041,13 +99925,13 @@ function writeCompileContextSummary(input) {
   writeCompileContextTextSummary(input, coverageRepairRound, coverageScopeHint);
 }
 function compileDraftRevisionHints(slug, digest2) {
-  const patchCommand = `context compile draft-patch ${shellQuote(slug)} --input -`;
+  const patchCommand = `context compile cycle ${shellQuote(slug)} --input - --format json`;
   const rebuildCommand = `context compile draft ${shellQuote(slug)} --input -`;
   return [{
     code: "compile-draft-patch-ready",
     severity: "info",
     message: "Current draft can be revised with a node-scoped patch instead of resubmitting all actions.",
-    next_action: "Replace, add, or remove only the affected action. replace_action fully replaces that action while keeping action_id; add_action receives a new action_id. To rebuild from scratch, submit a full draft with context compile draft <slug> --input -.",
+    next_action: "Replace, add, or remove only the affected action, then submit the compile-draft-patch payload through context compile cycle. replace_action fully replaces that action while keeping action_id; add_action receives a new action_id. To rebuild from scratch, submit a full draft with context compile cycle <slug> --input - --format json.",
     command: patchCommand,
     patch_schema_version: COMPILE_DRAFT_PATCH_SCHEMA_VERSION,
     correct_shape: compileDraftPatchCorrectShape(),
@@ -99085,7 +99969,7 @@ function writeCompileDraftStatus(input) {
       view,
       draft_digest: input.digest,
       patch_schema_version: COMPILE_DRAFT_PATCH_SCHEMA_VERSION,
-      patch_command: hints[0]?.command ?? `context compile draft-patch ${shellQuote(input.session.node)} --input -`,
+      patch_command: hints[0]?.command ?? `context compile cycle ${shellQuote(input.session.node)} --input - --format json`,
       ...input.session.suggested_patch_template !== undefined ? { suggested_patch_template: input.session.suggested_patch_template } : {},
       show_command: input.showCommand,
       next_command: input.showCommand,
@@ -99120,7 +100004,7 @@ function writeCompileDraftStatus(input) {
 function claimIdForActionIndex(index2) {
   return `claim-${String(index2 + 1).padStart(3, "0")}`;
 }
-function stringArray9(value) {
+function stringArray11(value) {
   return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
 }
 function sourceRefNarrowingByActionIndex(hints) {
@@ -99129,13 +100013,13 @@ function sourceRefNarrowingByActionIndex(hints) {
     if (hint.code !== "compile-source-refs-narrowing-suggested" || typeof hint.op_index !== "number")
       continue;
     const diagnostics = hint.diagnostics ?? {};
-    const original = stringArray9(diagnostics.original_source_refs);
-    const narrowed = stringArray9(diagnostics.narrowed_source_refs);
-    const removed = stringArray9(diagnostics.removed_source_refs);
-    const leadIn = stringArray9(diagnostics.removed_lead_in_source_refs);
-    const redundant = stringArray9(diagnostics.removed_redundant_source_refs);
-    const suggestedRefs = stringArray9(diagnostics.suggested_source_refs);
-    const patchRefs = stringArray9(diagnostics.patch_source_refs);
+    const original = stringArray11(diagnostics.original_source_refs);
+    const narrowed = stringArray11(diagnostics.narrowed_source_refs);
+    const removed = stringArray11(diagnostics.removed_source_refs);
+    const leadIn = stringArray11(diagnostics.removed_lead_in_source_refs);
+    const redundant = stringArray11(diagnostics.removed_redundant_source_refs);
+    const suggestedRefs = stringArray11(diagnostics.suggested_source_refs);
+    const patchRefs = stringArray11(diagnostics.patch_source_refs);
     if (original.length === 0 || narrowed.length === 0 || removed.length === 0)
       continue;
     byIndex.set(hint.op_index, {
@@ -99160,8 +100044,8 @@ function sourceRefNarrowingByActionIndex(hints) {
 function sourceSupportDiagnostics(support) {
   if (support?.verdict === undefined || support.verdict === "supported")
     return;
-  const missingHardTerms = stringArray9(support.missing_hard_terms);
-  const missingContentTerms = stringArray9(support.missing_content_terms);
+  const missingHardTerms = stringArray11(support.missing_hard_terms);
+  const missingContentTerms = stringArray11(support.missing_content_terms);
   const missingTerms = Array.isArray(support.missing_terms) ? support.missing_terms.slice(0, 12).filter((term) => term !== null && typeof term === "object") : [];
   if (missingHardTerms.length === 0 && missingContentTerms.length === 0 && missingTerms.length === 0)
     return;
@@ -99270,11 +100154,11 @@ function withPayloadMeta2(value, payload) {
     })
   };
 }
-function stringArray10(value) {
+function stringArray12(value) {
   return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
 }
 function narrowingSuggestionRemovedCount(context) {
-  return (context.agent_hints ?? []).filter((hint) => hint.code === "compile-source-refs-narrowing-suggested").reduce((sum, hint) => sum + stringArray10(hint.diagnostics?.removed_source_refs).length, 0);
+  return (context.agent_hints ?? []).filter((hint) => hint.code === "compile-source-refs-narrowing-suggested").reduce((sum, hint) => sum + stringArray12(hint.diagnostics?.removed_source_refs).length, 0);
 }
 function prepareEnvelopeOutput(input) {
   const warnings = (input.context.agent_hints ?? []).filter((hint) => hint.severity === "warning" || hint.severity === "error");
@@ -99368,27 +100252,12 @@ async function prepareCompileDraftWorkflow(input) {
 }
 
 // src/commands/compileDraftCommand.ts
-function isRecord44(value) {
+function isRecord43(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function draftActionCounts(draft) {
-  return {
-    total: draft.actions.length,
-    add: draft.actions.filter((action) => action.op === "add").length,
-    update: draft.actions.filter((action) => action.op === "update").length,
-    supersede: draft.actions.filter((action) => action.op === "supersede").length,
-    deprecate: draft.actions.filter((action) => action.op === "deprecate").length,
-    skip: draft.actions.filter((action) => action.op === "skip").length,
-    structure_challenge: draft.actions.filter((action) => action.op === "structure_challenge").length,
-    pending_ownership_challenge: draft.actions.filter((action) => action.op === "pending_ownership_challenge").length
-  };
-}
 function compileCycleInputCommand(slug) {
   return `context compile cycle ${shellQuote(slug)} --input - --format json`;
 }
-function compileCycleContinueCommand2(slug) {
-  return `context compile cycle ${shellQuote(slug)} --continue --format json`;
-}
 function compileDraftInputRequiredError(slug) {
   const reasonCode = "compile-draft-input-required";
   const message = "context compile draft requires --input - unless --prepare is used to load the saved draft session";
@@ -99425,6 +100294,44 @@ function compileDraftInputRequiredError(slug) {
     }]
   });
 }
+function compileDraftPatchCommandError(slug) {
+  const reasonCode = "compile-draft-patch-cycle-required";
+  const command = compileCycleInputCommand(slug);
+  const message = "submit compile draft patches through context compile cycle";
+  const envelope = createNextActionEnvelope({
+    allowed_actions: ["patch_payload", "show_view"],
+    next_action: {
+      kind: "patch_compile_draft",
+      command,
+      input_schema: "compile-draft-patch",
+      reason_code: reasonCode,
+      blocking: true
+    },
+    diagnostics: {
+      summary: { reason_code: reasonCode, issue_count: 1 },
+      warnings: [{
+        code: reasonCode,
+        severity: "error",
+        message,
+        reason_code: reasonCode
+      }]
+    },
+    strict: false
+  });
+  return new ContextError(ExitCode.UserError, message, {
+    category: ErrorCategory.UserInputInvalid,
+    ...envelope,
+    agent_hints: [{
+      code: reasonCode,
+      severity: "error",
+      message,
+      next_action: "Submit the same compile-draft-patch payload to the compile cycle command.",
+      command,
+      schema: "compile-draft-patch",
+      schema_version: "compile.draft-patch.v2"
+    }]
+  });
+}
 async function writeCompileDraftChallengePayloads2(input) {
   const payloads = await compileDraftChallengePayloads({
     ctxDir: input.ctxDir,
@@ -99452,16 +100359,16 @@ async function writeCompileDraftChallengePayloads2(input) {
     });
   }
 }
-function stringArray11(value) {
+function stringArray13(value) {
   return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
 }
 function preparedSourceSupportStatus(value) {
-  if (!isRecord44(value) || typeof value.verdict !== "string")
+  if (!isRecord43(value) || typeof value.verdict !== "string")
     return;
   if (value.verdict === "supported")
     return { verdict: value.verdict };
-  const missingHardTerms = stringArray11(value.missing_hard_terms);
-  const missingContentTerms = stringArray11(value.missing_content_terms);
+  const missingHardTerms = stringArray13(value.missing_hard_terms);
+  const missingContentTerms = stringArray13(value.missing_content_terms);
   const missingTerms = Array.isArray(value.missing_terms) ? value.missing_terms.slice(0, 12).filter((term) => term !== null && typeof term === "object") : [];
   return {
     verdict: value.verdict,
@@ -99471,15 +100378,15 @@ function preparedSourceSupportStatus(value) {
   };
 }
 function preparedReconcileStatus(value, slug) {
-  const agentHints = isRecord44(value) && Array.isArray(value.agent_hints) ? value.agent_hints.filter(isRecord44) : [];
-  if (!isRecord44(value) || !Array.isArray(value.items))
+  const agentHints = isRecord43(value) && Array.isArray(value.agent_hints) ? value.agent_hints.filter(isRecord43) : [];
+  if (!isRecord43(value) || !Array.isArray(value.items))
     return { items: [], agentHints };
-  const target = isRecord44(value.target) ? value.target : undefined;
+  const target = isRecord43(value.target) ? value.target : undefined;
   if (target !== undefined && target.node !== slug)
     return { items: [], agentHints };
   return {
     agentHints,
-    items: value.items.filter(isRecord44).flatMap((item) => {
+    items: value.items.filter(isRecord43).flatMap((item) => {
       if (typeof item.item_id !== "string")
         return [];
       const sourceSupport = preparedSourceSupportStatus(item.source_support);
@@ -99528,125 +100435,7 @@ async function runDraftStatus(input) {
   });
 }
 async function runDraftPatch(input) {
-  const current = requireCurrentWorkflow(await readCurrentWorkflow(input.ctxDir));
-  if (current.family !== "compile") {
-    throw new ContextError(ExitCode.UserError, "compile draft patch requires an active compile workflow", {
-      category: ErrorCategory.UserInputInvalid
-    });
-  }
-  const payload = await readWorkflowPayloadByDigest({
-    ctxDir: input.ctxDir,
-    workflowId: current.workflow_id,
-    scopeId: nodeRunIdForSlug(input.slug),
-    payload: "compile-draft",
-    ...typeof input.options.payloadDigest === "string" ? { digest: input.options.payloadDigest } : {},
-    fallbackToUniqueScope: true
-  });
-  const session = parseCompileDraftSession(payload.value);
-  assertCompileDraftSessionNode(session, input.slug);
-  const patchInput = await readStructuredInput2(resolveStdinOnlyInput(input.options.input, "--input"));
-  const patch = parseCompileDraftPatch(patchInput);
-  const patched = applyCompileDraftPatch({
-    session,
-    patch,
-    expectedDigest: payload.digest
-  });
-  rejectRetiredDraftPatchFields(patchInput, input.slug);
-  const result = await compileDraft({
-    ctxDir: input.ctxDir,
-    slug: input.slug,
-    mode: "plan",
-    inputMode: "internal",
-    stdout: { write: () => true },
-    draftProvider: async () => patched.draft
-  });
-  const normalizedDraft = result.plan ?? patched.draft;
-  const nextSession = createCompileDraftSession({
-    node: input.slug,
-    draft: normalizedDraft,
-    ...result.agent_hints !== undefined ? { agentHints: result.agent_hints } : {}
-  });
-  const nextPayload = await writeWorkflowPayloadWithDigest({
-    ctxDir: input.ctxDir,
-    workflowId: current.workflow_id,
-    scopeId: nodeRunIdForSlug(input.slug),
-    payload: "compile-draft",
-    value: nextSession,
-    format: "yaml"
-  });
-  await writeCompileDraftChallengePayloads2({
-    ctxDir: input.ctxDir,
-    workflowId: current.workflow_id,
-    scopeId: nodeRunIdForSlug(input.slug),
-    draft: normalizedDraft
-  });
-  const continueCommand = compileCycleContinueCommand2(result.slug);
-  const envelope = createNextActionEnvelope({
-    workflow: {
-      id: current.workflow_id,
-      workflow_id: current.workflow_id,
-      family: current.family,
-      stage: current.stage,
-      terminal: false,
-      scope_id: workflowScope(current)
-    },
-    allowed_actions: ["continue_compile_cycle", "show_view"],
-    next_action: {
-      kind: "continue_compile_cycle",
-      command: continueCommand,
-      reason_code: "compile-draft-patched"
-    },
-    views: [{
-      id: "draft-status",
-      purpose: "Inspect the patched saved draft before continuing cycle if needed.",
-      evidence_role: "diagnostic",
-      expected: false,
-      budget_safety: "compact",
-      command: `context compile draft-status ${shellQuote(result.slug)} --format json`
-    }]
-  });
-  const outputHints = [...patch.agent_hints ?? [], ...result.agent_hints ?? []];
-  if (compileChangesFormat(input.options.format) === "json") {
-    writeJson5({
-      action: "patched",
-      status: "planned",
-      node: input.slug,
-      schema_version: envelope.schema_version,
-      allowed_actions: envelope.allowed_actions,
-      next_action: envelope.next_action,
-      views: envelope.views,
-      workflow: workflowMetadata(current),
-      draft: {
-        payload: nextPayload.payload,
-        scope_id: nextPayload.scope_id,
-        digest: nextPayload.digest,
-        format: nextPayload.format,
-        show_command: workflowPayloadShowCommand(nextPayload)
-      },
-      action_counts: draftActionCounts(normalizedDraft),
-      agent_hints: outputHints,
-      next_command: continueCommand
-    });
-    return;
-  }
-  process.stdout.write(formatFeedback({
-    symbol: outputHints.some((hint) => hint.severity === "warning" || hint.severity === "error") ? "⚠" : "✓",
-    action: "patched",
-    subject: input.slug,
-    headline: formatDraftPatchHeadline(result),
-    body: [
-      workflowSummaryLine(current),
-      ...draftPlanBody({
-        ctxDir: input.ctxDir,
-        slug: result.slug,
-        saved: false,
-        ...outputHints.length > 0 ? { hints: outputHints } : {},
-        draftDigest: nextPayload.digest,
-        result
-      })
-    ],
-    next: continueCommand
-  }));
+  throw compileDraftPatchCommandError(input.slug);
 }
 async function draftFromSavedSession(input) {
   const current = requireCurrentWorkflow(await readCurrentWorkflow(input.ctxDir));
@@ -100160,7 +100949,7 @@ function registerCompileWorkflowSubcommands(command, run2) {
   command.command("draft-status <slug>").description("Print the current compile draft session summary").option("--view <view>", "output view: summary | detail | narrowing-detail").option("--format <format>", "output format: json | table", "json").action(async (slug, options) => {
     await run2(mergeOptions(options, { draftStatus: slug }));
   });
-  command.command("draft-patch <slug>").description("Apply a compile draft patch for one node").option("--input <-|stdin>", "compile draft patch JSON/YAML document; only '-' is accepted; use shell redirect or heredoc").option("--payload-digest <digest>", "optional compile draft payload digest stale guard").option("--format <format>", "output format: json | table", "json").action(async (slug, options) => {
+  command.command("draft-patch <slug>", { hidden: true }).description("Use context compile cycle <slug> --input - --format json").option("--input <-|stdin>", "compile draft patch JSON/YAML document; only '-' is accepted; use shell redirect or heredoc").option("--payload-digest <digest>", "optional compile draft payload digest stale guard").option("--format <format>", "output format: json | table", "json").action(async (slug, options) => {
     await run2(mergeOptions(options, { draftPatch: slug, plan: true }));
   });
   command.command("coverage <slug>").description("Resolve coverage candidates for one node").option("--input <-|stdin>", "coverage disposition patch JSON/YAML document; only '-' is accepted; use shell redirect or heredoc").option("--skip <candidate-id>", "skip one or more coverage candidates; repeat for multiple", collectCoverageSkip, []).option("--skip-unresolved", "skip every unresolved coverage candidate for this node").option("--reason <text>", "reason for coverage skip shortcuts").option("--replace", "replace existing dispositions for patched candidates").option("--payload-digest <digest>", "optional workflow payload digest stale guard").option("--format <format>", "output format: json | table", "json").action(async (slug, options) => {
@@ -100233,11 +101022,6 @@ var COMPILE_MODE_COMMANDS = [
     command: "context compile draft-status <slug> --format json",
     description: "Inspect a saved compile draft session."
   },
-  {
-    mode: "draft-patch",
-    command: "context compile draft-patch <slug> --input -",
-    description: "Patch a saved compile draft session."
-  },
   {
     mode: "coverage-status",
     command: "context compile coverage <slug> --format json",
@@ -101642,11 +102426,6 @@ function assertDraftOptions(options) {
   if (typeof options.draftPatch === "string" && options.plan !== true) {
     options.plan = true;
   }
-  if (typeof options.draftPatch === "string" && typeof options.input !== "string") {
-    throw new ContextError(ExitCode.UserError, "context compile draft-patch requires --input", {
-      category: ErrorCategory.UserInputInvalid
-    });
-  }
 }
 function assertAspectCompileOptions(options, flags2) {
   if (flags2.wantsCode && (options.plan === true || options.delegated === true)) {
@@ -102467,6 +103246,13 @@ var AGENT_HINT_EMITTER_WORKFLOW_INVENTORY = [
     handles: ["node_ref", "block_id", "ownership_role"],
     notes: "Shared align payload diagnostics expose semantic ids and ownership roles; normal authoring remains intent-first."
   },
+  {
+    source: "src/workflow/alignStructureIntent.ts",
+    family: "align structure intent compiler",
+    policy: "semantic",
+    handles: ["block_id", "node_slug", "ownership_role", "schema_version"],
+    notes: "Intent compile diagnostics expose semantic block, node, role, and schema handles while keeping canonical decision expansion mechanical."
+  },
   {
     source: "src/workflow/alignWorkflowSchemas.ts",
     family: "align schema example",
@@ -102736,8 +103522,8 @@ var COMMAND_MATRIX = [
   { command: "compile context", view: "production-semantic", handles: ["node_slug", "source_ref", "block_id", "payload"], notes: "Prepares one node context or source-ref view before drafting." },
   { command: "compile cycle", view: "production-semantic", handles: ["node_slug", "review_id", "workflow_id"], notes: "Runs one node through draft validation, prepare, safe review, and apply." },
   { command: "compile draft", view: "production-semantic", handles: ["node_slug", "source_ref", "payload"], notes: "Validates one compile draft from stdin in plan mode." },
+  { command: "compile draft-patch", view: "production-semantic", handles: ["node_slug", "action_id", "operation"], notes: "Patches a saved compile draft session through semantic operations." },
   { command: "compile draft-status", view: "production-semantic", handles: ["node_slug", "payload"], notes: "Shows the current draft session for one node." },
-  { command: "compile draft-patch", view: "production-semantic", handles: ["node_slug", "payload"], notes: "Patches the current draft session for one node." },
   { command: "compile coverage", view: "production-semantic", handles: ["node_slug", "candidate_id", "payload"], notes: "Resolves coverage candidates through one node-scoped command." },
   { command: "compile close", view: "production-semantic", handles: ["workflow_id", "node_slug", "section_id"], notes: "Closes compile workflow after pending node work is settled." },
   { command: "reconcile", view: "production-semantic", handles: ["prepare_digest", "review_id", "scope_id"], notes: "Semantic reconciliation namespace." },
@@ -102923,6 +103709,13 @@ var AGENT_HINT_EMITTER_INVENTORY = [
     handles: ["workflow_payload", "prepare_digest", "review_id"],
     notes: "Reconcile errors route to previous semantic workflow step or schema."
   },
+  {
+    source: "src/commands/reconcilePrepareCandidateViews.ts",
+    family: "reconcile prepare candidate views",
+    policy: "semantic",
+    handles: ["item_id", "candidate_id", "candidate_count"],
+    notes: "Candidate index hints route agents from prepare item ids to scoped candidate detail views before semantic judgment."
+  },
   {
     source: "src/commands/reconcilePrepareRefresh.ts",
     family: "reconcile stale prepare refresh",
@@ -105202,9 +105995,7 @@ function compileSchemaExample(name) {
       schema: "compile-draft-patch",
       schema_version: COMPILE_DRAFT_PATCH_SCHEMA_VERSION,
       consumed_by: [
-        "context compile draft-patch <slug> --input -",
-        "context compile cycle <slug> --input -",
-        "context compile cycle <slug> --continue --format json"
+        "context compile cycle <slug> --input -"
       ],
       required: ["operations"],
       enums: {
@@ -105216,7 +106007,7 @@ function compileSchemaExample(name) {
         "The CLI reads the current draft session by default; add --payload-digest only when an explicit stale guard is needed.",
         "This is not the align finalize patch shape: do not use op/path/value JSON Pointer operations here.",
         "replace_action keeps the same action_id; add_action receives a new CLI-owned action_id.",
-        "When node-cycle returns partial-applied or review-required, the same node-cycle command may take this patch shape on stdin to patch the saved draft and continue the safe-default review/apply loop.",
+        "When node-cycle returns partial-applied or review-required, submit this patch shape on stdin to context compile cycle <slug> --input - --format json to patch the saved draft and continue the safe-default review/apply loop.",
         "The CLI validates the whole patched draft before saving it, so failed patches do not corrupt the current draft session."
       ],
       example: {