Merge pull request #1368 from WolframResearch/bugfix/Sidebar9

KMDaily · web-flow · commit dfc7f59ca57b · 2026-01-15T15:07:27.000-08:00
Bugfix/sidebar9
diff --git a/DarkModeSupport/TextResources/ChatbookResources.tr b/DarkModeSupport/TextResources/ChatbookResources.tr
@@ -9848,7 +9848,11 @@ VX/aMEEQzrerjFhhelYAzofFB3r8AgApYdcE
      StandardForm],
    DestroyAfterEvaluation->True], 
   DynamicBox[ToBoxes[Needs["Wolfram`Chatbook`" -> None]; RawBoxes[
-      Symbol["Wolfram`Chatbook`ChatModes`Common`sidebarChatInputCell"][]], 
+      Symbol["Wolfram`Chatbook`ChatbookAction"][
+      "MakeSidebarChatScrollingCell"]], StandardForm],
+   DestroyAfterEvaluation->True], 
+  DynamicBox[ToBoxes[Needs["Wolfram`Chatbook`" -> None]; RawBoxes[
+      Symbol["Wolfram`Chatbook`ChatbookAction"]["MakeSidebarChatInputCell"]], 
     StandardForm],
    DestroyAfterEvaluation->True]}]],
  Editable->True,
@@ -9861,8 +9865,8 @@ VX/aMEEQzrerjFhhelYAzofFB3r8AgApYdcE
   CurrentValue[
      EvaluationCell[], TaggingRules] = <|
     "ChatNotebookSettings" -> 
-     Wolfram`Chatbook`ChatModes`ShowNotebookAssistance`Private`$\
-notebookAssistanceSidebarSettings, "ConversationTitle" -> ""|>),
+     Wolfram`Chatbook`NotebookAssistanceSidebarSettings[], 
+     "ConversationTitle" -> ""|>),
  CellFrameMargins->0,
  ShowCursorTracker->False,
  LineSpacing->{1, 0},
@@ -9873,8 +9877,8 @@ notebookAssistanceSidebarSettings, "ConversationTitle" -> ""|>),
    GrayLevel[0.95], 
    RGBColor[0.1882352, 0.2078431, 0.2274509]],
  CellTags->
-  "NotebookAssistantSidebarCell",ExpressionUUID->"63d02243-e7fb-e74f-b904-\
-32a950285a1a"],
+  "NotebookAssistantSidebarCell",ExpressionUUID->"ceb7a8fa-8e67-e442-9d90-\
+64f5b8406e2d"],
 
 "SidebarIconHide" -> (GraphicsBox[{
    Thickness[0.125], 
@@ -9892,7 +9896,20 @@ W3sk8xku73mJwrdf8hSFv6b7IYr+bRfvoJh/JeyCPZL/YXxY+MDUw8KvYW0E
 HTIfFh4w9bDw0lh5WcgBKTxh8i8MIfbC9PechdgL48PiF6YeFv8w98H4MPfD
 1MP8l+B2RQjZ/yjpCwBvF7ac
     "]]}, AspectRatio -> Automatic, BaselinePosition -> (Center -> Center), 
-  ImageSize -> {9., 9.}, PlotRange -> {{-0.5, 8.5}, {-0.5, 8.5}}]& )
+  ImageSize -> {9., 9.}, PlotRange -> {{-0.5, 8.5}, {-0.5, 8.5}}]& ),
+
+"SidebarAskAnythingArrowIcon" -> GraphicsBox[
+  {FaceForm[LightDarkSwitched[
+    GrayLevel[0.819607], 
+    GrayLevel[0.392157]]], 
+   FilledCurveBox[
+    Line[{{0, 1.7366173205033308`}, {0.233009708737864, 0.4119170984455958}, {
+      0.5097087378640774, 0.4119170984455958}, {0, 0}, {-0.5097087378640774, 
+      0.4119170984455958}, {-0.233009708737864, 0.4119170984455958}, {
+      0, 1.7366173205033308`}}]]},
+  AspectRatio->3.3,
+  ImagePadding->1,
+  ImageSize->{24, 77}]
 }
 @|
 @|
diff --git a/Developer/Resources/FrontEndResources/SideBarChat/NotebookAssistantSidebarCell.wl b/Developer/Resources/FrontEndResources/SideBarChat/NotebookAssistantSidebarCell.wl
@@ -12,7 +12,14 @@ Cell[
 				DynamicBox[
 					ToBoxes[
 						Needs[ "Wolfram`Chatbook`" -> None ];
-						RawBoxes @ Symbol[ "Wolfram`Chatbook`ChatModes`Common`sidebarChatInputCell" ][ ],
+						RawBoxes @ Symbol[ "Wolfram`Chatbook`ChatbookAction" ][ "MakeSidebarChatScrollingCell" ],
+						StandardForm ],
+					DestroyAfterEvaluation -> True
+				],
+				DynamicBox[
+					ToBoxes[
+						Needs[ "Wolfram`Chatbook`" -> None ];
+						RawBoxes @ Symbol[ "Wolfram`Chatbook`ChatbookAction" ][ "MakeSidebarChatInputCell" ],
 						StandardForm ],
 					DestroyAfterEvaluation -> True
 				]
@@ -25,13 +32,13 @@ Cell[
 	CellTags          -> "NotebookAssistantSidebarCell",
 	Editable          -> True,
 	FontSize          -> 0.5, (* needed to workaround line wrapping issue where newlines are given their full line-height based on the FontSize *)
-    Initialization    :> (
-    	AttachCell[ EvaluationCell[ ], Cell[ "", CellTags -> "NotebookAssistantSidebarAttachedHelperCell" ], { Left, Top }, 0, { Left, Top } ];
-    	Needs[ "Wolfram`Chatbook`" -> None ];
-    	CurrentValue[ EvaluationCell[ ], TaggingRules ] = <| "ChatNotebookSettings" -> Wolfram`Chatbook`ChatModes`ShowNotebookAssistance`Private`$notebookAssistanceSidebarSettings, "ConversationTitle" -> "" |>),
-    LineIndent        -> 0,
-    LineSpacing       -> { 1, 0 },
-    Magnification     -> 1.,
-    Selectable        -> False,
-    ShowCursorTracker -> False
+	Initialization    :> (
+		AttachCell[ EvaluationCell[ ], Cell[ "", CellTags -> "NotebookAssistantSidebarAttachedHelperCell" ], { Left, Top }, 0, { Left, Top } ];
+		Needs[ "Wolfram`Chatbook`" -> None ];
+		CurrentValue[ EvaluationCell[ ], TaggingRules ] = <| "ChatNotebookSettings" -> Wolfram`Chatbook`NotebookAssistanceSidebarSettings[ ], "ConversationTitle" -> "" |>),
+	LineIndent        -> 0,
+	LineSpacing       -> { 1, 0 },
+	Magnification     -> 1.,
+	Selectable        -> False,
+	ShowCursorTracker -> False
 ]
