@agent-native/core-corpus 0.216.0 → 0.218.0

package/corpus/templates/content/app/components/editor/VisualEditor.tsx

@@ -1439,7 +1439,26 @@ function suggestionAnchorRange(
   const collapsedRange = collapsedDeletionTextblock();
   if (collapsedRange) return collapsedRange;
   if (sourceMatches) {
-    const exactRange = sourceRangeToPm(sourceFrom, sourceTo);
+    // An empty paragraph has no text to map, so a span that opens or closes
+    // with one maps the text beside it, or the place it starts when that's
+    // all it holds.
+    const emptyLine = "<empty-block/>";
+    let mapFrom = sourceFrom;
+    let mapTo = sourceTo;
+    for (;;) {
+      if (
+        mapTo - mapFrom > emptyLine.length &&
+        source.slice(mapTo - emptyLine.length - 1, mapTo) === `\n${emptyLine}`
+      )
+        mapTo -= emptyLine.length + 1;
+      else if (
+        mapTo - mapFrom > emptyLine.length &&
+        source.startsWith(`${emptyLine}\n`, mapFrom)
+      )
+        mapFrom += emptyLine.length + 1;
+      else break;
+    }
+    const exactRange = sourceRangeToPm(mapFrom, mapTo);
     if (exactRange) return exactRange;
   }
   const mappedSource = suggestionAnchorText(source);
@@ -1592,11 +1611,18 @@ export function suggestionHighlightSpec(
       editableText: true,
     };
   }
