Merge remote-tracking branch 'origin/master' into conat-optimize1

Author: haraldschilly

src/packages/frontend/cspell.json

@@ -18,6 +18,7 @@
     "ggplot",
     "ipython",
     "ipywidgets",
+    "jsonic",
     "katex",
     "knitr",
     "kucalc",
@@ -60,12 +61,9 @@
   "ignoreWords": [
     "antd",
     "buttonbar",
-    "buttonbar",
     "collab",
     "descr",
     "flyoutdragbar",
-    "flyoutdragbar",
-    "flyouts",
     "flyouts",
     "immutablejs",
     "ipynb",
@@ -79,22 +77,16 @@
     "mintime",
     "mistralai",
     "noconf",
-    "noconf",
     "nprocs",
-    "nprocs",
-    "pchildren",
     "pchildren",
     "pids",
-    "pids",
     "Popconfirm",
     "PoweroffOutlined",
     "ptree",
-    "ptree",
     "reuseinflight",
     "sidechat",
     "vertexai",
     "vfill",
-    "xsmall",
     "xsmall"
   ],
   "flagWords": [],

src/packages/frontend/frame-editors/frame-tree/title-bar.tsx

@@ -205,7 +205,10 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
   const [close_and_halt_confirm, set_close_and_halt_confirm] =
     useState<boolean>(false);
 
-  const [showAI, setShowAI] = useState<boolean>(false);
+  const [showAIDialogs, setShowAIDialogs] = useState<{
+    main: boolean;
+    popover: boolean;
+  }>({ main: false, popover: false });
   const [showNewAI, setShowNewAI] = useState<boolean>(false);
 
   const [helpSearch, setHelpSearch] = useState<string>("");
@@ -235,7 +238,8 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
       new ManageCommands({
         props,
         studentProjectFunctionality: student_project_functionality,
-        setShowAI,
+        setShowAI: (val: boolean) =>
+          setShowAIDialogs((prev) => ({ ...prev, main: val })),
         setShowNewAI,
         helpSearch,
         setHelpSearch,
@@ -248,7 +252,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
       student_project_functionality,
       helpSearch,
       setHelpSearch,
-      setShowAI,
+      setShowAIDialogs,
       setShowNewAI,
       read_only,
       editorSettings,
@@ -579,7 +583,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
     );
   }
 
