@agent-native/core 0.85.7 → 0.86.1

package/corpus/core/src/client/AgentPanel.tsx

@@ -65,6 +65,7 @@ import {
   TooltipTrigger,
   normalizeTooltipText,
 } from "./components/ui/tooltip.js";
+import { ErrorReportActions } from "./ErrorReportActions.js";
 import { FeedbackButton } from "./FeedbackButton.js";
 import { RunsTrayMenuItem } from "./progress/RunsTray.js";
 // Lazy-load the full assistant-ui chat stack (tiptap composer + react-markdown +
@@ -2251,6 +2252,15 @@ class AgentPanelErrorBoundary extends React.Component<
         >
           Reset agent panel
         </button>
+        <ErrorReportActions
+          appName="Agent panel"
+          title="Agent panel UI error"
+          details={this.state.error.message}
+          issueTitle="Agent panel UI error"
+          className="max-w-[260px]"
+          feedbackClassName="h-7"
+          githubClassName="h-7"
+        />
       </div>
     );
   }

package/corpus/core/src/client/AssistantChat.tsx

@@ -633,10 +633,40 @@ function toolCallPartHasResult(part: unknown): boolean {
   return candidate.type === "tool-call" && "result" in candidate;
 }
 
-function collectRenderedToolCallStates(
-  messages: readonly unknown[],
-): Map<string, { hasResult: boolean }> {
-  const states = new Map<string, { hasResult: boolean }>();
+/**
+ * Identity fingerprint for a tool-call part that survives across readers: two
+ * readers of the same run assign unrelated synthetic toolCallIds until both
+ * have seen the server id, but the tool name + serialized args are identical
+ * for the same logical call (argsText is `JSON.stringify(input)` on both
+ * sides). Activity placeholders (no args yet) return null — an empty-args
+ * fingerprint would over-match unrelated calls of the same tool.
+ */
+function toolCallFingerprintFromContentPart(part: unknown): string | null {
+  if (!part || typeof part !== "object") return null;
+  const candidate = part as {
+    type?: unknown;
+    toolName?: unknown;
+    argsText?: unknown;
+    activity?: unknown;
+  };
+  if (candidate.type !== "tool-call") return null;
+  if (candidate.activity === true) return null;
+  const name =
+    typeof candidate.toolName === "string" && candidate.toolName
+      ? candidate.toolName
+      : null;
+  const argsText =
+    typeof candidate.argsText === "string" ? candidate.argsText : "";
+  if (!name || !argsText) return null;
+  return `${name}${argsText}`;
+}
+
+function collectRenderedToolCallStates(messages: readonly unknown[]): {
+  byId: Map<string, { hasResult: boolean }>;
+  completedFingerprints: Set<string>;
+} {
+  const byId = new Map<string, { hasResult: boolean }>();
+  const completedFingerprints = new Set<string>();
   for (const message of messages) {
     const msg = (message as { message?: unknown })?.message ?? message;
     const content = (msg as { content?: unknown })?.content;
@@ -644,13 +674,74 @@ function collectRenderedToolCallStates(
     for (const part of content) {
       const id = toolCallIdFromContentPart(part);
       if (!id) continue;
-      const existing = states.get(id);
-      states.set(id, {
-        hasResult: Boolean(existing?.hasResult || toolCallPartHasResult(part)),
+      const hasResult = toolCallPartHasResult(part);
+      const existing = byId.get(id);
+      byId.set(id, {
+        hasResult: Boolean(existing?.hasResult || hasResult),
       });
+      if (hasResult) {
+        const fingerprint = toolCallFingerprintFromContentPart(part);
+        if (fingerprint) completedFingerprints.add(fingerprint);
+      }
     }
   }
-  return states;
+  return { byId, completedFingerprints };
+}
+
+function assistantTextFromContent(content: unknown): string {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  return content
+    .filter(
+      (part): part is { type: "text"; text: string } =>
+        part?.type === "text" && typeof part.text === "string",
+    )
+    .map((part) => part.text)
+    .join("");
+}
+
+function latestRenderedAssistantText(messages: readonly unknown[]): string {
+  const latestEntry = messages.at(-1);
+  const latestMessage = getRepoMessage(latestEntry as any);
+  if (latestMessage?.role !== "assistant") return "";
+  return assistantTextFromContent(latestMessage.content);
+}
+
+function trimReconnectTextAlreadyRendered(
+  content: ContentPart[],
+  renderedAssistantText: string,
+): ContentPart[] {
+  if (!renderedAssistantText) return content;
+
+  let remainingOverlap = renderedAssistantText;
+  let changed = false;
+  const next: ContentPart[] = [];
+
+  for (const part of content) {
+    if (part.type !== "text" || remainingOverlap.length === 0) {
+      next.push(part);
+      continue;
+    }
+
+    if (remainingOverlap.startsWith(part.text)) {
+      remainingOverlap = remainingOverlap.slice(part.text.length);
+      changed = true;
+      continue;
+    }
+
+    if (part.text.startsWith(remainingOverlap)) {
+      const text = part.text.slice(remainingOverlap.length);
+      remainingOverlap = "";
+      changed = true;
+      if (text) next.push({ ...part, text });
+      continue;
+    }
+
+    remainingOverlap = "";
+    next.push(part);
+  }
+
+  return changed ? next : content;
 }
 
 export function dedupeReconnectContentAgainstMessages(
@@ -658,19 +749,45 @@ export function dedupeReconnectContentAgainstMessages(
   messages: readonly unknown[],
 ): ContentPart[] {
   if (content.length === 0 || messages.length === 0) return content;
-  const renderedToolCallStates = collectRenderedToolCallStates(messages);
-  if (renderedToolCallStates.size === 0) return content;
+  const { byId, completedFingerprints } =
+    collectRenderedToolCallStates(messages);
+  const renderedAssistantText = latestRenderedAssistantText(messages);
+  if (byId.size === 0 && !renderedAssistantText) return content;
 
   let changed = false;
-  const filtered = content.filter((part) => {
-    const id = toolCallIdFromContentPart(part);
-    const existing = id ? renderedToolCallStates.get(id) : undefined;
-    if (!id || !existing) return true;
-    if (toolCallPartHasResult(part) && !existing.hasResult) return true;
-    changed = true;
-    return false;
-  });
-  return changed ? filtered : content;
+  const filtered = byId.size
+    ? content.filter((part) => {
+        const id = toolCallIdFromContentPart(part);
+        if (!id) return true;
+        const existing = byId.get(id);
+        if (existing) {
+          if (toolCallPartHasResult(part) && !existing.hasResult) return true;
+          changed = true;
+          return false;
+        }
+        // Fingerprint fallback for the id-convergence window: a reconnect part
+        // that is still PENDING while the rendered messages already show the same
+        // call (same tool + same serialized args) completed is a replay artifact —
+        // dropping it removes the "one spinning, one done" duplicate pair. Only
+        // pending parts are dropped by fingerprint: completed-vs-completed keeps
+        // the strict id match so a legitimately repeated identical call is never
+        // hidden.
+        if (!toolCallPartHasResult(part)) {
+          const fingerprint = toolCallFingerprintFromContentPart(part);
+          if (fingerprint && completedFingerprints.has(fingerprint)) {
+            changed = true;
+            return false;
+          }
+        }
+        return true;
+      })
+    : content;
+  const textDeduped = trimReconnectTextAlreadyRendered(
+    filtered,
+    renderedAssistantText,
+  );
+  if (textDeduped !== filtered) changed = true;
+  return changed ? textDeduped : content;
 }
 
 const RECOVERY_USER_MESSAGE_PREFIXES = [
@@ -1232,6 +1349,14 @@ const AssistantChatInner = forwardRef<
   const threadRuntime = useThreadRuntime();
   const composerRuntime = useComposerRuntime();
   const isRuntimeRunning = thread.isRunning;
+  // Latest-value ref so long-lived async closures (the reconnect reader, its
+  // watchdog) can check the CURRENT adapter-runtime state instead of the value
+  // captured when they were created. Load-bearing for single-reader ownership:
+  // the adapter's own stream and AssistantChat's reconnect reader must never
+  // both be attached to the same run (dual accumulators render duplicate tool
+  // cards and parallel duplicate streaming text).
+  const isRuntimeRunningRef = useRef(isRuntimeRunning);
+  isRuntimeRunningRef.current = isRuntimeRunning;
   const messages = thread.messages;
   const { suggestions: resolvedSuggestions } = useAgentDynamicSuggestionsResult(
     {
@@ -1544,6 +1669,11 @@ const AssistantChatInner = forwardRef<
   // True during the 250ms continuation window and startup of the next chunk
   // (adapter's auto-continue delay before POSTing the next chunk).
   const [isAutoResuming, setIsAutoResuming] = useState(false);
+  // Latest-value ref for the same single-reader checks as isRuntimeRunningRef:
+  // during an adapter auto-continuation the runtime can flick false between
+  // chunks while the adapter is still driving the turn.
+  const isAutoResumingRef = useRef(isAutoResuming);
+  isAutoResumingRef.current = isAutoResuming;
   const autoResumeTimerRef = useRef<number | null>(null);
   const [optimisticRunning, setOptimisticRunning] = useState(false);
   const [runningActivityLabel, setRunningActivityLabel] = useState<
@@ -1889,6 +2019,16 @@ const AssistantChatInner = forwardRef<
       const runId = String(runInfo.runId);
       if (wasRecentlyStoppedRun(runId)) return false;
       if (reconnectRunIdRef.current === runId) return true;
+      // SINGLE-READER OWNERSHIP: never start a second reader while the
+      // adapter's own stream is live (or mid auto-continuation) for this
+      // thread. Two concurrent readers of the same run render two independent
+      // accumulators — duplicate tool cards (one spinning, one static) and the
+      // same assistant text streaming twice in parallel. The adapter owns the
+      // run whenever its runtime is active; this reconnect reader exists only
+      // for runs with NO live adapter stream (page reload, tab restore).
+      if (isRuntimeRunningRef.current || isAutoResumingRef.current) {
+        return false;
+      }
 
       reconnectRunIdRef.current = runId;
       const afterSeq = resolveReconnectAfterSeq(threadId, runId);
@@ -1928,6 +2068,16 @@ const AssistantChatInner = forwardRef<
             return;
           }
           const info = (await res.json()) as ActiveRunLookup;
+          // SINGLE-READER OWNERSHIP: if the adapter runtime came alive while
+          // this reader was attached (user sent a message, adapter adopted the
+          // thread's run), this reader is now the duplicate — kill it. The
+          // false→true runtime-transition effect also unwinds the UI state;
+          // this covers the reader itself.
+          if (isRuntimeRunningRef.current) {
+            abortCtrl.abort();
+            clearInterval(watchdog);
+            return;
+          }
           if (isReplayableTerminalRun(info)) {
             return;
           }
@@ -2240,7 +2390,10 @@ const AssistantChatInner = forwardRef<
             }),
           );
         }
-        if (!loaded) {
+        // Skip the final refresh when the adapter runtime is live — importing
+        // thread_data mid-stream would clobber the adapter's in-flight message
+        // (the takeover path already discarded this reader's content).
+        if (!loaded && !isRuntimeRunningRef.current) {
           const repo = await refreshThreadFromServer();
           if (afterSeq > 0 || repoHasAssistantMessage(repo)) {
             setReconnectContent([]);
@@ -2259,6 +2412,12 @@ const AssistantChatInner = forwardRef<
   const reconnectActiveRunForThread =
     useCallback(async (): Promise<boolean> => {
       if (!threadId) return false;
+      // Single-reader ownership (see startReconnectToRun, which re-checks
+      // after the async probe): skip the probe entirely while the adapter's
+      // own stream is driving this thread.
+      if (isRuntimeRunningRef.current || isAutoResumingRef.current) {
+        return false;
+      }
       try {
         const storedActiveRun = getActiveRun();
         const runRes = await fetch(
@@ -2955,7 +3114,21 @@ const AssistantChatInner = forwardRef<
     const wasRunning = prevIsRuntimeRunningRef.current;
     prevIsRuntimeRunningRef.current = isRuntimeRunning;
     if (isRuntimeRunning && !wasRunning) {
-      if (reconnectFrozen) {
+      // SINGLE-READER OWNERSHIP: the adapter runtime just took over (a new run
+      // started or an adopted run resumed). Any live reconnect reader is now a
+      // duplicate accumulator — abort it and DISCARD its content; the adapter's
+      // stream renders the canonical message. Null the run ref first so the
+      // reader's own cleanup paths (which all check reconnectRunIdRef) no-op.
+      if (reconnectRunIdRef.current !== null) {
+        reconnectRunIdRef.current = null;
+        reconnectAbortRef.current?.abort();
+        reconnectAbortRef.current = null;
+        setIsReconnecting(false);
+        setReconnectContent([]);
+        setReconnectFrozen(false);
+        reconnectCanMaterializeRef.current = false;
+        reconnectTailOnlyRef.current = false;
+      } else if (reconnectFrozen) {
         setReconnectFrozen(false);
         setReconnectContent([]);
         reconnectCanMaterializeRef.current = false;

package/corpus/core/src/client/ErrorBoundary.tsx

@@ -13,13 +13,16 @@ import {
   type LocaleCode,
 } from "../localization/shared.js";
 import { appPath } from "./api-path.js";
+import { ErrorReportActions } from "./ErrorReportActions.js";
 import {
   isDynamicImportFailureMessage,
   recoverFromStaleChunkError,
 } from "./route-chunk-recovery.js";
 
-const homeLinkClassName =
-  "mt-6 inline-flex items-center gap-1.5 rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground shadow-sm hover:bg-primary/90 cursor-pointer";
+const primaryActionClassName =
+  "inline-flex h-9 items-center gap-1.5 rounded-md bg-primary px-4 text-sm font-medium text-primary-foreground shadow-sm hover:bg-primary/90 cursor-pointer";
+const secondaryActionClassName =
+  "inline-flex h-9 cursor-pointer items-center gap-1.5 rounded-md border border-border bg-background px-4 text-sm font-medium text-foreground shadow-sm hover:bg-accent";
 
 const errorCopy: Record<
   LocaleCode,
@@ -32,6 +35,9 @@ const errorCopy: Record<
     statusTitle: (status: number) => string;
     goHome: string;
     reload: string;
+    sendFeedback: string;
+    feedbackPlaceholder: string;
+    openGitHubIssue: string;
   }
 > = {
   "en-US": {
@@ -43,6 +49,9 @@ const errorCopy: Record<
     statusTitle: (status) => `${status} Error`,
     goHome: "Go home",
     reload: "Reload",
+    sendFeedback: "Send feedback",
+    feedbackPlaceholder: "Describe what happened before this error appeared.",
+    openGitHubIssue: "Open GitHub issue",
   },
   "zh-CN": {
     loadingLatest: "正在加载最新版本...",
@@ -53,6 +62,9 @@ const errorCopy: Record<
     statusTitle: (status) => `${status} 错误`,
     goHome: "回到首页",
     reload: "重新加载",
+    sendFeedback: "发送反馈",
+    feedbackPlaceholder: "描述此错误出现前发生了什么。",
+    openGitHubIssue: "打开 GitHub issue",
   },
   "zh-TW": {
     loadingLatest: "正在載入最新版本...",
@@ -63,6 +75,9 @@ const errorCopy: Record<
     statusTitle: (status) => `${status} 錯誤`,
     goHome: "回首頁",
     reload: "重新載入",
+    sendFeedback: "傳送意見回饋",
+    feedbackPlaceholder: "描述此錯誤出現前發生了什麼。",
+    openGitHubIssue: "開啟 GitHub issue",
   },
   "es-ES": {
     loadingLatest: "Cargando la versión más reciente...",
@@ -73,6 +88,10 @@ const errorCopy: Record<
     statusTitle: (status) => `Error ${status}`,
     goHome: "Ir al inicio",
     reload: "Recargar",
+    sendFeedback: "Enviar comentarios",
+    feedbackPlaceholder:
+      "Describe qué pasó antes de que apareciera este error.",
+    openGitHubIssue: "Abrir issue en GitHub",
   },
   "fr-FR": {
     loadingLatest: "Chargement de la dernière version...",
@@ -83,6 +102,9 @@ const errorCopy: Record<
     statusTitle: (status) => `Erreur ${status}`,
     goHome: "Accueil",
     reload: "Recharger",
+    sendFeedback: "Envoyer un retour",
+    feedbackPlaceholder: "Décrivez ce qui s'est passé avant cette erreur.",
+    openGitHubIssue: "Ouvrir une issue GitHub",
   },
   "de-DE": {
     loadingLatest: "Neueste Version wird geladen...",
@@ -93,6 +115,9 @@ const errorCopy: Record<
     statusTitle: (status) => `Fehler ${status}`,
     goHome: "Zur Startseite",
     reload: "Neu laden",
+    sendFeedback: "Feedback senden",
+    feedbackPlaceholder: "Beschreiben Sie, was vor diesem Fehler passiert ist.",
+    openGitHubIssue: "GitHub-Issue öffnen",
   },
   "ja-JP": {
     loadingLatest: "最新バージョンを読み込み中...",
@@ -103,6 +128,9 @@ const errorCopy: Record<
     statusTitle: (status) => `${status} エラー`,
     goHome: "ホームへ",
     reload: "再読み込み",
+    sendFeedback: "フィードバックを送信",
+    feedbackPlaceholder: "このエラーの直前に起きたことを説明してください。",
+    openGitHubIssue: "GitHub issue を開く",
   },
   "ko-KR": {
     loadingLatest: "최신 버전을 불러오는 중...",
@@ -113,6 +141,10 @@ const errorCopy: Record<
     statusTitle: (status) => `${status} 오류`,
     goHome: "홈으로 이동",
     reload: "새로고침",
+    sendFeedback: "피드백 보내기",
+    feedbackPlaceholder:
+      "이 오류가 나타나기 전에 무슨 일이 있었는지 적어 주세요.",
+    openGitHubIssue: "GitHub issue 열기",
   },
   "pt-BR": {
     loadingLatest: "Carregando a versão mais recente...",
@@ -123,6 +155,9 @@ const errorCopy: Record<
     statusTitle: (status) => `Erro ${status}`,
     goHome: "Ir para início",
     reload: "Recarregar",
+    sendFeedback: "Enviar feedback",
+    feedbackPlaceholder: "Descreva o que aconteceu antes deste erro aparecer.",
+    openGitHubIssue: "Abrir issue no GitHub",
   },
   "hi-IN": {
     loadingLatest: "नवीनतम संस्करण लोड हो रहा है...",
@@ -133,6 +168,9 @@ const errorCopy: Record<
     statusTitle: (status) => `${status} त्रुटि`,
     goHome: "होम पर जाएं",
     reload: "रीलोड करें",
+    sendFeedback: "फ़ीडबैक भेजें",
+    feedbackPlaceholder: "इस त्रुटि से पहले क्या हुआ, उसका वर्णन करें।",
+    openGitHubIssue: "GitHub issue खोलें",
   },
   "ar-SA": {
     loadingLatest: "جار تحميل أحدث إصدار...",
@@ -143,6 +181,9 @@ const errorCopy: Record<
     statusTitle: (status) => `خطأ ${status}`,
     goHome: "العودة للرئيسية",
     reload: "إعادة التحميل",
+    sendFeedback: "إرسال الملاحظات",
+    feedbackPlaceholder: "صف ما حدث قبل ظهور هذا الخطأ.",
+    openGitHubIssue: "فتح مشكلة في GitHub",
   },
 };
 
@@ -273,16 +314,30 @@ function ErrorScreen({ error }: { error: unknown }) {
         )}
         <h1 className="mt-3 text-2xl font-semibold">{title}</h1>
         <p className="mt-2 text-muted-foreground text-sm">{details}</p>
-        <a href={appPath("/")} className={homeLinkClassName}>
-          {copy.goHome}
-        </a>
-        <button
-          type="button"
-          onClick={() => window.location.reload()}
-          className="mt-3 inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-border bg-background px-4 py-2 text-sm font-medium text-foreground shadow-sm hover:bg-accent"
-        >
-          {copy.reload}
-        </button>
+        <div className="mt-6 flex flex-wrap justify-center gap-2">
+          <a href={appPath("/")} className={primaryActionClassName}>
+            {copy.goHome}
+          </a>
+          <button
+            type="button"
+            onClick={() => window.location.reload()}
+            className={secondaryActionClassName}
+          >
+            {copy.reload}
+          </button>
+          <ErrorReportActions
+            appName="Agent Native"
+            title={title}
+            details={details}
+            status={status}
+            issueTitle={`Error screen: ${title}`}
+            feedbackLabel={copy.sendFeedback}
+            feedbackPlaceholder={copy.feedbackPlaceholder}
+            githubLabel={copy.openGitHubIssue}
+            feedbackClassName="h-9"
+            githubClassName="h-9"
+          />
+        </div>
         {stack && (
           <pre className="mt-6 w-full text-start text-xs overflow-auto p-4 bg-muted rounded">
             <code>{stack}</code>

package/corpus/core/src/client/ErrorReportActions.tsx

@@ -0,0 +1,69 @@
+import { IconBrandGithub } from "@tabler/icons-react";
+
+import {
+  buildErrorReportTemplate,
+  buildGitHubIssueUrl,
+  type ErrorReportTemplateOptions,
+} from "./error-reporting.js";
+import { FeedbackButton } from "./FeedbackButton.js";
+import { cn } from "./utils.js";
+
+export interface ErrorReportActionsProps extends ErrorReportTemplateOptions {
+  feedbackLabel?: string;
+  feedbackPlaceholder?: string;
+  githubLabel?: string;
+  className?: string;
+  feedbackClassName?: string;
+  githubClassName?: string;
+  side?: "top" | "bottom" | "left" | "right";
+  align?: "start" | "center" | "end";
+}
+
+export function ErrorReportActions({
+  feedbackLabel = "Send feedback",
+  feedbackPlaceholder = "Describe what happened before this error appeared.",
+  githubLabel = "Open GitHub issue",
+  className,
+  feedbackClassName,
+  githubClassName,
+  side = "top",
+  align = "center",
+  ...report
+}: ErrorReportActionsProps) {
+  const template = buildErrorReportTemplate({
+    ...report,
+    prompt: report.prompt ?? feedbackPlaceholder,
+  });
+  const githubIssueUrl = buildGitHubIssueUrl(report);
+
+  return (
+    <div
+      className={cn(
+        "flex flex-wrap items-center justify-center gap-2",
+        className,
+      )}
+    >
+      <FeedbackButton
+        variant="outlined"
+        label={feedbackLabel}
+        placeholder={feedbackPlaceholder}
+        initialValue={template}
+        side={side}
+        align={align}
+        className={cn("h-8 text-xs", feedbackClassName)}
+      />
+      <a
+        href={githubIssueUrl}
+        target="_blank"
+        rel="noreferrer"
+        className={cn(
+          "inline-flex h-8 items-center gap-1.5 rounded-md px-2 text-xs text-muted-foreground underline-offset-4 hover:bg-muted/60 hover:text-foreground hover:underline",
+          githubClassName,
+        )}
+      >
+        <IconBrandGithub className="size-3.5" />
+        {githubLabel}
+      </a>
+    </div>
+  );
+}

package/corpus/core/src/client/FeedbackButton.tsx

@@ -13,7 +13,7 @@ import {
 
 import { DEFAULT_LOCALE, type LocaleCode } from "../localization/shared.js";
 import { getFeedbackClientContext } from "./feedback-context.js";
-import { useLocale } from "./i18n.js";
+import { useOptionalLocale } from "./i18n.js";
 import { useSession } from "./use-session.js";
 import { cn } from "./utils.js";
 
@@ -241,6 +241,8 @@ export interface FeedbackButtonProps {
   align?: "start" | "center" | "end";
   /** Placeholder text for the textarea. */
   placeholder?: string;
+  /** Optional text to prefill when the popover opens. */
+  initialValue?: string;
   /** Current chat session/thread id, when the host already knows it. */
   chatSessionId?: string | null;
   /** Chat localStorage namespace, when the host uses per-app chat storage. */
@@ -273,6 +275,7 @@ export function FeedbackButton({
   side,
   align = "end",
   placeholder,
+  initialValue,
   chatSessionId,
   chatStorageKey,
   open: controlledOpen,
@@ -281,7 +284,8 @@ export function FeedbackButton({
 }: FeedbackButtonProps) {
   const target = parseTarget(url);
   const { session } = useSession();
-  const { locale } = useLocale();
+  const localeContext = useOptionalLocale();
+  const locale = localeContext?.locale ?? DEFAULT_LOCALE;
   const copy = FEEDBACK_COPY[locale] ?? FEEDBACK_COPY[DEFAULT_LOCALE];
   const resolvedLabel = label ?? copy.label;
 
@@ -308,7 +312,7 @@ export function FeedbackButton({
   useEffect(() => {
     if (!open) return;
     openedAtRef.current = Date.now();
-    setValue("");
+    setValue(initialValue ?? "");
     setHoneypot("");
     setSubmitting(false);
     setSubmitted(false);
@@ -332,7 +336,7 @@ export function FeedbackButton({
         closeTimerRef.current = null;
       }
     };
-  }, [open, url]);
+  }, [copy.invalidUrl, copy.loadError, initialValue, open, url]);
 
   const submit = useCallback(
     async (e?: FormEvent) => {

package/corpus/core/src/client/agent-chat-adapter.ts

@@ -146,11 +146,12 @@ const STARTUP_RESPONSE_TIMEOUT_MS = 45_000;
 const BACKGROUND_FOLLOW_POLL_INTERVAL_MS = 1_000;
 // How long the follow loop tolerates seeing NO active run for this turn before
 // treating the turn as ended. The server pre-inserts the successor row before
-// the old chunk completes, so a healthy chain never shows an idle gap; 45s
-// also comfortably covers the server's 25s unclaimed-handoff grace + sweep
-// cadence so a reaped handoff resurfaces as a terminal errored run (which the
-// follow loop replays) before this window expires.
-const BACKGROUND_FOLLOW_IDLE_TIMEOUT_MS = 45_000;
+// the old chunk completes, so a healthy chain never shows an idle gap; allow a
+// wider window here because the server's unclaimed-handoff recovery can span
+// the 25s grace plus sweep/DB latency. This stays below the background
+// reconnect stuck threshold, but gives the server-owned recovery brain time to
+// surface the successor or terminal errored run before the client reports idle.
+const BACKGROUND_FOLLOW_IDLE_TIMEOUT_MS = 150_000;
 
 /**
  * User-facing copy for the server's background terminal reasons

package/corpus/core/src/client/app-providers.tsx

@@ -65,8 +65,8 @@ export interface AppProvidersProps {
 
   /**
    * Default theme passed to next-themes `ThemeProvider`.
-   * Defaults to `"system"`.  Dark-first templates (videos, slides, macros,
-   * analytics) pass `"dark"`.
+   * Defaults to `"system"`.  Dark-first templates (slides, macros, analytics)
+   * pass `"dark"`.
    */
   defaultTheme?: string;
 

package/corpus/core/src/client/collab/index.ts

@@ -48,4 +48,35 @@ export {
 export {
   RemoteSelectionRings,
   type RemoteSelectionRingsProps,
+  type SelectionDescriptor,
 } from "../components/RemoteSelectionRings.js";
+export {
+  RecentEditHighlights,
+  type RecentEditHighlightsProps,
+} from "../components/RecentEditHighlights.js";
+export {
+  appendRecentEdit,
+  collectRecentEdits,
+  publishRecentEdit,
+  useRecentEdits,
+  RECENT_EDITS_MAX,
+  RECENT_EDIT_TTL_MS,
+  type RecentEdit,
+  type RecentEditDescriptor,
+  type AttributedRecentEdit,
+  type UseRecentEditsOptions,
+} from "../../collab/recent-edits.js";
+export {
+  useCollabUndo,
+  useLocalOpUndo,
+  createLocalOpUndoController,
+  type UseCollabUndoOptions,
+  type UseCollabUndoResult,
+  type CollabUndoScope,
+  type UseLocalOpUndoOptions,
+  type UseLocalOpUndoResult,
+  type LocalOpUndoEntry,
+  type LocalOpUndoController,
+  type CreateLocalOpUndoOptions,
+  type UndoKeyboardOptions,
+} from "../../collab/undo.js";