From 8dd94c7dd999e2458302456af79ec3e8bc121f73 Mon Sep 17 00:00:00 2001
From: Kathryn Isabelle Lawrence <lawr3ka@gmail.com>
Date: Tue, 10 Mar 2026 14:01:38 -0700
Subject: [PATCH 1/5] add missing base code block props

---
 .../components/src/components/code-block/code-block.tsx   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/components/src/components/code-block/code-block.tsx b/packages/components/src/components/code-block/code-block.tsx
index 61ac677..2a6ab7b 100644
--- a/packages/components/src/components/code-block/code-block.tsx
+++ b/packages/components/src/components/code-block/code-block.tsx
@@ -79,6 +79,8 @@ type CodeBlockProps = {
   feedbackButton?: ReactNode;
   children?: ReactNode;
   copyButtonProps?: CopyToClipboardButtonProps;
+  isParentCodeGroup?: boolean;
+  shouldHighlight?: boolean;
 };
 
 const CodeBlock = function CodeBlock(params: CodeBlockProps) {
@@ -96,6 +98,9 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
     askAiButton,
     feedbackButton,
     copyButtonProps,
+    isParentCodeGroup,
+    shouldHighlight,
+    numberOfLines,
   } = params;
 
   const codeString = getNodeText(children);
@@ -150,7 +155,10 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
         codeBlockTheme={codeBlockTheme}
         codeBlockThemeObject={codeBlockThemeObject}
         hideAskAiButton={hideAskAiButton}
+        isParentCodeGroup={isParentCodeGroup}
         isSmallText={isSmallText}
+        numberOfLines={numberOfLines}
+        shouldHighlight={shouldHighlight}
         {...params}
       />
     </div>

From 66a5ad6cee57473db61b943981726aa57fe7fb75 Mon Sep 17 00:00:00 2001
From: Kathryn Isabelle Lawrence <lawr3ka@gmail.com>
Date: Tue, 10 Mar 2026 14:03:39 -0700
Subject: [PATCH 2/5] make sure expandable is included

---
 packages/components/src/components/code-block/code-block.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/components/src/components/code-block/code-block.tsx b/packages/components/src/components/code-block/code-block.tsx
index 2a6ab7b..f190cc9 100644
--- a/packages/components/src/components/code-block/code-block.tsx
+++ b/packages/components/src/components/code-block/code-block.tsx
@@ -101,6 +101,7 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
     isParentCodeGroup,
     shouldHighlight,
     numberOfLines,
+    expandable,
   } = params;
 
   const codeString = getNodeText(children);
@@ -159,6 +160,7 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
         isSmallText={isSmallText}
         numberOfLines={numberOfLines}
         shouldHighlight={shouldHighlight}
+        expandable={expandable}
         {...params}
       />
     </div>

From 1aa71a5ea5e7f5662f47155774cc1bbbaa2ca8f8 Mon Sep 17 00:00:00 2001
From: Kathryn Isabelle Lawrence <lawr3ka@gmail.com>
Date: Tue, 10 Mar 2026 14:05:28 -0700
Subject: [PATCH 3/5] simplify prop spread

---
 .../src/components/code-block/code-block.tsx  | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/packages/components/src/components/code-block/code-block.tsx b/packages/components/src/components/code-block/code-block.tsx
index f190cc9..3828f60 100644
--- a/packages/components/src/components/code-block/code-block.tsx
+++ b/packages/components/src/components/code-block/code-block.tsx
@@ -85,23 +85,16 @@ type CodeBlockProps = {
 
 const CodeBlock = function CodeBlock(params: CodeBlockProps) {
   const {
-    filename,
     children,
-    className,
+    filename,
     icon,
-    isSmallText,
-    hideAskAiButton,
+    codeBlockTheme,
     feedbackModalOpen,
+    className,
     anchorRef,
-    codeBlockTheme = "system",
-    codeBlockThemeObject,
-    askAiButton,
     feedbackButton,
     copyButtonProps,
-    isParentCodeGroup,
-    shouldHighlight,
-    numberOfLines,
-    expandable,
+    askAiButton,
   } = params;
 
   const codeString = getNodeText(children);
@@ -152,17 +145,7 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
           {askAiButton && askAiButton}
         </div>
       )}
-      <BaseCodeBlock
-        codeBlockTheme={codeBlockTheme}
-        codeBlockThemeObject={codeBlockThemeObject}
-        hideAskAiButton={hideAskAiButton}
-        isParentCodeGroup={isParentCodeGroup}
-        isSmallText={isSmallText}
-        numberOfLines={numberOfLines}
-        shouldHighlight={shouldHighlight}
-        expandable={expandable}
-        {...params}
-      />
+      <BaseCodeBlock {...params} />
     </div>
   );
 };

From 566be0e8087a8012d888642ca636558e1e47c3fb Mon Sep 17 00:00:00 2001
From: Kathryn Isabelle Lawrence <lawr3ka@gmail.com>
Date: Tue, 10 Mar 2026 14:13:23 -0700
Subject: [PATCH 4/5] fix ternary

---
 .../src/components/code-block/code-block.tsx        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/components/src/components/code-block/code-block.tsx b/packages/components/src/components/code-block/code-block.tsx
index 3828f60..6228dd0 100644
--- a/packages/components/src/components/code-block/code-block.tsx
+++ b/packages/components/src/components/code-block/code-block.tsx
@@ -85,16 +85,17 @@ type CodeBlockProps = {
 
 const CodeBlock = function CodeBlock(params: CodeBlockProps) {
   const {
-    children,
     filename,
+    children,
+    className,
     icon,
-    codeBlockTheme,
+    hideAskAiButton,
     feedbackModalOpen,
-    className,
     anchorRef,
+    codeBlockTheme,
+    askAiButton,
     feedbackButton,
     copyButtonProps,
-    askAiButton,
   } = params;
 
   const codeString = getNodeText(children);
@@ -129,7 +130,7 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
             textToCopy={codeString}
             {...copyButtonProps}
           />
-          {askAiButton && askAiButton}
+          {askAiButton && !hideAskAiButton ? askAiButton : null}
         </CodeHeader>
       ) : (
         <div
@@ -142,7 +143,7 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
             textToCopy={codeString}
             {...copyButtonProps}
           />
-          {askAiButton && askAiButton}
+          {askAiButton && !hideAskAiButton ? askAiButton : null}
         </div>
       )}
       <BaseCodeBlock {...params} />

From d7e94afd040e13f1e6eb155a35d0e45b71f055f3 Mon Sep 17 00:00:00 2001
From: Kathryn Isabelle Lawrence <lawr3ka@gmail.com>
Date: Tue, 10 Mar 2026 14:20:01 -0700
Subject: [PATCH 5/5] restore default codeBlockTheme enum

---
 packages/components/src/components/code-block/code-block.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/components/code-block/code-block.tsx b/packages/components/src/components/code-block/code-block.tsx
index 6228dd0..af101a6 100644
--- a/packages/components/src/components/code-block/code-block.tsx
+++ b/packages/components/src/components/code-block/code-block.tsx
@@ -92,7 +92,7 @@ const CodeBlock = function CodeBlock(params: CodeBlockProps) {
     hideAskAiButton,
     feedbackModalOpen,
     anchorRef,
-    codeBlockTheme,
+    codeBlockTheme = "system",
     askAiButton,
     feedbackButton,
     copyButtonProps,