@agent-native/core-corpus 0.210.2 → 0.211.0

package/corpus/templates/plan/app/pages/PlansPage.tsx

@@ -349,7 +349,12 @@ export {
 };
 export type { NativeMarkerPlacement } from "@/lib/plan-native-anchors";
 export type { PlanOrgAccessPrompt } from "@/lib/plan-access-prompt";
-export { canSubmitInlineCommentDraft, mentionQueryAtCaret };
+export {
+  AnnotationPopover,
+  canSubmitInlineCommentDraft,
+  CommentMentionEditor,
+  mentionQueryAtCaret,
+};
 export type { CommentDraft } from "@/lib/plan-comment-editor-helpers";
 
 export function buildPlanEmailVerificationCallbackURL(
@@ -5742,6 +5747,7 @@ export function PlansPage({ localPlanSlug }: { localPlanSlug?: string } = {}) {
                   ) : (
                     <InlineCommentPopover
                       key={failedCommentDraft ? "retry" : "new"}
+                      anchor={pendingAnnotation}
                       position={inlineCommentPosition}
                       initialDraft={
                         failedCommentDraft ?? defaultInlineCommentDraft
@@ -5749,6 +5755,7 @@ export function PlansPage({ localPlanSlug }: { localPlanSlug?: string } = {}) {
                       onCancel={closeInlineComment}
                       onSubmit={submitInlineComment}
                       lockToAgent={localPlanMode}
+                      reopened={Boolean(failedCommentDraft)}
                     />
                   )}
                 </>
@@ -8930,9 +8937,26 @@ function CreatePlanDialog({
   );
 }
 
+/** Nothing on the page holds focus, so taking it moves nobody's caret. */
+function focusIsFree() {
+  const active = document.activeElement;
+  return !active || active === document.body;
+}
+
+function focusCommentEditorAtEnd(root: HTMLElement) {
+  root.focus();
+  const selection = window.getSelection();
+  const range = document.createRange();
+  range.selectNodeContents(root);
+  range.collapse(false);
+  selection?.removeAllRanges();
+  selection?.addRange(range);
+}
+
 function CommentMentionEditor({
   initialMessage,
   resetKey,
+  focusKey,
   placeholder,
   className,
   autoFocus,
@@ -8941,9 +8965,12 @@ function CommentMentionEditor({
 }: {
   initialMessage?: string;
   resetKey?: string;
+  /** A new value puts the caret back in the editor and keeps its text. */
+  focusKey?: unknown;
   placeholder: string;
   className?: string;
-  autoFocus?: boolean;
+  /** "if-free" only takes focus nobody holds, for a box reopened after a failed save. */
+  autoFocus?: boolean | "if-free";
   onChange: (draft: Pick<CommentDraft, "message" | "mentions">) => void;
   onSubmitShortcut?: () => void;
 }) {
@@ -8975,19 +9002,36 @@ function CommentMentionEditor({
   useEffect(() => {
     const root = editorRef.current;
     if (!root) return;
+    const hadFocus = root.contains(document.activeElement);
     appendMessageToEditor(root, initialMessage ?? "");
     emitChange();
-    if (autoFocus) {
-      root.focus();
-      const selection = window.getSelection();
-      const range = document.createRange();
-      range.selectNodeContents(root);
-      range.collapse(false);
-      selection?.removeAllRanges();
-      selection?.addRange(range);
-    }
+    // Reloading the text keeps the caret in an editor that had it.
+    if (hadFocus) focusCommentEditorAtEnd(root);
+    if (!autoFocus || (autoFocus === "if-free" && !focusIsFree())) return;
+    // An Edit menu item mounts this editor while its menu still traps focus,
+    // so keep trying for a few frames until focus lands.
+    let attempts = 0;
+    let frame = 0;
+    const focusEditor = () => {
+      focusCommentEditorAtEnd(root);
+      if (document.activeElement !== root && ++attempts < 10)
+        frame = requestAnimationFrame(focusEditor);
+    };
+    focusEditor();
+    return () => cancelAnimationFrame(frame);
   }, [autoFocus, emitChange, initialMessage, resetKey]);
 
+  // Only a new key moves the caret; mounting is autoFocus's job.
+  const focusKeyRef = useRef(focusKey);
+  useEffect(() => {
+    if (focusKeyRef.current === focusKey) return;
+    focusKeyRef.current = focusKey;
+    const root = editorRef.current;
+    if (!root || focusKey === undefined) return;
+    if (root.contains(document.activeElement)) return;
+    focusCommentEditorAtEnd(root);
+  }, [focusKey]);
+
   const selectMember = (member: OrgMemberSuggestion) => {
     const root = editorRef.current;
     const active = activeQueryRef.current;
@@ -9158,17 +9202,22 @@ function ResolutionTargetToggle({
 }
 
 function InlineCommentPopover({
+  anchor,
   position,
   initialDraft,
   onCancel,
   onSubmit,
   lockToAgent = false,
+  reopened = false,
 }: {
+  anchor: PlanAnnotationAnchor;
   position: InlineCommentPosition;
   initialDraft: CommentDraft;
   onCancel: () => void;
   onSubmit: (draft: CommentDraft) => Promise<void>;
   lockToAgent?: boolean;
+  /** Shown again after a failed save, when the person may have moved on. */
+  reopened?: boolean;
 }) {
   const t = useT();
   const initialMessageRef = useRef(initialDraft.message);
@@ -9249,7 +9298,10 @@ function InlineCommentPopover({
         <CommentMentionEditor
           initialMessage={initialMessageRef.current}
           placeholder={t("plansPage.comments.addPlaceholder")}
-          autoFocus
+          autoFocus={reopened ? "if-free" : true}
+          // Commenting somewhere else moves this popover instead of
+          // remounting it, so the draft keeps its text and gets the caret.
+          focusKey={anchor}
           onSubmitShortcut={submit}
           onChange={(value) =>
             setDraft((current) => {
@@ -9387,42 +9439,110 @@ function CommentDeleteButton({
   );
 }
 
+/** What a reply box shows: the editor reloads `loadedMessage` when `version` changes. */
+function loadReplyBox({
+  threadId,
+  message,
+  version,
+  takeFocus,
+}: {
+  threadId: string;
+  message: string;
+  version: number;
+  takeFocus: boolean;
+}) {
+  const draft: Pick<CommentDraft, "message" | "mentions"> = {
+    message,
+    mentions: extractCommentMentions(message),
+  };
+  return { threadId, loadedMessage: message, version, takeFocus, draft };
+}
+
 function ReplyComposer({
   author,
   isPending,
   placeholder,
+  autoFocus,
+  threadId = "",
   onSubmit,
 }: {
   author: CommentAuthorPresentation;
   isPending: boolean;
   placeholder?: string;
+  autoFocus?: boolean;
+  /** One box can reply to several threads in turn; each keeps its own draft. */
+  threadId?: string;
   onSubmit: (message: string) => Promise<void>;
 }) {
   const t = useT();
-  const [draft, setDraft] = useState<
-    Pick<CommentDraft, "message" | "mentions">
-  >({
-    message: "",
-    mentions: [],
-  });
-  const [submitError, setSubmitError] = useState(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [resetKey, setResetKey] = useState(0);
+  // Unsent replies by thread, including the one on screen.
+  const [drafts] = useState(() => new Map<string, string>());
+  // The thread on screen and its draft change together, so Send always
+  // pairs them.
+  const [box, setBox] = useState(() =>
+    loadReplyBox({ threadId, message: "", version: 0, takeFocus: true }),
+  );
+  const [sendingThreadIds, setSendingThreadIds] = useState<string[]>([]);
+  const [failedThreadIds, setFailedThreadIds] = useState<string[]>([]);
+
+  if (box.threadId !== threadId) {
+    // Opening another thread brings back that thread's own reply.
+    setBox(
+      loadReplyBox({
+        threadId,
+        message: drafts.get(threadId) ?? "",
+        version: box.version + 1,
+        takeFocus: true,
+      }),
+    );
+  }
 
+  const isSubmitting = sendingThreadIds.includes(box.threadId);
   const canSubmit =
-    commentBodyText(draft.message).length > 0 && !isSubmitting && !isPending;
+    commentBodyText(box.draft.message).length > 0 &&
+    !isSubmitting &&
+    !isPending;
   const submit = async () => {
     if (!canSubmit) return;
-    setSubmitError(false);
-    setIsSubmitting(true);
+    const sentThreadId = box.threadId;
+    const message = box.draft.message;
+    setFailedThreadIds((ids) => ids.filter((id) => id !== sentThreadId));
+    setSendingThreadIds((ids) => [...ids, sentThreadId]);
+    // Empty the box right away. The reply shows in the thread while it
+    // sends, and anything typed meanwhile is a new draft.
+    drafts.set(sentThreadId, "");
+    setBox((current) =>
+      loadReplyBox({
+        threadId: current.threadId,
+        message: "",
+        version: current.version + 1,
+        takeFocus: true,
+      }),
+    );
     try {
-      await onSubmit(draft.message.trim());
-      setDraft({ message: "", mentions: [] });
-      setResetKey((key) => key + 1);
+      await onSubmit(message.trim());
     } catch {
-      setSubmitError(true);
+      // Put the reply back in its thread's box, ahead of anything typed
+      // since, wherever that box is now.
+      const typedSince = drafts.get(sentThreadId)?.trim();
+      const restored = typedSince ? `${message} ${typedSince}` : message;
+      drafts.set(sentThreadId, restored);
+      setFailedThreadIds((ids) => [
+        ...ids.filter((id) => id !== sentThreadId),
+        sentThreadId,
+      ]);
+      setBox((current) =>
+        current.threadId === sentThreadId
+          ? loadReplyBox({
+              threadId: sentThreadId,
+              message: restored,
+              version: current.version + 1,
+              takeFocus: false,
+            })
+          : current,
+      );
     } finally {
-      setIsSubmitting(false);
+      setSendingThreadIds((ids) => ids.filter((id) => id !== sentThreadId));
     }
   };
 
@@ -9435,9 +9555,16 @@ function ReplyComposer({
             placeholder={
               placeholder ?? t("plansPage.comments.replyPlaceholder")
             }
-            resetKey={`reply-${resetKey}`}
+            initialMessage={box.loadedMessage}
+            resetKey={`reply-${box.version}`}
+            // Only opening the thread or pressing Send pulls focus here; a
+            // reply put back after a failed send takes only free focus.
+            autoFocus={!autoFocus ? false : box.takeFocus ? true : "if-free"}
             className="min-h-10 border-0 bg-transparent px-0 py-2 shadow-none focus-visible:ring-0"
-            onChange={setDraft}
+            onChange={(next) => {
+              setBox((current) => ({ ...current, draft: next }));
+              drafts.set(box.threadId, next.message);
+            }}
             onSubmitShortcut={() => void submit()}
           />
           <Button
@@ -9456,7 +9583,7 @@ function ReplyComposer({
           </Button>
         </div>
       </div>
-      {submitError && (
+      {failedThreadIds.includes(box.threadId) && (
         <p className="ml-11 text-xs text-destructive">
           {t("plansPage.comments.sendFailed")}
         </p>
@@ -9500,6 +9627,7 @@ function AnnotationPopover({
 }) {
   const t = useT();
   const popoverRef = useRef<HTMLDivElement>(null);
+  const editChosenFromMenuRef = useRef(false);
   const [editing, setEditing] = useState(false);
   const [messageDraft, setMessageDraft] = useState<
     Pick<CommentDraft, "message" | "mentions">
@@ -9612,6 +9740,12 @@ function AnnotationPopover({
                 align="end"
                 className="w-48 rounded-xl"
                 data-comment-popover-portal
+                onCloseAutoFocus={(event) => {
+                  // Edit puts focus in its editor; leave it there. Other
+                  // actions return to the button.
+                  if (editChosenFromMenuRef.current) event.preventDefault();
+                  editChosenFromMenuRef.current = false;
+                }}
               >
                 {canResolve && (
                   <DropdownMenuItem
@@ -9629,7 +9763,10 @@ function AnnotationPopover({
                 {canEditRootComment && (
                   <DropdownMenuItem
                     className="gap-2"
-                    onClick={() => setEditing(true)}
+                    onClick={() => {
+                      editChosenFromMenuRef.current = true;
+                      setEditing(true);
+                    }}
                   >
                     <IconPencil className="size-4" />
                     {t("plansPage.comments.editFirstComment")}
@@ -9759,6 +9896,9 @@ function AnnotationPopover({
           <ReplyComposer
             author={pendingAuthor}
             isPending={isPending}
+            autoFocus
+            // Opening another thread reuses this popover and its reply box.
+            threadId={annotation.id}
             onSubmit={(reply) => onReply(annotation.id, reply)}
           />
         </div>

package/corpus/templates/plan/changelog/2026-10-19-opening-a-comment-thread-puts-the-cursor-in-the-reply-box-an.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-19
+---
+
+Opening a comment thread puts the cursor in the reply box, and Edit puts it after the comment's text. A reply you haven't sent stays with its thread when you open another one.

package/corpus/templates/slides/.agents/skills/actions/references/action-fields.md

@@ -95,9 +95,9 @@ MCP clients see no `outputSchema` by default. Set `mcpOutputSchema: true` (requi
 
 `authorize` decides whether the caller may run the action at all. It wraps
 `run`, so it holds at **all six dispatch sites** — agent tool, HTTP, frontend
-hook, MCP, A2A, CLI — unlike `needsApproval`, which is honoured only in the
-agent loop. Use `authorize` for "not everyone may do this"; use `needsApproval`
-to ask a human to bless one call a permitted caller is already allowed to make.
+hook, MCP, A2A, CLI. Use `authorize` for "not everyone may do this"; use
+`needsApproval` to ask a human to bless one call a permitted caller is already
+allowed to make.
 
 ```ts
 import { coachAccess } from "../lib/access.js"; // defineAppRoles(...)
@@ -140,4 +140,6 @@ export default defineAction({
 
 When the gate is truthy and the call isn't yet approved, the loop emits an `approval_required` event and **stops the turn — `run()` never executes**. A predicate gates conditionally (e.g. only external recipients) and **fails closed**: a throw is treated as "approval required". It receives its own copy of the prepared snapshot of the validated arguments, defaults applied, and the approval binds to the snapshot's hash, so an approved call runs only with the arguments that were approved (a Date binds by its time). The human approves via the chat UI's Approve affordance, which re-issues the turn with the call's `approvalKey`, and only then does the action run.
 
+Approval is given in the app, so HTTP never grants it. The HTTP action route and the generated Workers entry run a gated call only for the proven app UI (a frontend call from the signed-in user, same origin, holding the short-lived UI capability; `isProvenUiRequest`, the proof `uiOnly` uses) or the app's MCP directory widget. Every other HTTP caller (bearer or API key, MCP OAuth token, org service token, A2A, extension iframe, mobile app) gets `409 approval_required`, and a service identity can never approve. The shared client presents the capability with every write from a signed-in session (minted once per user, reused for nine minutes, never for reads or public pages), so a gated button works on its first request. A call without proof gets `403 ui_capability_required`; the client then re-mints and retries once, which is only the fallback for an expired or rejected capability. Every surface evaluates the gate through `preparedCallNeedsApproval`, so a throwing predicate asks there too. A caller that must run unattended needs a different action, never a bypass of the gate.
+
 **Keep approvals rare** — the default is off and almost every action should leave it off. The canonical example is Mail's `send-email` (`needsApproval: true`). See the `security` skill and the Human Approval doc.

package/corpus/templates/slides/app/components/editor/EditorToolbar.tsx

@@ -30,7 +30,6 @@ import {
   IconLoader2,
   IconAdjustments,
   IconPencilPlus,
-  IconPin,
   IconBrandGoogle,
   IconCode,
   IconCopy,
@@ -146,7 +145,6 @@ interface EditorToolbarProps {
   deckId: string;
   deckTitle: string;
   canEdit?: boolean;
-  canComment?: boolean;
   onTitleChange: (title: string) => void;
   currentSlideIndex: number;
   sidebarOpen: boolean;
@@ -172,8 +170,6 @@ interface EditorToolbarProps {
   onToggleTweaks?: () => void;
   drawMode?: boolean;
   onToggleDrawMode?: () => void;
-  pinMode?: boolean;
-  onTogglePinMode?: () => void;
   textBoxMode?: boolean;
   onToggleTextBoxMode?: () => void;
   shapeType?: SlideShapeType | null;
@@ -241,8 +237,6 @@ export default function EditorToolbar({
   onToggleTweaks,
   drawMode,
   onToggleDrawMode,
-  pinMode,
-  onTogglePinMode,
   textBoxMode,
   onToggleTextBoxMode,
   shapeType,
@@ -269,7 +263,6 @@ export default function EditorToolbar({
   onPreviousSlide,
   onNextSlide,
   canEdit = true,
-  canComment = canEdit,
 }: EditorToolbarProps) {
   const t = useT();
   // The top bar is the app's own in a widget. It drops only what the host owns
@@ -359,13 +352,12 @@ export default function EditorToolbar({
 
   const contextToolbarVisible = canEdit && Boolean(currentSlide);
   const showSlideTools =
-    (canEdit &&
-      Boolean(
-        (currentSlide && onToggleAnimations) ||
-        onToggleTweaks ||
-        onToggleDrawMode,
-      )) ||
-    (canComment && Boolean(onTogglePinMode));
+    canEdit &&
+    Boolean(
+      (currentSlide && onToggleAnimations) ||
+      onToggleTweaks ||
+      onToggleDrawMode,
+    );
   const showCommentsItem = !widgetEmbed && Boolean(onToggleComments);
   const fileInputRef = useRef<HTMLInputElement>(null);
   const backupInputRef = useRef<HTMLInputElement>(null);
@@ -646,17 +638,6 @@ export default function EditorToolbar({
         });
       }
     }
-    if (canComment && onTogglePinMode) {
-      commands.push({
-        id: "pin-comments",
-        group: "slideTools",
-        label: t("editorToolbar.pinComments"),
-        keywords: ["comment", "pin"],
-        icon: IconPin,
-        active: pinMode,
-        run: onTogglePinMode,
-      });
-    }
 
     if (canEdit && currentSlide && onChangeSlideTransition) {
       commands.push(
@@ -767,7 +748,6 @@ export default function EditorToolbar({
     addSlideGenerating,
     animationsOpen,
     layersOpen,
-    canComment,
     canEdit,
     commentsOpen,
     currentSlide,
@@ -789,10 +769,8 @@ export default function EditorToolbar({
     onToggleLayers,
     onToggleComments,
     onToggleDrawMode,
-    onTogglePinMode,
     onToggleTextBoxMode,
     onToggleTweaks,
-    pinMode,
     setTheme,
     shapeType,
     t,
@@ -1057,20 +1035,6 @@ export default function EditorToolbar({
                         {t("editorToolbar.drawOnSlide")}
                       </DropdownMenuItem>
                     )}
-                    {canComment && onTogglePinMode && (
-                      <DropdownMenuItem
-                        onSelect={onTogglePinMode}
-                        data-toolbar-pin-button
-                        className={
-                          pinMode
-                            ? "bg-accent text-accent-foreground"
-                            : undefined
-                        }
-                      >
-                        <IconPin className="size-4" />
-                        {t("editorToolbar.pinComments")}
-                      </DropdownMenuItem>
-                    )}
                   </DropdownMenuGroup>
                 </>
               )}

package/corpus/templates/slides/app/components/editor/FloatingToolbar.tsx

@@ -13,7 +13,6 @@ import {
   IconMinus,
   IconOval,
   IconPhotoVideo,
-  IconPin,
   IconPointer,
   IconResize,
   IconRobot,
@@ -55,7 +54,7 @@ export type FloatingToolbarInsertTool =
   | "shape"
   | "media";
 export type FloatingToolbarTransition = "none" | AnimationType;
-type FloatingToolbarCommentAction = "comments" | "annotate" | "pin";
+type FloatingToolbarCommentAction = "comments" | "annotate";
 export type FloatingToolbarAgentAction =
   | "inspiration"
   | "tighten-tone"
@@ -172,7 +171,6 @@ const COMMENT_ITEMS: MenuItem<FloatingToolbarCommentAction>[] = [
     labelKey: "floatingToolbar.annotate",
     icon: IconUserEdit,
   },
-  { value: "pin", labelKey: "floatingToolbar.pinComment", icon: IconPin },
 ];
 
 const ALL_TRANSITIONS = TRANSITION_ITEMS.map((item) => item.value);
@@ -348,7 +346,6 @@ export interface FloatingToolbarProps {
   onOpenTransitions?: () => void;
   onSelectTransition?: (transition: FloatingToolbarTransition) => void;
   /** True while the comments panel is open. */
-  commentsOpen?: boolean;
   /** The armed comment tool, if any. */
   commentToolValue?: FloatingToolbarCommentAction | null;
   /** Rows the viewer lacks the permission for. */
@@ -370,7 +367,6 @@ export const FloatingToolbar = memo(function FloatingToolbar({
   transitionsDisabledReason = null,
   onOpenTransitions,
   onSelectTransition,
-  commentsOpen = false,
   commentToolValue = null,
   disabledCommentActions,
   onOpenComments,
@@ -430,8 +426,8 @@ export const FloatingToolbar = memo(function FloatingToolbar({
         tooltip={t("floatingToolbar.comment")}
         menuLabel={t("floatingToolbar.commentMenu")}
         items={COMMENT_ITEMS}
-        active={commentsOpen || commentToolValue !== null}
-        value={commentToolValue ?? (commentsOpen ? "comments" : null)}
+        active={commentToolValue !== null}
+        value={commentToolValue}
         disabledValues={disabledCommentActions}
         onActivate={onOpenComments}
         onSelect={onCommentAction}

package/corpus/templates/slides/app/components/editor/SlideEditor.tsx

@@ -1295,11 +1295,9 @@ interface SlideEditorProps {
   /** Close the document layers panel. */
   onCloseLayers?: () => void;
   /** Whether the comments panel is open. */
-  commentsOpen?: boolean;
   /** Toggles the comments panel. */
   onToggleComments?: () => void;
   /** Toggles the pin-comment tool. */
-  onTogglePinMode?: () => void;
   /** Toggles the draw-on-slide annotation overlay. */
   onToggleDrawMode?: () => void;
   /** Toggle the transitions panel without a target. */
@@ -1985,9 +1983,7 @@ export default function SlideEditor({
   onCloseLayers,
   onOpenAnimations,
   onToggleAnimations,
-  commentsOpen,
   onToggleComments,
-  onTogglePinMode,
   onToggleDrawMode,
   onSelectedAnimationTargetsChange,
   slideId,
@@ -3426,20 +3422,16 @@ export default function SlideEditor({
   );
 
   const disabledCommentActions = useMemo(
-    () => [
-      ...(canComment ? [] : (["pin"] as const)),
-      ...(readOnly ? (["annotate"] as const) : []),
-    ],
-    [canComment, readOnly],
+    () => (readOnly ? (["annotate"] as const) : []),
+    [readOnly],
   );
 
   const runCommentAction = useCallback(
-    (action: "comments" | "annotate" | "pin") => {
+    (action: "comments" | "annotate") => {
       if (action === "comments") onToggleComments?.();
-      else if (action === "pin") onTogglePinMode?.();
       else onToggleDrawMode?.();
     },
-    [onToggleComments, onTogglePinMode, onToggleDrawMode],
+    [onToggleComments, onToggleDrawMode],
   );
 
   const runAgentAction = useCallback(
@@ -11344,9 +11336,8 @@ export default function SlideEditor({
                   transitionsDisabledReason={transitionsDisabledReason}
                   onOpenTransitions={openTransitionsPanel}
                   onSelectTransition={applyTransitionQuickPick}
-                  commentsOpen={Boolean(commentsOpen)}
                   commentToolValue={
-                    pinMode ? "pin" : drawMode ? "annotate" : null
+                    pinMode ? "comments" : drawMode ? "annotate" : null
                   }
                   disabledCommentActions={disabledCommentActions}
                   onOpenComments={onToggleComments}

package/corpus/templates/slides/app/i18n/en-US.ts

@@ -275,7 +275,6 @@ const messages = {
     commentMenu: "Comment options",
     comments: "Comments",
     annotate: "Annotate",
-    pinComment: "Pin Comment",
     agent: "Agent",
     agentMenu: "Agent options",
     agentUnavailable: "Couldn't reach the agent chat. Try again.",
@@ -376,7 +375,6 @@ const messages = {
     shapeLine: "Line",
     shapeStar: "Star",
     shapePolygon: "Polygon",
-    pinComments: "Pin comments",
     undo: "Undo",
     undoWithShortcut: "Undo ({{shortcut}})",
     redo: "Redo",