fix: harden agent snapshot restore flow

main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentSnapshotController.java

@@ -6,17 +6,20 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.agent.dto.AgentSnapshotPageDTO;
+import xiaozhi.modules.agent.dto.AgentSnapshotRestoreDTO;
 import xiaozhi.modules.agent.service.AgentService;
 import xiaozhi.modules.agent.service.AgentSnapshotService;
 import xiaozhi.modules.agent.vo.AgentSnapshotVO;
@@ -51,9 +54,10 @@ public class AgentSnapshotController {
     @PostMapping("/{snapshotId}/restore")
     @Operation(summary = "恢复智能体快照")
     @RequiresPermissions("sys:role:normal")
-    public Result<Void> restore(@PathVariable String agentId, @PathVariable String snapshotId) {
+    public Result<Void> restore(@PathVariable String agentId, @PathVariable String snapshotId,
+            @RequestBody @Valid AgentSnapshotRestoreDTO request) {
         checkPermission(agentId);
-        agentSnapshotService.restoreSnapshot(agentId, snapshotId);
+        agentSnapshotService.restoreSnapshot(agentId, snapshotId, request.getCurrentStateToken());
         return new Result<>();
     }
 

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java

@@ -43,4 +43,13 @@ public interface AgentDao extends BaseDao<AgentEntity> {
      * @param agentId 智能体ID
      */
     AgentEntity selectByIdForUpdate(@Param("agentId") String agentId);
+
+    /**
+     * 精确写入快照覆盖的智能体字段，包括目标快照中的 null 值。
+     * 不更新所属用户、创建信息等不属于快照的字段。
+     *
+     * @param agent 已应用目标快照的智能体
+     * @return 受影响行数
+     */
+    int updateSnapshotFields(@Param("agent") AgentEntity agent);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentSnapshotDao.java

@@ -1,5 +1,7 @@
 package xiaozhi.modules.agent.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,4 +19,11 @@ public interface AgentSnapshotDao extends BaseDao<AgentSnapshotEntity> {
     int insertWithNextVersion(@Param("snapshot") AgentSnapshotEntity snapshot);
 
     int deleteOlderThanKeepLimit(@Param("agentId") String agentId, @Param("keepLimit") int keepLimit);
+
+    List<AgentSnapshotEntity> selectLegacyRedactionBatch(@Param("afterId") String afterId,
+            @Param("limit") int limit,
+            @Param("targetRedactionVersion") int targetRedactionVersion);
+
+    int updateRedactedSnapshots(@Param("snapshots") List<AgentSnapshotEntity> snapshots,
+            @Param("redactionVersion") int redactionVersion);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentSnapshotRestoreDTO.java

@@ -0,0 +1,13 @@
+package xiaozhi.modules.agent.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+@Schema(description = "智能体快照恢复请求")
+public class AgentSnapshotRestoreDTO {
+    @NotBlank
+    @Schema(description = "预览时由服务端生成的当前配置状态指纹")
+    private String currentStateToken;
+}

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentSnapshotEntity.java

@@ -47,4 +47,7 @@ public class AgentSnapshotEntity {
 
     @Schema(description = "创建时间")
     private Date createdAt;
+
+    @Schema(description = "快照数据脱敏规则版本")
+    private Integer redactionVersion;
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentSnapshotService.java

@@ -13,11 +13,13 @@ public interface AgentSnapshotService extends BaseService<AgentSnapshotEntity> {
 
     AgentSnapshotVO getSnapshot(String agentId, String snapshotId);
 
-    void restoreSnapshot(String agentId, String snapshotId);
+    void restoreSnapshot(String agentId, String snapshotId, String currentStateToken);
 
     void deleteSnapshot(String agentId, String snapshotId);
 
     Integer getCurrentVersionNo(String agentId);
 
     void deleteByAgentId(String agentId);
+
+    long redactLegacySnapshots();
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java

@@ -311,8 +311,9 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
 
         // 锁定后查询现有实体和关联配置
         AgentEntity existingEntity = this.getAgentById(agentId);
-        if (createSnapshot && agentSnapshotService.getCurrentVersionNo(agentId) == 0) {
+        if (createSnapshot) {
-            agentSnapshotService.createSnapshot(agentId, "initial");
+            int currentVersionNo = agentSnapshotService.getCurrentVersionNo(agentId);
+            agentSnapshotService.createSnapshot(agentId, currentVersionNo == 0 ? "initial" : "current");
         }
 
         // 只更新提供的非空字段

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentSnapshotRedactionRunner.java

@@ -0,0 +1,59 @@
+package xiaozhi.modules.agent.service.impl;
+
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import xiaozhi.modules.agent.service.AgentSnapshotService;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AgentSnapshotRedactionRunner implements SmartInitializingSingleton {
+    static final long ROLLING_DEPLOYMENT_INITIAL_DELAY_MILLIS = 5_000;
+    static final long ROLLING_DEPLOYMENT_FIXED_DELAY_MILLIS = 15_000;
+
+    private final AgentSnapshotService agentSnapshotService;
+
+    @Override
+    public void afterSingletonsInstantiated() {
+        redactAndReport("startup");
+    }
+
+    @Scheduled(initialDelay = ROLLING_DEPLOYMENT_INITIAL_DELAY_MILLIS,
+            fixedDelay = ROLLING_DEPLOYMENT_FIXED_DELAY_MILLIS)
+    public void redactLateRollingDeploymentWrites() {
+        redactAndReport("rolling-deployment");
+    }
+
+    private void redactAndReport(String trigger) {
+        long startedAt = System.nanoTime();
+        try {
+            long migrated = agentSnapshotService.redactLegacySnapshots();
+            long durationMillis = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startedAt);
+            if (migrated > 0) {
+                log.warn("Agent snapshot legacy redaction trigger={} migrated={} durationMs={}. Rotate credentials "
+                        + "that may have appeared in historical snapshot URLs, cookies, sessions, or structured "
+                        + "headers.", trigger, migrated, durationMillis);
+            } else if ("startup".equals(trigger)) {
+                log.info("Agent snapshot legacy redaction startup pass completed: migrated=0 durationMs={}; "
+                        + "rolling-deployment compensation starts after {} ms and repeats every {} ms.",
+                        durationMillis, ROLLING_DEPLOYMENT_INITIAL_DELAY_MILLIS,
+                        ROLLING_DEPLOYMENT_FIXED_DELAY_MILLIS);
+            }
+        } catch (RuntimeException exception) {
+            if ("startup".equals(trigger)) {
+                log.error("Agent snapshot legacy redaction failed during startup; blocking application startup "
+                        + "before it can accept traffic.", exception);
+            } else {
+                log.error("Agent snapshot legacy redaction failed during rolling-deployment compensation; the "
+                        + "scheduler will retry on its next run.", exception);
+            }
+            throw exception;
+        }
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/agent/vo/AgentSnapshotVO.java

@@ -18,13 +18,17 @@ public class AgentSnapshotVO {
     private List<String> changedFields;
     private List<String> fieldOrder;
     private String source;
-    @Schema(description = "恢复来源快照ID，仅恢复前自动备份版本有值")
+    @Schema(description = "恢复来源快照ID，仅恢复结果版本有值")
     private String restoreFromSnapshotId;
-    @Schema(description = "恢复来源版本号，仅恢复前自动备份版本有值")
+    @Schema(description = "恢复来源版本号，仅恢复结果版本有值")
     private Integer restoreFromVersionNo;
     @Schema(description = "创建者，表示触发本次快照写入的操作人")
     private Long creator;
     private Date createdAt;
     private AgentSnapshotDataDTO snapshotData;
     private AgentSnapshotDataDTO afterSnapshotData;
+    @Schema(description = "恢复预览对应的脱敏当前配置，仅详情接口有值")
+    private AgentSnapshotDataDTO currentSnapshotData;
+    @Schema(description = "恢复预览对应的当前配置状态指纹，仅详情接口有值")
+    private String currentStateToken;
 }

main/manager-api/src/main/resources/db/changelog/202607101200.sql

@@ -0,0 +1,8 @@
+-- liquibase formatted sql
+
+-- changeset tykechen:202607101200
+ALTER TABLE `ai_agent_snapshot`
+    ADD COLUMN `redaction_version` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '快照脱敏规则版本' AFTER `created_at`,
+    ADD INDEX `idx_snapshot_redaction_version_id` (`redaction_version`, `id`);
+
+-- rollback ALTER TABLE `ai_agent_snapshot` DROP INDEX `idx_snapshot_redaction_version_id`, DROP COLUMN `redaction_version`;

main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -704,3 +704,10 @@ databaseChangeLog:
         - sqlFile:
             encoding: utf8
             path: classpath:db/changelog/202607071530.sql
+  - changeSet:
+      id: 202607101200
+      author: tykechen
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202607101200.sql

main/manager-api/src/main/resources/mapper/agent/AgentDao.xml

@@ -89,4 +89,32 @@
         FOR UPDATE
     </select>
 
+    <update id="updateSnapshotFields">
+        UPDATE ai_agent
+        SET agent_code = #{agent.agentCode,jdbcType=VARCHAR},
+            agent_name = #{agent.agentName,jdbcType=VARCHAR},
+            asr_model_id = #{agent.asrModelId,jdbcType=VARCHAR},
+            vad_model_id = #{agent.vadModelId,jdbcType=VARCHAR},
+            llm_model_id = #{agent.llmModelId,jdbcType=VARCHAR},
+            slm_model_id = #{agent.slmModelId,jdbcType=VARCHAR},
+            vllm_model_id = #{agent.vllmModelId,jdbcType=VARCHAR},
+            tts_model_id = #{agent.ttsModelId,jdbcType=VARCHAR},
+            tts_voice_id = #{agent.ttsVoiceId,jdbcType=VARCHAR},
+            tts_language = #{agent.ttsLanguage,jdbcType=VARCHAR},
+            tts_volume = #{agent.ttsVolume,jdbcType=INTEGER},
+            tts_rate = #{agent.ttsRate,jdbcType=INTEGER},
+            tts_pitch = #{agent.ttsPitch,jdbcType=INTEGER},
+            mem_model_id = #{agent.memModelId,jdbcType=VARCHAR},
+            intent_model_id = #{agent.intentModelId,jdbcType=VARCHAR},
+            chat_history_conf = #{agent.chatHistoryConf,jdbcType=INTEGER},
+            system_prompt = #{agent.systemPrompt,jdbcType=LONGVARCHAR},
+            summary_memory = #{agent.summaryMemory,jdbcType=LONGVARCHAR},
+            lang_code = #{agent.langCode,jdbcType=VARCHAR},
+            language = #{agent.language,jdbcType=VARCHAR},
+            sort = #{agent.sort,jdbcType=INTEGER},
+            updater = #{agent.updater,jdbcType=BIGINT},
+            updated_at = #{agent.updatedAt,jdbcType=TIMESTAMP}
+        WHERE id = #{agent.id}
+    </update>
+
 </mapper>

main/manager-api/src/main/resources/mapper/agent/AgentSnapshotDao.xml

@@ -19,7 +19,8 @@
                restore_from_snapshot_id AS restoreFromSnapshotId,
                restore_from_version_no  AS restoreFromVersionNo,
                creator,
-               created_at     AS createdAt
+               created_at     AS createdAt,
+               redaction_version AS redactionVersion
         FROM ai_agent_snapshot
         WHERE agent_id = #{agentId}
         ORDER BY version_no DESC
@@ -37,7 +38,8 @@
                restore_from_snapshot_id AS restoreFromSnapshotId,
                restore_from_version_no  AS restoreFromVersionNo,
                creator,
-               created_at     AS createdAt
+               created_at     AS createdAt,
+               redaction_version AS redactionVersion
         FROM ai_agent_snapshot
         WHERE agent_id = #{agentId}
           AND version_no > #{versionNo}
@@ -57,7 +59,8 @@
             restore_from_snapshot_id,
             restore_from_version_no,
             creator,
-            created_at
+            created_at,
+            redaction_version
         )
         SELECT #{snapshot.id},
                #{snapshot.agentId},
@@ -69,7 +72,8 @@
                #{snapshot.restoreFromSnapshotId},
                #{snapshot.restoreFromVersionNo},
                #{snapshot.creator},
-               #{snapshot.createdAt}
+               #{snapshot.createdAt},
+               #{snapshot.redactionVersion}
         FROM ai_agent_snapshot
         WHERE agent_id = #{snapshot.agentId}
     </insert>
@@ -89,4 +93,31 @@
           )
     </delete>
 
+    <select id="selectLegacyRedactionBatch" resultType="xiaozhi.modules.agent.entity.AgentSnapshotEntity">
+        SELECT id,
+               snapshot_data AS snapshotData,
+               redaction_version AS redactionVersion
+        FROM ai_agent_snapshot
+        WHERE redaction_version &lt; #{targetRedactionVersion}
+          AND (#{afterId} IS NULL OR id &gt; #{afterId})
+        ORDER BY id ASC
+        LIMIT #{limit}
+    </select>
+
+    <update id="updateRedactedSnapshots">
+        UPDATE ai_agent_snapshot
+        SET snapshot_data = CASE id
+            <foreach collection="snapshots" item="snapshot">
+                WHEN #{snapshot.id} THEN #{snapshot.snapshotData}
+            </foreach>
+            ELSE snapshot_data
+            END,
+            redaction_version = #{redactionVersion}
+        WHERE redaction_version &lt; #{redactionVersion}
+          AND id IN
+          <foreach collection="snapshots" item="snapshot" open="(" separator="," close=")">
+              #{snapshot.id}
+          </foreach>
+    </update>
+
 </mapper>

main/manager-api/src/test/java/xiaozhi/modules/agent/service/impl/AgentSnapshotRedactionRunnerTest.java

@@ -0,0 +1,77 @@
+package xiaozhi.modules.agent.service.impl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import xiaozhi.modules.agent.service.AgentSnapshotService;
+
+@ExtendWith(OutputCaptureExtension.class)
+class AgentSnapshotRedactionRunnerTest {
+
+    @Test
+    void startupRedactionRunsSynchronouslyAndReportsCompensationWindow(CapturedOutput output) {
+        assertTrue(SmartInitializingSingleton.class.isAssignableFrom(AgentSnapshotRedactionRunner.class));
+        AgentSnapshotService service = mock(AgentSnapshotService.class);
+        AgentSnapshotRedactionRunner runner = new AgentSnapshotRedactionRunner(service);
+        when(service.redactLegacySnapshots()).thenReturn(0L);
+
+        runner.afterSingletonsInstantiated();
+
+        verify(service).redactLegacySnapshots();
+        assertTrue(output.getAll().contains("startup pass completed"));
+        assertTrue(output.getAll().contains("starts after 5000 ms and repeats every 15000 ms"));
+    }
+
+    @Test
+    void startupRedactionFailureIsLoggedAndPropagatedToKeepStartupFailClosed(CapturedOutput output) {
+        AgentSnapshotService service = mock(AgentSnapshotService.class);
+        AgentSnapshotRedactionRunner runner = new AgentSnapshotRedactionRunner(service);
+        IllegalStateException failure = new IllegalStateException("database unavailable");
+        when(service.redactLegacySnapshots()).thenThrow(failure);
+
+        IllegalStateException thrown = assertThrows(IllegalStateException.class,
+                runner::afterSingletonsInstantiated);
+
+        assertSame(failure, thrown);
+        assertTrue(output.getAll().contains("blocking application startup before it can accept traffic"));
+    }
+
+    @Test
+    void rollingDeploymentRedactionReportsTriggerCountAndCredentialRotation(CapturedOutput output) {
+        AgentSnapshotService service = mock(AgentSnapshotService.class);
+        AgentSnapshotRedactionRunner runner = new AgentSnapshotRedactionRunner(service);
+        when(service.redactLegacySnapshots()).thenReturn(3L);
+
+        runner.redactLateRollingDeploymentWrites();
+
+        assertTrue(output.getAll().contains("trigger=rolling-deployment migrated=3"));
+        assertTrue(output.getAll().contains("Rotate credentials"));
+    }
+
+    @Test
+    void rollingDeploymentScheduleKeepsLegacyWriteExposureWindowShort() throws Exception {
+        Method method = AgentSnapshotRedactionRunner.class.getMethod("redactLateRollingDeploymentWrites");
+        Scheduled scheduled = method.getAnnotation(Scheduled.class);
+
+        assertNotNull(scheduled);
+        assertEquals(5_000, scheduled.initialDelay());
+        assertEquals(15_000, scheduled.fixedDelay());
+        assertTrue(scheduled.initialDelay() <= 10_000);
+        assertTrue(scheduled.fixedDelay() <= 30_000);
+    }
+}

main/manager-mobile/package.json

@@ -69,6 +69,7 @@
     "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
     "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
     "type-check": "vue-tsc --noEmit",
+    "test:snapshot": "node --test src/pages/agent/components/agentSnapshotUtils.test.mjs src/pages/agent/components/agentSnapshotContracts.test.mjs",
     "openapi-ts-request": "openapi-ts",
     "prepare": "git init && husky",
     "lint": "eslint",

main/manager-mobile/src/api/agent/agent.ts

@@ -253,11 +253,11 @@ export function getAgentSnapshot(agentId: string, snapshotId: string) {
 }
 
 // 恢复智能体历史版本
-export function restoreAgentSnapshot(agentId: string, snapshotId: string) {
+export function restoreAgentSnapshot(agentId: string, snapshotId: string, currentStateToken: string) {
-  return http.Post(`/agent/${agentId}/snapshots/${snapshotId}/restore`, {}, {
+  return http.Post(`/agent/${agentId}/snapshots/${snapshotId}/restore`, { currentStateToken }, {
     meta: {
       ignoreAuth: false,
-      toast: true,
+      toast: false,
     },
   })
 }
@@ -267,7 +267,7 @@ export function deleteAgentSnapshot(agentId: string, snapshotId: string) {
   return http.Delete(`/agent/${agentId}/snapshots/${snapshotId}`, {
     meta: {
       ignoreAuth: false,
-      toast: true,
+      toast: false,
     },
   })
 }

main/manager-mobile/src/api/agent/types.ts

@@ -87,14 +87,16 @@ export interface AgentSnapshotData extends Partial<AgentDetail> {
 export interface AgentSnapshot {
   id: string
   agentId: string
-  userId?: number
+  userId?: string
   versionNo: number
   changedFields?: string[]
   fieldOrder?: string[]
   source?: string
   restoreFromSnapshotId?: string | null
   restoreFromVersionNo?: number | null
-  creator?: number
+  currentStateToken?: string
+  currentSnapshotData?: AgentSnapshotData
+  creator?: string
   createdAt?: string
   snapshotData?: AgentSnapshotData
   afterSnapshotData?: AgentSnapshotData

main/manager-mobile/src/i18n/de.ts

@@ -130,6 +130,7 @@ export default {
   'agent.saving': 'Wird gespeichert...',
   'agent.saveSuccess': 'Erfolgreich gespeichert',
   'agent.saveFail': 'Speichern fehlgeschlagen',
+  'agent.ttsOptionsLoadFailed': 'Die Sprachoptionen konnten nicht geladen werden. Die vorherigen Einstellungen wurden beibehalten.',
   'agent.loadFail': 'Laden fehlgeschlagen',
   'agent.pleaseInputAgentName': 'Bitte Agenten-Namen eingeben',
   'agent.pleaseInputRoleDescription': 'Bitte Rollenbeschreibung eingeben',
@@ -161,7 +162,7 @@ export default {
   'agentSnapshot.detailTitle': 'Änderungsdetails',
   'agentSnapshot.restorePreviewTitle': 'Wiederherstellungsvorschau',
   'agentSnapshot.confirmRestore': 'Wiederherstellung bestätigen',
-  'agentSnapshot.currentVersion': 'Aktuelle Version',
+  'agentSnapshot.currentVersion': 'Neuester Snapshot',
   'agentSnapshot.beforeChange': 'Vorher',
   'agentSnapshot.afterChange': 'Nachher',
   'agentSnapshot.beforeRestore': 'Vor der Wiederherstellung',
@@ -169,11 +170,22 @@ export default {
   'agentSnapshot.configValue': 'Konfigurationswert',
   'agentSnapshot.emptyValue': 'Keine',
   'agentSnapshot.secretRedacted': 'Geheimnis verborgen',
+  'agentSnapshot.redactedValueChanged': 'Der Wert ist ausgeblendet, wurde aber geändert',
   'agentSnapshot.noChangedContent': 'Keine anzeigbaren Änderungen',
-  'agentSnapshot.restoreConfirm': 'Version #{version} wiederherstellen? Die aktuelle Konfiguration wird zuerst als neue Version gespeichert.',
+  'agentSnapshot.recordedChange': 'Bei der Aufzeichnung geändert',
+  'agentSnapshot.noRestoreNeeded': 'Die aktuelle Konfiguration entspricht bereits dieser Version',
+  'agentSnapshot.unsavedChangesTitle': 'Nicht gespeicherte Änderungen',
+  'agentSnapshot.unsavedChangesWarning': 'Beim Fortfahren werden die nicht gespeicherten Änderungen auf dieser Seite verworfen.',
+  'agentSnapshot.discardAndRestore': 'Verwerfen und wiederherstellen',
+  'agentSnapshot.restoreConfirm': 'Version #{version} wiederherstellen? Die aktuelle Konfiguration bleibt im Verlauf erhalten.',
   'agentSnapshot.restoreMemoryWarning': 'Beim Wiederherstellen einer Version ohne Speicher wird der Chatverlauf dieses Agenten gelöscht. Bitte Risiko bestätigen.',
+  'agentSnapshot.restoreChatHistoryDestructiveWarning': 'Diese Wiederherstellung löscht den vorhandenen Chatverlauf dieses Agenten dauerhaft. Der Chatverlauf ist nicht in Konfigurations-Snapshots enthalten und kann nicht über den Versionsverlauf wiederhergestellt werden.',
   'agentSnapshot.restoreSuccess': 'Version wurde wiederhergestellt',
   'agentSnapshot.restoreFailed': 'Version konnte nicht wiederhergestellt werden',
+  'agentSnapshot.reloadAfterRestorePending': 'Die wiederhergestellte Konfiguration und die Tags werden neu geladen. Speichern ist bis zum Abschluss deaktiviert.',
+  'agentSnapshot.reloadAfterRestoreFailed': 'Die wiederhergestellte Konfiguration oder die Tags konnten nicht neu geladen werden. Speichern bleibt deaktiviert, damit veraltete Daten die Wiederherstellung nicht überschreiben. Bitte erneut versuchen.',
+  'agentSnapshot.retryReload': 'Neu laden',
+  'agentSnapshot.mutationBusy': 'Die Konfiguration wird gespeichert oder neu geladen. Bitte warten Sie, bevor Sie den Versionsverlauf öffnen oder eine Wiederherstellung starten.',
   'agentSnapshot.deleteConfirm': 'Version #{version} löschen? Dies kann nicht rückgängig gemacht werden.',
   'agentSnapshot.deleteSuccess': 'Version gelöscht',
   'agentSnapshot.deleteFailed': 'Version konnte nicht gelöscht werden',
@@ -182,7 +194,7 @@ export default {
   'agentSnapshot.correctWordCount': '{count} Ersatzwörter',
   'agentSnapshot.source.config': 'Konfiguration gespeichert',
   'agentSnapshot.source.current': 'Aktuelle Konfiguration',
-  'agentSnapshot.source.restore': 'Vor der Wiederherstellung',
+  'agentSnapshot.source.restore': 'Wiederhergestellt',
   'agentSnapshot.source.initial': 'Initialversion',
   'agentSnapshot.field.initial': 'Initialer Snapshot',
   'agentSnapshot.field.agentCode': 'Agent-Code',

main/manager-mobile/src/i18n/en.ts

@@ -130,6 +130,7 @@ export default {
   'agent.saving': 'Saving...',
   'agent.saveSuccess': 'Save successful',
   'agent.saveFail': 'Save failed',
+  'agent.ttsOptionsLoadFailed': 'Voice options could not be loaded. The previous voice settings were kept.',
   'agent.loadFail': 'Load failed',
   'agent.pleaseInputAgentName': 'Please input agent name',
   'agent.pleaseInputRoleDescription': 'Please input role description',
@@ -161,7 +162,7 @@ export default {
   'agentSnapshot.detailTitle': 'Change Details',
   'agentSnapshot.restorePreviewTitle': 'Restore Preview',
   'agentSnapshot.confirmRestore': 'Confirm Restore',
-  'agentSnapshot.currentVersion': 'Current Version',
+  'agentSnapshot.currentVersion': 'Latest Snapshot',
   'agentSnapshot.beforeChange': 'Before',
   'agentSnapshot.afterChange': 'After',
   'agentSnapshot.beforeRestore': 'Before Restore',
@@ -169,11 +170,22 @@ export default {
   'agentSnapshot.configValue': 'Config Value',
   'agentSnapshot.emptyValue': 'None',
   'agentSnapshot.secretRedacted': 'Secret hidden',
+  'agentSnapshot.redactedValueChanged': 'The value is hidden, but it did change',
   'agentSnapshot.noChangedContent': 'No displayable changes',
-  'agentSnapshot.restoreConfirm': 'Restore to version #{version}? The current config will be saved as a new version first.',
+  'agentSnapshot.recordedChange': 'Changed when recorded',
+  'agentSnapshot.noRestoreNeeded': 'The current configuration already matches this version',
+  'agentSnapshot.unsavedChangesTitle': 'Unsaved changes',
+  'agentSnapshot.unsavedChangesWarning': 'Continuing will discard the unsaved changes on this page.',
+  'agentSnapshot.discardAndRestore': 'Discard and restore',
+  'agentSnapshot.restoreConfirm': 'Restore to version #{version}? The current configuration will remain available in history.',
   'agentSnapshot.restoreMemoryWarning': 'Restoring to a no-memory version will clear this agent\'s chat history. Please confirm the risk.',
+  'agentSnapshot.restoreChatHistoryDestructiveWarning': 'This restore will permanently delete this agent\'s existing chat history. Chat history is not included in configuration snapshots and cannot be recovered from version history.',
   'agentSnapshot.restoreSuccess': 'Version restored',
   'agentSnapshot.restoreFailed': 'Failed to restore version',
+  'agentSnapshot.reloadAfterRestorePending': 'Reloading the restored configuration and tags. Saving is disabled until this completes.',
+  'agentSnapshot.reloadAfterRestoreFailed': 'The restored configuration or tags could not be reloaded. Saving remains disabled to prevent stale data from overwriting the restore. Please retry.',
+  'agentSnapshot.retryReload': 'Reload',
+  'agentSnapshot.mutationBusy': 'The configuration is being saved or reloaded. Wait for it to finish before opening version history or restoring.',
   'agentSnapshot.deleteConfirm': 'Delete version #{version}? This cannot be undone.',
   'agentSnapshot.deleteSuccess': 'Version deleted',
   'agentSnapshot.deleteFailed': 'Failed to delete version',
@@ -182,7 +194,7 @@ export default {
   'agentSnapshot.correctWordCount': '{count} replacement words',
   'agentSnapshot.source.config': 'Config Save',
   'agentSnapshot.source.current': 'Current Config',
-  'agentSnapshot.source.restore': 'Before Restore',
+  'agentSnapshot.source.restore': 'Restored',
   'agentSnapshot.source.initial': 'Initial Version',
   'agentSnapshot.field.initial': 'Initial Snapshot',
   'agentSnapshot.field.agentCode': 'Agent Code',

main/manager-mobile/src/i18n/pt_BR.ts

@@ -130,6 +130,7 @@ export default {
   'agent.saving': 'Salvando...',
   'agent.saveSuccess': 'Salvo com sucesso',
   'agent.saveFail': 'Falha ao salvar',
+  'agent.ttsOptionsLoadFailed': 'Não foi possível carregar as opções de voz. As configurações anteriores foram mantidas.',
   'agent.loadFail': 'Falha ao carregar',
   'agent.pleaseInputAgentName': 'Por favor, insira o nome do agente',
   'agent.pleaseInputRoleDescription': 'Por favor, insira a descrição do papel',
@@ -161,7 +162,7 @@ export default {
   'agentSnapshot.detailTitle': 'Detalhes da Alteração',
   'agentSnapshot.restorePreviewTitle': 'Prévia da Restauração',
   'agentSnapshot.confirmRestore': 'Confirmar Restauração',
-  'agentSnapshot.currentVersion': 'Versão Atual',
+  'agentSnapshot.currentVersion': 'Snapshot mais recente',
   'agentSnapshot.beforeChange': 'Antes',
   'agentSnapshot.afterChange': 'Depois',
   'agentSnapshot.beforeRestore': 'Antes da Restauração',
@@ -169,11 +170,22 @@ export default {
   'agentSnapshot.configValue': 'Valor da Configuração',
   'agentSnapshot.emptyValue': 'Nenhum',
   'agentSnapshot.secretRedacted': 'Segredo oculto',
+  'agentSnapshot.redactedValueChanged': 'O valor está oculto, mas foi alterado',
   'agentSnapshot.noChangedContent': 'Nenhuma alteração exibível',
-  'agentSnapshot.restoreConfirm': 'Restaurar para a versão #{version}? A configuração atual será salva como uma nova versão primeiro.',
+  'agentSnapshot.recordedChange': 'Alterado quando registrado',
+  'agentSnapshot.noRestoreNeeded': 'A configuração atual já corresponde a esta versão',
+  'agentSnapshot.unsavedChangesTitle': 'Alterações não salvas',
+  'agentSnapshot.unsavedChangesWarning': 'Continuar descartará as alterações não salvas desta página.',
+  'agentSnapshot.discardAndRestore': 'Descartar e restaurar',
+  'agentSnapshot.restoreConfirm': 'Restaurar para a versão #{version}? A configuração atual continuará disponível no histórico.',
   'agentSnapshot.restoreMemoryWarning': 'Restaurar para uma versão sem memória limpará o histórico de chat deste agente. Confirme o risco.',
+  'agentSnapshot.restoreChatHistoryDestructiveWarning': 'Esta restauração excluirá permanentemente o histórico de chat existente deste agente. O histórico de chat não faz parte dos snapshots de configuração e não pode ser recuperado pelo histórico de versões.',
   'agentSnapshot.restoreSuccess': 'Versão restaurada',
   'agentSnapshot.restoreFailed': 'Falha ao restaurar versão',
+  'agentSnapshot.reloadAfterRestorePending': 'Recarregando a configuração e as tags restauradas. Não é possível salvar até a conclusão.',
+  'agentSnapshot.reloadAfterRestoreFailed': 'Não foi possível recarregar a configuração ou as tags restauradas. O salvamento permanece desativado para impedir que dados antigos sobrescrevam a restauração. Tente novamente.',
+  'agentSnapshot.retryReload': 'Recarregar',
+  'agentSnapshot.mutationBusy': 'A configuração está sendo salva ou recarregada. Aguarde a conclusão antes de abrir o histórico de versões ou restaurar.',
   'agentSnapshot.deleteConfirm': 'Excluir versão #{version}? Esta ação não pode ser desfeita.',
   'agentSnapshot.deleteSuccess': 'Versão excluída',
   'agentSnapshot.deleteFailed': 'Falha ao excluir versão',
@@ -182,7 +194,7 @@ export default {
   'agentSnapshot.correctWordCount': '{count} palavras de substituição',
   'agentSnapshot.source.config': 'Configuração Salva',
   'agentSnapshot.source.current': 'Configuração Atual',
-  'agentSnapshot.source.restore': 'Antes da Restauração',
+  'agentSnapshot.source.restore': 'Restaurado',
   'agentSnapshot.source.initial': 'Versão Inicial',
   'agentSnapshot.field.initial': 'Snapshot Inicial',
   'agentSnapshot.field.agentCode': 'Código do Agente',

main/manager-mobile/src/i18n/vi.ts

@@ -130,6 +130,7 @@ export default {
   'agent.saving': 'Đang lưu...',
   'agent.saveSuccess': 'Lưu thành công',
   'agent.saveFail': 'Lưu thất bại',
+  'agent.ttsOptionsLoadFailed': 'Không thể tải tùy chọn giọng nói. Cấu hình giọng nói trước đó đã được giữ lại.',
   'agent.loadFail': 'Tải thất bại',
   'agent.pleaseInputAgentName': 'Vui lòng nhập tên đại lý',
   'agent.pleaseInputRoleDescription': 'Vui lòng nhập mô tả vai trò',
@@ -161,7 +162,7 @@ export default {
   'agentSnapshot.detailTitle': 'Chi tiết thay đổi',
   'agentSnapshot.restorePreviewTitle': 'Xem trước khôi phục',
   'agentSnapshot.confirmRestore': 'Xác nhận khôi phục',
-  'agentSnapshot.currentVersion': 'Phiên bản hiện tại',
+  'agentSnapshot.currentVersion': 'Ảnh chụp mới nhất',
   'agentSnapshot.beforeChange': 'Trước',
   'agentSnapshot.afterChange': 'Sau',
   'agentSnapshot.beforeRestore': 'Trước khôi phục',
@@ -169,11 +170,22 @@ export default {
   'agentSnapshot.configValue': 'Giá trị cấu hình',
   'agentSnapshot.emptyValue': 'Không có',
   'agentSnapshot.secretRedacted': 'Đã ẩn khóa bí mật',
+  'agentSnapshot.redactedValueChanged': 'Giá trị đã được ẩn nhưng thực sự đã thay đổi',
   'agentSnapshot.noChangedContent': 'Không có thay đổi để hiển thị',
-  'agentSnapshot.restoreConfirm': 'Khôi phục về phiên bản #{version}? Cấu hình hiện tại sẽ được lưu thành phiên bản mới trước.',
+  'agentSnapshot.recordedChange': 'Đã thay đổi khi ghi nhận',
+  'agentSnapshot.noRestoreNeeded': 'Cấu hình hiện tại đã khớp với phiên bản này',
+  'agentSnapshot.unsavedChangesTitle': 'Có thay đổi chưa lưu',
+  'agentSnapshot.unsavedChangesWarning': 'Tiếp tục sẽ hủy các thay đổi chưa lưu trên trang này.',
+  'agentSnapshot.discardAndRestore': 'Hủy thay đổi và khôi phục',
+  'agentSnapshot.restoreConfirm': 'Khôi phục về phiên bản #{version}? Cấu hình hiện tại sẽ vẫn có trong lịch sử.',
   'agentSnapshot.restoreMemoryWarning': 'Khôi phục về phiên bản không có bộ nhớ sẽ xóa lịch sử trò chuyện của đại lý này. Vui lòng xác nhận rủi ro.',
+  'agentSnapshot.restoreChatHistoryDestructiveWarning': 'Thao tác khôi phục này sẽ xóa vĩnh viễn lịch sử trò chuyện hiện có của tác nhân. Lịch sử trò chuyện không nằm trong bản chụp cấu hình và không thể khôi phục từ lịch sử phiên bản.',
   'agentSnapshot.restoreSuccess': 'Đã khôi phục phiên bản',
   'agentSnapshot.restoreFailed': 'Khôi phục phiên bản thất bại',
+  'agentSnapshot.reloadAfterRestorePending': 'Đang tải lại cấu hình và thẻ đã khôi phục. Không thể lưu cho đến khi hoàn tất.',
+  'agentSnapshot.reloadAfterRestoreFailed': 'Không thể tải lại cấu hình hoặc thẻ đã khôi phục. Chức năng lưu vẫn bị tắt để tránh dữ liệu cũ ghi đè kết quả khôi phục. Vui lòng thử lại.',
+  'agentSnapshot.retryReload': 'Tải lại',
+  'agentSnapshot.mutationBusy': 'Cấu hình đang được lưu hoặc tải lại. Hãy đợi hoàn tất trước khi mở lịch sử phiên bản hoặc khôi phục.',
   'agentSnapshot.deleteConfirm': 'Xóa phiên bản #{version}? Không thể hoàn tác thao tác này.',
   'agentSnapshot.deleteSuccess': 'Đã xóa phiên bản',
   'agentSnapshot.deleteFailed': 'Xóa phiên bản thất bại',
@@ -182,7 +194,7 @@ export default {
   'agentSnapshot.correctWordCount': '{count} từ thay thế',
   'agentSnapshot.source.config': 'Lưu cấu hình',
   'agentSnapshot.source.current': 'Cấu hình hiện tại',
-  'agentSnapshot.source.restore': 'Trước khôi phục',
+  'agentSnapshot.source.restore': 'Đã khôi phục',
   'agentSnapshot.source.initial': 'Phiên bản khởi tạo',
   'agentSnapshot.field.initial': 'Ảnh chụp ban đầu',
   'agentSnapshot.field.agentCode': 'Mã đại lý',

main/manager-mobile/src/i18n/zh_CN.ts

@@ -130,6 +130,7 @@ export default {
   'agent.saving': '保存中...',
   'agent.saveSuccess': '保存成功',
   'agent.saveFail': '保存失败',
+  'agent.ttsOptionsLoadFailed': '语音选项加载失败，已保留原来的语音配置',
   'agent.loadFail': '加载失败',
   'agent.pleaseInputAgentName': '请输入智能体名称',
   'agent.pleaseInputRoleDescription': '请输入角色介绍',
@@ -161,7 +162,7 @@ export default {
   'agentSnapshot.detailTitle': '变更详情',
   'agentSnapshot.restorePreviewTitle': '恢复预览',
   'agentSnapshot.confirmRestore': '确认恢复',
-  'agentSnapshot.currentVersion': '当前版本',
+  'agentSnapshot.currentVersion': '最新快照',
   'agentSnapshot.beforeChange': '变化前',
   'agentSnapshot.afterChange': '变化后',
   'agentSnapshot.beforeRestore': '恢复前',
@@ -169,11 +170,22 @@ export default {
   'agentSnapshot.configValue': '配置值',
   'agentSnapshot.emptyValue': '无',
   'agentSnapshot.secretRedacted': '密钥已隐藏',
+  'agentSnapshot.redactedValueChanged': '值已脱敏，但确有变化',
   'agentSnapshot.noChangedContent': '无可显示变更',
-  'agentSnapshot.restoreConfirm': '确定恢复到版本 #{version}？当前配置会先保存为新的历史版本。',
+  'agentSnapshot.recordedChange': '记录时发生变更',
+  'agentSnapshot.noRestoreNeeded': '当前配置与目标版本相同，无需恢复',
+  'agentSnapshot.unsavedChangesTitle': '存在未保存修改',
+  'agentSnapshot.unsavedChangesWarning': '继续恢复会放弃当前页面中尚未保存的修改。',
+  'agentSnapshot.discardAndRestore': '放弃修改并恢复',
+  'agentSnapshot.restoreConfirm': '确定恢复到版本 #{version}？当前配置会保留在历史中。',
   'agentSnapshot.restoreMemoryWarning': '恢复到无记忆版本会清空该智能体聊天记录，请确认风险。',
+  'agentSnapshot.restoreChatHistoryDestructiveWarning': '此恢复会永久删除该智能体现有的聊天记录。聊天记录不包含在配置快照中，删除后无法通过历史版本恢复。',
   'agentSnapshot.restoreSuccess': '版本已恢复',
   'agentSnapshot.restoreFailed': '版本恢复失败',
+  'agentSnapshot.reloadAfterRestorePending': '正在重新加载恢复后的配置和标签，完成前无法保存。',
+  'agentSnapshot.reloadAfterRestoreFailed': '无法重新加载恢复后的配置或标签。为防止旧数据覆盖恢复结果，保存已禁用，请重试。',
+  'agentSnapshot.retryReload': '重新加载',
+  'agentSnapshot.mutationBusy': '配置正在保存或重新加载，请完成后再打开历史版本或恢复。',
   'agentSnapshot.deleteConfirm': '确定删除版本 #{version}？此操作不可撤销。',
   'agentSnapshot.deleteSuccess': '历史版本已删除',
   'agentSnapshot.deleteFailed': '历史版本删除失败',
@@ -182,7 +194,7 @@ export default {
   'agentSnapshot.correctWordCount': '共 {count} 个替换词',
   'agentSnapshot.source.config': '配置保存',
   'agentSnapshot.source.current': '当前配置',
-  'agentSnapshot.source.restore': '恢复前备份',
+  'agentSnapshot.source.restore': '恢复结果',
   'agentSnapshot.source.initial': '初始版本',
   'agentSnapshot.field.initial': '初始快照',
   'agentSnapshot.field.agentCode': '智能体编码',

main/manager-mobile/src/i18n/zh_TW.ts

@@ -151,6 +151,7 @@ export default {
   'agent.saving': '儲存中...',
   'agent.saveSuccess': '儲存成功',
   'agent.saveFail': '儲存失敗',
+  'agent.ttsOptionsLoadFailed': '語音選項載入失敗，已保留原來的語音設定',
   'agent.loadFail': '加載失敗',
   'agent.pleaseInputAgentName': '請輸入助手暱稱',
   'agent.pleaseInputRoleDescription': '請輸入角色介紹',
@@ -182,7 +183,7 @@ export default {
   'agentSnapshot.detailTitle': '變更詳情',
   'agentSnapshot.restorePreviewTitle': '恢復預覽',
   'agentSnapshot.confirmRestore': '確認恢復',
-  'agentSnapshot.currentVersion': '當前版本',
+  'agentSnapshot.currentVersion': '最新快照',
   'agentSnapshot.beforeChange': '變化前',
   'agentSnapshot.afterChange': '變化後',
   'agentSnapshot.beforeRestore': '恢復前',
@@ -190,11 +191,22 @@ export default {
   'agentSnapshot.configValue': '配置值',
   'agentSnapshot.emptyValue': '無',
   'agentSnapshot.secretRedacted': '密鑰已隱藏',
+  'agentSnapshot.redactedValueChanged': '值已脫敏，但確有變化',
   'agentSnapshot.noChangedContent': '無可顯示變更',
-  'agentSnapshot.restoreConfirm': '確定恢復到版本 #{version}？當前配置會先保存為新的歷史版本。',
+  'agentSnapshot.recordedChange': '記錄時發生變更',
+  'agentSnapshot.noRestoreNeeded': '目前設定與目標版本相同，無需恢復',
+  'agentSnapshot.unsavedChangesTitle': '存在未儲存修改',
+  'agentSnapshot.unsavedChangesWarning': '繼續恢復會放棄目前頁面中尚未儲存的修改。',
+  'agentSnapshot.discardAndRestore': '放棄修改並恢復',
+  'agentSnapshot.restoreConfirm': '確定恢復到版本 #{version}？目前設定會保留在歷史中。',
   'agentSnapshot.restoreMemoryWarning': '恢復到無記憶版本會清空該智能體聊天記錄，請確認風險。',
+  'agentSnapshot.restoreChatHistoryDestructiveWarning': '此恢復會永久刪除該智能體現有的聊天記錄。聊天記錄不包含在配置快照中，刪除後無法透過歷史版本恢復。',
   'agentSnapshot.restoreSuccess': '版本已恢復',
   'agentSnapshot.restoreFailed': '版本恢復失敗',
+  'agentSnapshot.reloadAfterRestorePending': '正在重新載入恢復後的配置和標籤，完成前無法儲存。',
+  'agentSnapshot.reloadAfterRestoreFailed': '無法重新載入恢復後的配置或標籤。為防止舊資料覆蓋恢復結果，儲存已停用，請重試。',
+  'agentSnapshot.retryReload': '重新載入',
+  'agentSnapshot.mutationBusy': '配置正在儲存或重新載入，請完成後再開啟歷史版本或恢復。',
   'agentSnapshot.deleteConfirm': '確定刪除版本 #{version}？此操作不可復原。',
   'agentSnapshot.deleteSuccess': '歷史版本已刪除',
   'agentSnapshot.deleteFailed': '歷史版本刪除失敗',
@@ -203,7 +215,7 @@ export default {
   'agentSnapshot.correctWordCount': '共 {count} 個替換詞',
   'agentSnapshot.source.config': '配置保存',
   'agentSnapshot.source.current': '當前配置',
-  'agentSnapshot.source.restore': '恢復前備份',
+  'agentSnapshot.source.restore': '恢復結果',
   'agentSnapshot.source.initial': '初始版本',
   'agentSnapshot.field.initial': '初始快照',
   'agentSnapshot.field.agentCode': '智能體編碼',

main/manager-mobile/src/pages/agent/components/AgentSnapshotPanel.vue

@@ -4,18 +4,26 @@ import { computed, ref, watch } from 'vue'
 import { useMessage } from 'wot-design-uni/components/wd-message-box'
 import {
   deleteAgentSnapshot,
-  getAgentDetail,
   getAgentSnapshot,
   getAgentSnapshots,
-  getAgentTags,
   getCorrectWordFiles,
   getModelOptions,
   getPluginFunctions,
   getTTSVoices,
   restoreAgentSnapshot,
 } from '@/api/agent/agent'
-import { t } from '@/i18n'
+import { getCurrentLanguage, t } from '@/i18n'
 import { toast } from '@/utils/toast'
+import {
+  isSensitiveKey,
+  normalizeSnapshotTtsNumber as normalizeDefaultTtsNumber,
+  normalizeSnapshotOrderedList,
+  redactSnapshotDisplayValue,
+  SNAPSHOT_SECRET_REDACTED,
+  stablePrettyStringify,
+  toIntlLocale,
+  willRestorePermanentlyDeleteChatHistory,
+} from './agentSnapshotUtils.mjs'
 
 defineOptions({
   name: 'AgentSnapshotPanel',
@@ -24,17 +32,21 @@ defineOptions({
 const props = withDefaults(defineProps<Props>(), {
   visible: false,
   currentVersionNo: null,
+  hasUnsavedChanges: false,
+  mutationBusy: false,
 })
 
 const emit = defineEmits<{
   (event: 'update:visible', value: boolean): void
-  (event: 'restored'): void
+  (event: 'restored', context: { agentId: string, actionSequence: number }): void
 }>()
 
 interface Props {
   visible?: boolean
   agentId: string
   currentVersionNo?: number | null
+  hasUnsavedChanges?: boolean
+  mutationBusy?: boolean
 }
 
 interface SnapshotRow extends AgentSnapshot {
@@ -54,6 +66,7 @@ interface VersionDetail {
   forceCompare?: boolean
   beforeVersionNo?: number | null
   afterVersionNo?: number | null
+  currentStateToken?: string
 }
 
 interface DetailItem {
@@ -62,18 +75,34 @@ interface DetailItem {
   beforeText: string
   afterText: string
   single: boolean
+  recordedOnly?: boolean
+  redactedDifference?: boolean
+}
+
+interface RestoreActionContext {
+  actionSequence: number
+  agentId: string
+  snapshotId: string
+  currentStateToken: string
+  detailRequestSequence: number
+  willClearChatHistory: boolean
 }
 
 const message = useMessage()
+const restoring = ref(false)
 
 const panelVisible = computed({
   get: () => props.visible,
-  set: value => emit('update:visible', value),
+  set: (value) => {
+    if (!value && restoring.value) {
+      return
+    }
+    emit('update:visible', value)
+  },
 })
 
 const loading = ref(false)
 const detailLoading = ref(false)
-const restoring = ref(false)
 const deletingSnapshotId = ref('')
 const snapshots = ref<SnapshotRow[]>([])
 const page = ref(1)
@@ -81,6 +110,15 @@ const limit = 10
 const total = ref(0)
 const historyAnchorVersionNo = ref<number | null>(null)
 const detailVisible = ref(false)
+const detailPopupVisible = computed({
+  get: () => detailVisible.value,
+  set: (value) => {
+    if (!value && restoring.value) {
+      return
+    }
+    detailVisible.value = value
+  },
+})
 const currentDetail = ref<VersionDetail | null>(null)
 const pluginNameMap = ref<Record<string, string>>({})
 const modelNameMap = ref<Record<string, string>>({})
@@ -91,6 +129,9 @@ const metadataLoaded = ref(false)
 const correctWordMetadataLoaded = ref(false)
 let detailRequestSequence = 0
 let snapshotRequestSequence = 0
+let restoreActionSequence = 0
+let restorePostActionSequence: number | null = null
+let restorePreviewRequestSequence: number | null = null
 
 const MODEL_TYPES = ['ASR', 'VAD', 'LLM', 'VLLM', 'TTS', 'Memory', 'Intent']
 const MODEL_FIELD_TYPES: Record<string, string> = {
@@ -110,7 +151,6 @@ const CHAT_HISTORY_CONF_LABEL_KEYS: Record<string, string> = {
   2: 'agentSnapshot.chatHistoryConf.textVoice',
 }
 
-const SNAPSHOT_SECRET_REDACTED = '__SNAPSHOT_SECRET_REDACTED__'
 const SNAPSHOT_FIELD_ORDER = [
   'agentName',
   'agentCode',
@@ -159,8 +199,18 @@ const restoreWillClearChatHistory = computed(() => {
   if (!currentDetail.value || currentDetail.value.mode !== 'restore') {
     return false
   }
-  return currentDetail.value.beforeData?.memModelId !== 'Memory_nomem'
+  return willRestorePermanentlyDeleteChatHistory(
-    && currentDetail.value.afterData?.memModelId === 'Memory_nomem'
+    currentDetail.value.beforeData?.memModelId,
+    currentDetail.value.afterData?.memModelId,
+  )
+})
+const displayedCurrentVersionNo = computed(() => historyAnchorVersionNo.value || props.currentVersionNo)
+const canConfirmRestore = computed(() => {
+  return !restoring.value
+    && !props.mutationBusy
+    && currentDetail.value?.mode === 'restore'
+    && detailItems.value.length > 0
+    && Boolean(currentDetail.value.currentStateToken?.trim())
 })
 
 watch(() => props.visible, (visible) => {
@@ -168,8 +218,9 @@ watch(() => props.visible, (visible) => {
     openPanel()
   }
   else {
+    invalidateRestoreAction()
     invalidateSnapshotRequest()
-    closeDetail()
+    closeDetail(true)
   }
 })
 
@@ -185,9 +236,48 @@ watch(() => props.currentVersionNo, () => {
   }
 })
 
+watch(() => props.agentId, (currentAgentId, previousAgentId) => {
+  if (currentAgentId === previousAgentId) {
+    return
+  }
+  invalidateRestoreAction()
+  invalidateSnapshotRequest()
+  closeDetail(true)
+  if (props.visible) {
+    openPanel()
+  }
+}, { flush: 'sync' })
+
+watch(() => props.mutationBusy, (mutationBusy) => {
+  if (!mutationBusy) {
+    return
+  }
+  const restorePostInFlight = restoring.value
+    && restorePostActionSequence === restoreActionSequence
+  if (restorePostInFlight) {
+    return
+  }
+  const pendingRestorePreview = restorePreviewRequestSequence !== null
+    || currentDetail.value?.mode === 'restore'
+  const pendingRestoreConfirmation = restoring.value
+    && restorePostActionSequence !== restoreActionSequence
+  if (!pendingRestorePreview && !pendingRestoreConfirmation) {
+    return
+  }
+  if (pendingRestoreConfirmation) {
+    invalidateRestoreAction()
+  }
+  restorePreviewRequestSequence = null
+  closeDetail(true)
+  toast.warning(t('agentSnapshot.mutationBusy'))
+}, { flush: 'sync' })
+
 async function openPanel() {
   const requestId = ++snapshotRequestSequence
-  historyAnchorVersionNo.value = props.currentVersionNo || null
+  // The first page must be unanchored so that a stale parent page cannot hide
+  // versions created by another client. The response establishes a stable
+  // anchor for all subsequent pages in this panel session.
+  historyAnchorVersionNo.value = null
   page.value = 1
   snapshots.value = []
   await loadSnapshots(true, requestId)
@@ -207,14 +297,18 @@ async function loadSnapshots(reset = false, requestId = snapshotRequestSequence)
       page: nextPage,
       limit,
     }
-    if (historyAnchorVersionNo.value) {
+    if (!reset && historyAnchorVersionNo.value) {
       params.maxVersionNo = historyAnchorVersionNo.value
     }
     const result = await getAgentSnapshots(props.agentId, params)
     if (!isActiveSnapshotRequest(requestId)) {
       return
     }
-    const rows = decorateSnapshotRows(result?.list || [])
+    const responseRows = result?.list || []
+    if (reset) {
+      historyAnchorVersionNo.value = responseRows[0]?.versionNo || null
+    }
+    const rows = decorateSnapshotRows(responseRows)
     const mergedRows = reset ? rows : [...snapshots.value, ...rows]
     snapshots.value = attachPreviousRows(mergedRows)
     total.value = result?.total || 0
@@ -244,11 +338,9 @@ function invalidateSnapshotRequest() {
 }
 
 function decorateSnapshotRows(rows: AgentSnapshot[]): SnapshotRow[] {
-  return rows.map((row, index) => ({
+  return rows.map(row => ({
     ...row,
-    isLatestSnapshot: props.currentVersionNo
+    isLatestSnapshot: Boolean(historyAnchorVersionNo.value && row.versionNo === historyAnchorVersionNo.value),
-      ? row.versionNo === props.currentVersionNo
-      : index === 0 && page.value === 1,
   }))
 }
 
@@ -277,19 +369,18 @@ async function viewSnapshot(row: SnapshotRow) {
   detailLoading.value = true
   currentDetail.value = null
   try {
-    await ensureMetadata()
+    const metadataRequest = ensureMetadata()
-    if (!isActiveDetailRequest(requestId)) {
-      return
-    }
     const detail = await buildSavedVersionDetail(row)
     if (!isActiveDetailRequest(requestId)) {
       return
     }
-    await ensureDisplayMetadata(detail.beforeData, detail.afterData)
-    if (!isActiveDetailRequest(requestId)) {
-      return
-    }
     currentDetail.value = detail
+    // Names are enhancement metadata. Render the snapshot immediately with
+    // stable IDs, then update names reactively as metadata arrives.
+    void Promise.allSettled([
+      metadataRequest,
+      ensureDisplayMetadata(detail.beforeData, detail.afterData),
+    ])
   }
   catch (error) {
     if (!isActiveDetailRequest(requestId)) {
@@ -307,22 +398,26 @@ async function viewSnapshot(row: SnapshotRow) {
 }
 
 async function previewRestoreSnapshot(row: SnapshotRow) {
+  if (!canRestoreSnapshot(row)) {
+    return
+  }
+  if (props.mutationBusy) {
+    toast.warning(t('agentSnapshot.mutationBusy'))
+    return
+  }
   detailVisible.value = true
   const requestId = ++detailRequestSequence
+  restorePreviewRequestSequence = requestId
   detailLoading.value = true
   currentDetail.value = null
   try {
-    await ensureMetadata()
+    const metadataRequest = ensureMetadata()
+    const targetSnapshot = await getAgentSnapshot(props.agentId, row.id)
     if (!isActiveDetailRequest(requestId)) {
       return
     }
-    const [targetSnapshot, currentAgent, currentTags] = await Promise.all([
+    if (!isPlainObject(targetSnapshot.currentSnapshotData)) {
-      getAgentSnapshot(props.agentId, row.id),
+      throw new Error('Snapshot detail is missing the atomic current-state data')
-      getAgentDetail(props.agentId),
-      getAgentTags(props.agentId),
-    ])
-    if (!isActiveDetailRequest(requestId)) {
-      return
     }
     const detail: VersionDetail = {
       mode: 'restore',
@@ -331,23 +426,20 @@ async function previewRestoreSnapshot(row: SnapshotRow) {
         ...row,
         id: targetSnapshot.id || row.id,
       },
-      beforeData: {
+      beforeData: targetSnapshot.currentSnapshotData,
-        ...currentAgent,
-        tags: currentTags || [],
-        tagNames: (currentTags || []).map(tag => tag?.tagName).filter(Boolean),
-      } as AgentSnapshotData,
       afterData: targetSnapshot.snapshotData || {},
       changedFields: [],
       fieldOrder: targetSnapshot.fieldOrder || [],
       forceCompare: true,
-      beforeVersionNo: props.currentVersionNo,
+      beforeVersionNo: historyAnchorVersionNo.value || props.currentVersionNo,
       afterVersionNo: targetSnapshot.versionNo,
-    }
+      currentStateToken: targetSnapshot.currentStateToken,
-    await ensureDisplayMetadata(detail.beforeData, detail.afterData)
-    if (!isActiveDetailRequest(requestId)) {
-      return
     }
     currentDetail.value = detail
+    void Promise.allSettled([
+      metadataRequest,
+      ensureDisplayMetadata(detail.beforeData, detail.afterData),
+    ])
   }
   catch (error) {
     if (!isActiveDetailRequest(requestId)) {
@@ -358,6 +450,9 @@ async function previewRestoreSnapshot(row: SnapshotRow) {
     detailVisible.value = false
   }
   finally {
+    if (restorePreviewRequestSequence === requestId) {
+      restorePreviewRequestSequence = null
+    }
     if (isActiveDetailRequest(requestId)) {
       detailLoading.value = false
     }
@@ -374,7 +469,10 @@ function invalidateDetailRequest() {
   currentDetail.value = null
 }
 
-function closeDetail() {
+function closeDetail(force = false) {
+  if (restoring.value && !force) {
+    return
+  }
   if (detailVisible.value) {
     detailVisible.value = false
     return
@@ -437,24 +535,125 @@ async function confirmRestoreSnapshot() {
   if (restoring.value || !detail || detail.mode !== 'restore' || !detail.row?.id) {
     return
   }
-  const snapshotId = detail.row.id
+  if (props.mutationBusy) {
+    toast.warning(t('agentSnapshot.mutationBusy'))
+    return
+  }
+  if (!detailItems.value.length) {
+    toast.info(t('agentSnapshot.noRestoreNeeded'))
+    return
+  }
+  const currentStateToken = detail.currentStateToken?.trim()
+  if (!currentStateToken) {
+    console.error('Cannot restore snapshot without a current-state token')
+    toast.error(t('agentSnapshot.restoreFailed'))
+    return
+  }
+  const context: RestoreActionContext = {
+    actionSequence: ++restoreActionSequence,
+    agentId: props.agentId,
+    snapshotId: detail.row.id,
+    currentStateToken,
+    detailRequestSequence,
+    willClearChatHistory: restoreWillClearChatHistory.value,
+  }
+  // Enter the busy state before either confirmation can yield. This prevents
+  // rapid taps from opening duplicate dialogs or issuing duplicate restores.
   restoring.value = true
   try {
-    await restoreAgentSnapshot(props.agentId, snapshotId)
+    if (props.hasUnsavedChanges) {
+      const confirmed = await requestRestoreConfirmation({
+        title: t('agentSnapshot.unsavedChangesTitle'),
+        msg: t('agentSnapshot.unsavedChangesWarning'),
+        confirmButtonText: t('agentSnapshot.discardAndRestore'),
+        cancelButtonText: t('common.cancel'),
+      })
+      if (!confirmed || !isActiveRestoreAction(context)) {
+        return
+      }
+    }
+
+    // This confirmation must be the last user interaction before the POST.
+    // It is intentionally separate from the unsaved-form confirmation because
+    // clearing chat history is irreversible and outside snapshot recovery.
+    if (context.willClearChatHistory) {
+      const confirmed = await requestRestoreConfirmation({
+        title: t('agentSnapshot.confirmRestore'),
+        msg: t('agentSnapshot.restoreChatHistoryDestructiveWarning'),
+        confirmButtonText: t('agentSnapshot.confirmRestore'),
+        cancelButtonText: t('common.cancel'),
+      })
+      if (!confirmed || !isActiveRestoreAction(context)) {
+        return
+      }
+    }
+
+    if (!isActiveRestoreAction(context)) {
+      return
+    }
+    // Mark the irreversible request boundary only after the final mutation
+    // guard. A later parent busy transition must not pretend this POST was
+    // canceled; its real response still owns the terminal UI state.
+    restorePostActionSequence = context.actionSequence
+    await restoreAgentSnapshot(context.agentId, context.snapshotId, context.currentStateToken)
+    if (!isActiveRestoreAction(context)) {
+      return
+    }
     toast.success(t('agentSnapshot.restoreSuccess'))
-    closeDetail()
+    closeDetail(true)
-    emit('restored')
+    emit('restored', {
-    await openPanel()
+      agentId: context.agentId,
+      actionSequence: context.actionSequence,
+    })
+    if (props.visible && props.agentId === context.agentId) {
+      await openPanel()
+    }
   }
   catch (error) {
-    console.error('Failed to restore snapshot:', error)
+    if (isActiveRestoreAction(context)) {
-    toast.error(t('agentSnapshot.restoreFailed'))
+      console.error('Failed to restore snapshot:', error)
+      toast.error(t('agentSnapshot.restoreFailed'))
+    }
   }
   finally {
-    restoring.value = false
+    if (restorePostActionSequence === context.actionSequence) {
+      restorePostActionSequence = null
+    }
+    if (context.actionSequence === restoreActionSequence) {
+      restoring.value = false
+    }
   }
 }
 
+async function requestRestoreConfirmation(options: Parameters<typeof message.confirm>[0]) {
+  try {
+    await message.confirm(options)
+    return true
+  }
+  catch {
+    return false
+  }
+}
+
+function isActiveRestoreAction(context: RestoreActionContext) {
+  const detail = currentDetail.value
+  return restoring.value
+    && context.actionSequence === restoreActionSequence
+    && (!props.mutationBusy || restorePostActionSequence === context.actionSequence)
+    && context.agentId === props.agentId
+    && props.visible
+    && detailVisible.value
+    && context.detailRequestSequence === detailRequestSequence
+    && detail?.mode === 'restore'
+    && detail.row?.id === context.snapshotId
+    && detail.currentStateToken?.trim() === context.currentStateToken
+}
+
+function invalidateRestoreAction() {
+  restoreActionSequence += 1
+  restoring.value = false
+}
+
 function deleteSnapshot(row: SnapshotRow) {
   message.confirm({
     title: t('agentSnapshot.delete'),
@@ -494,6 +693,8 @@ function buildDetailItems(detail: VersionDetail): DetailItem[] {
         beforeText: '',
         afterText: formatDisplayValue(field, afterValue, detail.afterData),
         single: true,
+        recordedOnly: false,
+        redactedDifference: false,
       }
     })
   }
@@ -507,12 +708,18 @@ function buildDetailItems(detail: VersionDetail): DetailItem[] {
   ).map((field) => {
     const beforeValue = getFieldValue(detail.beforeData, field)
     const afterValue = getFieldValue(detail.afterData, field)
+    const beforeText = formatDisplayValue(field, beforeValue, detail.beforeData)
+    const afterText = formatDisplayValue(field, afterValue, detail.afterData)
     return {
       field,
       label: fieldLabel(field),
-      beforeText: formatDisplayValue(field, beforeValue, detail.beforeData),
+      beforeText,
-      afterText: formatDisplayValue(field, afterValue, detail.afterData),
+      afterText,
       single: false,
+      recordedOnly: !detail.forceCompare && isSameFieldValue(field, beforeValue, afterValue),
+      redactedDifference: !isSameFieldValue(field, beforeValue, afterValue)
+        && beforeText === afterText
+        && beforeText.includes(t('agentSnapshot.secretRedacted')),
     }
   })
 }
@@ -531,7 +738,13 @@ function resolveDiffFields(
     .map(canonicalField)
   const candidates = forceCompare ? orderedFields : directFields
 
-  return Array.from(new Set(candidates)).filter((field) => {
+  const uniqueCandidates = Array.from(new Set(candidates))
+  if (!forceCompare) {
+    // changedFields is an immutable fact about the saved event. Re-running
+    // today's comparison rules would make old events disappear from detail.
+    return uniqueCandidates
+  }
+  return uniqueCandidates.filter((field) => {
     return !isSameFieldValue(
       field,
       getFieldValue(beforeData, field),
@@ -596,7 +809,7 @@ function formatDisplayValue(field: string, value: any, rowData: AgentSnapshotDat
     return formatArrayValue(value)
   }
   if (typeof value === 'object') {
-    return JSON.stringify(value, null, 2)
+    return stablePrettyStringify(redactDisplayValue(value))
   }
   if (field === 'ttsLanguage' && !value && rowData.ttsVoiceId) {
     return t('agentSnapshot.emptyValue')
@@ -611,9 +824,11 @@ function formatFunctions(value: any) {
   return value.map((item) => {
     const pluginId = item?.pluginId || item?.id || ''
     const name = pluginNameMap.value[pluginId] || translatedFallback(`agentSnapshot.plugin.${pluginId}`, pluginId || t('agentSnapshot.emptyValue'))
-    const params = item?.paramInfo || item?.params || {}
+    const params = parseObjectValue(item?.paramInfo ?? item?.params)
-    const keys = params && typeof params === 'object' ? Object.keys(params) : []
+    const safeParams = redactDisplayValue(params)
-    return keys.length ? `${name} (${keys.join(', ')})` : name
+    return Object.keys(safeParams).length
+      ? `${name}\n${stablePrettyStringify(safeParams)}`
+      : name
   }).join('\n')
 }
 
@@ -622,7 +837,7 @@ function formatContextProviders(value: any) {
     return t('agentSnapshot.emptyValue')
   }
   return value.map((item, index) => {
-    return `${index + 1}. ${item?.url || JSON.stringify(item)}`
+    return `${index + 1}. ${stablePrettyStringify(redactDisplayValue(item))}`
   }).join('\n')
 }
 
@@ -630,14 +845,14 @@ function formatCorrectWordFileIds(value: any) {
   if (!Array.isArray(value) || value.length === 0) {
     return t('agentSnapshot.emptyValue')
   }
-  return value.map(id => correctWordNameMap.value[id] || id).join('、')
+  return formatLocalizedList(value.map(id => correctWordNameMap.value[id] || id))
 }
 
 function formatStringList(value: any) {
   if (!Array.isArray(value) || value.length === 0) {
     return t('agentSnapshot.emptyValue')
   }
-  return value.join('、')
+  return formatLocalizedList(value)
 }
 
 function formatArrayValue(value: any[]) {
@@ -645,9 +860,9 @@ function formatArrayValue(value: any[]) {
     return t('agentSnapshot.emptyValue')
   }
   if (value.every(item => item === null || ['string', 'number', 'boolean'].includes(typeof item))) {
-    return value.join('、')
+    return formatLocalizedList(value)
   }
-  return JSON.stringify(value, null, 2)
+  return stablePrettyStringify(redactDisplayValue(value))
 }
 
 async function ensureMetadata() {
@@ -760,8 +975,34 @@ function formatTime(time?: string) {
   if (Number.isNaN(date.getTime())) {
     return String(time)
   }
-  const pad = (value: number) => String(value).padStart(2, '0')
+  try {
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+    return new Intl.DateTimeFormat(toIntlLocale(getCurrentLanguage()), {
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+      hour12: false,
+    }).format(date)
+  }
+  catch {
+    const pad = (value: number) => String(value).padStart(2, '0')
+    return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+  }
+}
+
+function formatLocalizedList(values: any[]) {
+  const items = values.map(value => String(value))
+  try {
+    return new Intl.ListFormat(toIntlLocale(getCurrentLanguage()), {
+      style: 'short',
+      type: 'conjunction',
+    }).format(items)
+  }
+  catch {
+    return items.join(getCurrentLanguage().startsWith('zh_') ? '、' : ', ')
+  }
 }
 
 function isSameFieldValue(
@@ -789,22 +1030,11 @@ function normalizeValueForField(field: string, value: any): any {
     return normalizeFunctions(value)
   }
   if (field === 'contextProviders') {
-    return normalizeSortedList(value)
+    return normalizeSnapshotOrderedList(value)
   }
   return normalizeValue(value)
 }
 
-function normalizeDefaultTtsNumber(value: any) {
-  if (value === undefined || value === null || String(value).trim() === '') {
-    return 0
-  }
-  if (typeof value === 'number') {
-    return Math.trunc(value)
-  }
-  const text = String(value).trim()
-  return /^[+-]?\d+$/.test(text) ? Number.parseInt(text, 10) : text
-}
-
 function normalizeStringList(value: any) {
   if (!Array.isArray(value)) {
     return []
@@ -845,16 +1075,6 @@ function parseObjectValue(value: any) {
   }
 }
 
-function normalizeSortedList(value: any) {
-  if (!Array.isArray(value)) {
-    return []
-  }
-  return value
-    .filter(item => item !== undefined && item !== null)
-    .map(normalizeValue)
-    .sort((left, right) => stableStringify(left).localeCompare(stableStringify(right)))
-}
-
 function isEquivalentValue(left: any, right: any): boolean {
   if (left === SNAPSHOT_SECRET_REDACTED || right === SNAPSHOT_SECRET_REDACTED) {
     return true
@@ -892,23 +1112,8 @@ function isPlainObject(value: any): value is Record<string, any> {
   return value !== null && typeof value === 'object' && !Array.isArray(value)
 }
 
-function isSensitiveKey(key: string) {
+function redactDisplayValue(value: any, parentKey = ''): any {
-  const normalized = String(key).toLowerCase().replace(/[^a-z0-9]/g, '')
+  return redactSnapshotDisplayValue(value, t('agentSnapshot.secretRedacted'), parentKey)
-  return normalized === 'authorization'
-    || normalized === 'token'
-    || normalized.endsWith('token')
-    || normalized.includes('apikey')
-    || normalized.includes('appkey')
-    || normalized.includes('accesskey')
-    || normalized.includes('privatekey')
-    || normalized.includes('password')
-    || normalized.includes('passwd')
-    || normalized.includes('secret')
-    || normalized.includes('credential')
-}
-
-function stableStringify(value: any) {
-  return JSON.stringify(value)
 }
 </script>
 
@@ -918,6 +1123,7 @@ function stableStringify(value: any) {
     position="bottom"
     custom-class="agent-snapshot-popup"
     custom-style="height: 86vh; max-height: 900px;"
+    :close-on-click-modal="!restoring"
     safe-area-inset-bottom
   >
     <view class="agent-snapshot-shell">
@@ -926,8 +1132,8 @@ function stableStringify(value: any) {
           <text class="block text-[34rpx] text-[#232338] font-bold">
             {{ t('agentSnapshot.title') }}
           </text>
-          <text v-if="currentVersionNo" class="mt-[6rpx] block text-[24rpx] text-[#65686f]">
+          <text v-if="displayedCurrentVersionNo" class="mt-[6rpx] block text-[24rpx] text-[#65686f]">
-            {{ t('agentSnapshot.currentVersion') }} {{ formatVersion(currentVersionNo) }}
+            {{ t('agentSnapshot.currentVersion') }} {{ formatVersion(displayedCurrentVersionNo) }}
           </text>
         </view>
         <wd-icon name="close" size="22px" custom-class="agent-snapshot-close-icon text-[#65686f]" @click="panelVisible = false" />
@@ -993,6 +1199,7 @@ function stableStringify(value: any) {
                 v-if="canRestoreSnapshot(snapshot)"
                 size="small"
                 type="primary"
+                :disabled="mutationBusy"
                 custom-class="agent-snapshot-action-button flex-1 !h-[64rpx] !bg-[#336cff]"
                 @click="previewRestoreSnapshot(snapshot)"
               >
@@ -1027,10 +1234,11 @@ function stableStringify(value: any) {
   </wd-popup>
 
   <wd-popup
-    v-model="detailVisible"
+    v-model="detailPopupVisible"
     position="bottom"
     custom-class="agent-snapshot-popup"
     custom-style="height: 88vh; max-height: 940px;"
+    :close-on-click-modal="!restoring"
     safe-area-inset-bottom
   >
     <view class="agent-snapshot-shell">
@@ -1038,7 +1246,7 @@ function stableStringify(value: any) {
         <text class="agent-snapshot-detail-title">
           {{ detailTitle }}
         </text>
-        <wd-icon name="close" size="22px" custom-class="agent-snapshot-close-icon text-[#65686f]" @click="detailVisible = false" />
+        <wd-icon name="close" size="22px" custom-class="agent-snapshot-close-icon text-[#65686f]" @click="closeDetail()" />
       </view>
 
       <scroll-view scroll-y class="agent-snapshot-body">
@@ -1060,6 +1268,12 @@ function stableStringify(value: any) {
               <text class="text-[28rpx] text-[#232338] font-semibold">
                 {{ item.label }}
               </text>
+              <text v-if="item.recordedOnly" class="ml-[10rpx] text-[22rpx] text-[#8b8f9a]">
+                {{ t('agentSnapshot.recordedChange') }}
+              </text>
+              <text v-if="item.redactedDifference" class="ml-[10rpx] text-[22rpx] text-[#a06a1f]">
+                {{ t('agentSnapshot.redactedValueChanged') }}
+              </text>
             </view>
 
             <view v-if="item.single" class="p-[22rpx]">
@@ -1097,11 +1311,17 @@ function stableStringify(value: any) {
           >
             {{ t('agentSnapshot.restoreConfirm', { version: currentDetail.afterVersionNo || '' }) }}
           </view>
+          <view
+            v-if="currentDetail?.mode === 'restore' && hasUnsavedChanges"
+            class="rounded-[18rpx] bg-[rgba(245,108,108,0.1)] p-[22rpx] text-[24rpx] text-[#a34848] leading-[1.6]"
+          >
+            {{ t('agentSnapshot.unsavedChangesWarning') }}
+          </view>
           <view
             v-if="restoreWillClearChatHistory"
             class="rounded-[18rpx] bg-[rgba(245,108,108,0.1)] p-[22rpx] text-[24rpx] text-[#a34848] leading-[1.6]"
           >
-            {{ t('agentSnapshot.restoreMemoryWarning') }}
+            {{ t('agentSnapshot.restoreChatHistoryDestructiveWarning') }}
           </view>
         </view>
       </scroll-view>
@@ -1110,12 +1330,13 @@ function stableStringify(value: any) {
         v-if="currentDetail?.mode === 'restore'"
         class="agent-snapshot-footer"
       >
-        <wd-button type="info" custom-class="agent-snapshot-footer-button flex-1 !h-[78rpx]" @click="detailVisible = false">
+        <wd-button type="info" :disabled="restoring" custom-class="agent-snapshot-footer-button flex-1 !h-[78rpx]" @click="closeDetail()">
           {{ t('common.cancel') }}
         </wd-button>
         <wd-button
           type="primary"
           :loading="restoring"
+          :disabled="restoring || !canConfirmRestore"
           custom-class="agent-snapshot-footer-button flex-1 !h-[78rpx] !bg-[#336cff]"
           @click="confirmRestoreSnapshot"
         >

main/manager-mobile/src/pages/agent/components/agentSnapshotContracts.test.mjs

@@ -0,0 +1,103 @@
+/* eslint-disable test/no-import-node-test -- zero-dependency source contract gate */
+import assert from 'node:assert/strict'
+import { readFile } from 'node:fs/promises'
+import test from 'node:test'
+
+const panelSource = await readFile(new URL('./AgentSnapshotPanel.vue', import.meta.url), 'utf8')
+const editSource = await readFile(new URL('../edit.vue', import.meta.url), 'utf8')
+
+function sourceBetween(source, startMarker, endMarker) {
+  const start = source.indexOf(startMarker)
+  const end = source.indexOf(endMarker, start + startMarker.length)
+  assert.notEqual(start, -1, `missing start marker: ${startMarker}`)
+  assert.notEqual(end, -1, `missing end marker: ${endMarker}`)
+  return source.slice(start, end)
+}
+
+test('restore enters busy state before confirmations and requires a final destructive confirmation', () => {
+  const restore = sourceBetween(
+    panelSource,
+    'async function confirmRestoreSnapshot()',
+    'async function requestRestoreConfirmation',
+  )
+  const busyIndex = restore.indexOf('restoring.value = true')
+  const unsavedConfirmIndex = restore.indexOf('title: t(\'agentSnapshot.unsavedChangesTitle\')')
+  const destructiveConfirmIndex = restore.indexOf('msg: t(\'agentSnapshot.restoreChatHistoryDestructiveWarning\')')
+  const postIndex = restore.indexOf('await restoreAgentSnapshot(')
+
+  assert.ok(busyIndex >= 0 && busyIndex < unsavedConfirmIndex)
+  assert.ok(destructiveConfirmIndex > unsavedConfirmIndex && destructiveConfirmIndex < postIndex)
+  assert.match(restore, /if \(context\.willClearChatHistory\)/)
+  assert.match(restore.slice(destructiveConfirmIndex, postIndex), /isActiveRestoreAction\(context\)/)
+  const finalMutationGuardIndex = restore.lastIndexOf('if (!isActiveRestoreAction(context))', postIndex)
+  const postBoundaryIndex = restore.indexOf('restorePostActionSequence = context.actionSequence')
+  assert.ok(finalMutationGuardIndex > destructiveConfirmIndex)
+  assert.ok(finalMutationGuardIndex < postBoundaryIndex && postBoundaryIndex < postIndex)
+})
+test('restore guards popup exits and stale action completion', () => {
+  assert.match(panelSource, /if \(!value && restoring\.value\) \{\s*return\s*\}/)
+  assert.equal((panelSource.match(/:close-on-click-modal="!restoring"/g) || []).length, 2)
+  assert.match(panelSource, /function closeDetail\(force = false\) \{\s*if \(restoring\.value && !force\)/)
+  assert.match(panelSource, /context\.agentId === props\.agentId/)
+  assert.match(panelSource, /context\.detailRequestSequence === detailRequestSequence/)
+  assert.match(panelSource, /if \(!isActiveRestoreAction\(context\)\) \{\s*return\s*\}\s*toast\.success/)
+  assert.match(panelSource, /mutationBusy\?: boolean/)
+  assert.match(panelSource, /&& !props\.mutationBusy[\s\S]*currentDetail\.value\?\.mode === 'restore'/)
+  assert.match(panelSource, /&& \(!props\.mutationBusy \|\| restorePostActionSequence === context\.actionSequence\)/)
+  assert.match(panelSource, /if \(restorePostInFlight\) \{\s*return\s*\}/)
+})
+
+test('post-restore detail and tag reload fail closed before save', () => {
+  const save = sourceBetween(editSource, 'async function saveAgent()', 'function loadPluginFunctions()')
+  const reload = sourceBetween(
+    editSource,
+    'async function reloadAgentAfterSnapshotRestore',
+    'function isActiveSnapshotReload',
+  )
+
+  assert.ok(save.indexOf('if (snapshotReloadBlocked.value)') < save.indexOf('await updateAgent('))
+  assert.match(reload, /snapshotReloadBlocked\.value = true/)
+  assert.match(reload, /Promise\.all\(\[\s*getAgentDetail\(targetAgentId\),\s*getAgentTags\(targetAgentId\)/)
+  assert.ok(reload.indexOf('const [detail, tags] = await Promise.all') < reload.indexOf('applyPersistedAgentDetail('))
+  assert.match(reload, /snapshotReloadFailed\.value = true/)
+  assert.match(editSource, /:disabled="saving \|\| ttsOptionsLoading \|\| snapshotReloadBlocked"/)
+  assert.match(editSource, /v-if="snapshotReloadFailed"[\s\S]*@click="retrySnapshotReload"/)
+})
+
+test('parent mutations guard history opening and propagate into every restore gate', () => {
+  const opener = sourceBetween(editSource, 'function openSnapshotPanel()', 'function isSameStringList')
+  const restore = sourceBetween(
+    panelSource,
+    'async function confirmRestoreSnapshot()',
+    'async function requestRestoreConfirmation',
+  )
+
+  assert.match(opener, /if \(saving\.value \|\| snapshotReloadBlocked\.value\) \{[\s\S]*return/)
+  assert.match(editSource, /:disabled="saving \|\| snapshotReloadBlocked"[\s\S]*@click="openSnapshotPanel"/)
+  assert.match(editSource, /:mutation-busy="saving \|\| snapshotReloadBlocked"/)
+  assert.match(restore, /if \(props\.mutationBusy\) \{[\s\S]*return/)
+  const postIndex = restore.indexOf('await restoreAgentSnapshot(')
+  const finalGate = restore.lastIndexOf('if (!isActiveRestoreAction(context))', postIndex)
+  assert.ok(finalGate >= 0 && finalGate < postIndex)
+})
+
+test('the latest snapshot hides restore and delete actions', () => {
+  const restoreGate = sourceBetween(
+    panelSource,
+    'function canRestoreSnapshot(row: SnapshotRow)',
+    'function canDeleteSnapshot(row: SnapshotRow)',
+  )
+  const deleteGate = sourceBetween(
+    panelSource,
+    'function canDeleteSnapshot(row: SnapshotRow)',
+    'function buildDetailItems',
+  )
+
+  assert.match(restoreGate, /!!row\?\.id && !row\.isLatestSnapshot/)
+  assert.match(deleteGate, /!!row\?\.id && !row\.isLatestSnapshot/)
+  assert.match(panelSource, /v-if="canRestoreSnapshot\(snapshot\)"/)
+  assert.match(
+    panelSource,
+    /async function previewRestoreSnapshot\(row: SnapshotRow\) \{\s*if \(!canRestoreSnapshot\(row\)\) \{\s*return/,
+  )
+})

main/manager-mobile/src/pages/agent/components/agentSnapshotUtils.mjs

@@ -0,0 +1,314 @@
+export const SNAPSHOT_SECRET_REDACTED = '__SNAPSHOT_SECRET_REDACTED__'
+
+/** @param {unknown} voices */
+export function hasUsableTtsVoiceMetadata(voices) {
+  return Array.isArray(voices) && voices.length > 0
+}
+
+/**
+ * @param {unknown} currentMemModelId
+ * @param {unknown} targetMemModelId
+ */
+export function willRestorePermanentlyDeleteChatHistory(currentMemModelId, targetMemModelId) {
+  return currentMemModelId !== 'Memory_nomem' && targetMemModelId === 'Memory_nomem'
+}
+
+/**
+ * @param {Array<Record<string, any>>} voices
+ * @param {string} language
+ */
+export function filterTtsVoicesByLanguage(voices, language) {
+  if (!language) {
+    return voices
+  }
+  return voices.filter((voice) => {
+    if (typeof voice.languages !== 'string' || !voice.languages.trim()) {
+      return false
+    }
+    return voice.languages
+      .split(/[、；;,，]/)
+      .map(item => item.trim())
+      .filter(Boolean)
+      .includes(language)
+  })
+}
+
+/** @param {unknown} value */
+export function normalizeSnapshotTtsNumber(value) {
+  if (value === undefined || value === null || String(value).trim() === '') {
+    return null
+  }
+  if (typeof value === 'number') {
+    return Math.trunc(value)
+  }
+  const text = String(value).trim()
+  return /^[+-]?\d+$/.test(text) ? Number.parseInt(text, 10) : text
+}
+
+/**
+ * Normalize object-key order without changing array order. Context providers
+ * are consumed sequentially by the runtime, so their list order is semantic.
+ * @param {unknown} value
+ */
+export function normalizeSnapshotOrderedList(value) {
+  if (!Array.isArray(value)) {
+    return []
+  }
+  return value
+    .filter(item => item !== undefined && item !== null)
+    .map(normalizeDisplayObject)
+}
+
+/**
+ * @param {unknown} value
+ * @param {string} redactedLabel
+ * @param {string} [parentKey]
+ * @returns {unknown}
+ */
+export function redactSnapshotDisplayValue(value, redactedLabel, parentKey = '') {
+  if (value === SNAPSHOT_SECRET_REDACTED || isSensitiveKey(parentKey)) {
+    return redactedLabel
+  }
+  if (Array.isArray(value)) {
+    return value.map(item => redactSnapshotDisplayValue(item, redactedLabel, parentKey))
+  }
+  if (isPlainObject(value)) {
+    const entryNameKey = Object.keys(value).find((key) => {
+      return ['key', 'name'].includes(key.toLowerCase())
+        && typeof value[key] === 'string'
+        && isSensitiveKey(value[key])
+    })
+    const entryValueKey = Object.keys(value).find(key => key.toLowerCase() === 'value')
+    return Object.keys(value).sort().reduce((result, key) => {
+      const semanticKey = resolveUrlSemanticKey(parentKey, key)
+      if (entryNameKey && key === entryValueKey) {
+        result[key] = redactedLabel
+      }
+      else {
+        result[key] = redactSnapshotDisplayValue(value[key], redactedLabel, semanticKey)
+      }
+      return result
+    }, {})
+  }
+  if (typeof value === 'string' && isSnapshotUrlValue(parentKey, value)) {
+    return redactUrl(value, redactedLabel, parentKey)
+  }
+  return value
+}
+
+/** @param {unknown} value */
+export function stablePrettyStringify(value) {
+  return JSON.stringify(normalizeDisplayObject(value), null, 2)
+}
+
+/** @param {string} language */
+export function toIntlLocale(language) {
+  return language.replace('_', '-')
+}
+
+/** @param {string} key */
+export function isSensitiveKey(key) {
+  const normalized = String(key).toLowerCase().replace(/[^a-z0-9]/g, '')
+  return normalized === 'authorization'
+    || normalized.includes('authorization')
+    || normalized.includes('authentication')
+    || normalized === 'auth'
+    || normalized.endsWith('auth')
+    || normalized === 'cookie'
+    || normalized === 'cookie2'
+    || normalized === 'setcookie'
+    || normalized === 'setcookie2'
+    || normalized.endsWith('cookie')
+    || normalized === 'session'
+    || normalized.endsWith('session')
+    || normalized.includes('sessionid')
+    || normalized.includes('sessionkey')
+    || normalized.includes('sessiontoken')
+    || normalized.includes('sessioncookie')
+    || normalized.endsWith('sessid')
+    || normalized === 'token'
+    || normalized.endsWith('token')
+    || normalized.includes('apikey')
+    || normalized.includes('appkey')
+    || normalized.includes('accesskey')
+    || normalized.includes('subscriptionkey')
+    || normalized.includes('privatekey')
+    || normalized.includes('password')
+    || normalized.includes('passwd')
+    || normalized.includes('secret')
+    || normalized.includes('credential')
+}
+
+/**
+ * @param {string} value
+ * @param {string} redactedLabel
+ * @param {string} parentKey
+ */
+function redactUrl(value, redactedLabel, parentKey) {
+  const withoutCredentials = value.replace(
+    /^((?:[a-z][a-z0-9+.-]*:)*\/\/)[^/?#\s]*@/i,
+    (match, prefix) => `${prefix}${redactedLabel}@`,
+  )
+  const schemeMatch = /^((?:[a-z][a-z0-9+.-]*:)*\/\/)/i.exec(withoutCredentials)
+  let pathRedacted = withoutCredentials
+  if (schemeMatch) {
+    const scheme = schemeMatch[1]
+    const remainder = withoutCredentials.slice(scheme.length)
+    const suffixIndex = remainder.search(/[?#]/)
+    const authorityAndPath = suffixIndex < 0 ? remainder : remainder.slice(0, suffixIndex)
+    const suffix = suffixIndex < 0 ? '' : remainder.slice(suffixIndex)
+    const pathIndex = authorityAndPath.indexOf('/')
+    const authority = pathIndex < 0 ? authorityAndPath : authorityAndPath.slice(0, pathIndex)
+    const path = pathIndex < 0 ? '' : authorityAndPath.slice(pathIndex)
+    let host = authority.slice(authority.lastIndexOf('@') + 1)
+    if (host.startsWith('[')) {
+      const closingBracket = host.indexOf(']')
+      host = closingBracket > 0 ? host.slice(1, closingBracket) : host
+    }
+    else {
+      host = host.replace(/:\d+$/, '')
+    }
+    host = host.toLowerCase()
+    pathRedacted = `${scheme}${authority}${redactCapabilityPath(path, host, parentKey, redactedLabel)}${suffix}`
+  }
+  else {
+    const suffixIndex = withoutCredentials.search(/[?#]/)
+    const path = suffixIndex < 0 ? withoutCredentials : withoutCredentials.slice(0, suffixIndex)
+    const suffix = suffixIndex < 0 ? '' : withoutCredentials.slice(suffixIndex)
+    pathRedacted = `${redactCapabilityPath(path, '', parentKey, redactedLabel)}${suffix}`
+  }
+  const queryIndex = pathRedacted.search(/[?#]/)
+  if (queryIndex < 0) {
+    return pathRedacted
+  }
+  return `${pathRedacted.slice(0, queryIndex)}${pathRedacted[queryIndex]}${redactedLabel}`
+}
+
+/**
+ * Capability URLs often carry credentials in path segments rather than in
+ * query parameters. Preserve public provider IDs where their formats are
+ * known, and fail closed after generic hook markers.
+ * @param {string} path
+ * @param {string} host
+ * @param {string} parentKey
+ * @param {string} redactedLabel
+ */
+function redactCapabilityPath(path, host, parentKey, redactedLabel) {
+  if (!path) {
+    return path
+  }
+  const segments = path.split('/')
+  const normalizedSegments = segments.map(segment => segment.toLowerCase())
+
+  if (host === 'hooks.slack.com' || host === 'hooks.slack-gov.com') {
+    const servicesIndex = normalizedSegments.indexOf('services')
+    const capabilityIndex = servicesIndex >= 0 ? servicesIndex + 3 : -1
+    if (capabilityIndex > 0 && capabilityIndex < segments.length) {
+      segments[capabilityIndex] = redactedLabel
+      return segments.join('/')
+    }
+  }
+
+  if (host === 'discord.com'
+    || host.endsWith('.discord.com')
+    || host === 'discordapp.com'
+    || host.endsWith('.discordapp.com')) {
+    const webhooksIndex = normalizedSegments.indexOf('webhooks')
+    const capabilityIndex = webhooksIndex >= 0 ? webhooksIndex + 2 : -1
+    if (capabilityIndex > 0 && capabilityIndex < segments.length) {
+      segments[capabilityIndex] = redactedLabel
+      return segments.join('/')
+    }
+  }
+
+  if (host === 'api.telegram.org') {
+    const botIndex = segments.findIndex(segment => /^bot[^:]+:.+$/i.test(segment))
+    if (botIndex >= 0) {
+      segments[botIndex] = segments[botIndex].replace(/^bot([^:]+):.+$/i, `bot$1:${redactedLabel}`)
+      return segments.join('/')
+    }
+  }
+
+  const markerIndex = normalizedSegments.findIndex(segment => /^(?:webhooks?|hooks?)$/.test(segment))
+  if (markerIndex >= 0 && markerIndex + 1 < segments.length) {
+    return [...segments.slice(0, markerIndex + 1), redactedLabel].join('/')
+  }
+
+  const normalizedKey = String(parentKey).toLowerCase().replace(/[^a-z0-9]/g, '')
+  if (normalizedKey.includes('webhook')) {
+    let lastSegmentIndex = -1
+    for (let index = segments.length - 1; index >= 0; index -= 1) {
+      if (segments[index].length > 0) {
+        lastSegmentIndex = index
+        break
+      }
+    }
+    if (lastSegmentIndex >= 0) {
+      segments[lastSegmentIndex] = redactedLabel
+      return segments.join('/')
+    }
+  }
+
+  return path
+}
+
+/**
+ * Carry webhook capability semantics through wrapper objects such as
+ * `{ deliveryWebhook: { options: { target: "https://.../secret" } } }`.
+ * @param {string} parentKey
+ * @param {string} childKey
+ */
+function resolveUrlSemanticKey(parentKey, childKey) {
+  if (isWebhookSemanticKey(childKey)) {
+    return childKey
+  }
+  if (isWebhookSemanticKey(parentKey)) {
+    return childKey ? `${parentKey}.${childKey}` : parentKey
+  }
+  return childKey
+}
+
+/** @param {string} value */
+function isWebhookSemanticKey(value) {
+  const normalized = String(value || '').toLowerCase().replace(/[^a-z0-9]/g, '')
+  return normalized.includes('webhook')
+    || normalized === 'hook'
+    || normalized === 'hooks'
+    || normalized.endsWith('hook')
+    || normalized.endsWith('hooks')
+}
+
+/**
+ * @param {string} parentKey
+ * @param {string} value
+ */
+function isSnapshotUrlValue(parentKey, value) {
+  const normalizedKey = String(parentKey).toLowerCase().replace(/[^a-z0-9]/g, '')
+  return normalizedKey.includes('url')
+    || normalizedKey.endsWith('uri')
+    || normalizedKey.includes('endpoint')
+    || isWebhookSemanticKey(parentKey)
+    || /^(?:[a-z][a-z0-9+.-]*:)*\/\//i.test(value)
+}
+
+/** @param {unknown} value */
+function normalizeDisplayObject(value) {
+  if (Array.isArray(value)) {
+    return value.map(normalizeDisplayObject)
+  }
+  if (isPlainObject(value)) {
+    return Object.keys(value).sort().reduce((result, key) => {
+      result[key] = normalizeDisplayObject(value[key])
+      return result
+    }, {})
+  }
+  return value
+}
+
+/**
+ * @param {unknown} value
+ * @returns {value is Record<string, unknown>}
+ */
+function isPlainObject(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value)
+}

main/manager-mobile/src/pages/agent/components/agentSnapshotUtils.test.mjs

@@ -0,0 +1,183 @@
+/* eslint-disable test/no-import-node-test -- this zero-dependency gate intentionally uses Node's built-in runner */
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import {
+  filterTtsVoicesByLanguage,
+  hasUsableTtsVoiceMetadata,
+  isSensitiveKey,
+  normalizeSnapshotOrderedList,
+  normalizeSnapshotTtsNumber,
+  redactSnapshotDisplayValue,
+  SNAPSHOT_SECRET_REDACTED,
+  stablePrettyStringify,
+  toIntlLocale,
+  willRestorePermanentlyDeleteChatHistory,
+} from './agentSnapshotUtils.mjs'
+
+test('rejects empty TTS metadata while keeping language-less voices selectable without a filter', () => {
+  const voices = [{ id: 'voice-without-language', languages: '' }]
+  assert.equal(hasUsableTtsVoiceMetadata([]), false)
+  assert.equal(hasUsableTtsVoiceMetadata(voices), true)
+  assert.deepEqual(filterTtsVoicesByLanguage(voices, ''), voices)
+  assert.deepEqual(filterTtsVoicesByLanguage(voices, 'zh-CN'), [])
+})
+
+test('keeps inherited TTS values distinct from explicit zero', () => {
+  assert.equal(normalizeSnapshotTtsNumber(null), null)
+  assert.equal(normalizeSnapshotTtsNumber(''), null)
+  assert.equal(normalizeSnapshotTtsNumber(0), 0)
+  assert.equal(normalizeSnapshotTtsNumber('0'), 0)
+})
+
+test('warns only when restoring from a memory mode to no-memory mode', () => {
+  assert.equal(willRestorePermanentlyDeleteChatHistory('Memory_mem_local_short', 'Memory_nomem'), true)
+  assert.equal(willRestorePermanentlyDeleteChatHistory(undefined, 'Memory_nomem'), true)
+  assert.equal(willRestorePermanentlyDeleteChatHistory('Memory_nomem', 'Memory_nomem'), false)
+  assert.equal(willRestorePermanentlyDeleteChatHistory('Memory_mem_local_short', 'Memory_mem0ai'), false)
+})
+
+test('keeps context-provider order while stabilizing object keys', () => {
+  const first = normalizeSnapshotOrderedList([
+    { url: 'https://one.example', headers: { z: 'last', a: 'first' } },
+    { url: 'https://two.example', headers: {} },
+  ])
+  const reversed = normalizeSnapshotOrderedList([
+    { url: 'https://two.example', headers: {} },
+    { headers: { a: 'first', z: 'last' }, url: 'https://one.example' },
+  ])
+
+  assert.deepEqual(first[0], {
+    headers: { a: 'first', z: 'last' },
+    url: 'https://one.example',
+  })
+  assert.notDeepEqual(first, reversed)
+})
+
+test('redacts nested credentials, header entries, URL credentials and query values', () => {
+  const redacted = redactSnapshotDisplayValue({
+    'apiKey': 'api-secret',
+    'Authentication': 'authentication-secret',
+    'X-Auth': 'auth-secret',
+    'PHPSESSID': 'php-session-secret',
+    'Session-Key': 'session-key-secret',
+    'headers': [
+      { key: 'Authorization', value: 'Bearer secret' },
+      { key: 'Proxy-Authorization', value: 'Basic secret' },
+      { key: 'Cookie', value: 'sid=secret' },
+      { key: 'Set-Cookie', value: 'session=secret' },
+      { key: 'Content-Type', value: 'application/json' },
+    ],
+    'marker': SNAPSHOT_SECRET_REDACTED,
+    'session_id': 'session-secret',
+    'url': 'https://user:pass@example.com/context?access_token=secret#fragment',
+    'endpoint': 'https://example.com/callback?signature=secret',
+  }, '[hidden]')
+
+  assert.deepEqual(redacted, {
+    'apiKey': '[hidden]',
+    'Authentication': '[hidden]',
+    'X-Auth': '[hidden]',
+    'PHPSESSID': '[hidden]',
+    'Session-Key': '[hidden]',
+    'headers': [
+      { key: 'Authorization', value: '[hidden]' },
+      { key: 'Proxy-Authorization', value: '[hidden]' },
+      { key: 'Cookie', value: '[hidden]' },
+      { key: 'Set-Cookie', value: '[hidden]' },
+      { key: 'Content-Type', value: 'application/json' },
+    ],
+    'marker': '[hidden]',
+    'session_id': '[hidden]',
+    'url': 'https://[hidden]@example.com/context?[hidden]',
+    'endpoint': 'https://example.com/callback?[hidden]',
+  })
+})
+
+test('redacts structured key/name entries without relying on property casing', () => {
+  const entries = [
+    { KEY: 'Authentication', VALUE: 'key secret' },
+    { Name: 'X-Auth', Value: 'name secret' },
+    { key: 'public-label', NAME: 'Authorization', value: 'secret selected from either marker' },
+    { NAME: 'Content-Type', VALUE: 'application/json; charset=utf-8' },
+  ]
+
+  assert.deepEqual(redactSnapshotDisplayValue(entries, '[hidden]'), [
+    { KEY: 'Authentication', VALUE: '[hidden]' },
+    { Name: 'X-Auth', Value: '[hidden]' },
+    { key: 'public-label', NAME: 'Authorization', value: '[hidden]' },
+    { NAME: 'Content-Type', VALUE: 'application/json; charset=utf-8' },
+  ])
+})
+
+test('redacts capability path values without hiding ordinary REST paths', () => {
+  const redacted = redactSnapshotDisplayValue({
+    slack: 'https://hooks.slack.com/services/T111/B222/capability-value',
+    slackGov: 'https://hooks.slack-gov.com/services/T111/B222/gov-capability-value',
+    discord: 'https://discord.com/api/webhooks/123456/capability-value',
+    telegram: 'https://api.telegram.org/bot123456:capability-value/sendMessage',
+    genericHook: 'https://example.com/api/hook/capability/continuation',
+    genericHooks: 'https://example.com/api/hooks/capability/continuation',
+    genericWebhook: 'https://example.com/api/webhook/capability/continuation',
+    genericWebhooks: 'https://example.com/api/webhooks/capability/continuation',
+    relativeUrl: '/api/webhooks/capability/continuation',
+    callbackWebhookUrl: 'https://example.com/incoming/capability-value',
+    nested: {
+      deliveryWebhook: {
+        options: {
+          target: 'https://example.com/incoming/nested-capability-value',
+          relativeTarget: '/incoming/nested-relative-capability-value',
+        },
+      },
+    },
+    protocolRelativeUrl: '//protocol-user:protocol-pass@example.com/context',
+    jdbcUrl: 'jdbc:mysql://jdbc-user:jdbc-pass@example.com/database',
+    ordinary: 'https://example.com/api/v1/agents/42',
+  }, '[hidden]')
+
+  assert.deepEqual(redacted, {
+    slack: 'https://hooks.slack.com/services/T111/B222/[hidden]',
+    slackGov: 'https://hooks.slack-gov.com/services/T111/B222/[hidden]',
+    discord: 'https://discord.com/api/webhooks/123456/[hidden]',
+    telegram: 'https://api.telegram.org/bot123456:[hidden]/sendMessage',
+    genericHook: 'https://example.com/api/hook/[hidden]',
+    genericHooks: 'https://example.com/api/hooks/[hidden]',
+    genericWebhook: 'https://example.com/api/webhook/[hidden]',
+    genericWebhooks: 'https://example.com/api/webhooks/[hidden]',
+    relativeUrl: '/api/webhooks/[hidden]',
+    callbackWebhookUrl: 'https://example.com/incoming/[hidden]',
+    nested: {
+      deliveryWebhook: {
+        options: {
+          target: 'https://example.com/incoming/[hidden]',
+          relativeTarget: '/incoming/[hidden]',
+        },
+      },
+    },
+    protocolRelativeUrl: '//[hidden]@example.com/context',
+    jdbcUrl: 'jdbc:mysql://[hidden]@example.com/database',
+    ordinary: 'https://example.com/api/v1/agents/42',
+  })
+})
+
+test('matches the backend sensitive key variants', () => {
+  for (const key of [
+    'Authentication',
+    'X-Auth',
+    'Proxy-Authorization',
+    'Cookie',
+    'Set-Cookie',
+    'PHPSESSID',
+    'Session-Key',
+    'session_token',
+    'Ocp-Apim-Subscription-Key',
+  ]) {
+    assert.equal(isSensitiveKey(key), true, `${key} should be redacted`)
+  }
+  assert.equal(isSensitiveKey('Content-Type'), false)
+  assert.equal(isSensitiveKey('publicKey'), false)
+})
+
+test('formats objects stably and maps app locale names to Intl locales', () => {
+  assert.equal(stablePrettyStringify({ z: 1, a: { d: 2, c: 1 } }), '{\n  "a": {\n    "c": 1,\n    "d": 2\n  },\n  "z": 1\n}')
+  assert.equal(toIntlLocale('pt_BR'), 'pt-BR')
+})

main/manager-mobile/src/pages/agent/edit.vue

@@ -6,6 +6,7 @@ import { t } from '@/i18n'
 import { usePluginStore, useProvider, useSpeedPitch } from '@/store'
 import { toast } from '@/utils/toast'
 import AgentSnapshotPanel from './components/AgentSnapshotPanel.vue'
+import { filterTtsVoicesByLanguage, hasUsableTtsVoiceMetadata } from './components/agentSnapshotUtils.mjs'
 
 defineOptions({
   name: 'AgentEdit',
@@ -67,6 +68,8 @@ const loading = ref(false)
 const saving = ref(false)
 const showSnapshotPanel = ref(false)
 const currentVersionNo = ref<number | null>(null)
+const snapshotReloadBlocked = ref(false)
+const snapshotReloadFailed = ref(false)
 
 // 模型选项数据
 const modelOptions = ref<{
@@ -120,8 +123,18 @@ const selectedTtsLanguage = ref('')
 const ttsLanguageTouched = ref(false)
 const ttsVoiceTouched = ref(false)
 const ttsOptionsLoading = ref(false)
+const ttsOptionsModelId = ref('')
 const originalTagNames = ref<string[]>([])
+const originalAgentDetail = ref<AgentDetail | null>(null)
 let ttsOptionsRequestSequence = 0
+let agentDetailRequestSequence = 0
+let agentTagRequestSequence = 0
+let snapshotReloadSequence = 0
+
+interface SnapshotRestoreContext {
+  agentId: string
+  actionSequence: number
+}
 
 // 音频播放相关
 const audioRef = ref<UniApp.InnerAudioContext | null>(null)
@@ -132,6 +145,91 @@ const pluginStore = usePluginStore()
 const speedPitchStore = useSpeedPitch()
 const providerStore = useProvider()
 
+const EDITABLE_AGENT_FIELDS: Array<keyof AgentDetail> = [
+  'agentName',
+  'systemPrompt',
+  'summaryMemory',
+  'vadModelId',
+  'asrModelId',
+  'llmModelId',
+  'slmModelId',
+  'vllmModelId',
+  'intentModelId',
+  'memModelId',
+  'ttsModelId',
+  'chatHistoryConf',
+  'langCode',
+  'language',
+  'sort',
+]
+
+const hasUnsavedChanges = computed(() => {
+  if (loading.value || !originalAgentDetail.value) {
+    return false
+  }
+  return stableSerialize(buildCurrentEditableState()) !== stableSerialize(buildOriginalEditableState())
+})
+
+function buildCurrentEditableState() {
+  const original = originalAgentDetail.value as AgentDetail
+  const current = formData.value as Record<string, any>
+  const changedTtsFields = new Set(speedPitchStore.changedFields)
+  return {
+    ...pickEditableFields(current),
+    ttsLanguage: ttsLanguageTouched.value ? selectedTtsLanguage.value : original.ttsLanguage,
+    ttsVoiceId: ttsVoiceTouched.value ? current.ttsVoiceId : original.ttsVoiceId,
+    ttsVolume: changedTtsFields.has('ttsVolume') ? speedPitchStore.speedPitch.ttsVolume : original.ttsVolume,
+    ttsRate: changedTtsFields.has('ttsRate') ? speedPitchStore.speedPitch.ttsRate : original.ttsRate,
+    ttsPitch: changedTtsFields.has('ttsPitch') ? speedPitchStore.speedPitch.ttsPitch : original.ttsPitch,
+    functions: normalizeAgentFunctions(current.functions || []),
+    contextProviders: providerStore.providers,
+    tagNames: dynamicTags.value.map((tag: any) => tag.tagName).filter(Boolean).sort(),
+  }
+}
+
+function buildOriginalEditableState() {
+  const original = originalAgentDetail.value as AgentDetail
+  return {
+    ...pickEditableFields(original as unknown as Record<string, any>),
+    ttsLanguage: original.ttsLanguage,
+    ttsVoiceId: original.ttsVoiceId,
+    ttsVolume: original.ttsVolume,
+    ttsRate: original.ttsRate,
+    ttsPitch: original.ttsPitch,
+    functions: normalizeAgentFunctions(original.functions || []),
+    contextProviders: original.contextProviders || [],
+    tagNames: [...originalTagNames.value].sort(),
+  }
+}
+
+function pickEditableFields(data: Record<string, any>) {
+  return EDITABLE_AGENT_FIELDS.reduce<Record<string, any>>((result, field) => {
+    result[field] = data[field]
+    return result
+  }, {})
+}
+
+function stableSerialize(value: any) {
+  return JSON.stringify(sortObjectKeys(value))
+}
+
+function sortObjectKeys(value: any): any {
+  if (Array.isArray(value)) {
+    return value.map(sortObjectKeys)
+  }
+  if (value && typeof value === 'object') {
+    return Object.keys(value).sort().reduce<Record<string, any>>((result, key) => {
+      result[key] = sortObjectKeys(value[key])
+      return result
+    }, {})
+  }
+  return value
+}
+
+function cloneSerializable<T>(value: T): T {
+  return JSON.parse(JSON.stringify(value)) as T
+}
+
 // tabs
 const tabList = [
   {
@@ -214,38 +312,63 @@ function handleRegulate() {
 }
 
 // 加载智能体详情
-async function loadAgentDetail() {
+async function loadAgentDetail(targetAgentId = agentId.value) {
-  if (!agentId.value)
+  if (!targetAgentId)
-    return
+    return false
 
+  const requestId = ++agentDetailRequestSequence
+  invalidateTtsMetadataRequest()
   try {
     loading.value = true
-    tempSummaryMemory.value = ''
+    const detail = await getAgentDetail(targetAgentId)
-    ttsLanguageTouched.value = false
+    if (!isActiveAgentDetailRequest(targetAgentId, requestId)) {
-    ttsVoiceTouched.value = false
+      return false
-    ttsOptionsRequestSequence += 1
+    }
-    ttsOptionsLoading.value = false
+    applyPersistedAgentDetail(detail, targetAgentId)
-    const detail = await getAgentDetail(agentId.value)
+    await enhanceAgentDetailMetadata(detail, targetAgentId, requestId)
-    const normalizedFunctions = normalizeAgentFunctions(detail.functions || [])
+    return isActiveAgentDetailRequest(targetAgentId, requestId)
-    formData.value = { ...detail, functions: normalizedFunctions }
+  }
-    currentVersionNo.value = detail.currentVersionNo || null
+  catch (error) {
+    if (isActiveAgentDetailRequest(targetAgentId, requestId)) {
+      console.error('加载智能体详情失败:', error)
+      toast.error(t('agent.loadFail'))
+    }
+    return false
+  }
+  finally {
+    if (isActiveAgentDetailRequest(targetAgentId, requestId)) {
+      loading.value = false
+    }
+  }
+}
 
-    // 更新插件store
+function applyPersistedAgentDetail(detail: AgentDetail, targetAgentId: string) {
-    pluginStore.setCurrentAgentId(agentId.value)
+  const normalizedFunctions = normalizeAgentFunctions(detail.functions || [])
-    pluginStore.setCurrentFunctions(normalizedFunctions)
+  tempSummaryMemory.value = ''
+  ttsLanguageTouched.value = false
+  ttsVoiceTouched.value = false
+  ttsOptionsModelId.value = ''
+  voiceOptions.value = []
+  voiceDetails.value = {}
+  languageOptions.value = []
+  formData.value = { ...detail, functions: normalizedFunctions }
+  originalAgentDetail.value = cloneSerializable({ ...detail, functions: normalizedFunctions })
+  currentVersionNo.value = detail.currentVersionNo || null
+  selectedTtsLanguage.value = detail.ttsLanguage || ''
 
-    // 更新语速音调
+  pluginStore.setCurrentAgentId(targetAgentId)
-    speedPitchStore.updateSpeedPitch({
+  pluginStore.setCurrentFunctions(normalizedFunctions)
-      ttsVolume: detail.ttsVolume ?? 0,
+  speedPitchStore.updateSpeedPitch({
-      ttsRate: detail.ttsRate ?? 0,
+    ttsVolume: detail.ttsVolume ?? 0,
-      ttsPitch: detail.ttsPitch ?? 0,
+    ttsRate: detail.ttsRate ?? 0,
-    })
+    ttsPitch: detail.ttsPitch ?? 0,
-    speedPitchStore.resetChangedFields()
+  })
+  speedPitchStore.resetChangedFields()
+  providerStore.updateProviders(detail.contextProviders || [])
+}
 
-    // 加载上下文配置
+async function enhanceAgentDetailMetadata(detail: AgentDetail, targetAgentId: string, requestId: number) {
-    providerStore.updateProviders(detail.contextProviders || [])
+  try {
-
-    // 如果有TTS模型，加载对应的音色选项
     if (detail.ttsModelId) {
       await fetchAllLanguag(detail.ttsModelId, {
         preferredLanguage: detail.ttsLanguage,
@@ -258,20 +381,28 @@ async function loadAgentDetail() {
       languageOptions.value = []
       selectedTtsLanguage.value = ''
     }
-
-    // 等待模型选项加载完成后再更新显示名称
     await nextTick()
-    updateDisplayNames()
+    if (isActiveAgentDetailRequest(targetAgentId, requestId)) {
+      updateDisplayNames()
+    }
   }
   catch (error) {
-    console.error('加载智能体详情失败:', error)
+    // Persisted agent detail has already loaded successfully. Voice metadata is
-    toast.error(t('agent.loadFail'))
+    // display enhancement only and must not keep the post-restore save barrier.
-  }
+    console.warn('Failed to enhance agent detail metadata:', error)
-  finally {
-    loading.value = false
   }
 }
 
+function isActiveAgentDetailRequest(targetAgentId: string, requestId: number) {
+  return targetAgentId === agentId.value && requestId === agentDetailRequestSequence
+}
+
+function invalidateTtsMetadataRequest() {
+  ttsOptionsRequestSequence += 1
+  ttsOptionsLoading.value = false
+  ttsOptionsModelId.value = ''
+}
+
 // 获取音色显示名称
 function getVoiceDisplayName(ttsVoiceId: string) {
   if (!ttsVoiceId)
@@ -374,6 +505,60 @@ interface VoiceSelectionOptions {
   preferredVoiceId?: string | null
 }
 
+interface TtsSelectionState {
+  modelId: string
+  voiceId: string
+  language: string
+  selectedLanguage: string
+  languageTouched: boolean
+  voiceTouched: boolean
+  optionsModelId: string
+  voiceOptions: any[]
+  voiceDetails: Record<string, any>
+  languageOptions: any[]
+  displayNames: {
+    tts: string
+    voiceprint: string
+    language: string
+  }
+}
+
+function captureTtsSelectionState(): TtsSelectionState {
+  return {
+    modelId: formData.value.ttsModelId || '',
+    voiceId: formData.value.ttsVoiceId || '',
+    language: formData.value.ttsLanguage || '',
+    selectedLanguage: selectedTtsLanguage.value,
+    languageTouched: ttsLanguageTouched.value,
+    voiceTouched: ttsVoiceTouched.value,
+    optionsModelId: ttsOptionsModelId.value,
+    voiceOptions: voiceOptions.value,
+    voiceDetails: voiceDetails.value,
+    languageOptions: languageOptions.value,
+    displayNames: {
+      tts: displayNames.value.tts,
+      voiceprint: displayNames.value.voiceprint,
+      language: displayNames.value.language,
+    },
+  }
+}
+
+function restoreTtsSelectionState(state: TtsSelectionState) {
+  formData.value.ttsModelId = state.modelId
+  formData.value.ttsVoiceId = state.voiceId
+  formData.value.ttsLanguage = state.language
+  selectedTtsLanguage.value = state.selectedLanguage
+  ttsLanguageTouched.value = state.languageTouched
+  ttsVoiceTouched.value = state.voiceTouched
+  ttsOptionsModelId.value = state.optionsModelId
+  voiceOptions.value = state.voiceOptions
+  voiceDetails.value = state.voiceDetails
+  languageOptions.value = state.languageOptions
+  displayNames.value.tts = state.displayNames.tts
+  displayNames.value.voiceprint = state.displayNames.voiceprint
+  displayNames.value.language = state.displayNames.language
+}
+
 function filterVoicesByLanguage(options: VoiceSelectionOptions = {}) {
   if (!voiceDetails.value || Object.keys(voiceDetails.value).length === 0) {
     voiceOptions.value = []
@@ -383,13 +568,7 @@ function filterVoicesByLanguage(options: VoiceSelectionOptions = {}) {
   const allVoices = Object.values(voiceDetails.value) as any[]
 
   // 根据选中的语言筛选音色
-  const filteredVoices = allVoices.filter((voice) => {
+  const filteredVoices = filterTtsVoicesByLanguage(allVoices, selectedTtsLanguage.value)
-    if (!voice.languages) {
-      return false
-    }
-    const languagesArray = voice.languages.split(/[、；;,，]/).map(lang => lang.trim()).filter(lang => lang)
-    return languagesArray.includes(selectedTtsLanguage.value)
-  })
 
   voiceOptions.value = filteredVoices.map(voice => ({
     value: voice.id,
@@ -427,13 +606,22 @@ function getVoiceDefaultLanguage(ttsVoiceId: string) {
 }
 
 // 根据语音合成模型加载语言
-async function fetchAllLanguag(ttsModelId: string, options: VoiceSelectionOptions = {}) {
+async function fetchAllLanguag(ttsModelId: string, options: VoiceSelectionOptions = {}): Promise<'loaded' | 'failed' | 'stale'> {
   const requestId = ++ttsOptionsRequestSequence
   ttsOptionsLoading.value = true
   try {
     const res = await getAllLanguage(ttsModelId)
     if (requestId !== ttsOptionsRequestSequence) {
-      return
+      return 'stale'
+    }
+    if (!Array.isArray(res)) {
+      throw new TypeError('Invalid TTS voice metadata')
+    }
+    // An empty response cannot prove that the newly selected model accepts an
+    // empty voice. Until the API exposes an explicit "voice optional"
+    // capability, keep the previous tuple instead of persisting a guess.
+    if (!hasUsableTtsVoiceMetadata(res)) {
+      throw new Error('No TTS voice metadata is available')
     }
     // 保存完整的音色信息
     voiceDetails.value = res.reduce((acc, voice) => {
@@ -457,6 +645,10 @@ async function fetchAllLanguag(ttsModelId: string, options: VoiceSelectionOption
     const preferredVoiceLanguage = options.preferredVoiceId
       ? getVoiceDefaultLanguage(options.preferredVoiceId)
       : ''
+    // Do not carry a language from the previous model into a provider which
+    // exposes no language dimension.
+    selectedTtsLanguage.value = ''
+    displayNames.value.language = ''
     // 优先使用调用方指定的语言或音色默认语言，再回退到智能体当前配置
     if (requestedLanguage && languageOptions.value.some(option => option.value === requestedLanguage)) {
       selectedTtsLanguage.value = requestedLanguage
@@ -481,13 +673,15 @@ async function fetchAllLanguag(ttsModelId: string, options: VoiceSelectionOption
 
     // 根据选中的语言筛选音色
     filterVoicesByLanguage(options)
+    ttsOptionsModelId.value = ttsModelId
+    return 'loaded'
   }
-  catch {
+  catch (error) {
     if (requestId === ttsOptionsRequestSequence) {
-      voiceOptions.value = []
+      console.error('Failed to load TTS options:', error)
-      voiceDetails.value = {}
+      ttsOptionsModelId.value = ''
-      languageOptions.value = []
     }
+    return requestId === ttsOptionsRequestSequence ? 'failed' : 'stale'
   }
   finally {
     if (requestId === ttsOptionsRequestSequence) {
@@ -514,7 +708,10 @@ async function fetchAllLanguag(ttsModelId: string, options: VoiceSelectionOption
 // }
 
 // 选择角色模板
-function selectRoleTemplate(templateId: string) {
+async function selectRoleTemplate(templateId: string) {
+  if (ttsOptionsLoading.value) {
+    return
+  }
   if (selectedTemplateId.value === templateId) {
     selectedTemplateId.value = ''
     return
@@ -523,6 +720,7 @@ function selectRoleTemplate(templateId: string) {
   selectedTemplateId.value = templateId
   const template = roleTemplates.value.find(t => t.id === templateId)
   if (template) {
+    const previousTtsState = captureTtsSelectionState()
     const templateTtsLanguage = template.ttsLanguage?.trim() || ''
     const hasTemplateTtsLanguage = Boolean(templateTtsLanguage)
     formData.value = {
@@ -548,14 +746,20 @@ function selectRoleTemplate(templateId: string) {
       displayNames.value.language = templateTtsLanguage
     }
     if (template.ttsModelId || template.ttsVoiceId || hasTemplateTtsLanguage) {
-      ttsLanguageTouched.value = true
+      const result = await fetchAllLanguag(template.ttsModelId || formData.value.ttsModelId, {
-      ttsVoiceTouched.value = true
+        autoSelectVoice: true,
+        preferredLanguage: hasTemplateTtsLanguage ? templateTtsLanguage : '',
+        preferredVoiceId: template.ttsVoiceId,
+      })
+      if (result === 'failed') {
+        restoreTtsSelectionState(previousTtsState)
+        toast.warning(t('agent.ttsOptionsLoadFailed'))
+      }
+      else if (result === 'loaded') {
+        ttsLanguageTouched.value = true
+        ttsVoiceTouched.value = true
+      }
     }
-    fetchAllLanguag(template.ttsModelId || formData.value.ttsModelId, {
-      autoSelectVoice: true,
-      preferredLanguage: hasTemplateTtsLanguage ? templateTtsLanguage : '',
-      preferredVoiceId: template.ttsVoiceId,
-    })
     updateDisplayNames()
   }
 }
@@ -572,6 +776,7 @@ function openPicker(type: string) {
 async function onPickerConfirm(type: string, value: any, name: string) {
   console.log('选择器确认:', type, value, name)
 
+  const previousTtsState = type === 'tts' ? captureTtsSelectionState() : null
   // 保存显示名称
   displayNames.value[type] = name
 
@@ -613,10 +818,16 @@ async function onPickerConfirm(type: string, value: any, name: string) {
     case 'tts': {
       const preferredLanguage = selectedTtsLanguage.value
       formData.value.ttsModelId = value
-      ttsLanguageTouched.value = true
-      ttsVoiceTouched.value = true
       formData.value.ttsVoiceId = ''
-      await fetchAllLanguag(value, { autoSelectVoice: true, preferredLanguage })
+      const result = await fetchAllLanguag(value, { autoSelectVoice: true, preferredLanguage })
+      if (result === 'failed' && previousTtsState) {
+        restoreTtsSelectionState(previousTtsState)
+        toast.warning(t('agent.ttsOptionsLoadFailed'))
+      }
+      else if (result === 'loaded') {
+        ttsLanguageTouched.value = true
+        ttsVoiceTouched.value = true
+      }
       break
     }
     case 'language':
@@ -719,9 +930,28 @@ function getModelDisplayName(modelType: string, modelId: string) {
 
 // 保存智能体
 async function saveAgent() {
+  if (saving.value) {
+    return
+  }
+  if (snapshotReloadBlocked.value) {
+    toast.error(t(snapshotReloadFailed.value
+      ? 'agentSnapshot.reloadAfterRestoreFailed'
+      : 'agentSnapshot.reloadAfterRestorePending'))
+    return
+  }
   if (ttsOptionsLoading.value) {
     return
   }
+  const ttsSelectionTouched = ttsLanguageTouched.value || ttsVoiceTouched.value
+  const hasLanguageOptions = languageOptions.value.length > 0
+  const hasVoiceOptions = Object.keys(voiceDetails.value).length > 0
+  if (ttsSelectionTouched
+    && (ttsOptionsModelId.value !== formData.value.ttsModelId
+      || (hasLanguageOptions && !selectedTtsLanguage.value)
+      || (hasVoiceOptions && !formData.value.ttsVoiceId))) {
+    toast.warning(t('agent.ttsOptionsLoadFailed'))
+    return
+  }
   if (!formData.value.agentName?.trim()) {
     toast.warning(t('agent.pleaseInputAgentName'))
     return
@@ -815,20 +1045,116 @@ function handleTools() {
 }
 
 // 获取智能体标签
-async function loadAgentTags() {
+async function loadAgentTags(targetAgentId = agentId.value) {
+  if (!targetAgentId) {
+    return false
+  }
+  const requestId = ++agentTagRequestSequence
   try {
-    const res = await getAgentTags(agentId.value)
+    const res = await getAgentTags(targetAgentId)
+    if (!isActiveAgentTagRequest(targetAgentId, requestId)) {
+      return false
+    }
     dynamicTags.value = res || []
     originalTagNames.value = dynamicTags.value.map(tag => tag.tagName)
+    return true
+  }
+  catch (error) {
+    if (isActiveAgentTagRequest(targetAgentId, requestId)) {
+      console.error('加载智能体标签失败:', error)
+    }
+    return false
   }
-  catch (error) {}
 }
 
-async function handleSnapshotRestored() {
+function isActiveAgentTagRequest(targetAgentId: string, requestId: number) {
-  await Promise.all([
+  return targetAgentId === agentId.value && requestId === agentTagRequestSequence
-    loadAgentDetail(),
+}
-    loadAgentTags(),
+
-  ])
+async function handleSnapshotRestored(context: SnapshotRestoreContext) {
+  if (!context || context.agentId !== agentId.value) {
+    return
+  }
+  await reloadAgentAfterSnapshotRestore(context.agentId)
+}
+
+async function reloadAgentAfterSnapshotRestore(targetAgentId = agentId.value) {
+  if (!targetAgentId || targetAgentId !== agentId.value) {
+    return false
+  }
+  const reloadId = ++snapshotReloadSequence
+  const detailRequestId = ++agentDetailRequestSequence
+  const tagRequestId = ++agentTagRequestSequence
+  snapshotReloadBlocked.value = true
+  snapshotReloadFailed.value = false
+  loading.value = true
+  invalidateTtsMetadataRequest()
+
+  try {
+    // Apply detail and tags only after both persisted reads succeed. If either
+    // fails, the old form may remain visible but cannot be saved until retry.
+    const [detail, tags] = await Promise.all([
+      getAgentDetail(targetAgentId),
+      getAgentTags(targetAgentId),
+    ])
+    if (!isActiveSnapshotReload(targetAgentId, reloadId, detailRequestId, tagRequestId)) {
+      return false
+    }
+
+    applyPersistedAgentDetail(detail, targetAgentId)
+    dynamicTags.value = tags || []
+    originalTagNames.value = dynamicTags.value.map(tag => tag.tagName)
+
+    // Voice metadata is an optional display enhancement. Its own failure must
+    // not turn a successful persisted detail+tag reload into a blocked form.
+    await enhanceAgentDetailMetadata(detail, targetAgentId, detailRequestId)
+    if (!isActiveSnapshotReload(targetAgentId, reloadId, detailRequestId, tagRequestId)) {
+      return false
+    }
+    snapshotReloadBlocked.value = false
+    snapshotReloadFailed.value = false
+    return true
+  }
+  catch (error) {
+    if (isActiveSnapshotReload(targetAgentId, reloadId, detailRequestId, tagRequestId)) {
+      console.error('恢复后重新加载智能体失败:', error)
+      snapshotReloadFailed.value = true
+      toast.error(t('agentSnapshot.reloadAfterRestoreFailed'))
+    }
+    return false
+  }
+  finally {
+    if (isActiveSnapshotReload(targetAgentId, reloadId, detailRequestId, tagRequestId)) {
+      loading.value = false
+    }
+  }
+}
+
+function isActiveSnapshotReload(
+  targetAgentId: string,
+  reloadId: number,
+  detailRequestId: number,
+  tagRequestId: number,
+) {
+  return targetAgentId === agentId.value
+    && reloadId === snapshotReloadSequence
+    && detailRequestId === agentDetailRequestSequence
+    && tagRequestId === agentTagRequestSequence
+}
+
+function retrySnapshotReload() {
+  if (!snapshotReloadFailed.value || !agentId.value) {
+    return
+  }
+  void reloadAgentAfterSnapshotRestore(agentId.value)
+}
+
+function openSnapshotPanel() {
+  if (saving.value || snapshotReloadBlocked.value) {
+    toast.warning(t('agentSnapshot.mutationBusy'))
+    return
+  }
+  showSnapshotPanel.value = true
 }
 
 function isSameStringList(left: string[], right: string[]) {
@@ -843,6 +1169,24 @@ watch(() => pluginStore.currentFunctions, (newFunctions) => {
   formData.value.functions = normalizeAgentFunctions(newFunctions || [])
 }, { deep: true })
 
+watch(agentId, (currentAgentId, previousAgentId) => {
+  if (currentAgentId === previousAgentId) {
+    return
+  }
+  agentDetailRequestSequence += 1
+  agentTagRequestSequence += 1
+  snapshotReloadSequence += 1
+  invalidateTtsMetadataRequest()
+  loading.value = false
+  snapshotReloadFailed.value = false
+  snapshotReloadBlocked.value = Boolean(currentAgentId)
+  originalAgentDetail.value = null
+  originalTagNames.value = []
+  if (currentAgentId) {
+    void reloadAgentAfterSnapshotRestore(currentAgentId)
+  }
+}, { flush: 'sync' })
+
 onMounted(async () => {
   loadAgentTags()
 
@@ -854,7 +1198,7 @@ onMounted(async () => {
   ])
 
   // 然后加载智能体详情，这样可以正确映射显示名称
-  if (agentId.value) {
+  if (agentId.value && !snapshotReloadBlocked.value) {
     await loadAgentDetail()
   }
 })
@@ -874,8 +1218,9 @@ onMounted(async () => {
       <wd-button
         size="small"
         type="primary"
+        :disabled="saving || snapshotReloadBlocked"
         custom-class="!bg-[#336cff] !h-[64rpx] !rounded-[32rpx]"
-        @click="showSnapshotPanel = true"
+        @click="openSnapshotPanel"
       >
         {{ t('agentSnapshot.title') }}
       </wd-button>
@@ -1152,10 +1497,27 @@ onMounted(async () => {
 
     <!-- 保存按钮 -->
     <view class="mt-[40rpx] p-0">
+      <view
+        v-if="snapshotReloadBlocked"
+        class="mb-[18rpx] rounded-[16rpx] bg-[rgba(245,108,108,0.1)] p-[20rpx] text-[24rpx] text-[#a34848] leading-[1.6]"
+      >
+        <text class="block">
+          {{ t(snapshotReloadFailed ? 'agentSnapshot.reloadAfterRestoreFailed' : 'agentSnapshot.reloadAfterRestorePending') }}
+        </text>
+        <wd-button
+          v-if="snapshotReloadFailed"
+          size="small"
+          type="info"
+          custom-class="mt-[14rpx] !h-[60rpx]"
+          @click="retrySnapshotReload"
+        >
+          {{ t('agentSnapshot.retryReload') }}
+        </wd-button>
+      </view>
       <wd-button
         type="primary"
         :loading="saving"
-        :disabled="saving || ttsOptionsLoading"
+        :disabled="saving || ttsOptionsLoading || snapshotReloadBlocked"
         custom-class="w-full h-[80rpx] rounded-[16rpx] text-[30rpx] font-semibold bg-[#336cff] active:bg-[#2d5bd1]"
         @click="saveAgent"
       >
@@ -1260,6 +1622,8 @@ onMounted(async () => {
       v-model:visible="showSnapshotPanel"
       :agent-id="agentId"
       :current-version-no="currentVersionNo"
+      :has-unsaved-changes="hasUnsavedChanges"
+      :mutation-busy="saving || snapshotReloadBlocked"
       @restored="handleSnapshotRestored"
     />
   </view>

main/manager-mobile/src/wot-design-uni.d.ts

@@ -1,30 +1,56 @@
-import type { Component } from 'vue'
+import type { ExtractPropTypes } from 'vue'
+import type { actionSheetProps } from 'wot-design-uni/components/wd-action-sheet/types'
+import type { buttonProps } from 'wot-design-uni/components/wd-button/types'
+import type { checkboxProps } from 'wot-design-uni/components/wd-checkbox/types'
+import type { configProviderProps } from 'wot-design-uni/components/wd-config-provider/types'
+import type { fabProps } from 'wot-design-uni/components/wd-fab/types'
+import type { iconProps } from 'wot-design-uni/components/wd-icon/types'
+import type { imgProps } from 'wot-design-uni/components/wd-img/types'
+import type { inputProps } from 'wot-design-uni/components/wd-input/types'
+import type { loadingProps } from 'wot-design-uni/components/wd-loading/types'
+import type { messageBoxProps } from 'wot-design-uni/components/wd-message-box/types'
+import type { navbarProps } from 'wot-design-uni/components/wd-navbar/types'
+import type { pickerProps } from 'wot-design-uni/components/wd-picker/types'
+import type { popupProps } from 'wot-design-uni/components/wd-popup/types'
+import type { segmentedProps } from 'wot-design-uni/components/wd-segmented/types'
+import type { sliderProps } from 'wot-design-uni/components/wd-slider/types'
+import type { statusTipProps } from 'wot-design-uni/components/wd-status-tip/types'
+import type { swipeActionProps } from 'wot-design-uni/components/wd-swipe-action/types'
+import type { switchProps } from 'wot-design-uni/components/wd-switch/types'
+import type { tabbarItemProps } from 'wot-design-uni/components/wd-tabbar-item/types'
+import type { tabbarProps } from 'wot-design-uni/components/wd-tabbar/types'
+import type { tagProps } from 'wot-design-uni/components/wd-tag/types'
+import type { toastProps } from 'wot-design-uni/components/wd-toast/types'
+
+type TypedGlobalComponent<Props> = new () => { $props: Partial<Props> }
 
 // wot-design-uni 1.9.1 exposes raw Vue source through its global declarations.
-// Keep the components used by this app recognizable without pulling that source into vue-tsc.
+// Rebuild lightweight global components from the published prop objects without
+// pulling the package's raw Vue source into vue-tsc. Partial preserves Vue's
+// runtime defaults while retaining prop names and value types.
 declare module 'vue' {
   export interface GlobalComponents {
-    WdActionSheet: Component
+    WdActionSheet: TypedGlobalComponent<ExtractPropTypes<typeof actionSheetProps>>
-    WdButton: Component
+    WdButton: TypedGlobalComponent<ExtractPropTypes<typeof buttonProps>>
-    WdCheckbox: Component
+    WdCheckbox: TypedGlobalComponent<ExtractPropTypes<typeof checkboxProps>>
-    WdConfigProvider: Component
+    WdConfigProvider: TypedGlobalComponent<ExtractPropTypes<typeof configProviderProps>>
-    WdFab: Component
+    WdFab: TypedGlobalComponent<ExtractPropTypes<typeof fabProps>>
-    WdIcon: Component
+    WdIcon: TypedGlobalComponent<ExtractPropTypes<typeof iconProps>>
-    WdImg: Component
+    WdImg: TypedGlobalComponent<ExtractPropTypes<typeof imgProps>>
-    WdInput: Component
+    WdInput: TypedGlobalComponent<ExtractPropTypes<typeof inputProps>>
-    WdLoading: Component
+    WdLoading: TypedGlobalComponent<ExtractPropTypes<typeof loadingProps>>
-    WdMessageBox: Component
+    WdMessageBox: TypedGlobalComponent<ExtractPropTypes<typeof messageBoxProps>>
-    WdNavbar: Component
+    WdNavbar: TypedGlobalComponent<ExtractPropTypes<typeof navbarProps>>
-    WdPicker: Component
+    WdPicker: TypedGlobalComponent<ExtractPropTypes<typeof pickerProps>>
-    WdPopup: Component
+    WdPopup: TypedGlobalComponent<ExtractPropTypes<typeof popupProps>>
-    WdSegmented: Component
+    WdSegmented: TypedGlobalComponent<ExtractPropTypes<typeof segmentedProps>>
-    WdSlider: Component
+    WdSlider: TypedGlobalComponent<ExtractPropTypes<typeof sliderProps>>
-    WdStatusTip: Component
+    WdStatusTip: TypedGlobalComponent<ExtractPropTypes<typeof statusTipProps>>
-    WdSwipeAction: Component
+    WdSwipeAction: TypedGlobalComponent<ExtractPropTypes<typeof swipeActionProps>>
-    WdSwitch: Component
+    WdSwitch: TypedGlobalComponent<ExtractPropTypes<typeof switchProps>>
-    WdTabbar: Component
+    WdTabbar: TypedGlobalComponent<ExtractPropTypes<typeof tabbarProps>>
-    WdTabbarItem: Component
+    WdTabbarItem: TypedGlobalComponent<ExtractPropTypes<typeof tabbarItemProps>>
-    WdTag: Component
+    WdTag: TypedGlobalComponent<ExtractPropTypes<typeof tagProps>>
-    WdToast: Component
+    WdToast: TypedGlobalComponent<ExtractPropTypes<typeof toastProps>>
   }
 }

main/manager-mobile/tsconfig.json

@@ -30,6 +30,7 @@
   "include": [
     "src/**/*.ts",
     "src/**/*.js",
+    "src/**/*.mjs",
     "src/**/*.d.ts",
     "src/**/*.tsx",
     "src/**/*.jsx",

main/manager-web/package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "check:i18n": "node scripts/check-i18n.js",
+    "test:snapshot": "node --test src/components/agentSnapshotDisplayUtils.test.mjs src/apis/module/agentSnapshotApi.test.mjs",
     "build": "vue-cli-service build",
     "analyze": "cross-env ANALYZE=true vue-cli-service build"
   },

main/manager-web/src/apis/module/agent.js

@@ -1,6 +1,41 @@
 import { getServiceUrl } from '../api';
 import RequestService from '../httpRequest';
 
+const CALLBACK_RETRY_LIMIT = 10;
+const CALLBACK_RETRY_DELAY_MS = 2000;
+const CALLBACK_RETRY_WINDOW_MS = CALLBACK_RETRY_LIMIT * CALLBACK_RETRY_DELAY_MS;
+
+function retryCallbackRequest(retry, retryCount, onTerminalFailure, error, retryStartedAt) {
+    if (!onTerminalFailure) {
+        RequestService.reAjaxFun(() => retry(retryCount + 1))
+        return
+    }
+    const startedAt = retryStartedAt || Date.now()
+    if (retryCount >= CALLBACK_RETRY_LIMIT || Date.now() - startedAt >= CALLBACK_RETRY_WINDOW_MS) {
+        RequestService.clearRequestTime()
+        onTerminalFailure(error)
+        return
+    }
+    setTimeout(() => retry(retryCount + 1, startedAt), CALLBACK_RETRY_DELAY_MS)
+}
+
+function attachTerminalFailure(request, onTerminalFailure) {
+    if (onTerminalFailure) {
+        request.fail((error) => {
+            RequestService.clearRequestTime()
+            onTerminalFailure(error)
+        })
+    }
+    return request
+}
+
+function terminateCallbackRequest(onTerminalFailure, error) {
+    RequestService.clearRequestTime()
+    if (onTerminalFailure) {
+        onTerminalFailure(error)
+    }
+}
+
 
 export default {
     // 获取智能体列表
@@ -50,8 +85,9 @@ export default {
             }).send();
     },
     // 获取智能体配置
-    getDeviceConfig(agentId, callback) {
+    getDeviceConfig(agentId, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-        RequestService.sendRequest()
+        const retryWindowStartedAt = retryStartedAt || Date.now()
+        const request = RequestService.sendRequest()
             .url(`${getServiceUrl()}/agent/${agentId}`)
             .method('GET')
             .success((res) => {
@@ -60,10 +96,21 @@ export default {
             })
             .networkFail((err) => {
                 console.error('获取配置失败:', err);
-                RequestService.reAjaxFun(() => {
+                retryCallbackRequest(
-                    this.getDeviceConfig(agentId, callback);
+                    (nextRetryCount, nextRetryStartedAt) => this.getDeviceConfig(
-                });
+                        agentId,
-            }).send();
+                        callback,
+                        onTerminalFailure,
+                        nextRetryCount,
+                        nextRetryStartedAt
+                    ),
+                    retryCount,
+                    onTerminalFailure,
+                    err,
+                    retryWindowStartedAt
+                )
+            })
+        attachTerminalFailure(request, onTerminalFailure).send();
     },
     // 配置智能体
     updateAgentConfig(agentId, configData, callback) {
@@ -82,8 +129,9 @@ export default {
             }).send();
     },
     // 获取智能体配置快照列表
-    getAgentSnapshots(agentId, params, callback) {
+    getAgentSnapshots(agentId, params, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-        RequestService.sendRequest()
+        const retryWindowStartedAt = retryStartedAt || Date.now()
+        const request = RequestService.sendRequest()
             .url(`${getServiceUrl()}/agent/${agentId}/snapshots`)
             .method('GET')
             .data(params)
@@ -91,56 +139,80 @@ export default {
                 RequestService.clearRequestTime();
                 callback(res);
             })
-            .networkFail(() => {
+            .networkFail((error) => {
-                RequestService.reAjaxFun(() => {
+                retryCallbackRequest(
-                    this.getAgentSnapshots(agentId, params, callback);
+                    (nextRetryCount, nextRetryStartedAt) => this.getAgentSnapshots(
-                });
+                        agentId,
-            }).send();
+                        params,
+                        callback,
+                        onTerminalFailure,
+                        nextRetryCount,
+                        nextRetryStartedAt
+                    ),
+                    retryCount,
+                    onTerminalFailure,
+                    error,
+                    retryWindowStartedAt
+                )
+            })
+        attachTerminalFailure(request, onTerminalFailure).send();
     },
     // 获取智能体配置快照详情
-    getAgentSnapshot(agentId, snapshotId, callback) {
+    getAgentSnapshot(agentId, snapshotId, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-        RequestService.sendRequest()
+        const retryWindowStartedAt = retryStartedAt || Date.now()
+        const request = RequestService.sendRequest()
             .url(`${getServiceUrl()}/agent/${agentId}/snapshots/${snapshotId}`)
             .method('GET')
             .success((res) => {
                 RequestService.clearRequestTime();
                 callback(res);
             })
-            .networkFail(() => {
+            .networkFail((error) => {
-                RequestService.reAjaxFun(() => {
+                retryCallbackRequest(
-                    this.getAgentSnapshot(agentId, snapshotId, callback);
+                    (nextRetryCount, nextRetryStartedAt) => this.getAgentSnapshot(
-                });
+                        agentId,
-            }).send();
+                        snapshotId,
+                        callback,
+                        onTerminalFailure,
+                        nextRetryCount,
+                        nextRetryStartedAt
+                    ),
+                    retryCount,
+                    onTerminalFailure,
+                    error,
+                    retryWindowStartedAt
+                )
+            })
+        attachTerminalFailure(request, onTerminalFailure).send();
     },
     // 恢复智能体配置快照
-    restoreAgentSnapshot(agentId, snapshotId, callback) {
+    restoreAgentSnapshot(agentId, snapshotId, currentStateToken, callback, onTerminalFailure) {
-        RequestService.sendRequest()
+        const request = RequestService.sendRequest()
             .url(`${getServiceUrl()}/agent/${agentId}/snapshots/${snapshotId}/restore`)
             .method('POST')
+            .data({ currentStateToken })
             .success((res) => {
                 RequestService.clearRequestTime();
                 callback(res);
             })
-            .networkFail(() => {
+            .networkFail((error) => {
-                RequestService.reAjaxFun(() => {
+                terminateCallbackRequest(onTerminalFailure, error)
-                    this.restoreAgentSnapshot(agentId, snapshotId, callback);
+            })
-                });
+        attachTerminalFailure(request, onTerminalFailure).send();
-            }).send();
     },
     // 删除智能体配置快照
-    deleteAgentSnapshot(agentId, snapshotId, callback) {
+    deleteAgentSnapshot(agentId, snapshotId, callback, onTerminalFailure) {
-        RequestService.sendRequest()
+        const request = RequestService.sendRequest()
             .url(`${getServiceUrl()}/agent/${agentId}/snapshots/${snapshotId}`)
             .method('DELETE')
             .success((res) => {
                 RequestService.clearRequestTime();
                 callback(res);
             })
-            .networkFail(() => {
+            .networkFail((error) => {
-                RequestService.reAjaxFun(() => {
+                terminateCallbackRequest(onTerminalFailure, error)
-                    this.deleteAgentSnapshot(agentId, snapshotId, callback);
+            })
-                });
+        attachTerminalFailure(request, onTerminalFailure).send();
-            }).send();
     },
     // 新增方法：获取智能体模板
     getAgentTemplate(callback) {  // 移除templateName参数
@@ -463,19 +535,31 @@ export default {
             }).send();
     },
     // 获取智能体标签
-    getAgentTags(agentId, callback) {
+    getAgentTags(agentId, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-        RequestService.sendRequest()
+        const retryWindowStartedAt = retryStartedAt || Date.now()
+        const request = RequestService.sendRequest()
             .url(`${getServiceUrl()}/agent/${agentId}/tags`)
             .method('GET')
             .success((res) => {
                 RequestService.clearRequestTime();
                 callback(res);
             })
-            .networkFail(() => {
+            .networkFail((error) => {
-                RequestService.reAjaxFun(() => {
+                retryCallbackRequest(
-                    this.getAgentTags(agentId, callback);
+                    (nextRetryCount, nextRetryStartedAt) => this.getAgentTags(
-                });
+                        agentId,
-            }).send();
+                        callback,
+                        onTerminalFailure,
+                        nextRetryCount,
+                        nextRetryStartedAt
+                    ),
+                    retryCount,
+                    onTerminalFailure,
+                    error,
+                    retryWindowStartedAt
+                )
+            })
+        attachTerminalFailure(request, onTerminalFailure).send();
     },
     // 保存智能体标签
     saveAgentTags(agentId, tags, callback) {

main/manager-web/src/apis/module/agentSnapshotApi.test.mjs

@@ -0,0 +1,123 @@
+/* eslint-disable test/no-import-node-test -- zero-dependency API regression gate */
+import assert from "node:assert/strict";
+import { readFile } from "node:fs/promises";
+import test from "node:test";
+
+const agentApiSource = await readFile(new URL("./agent.js", import.meta.url), "utf8");
+const snapshotDialogSource = await readFile(
+  new URL("../../components/AgentSnapshotDialog.vue", import.meta.url),
+  "utf8"
+);
+
+function sourceBetween(source, startMarker, endMarker) {
+  const start = source.indexOf(startMarker);
+  const end = source.indexOf(endMarker, start);
+  assert.notEqual(start, -1, `missing source marker: ${startMarker}`);
+  assert.notEqual(end, -1, `missing source marker: ${endMarker}`);
+  return source.slice(start, end);
+}
+
+test("snapshot restore sends the preview token once without an automatic replay", () => {
+  const source = sourceBetween(
+    agentApiSource,
+    "restoreAgentSnapshot(agentId",
+    "// 删除智能体配置快照"
+  );
+
+  assert.match(source, /restoreAgentSnapshot\(agentId, snapshotId, currentStateToken, callback, onTerminalFailure\)/);
+  assert.match(source, /\.method\('POST'\)/);
+  assert.match(source, /\.data\(\{ currentStateToken \}\)/);
+  assert.match(source, /terminateCallbackRequest\(onTerminalFailure, error\)/);
+  assert.doesNotMatch(source, /retryCallbackRequest|RequestService\.reAjaxFun|this\.restoreAgentSnapshot/);
+});
+
+test("snapshot deletion terminates on network failure without an automatic replay", () => {
+  const source = sourceBetween(
+    agentApiSource,
+    "deleteAgentSnapshot(agentId",
+    "// 新增方法：获取智能体模板"
+  );
+
+  assert.match(source, /deleteAgentSnapshot\(agentId, snapshotId, callback, onTerminalFailure\)/);
+  assert.match(source, /\.method\('DELETE'\)/);
+  assert.match(source, /terminateCallbackRequest\(onTerminalFailure, error\)/);
+  assert.doesNotMatch(source, /retryCallbackRequest|RequestService\.reAjaxFun|this\.deleteAgentSnapshot/);
+});
+
+test("restore preview uses the state data and token from one snapshot-detail response", () => {
+  const source = sourceBetween(
+    snapshotDialogSource,
+    "restoreSnapshot(row)",
+    "decorateSnapshotRows(rows)"
+  );
+
+  assert.match(source, /this\.fetchSnapshotDetail\(row\.id\)\.then\(\(targetSnapshot\)/);
+  assert.match(source, /beforeSnapshotData: targetSnapshot\.currentSnapshotData/);
+  assert.match(source, /hasValidCurrentStateToken\(targetSnapshot\.currentStateToken\)/);
+  assert.doesNotMatch(source, /fetchCurrentAgentData|fetchCurrentAgentTags|Promise\.all/);
+});
+
+test("snapshot dialogs cannot close while a restore request is in flight", () => {
+  const guardedDialogs = snapshotDialogSource.match(/:before-close="guardRestoreInFlightClose"/g) || [];
+  const hiddenCloseButtons = snapshotDialogSource.match(/:show-close="!restoring"/g) || [];
+  assert.equal(guardedDialogs.length, 2);
+  assert.equal(hiddenCloseButtons.length, 2);
+  assert.match(
+    snapshotDialogSource,
+    /class="snapshot-footer-button snapshot-footer-cancel"[\s\S]*?:disabled="restoring"[\s\S]*?@click="closeRestorePreview"/
+  );
+
+  const closeMethods = sourceBetween(
+    snapshotDialogSource,
+    "    close() {",
+    "    open() {"
+  );
+  assert.match(closeMethods, /close\(\) \{\s+if \(this\.restoring\) \{\s+return;/);
+  assert.match(closeMethods, /guardRestoreInFlightClose\(done\) \{\s+if \(this\.restoring\) \{\s+return;[\s\S]*?done\(\);/);
+  assert.match(closeMethods, /closeRestorePreview\(\) \{\s+if \(this\.restoring\) \{\s+return;[\s\S]*?this\.restorePreviewVisible = false;/);
+});
+
+test("destructive restore requires a second explicit warning before the POST", () => {
+  const source = sourceBetween(
+    snapshotDialogSource,
+    "    confirmRestoreSnapshot() {",
+    "    deleteSnapshot(row) {"
+  );
+
+  assert.match(
+    source,
+    /if \(!this\.restoreWillClearChatHistory\) \{\s+this\.submitRestoreSnapshot\(snapshotId, currentStateToken\);\s+return;\s+\}/
+  );
+  assert.match(
+    source,
+    /this\.\$confirm\(\s+this\.\$t\("agentSnapshot\.restoreMemoryDestructiveWarning"\),[\s\S]*?type: "error"[\s\S]*?\)\.then\(\(\) => \{[\s\S]*?this\.submitRestoreSnapshot\(snapshotId, currentStateToken, requestSeq\);/
+  );
+  assert.match(source, /if \(this\.restoring \|\| !this\.restorePreviewRow\) \{\s+return;/);
+});
+
+test("a terminal restore failure invalidates the atomic preview instead of replaying it", () => {
+  const source = sourceBetween(
+    snapshotDialogSource,
+    "    submitRestoreSnapshot(snapshotId",
+    "    deleteSnapshot(row) {"
+  );
+
+  assert.match(source, /else \{\s+this\.invalidateRestorePreview\(\);\s+this\.\$message\.error\(this\.restoreFailedMessage\(data\)\);/);
+  assert.match(source, /\}, \(\) => \{[\s\S]*?this\.invalidateRestorePreview\(\);\s+this\.\$message\.error\(this\.\$t\("agentSnapshot\.restoreFailed"\)\);/);
+  assert.match(source, /invalidateRestorePreview\(\) \{[\s\S]*?this\.restorePreviewSnapshot = null;[\s\S]*?this\.restorePreviewRow = null;/);
+});
+
+test("the latest snapshot does not expose a restore action", () => {
+  const source = sourceBetween(
+    snapshotDialogSource,
+    "    canRestoreSnapshot(row) {",
+    "    canDeleteSnapshot(row) {"
+  );
+
+  assert.match(source, /!!row\?\.id && !row\.isLatestSnapshot/);
+  assert.match(snapshotDialogSource, /v-if="canRestoreSnapshot\(scope\.row\)"/);
+  assert.match(
+    snapshotDialogSource,
+    /restoreSnapshot\(row\) \{\s+if \(!this\.canRestoreSnapshot\(row\)\) \{\s+return;/
+  );
+});

main/manager-web/src/apis/module/correctWord.js

@@ -1,6 +1,26 @@
 import { getServiceUrl } from '../api';
 import RequestService from '../httpRequest';
 
+const CALLBACK_RETRY_LIMIT = 10;
+const CALLBACK_RETRY_DELAY_MS = 2000;
+const CALLBACK_RETRY_WINDOW_MS = CALLBACK_RETRY_LIMIT * CALLBACK_RETRY_DELAY_MS;
+
+function retryCallbackRequest(retry, retryCount, onTerminalFailure, error, retryStartedAt) {
+    if (!onTerminalFailure) {
+        RequestService.reAjaxFun(() => retry(retryCount + 1))
+        return
+    }
+    const startedAt = retryStartedAt || Date.now()
+    if (retryCount >= CALLBACK_RETRY_LIMIT || Date.now() - startedAt >= CALLBACK_RETRY_WINDOW_MS) {
+        RequestService.clearRequestTime()
+        if (onTerminalFailure) {
+            onTerminalFailure(error)
+        }
+        return
+    }
+    setTimeout(() => retry(retryCount + 1, startedAt), CALLBACK_RETRY_DELAY_MS)
+}
+
 
 export default {
     // 获取替换词文件列表
@@ -26,8 +46,9 @@ export default {
     },
 
     // 获取所有替换词文件（不分页）
-    selectAll(callback) {
+    selectAll(callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-        RequestService.sendRequest()
+        const retryWindowStartedAt = retryStartedAt || Date.now()
+        const request = RequestService.sendRequest()
             .url(`${getServiceUrl()}/correct-word/file/select`)
             .method('GET')
             .success((res) => {
@@ -36,10 +57,26 @@ export default {
             })
             .networkFail((err) => {
                 console.error('获取所有替换词文件失败:', err)
-                RequestService.reAjaxFun(() => {
+                retryCallbackRequest(
-                    this.selectAll(callback)
+                    (nextRetryCount, nextRetryStartedAt) => this.selectAll(
-                })
+                        callback,
-            }).send()
+                        onTerminalFailure,
+                        nextRetryCount,
+                        nextRetryStartedAt
+                    ),
+                    retryCount,
+                    onTerminalFailure,
+                    err,
+                    retryWindowStartedAt
+                )
+            })
+        if (onTerminalFailure) {
+            request.fail((error) => {
+                RequestService.clearRequestTime()
+                onTerminalFailure(error)
+            })
+        }
+        request.send()
     },
 
     // 下载替换词文件

main/manager-web/src/apis/module/model.js

@@ -1,6 +1,26 @@
 import { getServiceUrl } from '../api';
 import RequestService from '../httpRequest';
 
+const CALLBACK_RETRY_LIMIT = 10;
+const CALLBACK_RETRY_DELAY_MS = 2000;
+const CALLBACK_RETRY_WINDOW_MS = CALLBACK_RETRY_LIMIT * CALLBACK_RETRY_DELAY_MS;
+
+function retryCallbackRequest(retry, retryCount, onTerminalFailure, error, retryStartedAt) {
+  if (!onTerminalFailure) {
+    RequestService.reAjaxFun(() => retry(retryCount + 1));
+    return;
+  }
+  const startedAt = retryStartedAt || Date.now();
+  if (retryCount >= CALLBACK_RETRY_LIMIT || Date.now() - startedAt >= CALLBACK_RETRY_WINDOW_MS) {
+    RequestService.clearRequestTime();
+    if (onTerminalFailure) {
+      onTerminalFailure(error);
+    }
+    return;
+  }
+  setTimeout(() => retry(retryCount + 1, startedAt), CALLBACK_RETRY_DELAY_MS);
+}
+
 export default {
   // 获取模型配置列表
   getModelList(params, callback) {
@@ -92,8 +112,9 @@ export default {
       }).send()
   },
   // 获取模型名称列表
-  getModelNames(modelType, modelName, callback) {
+  getModelNames(modelType, modelName, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-    RequestService.sendRequest()
+    const retryWindowStartedAt = retryStartedAt || Date.now();
+    const request = RequestService.sendRequest()
       .url(`${getServiceUrl()}/models/names`)
       .method('GET')
       .data({ modelType, modelName })
@@ -101,15 +122,34 @@ export default {
         RequestService.clearRequestTime();
         callback(res);
       })
-      .networkFail(() => {
+      .networkFail((error) => {
-        RequestService.reAjaxFun(() => {
+        retryCallbackRequest(
-          this.getModelNames(modelType, modelName, callback);
+          (nextRetryCount, nextRetryStartedAt) => this.getModelNames(
-        });
+            modelType,
-      }).send();
+            modelName,
+            callback,
+            onTerminalFailure,
+            nextRetryCount,
+            nextRetryStartedAt
+          ),
+          retryCount,
+          onTerminalFailure,
+          error,
+          retryWindowStartedAt
+        );
+      });
+    if (onTerminalFailure) {
+      request.fail((error) => {
+        RequestService.clearRequestTime();
+        onTerminalFailure(error);
+      });
+    }
+    request.send();
   },
   // 获取LLM模型名称列表
-  getLlmModelCodeList(modelName, callback) {
+  getLlmModelCodeList(modelName, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-    RequestService.sendRequest()
+    const retryWindowStartedAt = retryStartedAt || Date.now();
+    const request = RequestService.sendRequest()
       .url(`${getServiceUrl()}/models/llm/names`)
       .method('GET')
       .data({ modelName })
@@ -117,29 +157,65 @@ export default {
         RequestService.clearRequestTime();
         callback(res);
       })
-      .networkFail(() => {
+      .networkFail((error) => {
-        RequestService.reAjaxFun(() => {
+        retryCallbackRequest(
-          this.getLlmModelCodeList(modelName, callback);
+          (nextRetryCount, nextRetryStartedAt) => this.getLlmModelCodeList(
-        });
+            modelName,
-      }).send();
+            callback,
+            onTerminalFailure,
+            nextRetryCount,
+            nextRetryStartedAt
+          ),
+          retryCount,
+          onTerminalFailure,
+          error,
+          retryWindowStartedAt
+        );
+      });
+    if (onTerminalFailure) {
+      request.fail((error) => {
+        RequestService.clearRequestTime();
+        onTerminalFailure(error);
+      });
+    }
+    request.send();
   },
   // 获取模型音色列表
-  getModelVoices(modelId, voiceName, callback) {
+  getModelVoices(modelId, voiceName, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
+    const retryWindowStartedAt = retryStartedAt || Date.now();
     const queryParams = new URLSearchParams({
       voiceName: voiceName || ''
     }).toString();
-    RequestService.sendRequest()
+    const request = RequestService.sendRequest()
       .url(`${getServiceUrl()}/models/${modelId}/voices?${queryParams}`)
       .method('GET')
       .success((res) => {
         RequestService.clearRequestTime();
         callback(res);
       })
-      .networkFail(() => {
+      .networkFail((error) => {
-        RequestService.reAjaxFun(() => {
+        retryCallbackRequest(
-          this.getModelVoices(modelId, voiceName, callback);
+          (nextRetryCount, nextRetryStartedAt) => this.getModelVoices(
-        });
+            modelId,
-      }).send();
+            voiceName,
+            callback,
+            onTerminalFailure,
+            nextRetryCount,
+            nextRetryStartedAt
+          ),
+          retryCount,
+          onTerminalFailure,
+          error,
+          retryWindowStartedAt
+        );
+      });
+    if (onTerminalFailure) {
+      request.fail((error) => {
+        RequestService.clearRequestTime();
+        onTerminalFailure(error);
+      });
+    }
+    request.send();
   },
   // 获取单个模型配置
   getModelConfig(id, callback) {
@@ -323,8 +399,9 @@ export default {
       }).send()
   },
   // 获取插件列表
-  getPluginFunctionList(params, callback) {
+  getPluginFunctionList(params, callback, onTerminalFailure, retryCount = 0, retryStartedAt = 0) {
-    RequestService.sendRequest()
+    const retryWindowStartedAt = retryStartedAt || Date.now();
+    const request = RequestService.sendRequest()
       .url(`${getServiceUrl()}/models/provider/plugin/names`)
       .method('GET')
       .success((res) => {
@@ -332,11 +409,30 @@ export default {
         callback(res)
       })
       .networkFail((err) => {
-        this.$message.error(err.msg || '获取插件列表失败')
+        if (!onTerminalFailure && this.$message) {
-        RequestService.reAjaxFun(() => {
+          this.$message.error(err.msg || '获取插件列表失败');
-          this.getPluginFunctionList(params, callback)
+        }
-        })
+        retryCallbackRequest(
-      }).send()
+          (nextRetryCount, nextRetryStartedAt) => this.getPluginFunctionList(
+            params,
+            callback,
+            onTerminalFailure,
+            nextRetryCount,
+            nextRetryStartedAt
+          ),
+          retryCount,
+          onTerminalFailure,
+          err,
+          retryWindowStartedAt
+        );
+      });
+    if (onTerminalFailure) {
+      request.fail((error) => {
+        RequestService.clearRequestTime();
+        onTerminalFailure(error);
+      });
+    }
+    request.send()
   },
 
   // 获取RAG模型列表

main/manager-web/src/components/AgentSnapshotDialog.vue

@@ -5,6 +5,10 @@
       :visible="visible"
       width="760px"
       class="agent-snapshot-dialog"
+      :before-close="guardRestoreInFlightClose"
+      :close-on-click-modal="!restoring"
+      :close-on-press-escape="!restoring"
+      :show-close="!restoring"
       @open="open"
       @close="close"
     >
@@ -302,6 +306,10 @@
       :visible.sync="restorePreviewVisible"
       width="860px"
       class="snapshot-detail-dialog"
+      :before-close="guardRestoreInFlightClose"
+      :close-on-click-modal="!restoring"
+      :close-on-press-escape="!restoring"
+      :show-close="!restoring"
     >
       <template slot="title">
         <div class="snapshot-dialog-title">
@@ -431,25 +439,34 @@
           :title="$t('agentSnapshot.restoreConfirm', { version: restoreTargetVersion })"
         />
         <el-alert
-          v-if="restoreWillClearChatHistory"
+          v-if="restorePreviewSnapshot"
           class="restore-risk-alert"
           type="warning"
           :closable="false"
           show-icon
-          :title="$t('agentSnapshot.restoreMemoryWarning')"
+          :title="$t('agentSnapshot.unsavedChangesWarning')"
+        />
+        <el-alert
+          v-if="restoreWillClearChatHistory"
+          class="restore-risk-alert"
+          type="error"
+          :closable="false"
+          show-icon
+          :title="$t('agentSnapshot.restoreMemoryDestructiveWarning')"
         />
       </div>
       <span slot="footer" class="snapshot-dialog-footer">
         <el-button
           class="snapshot-footer-button snapshot-footer-cancel"
-          @click="restorePreviewVisible = false"
+          :disabled="restoring"
+          @click="closeRestorePreview"
         >
           {{ $t('button.cancel') }}
         </el-button>
         <el-button
           class="snapshot-footer-button snapshot-footer-confirm"
           :loading="restoring"
-          :disabled="restorePreviewLoading || !restorePreviewSnapshot || restorePreviewDiffs.length === 0"
+          :disabled="restoring || restorePreviewLoading || !restorePreviewSnapshot || restorePreviewDiffs.length === 0"
           @click="confirmRestoreSnapshot"
         >
           <span class="confirm-inner">
@@ -466,6 +483,12 @@
 import Api from "@/apis/api";
 import correctWord from "@/apis/module/correctWord";
 import { formatDate } from "@/utils/date";
+import {
+  hasValidCurrentStateToken,
+  normalizeSnapshotOrderedValue,
+  redactSnapshotDisplayValue,
+  SNAPSHOT_SECRET_REDACTED
+} from "./agentSnapshotDisplayUtils.mjs";
 
 const FALLBACK_PLUGIN_NAME_KEYS = {
   SYSTEM_PLUGIN_WEATHER: "agentSnapshot.plugin.SYSTEM_PLUGIN_WEATHER",
@@ -533,8 +556,6 @@ const CHAT_HISTORY_CONF_LABEL_KEYS = {
   1: "agentSnapshot.chatHistoryConf.text",
   2: "agentSnapshot.chatHistoryConf.textVoice"
 };
-const SNAPSHOT_SECRET_REDACTED = "__SNAPSHOT_SECRET_REDACTED__";
-
 export default {
   name: "AgentSnapshotDialog",
   props: {
@@ -730,10 +751,25 @@ export default {
       });
     },
     close() {
+      if (this.restoring) {
+        return;
+      }
       this.cancelPendingSnapshotRequests();
       this.historyAnchorVersionNo = null;
       this.$emit("update:visible", false);
     },
+    guardRestoreInFlightClose(done) {
+      if (this.restoring) {
+        return;
+      }
+      done();
+    },
+    closeRestorePreview() {
+      if (this.restoring) {
+        return;
+      }
+      this.restorePreviewVisible = false;
+    },
     open() {
       this.historyAnchorVersionNo = null;
       this.page = 1;
@@ -761,7 +797,7 @@ export default {
       return !!row?.id;
     },
     canRestoreSnapshot(row) {
-      return !!row && !row.isLatestSnapshot;
+      return !!row?.id && !row.isLatestSnapshot;
     },
     canDeleteSnapshot(row) {
       return !!row && !row.isLatestSnapshot;
@@ -806,6 +842,13 @@ export default {
           } else {
             this.$message.error(data.msg || this.$t("agentSnapshot.fetchFailed"));
           }
+        },
+        () => {
+          if (requestSeq !== this.snapshotFetchSeq) {
+            return;
+          }
+          this.loading = false;
+          this.$message.error(this.$t("agentSnapshot.fetchFailed"));
         }
       );
     },
@@ -855,16 +898,20 @@ export default {
       this.ensurePluginMetadata();
       this.ensureModelMetadata();
 
-      Promise.all([
+      this.fetchSnapshotDetail(row.id).then((targetSnapshot) => {
-        this.fetchSnapshotDetail(row.id),
-        this.fetchCurrentAgentData()
-      ]).then(([targetSnapshot, currentData]) => {
         if (requestSeq !== this.restorePreviewFetchSeq) {
           return Promise.resolve();
         }
+        if (
+          !this.isPlainObject(targetSnapshot.currentSnapshotData)
+          || !hasValidCurrentStateToken(targetSnapshot.currentStateToken)
+        ) {
+          throw new Error("Snapshot detail is missing its atomic current-state preview");
+        }
         const previewSnapshot = {
           ...targetSnapshot,
-          beforeSnapshotData: currentData,
+          currentStateToken: targetSnapshot.currentStateToken,
+          beforeSnapshotData: targetSnapshot.currentSnapshotData,
           afterSnapshotData: targetSnapshot.snapshotData || {},
           beforeVersionNo: this.resolveCurrentVersionNo(),
           afterVersionNo: targetSnapshot.versionNo,
@@ -895,12 +942,56 @@ export default {
       }));
     },
     confirmRestoreSnapshot() {
-      if (!this.restorePreviewRow) {
+      if (this.restoring || !this.restorePreviewRow) {
+        return;
+      }
+      const snapshotId = this.restorePreviewRow.id;
+      const currentStateToken = this.restorePreviewSnapshot?.currentStateToken;
+      if (!hasValidCurrentStateToken(currentStateToken)) {
+        this.invalidateRestorePreview();
+        this.$message.error(this.$t("agentSnapshot.restoreFailed"));
+        return;
+      }
+
+      if (!this.restoreWillClearChatHistory) {
+        this.submitRestoreSnapshot(snapshotId, currentStateToken);
+        return;
+      }
+
+      this.restoring = true;
+      const requestSeq = ++this.restoreActionSeq;
+      this.$confirm(
+        this.$t("agentSnapshot.restoreMemoryDestructiveWarning"),
+        this.$t("common.warning"),
+        {
+          confirmButtonText: this.$t("common.confirm"),
+          cancelButtonText: this.$t("common.cancel"),
+          type: "error"
+        }
+      ).then(() => {
+        if (requestSeq !== this.restoreActionSeq) {
+          return;
+        }
+        this.submitRestoreSnapshot(snapshotId, currentStateToken, requestSeq);
+      }).catch(() => {
+        if (requestSeq === this.restoreActionSeq) {
+          this.restoring = false;
+        }
+      });
+    },
+    submitRestoreSnapshot(snapshotId, currentStateToken, confirmedRequestSeq = null) {
+      if (!hasValidCurrentStateToken(currentStateToken)) {
+        this.restoring = false;
+        this.invalidateRestorePreview();
+        this.$message.error(this.$t("agentSnapshot.restoreFailed"));
+        return;
+      }
+      const requestSeq = confirmedRequestSeq ?? ++this.restoreActionSeq;
+      if (requestSeq !== this.restoreActionSeq) {
         return;
       }
       this.restoring = true;
-      const requestSeq = ++this.restoreActionSeq;
+      Api.agent.restoreAgentSnapshot(this.agentId, snapshotId, currentStateToken, ({ data }) => {
-      Api.agent.restoreAgentSnapshot(this.agentId, this.restorePreviewRow.id, ({ data }) => {
         if (requestSeq !== this.restoreActionSeq) {
           return;
         }
@@ -908,15 +999,32 @@ export default {
         if (data.code === 0) {
           this.$message.success(this.$t("agentSnapshot.restoreSuccess"));
           this.restorePreviewVisible = false;
+          this.restorePreviewSnapshot = null;
+          this.restorePreviewRow = null;
           this.detailVisible = false;
           this.$emit("restored");
           this.historyAnchorVersionNo = null;
           this.fetchSnapshots();
         } else {
+          this.invalidateRestorePreview();
           this.$message.error(this.restoreFailedMessage(data));
         }
+      }, () => {
+        if (requestSeq !== this.restoreActionSeq) {
+          return;
+        }
+        this.restoring = false;
+        this.invalidateRestorePreview();
+        this.$message.error(this.$t("agentSnapshot.restoreFailed"));
       });
     },
+    invalidateRestorePreview() {
+      this.restorePreviewFetchSeq += 1;
+      this.restorePreviewLoading = false;
+      this.restorePreviewVisible = false;
+      this.restorePreviewSnapshot = null;
+      this.restorePreviewRow = null;
+    },
     deleteSnapshot(row) {
       if (!this.canDeleteSnapshot(row)) {
         return;
@@ -946,6 +1054,12 @@ export default {
           } else {
             this.$message.error(data.msg || this.$t("agentSnapshot.deleteFailed"));
           }
+        }, () => {
+          if (requestSeq !== this.deleteActionSeq) {
+            return;
+          }
+          this.deletingSnapshotId = null;
+          this.$message.error(this.$t("agentSnapshot.deleteFailed"));
         });
       }).catch(() => {});
     },
@@ -992,7 +1106,7 @@ export default {
           } else {
             reject(data);
           }
-        });
+        }, reject);
       });
     },
     fetchSnapshotRows(params) {
@@ -1003,7 +1117,7 @@ export default {
           } else {
             reject(data);
           }
-        });
+        }, reject);
       });
     },
     snapshotQueryParams(params = {}) {
@@ -1192,6 +1306,9 @@ export default {
             this.pluginMetadataLoaded = true;
           }
           resolve();
+        }, () => {
+          this.pluginMetadataLoaded = true;
+          resolve();
         });
       }).finally(() => {
         this.pluginMetadataLoading = null;
@@ -1221,9 +1338,9 @@ export default {
           };
 
           if (type === "LLM") {
-            Api.model.getLlmModelCodeList("", callback);
+            Api.model.getLlmModelCodeList("", callback, () => resolve([]));
           } else {
-            Api.model.getModelNames(type, "", callback);
+            Api.model.getModelNames(type, "", callback, () => resolve([]));
           }
         });
       });
@@ -1281,6 +1398,10 @@ export default {
             this.correctWordMetadataLoaded = true;
           }
           resolve();
+        }, () => {
+          // 权限不足或元数据服务不可用时保留原始 ID，不扩大文件列表的访问边界。
+          this.correctWordMetadataLoaded = true;
+          resolve();
         });
       }).finally(() => {
         this.correctWordMetadataLoading = null;
@@ -1324,6 +1445,12 @@ export default {
               };
             }
             resolve();
+          }, () => {
+            this.loadedVoiceModelIds = {
+              ...this.loadedVoiceModelIds,
+              [modelId]: true
+            };
+            resolve();
           });
         }).finally(() => {
           const { [modelId]: dropped, ...rest } = this.voiceMetadataLoading;
@@ -1358,7 +1485,7 @@ export default {
           } else {
             reject(data);
           }
-        });
+        }, reject);
       });
       const tagsPromise = this.fetchCurrentAgentTags();
 
@@ -1378,7 +1505,7 @@ export default {
           } else {
             reject(data);
           }
-        });
+        }, reject);
       });
     },
     normalizeAgentData(data) {
@@ -1576,7 +1703,7 @@ export default {
       return paramKeys.map((key) => ({
         key,
         label: this.functionParamLabel(pluginId, key),
-        value: this.formatFunctionParamValue(normalizedParams[key]),
+        value: this.formatFunctionParamValue(normalizedParams[key], key),
         changed: changedParamKeys.includes(key)
       }));
     },
@@ -1604,11 +1731,11 @@ export default {
         return item.id === pluginId || item.providerCode === pluginId || item.name === pluginId;
       }) || null;
     },
-    formatFunctionParamValue(value) {
+    formatFunctionParamValue(value, key = "") {
       if (value === null || value === undefined || value === "") {
         return this.$t("agentSnapshot.emptyValue");
       }
-      const displayValue = this.localizedSnapshotDisplayValue(value);
+      const displayValue = this.localizedSnapshotDisplayValue(value, key);
       if (typeof displayValue === "object") {
         return JSON.stringify(displayValue);
       }
@@ -1796,7 +1923,7 @@ export default {
         return this.normalizeFunctionMap(value);
       }
       if (field === "contextProviders") {
-        return this.normalizeSortedJsonList(value);
+        return normalizeSnapshotOrderedValue(Array.isArray(value) ? value : []);
       }
       if (["ttsVolume", "ttsRate", "ttsPitch"].includes(field)) {
         return this.normalizeDefaultTtsNumber(value);
@@ -1813,17 +1940,9 @@ export default {
       }
       return this.normalizeValue(value);
     },
-    normalizeSortedJsonList(value) {
-      if (!Array.isArray(value)) {
-        return [];
-      }
-      return value
-        .map((item) => this.normalizeValue(item))
-        .sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
-    },
     normalizeDefaultTtsNumber(value) {
       if (value === null || value === undefined || String(value).trim() === "") {
-        return 0;
+        return null;
       }
       if (typeof value === "number") {
         return Math.trunc(value);
@@ -1854,16 +1973,7 @@ export default {
       return left === right;
     },
     normalizeValue(value) {
-      if (Array.isArray(value)) {
+      return normalizeSnapshotOrderedValue(value);
-        return value.map((item) => this.normalizeValue(item));
-      }
-      if (value && typeof value === "object") {
-        return Object.keys(value).sort().reduce((result, key) => {
-          result[key] = this.normalizeValue(value[key]);
-          return result;
-        }, {});
-      }
-      return value === undefined ? null : value;
     },
     isPlainObject(value) {
       return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -1882,7 +1992,7 @@ export default {
       if (field === "correctWordFileIds") {
         return this.correctWordDisplayNames(value);
       }
-      return this.formatValue(value);
+      return this.formatValue(value, field);
     },
     modelDisplayName(value) {
       if (value === null || value === undefined || value === "") {
@@ -1905,14 +2015,14 @@ export default {
         .map((id) => this.correctWordNameMap[id] || id)
         .join(", ");
     },
-    formatValue(value) {
+    formatValue(value, parentKey = "") {
       if (value === null || value === undefined || value === "") {
         return this.$t("agentSnapshot.emptyValue");
       }
       if (Array.isArray(value) && value.length === 0) {
         return this.$t("agentSnapshot.emptyValue");
       }
-      const displayValue = this.localizedSnapshotDisplayValue(value);
+      const displayValue = this.localizedSnapshotDisplayValue(value, parentKey);
       if (Array.isArray(displayValue) && displayValue.every((item) => this.isPrimitiveValue(item))) {
         return displayValue.join(", ");
       }
@@ -1921,20 +2031,12 @@ export default {
       }
       return String(displayValue);
     },
-    localizedSnapshotDisplayValue(value) {
+    localizedSnapshotDisplayValue(value, parentKey = "") {
-      if (value === SNAPSHOT_SECRET_REDACTED) {
+      return redactSnapshotDisplayValue(
-        return this.$t("agentSnapshot.secretRedacted");
+        value,
-      }
+        this.$t("agentSnapshot.secretRedacted"),
-      if (Array.isArray(value)) {
+        parentKey
-        return value.map((item) => this.localizedSnapshotDisplayValue(item));
+      );
-      }
-      if (value && typeof value === "object") {
-        return Object.keys(value).reduce((result, key) => {
-          result[key] = this.localizedSnapshotDisplayValue(value[key]);
-          return result;
-        }, {});
-      }
-      return value;
     },
     isPrimitiveValue(value) {
       return value === null || ["string", "number", "boolean"].includes(typeof value);

main/manager-web/src/components/agentSnapshotDisplayUtils.mjs

@@ -0,0 +1,186 @@
+export const SNAPSHOT_SECRET_REDACTED = "__SNAPSHOT_SECRET_REDACTED__";
+
+export function hasValidCurrentStateToken(value) {
+  return typeof value === "string" && value.trim().length > 0;
+}
+
+export function redactSnapshotDisplayValue(value, redactedLabel, parentKey = "") {
+  if (value === SNAPSHOT_SECRET_REDACTED || isSensitiveSnapshotKey(parentKey)) {
+    return redactedLabel;
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => redactSnapshotDisplayValue(item, redactedLabel, parentKey));
+  }
+  if (isPlainObject(value)) {
+    const sensitiveEntry = Object.keys(value).some((key) => {
+      const normalizedKey = key.toLowerCase();
+      return (normalizedKey === "key" || normalizedKey === "name")
+        && typeof value[key] === "string"
+        && isSensitiveSnapshotKey(value[key]);
+    });
+    return Object.keys(value).reduce((result, key) => {
+      const semanticKey = resolveUrlSemanticKey(parentKey, key);
+      if (sensitiveEntry && key.toLowerCase() === "value") {
+        result[key] = redactedLabel;
+      } else {
+        result[key] = redactSnapshotDisplayValue(value[key], redactedLabel, semanticKey);
+      }
+      return result;
+    }, {});
+  }
+  if (typeof value === "string" && isSnapshotUrlValue(parentKey, value)) {
+    return redactSnapshotUrl(value, redactedLabel, parentKey);
+  }
+  return value;
+}
+
+export function normalizeSnapshotOrderedValue(value) {
+  if (Array.isArray(value)) {
+    return value.map((item) => normalizeSnapshotOrderedValue(item));
+  }
+  if (isPlainObject(value)) {
+    return Object.keys(value).sort().reduce((result, key) => {
+      result[key] = normalizeSnapshotOrderedValue(value[key]);
+      return result;
+    }, {});
+  }
+  return value === undefined ? null : value;
+}
+
+export function isSensitiveSnapshotKey(key) {
+  const normalized = String(key || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+  return normalized === "authorization"
+    || normalized.includes("authorization")
+    || normalized.includes("authentication")
+    || normalized === "auth"
+    || normalized.endsWith("auth")
+    || normalized === "cookie"
+    || normalized === "cookie2"
+    || normalized === "setcookie"
+    || normalized === "setcookie2"
+    || normalized.endsWith("cookie")
+    || normalized === "session"
+    || normalized.endsWith("session")
+    || normalized.includes("sessionid")
+    || normalized.includes("sessionkey")
+    || normalized.includes("sessiontoken")
+    || normalized.includes("sessioncookie")
+    || normalized.endsWith("sessid")
+    || normalized === "token"
+    || normalized.endsWith("token")
+    || normalized.includes("apikey")
+    || normalized.includes("appkey")
+    || normalized.includes("accesskey")
+    || normalized.includes("subscriptionkey")
+    || normalized.includes("privatekey")
+    || normalized.includes("password")
+    || normalized.includes("passwd")
+    || normalized.includes("secret")
+    || normalized.includes("credential");
+}
+
+function isSnapshotUrlValue(parentKey, value) {
+  const normalizedKey = String(parentKey || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+  return normalizedKey.includes("url")
+    || normalizedKey.endsWith("uri")
+    || normalizedKey.includes("endpoint")
+    || normalizedKey.includes("webhook")
+    || /^(?:[a-z][a-z0-9+.-]*:)*\/\//i.test(value);
+}
+
+function resolveUrlSemanticKey(parentKey, childKey) {
+  if (isWebhookSemanticKey(childKey)) {
+    return childKey;
+  }
+  if (isWebhookSemanticKey(parentKey)) {
+    return childKey ? `${parentKey}.${childKey}` : parentKey;
+  }
+  return childKey;
+}
+
+function isWebhookSemanticKey(value) {
+  const normalized = String(value || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+  return normalized.includes("webhook")
+    || normalized === "hook"
+    || normalized === "hooks"
+    || normalized.endsWith("hook")
+    || normalized.endsWith("hooks");
+}
+
+function redactSnapshotUrl(value, redactedLabel, parentKey) {
+  const withoutCredentials = value.replace(
+    /^((?:[a-z][a-z0-9+.-]*:)*\/\/)([^/?#\s]*@)/i,
+    (match, prefix) => `${prefix}${redactedLabel}@`
+  );
+  const suffixIndex = withoutCredentials.search(/[?#]/);
+  const base = suffixIndex < 0 ? withoutCredentials : withoutCredentials.slice(0, suffixIndex);
+  const redactedBase = redactSnapshotCapabilityPath(base, redactedLabel, parentKey);
+  return suffixIndex < 0
+    ? redactedBase
+    : `${redactedBase}${withoutCredentials[suffixIndex]}${redactedLabel}`;
+}
+
+function redactSnapshotCapabilityPath(value, redactedLabel, parentKey) {
+  const absoluteUrl = value.match(/^((?:[a-z][a-z0-9+.-]*:)*\/\/)([^/?#]*)([^?#]*)$/i);
+  if (!absoluteUrl) {
+    return redactGenericCapabilityPath(value, redactedLabel, parentKey);
+  }
+
+  const [, scheme, authority, path = ""] = absoluteUrl;
+  const hostWithPort = authority.slice(authority.lastIndexOf("@") + 1);
+  const host = hostWithPort.replace(/:\d+$/, "").toLowerCase();
+  let redactedPath = path;
+  let providerMatched = false;
+
+  if (host === "hooks.slack.com" || host === "hooks.slack-gov.com") {
+    redactedPath = redactedPath.replace(
+      /^(\/services\/[^/]+\/[^/]+\/)([^/]+)(.*)$/i,
+      (match, prefix, secret, suffix) => `${prefix}${redactedLabel}${suffix}`
+    );
+    providerMatched = redactedPath !== path;
+  } else if (
+    host === "discord.com"
+    || host.endsWith(".discord.com")
+    || host === "discordapp.com"
+    || host.endsWith(".discordapp.com")
+  ) {
+    redactedPath = redactedPath.replace(
+      /^(\/api(?:\/v\d+)?\/webhooks\/[^/]+\/)([^/]+)(.*)$/i,
+      (match, prefix, secret, suffix) => `${prefix}${redactedLabel}${suffix}`
+    );
+    providerMatched = redactedPath !== path;
+  } else if (host === "api.telegram.org") {
+    redactedPath = redactedPath.replace(
+      /^((?:\/file)?\/bot[^/:]+:)([^/]+)(.*)$/i,
+      (match, prefix, secret, suffix) => `${prefix}${redactedLabel}${suffix}`
+    );
+    providerMatched = redactedPath !== path;
+  }
+
+  if (!providerMatched) {
+    redactedPath = redactGenericCapabilityPath(redactedPath, redactedLabel, parentKey);
+  }
+
+  return `${scheme}${authority}${redactedPath}`;
+}
+
+function redactGenericCapabilityPath(path, redactedLabel, parentKey) {
+  const markerRedacted = path.replace(
+    /(^|\/)(webhooks?|hooks?)(\/)(.+)$/i,
+    (match, boundary, marker, separator) => `${boundary}${marker}${separator}${redactedLabel}`
+  );
+  if (markerRedacted !== path) {
+    return markerRedacted;
+  }
+  if (!isWebhookSemanticKey(parentKey)) {
+    return path;
+  }
+  return path.replace(
+    /^(.*\/)([^/]+)(\/?)$/,
+    (match, prefix, secret, suffix) => `${prefix}${redactedLabel}${suffix}`
+  );
+}
+
+function isPlainObject(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}

main/manager-web/src/components/agentSnapshotDisplayUtils.test.mjs

@@ -0,0 +1,155 @@
+/* eslint-disable test/no-import-node-test -- zero-dependency security regression gate */
+import assert from "node:assert/strict";
+import test from "node:test";
+import {
+  hasValidCurrentStateToken,
+  normalizeSnapshotOrderedValue,
+  redactSnapshotDisplayValue,
+  SNAPSHOT_SECRET_REDACTED
+} from "./agentSnapshotDisplayUtils.mjs";
+
+test("accepts only non-empty opaque current-state tokens", () => {
+  assert.equal(hasValidCurrentStateToken("state-token"), true);
+  assert.equal(hasValidCurrentStateToken("  state-token  "), true);
+  assert.equal(hasValidCurrentStateToken(""), false);
+  assert.equal(hasValidCurrentStateToken("   "), false);
+  assert.equal(hasValidCurrentStateToken(null), false);
+  assert.equal(hasValidCurrentStateToken(123), false);
+});
+
+test("redacts nested credentials without hiding non-sensitive display values", () => {
+  const redacted = redactSnapshotDisplayValue({
+    apiKey: "api-secret",
+    headers: [
+      { key: "Authorization", value: "Bearer secret" },
+      { key: "Proxy-Authorization", value: "Basic secret" },
+      { key: "Set-Cookie", value: "session=secret" },
+      { key: "Content-Type", value: "application/json" }
+    ],
+    marker: SNAPSHOT_SECRET_REDACTED,
+    session_id: "session-secret",
+    url: "https://user:pass@example.com/context?access_token=secret#fragment",
+    visible: "kept"
+  }, "[hidden]");
+
+  assert.deepEqual(redacted, {
+    apiKey: "[hidden]",
+    headers: [
+      { key: "Authorization", value: "[hidden]" },
+      { key: "Proxy-Authorization", value: "[hidden]" },
+      { key: "Set-Cookie", value: "[hidden]" },
+      { key: "Content-Type", value: "application/json" }
+    ],
+    marker: "[hidden]",
+    session_id: "[hidden]",
+    url: "https://[hidden]@example.com/context?[hidden]",
+    visible: "kept"
+  });
+});
+
+test("uses a function parameter key when redacting scalar plugin values", () => {
+  assert.equal(redactSnapshotDisplayValue("secret", "[hidden]", "clientSecret"), "[hidden]");
+  assert.equal(redactSnapshotDisplayValue("secret", "[hidden]", "Ocp-Apim-Subscription-Key"), "[hidden]");
+  assert.equal(redactSnapshotDisplayValue("public", "[hidden]", "clientId"), "public");
+});
+
+test("redacts mixed-case name/value credential entries", () => {
+  assert.deepEqual(redactSnapshotDisplayValue({
+    headers: [
+      { NAME: "Authorization", VALUE: "Bearer live-secret" },
+      { NaMe: "Content-Type", VaLuE: "application/json" }
+    ]
+  }, "[hidden]"), {
+    headers: [
+      { NAME: "Authorization", VALUE: "[hidden]" },
+      { NaMe: "Content-Type", VaLuE: "application/json" }
+    ]
+  });
+});
+
+test("redacts capability URL path secrets while preserving public route identity", () => {
+  const redacted = redactSnapshotDisplayValue({
+    slackUrl: "https://hooks.slack.com/services/T00000000/B00000000/slack-secret",
+    slackGovUrl: "https://hooks.slack-gov.com/services/T00000000/B00000000/slack-gov-secret",
+    discordEndpoint: "https://discord.com/api/webhooks/123456789/discord-secret",
+    telegramUri: "https://api.telegram.org/bot123456789:telegram-secret/sendMessage",
+    telegramFileUri: "https://api.telegram.org/file/bot123456789:telegram-file-secret/documents/file.txt",
+    callbackUrl: "https://events.example.com/api/webhook/generic-secret/delivery",
+    hooksEndpoint: "https://events.example.com/v1/hooks/hook-secret/status",
+    hookEndpoint: "https://events.example.com/v1/hook/singular-secret/status",
+    webhooksEndpoint: "https://events.example.com/v1/webhooks/plural-secret/status",
+    relativeUrl: "/api/webhooks/relative-secret/continuation",
+    nested: {
+      deliveryWebhook: {
+        options: {
+          target: "https://events.example.com/incoming/nested-secret",
+          relativeTarget: "/incoming/nested-relative-secret"
+        }
+      }
+    },
+    protocolRelativeUrl: "//protocol-user:protocol-pass@example.com/context",
+    jdbcUrl: "jdbc:mysql://jdbc-user:jdbc-pass@example.com/database",
+    webhook: "https://capability.example.com/public-prefix/key-secret",
+    restUrl: "https://api.example.com/v1/users/customer-123",
+    similarMarkerUrl: "https://api.example.com/v1/webhook-settings/public-value"
+  }, "[hidden]");
+
+  assert.deepEqual(redacted, {
+    slackUrl: "https://hooks.slack.com/services/T00000000/B00000000/[hidden]",
+    slackGovUrl: "https://hooks.slack-gov.com/services/T00000000/B00000000/[hidden]",
+    discordEndpoint: "https://discord.com/api/webhooks/123456789/[hidden]",
+    telegramUri: "https://api.telegram.org/bot123456789:[hidden]/sendMessage",
+    telegramFileUri: "https://api.telegram.org/file/bot123456789:[hidden]/documents/file.txt",
+    callbackUrl: "https://events.example.com/api/webhook/[hidden]",
+    hooksEndpoint: "https://events.example.com/v1/hooks/[hidden]",
+    hookEndpoint: "https://events.example.com/v1/hook/[hidden]",
+    webhooksEndpoint: "https://events.example.com/v1/webhooks/[hidden]",
+    relativeUrl: "/api/webhooks/[hidden]",
+    nested: {
+      deliveryWebhook: {
+        options: {
+          target: "https://events.example.com/incoming/[hidden]",
+          relativeTarget: "/incoming/[hidden]"
+        }
+      }
+    },
+    protocolRelativeUrl: "//[hidden]@example.com/context",
+    jdbcUrl: "jdbc:mysql://[hidden]@example.com/database",
+    webhook: "https://capability.example.com/public-prefix/[hidden]",
+    restUrl: "https://api.example.com/v1/users/customer-123",
+    similarMarkerUrl: "https://api.example.com/v1/webhook-settings/public-value"
+  });
+  assert.equal(JSON.stringify(redacted).includes("slack-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("slack-gov-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("discord-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("telegram-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("telegram-file-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("generic-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("hook-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("singular-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("plural-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("relative-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("nested-secret"), false);
+  assert.equal(JSON.stringify(redacted).includes("key-secret"), false);
+});
+
+test("normalizes object keys without erasing ordered-list changes", () => {
+  const before = [
+    { url: "https://first.example", headers: { Zeta: "2", Accept: "json" } },
+    { url: "https://second.example" }
+  ];
+  const sameOrder = [
+    { headers: { Accept: "json", Zeta: "2" }, url: "https://first.example" },
+    { url: "https://second.example" }
+  ];
+  const reversed = [...sameOrder].reverse();
+
+  assert.deepEqual(
+    normalizeSnapshotOrderedValue(before),
+    normalizeSnapshotOrderedValue(sameOrder)
+  );
+  assert.notDeepEqual(
+    normalizeSnapshotOrderedValue(before),
+    normalizeSnapshotOrderedValue(reversed)
+  );
+});

main/manager-web/src/i18n/de.js

@@ -845,7 +845,9 @@ export default {
   'agentSnapshot.beforeRestore': 'Vor der Wiederherstellung',
   'agentSnapshot.afterRestore': 'Nach der Wiederherstellung',
   'agentSnapshot.restoreMemoryWarning': 'Beim Wiederherstellen einer Version ohne Speicher wird der Chatverlauf dieses Agenten gelöscht. Fahren Sie nur fort, wenn Sie dieses Risiko bestätigt haben.',
-  'agentSnapshot.restoreConfirm': 'Version {version} wiederherstellen? Die aktuelle Konfiguration wird zuerst als neue Version gespeichert.',
+  'agentSnapshot.restoreMemoryDestructiveWarning': 'Diese Wiederherstellung löscht den bestehenden Chatverlauf dieses Agenten dauerhaft. Chatverläufe sind nicht in Konfigurations-Snapshots enthalten und können nicht über den Versionsverlauf wiederhergestellt werden.',
+  'agentSnapshot.unsavedChangesWarning': 'Nicht gespeicherte Änderungen auf dieser Seite werden nicht in den Verlauf übernommen und nach der Wiederherstellung verworfen.',
+  'agentSnapshot.restoreConfirm': 'Version {version} wiederherstellen? Die aktuelle Konfiguration bleibt im Verlauf erhalten.',
   'agentSnapshot.restoreSuccess': 'Version wurde wiederhergestellt',
   'agentSnapshot.restoreFailed': 'Version konnte nicht wiederhergestellt werden',
   'agentSnapshot.restoreFailedRollback': 'Version konnte nicht wiederhergestellt werden. Die Transaktion wurde zurueckgerollt und die aktuelle Konfiguration wurde nicht geaendert',
@@ -854,10 +856,10 @@ export default {
   'agentSnapshot.deleteFailed': 'Verlaufsversion konnte nicht gelöscht werden',
   'agentSnapshot.fetchFailed': 'Versionsverlauf konnte nicht abgerufen werden',
   'agentSnapshot.detailFailed': 'Snapshot-Details konnten nicht abgerufen werden',
-  'agentSnapshot.currentVersion': 'Aktuelle Version',
+  'agentSnapshot.currentVersion': 'Neuester Snapshot',
   'agentSnapshot.source.config': 'Konfiguration gespeichert',
   'agentSnapshot.source.current': 'Aktuelle Konfiguration',
-  'agentSnapshot.source.restore': 'Vor der Wiederherstellung',
+  'agentSnapshot.source.restore': 'Wiederherstellungsergebnis',
   'agentSnapshot.source.initial': 'Initialversion',
   'agentSnapshot.field.restore': 'Wiederherstellung',
   'agentSnapshot.field.initial': 'Initialer Snapshot',

main/manager-web/src/i18n/en.js

@@ -895,7 +895,9 @@ export default {
   'agentSnapshot.beforeRestore': 'Before Restore',
   'agentSnapshot.afterRestore': 'After Restore',
   'agentSnapshot.restoreMemoryWarning': 'Restoring to a no-memory version will clear this agent\'s chat history. Continue only after confirming this risk.',
-  'agentSnapshot.restoreConfirm': 'Restore to version {version}? The current configuration will be saved as a new version first.',
+  'agentSnapshot.restoreMemoryDestructiveWarning': 'This restore will permanently delete this agent\'s existing chat history. Chat history is not included in configuration snapshots and cannot be recovered from version history.',
+  'agentSnapshot.unsavedChangesWarning': 'Unsaved changes on this page are not included in history and will be discarded after restore.',
+  'agentSnapshot.restoreConfirm': 'Restore to version {version}? The current configuration will be preserved in history.',
   'agentSnapshot.restoreSuccess': 'Version restored',
   'agentSnapshot.restoreFailed': 'Failed to restore version',
   'agentSnapshot.restoreFailedRollback': 'Failed to restore version. The transaction was rolled back and the current configuration was not changed',
@@ -904,10 +906,10 @@ export default {
   'agentSnapshot.deleteFailed': 'Failed to delete history version',
   'agentSnapshot.fetchFailed': 'Failed to fetch versions',
   'agentSnapshot.detailFailed': 'Failed to fetch snapshot details',
-  'agentSnapshot.currentVersion': 'Current Version',
+  'agentSnapshot.currentVersion': 'Latest Snapshot',
   'agentSnapshot.source.config': 'Config Save',
   'agentSnapshot.source.current': 'Current Config',
-  'agentSnapshot.source.restore': 'Before Restore',
+  'agentSnapshot.source.restore': 'Restored',
   'agentSnapshot.source.initial': 'Initial Version',
   'agentSnapshot.field.restore': 'Restore',
   'agentSnapshot.field.initial': 'Initial Snapshot',

main/manager-web/src/i18n/pt_BR.js

@@ -845,7 +845,9 @@ export default {
   'agentSnapshot.beforeRestore': 'Antes da Restauração',
   'agentSnapshot.afterRestore': 'Depois da Restauração',
   'agentSnapshot.restoreMemoryWarning': 'Restaurar para uma versão sem memória apagará o histórico de conversa deste agente. Continue somente após confirmar esse risco.',
-  'agentSnapshot.restoreConfirm': 'Restaurar para a versão {version}? A configuração atual será salva primeiro como uma nova versão.',
+  'agentSnapshot.restoreMemoryDestructiveWarning': 'Esta restauração excluirá permanentemente o histórico de conversa existente deste agente. O histórico de conversa não faz parte dos snapshots de configuração e não pode ser recuperado pelo histórico de versões.',
+  'agentSnapshot.unsavedChangesWarning': 'As alterações não salvas nesta página não serão incluídas no histórico e serão descartadas após a restauração.',
+  'agentSnapshot.restoreConfirm': 'Restaurar para a versão {version}? A configuração atual será preservada no histórico.',
   'agentSnapshot.restoreSuccess': 'Versão restaurada',
   'agentSnapshot.restoreFailed': 'Falha ao restaurar versão',
   'agentSnapshot.restoreFailedRollback': 'Falha ao restaurar versão. A transação foi revertida e a configuração atual não foi alterada',
@@ -854,10 +856,10 @@ export default {
   'agentSnapshot.deleteFailed': 'Falha ao excluir a versão do histórico',
   'agentSnapshot.fetchFailed': 'Falha ao buscar versões',
   'agentSnapshot.detailFailed': 'Falha ao buscar detalhes do snapshot',
-  'agentSnapshot.currentVersion': 'Versão Atual',
+  'agentSnapshot.currentVersion': 'Snapshot mais recente',
   'agentSnapshot.source.config': 'Configuração Salva',
   'agentSnapshot.source.current': 'Configuração Atual',
-  'agentSnapshot.source.restore': 'Antes da Restauração',
+  'agentSnapshot.source.restore': 'Resultado da restauração',
   'agentSnapshot.source.initial': 'Versão inicial',
   'agentSnapshot.field.restore': 'Restauração',
   'agentSnapshot.field.initial': 'Snapshot inicial',

main/manager-web/src/i18n/vi.js

@@ -845,7 +845,9 @@ export default {
   'agentSnapshot.beforeRestore': 'Trước khi khôi phục',
   'agentSnapshot.afterRestore': 'Sau khi khôi phục',
   'agentSnapshot.restoreMemoryWarning': 'Khôi phục về phiên bản không có bộ nhớ sẽ xóa lịch sử trò chuyện của tác nhân này. Chỉ tiếp tục sau khi xác nhận rủi ro này.',
-  'agentSnapshot.restoreConfirm': 'Khôi phục về phiên bản {version}? Cấu hình hiện tại sẽ được lưu thành phiên bản mới trước.',
+  'agentSnapshot.restoreMemoryDestructiveWarning': 'Lần khôi phục này sẽ xóa vĩnh viễn lịch sử trò chuyện hiện có của tác nhân. Lịch sử trò chuyện không nằm trong ảnh chụp cấu hình và không thể khôi phục từ lịch sử phiên bản.',
+  'agentSnapshot.unsavedChangesWarning': 'Các thay đổi chưa lưu trên trang này không được ghi vào lịch sử và sẽ bị loại bỏ sau khi khôi phục.',
+  'agentSnapshot.restoreConfirm': 'Khôi phục về phiên bản {version}? Cấu hình hiện tại sẽ được giữ lại trong lịch sử.',
   'agentSnapshot.restoreSuccess': 'Đã khôi phục phiên bản',
   'agentSnapshot.restoreFailed': 'Khôi phục phiên bản thất bại',
   'agentSnapshot.restoreFailedRollback': 'Khôi phục phiên bản thất bại. Giao dịch đã được hoàn tác và cấu hình hiện tại chưa thay đổi',
@@ -854,10 +856,10 @@ export default {
   'agentSnapshot.deleteFailed': 'Xóa phiên bản lịch sử thất bại',
   'agentSnapshot.fetchFailed': 'Không thể tải lịch sử phiên bản',
   'agentSnapshot.detailFailed': 'Không thể tải chi tiết snapshot',
-  'agentSnapshot.currentVersion': 'Phiên bản hiện tại',
+  'agentSnapshot.currentVersion': 'Ảnh chụp mới nhất',
   'agentSnapshot.source.config': 'Lưu cấu hình',
   'agentSnapshot.source.current': 'Cấu hình hiện tại',
-  'agentSnapshot.source.restore': 'Trước khi khôi phục',
+  'agentSnapshot.source.restore': 'Kết quả khôi phục',
   'agentSnapshot.source.initial': 'Phiên bản ban đầu',
   'agentSnapshot.field.restore': 'Khôi phục',
   'agentSnapshot.field.initial': 'Snapshot ban đầu',

main/manager-web/src/i18n/zh_CN.js

@@ -895,7 +895,9 @@ export default {
   'agentSnapshot.beforeRestore': '恢复前',
   'agentSnapshot.afterRestore': '恢复后',
   'agentSnapshot.restoreMemoryWarning': '恢复到无记忆版本会清空该智能体的聊天记录，请确认后再继续。',
-  'agentSnapshot.restoreConfirm': '确定恢复到版本 {version} 吗？当前配置会先自动保存为新的历史版本。',
+  'agentSnapshot.restoreMemoryDestructiveWarning': '此次恢复会永久删除该智能体现有的聊天记录。聊天记录不包含在配置快照中，删除后无法通过历史版本恢复。',
+  'agentSnapshot.unsavedChangesWarning': '页面中尚未保存的修改不会进入历史，并会在恢复后丢失。',
+  'agentSnapshot.restoreConfirm': '确定恢复到版本 {version} 吗？当前配置会保留在历史中。',
   'agentSnapshot.restoreSuccess': '已恢复历史版本',
   'agentSnapshot.restoreFailed': '恢复历史版本失败',
   'agentSnapshot.restoreFailedRollback': '恢复历史版本失败，事务已回滚，当前配置未改变',
@@ -904,10 +906,10 @@ export default {
   'agentSnapshot.deleteFailed': '删除历史版本失败',
   'agentSnapshot.fetchFailed': '获取历史版本失败',
   'agentSnapshot.detailFailed': '获取快照详情失败',
-  'agentSnapshot.currentVersion': '当前版本',
+  'agentSnapshot.currentVersion': '最新快照',
   'agentSnapshot.source.config': '配置保存',
   'agentSnapshot.source.current': '当前配置',
-  'agentSnapshot.source.restore': '恢复前',
+  'agentSnapshot.source.restore': '恢复结果',
   'agentSnapshot.source.initial': '初始版本',
   'agentSnapshot.field.restore': '恢复操作',
   'agentSnapshot.field.initial': '初始快照',

main/manager-web/src/i18n/zh_TW.js

@@ -845,7 +845,9 @@ export default {
   'agentSnapshot.beforeRestore': '恢復前',
   'agentSnapshot.afterRestore': '恢復後',
   'agentSnapshot.restoreMemoryWarning': '恢復到無記憶版本會清空該智能體的聊天記錄，請確認後再繼續。',
-  'agentSnapshot.restoreConfirm': '確定恢復到版本 {version} 嗎？目前配置會先自動保存為新的歷史版本。',
+  'agentSnapshot.restoreMemoryDestructiveWarning': '此次恢復會永久刪除該智能體現有的聊天記錄。聊天記錄不包含在配置快照中，刪除後無法透過歷史版本復原。',
+  'agentSnapshot.unsavedChangesWarning': '頁面中尚未儲存的修改不會寫入歷史，並會在恢復後遺失。',
+  'agentSnapshot.restoreConfirm': '確定恢復到版本 {version} 嗎？目前配置會保留在歷史記錄中。',
   'agentSnapshot.restoreSuccess': '已恢復歷史版本',
   'agentSnapshot.restoreFailed': '恢復歷史版本失敗',
   'agentSnapshot.restoreFailedRollback': '恢復歷史版本失敗，交易已回滾，目前配置未改變',
@@ -854,10 +856,10 @@ export default {
   'agentSnapshot.deleteFailed': '刪除歷史版本失敗',
   'agentSnapshot.fetchFailed': '獲取歷史版本失敗',
   'agentSnapshot.detailFailed': '獲取快照詳情失敗',
-  'agentSnapshot.currentVersion': '目前版本',
+  'agentSnapshot.currentVersion': '最新快照',
   'agentSnapshot.source.config': '配置保存',
   'agentSnapshot.source.current': '目前配置',
-  'agentSnapshot.source.restore': '恢復前',
+  'agentSnapshot.source.restore': '恢復結果',
   'agentSnapshot.source.initial': '初始版本',
   'agentSnapshot.field.restore': '恢復操作',
   'agentSnapshot.field.initial': '初始快照',

main/manager-web/src/views/roleConfig.vue

@@ -6,7 +6,7 @@
       <h2 class="page-title">{{ $t("roleConfig.title") }}</h2>
     </div>
 
-    <div class="main-wrapper">
+    <div class="main-wrapper" v-loading="agentReloading">
       <div class="content-panel">
         <div class="content-area">
           <el-card class="config-card" shadow="never">
@@ -54,7 +54,7 @@
                 <el-button
                   type="primary"
                   class="save-btn"
-                  :disabled="voiceOptionsLoading"
+                  :disabled="configInteractionBlocked"
                   @click="saveConfig"
                 >
                   {{ $t("roleConfig.saveConfig") }}
@@ -304,6 +304,7 @@
                         <el-select
                           v-model="form.model[model.key]"
                           filterable
+                          :disabled="model.type === 'TTS' && voiceOptionsLoading"
                           :placeholder="$t('roleConfig.pleaseSelect')"
                           class="form-select"
                           @change="handleModelChange(model.type, $event)"
@@ -370,6 +371,7 @@
                         <div class="model-select-wrapper">
                           <el-select
                             v-model="selectedLanguage"
+                            :disabled="voiceOptionsLoading"
                             :placeholder="$t('roleConfig.selectLanguage')"
                             class="form-select language-select"
                             @change="handleLanguageChange"
@@ -395,6 +397,7 @@
                           <el-select
                             v-model="form.ttsVoiceId"
                             filterable
+                            :disabled="voiceOptionsLoading"
                             :placeholder="$t('roleConfig.pleaseSelect')"
                             class="form-select"
                             @change="handleVoiceChange"
@@ -566,6 +569,18 @@ export default {
       ttsVoiceTouched: false,
       voiceFetchSeq: 0,
       voiceOptionsLoading: false,
+      lastValidTtsDraft: null,
+      agentReloading: false,
+      agentReloadSeq: 0,
+      agentConfigFetchSeq: 0,
+      agentTagsFetchSeq: 0,
+      currentVersionFetchSeq: 0,
+      agentConfigLoaded: false,
+      agentFunctionsLoaded: false,
+      agentTagsLoaded: false,
+      currentVersionLoaded: false,
+      pluginMetadataReady: false,
+      pluginMetadataLoading: null,
       // 功能状态
       featureStatus: {
         vad: false, // 语言检测活动功能状态
@@ -578,6 +593,15 @@ export default {
       checkedReplacementWordIds: []
     };
   },
+  computed: {
+    configInteractionBlocked() {
+      return this.agentReloading
+        || this.voiceOptionsLoading
+        || !this.agentConfigLoaded
+        || !this.agentFunctionsLoaded
+        || !this.agentTagsLoaded;
+    }
+  },
   methods: {
     goToHome() {
       this.$router.push("/home");
@@ -602,7 +626,7 @@ export default {
       return { ...fallback };
     },
     async saveConfig() {
-      if (this.voiceOptionsLoading) {
+      if (this.configInteractionBlocked) {
         return;
       }
       const configData = {
@@ -676,6 +700,9 @@ export default {
               && this.form.ttsVoiceId === submittedTtsVoiceId) {
               this.ttsVoiceTouched = false;
             }
+            if (submittedVoiceFetchSeq === this.voiceFetchSeq) {
+              this.lastValidTtsDraft = this.captureTtsDraft();
+            }
             this.$message.success({
               message: i18n.t("roleConfig.saveSuccess"),
               showClose: true,
@@ -692,24 +719,77 @@ export default {
       });
       
     },
+    async reloadAgentPage(agentId, options = {}) {
+      if (!agentId) {
+        return false;
+      }
+      const requestSeq = ++this.agentReloadSeq;
+      this.agentReloading = true;
+      if (options.closeEditors) {
+        this.showSnapshotDialog = false;
+        this.showFunctionDialog = false;
+        this.showContextProviderDialog = false;
+        this.showTtsAdvancedDialog = false;
+        this.inputVisible = false;
+      }
+
+      const results = await Promise.all([
+        this.fetchAgentConfig(agentId, { showError: false }),
+        this.getAgentTags(agentId, { showError: false }),
+        this.fetchCurrentVersion(agentId, { showError: false })
+      ]);
+      if (requestSeq !== this.agentReloadSeq) {
+        return false;
+      }
+
+      this.agentReloading = false;
+      if (!this.pluginMetadataReady && this.agentConfigLoaded) {
+        this.$message.error(i18n.t("roleConfig.fetchPluginsFailed"));
+      } else if (!results.every(Boolean)) {
+        this.$message.error(i18n.t("roleConfig.fetchConfigFailed"));
+      }
+      return results.every(Boolean);
+    },
     handleSnapshotRestored() {
       const agentId = this.$route.query.agentId;
       if (agentId) {
-        this.fetchAgentConfig(agentId);
+        this.reloadAgentPage(agentId, { closeEditors: true });
-        this.getAgentTags(agentId);
-        this.fetchCurrentVersion(agentId);
       }
     },
-    fetchCurrentVersion(agentId) {
+    fetchCurrentVersion(agentId, options = {}) {
+      const requestSeq = ++this.currentVersionFetchSeq;
+      this.currentVersionLoaded = false;
       if (!agentId) {
         this.currentVersionNo = null;
-        return;
+        this.currentVersionLoaded = true;
+        return Promise.resolve(true);
       }
 
-      Api.agent.getDeviceConfig(agentId, ({ data }) => {
+      return new Promise((resolve) => {
-        if (data.code === 0) {
+        const handleFailure = (error) => {
-          this.currentVersionNo = data.data?.currentVersionNo || null;
+          if (requestSeq !== this.currentVersionFetchSeq) {
-        }
+            resolve(false);
+            return;
+          }
+          this.currentVersionLoaded = false;
+          if (options.showError !== false) {
+            this.$message.error(error?.data?.msg || i18n.t("roleConfig.fetchConfigFailed"));
+          }
+          resolve(false);
+        };
+        Api.agent.getDeviceConfig(agentId, ({ data }) => {
+          if (requestSeq !== this.currentVersionFetchSeq) {
+            resolve(false);
+            return;
+          }
+          if (data?.code === 0) {
+            this.currentVersionNo = data.data?.currentVersionNo || null;
+            this.currentVersionLoaded = true;
+            resolve(true);
+          } else {
+            handleFailure(data);
+          }
+        }, handleFailure);
       });
     },
     resetConfig() {
@@ -783,6 +863,7 @@ export default {
       }
     },
     applyTemplateData(templateData) {
+      const rollbackState = this.cloneTtsDraft(this.lastValidTtsDraft) || this.captureTtsDraft();
       const currentLanguage = this.selectedLanguage;
       this.form = {
         ...this.form,
@@ -805,90 +886,151 @@ export default {
       };
       if (templateData.ttsLanguage) {
         this.selectedLanguage = templateData.ttsLanguage;
-        this.ttsLanguageTouched = true;
       }
       if (templateData.ttsModelId || templateData.ttsVoiceId || templateData.ttsLanguage) {
-        if (templateData.ttsModelId || templateData.ttsVoiceId) {
-          this.ttsVoiceTouched = true;
-        }
-        this.ttsLanguageTouched = true;
         this.fetchVoiceOptions(this.form.model.ttsModelId, {
           autoSelectVoice: true,
           preferredLanguage: templateData.ttsLanguage || (templateData.ttsVoiceId ? "" : currentLanguage),
-          preferredVoiceId: templateData.ttsVoiceId || ""
+          preferredVoiceId: templateData.ttsVoiceId || "",
+          rollbackState,
+          markTouched: true
         });
       }
     },
-    fetchAgentConfig(agentId) {
+    buildCurrentFunctions(savedMappings) {
-      Api.agent.getDeviceConfig(agentId, ({ data }) => {
+      if (!Array.isArray(savedMappings)) {
-        if (data.code === 0) {
+        throw new TypeError("Invalid agent function mappings");
-          this.tempSummaryMemory = "";
+      }
-          this.ttsLanguageTouched = false;
+      return savedMappings.map((mapping) => {
-          this.ttsVoiceTouched = false;
+        const pluginId = mapping.pluginId || mapping.id;
-          this.form = {
+        const meta = this.pluginMetadataReady
-            ...this.form,
+          ? this.allFunctions.find((item) => item.id === pluginId)
-            ...data.data,
+          : null;
-            model: {
+        return {
-              ttsModelId: data.data.ttsModelId,
+          id: pluginId,
-              vadModelId: data.data.vadModelId,
+          name: meta?.name || mapping.name || pluginId,
-              asrModelId: data.data.asrModelId,
+          params: this.normalizeFunctionParams(mapping.paramInfo ?? mapping.params, meta?.params || {}),
-              llmModelId: data.data.llmModelId,
+          fieldsMeta: meta?.fieldsMeta || []
-              slmModelId: data.data.slmModelId,
+        };
-              vllmModelId: data.data.vllmModelId,
+      }).filter((item) => item.id);
-              memModelId: data.data.memModelId,
+    },
-              intentModelId: data.data.intentModelId,
+    enrichCurrentFunctionsWithMetadata() {
-            },
+      if (!this.agentFunctionsLoaded || !this.pluginMetadataReady) {
+        return;
+      }
+      this.currentFunctions = this.currentFunctions.map((item) => {
+        const meta = this.allFunctions.find((candidate) => candidate.id === item.id);
+        if (!meta) {
+          return {
+            ...item,
+            params: this.normalizeFunctionParams(item.params),
+            fieldsMeta: item.fieldsMeta || []
           };
-          this.fetchVoiceOptions(data.data.ttsModelId, {
-            preferredLanguage: data.data.ttsLanguage,
-            preferredVoiceId: data.data.ttsVoiceId
-          });
-
-          // 同步TTS设置到ttsSettings
-          this.ttsSettings = {
-            volume: this.form.ttsVolume || 0,
-            speed: this.form.ttsRate || 0,
-            pitch: this.form.ttsPitch || 0
-          };
-          // 同步替换词到checkedReplacementWordIds
-          this.checkedReplacementWordIds = data.data.correctWordFileIds || [];
-
-          // 后端只给了最小映射：[{ id, agentId, pluginId }, ...]
-          const savedMappings = data.data.functions || [];
-          
-          // 加载上下文配置
-          this.currentContextProviders = data.data.contextProviders || [];
-
-          // 先保证 allFunctions 已经加载（如果没有，则先 fetchAllFunctions）
-          const ensureFuncs = this.allFunctions.length
-            ? Promise.resolve()
-            : this.fetchAllFunctions();
-
-          ensureFuncs.then(() => {
-            // 合并：按照 pluginId（id 字段）把全量元数据信息补齐
-            this.currentFunctions = savedMappings.map((mapping) => {
-              const meta = this.allFunctions.find((f) => f.id === mapping.pluginId);
-              if (!meta) {
-                // 插件定义没找到，退化处理
-                return { id: mapping.pluginId, name: mapping.pluginId, params: {} };
-              }
-              return {
-                id: mapping.pluginId,
-                name: meta.name,
-                // 后端如果还有 paramInfo 字段就用 mapping.paramInfo，否则用 meta.params 默认值
-                params: this.normalizeFunctionParams(mapping.paramInfo, meta.params),
-                fieldsMeta: meta.fieldsMeta, // 保留以便对话框渲染 tooltip
-              };
-            });
-            // 备份原始，以备取消时恢复
-            this.originalFunctions = JSON.parse(JSON.stringify(this.currentFunctions));
-
-            // 确保意图识别选项的可见性正确
-            this.updateIntentOptionsVisibility();
-          });
-        } else {
-          this.$message.error(data.msg || i18n.t("roleConfig.fetchConfigFailed"));
         }
+        return {
+          ...item,
+          name: meta.name || item.name || item.id,
+          params: this.normalizeFunctionParams(item.params, meta.params),
+          fieldsMeta: meta.fieldsMeta || []
+        };
+      });
+      this.originalFunctions = JSON.parse(JSON.stringify(this.currentFunctions));
+    },
+    fetchAgentConfig(agentId, options = {}) {
+      const requestSeq = ++this.agentConfigFetchSeq;
+      this.agentConfigLoaded = false;
+      this.agentFunctionsLoaded = false;
+      this.voiceFetchSeq += 1;
+      this.voiceOptionsLoading = false;
+
+      return new Promise((resolve) => {
+        const handleFailure = (error) => {
+          if (requestSeq !== this.agentConfigFetchSeq) {
+            resolve(false);
+            return;
+          }
+          this.agentConfigLoaded = false;
+          this.agentFunctionsLoaded = false;
+          if (options.showError !== false) {
+            this.$message.error(error?.data?.msg || i18n.t("roleConfig.fetchConfigFailed"));
+          }
+          resolve(false);
+        };
+
+        Api.agent.getDeviceConfig(agentId, ({ data }) => {
+          if (requestSeq !== this.agentConfigFetchSeq) {
+            resolve(false);
+            return;
+          }
+          if (data?.code !== 0 || !data.data) {
+            handleFailure(data);
+            return;
+          }
+
+          try {
+            const agentData = data.data;
+            if (agentData.functions != null && !Array.isArray(agentData.functions)) {
+              throw new TypeError("Invalid agent function mappings");
+            }
+            if (agentData.contextProviders != null && !Array.isArray(agentData.contextProviders)) {
+              throw new TypeError("Invalid context providers");
+            }
+            if (agentData.correctWordFileIds != null && !Array.isArray(agentData.correctWordFileIds)) {
+              throw new TypeError("Invalid correct-word mappings");
+            }
+            this.tempSummaryMemory = "";
+            this.ttsLanguageTouched = false;
+            this.ttsVoiceTouched = false;
+            this.form = {
+              ...this.form,
+              ...agentData,
+              model: {
+                ttsModelId: agentData.ttsModelId,
+                vadModelId: agentData.vadModelId,
+                asrModelId: agentData.asrModelId,
+                llmModelId: agentData.llmModelId,
+                slmModelId: agentData.slmModelId,
+                vllmModelId: agentData.vllmModelId,
+                memModelId: agentData.memModelId,
+                intentModelId: agentData.intentModelId,
+              },
+            };
+            this.selectedLanguage = agentData.ttsLanguage || "";
+            this.voiceOptions = [];
+            this.voiceDetails = {};
+            this.languageOptions = [];
+            this.lastValidTtsDraft = this.captureTtsDraft();
+            this.fetchVoiceOptions(agentData.ttsModelId, {
+              preferredLanguage: agentData.ttsLanguage,
+              preferredVoiceId: agentData.ttsVoiceId
+            });
+
+            this.ttsSettings = {
+              volume: this.form.ttsVolume || 0,
+              speed: this.form.ttsRate || 0,
+              pitch: this.form.ttsPitch || 0
+            };
+            this.checkedReplacementWordIds = agentData.correctWordFileIds || [];
+            this.currentContextProviders = agentData.contextProviders || [];
+            this.currentFunctions = this.buildCurrentFunctions(agentData.functions || []);
+            this.originalFunctions = JSON.parse(JSON.stringify(this.currentFunctions));
+            this.agentFunctionsLoaded = true;
+            this.agentConfigLoaded = true;
+
+            const metadataPromise = this.pluginMetadataReady
+              ? Promise.resolve(true)
+              : this.fetchAllFunctions({ showError: options.showError });
+            metadataPromise.then((metadataReady) => {
+              if (requestSeq === this.agentConfigFetchSeq && metadataReady) {
+                this.enrichCurrentFunctionsWithMetadata();
+                this.updateIntentOptionsVisibility();
+              }
+              resolve(true);
+            }).catch(handleFailure);
+          } catch (error) {
+            handleFailure(error);
+          }
+        }, handleFailure);
       });
     },
     fetchModelOptions() {
@@ -942,6 +1084,7 @@ export default {
         this.voiceDetails = {};
         this.languageOptions = [];
         this.selectedLanguage = '';
+        this.lastValidTtsDraft = this.captureTtsDraft();
         return;
       }
       this.voiceOptionsLoading = true;
@@ -949,57 +1092,165 @@ export default {
         if (requestSeq !== this.voiceFetchSeq) {
           return;
         }
-        this.voiceOptionsLoading = false;
+        const draft = data.code === 0
-        if (data.code === 0 && data.data) {
+          ? this.buildTtsDraft(modelId, data.data, options)
-          // 保存完整的音色信息
+          : null;
-          this.voiceDetails = data.data.reduce((acc, voice) => {
+        if (!draft) {
-            acc[voice.id] = voice;
+          this.handleVoiceOptionsFailure(requestSeq, options.rollbackState);
-            return acc;
+          return;
-          }, {});
-          
-          // 提取所有语言选项并去重
-          const allLanguages = new Set();
-          data.data.forEach(voice => {
-            if (voice.languages) {
-              const languagesArray = voice.languages.split(/[、；;,，]/).map(lang => lang.trim()).filter(lang => lang);
-              languagesArray.forEach(lang => allLanguages.add(lang));
-            }
-          });
-
-          this.languageOptions = Array.from(allLanguages).map(lang => ({
-            value: lang,
-            label: lang
-          }));
-
-          // 优先保留调用方指定或后端保存的语言，其次使用当前音色的默认语言
-          const requestedLanguage = options.preferredLanguage;
-          const preferredVoiceLanguage = options.preferredVoiceId
-            ? this.getVoiceDefaultLanguage(options.preferredVoiceId)
-            : "";
-          if (requestedLanguage && this.languageOptions.some(option => option.value === requestedLanguage)) {
-            this.selectedLanguage = requestedLanguage;
-          } else if (preferredVoiceLanguage && this.languageOptions.some(option => option.value === preferredVoiceLanguage)) {
-            this.selectedLanguage = preferredVoiceLanguage;
-          } else if (this.form.ttsLanguage && this.languageOptions.some(option => option.value === this.form.ttsLanguage)) {
-            this.selectedLanguage = this.form.ttsLanguage;
-          } else if (this.getVoiceDefaultLanguage(this.form.ttsVoiceId)) {
-            this.selectedLanguage = this.getVoiceDefaultLanguage(this.form.ttsVoiceId);
-          } else if (this.languageOptions.length > 0) {
-            this.selectedLanguage = this.languageOptions[0].value;
-          } else {
-            this.selectedLanguage = "";
-          }
-
-          // 根据选中的语言筛选音色
-          this.filterVoicesByLanguage(options);
-        } else {
-          this.voiceOptions = [];
-          this.voiceDetails = {};
-          this.languageOptions = [];
-          this.selectedLanguage = '';
         }
+        this.applyTtsDraft(draft, options);
+        this.voiceOptionsLoading = false;
+        this.lastValidTtsDraft = this.captureTtsDraft();
+      }, () => {
+        this.handleVoiceOptionsFailure(requestSeq, options.rollbackState);
       });
     },
+    cloneTtsDraft(draft) {
+      return draft ? JSON.parse(JSON.stringify(draft)) : null;
+    },
+    captureTtsDraft() {
+      return {
+        modelId: this.form.model.ttsModelId,
+        language: this.selectedLanguage,
+        storedLanguage: this.form.ttsLanguage,
+        voiceId: this.form.ttsVoiceId,
+        languageTouched: this.ttsLanguageTouched,
+        voiceTouched: this.ttsVoiceTouched,
+        voiceOptions: this.cloneTtsDraft(this.voiceOptions) || [],
+        voiceDetails: this.cloneTtsDraft(this.voiceDetails) || {},
+        languageOptions: this.cloneTtsDraft(this.languageOptions) || []
+      };
+    },
+    restoreTtsDraft(draft) {
+      const restored = this.cloneTtsDraft(draft);
+      if (!restored) {
+        return false;
+      }
+      this.form.model.ttsModelId = restored.modelId;
+      this.selectedLanguage = restored.language;
+      this.form.ttsLanguage = restored.storedLanguage;
+      this.form.ttsVoiceId = restored.voiceId;
+      this.ttsLanguageTouched = restored.languageTouched;
+      this.ttsVoiceTouched = restored.voiceTouched;
+      this.voiceOptions = restored.voiceOptions;
+      this.voiceDetails = restored.voiceDetails;
+      this.languageOptions = restored.languageOptions;
+      this.lastValidTtsDraft = restored;
+      return true;
+    },
+    splitVoiceLanguages(voice) {
+      return voice && voice.languages
+        ? voice.languages.split(/[、；;,，]/).map(lang => lang.trim()).filter(Boolean)
+        : [];
+    },
+    buildTtsDraft(modelId, voices, options = {}) {
+      if (!Array.isArray(voices) || voices.length === 0) {
+        return null;
+      }
+      const voiceDetails = voices.reduce((result, voice) => {
+        if (voice && voice.id) {
+          result[voice.id] = voice;
+        }
+        return result;
+      }, {});
+      const validVoices = Object.values(voiceDetails);
+      if (validVoices.length === 0) {
+        return null;
+      }
+
+      const allLanguages = new Set();
+      validVoices.forEach((voice) => {
+        this.splitVoiceLanguages(voice).forEach((language) => allLanguages.add(language));
+      });
+      const languageOptions = Array.from(allLanguages).map((language) => ({
+        value: language,
+        label: language
+      }));
+      const languageExists = (language) => language
+        && languageOptions.some((option) => option.value === language);
+      const preferredVoiceId = options.preferredVoiceId || this.form.ttsVoiceId;
+      const preferredVoiceLanguage = this.splitVoiceLanguages(voiceDetails[preferredVoiceId])[0] || "";
+      const languageCandidates = [
+        options.preferredLanguage,
+        preferredVoiceLanguage,
+        this.form.ttsLanguage,
+        this.selectedLanguage,
+        languageOptions[0]?.value
+      ];
+      const preferredVoiceHasNoLanguage = Boolean(
+        voiceDetails[preferredVoiceId]
+        && this.splitVoiceLanguages(voiceDetails[preferredVoiceId]).length === 0
+      );
+      let language = options.preferredLanguage === "" && preferredVoiceHasNoLanguage
+        ? ""
+        : languageCandidates.find(languageExists) || "";
+      const filterVoices = (targetLanguage) => validVoices.filter((voice) => {
+        const languages = this.splitVoiceLanguages(voice);
+        return languages.length === 0 || languages.includes(targetLanguage);
+      });
+      let filteredVoices = filterVoices(language);
+      if (filteredVoices.length === 0) {
+        const fallbackVoice = validVoices.find((voice) => this.splitVoiceLanguages(voice).length > 0);
+        if (fallbackVoice) {
+          language = this.splitVoiceLanguages(fallbackVoice)[0];
+          filteredVoices = filterVoices(language);
+        } else {
+          filteredVoices = validVoices;
+        }
+      }
+      if (filteredVoices.length === 0) {
+        return null;
+      }
+
+      const preferredVoice = filteredVoices.find((voice) => voice.id === preferredVoiceId);
+      const voice = preferredVoice || (options.autoSelectVoice ? filteredVoices[0] : null);
+      return {
+        modelId,
+        language,
+        voiceId: voice?.id || preferredVoiceId || "",
+        voiceDetails,
+        languageOptions,
+        voiceOptions: filteredVoices.map((item) => ({
+          value: item.id,
+          label: item.name,
+          voiceDemo: item.voiceDemo,
+          voice_demo: item.voice_demo,
+          isClone: Boolean(item.isClone),
+          train_status: item.trainStatus
+        }))
+      };
+    },
+    applyTtsDraft(draft, options = {}) {
+      this.form.model.ttsModelId = draft.modelId;
+      this.voiceDetails = draft.voiceDetails;
+      this.languageOptions = draft.languageOptions;
+      this.voiceOptions = draft.voiceOptions;
+      this.selectedLanguage = draft.language;
+      this.form.ttsLanguage = draft.language;
+      this.form.ttsVoiceId = draft.voiceId;
+      if (options.markTouched) {
+        this.ttsLanguageTouched = true;
+        this.ttsVoiceTouched = true;
+      }
+      this.ttsSettings = {
+        volume: this.form.ttsVolume !== null && this.form.ttsVolume !== undefined ? this.form.ttsVolume : 0,
+        speed: this.form.ttsRate !== null && this.form.ttsRate !== undefined ? this.form.ttsRate : 0,
+        pitch: this.form.ttsPitch !== null && this.form.ttsPitch !== undefined ? this.form.ttsPitch : 0
+      };
+    },
+    handleVoiceOptionsFailure(requestSeq, rollbackState) {
+      if (requestSeq !== this.voiceFetchSeq) {
+        return;
+      }
+      this.voiceOptionsLoading = false;
+      if (!this.restoreTtsDraft(rollbackState)) {
+        this.voiceOptions = [];
+        this.voiceDetails = {};
+        this.languageOptions = [];
+      }
+      this.$message.error(i18n.t("ttsModel.fetchVoicesFailed"));
+    },
     getVoiceDefaultLanguage(voiceId) {
       if (!voiceId || !this.voiceDetails || !this.voiceDetails[voiceId]?.languages) {
         return "";
@@ -1022,11 +1273,11 @@ export default {
 
       // 根据选中的语言筛选音色
       const filteredVoices = allVoices.filter(voice => {
-        if (!voice.languages) {
+        const languagesArray = this.splitVoiceLanguages(voice);
-          // 对于没有语言信息的克隆音色，始终显示
+        if (languagesArray.length === 0) {
-          return Boolean(voice.isClone);
+          // 未声明语言的合法音色由 provider 自行解释，不在前端强制过滤。
+          return true;
         }
-        const languagesArray = voice.languages.split(/[、；;,，]/).map(lang => lang.trim()).filter(lang => lang);
         return languagesArray.includes(this.selectedLanguage);
       });
 
@@ -1059,6 +1310,9 @@ export default {
       this.ttsLanguageTouched = true;
       this.form.ttsLanguage = this.selectedLanguage;
       this.filterVoicesByLanguage({ autoSelectVoice: true });
+      if (this.form.ttsVoiceId) {
+        this.lastValidTtsDraft = this.captureTtsDraft();
+      }
     },
     handleVoiceChange() {
       this.ttsVoiceTouched = true;
@@ -1066,6 +1320,9 @@ export default {
         this.form.ttsLanguage = this.selectedLanguage;
         this.ttsLanguageTouched = true;
       }
+      if (this.form.ttsVoiceId) {
+        this.lastValidTtsDraft = this.captureTtsDraft();
+      }
     },
     shouldSubmitTtsLanguage() {
       return this.ttsLanguageTouched;
@@ -1089,7 +1346,11 @@ export default {
     },
     handleModelChange(type, value) {
       if (type === "Intent" && value !== "Intent_nointent") {
-        this.fetchAllFunctions();
+        this.fetchAllFunctions().then((metadataReady) => {
+          if (metadataReady) {
+            this.enrichCurrentFunctionsWithMetadata();
+          }
+        });
       }
       if (type === "Memory") {
         if (value === "Memory_nomem") {
@@ -1112,44 +1373,93 @@ export default {
         this.updateIntentOptionsVisibility();
       }
       if (type === "TTS") {
-        const preferredLanguage = this.selectedLanguage;
+        const rollbackState = this.cloneTtsDraft(this.lastValidTtsDraft);
-        this.ttsLanguageTouched = true;
-        this.ttsVoiceTouched = true;
-        this.form.ttsVoiceId = "";
-        this.form.ttsLanguage = "";
         this.fetchVoiceOptions(value, {
           autoSelectVoice: true,
-          preferredLanguage
+          preferredLanguage: rollbackState?.language || this.selectedLanguage,
+          rollbackState,
+          markTouched: true
         });
       }
     },
-    fetchAllFunctions() {
+    parsePluginFields(fields) {
-      return new Promise((resolve, reject) => {
+      if (Array.isArray(fields)) {
-        Api.model.getPluginFunctionList(null, ({ data }) => {
+        return fields;
-          if (data.code === 0) {
+      }
-            this.allFunctions = data.data.map((item) => {
+      if (typeof fields !== "string" || !fields.trim()) {
-              const meta = JSON.parse(item.fields || "[]");
+        return [];
-              const params = meta.reduce((m, f) => {
+      }
-                m[f.key] = f.default;
+      try {
-                return m;
+        const parsed = JSON.parse(fields);
-              }, {});
+        return Array.isArray(parsed) ? parsed : [];
-              return { ...item, fieldsMeta: meta, params };
+      } catch (error) {
-            });
+        return [];
-            resolve();
+      }
-          } else {
+    },
-            this.$message.error(data.msg || i18n.t("roleConfig.fetchPluginsFailed"));
+    fetchAllFunctions(options = {}) {
-            reject();
+      if (this.pluginMetadataReady) {
+        return Promise.resolve(true);
+      }
+      if (this.pluginMetadataLoading) {
+        return this.pluginMetadataLoading;
+      }
+
+      this.pluginMetadataLoading = new Promise((resolve) => {
+        let settled = false;
+        const finish = (ready, error) => {
+          if (settled) {
+            return;
           }
-        });
+          settled = true;
+          this.pluginMetadataReady = ready;
+          if (!ready && options.showError !== false) {
+            this.$message.error(error?.data?.msg || error?.msg || i18n.t("roleConfig.fetchPluginsFailed"));
+          }
+          resolve(ready);
+        };
+
+        Api.model.getPluginFunctionList(null, ({ data }) => {
+          if (data?.code !== 0) {
+            finish(false, data);
+            return;
+          }
+          try {
+            this.allFunctions = (data.data || []).map((item) => {
+              const fieldsMeta = this.parsePluginFields(item.fields);
+              const params = fieldsMeta.reduce((result, field) => {
+                if (field?.key) {
+                  result[field.key] = field.default;
+                }
+                return result;
+              }, {});
+              return { ...item, fieldsMeta, params };
+            });
+            finish(true);
+          } catch (error) {
+            finish(false, error);
+          }
+        }, (error) => finish(false, error));
+      }).finally(() => {
+        this.pluginMetadataLoading = null;
       });
+
+      return this.pluginMetadataLoading;
     },
     openFunctionDialog() {
-      // 显示编辑对话框时，确保 allFunctions 已经加载
+      if (this.agentReloading || !this.agentFunctionsLoaded) {
-      if (this.allFunctions.length === 0) {
+        return;
-        this.fetchAllFunctions().then(() => (this.showFunctionDialog = true));
-      } else {
-        this.showFunctionDialog = true;
       }
+      if (this.pluginMetadataReady) {
+        this.enrichCurrentFunctionsWithMetadata();
+        this.showFunctionDialog = true;
+        return;
+      }
+      this.fetchAllFunctions().then((metadataReady) => {
+        if (metadataReady) {
+          this.enrichCurrentFunctionsWithMetadata();
+          this.showFunctionDialog = true;
+        }
+      });
     },
     openContextProviderDialog() {
       this.showContextProviderDialog = true;
@@ -1520,12 +1830,46 @@ export default {
       this.inputVisible = false;
       this.inputValue = '';
     },
-    getAgentTags(agentId) {
+    getAgentTags(agentId, options = {}) {
-      Api.agent.getAgentTags(agentId, ({ data }) => {
+      const requestSeq = ++this.agentTagsFetchSeq;
-        if (data.code === 0) {
+      this.agentTagsLoaded = false;
-          this.dynamicTags = data.data || [];
+      if (!agentId) {
-          this.originalTagNames = this.dynamicTags.map(tag => tag.tagName);
+        this.dynamicTags = [];
-        }
+        this.originalTagNames = [];
+        this.agentTagsLoaded = true;
+        return Promise.resolve(true);
+      }
+
+      return new Promise((resolve) => {
+        const handleFailure = (error) => {
+          if (requestSeq !== this.agentTagsFetchSeq) {
+            resolve(false);
+            return;
+          }
+          this.agentTagsLoaded = false;
+          if (options.showError !== false) {
+            this.$message.error(error?.data?.msg || i18n.t("roleConfig.fetchConfigFailed"));
+          }
+          resolve(false);
+        };
+        Api.agent.getAgentTags(agentId, ({ data }) => {
+          if (requestSeq !== this.agentTagsFetchSeq) {
+            resolve(false);
+            return;
+          }
+          if (data?.code === 0) {
+            try {
+              this.dynamicTags = Array.isArray(data.data) ? data.data : [];
+              this.originalTagNames = this.dynamicTags.map(tag => tag.tagName);
+              this.agentTagsLoaded = true;
+              resolve(true);
+            } catch (error) {
+              handleFailure(error);
+            }
+          } else {
+            handleFailure(data);
+          }
+        }, handleFailure);
       });
     },
     isSameStringList(left, right) {
@@ -1547,13 +1891,18 @@ export default {
       });
     }
   },
+  beforeDestroy() {
+    this.agentReloadSeq += 1;
+    this.agentConfigFetchSeq += 1;
+    this.agentTagsFetchSeq += 1;
+    this.currentVersionFetchSeq += 1;
+    this.voiceFetchSeq += 1;
+  },
   async mounted() {
+    this.lastValidTtsDraft = this.captureTtsDraft();
     const agentId = this.$route.query.agentId;
     if (agentId) {
-      this.fetchAgentConfig(agentId);
+      this.reloadAgentPage(agentId);
-      this.getAgentTags(agentId);
-      this.fetchAllFunctions();
-      this.fetchCurrentVersion(agentId);
     }
     this.fetchModelOptions();
     this.fetchTemplates();