Merge pull request #513 from WolframResearch/main

Release v1.3.7

FrontEnd/StyleSheets/Chatbook.nb

@@ -1161,7 +1161,7 @@ Notebook[
   ],
   Cell[
    StyleData["ChatStyleSheetInformation"],
-   TaggingRules -> <|"StyleSheetVersion" -> "1.3.6.3913177292"|>
+   TaggingRules -> <|"StyleSheetVersion" -> "1.3.7.3913365950"|>
   ],
   Cell[
    StyleData["Text"],

PacletInfo.wl

@@ -1,7 +1,7 @@
 PacletObject[ <|
     "Name"           -> "Wolfram/Chatbook",
     "PublisherID"    -> "Wolfram",
-    "Version"        -> "1.3.6",
+    "Version"        -> "1.3.7",
     "WolframVersion" -> "13.3+",
     "Description"    -> "Wolfram Notebooks + LLMs",
     "License"        -> "MIT",

Source/Chatbook/Actions.wl

@@ -902,12 +902,7 @@ scrape // endDefinition;
 (*AttachCodeButtons*)
 AttachCodeButtons // beginDefinition;
 
-AttachCodeButtons[ attached_, cell0_CellObject, string_, lang_ ] :=
-    With[ { cell = parentCell @ cell0 },
-        AttachCodeButtons[ attached, cell, string, lang ] /; chatCodeBlockQ @ cell
-    ];
-
-AttachCodeButtons[ Dynamic[ attached_ ], cell_CellObject, string_, lang_ ] := (
+AttachCodeButtons[ Dynamic[ attached_ ], cell_CellObject? chatCodeBlockQ, string_, lang_ ] := (
     attached = AttachCell[
         cell,
         floatingButtonGrid[ attached, cell, lang ],
@@ -918,15 +913,44 @@ AttachCodeButtons[ Dynamic[ attached_ ], cell_CellObject, string_, lang_ ] := (
     ]
 );
 
+AttachCodeButtons[ attached_, cell_CellObject, string_, lang_ ] := Enclose[
+    Catch @ Module[ { parent, evalCell, newParent },
+        parent = parentCell @ cell;
+
+        (* The parent cell is the chat code block as expected, so attach there *)
+        If[ chatCodeBlockQ @ parent, Throw @ AttachCodeButtons[ attached, parent, string, lang ] ];
+
+        (* Otherwise, we have an EvaluationCell[] failure, so try to recover by retrying EvaluationCell[] *)
+        evalCell  = ConfirmMatch[ (FinishDynamic[ ]; EvaluationCell[ ]), _CellObject, "EvaluationCell" ];
+
+        (* The chat code block should be the parent of the current evaluation cell *)
+        newParent = ConfirmBy[ parentCell @ evalCell, chatCodeBlockQ, "ParentCell" ];
+
+        (* Finish attaching now that we have the correct cell *)
+        AttachCodeButtons[ attached, newParent, string, lang ]
+    ],
+    throwInternalFailure
+];
+
 AttachCodeButtons // endDefinition;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
 (*chatCodeBlockQ*)
 chatCodeBlockQ // beginDefinition;
-chatCodeBlockQ[ cell_CellObject ] := chatCodeBlockQ[ cell, Developer`CellInformation @ cell ];
+
+(* Many operations that return cell objects can return $Failed, but error handling should be done elsewhere: *)
+chatCodeBlockQ[ $Failed ] := False;
+
+(* Cache the result, since we might be calling this multiple times on the same cell in AttachCodeButtons: *)
+chatCodeBlockQ[ cell_CellObject ] := chatCodeBlockQ[ cell ] = chatCodeBlockQ[ cell, Developer`CellInformation @ cell ];
+
+(* The expected style of a chat code block cell: *)
 chatCodeBlockQ[ cell_, KeyValuePattern[ "Style" -> "ChatCodeBlock" ] ] := True;
+
+(* Anything else means it's not a chat block: *)
 chatCodeBlockQ[ cell_, _ ] := False;
+
 chatCodeBlockQ // endDefinition;
 
 (* ::**************************************************************************************************************:: *)

Source/Chatbook/Explode.wl

@@ -9,7 +9,7 @@ Begin[ "`Private`" ];
 Needs[ "Wolfram`Chatbook`"        ];
 Needs[ "Wolfram`Chatbook`Common`" ];
 
-$$newCellStyle = "Section"|"Subsection"|"Subsubsection"|"Subsubsubsection"|"Item"|"Input"|"ExternalLanguage";
+$$newCellStyle = "Section"|"Subsection"|"Subsubsection"|"Subsubsubsection"|"Item"|"Input"|"ExternalLanguage"|"Program";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
@@ -70,6 +70,9 @@ $preprocessingRules := $preprocessingRules = Dispatch @ {
     (* Remove "ChatCodeBlock" styling: *)
     Cell[ BoxData[ cell_Cell, ___ ], "ChatCodeBlock", ___ ] :> cell,
 
+    (* Language-agnostic code blocks: *)
+    Cell[ text_, "ChatPreformatted", ___ ] :> Cell[ text, "Program" ],
+
     (* Remove "ChatCodeBlockTemplate" template boxes: *)
     TemplateBox[ { cell_Cell }, "ChatCodeBlockTemplate" ] :> cell,
 

Source/Chatbook/Formatting.wl

@@ -1176,7 +1176,7 @@ inlineInteractiveCodeCell[ display_, string_, lang_ ] :=
         ],
         TaggingRules     -> <| "CellToStringType" -> "InlineInteractiveCodeCell", "CodeLanguage" -> lang |>,
         UnsavedVariables :> { $CellContext`attached, $CellContext`cell },
-        Initialization   :> { $CellContext`cell = EvaluationCell[ ] }
+        Initialization   :> { $CellContext`cell = (FinishDynamic[ ]; EvaluationCell[ ]) }
     ];
 
 inlineInteractiveCodeCell // endDefinition;