diff --git a/Developer/Resources/FrontEndResources/SideBarChat/SidebarAskAnythingArrowIcon.wl b/Developer/Resources/FrontEndResources/SideBarChat/SidebarAskAnythingArrowIcon.wl
@@ -0,0 +1,17 @@
+Graphics[
+    {
+        FaceForm @ color @ "NA_OverlayAskAnythingArrowIcon",
+        FilledCurve @ Line @ {
+            { 0, 1.7366173205033308 },
+            { 0.233009708737864, 0.4119170984455958 },
+            { 0.5097087378640774, 0.4119170984455958 },
+            { 0, 0 },
+            { -0.5097087378640774, 0.4119170984455958 },
+            { -0.233009708737864, 0.4119170984455958 },
+            { 0, 1.7366173205033308 }
+        }
+    },
+    ImagePadding -> 1,
+    AspectRatio -> 3.3,
+    ImageSize -> { 24, 77 }
+]
diff --git a/FrontEnd/TextResources/ChatbookResources.tr b/FrontEnd/TextResources/ChatbookResources.tr
@@ -7454,7 +7454,7 @@ Ol8EjS+Dph+dL4GmHp0vg8aH0bj8pYAmjs5XcgAAE1oO7g==
   TagBox[
    TagBox[
     DynamicModuleBox[{
-     Wolfram`ChatbookFrontEndResourceBuilder`Private`frame$$}, 
+     Wolfram`ChatbookFrontEndResourceBuilder`Private`frame$$ = 1}, 
      OverlayBox[{
       PaneBox[
        AnimatorBox[Dynamic[
@@ -9486,7 +9486,73 @@ VX/aMEEQzrerjFhhelYAzofFB3r8AgApYdcE
    CurrentValue["MouseOver"]],
   BaselinePosition->(Top -> Scaled[0.9]),
   FrameMargins->0,
-  ImageSize->Automatic]
+  ImageSize->Automatic],
+
+"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`ChatbookAction"][
+      "MakeSidebarChatScrollingCell"]], StandardForm],
+   DestroyAfterEvaluation->True], 
+  DynamicBox[ToBoxes[Needs["Wolfram`Chatbook`" -> None]; RawBoxes[
+      Symbol["Wolfram`Chatbook`ChatbookAction"]["MakeSidebarChatInputCell"]], 
+    StandardForm],
+   DestroyAfterEvaluation->True]}]],
+ Editable->True,
+ Selectable->False,
+ CellMargins->{{0, 0}, {0, 0}},
+ Initialization:>(AttachCell[
+    EvaluationCell[], 
+    Cell["", CellTags -> "NotebookAssistantSidebarAttachedHelperCell"], {
+    Left, Top}, 0, {Left, Top}]; Needs["Wolfram`Chatbook`" -> None]; 
+  CurrentValue[
+     EvaluationCell[], TaggingRules] = <|
+    "ChatNotebookSettings" -> 
+     Wolfram`Chatbook`NotebookAssistanceSidebarSettings[], 
+     "ConversationTitle" -> ""|>),
+ CellFrameMargins->0,
+ ShowCursorTracker->False,
+ LineSpacing->{1, 0},
+ LineIndent->0,
+ FontSize->0.5,
+ Magnification->1.,
+ Background->GrayLevel[0.95],
+ CellTags->
+  "NotebookAssistantSidebarCell",ExpressionUUID->"e5fb495e-6bfb-ba4a-9d42-\
+59b92f6652a6"],
+
+"SidebarAskAnythingArrowIcon" -> GraphicsBox[
+  {FaceForm[GrayLevel[0.819607]], 
+   FilledCurveBox[
+    Line[{{0, 1.7366173205033308`}, {0.233009708737864, 0.4119170984455958}, {
+      0.5097087378640774, 0.4119170984455958}, {0, 0}, {-0.5097087378640774, 
+      0.4119170984455958}, {-0.233009708737864, 0.4119170984455958}, {
+      0, 1.7366173205033308`}}]]},
+  AspectRatio->3.3,
+  ImagePadding->1,
+  ImageSize->{24, 77}],
+
+"SidebarIconHide" -> (GraphicsBox[{
+   Thickness[0.125], 
+   FaceForm[{#, 
+     Opacity[1.]}], 
+   FilledCurveBox[{{{1, 4, 3}, {1, 3, 3}, {1, 3, 3}, {0, 1, 0}, {0, 1, 0}, {1,
+     3, 3}, {1, 3, 3}, {1, 3, 3}, {0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {1, 3, 
+    3}, {0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {1, 3, 3}, {0, 1, 0}, {0, 1, 
+    0}}}, CompressedData["
+1:eJxTTMoPSmVmYGBgBGJ1IGZiAIMF1UZyDkA64UPrJ3sgvUXzF5ivUHDuHTKf
+YfLKJ/ZI6htcbtwB8huaFc/JgvgHFk26BpIX5feG8C/mXwbxl/w5LoPMj/ng
+isJ/c/eQNLL+C81x0kjmM0zwYxAA8QWKw7nA4j4tYHfC5Bn+fvtgj6SfIe3q
+W3sk8xku73mJwrdf8hSFv6b7IYr+bRfvoJh/JeyCPZL/YXxY+MDUw8KvYW0E
+2J0bkv7zOyDJ73gD8RdM/41ZajLI/AiDLFlk9TOeQMKZoXYd2N4Zk6DxoHn6
+HTIfFh4w9bDw0lh5WcgBKTxh8i8MIfbC9PechdgL48PiF6YeFv8w98H4MPfD
+1MP8l+B2RQjZ/yjpCwBvF7ac
+    "]]}, AspectRatio -> Automatic, BaselinePosition -> (Center -> Center), 
+  ImageSize -> {9., 9.}, PlotRange -> {{-0.5, 8.5}, {-0.5, 8.5}}]& )
 }
 @|
 @|
diff --git a/FrontEnd/TextResources/ChatbookStrings.tr b/FrontEnd/TextResources/ChatbookStrings.tr
@@ -220,6 +220,7 @@
 "SidebarToolbarButtonTooltipHideSidebar" -> "Hide notebook assistant",
 "SidebarToolbarButtonTooltipOpenAsWindowedAssistant" -> "Open as a separate window",
 "SidebarFocusIndicator" -> "Ignore notebook content",
+"SidebarOverlayAskAnything" -> "How can I help?",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
 "WorkspaceToolbarButtonLabelHistory" -> "History",
diff --git a/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr b/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr
@@ -220,6 +220,7 @@
 "SidebarToolbarButtonTooltipHideSidebar" -> "Hide notebook assistant",
 "SidebarToolbarButtonTooltipOpenAsWindowedAssistant" -> "Open as a separate window",
 "SidebarFocusIndicator" -> "Ignore notebook content",
+"SidebarOverlayAskAnything" -> "How can I help?",
 
 "WorkspaceWindowTitle" -> "\:7B14\:8BB0\:672C\:52A9\:624B",
 "WorkspaceToolbarButtonLabelHistory" -> "\:5386\:53F2\:8BB0\:5F55",
diff --git a/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr b/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr
@@ -220,6 +220,7 @@
 "SidebarToolbarButtonTooltipHideSidebar" -> "Hide notebook assistant",
 "SidebarToolbarButtonTooltipOpenAsWindowedAssistant" -> "Open as a separate window",
 "SidebarFocusIndicator" -> "Ignore notebook content",
+"SidebarOverlayAskAnything" -> "How can I help?",
 
 "WorkspaceWindowTitle" -> "\:7B46\:8A18\:672C\:5C0F\:5E6B\:624B",
 "WorkspaceToolbarButtonLabelHistory" -> "\:6B77\:53F2\:8A18\:9304",
diff --git a/FrontEnd/TextResources/French/ChatbookStrings.tr b/FrontEnd/TextResources/French/ChatbookStrings.tr
@@ -220,6 +220,7 @@
 "SidebarToolbarButtonTooltipHideSidebar" -> "Hide notebook assistant",
 "SidebarToolbarButtonTooltipOpenAsWindowedAssistant" -> "Open as a separate window",
 "SidebarFocusIndicator" -> "Ignore notebook content",
+"SidebarOverlayAskAnything" -> "How can I help?",
 
 "WorkspaceWindowTitle" -> "Assistant de notebook",
 "WorkspaceToolbarButtonLabelHistory" -> "Historique",
diff --git a/FrontEnd/TextResources/Japanese/ChatbookStrings.tr b/FrontEnd/TextResources/Japanese/ChatbookStrings.tr
@@ -220,6 +220,7 @@
 "SidebarToolbarButtonTooltipHideSidebar" -> "Hide notebook assistant",
 "SidebarToolbarButtonTooltipOpenAsWindowedAssistant" -> "Open as a separate window",
 "SidebarFocusIndicator" -> "Ignore notebook content",
+"SidebarOverlayAskAnything" -> "How can I help?",
 
 "WorkspaceWindowTitle" -> "\:30ce\:30fc\:30c8\:30d6\:30c3\:30af\:30a2\:30b7\:30b9\:30bf\:30f3\:30c8",
 "WorkspaceToolbarButtonLabelHistory" -> "\:5c65\:6b74",
diff --git a/FrontEnd/TextResources/Korean/ChatbookStrings.tr b/FrontEnd/TextResources/Korean/ChatbookStrings.tr
@@ -220,6 +220,7 @@
 "SidebarToolbarButtonTooltipHideSidebar" -> "Hide notebook assistant",
 "SidebarToolbarButtonTooltipOpenAsWindowedAssistant" -> "Open as a separate window",
 "SidebarFocusIndicator" -> "Ignore notebook content",
+"SidebarOverlayAskAnything" -> "How can I help?",
 
 "WorkspaceWindowTitle" -> "\:B178\:D2B8\:BD81 \:C5B4\:C2DC\:C2A4\:D134\:D2B8",
 "WorkspaceToolbarButtonLabelHistory" -> "\:D788\:C2A4\:D1A0\:B9AC",
diff --git a/FrontEnd/TextResources/Spanish/ChatbookStrings.tr b/FrontEnd/TextResources/Spanish/ChatbookStrings.tr
@@ -220,6 +220,7 @@
 "SidebarToolbarButtonTooltipHideSidebar" -> "Hide notebook assistant",
 "SidebarToolbarButtonTooltipOpenAsWindowedAssistant" -> "Open as a separate window",
 "SidebarFocusIndicator" -> "Ignore notebook content",
+"SidebarOverlayAskAnything" -> "How can I help?",
 
 "WorkspaceWindowTitle" -> "Notebook Assistant",
 "WorkspaceToolbarButtonLabelHistory" -> "Historial",
diff --git a/Source/Chatbook/Actions.wl b/Source/Chatbook/Actions.wl
@@ -83,6 +83,8 @@ ChatbookAction[ "ExplodeInPlace"               , args___ ] := catchMine @ Explod
 ChatbookAction[ "InsertCodeBelow"              , args___ ] := catchMine @ insertCodeBelow @ args;
 ChatbookAction[ "InsertInlineReference"        , args___ ] := catchMine @ InsertInlineReference @ args;
 ChatbookAction[ "MakeSidebarChatDockedCell"    , args___ ] := catchMine @ makeSidebarChatDockedCell @ args;
+ChatbookAction[ "MakeSidebarChatInputCell"     , args___ ] := catchMine @ makeSidebarChatInputCell @ args;
+ChatbookAction[ "MakeSidebarChatScrollingCell" , args___ ] := catchMine @ makeSidebarChatScrollingCell @ args;
 ChatbookAction[ "MakeWorkspaceChatDockedCell"  , args___ ] := catchMine @ makeWorkspaceChatDockedCell @ args;
 ChatbookAction[ "MoveToChatInputField"         , args___ ] := catchMine @ moveToChatInputField @ args;
 ChatbookAction[ "OpenChatBlockSettings"        , args___ ] := catchMine @ OpenChatBlockSettings @ args;
diff --git a/Source/Chatbook/ChatModes/Common.wl b/Source/Chatbook/ChatModes/Common.wl
@@ -20,7 +20,6 @@ HoldComplete[
     `moveToInlineChatInputField,
     `scrollInlineChat,
     `sidebarCellObject,
-    `sidebarChatInputCell,
     `sidebarScrollingCell,
     `toggleOverlayMenu,
     `userNotebookQ,
diff --git a/Source/Chatbook/ChatModes/Evaluate.wl b/Source/Chatbook/ChatModes/Evaluate.wl
@@ -82,12 +82,16 @@ 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" ];
-            NotebookWrite[ System`NotebookLocationSpecifier[ lastDockedCell, "After" ], sidebarScrollingCell[ nbo, { cell } ] ];
+            NotebookWrite[ System`NotebookLocationSpecifier[ lastDockedCell, "After" ], makeSidebarChatScrollingCell[ nbo, sidebarCell, { 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" ];
-            NotebookWrite[ System`NotebookLocationSpecifier[ lastContentCell, "After" ], cell ]
+            If[ Cells[ scrollablePaneCell, CellTags -> "SidebarTopCell" ] === { }, (* rewrite the entire cell if it has no content *)
+                NotebookWrite[ scrollablePaneCell, makeSidebarChatScrollingCell[ nbo, sidebarCell, { cell } ] ];
+                scrollablePaneCell = ConfirmMatch[ First[ Cells[ sidebarCell, CellTags -> "SidebarScrollingContentCell" ], $Failed ], _CellObject, "NoNewScrollingContentCell" ];
+                ,
+                lastContentCell = ConfirmMatch[ Last[ Cells[ scrollablePaneCell, CellTags -> "SidebarTopCell" ], $Failed ], _CellObject, "NoSidebarScrollingContentCell" ];
+                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
@@ -48,6 +48,10 @@ $notebookAssistanceInlineSettings := <|
     "InlineChat"            -> True
 |>;
 
+NotebookAssistanceSidebarSettings // beginDefinition;
+NotebookAssistanceSidebarSettings[ ] := $notebookAssistanceSidebarSettings
+NotebookAssistanceSidebarSettings // endDefinition;
+
 $notebookAssistanceSidebarSettings := <|
     $notebookAssistanceBaseSettings,
     "AutoGenerateTitle"     -> True,
diff --git a/Source/Chatbook/ChatModes/UI.wl b/Source/Chatbook/ChatModes/UI.wl
diff --git a/Source/Chatbook/ColorData.wl b/Source/Chatbook/ColorData.wl
diff --git a/Source/Chatbook/CommonSymbols.wl b/Source/Chatbook/CommonSymbols.wl
diff --git a/Source/Chatbook/Main.wl b/Source/Chatbook/Main.wl
diff --git a/Source/Chatbook/SendChat.wl b/Source/Chatbook/SendChat.wl
