Merge pull request #1364 from WolframResearch/bugfix/Sidebar7

Bugfix/sidebar7

Author: KMDaily

Source/Chatbook/ChatModes/ShowNotebookAssistance.wl

@@ -11,7 +11,10 @@ Needs[ "Wolfram`Chatbook`ChatModes`Common`" ];
 (* ::Section::Closed:: *)
 (*Configuration*)
 $workspaceChatWidth := $workspaceChatWidth = Switch[ $OperatingSystem, "MacOSX", 450, _, 360 ];
-$sidebarChatWidth := Min[ AbsoluteCurrentValue[ EvaluationNotebook[ ], { WindowSize, 1 } ]*0.5, Switch[ $OperatingSystem, "MacOSX", 450, _, 360 ] ];
+$sidebarChatWidth[ nbo_NotebookObject ] := Switch[ $OperatingSystem,
+    "MacOSX", Clip[ 450, { 255, AbsoluteCurrentValue[ nbo, { WindowSize, 1 } ]*0.5 } ],
+    _,        Clip[ 360, { 250, AbsoluteCurrentValue[ nbo, { WindowSize, 1 } ]*0.5 } ]
+];
 
 $notebookAssistanceBaseSettings = <|
     "AllowSelectionContext"     -> True,
@@ -522,18 +525,18 @@ sidebarCellObject// endDefinition;
 showNotebookAssistanceSidebar // beginDefinition;
 
 showNotebookAssistanceSidebar[ nbo_NotebookObject, input_, evaluate_, settings0_Association ] := Enclose[
-    Module[ { settings, sidebarCell, scrollingSidebarCell, movedLastChatToSourcesIndicatorQ },
+    Module[ { sidebarCell },
 
         sidebarCell = sidebarCellObject @ nbo; (* if the side bar has been opened once before IN ITS CONTAINING NOTEBOOK than this is a CellObject, else $Failed *)
 
         If[ FailureQ @ sidebarCell,
              (* don't do anything else because this is the first time we've opened the sidebar in this notebook; Cell Initialization adds necessary TaggingRules *)
-            FrontEndTokenExecute[ nbo, "SwitchSidebar", <| "PanelID" -> "NotebookAssistant", "PreferredSize" -> $sidebarChatWidth |> ];
+            FrontEndTokenExecute[ nbo, "SwitchSidebar", <| "PanelID" -> "NotebookAssistant", "PreferredSize" -> $sidebarChatWidth @ nbo |> ];
             , (* ELSE the sidebar assistant is persistant so don't remove content cells *)
 
             (* The sidebar assistant is persistant to a given notebook. Only remove content if "new chat" is selected. *)
 
-            FrontEndTokenExecute[ nbo, "SwitchSidebar", <| "PanelID" -> "NotebookAssistant", "PreferredSize" -> $sidebarChatWidth |> ];
+            FrontEndTokenExecute[ nbo, "SwitchSidebar", <| "PanelID" -> "NotebookAssistant", "PreferredSize" -> $sidebarChatWidth @ nbo |> ];
 
             (* will we ever need to do this with the sidebar chat...? *)
             If[ TrueQ @ evaluate,

Source/Chatbook/ChatModes/UI.wl

@@ -332,6 +332,7 @@ sidebarHideButton[ Dynamic[ nbo_ ] ] := Button[
         ],
         tr @ "SidebarToolbarButtonTooltipHideSidebar"
     ],
+    CurrentValue[ $FrontEndSession, "ShowNotebookAssistant" ] = False;
     FrontEndToken[nbo, "HideSidebar"],
     Appearance -> "Suppressed",
     Evaluator  -> None
@@ -601,7 +602,7 @@ sidebarChatInputCell // beginDefinition;
 sidebarChatInputCell[ ] := sidebarChatInputCell[ "" ]
 
 sidebarChatInputCell[ initialContent_ ] := Cell[
-    BoxData @ ToBoxes @ DynamicModule[ { thisNB, thisCell, sidebarCell, chatEvalCell, fieldContent = initialContent, returnKeyDownQ, input },
+    BoxData @ ToBoxes @ DynamicModule[ { thisNB, thisCell, sidebarCell, chatEvalCell, fieldContent = initialContent, returnKeyDownQ, input, kernelWasQuitQ = False, cachedChatInput = "", cachedSessionID = $SessionID },
         EventHandler[
             Pane[
                 Grid[
@@ -620,6 +621,11 @@ sidebarChatInputCell[ initialContent_ ] := Cell[
                                 ,
                                 If[ TrueQ @ returnKeyDownQ,
                                     returnKeyDownQ = False;
+                                    Needs[ "Wolfram`Chatbook`" -> None ];
+                                    If[ kernelWasQuitQ,
+                                        If[ Not @ TrueQ @ $workspaceChatInitialized, initializeWorkspaceChat[ ] ];
+                                        If[ fieldContent =!= cachedChatInput, fieldContent = cachedChatInput ];
+                                        kernelWasQuitQ = False ];
                                     evaluateSidebarChat[ thisNB, sidebarCell, input, Dynamic @ chatEvalCell ]
                                 ];
                                 (* spooky action at a distance: regenerating a side bar ChatOutput cell *)
@@ -691,7 +697,7 @@ sidebarChatInputCell[ initialContent_ ] := Cell[
             Method -> "Preemptive"
         ],
         (* 15.0: the side bar is a Row of cells: docked cells, scrollable pane cell, footer cell (ChatInput) *)
-        Initialization :> (thisNB = EvaluationNotebook[ ]; thisCell = EvaluationCell[ ]; sidebarCell = ParentCell @ thisCell)
+        Initialization :> (thisNB = EvaluationNotebook[ ]; thisCell = EvaluationCell[ ]; sidebarCell = ParentCell @ thisCell; kernelWasQuitQ = cachedSessionID =!= $SessionID; cachedSessionID = $SessionID)
     ],
     "ChatInputField",
     Background    -> $inputFieldOuterBackground,
@@ -747,7 +753,7 @@ attachWorkspaceChatInput // endDefinition;
 (* :!CodeAnalysis::BeginBlock:: *)
 (* :!CodeAnalysis::Disable::DynamicImageSize:: *)
 attachedWorkspaceChatInputCell[ location_String ] := Cell[
-    BoxData @ ToBoxes @ DynamicModule[ { thisNB },
+    BoxData @ ToBoxes @ DynamicModule[ { thisNB, cachedSessionID = $SessionID, cachedChatInput = "", kernelWasQuitQ = False },
         EventHandler[
             Pane[
                 Grid[
@@ -756,7 +762,7 @@ attachedWorkspaceChatInputCell[ location_String ] := Cell[
                             RawBoxes @ TemplateBox[ { }, "ChatIconUser" ],
                             Framed[
                                 InputField[
-                                    Dynamic @ $WorkspaceChatInput,
+                                    Dynamic[ $WorkspaceChatInput, Function[ cachedChatInput = $WorkspaceChatInput = # ] ], (* store a local copy of the text in case the kernel was quit *)
                                     Boxes,
                                     ContinuousAction -> True,
                                     $inputFieldOptions
@@ -773,6 +779,11 @@ attachedWorkspaceChatInputCell[ location_String ] := Cell[
                                             27
                                         ],
                                         Needs[ "Wolfram`Chatbook`" -> None ];
+                                        (* in case kernel was quit and the user hasn't typed something new into the search field, restore it to the cached value *)
+                                        If[ kernelWasQuitQ,
+                                            If[ Not @ TrueQ @ $workspaceChatInitialized, initializeWorkspaceChat[ ] ];
+                                            If[ $WorkspaceChatInput =!= cachedChatInput, $WorkspaceChatInput = cachedChatInput ];
+                                            kernelWasQuitQ = False ];
                                         Symbol[ "Wolfram`Chatbook`ChatbookAction" ][
                                             "EvaluateWorkspaceChat",
                                             thisNB,
@@ -821,6 +832,11 @@ attachedWorkspaceChatInputCell[ location_String ] := Cell[
             {
                 "ReturnKeyDown" :> (
                     Needs[ "Wolfram`Chatbook`" -> None ];
+                    (* in case kernel was quit and the user hasn't typed something new into the search field, restore it to the cached value *)
+                    If[ kernelWasQuitQ,
+                        If[ Not @ TrueQ @ $workspaceChatInitialized, initializeWorkspaceChat[ ] ];
+                        If[ $WorkspaceChatInput =!= cachedChatInput, $WorkspaceChatInput = cachedChatInput ];
+                        kernelWasQuitQ = False ];
                     Symbol[ "Wolfram`Chatbook`ChatbookAction" ][
                         "EvaluateWorkspaceChat",
                         thisNB,
@@ -830,7 +846,7 @@ attachedWorkspaceChatInputCell[ location_String ] := Cell[
             },
             Method -> "Queued"
         ],
-        Initialization :> (thisNB = EvaluationNotebook[ ])
+        Initialization :> (thisNB = EvaluationNotebook[ ]; kernelWasQuitQ = cachedSessionID =!= $SessionID; cachedSessionID = $SessionID)
     ],
     "ChatInputField",
     Background    -> $inputFieldOuterBackground,
@@ -865,7 +881,7 @@ $workspaceChatInitialized = False;
 (*initializeWorkspaceChat*)
 initializeWorkspaceChat // beginDefinition;
 
-initializeWorkspaceChat[ ] := initializeWorkspaceChat[ ] = LogChatTiming[
+initializeWorkspaceChat[ ] := LogChatTiming[
     LogChatTiming[ getEmbeddings[ { "Hello" } ], "InitializeEmbeddings" ];
     LogChatTiming[ cachedTokenizer[ "gpt-4o-text" ], "InitializeTokenizer" ];
     LogChatTiming[ $llmKitService, "InitializeLLMKitService" ];
@@ -1532,6 +1548,8 @@ assistantMessageButtons[ includeFeedback_, sidebarCellQ_ ] :=
                 Tooltip[ assistantCopyAsActionMenu[ Dynamic[ cell ] ], tr[ "WorkspaceOutputRaftCopyAsTooltip" ] ],
                 Button[
                     Tooltip[ $regenerateLabel, tr[ "WorkspaceOutputRaftRegenerateTooltip" ] ],
+                    Needs[ "Wolfram`Chatbook`" -> None ];
+                    If[ Not @ TrueQ @ $workspaceChatInitialized, initializeWorkspaceChat[ ] ]; (* in case kernel was quit *)
                     ChatbookAction[ "RegenerateAssistantMessage", cell, sidebarCellQ ],
                     Appearance -> "Suppressed",
                     Method     -> "Queued"