Merge pull request #1361 from WolframResearch/bugfix/Sidebar4

KMDaily · web-flow · commit 84eee70cbd94 · 2026-01-08T15:57:44.000-08:00
Bugfix/sidebar4
diff --git a/DarkModeSupport/TextResources/ChatbookResources.tr b/DarkModeSupport/TextResources/ChatbookResources.tr
@@ -9841,15 +9841,16 @@ VX/aMEEQzrerjFhhelYAzofFB3r8AgApYdcE
   FrameMargins->0,
   ImageSize->Automatic],
 
-"NotebookAssistantSidebarCell" -> Cell[BoxData[{
- DynamicBox[ToBoxes[Needs["Wolfram`Chatbook`" -> None]; RawBoxes[
-     Symbol["Wolfram`Chatbook`ChatbookAction"]["MakeSidebarChatDockedCell"]], 
-   StandardForm],
-  DestroyAfterEvaluation->True], "\n", 
- DynamicBox[ToBoxes[Needs["Wolfram`Chatbook`" -> None]; RawBoxes[
-     Symbol["Wolfram`Chatbook`ChatModes`Common`sidebarChatInputCell"][]], 
-   StandardForm],
-  DestroyAfterEvaluation->True]}],
+"NotebookAssistantSidebarCell" -> Cell[BoxData[
+ RowBox[{
+  DynamicBox[ToBoxes[Needs["Wolfram`Chatbook`" -> None]; RawBoxes[
+      Symbol["Wolfram`Chatbook`ChatbookAction"]["MakeSidebarChatDockedCell"]],
+     StandardForm],
+   DestroyAfterEvaluation->True], 
+  DynamicBox[ToBoxes[Needs["Wolfram`Chatbook`" -> None]; RawBoxes[
+      Symbol["Wolfram`Chatbook`ChatModes`Common`sidebarChatInputCell"][]], 
+    StandardForm],
+   DestroyAfterEvaluation->True]}]],
  Editable->True,
  Selectable->False,
  CellMargins->{{0, 0}, {0, 0}},
@@ -9872,8 +9873,8 @@ notebookAssistanceSidebarSettings, "ConversationTitle" -> ""|>),
    GrayLevel[0.95], 
    RGBColor[0.1882352, 0.2078431, 0.2274509]],
  CellTags->
