@agent-native/core 0.86.0 → 0.87.0

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

@@ -688,6 +688,62 @@ function collectRenderedToolCallStates(messages: readonly unknown[]): {
   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(
   content: ContentPart[],
   messages: readonly unknown[],
@@ -695,35 +751,43 @@ export function dedupeReconnectContentAgainstMessages(
   if (content.length === 0 || messages.length === 0) return content;
   const { byId, completedFingerprints } =
     collectRenderedToolCallStates(messages);
-  if (byId.size === 0) return content;
+  const renderedAssistantText = latestRenderedAssistantText(messages);
+  if (byId.size === 0 && !renderedAssistantText) return content;
 
   let changed = false;
-  const filtered = 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;
-  });
-  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 = [

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/components/ui/dialog.tsx

@@ -1,91 +1 @@
-import * as DialogPrimitive from "@radix-ui/react-dialog";
-import { IconX } from "@tabler/icons-react";
-import * as React from "react";
-
-import { cn } from "../../utils.js";
-
-const Dialog = DialogPrimitive.Root;
-const DialogTrigger = DialogPrimitive.Trigger;
-const DialogClose = DialogPrimitive.Close;
-const DialogPortal = DialogPrimitive.Portal;
-
-const DialogOverlay = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Overlay>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Overlay
-    ref={ref}
-    className={cn(
-      "fixed inset-0 z-[270] bg-background/45 backdrop-blur-[1px] data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
-      className,
-    )}
-    {...props}
-  />
-));
-DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
-
-const DialogContent = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
-  <DialogPortal>
-    <DialogOverlay />
-    <DialogPrimitive.Content
-      ref={ref}
-      className={cn(
-        "fixed left-1/2 top-1/2 z-[280] flex max-h-[min(760px,calc(100vh-32px))] w-[calc(100vw-24px)] max-w-[720px] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-lg border border-border bg-background text-foreground shadow-lg outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-150 data-[state=open]:duration-200 data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",
-        className,
-      )}
-      {...props}
-    >
-      {children}
-      <DialogPrimitive.Close className="absolute end-3 top-3 flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring">
-        <IconX className="h-4 w-4" />
-        <span className="sr-only">Close</span>
-      </DialogPrimitive.Close>
-    </DialogPrimitive.Content>
-  </DialogPortal>
-));
-DialogContent.displayName = DialogPrimitive.Content.displayName;
-
-const DialogHeader = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
-  <div className={cn("grid gap-1.5 px-4 py-4", className)} {...props} />
-);
-DialogHeader.displayName = "DialogHeader";
-
-const DialogTitle = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Title>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Title
-    ref={ref}
-    className={cn("text-sm font-semibold text-foreground", className)}
-    {...props}
-  />
-));
-DialogTitle.displayName = DialogPrimitive.Title.displayName;
-
-const DialogDescription = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Description>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
->(({ className, ...props }, ref) => (
-  <DialogPrimitive.Description
-    ref={ref}
-    className={cn("text-xs text-muted-foreground", className)}
-    {...props}
-  />
-));
-DialogDescription.displayName = DialogPrimitive.Description.displayName;
-
-export {
-  Dialog,
-  DialogTrigger,
-  DialogClose,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogDescription,
-};
+export * from "@agent-native/toolkit/ui/dialog";