Merge branch 'master' into fix/tts-audio-content-type

Author: timothycarambat

frontend/src/components/WorkspaceChat/ChatContainer/ChatTooltips/index.jsx

@@ -1,6 +1,5 @@
 import { Tooltip } from "react-tooltip";
 import { createPortal } from "react-dom";
-import { useTranslation } from "react-i18next";
 
 /**
  * Set the tooltips for the chat container in bulk.
@@ -17,8 +16,6 @@ import { useTranslation } from "react-i18next";
  * @returns
  */
 export function ChatTooltips() {
-  const { t } = useTranslation();
-
   return (
     <>
       <Tooltip
@@ -105,13 +102,6 @@ export function ChatTooltips() {
         delayShow={300}
         className="tooltip !text-xs"
       />
-      <Tooltip
-        id="agent-skill-disabled-tooltip"
-        place="top"
-        delayShow={300}
-        className="tooltip !text-xs z-99"
-        content={t("chat_window.agent_skills_disabled_in_session")}
-      />
       <DocumentLevelTooltip />
     </>
   );

frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/ToolsMenu/Tabs/AgentSkills/SkillRow/index.jsx

@@ -26,7 +26,6 @@ export default function SkillRow({
       type="button"
       className={classNames}
       onClick={() => !disabled && onToggle()}
-      data-tooltip-id={disabled ? "agent-skill-disabled-tooltip" : undefined}
     >
       <span className="text-xs text-white light:text-slate-900">{name}</span>
       <div className="pointer-events-none" aria-hidden="true">

frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/ToolsMenu/Tabs/AgentSkills/index.jsx

@@ -170,7 +170,7 @@ export default function AgentSkillsTab({
     highlightedIndex,
     onSelect: (item) => {
       if (item.type === "header") return item.onToggle();
-      if (!agentSessionActive) item.onToggle();
+      item.onToggle();
     },
     registerItemCount,
   });
@@ -209,7 +209,6 @@ export default function AgentSkillsTab({
                 enabled={item.enabled}
                 onToggle={item.onToggle}
                 highlighted={highlightedIndex === flatIndexMap[item.id]}
-                disabled={agentSessionActive}
               />
               {item.hasSubSkills && item.subSkills && item.enabled && (
                 <SkillSection
@@ -232,7 +231,7 @@ export default function AgentSkillsTab({
                       highlighted={
                         highlightedIndex === flatIndexMap[subItem.id]
                       }
-                      disabled={agentSessionActive || !subItem.parentEnabled}
+                      disabled={!subItem.parentEnabled}
                     />
                   ))}
                 </SkillSection>

frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/ToolsMenu/Tabs/AgentSkills/useAgentSkillsState.js

@@ -6,6 +6,7 @@ import AgentFlows from "@/models/agentFlows";
 import MCPServers from "@/models/mcpServers";
 import { getSubSkillPreferenceKeys } from "./skillRegistry";
 import useSubSkillPreferences from "./useSubSkillPreferences";
+import { toggleAgentSessionTool } from "@/utils/chat/agent";
 
 /**
  * Core hook for managing all agent skill state.
@@ -91,6 +92,7 @@ export default function useAgentSkillsState(defaultSkills) {
     async (key) => {
       const toggleItem = (arr, item) =>
         arr.includes(item) ? arr.filter((s) => s !== item) : [...arr, item];
+      const newEnabled = !isSkillEnabled(key);
 
       if (key in defaultSkills) {
         const updated = toggleItem(disabledDefaults, key);
@@ -99,6 +101,7 @@ export default function useAgentSkillsState(defaultSkills) {
           disabled_agent_skills: updated.join(","),
           default_agent_skills: enabledConfigurable.join(","),
         });
+        toggleAgentSessionTool(key, newEnabled);
         return;
       }
 
@@ -108,8 +111,9 @@ export default function useAgentSkillsState(defaultSkills) {
         disabled_agent_skills: disabledDefaults.join(","),
         default_agent_skills: updated.join(","),
       });
+      toggleAgentSessionTool(key, newEnabled);
     },
-    [defaultSkills, disabledDefaults, enabledConfigurable]
+    [defaultSkills, disabledDefaults, enabledConfigurable, isSkillEnabled]
   );
 
   const toggleImportedSkill = useCallback(async (skill) => {
@@ -120,6 +124,7 @@ export default function useAgentSkillsState(defaultSkills) {
       )
     );
     await AgentPlugins.toggleFeature(skill.hubId, newActive);
+    toggleAgentSessionTool(skill.hubId, newActive);
   }, []);
 
   const toggleFlow = useCallback(async (flow) => {
@@ -128,6 +133,7 @@ export default function useAgentSkillsState(defaultSkills) {
       prev.map((f) => (f.uuid === flow.uuid ? { ...f, active: newActive } : f))
     );
     await AgentFlows.toggleFlow(flow.uuid, newActive);
+    toggleAgentSessionTool(`@@flow_${flow.uuid}`, newActive);
   }, []);
 
   const toggleMcpTool = useCallback(
@@ -154,6 +160,11 @@ export default function useAgentSkillsState(defaultSkills) {
         });
       });
       await MCPServers.toggleTool(serverName, toolName, newEnabled);
+      toggleAgentSessionTool(
+        `${serverName}-${toolName}`,
+        newEnabled,
+        serverName
+      );
     },
     []
   );

frontend/src/components/WorkspaceChat/ChatContainer/PromptInput/ToolsMenu/Tabs/AgentSkills/useSubSkillPreferences.js

@@ -1,6 +1,7 @@
 import { useState, useCallback } from "react";
 import Admin from "@/models/admin";
 import { SUB_SKILL_REGISTRY, getPreferenceKeyForSkill } from "./skillRegistry";
+import { toggleAgentSessionTool } from "@/utils/chat/agent";
 
 /**
  * Hook to manage sub-skill preferences for all skills in the registry.
@@ -65,6 +66,7 @@ export default function useSubSkillPreferences() {
       await Admin.updateSystemPreferences({
         [prefKey]: updated.join(","),
       });
+      toggleAgentSessionTool(subSkillName, !updated.includes(subSkillName));
     },
     [disabledSubSkills]
   );

frontend/src/components/WorkspaceChat/ChatContainer/index.jsx

@@ -16,6 +16,7 @@ import handleSocketResponse, {
   AGENT_SESSION_END,
   AGENT_SESSION_START,
   setAgentSessionActive,
+  setAgentSessionSocket,
 } from "@/utils/chat/agent";
 import DnDFileUploaderWrapper from "./DnDWrapper";
 import SpeechRecognition, {
@@ -360,6 +361,7 @@ export default function ChatContainer({
 
         window.addEventListener(ABORT_STREAM_EVENT, () => {
           setAgentSessionActive(false);
+          setAgentSessionSocket(null);
           window.dispatchEvent(new CustomEvent(AGENT_SESSION_END));
           socket?.close();
         });
@@ -379,6 +381,7 @@ export default function ChatContainer({
 
         socket.addEventListener("close", (_event) => {
           setAgentSessionActive(false);
+          setAgentSessionSocket(null);
           window.dispatchEvent(new CustomEvent(AGENT_SESSION_END));
           // When the close was triggered by /reset, skip the "Agent session
           // complete." status - the pending /reset flow will clear history.
@@ -406,6 +409,7 @@ export default function ChatContainer({
         });
         setWebsocket(socket);
         setAgentSessionActive(true);
+        setAgentSessionSocket(socket);
         window.dispatchEvent(new CustomEvent(AGENT_SESSION_START));
         window.dispatchEvent(new CustomEvent(CLEAR_ATTACHMENTS_EVENT));
       } catch (e) {

frontend/src/utils/chat/agent.js

@@ -408,6 +408,26 @@ export function getAgentSessionActive() {
   return _agentSessionActive;
 }
 
+// Live agent-session websocket, used to toggle tools available to the agent mid-session.
+let _agentSessionSocket = null;
+export function setAgentSessionSocket(socket) {
+  _agentSessionSocket = socket;
+}
+
+/**
+ * Toggle a tool/skill on or off for the active agent session over the websocket.
+ * No-op when there is no open agent session.
+ * @param {string} skill - Skill key, `@@flow_<uuid>`, MCP `<server>-<tool>`, hubId, or sub-skill name.
+ * @param {boolean} enabled - Whether the tool should be enabled.
+ * @param {string|null} [serverName] - MCP server name; required to enable an MCP tool mid-session.
+ */
+export function toggleAgentSessionTool(skill, enabled, serverName = null) {
+  if (_agentSessionSocket?.readyState !== WebSocket.OPEN) return;
+  _agentSessionSocket.send(
+    JSON.stringify({ type: "agentToolToggle", skill, enabled, serverName })
+  );
+}
+
 export function useIsAgentSessionActive() {
   const [activeSession, setActiveSession] = useState(
     () => !!getAgentSessionActive()

server/endpoints/agentWebsocket.js

@@ -10,6 +10,9 @@ const { safeJsonParse } = require("../utils/http");
 
 // Setup listener for incoming messages to relay to socket so it can be handled by agent plugin.
 function relayToSocket(message) {
+  // Tool toggles can arrive while the agent is paused awaiting feedback/approval,
+  // so handle them first. The handler ignores (returns false for) any other message.
+  if (this.handleToolToggle?.(message)) return;
   if (this.handleFeedback) return this?.handleFeedback?.(message);
   if (this.handleToolApproval) return this?.handleToolApproval?.(message);
   if (this.handleClarificationResponse)

server/utils/agents/aibitat/index.js

@@ -1456,6 +1456,17 @@ https://docs.anythingllm.com/agent/intelligent-tool-selection
     this.functions.set(functionConfig.name, functionConfig);
     return this;
   }
+
+  /**
+   * Remove a registered function so the agent can no longer call it on its next
+   * turn. Used to disable a tool mid-session; restore it by re-running its plugin
+   * via aibitat.use().
+   * @param {string} functionName - The registered name of the function to remove.
+   */
+  removeFunction(functionName) {
+    this.functions.delete(functionName);
+    return this;
+  }
 }
 
 module.exports = AIbitat;

server/utils/agents/aibitat/plugins/websocket.js

@@ -3,6 +3,25 @@ const { Telemetry } = require("../../../../models/telemetry");
 const { v4: uuidv4 } = require("uuid");
 const { safeJsonParse } = require("../../../http");
 const { skillIsAutoApproved } = require("../../../helpers/agents");
+const { ROLES } = require("../../../middleware/multiUserProtected");
+
+/**
+ * Toggling an agent's tools mid-session is an admin-only action, mirroring the
+ * Agent Skills settings which only admins can manage. In multi-user mode the
+ * requesting user must be an admin; single-user mode (no userId) is allowed.
+ * @param {number|null} userId - User id from the agent invocation.
+ * @returns {Promise<boolean>}
+ */
+async function userCanToggleTools(userId = null) {
+  const { SystemSettings } = require("../../../../models/systemSettings");
+  if (!(await SystemSettings.isMultiUserMode())) return true;
+  if (!userId) return false;
+
+  const { User } = require("../../../../models/user");
+  const user = await User.get({ id: Number(userId) });
+  return user?.role === ROLES.admin;
+}
+
 const SOCKET_TIMEOUT_MS = 300 * 1_000; // 5 mins
 const TOOL_APPROVAL_TIMEOUT_MS = 120 * 1_000; // 2 mins for tool approval
 const CLARIFICATION_DEFAULT_TIMEOUT_MS = 120 * 1_000; // 2 mins for clarifying questions
@@ -87,6 +106,29 @@ const websocket = {
           },
         };
 
+        // Toggle a tool/skill on or off for the running agent mid-session. The
+        // change applies on the agent's next turn. Returns true once handled so
+        // the socket message router stops further dispatch. Toggling is an
+        // admin-only action, so the message is claimed but only applied once
+        // the requesting user is authorized.
+        socket.handleToolToggle = (message) => {
+          const data = safeJsonParse(message, {});
+          if (data?.type !== "agentToolToggle") return false;
+
+          userCanToggleTools(userId).then((authorized) => {
+            if (!authorized)
+              return console.log(
+                chalk.yellow("Ignoring agentToolToggle from a non-admin user.")
+              );
+            aibitat.toggleAgentTool?.({
+              skill: data.skill,
+              enabled: data.enabled,
+              serverName: data.serverName || null,
+            });
+          });
+          return true;
+        };
+
         /**
          * Request user approval before executing a tool/skill.
          * This sends a request to the frontend and blocks until the user responds.