-  "NotebookAssistantSidebarCell",ExpressionUUID->"6696f587-5fe9-ad4b-a610-\
-df2378d4af41"],
+  "NotebookAssistantSidebarCell",ExpressionUUID->"63d02243-e7fb-e74f-b904-\
+32a950285a1a"],
 
 "SidebarIconHide" -> (GraphicsBox[{
    Thickness[0.125], 
diff --git a/Developer/Resources/FrontEndResources/SideBarChat/NotebookAssistantSidebarCell.wl b/Developer/Resources/FrontEndResources/SideBarChat/NotebookAssistantSidebarCell.wl
@@ -9,7 +9,6 @@ Cell[
 						StandardForm ],
 					DestroyAfterEvaluation -> True
 				],
-				"\n",
 				DynamicBox[
 					ToBoxes[
 						Needs[ "Wolfram`Chatbook`" -> None ];
diff --git a/Source/Chatbook/Actions.wl b/Source/Chatbook/Actions.wl
@@ -117,18 +117,13 @@ regenerateAssistantMessage[ chatOutput_CellObject, True(*sidebarCellQ_*) ] := En
         chatInputFieldCell = ConfirmMatch[ Last[ Cells[ sidebarCell, CellTags -> "SidebarChatInputCell" ], None ], _CellObject, "SidebarChatInputFieldCell" ];
 
         With[ { sbc = sidebarCell, cic = chatInputCell }, (* "Set" is HoldFirst so we must inject values *)
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`SelectionMove[ chatOutput, Before, Cell ],
-                    FrontEnd`FrontEndToken[ nbo, "DeletePrevious" ], (* remove the newline character before the sub-cell *)
-                    FrontEnd`NotebookDelete @ chatOutput,
-                    FrontEnd`SetValue @ FEPrivate`Set[ FrontEnd`CurrentValue[ sbc, { TaggingRules, "ChatEvaluationCell" } ], cic ], (* use TaggingRules to pass CellObject around *)
-                    FrontEnd`SetOptions[ chatInputFieldCell, CellTags -> { "SidebarChatInputCell", "RegenerateChatOutput" } ] (* backdoor to re-evaluation in side bar *)
-                } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ]
+            FrontEndExecute[ {
+                FrontEnd`SelectionMove[ chatOutput, Before, Cell ],
+                FrontEnd`FrontEndToken[ nbo, "DeletePrevious" ], (* remove the newline character before the sub-cell *)
+                FrontEnd`NotebookDelete @ chatOutput,
+                FrontEnd`SetValue @ FEPrivate`Set[ FrontEnd`CurrentValue[ sbc, { TaggingRules, "ChatEvaluationCell" } ], cic ], (* use TaggingRules to pass CellObject around *)
+                FrontEnd`SetOptions[ chatInputFieldCell, CellTags -> { "SidebarChatInputCell", "RegenerateChatOutput" } ] (* backdoor to re-evaluation in side bar *)
+            } ]
         ];
     ],
     throwInternalFailure
diff --git a/Source/Chatbook/ChatModes/Evaluate.wl b/Source/Chatbook/ChatModes/Evaluate.wl
@@ -82,26 +82,12 @@ evaluateSidebarChat[ nbo_NotebookObject, sidebarCell_CellObject, input_, Dynamic
         scrollablePaneCell = First[ Cells[ sidebarCell, CellTags -> "SidebarScrollingContentCell" ], Missing @ "NoScrollingContent" ];
         If[ MissingQ @ scrollablePaneCell,
             lastDockedCell = ConfirmMatch[ Last[ Cells[ sidebarCell, CellTags -> "SidebarDockedCell" ], $Failed ], _CellObject, "SidebarDockedCell" ];
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`SelectionMove[ lastDockedCell, After, Cell, AutoScroll -> True ],
-                    FrontEnd`NotebookWrite[ nbo, RowBox[ { "\n", sidebarScrollingCell[ nbo, { cell } ] } ] ] } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ];
+            NotebookWrite[ System`NotebookLocationSpecifier[ lastDockedCell, "After" ], sidebarScrollingCell[ nbo, { cell } ] ];
             scrollablePaneCell = ConfirmMatch[ First[ Cells[ sidebarCell, CellTags -> "SidebarScrollingContentCell" ], $Failed ], _CellObject, "UpdatedSidebarScrollableCell" ];
             , (* ELSE *)
             (* The scrolling pane cell should only exist if it contains content. If it exists without content then something has gone wrong. *)
             lastContentCell = ConfirmMatch[ Last[ Cells[ scrollablePaneCell, CellTags -> "SidebarTopCell" ], $Failed ], _CellObject, "NoSidebarScrollingContentCell" ];
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`SelectionMove[ lastContentCell, After, Cell, AutoScroll -> True ],
-                    FrontEnd`NotebookWrite[ nbo, RowBox[ { "\n", cell } ] ] } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ]
+            NotebookWrite[ System`NotebookLocationSpecifier[ lastContentCell, "After" ], cell ]
         ];
 
         cellObject = ConfirmMatch[ Last[ Cells[ scrollablePaneCell, CellTags -> uuid ], $Failed ], _CellObject, "SidebarChatInputCellObject" ];
