diff --git a/agent/app/repo/task.go b/agent/app/repo/task.go
index b5dea011fcd7..d0450c78a911 100644
--- a/agent/app/repo/task.go
+++ b/agent/app/repo/task.go
@@ -2,6 +2,7 @@ package repo
 
 import (
 	"context"
+	"time"
 
 	"github.com/1Panel-dev/1Panel/agent/constant"
 	"github.com/1Panel-dev/1Panel/agent/global"
@@ -110,7 +111,9 @@ func (t TaskRepo) Update(ctx context.Context, task *model.Task) error {
 }
 
 func (t TaskRepo) UpdateRunningTaskToFailed() error {
-	return getTaskDb(t.WithByStatus(constant.StatusExecuting)).Model(&model.Task{}).Updates(map[string]interface{}{"status": constant.StatusFailed, "error_msg": "1Panel restart causes failure"}).Error
+	return getTaskDb(t.WithByStatus(constant.StatusExecuting)).Model(&model.Task{}).Updates(map[string]interface{}{
+		"status": constant.StatusFailed, "error_msg": constant.InterruptedMsg, "end_at": time.Now(),
+	}).Error
 }
 
 func (t TaskRepo) CountExecutingTask() (int64, error) {
diff --git a/agent/app/service/app.go b/agent/app/service/app.go
index 45cfc365eb96..d33678ae4b31 100644
--- a/agent/app/service/app.go
+++ b/agent/app/service/app.go
@@ -550,6 +550,11 @@ func (a AppService) installWithHooks(req request.AppInstallCreate, executeScript
 
 	installTask, err := task.NewTaskWithOps(appInstall.Name, task.TaskInstall, task.TaskScopeApp, req.TaskID, appInstall.ID)
 	if err != nil {
+		appInstall.Status = constant.StatusInstallErr
+		appInstall.Message = err.Error()
+		if saveErr := appInstallRepo.Save(context.Background(), appInstall); saveErr != nil {
+			err = fmt.Errorf("%w; save failed install status: %v", err, saveErr)
+		}
 		return
 	}
 
@@ -557,7 +562,7 @@ func (a AppService) installWithHooks(req request.AppInstallCreate, executeScript
 		return
 	}
 
-	installApp := func(t *task.Task) error {
+	installApp := func(t *task.Task) (err error) {
 		if err = copyData(t, app, appDetail, appInstall, req); err != nil {
 			return err
 		}
diff --git a/agent/app/service/app_install.go b/agent/app/service/app_install.go
index 38ee2b9d8650..18f33e2dbf5d 100644
--- a/agent/app/service/app_install.go
+++ b/agent/app/service/app_install.go
@@ -339,6 +339,11 @@ func operateAppWithLifecycleScripts(install model.AppInstall, req request.AppIns
 
 	operationTask, err := task.NewTaskWithOps(install.Name, taskType, task.TaskScopeApp, req.TaskID, install.ID)
 	if err != nil {
+		install.Status = constant.StatusUpErr
+		install.Message = err.Error()
+		if saveErr := appInstallRepo.Save(context.Background(), &install); saveErr != nil {
+			return fmt.Errorf("%w; save failed operation status: %v", err, saveErr)
+		}
 		return err
 	}
 	operation := string(req.Operate)
@@ -567,11 +572,15 @@ func (a *AppInstallService) SyncAll(systemInit bool) error {
 		return err
 	}
 	for _, i := range allList {
-		if i.Status == constant.StatusInstalling || i.Status == constant.StatusUpgrading || i.Status == constant.StatusRebuilding || i.Status == constant.StatusUninstalling {
+		if appInstallOperationInterruptedOnRestart(i.Status) {
 			if systemInit {
-				i.Status = constant.StatusError
-				i.Message = "1Panel restart causes the task to terminate"
-				_ = appInstallRepo.Save(context.Background(), &i)
+				i.Status = appInstallOperationFailureStatus(i.Status)
+				i.Message = constant.InterruptedMsg
+				if err := appInstallRepo.Save(context.Background(), &i); err != nil {
+					return err
+				}
+			} else if err := syncAppInstallStatus(&i, false); err != nil {
+				global.LOG.Errorf("sync install app[%s] error,mgs: %s", i.Name, err.Error())
 			}
 			continue
 		}
@@ -931,10 +940,34 @@ func (a *AppInstallService) GetParams(id uint) (*response.AppConfig, error) {
 }
 
 func syncAppInstallStatus(appInstall *model.AppInstall, force bool) error {
+	operation := ""
+	switch appInstall.Status {
+	case constant.StatusInstalling:
+		operation = task.TaskInstall
+	case constant.StatusUpgrading:
+		operation = task.TaskUpgrade
+	case constant.StatusRebuilding:
+		operation = task.TaskBuild
+	case constant.StatusUninstalling:
+		operation = task.TaskUninstall
+	case constant.StatusStarting, constant.StatusWaiting:
+		operation = task.TaskUpdate
+	case constant.StatusRestarting:
+		operation = task.TaskRestart
+	}
+	if operation != "" {
+		if err := reconcileAppInstallTaskFailure(appInstall, operation, global.DB, global.TaskDB); err != nil {
+			return err
+		}
+	}
 	switch appInstall.Status {
 	case constant.StatusInstalling, constant.StatusRebuilding, constant.StatusUpgrading, constant.StatusUninstalling,
 		constant.StatusStarting, constant.StatusRestarting, constant.StatusWaiting:
 		return nil
+	case constant.StatusInstallErr, constant.StatusUpgradeErr, constant.StatusUpErr:
+		if !force {
+			return nil
+		}
 	}
 	cli, err := docker.NewClient()
 	if err != nil {
diff --git a/agent/app/service/app_operation_status.go b/agent/app/service/app_operation_status.go
new file mode 100644
index 000000000000..fb70f4ec71cd
--- /dev/null
+++ b/agent/app/service/app_operation_status.go
@@ -0,0 +1,76 @@
+package service
+
+import (
+	"errors"
+
+	"github.com/1Panel-dev/1Panel/agent/app/model"
+	"github.com/1Panel-dev/1Panel/agent/constant"
+	"gorm.io/gorm"
+)
+
+func appInstallOperationFailureStatus(status string) string {
+	switch status {
+	case constant.StatusInstalling:
+		return constant.StatusInstallErr
+	case constant.StatusUpgrading:
+		return constant.StatusUpgradeErr
+	case constant.StatusUninstalling:
+		return constant.StatusError
+	default:
+		return constant.StatusUpErr
+	}
+}
+
+func appInstallOperationPending(status string) bool {
+	switch status {
+	case constant.StatusInstalling, constant.StatusRebuilding, constant.StatusUpgrading, constant.StatusUninstalling,
+		constant.StatusStarting, constant.StatusRestarting, constant.StatusWaiting:
+		return true
+	default:
+		return false
+	}
+}
+
+func appInstallOperationInterruptedOnRestart(status string) bool {
+	// ReStarting can also describe a container's Docker restart policy.
+	return appInstallOperationPending(status) && status != constant.StatusRestarting
+}
+
+func reconcileAppInstallTaskFailure(install *model.AppInstall, operation string, appDB, taskDB *gorm.DB) error {
+	if !appInstallOperationPending(install.Status) {
+		return nil
+	}
+	var operationTask model.Task
+	err := taskDB.Where("type = ? AND resource_id = ? AND operate = ?", "App", install.ID, operation).
+		Order("created_at DESC").First(&operationTask).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+	if operationTask.Status != constant.StatusFailed && operationTask.Status != constant.StatusCanceled {
+		return nil
+	}
+	// A previous operation must not turn a newly queued retry into a failure.
+	if operationTask.CreatedAt.Before(install.UpdatedAt) &&
+		(operationTask.EndAt.IsZero() || operationTask.EndAt.Before(install.UpdatedAt)) {
+		return nil
+	}
+	message := operationTask.ErrorMsg
+	if message == "" {
+		message = "the application operation task failed"
+	}
+	status := appInstallOperationFailureStatus(install.Status)
+	result := appDB.Model(&model.AppInstall{}).
+		Where("id = ? AND status = ? AND updated_at = ?", install.ID, install.Status, install.UpdatedAt).
+		Updates(map[string]interface{}{"status": status, "message": message})
+	if result.Error != nil {
+		return result.Error
+	}
+	if result.RowsAffected > 0 {
+		install.Status = status
+		install.Message = message
+	}
+	return nil
+}
diff --git a/agent/app/service/app_operation_status_test.go b/agent/app/service/app_operation_status_test.go
new file mode 100644
index 000000000000..4cc44d0b0173
--- /dev/null
+++ b/agent/app/service/app_operation_status_test.go
@@ -0,0 +1,147 @@
+package service
+
+import (
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/1Panel-dev/1Panel/agent/app/model"
+	"github.com/1Panel-dev/1Panel/agent/constant"
+	"github.com/glebarez/sqlite"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+	"gorm.io/gorm/logger"
+)
+
+func operationStatusTestDB(t *testing.T) (*gorm.DB, *gorm.DB, model.AppInstall) {
+	t.Helper()
+	open := func(name string, schema interface{}) *gorm.DB {
+		db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), name)), &gorm.Config{
+			Logger: logger.Default.LogMode(logger.Silent),
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if err := db.AutoMigrate(schema); err != nil {
+			t.Fatal(err)
+		}
+		t.Cleanup(func() {
+			sqlDB, _ := db.DB()
+			if sqlDB != nil {
+				_ = sqlDB.Close()
+			}
+		})
+		return db
+	}
+	appDB := open("apps.db", &model.AppInstall{})
+	taskDB := open("tasks.db", &model.Task{})
+	install := model.AppInstall{
+		Name: "gb10-ds-vision", AppId: 1, AppDetailId: 1,
+		Version: "nvidia-gb10-dspark-0.1.1", ContainerName: "vllm-dspark-1", ServiceName: "vllm-dspark",
+		Status: constant.StatusStarting, Env: `{"MODEL_DIR":"/models/vision"}`,
+	}
+	if err := appDB.Omit(clause.Associations).Create(&install).Error; err != nil {
+		t.Fatal(err)
+	}
+	return appDB, taskDB, install
+}
+
+func TestAppInstallFailedTaskRecoversPendingState(t *testing.T) {
+	for _, state := range []string{constant.StatusStarting, constant.StatusWaiting, constant.StatusRestarting, constant.StatusInstalling} {
+		t.Run(state, func(t *testing.T) {
+			appDB, taskDB, install := operationStatusTestDB(t)
+			install.Status = state
+			if err := appDB.Omit(clause.Associations).Save(&install).Error; err != nil {
+				t.Fatal(err)
+			}
+			task := model.Task{ID: "failed", Type: "App", Operate: "TaskUpdate", ResourceID: install.ID,
+				Status: constant.StatusFailed, ErrorMsg: "model startup script failed", CreatedAt: install.UpdatedAt.Add(time.Second), EndAt: install.UpdatedAt.Add(2 * time.Second)}
+			if err := taskDB.Create(&task).Error; err != nil {
+				t.Fatal(err)
+			}
+			if err := reconcileAppInstallTaskFailure(&install, task.Operate, appDB, taskDB); err != nil {
+				t.Fatal(err)
+			}
+			want := constant.StatusUpErr
+			if state == constant.StatusInstalling {
+				want = constant.StatusInstallErr
+			}
+			var stored model.AppInstall
+			if err := appDB.First(&stored, install.ID).Error; err != nil {
+				t.Fatal(err)
+			}
+			if install.Status != want || stored.Status != want || stored.Message != task.ErrorMsg || stored.Env != install.Env {
+				t.Fatalf("recovered state = %s/%s, message %q, env %q", install.Status, stored.Status, stored.Message, stored.Env)
+			}
+		})
+	}
+}
+
+func TestAppInstallPendingStateKeepsActiveAndUnrelatedTasks(t *testing.T) {
+	for _, taskStatus := range []string{constant.StatusExecuting, constant.StatusSuccess, "missing", "previous-failure", "other-resource"} {
+		t.Run(taskStatus, func(t *testing.T) {
+			appDB, taskDB, install := operationStatusTestDB(t)
+			task := model.Task{ID: "task", Type: "App", Operate: "TaskUpdate", ResourceID: install.ID,
+				Status: taskStatus, CreatedAt: install.UpdatedAt.Add(time.Second), EndAt: install.UpdatedAt.Add(2 * time.Second)}
+			if taskStatus == "previous-failure" {
+				task.Status = constant.StatusFailed
+				task.CreatedAt = install.UpdatedAt.Add(-2 * time.Hour)
+				task.EndAt = install.UpdatedAt.Add(-time.Hour)
+			}
+			if taskStatus == "other-resource" {
+				task.Status = constant.StatusFailed
+				task.ResourceID++
+			}
+			if taskStatus != "missing" {
+				if err := taskDB.Create(&task).Error; err != nil {
+					t.Fatal(err)
+				}
+			}
+			if err := reconcileAppInstallTaskFailure(&install, task.Operate, appDB, taskDB); err != nil {
+				t.Fatal(err)
+			}
+			if install.Status != constant.StatusStarting {
+				t.Fatalf("unrelated or active task changed pending state to %s", install.Status)
+			}
+		})
+	}
+}
+
+func TestAppInstallRecoveryDoesNotOverwriteConcurrentRetry(t *testing.T) {
+	appDB, taskDB, install := operationStatusTestDB(t)
+	task := model.Task{ID: "failed", Type: "App", Operate: "TaskUpdate", ResourceID: install.ID,
+		Status: constant.StatusCanceled, ErrorMsg: "interrupted", CreatedAt: install.UpdatedAt.Add(time.Second), EndAt: install.UpdatedAt.Add(2 * time.Second)}
+	if err := taskDB.Create(&task).Error; err != nil {
+		t.Fatal(err)
+	}
+	if err := appDB.Callback().Update().Before("gorm:update").Register("new-operation", func(db *gorm.DB) {
+		if err := db.Exec("UPDATE app_installs SET updated_at = ?, message = ? WHERE id = ?", install.UpdatedAt.Add(time.Hour), "new attempt", install.ID).Error; err != nil {
+			t.Error(err)
+		}
+	}); err != nil {
+		t.Fatal(err)
+	}
+	if err := reconcileAppInstallTaskFailure(&install, task.Operate, appDB, taskDB); err != nil {
+		t.Fatal(err)
+	}
+	var stored model.AppInstall
+	if err := appDB.First(&stored, install.ID).Error; err != nil {
+		t.Fatal(err)
+	}
+	if stored.Status != constant.StatusStarting || stored.Message != "new attempt" {
+		t.Fatalf("recovery overwrote a newer operation: %s, %s", stored.Status, stored.Message)
+	}
+}
+
+func TestAppInstallRestartRecoveryCoversLifecycleStates(t *testing.T) {
+	for _, state := range []string{constant.StatusStarting, constant.StatusWaiting, constant.StatusInstalling} {
+		if !appInstallOperationInterruptedOnRestart(state) {
+			t.Errorf("restart recovery omitted %s", state)
+		}
+	}
+	for _, state := range []string{constant.StatusRunning, constant.StatusStopped, constant.StatusRestarting} {
+		if appInstallOperationInterruptedOnRestart(state) {
+			t.Errorf("restart recovery changes a Docker runtime state: %s", state)
+		}
+	}
+}
diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go
index a5887d465df8..9dfd7c9aed27 100644
--- a/agent/app/service/app_utils.go
+++ b/agent/app/service/app_utils.go
@@ -1406,9 +1406,8 @@ func handleErr(install model.AppInstall, err error, out string) error {
 }
 
 func doNotNeedSync(installed model.AppInstall) bool {
-	return installed.Status == constant.StatusInstalling || installed.Status == constant.StatusRebuilding || installed.Status == constant.StatusUpgrading ||
-		installed.Status == constant.StatusSyncing || installed.Status == constant.StatusUninstalling || installed.Status == constant.StatusInstallErr ||
-		installed.Status == constant.StatusStarting || installed.Status == constant.StatusRestarting || installed.Status == constant.StatusWaiting
+	return appInstallOperationPending(installed.Status) || installed.Status == constant.StatusSyncing ||
+		installed.Status == constant.StatusInstallErr || installed.Status == constant.StatusUpgradeErr || installed.Status == constant.StatusUpErr
 }
 
 func synAppInstall(containers map[string]container.Summary, appInstall *model.AppInstall, force bool) {
@@ -1502,6 +1501,11 @@ func handleInstalled(appInstallList []model.AppInstall, updated, sync, checkUpda
 	}
 
 	for _, installed := range appInstallList {
+		if sync && appInstallOperationPending(installed.Status) {
+			if err := syncAppInstallStatus(&installed, false); err != nil {
+				return nil, err
+			}
+		}
 		if updated && ignoreUpdate(installed) {
 			continue
 		}
diff --git a/agent/app/service/image.go b/agent/app/service/image.go
index b8f7e65875ee..768e9f99f4aa 100644
--- a/agent/app/service/image.go
+++ b/agent/app/service/image.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -28,6 +27,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/moby/go-archive"
 )
 
@@ -325,18 +325,16 @@ func (u *ImageService) ImageLoad(req dto.ImageLoad) error {
 	}
 
 	go func() {
-		client, err := docker.NewDockerClient()
-		if err != nil {
-			taskItem.Log("Failed to create Docker client: " + err.Error())
-			return
-		}
-		defer client.Close()
-
 		for _, itemPath := range req.Paths {
 			currentPath := itemPath
 			itemName := path.Base(currentPath)
 			taskItem.AddSubTask(i18n.GetWithName("TaskImport", itemName), func(t *task.Task) error {
 				taskItem.Logf("----------------- %s -----------------", itemName)
+				client, err := docker.NewDockerClient()
+				if err != nil {
+					return err
+				}
+				defer client.Close()
 				file, err := os.Open(currentPath)
 				if err != nil {
 					return err
@@ -347,14 +345,7 @@ func (u *ImageService) ImageLoad(req dto.ImageLoad) error {
 					return err
 				}
 				defer res.Body.Close()
-				content, err := io.ReadAll(res.Body)
-				if err != nil {
-					return err
-				}
-				if strings.Contains(string(content), "Error") {
-					return errors.New(string(content))
-				}
-				return nil
+				return consumeImageLoadResponse(res.Body, taskItem.Log)
 			}, nil)
 		}
 		_ = taskItem.Execute()
@@ -362,6 +353,29 @@ func (u *ImageService) ImageLoad(req dto.ImageLoad) error {
 	return nil
 }
 
+// Docker may report load failures in a successful HTTP response's JSON stream.
+func consumeImageLoadResponse(reader io.Reader, log func(string)) error {
+	decoder := json.NewDecoder(reader)
+	for {
+		var message jsonmessage.JSONMessage
+		if err := decoder.Decode(&message); err != nil {
+			if errors.Is(err, io.EOF) {
+				return nil
+			}
+			return err
+		}
+		if message.Error != nil && message.Error.Message != "" {
+			return message.Error
+		}
+		if message.ErrorMessage != "" {
+			return errors.New(message.ErrorMessage)
+		}
+		if text := strings.TrimSpace(message.Stream); text != "" {
+			log(text)
+		}
+	}
+}
+
 func (u *ImageService) ImageSave(req dto.ImageSave) error {
 	taskItem, err := task.NewTaskWithOps(req.Name, task.TaskExport, task.TaskScopeImage, req.TaskID, 1)
 	if err != nil {
diff --git a/agent/app/service/image_load_response.go b/agent/app/service/image_load_response.go
new file mode 100644
index 000000000000..f8b2bba5414b
--- /dev/null
+++ b/agent/app/service/image_load_response.go
@@ -0,0 +1,33 @@
+package service
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"strings"
+
+	"github.com/docker/docker/pkg/jsonmessage"
+)
+
+// Docker may report load failures in a successful HTTP response's JSON stream.
+func consumeImageLoadResponse(reader io.Reader, log func(string)) error {
+	decoder := json.NewDecoder(reader)
+	for {
+		var message jsonmessage.JSONMessage
+		if err := decoder.Decode(&message); err != nil {
+			if errors.Is(err, io.EOF) {
+				return nil
+			}
+			return err
+		}
+		if message.Error != nil && message.Error.Message != "" {
+			return message.Error
+		}
+		if message.ErrorMessage != "" {
+			return errors.New(message.ErrorMessage)
+		}
+		if text := strings.TrimSpace(message.Stream); text != "" {
+			log(text)
+		}
+	}
+}
diff --git a/agent/app/service/task.go b/agent/app/service/task.go
index 413fab60b482..a8136f681774 100644
--- a/agent/app/service/task.go
+++ b/agent/app/service/task.go
@@ -57,7 +57,10 @@ func (u *TaskLogService) ReadByLine(req request.TaskLogReadReq) (*response.FileL
 	if req.TaskID != "" {
 		opts = append(opts, taskRepo.WithByID(req.TaskID))
 	} else {
-		opts = append(opts, repo.WithOrderRuleBy("created_at", "desc"), repo.WithByType(req.TaskType), taskRepo.WithOperate(req.TaskOperate), taskRepo.WithResourceID(req.ResourceID))
+		opts = append(opts, repo.WithOrderRuleBy("created_at", "desc"), repo.WithByType(req.TaskType), taskRepo.WithResourceID(req.ResourceID))
+		if req.TaskOperate != "" {
+			opts = append(opts, taskRepo.WithOperate(req.TaskOperate))
+		}
 	}
 	taskModel, err := taskRepo.GetFirst(opts...)
 	if err != nil {
diff --git a/agent/app/task/task.go b/agent/app/task/task.go
index 044716c41169..3883f13501d4 100644
--- a/agent/app/task/task.go
+++ b/agent/app/task/task.go
@@ -87,7 +87,6 @@ const (
 	TaskScopeCronjob          = "Cronjob"
 	TaskScopeClam             = "Clam"
 	TaskScopeSystem           = "System"
-	TaskScopeVm               = "VirtualMachine"
 	TaskScopeFirewall         = "Firewall"
 	TaskScopeAppStore         = "AppStore"
 	TaskScopeSnapshot         = "Snapshot"
diff --git a/frontend/src/api/interface/website.ts b/frontend/src/api/interface/website.ts
index e5141f54fe42..5da5618f95b8 100644
--- a/frontend/src/api/interface/website.ts
+++ b/frontend/src/api/interface/website.ts
@@ -311,6 +311,7 @@ export namespace Website {
         email: string;
         url: string;
         type: string;
+        keyType: string;
         useProxy: boolean;
     }
 
diff --git a/frontend/src/api/modules/container.ts b/frontend/src/api/modules/container.ts
index e5176cfa515a..731b5f4bf056 100644
--- a/frontend/src/api/modules/container.ts
+++ b/frontend/src/api/modules/container.ts
@@ -144,8 +144,13 @@ export const imagePull = (params: Container.ImagePull) => {
 export const imagePush = (params: Container.ImagePush) => {
     return http.post<string>(`/containers/image/push`, params);
 };
-export const imageLoad = (params: Container.ImageLoad) => {
-    return http.post(`/containers/image/load`, params, TimeoutEnum.T_10M);
+export const imageLoad = (params: Container.ImageLoad, currentNode?: string) => {
+    return http.post(
+        `/containers/image/load`,
+        params,
+        TimeoutEnum.T_10M,
+        currentNode ? { CurrentNode: currentNode } : undefined,
+    );
 };
 export const imageSave = (params: Container.ImageSave) => {
     return http.post(`/containers/image/save`, params, TimeoutEnum.T_10M);
diff --git a/frontend/src/components/table/TableSearch.vue b/frontend/src/components/table/TableSearch.vue
index f965fb385536..401ad150df98 100644
--- a/frontend/src/components/table/TableSearch.vue
+++ b/frontend/src/components/table/TableSearch.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { onActivated, ref, watch } from 'vue';
 defineOptions({ name: 'TableSearch' });
 
 const emit = defineEmits(['search', 'update:searchName']);
@@ -42,6 +42,10 @@ watch(
     { immediate: true },
 );
 
+onActivated(() => {
+    searchInfo.value = props.searchName;
+});
+
 const search = () => {
     emit('update:searchName', searchInfo.value);
     emit('search');
diff --git a/frontend/src/components/table/complex/ComplexTable.vue b/frontend/src/components/table/complex/ComplexTable.vue
index 8b68655904bc..c10644c1e1a2 100644
--- a/frontend/src/components/table/complex/ComplexTable.vue
+++ b/frontend/src/components/table/complex/ComplexTable.vue
@@ -167,7 +167,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { computed, onMounted, ref, useAttrs } from 'vue';
+import { computed, onDeactivated, onMounted, ref, useAttrs } from 'vue';
 import { useGlobalStore } from '@/composables/useGlobalStore';
 import { flattenVNodes, type FuTableOperationButton } from '@/components/table/shared';
 import { useCardColumns } from './useCardColumns';
@@ -459,6 +459,8 @@ watch([currentViewMode, tableData, () => props.syncCardContentHeight], scheduleC
     flush: 'post',
 });
 
+onDeactivated(clearSelects);
+
 watch([() => props.paginationConfig?.currentPage, () => props.paginationConfig?.pageSize], clearSelects, {
     flush: 'sync',
 });
diff --git a/frontend/src/composables/usePageState.ts b/frontend/src/composables/usePageState.ts
index 659d65cab9a3..a15c22a78d75 100644
--- a/frontend/src/composables/usePageState.ts
+++ b/frontend/src/composables/usePageState.ts
@@ -1,11 +1,6 @@
 import { reactive, type UnwrapNestedRefs } from 'vue';
-import { useRoute } from 'vue-router';
-import { useGlobalStore } from '@/composables/useGlobalStore';
-import { getPageState } from '@/utils/page-state-cache';
 
+/** A new page visit starts from its defaults instead of restoring the previous page number. */
 export const usePageState = <T extends object>(factory: () => T): UnwrapNestedRefs<T> => {
-    const route = useRoute();
-    const { currentNode } = useGlobalStore();
-    const key = `${currentNode.value}:${String(route.name || route.path)}`;
-    return reactive(getPageState(key, factory));
+    return reactive(factory());
 };
diff --git a/frontend/src/composables/useSearchPersistence.ts b/frontend/src/composables/useSearchPersistence.ts
deleted file mode 100644
index fcef3d923205..000000000000
--- a/frontend/src/composables/useSearchPersistence.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { storeToRefs } from 'pinia';
-import { watch, type Ref } from 'vue';
-import GlobalStore from '@/store/modules/global';
-
-type SearchValue = string | number | undefined;
-type SearchFields = Record<string, Ref<SearchValue>>;
-
-export const useSearchPersistence = (page: string, fields: SearchFields, scope?: () => SearchValue) => {
-    const { currentNode } = storeToRefs(GlobalStore());
-    const defaults = Object.fromEntries(Object.entries(fields).map(([name, field]) => [name, field.value]));
-    let initialized = false;
-    let restoring = false;
-    let activeKey: string | undefined;
-
-    watch(
-        () => {
-            const context = scope?.();
-            if (scope && context === undefined) return undefined;
-            return `1panel:search:v1:${JSON.stringify([currentNode.value, page, context ?? ''])}`;
-        },
-        (key) => {
-            activeKey = key;
-            let saved: Record<string, unknown> = {};
-            try {
-                const parsed = activeKey ? JSON.parse(localStorage.getItem(activeKey) || '{}') : {};
-                if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) saved = parsed;
-            } catch {}
-            restoring = true;
-            for (const [name, field] of Object.entries(fields)) {
-                const value = saved[name];
-                const initial = defaults[name];
-                let fallback = initial;
-                if (initialized) {
-                    fallback = typeof initial === 'string' ? '' : undefined;
-                }
-                const valid =
-                    (typeof value === 'string' || (typeof value === 'number' && Number.isFinite(value))) &&
-                    (fallback === undefined || typeof value === typeof fallback);
-                if (value === null) {
-                    field.value = typeof initial === 'string' ? '' : undefined;
-                } else if (valid) {
-                    field.value = value as SearchValue;
-                } else {
-                    field.value = fallback;
-                }
-            }
-            restoring = false;
-            initialized = true;
-        },
-        { immediate: true, flush: 'sync' },
-    );
-
-    watch(
-        () => Object.fromEntries(Object.entries(fields).map(([name, field]) => [name, field.value ?? null])),
-        (value) => {
-            if (restoring || !activeKey) return;
-            try {
-                localStorage.setItem(activeKey, JSON.stringify(value));
-            } catch {}
-        },
-        { flush: 'sync' },
-    );
-};
diff --git a/frontend/src/composables/useSearchReset.ts b/frontend/src/composables/useSearchReset.ts
new file mode 100644
index 000000000000..f10144ca6888
--- /dev/null
+++ b/frontend/src/composables/useSearchReset.ts
@@ -0,0 +1,24 @@
+import { storeToRefs } from 'pinia';
+import { onActivated, onDeactivated } from 'vue';
+import GlobalStore from '@/store/modules/global';
+import { bindSearchReset, type SearchFields } from '@/utils/search-reset';
+
+interface SearchResetOptions {
+    scope?: () => string | number | undefined;
+    onRevisit: () => unknown;
+}
+
+export const useSearchReset = (fields: SearchFields, options: SearchResetOptions) => {
+    const { currentNode } = storeToRefs(GlobalStore());
+    const reset = bindSearchReset(options.scope ? [currentNode, options.scope] : [currentNode], fields);
+    let deactivated = false;
+    onDeactivated(() => {
+        deactivated = true;
+    });
+    onActivated(() => {
+        if (!deactivated) return;
+        deactivated = false;
+        reset();
+        return options.onRevisit();
+    });
+};
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 29013a2589d2..5ff9b1b961a4 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -570,6 +570,8 @@ const message = {
         cancelKeepAlive: 'Stop keeping page session',
     },
     header: {
+        userCenter: 'User Center',
+        exitSystem: 'Log Out',
         logout: 'Logout',
     },
     database: {
@@ -1065,6 +1067,13 @@ const message = {
             whiteListHelper: 'Restrict access to only IPs in the whitelist',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI Gateway supports standalone deployment',
+            deploymentNoticeDescription:
+                'AI Gateway now supports standalone deployment. The built-in AI Gateway in 1Panel will no longer receive updates. We recommend installing the standalone version from the App Store. You can also continue using the current version.',
+            deploymentNoticeContinue: 'Understood, continue using',
+            deploymentNoticeAppStore: 'Go to App Store',
+            deploymentNoticeNoAppPermission:
+                'You do not have access to the App Store. Contact your administrator to install the standalone version.',
             title: 'AI Gateway',
             apiReference: 'API Reference',
             notInstalled: 'Not installed',
@@ -1869,6 +1878,11 @@ const message = {
         imageName: 'Image name',
         pull: 'Pull',
         path: 'Path',
+        imageUploadDrop: 'Drop an image file here, or click to upload',
+        imageUploadHelper:
+            'Any file format is allowed. Docker validates the contents. Uploaded files are retained for retrying imports or manual deletion.',
+        imageUploadEmpty: 'The file is empty. Select a valid image archive.',
+        imageImportSubmitted: 'Image import task submitted. Check the task log for the result.',
         importImage: 'Import',
         buildArgs: 'Build Arguments',
         imageBuild: 'Build',
diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts
index 32c23034f745..76f70aaab5b7 100644
--- a/frontend/src/lang/modules/es-es.ts
+++ b/frontend/src/lang/modules/es-es.ts
@@ -570,6 +570,8 @@ const message = {
         cancelKeepAlive: 'Dejar de mantener la sesión de la página',
     },
     header: {
+        userCenter: 'Centro de usuario',
+        exitSystem: 'Cerrar sesión',
         logout: 'Cerrar sesión',
     },
     database: {
@@ -1069,6 +1071,13 @@ const message = {
             whiteListHelper: 'Restringir el acceso solo a las IP incluidas en la lista blanca',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI Gateway admite la implementación independiente',
+            deploymentNoticeDescription:
+                'AI Gateway ahora admite la implementación independiente. AI Gateway integrado en 1Panel dejará de recibir actualizaciones. Recomendamos instalar la versión independiente desde la tienda de aplicaciones. También puede seguir usando la versión actual.',
+            deploymentNoticeContinue: 'Entendido, seguir usando',
+            deploymentNoticeAppStore: 'Ir a la tienda de aplicaciones',
+            deploymentNoticeNoAppPermission:
+                'No tiene acceso a la tienda de aplicaciones. Contacte con su administrador para instalar la versión independiente.',
             title: 'Gateway de IA',
             apiReference: 'Referencia de API',
             notInstalled: 'No instalado',
@@ -1893,6 +1902,12 @@ const message = {
         imageName: 'Nombre de la imagen',
         pull: 'Descargar',
         path: 'Ruta',
+        imageUploadDrop: 'Arrastre un archivo de imagen aquí o haga clic para subirlo',
+        imageUploadHelper:
+            'Se permite cualquier formato de archivo. Docker valida el contenido. Los archivos subidos se conservan para reintentar la importación o eliminarlos manualmente.',
+        imageUploadEmpty: 'El archivo está vacío. Seleccione un archivo de imagen válido.',
+        imageImportSubmitted:
+            'Tarea de importación de imagen enviada. Consulte el registro de la tarea para ver el resultado.',
         importImage: 'Importar',
         buildArgs: 'Argumentos de Construcción',
         imageBuild: 'Construir',
diff --git a/frontend/src/lang/modules/fa.ts b/frontend/src/lang/modules/fa.ts
index a61ea989fa4c..88250e49459e 100644
--- a/frontend/src/lang/modules/fa.ts
+++ b/frontend/src/lang/modules/fa.ts
@@ -565,6 +565,8 @@ const message = {
         cancelKeepAlive: 'لغو حفظ نشست صفحه',
     },
     header: {
+        userCenter: 'مرکز کاربری',
+        exitSystem: 'خروج از سیستم',
         logout: 'خروج',
     },
     database: {
@@ -1051,6 +1053,13 @@ const message = {
             whiteListHelper: 'دسترسی را فقط به IP‌های موجود در لیست سفید محدود کنید',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'درگاه هوش مصنوعی از استقرار مستقل پشتیبانی می‌کند',
+            deploymentNoticeDescription:
+                'درگاه هوش مصنوعی اکنون از استقرار مستقل پشتیبانی می‌کند. درگاه هوش مصنوعی داخلی 1Panel دیگر به‌روزرسانی دریافت نخواهد کرد. توصیه می‌کنیم نسخه مستقل را از فروشگاه برنامه نصب کنید. همچنین می‌توانید به استفاده از نسخه فعلی ادامه دهید.',
+            deploymentNoticeContinue: 'متوجه شدم، ادامه استفاده',
+            deploymentNoticeAppStore: 'رفتن به فروشگاه برنامه',
+            deploymentNoticeNoAppPermission:
+                'شما به فروشگاه برنامه دسترسی ندارید. برای نصب نسخه مستقل با مدیر تماس بگیرید.',
             title: 'دروازه AI',
             apiReference: 'راهنمای API',
             notInstalled: 'نصب نشده',
@@ -1853,6 +1862,11 @@ const message = {
         imageName: 'نام تصویر',
         pull: 'دریافت',
         path: 'مسیر',
+        imageUploadDrop: 'فایل ایمیج را اینجا بکشید یا برای بارگذاری کلیک کنید',
+        imageUploadHelper:
+            'همه قالب‌های فایل مجاز هستند. Docker محتوای فایل را اعتبارسنجی می‌کند. فایل‌های بارگذاری‌شده برای تلاش مجدد جهت وارد کردن یا حذف دستی نگه داشته می‌شوند.',
+        imageUploadEmpty: 'فایل خالی است. یک فایل ایمیج معتبر انتخاب کنید.',
+        imageImportSubmitted: 'وظیفه وارد کردن ایمیج ثبت شد. برای مشاهده نتیجه، گزارش وظیفه را بررسی کنید.',
         importImage: 'واردات',
         buildArgs: 'آرگومان‌های ساخت',
         imageBuild: 'ساخت',
diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts
index 96f448ed98bd..d9e5371f1a86 100644
--- a/frontend/src/lang/modules/ja.ts
+++ b/frontend/src/lang/modules/ja.ts
@@ -568,6 +568,8 @@ const message = {
         cancelKeepAlive: 'ページセッションの保持を解除',
     },
     header: {
+        userCenter: 'ユーザーセンター',
+        exitSystem: 'ログアウト',
         logout: 'ログアウト',
     },
     database: {
@@ -1054,6 +1056,13 @@ const message = {
             whiteListHelper: 'ホワイトリスト内のIPのみアクセスを許可する',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI ゲートウェイの独立したデプロイに対応',
+            deploymentNoticeDescription:
+                'AI ゲートウェイは独立したデプロイに対応しました。1Panel 内蔵の AI ゲートウェイは今後更新されません。アプリストアから独立版をインストールすることをお勧めします。現在のバージョンを引き続き使用することもできます。',
+            deploymentNoticeContinue: '了解して使用を継続',
+            deploymentNoticeAppStore: 'アプリストアへ',
+            deploymentNoticeNoAppPermission:
+                'アプリストアへのアクセス権限がありません。管理者に独立版のインストールを依頼してください。',
             title: 'AI ゲートウェイ',
             apiReference: 'API リファレンス',
             notInstalled: '未インストール',
@@ -1850,6 +1859,11 @@ const message = {
         imageName: '画像名',
         pull: '引く',
         path: 'パス',
+        imageUploadDrop: 'イメージファイルをここにドラッグするか、クリックしてアップロードしてください',
+        imageUploadHelper:
+            'ファイル形式に制限はありません。Docker が内容を検証します。アップロードしたファイルは保持されるため、インポートを再試行したり、手動で削除したりできます。',
+        imageUploadEmpty: 'ファイルが空です。有効なイメージファイルを選択してください。',
+        imageImportSubmitted: 'イメージのインポートタスクを送信しました。結果はタスクログで確認してください。',
         importImage: '輸入',
         buildArgs: 'ビルド引数',
         imageBuild: '建てる',
diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts
index edfe9578092f..e401cd5b087d 100644
--- a/frontend/src/lang/modules/ko.ts
+++ b/frontend/src/lang/modules/ko.ts
@@ -562,6 +562,8 @@ const message = {
         cancelKeepAlive: '페이지 세션 유지 해제',
     },
     header: {
+        userCenter: '사용자 센터',
+        exitSystem: '로그아웃',
         logout: '로그아웃',
     },
     database: {
@@ -1043,6 +1045,12 @@ const message = {
             whiteListHelper: '화이트리스트에 있는 IP만 접근 허용',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI 게이트웨이 독립 배포 지원',
+            deploymentNoticeDescription:
+                'AI 게이트웨이가 독립 배포를 지원합니다. 1Panel 내장 AI 게이트웨이는 더 이상 업데이트되지 않습니다. 앱 스토어에서 독립 버전을 설치하는 것을 권장합니다. 현재 버전을 계속 사용할 수도 있습니다.',
+            deploymentNoticeContinue: '확인, 계속 사용',
+            deploymentNoticeAppStore: '앱 스토어로 이동',
+            deploymentNoticeNoAppPermission: '앱 스토어 접근 권한이 없습니다. 관리자에게 독립 버전 설치를 요청하세요.',
             title: 'AI 게이트웨이',
             apiReference: 'API 안내',
             notInstalled: '설치되지 않음',
@@ -1833,6 +1841,11 @@ const message = {
         imageName: '이미지 이름',
         pull: '풀',
         path: '경로',
+        imageUploadDrop: '이미지 파일을 여기로 끌어 놓거나 클릭하여 업로드하세요',
+        imageUploadHelper:
+            '파일 형식에는 제한이 없습니다. Docker가 내용을 검증합니다. 업로드한 파일은 보관되므로 가져오기를 다시 시도하거나 수동으로 삭제할 수 있습니다.',
+        imageUploadEmpty: '빈 파일입니다. 유효한 이미지 파일을 선택하세요.',
+        imageImportSubmitted: '이미지 가져오기 작업이 제출되었습니다. 작업 로그에서 결과를 확인하세요.',
         importImage: '가져오기',
         buildArgs: '빌드 인수',
         imageBuild: '이미지 빌드',
diff --git a/frontend/src/lang/modules/lo.ts b/frontend/src/lang/modules/lo.ts
index 33a6dcdab20f..7372f0a12af3 100644
--- a/frontend/src/lang/modules/lo.ts
+++ b/frontend/src/lang/modules/lo.ts
@@ -563,6 +563,8 @@ const message = {
         cancelKeepAlive: 'ຍົກເລີກການຮັກສາເຊັດຊັນໜ້າ',
     },
     header: {
+        userCenter: 'ສູນຜູ້ໃຊ້',
+        exitSystem: 'ອອກຈາກລະບົບ',
         logout: 'ອອກຈາກລະບົບ',
     },
     database: {
@@ -1040,6 +1042,13 @@ const message = {
             whiteListHelper: 'ຈຳກັດການເຂົ້າເຖິງສະເພາະ IP ໃນລາຍຊື່ທີ່ອະນຸຍາດ',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI Gateway ຮອງຮັບການຕິດຕັ້ງແບບແຍກຕ່າງຫາກ',
+            deploymentNoticeDescription:
+                'AI Gateway ຮອງຮັບການຕິດຕັ້ງແບບແຍກຕ່າງຫາກແລ້ວ. AI Gateway ທີ່ມາພ້ອມກັບ 1Panel ຈະບໍ່ໄດ້ຮັບການອັບເດດອີກ. ແນະນຳໃຫ້ຕິດຕັ້ງລຸ້ນແຍກຕ່າງຫາກຈາກຮ້ານແອັບ. ທ່ານຍັງສາມາດໃຊ້ລຸ້ນປັດຈຸບັນຕໍ່ໄດ້.',
+            deploymentNoticeContinue: 'ຮັບຊາບ, ໃຊ້ຕໍ່',
+            deploymentNoticeAppStore: 'ໄປທີ່ຮ້ານແອັບ',
+            deploymentNoticeNoAppPermission:
+                'ທ່ານບໍ່ມີສິດເຂົ້າເຖິງຮ້ານແອັບ. ກະລຸນາຕິດຕໍ່ຜູ້ດູແລເພື່ອຕິດຕັ້ງລຸ້ນແຍກຕ່າງຫາກ.',
             title: 'AI Gateway',
             apiReference: 'ຄູ່ມື API',
             notInstalled: 'ຍັງບໍ່ໄດ້ຕິດຕັ້ງ',
@@ -1822,6 +1831,11 @@ const message = {
         imageName: 'ຊື່ Image',
         pull: 'ດຶງຂໍ້ມູນ (Pull)',
         path: 'ເສັ້ນທາງ',
+        imageUploadDrop: 'ລາກໄຟລ໌ອິມເມຈມາວາງບ່ອນນີ້ ຫຼື ຄລິກເພື່ອອັບໂຫຼດ',
+        imageUploadHelper:
+            'ບໍ່ຈຳກັດຮູບແບບໄຟລ໌. Docker ຈະກວດສອບເນື້ອຫາ. ໄຟລ໌ທີ່ອັບໂຫຼດຈະຖືກເກັບໄວ້ ເພື່ອໃຫ້ສາມາດລອງນຳເຂົ້າອີກຄັ້ງ ຫຼື ລຶບດ້ວຍຕົນເອງ.',
+        imageUploadEmpty: 'ໄຟລ໌ຫວ່າງເປົ່າ. ກະລຸນາເລືອກໄຟລ໌ອິມເມຈທີ່ຖືກຕ້ອງ.',
+        imageImportSubmitted: 'ສົ່ງວຽກນຳເຂົ້າອິມເມຈແລ້ວ. ກະລຸນາເບິ່ງບັນທຶກວຽກເພື່ອກວດສອບຜົນ.',
         importImage: 'ນຳເຂົ້າ',
         buildArgs: 'Build Arguments',
         imageBuild: 'ສ້າງ (Build)',
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
index 4513d6b0c275..b5004467a21f 100644
--- a/frontend/src/lang/modules/ms.ts
+++ b/frontend/src/lang/modules/ms.ts
@@ -575,6 +575,8 @@ const message = {
         cancelKeepAlive: 'Hentikan pengekalan sesi halaman',
     },
     header: {
+        userCenter: 'Pusat Pengguna',
+        exitSystem: 'Log keluar',
         logout: 'Log keluar',
     },
     database: {
@@ -1077,6 +1079,13 @@ const message = {
             whiteListHelper: 'Hadkan akses kepada hanya IP dalam senarai putih',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI Gateway menyokong penggunaan kendiri',
+            deploymentNoticeDescription:
+                'AI Gateway kini menyokong penggunaan kendiri. AI Gateway terbina dalam 1Panel tidak lagi akan menerima kemas kini. Kami mengesyorkan pemasangan versi kendiri daripada gedung aplikasi. Anda juga boleh terus menggunakan versi semasa.',
+            deploymentNoticeContinue: 'Faham, terus gunakan',
+            deploymentNoticeAppStore: 'Pergi ke gedung aplikasi',
+            deploymentNoticeNoAppPermission:
+                'Anda tidak mempunyai akses ke gedung aplikasi. Hubungi pentadbir untuk memasang versi kendiri.',
             title: 'Gateway AI',
             apiReference: 'Rujukan API',
             notInstalled: 'Belum dipasang',
@@ -1882,6 +1891,11 @@ const message = {
         imageName: 'Nama imej',
         pull: 'Tarik',
         path: 'Laluan',
+        imageUploadDrop: 'Seret fail imej ke sini atau klik untuk memuat naik',
+        imageUploadHelper:
+            'Semua format fail dibenarkan. Docker mengesahkan kandungannya. Fail yang dimuat naik disimpan untuk mencuba semula import atau dipadam secara manual.',
+        imageUploadEmpty: 'Fail kosong. Pilih arkib imej yang sah.',
+        imageImportSubmitted: 'Tugas import imej telah dihantar. Semak log tugas untuk melihat hasilnya.',
         importImage: 'Import',
         buildArgs: 'Argumen Binaan',
         imageBuild: 'Bina',
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
index 1cb2f933b5c0..3c555a419406 100644
--- a/frontend/src/lang/modules/pt-br.ts
+++ b/frontend/src/lang/modules/pt-br.ts
@@ -568,6 +568,8 @@ const message = {
         cancelKeepAlive: 'Parar de manter a sessão da página',
     },
     header: {
+        userCenter: 'Central do usuário',
+        exitSystem: 'Sair',
         logout: 'Logout',
     },
     database: {
@@ -1072,6 +1074,13 @@ const message = {
                 'Após ativar, você pode desativar o acesso externo à porta em Loja de Apps - Instalado - Ollama - Parâmetros para melhorar a segurança.',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI Gateway permite implantação independente',
+            deploymentNoticeDescription:
+                'O AI Gateway agora permite implantação independente. O AI Gateway integrado ao 1Panel não receberá mais atualizações. Recomendamos instalar a versão independente pela loja de aplicativos. Você também pode continuar usando a versão atual.',
+            deploymentNoticeContinue: 'Entendido, continuar usando',
+            deploymentNoticeAppStore: 'Ir à loja de aplicativos',
+            deploymentNoticeNoAppPermission:
+                'Você não tem acesso à loja de aplicativos. Contate o administrador para instalar a versão independente.',
             title: 'Gateway de IA',
             apiReference: 'Referência da API',
             notInstalled: 'Não instalado',
@@ -1884,6 +1893,11 @@ const message = {
         imageName: 'Nome da imagem',
         pull: 'Puxar',
         path: 'Caminho',
+        imageUploadDrop: 'Arraste um arquivo de imagem para cá ou clique para enviar',
+        imageUploadHelper:
+            'Qualquer formato de arquivo é permitido. O Docker valida o conteúdo. Os arquivos enviados são mantidos para novas tentativas de importação ou exclusão manual.',
+        imageUploadEmpty: 'O arquivo está vazio. Selecione um arquivo de imagem válido.',
+        imageImportSubmitted: 'Tarefa de importação de imagem enviada. Consulte o log da tarefa para ver o resultado.',
         importImage: 'Importar',
         buildArgs: 'Argumentos de Build',
         imageBuild: 'Construção de imagem',
diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts
index bab4678c9eeb..932ed94d50b1 100644
--- a/frontend/src/lang/modules/ru.ts
+++ b/frontend/src/lang/modules/ru.ts
@@ -566,6 +566,8 @@ const message = {
         cancelKeepAlive: 'Не сохранять сеанс страницы',
     },
     header: {
+        userCenter: 'Центр пользователя',
+        exitSystem: 'Выйти из системы',
         logout: 'Выход',
     },
     database: {
@@ -1065,6 +1067,13 @@ const message = {
             whiteListHelper: 'Ограничить доступ только для IP-адресов из белого списка',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI Gateway поддерживает отдельное развёртывание',
+            deploymentNoticeDescription:
+                'AI Gateway теперь поддерживает отдельное развёртывание. Встроенный AI Gateway в 1Panel больше не будет получать обновления. Рекомендуем установить отдельную версию из магазина приложений. Вы также можете продолжить использовать текущую версию.',
+            deploymentNoticeContinue: 'Понятно, продолжить использование',
+            deploymentNoticeAppStore: 'Перейти в магазин приложений',
+            deploymentNoticeNoAppPermission:
+                'У вас нет доступа к магазину приложений. Обратитесь к администратору для установки отдельной версии.',
             title: 'AI-шлюз',
             apiReference: 'Справочник API',
             notInstalled: 'Не установлен',
@@ -1874,6 +1883,11 @@ const message = {
         imageName: 'Имя образа',
         pull: 'Загрузить',
         path: 'Путь',
+        imageUploadDrop: 'Перетащите файл образа сюда или нажмите для загрузки',
+        imageUploadHelper:
+            'Допускаются файлы любого формата. Docker проверяет содержимое. Загруженные файлы сохраняются для повторного импорта или удаления вручную.',
+        imageUploadEmpty: 'Файл пуст. Выберите корректный архив образа.',
+        imageImportSubmitted: 'Задача импорта образа отправлена. Результат можно посмотреть в журнале задачи.',
         importImage: 'Импорт',
         buildArgs: 'Аргументы Сборки',
         imageBuild: 'Сборка',
diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts
index 1b260ff5b046..28447f9280da 100644
--- a/frontend/src/lang/modules/tr.ts
+++ b/frontend/src/lang/modules/tr.ts
@@ -570,6 +570,8 @@ const message = {
         cancelKeepAlive: 'Sayfa oturumunu korumayı bırak',
     },
     header: {
+        userCenter: 'Kullanıcı Merkezi',
+        exitSystem: 'Çıkış yap',
         logout: 'Çıkış',
     },
     database: {
@@ -1076,6 +1078,13 @@ const message = {
             whiteListHelper: 'Erişimi yalnızca beyaz listedeki IPlerle sınırlayın',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI Gateway bağımsız dağıtımı destekliyor',
+            deploymentNoticeDescription:
+                'AI Gateway artık bağımsız dağıtımı destekliyor. 1Panel içindeki AI Gateway artık güncelleme almayacak. Uygulama mağazasından bağımsız sürümü yüklemenizi öneririz. Mevcut sürümü kullanmaya da devam edebilirsiniz.',
+            deploymentNoticeContinue: 'Anladım, kullanmaya devam et',
+            deploymentNoticeAppStore: 'Uygulama mağazasına git',
+            deploymentNoticeNoAppPermission:
+                'Uygulama mağazasına erişim izniniz yok. Bağımsız sürümü yüklemek için yöneticinizle iletişime geçin.',
             title: 'AI Ağ Geçidi',
             apiReference: 'API Referansı',
             notInstalled: 'Kurulu değil',
@@ -1883,6 +1892,11 @@ const message = {
         imageName: 'İmaj adı',
         pull: 'Çek',
         path: 'Yol',
+        imageUploadDrop: 'Bir imaj dosyasını buraya sürükleyin veya yüklemek için tıklayın',
+        imageUploadHelper:
+            'Tüm dosya biçimlerine izin verilir. Docker içeriği doğrular. Yüklenen dosyalar, içe aktarmayı yeniden denemek veya elle silmek için saklanır.',
+        imageUploadEmpty: 'Dosya boş. Geçerli bir imaj arşivi seçin.',
+        imageImportSubmitted: 'İmajı içe aktarma görevi gönderildi. Sonuç için görev günlüğünü kontrol edin.',
         importImage: 'İçe aktar',
         buildArgs: 'Derleme Argümanları',
         imageBuild: 'Oluştur',
diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts
index dd92ee85b061..58ce851dd369 100644
--- a/frontend/src/lang/modules/zh-Hant.ts
+++ b/frontend/src/lang/modules/zh-Hant.ts
@@ -548,6 +548,8 @@ const message = {
         cancelKeepAlive: '取消保持頁面工作階段',
     },
     header: {
+        userCenter: '使用者中心',
+        exitSystem: '登出系統',
         logout: '登出',
     },
     database: {
@@ -1006,6 +1008,12 @@ const message = {
             whiteListHelper: '限制僅白名單中的 IP 可瀏覽',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI 網關已支援獨立部署',
+            deploymentNoticeDescription:
+                'AI 網關現已支援獨立部署，1Panel 內建 AI 網關後續將不再更新。建議前往應用程式商店安裝獨立版本，您也可以繼續使用目前版本。',
+            deploymentNoticeContinue: '已知悉，繼續使用',
+            deploymentNoticeAppStore: '前往應用程式商店',
+            deploymentNoticeNoAppPermission: '您沒有應用程式商店存取權限，請聯絡管理員安裝獨立版本。',
             title: 'AI 閘道',
             apiReference: '介面說明',
             notInstalled: '未安裝',
@@ -1773,6 +1781,10 @@ const message = {
         delInsecureHelper: '刪除授信需要重新啟動 docker 服務，是否刪除？',
         pull: '拉取',
         path: '路徑',
+        imageUploadDrop: '拖曳映像檔案至此處，或點擊上傳',
+        imageUploadHelper: '不限制檔案格式，由 Docker 驗證內容。上傳的檔案會保留，可重試匯入或手動刪除。',
+        imageUploadEmpty: '不能上傳空檔案，請選擇有效的映像檔案。',
+        imageImportSubmitted: '映像匯入任務已提交，請查看任務日誌',
         importImage: '匯入映像',
         imageBuild: '構建映像',
         buildArgs: '構建參數',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 086fcd0330e2..716290730bac 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -552,6 +552,8 @@ const message = {
         cancelKeepAlive: '取消保持页面会话',
     },
     header: {
+        userCenter: '用户中心',
+        exitSystem: '退出系统',
         logout: '退出登录',
     },
     database: {
@@ -1019,6 +1021,12 @@ const message = {
             whiteListHelper: '限制仅白名单中的 IP 可访问',
         },
         aiProxy: {
+            deploymentNoticeTitle: 'AI 网关已支持独立部署',
+            deploymentNoticeDescription:
+                'AI 网关现已支持独立部署，1Panel 内置 AI 网关后续将不再更新。建议前往应用商店安装独立版本，您也可以继续使用当前版本。',
+            deploymentNoticeContinue: '已知晓，继续使用',
+            deploymentNoticeAppStore: '前往应用商店',
+            deploymentNoticeNoAppPermission: '您没有应用商店访问权限，请联系管理员安装独立版本。',
             title: 'AI 网关',
             apiReference: '接口说明',
             notInstalled: '未安装',
@@ -1793,6 +1801,10 @@ const message = {
         delInsecureHelper: '删除授信需要重启 docker 服务，是否删除？',
         pull: '拉取',
         path: '路径',
+        imageUploadDrop: '拖拽镜像文件到此处，或点击上传',
+        imageUploadHelper: '不限制文件格式，由 Docker 校验内容。上传的文件会保留，可重试导入或手动删除。',
+        imageUploadEmpty: '不能上传空文件，请选择有效的镜像文件。',
+        imageImportSubmitted: '镜像导入任务已提交，请查看任务日志',
         importImage: '导入镜像',
         imageBuild: '构建镜像',
         buildArgs: '构建参数',
diff --git a/frontend/src/layout/components/Sidebar/components/Collapse.vue b/frontend/src/layout/components/Sidebar/components/Collapse.vue
index e228fb586840..453dddaf7ac1 100644
--- a/frontend/src/layout/components/Sidebar/components/Collapse.vue
+++ b/frontend/src/layout/components/Sidebar/components/Collapse.vue
@@ -2,7 +2,7 @@
     <div>
         <el-popover
             v-model:visible="popoverVisible"
-            placement="right-end"
+            placement="right-start"
             :show-arrow="false"
             :offset="0"
             :width="200"
@@ -26,12 +26,6 @@
                 </div>
             </template>
             <div class="dropdown-menu" v-loading="loading || switchingNode">
-                <div class="dropdown-item" v-if="currentUser" @click="changeUserInfo">
-                    <SvgIcon class="icon" iconName="p-gerenzhongxin1" />
-                    {{ currentUser.name }}
-                </div>
-                <el-divider class="divider" />
-
                 <div class="dropdown-item" @click="openTask">
                     <SvgIcon class="icon" iconName="p-renwuzhongxin1" />
                     {{ $t('menu.msgCenter') }}
@@ -74,11 +68,6 @@
                         </el-icon>
                     </div>
                 </div>
-                <el-divider class="divider" />
-                <div class="dropdown-item" @click="logout">
-                    <SvgIcon class="icon" iconName="p-tuichudenglu3" />
-                    {{ $t('commons.login.logout') }}
-                </div>
             </div>
         </el-popover>
         <NodeDrawer
@@ -129,7 +118,7 @@ const props = defineProps({
 
 const defaultNodeLimit = 8;
 
-const emit = defineEmits(['openTask', 'refresh']);
+const emit = defineEmits(['openTask', 'refresh', 'userChange']);
 bus.on('refreshTask', () => {
     checkTask();
 });
@@ -272,6 +261,7 @@ const openNodeDashboard = () => {
 };
 
 const logout = () => {
+    popoverVisible.value = false;
     ElMessageBox.confirm(i18n.global.t('commons.msg.sureLogOut'), i18n.global.t('commons.msg.infoTitle'), {
         confirmButtonText: i18n.global.t('commons.button.confirm'),
         cancelButtonText: i18n.global.t('commons.button.cancel'),
@@ -297,13 +287,17 @@ const loadCurrentUser = async (currentNode?: string) => {
     const authInfo = await syncAuthInfo(currentNode);
     if (authInfo) {
         currentUser.value = authInfo;
+        emit('userChange', authInfo);
     }
 };
 const changeUserInfo = () => {
+    popoverVisible.value = false;
     loadCurrentUser();
     userInfoRef.value?.openDrawer();
 };
 
+defineExpose({ openUserInfo: changeUserInfo, logout });
+
 onMounted(() => {
     loadNodes();
     checkTask();
@@ -318,7 +312,7 @@ onMounted(() => {
     display: flex;
     align-items: center;
     box-sizing: border-box;
-    border-top: 1px solid var(--panel-footer-border);
+    border-bottom: 1px solid var(--panel-footer-border);
     height: 48px;
     .icon {
         margin-left: 25px;
diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue
index c5049d9e66cb..5d3ebefd6e69 100644
--- a/frontend/src/layout/components/Sidebar/index.vue
+++ b/frontend/src/layout/components/Sidebar/index.vue
@@ -10,6 +10,14 @@
             <PrimaryMenu />
         </div>
         <Logo :isCollapse="isCollapse" />
+        <Collapse
+            ref="nodeSelectorRef"
+            class="node-selector"
+            :version="version"
+            @open-task="openTask"
+            @refresh="search"
+            @user-change="currentUser = $event"
+        />
         <el-scrollbar>
             <el-menu
                 :default-active="activeMenu"
@@ -23,7 +31,40 @@
                 <SubItem :menuList="routerMenus" :level="0" />
             </el-menu>
         </el-scrollbar>
-        <Collapse :version="version" @open-task="openTask" @refresh="search" />
+        <el-dropdown
+            v-if="currentUser"
+            class="user-dropdown"
+            trigger="click"
+            placement="right-end"
+            :popper-options="{ modifiers: [{ name: 'flip', enabled: false }] }"
+            :show-arrow="false"
+            :hide-on-click="true"
+            @visible-change="userMenuVisible = $event"
+            @command="handleUserCommand"
+        >
+            <button
+                type="button"
+                class="user-entry"
+                :class="{ 'is-active': userMenuVisible }"
+                :aria-label="currentUser.name"
+                :title="currentUser.name"
+            >
+                <SvgIcon class="icon" iconName="p-gerenzhongxin1" />
+                <span v-if="!isCollapse" class="user-name">{{ currentUser.name }}</span>
+            </button>
+            <template #dropdown>
+                <el-dropdown-menu class="user-menu">
+                    <el-dropdown-item command="userCenter">
+                        <SvgIcon class="user-menu-icon" iconName="p-gerenzhongxin1" />
+                        <span>{{ $t('header.userCenter') }}</span>
+                    </el-dropdown-item>
+                    <el-dropdown-item command="logout">
+                        <SvgIcon class="user-menu-icon" iconName="p-tuichudenglu3" />
+                        <span>{{ $t('header.exitSystem') }}</span>
+                    </el-dropdown-item>
+                </el-dropdown-menu>
+            </template>
+        </el-dropdown>
     </div>
 </template>
 
@@ -40,12 +81,24 @@ import { getSettingBaseInfo } from '@/api/modules/setting';
 import PrimaryMenu from '@/assets/images/menu-bg.svg?component';
 import { hasPermissionMetaAccess, hasRouteRoleAccess } from '@/utils/rbac';
 import { useGlobalStore } from '@/composables/useGlobalStore';
+import type { Login } from '@/api/interface/auth';
 
 const route = useRoute();
 const router = useRouter();
 const menuStore = MenuStore();
 const { currentNode, isAdmin, menuAccordion, permissions } = useGlobalStore();
 const version = ref();
+const nodeSelectorRef = ref<InstanceType<typeof Collapse>>();
+const currentUser = ref<Login.AuthInfo>();
+const userMenuVisible = ref(false);
+
+const handleUserCommand = (command: string) => {
+    if (command === 'userCenter') {
+        nodeSelectorRef.value?.openUserInfo();
+    } else if (command === 'logout') {
+        nodeSelectorRef.value?.logout();
+    }
+};
 
 const activeMenu = computed(() => {
     const { meta, path } = route;
@@ -324,8 +377,14 @@ watch(
     height: 100%;
     background: var(--panel-menu-bg-color) no-repeat top;
 
+    .logo,
+    .node-selector {
+        flex-shrink: 0;
+    }
+
     .el-scrollbar {
         flex: 1;
+        min-height: 0;
         .el-menu {
             overflow: auto;
             overflow-x: hidden;
@@ -337,4 +396,62 @@ watch(
 .ico {
     height: 20px !important;
 }
+
+.user-dropdown {
+    flex-shrink: 0;
+    width: 100%;
+}
+
+.user-menu {
+    min-width: 160px;
+
+    :deep(.el-dropdown-menu__item) {
+        gap: 8px;
+        padding: 10px 16px;
+    }
+
+    .user-menu-icon {
+        flex-shrink: 0;
+        font-size: 8px;
+    }
+}
+
+.user-entry {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    flex-shrink: 0;
+    position: relative;
+    width: 100%;
+    height: 48px;
+    padding: 0 25px;
+    border: 0;
+    border-top: 1px solid var(--panel-footer-border);
+    background: transparent;
+    color: var(--panel-main-bg-color-1);
+    font-family: inherit;
+    font-size: var(--el-font-size-base);
+    line-height: 1.5;
+    text-align: left;
+    cursor: pointer;
+
+    .icon {
+        flex-shrink: 0;
+        font-size: 8px;
+    }
+
+    .user-name {
+        min-width: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    &:hover,
+    &:focus-visible,
+    &.is-active {
+        color: var(--el-color-primary);
+        background: var(--el-menu-item-bg-color);
+    }
+}
 </style>
diff --git a/frontend/src/store/modules/process.ts b/frontend/src/store/modules/process.ts
index 13a5a4ecebf6..91ae45634f9f 100644
--- a/frontend/src/store/modules/process.ts
+++ b/frontend/src/store/modules/process.ts
@@ -1,4 +1,6 @@
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { bindSearchReset } from '@/utils/search-reset';
+import router from '@/routers/router';
+import { useGlobalStore } from '@/composables/useGlobalStore';
 import { defineStore } from 'pinia';
 import { ref, reactive, toRef } from 'vue';
 import { MsgError } from '@/utils/message';
@@ -47,12 +49,12 @@ export const ProcessStore = defineStore('ProcessStore', () => {
         port: undefined,
     });
 
-    useSearchPersistence('host/process/process', {
+    const { currentNode } = useGlobalStore();
+    bindSearchReset([() => router.currentRoute.value.path, currentNode], {
         pid: toRef(psSearch, 'pid'),
         name: toRef(psSearch, 'name'),
         username: toRef(psSearch, 'username'),
-    });
-    useSearchPersistence('host/process/network', {
+
         processID: toRef(netSearch, 'processID'),
         processName: toRef(netSearch, 'processName'),
         port: toRef(netSearch, 'port'),
diff --git a/frontend/src/utils/chunk-upload.ts b/frontend/src/utils/chunk-upload.ts
new file mode 100644
index 000000000000..e85c755a7f5c
--- /dev/null
+++ b/frontend/src/utils/chunk-upload.ts
@@ -0,0 +1,57 @@
+import { chunkUploadFileData, type FileUploadRequestConfig } from '@/api/modules/files';
+
+export const CHUNK_SIZE = 5 * 1024 * 1024;
+const MAX_CHUNK_RETRIES = 3;
+
+const shouldRetryChunkUpload = (error: unknown) => {
+    const item = error as {
+        code?: string | number;
+        data?: { retryable?: boolean };
+        response?: { status?: number };
+    };
+    if (item?.code === 'ERR_CANCELED') {
+        return false;
+    }
+    if (typeof item?.data?.retryable === 'boolean') {
+        return item.data.retryable;
+    }
+    const status = item?.response?.status ?? (typeof item?.code === 'number' ? item.code : undefined);
+    return !status || status === 408 || status === 429 || status >= 500;
+};
+
+const waitForChunkRetry = (attempt: number, signal: AbortSignal) => {
+    return new Promise<void>((resolve) => {
+        if (signal.aborted) {
+            resolve();
+            return;
+        }
+        const timer = window.setTimeout(done, 500 * 2 ** attempt);
+        function done() {
+            window.clearTimeout(timer);
+            signal.removeEventListener('abort', done);
+            resolve();
+        }
+        signal.addEventListener('abort', done, { once: true });
+    });
+};
+
+export const uploadChunkWithRetry = async (
+    formData: FormData,
+    config: FileUploadRequestConfig,
+    signal: AbortSignal,
+) => {
+    let retryCount = 0;
+    while (true) {
+        signal.throwIfAborted();
+        try {
+            await chunkUploadFileData(formData, config);
+            return;
+        } catch (error) {
+            if (signal.aborted || retryCount >= MAX_CHUNK_RETRIES || !shouldRetryChunkUpload(error)) {
+                throw error;
+            }
+            await waitForChunkRetry(retryCount, signal);
+            retryCount++;
+        }
+    }
+};
diff --git a/frontend/src/utils/search-reset.ts b/frontend/src/utils/search-reset.ts
new file mode 100644
index 000000000000..52ecef14d5ff
--- /dev/null
+++ b/frontend/src/utils/search-reset.ts
@@ -0,0 +1,12 @@
+import { watch, type Ref, type WatchSource } from 'vue';
+
+export type SearchFields = Record<string, Ref<string | number | undefined>>;
+
+export const bindSearchReset = (sources: WatchSource[], fields: SearchFields) => {
+    const defaults = Object.values(fields).map((field) => ({ field, value: field.value }));
+    const reset = () => {
+        for (const { field, value } of defaults) field.value = value;
+    };
+    watch(sources, reset, { flush: 'sync' });
+    return reset;
+};
diff --git a/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue b/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue
index 1a799486868e..d947ce0f4c8e 100644
--- a/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue
+++ b/frontend/src/views/ai/agents/agent/config/tabs/plugins.vue
@@ -172,7 +172,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { ElMessageBox } from 'element-plus';
@@ -193,10 +193,16 @@ const searching = ref(false);
 const operating = ref('');
 const keyword = ref('');
 const marketKeyword = ref('');
-useSearchPersistence(
-    'ai/agents/agent/config/tabs/plugins',
+useSearchReset(
     { keyword, marketKeyword },
-    () => agentId.value || undefined,
+    {
+        scope: () => agentId.value || undefined,
+        onRevisit: () => {
+            page.value = 1;
+            marketResults.value = [];
+            marketSearched.value = false;
+        },
+    },
 );
 const origin = ref('');
 const status = ref('');
diff --git a/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue b/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue
index ee8f0943c1de..fcb7757b9184 100644
--- a/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue
+++ b/frontend/src/views/ai/agents/agent/config/tabs/skills/hermes.vue
@@ -138,7 +138,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { useI18n } from 'vue-i18n';
@@ -169,10 +169,15 @@ const getDefaultMarketSource = (): HermesSkillMarketSource => {
 const marketSource = ref<HermesSkillMarketSource>(getDefaultMarketSource());
 const marketSearched = ref(false);
 const agentId = ref(0);
-useSearchPersistence(
-    'ai/agents/agent/config/tabs/skills/hermes',
+useSearchReset(
     { installedKeyword, marketKeyword },
-    () => agentId.value || undefined,
+    {
+        scope: () => agentId.value || undefined,
+        onRevisit: () => {
+            marketResults.value = [];
+            marketSearched.value = false;
+        },
+    },
 );
 const installedSkills = ref<AI.AgentSkillItem[]>([]);
 const marketResults = ref<AI.AgentSkillSearchItem[]>([]);
diff --git a/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue b/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue
index 8689ab40707a..0420e3100cd4 100644
--- a/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue
+++ b/frontend/src/views/ai/agents/agent/config/tabs/skills/openclaw.vue
@@ -142,7 +142,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, ref, watch } from 'vue';
 import { Refresh, Search } from '@element-plus/icons-vue';
 import { useI18n } from 'vue-i18n';
@@ -181,10 +181,15 @@ const getDefaultMarketSource = (): SkillMarketSource => {
 const marketSource = ref<SkillMarketSource>(getDefaultMarketSource());
 const marketSearched = ref(false);
 const agentId = ref(0);
-useSearchPersistence(
-    'ai/agents/agent/config/tabs/skills/openclaw',
+useSearchReset(
     { installedKeyword, marketKeyword },
-    () => agentId.value || undefined,
+    {
+        scope: () => agentId.value || undefined,
+        onRevisit: () => {
+            marketResults.value = [];
+            marketSearched.value = false;
+        },
+    },
 );
 const skills = ref<AI.AgentSkillItem[]>([]);
 const marketResults = ref<AI.AgentSkillSearchItem[]>([]);
diff --git a/frontend/src/views/ai/agents/agent/index.vue b/frontend/src/views/ai/agents/agent/index.vue
index f9cab2081832..27a862ada429 100644
--- a/frontend/src/views/ai/agents/agent/index.vue
+++ b/frontend/src/views/ai/agents/agent/index.vue
@@ -272,8 +272,8 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { deleteAgentCheck, pageAgents, resetAgentToken, unbindAgentWebsite, updateAgentRemark } from '@/api/modules/ai';
 import { checkAppInstalled, installedOp, searchApp, searchAppInstalled } from '@/api/modules/app';
@@ -341,7 +341,6 @@ const isActive = ref(false);
 const isExist = ref(false);
 const noApp = ref(false);
 const searchName = ref('');
-useSearchPersistence('ai/agents/agent/index', { search: searchName });
 const defaultHttpsPort = ref(443);
 const openrestyPortLoaded = ref(false);
 const websiteDomainsMap = ref<Record<number, Website.Domain[]>>({});
@@ -401,6 +400,7 @@ const paginationConfig = reactive({
     pageSize: 10,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const checkNoApp = async () => {
     try {
diff --git a/frontend/src/views/ai/agents/model/index.vue b/frontend/src/views/ai/agents/model/index.vue
index cf31de24afaa..4f9347ce8f93 100644
--- a/frontend/src/views/ai/agents/model/index.vue
+++ b/frontend/src/views/ai/agents/model/index.vue
@@ -69,8 +69,8 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteAgentAccount, getAgentProviders, pageAgentAccounts } from '@/api/modules/ai';
 import { AI } from '@/api/interface/ai';
 import AddDialog from '@/views/ai/agents/model/add/index.vue';
@@ -86,7 +86,6 @@ const items = ref<AI.AgentAccountItem[]>([]);
 const addRef = ref();
 const modelPoolRef = ref();
 const searchName = ref('');
-useSearchPersistence('ai/agents/model/index', { search: searchName });
 const apiType = ref('');
 const apiTypeOptions = ref<string[]>([]);
 
@@ -112,6 +111,7 @@ const paginationConfig = reactive({
     pageSize: 10,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async () => {
     const req: AI.AgentAccountSearch = {
diff --git a/frontend/src/views/ai/model/ollama/index.vue b/frontend/src/views/ai/model/ollama/index.vue
index 90b14c08ab70..b2eef6bbf87d 100644
--- a/frontend/src/views/ai/model/ollama/index.vue
+++ b/frontend/src/views/ai/model/ollama/index.vue
@@ -186,7 +186,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import AppStatus from '@/components/app-status/index.vue';
 import AddDialog from '@/views/ai/model/ollama/add/index.vue';
 import Conn from '@/views/ai/model/ollama/conn/index.vue';
@@ -195,7 +195,7 @@ import Terminal from '@/views/ai/model/ollama/terminal/index.vue';
 import Del from '@/views/ai/model/ollama/del/index.vue';
 import PortJumpDialog from '@/components/port-jump/index.vue';
 import CodemirrorDrawer from '@/components/codemirror-pro/drawer.vue';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { App } from '@/api/interface/app';
 import {
@@ -237,7 +237,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('ai/model/ollama/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const appInstallID = ref(0);
 
 const opRef = ref();
diff --git a/frontend/src/views/app-store/apps/index.vue b/frontend/src/views/app-store/apps/index.vue
index 71070604244f..6190565d2d81 100644
--- a/frontend/src/views/app-store/apps/index.vue
+++ b/frontend/src/views/app-store/apps/index.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { App } from '@/api/interface/app';
 import { toRef, onMounted, reactive, ref } from 'vue';
 import { searchApp, syncApp, syncCutomAppStore, syncLocalApp, getCurrentNodeCustomAppConfig } from '@/api/modules/app';
@@ -105,7 +105,10 @@ const req = reactive({
     resource: 'all',
     showCurrentArch: false,
 });
-useSearchPersistence('app-store/apps/index', { search: toRef(req, 'name') });
+useSearchReset(
+    { search: toRef(req, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search(req) },
+);
 
 const apps = ref<App.AppItem[]>([]);
 const loading = ref(false);
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
index 7dcb7187262b..d176d5272c63 100644
--- a/frontend/src/views/app-store/installed/index.vue
+++ b/frontend/src/views/app-store/installed/index.vue
@@ -139,7 +139,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import AppCard from '@/views/app-store/installed/app/card.vue';
 import Backups from '@/components/backup/index.vue';
 import Uploads from '@/components/upload/index.vue';
@@ -211,7 +211,10 @@ const searchReq = reactive({
     update: false,
     sync: false,
 });
-useSearchPersistence('app-store/installed/index', { search: toRef(searchReq, 'name') });
+useSearchReset(
+    { search: toRef(searchReq, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const router = useRouter();
 const activeName = ref(i18n.global.t('app.installed'));
 const mode = ref('installed');
diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue
index 88eb399ea60c..26ce3225c1f7 100644
--- a/frontend/src/views/container/compose/index.vue
+++ b/frontend/src/views/container/compose/index.vue
@@ -521,7 +521,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, h, ref } from 'vue';
 import CodemirrorPro from '@/components/codemirror-pro/index.vue';
 import ContainerLog from '@/components/log/container/index.vue';
@@ -576,7 +576,7 @@ const dialogBackupRef = ref();
 const uploadRef = ref();
 
 const searchName = ref('');
-useSearchPersistence('container/compose/index', { search: searchName });
+useSearchReset({ search: searchName }, { onRevisit: () => search() });
 const includeAppStore = ref(localStorage.getItem('includeAppStore') !== 'false');
 const showType = ref('compose');
 const containerStats = ref<any[]>([]);
diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue
index 7708dfecefce..e7532026098d 100644
--- a/frontend/src/views/container/container/index.vue
+++ b/frontend/src/views/container/container/index.vue
@@ -474,7 +474,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import PruneDialog from '@/views/container/container/prune/index.vue';
 import RenameDialog from '@/views/container/container/rename/index.vue';
 import UpgradeDialog from '@/views/container/container/upgrade/index.vue';
@@ -490,7 +490,7 @@ import Uploads from '@/components/upload/index.vue';
 import DockerStatus from '@/views/container/docker-status/index.vue';
 import ContainerLogDialog from '@/components/log/container-drawer/index.vue';
 import Status from '@/components/status/index.vue';
-import { computed, reactive, ref } from 'vue';
+import { toRef, computed, reactive, ref } from 'vue';
 import {
     containerItemStats,
     containerListStats,
@@ -536,7 +536,7 @@ const paginationConfig = reactive({
     order: 'ascending',
 });
 const searchName = ref();
-useSearchPersistence('container/container/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const dialogUpgradeRef = ref();
 const dialogCommitRef = ref();
 const dialogPortJumpRef = ref();
diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue
index c46cd1d5d6eb..8bdd25b0f447 100644
--- a/frontend/src/views/container/image/index.vue
+++ b/frontend/src/views/container/image/index.vue
@@ -157,7 +157,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { toRef, reactive, ref, computed } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
@@ -200,7 +200,10 @@ const paginationConfig = reactive({
     orderBy: 'createdAt',
     order: 'null',
 });
-useSearchPersistence('container/image/index', { search: toRef(paginationConfig, 'name') });
+useSearchReset(
+    { search: toRef(paginationConfig, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const columns = ref([]);
 
 const isActive = ref(false);
diff --git a/frontend/src/views/container/image/load/index.vue b/frontend/src/views/container/image/load/index.vue
index 46da2edba103..2f45b7f4b062 100644
--- a/frontend/src/views/container/image/load/index.vue
+++ b/frontend/src/views/container/image/load/index.vue
@@ -1,105 +1,254 @@
 <template>
-    <DrawerPro v-model="loadVisible" :header="$t('container.importImage')" @close="handleClose" size="small">
-        <el-form @submit.prevent v-loading="loading" ref="formRef" :model="form" label-position="top">
-            <el-form-item :label="$t('container.path')" :rules="Rules.requiredInput" prop="path">
-                <el-input v-model="form.path" @input="handlePathChange">
-                    <template #prepend>
-                        <el-button icon="Folder" @click="fileRef.acceptParams({ dir: false, multiple: true })" />
-                    </template>
-                </el-input>
+    <DrawerPro
+        v-model="loadVisible"
+        :header="$t('container.importImage')"
+        :auto-close="!busy"
+        :confirm-before-close="true"
+        @before-close="beforeClose"
+        size="small"
+    >
+        <el-form @submit.prevent label-position="top">
+            <div class="flex items-center gap-3 mb-5">
+                <el-button :disabled="busy" @click="source = 'local'">
+                    {{ $t('database.localUpload') }}
+                </el-button>
+                <el-button :disabled="busy" @click="onServerSelect">
+                    {{ $t('database.hostSelect') }}
+                </el-button>
+            </div>
+            <el-form-item v-if="source === 'server'" :label="$t('container.path')">
+                <el-input v-model="form.path" :disabled="busy" @input="handlePathChange" />
             </el-form-item>
+            <template v-else>
+                <el-upload
+                    ref="uploadRef"
+                    drag
+                    :limit="1"
+                    :auto-upload="false"
+                    :show-file-list="false"
+                    :disabled="busy"
+                    :on-change="onFileChange"
+                    :on-exceed="onFileExceed"
+                >
+                    <el-icon class="el-icon--upload"><UploadFilled /></el-icon>
+                    <div class="el-upload__text">{{ $t('container.imageUploadDrop') }}</div>
+                </el-upload>
+                <p class="input-help">{{ $t('container.imageUploadHelper') }}</p>
+                <template v-if="localFile">
+                    <p class="break-all">{{ localFile.name }} ({{ computeSize(localFile.size) }})</p>
+                    <el-progress
+                        :percentage="uploadPercent"
+                        :status="uploadFailed ? 'exception' : uploadedPath ? 'success' : undefined"
+                    />
+                    <p v-if="uploadedPath" class="input-help break-all">{{ uploadedPath }}</p>
+                    <el-button v-if="uploadFailed" :disabled="busy" @click="uploadLocalFile">
+                        {{ $t('commons.button.retry') }}
+                    </el-button>
+                </template>
+            </template>
+            <el-button v-if="submittedTaskID" link type="primary" @click="openTaskLog">
+                {{ $t('commons.button.log') }}
+            </el-button>
         </el-form>
         <template #footer>
-            <span class="dialog-footer">
-                <el-button :disabled="loading" @click="loadVisible = false">
-                    {{ $t('commons.button.cancel') }}
-                </el-button>
-                <el-button
-                    :disabled="loading || !form.path.trim() || form.paths.length === 0"
-                    type="primary"
-                    @click="onSubmit(formRef)"
-                >
-                    {{ $t('commons.button.import') }}
-                </el-button>
-            </span>
+            <el-button :disabled="busy" @click="loadVisible = false">{{ $t('commons.button.cancel') }}</el-button>
+            <el-button
+                v-if="source === 'server'"
+                :disabled="busy || !!submittedTaskID || !form.paths.length"
+                :loading="loading"
+                type="primary"
+                @click="onSubmit"
+            >
+                {{ $t('commons.button.import') }}
+            </el-button>
         </template>
     </DrawerPro>
-    <FileList ref="fileRef" @choose="loadLoadDir" />
-    <TaskLog ref="taskLogRef" width="70%" />
+    <FileList v-if="loadVisible" ref="fileRef" @choose="loadLoadDir" />
+    <TaskLog ref="taskLogRef" width="70%" @close="emit('search')" />
 </template>
 
 <script lang="ts" setup>
 import FileList from '@/components/file-list/index.vue';
-import { reactive, ref } from 'vue';
-import { Rules } from '@/global/form-rules';
+import { computed, onBeforeUnmount, reactive, ref, watch } from 'vue';
+import { genFileId, type UploadFile, type UploadInstance, type UploadProps, type UploadRawFile } from 'element-plus';
 import TaskLog from '@/components/log/task/index.vue';
 import i18n from '@/lang';
-import { ElForm } from 'element-plus';
 import { imageLoad } from '@/api/modules/container';
-import { MsgSuccess } from '@/utils/message';
+import { stopChunkUpload } from '@/api/modules/files';
+import { loadBaseDir } from '@/api/modules/setting';
+import { useGlobalStore } from '@/composables/useGlobalStore';
+import { MsgError, MsgSuccess } from '@/utils/message';
+import { computeSize } from '@/utils/size';
 import { newUUID } from '@/utils/id';
+import { CHUNK_SIZE, uploadChunkWithRetry } from '@/utils/chunk-upload';
+
+const { currentNode } = useGlobalStore();
 const loading = ref(false);
+const uploading = ref(false);
+const busy = computed(() => loading.value || uploading.value);
 const fileRef = ref();
 const taskLogRef = ref();
-
+const uploadRef = ref<UploadInstance>();
 const loadVisible = ref(false);
-const form = reactive({
-    path: '',
-    paths: [] as string[],
-    taskID: '',
-});
+const source = ref<'server' | 'local'>('local');
+const operateNode = ref('');
+const form = reactive({ path: '', paths: [] as string[] });
+const localFile = ref<UploadRawFile>();
+const uploadPercent = ref(0);
+const uploadFailed = ref(false);
+const uploadedPath = ref('');
+const submittedTaskID = ref('');
+let uploadID = '';
+let uploadController: AbortController | undefined;
+let disposed = false;
+const emit = defineEmits<{ (e: 'search'): void }>();
 
 const acceptParams = () => {
-    loadVisible.value = true;
+    if (busy.value) return;
+    operateNode.value = currentNode.value;
+    source.value = 'local';
     form.path = '';
     form.paths = [];
+    localFile.value = undefined;
+    uploadedPath.value = '';
+    uploadPercent.value = 0;
+    uploadFailed.value = false;
+    submittedTaskID.value = '';
+    uploadRef.value?.clearFiles();
+    loadVisible.value = true;
 };
-const handleClose = () => {
-    loadVisible.value = false;
+const beforeClose = (done: () => void) => {
+    if (!busy.value) done();
 };
-
-const emit = defineEmits<{ (e: 'search'): void }>();
-
-type FormInstance = InstanceType<typeof ElForm>;
-const formRef = ref<FormInstance>();
-
-const onSubmit = async (formEl: FormInstance | undefined) => {
-    if (!formEl || !form.path.trim() || form.paths.length === 0) return;
-    formEl.validate(async (valid) => {
-        if (!valid) return;
-        loading.value = true;
-        form.taskID = newUUID();
-        await imageLoad({ paths: form.paths, taskID: form.taskID })
-            .then(() => {
-                loading.value = false;
-                loadVisible.value = false;
-                openTaskLog(form.taskID);
-                emit('search');
-                MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
-            })
-            .catch(() => {
-                loading.value = false;
-            });
-    });
+const onServerSelect = () => {
+    if (busy.value) return;
+    source.value = 'server';
+    fileRef.value.acceptParams({ dir: false, multiple: true });
 };
-
-const openTaskLog = (taskID: string) => {
-    taskLogRef.value.openWithTaskID(taskID);
+const onFileChange = (file: UploadFile) => {
+    if (!file.raw || busy.value) return;
+    if (file.raw.size === 0) {
+        MsgError(i18n.global.t('container.imageUploadEmpty'));
+        uploadRef.value?.clearFiles();
+        return;
+    }
+    localFile.value = file.raw;
+    uploadedPath.value = '';
+    submittedTaskID.value = '';
+    void uploadLocalFile();
+};
+const onFileExceed: UploadProps['onExceed'] = (files) => {
+    if (busy.value || !files.length) return;
+    uploadRef.value?.clearFiles();
+    const file = files[0] as UploadRawFile;
+    file.uid = genFileId();
+    uploadRef.value?.handleStart(file);
 };
 
-const handlePathChange = () => {
-    if (!form.path.trim()) {
-        form.paths = [];
+const uploadLocalFile = async () => {
+    const file = localFile.value;
+    if (!file || busy.value) return;
+    uploading.value = true;
+    uploadFailed.value = false;
+    uploadPercent.value = 0;
+    const node = operateNode.value;
+    const id = newUUID();
+    uploadID = id;
+    const controller = new AbortController();
+    uploadController = controller;
+    try {
+        const { data: baseDir } = await loadBaseDir(node);
+        controller.signal.throwIfAborted();
+        const directory = `${baseDir}/uploads/image/${id}`;
+        const count = Math.ceil(file.size / CHUNK_SIZE);
+        for (let index = 0; index < count; index++) {
+            const data = new FormData();
+            data.append('filename', file.name);
+            data.append('path', directory);
+            data.append('uploadID', id);
+            data.append('chunk', file.slice(index * CHUNK_SIZE, (index + 1) * CHUNK_SIZE));
+            data.append('chunkIndex', String(index));
+            data.append('chunkCount', String(count));
+            data.append('offset', String(index * CHUNK_SIZE));
+            data.append('fileSize', String(file.size));
+            await uploadChunkWithRetry(
+                data,
+                {
+                    headers: { CurrentNode: node },
+                    signal: controller.signal,
+                    skipErrorMessage: true,
+                    timeout: 0,
+                    onUploadProgress: (event: { total?: number; loaded: number }) => {
+                        const fraction = event.total ? Math.min(1, event.loaded / event.total) : 0;
+                        uploadPercent.value = Math.min(99, Math.floor(((index + fraction) * 100) / count));
+                    },
+                },
+                controller.signal,
+            );
+        }
+        controller.signal.throwIfAborted();
+        uploadedPath.value = `${directory}/${file.name}`;
+        uploadPercent.value = 100;
+    } catch {
+        if (!controller.signal.aborted) uploadFailed.value = true;
+        await stopChunkUpload(id, node).catch(() => {});
+        return;
+    } finally {
+        uploading.value = false;
+        uploadController = undefined;
+        uploadID = '';
     }
+    if (!disposed && currentNode.value === node) await onSubmit();
 };
 
-const loadLoadDir = async (paths: string | string[]) => {
-    const newPaths = Array.isArray(paths) ? paths : [paths];
-    form.paths = [...new Set(newPaths)];
+const openTaskLog = () => {
+    taskLogRef.value.openWithTaskID(submittedTaskID.value, true, operateNode.value);
+};
+const onSubmit = async () => {
+    const paths = source.value === 'local' ? [uploadedPath.value].filter(Boolean) : [...form.paths];
+    if (busy.value || submittedTaskID.value || !paths.length) return;
+    loading.value = true;
+    const taskID = newUUID();
+    const node = operateNode.value;
+    submittedTaskID.value = taskID;
+    try {
+        await imageLoad({ paths, taskID }, node);
+        if (disposed || currentNode.value !== node) return;
+        loadVisible.value = false;
+        openTaskLog();
+        MsgSuccess(i18n.global.t('container.imageImportSubmitted'));
+    } catch {
+        return;
+    } finally {
+        loading.value = false;
+    }
+};
+const handlePathChange = () => {
+    submittedTaskID.value = '';
+    form.paths = [
+        ...new Set(
+            form.path
+                .split(';')
+                .map((path) => path.trim())
+                .filter(Boolean),
+        ),
+    ];
+};
+const loadLoadDir = (paths: string | string[]) => {
+    if (currentNode.value !== operateNode.value) return;
+    source.value = 'server';
+    submittedTaskID.value = '';
+    form.paths = [...new Set(Array.isArray(paths) ? paths : [paths])];
     form.path = form.paths.join('; ');
 };
-
-defineExpose({
-    acceptParams,
+watch(currentNode, () => {
+    loadVisible.value = false;
+    uploadController?.abort();
+});
+onBeforeUnmount(() => {
+    disposed = true;
+    uploadController?.abort();
+    if (uploadID) void stopChunkUpload(uploadID, operateNode.value).catch(() => {});
 });
+defineExpose({ acceptParams });
 </script>
diff --git a/frontend/src/views/container/network/index.vue b/frontend/src/views/container/network/index.vue
index 52b792af8ebc..1a59e14c4a23 100644
--- a/frontend/src/views/container/network/index.vue
+++ b/frontend/src/views/container/network/index.vue
@@ -95,10 +95,10 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import CreateDialog from '@/views/container/network/create/index.vue';
 import DetailDrawer from '@/views/container/network/detail/index.vue';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
 import { deleteNetwork, searchNetwork, inspect, containerPrune } from '@/api/modules/container';
@@ -121,7 +121,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/network/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 const isActive = ref(false);
diff --git a/frontend/src/views/container/repo/index.vue b/frontend/src/views/container/repo/index.vue
index cd9c45ae6f18..94e5d7d910c2 100644
--- a/frontend/src/views/container/repo/index.vue
+++ b/frontend/src/views/container/repo/index.vue
@@ -59,9 +59,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import OperatorDialog from '@/views/container/repo/operator/index.vue';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { Container } from '@/api/interface/container';
 import { checkRepoStatus, deleteImageRepo, searchImageRepo } from '@/api/modules/container';
@@ -78,7 +78,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/repo/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 const confirmDialog = ref();
diff --git a/frontend/src/views/container/template/index.vue b/frontend/src/views/container/template/index.vue
index 816666d13f94..319ae55012fe 100644
--- a/frontend/src/views/container/template/index.vue
+++ b/frontend/src/views/container/template/index.vue
@@ -81,8 +81,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat, getCurrentDateFormatted } from '@/utils/date';
 import { downloadWithContent } from '@/utils/file';
 import { Container } from '@/api/interface/container';
@@ -111,7 +111,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/template/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async () => {
     if (!isActive.value || !isExist.value) {
diff --git a/frontend/src/views/container/volume/index.vue b/frontend/src/views/container/volume/index.vue
index 4d8d79b0bcc8..55c45addf706 100644
--- a/frontend/src/views/container/volume/index.vue
+++ b/frontend/src/views/container/volume/index.vue
@@ -124,11 +124,11 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import CreateDialog from '@/views/container/volume/create/index.vue';
 import CodemirrorDrawer from '@/components/codemirror-pro/drawer.vue';
 import DockerStatus from '@/views/container/docker-status/index.vue';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
 import { deleteVolume, searchVolume, inspect, containerPrune } from '@/api/modules/container';
@@ -158,7 +158,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref();
-useSearchPersistence('container/volume/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const isActive = ref(false);
 const isExist = ref(false);
 
diff --git a/frontend/src/views/cronjob/cronjob/index.vue b/frontend/src/views/cronjob/cronjob/index.vue
index 90477a1cb3c0..60e14cf58dc2 100644
--- a/frontend/src/views/cronjob/cronjob/index.vue
+++ b/frontend/src/views/cronjob/cronjob/index.vue
@@ -272,11 +272,11 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import Records from '@/views/cronjob/cronjob/record/index.vue';
 import Backups from '@/views/cronjob/cronjob/backup/index.vue';
 import Import from '@/views/cronjob/cronjob/import/index.vue';
-import { onMounted, ref, toRefs } from 'vue';
+import { toRef, onMounted, ref, toRefs } from 'vue';
 import {
     deleteCronjob,
     editCronjobGroup,
@@ -332,7 +332,7 @@ const pageState = usePageState(() => ({
 }));
 const paginationConfig = pageState.paginationConfig;
 const { defaultGroupID, searchName, searchGroupID } = toRefs(pageState);
-useSearchPersistence('cronjob/cronjob/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     if (column) {
diff --git a/frontend/src/views/cronjob/library/index.vue b/frontend/src/views/cronjob/library/index.vue
index a8d38caea551..90df9d64a31e 100644
--- a/frontend/src/views/cronjob/library/index.vue
+++ b/frontend/src/views/cronjob/library/index.vue
@@ -132,7 +132,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat, getCurrentDateFormatted } from '@/utils/date';
 import { deepCopy } from '@/utils/misc';
 import { newUUID } from '@/utils/id';
@@ -141,7 +141,7 @@ import TaskLog from '@/components/log/task/index.vue';
 import OperateDialog from '@/views/cronjob/library/operate/index.vue';
 import TerminalDialog from '@/views/cronjob/library/run/index.vue';
 import { deleteScript, searchScript, syncScript } from '@/api/modules/cronjob';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { Cronjob } from '@/api/interface/cronjob';
 import i18n from '@/lang';
 import { useGlobalStore } from '@/composables/useGlobalStore';
@@ -170,7 +170,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchInfo = ref<string>('');
-useSearchPersistence('cronjob/library/index', { search: searchInfo });
+useSearchReset({ search: searchInfo, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const group = ref<string>('');
 const groupOptions = ref();
 
diff --git a/frontend/src/views/database/mongodb/index.vue b/frontend/src/views/database/mongodb/index.vue
index c17ab308a984..e6c2cbf35b09 100644
--- a/frontend/src/views/database/mongodb/index.vue
+++ b/frontend/src/views/database/mongodb/index.vue
@@ -323,8 +323,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { nextTick, onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, nextTick, onMounted, reactive, ref } from 'vue';
 import { dateFormat } from '@/utils/date';
 import { getRandomStr } from '@/utils/id';
 import { Position } from '@element-plus/icons-vue';
@@ -366,7 +366,6 @@ const loading = ref(false);
 const maskShow = ref(true);
 const submitLoading = ref(false);
 const searchName = ref('');
-useSearchPersistence('database/mongodb/index', { search: searchName });
 const createVisible = ref(false);
 const appStatusRef = ref();
 const bindRef = ref();
@@ -400,6 +399,7 @@ const paginationConfig = reactive({
     orderBy: 'createdAt',
     order: 'null',
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 type FormInstance = InstanceType<typeof ElForm>;
 const formRef = ref<FormInstance>();
diff --git a/frontend/src/views/database/mongodb/remote/index.vue b/frontend/src/views/database/mongodb/remote/index.vue
index 15bf8d0a331a..402a9720172e 100644
--- a/frontend/src/views/database/mongodb/remote/index.vue
+++ b/frontend/src/views/database/mongodb/remote/index.vue
@@ -75,9 +75,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/postgresql/check/index.vue';
 import OperateDialog from '@/views/database/mongodb/remote/operate/index.vue';
@@ -101,7 +101,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/mongodb/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue
index 7b3586ac5b4e..46eb39168bcc 100644
--- a/frontend/src/views/database/mysql/index.vue
+++ b/frontend/src/views/database/mysql/index.vue
@@ -226,7 +226,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import BindDialog from '@/views/database/mysql/bind/index.vue';
 import UserDialog from '@/views/database/mysql/user/index.vue';
 import OperateDialog from '@/views/database/mysql/create/index.vue';
@@ -241,7 +241,7 @@ import PortJumpDialog from '@/components/port-jump/index.vue';
 import Tooltip from '@/components/tooltip/index.vue';
 import { dateFormat } from '@/utils/date';
 import { ElMessageBox } from 'element-plus';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import {
     deleteCheckMysqlDB,
     listDatabases,
@@ -301,7 +301,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/mysql/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const mysqlContainer = ref();
 const mysqlStatus = ref();
diff --git a/frontend/src/views/database/mysql/remote/index.vue b/frontend/src/views/database/mysql/remote/index.vue
index d2d945bf2b5a..772b14c99b80 100644
--- a/frontend/src/views/database/mysql/remote/index.vue
+++ b/frontend/src/views/database/mysql/remote/index.vue
@@ -74,9 +74,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/mysql/check/index.vue';
 import OperateDialog from '@/views/database/mysql/remote/operate/index.vue';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/mysql/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/database/postgresql/index.vue b/frontend/src/views/database/postgresql/index.vue
index 87e637ecfc59..34878d0bd6d8 100644
--- a/frontend/src/views/database/postgresql/index.vue
+++ b/frontend/src/views/database/postgresql/index.vue
@@ -241,7 +241,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import BindDialog from '@/views/database/postgresql/bind/index.vue';
 import OperateDialog from '@/views/database/postgresql/create/index.vue';
 import DeleteDialog from '@/views/database/postgresql/delete/index.vue';
@@ -256,7 +256,7 @@ import UploadDialog from '@/components/upload/index.vue';
 import PortJumpDialog from '@/components/port-jump/index.vue';
 import Tooltip from '@/components/tooltip/index.vue';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import {
     deleteCheckPostgresqlDB,
     listDatabases,
@@ -313,7 +313,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/postgresql/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const postgresqlContainer = ref();
 const postgresqlStatus = ref();
diff --git a/frontend/src/views/database/postgresql/remote/index.vue b/frontend/src/views/database/postgresql/remote/index.vue
index 6f96dbd92279..8bff59afe152 100644
--- a/frontend/src/views/database/postgresql/remote/index.vue
+++ b/frontend/src/views/database/postgresql/remote/index.vue
@@ -74,9 +74,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/postgresql/check/index.vue';
 import OperateDialog from '@/views/database/postgresql/remote/operate/index.vue';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/postgresql/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/database/redis/remote/index.vue b/frontend/src/views/database/redis/remote/index.vue
index ee66b73f8ff4..78d625489498 100644
--- a/frontend/src/views/database/redis/remote/index.vue
+++ b/frontend/src/views/database/redis/remote/index.vue
@@ -73,9 +73,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { deleteCheckDatabase, searchDatabases } from '@/api/modules/database';
 import AppResources from '@/views/database/redis/check/index.vue';
 import OperateDialog from '@/views/database/redis/remote/operate/index.vue';
@@ -99,7 +99,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('database/redis/remote/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async (column?: any) => {
     paginationConfig.orderBy = column?.order ? column.prop : paginationConfig.orderBy;
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index 9af59a4f2ac7..81fe290ca25a 100644
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -739,7 +739,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { toRef, computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
 import {
     addFavorite,
@@ -853,7 +853,6 @@ const initData = () => ({
     sortOrder: 'ascending',
 });
 let req = reactive(initData());
-useSearchPersistence('host/file-management/index', { search: toRef(req, 'search') });
 let loading = ref(false);
 const paths = ref<FilePaths[]>([]);
 const breadcrumbVisiblePaths = ref<FilePaths[]>([]);
@@ -986,6 +985,10 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('file-page-size')) || 100,
     total: 0,
 });
+useSearchReset(
+    { search: toRef(req, 'search'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 
 const btnWrapperRefs = ref<Record<string, any>>({});
 
diff --git a/frontend/src/views/host/file-management/upload/index.vue b/frontend/src/views/host/file-management/upload/index.vue
index 33749155bd10..06b324032a53 100644
--- a/frontend/src/views/host/file-management/upload/index.vue
+++ b/frontend/src/views/host/file-management/upload/index.vue
@@ -121,13 +121,8 @@
 <script setup lang="ts">
 import { computed, nextTick, reactive, ref } from 'vue';
 import { UploadFile, UploadFiles, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
-import {
-    batchCheckFiles,
-    chunkUploadFileData,
-    stopChunkUpload,
-    uploadFileData,
-    type FileUploadRequestConfig,
-} from '@/api/modules/files';
+import { batchCheckFiles, stopChunkUpload, uploadFileData } from '@/api/modules/files';
+import { CHUNK_SIZE, uploadChunkWithRetry } from '@/utils/chunk-upload';
 import i18n from '@/lang';
 import { MsgError, MsgSuccess, MsgWarning } from '@/utils/message';
 import { Close, Document, UploadFilled } from '@element-plus/icons-vue';
@@ -225,8 +220,6 @@ const uploaderFiles = ref<UploadFiles>([]);
 const hoverIndex = ref<number | null>(null);
 const tmpFiles = ref<UploadFiles>([]);
 const breakFlag = ref(false);
-const CHUNK_SIZE = 1024 * 1024 * 5;
-const MAX_CHUNK_RETRIES = 3;
 
 const upload = (command: string) => {
     if (uploadLocked.value) {
@@ -504,54 +497,6 @@ const cleanupActiveChunkUpload = async () => {
     }
 };
 
-const shouldRetryChunkUpload = (error: unknown) => {
-    const item = error as {
-        code?: string | number;
-        data?: { retryable?: boolean };
-        response?: { status?: number };
-    };
-    if (item?.code === 'ERR_CANCELED') {
-        return false;
-    }
-    if (typeof item?.data?.retryable === 'boolean') {
-        return item.data.retryable;
-    }
-    const status = item?.response?.status ?? (typeof item?.code === 'number' ? item.code : undefined);
-    return !status || status === 408 || status === 429 || status >= 500;
-};
-
-const waitForChunkRetry = (attempt: number, signal: AbortSignal) => {
-    return new Promise<void>((resolve) => {
-        if (signal.aborted) {
-            resolve();
-            return;
-        }
-        const timer = window.setTimeout(done, 500 * 2 ** attempt);
-        function done() {
-            window.clearTimeout(timer);
-            signal.removeEventListener('abort', done);
-            resolve();
-        }
-        signal.addEventListener('abort', done, { once: true });
-    });
-};
-
-const uploadChunkWithRetry = async (formData: FormData, config: FileUploadRequestConfig, signal: AbortSignal) => {
-    let retryCount = 0;
-    while (true) {
-        try {
-            await chunkUploadFileData(formData, config);
-            return;
-        } catch (error) {
-            if (signal.aborted || retryCount >= MAX_CHUNK_RETRIES || !shouldRetryChunkUpload(error)) {
-                throw error;
-            }
-            await waitForChunkRetry(retryCount, signal);
-            retryCount++;
-        }
-    }
-};
-
 const uploadChunkedFile = async (
     file: { size: number; raw: Blob; name: string },
     controller: AbortController,
diff --git a/frontend/src/views/host/firewall/docker/index.vue b/frontend/src/views/host/firewall/docker/index.vue
index ef48476fd20f..dad7502047bc 100644
--- a/frontend/src/views/host/firewall/docker/index.vue
+++ b/frontend/src/views/host/firewall/docker/index.vue
@@ -219,7 +219,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { computed, reactive, ref, watch } from 'vue';
 import FireRouter from '@/views/host/firewall/index.vue';
 import DockerGuardStatus from '@/views/host/firewall/docker/status/index.vue';
@@ -263,7 +263,14 @@ const openRuleTask = (taskID: string) => taskLogRef.value?.openWithTaskID(taskID
 const orphanDrawerVisible = ref(false);
 const orphanSearchName = ref('');
 const searchName = ref('');
-useSearchPersistence('host/firewall/docker/index', { search: searchName });
+useSearchReset(
+    { search: searchName },
+    {
+        onRevisit: () => {
+            paginationConfig.currentPage = 1;
+        },
+    },
+);
 const selects = ref<Firewall.DockerGuardContainer[]>([]);
 const orphanSelects = ref<Firewall.DockerGuardEndpoint[]>([]);
 const data = reactive<Firewall.DockerGuardList>({
diff --git a/frontend/src/views/host/firewall/forward/index.vue b/frontend/src/views/host/firewall/forward/index.vue
index 1751299e8a1c..f4bd467d92a2 100644
--- a/frontend/src/views/host/firewall/forward/index.vue
+++ b/frontend/src/views/host/firewall/forward/index.vue
@@ -117,14 +117,14 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import OperateDialog from './operate/index.vue';
 import ImportDialog from './import/index.vue';
 import FireRouter from '@/views/host/firewall/index.vue';
 import FireStatus from '@/views/host/firewall/status/index.vue';
 import RuleReset from '@/views/host/firewall/components/rule-reset.vue';
 import TaskLog from '@/components/log/task/index.vue';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { resetFirewallRules, operateForwardRule, searchForwardRule } from '@/api/modules/firewall';
 import { Firewall } from '@/api/interface/firewall';
 import { buildForwardRuleExport } from './transfer';
@@ -138,7 +138,6 @@ import { ElMessageBox } from 'element-plus';
 const loading = ref();
 const selects = ref<any>([]);
 const searchName = ref();
-useSearchPersistence('host/firewall/forward/index', { search: searchName });
 
 const isInit = ref(false);
 const isBind = ref(false);
@@ -189,6 +188,7 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('firewall-forward-page-size')) || 20,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const search = async () => {
     if (!isInit.value || !isBind.value || fireName.value === '-') {
diff --git a/frontend/src/views/host/firewall/rule/index.vue b/frontend/src/views/host/firewall/rule/index.vue
index 063d9bca0cde..b2665441d533 100644
--- a/frontend/src/views/host/firewall/rule/index.vue
+++ b/frontend/src/views/host/firewall/rule/index.vue
@@ -302,7 +302,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Firewall } from '@/api/interface/firewall';
 import type { FuTableOperationButton } from '@/components/table/shared';
 import { buildHostRuleExport } from './transfer';
@@ -330,7 +330,7 @@ import RuleReset from '@/views/host/firewall/components/rule-reset.vue';
 import TaskLog from '@/components/log/task/index.vue';
 import DockerRestart from '@/components/docker-proxy/docker-restart.vue';
 import { loadDockerStatus } from '@/api/modules/container';
-import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
+import { toRef, computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
 import { useElementSize } from '@vueuse/core';
 import { ElMessageBox } from 'element-plus';
 import { Expand, Loading, Lock, Refresh } from '@element-plus/icons-vue';
@@ -405,7 +405,6 @@ const showFirewallUnavailablePrompt = computed(
 const firewallVersion = ref('');
 const selectedRuleFilters = ref<RuleFilter[]>(loadCachedFilterValues(ruleFilterStorageKey, ruleFilterOptions, []));
 const searchName = ref('');
-useSearchPersistence('host/firewall/rule/index', { search: searchName });
 const inventoryItems = ref<Firewall.InventoryItem[]>([]);
 const positionRanges = ref<Partial<Record<Firewall.Family, Firewall.PositionRange>>>({});
 const inventoryTotal = ref(0);
@@ -433,6 +432,7 @@ const paginationConfig = reactive({
     pageSize: Number(localStorage.getItem('firewall-rule-page-size')) || 20,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const providerScopes = (): Firewall.Scope[] => {
     if (provider.value === 'iptables' || provider.value === 'nftables') {
diff --git a/frontend/src/views/host/ssh/log/log.vue b/frontend/src/views/host/ssh/log/log.vue
index d94918e65e0f..6c210f484c01 100644
--- a/frontend/src/views/host/ssh/log/log.vue
+++ b/frontend/src/views/host/ssh/log/log.vue
@@ -93,11 +93,11 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import { dateFormatServerTimezone } from '@/utils/date';
 import { downloadFile } from '@/utils/file';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { cleanSSHLogs, exportSSHLogs, loadSSHLogs } from '@/api/modules/host';
 import { useGlobalStore } from '@/composables/useGlobalStore';
 import i18n from '@/lang';
@@ -120,7 +120,7 @@ const exportConfig = reactive({
     status: 'All',
 });
 const searchInfo = ref();
-useSearchPersistence('host/ssh/log/log', { search: searchInfo });
+useSearchReset({ search: searchInfo, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const searchStatus = ref('All');
 
 const search = async () => {
diff --git a/frontend/src/views/host/ssh/session/index.vue b/frontend/src/views/host/ssh/session/index.vue
index 0389420e3adf..f67d6b5b8e93 100644
--- a/frontend/src/views/host/ssh/session/index.vue
+++ b/frontend/src/views/host/ssh/session/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import FireRouter from '@/views/host/ssh/index.vue';
 import { toRef, ref, onMounted, onUnmounted, reactive } from 'vue';
 import i18n from '@/lang';
@@ -38,7 +38,7 @@ const sshSearch = reactive({
     type: 'ssh',
     loginUser: '',
 });
-useSearchPersistence('host/ssh/session/index', { search: toRef(sshSearch, 'loginUser') });
+useSearchReset({ search: toRef(sshSearch, 'loginUser') }, { onRevisit: () => search() });
 
 const buttons = [
     {
diff --git a/frontend/src/views/log/host-system/index.vue b/frontend/src/views/log/host-system/index.vue
index 5bac4b411e2c..5461af0e8957 100644
--- a/frontend/src/views/log/host-system/index.vue
+++ b/frontend/src/views/log/host-system/index.vue
@@ -101,7 +101,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import { Log } from '@/api/interface/log';
 import { getSystemLogStatus, listRunningServices, readSystemLogs } from '@/api/modules/log';
@@ -114,7 +114,7 @@ const logs = ref<Log.SystemLogItem[]>([]);
 const loading = ref(false);
 const watching = ref(false);
 const keyword = ref('');
-useSearchPersistence('log/host-system/index', { keyword });
+useSearchReset({ keyword }, { onRevisit: () => scheduleFilterSearch() });
 const priority = ref('');
 const service = ref('');
 const services = ref<string[]>([]);
@@ -274,11 +274,13 @@ onUnmounted(() => {
     if (filterTimer) clearTimeout(filterTimer);
 });
 
-watch([keyword, priority, service], () => {
+const scheduleFilterSearch = () => {
     requestID++;
     if (filterTimer) clearTimeout(filterTimer);
     filterTimer = setTimeout(resetAndLoadLogs, 300);
-});
+};
+
+watch([keyword, priority, service], scheduleFilterSearch);
 </script>
 
 <style scoped lang="scss">
diff --git a/frontend/src/views/log/login/index.vue b/frontend/src/views/log/login/index.vue
index 9e967943cadb..b82eefd636dd 100644
--- a/frontend/src/views/log/login/index.vue
+++ b/frontend/src/views/log/login/index.vue
@@ -45,12 +45,12 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import LogRouter from '@/views/log/router/index.vue';
 import { dateFormat } from '@/utils/date';
 import { cleanLogs, getLoginLogs } from '@/api/modules/log';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { useGlobalStore } from '@/composables/useGlobalStore';
@@ -67,7 +67,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchInfo = ref<string>('');
-useSearchPersistence('log/login/index', { search: searchInfo });
+useSearchReset({ search: searchInfo, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const searchStatus = ref<string>('');
 
 const search = async () => {
diff --git a/frontend/src/views/log/operation/index.vue b/frontend/src/views/log/operation/index.vue
index f9594817106c..5c1f43d952b3 100644
--- a/frontend/src/views/log/operation/index.vue
+++ b/frontend/src/views/log/operation/index.vue
@@ -125,12 +125,12 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import LogRouter from '@/views/log/router/index.vue';
 import { dateFormat } from '@/utils/date';
 import { cleanLogs, getOperationLogs } from '@/api/modules/log';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { useGlobalStore } from '@/composables/useGlobalStore';
@@ -146,7 +146,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const searchName = ref<string>('');
-useSearchPersistence('log/operation/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const searchGroup = ref<string>('');
 const searchStatus = ref<string>('');
 const searchNode = ref<string>('');
diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue
index 5e089d6aca22..45da42208eb6 100644
--- a/frontend/src/views/setting/backup-account/index.vue
+++ b/frontend/src/views/setting/backup-account/index.vue
@@ -120,7 +120,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { dateFormat } from '@/utils/date';
 import { toRef, onMounted, ref } from 'vue';
 import { searchBackup, deleteBackup, refreshToken } from '@/api/modules/backup';
@@ -143,7 +143,10 @@ const paginationConfig = reactive({
     type: '',
     name: '',
 });
-useSearchPersistence('setting/backup-account/index', { search: toRef(paginationConfig, 'name') });
+useSearchReset(
+    { search: toRef(paginationConfig, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const opRef = ref();
 const dialogRef = ref();
 const detailRef = ref();
diff --git a/frontend/src/views/setting/snapshot/index.vue b/frontend/src/views/setting/snapshot/index.vue
index 2f1ec2aa9e51..9a4246c2b8c3 100644
--- a/frontend/src/views/setting/snapshot/index.vue
+++ b/frontend/src/views/setting/snapshot/index.vue
@@ -225,7 +225,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import {
     searchSnapshotPage,
     snapshotDelete,
@@ -233,7 +233,7 @@ import {
     snapshotRollback,
     updateSnapshotDescription,
 } from '@/api/modules/setting';
-import { onMounted, reactive, ref } from 'vue';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import { computeSize } from '@/utils/size';
 import { dateFormat } from '@/utils/date';
 import { newUUID } from '@/utils/id';
@@ -261,7 +261,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('setting/snapshot/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 
diff --git a/frontend/src/views/terminal/command/index.vue b/frontend/src/views/terminal/command/index.vue
index 8fa1c839d629..f4350a2d5573 100644
--- a/frontend/src/views/terminal/command/index.vue
+++ b/frontend/src/views/terminal/command/index.vue
@@ -100,13 +100,13 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Command } from '@/api/interface/command';
 import GroupDialog from '@/components/group/index.vue';
 import OperateDialog from '@/views/terminal/command/operate/index.vue';
 import ImportDialog from '@/views/terminal/command/import/index.vue';
 import { editCommand, deleteCommand, getCommandPage, exportCommands } from '@/api/modules/command';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { getGroupList } from '@/api/modules/group';
@@ -124,7 +124,7 @@ const paginationConfig = reactive({
     order: 'ascending',
 });
 const info = ref();
-useSearchPersistence('terminal/command/index', { search: info });
+useSearchReset({ search: info, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const group = ref<string>('');
 const dialogRef = ref();
 const opRef = ref();
diff --git a/frontend/src/views/terminal/host/index.vue b/frontend/src/views/terminal/host/index.vue
index fbe9822fb522..69a1bb315ac1 100644
--- a/frontend/src/views/terminal/host/index.vue
+++ b/frontend/src/views/terminal/host/index.vue
@@ -79,12 +79,12 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import GroupDialog from '@/components/agent-group/index.vue';
 import OperateDialog from '@/views/terminal/host/operate/index.vue';
 import { deleteHost, editHostGroup, searchHosts } from '@/api/modules/terminal';
 import { getAgentGroupList } from '@/api/modules/group';
-import { reactive, ref } from 'vue';
+import { toRef, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { Host } from '@/api/interface/host';
 import { MsgSuccess } from '@/utils/message';
@@ -100,7 +100,7 @@ const paginationConfig = reactive({
     total: 0,
 });
 const info = ref();
-useSearchPersistence('terminal/host/index', { search: info });
+useSearchReset({ search: info, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 const group = ref<string>('');
 
 const opRef = ref();
diff --git a/frontend/src/views/toolbox/clam/index.vue b/frontend/src/views/toolbox/clam/index.vue
index f791763711ad..b7728f59d618 100644
--- a/frontend/src/views/toolbox/clam/index.vue
+++ b/frontend/src/views/toolbox/clam/index.vue
@@ -190,8 +190,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { deleteClam, handleClamScan, searchClam, updateClam, updateClamStatus } from '@/api/modules/toolbox';
@@ -218,7 +218,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('toolbox/clam/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const opRef = ref();
 const dialogRef = ref();
diff --git a/frontend/src/views/toolbox/ftp/index.vue b/frontend/src/views/toolbox/ftp/index.vue
index fb31d9394efc..26adbbab297f 100644
--- a/frontend/src/views/toolbox/ftp/index.vue
+++ b/frontend/src/views/toolbox/ftp/index.vue
@@ -174,8 +174,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
-import { onMounted, reactive, ref } from 'vue';
+import { useSearchReset } from '@/composables/useSearchReset';
+import { toRef, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { MsgError, MsgSuccess } from '@/utils/message';
 import { deleteFtp, searchFtp, updateFtp, syncFtp, operateFtp, getFtpBase } from '@/api/modules/toolbox';
@@ -201,7 +201,7 @@ const paginationConfig = reactive({
     order: 'null',
 });
 const searchName = ref();
-useSearchPersistence('toolbox/ftp/index', { search: searchName });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const form = reactive({
     isActive: true,
diff --git a/frontend/src/views/website/runtime/php/extension-management/index.vue b/frontend/src/views/website/runtime/php/extension-management/index.vue
index 53dc92be752e..7183e0f8bd08 100644
--- a/frontend/src/views/website/runtime/php/extension-management/index.vue
+++ b/frontend/src/views/website/runtime/php/extension-management/index.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup lang="ts">
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Runtime } from '@/api/interface/runtime';
 import { GetPHPExtensions, InstallPHPExtension, UnInstallPHPExtension } from '@/api/modules/runtime';
 import i18n from '@/lang';
@@ -49,7 +49,7 @@ const supportExtensions = ref([]);
 const loading = ref(false);
 const taskLogRef = ref();
 const searchName = ref('');
-useSearchPersistence('website/runtime/php/extension-management/index', { search: searchName });
+useSearchReset({ search: searchName }, { onRevisit: () => searchByName() });
 const data = ref([]);
 
 const handleClose = () => {
diff --git a/frontend/src/views/website/ssl/create/index.vue b/frontend/src/views/website/ssl/create/index.vue
index 5c244d969110..bdb7d976737b 100644
--- a/frontend/src/views/website/ssl/create/index.vue
+++ b/frontend/src/views/website/ssl/create/index.vue
@@ -179,7 +179,7 @@ import { Rules, checkMaxLength } from '@/global/form-rules';
 import FileList from '@/components/file-list/index.vue';
 import i18n from '@/lang';
 import { FormInstance } from 'element-plus';
-import { computed, reactive, ref } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import { MsgSuccess } from '@/utils/message';
 import { KeyTypes } from '@/global/mimetype';
 import { getDNSName, getAccountName } from '@/utils/ssl';
@@ -265,6 +265,15 @@ const initData = () => ({
 
 const ssl = ref(initData());
 const operate = ref('create');
+watch([() => ssl.value.acmeAccountId, acmeAccounts], () => {
+    if (operate.value !== 'create' || ssl.value.provider === 'selfSigned') {
+        return;
+    }
+    const account = acmeAccounts.value?.find((item) => item.id === ssl.value.acmeAccountId);
+    if (account?.keyType) {
+        ssl.value.keyType = account.keyType;
+    }
+});
 const dnsResolve = ref<Website.DNSResolve[]>([]);
 const em = defineEmits(['close', 'submit']);
 
diff --git a/frontend/src/views/website/ssl/index.vue b/frontend/src/views/website/ssl/index.vue
index 24fba751a3ab..44eda5ba77b0 100644
--- a/frontend/src/views/website/ssl/index.vue
+++ b/frontend/src/views/website/ssl/index.vue
@@ -221,7 +221,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { toRef, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { deleteSSL, downloadFile, pushSSLToNode, searchSSL, updateSSL } from '@/api/modules/website';
 import DnsAccount from './dns-account/index.vue';
@@ -287,7 +287,10 @@ const req = reactive({
     orderBy: 'updated_at',
     order: 'descending',
 });
-useSearchPersistence('website/ssl/index', { search: toRef(req, 'domain') });
+useSearchReset(
+    { search: toRef(req, 'domain'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const pushForm = ref({
     id: 0,
     pushNode: true,
diff --git a/frontend/src/views/website/ssl/upload/index.vue b/frontend/src/views/website/ssl/upload/index.vue
index dd869dd5380f..2790e6e56f50 100644
--- a/frontend/src/views/website/ssl/upload/index.vue
+++ b/frontend/src/views/website/ssl/upload/index.vue
@@ -9,37 +9,37 @@
                 </el-select>
             </el-form-item>
             <div v-if="ssl.type === 'paste'">
-                <el-form-item :label="$t('website.privateKey')" prop="privateKey">
-                    <el-input v-model="ssl.privateKey" :rows="6" type="textarea" />
-                </el-form-item>
                 <el-form-item :label="$t('website.certificate')" prop="certificate">
                     <el-input v-model="ssl.certificate" :rows="6" type="textarea" />
                 </el-form-item>
+                <el-form-item :label="$t('website.privateKey')" prop="privateKey">
+                    <el-input v-model="ssl.privateKey" :rows="6" type="textarea" />
+                </el-form-item>
             </div>
             <div v-if="ssl.type === 'local'">
-                <el-form-item :label="$t('website.privateKeyPath')" prop="privateKeyPath">
-                    <el-input v-model="ssl.privateKeyPath">
+                <el-form-item :label="$t('website.certificatePath')" prop="certificatePath">
+                    <el-input v-model="ssl.certificatePath">
                         <template #prepend>
-                            <el-button icon="Folder" @click="keyFileRef.acceptParams({ dir: false })" />
+                            <el-button icon="Folder" @click="certFileRef.acceptParams({ dir: false })" />
                         </template>
                     </el-input>
                 </el-form-item>
-                <el-form-item :label="$t('website.certificatePath')" prop="certificatePath">
-                    <el-input v-model="ssl.certificatePath">
+                <el-form-item :label="$t('website.privateKeyPath')" prop="privateKeyPath">
+                    <el-input v-model="ssl.privateKeyPath">
                         <template #prepend>
-                            <el-button icon="Folder" @click="certFileRef.acceptParams({ dir: false })" />
+                            <el-button icon="Folder" @click="keyFileRef.acceptParams({ dir: false })" />
                         </template>
                     </el-input>
                 </el-form-item>
             </div>
             <div v-if="ssl.type === 'upload'">
-                <el-form-item :label="$t('website.privateKey')" prop="privateKeyFile">
+                <el-form-item :label="$t('website.certificate')" prop="certificateFile">
                     <el-upload
-                        ref="privateKeyUpload"
+                        ref="certificateUpload"
                         :auto-upload="false"
                         :limit="1"
-                        :on-change="handlePrivateKeyChange"
-                        :file-list="privateKeyFileList"
+                        :on-change="handleCertificateChange"
+                        :file-list="certificateFileList"
                         class="p-w-200"
                     >
                         <template #trigger>
@@ -49,13 +49,13 @@
                         </template>
                     </el-upload>
                 </el-form-item>
-                <el-form-item :label="$t('website.certificate')" prop="certificateFile">
+                <el-form-item :label="$t('website.privateKey')" prop="privateKeyFile">
                     <el-upload
-                        ref="certificateUpload"
+                        ref="privateKeyUpload"
                         :auto-upload="false"
                         :limit="1"
-                        :on-change="handleCertificateChange"
-                        :file-list="certificateFileList"
+                        :on-change="handlePrivateKeyChange"
+                        :file-list="privateKeyFileList"
                         class="p-w-200"
                     >
                         <template #trigger>
diff --git a/frontend/src/views/website/template/index.vue b/frontend/src/views/website/template/index.vue
index de057f9e6221..d9463795a60b 100644
--- a/frontend/src/views/website/template/index.vue
+++ b/frontend/src/views/website/template/index.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import { Website } from '@/api/interface/website';
 import { deleteTemplate, searchTemplates } from '@/api/modules/website';
 import TemplateOperate from '@/views/website/template/operate/index.vue';
@@ -67,12 +67,11 @@ import OutputCreate from '@/views/website/template/output/create.vue';
 import OutputList from '@/views/website/template/output/index.vue';
 import { dateFormat } from '@/utils/date';
 import i18n from '@/lang';
-import { reactive, ref, onMounted } from 'vue';
+import { toRef, reactive, ref, onMounted } from 'vue';
 
 const loading = ref(false);
 const data = ref<Website.Template[]>([]);
 const searchName = ref('');
-useSearchPersistence('website/template/index', { search: searchName });
 const opRef = ref();
 const operateRef = ref();
 const outputCreateRef = ref();
@@ -91,6 +90,7 @@ const paginationConfig = reactive({
     pageSize: 20,
     total: 0,
 });
+useSearchReset({ search: searchName, page: toRef(paginationConfig, 'currentPage') }, { onRevisit: () => search() });
 
 const buttons = [
     {
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 9098803d11bf..cba937c2ef18 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -346,7 +346,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useSearchPersistence } from '@/composables/useSearchPersistence';
+import { useSearchReset } from '@/composables/useSearchReset';
 import Backups from '@/components/backup/index.vue';
 import UploadDialog from '@/components/upload/index.vue';
 import DefaultServer from '@/views/website/website/default/index.vue';
@@ -451,7 +451,10 @@ const pageState = usePageState(() => ({
 }));
 const paginationConfig = pageState.paginationConfig;
 const req = pageState.req;
-useSearchPersistence('website/website/index', { search: toRef(req, 'name') });
+useSearchReset(
+    { search: toRef(req, 'name'), page: toRef(paginationConfig, 'currentPage') },
+    { onRevisit: () => search() },
+);
 const tableSort = pageState.tableSort;
 
 const goRouter = async (key: string) => {