-  function renderAssistant(noLabel): Rendered {
+  function renderAssistant(noLabel, where: "main" | "popover"): Rendered {
     if (
       !manageCommands.isVisible("chatgpt") ||
       !redux.getStore("projects").hasLanguageModelEnabled(props.project_id)
@@ -590,11 +594,13 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
       <LanguageModelTitleBarButton
         path={props.path}
         type={props.type}
-        showDialog={showAI}
-        setShowDialog={setShowAI}
+        showDialog={showAIDialogs[where]}
+        setShowDialog={(value: boolean) => {
+          setShowAIDialogs((prev) => ({ ...prev, [where]: value }));
+        }}
         project_id={props.project_id}
         buttonRef={getTourRef("chatgpt")}
-        key={"ai-button"}
+        key={`ai-button-${where}`}
         id={props.id}
         actions={props.actions}
         buttonSize={button_size()}
@@ -641,7 +647,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
     );
   }
 
-  function renderSaveTimetravelGroup(): Rendered {
+  function renderSaveTimetravelGroup(where: "main" | "popover"): Rendered {
     if (props.type == "chat") {
       // these buttons don't make much sense for side chat.
       return;
@@ -651,7 +657,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
     let x;
     if ((x = renderSaveButton(noLabel))) v.push(x);
     if ((x = renderTimeTravel(noLabel))) v.push(x);
-    if ((x = renderAssistant(noLabel))) v.push(x);
+    if ((x = renderAssistant(noLabel, where))) v.push(x);
     if ((x = renderComputeServer(noLabel))) v.push(x);
     if (v.length == 1) return v[0];
     if (v.length > 0) {
@@ -754,7 +760,11 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
     // seems too horrible right now since it is a selector.
   }
 
-  function renderButtons(style?: CSS, noRefs?): Rendered {
+  function renderButtons(
+    style?: CSS,
+    noRefs?,
+    where: "main" | "popover" = "main",
+  ): Rendered {
     if (!is_active) {
       return (
         <div style={{ display: "flex", width: "100%" }}>
@@ -784,7 +794,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
       }
 
       const v: (React.JSX.Element | undefined | null)[] = [];
-      v.push(renderSaveTimetravelGroup());
+      v.push(renderSaveTimetravelGroup(where));
       if (props.title != null) {
         v.push(renderTitle());
       }
@@ -841,7 +851,7 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
     }
     return (
       <Popover
-        overlayStyle={{ zIndex: 990 }}
+        styles={{ root: { zIndex: 990 } }}
         open={
           props.tab_is_visible && props.is_visible && showMainButtonsPopover
         }
@@ -860,7 +870,11 @@ export function FrameTitleBar(props: FrameTitleBarProps) {
                   marginRight: "3px",
                 }}
               >
-                {renderButtons({ maxHeight: "50vh", display: "block" }, true)}
+                {renderButtons(
+                  { maxHeight: "50vh", display: "block" },
+                  true,
+                  "popover",
+                )}
               </div>
               <div>
                 {renderFrameControls()}

src/packages/frontend/frame-editors/llm/help-me-fix-utils.ts

@@ -18,6 +18,7 @@ export interface GetHelpOptions {
   redux: any;
   prioritize?: "start" | "start-end" | "end";
   model: string;
+  isHint?: boolean;
 }
 
 export interface CreateMessageOpts {
@@ -35,23 +36,22 @@ export interface CreateMessageOpts {
   isHint?: boolean;
 }
 
-export async function getHelp(options: GetHelpOptions) {
-  const {
-    project_id,
-    path,
-    tag,
-    line = "",
-    error,
-    input,
-    task,
-    language,
-    extraFileInfo,
-    redux,
-    prioritize,
-    model,
-  } = options;
-
-  const solutionText = createMessage({
+export async function getHelp({
+  project_id,
+  path,
+  tag,
+  line = "",
+  error,
+  input,
+  task,
+  language,
+  extraFileInfo,
+  redux,
+  prioritize,
+  model,
+  isHint = false,
+}: GetHelpOptions) {
+  const messageText = createMessage({
     error,
     task,
     line,
@@ -60,17 +60,18 @@ export async function getHelp(options: GetHelpOptions) {
     extraFileInfo,
     model,
     prioritize,
-    open: false,
-    full: false,
-    isHint: false,
+    open: true,
+    full: true,
+    isHint,
   });
 
   try {
     const actions = await getChatActions(redux, project_id, path);
     setTimeout(() => actions.scrollToBottom(), 100);
+    const tagSuffix = isHint ? "hint" : "solution";
     await actions.sendChat({
-      input: solutionText,
-      tag: `help-me-fix-solution${tag ? `:${tag}` : ""}`,
+      input: messageText,
+      tag: `help-me-fix-${tagSuffix}${tag ? `:${tag}` : ""}`,
       noNotification: true,
     });
   } catch (err) {
@@ -139,8 +140,8 @@ export function createMessage({
         prioritize === "start"
           ? "starts"
           : prioritize === "end"
-          ? "ends"
-          : "starts and ends";
+            ? "ends"
+            : "starts and ends";
       message.push(
         `My ${
           extraFileInfo ?? ""

src/packages/frontend/jupyter/cell-buttonbar-menu.tsx

@@ -11,6 +11,7 @@ import { useIntl } from "react-intl";
 import { alert_message } from "@cocalc/frontend/alerts";
 import { Icon } from "@cocalc/frontend/components";
 import { jupyter, labels } from "@cocalc/frontend/i18n";
+import { commands } from "./commands";
 import {
   CODE_BAR_BTN_STYLE,
   COPY_CELL_ICON,
@@ -21,6 +22,27 @@ import {
 export function CodeBarDropdownMenu({ actions, frameActions, id, cell }) {
   const intl = useIntl();
 
+  // All jupyter commands
+  const allCommands = commands({
+    jupyter_actions: actions,
+    frame_actions: frameActions,
+  });
+
+  // Extract the cell toolbar command definitions
+  const toolbarNone = allCommands["cell toolbar none"];
+  const toolbarAssignment = allCommands["cell toolbar create_assignment"];
+  const toolbarSlideshow = allCommands["cell toolbar slideshow"];
+  const toolbarMetadata = allCommands["cell toolbar metadata"];
+  const toolbarAttachments = allCommands["cell toolbar attachments"];
+  const toolbarTags = allCommands["cell toolbar tags"];
+  const toolbarIds = allCommands["cell toolbar ids"];
+
+  // Helper to format labels safely
+  const formatLabel = (cmd) => {
+    const message = cmd.menu || cmd.m;
+    return typeof message === "string" ? message : intl.formatMessage(message);
+  };
+
   function cut_cell(): void {
     if (id == null) return;
     frameActions.current?.unselect_all_cells();
@@ -113,6 +135,55 @@ export function CodeBarDropdownMenu({ actions, frameActions, id, cell }) {
         },
       ],
     },
+    {
+      key: "cell-toolbar",
+      label: intl.formatMessage(jupyter.commands.view_toolbars_menu),
+      icon: <Icon name="tool" />,
+      children: [
+        {
+          key: "cell-toolbar-none",
+          label: formatLabel(toolbarNone),
+          icon: <Icon name={toolbarNone.i} />,
+          onClick: toolbarNone.f,
+        },
+        {
+          key: "cell-toolbar-create-assignment",
+          label: formatLabel(toolbarAssignment),
+          icon: <Icon name={toolbarAssignment.i} />,
+          onClick: toolbarAssignment.f,
+        },
+        {
+          key: "cell-toolbar-slideshow",
+          label: formatLabel(toolbarSlideshow),
+          icon: <Icon name={toolbarSlideshow.i} />,
+          onClick: toolbarSlideshow.f,
+        },
+        {
+          key: "cell-toolbar-metadata",
+          label: formatLabel(toolbarMetadata),
+          icon: <Icon name={toolbarMetadata.i} />,
+          onClick: toolbarMetadata.f,
+        },
+        {
+          key: "cell-toolbar-attachments",
+          label: formatLabel(toolbarAttachments),
+          icon: <Icon name={toolbarAttachments.i} />,
+          onClick: toolbarAttachments.f,
+        },
+        {
+          key: "cell-toolbar-tags",
+          label: formatLabel(toolbarTags),
+          icon: <Icon name={toolbarTags.i} />,
+          onClick: toolbarTags.f,
+        },
+        {
+          key: "cell-toolbar-ids",
+          label: formatLabel(toolbarIds),
+          icon: <Icon name={toolbarIds.i} />,
+          onClick: toolbarIds.f,
+        },
+      ],
+    },
     { key: "divider4", type: "divider" },
     {
       key: "copy-cell",

src/packages/frontend/project/new/file-type-selector.tsx

@@ -3,7 +3,7 @@
  *  License: MS-RSL – see LICENSE.md for details
  */
 
-import { Col, Flex, Modal, Row, Tag } from "antd";
+import { Col, Flex, Row, Tag } from "antd";
 import { Gutter } from "antd/es/grid/row";
 import type { ReactNode } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -372,30 +372,6 @@ export function FileTypeSelector({
   function renderSageWS() {
     if (!availableFeatures.sage) return;
 
-    function handleClick(ext) {
-      Modal.confirm({
-        icon: <Icon name="exclamation-circle" />,
-        title: intl.formatMessage({
-          id: "project.new.file-type-selector.sagews.modal.title",
-          defaultMessage: "SageMath Worksheets are Deprecated",
-        }),
-        content: intl.formatMessage({
-          id: "project.new.file-type-selector.sagews.modal.content",
-          defaultMessage:
-            "Consider creating a Jupyter Notebook and use a SageMath Kernel (use the 'SageMath Notebook' button). You can also convert existing SageMath Worksheets to Jupyter Notebooks by opening the worksheet and clicking 'Jupyter'.",
-        }),
-        okText: intl.formatMessage({
-          id: "project.new.file-type-selector.sagews.modal.ok",
-          defaultMessage: "Create SageMath Worksheet Anyways",
-        }),
-        onOk: (close) => {
-          create_file(ext);
-          close();
-        },
-        closable: true,
-      });
-    }
-
     return (
       <Col sm={sm} md={md}>
         <Tip
@@ -405,12 +381,12 @@ export function FileTypeSelector({
           tip={intl.formatMessage({
             id: "new.file-type-selector.sagews.tooltip",
             defaultMessage:
-              "Create an interactive worksheet for using the SageMath mathematical software, Python, R, and many other systems.  Do sophisticated mathematics, draw plots, compute integrals, work with matrices, etc.",
+              "Create an interactive worksheet for using the SageMath mathematical software, Python, R, and many other systems.  Do mathematics, draw plots, compute integrals, work with matrices, etc.",
           })}
         >
           <NewFileButton
             name={intl.formatMessage(labels.sagemath_worksheet)}
-            on_click={handleClick}
+            on_click={create_file}
             ext="sagews"
             size={btnSize}
             active={btnActive("sagews")}