Merge upstream/experimental: resolve conflicts (keep feat/citations)

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-04-21 13:24:44 +08:00 · 2026-02-09 21:56:02 +08:00
parent 2f50e5d969 69c8b41186
commit c89bd9edc9
3 changed files with 78 additions and 32 deletions
--- a/frontend/src/components/workspace/artifacts/artifact-file-detail.tsx
+++ b/frontend/src/components/workspace/artifacts/artifact-file-detail.tsx
@@ -275,8 +275,8 @@ export function ArtifactFilePreview({
  if (language === "markdown") {
    return (
      <div className="size-full px-4">
-        <Streamdown 
-          className="size-full" 
+        <Streamdown
+          className="size-full"
          {...streamdownPlugins}
          components={{ a: CitationLink }}
        >