@beyondwork/docx-react-component 1.0.94 → 1.0.95

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@beyondwork/docx-react-component",
   "publisher": "beyondwork",
-  "version": "1.0.94",
+  "version": "1.0.95",
   "description": "Embeddable React Word (docx) editor with review, comments, tracked changes, and round-trip OOXML fidelity.",
   "type": "module",
   "sideEffects": [

package/src/api/v3/ai/replacement.ts

@@ -384,9 +384,9 @@ export function createReplacementFamily(runtime: RuntimeApiHandle) {
     },
 
     applyScopeAction(input: ApplyScopeActionInput): ApplyResult {
-      // @endStateApi — live-with-adapter. Routes through the scope
-      // compiler's applyFormatting + the same ApplyResult projection
-      // used by applyReplacementScope.
+      // @endStateApi — live-with-adapter. Routes scope actions through the
+      // shipped compiler/applyFormatting facade so AI-triggered formatting
+      // mutations share validation, audit, and undo semantics.
       const proposalId =
         input.proposalId ??
         mockId(

package/src/api/v3/runtime/formatting.ts

@@ -216,9 +216,9 @@ export function createFormattingFamily(runtime: RuntimeApiHandle) {
     },
 
     applyToScope(input: FormattingApplyToScopeInput): FormattingApplyToScopeResult {
-      // @endStateApi — live-with-adapter. Routes through the scope
-      // compiler's applyFormatting with actor=user + origin=ui; returns
-      // the authored-revision + audit shape projected for v3 callers.
+      // @endStateApi — live-with-adapter. Routes through the scope-compiler
+      // facade so scope-targeted formatting shares Layer-08 validation,
+      // audit, and runtime-owned mutation semantics.
       const result = compiler.applyFormatting({
         targetScopeId: input.scopeId,
         action: input.action,

package/src/core/commands/formatting-commands.ts

@@ -591,7 +591,7 @@ export function applyFormattingOperationToDocument(
 export type TextMarkClearTarget = TextMark["type"] | "visualHighlight";
 
 export type TextMarkRangeOperation =
-  | { type: "clear-mark"; mark: TextMarkClearTarget }
+  | { type: "clear-mark"; mark: TextMarkClearTarget; expandToFullHighlight?: boolean }
   | { type: "set-mark"; mark: TextMark };
 
 /**
@@ -605,8 +605,14 @@ export function applyTextMarkOperationToDocumentRange(
   range: { from: number; to: number },
   operation: TextMarkRangeOperation,
 ): FormattingMutationResult {
-  const selectionFrom = Math.min(range.from, range.to);
-  const selectionTo = Math.max(range.from, range.to);
+  const inputFrom = Math.min(range.from, range.to);
+  const inputTo = Math.max(range.from, range.to);
+  const expandedRange =
+    operation.type === "clear-mark" && operation.expandToFullHighlight === true
+      ? expandRangeToCanonicalHighlightExtent(document, inputFrom, inputTo)
+      : { from: inputFrom, to: inputTo };
+  const selectionFrom = expandedRange.from;
+  const selectionTo = expandedRange.to;
   const selection: RuntimeRenderSnapshot["selection"] = {
     anchor: selectionFrom,
     head: selectionTo,
@@ -671,6 +677,143 @@ export function applyTextMarkOperationToDocumentRange(
   };
 }
 
+function expandRangeToCanonicalHighlightExtent(
+  document: CanonicalDocumentEnvelope,
+  inputFrom: number,
+  inputTo: number,
+): { from: number; to: number } {
+  let from = inputFrom;
+  let to = inputTo;
+  const root = document.content as DocumentRootNode;
+  let cursor = 0;
+
+  for (let blockIndex = 0; blockIndex < root.children.length; blockIndex += 1) {
+    const block = root.children[blockIndex]!;
+    const blockFrom = cursor;
+    const blockLength =
+      block.type === "paragraph"
+        ? block.children.reduce(
+            (total, child) => total + inlineNodeLength(child as InlineNode),
+            0,
+          )
+        : 1;
+    const blockTo = blockFrom + blockLength;
+
+    if (
+      block.type === "paragraph" &&
+      rangesOverlap(inputFrom, inputTo, blockFrom, blockTo)
+    ) {
+      const spans = collectInlineHighlightSpans(block.children, blockFrom).spans;
+      const expanded = expandRangeWithinHighlightSpans(spans, inputFrom, inputTo);
+      if (expanded.from < from) from = expanded.from;
+      if (expanded.to > to) to = expanded.to;
+    }
+
+    cursor = blockTo;
+    if (blockIndex < root.children.length - 1) {
+      cursor += 1;
+    }
+  }
+
+  return { from, to };
+}
+
+interface HighlightSpan {
+  readonly from: number;
+  readonly to: number;
+  readonly highlighted: boolean;
+}
+
+function collectInlineHighlightSpans(
+  nodes: readonly InlineNode[],
+  start: number,
+): { spans: HighlightSpan[]; nextPosition: number } {
+  const spans: HighlightSpan[] = [];
+  let position = start;
+
+  for (const node of nodes) {
+    if (node.type === "text") {
+      const length = Array.from(node.text).length;
+      if (length > 0) {
+        spans.push({
+          from: position,
+          to: position + length,
+          highlighted: marksHaveVisualHighlight(node.marks),
+        });
+      }
+      position += length;
+      continue;
+    }
+
+    if (node.type === "hyperlink") {
+      const nested = collectInlineHighlightSpans(node.children as InlineNode[], position);
+      spans.push(...nested.spans);
+      position = nested.nextPosition;
+      continue;
+    }
+
+    const length = inlineNodeLength(node);
+    if (length > 0) {
+      spans.push({
+        from: position,
+        to: position + length,
+        highlighted: false,
+      });
+    }
+    position += length;
+  }
+
+  return { spans, nextPosition: position };
+}
+
+function expandRangeWithinHighlightSpans(
+  spans: readonly HighlightSpan[],
+  inputFrom: number,
+  inputTo: number,
+): { from: number; to: number } {
+  let from = inputFrom;
+  let to = inputTo;
+  let touchedLeftIndex = -1;
+  let touchedRightIndex = -1;
+
+  for (let i = 0; i < spans.length; i += 1) {
+    const span = spans[i]!;
+    if (!span.highlighted) continue;
+    if (rangesOverlap(inputFrom, inputTo, span.from, span.to)) {
+      if (touchedLeftIndex === -1) touchedLeftIndex = i;
+      touchedRightIndex = i;
+    }
+  }
+
+  if (touchedLeftIndex === -1) {
+    return { from, to };
+  }
+
+  for (let i = touchedLeftIndex; i >= 0; i -= 1) {
+    const span = spans[i]!;
+    if (!span.highlighted) break;
+    if (span.to < from) break;
+    if (span.from < from) from = span.from;
+  }
+
+  for (let i = touchedRightIndex; i < spans.length; i += 1) {
+    const span = spans[i]!;
+    if (!span.highlighted) break;
+    if (span.from > to) break;
+    if (span.to > to) to = span.to;
+  }
+
+  return { from, to };
+}
+
+function marksHaveVisualHighlight(marks: readonly TextMark[] | undefined): boolean {
+  return (
+    marks?.some((mark) =>
+      mark.type === "highlight" || mark.type === "backgroundColor"
+    ) ?? false
+  );
+}
+
 function resolveTextMarkRangeUpdater(
   operation: TextMarkRangeOperation,
 ): (marks?: TextMark[]) => TextMark[] | undefined {

package/src/core/state/text-transaction.ts

@@ -130,9 +130,12 @@ function applyLinearTextTransaction(
 
   // `normalizedRange.{from,to}` are logical positions (scope markers = 0 width,
   // matching surface-projection). Translate to unit-array indices so scope
-  // marker units preserved at the boundary stay intact on either side.
-  const unitFrom = logicalPositionToUnitIndex(story.units, normalizedRange.from, "before");
-  const unitTo = logicalPositionToUnitIndex(story.units, normalizedRange.to, "after");
+  // marker units sitting exactly on the replacement boundaries stay intact:
+  // start-boundary markers remain before the inserted payload, end-boundary
+  // markers remain after it. Markers strictly inside the range are still part
+  // of the replacement/delete slice.
+  const unitFrom = logicalPositionToUnitIndex(story.units, normalizedRange.from, "after");
+  const unitTo = logicalPositionToUnitIndex(story.units, normalizedRange.to, "before");
 
   ensureEditableRange(story.units.slice(unitFrom, unitTo));
 

package/src/runtime/document-runtime.ts

@@ -3531,6 +3531,9 @@ export function createDocumentRuntime(
             ? {
                 type: "clear-mark" as const,
                 mark: step.formattingAction.mark,
+                ...(step.formattingAction.expandToFullHighlight === true
+                  ? { expandToFullHighlight: true as const }
+                  : {}),
               }
             : {
                 type: "set-mark" as const,

package/src/runtime/scopes/semantic-scope-types.ts

@@ -332,6 +332,15 @@ export type ScopeFormattingAction =
        * `"visualHighlight"` to remove both visual highlight layers.
        */
       readonly mark: ScopeFormattingClearTarget;
+      /**
+       * When true, expand the target range to the full contiguous visual
+       * highlight span that touches it before clearing. Mirrors
+       * `clearHighlight({expandToFullHighlight:true})`; the clear remains
+       * source-layer exact, so `mark:"highlight"` still removes only
+       * `w:highlight`, while `mark:"visualHighlight"` removes highlight +
+       * shading across the expanded span.
+       */
+      readonly expandToFullHighlight?: boolean;
     }
   | {
       readonly kind: "set-mark";

package/src/ui/WordReviewEditor.tsx

@@ -3931,18 +3931,11 @@ export const WordReviewEditor = forwardRef<WordReviewEditorRef, WordReviewEditor
         }}
         onDeselectObject={() => activeRuntime.deselectObject()}
         onScopeAskAgent={(payload) => {
-          // Resolve the scope's anchor + story from the workflow
-          // facet's card model so the agent request carries the
-          // canonical range. Layer-06 Slice 4 made `runtime.workflow`
-          // the canonical source for scope-card data.
-          const models = activeRuntime.workflow.getAllScopeCardModels();
-          const model = models.find((entry) => entry.scopeId === payload.scopeId);
-          if (!model) return;
-          const scopeSnapshot = activeRuntime.getWorkflowScopeSnapshot();
-          const scopes = scopeSnapshot?.scopes ?? [];
-          const scope = scopes.find((entry) => entry.scopeId === payload.scopeId);
-          if (!scope) return;
-          const anchor = scope.anchor;
+          // Resolve scope card + story through the mounted UI API seam so
+          // the shell root does not re-own workflow facet reads.
+          const model = api.ui?.scope.card(payload.scopeId) ?? null;
+          const bundle = api.ui?.scope.getBundle(payload.scopeId) ?? null;
+          const anchor = payload.anchor ?? model?.anchor;
           if (!anchor) return;
           const requestId =
             typeof crypto !== "undefined" && typeof crypto.randomUUID === "function"
@@ -3957,8 +3950,10 @@ export const WordReviewEditor = forwardRef<WordReviewEditorRef, WordReviewEditor
             requestId,
             scopeId: payload.scopeId,
             anchor,
-            selectionText: model.label ?? "",
-            ...(scope.storyTarget ? { storyTarget: scope.storyTarget } : {}),
+            selectionText: model?.label ?? "",
+            ...(bundle?.scope.handle.storyTarget
+              ? { storyTarget: bundle.scope.handle.storyTarget }
+              : {}),
           };
           onEventRef.current?.(eventPayload);
         }}

package/src/ui/editor-shell-view.tsx

@@ -162,7 +162,10 @@ export interface EditorShellViewProps {
     groupId: string;
   }) => void;
   /** K2 — forwarded from workspace to WordReviewEditor. */
-  onScopeAskAgent?: (payload: { scopeId: string }) => void;
+  onScopeAskAgent?: (payload: {
+    scopeId: string;
+    anchor?: import("../api/public-types.ts").EditorAnchorProjection;
+  }) => void;
   /** N6 — deselects the currently grabbed object; wired to runtime.deselectObject(). */
   onDeselectObject?: () => void;
   mediaPreviews?: Record<string, MediaPreviewDescriptor>;

package/src/ui-tailwind/chrome-overlay/tw-chrome-overlay.tsx

@@ -14,7 +14,7 @@
 
 import * as React from "react";
 import type { OverlayCoordinateSpace } from "./chrome-overlay-projector";
-import type { ScopeRailSegment } from "../../api/public-types.ts";
+import type { ScopeRailPosture, ScopeRailSegment } from "../../api/public-types.ts";
 import type {
   EditorRole,
   EditorStoryTarget,
@@ -28,6 +28,7 @@ import { TwScopeCardLayer } from "./tw-scope-card-layer";
 import { TwPageStackChromeLayer, type PmPortalView } from "../page-stack/tw-page-stack-chrome-layer";
 import { TwTableGripLayer } from "../chrome/tw-table-grip-layer";
 import { TwObjectSelectionOverlay } from "./tw-object-selection-overlay";
+import { useUiApi } from "../ui-api-context";
 
 export interface TwChromeOverlayProps {
   /** Layout facet the overlay layers read from (layout-semantic data). */
@@ -39,16 +40,17 @@ export interface TwChromeOverlayProps {
    */
   geometryFacet: import("../../runtime/geometry/index.ts").GeometryFacet;
   /**
-   * Workflow facet — Layer-06 canonical source of scope rail segments
-   * + scope card models (`runtime.workflow`). Required for scope-rail
-   * / scope-card rendering; pass `null` when no runtime is attached
-   * (e.g., during initial mount).
+   * Workflow facet — no-provider fallback for scope rail/card reads.
+   * Mounted editor paths prefer `api.ui.scope.*`; pass `null` when no
+   * runtime is attached (e.g., during initial mount).
    */
   workflowFacet: import("../../runtime/workflow/rail/types.ts").WorkflowFacet | null;
   /** Optional coordinate space override.  Defaults to the overlay origin. */
   space?: OverlayCoordinateSpace;
   /** Active scope id (for emphasis + rail tab sync). */
   activeScopeId?: string | null;
+  /** Posture filters shared with the Workflow rail. Omitted means all scopes render. */
+  visibleScopePostures?: ReadonlySet<ScopeRailPosture>;
   /**
    * Click handler fired when the user clicks a scope rail stripe.
    * P0 wires this to open the scope card (P1 ships the card layer).
@@ -213,6 +215,7 @@ export const TwChromeOverlay: React.FC<TwChromeOverlayProps> = ({
   geometryFacet,
   space,
   activeScopeId,
+  visibleScopePostures,
   onScopeStripeClick,
   onScopeSegmentClick,
   onScopeCardClose,
@@ -242,6 +245,25 @@ export const TwChromeOverlay: React.FC<TwChromeOverlayProps> = ({
   mediaPreviews,
   activeBandRibbonProps,
 }) => {
+  const ui = useUiApi();
+  const scopeRailSegments = React.useMemo(
+    () =>
+      ui?.scope.rail().segments ??
+      workflowFacet?.getAllRailSegments() ??
+      [],
+    [ui, workflowFacet, renderFrameRevision],
+  );
+  const visibleScopeIds = React.useMemo(() => {
+    if (!visibleScopePostures) return undefined;
+    const ids = new Set<string>();
+    for (const segment of scopeRailSegments) {
+      if (visibleScopePostures.has(segment.posture)) {
+        ids.add(segment.scopeId);
+      }
+    }
+    return ids;
+  }, [scopeRailSegments, visibleScopePostures]);
+
   return (
     <div
       className="wre-chrome-overlay pointer-events-none absolute inset-0 z-30"
@@ -266,8 +288,10 @@ export const TwChromeOverlay: React.FC<TwChromeOverlayProps> = ({
       <TwScopeRailLayer
         geometryFacet={geometryFacet}
         workflowFacet={workflowFacet}
+        scopeRailSegments={scopeRailSegments}
         space={space}
         activeScopeId={activeScopeId}
+        visibleScopePostures={visibleScopePostures}
         onStripeClick={onScopeStripeClick}
         onSegmentClick={onScopeSegmentClick}
       />
@@ -275,6 +299,7 @@ export const TwChromeOverlay: React.FC<TwChromeOverlayProps> = ({
         facet={facet}
         workflowFacet={workflowFacet}
         activeScopeId={activeScopeId ?? null}
+        visibleScopeIds={visibleScopeIds}
         onClose={onScopeCardClose ?? noop}
         onModeChange={onScopeCardModeChange ?? noopModeChange}
         onIssueAction={onScopeCardIssueAction ?? noopIssueAction}

package/src/ui-tailwind/chrome-overlay/tw-scope-rail-layer.tsx

@@ -17,6 +17,7 @@ import {
   projectRectToOverlay,
   type OverlayCoordinateSpace,
 } from "./chrome-overlay-projector";
+import { useUiApi } from "../ui-api-context";
 import type { RenderFrame, RenderFrameRect } from "../../api/public-types.ts";
 import type { ScopeRailSegment, ScopeRailPosture } from "../../api/public-types.ts";
 import type { WorkflowFacet } from "../../api/public-types.ts";
@@ -30,22 +31,29 @@ export interface TwScopeRailLayerProps {
   /**
    * Geometry facet — used for `getRenderFrame()`. Migrated from
    * `facet: WordReviewEditorLayoutFacet` in refactor/05 cross-lane-coord
-   * §8.4 pass. Rail-segment + scope-card data flows through
-   * `workflowFacet` per Layer-06 Slice 4's seam inversion.
+   * §8.4 pass. Mounted rail/card data flows through `api.ui.scope.*`.
    */
   geometryFacet: GeometryFacet;
   /**
-   * Workflow facet — canonical source of scope rail segments + scope
-   * card models (`runtime.workflow.*`). Required for the layer to
-   * render anything; passing `null` makes the layer a no-op.
+   * Workflow facet — no-provider fallback for scope rail/card reads.
+   * Mounted editor paths prefer `api.ui.scope.*`; passing `null` makes
+   * fallback reads no-op.
    */
   workflowFacet: WorkflowFacet | null;
+  /**
+   * Optional pre-read rail snapshot from `ui.scope.rail()`. When omitted,
+   * the layer reads the mounted UI API itself, then falls back to the
+   * workflow facet for no-provider paths.
+   */
+  scopeRailSegments?: readonly ScopeRailSegment[];
   /** Overlay's coordinate space.  Defaults to the overlay's own origin. */
   space?: OverlayCoordinateSpace;
   /** Horizontal pad (px) the rail gutter occupies to the left of body. */
   railLaneWidthPx?: number;
   /** Scope id that should render with the `active` emphasis. */
   activeScopeId?: string | null;
+  /** Posture filters shared with the Workflow rail. Omitted means all scopes render. */
+  visibleScopePostures?: ReadonlySet<ScopeRailPosture>;
   /**
    * Fires when the user clicks the rail stripe — opens the scope card.
    * P0 wires this directly; P1 replaces with card-layer-aware routing.
@@ -87,22 +95,32 @@ const POSTURE_STYLES: Record<ScopeRailPosture, PostureStyle> = {
 // ---------------------------------------------------------------------------
 
 const DEFAULT_RAIL_LANE_PX = 44;
-const STRIPE_WIDTH_PX = 4;
-const LABEL_WIDTH_PX = 40;
+const STRIPE_WIDTH_PX = 6;
+const LABEL_WIDTH_PX = 58;
 const STACK_OFFSET_PX = 6;
 
 export const TwScopeRailLayer: React.FC<TwScopeRailLayerProps> = ({
   geometryFacet,
   workflowFacet,
+  scopeRailSegments,
   space,
   railLaneWidthPx = DEFAULT_RAIL_LANE_PX,
   activeScopeId,
+  visibleScopePostures,
   onStripeClick,
   onSegmentClick,
   "data-testid": testId,
 }) => {
+  const ui = useUiApi();
   const frame = geometryFacet.getRenderFrame() ?? null;
-  const segments = workflowFacet?.getAllRailSegments() ?? [];
+  const railSegments =
+    scopeRailSegments ??
+    ui?.scope.rail().segments ??
+    workflowFacet?.getAllRailSegments() ??
+    [];
+  const segments = railSegments.filter((segment) =>
+    visibleScopePostures ? visibleScopePostures.has(segment.posture) : true,
+  );
 
   if (!frame || segments.length === 0) {
     return null;
@@ -110,15 +128,23 @@ export const TwScopeRailLayer: React.FC<TwScopeRailLayerProps> = ({
 
   // P2: which scopes currently have a `source: "ai"` candidate
   // overlapping — drives the agent-pending shimmer class on their
-  // tints. Reads from the workflow facet's card-model projection so the
-  // shimmer logic lives in the Layer-06 runtime, not the overlay.
-  const cardModels = workflowFacet?.getAllScopeCardModels() ?? [];
+  // tints. Mounted surfaces read card projections through ui.scope.card;
+  // no-provider paths fall back to the workflow facet.
+  const cardModels = ui ? [] : workflowFacet?.getAllScopeCardModels() ?? [];
   const agentPendingByScope = new Map<string, boolean>();
   for (const model of cardModels) {
     if (model.agentPending) {
       agentPendingByScope.set(model.scopeId, true);
     }
   }
+  if (ui) {
+    for (const segment of segments) {
+      const model = ui.scope.card(segment.scopeId);
+      if (model?.agentPending) {
+        agentPendingByScope.set(segment.scopeId, true);
+      }
+    }
+  }
 
   // P3c: stack offsets for overlapping scopes.  Two scopes whose
   // offset ranges intersect on the same page render as stacked
@@ -223,16 +249,21 @@ export const TwScopeRailLayer: React.FC<TwScopeRailLayerProps> = ({
               style={projectRectToOverlay(stripeRect, projectorSpace)}
             />
             {/* Label pill — revealed on stripe hover via CSS. */}
-            <div
-              className={`wre-scope-rail-label wre-scope-rail-label-${style.railToken}`}
+            <button
+              type="button"
+              tabIndex={-1}
+              className={`wre-scope-rail-label wre-scope-rail-label-${style.railToken} ${
+                isActive ? "wre-scope-rail-label-active" : ""
+              }`}
               data-scope-id={segment.scopeId}
               data-posture={segment.posture}
-              aria-hidden="true"
+              aria-label={`${style.labelText}${segment.label ? `: ${segment.label}` : ""}`}
+              onClick={handleActivate}
               style={projectRectToOverlay(labelRect, projectorSpace)}
             >
               <span aria-hidden="true" className={`wre-scope-rail-icon wre-scope-rail-icon-${style.icon}`} />
               <span className="wre-scope-rail-label-text">{style.labelText}</span>
-            </div>
+            </button>
           </React.Fragment>
         );
       })}

package/src/ui-tailwind/editor-surface/pm-state-from-snapshot.ts

@@ -402,13 +402,7 @@ function buildParagraph(
       indentRight: paragraphLayout.indentation?.right ?? null,
       indentFirstLine: paragraphLayout.indentation?.firstLine ?? null,
       indentHanging: paragraphLayout.indentation?.hanging ?? null,
-      numberingMarkerWidth:
-        paragraphLayout.markerLane?.width ??
-        paragraphLayout.indentation?.hanging ??
-        (paragraphLayout.indentation?.firstLine !== undefined &&
-        paragraphLayout.indentation.firstLine < 0
-          ? Math.abs(paragraphLayout.indentation.firstLine)
-          : null),
+      numberingMarkerWidth: paragraphLayout.markerLane?.width ?? null,
       numberingMarkerStart: paragraphLayout.markerLane?.start ?? null,
       numberingMarkerJustification: paragraphLayout.markerJustification ?? null,
       numberingMarkerRunProperties: block.resolvedNumbering?.markerRunProperties ?? null,

package/src/ui-tailwind/review-workspace/use-scope-card-state.ts

@@ -9,13 +9,13 @@ import {
   cycleScopeIndex,
   shouldHandleScopeNavKey,
 } from "../chrome-overlay/scope-keyboard-cycle";
+import { useUiApi } from "../ui-api-context.tsx";
 
 export interface UseScopeCardStateOptions {
   layoutFacet?: import("../../runtime/layout/index.ts").WordReviewEditorLayoutFacet;
   /**
-   * Layer-06 workflow facet — canonical source of scope card models.
-   * Required by the keyboard-nav loop + Ask-agent handler after Slice 4
-   * rail-seam inversion removed those methods from `layoutFacet`.
+   * Layer-06 workflow facet — no-provider fallback for scope card models.
+   * Mounted paths prefer `api.ui.scope.rail/card`.
    */
   workflowFacet?: import("../../runtime/workflow/rail/types.ts").WorkflowFacet;
   onScopeModeChangeRequested?: (payload: {
@@ -79,6 +79,31 @@ export function useScopeCardState(options: UseScopeCardStateOptions): ScopeCardS
   void layoutFacet;
 
   const [activeScopeId, setActiveScopeId] = useState<string | null>(null);
+  const ui = useUiApi();
+
+  const readScopeIds = useCallback((): string[] => {
+    if (ui) {
+      const ids: string[] = [];
+      const seen = new Set<string>();
+      for (const segment of ui.scope.rail().segments) {
+        if (seen.has(segment.scopeId)) continue;
+        seen.add(segment.scopeId);
+        ids.push(segment.scopeId);
+      }
+      return ids;
+    }
+    return workflowFacet?.getAllScopeCardModels().map((model) => model.scopeId) ?? [];
+  }, [ui, workflowFacet]);
+
+  const readScopeCard = useCallback(
+    (scopeId: string) => {
+      if (ui) return ui.scope.card(scopeId);
+      return workflowFacet
+        ?.getAllScopeCardModels()
+        .find((m) => m.scopeId === scopeId) ?? null;
+    },
+    [ui, workflowFacet],
+  );
 
   const handleScopeStripeClick = useCallback(
     (segment: { scopeId: string }) => {
@@ -94,14 +119,13 @@ export function useScopeCardState(options: UseScopeCardStateOptions): ScopeCardS
   }, []);
 
   useEffect(() => {
-    if (!workflowFacet) {
+    if (!ui && !workflowFacet) {
       return undefined;
     }
     const onKey = (event: KeyboardEvent) => {
       if (!shouldHandleScopeNavKey(event)) return;
-      const models = workflowFacet.getAllScopeCardModels();
-      if (models.length === 0) return;
-      const ids = models.map((model) => model.scopeId);
+      const ids = readScopeIds();
+      if (ids.length === 0) return;
       const key = event.key.toLowerCase();
       if (key === "enter") {
         if (!activeScopeId) {
@@ -117,7 +141,7 @@ export function useScopeCardState(options: UseScopeCardStateOptions): ScopeCardS
     };
     window.addEventListener("keydown", onKey);
     return () => window.removeEventListener("keydown", onKey);
-  }, [workflowFacet, activeScopeId]);
+  }, [ui, workflowFacet, activeScopeId, readScopeIds]);
 
   const handleScopeCardModeChange = useCallback(
     (scopeId: string, mode: WorkflowScopeMode) => {
@@ -149,12 +173,10 @@ export function useScopeCardState(options: UseScopeCardStateOptions): ScopeCardS
 
   const handleScopeCardAskAgent = useCallback(
     (scopeId: string) => {
-      const cardModel = workflowFacet
-        ?.getAllScopeCardModels()
-        .find((m) => m.scopeId === scopeId);
+      const cardModel = readScopeCard(scopeId);
       onScopeAskAgent?.({ scopeId, anchor: cardModel?.anchor });
     },
-    [onScopeAskAgent, workflowFacet],
+    [onScopeAskAgent, readScopeCard],
   );
 
   return {

package/src/ui-tailwind/tw-review-workspace.tsx

@@ -283,13 +283,20 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
   //     changed, re-read any attached anchors" marker. Per-query
   //     invalidation fan-out is a Phase Q follow-up — the geometry
   //     facet does not yet expose per-kind invalidation events.
-  const uiApiForEmit = useUiApi();
+  const uiApi = useUiApi();
   const shellChannels = useUiShellChannels();
   React.useEffect(() => {
-    if (!uiApiForEmit || !shellChannels) return;
-    shellChannels.viewport.emit(uiApiForEmit.viewport.get());
+    if (!uiApi || !shellChannels) return;
+    shellChannels.viewport.emit(uiApi.viewport.get());
     shellChannels.overlays.emit({ kind: "page", value: 0 });
-  }, [renderFrameRevision, uiApiForEmit, shellChannels]);
+  }, [renderFrameRevision, uiApi, shellChannels]);
+  const scopeRailSegments = useMemo(
+    () =>
+      uiApi?.scope.rail().segments ??
+      props.workflowFacet?.getAllRailSegments() ??
+      [],
+    [uiApi, props.workflowFacet, renderFrameRevision],
+  );
   const headings = props.documentNavigation?.headings ?? [];
   const headerVariant = snapshot.pageLayout?.headerVariants[0]?.variant ?? "default";
   const footerVariant = snapshot.pageLayout?.footerVariants[0]?.variant ?? "default";
@@ -1272,10 +1279,10 @@ export function TwReviewWorkspace(inputProps: TwReviewWorkspaceProps) {
               onRejectRevision: props.onRejectRevision,
               onAcceptAllChanges: props.onAcceptAllChanges,
               onRejectAllChanges: props.onRejectAllChanges,
-              // Slice 4C rail-seam inversion: segments now come from the
-              // Layer-06 workflow facet. Layout facet no longer exposes
-              // `getAllScopeRailSegments` (methods removed in v40 / Slice 4C).
-              scopeRailSegments: props.workflowFacet?.getAllRailSegments() ?? [],
+              // Layer 11 closeout: mounted workspace chrome reads scope
+              // rail data through `api.ui.scope.rail()`, with the workflow
+              // facet retained as the no-provider fallback.
+              scopeRailSegments,
               activeScopeId,
               onOpenScope: (segment) => {
                 handleScopeStripeClick({ scopeId: segment.scopeId });