diff --git a/Source/Chatbook/ChatModes/ShowNotebookAssistance.wl b/Source/Chatbook/ChatModes/ShowNotebookAssistance.wl
@@ -123,7 +123,7 @@ $notebookAssistanceMenuItems = <|
                 FrontEndResource[ "ChatbookStrings", "MenuItemShowNotebookAssistanceWindow" ],
                 FrontEnd`KernelExecute[
                     Needs[ "Wolfram`Chatbook`" -> None ];
-                    Symbol[ "Wolfram`Chatbook`ShowNotebookAssistance" ][ "Window", "NewChat" -> True ]
+                    Symbol[ "Wolfram`Chatbook`ShowNotebookAssistance" ][ If[ BoxForm`sufficientVersionQ[ 15.0 ], "Sidebar", "Window" ], "NewChat" -> True ]
                 ],
                 FrontEnd`MenuEvaluator -> Automatic,
                 Evaluate[
diff --git a/Source/Chatbook/ChatModes/UI.wl b/Source/Chatbook/ChatModes/UI.wl
@@ -118,26 +118,11 @@ writeSidebarChatSubDockedCell[ nbo_NotebookObject, sidebarCell_CellObject, conte
         subDockedCell = First[ Cells[ sidebarCell, CellTags -> "SidebarSubDockedCell" ], $Failed ];
         If[ ! FailureQ @ subDockedCell,
             (* if the sub-cell already exists then rewrite it *)
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`NotebookWrite[ subDockedCell, makeSidebarChatSubDockedCellExpression[ nbo, sidebarCell, content ] ]
-                } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ]
+            NotebookWrite[ subDockedCell, makeSidebarChatSubDockedCellExpression[ nbo, sidebarCell, content ] ]
             ,
             (* else, write a new sub-cell after the last docked cell *)
             lastDockedCell = ConfirmMatch[ Last[ Cells[ sidebarCell, CellTags -> "SidebarDockedCell" ], $Failed ], _CellObject, "SidebarDockedCell" ];
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`SelectionMove[ lastDockedCell, After, Cell ],
-                    FrontEnd`NotebookWrite[ nbo, RowBox[ { "\n", makeSidebarChatSubDockedCellExpression[ nbo, sidebarCell, content ] } ] ]
-                } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ]
+            NotebookWrite[ System`NotebookLocationSpecifier[ lastDockedCell, "After" ], makeSidebarChatSubDockedCellExpression[ nbo, sidebarCell, content ] ]
         ];
         (* TODO: move selection to side bar chat's input field *)
     ],
@@ -167,17 +152,7 @@ removeSidebarChatSubDockedCell // beginDefinition;
 
 removeSidebarChatSubDockedCell[ nbo_NotebookObject, sidebarCell_CellObject ] := Module[ { subDockedCell },
     subDockedCell = First[ Cells[ sidebarCell, CellTags -> "SidebarSubDockedCell" ], Missing @ "NoSidebarSubDockedCell" ];
-    If[ ! MissingQ @ subDockedCell,
-        WithCleanup[
-            FrontEndExecute[ {
-                FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                FrontEnd`SelectionMove[ subDockedCell, Before, Cell ],
-                FrontEnd`FrontEndToken[ nbo, "DeletePrevious" ], (* remove the newline character before the sub-cell *)
-                FrontEnd`NotebookDelete @ subDockedCell } ]
-            ,
-            CurrentValue[ sidebarCell, Editable ] = Inherited
-        ]
-    ]
+    If[ ! MissingQ @ subDockedCell, NotebookDelete @ subDockedCell ]
 ];
 
 removeSidebarChatSubDockedCell // endDefinition;
@@ -187,15 +162,7 @@ removeSidebarChatSubDockedCell // endDefinition;
 (*removeSidebarTopCell*)
 removeSidebarTopCell // beginDefinition;
 
-removeSidebarTopCell[ nbo_NotebookObject, sidebarTopCell_CellObject ] := WithCleanup[
-    FrontEndExecute[ {
-        FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-        FrontEnd`SelectionMove[ sidebarTopCell, Before, Cell ],
-        FrontEnd`FrontEndToken[ nbo, "DeletePrevious" ], (* remove the newline character before the top cell *)
-        FrontEnd`NotebookDelete @ sidebarTopCell } ]
-        ,
-    CurrentValue[ sidebarCell, Editable ] = Inherited
-];
+removeSidebarTopCell[ nbo_NotebookObject, sidebarTopCell_CellObject ] := NotebookDelete @ sidebarTopCell;
 
 removeSidebarTopCell // endDefinition;
 
@@ -206,17 +173,7 @@ removeSidebarScrollingContentCell // beginDefinition;
 
 removeSidebarScrollingContentCell[ nbo_NotebookObject, sidebarCell_CellObject ] := Module[ { scrollablePaneCell },
     scrollablePaneCell = First[ Cells[ sidebarCell, CellTags -> "SidebarScrollingContentCell" ], Missing @ "NoScrollingSidebarCell" ];
-    If[ ! MissingQ @ scrollablePaneCell,
-        WithCleanup[
-            FrontEndExecute[ {
-                FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                FrontEnd`SelectionMove[ scrollablePaneCell, Before, Cell ],
-                FrontEnd`FrontEndToken[ nbo, "DeletePrevious" ], (* remove the newline character before the top cell *)
-                FrontEnd`NotebookDelete @ scrollablePaneCell } ]
-            ,
-            CurrentValue[ sidebarCell, Editable ] = Inherited
-        ]
-    ]
+    If[ ! MissingQ @ scrollablePaneCell, NotebookDelete @ scrollablePaneCell ]
 ];
 
 removeSidebarScrollingContentCell // endDefinition;
