Merge remote-tracking branch 'origin/develop' into xyc/frontend_ui

# Conflicts:
#	frontend/app/[locale]/setup/SetupLayout.tsx
#	frontend/components/ui/navbar.tsx

Author: Jasonxia007

.github/workflows/docker-deploy.yml

@@ -15,6 +15,11 @@ on:
         description: 'runner array in json format (e.g. ["ubuntu-latest"] or ["self-hosted"])'
         required: true
         default: '[]'
+      app_version:
+        description: 'Docker image tag to build and deploy (e.g. v1.7.1)'
+        required: true
+        default: 'latest'
+        type: string
 
 jobs:
   build-main:
@@ -23,7 +28,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Build main application image
-        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua -t nexent/nexent -f make/main/Dockerfile .
+        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua -t nexent/nexent:${{ github.event.inputs.app_version }} -t nexent/nexent -f make/main/Dockerfile .
 
   build-data-process:
     runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -47,23 +52,23 @@ jobs:
           GIT_TRACE=1 GIT_CURL_VERBOSE=1 GIT_LFS_LOG=debug git lfs pull
           rm -rf .git .gitattributes
       - name: Build data process image
-        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua -t nexent/nexent-data-process -f make/data_process/Dockerfile .
+        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua -t nexent/nexent-data-process:${{ github.event.inputs.app_version }} -t nexent/nexent-data-process -f make/data_process/Dockerfile .
 
   build-web:
     runs-on: ${{ fromJson(inputs.runner_label_json) }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Build web frontend image
-        run: docker build --build-arg MIRROR=https://registry.npmmirror.com --build-arg APK_MIRROR=tsinghua -t nexent/nexent-web -f make/web/Dockerfile .
+        run: docker build --build-arg MIRROR=https://registry.npmmirror.com --build-arg APK_MIRROR=tsinghua -t nexent/nexent-web:${{ github.event.inputs.app_version }} -t nexent/nexent-web -f make/web/Dockerfile .
 
   build-docs:
     runs-on: ${{ fromJson(inputs.runner_label_json) }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Build docs image
-        run: docker build --progress=plain -t nexent/nexent-docs -f make/docs/Dockerfile .
+        run: docker build --progress=plain -t nexent/nexent-docs:${{ github.event.inputs.app_version }} -t nexent/nexent-docs -f make/docs/Dockerfile .
 
   deploy:
     runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -76,6 +81,9 @@ jobs:
           rm -rf $HOME/nexent
           mkdir -p $HOME/nexent
           cp -r $GITHUB_WORKSPACE/* $HOME/nexent/
+      - name: Force APP_VERSION to latest in deploy.sh (CI only)
+        run: |
+          sed -i 's/APP_VERSION="$(get_app_version)"/APP_VERSION="${{ github.event.inputs.app_version }}"/' $HOME/nexent/docker/deploy.sh
       - name: Start docs container
         run: |
           docker stop nexent-docs 2>/dev/null || true

frontend/app/[locale]/agents/AgentsContent.tsx

@@ -9,7 +9,6 @@ import {
 } from "@/const/modelConfig";
 
 import AgentConfig, {AgentConfigHandle} from "./AgentConfiguration";
-import SaveConfirmModal from "./components/SaveConfirmModal";
 
 interface AgentsContentProps {
   /** Whether currently saving */
@@ -39,8 +38,6 @@ export default forwardRef<AgentConfigHandle, AgentsContentProps>(function Agents
   onSavingStateChange,
 }: AgentsContentProps, ref) {
   const agentConfigRef = useRef<AgentConfigHandle | null>(null);
-  const [showSaveConfirm, setShowSaveConfirm] = useState(false);
-  const pendingNavRef = useRef<null | (() => void)>(null);
 
   // Use custom hook for common setup flow logic
   const {
@@ -95,32 +92,6 @@ export default forwardRef<AgentConfigHandle, AgentsContentProps>(function Agents
           ) : null}
         </div>
       </motion.div>
-
-      <SaveConfirmModal
-        open={showSaveConfirm}
-        onCancel={async () => {
-          // Reload data from backend to discard changes
-          await agentConfigRef.current?.reloadCurrentAgentData?.();
-          setShowSaveConfirm(false);
-          const go = pendingNavRef.current;
-          pendingNavRef.current = null;
-          if (go) go();
-        }}
-        onSave={async () => {
-          try {
-            setInternalIsSaving(true);
-            await agentConfigRef.current?.saveAllChanges?.();
-            setShowSaveConfirm(false);
-            const go = pendingNavRef.current;
-            pendingNavRef.current = null;
-            if (go) go();
-          } catch (e) {
-            // errors are surfaced by underlying save
-          } finally {
-            setInternalIsSaving(false);
-          }
-        }}
-      />
     </>
   );
 });

