diff --git a/desktop/src/components/HandParamsForm.tsx b/desktop/src/components/HandParamsForm.tsx
index 796f1a5..e080999 100644
--- a/desktop/src/components/HandParamsForm.tsx
+++ b/desktop/src/components/HandParamsForm.tsx
@@ -31,6 +31,7 @@ import {
   Info,
 } from 'lucide-react';
 import type { HandParameter } from '../types/hands';
+import { parseJsonOrDefault, safeJsonParse } from '../lib/json-utils';
 
 // === Types ===
 
@@ -144,13 +145,9 @@ function getPresetStorageKey(handId: string): string {
 }
 
 function loadPresets(handId: string): ParameterPreset[] {
-  try {
-    const stored = localStorage.getItem(getPresetStorageKey(handId));
-    if (stored) {
-      return JSON.parse(stored) as ParameterPreset[];
-    }
-  } catch {
-    // Ignore parse errors
+  const stored = localStorage.getItem(getPresetStorageKey(handId));
+  if (stored) {
+    return parseJsonOrDefault<ParameterPreset[]>(stored, []);
   }
   return [];
 }
@@ -405,15 +402,15 @@ function ObjectParamInput({ param, value, onChange, disabled, error }: ParamInpu
       return;
     }
 
-    try {
-      const parsed = JSON.parse(text);
-      if (typeof parsed === 'object' && !Array.isArray(parsed)) {
-        onChange(parsed);
+    const result = safeJsonParse<unknown>(text);
+    if (result.success) {
+      if (typeof result.data === 'object' && !Array.isArray(result.data)) {
+        onChange(result.data as Record<string, unknown>);
         setParseError(null);
       } else {
         setParseError('Value must be a JSON object');
       }
-    } catch {
+    } else {
       setParseError('Invalid JSON format');
     }
   };
diff --git a/desktop/src/components/RightPanel.tsx b/desktop/src/components/RightPanel.tsx
index aaefbb9..225608a 100644
--- a/desktop/src/components/RightPanel.tsx
+++ b/desktop/src/components/RightPanel.tsx
@@ -574,6 +574,8 @@ export function RightPanel() {
             </div>
           </div>
         </motion.div>
+          </>
+        )}
       </div>
     </aside>
   );
diff --git a/desktop/src/components/WorkflowEditor.tsx b/desktop/src/components/WorkflowEditor.tsx
index 9c3f537..4a8fff2 100644
--- a/desktop/src/components/WorkflowEditor.tsx
+++ b/desktop/src/components/WorkflowEditor.tsx
@@ -23,6 +23,7 @@ import {
   AlertCircle,
   GitBranch,
 } from 'lucide-react';
+import { safeJsonParse } from '../lib/json-utils';
 
 // === Types ===
 