@@ -234,7 +191,7 @@ Module[ { sidebarCellObj, dockedCellObj, chatInputCellObj },
     With[ { sc = sidebarCellObj, cc = chatInputCellObj, dc = dockedCellObj },
         Cell[ BoxData @
             PaneBox[
-                RowBox @ Riffle[ cells, "\n" ],
+                RowBox @ cells,
                 AppearanceElements -> {},
                 ImageSize -> 
                     Dynamic[
@@ -2700,25 +2657,9 @@ loadConversation[ nbo_NotebookObject, sidebarCell_CellObject, id_ ] := Enclose[
         scrollablePaneCell = First[ Cells[ sidebarCell, CellTags -> "SidebarScrollingContentCell" ], Missing @ "NoScrollingContent" ];
         If[ MissingQ @ scrollablePaneCell,
             lastDockedCell = ConfirmMatch[ Last[ Cells[ sidebarCell, CellTags -> "SidebarDockedCell" ], $Failed ], _CellObject, "SidebarDockedCell" ];
-            (* FIXME: this can write to the notebook content area if its empty *)
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`SelectionMove[ lastDockedCell, After, Cell, AutoScroll -> True ],
-                    FrontEnd`NotebookWrite[ nbo, RowBox[ { "\n", sidebarScrollingCell[ nbo, cells ] } ] ]
-                } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ]
+            NotebookWrite[ System`NotebookLocationSpecifier[ lastDockedCell, "After" ], sidebarScrollingCell[ nbo, cells ] ]
             , (* ELSE *)
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`NotebookWrite[ scrollablePaneCell, sidebarScrollingCell[ nbo, cells ] ]
-                } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ]
+            NotebookWrite[ scrollablePaneCell, sidebarScrollingCell[ nbo, cells ] ]
         ];
         
         CurrentChatSettings[ sidebarCell, "ConversationUUID" ] = uuid;
diff --git a/Source/Chatbook/FrontEnd.wl b/Source/Chatbook/FrontEnd.wl
@@ -709,21 +709,9 @@ cloudCellPrint // endDefinition;
 cellPrintAfter[ target_ ][ cell_ ] := cellPrintAfter[ target, cell ];
 
 cellPrintAfter[ target_CellObject, cell: Cell[ __, ExpressionUUID -> uuid_, ___ ] ] /; cellTaggedQ[ target, "SidebarTopCell" ] := Enclose[
-    Module[ { sidebarCell },
-        (* topParentCell is blocked from recursing past a "SidebarTopCell", but we know the parent distance to the side bar cell *)
-        sidebarCell = ConfirmMatch[ ParentCell @ ParentCell @ target, _CellObject, "SidebarCellPrintAfter" ];
-        WithCleanup[
-            FrontEndExecute[ {
-                FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                FrontEnd`SelectionMove[ target, After, Cell, AutoScroll -> True ],
-                FrontEnd`NotebookWrite[ parentNotebook @ target, RowBox[ { "\n", cell } ] ]
-            } ]
-            ,
-            CurrentValue[ sidebarCell, Editable ] = Inherited
-        ];
-        (* this should return the CellObject of the newly written inline cell in the scrolling content cell *)
-        ConfirmMatch[ NextCell @ target, _CellObject, "SidebarCellPrintAfterCellObject" ]
-    ]
+    NotebookWrite[ System`NotebookLocationSpecifier[ target, "After" ],  cell ];
+    (* this should return the CellObject of the newly written inline cell in the scrolling content cell *)
+    ConfirmMatch[ NextCell @ target, _CellObject, "SidebarCellPrintAfterCellObject" ]
     ,
     throwInternalFailure
 ];
diff --git a/Source/Chatbook/SendChat.wl b/Source/Chatbook/SendChat.wl
@@ -1429,28 +1429,14 @@ splitDynamicContent[ container_, { static__String, dynamic_String }, cell_CellOb
 
         container[ "DynamicContent" ] = dynamic;
 
-        If[ TrueQ @ $SidebarChat,
-            With[ { boxObject = boxObject, write = write, sidebarCell = sidebarCellObject @ nbo },
-                splitDynamicTaskFunction @
-                WithCleanup[
-                    FrontEndExecute[ {
-                        FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                        FrontEnd`NotebookWrite[ System`NotebookLocationSpecifier[ boxObject, "Before" ], write, None, AutoScroll -> False ]
-                    } ]
-                    ,
-                    CurrentValue[ sidebarCell, Editable ] = Inherited
-                ]
-            ]
-            ,
-            With[ { boxObject = boxObject, write = write },
-                splitDynamicTaskFunction @ NotebookWrite[
-                    System`NotebookLocationSpecifier[ boxObject, "Before" ],
-                    write,
-                    None,
-                    AutoScroll -> False
-                ]
+        With[ { boxObject = boxObject, write = write },
+            splitDynamicTaskFunction @ NotebookWrite[
+                System`NotebookLocationSpecifier[ boxObject, "Before" ],
+                write,
+                None,
+                AutoScroll -> False
             ]
-        ];
+        ]
 
         $dynamicTrigger++;
         $lastDynamicUpdate = AbsoluteTime[ ];
@@ -2384,23 +2370,10 @@ WriteChatOutputCell[
     new_Cell,
     info: KeyValuePattern @ { "ExpressionUUID" -> uuid_String, "ScrollOutput" -> scroll_ }
 ] := Enclose[
-    Module[ { output, input, sidebarQ, sidebarCell },
+    Module[ { output, input, sidebarQ },
         sidebarQ = cellTaggedQ[ cell, "SidebarTopCell" ];
         input = PreviousCell[ cell, CellStyle -> If[ sidebarQ, "NotebookAssistant`Sidebar`ChatInput", "ChatInput" ] ]; (* kind of a hack, but we know there should be a corresponding ChatInput cell *)
-        If[ sidebarQ,
-            sidebarCell = ConfirmMatch[ ParentCell @ ParentCell @ cell, _CellObject, "SidebarCellWriteChatOutputCell" ];
-            ConfirmMatch[ cellTaggedQ[ sidebarCell, "NotebookAssistantSidebarCell" ], True, "SidebarCellWriteChatOutputCellTaggedQ" ];
-            WithCleanup[
-                FrontEndExecute[ {
-                    FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                    FrontEnd`NotebookWrite[ cell, new, None, AutoScroll -> False ]
-                } ]
-                ,
-                CurrentValue[ sidebarCell, Editable ] = Inherited
-            ]
-            ,
-            NotebookWrite[ cell, new, None, AutoScroll -> False ]
-        ];
+        NotebookWrite[ cell, new, None, AutoScroll -> False ];
         output = NextCell[ input, CellTags -> uuid ]; (* we set the uuid previously *)
         (* The cell expression was specifically constructed that the UUID appears first in the CellTags *)
         CurrentValue[ output, CellTags ] = Replace[ new, Cell[ ___, CellTags -> { uuid, rest___ }, ___ ] :> { rest } ]; (* an empty list clears the CellTags option *)
@@ -3245,18 +3218,7 @@ throwFailureToChatOutput // endDefinition;
 (*writeErrorCell*)
 writeErrorCell // beginDefinition;
 writeErrorCell[ cell_CellObject, as_ ] /; TrueQ[ $SidebarChat ] := Enclose[
-    (* topParentCell is blocked from recursing past a "SidebarTopCell", but we know the parent distance to the side bar cell if in a side bar chat *)
-    With[ { sidebarCell = ConfirmMatch[ ParentCell @ ParentCell @ target, _CellObject, "SidebarCellPrintAfter" ] },
-        createFETask @ WithCleanup[
-            FrontEndExecute[ {
-                FrontEnd`SetOptions[ sidebarCell, Editable -> True ],
-                FrontEnd`NotebookWrite[ cell, errorCell @ as ]
-            } ]
-            ,
-            CurrentValue[ sidebarCell, Editable ] = Inherited
-        ];
-        Null
-    ],
+    createFETask @ NotebookWrite[ cell, errorCell @ as ],
     throwInternalFailure
 ]
 writeErrorCell[ cell_CellObject, as_ ] := (createFETask @ NotebookWrite[ cell, errorCell @ as ]; Null);