+  // Removed syntax with no text, such as indentation, a list marker, or an
+  // empty paragraph, is not in the document text, so it is drawn instead.
   const structuralDeletion =
     /^\n+$/.test(suggestionAnchorText(suggestion.beforeText)) ||
     (beforePresentation &&
       beforePresentation.length > 0 &&
-      beforePresentation.every((node) => node.type === "indent"));
+      beforePresentation.every(
+        (node) =>
+          node.type === "indent" ||
+          node.type === "block" ||
+          (node.type === "text" && /^↵+$/.test(node.value)),
+      ));
   return {
     suggestionId: suggestion.id,
     kind:
@@ -4743,9 +4769,17 @@ export function VisualEditor({
     const apply = (report = true) => {
       if (editor.isDestroyed) return;
       const specs = suggestions
-        .map((suggestion) =>
-          suggestionHighlightSpec(editor.state.doc, suggestion),
-        )
+        .map((suggestion) => {
+          const spec = suggestionHighlightSpec(editor.state.doc, suggestion);
+          // While suggesting, a saved suggestion's text outside the document
+          // is somewhere to type beside, not a control to focus.
+          return spec &&
+            suggesting &&
+            editable &&
+            suggestion.presentation === "canonical"
+            ? { ...spec, editableBoundary: true }
+            : spec;
+        })
         .filter((spec): spec is SuggestionHighlightSpec => spec !== null);
       if (report)
         onSuggestionAnchorsChange?.(
@@ -4771,8 +4805,10 @@ export function VisualEditor({
     };
   }, [
     activeSuggestionId,
+    editable,
     editor,
     onSuggestionAnchorsChange,
+    suggesting,
     suggestions,
     suggestionsSignature,
     showCommentIndicators,
@@ -4796,34 +4832,46 @@ export function VisualEditor({
     };
   }, [editor]);
 
+  // Callers build the readbacks inline and render again on every report, so
+  // these checks key on the readbacks' fields and report each divergent body
+  // once: keyed on the objects, each report re-runs its check until React
+  // aborts the render.
+  const acceptedReadbackId = acceptedDecisionReadback?.id ?? null;
+  const acceptedReadbackContent = acceptedDecisionReadback?.content ?? null;
   useLayoutEffect(() => {
-    if (!editor || editor.isDestroyed || !acceptedDecisionReadback) return;
+    if (
+      !editor ||
+      editor.isDestroyed ||
+      acceptedReadbackId === null ||
+      acceptedReadbackContent === null
+    )
+      return;
     const settlingSuggestion = suggestions.find(
-      (suggestion) => suggestion.id === acceptedDecisionReadback.id,
+      (suggestion) => suggestion.id === acceptedReadbackId,
     );
     if (!settlingSuggestion) return;
+    let reported: string | null = null;
     const check = () => {
       if (editor.isDestroyed) return;
       const actualContent = docToNfm(editor.getJSON() as any);
       if (
         acceptedSuggestionRendered(
           actualContent,
-          acceptedDecisionReadback.content,
+          acceptedReadbackContent,
           settlingSuggestion,
         )
       ) {
-        onAcceptedDecisionRendered?.(acceptedDecisionReadback.id);
+        onAcceptedDecisionRendered?.(acceptedReadbackId);
       } else if (
+        actualContent !== reported &&
         acceptedSuggestionReadbackOutdated(
           actualContent,
-          acceptedDecisionReadback.content,
+          acceptedReadbackContent,
           settlingSuggestion,
         )
       ) {
-        onAcceptedDecisionReadbackOutdated?.(
-          acceptedDecisionReadback.id,
-          actualContent,
-        );
+        reported = actualContent;
+        onAcceptedDecisionReadbackOutdated?.(acceptedReadbackId, actualContent);
       }
     };
     editor.on("transaction", check);
@@ -4832,27 +4880,44 @@ export function VisualEditor({
       editor.off("transaction", check);
     };
   }, [
-    acceptedDecisionReadback,
+    acceptedReadbackContent,
+    acceptedReadbackId,
     editor,
     onAcceptedDecisionRendered,
     onAcceptedDecisionReadbackOutdated,
     suggestions,
   ]);
 
+  const proposalReadbackGeneration =
+    proposalDecisionReadback?.generation ?? null;
+  const proposalReadbackContent = proposalDecisionReadback?.content ?? null;
+  const proposalReadbackBefore =
+    proposalDecisionReadback?.beforeContent ?? null;
   useLayoutEffect(() => {
-    if (!editor || editor.isDestroyed || !proposalDecisionReadback) return;
+    if (
+      !editor ||
+      editor.isDestroyed ||
+      proposalReadbackGeneration === null ||
+      proposalReadbackContent === null ||
+      proposalReadbackBefore === null
+    )
+      return;
+    let reported: string | null = null;
     const check = () => {
       if (editor.isDestroyed) return;
       const actual = canonicalizeNfm(docToNfm(editor.getJSON() as any));
-      if (actual === canonicalizeNfm(proposalDecisionReadback.content))
-        onProposalDecisionRendered?.(proposalDecisionReadback.generation);
+      if (actual === canonicalizeNfm(proposalReadbackContent))
+        onProposalDecisionRendered?.(proposalReadbackGeneration);
       else if (
-        actual !== canonicalizeNfm(proposalDecisionReadback.beforeContent)
-      )
+        actual !== reported &&
+        actual !== canonicalizeNfm(proposalReadbackBefore)
+      ) {
+        reported = actual;
         onProposalDecisionReadbackOutdated?.(
-          proposalDecisionReadback.generation,
+          proposalReadbackGeneration,
           actual,
         );
+      }
     };
     editor.on("transaction", check);
     check();
@@ -4863,7 +4928,9 @@ export function VisualEditor({
     editor,
     onProposalDecisionReadbackOutdated,
     onProposalDecisionRendered,
-    proposalDecisionReadback,
+    proposalReadbackBefore,
+    proposalReadbackContent,
+    proposalReadbackGeneration,
   ]);
 
   useEffect(() => {

package/corpus/templates/content/app/components/editor/database/DatabaseView.tsx

@@ -1232,6 +1232,18 @@ function DatabaseTable({
     if (panel !== "source") sourceHandoffActiveRef.current = false;
     setSettingsPanel(panel);
   };
+  // Opens Sources at one source's own page, as the GitHub status line's
+  // "From the … folder" does; each request has a new id so a repeat opens it.
+  const [sourceNavRequest, setSourceNavRequest] =
+    useState<SourceNavRequest | null>(null);
+  const openGitHubSource = () => {
+    changeDatabaseSettingsPanel("source");
+    setSourceNavRequest((request) => ({
+      id: (request?.id ?? 0) + 1,
+      stack: [{ kind: "github" }],
+    }));
+    setSettingsOpen(true);
+  };
   const [savedViewConfig, setSavedViewConfig] =
     useState<ContentDatabaseViewConfig>(defaultDatabaseViewConfig());
   const [personalQueryDirty, setPersonalQueryDirty] = useState(false);
@@ -3532,6 +3544,7 @@ function DatabaseTable({
         documentId={document.id}
         canEdit={canEdit}
         pageCount={totalItemCount}
+        onOpenSource={canEditWidgetRows ? undefined : openGitHubSource}
       />
       {canEdit &&
       databaseId &&
@@ -4082,6 +4095,7 @@ function DatabaseTable({
         }
         sourcePendingOperations={sourcePendingOperations}
         preserveSourceNavigationOnClose={preserveSourceNavigationOnClose}
+        sourceNavRequest={sourceNavRequest}
         onViewTypeChange={(type) =>
           setViewConfig(updateDatabaseViewType(viewConfig, activeView.id, type))
         }
@@ -7927,6 +7941,9 @@ type SourceNavStep =
   | { kind: "fieldPicker"; sourceId: string; sourceName: string }
   | { kind: "github" };
 
+/** A request to open Sources at a given page; a new id repeats it. */
+type SourceNavRequest = { id: number; stack: SourceNavStep[] };
+
 function sourceNavTitle(stack: SourceNavStep[]): string {
   const top = stack[stack.length - 1];
   if (!top) return dbText("sources");
@@ -8007,6 +8024,7 @@ function DatabaseSettingsPanelSheet({
   sourceActionPending,
   sourcePendingOperations,
   preserveSourceNavigationOnClose,
+  sourceNavRequest,
   onViewTypeChange,
   onWrapCellsChange,
   onOpenPagesInChange,
@@ -8060,6 +8078,7 @@ function DatabaseSettingsPanelSheet({
   sourceActionPending: boolean;
   sourcePendingOperations: DatabaseSourcePendingOperations;
   preserveSourceNavigationOnClose: boolean;
+  sourceNavRequest: SourceNavRequest | null;
   onViewTypeChange: (type: ContentDatabaseViewType) => void;
   onWrapCellsChange: (wrapCells: boolean) => void;
   onOpenPagesInChange: (openPagesIn: ContentDatabaseOpenPagesIn) => void;
@@ -8113,6 +8132,10 @@ function DatabaseSettingsPanelSheet({
       setSourceNavStack([]);
     }
   }, [open, panel, preserveSourceNavigationOnClose]);
+  // Runs after the reset above, so a request that opens the sheet keeps its page.
+  useEffect(() => {
+    if (sourceNavRequest) setSourceNavStack(sourceNavRequest.stack);
+  }, [sourceNavRequest]);
 
   const title =
     panel === "main"

package/corpus/templates/content/app/components/editor/database/GitHubSourceStatusLine.tsx

@@ -312,11 +312,14 @@ export function GitHubSourceStatusLine({
   documentId,
   canEdit,
   pageCount,
+  onOpenSource,
 }: {
   source: ContentDatabaseSource | null;
   documentId: string;
   canEdit: boolean;
   pageCount: number;
+  /** Opens the folder's page in Sources; without it, the folder is plain text. */
+  onOpenSource?: () => void;
 }) {
   const now = useNow();
   const [unlinkOpen, setUnlinkOpen] = useState(false);
@@ -334,6 +337,7 @@ export function GitHubSourceStatusLine({
       documentId={documentId}
       canEdit={canEdit}
       pageCount={pageCount}
+      onOpenSource={onOpenSource}
       detailsOpen={detailsOpen}
       onDetailsOpenChange={setDetailsOpen}
       unlinkOpen={unlinkOpen}
@@ -349,6 +353,7 @@ function GitHubStatusLineContent({
   documentId,
   canEdit,
   pageCount,
+  onOpenSource,
   detailsOpen,
   onDetailsOpenChange,
   unlinkOpen,
@@ -360,6 +365,7 @@ function GitHubStatusLineContent({
   documentId: string;
   canEdit: boolean;
   pageCount: number;
+  onOpenSource?: () => void;
   detailsOpen: boolean;
   onDetailsOpenChange: (open: boolean) => void;
   unlinkOpen: boolean;
@@ -387,8 +393,27 @@ function GitHubStatusLineContent({
       <div className="-m-px overflow-hidden p-px">
         <div className="-ms-3 flex min-w-0 flex-wrap items-center gap-y-1 text-muted-foreground">
           <Dotted>
-            <IconBrandGithub className="me-1.5 size-3.5 shrink-0" aria-hidden />
-            <FromFolder status={status} />
+            {onOpenSource ? (
+              <button
+                type="button"
+                onClick={onOpenSource}
+                className="inline-flex min-w-0 items-center rounded-sm text-start underline-offset-2 hover:underline focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+              >
+                <IconBrandGithub
+                  className="me-1.5 size-3.5 shrink-0"
+                  aria-hidden
+                />
+                <FromFolder status={status} />
+              </button>
+            ) : (
+              <>
+                <IconBrandGithub
+                  className="me-1.5 size-3.5 shrink-0"
+                  aria-hidden
+                />
+                <FromFolder status={status} />
+              </>
+            )}
           </Dotted>
           {stops ? null : (
             <Dotted>

package/corpus/templates/content/app/components/editor/database/ListItemLayout.tsx

@@ -93,6 +93,7 @@ function PropertyChoices({
   selectedIds: savedIds,
   multiple,
   noneLabel,
+  otherChoice,
   onChange,
 }: {
   label: string;
@@ -100,6 +101,8 @@ function PropertyChoices({
   selectedIds: string[];
   multiple: boolean;
   noneLabel?: string;
+  /** A choice that isn't a property, listed after Nothing (Line 2's page text). */
+  otherChoice?: { label: string; selected: boolean; onSelect: () => void };
   onChange: (ids: string[]) => void;
 }) {
   // A saved slot can name a property this menu doesn't offer: one hidden, or
@@ -107,8 +110,11 @@ function PropertyChoices({
   // In Line 3 and End it stays saved for when it's shown again.
   const offeredIds = properties.map((property) => property.definition.id);
   const selectedIds = savedIds.filter((id) => offeredIds.includes(id));
-  const rows = [
+  const rows: Array<{ id: string; name: string; other?: true }> = [
     ...(noneLabel ? [{ id: "", name: noneLabel }] : []),
+    ...(otherChoice
+      ? [{ id: "", name: otherChoice.label, other: true as const }]
+      : []),
     ...properties.map((property) => ({
       id: property.definition.id,
       name: property.definition.name,
@@ -121,9 +127,11 @@ function PropertyChoices({
       className="grid max-h-56 gap-0.5 overflow-y-auto"
     >
       {rows.map((row) => {
-        const selected = row.id
-          ? selectedIds.includes(row.id)
-          : selectedIds.length === 0;
+        const selected = row.other
+          ? otherChoice!.selected
+          : row.id
+            ? selectedIds.includes(row.id)
+            : selectedIds.length === 0 && !otherChoice?.selected;
         const position = row.id ? selectedIds.indexOf(row.id) : -1;
         const full =
           multiple &&
@@ -132,12 +140,13 @@ function PropertyChoices({
           selectedIds.length >= MAX_ITEM_LAYOUT_META_PROPERTIES;
         return (
           <button
-            key={row.id || "none"}
+            key={row.id || (row.other ? "other" : "none")}
             type="button"
             aria-pressed={selected}
             disabled={full}
             className="flex h-8 items-center gap-2 rounded px-2 text-left text-sm enabled:hover:bg-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50"
             onClick={() => {
+              if (row.other) return otherChoice!.onSelect();
               if (!multiple) return onChange(row.id ? [row.id] : []);
               onChange(
                 toggleContentDatabaseItemLayoutMetaProperty(
@@ -253,22 +262,37 @@ export function ListItemLayoutSlotEditor({
     );
   }
   if (slot === "line2") {
+    const pageText = layout.line2.source === "page";
+    const { lines } = layout.line2;
     return (
       <div className="grid gap-2">
         <PropertyChoices
           label={label}
           properties={itemLayoutLine2Candidates(properties)}
-          selectedIds={layout.line2.propertyId ? [layout.line2.propertyId] : []}
+          selectedIds={
+            !pageText && layout.line2.propertyId
+              ? [layout.line2.propertyId]
+              : []
+          }
           multiple={false}
           noneLabel={dbText("listRowsNothing")}
+          otherChoice={{
+            label: dbText("listRowsPageText"),
+            selected: pageText,
+            onSelect: () =>
+              onChange({
+                ...layout,
+                line2: { source: "page", propertyId: null, lines },
+              }),
+          }}
           onChange={([id]) =>
             onChange({
               ...layout,
-              line2: { ...layout.line2, propertyId: id ?? null },
+              line2: { propertyId: id ?? null, lines },
             })
           }
         />
-        {layout.line2.propertyId ? (
+        {pageText || layout.line2.propertyId ? (
           <Segmented<1 | 2 | 3>
             label={label}
             value={layout.line2.lines}

package/corpus/templates/content/app/components/editor/database/ListItemRow.tsx

@@ -7,7 +7,10 @@ import type {
   ContentDatabaseItemLayoutSlot,
   ResolvedContentDatabaseItemLayout,
 } from "@shared/database-item-layout";
-import { stripMarkdownForPreview } from "@shared/og-description";
+import {
+  buildListRowExcerpt,
+  stripMarkdownForPreview,
+} from "@shared/og-description";
 import {
   isEmptyPropertyValue,
   type DocumentPropertyOptionColor,
@@ -93,11 +96,29 @@ function line2Text(property: DocumentProperty) {
     : value.trim();
 }
 
+/**
+ * The first lines of a row's page. The list read sends an excerpt, and saving
+ * the page's body in this tab rebuilds it. Until a read brings one (right after
+ * Page text is picked), a body this tab already holds stands in.
+ */
+function pageExcerpt(item: ContentDatabaseItem) {
+  if (item.excerpt !== undefined) return item.excerpt;
+  return item.document.content
+    ? buildListRowExcerpt({
+        content: item.document.content,
+        title: item.document.title,
+      })
+    : "";
+}
+
 /** The fields a slot shows, which can be set but blank on a given row. */
 function slotFieldNames(
   resolved: ResolvedContentDatabaseItemLayout<DocumentProperty>,
   slot: ContentDatabaseItemLayoutSlot,
 ) {
+  if (slot === "line2" && resolved.line2.pageText) {
+    return [dbText("listRowsPageText")];
+  }
   const fields =
     slot === "line2"
       ? resolved.line2.property
@@ -305,7 +326,11 @@ export function DatabaseLayoutListRow({
   const line2Property = resolved.line2.property
     ? itemValue(item, resolved.line2.property)
     : null;
-  const line2 = line2Property ? line2Text(line2Property) : "";
+  const line2 = resolved.line2.pageText
+    ? pageExcerpt(item)
+    : line2Property
+      ? line2Text(line2Property)
+      : "";
   const filled = (properties: DocumentProperty[]) =>
     properties
       .map((property) => itemValue(item, property))

package/corpus/templates/content/app/components/editor/database-sources/BuilderSourceReviewDialog.tsx

@@ -238,6 +238,7 @@ export function builderReviewRowCanCancelPrepared(
 ) {
   const execution = row.execution;
   if (!execution) return false;
+  if (execution.payloadUnavailable) return false;
   if (
     execution.state !== "ready" &&
     execution.state !== "write_disabled" &&