@@ -163,11 +164,15 @@ function StepEditor({ step, hands, index, onUpdate, onRemove, onMoveUp, onMoveDo
             <textarea
               value={step.params ? JSON.stringify(step.params, null, 2) : ''}
               onChange={(e) => {
-                try {
-                  const params = e.target.value.trim() ? JSON.parse(e.target.value) : undefined;
-                  onUpdate({ ...step, params });
-                } catch {
-                  // Invalid JSON, keep current params
+                const text = e.target.value.trim();
+                if (text) {
+                  const result = safeJsonParse<Record<string, unknown>>(text);
+                  if (result.success) {
+                    onUpdate({ ...step, params: result.data });
+                  }
+                  // If parse fails, keep current params
+                } else {
+                  onUpdate({ ...step, params: undefined });
                 }
               }}
               placeholder='{"key": "value"}'
diff --git a/desktop/src/components/WorkflowList.tsx b/desktop/src/components/WorkflowList.tsx
index ffe541b..c6d2448 100644
--- a/desktop/src/components/WorkflowList.tsx
+++ b/desktop/src/components/WorkflowList.tsx
@@ -23,6 +23,7 @@ import {
   Loader2,
   X,
 } from 'lucide-react';
+import { safeJsonParse } from '../lib/json-utils';
 
 // === View Toggle Types ===
 
@@ -44,12 +45,12 @@ function ExecuteModal({ workflow, isOpen, onClose, onExecute, isExecuting }: Exe
   const handleExecute = async () => {
     let parsedInput: Record<string, unknown> | undefined;
     if (input.trim()) {
-      try {
-        parsedInput = JSON.parse(input);
-      } catch {
-        alert('输入格式错误，请使用有效的 JSON 格式。');
+      const result = safeJsonParse<Record<string, unknown>>(input);
+      if (!result.success) {
+        alert('Input format error, please use valid JSON format.');
         return;
       }
+      parsedInput = result.data;
     }
     await onExecute(workflow.id, parsedInput);
     setInput('');
diff --git a/desktop/src/lib/gateway-client.ts b/desktop/src/lib/gateway-client.ts
index 84fa384..e02eb54 100644
--- a/desktop/src/lib/gateway-client.ts
+++ b/desktop/src/lib/gateway-client.ts
@@ -10,16 +10,41 @@
  * - WebSocket path: /ws
  * - REST API: http://127.0.0.1:50051/api/*
  * - Config format: TOML
+ *
+ * Security:
+ * - Device keys stored in OS keyring when available
+ * - Supports WSS (WebSocket Secure) for production
  */
 
 import nacl from 'tweetnacl';
 import type { GatewayConfigSnapshot, GatewayModelChoice } from './gateway-config';
+import {
+  storeDeviceKeys,
+  getDeviceKeys,
+  deleteDeviceKeys,
+} from './secure-storage';
+
+// === WSS Configuration ===
+
+/**
+ * Whether to use WSS (WebSocket Secure) instead of WS.
+ * Set VITE_USE_WSS=true in production environments.
+ */
+const USE_WSS = import.meta.env.VITE_USE_WSS === 'true';
+
+/**
+ * Default protocol based on WSS configuration.
+ */
+const DEFAULT_WS_PROTOCOL = USE_WSS ? 'wss://' : 'ws://';
 
 // OpenFang endpoints (actual port is 50051, not 4200)
 // Note: REST API uses relative path to leverage Vite proxy for CORS bypass
-export const DEFAULT_GATEWAY_URL = 'ws://127.0.0.1:50051/ws';
-export const REST_API_URL = '';  // Empty = use relative path (Vite proxy)
-export const FALLBACK_GATEWAY_URLS = [DEFAULT_GATEWAY_URL, 'ws://127.0.0.1:4200/ws'];
+export const DEFAULT_GATEWAY_URL = `${DEFAULT_WS_PROTOCOL}127.0.0.1:50051/ws`;
+export const REST_API_URL = ''; // Empty = use relative path (Vite proxy)
+export const FALLBACK_GATEWAY_URLS = [
+  DEFAULT_GATEWAY_URL,
+  `${DEFAULT_WS_PROTOCOL}127.0.0.1:4200/ws`,
+];
 const GATEWAY_URL_STORAGE_KEY = 'zclaw_gateway_url';
 const GATEWAY_TOKEN_STORAGE_KEY = 'zclaw_gateway_token';
 
@@ -114,7 +139,36 @@ export function setStoredGatewayToken(token: string): string {
     } else {
       localStorage.removeItem(GATEWAY_TOKEN_STORAGE_KEY);
     }
-  } catch { /* ignore localStorage failures */ }
+  } catch {
+    /* ignore localStorage failures */
+  }
+  return normalized;
+}
+
+// === URL Normalization ===
+
+/**
+ * Normalize a gateway URL to ensure correct protocol and path.
+ * - Ensures ws:// or wss:// protocol based on configuration
+ * - Ensures /ws path suffix
+ * - Handles both localhost and IP addresses
+ */
+export function normalizeGatewayUrl(url: string): string {
+  let normalized = url.trim();
+
+  // Remove trailing slashes except for protocol
+  normalized = normalized.replace(/\/+$/, '');
+
+  // Ensure protocol
+  if (!normalized.startsWith('ws://') && !normalized.startsWith('wss://')) {
+    normalized = USE_WSS ? `wss://${normalized}` : `ws://${normalized}`;
+  }
+
+  // Ensure /ws path
+  if (!normalized.endsWith('/ws')) {
+    normalized = `${normalized}/ws`;
+  }
+
   return normalized;
 }
 
@@ -152,41 +206,35 @@ async function generateDeviceKeys(): Promise<DeviceKeys> {
   };
 }
 
+/**
+ * Load device keys from secure storage.
+ * Uses OS keyring when available, falls back to localStorage.
+ */
 async function loadDeviceKeys(): Promise<DeviceKeys> {
-  // Try to load from localStorage
-  const stored = localStorage.getItem('zclaw_device_keys');
-  if (stored) {
+  // Try to load from secure storage (keyring or localStorage fallback)
+  const storedKeys = await getDeviceKeys();
+  if (storedKeys) {
     try {
-      const parsed = JSON.parse(stored);
-      const publicKey = b64Decode(parsed.publicKeyBase64);
-      const secretKey = b64Decode(parsed.secretKeyBase64);
-      const deviceId = await deriveDeviceId(publicKey);
-
-      // Validate that the stored deviceId matches the derived one
-      if (parsed.deviceId && parsed.deviceId !== deviceId) {
-        console.warn('[GatewayClient] Stored deviceId mismatch, regenerating keys');
-        throw new Error('Device ID mismatch');
-      }
+      const deviceId = await deriveDeviceId(storedKeys.publicKey);
 
       return {
         deviceId,
-        publicKey,
-        secretKey,
-        publicKeyBase64: parsed.publicKeyBase64,
+        publicKey: storedKeys.publicKey,
+        secretKey: storedKeys.secretKey,
+        publicKeyBase64: b64Encode(storedKeys.publicKey),
       };
     } catch (e) {
-      // Invalid stored keys, generate new ones
       console.warn('[GatewayClient] Failed to load stored keys:', e);
+      // Invalid stored keys, clear and regenerate
+      await deleteDeviceKeys();
     }
   }
 
   // Generate new keys
   const keys = await generateDeviceKeys();
-  localStorage.setItem('zclaw_device_keys', JSON.stringify({
-    deviceId: keys.deviceId,
-    publicKeyBase64: keys.publicKeyBase64,
-    secretKeyBase64: b64Encode(keys.secretKey),
-  }));
+
+  // Store in secure storage (keyring when available, localStorage fallback)
+  await storeDeviceKeys(keys.publicKey, keys.secretKey);
 
   return keys;
 }
@@ -203,12 +251,12 @@ export async function getLocalDeviceIdentity(): Promise<LocalDeviceIdentity> {
  * Clear cached device keys to force regeneration on next connect.
  * Useful when device signature validation fails repeatedly.
  */
-export function clearDeviceKeys(): void {
+export async function clearDeviceKeys(): Promise<void> {
   try {
-    localStorage.removeItem('zclaw_device_keys');
+    await deleteDeviceKeys();
     console.log('[GatewayClient] Device keys cleared');
-  } catch {
-    // Ignore localStorage errors
+  } catch (e) {
+    console.warn('[GatewayClient] Failed to clear device keys:', e);
   }
 }
 
@@ -220,17 +268,6 @@ function b64Encode(bytes: Uint8Array): string {
   return btoa(binary).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
 }
 
-function b64Decode(str: string): Uint8Array {
-  str = str.replace(/-/g, '+').replace(/_/g, '/');
-  while (str.length % 4) str += '=';
-  const binary = atob(str);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  return bytes;
-}
-
 function buildDeviceAuthPayload(params: {
   clientId: string;
   clientMode: string;
@@ -1563,10 +1600,6 @@ export function getGatewayClient(opts?: ConstructorParameters<typeof GatewayClie
   return _client;
 }
 
-function normalizeGatewayUrl(url: string): string {
-  return url.replace(/\/+$/, '');
-}
-
 
 
 
diff --git a/desktop/src/lib/json-utils.ts b/desktop/src/lib/json-utils.ts
new file mode 100644
index 0000000..d58d023
--- /dev/null
+++ b/desktop/src/lib/json-utils.ts
@@ -0,0 +1,173 @@
+/**
+ * Safe JSON Parsing Utilities
+ *
+ * Provides try-catch protected JSON parsing with optional default values
+ * and context-aware error messages.
+ *
+ * Usage:
+ * - safeJsonParse: Returns result object with success/failure status
+ * - parseJsonOrDefault: Returns parsed value or default on failure
+ * - parseJsonOrThrow: Returns parsed value or throws friendly error
+ */
+
+export interface SafeJsonParseResult<T> {
+  success: boolean;
+  data?: T;
+  error?: string;
+}
+
+/**
+ * Safely parse a JSON string with error handling
+ *
+ * @param text - The JSON string to parse
+ * @param defaultValue - Optional default value to return on parse failure
+ * @returns Result object with success status, data, and optional error message
+ *
+ * @example
+ * const result = safeJsonParse<UserData>(jsonString);
+ * if (result.success) {
+ *   console.log(result.data);
+ * } else {
+ *   console.error(result.error);
+ * }
+ */
+export function safeJsonParse<T>(text: string, defaultValue?: T): SafeJsonParseResult<T> {
+  try {
+    const data = JSON.parse(text) as T;
+    return { success: true, data };
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'Unknown JSON parse error';
+    // Log truncated input for debugging
+    const truncatedInput = text.length > 100 ? `${text.substring(0, 100)}...` : text;
+    console.warn('[json-utils] Parse failed:', errorMessage, 'Input:', truncatedInput);
+    return {
+      success: false,
+      error: errorMessage,
+      data: defaultValue,
+    };
+  }
+}
+
+/**
+ * Safely parse JSON and return default value on failure
+ *
+ * Use this when you have a sensible default and don't need to know
+ * about parse failures.
+ *
+ * @param text - The JSON string to parse
+ * @param defaultValue - The value to return if parsing fails
+ * @returns The parsed data or the default value
+ *
+ * @example
+ * const config = parseJsonOrDefault(rawConfig, defaultConfig);
+ */
+export function parseJsonOrDefault<T>(text: string, defaultValue: T): T {
+  const result = safeJsonParse<T>(text, defaultValue);
+  return result.data!;
+}
+
+/**
+ * Safely parse JSON or throw a friendly error with context
+ *
+ * Use this when JSON parsing is required and failures should halt execution
+ * with a clear error message.
+ *
+ * @param text - The JSON string to parse
+ * @param context - Optional context for the error message (e.g., "loading config")
+ * @returns The parsed data
+ * @throws Error with context-aware message if parsing fails
+ *
+ * @example
+ * try {
+ *   const data = parseJsonOrThrow<UserConfig>(rawJson, 'parsing user config');
+ * } catch (error) {
+ *   showToast(error.message); // "JSON parse failed (parsing user config): Unexpected token..."
+ * }
+ */
+export function parseJsonOrThrow<T>(text: string, context?: string): T {
+  const result = safeJsonParse<T>(text);
+  if (!result.success) {
+    throw new Error(`JSON parse failed${context ? ` (${context})` : ''}: ${result.error}`);
+  }
+  return result.data!;
+}
+
+/**
+ * Type guard to check if a value is a valid JSON-compatible object
+ *
+ * @param value - The value to check
+ * @returns True if the value can be safely serialized to JSON
+ */
+export function isJsonSerializable(value: unknown): boolean {
+  try {
+    JSON.stringify(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Safely stringify a value to JSON
+ *
+ * @param value - The value to stringify
+ * @param fallback - Fallback string if stringification fails
+ * @returns JSON string or fallback
+ */
+export function safeJsonStringify(value: unknown, fallback = '{}'): string {
+  try {
+    return JSON.stringify(value);
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'Unknown stringify error';
+    console.warn('[json-utils] Stringify failed:', errorMessage);
+    return fallback;
+  }
+}
+
+/**
+ * Safely stringify with pretty formatting
+ *
+ * @param value - The value to stringify
+ * @param indent - Number of spaces for indentation (default: 2)
+ * @param fallback - Fallback string if stringification fails
+ * @returns Formatted JSON string or fallback
+ */
+export function safeJsonStringifyPretty(value: unknown, indent = 2, fallback = '{}'): string {
+  try {
+    return JSON.stringify(value, null, indent);
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'Unknown stringify error';
+    console.warn('[json-utils] Pretty stringify failed:', errorMessage);
+    return fallback;
+  }
+}
+
+/**
+ * Deep clone an object using JSON serialization
+ *
+ * Note: This only works for JSON-serializable data (no functions, undefined, symbols, etc.)
+ *
+ * @param value - The value to clone
+ * @returns A deep clone of the value
+ * @throws Error if the value cannot be serialized
+ */
+export function deepClone<T>(value: T): T {
+  return JSON.parse(JSON.stringify(value)) as T;
+}
+
+/**
+ * Safely deep clone an object with fallback
+ *
+ * @param value - The value to clone
+ * @param fallback - Fallback value if cloning fails
+ * @returns A deep clone of the value or the fallback
+ */
+export function safeDeepClone<T>(value: T, fallback: T): T {
+  try {
+    return JSON.parse(JSON.stringify(value)) as T;
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'Unknown clone error';
+    console.warn('[json-utils] Deep clone failed:', errorMessage);
+    return fallback;
+  }
+}
diff --git a/desktop/src/lib/secure-storage.ts b/desktop/src/lib/secure-storage.ts
index 5f5e310..d882ede 100644
--- a/desktop/src/lib/secure-storage.ts
+++ b/desktop/src/lib/secure-storage.ts
@@ -179,3 +179,201 @@ export const secureStorageSync = {
     clearLocalStorageBackup(key);
   },
 };
+
+// === Device Keys Secure Storage ===
+
+/**
+ * Storage keys for Ed25519 device keys
+ */
+const DEVICE_KEYS_PRIVATE_KEY = 'zclaw_device_keys_private';
+const DEVICE_KEYS_PUBLIC_KEY = 'zclaw_device_keys_public';
+const DEVICE_KEYS_CREATED = 'zclaw_device_keys_created';
+const DEVICE_KEYS_LEGACY = 'zclaw_device_keys'; // Old format for migration
+
+/**
+ * Ed25519 SignKeyPair interface (compatible with tweetnacl)
+ */
+export interface Ed25519KeyPair {
+  publicKey: Uint8Array;
+  secretKey: Uint8Array;
+}
+
+/**
+ * Legacy device keys format (stored in localStorage)
+ * Used for migration from the old format.
+ */
+interface LegacyDeviceKeys {
+  deviceId: string;
+  publicKeyBase64: string;
+  secretKeyBase64: string;
+}
+
+/**
+ * Base64 URL-safe encode (without padding)
+ */
+function base64UrlEncode(bytes: Uint8Array): string {
+  let binary = '';
+  for (let i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
+  return btoa(binary).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+}
+
+/**
+ * Base64 URL-safe decode
+ */
+function base64UrlDecode(str: string): Uint8Array {
+  str = str.replace(/-/g, '+').replace(/_/g, '/');
+  while (str.length % 4) str += '=';
+  const binary = atob(str);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i);
+  }
+  return bytes;
+}
+
+/**
+ * Store device keys securely.
+ * The secret key is stored in the OS keyring when available,
+ * falling back to localStorage with a warning.
+ *
+ * @param publicKey - Ed25519 public key (32 bytes)
+ * @param secretKey - Ed25519 secret key (64 bytes)
+ */
+export async function storeDeviceKeys(
+  publicKey: Uint8Array,
+  secretKey: Uint8Array
+): Promise<void> {
+  const publicKeyBase64 = base64UrlEncode(publicKey);
+  const secretKeyBase64 = base64UrlEncode(secretKey);
+  const createdAt = Date.now().toString();
+
+  if (await isSecureStorageAvailable()) {
+    // Store secret key in keyring (most secure)
+    await secureStorage.set(DEVICE_KEYS_PRIVATE_KEY, secretKeyBase64);
+    // Public key and metadata can go to localStorage (non-sensitive)
+    localStorage.setItem(DEVICE_KEYS_PUBLIC_KEY, publicKeyBase64);
+    localStorage.setItem(DEVICE_KEYS_CREATED, createdAt);
+    // Clear legacy format if present
+    try {
+      localStorage.removeItem(DEVICE_KEYS_LEGACY);
+    } catch {
+      // Ignore
+    }
+  } else {
+    // Fallback: store in localStorage (less secure, but better than nothing)
+    console.warn(
+      '[SecureStorage] Keyring not available, using localStorage fallback for device keys. ' +
+        'Consider running in Tauri for secure key storage.'
+    );
+    localStorage.setItem(
+      DEVICE_KEYS_LEGACY,
+      JSON.stringify({
+        publicKeyBase64,
+        secretKeyBase64,
+        createdAt,
+      })
+    );
+  }
+}
+
+/**
+ * Retrieve device keys from secure storage.
+ * Attempts to read from keyring first, then falls back to localStorage.
+ * Also handles migration from the legacy format.
+ *
+ * @returns Key pair or null if not found
+ */
+export async function getDeviceKeys(): Promise<Ed25519KeyPair | null> {
+  // Try keyring storage first (new format)
+  if (await isSecureStorageAvailable()) {
+    const secretKeyBase64 = await secureStorage.get(DEVICE_KEYS_PRIVATE_KEY);
+    const publicKeyBase64 = localStorage.getItem(DEVICE_KEYS_PUBLIC_KEY);
+
+    if (secretKeyBase64 && publicKeyBase64) {
+      try {
+        return {
+          publicKey: base64UrlDecode(publicKeyBase64),
+          secretKey: base64UrlDecode(secretKeyBase64),
+        };
+      } catch (e) {
+        console.warn('[SecureStorage] Failed to decode keys from keyring:', e);
+      }
+    }
+  }
+
+  // Try legacy format (localStorage)
+  const legacyStored = localStorage.getItem(DEVICE_KEYS_LEGACY);
+  if (legacyStored) {
+    try {
+      const parsed: LegacyDeviceKeys = JSON.parse(legacyStored);
+      return {
+        publicKey: base64UrlDecode(parsed.publicKeyBase64),
+        secretKey: base64UrlDecode(parsed.secretKeyBase64),
+      };
+    } catch (e) {
+      console.warn('[SecureStorage] Failed to decode legacy keys:', e);
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Delete device keys from all storage locations.
+ * Used when keys need to be regenerated.
+ */
+export async function deleteDeviceKeys(): Promise<void> {
+  // Delete from keyring
+  if (await isSecureStorageAvailable()) {
+    await secureStorage.delete(DEVICE_KEYS_PRIVATE_KEY);
+  }
+
+  // Delete from localStorage
+  try {
+    localStorage.removeItem(DEVICE_KEYS_PUBLIC_KEY);
+    localStorage.removeItem(DEVICE_KEYS_CREATED);
+    localStorage.removeItem(DEVICE_KEYS_LEGACY);
+  } catch {
+    // Ignore localStorage errors
+  }
+}
+
+/**
+ * Check if device keys exist in any storage.
+ */
+export async function hasDeviceKeys(): Promise<boolean> {
+  const keys = await getDeviceKeys();
+  return keys !== null;
+}
+
+/**
+ * Get the creation timestamp of stored device keys.
+ * Returns null if keys don't exist or timestamp is unavailable.
+ */
+export async function getDeviceKeysCreatedAt(): Promise<number | null> {
+  // Try new format
+  const created = localStorage.getItem(DEVICE_KEYS_CREATED);
+  if (created) {
+    const parsed = parseInt(created, 10);
+    if (!isNaN(parsed)) {
+      return parsed;
+    }
+  }
+
+  // Try legacy format
+  const legacyStored = localStorage.getItem(DEVICE_KEYS_LEGACY);
+  if (legacyStored) {
+    try {
+      const parsed = JSON.parse(legacyStored);
+      if (typeof parsed.createdAt === 'number' || typeof parsed.createdAt === 'string') {
+        return parseInt(String(parsed.createdAt), 10);
+      }
+    } catch {
+      // Ignore
+    }
+  }
+
+  return null;
+}
diff --git a/desktop/src/store/teamStore.ts b/desktop/src/store/teamStore.ts
index 4bea348..2040097 100644
--- a/desktop/src/store/teamStore.ts
+++ b/desktop/src/store/teamStore.ts
@@ -23,6 +23,7 @@ import type {
   ReviewFeedback,
   TaskDeliverable,
 } from '../types/team';
+import { parseJsonOrDefault } from '../lib/json-utils';
 
 // === Store State ===
 
@@ -136,7 +137,7 @@ export const useTeamStore = create<TeamStoreState>((set, get) => ({
     try {
       // For now, load from localStorage until API is available
       const stored = localStorage.getItem('zclaw-teams');
-      const teams: Team[] = stored ? JSON.parse(stored) : [];
+      const teams: Team[] = stored ? parseJsonOrDefault<Team[]>(stored, []) : [];
       set({ teams, isLoading: false });
     } catch (error) {
       set({ error: (error as Error).message, isLoading: false });
diff --git a/docs/SYSTEM_ANALYSIS.md b/docs/SYSTEM_ANALYSIS.md
index 89d71e7..b226084 100644
--- a/docs/SYSTEM_ANALYSIS.md
+++ b/docs/SYSTEM_ANALYSIS.md
@@ -530,4 +530,19 @@ ZCLAW 是基于 **OpenFang** (Rust Agent OS) 的 AI Agent 桌面客户端，核
     * ✅ TypeScript 类型检查通过
     * ✅ 所有组件中文化完成
 
-*下一步: 生产环境测试与性能优化*
+*Phase 9 已完成 ✅ (2026-03-15)* - 安全加固
+  * JSON 安全解析:
+    * ✅ 创建 `lib/json-utils.ts` - safeJsonParse, parseJsonOrDefault, parseJsonOrThrow
+    * ✅ 修复 `HandParamsForm.tsx` - 替换不安全 JSON.parse
+    * ✅ 修复 `teamStore.ts` - 使用 parseJsonOrDefault
+  * Token 安全存储:
+    * ✅ 扩展 `secure-storage.ts` - 添加设备密钥存储函数
+    * ✅ 更新 `gateway-client.ts` - 使用 secure-storage 存储密钥
+  * WSS 配置:
+    * ✅ 添加 `VITE_USE_WSS` 环境变量支持
+    * ✅ 添加 `normalizeGatewayUrl()` URL 规范化函数
+  * 代码质量:
+    * ✅ TypeScript 类型检查通过
+    * ✅ gatewayStore 测试通过 (17/17)
+
+*下一步: Phase 10 类型安全强化*
diff --git a/tests/desktop/gatewayStore.test.ts b/tests/desktop/gatewayStore.test.ts
index c817cff..e7a103b 100644
--- a/tests/desktop/gatewayStore.test.ts
+++ b/tests/desktop/gatewayStore.test.ts
@@ -313,8 +313,8 @@ function resetClientMocks() {
   // OpenFang mock defaults
   mockClient.listHands.mockResolvedValue({
     hands: [
-      { name: 'echo', description: 'Echo handler', status: 'active' },
-      { name: 'notify', description: 'Notification handler', status: 'active' },
+      { name: 'echo', description: 'Echo handler', status: 'idle', requirements_met: true },
+      { name: 'notify', description: 'Notification handler', status: 'idle', requirements_met: true },
     ],
   });
   mockClient.triggerHand.mockImplementation(async (name: string) => ({
@@ -481,8 +481,8 @@ describe('OpenFang actions', () => {
         id: 'echo',
         name: 'echo',
         description: 'Echo handler',
-        status: 'active',
-        requirements_met: undefined,
+        status: 'idle',
+        requirements_met: true,
         category: undefined,
         icon: undefined,
         toolCount: undefined,
@@ -492,8 +492,8 @@ describe('OpenFang actions', () => {
         id: 'notify',
         name: 'notify',
         description: 'Notification handler',
-        status: 'active',
-        requirements_met: undefined,
+        status: 'idle',
+        requirements_met: true,
         category: undefined,
         icon: undefined,
         toolCount: undefined,