frontend/app/[locale]/agents/components/AgentSetupOrchestrator.tsx

@@ -118,9 +118,7 @@ export default function AgentSetupOrchestrator({
 
 
 
-  // Embedding auto-unselect notice modal
-  const [isEmbeddingAutoUnsetOpen, setIsEmbeddingAutoUnsetOpen] =
-    useState(false);
+
   const lastProcessedAgentIdForEmbedding = useRef<number | null>(null);
 
   // Flag to track if we need to refresh enabledToolIds after tools update
@@ -672,7 +670,12 @@ export default function AgentSetupOrchestrator({
       } catch (error) {
         // Even if API fails, still inform user and prevent usage in UI
       } finally {
-        setIsEmbeddingAutoUnsetOpen(true);
+        confirm({
+          title: t("embedding.agentToolAutoDeselectModal.title"),
+          content: t("embedding.agentToolAutoDeselectModal.content"),
+          okText: t("common.confirm"),
+          onOk: () => {},
+        });
         lastProcessedAgentIdForEmbedding.current = currentAgentId;
       }
     };
@@ -2011,32 +2014,6 @@ export default function AgentSetupOrchestrator({
     });
   };
 
-  // Handle exit edit mode
-  const handleExitEdit = () => {
-    setIsEditingAgent(false);
-    setEditingAgent(null);
-    // Use the parent's exit creation handler to properly clear cache
-    if (isCreatingNewAgent && onExitCreation) {
-      onExitCreation();
-    } else {
-      setIsCreatingNewAgent(false);
-    }
-    setBusinessLogic("");
-    setDutyContent("");
-    setConstraintContent("");
-    setFewShotsContent("");
-    setAgentName?.("");
-    setAgentDescription?.("");
-    // Reset mainAgentId and enabledAgentIds
-    setMainAgentId(null);
-    setEnabledAgentIds([]);
-    // Reset selected tools
-    setSelectedTools([]);
-    setEnabledToolIds([]);
-    // Notify parent component about editing state change
-    onEditingStateChange?.(false, null);
-  };
-
   // Refresh tool list
   const handleToolsRefresh = useCallback(
     async (showSuccessMessage = true) => {
@@ -2295,8 +2272,6 @@ export default function AgentSetupOrchestrator({
               isCreatingNewAgent={isCreatingNewAgent}
               canSaveAgent={localCanSaveAgent}
               getButtonTitle={getLocalButtonTitle}
-              onDeleteAgent={onDeleteAgent || (() => {})}
-              onDeleteSuccess={handleExitEdit}
               editingAgent={editingAgentFromParent || editingAgent}
               onViewCallRelationship={handleViewCallRelationship}
             />
@@ -2443,37 +2418,7 @@ export default function AgentSetupOrchestrator({
           }
         />
         {/* Auto unselect knowledge_base_search notice when embedding not configured */}
-        <Modal
-          title={t("embedding.agentToolAutoDeselectModal.title")}
-          open={isEmbeddingAutoUnsetOpen}
-          onCancel={() => setIsEmbeddingAutoUnsetOpen(false)}
-          centered
-          footer={
-            <div className="flex justify-end mt-6 gap-4">
-              <Button
-                type="primary"
-                onClick={() => setIsEmbeddingAutoUnsetOpen(false)}
-              >
-                {t("common.confirm")}
-              </Button>
-            </div>
-          }
-          width={520}
-        >
-          <div className="py-2">
-            <div className="flex items-center">
-              <WarningFilled
-                className="text-yellow-500 mt-1 mr-2"
-                style={{ fontSize: "48px" }}
-              />
-              <div className="ml-3 mt-2">
-                <div className="text-sm leading-6">
-                  {t("embedding.agentToolAutoDeselectModal.content")}
-                </div>
-              </div>
-            </div>
-          </div>
-        </Modal>
+
         {/* Agent call relationship modal */}
         <AgentCallRelationshipModal
           visible={callRelationshipModalVisible}

frontend/app/[locale]/agents/components/PromptManager.tsx

@@ -13,7 +13,7 @@ import { updateAgent } from "@/services/agentConfigService";
 import { modelService } from "@/services/modelService";
 import { ModelOption } from "@/types/modelConfig";
 
-import AgentConfigModal from "./agent/AgentConfigModal";
+import AgentConfigModal, { AgentConfigModalProps } from "./agent/AgentConfigModal";
 
 import log from "@/lib/logger";
 
@@ -225,8 +225,6 @@ export interface PromptManagerProps {
   onGenerateAgent?: (model: ModelOption) => void;
   onSaveAgent?: () => void;
   onDebug?: () => void;
-  onDeleteAgent?: () => void;
-  onDeleteSuccess?: () => void;
   getButtonTitle?: () => string;
   onViewCallRelationship?: () => void;
 
@@ -272,8 +270,6 @@ export default function PromptManager({
   onGenerateAgent,
   onSaveAgent,
   onDebug,
-  onDeleteAgent,
-  onDeleteSuccess,
   getButtonTitle,
   onViewCallRelationship,
   editingAgent,
@@ -691,8 +687,6 @@ export default function PromptManager({
             onExpandCard={handleExpandCard}
             isGeneratingAgent={isGeneratingAgent}
             onDebug={onDebug}
-            onDeleteAgent={onDeleteAgent}
-            onDeleteSuccess={onDeleteSuccess}
             onSaveAgent={onSaveAgent}
             isCreatingNewAgent={isCreatingNewAgent}
             editingAgent={editingAgent}

frontend/app/[locale]/agents/components/agent/AgentConfigModal.tsx

@@ -45,8 +45,6 @@ export interface AgentConfigModalProps {
   isGeneratingAgent?: boolean;
   // Add new props for action buttons
   onDebug?: () => void;
-  onDeleteAgent?: () => void;
-  onDeleteSuccess?: () => void; // New prop for handling delete success
   onSaveAgent?: () => void;
   isCreatingNewAgent?: boolean;
   editingAgent?: Agent | null;
@@ -81,8 +79,6 @@ export default function AgentConfigModal({
   isGeneratingAgent = false,
   // Add new props for action buttons
   onDebug,
-  onDeleteAgent,
-  onDeleteSuccess,
   onSaveAgent,
   isCreatingNewAgent = false,
   editingAgent = null,
@@ -104,9 +100,6 @@ export default function AgentConfigModal({
   // Add segmented state management
   const [activeSegment, setActiveSegment] = useState<string>("agent-info");
 
-  // Add state for delete confirmation modal
-  const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
-
   // Add state for agent name validation error
   const [agentNameError, setAgentNameError] = useState<string>("");
   // Add state for agent name status check
@@ -470,16 +463,6 @@ export default function AgentConfigModal({
     }
   }, [isCreatingNewAgent, currentDisplayName, originalDisplayName]);
 
-  // Handle delete confirmation
-  const handleDeleteConfirm = useCallback(() => {
-    setIsDeleteModalVisible(false);
-    // Execute the delete operation
-    onDeleteAgent?.();
-    // Call the success callback immediately after triggering delete
-    // The actual success/failure will be handled by the parent component
-    onDeleteSuccess?.();
-  }, [onDeleteAgent, onDeleteSuccess]);
-
   // Optimized click handlers using useCallback
   const handleSegmentClick = useCallback((segment: string) => {
     setActiveSegment(segment);
@@ -1193,25 +1176,6 @@ export default function AgentConfigModal({
           </div>
         </div>
       )}
-
-      {/* Delete Confirmation Modal */}
-      <Modal
-        title={t("businessLogic.config.modal.deleteTitle")}
-        open={isDeleteModalVisible}
-        onOk={handleDeleteConfirm}
-        onCancel={() => setIsDeleteModalVisible(false)}
-        okText={t("businessLogic.config.modal.button.confirm")}
-        cancelText={t("businessLogic.config.modal.button.cancel")}
-        okButtonProps={{
-          danger: true,
-        }}
-      >
-        <p>
-          {t("businessLogic.config.modal.deleteContent", {
-            name: agentName || "Unnamed Agent",
-          })}
-        </p>
-      </Modal>
     </div>
   );
 }