@agent-native/core-corpus 0.210.2 → 0.211.0

package/corpus/templates/content/actions/create-comment-ai-suggestion.ts

@@ -1,10 +1,10 @@
 import { defineAction } from "@agent-native/core/action";
 import createSuggestion from "@agent-native/core/review/suggestions/actions/create-resource-suggestion";
+import createSuggestionProposal from "@agent-native/core/review/suggestions/actions/create-resource-suggestion-proposal";
 import listSuggestions from "@agent-native/core/review/suggestions/actions/list-resource-suggestions";
 import { and, eq, lt } from "drizzle-orm";
 import { z } from "zod";
 
-import { markdownSuggestionOperation } from "../app/components/editor/suggestions/markdown-operation.js";
 import { getDb, schema } from "../server/db/index.js";
 import {
   CommentAiOperationError,
@@ -20,6 +20,10 @@ import {
 import { CONTENT_DOCUMENT_SUGGESTION_ADAPTER } from "../server/lib/suggested-edits.js";
 import type { CommentAiRequest } from "../shared/comment-ai.js";
 import { resolveDocumentTextEdits } from "../shared/document-text-edits.js";
+import {
+  markdownSuggestionOperationsForFindReplaceEdits,
+  markdownSuggestionOperationSummary,
+} from "../shared/suggestion-diff.js";
 import { documentRevisionToken } from "./_document-edit-mutation.js";
 import { addCommentWithGuard, commentIdForIdempotency } from "./add-comment.js";
 
@@ -33,25 +37,38 @@ const payloadSchema = z.object({
     .describe(
       "One or two sentences to the commenter about this change, including anything they should check; shown on the suggestion in their comment thread",
     ),
-  find: z
-    .string()
+  edits: z
+    .array(
+      z.object({
+        find: z
+          .string()
+          .min(1)
+          .max(24000)
+          .describe("Exact unique text to propose replacing"),
+        replace: z
+          .string()
+          .max(24000)
+          .describe("Proposed replacement; canonical text remains unchanged"),
+      }),
+    )
     .min(1)
-    .max(24000)
-    .describe("Exact unique text to propose replacing"),
-  replace: z
-    .string()
-    .max(24000)
-    .describe("Proposed replacement; canonical text remains unchanged"),
+    .max(20)
+    .describe(
+      "One entry per separate change. Each find holds the words that change plus only enough surrounding text to occur once, so changes in different places become separate edits instead of one span of unchanged text between them.",
+    ),
 });
 
 /**
  * Earlier pending proposals the requester got in this thread are replaced by
- * a revision instead of stacking up. Only requests made before this one count,
- * so a retry builds the same list and its creation receipt still matches.
+ * a revision instead of stacking up: those from requests made before this one,
+ * and those an earlier attempt of this request created. Edits from this
+ * attempt never count, so replaying it builds the same list and its creation
+ * receipt still matches.
  */
 async function supersededSuggestionIds(
   request: Awaited<ReturnType<typeof requireCommentAiRequest>>,
   ctx: Parameters<typeof listSuggestions.run>[1],
+  attemptId: string,
 ) {
   const earlier = await getDb()
     .select({ id: schema.commentAiRequests.id })
@@ -64,8 +81,11 @@ async function supersededSuggestionIds(
         lt(schema.commentAiRequests.createdAt, request.createdAt),
       ),
     );
-  if (!earlier.length) return [];
   const earlierIds = new Set(earlier.map((row) => row.id));
+  // Only an earlier request, or an earlier attempt of this one, can have left
+  // edits to replace. Attempts are counted rather than results, because an
+  // attempt can create edits and then fail before recording them.
+  if (!earlierIds.size && request.attemptCount <= 1) return [];
   const { suggestions } = await listSuggestions.run(
     { resourceType: "document", resourceId: request.documentId },
     ctx,
@@ -76,10 +96,12 @@ async function supersededSuggestionIds(
         suggestion.adapterKind === CONTENT_DOCUMENT_SUGGESTION_ADAPTER &&
         suggestion.authorEmail === request.requesterEmail &&
         suggestion.metadata?.sourceThreadId === request.threadId &&
-        earlierIds.has(String(suggestion.metadata?.commentAiRequestId)),
+        (earlierIds.has(String(suggestion.metadata?.commentAiRequestId)) ||
+          (suggestion.metadata?.commentAiRequestId === request.id &&
+            suggestion.metadata?.commentAiAttemptId !== attemptId)),
     )
     .sort((left, right) => left.createdAt.localeCompare(right.createdAt))
-    .slice(-20)
+    .slice(-100)
     .map((suggestion) => suggestion.id);
 }
 
@@ -112,7 +134,7 @@ function targetError(kind: "missing" | "ambiguous" | "overlapping") {
 
 export default defineAction({
   description:
-    "Create one anchored suggestion against the latest Page text and link it to the original feedback. Pass the latest attemptId from get-comment-ai-context. Unrelated edits are tolerated when the exact target remains unique; missing or repeated targets become typed review conflicts. A new suggestion on the same comment replaces the requester's earlier pending one, so never ask them to reject it.",
+    "Propose anchored edits against the latest Page text, reviewed in the comment thread that asked for them. Pass the latest attemptId from get-comment-ai-context. Unrelated edits are tolerated when each exact target remains unique; missing, repeated, or overlapping targets become typed review conflicts. New edits on the same comment replace the requester's earlier pending ones, so never ask them to reject those.",
   schema: payloadSchema,
   run: async (args, ctx) => {
     const request = await requireCommentAiRequest("suggest");
@@ -126,45 +148,72 @@ export default defineAction({
       );
       const proposed = resolveDocumentTextEdits(
         verification.source.document.content,
-        [{ find: payload.find, replace: payload.replace }],
+        payload.edits,
       );
       if (!proposed.ok) throw targetError(proposed.error.kind);
-      const operation = markdownSuggestionOperation(
-        verification.source.document.content,
-        proposed.content,
-      );
-      if (!operation) {
+      const operations = markdownSuggestionOperationsForFindReplaceEdits({
+        before: verification.source.document.content,
+        edits: proposed.ranges,
+      });
+      if (!operations.length) {
         throw new CommentAiOperationError(
           "target_deleted",
           "The proposal does not change the latest Page text",
           false,
         );
       }
-      const supersedes = await supersededSuggestionIds(request, ctx);
-      const suggestion = await createSuggestion.run(
-        {
-          ...(supersedes.length ? { supersedes } : {}),
-          resourceType: "document",
-          resourceId: request.documentId,
-          adapterKind: CONTENT_DOCUMENT_SUGGESTION_ADAPTER,
-          baseRevision: verification.source.document.updatedAt,
-          summary: payload.summary,
-          idempotencyKey: `comment-ai:${request.id}:suggestion`,
-          operations: [operation],
-          metadata: {
-            sourceCommentId: request.rootCommentId,
-            sourceThreadId: request.threadId,
-            sourceUrl: `/page/${encodeURIComponent(request.documentId)}?comment=${encodeURIComponent(request.threadId)}`,
-            commentAiRequestId: request.id,
-            commentAiOperationId: request.id,
-            commentAiAttemptId: args.attemptId,
-            agentThreadId: request.agentThreadId,
-            runId: request.runId,
-            model: request.model,
-          },
-        },
+      const supersedes = await supersededSuggestionIds(
+        request,
         ctx,
+        args.attemptId,
       );
+      const proposal = {
+        ...(supersedes.length ? { supersedes } : {}),
+        resourceType: "document",
+        resourceId: request.documentId,
+        adapterKind: CONTENT_DOCUMENT_SUGGESTION_ADAPTER,
+        baseRevision: verification.source.document.updatedAt,
+        summary: payload.summary,
+      };
+      const metadata = {
+        sourceCommentId: request.rootCommentId,
+        sourceThreadId: request.threadId,
+        sourceUrl: `/page/${encodeURIComponent(request.documentId)}?comment=${encodeURIComponent(request.threadId)}`,
+        commentAiRequestId: request.id,
+        commentAiOperationId: request.id,
+        commentAiAttemptId: args.attemptId,
+        agentThreadId: request.agentThreadId,
+        runId: request.runId,
+        model: request.model,
+      };
+      // A Content suggestion holds exactly one edit, so separate changes become
+      // one proposal. The receipt links its first edit. Each attempt creates
+      // under its own key, because a retry may propose different edits.
+      const suggestion =
+        operations.length === 1
+          ? await createSuggestion.run(
+              {
+                ...proposal,
+                idempotencyKey: `comment-ai:${args.attemptId}:suggestion`,
+                operations,
+                metadata,
+              },
+              ctx,
+            )
+          : (
+              await createSuggestionProposal.run(
+                {
+                  ...proposal,
+                  idempotencyKey: `comment-ai:${args.attemptId}:proposal`,
+                  suggestions: operations.map((operation) => ({
+                    summary: markdownSuggestionOperationSummary(operation),
+                    operations: [{ ...operation, ordinal: 0 }],
+                    metadata,
+                  })),
+                },
+                ctx,
+              )
+            ).suggestions[0]!;
       await updateCommentAiRequest(request, {
         status: "running",
         result: { suggestionId: suggestion.id },

package/corpus/templates/content/actions/export-document.ts

@@ -3,6 +3,7 @@ import { buildDeepLink } from "@agent-native/core/server";
 import { resolveAccess } from "@agent-native/core/sharing";
 import { z } from "zod";
 
+import { CONTENT_DATABASE_FILTER_OPERATORS } from "../shared/api.js";
 import { blocksContentHash } from "../shared/blocks-field-identity.js";
 import {
   renderCollectionCsv,
@@ -31,20 +32,7 @@ const collectionSchema = z.object({
             z.object({
               key: z.string(),
               label: z.string(),
-              operator: z.enum([
-                "contains",
-                "equals",
-                "does_not_equal",
-                "greater_than",
-                "less_than",
-                "before",
-                "after",
-                "between",
-                "is_checked",
-                "is_unchecked",
-                "is_empty",
-                "is_not_empty",
-              ]),
+              operator: z.enum(CONTENT_DATABASE_FILTER_OPERATORS),
               value: z.string(),
               filterGroupId: z.string().optional(),
               parentFilterGroupId: z.string().optional(),

package/corpus/templates/content/actions/suggest-document-edit.ts

@@ -15,7 +15,10 @@ import { track } from "@agent-native/core/tracking";
 import { z } from "zod";
 
 import { resolveDocumentTextEdits } from "../shared/document-text-edits.js";
-import { markdownSuggestionOperationsForFindReplace } from "../shared/suggestion-diff.js";
+import {
+  markdownSuggestionOperationsForFindReplace,
+  markdownSuggestionOperationSummary,
+} from "../shared/suggestion-diff.js";
 import { contentSuggestionPath } from "../shared/suggestion-link.js";
 import { resolveDocumentAccess } from "./_document-access.js";
 import { documentRevisionToken } from "./_document-edit-mutation.js";
@@ -366,12 +369,7 @@ export default defineAction({
         proposalId: args.proposalId,
         idempotencyKey: args.idempotencyKey ?? crypto.randomUUID(),
         suggestions: operations.map((operation, index) => ({
-          summary:
-            operation.before.changedText && operation.after.changedText
-              ? `Replace "${operation.before.changedText.slice(0, 80)}" with "${operation.after.changedText.slice(0, 80)}"`
-              : operation.before.changedText
-                ? `Delete "${operation.before.changedText.slice(0, 80)}"`
-                : `Insert "${operation.after.changedText.slice(0, 80)}"`,
+          summary: markdownSuggestionOperationSummary(operation),
           operations: [{ ...operation, ordinal: 0 }],
           metadata:
             index === 0

package/corpus/templates/content/actions/update-content-database-view.ts

@@ -9,6 +9,7 @@ import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
 import { syncPrivateViewIconReferences } from "../server/lib/private-icon-references.js";
+import { CONTENT_DATABASE_FILTER_OPERATORS } from "../shared/api.js";
 import { withSavedTableColumnPresentation } from "../shared/database-table-columns.js";
 import { lockContentDatabaseMutation } from "./_content-database-mutation-lock.js";
 import {
@@ -39,20 +40,7 @@ const filterSchema = z
   .object({
     key: z.string(),
     label: z.string(),
-    operator: z.enum([
-      "contains",
-      "equals",
-      "does_not_equal",
-      "greater_than",
-      "less_than",
-      "before",
-      "after",
-      "between",
-      "is_checked",
-      "is_unchecked",
-      "is_empty",
-      "is_not_empty",
-    ]),
+    operator: z.enum(CONTENT_DATABASE_FILTER_OPERATORS),
     value: z.string(),
     filterGroupId: z.string().optional(),
     parentFilterGroupId: z.string().optional(),

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

@@ -116,6 +116,7 @@ import {
 import type { DraftSuggestion } from "./suggestions/draft-session";
 import { SuggestionText } from "./SuggestionText";
 import {
+  proposalGroups,
   receiptSuggestion,
   suggestionSourceThreadId,
   suggestionsByThread,
@@ -741,6 +742,8 @@ interface CommentsSidebarOptions {
   surface?: CommentSurface;
   /** Closes the anchored popover; shown as its header close button. */
   onClose?: () => void;
+  /** Extra header actions for each comment thread's card. */
+  renderThreadActions?: (thread: CommentThread) => ReactNode;
 }
 
 type CommentsSidebarProps = CommentsSidebarOptions &
@@ -812,6 +815,7 @@ export function CommentsSidebar({
   presentation = "inline",
   surface: surfaceProp,
   onClose,
+  renderThreadActions,
 }: CommentsSidebarProps) {
   const surface: CommentSurface =
     surfaceProp ?? (presentation === "history" ? "panel" : "rail");
@@ -1148,23 +1152,52 @@ export function CommentsSidebar({
   const pendingFocus = displayedPendingComment?.focus;
   useEffect(() => {
     if (!pendingFocus || presentation !== "inline") return;
-    const timer = setTimeout(() => {
+    // A new comment has no saved caret yet ({}); a draft that lost focus has
+    // none at all (null) and stays put. A new comment takes focus from the
+    // page, which keeps it through the toolbar click or shortcut that opened
+    // the comment, so typing goes into the comment. A restored draft only
+    // takes focus nobody else holds.
+    const isNew =
+      pendingFocus.current !== null && pendingFocus.current.start === undefined;
+    let movedAway = false;
+    const relinquish = (event: FocusEvent) => {
+      if (!pendingCardRef.current?.contains(event.target as Node))
+        movedAway = true;
+    };
+    document.addEventListener("focusin", relinquish);
+    let attempts = 0;
+    let frame = 0;
+    const focusComposer = () => {
       const input = pendingInputRef.current;
+      const card = pendingCardRef.current;
       const saved = pendingFocus.current;
-      if (!input || !saved) return;
-      const active = document.activeElement;
-      if (
-        active &&
-        active !== document.body &&
-        active !== document.documentElement &&
-        active.isConnected
-      )
-        return;
-      input.focus();
-      if (saved.start !== undefined && saved.end !== undefined)
-        input.setSelection(saved.start, saved.end, saved.direction);
-    }, 50);
-    return () => clearTimeout(timer);
+      if (!saved || movedAway) return;
+      if (input && card) {
+        if (card.contains(document.activeElement)) return;
+        const active = document.activeElement;
+        if (
+          !isNew &&
+          active &&
+          active !== document.body &&
+          active !== document.documentElement &&
+          active.isConnected
+        )
+          return;
+        input.focus();
+        if (saved.start !== undefined && saved.end !== undefined)
+          input.setSelection(saved.start, saved.end, saved.direction);
+        if (card.contains(document.activeElement)) return;
+      }
+      // The composer may still be mounting, or hidden while its popover is
+      // positioned; focus can't land until it's on screen.
+      if (++attempts < 30) frame = requestAnimationFrame(focusComposer);
+    };
+    const timer = setTimeout(focusComposer, 50);
+    return () => {
+      clearTimeout(timer);
+      cancelAnimationFrame(frame);
+      document.removeEventListener("focusin", relinquish);
+    };
   }, [pendingFocus, presentation]);
 
   const handlePendingSubmit = async (
@@ -1622,25 +1655,47 @@ export function CommentsSidebar({
     const freshResolution =
       thread.resolved && commentAi?.freshResolutions.has(thread.threadId);
     const embedded = threadSuggestions.get(thread.threadId) ?? [];
-    const receipts = new Map<string, ResourceSuggestion>();
+    // A receipt links the first edit of its proposal and stands for them all.
+    const groups = proposalGroups(embedded);
+    const receipts = new Map<string, ResourceSuggestion[]>();
     for (const comment of thread.comments) {
       const suggestion = receiptSuggestion(comment, embedded);
-      if (suggestion) receipts.set(comment.id, suggestion);
+      const group =
+        suggestion && groups.find((members) => members.includes(suggestion));
+      if (group) receipts.set(comment.id, group);
     }
-    const receiptless = embedded.filter(
-      (suggestion) => ![...receipts.values()].includes(suggestion),
+    const receiptless = groups.filter(
+      (group) => ![...receipts.values()].includes(group),
     );
     const aiWorking = Boolean(
       commentAi && isCommentAiWorkingOn(commentAi, thread.threadId),
     );
-    const suggestionProps = (suggestion: ResourceSuggestion) => ({
-      suggestion,
-      canDecide: canDecideSuggestions,
-      busy: suggestionBusy(suggestion),
-      conflict: isUnplaceable(suggestion),
-      onDecide: (decision: SuggestionDecision) =>
-        onDecideSuggestion?.(suggestion, decision),
-    });
+    const suggestionProps = (members: ResourceSuggestion[]) => {
+      const proposalId = members.length > 1 ? members[0]?.proposalId : null;
+      return {
+        suggestions: members,
+        canDecide: canDecideSuggestions,
+        busy: suggestionBusy,
+        conflict: isUnplaceable,
+        onDecide: (
+          suggestion: ResourceSuggestion,
+          decision: SuggestionDecision,
+        ) => onDecideSuggestion?.(suggestion, decision),
+        onDecideRemaining:
+          proposalId && onDecideSuggestionProposal
+            ? (decision: SuggestionDecision) =>
+                onDecideSuggestionProposal(
+                  proposalId,
+                  decision,
+                  suggestions.filter(
+                    (suggestion) =>
+                      suggestion.proposalId === proposalId &&
+                      suggestion.status === "pending",
+                  ),
+                )
+            : undefined,
+      };
+    };
     const showsRequestSuggestion =
       aiRequest?.status === "suggested" &&
       embedded.some(
@@ -1794,6 +1849,7 @@ export function CommentsSidebar({
         resolved={Boolean(thread.resolved)}
         surface={surface}
         onClose={onClose}
+        threadActions={renderThreadActions?.(thread)}
         currentUserEmail={currentUserEmail}
         quote={thread.quotedText}
         propertyTarget={
@@ -1843,10 +1899,10 @@ export function CommentsSidebar({
         feedback={
           (aiRequest && commentAi) || receiptless.length ? (
             <>
-              {receiptless.map((suggestion) => (
+              {receiptless.map((members) => (
                 <ThreadSuggestionRow
-                  key={suggestion.id}
-                  {...suggestionProps(suggestion)}
+                  key={members[0]!.id}
+                  {...suggestionProps(members)}
                 />
               ))}
               {!aiRequest || !commentAi ? null : continuation ||

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

@@ -264,7 +264,6 @@ import {
 } from "./local-source-write-state";
 import { NotionConflictBanner } from "./NotionConflictBanner";
 import {
-  clearPageDraftJournal,
   clearPageDraftJournalGeneration,
   listPageDraftJournal,
   syncPageDraftJournalBeforePersistingRecoveryDraft,
@@ -449,12 +448,14 @@ export interface PageEditorSession {
 
 /**
  * Opens the Page with its Comments showing: one thread when `threadId` is
- * set, otherwise the list. A new `key` asks again.
+ * set, a new comment on the Property `propertyId` names, otherwise the list.
+ * A new `key` asks again.
  */
 export interface PageCommentIntent {
   key: number;
   documentId: string;
   threadId?: string | null;
+  propertyId?: string;
 }
 
 export interface PageEditorSurfaceProps extends DocumentEditorProps {
@@ -3346,24 +3347,11 @@ function PageEditorSessionBody({
     [isLinkedLocalSourceDocument, isLocalFileDocument, journalScope, t],
   );
   const clearConfirmedDraftJournal = useCallback(
-    (
-      saved: Document & {
-        bodyIntentOutcome?: { status: "applied" | "displaced-preserved" };
-      },
-      editGeneration: number,
-    ) => {
+    (editGeneration: number) => {
       const scope = journalScope();
       if (!scope) return;
       try {
-        if (saved.bodyIntentOutcome) {
-          clearPageDraftJournalGeneration(scope, editGeneration);
-        } else {
-          clearPageDraftJournal(scope, {
-            editGeneration,
-            title: saved.title,
-            content: saved.content,
-          });
-        }
+        clearPageDraftJournalGeneration(scope, editGeneration);
       } catch {
         if (!recoveryWriteErrorShownRef.current) {
           toast.error(t("editor.pageSaveBeforeNavigationFailed"));
@@ -4354,17 +4342,13 @@ function PageEditorSessionBody({
             : null,
         });
       }
-      if (
-        contentEditVersionRef.current === contentEditVersion &&
-        contentObservationEpochRef.current === contentObservationEpoch
-      ) {
+      // Text another writer added while this save was in flight is theirs to
+      // save, so it holds back neither the confirmation nor the journal clear.
+      // An entry kept for it outlives this tab's edits, and the next tab to
+      // open the page replays it as a save of its own.
+      if (contentEditVersionRef.current === contentEditVersion) {
         confirmedContentEditVersionRef.current = contentEditVersion;
-        if (
-          saved.title === localTitleRef.current &&
-          saved.content === localContentRef.current
-        ) {
-          clearConfirmedDraftJournal(saved, editorEditGeneration);
-        }
+        clearConfirmedDraftJournal(editorEditGeneration);
       }
 
       if (autoSync) {
@@ -7408,6 +7392,7 @@ function PageEditorSessionBody({
   )
     ? pagePropertiesQuery.data.properties
     : undefined;
+  const pagePropertiesFailed = !pageProperties && pagePropertiesQuery.isError;
   const documentLayoutRef = useRef<HTMLDivElement>(null);
   const commentLaneRef = useRef<HTMLElement>(null);
   const anchoredCommentRef = useRef<HTMLElement>(null);
@@ -7792,6 +7777,7 @@ function PageEditorSessionBody({
     ],
   );
   const handledCommentDeepLinkRef = useRef<string | null>(null);
+  const handledPropertyCommentLinkRef = useRef<string | null>(null);
 
   const startPropertyComment = useCallback(
     (property: DocumentProperty) => {
@@ -7928,6 +7914,40 @@ function PageEditorSessionBody({
     activateCommentThread(threadId, true);
   }, [activateCommentThread, documentId, location.search, threads]);
 
+  // A Collection that opens rows as full pages links here to start a comment
+  // on one Property, as the row's peek does on a touch screen.
+  useEffect(() => {
+    const propertyId = new URLSearchParams(location.search).get(
+      "commentProperty",
+    );
+    if (!propertyId) {
+      handledPropertyCommentLinkRef.current = null;
+      return;
+    }
+    const linkKey = `${documentId}:${propertyId}`;
+    // Wait for the Properties; a failed read opens the list instead.
+    if (
+      handledPropertyCommentLinkRef.current === linkKey ||
+      (!pageProperties && !pagePropertiesFailed)
+    ) {
+      return;
+    }
+    handledPropertyCommentLinkRef.current = linkKey;
+    const property = pageProperties?.find(
+      (candidate) => candidate.definition.id === propertyId,
+    );
+    if (property && canComment) startPropertyComment(property);
+    else handleUtilityPanelChange("comments");
+  }, [
+    canComment,
+    documentId,
+    handleUtilityPanelChange,
+    location.search,
+    pageProperties,
+    pagePropertiesFailed,
+    startPropertyComment,
+  ]);
+
   const handledCommentIntentRef = useRef<number | null>(null);
   useEffect(() => {
     if (
@@ -7935,7 +7955,7 @@ function PageEditorSessionBody({
       handledCommentIntentRef.current === commentIntent.key
     )
       return;
-    const threadId = commentIntent.threadId;
+    const { threadId, propertyId } = commentIntent;
     if (threadId) {
       // Wait for the thread; a thread that is gone opens the list instead.
       if (!threads) return;
@@ -7944,14 +7964,30 @@ function PageEditorSessionBody({
         activateCommentThread(threadId);
         return;
       }
+    } else if (propertyId) {
+      // Wait for the Properties; one that is gone, or a failed read, opens
+      // the list instead.
+      if (!pageProperties && !pagePropertiesFailed) return;
+      handledCommentIntentRef.current = commentIntent.key;
+      const property = pageProperties?.find(
+        (candidate) => candidate.definition.id === propertyId,
+      );
+      if (property && canComment) {
+        startPropertyComment(property);
+        return;
+      }
     }
     handledCommentIntentRef.current = commentIntent.key;
     handleUtilityPanelChange("comments");
   }, [
     activateCommentThread,
+    canComment,
     commentIntent,
     documentId,
     handleUtilityPanelChange,
+    pageProperties,
+    pagePropertiesFailed,
+    startPropertyComment,
     threads,
   ]);