From 4a0102adeb8344d796b985ceb7acfdd30f88fb78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E7=AB=A0=E5=BD=AA?= <1353464539@qq.com>
Date: Sat, 22 Aug 2026 17:48:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?#Update=20=E5=A2=9E=E5=8A=A0=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=BF=AB=E9=80=9F=E5=88=87=E6=8D=A2=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=A4=9A=E6=88=BF=E9=97=B4=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/windows.ts    |   14 +-
 pages/cidr.vue            |   21 +-
 pages/index.vue           | 1040 ++++++++++++++++++++++++++++---------
 pages/member.vue          |   58 ++-
 src-tauri/Cargo.toml      |    2 +-
 src-tauri/src/lib.rs      |  432 +++++++++------
 src-tauri/tauri.conf.json |    6 +-
 stores/index.ts           |  315 +++++++++--
 8 files changed, 1420 insertions(+), 468 deletions(-)

diff --git a/composables/windows.ts b/composables/windows.ts
index a4f5501..c41ea38 100644
--- a/composables/windows.ts
+++ b/composables/windows.ts
@@ -8,6 +8,11 @@ import { updateConfigJsonBounce, type ConfigServerUrlType } from "./configJson";
 
 const _listenersMaps: { [key: string]: [UnlistenFn | null] } = {};
 
+export const MAIN_WINDOW_LOGICAL_SIZE = Object.freeze({
+	width: 340,
+	height: 350
+});
+
 const dealCloseListener = async (dialog: WebviewWindow, label: string, beforeCloseFunc?: () => void | null) => {
 	const unlistenFnList: [UnlistenFn | null] = _listenersMaps[label] || [null];
 	let [unListenlogClose] = unlistenFnList;
@@ -44,13 +49,12 @@ export default async (
 			defaultOpts.parent = appWindow;
 			// console.error(logicalPosition);
 			if (defaultOpts.x == 0 && defaultOpts.y == 0) {
-				const logicalAppSize = {
-					width: 340,
-					height: 305
-				}
 				const factor = await appWindow.scaleFactor();
 				const appPosition = await appWindow.outerPosition();
-				const logicalPosition = new PhysicalPosition(appPosition.x + Math.ceil((logicalAppSize.width + 5) * factor), appPosition.y).toLogical(factor);
+				const logicalPosition = new PhysicalPosition(
+					appPosition.x + Math.ceil((MAIN_WINDOW_LOGICAL_SIZE.width + 5) * factor),
+					appPosition.y
+				).toLogical(factor);
 				defaultOpts.x = logicalPosition.x;
 				defaultOpts.y = logicalPosition.y;
 			}
diff --git a/pages/cidr.vue b/pages/cidr.vue
index 52a3f69..f3dddfd 100644
--- a/pages/cidr.vue
+++ b/pages/cidr.vue
@@ -54,9 +54,12 @@
 	import { dataSubscribe } from "@/composables/windows";
 	import { invoke } from "@tauri-apps/api/core";
 	import { reactive, onMounted, onBeforeUnmount } from "vue";
-	import { ATJ, parseCliInfo } from "@/utils";
+	import { ATJ } from "@/utils";
 	import { listen, type UnlistenFn } from "@tauri-apps/api/event";
 	const mainStore = useMainStore();
+	if (!mainStore.activeRoomProfile) {
+		mainStore.initializeRoomProfiles();
+	}
 
 	const data = reactive<{ [key: string]: any }>({
 		route: [],
@@ -67,7 +70,13 @@
 
 	const listenOutput = async () => {
 		data.isRunning = true;
-		const [error, member] = await ATJ(invoke<string>("get_route_by_cli"));
+		const rpcPortal = mainStore.activeRoomProfile?.rpcPortal;
+		if (!rpcPortal) {
+			data.isRunning = false;
+			data.route = [];
+			return;
+		}
+		const [error, member] = await ATJ(invoke<string>("get_route_by_cli", { rpc_portal: rpcPortal }));
 		data.isRunning = false;
 		if(!member) return;
 		if (error) {
@@ -76,10 +85,14 @@
 		}
 		if (member === "_EasytierGameCliFailedToConnect_") {
 			data.route = [];
-			await listenOutput();
 			return;
 		}
-		data.route = JSON.parse(member);
+		try {
+			data.route = JSON.parse(member);
+		} catch (error) {
+			console.error("解析当前房间的子网代理路由失败", error);
+			data.route = [];
+		}
 	};
 
 	const listenStart = async () => {
diff --git a/pages/index.vue b/pages/index.vue
index 8442318..218f6e6 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,4 +1,76 @@
 <template>
+	<div class="mb-[4px] flex items-center gap-[5px] rounded-[5px] border border-[var(--el-border-color)] bg-[var(--el-fill-color-light)] p-[4px]">
+		<ElSelect
+			class="min-w-0 flex-1"
+			:model-value="mainStore.activeRoomId"
+			placeholder="选择房间配置"
+			@change="handleRoomSwitch"
+		>
+			<template #prefix>
+				<span
+					class="h-[7px] w-[7px] rounded-full"
+					:class="activeRoomStatus.className"
+				></span>
+			</template>
+			<ElOption
+				v-for="{ room, status } in roomOptions"
+				:key="room.id"
+				:label="room.name"
+				:value="room.id"
+			>
+				<div class="flex w-full items-center gap-[8px]">
+					<span
+						class="h-[7px] w-[7px] flex-shrink-0 rounded-full"
+						:class="status.className"
+					></span>
+					<span class="truncate">{{ room.name }}</span>
+					<ElTag
+						class="ml-auto"
+						size="small"
+						:type="status.type"
+					>
+						{{ status.text }}
+					</ElTag>
+				</div>
+			</ElOption>
+		</ElSelect>
+		<ElTooltip content="保存当前房间配置">
+			<ElButton
+				:icon="DocumentChecked"
+				@click="handleSaveRoom"
+			></ElButton>
+		</ElTooltip>
+		<ElTooltip content="新增房间配置">
+			<ElButton
+				:icon="Plus"
+				type="primary"
+				@click="handleAddRoom"
+			></ElButton>
+		</ElTooltip>
+		<ElDropdown
+			trigger="click"
+			@command="handleRoomManageCommand"
+		>
+			<ElButton :icon="MoreFilled"></ElButton>
+			<template #dropdown>
+				<ElDropdownMenu>
+					<ElDropdownItem
+						command="rename"
+						:icon="EditPen"
+					>
+						重命名当前房间
+					</ElDropdownItem>
+					<ElDropdownItem
+						command="delete"
+						:icon="Delete"
+						:disabled="mainStore.roomProfiles.length <= 1 || activeRoomRuntime.isStart"
+					>
+						删除当前房间
+					</ElDropdownItem>
+				</ElDropdownMenu>
+			</template>
+		</ElDropdown>
+	</div>
 	<ElForm
 		size="small"
 		label-position="top"
@@ -20,9 +92,9 @@
 					<div class="h-[fit-content]">-</div>
 					<ElTag
 						effect="dark"
-						:type="data.isSuccessGetIp ? 'success' : 'info'"
+						:type="activeRoomStatus.connectionType"
 					>
-						{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
+						{{ activeRoomStatus.connectionText }}
 					</ElTag>
 					<ElButton
 						v-if="!data.coreVersion"
@@ -53,7 +125,7 @@
 						>
 							<ElButton
 								class="ml-auto mr-[3px]"
-								:disabled="data.isStart || listenObj.server_thread_id.value"
+								:disabled="hasRunningRoom || listenObj.server_thread_id.value"
 								@click.stop="handleCoreManagement"
 								:loading="data.update"
 								type="primary"
@@ -251,7 +323,7 @@
 				<ElInput
 					maxlength="100"
 					:readonly="mainStore.config.dhcp"
-					:placeholder="data.isStart && mainStore.config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
+					:placeholder="activeRoomRuntime.isStart && mainStore.config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
 					v-model="mainStore.config.ipv4"
 				>
 					<template #prefix>
@@ -285,11 +357,11 @@
 					trigger="click"
 					size="default"
 					placement="right-end"
-					:type="!data.isStart ? 'primary' : 'danger'"
-					:disabled="data.startLoading || !data.coreVersion || data.update"
-					@click="handleConnection"
+					:type="!activeRoomRuntime.isStart ? 'primary' : 'danger'"
+					:disabled="activeRoomRuntime.startLoading || !data.coreVersion || data.update"
+					@click="handleConnection()"
 				>
-					{{ !data.isStart ? "启动联机" : "停止联机" }}
+					{{ !activeRoomRuntime.isStart ? "启动当前房间" : "停止当前房间" }}
 					<template #dropdown>
 						<ElDropdownMenu>
 							<ElDropdownItem
@@ -308,7 +380,7 @@
 							<ElDropdownItem
 								:icon="Tools"
 								command="toml"
-								:disabled="data.isStart"
+								:disabled="activeRoomRuntime.isStart"
 							>
 								使用外部配置文件
 							</ElDropdownItem>
@@ -784,41 +856,162 @@
 		Folder,
 		CopyDocument,
 		Platform,
-		SwitchFilled
+		SwitchFilled,
+		DocumentChecked,
+		Plus,
+		MoreFilled,
+		EditPen
 	} from "@element-plus/icons-vue";
-	import { reactive, onBeforeUnmount, onMounted, ref, toRaw, computed } from "vue";
+	import { reactive, onBeforeUnmount, onMounted, ref, computed, watch } from "vue";
 	import { useTray, setTrayRunState, setTrayTooltip, checkNewVersion, hasNewVersion } from "~/composables/tray";
 	import { getMatches } from "@tauri-apps/plugin-cli";
-	import { initStartWinIpBroadcast } from "~/composables/netcard";
 	import useMainStore from "@/stores/index";
 	import { ElMessage, ElMessageBox, ElTooltip } from "element-plus";
-	import { getCurrentWindow, PhysicalSize, type Window } from "@tauri-apps/api/window";
-	import { getAllWebviewWindows, WebviewWindow } from "@tauri-apps/api/webviewWindow";
-	import etWindows, { dataSubscribe } from "@/composables/windows";
+	import { getCurrentWindow, PhysicalSize } from "@tauri-apps/api/window";
+	import { getAllWebviewWindows } from "@tauri-apps/api/webviewWindow";
+	import etWindows, { dataSubscribe, MAIN_WINDOW_LOGICAL_SIZE } from "@/composables/windows";
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
-	import { readDir, exists, mkdir, BaseDirectory, readTextFile, readFile, writeFile, remove as removeFile, stat } from "@tauri-apps/plugin-fs";
+	import { readDir, exists, mkdir, BaseDirectory, readFile, writeFile, remove as removeFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson, updateConfigJsonBounce } from "~/composables/configJson";
-	import { writeText, readText } from "@tauri-apps/plugin-clipboard-manager";
-	import { sortedUniq, uniq } from "lodash-es";
+	import { writeText } from "@tauri-apps/plugin-clipboard-manager";
+	import { uniq } from "lodash-es";
 	import { addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName, mixedArray } from "~/utils";
 	import { ElConfirmDanger, ElConfirmPrimary } from "~/utils/element";
 	import { getServerArgs } from "@/composables/server";
 	import { isIPv6 } from "is-ip";
 
+	type RoomRuntime = {
+		childId: number | null;
+		runId: string;
+		log: string;
+		isStart: boolean;
+		isSuccessGetIp: boolean;
+		startLoading: boolean;
+		error: string;
+	};
+
+	type ClientCommandEvent = {
+		instanceId: string;
+		runId: string;
+		eventType: "started" | "output" | "exited" | "error";
+		childId?: number;
+		output?: string;
+		exitCode?: number;
+	};
+
+	type RunningClientInstance = {
+		childId: number;
+		runId: string;
+	};
+
+	type RoomStatusView = {
+		text: string;
+		connectionText: string;
+		type: "success" | "warning" | "danger" | "info";
+		connectionType: "success" | "danger" | "info";
+		className: string;
+	};
+
+	const mainStore = useMainStore();
+	mainStore.initializeRoomProfiles();
+
+	const roomRuntimes = reactive<Record<string, RoomRuntime>>({});
+	const createRoomRuntime = (): RoomRuntime => ({
+		childId: null,
+		runId: "",
+		log: "",
+		isStart: false,
+		isSuccessGetIp: false,
+		startLoading: false,
+		error: ""
+	});
+	const idleRoomRuntime = Object.freeze(createRoomRuntime()) as RoomRuntime;
+	const getRoomRuntime = (roomId: string): RoomRuntime => {
+		if (!roomRuntimes[roomId]) {
+			roomRuntimes[roomId] = createRoomRuntime();
+		}
+		return roomRuntimes[roomId];
+	};
+	mainStore.roomProfiles.forEach(room => getRoomRuntime(room.id));
+	const activeRoomRuntime = computed(() => roomRuntimes[mainStore.activeRoomId] || idleRoomRuntime);
+	const hasRunningRoom = computed(() => Object.values(roomRuntimes).some(runtime => runtime.isStart));
+	const getRoomStatus = (runtime: RoomRuntime): RoomStatusView => {
+		if (runtime.error) {
+			return {
+				text: "异常",
+				connectionText: "启动失败",
+				type: "danger",
+				connectionType: "danger",
+				className: "bg-[var(--el-color-danger)]"
+			};
+		}
+		if (runtime.isSuccessGetIp) {
+			return {
+				text: "已连接",
+				connectionText: "联机成功",
+				type: "success",
+				connectionType: "success",
+				className: "bg-[var(--el-color-success)]"
+			};
+		}
+		if (runtime.startLoading || runtime.isStart) {
+			return {
+				text: runtime.startLoading ? "启动中" : "运行中",
+				connectionText: "联机中",
+				type: "warning",
+				connectionType: "info",
+				className: "bg-[var(--el-color-warning)]"
+			};
+		}
+		return {
+			text: "未运行",
+			connectionText: "未联机",
+			type: "info",
+			connectionType: "info",
+			className: "bg-[var(--el-text-color-placeholder)]"
+		};
+	};
+	const activeRoomStatus = computed(() => getRoomStatus(activeRoomRuntime.value));
+	const roomOptions = computed(() =>
+		mainStore.roomProfiles.map(room => {
+			const runtime = roomRuntimes[room.id] || idleRoomRuntime;
+			return { room, status: getRoomStatus(runtime) };
+		})
+	);
+	let roomProfileSaveTimer: number | null = null;
+	watch(
+		[
+			() => mainStore.config,
+			() => mainStore.cidrEnable,
+			() => mainStore.proxyForwardBySystem,
+			() => mainStore.configStartEnable,
+			() => mainStore.configPath
+		],
+		() => {
+			if (roomProfileSaveTimer) {
+				clearTimeout(roomProfileSaveTimer);
+			}
+			roomProfileSaveTimer = window.setTimeout(() => {
+				mainStore.saveActiveRoomProfile();
+				roomProfileSaveTimer = null;
+			}, 180);
+		},
+		{ deep: true }
+	);
+
 	let is_close = false;
-	const publicPeersLink = import.meta.env.VITE_PUBLIC_PEERS_URL;
 	const tray = await useTray(
 		true,
 		async () => {
 			is_close = true;
-			await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
+			await stopAllRooms();
 			await invoke("stop_command", { child_id: data.winipBcPid || 0 });
 			await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
 			await stopPreventSleep(); //关闭防休眠
 		},
 		async () => {
 			await handleConnection();
-			return data.isStart;
+			return activeRoomRuntime.value.isStart;
 		},
 		async () => {
 			await handleReconnect();
@@ -828,8 +1021,6 @@
 		}
 	);
 
-	const mainStore = useMainStore();
-
 	const protocols = supportProtocols();
 	const data = reactive({
 		//easytierGame有没有新版
@@ -841,17 +1032,11 @@
 		nodesListVisible: false,
 		serverVisible: false,
 		winipBcPid: 0, //WinIPBroadcast进程id
-		winipBcStart: false,
 		memberVisible: false,
-		log: "",
 		serverLog: "", //服务端日志
 		update: false,
 		releaseList: [[]],
 		coreVersion: "-",
-		isSuccessGetIp: false,
-		startLoading: false,
-		isStart: false,
-		connectionSuccess: false,
 		configJsonSeverUrl: [] // 本地保存一次，用于回填config.json
 	});
 
@@ -880,6 +1065,80 @@
 		data: ""
 	});
 
+	const requestRoomName = async (title: string, initialValue = "", excludeRoomId = "") => {
+		const [error, result] = await ATJ(
+			ElMessageBox.prompt("请输入便于识别的房间配置名称", title, {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				inputValue: initialValue,
+				inputPlaceholder: "例如：朋友联机房",
+				inputValidator: (value: string) => {
+					const name = value?.trim();
+					if (!name) return "房间名称不能为空";
+					if (name.length > 32) return "房间名称不能超过 32 个字符";
+					if (mainStore.roomProfiles.some(room => room.id !== excludeRoomId && room.name === name)) {
+						return "房间名称已存在";
+					}
+					return true;
+				}
+			})
+		);
+		return error ? "" : result?.value?.trim() || "";
+	};
+
+	const handleRoomSwitch = async (roomId: string) => {
+		if (!roomId || roomId === mainStore.activeRoomId) return;
+		await closeRoomDetailWindows();
+		mainStore.switchRoomProfile(roomId);
+		await updateConfigJsonBounce(data.configJsonSeverUrl);
+	};
+
+	const handleSaveRoom = async () => {
+		mainStore.saveActiveRoomProfile();
+		if (mainStore.createConfigInEasytier) {
+			await updateConfigJson(data.configJsonSeverUrl);
+		}
+		ElMessage.success(`房间“${mainStore.activeRoomProfile?.name || ""}”配置已保存`);
+	};
+
+	const handleAddRoom = async () => {
+		const name = await requestRoomName("新增房间配置");
+		if (!name) return;
+		const room = mainStore.addRoomProfile(name);
+		getRoomRuntime(room.id);
+		await closeRoomDetailWindows();
+		ElMessage.success(`已创建房间“${room.name}”`);
+	};
+
+	const handleRoomManageCommand = async (command: string | number | object) => {
+		const room = mainStore.activeRoomProfile;
+		if (!room) return;
+		if (command === "rename") {
+			const name = await requestRoomName("重命名房间配置", room.name, room.id);
+			if (name && mainStore.renameRoomProfile(room.id, name)) {
+				ElMessage.success("房间配置已重命名");
+			}
+		}
+		if (command === "delete") {
+			const runtime = getRoomRuntime(room.id);
+			if (runtime.isStart) {
+				ElMessage.warning("请先停止当前房间");
+				return;
+			}
+			const [error] = await ElConfirmDanger(`确定{action}房间“${room.name}”及其配置吗？`, "提示", {
+				confirmButtonText: "删除",
+				cancelButtonText: "取消",
+				action: "删除"
+			});
+			if (error) return;
+			if (mainStore.deleteRoomProfile(room.id)) {
+				delete roomRuntimes[room.id];
+				await closeRoomDetailWindows();
+				ElMessage.success("房间配置已删除");
+			}
+		}
+	};
+
 	const closePrevent = async () => {
 		const appWindow = getCurrentWindow();
 		if (appWindow.label == "main") {
@@ -926,7 +1185,7 @@
 					ElMessage.error("没有IPV4地址，无法复制");
 					return;
 				}
-				if (data.isStart || !mainStore.config.dhcp) {
+				if (activeRoomRuntime.value.isStart || !mainStore.config.dhcp) {
 					await copyText(v4);
 				} else {
 					await copyText(v4, "复制成功,联机后IP可能会变化");
@@ -937,7 +1196,7 @@
 				ElMessage.error("没有IPV4地址，无法复制");
 				return;
 			}
-			if (data.isStart || !mainStore.config.dhcp) {
+			if (activeRoomRuntime.value.isStart || !mainStore.config.dhcp) {
 				await copyText(v4);
 			} else {
 				await copyText(v4, "复制成功,联机后IP可能会变化");
@@ -999,91 +1258,252 @@
 		mainStore.basePeers = uniq([...mainStore.config.serverUrl, ...mainStore.basePeers]);
 	};
 
-	let getMemeberTimer: number | null = null;
+	const memberTimers: Record<string, number> = {};
+	const memberTimerGenerations: Record<string, number> = {};
+	const reconnectTimers: Record<string, number> = {};
+	const stoppingRuns = new Set<string>();
+	const cancelledRuns = new Set<string>();
+	const stopMemberTimer = (roomId: string) => {
+		memberTimerGenerations[roomId] = (memberTimerGenerations[roomId] || 0) + 1;
+		if (memberTimers[roomId]) {
+			clearTimeout(memberTimers[roomId]);
+			delete memberTimers[roomId];
+		}
+	};
+	const clearReconnectTimer = (roomId: string) => {
+		if (reconnectTimers[roomId]) {
+			clearTimeout(reconnectTimers[roomId]);
+			delete reconnectTimers[roomId];
+		}
+	};
+	let requestedTrayStatusKey: string | null = null;
+	let appliedTrayRunState: boolean | null = null;
+	let appliedTrayTooltip: string | null = null;
+	let trayUpdateQueue = Promise.resolve();
+	const updateTrayRoomStatus = async () => {
+		const runningRooms = mainStore.roomProfiles.filter(room => getRoomRuntime(room.id).isStart);
+		const isRunning = runningRooms.length > 0;
+		const tooltip = isRunning
+			? `${runningRooms.length} 个房间运行中\n${runningRooms
+					.slice(0, 4)
+					.map(room => {
+						const ipv4 = room.config.ipv4?.trim();
+						return `${room.name}: ${ipv4 || "连接中"}`;
+					})
+					.join("\n")}`
+			: null;
+		const statusKey = `${isRunning}:${tooltip || ""}`;
+		if (statusKey === requestedTrayStatusKey) {
+			await trayUpdateQueue;
+			return;
+		}
+		requestedTrayStatusKey = statusKey;
+		// 托盘 API 串行执行，避免多个房间的异步事件互相覆盖；图标与提示文本分别去重，防止同一图标被重复加载。
+		trayUpdateQueue = trayUpdateQueue
+			.then(async () => {
+				if (appliedTrayRunState !== isRunning) {
+					await setTrayRunState(tray, isRunning);
+					appliedTrayRunState = isRunning;
+				}
+				if (appliedTrayTooltip !== tooltip) {
+					await setTrayTooltip(tray, tooltip);
+					appliedTrayTooltip = tooltip;
+				}
+			})
+			.catch(error => {
+				if (requestedTrayStatusKey === statusKey) {
+					requestedTrayStatusKey = null;
+				}
+				console.error("更新托盘状态失败", error);
+			});
+		await trayUpdateQueue;
+	};
+	const resetRoomIp = async (roomId: string) => {
+		const room = mainStore.roomProfiles.find(item => item.id === roomId);
+		const runtime = getRoomRuntime(roomId);
+		let changed = runtime.isSuccessGetIp;
+		runtime.isSuccessGetIp = false;
+		if (room?.config.dhcp) {
+			changed ||= Boolean(room.config.ipv4);
+			room.config.ipv4 = "";
+			if (mainStore.activeRoomId === roomId) {
+				changed ||= Boolean(mainStore.config.ipv4);
+				mainStore.config.ipv4 = "";
+			}
+		}
+		return changed;
+	};
+	const startMemberTimer = (roomId: string) => {
+		stopMemberTimer(roomId);
+		const generation = memberTimerGenerations[roomId];
+		const scheduleNextPoll = (delay: number) => {
+			if (memberTimerGenerations[roomId] !== generation) return;
+			memberTimers[roomId] = window.setTimeout(() => {
+				delete memberTimers[roomId];
+				void pollMember();
+			}, delay);
+		};
+		const pollMember = async () => {
+			const room = mainStore.roomProfiles.find(item => item.id === roomId);
+			const runtime = getRoomRuntime(roomId);
+			if (!room || !runtime.isStart) {
+				stopMemberTimer(roomId);
+				if (await resetRoomIp(roomId)) {
+					await updateTrayRoomStatus();
+				}
+				return;
+			}
+			const runId = runtime.runId;
+			const [error, member] = await ATJ(invoke<string>("get_members_by_cli", { rpc_portal: room.rpcPortal }));
+			if (memberTimerGenerations[roomId] !== generation || runtime.runId !== runId || !runtime.isStart) return;
+			if (!error && member !== "_EasytierGameCliFailedToConnect_") {
+				try {
+					const memberJson = JSON.parse(member) as Member[];
+					const localData = memberJson.find(memberItem => memberItem?.cost == "Local");
+					const ipv4 = localData?.ipv4;
+					if (localData && ipv4) {
+						const changed = room.config.ipv4 !== ipv4 || !runtime.isSuccessGetIp;
+						room.config.ipv4 = ipv4;
+						if (mainStore.activeRoomId === roomId) {
+							mainStore.config.ipv4 = ipv4;
+						}
+						runtime.isSuccessGetIp = true;
+						if (changed) {
+							await updateTrayRoomStatus();
+						}
+					} else if (await resetRoomIp(roomId)) {
+						await updateTrayRoomStatus();
+					}
+				} catch (err) {
+					console.error(`解析房间“${room.name}”成员信息失败`, err);
+				}
+			}
+			scheduleNextPoll(runtime.isSuccessGetIp ? 3000 : 1000);
+		};
+		scheduleNextPoll(0);
+	};
+	const appendLimitedLog = (currentLog: string, output: string, maxLines = 1000) => {
+		const lines = currentLog ? currentLog.split("\n") : [];
+		if (lines[lines.length - 1] === "") {
+			lines.pop();
+		}
+		lines.push(output);
+		return `${lines.slice(-maxLines).join("\n")}\n`;
+	};
+	const appendRoomLog = (roomId: string, output: string) => {
+		const runtime = getRoomRuntime(roomId);
+		runtime.log = appendLimitedLog(runtime.log, output);
+	};
 	const listenObj: { [key: string]: any } = {
-		unListenOutPut: null,
-		unListenThreadId: null,
+		unListenClientCommand: null,
 		unListenServerOutPut: null,
 		unListenServerThreadId: null,
 		unListenStartStopServer: null,
-		thread_id: null,
 		server_thread_id: ref(null),
-		async listenOutput() {
-			// const appWindow = getCurrentWindow();
-			getMemeberTimer && clearInterval(getMemeberTimer);
-			getMemeberTimer = setInterval(async () => {
-				const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
-				if(!data.isStart) {
-					getMemeberTimer && clearInterval(getMemeberTimer);
-					getMemeberTimer = null;
-					ipReset();
+		async listenClientCommand() {
+			const unListen = await listen<ClientCommandEvent>("client-command-event", async event => {
+				const payload = event.payload;
+				const room = mainStore.roomProfiles.find(item => item.id === payload.instanceId);
+				if (!room) return;
+				const runtime = getRoomRuntime(room.id);
+				if (payload.eventType !== "started" && cancelledRuns.delete(payload.runId)) {
+					stoppingRuns.delete(payload.runId);
 					return;
 				}
-				if (!error && member !== "_EasytierGameCliFailedToConnect_") {
-					const memberJson = JSON.parse(member) as Member[];
-					const localData = memberJson.find(member => member?.cost == "Local");
-					const ipv4 = localData?.ipv4;
-					if (localData && ipv4) {
-						mainStore.config.ipv4 = ipv4;
-						await setTrayRunState(tray, true);
-						data.isSuccessGetIp = true;
-						await setTrayTooltip(tray, `IP: ${mainStore.config.ipv4}`);
+				if (payload.eventType === "started") {
+					if (cancelledRuns.delete(payload.runId) || payload.runId !== runtime.runId) {
+						if (payload.childId) {
+							stoppingRuns.add(payload.runId);
+							const [stopError, stopped] = await ATJ(invoke<boolean>("stop_command", { child_id: payload.childId }));
+							if (stopError || !stopped) {
+								console.error(`停止房间“${room.name}”的过期启动实例失败`, stopError);
+								if (payload.runId === runtime.runId) {
+									stoppingRuns.delete(payload.runId);
+									runtime.childId = payload.childId;
+									runtime.isStart = true;
+									runtime.startLoading = false;
+									runtime.error = "取消启动 EasyTier 内核失败";
+									await updateTrayRoomStatus();
+								}
+							}
+						}
 						return;
 					}
-					ipReset();
+					runtime.childId = payload.childId || null;
+					runtime.isStart = true;
+					runtime.startLoading = false;
+					runtime.error = "";
+					if (payload.output) {
+						appendRoomLog(room.id, payload.output);
+					}
+					startMemberTimer(room.id);
 				}
-			}, 1000);
-			const unListen = await listen<string>("command-output", async event => {
-				data.isStart = true;
-				if (event.payload) {
-					data.startLoading = false;
-					let devName = /tun device ready. dev: (.*)/g.exec(event.payload as string)?.[1];
+				if (payload.runId !== runtime.runId) {
+					stoppingRuns.delete(payload.runId);
+					cancelledRuns.delete(payload.runId);
+					return;
+				}
+				let shouldUpdateTray = payload.eventType === "started";
+				if (payload.eventType === "output" && payload.output) {
+					runtime.startLoading = false;
+					appendRoomLog(room.id, payload.output);
+					const devName = /tun device ready. dev: (.*)/g.exec(payload.output)?.[1];
 					if (
 						devName &&
-						mainStore.config.enableNetCardMetric &&
-						mainStore.config.netCardMetricValue &&
-						mainStore.config.netCardMetricValue >= 1 &&
-						mainStore.config.netCardMetricValue <= 9999
+						room.config.enableNetCardMetric &&
+						room.config.netCardMetricValue >= 1 &&
+						room.config.netCardMetricValue <= 9999
 					) {
 						try {
-							const output = await Command.create(
+							await Command.create(
 								"netsh",
-								["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
-								{
-									encoding: "gb2312"
-								}
+								["interface", "ipv4", "set", "interface", devName, "metric=", `${room.config.netCardMetricValue}`],
+								{ encoding: "gb2312" }
 							).execute();
 						} catch (err) {
-							console.error(err);
-							ElMessage.error("跃点设置失败");
+							console.error(`设置房间“${room.name}”网卡跃点失败`, err);
+							ElMessage.error(`房间“${room.name}”跃点设置失败`);
 						}
 					}
 				}
-				const logArr = data.log.split("\n");
-				const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
-				data.log = logArr.slice(start).join("\n");
-				data.log += (event.payload as string) + "\n";
-			});
-			this.unListenOutPut = () => {
-				getMemeberTimer && clearInterval(getMemeberTimer);
-				unListen();
-			};
-		},
-		async listenThreadId() {
-			const unListen = await listen("thread-id", event => {
-				if (event.payload) {
-					this.thread_id = event.payload;
+				if (payload.eventType === "error") {
+					shouldUpdateTray = true;
+					runtime.error = payload.output || "EasyTier 内核启动失败";
+					runtime.isStart = false;
+					runtime.startLoading = false;
+					runtime.childId = null;
+					stopMemberTimer(room.id);
+					await resetRoomIp(room.id);
+					appendRoomLog(room.id, runtime.error);
+					ElMessage.error(`房间“${room.name}”启动失败`);
+				}
+				if (payload.eventType === "exited") {
+					shouldUpdateTray = true;
+					const expectedStop = stoppingRuns.delete(payload.runId);
+					runtime.isStart = false;
+					runtime.startLoading = false;
+					runtime.childId = null;
+					stopMemberTimer(room.id);
+					await resetRoomIp(room.id);
+					if (!expectedStop) {
+						runtime.error =
+							payload.exitCode === undefined || payload.exitCode === null
+								? "EasyTier 内核异常退出"
+								: `EasyTier 内核异常退出，代码 ${payload.exitCode}`;
+						appendRoomLog(room.id, runtime.error);
+						ElMessage.error(`房间“${room.name}”异常退出`);
+					}
+				}
+				if (shouldUpdateTray) {
+					await updateTrayRoomStatus();
 				}
 			});
-			this.unListenThreadId = unListen;
+			this.unListenClientCommand = unListen;
 		},
 		async listenServerOutPut() {
 			const unListen = await listen<string>("server-command-output", async event => {
 				// console.log("server-command-output", event);
-				const logArr = data.serverLog.split("\n");
-				const start = logArr.length > 1000 ? logArr.length - 1000 : 0;
-				data.serverLog = logArr.slice(start).join("\n");
-				data.serverLog += (event.payload || "") + "\n";
+				data.serverLog = appendLimitedLog(data.serverLog, event.payload || "");
 			});
 			this.unListenServerOutPut = unListen;
 		},
@@ -1115,10 +1535,54 @@
 		}
 	};
 
-	const unListenAll = async () => {
-		listenObj.unListenOutPut && (await listenObj.unListenOutPut());
-		await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
-		listenObj.thread_id = null;
+	const stopRoomProcess = async (roomId: string) => {
+		const runtime = getRoomRuntime(roomId);
+		const runId = runtime.runId;
+		if (runtime.startLoading && !runtime.childId && runId) {
+			cancelledRuns.add(runId);
+		}
+		if (runtime.childId) {
+			const childId = runtime.childId;
+			stoppingRuns.add(runId);
+			try {
+				const stopped = await invoke<boolean>("stop_command", { child_id: childId });
+				if (!stopped && runtime.childId === childId) {
+					stoppingRuns.delete(runId);
+					runtime.error = "停止 EasyTier 内核失败";
+					ElMessage.error(`房间“${mainStore.roomProfiles.find(room => room.id === roomId)?.name || ""}”停止失败`);
+					return false;
+				}
+			} catch (err) {
+				if (runtime.runId !== runId || runtime.childId !== childId) return true;
+				stoppingRuns.delete(runId);
+				runtime.error = "停止 EasyTier 内核失败";
+				console.error(runtime.error, err);
+				return false;
+			}
+		}
+		if (runtime.runId !== runId) return true;
+		stopMemberTimer(roomId);
+		runtime.childId = null;
+		runtime.isStart = false;
+		runtime.startLoading = false;
+		runtime.error = "";
+		await resetRoomIp(roomId);
+		return true;
+	};
+
+	const stopRoom = async (roomId: string) => {
+		const stopped = await stopRoomProcess(roomId);
+		await updateTrayRoomStatus();
+		return stopped;
+	};
+
+	const stopAllRooms = async () => {
+		const runningRooms = mainStore.roomProfiles.filter(room => {
+			const runtime = getRoomRuntime(room.id);
+			return runtime.isStart || runtime.startLoading || Boolean(runtime.childId);
+		});
+		await Promise.allSettled(runningRooms.map(room => stopRoomProcess(room.id)));
+		await updateTrayRoomStatus();
 	};
 
 	const getCoreVersion = async (isClick = false) => {
@@ -1202,6 +1666,9 @@
 	let size = 0;
 	const handleInstallCore = async () => {
 		try {
+			if (hasRunningRoom.value || listenObj.server_thread_id.value) {
+				return ElMessage.warning("请先停止所有房间和自建服务器");
+			}
 			if (!coreManagementData.data) {
 				return ElMessage.error("请选择一个内核");
 			}
@@ -1298,17 +1765,22 @@
 	// };
 
 	const initConnectAfterStart = async () => {
-		if (mainStore.config.connectAfterStart && data.coreVersion) {
-			await reset();
-			await handleConnection();
+		if (!data.coreVersion) return;
+		for (const room of mainStore.roomProfiles) {
+			if (room.config.connectAfterStart && !getRoomRuntime(room.id).isStart) {
+				await handleConnection(room.id);
+			}
 		}
 	};
 
 	// 多选serverUrl兼容
 	const compatibleInitServerUrl = async () => {
-		if (typeof mainStore.config.serverUrl == "string") {
-			mainStore.config.serverUrl = [mainStore.config.serverUrl || ""];
+		for (const room of mainStore.roomProfiles) {
+			if (typeof room.config.serverUrl == "string") {
+				room.config.serverUrl = [room.config.serverUrl || ""];
+			}
 		}
+		mainStore.applyRoomProfile(mainStore.activeRoomId);
 	};
 
 	const initGuiJson = async () => {
@@ -1353,6 +1825,7 @@
 							serverUrl: saveServerUrl
 						}
 					});
+					mainStore.saveActiveRoomProfile();
 					if (mainStore.createConfigInEasytier) {
 						await updateConfigJson(data.configJsonSeverUrl);
 					}
@@ -1382,6 +1855,26 @@
 		}
 	};
 
+	const recoverRunningRooms = async () => {
+		try {
+			const runningInstances = await invoke<Record<string, RunningClientInstance>>("get_running_instances");
+			for (const room of mainStore.roomProfiles) {
+				const instance = runningInstances[room.id];
+				if (!instance?.childId) continue;
+				const runtime = getRoomRuntime(room.id);
+				runtime.childId = instance.childId;
+				runtime.runId = instance.runId;
+				runtime.isStart = true;
+				runtime.startLoading = false;
+				runtime.error = "";
+				startMemberTimer(room.id);
+			}
+			await updateTrayRoomStatus();
+		} catch (error) {
+			console.error("恢复多房间运行状态失败", error);
+		}
+	};
+
 	const initPreventSleep = async () => {
 		if (mainStore.config.enablePreventSleep) {
 			preventSleep();
@@ -1396,16 +1889,20 @@
 			await appWindow.setFocus();
 		}
 		const appWindow = getCurrentWindow();
-		const logicalAppSize = {
-			width: 340,
-			height: 305
-		};
 		const scaleFactor = await appWindow.scaleFactor();
-		const size = new PhysicalSize(Math.ceil(logicalAppSize.width * scaleFactor), Math.ceil(logicalAppSize.height * scaleFactor));
+		const size = new PhysicalSize(
+			Math.ceil(MAIN_WINDOW_LOGICAL_SIZE.width * scaleFactor),
+			Math.ceil(MAIN_WINDOW_LOGICAL_SIZE.height * scaleFactor)
+		);
 		appWindow.setSize(size);
 		appWindow.onScaleChanged(({ payload: { scaleFactor } }) => {
 			console.log("scaleFactor", scaleFactor);
-			appWindow.setSize(new PhysicalSize(Math.ceil(logicalAppSize.width * scaleFactor), Math.ceil(logicalAppSize.height * scaleFactor)));
+			appWindow.setSize(
+				new PhysicalSize(
+					Math.ceil(MAIN_WINDOW_LOGICAL_SIZE.width * scaleFactor),
+					Math.ceil(MAIN_WINDOW_LOGICAL_SIZE.height * scaleFactor)
+				)
+			);
 		});
 	};
 
@@ -1416,11 +1913,13 @@
 	onMounted(async () => {
 		await compatibleInitServerUrl();
 		await initGuiJson();
+		mainStore.saveActiveRoomProfile();
 		await compatibleInitAutoStart();
 		// await initAutoStart();
 		// await initStartWinIpBroadcast();  // 对于三层tun而言，winipbroadcast没有作用，先禁用
 		await getCoreVersion();
-		await listenObj.listenThreadId();
+		await listenObj.listenClientCommand();
+		await recoverRunningRooms();
 		await listenObj.listenServerThreadId();
 		await listenObj.listenStartStopServer();
 		await initConfigDir();
@@ -1447,9 +1946,13 @@
 	});
 
 	onBeforeUnmount(() => {
-		unListenAll();
+		mainStore.saveActiveRoomProfile();
+		roomProfileSaveTimer && clearTimeout(roomProfileSaveTimer);
+		listenObj.unListenClientCommand && listenObj.unListenClientCommand();
 		listenObj.unListenReleaseList && listenObj.unListenReleaseList();
 		listenObj.unListenStartStopServer && listenObj.unListenStartStopServer();
+		Object.keys(memberTimerGenerations).forEach(stopMemberTimer);
+		Object.keys(reconnectTimers).forEach(clearReconnectTimer);
 		logsTimer && clearInterval(logsTimer);
 		serverLogsTimer && clearInterval(serverLogsTimer);
 		cidrTimer && clearInterval(cidrTimer);
@@ -1457,81 +1960,90 @@
 		// unListenStorage && unListenStorage();
 	});
 
-	const getArgs = async () => {
-		// console.error(config.proxyNetworks);
-		const args = [];
-		if (mainStore.configStartEnable) {
-			if (mainStore.configPath) {
-				const isExists = await exists(mainStore.configPath, { baseDir: BaseDirectory.Resource });
+	const getArgs = async (roomId: string) => {
+		const room = mainStore.roomProfiles.find(item => item.id === roomId);
+		if (!room) return [];
+		const config = room.config;
+		const args: string[] = [];
+		if (room.configStartEnable) {
+			if (room.configPath) {
+				const isExists = await exists(room.configPath, { baseDir: BaseDirectory.Resource });
 				if (isExists) {
 					const resourceDir = await getResourceDir();
-					const configPath = await join(resourceDir, mainStore.configPath);
+					const configPath = await join(resourceDir, room.configPath);
 					args.push("-c", configPath);
-					return args;
 				} else {
-					const appWindow = getCurrentWindow();
-					const isVisible = await appWindow.isVisible();
-					if (!isVisible) {
-						await appWindow.show();
-						await appWindow.setFocus();
+					room.configPath = "";
+					if (mainStore.activeRoomId === roomId) {
+						mainStore.configPath = "";
+						const appWindow = getCurrentWindow();
+						const isVisible = await appWindow.isVisible();
+						if (!isVisible) {
+							await appWindow.show();
+							await appWindow.setFocus();
+						}
+						await handleStartCommand("toml");
 					}
-					mainStore.configPath = "";
-					ElMessage.error(`配置文件不存在 请重新选择`);
-					await handleStartCommand("toml"); // 配置文件不存在，显示配置文件弹窗
+					ElMessage.error(`房间“${room.name}”的配置文件不存在，请重新选择`);
 					return [];
 				}
 			} else {
-				ElMessage.warning(`配置文件不存在 请选择`);
-				await handleStartCommand("toml"); // 配置文件不存在，显示配置文件弹窗
+				ElMessage.warning(`房间“${room.name}”尚未选择配置文件`);
+				if (mainStore.activeRoomId === roomId) {
+					await handleStartCommand("toml");
+				}
 				return [];
 			}
 		}
-		if (mainStore.config.serverUrl?.length <= 0) {
-			ElMessage.warning(`请至少选择一个服务器`);
+		if (room.configStartEnable) {
+			args.push("--rpc-portal", `${room.rpcPortal}`, "--instance-name", room.id);
+			return args;
+		}
+
+		if (config.serverUrl?.length <= 0) {
+			ElMessage.warning(`房间“${room.name}”请至少选择一个服务器`);
 			return [];
 		}
-		// 		lodash-es 如何将两个数组的值混合  比如["tcp","udp"] [1,2]
-		// 混合后["tcp1","tcp2","udp1","udp2"]
-		if (mainStore.config.protocol?.length <= 0) {
-			ElMessage.warning(`请至少选择一个协议`);
+		if (config.protocol?.length <= 0) {
+			ElMessage.warning(`房间“${room.name}”请至少选择一个协议`);
 			return [];
 		}
-		if (mainStore.config.dhcp) {
+		if (config.dhcp) {
 			args.push("-d");
 		}
-		if (mainStore.config.hostname) {
-			args.push("--hostname", mainStore.config.hostname);
+		if (config.hostname) {
+			args.push("--hostname", config.hostname);
 		}
-		if (mainStore.config.networkName) {
-			args.push("--network-name", mainStore.config.networkName);
+		if (config.networkName) {
+			args.push("--network-name", config.networkName);
 		}
-		if (mainStore.config.networkPassword) {
-			args.push("--network-secret", mainStore.config.networkPassword);
+		if (config.networkPassword) {
+			args.push("--network-secret", config.networkPassword);
 		}
-		if (mainStore.config.ipv4) {
-			args.push("--ipv4", mainStore.config.ipv4.trim());
+		if (config.ipv4) {
+			args.push("--ipv4", config.ipv4.trim());
 		}
-		if (mainStore.config.serverUrl) {
-			const formatUrlArr = mainStore.config.serverUrl.map((url: string) => url.replace(/\\/g, "/"));
-			args.push("--peers", ...mixedArray(mainStore.config.protocol, formatUrlArr, "://"));
+		if (config.serverUrl) {
+			const formatUrlArr = config.serverUrl.map((url: string) => url.replace(/\\/g, "/"));
+			args.push("--peers", ...mixedArray(config.protocol, formatUrlArr, "://"));
 		}
-		if (mainStore.config.enableCustomProtocol) {
-			const includes = mainStore.config.protocol.includes(mainStore.config.customProtocol);
+		if (config.enableCustomProtocol) {
+			const includes = config.protocol.includes(config.customProtocol);
 			if (includes) {
-				args.push("--default-protocol", mainStore.config.customProtocol);
+				args.push("--default-protocol", config.customProtocol);
 			}
 		}
-		if (mainStore.config.disbleP2p) {
+		if (config.disbleP2p) {
 			args.push("--disable-p2p");
 		}
-		if (mainStore.config.disableIpv6) {
+		if (config.disableIpv6) {
 			args.push("--disable-ipv6", "true");
 		}
-		if (mainStore.config.disbleListenner) {
+		if (config.disbleListenner) {
 			args.push("--no-listener");
 		}
-		if (!mainStore.config.disbleListenner && mainStore.config.enableCustomListener && mainStore.config.customListenerData) {
-			const customListener = mainStore.config.customListenerData
+		if (!config.disbleListenner && config.enableCustomListener && config.customListenerData) {
+			const customListener = config.customListenerData
 				.trim()
 				.split("\n")
 				.map(el => el.trim())
@@ -1541,11 +2053,11 @@
 			}
 		}
 
-		if (!mainStore.config.disbleListenner && !mainStore.config.enableCustomListener && mainStore.config.port) {
-			args.push("-l", mainStore.config.port);
+		if (!config.disbleListenner && !config.enableCustomListener && config.port) {
+			args.push("-l", config.port);
 		}
-		if (mainStore.cidrEnable && mainStore.config.proxyNetworks) {
-			let formatProxyNetworks = mainStore.config.proxyNetworks.trim().split("\n");
+		if (room.cidrEnable && config.proxyNetworks) {
+			const formatProxyNetworks = config.proxyNetworks.trim().split("\n");
 			const newformatProxyNetworks = formatProxyNetworks
 				.map(el => el.trim())
 				.filter(cidr => {
@@ -1556,79 +2068,82 @@
 					args.push("-n", cidr);
 				}
 			}
-			mainStore.config.proxyNetworks = formatProxyNetworks.join("\n");
+			config.proxyNetworks = formatProxyNetworks.join("\n");
+			if (mainStore.activeRoomId === roomId) {
+				mainStore.config.proxyNetworks = config.proxyNetworks;
+			}
 		}
-		if (mainStore.config.disableEncryption) {
+		if (config.disableEncryption) {
 			args.push("--disable-encryption", "true");
 		}
-		if (mainStore.config.multiThread) {
+		if (config.multiThread) {
 			args.push("--multi-thread", "true");
 		}
-		if (mainStore.config.enablExitNode) {
+		if (config.enablExitNode) {
 			args.push("--enable-exit-node", "true");
 		}
-		if (mainStore.config.noTun) {
+		if (config.noTun) {
 			args.push("--no-tun", "true");
 		}
-		if (mainStore.config.latencyfirst) {
+		if (config.latencyfirst) {
 			args.push("--latency-first", "true");
 		}
-		if (mainStore.config.useSmoltcp) {
+		if (config.useSmoltcp) {
 			args.push("--use-smoltcp", "true");
 		}
-		if (mainStore.config.disableUdpHolePunching) {
+		if (config.disableUdpHolePunching) {
 			args.push("--disable-udp-hole-punching", "true");
 		}
-		if (mainStore.config.relayAllPeerrpc) {
+		if (config.relayAllPeerrpc) {
 			args.push("--relay-all-peer-rpc", "true");
 		}
-		if (mainStore.config.saveErrorLog) {
-			args.push("--file-log-level", mainStore.config.logLevel, "--file-log-dir", import.meta.env.VITE_LOG_PATH);
+		if (config.saveErrorLog) {
+			args.push("--file-log-level", config.logLevel, "--file-log-dir", `${import.meta.env.VITE_LOG_PATH}${room.id}`);
 		}
-		if (mainStore.config.devName && mainStore.config.devNameValue) {
-			args.push("--dev-name", mainStore.config.devNameValue);
+		if (config.devName && config.devNameValue) {
+			args.push("--dev-name", config.devNameValue);
 		}
-		if (mainStore.config.compression && mainStore.config.compression != "none") {
-			args.push("--compression", mainStore.config.compression);
+		if (config.compression && config.compression != "none") {
+			args.push("--compression", config.compression);
 		}
-		if (mainStore.config.enableKcpProxy) {
+		if (config.enableKcpProxy) {
 			args.push("--enable-kcp-proxy", "true");
 		}
-		if (mainStore.config.disableKcpInput) {
+		if (config.disableKcpInput) {
 			args.push("--disable-kcp-input", "true");
 		}
-		if (mainStore.config.enableQuicProxy) {
+		if (config.enableQuicProxy) {
 			args.push("--enable-quic-proxy", "true");
 		}
-		if (mainStore.config.disableQuicInput) {
+		if (config.disableQuicInput) {
 			args.push("--disable-quic-input", "true");
 		}
-		if (mainStore.config.enableUdpBroadcastRelay) {
+		if (config.enableUdpBroadcastRelay) {
 			args.push("--enable-udp-broadcast-relay", "true");
 		}
-		if (!mainStore.config.enableUpnp) {
+		if (!config.enableUpnp) {
 			args.push("--disable-upnp", "true");
 		}
-		if (mainStore.config.ipv6PublicAddrProvider) {
+		if (config.ipv6PublicAddrProvider) {
 			args.push("--ipv6-public-addr-provider", "true");
 		}
-		if (mainStore.config.ipv6PublicAddrAuto) {
+		if (config.ipv6PublicAddrAuto) {
 			args.push("--ipv6-public-addr-auto", "true");
 		}
-		if (mainStore.config.disableRelayData) {
+		if (config.disableRelayData) {
 			args.push("--disable-relay-data", "true");
 		}
-		if (mainStore.config.bindDeviceEnable) {
+		if (config.bindDeviceEnable) {
 			args.push("--bind-device", "true");
 		}
-		if (mainStore.proxyForwardBySystem) {
+		if (room.proxyForwardBySystem) {
 			args.push("--proxy-forward-by-system", "true");
 		}
-		if (mainStore.config.acceptDNS) {
+		if (config.acceptDNS) {
 			args.push("--accept-dns", "true");
 		}
-		if (mainStore.config.enablePortForward) {
-			let formatPortForward = mainStore.config.portForwardData.trim().split("\n");
+		if (config.enablePortForward) {
+			const formatPortForward = config.portForwardData.trim().split("\n");
 			const newformatPortForward = formatPortForward.map(el => el.trim()).filter(el => el);
 			if (newformatPortForward.length > 0) {
 				newformatPortForward.map(el => {
@@ -1636,36 +2151,27 @@
 				});
 			}
 		}
-		if (mainStore.config.privateMode) {
+		if (config.privateMode) {
 			args.push("--private-mode", "true");
 		}
-		if (mainStore.config.ipv6 && !mainStore.config.disableIpv6) {
-			args.push("--ipv6", mainStore.config.ipv6.trim());
+		if (config.ipv6 && !config.disableIpv6) {
+			args.push("--ipv6", config.ipv6.trim());
 		}
-		const tcpWhitelist = mainStore.config.tcpWhitelist.trim();
-		if (mainStore.config.tcpWhitelistEnable && tcpWhitelist) {
+		const tcpWhitelist = config.tcpWhitelist.trim();
+		if (config.tcpWhitelistEnable && tcpWhitelist) {
 			args.push("--tcp-whitelist", tcpWhitelist);
 		}
-		const udpWhitelist = mainStore.config.udpWhitelist.trim();
-		if (mainStore.config.udpWhitelistEnable && udpWhitelist) {
+		const udpWhitelist = config.udpWhitelist.trim();
+		if (config.udpWhitelistEnable && udpWhitelist) {
 			args.push("--udp-whitelist", udpWhitelist);
 		}
+		args.push("--rpc-portal", `${room.rpcPortal}`, "--instance-name", room.id);
 		return args;
 	};
 
-	const ipReset = async () => {
-		data.isSuccessGetIp = false;
-		if (mainStore.config.dhcp) {
-			mainStore.config.ipv4 = "";
-		}
-		await setTrayRunState(tray, false);
-		await setTrayTooltip(tray);
-	};
-
-	const reset = async () => {
-		data.isStart = false;
+	const closeRoomDetailWindows = async () => {
 		const memberDialog = await getAllWebviewWindows();
-		const memberDialogs = memberDialog.filter(item => item.label === "member");
+		const memberDialogs = memberDialog.filter(item => item.label === "member" || item.label === "cidr");
 		if (memberDialogs && memberDialogs.length > 0) {
 			data.memberVisible = false;
 			for (const memberDialog of memberDialogs) {
@@ -1675,33 +2181,61 @@
 				}
 			}
 		}
-		await unListenAll();
-		await ipReset();
 	};
 
-	const handleConnection = async () => {
-		if (data.isStart) {
-			await reset();
+	const reset = async (roomId: string = mainStore.activeRoomId) => {
+		if (roomId === mainStore.activeRoomId) {
+			await closeRoomDetailWindows();
+		}
+		await stopRoom(roomId);
+	};
+
+	const handleConnection = async (roomId: string = mainStore.activeRoomId) => {
+		clearReconnectTimer(roomId);
+		if (roomId === mainStore.activeRoomId) {
+			mainStore.saveActiveRoomProfile();
+		}
+		const room = mainStore.roomProfiles.find(item => item.id === roomId);
+		if (!room) return;
+		const runtime = getRoomRuntime(roomId);
+		if (runtime.startLoading) {
+			ElMessage.info(`房间“${room.name}”正在启动，请稍候`);
+			return;
+		}
+		if (runtime.isStart) {
+			await reset(roomId);
 		} else {
-			await setTrayTooltip(tray, "请求联机中...");
-			const args = await getArgs();
+			runtime.error = "";
+			const args = await getArgs(roomId);
 			if (!args || args.length <= 0) {
-				await reset();
+				await reset(roomId);
 				return;
 			}
 			if (args[0] === "-c") {
 				ElMessage.warning({
-					message: "使用配置文件中.",
+					message: `房间“${room.name}”使用外部配置文件启动`,
 					duration: 5000
 				});
 			}
-			data.log = ""; //清空日志
-			data.startLoading = true;
-			await unListenAll();
-			await listenObj.listenOutput();
-			await invoke("run_command", {
-				args
-			});
+			runtime.log = "";
+			runtime.runId = `${room.id}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+			runtime.startLoading = true;
+			runtime.isStart = true;
+			await updateTrayRoomStatus();
+			try {
+				await invoke("run_command", {
+					args,
+					instance_id: room.id,
+					run_id: runtime.runId
+				});
+			} catch (err) {
+				runtime.isStart = false;
+				runtime.startLoading = false;
+				runtime.error = "请求启动 EasyTier 内核失败";
+				appendRoomLog(room.id, `${runtime.error}: ${err}`);
+				await updateTrayRoomStatus();
+				ElMessage.error(`房间“${room.name}”启动失败`);
+			}
 		}
 	};
 
@@ -1849,7 +2383,23 @@
 				})) as any;
 		}
 		if (command === "save_config_admin") {
-			const config = btoa(encodeURIComponent(JSON.stringify(mainStore.$state)));
+			mainStore.saveActiveRoomProfile();
+			const room = mainStore.activeRoomProfile;
+			if (!room) return;
+			const config = btoa(
+				encodeURIComponent(
+					JSON.stringify({
+						version: 2,
+						room: {
+							config: room.config,
+							cidrEnable: room.cidrEnable,
+							proxyForwardBySystem: room.proxyForwardBySystem,
+							configStartEnable: room.configStartEnable,
+							configPath: room.configPath
+						}
+					})
+				)
+			);
 			const [error, { value = "" } = {}] = await ATJ(
 				ElMessageBox.prompt("请输入配置的存储名", "提示", {
 					confirmButtonText: "保存",
@@ -1926,17 +2476,24 @@
 	};
 
 	const handleReconnect = async () => {
-		if (data.isStart) {
+		const roomId = mainStore.activeRoomId;
+		clearReconnectTimer(roomId);
+		if (activeRoomRuntime.value.isStart || activeRoomRuntime.value.startLoading) {
 			ElMessage.info({
-				message: "正在重新联机...",
+				message: `正在重新连接房间“${mainStore.activeRoomProfile?.name || ""}”...`,
 				duration: 2200
 			});
-			await handleConnection();
-			setTimeout(() => {
-				handleConnection();
+			const stopped = await stopRoom(roomId);
+			if (!stopped) return;
+			reconnectTimers[roomId] = window.setTimeout(() => {
+				delete reconnectTimers[roomId];
+				const runtime = getRoomRuntime(roomId);
+				if (!runtime.isStart && !runtime.startLoading) {
+					void handleConnection(roomId);
+				}
 			}, 2000);
 		} else {
-			handleConnection();
+			await handleConnection(roomId);
 		}
 	};
 
@@ -1969,13 +2526,24 @@
 		const base64U8Arrray = await readFile(path, { baseDir: BaseDirectory.Resource });
 		const decoder = new TextDecoder("utf-8");
 		try {
-			if (data.isStart) {
-				ElMessage.warning("停止联机..");
+			if (activeRoomRuntime.value.isStart) {
+				ElMessage.warning("正在停止当前房间...");
 				await reset();
 			}
-			const json: typeof mainStore.$state = JSON.parse(decodeURIComponent(atob(decoder.decode(base64U8Arrray))));
-			mainStore.$patch(json);
-			ElMessage.success("切换成功");
+			const payload = JSON.parse(decodeURIComponent(atob(decoder.decode(base64U8Arrray))));
+			const savedRoom = payload.version === 2 && payload.room ? payload.room : payload;
+			mainStore.$patch({
+				config: {
+					...mainStore.config,
+					...(savedRoom.config || {})
+				},
+				cidrEnable: savedRoom.cidrEnable ?? mainStore.cidrEnable,
+				proxyForwardBySystem: savedRoom.proxyForwardBySystem ?? mainStore.proxyForwardBySystem,
+				configStartEnable: savedRoom.configStartEnable ?? mainStore.configStartEnable,
+				configPath: savedRoom.configPath ?? mainStore.configPath
+			});
+			mainStore.saveActiveRoomProfile();
+			ElMessage.success("当前房间配置切换成功");
 			configAdminData.visible = false;
 		} catch (err) {
 			ElMessage.error("读取配置失败");
@@ -1993,7 +2561,7 @@
 			payload.config.serverUrl = Array.isArray(payload?.config?.serverUrl)
 				? payload?.config?.serverUrl
 				: typeof payload?.config?.serverUrl == "string"
-					? [payload?.config?.serverUrl.split(",")]
+					? payload?.config?.serverUrl.split(",")
 					: typeof mainStore.config.serverUrl == "string"
 						? [mainStore.config.serverUrl]
 						: [];
@@ -2003,6 +2571,7 @@
 					...payload.config
 				}
 			});
+			mainStore.saveActiveRoomProfile();
 			ElMessage.success("导入成功");
 			importConfigData.visible = false;
 			mainStore.basePeers = uniq([...(mainStore.config.serverUrl || []), ...mainStore.basePeers].filter(el => el.trim()));
@@ -2020,6 +2589,7 @@
 		if (!isExists) {
 			mainStore.configStartEnable = false;
 			mainStore.configPath = "";
+			mainStore.saveActiveRoomProfile();
 			try {
 				await mkdir(path, { baseDir: BaseDirectory.Resource });
 			} catch (err) {
@@ -2042,7 +2612,7 @@
 	};
 
 	const handleShowMemberDialog = async () => {
-		if (!data.isStart) {
+		if (!activeRoomRuntime.value.isStart) {
 			return ElMessage.warning("请先启动联机");
 		}
 		// if (!mainStore.config.ipv4) {
@@ -2080,7 +2650,7 @@
 				data.logVisible = true;
 				logsTimer && clearInterval(logsTimer);
 				logsTimer = setInterval(() => {
-					appWindow.emitTo({ kind: "WebviewWindow", label: "log" }, "logs", data.log);
+					appWindow.emitTo({ kind: "WebviewWindow", label: "log" }, "logs", activeRoomRuntime.value.log);
 				}, 650);
 			},
 			() => {
@@ -2104,7 +2674,7 @@
 				data.cidrVisible = true;
 				cidrTimer && clearInterval(cidrTimer);
 				cidrTimer = setInterval(() => {
-					appWindow.emitTo({ kind: "WebviewWindow", label: "cidr" }, "route", data.isStart);
+					appWindow.emitTo({ kind: "WebviewWindow", label: "cidr" }, "route", activeRoomRuntime.value.isStart);
 				}, 650);
 			},
 			() => {
diff --git a/pages/member.vue b/pages/member.vue
index e9f95fb..1c5c9d1 100644
--- a/pages/member.vue
+++ b/pages/member.vue
@@ -160,6 +160,12 @@
 	import { ElConfirmDanger } from "~/utils/element";
 	import { getCurrentWindow } from "@tauri-apps/api/window";
 	import { isNaN } from "lodash-es";
+	import useMainStore from "@/stores/index";
+
+	const mainStore = useMainStore();
+	if (!mainStore.activeRoomProfile) {
+		mainStore.initializeRoomProfiles();
+	}
 
 	const natMaps = {
 		unknown: "未知",
@@ -339,7 +345,12 @@
 	let timer: number | null = null;
 
 	const listenOutput = async () => {
-		const [error, member] = await ATJ(invoke<string>("get_members_by_cli"));
+		const rpcPortal = mainStore.activeRoomProfile?.rpcPortal;
+		if (!rpcPortal) {
+			data.member = [];
+			return "";
+		}
+		const [error, member] = await ATJ(invoke<string>("get_members_by_cli", { rpc_portal: rpcPortal }));
 		if (error) {
 			data.member = [];
 			return "";
@@ -359,21 +370,31 @@
 			}
 			return;
 		}
-		const [errorConnections, connections] = await ATJ(invoke<string>("get_members_connections_cli"));
-		const memberConnections: ConnectionsType[] = JSON.parse(connections) as ConnectionsType[];
-
-		if (errorConnections != "_EasytierGameCliFailedToGetConnections_") {
-			data.member = (JSON.parse(member) as Member[]).map(member => {
-				const connection = memberConnections.find(conn => String(conn.route.peer_id) === member.id);
-				if (connection) {
-					member.connections_addrs = connection?.peer?.conns?.map(conn => conn?.tunnel?.remote_addr?.url || "") || [];
-				} else {
-					member.connections_addrs = [];
-				}
-				return member;
-			});
+		let memberList: Member[] = [];
+		try {
+			memberList = JSON.parse(member) as Member[];
+		} catch (error) {
+			console.error("解析当前房间成员信息失败", error);
+			data.member = [];
+			startTimer();
+			return;
+		}
+		const [errorConnections, connections] = await ATJ(invoke<string>("get_members_connections_cli", { rpc_portal: rpcPortal }));
+
+		if (!errorConnections && connections !== "_EasytierGameCliFailedToGetConnections_") {
+			try {
+				const memberConnections: ConnectionsType[] = JSON.parse(connections) as ConnectionsType[];
+				data.member = memberList.map(memberItem => {
+					const connection = memberConnections.find(conn => String(conn.route.peer_id) === memberItem.id);
+					memberItem.connections_addrs = connection?.peer?.conns?.map(conn => conn?.tunnel?.remote_addr?.url || "") || [];
+					return memberItem;
+				});
+			} catch (error) {
+				console.error("解析当前房间成员连接信息失败", error);
+				data.member = memberList;
+			}
 		} else {
-			data.member = JSON.parse(member) as Member[];
+			data.member = memberList;
 		}
 		// console.log(data.member);
 		getMembersProxy();
@@ -381,7 +402,12 @@
 	};
 
 	const getMembersProxy = async () => {
-		const [error, proxy] = await ATJ(invoke<string>("get_members_proxy"));
+		const rpcPortal = mainStore.activeRoomProfile?.rpcPortal;
+		if (!rpcPortal) {
+			data.proxy = [];
+			return "";
+		}
+		const [error, proxy] = await ATJ(invoke<string>("get_members_proxy", { rpc_portal: rpcPortal }));
 		if (error) {
 			data.proxy = [];
 			return "";
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 84bdb63..f4414c7 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -44,7 +44,7 @@ whoami = "1.5.2"
 tauri-plugin-fs = "2.5.1"
 tauri-plugin-clipboard-manager = "2.3.2"
 rand = "0.9.0"
-tokio = { version = "1.45.1", features = ["process"] }
+tokio = { version = "1.45.1", features = ["process", "time"] }
 tauri-plugin-dialog = "2.7.1"
 # prost = "0.13"
 # prost-types = "0.13"
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 1d39a4d..be006c0 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,13 +1,13 @@
 use reqwest::{Client, Error};
 // use futures_util::StreamExt;
-use serde::{Deserialize};
-// use std::collections::HashMap;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 use std::fs::{self, File};
-use std::io::{BufRead, BufReader, Write};
+use std::io::{BufRead, BufReader, Read, Write};
 use std::os::windows::process::CommandExt;
 use std::process::{Command, Stdio};
 use std::ptr;
-use std::sync::mpsc;
+use std::sync::{mpsc, Mutex, OnceLock};
 use std::{path, thread};
 use sysinfo::System;
 use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
@@ -31,6 +31,13 @@ use windows::Win32::System::Power::{
 
 use rand::Rng;
 use tokio::process::Command as tokioCommand;
+use tokio::time::{timeout, Duration};
+
+static RUNNING_CLIENT_INSTANCES: OnceLock<Mutex<HashMap<String, RunningClientInstance>>> = OnceLock::new();
+
+fn running_client_instances() -> &'static Mutex<HashMap<String, RunningClientInstance>> {
+    RUNNING_CLIENT_INSTANCES.get_or_init(|| Mutex::new(HashMap::new()))
+}
 
 #[tauri::command(rename_all = "snake_case")]
 fn get_network_adapter_guids() -> Vec<[String; 2]> {
@@ -238,118 +245,75 @@ fn get_tool_exe_path(path: &str) -> String {
 }
 
 
-#[tauri::command(rename_all = "snake_case")]
-async fn get_members_by_cli() -> String {
+const CLI_FAILED_TO_CONNECT: &str = "_EasytierGameCliFailedToConnect_";
+const CLI_FAILED_TO_GET_PROXY: &str = "_EasytierGameCliFailedToGetProxy_";
+const CLI_FAILED_TO_GET_CONNECTIONS: &str = "_EasytierGameCliFailedToGetConnections_";
+
+async fn run_cli_json(
+    rpc_portal: u16,
+    options: &[&str],
+    command_args: &[&str],
+    failure_marker: &str,
+    operation_name: &str,
+) -> String {
     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
-    match tokioCommand::new(&cli_path)
+    let mut command = tokioCommand::new(&cli_path);
+    command
+        .arg("-p")
+        .arg(format!("127.0.0.1:{}", rpc_portal))
+        .args(options)
         .arg("-o")
         .arg("json")
-        .arg("peer")
-        .arg("list")
+        .args(command_args)
         .creation_flags(0x08000000)
-        .output()
-        .await
-    {
-        Ok(output) => {
+        .kill_on_drop(true);
+    match timeout(Duration::from_secs(5), command.output()).await {
+        Ok(Ok(output)) => {
             if output.status.success() {
                 let output_str = String::from_utf8_lossy(&output.stdout);
-                return output_str.trim().to_string();
+                output_str.trim().to_string()
             } else {
                 let output_str = String::from_utf8_lossy(&output.stderr);
-                log::error!("{}", output_str.trim().to_string());
-                return "_EasytierGameCliFailedToConnect_".to_string();
+                log::error!("{}失败: {}", operation_name, output_str.trim());
+                failure_marker.to_string()
             }
         }
-        Err(_e) => {
-            log::error!("get member list error");
-            return "".to_string();
+        Ok(Err(error)) => {
+            log::error!("{}执行失败: {}", operation_name, error);
+            String::new()
+        }
+        Err(_) => {
+            log::error!("{}超时，RPC端口: {}", operation_name, rpc_portal);
+            failure_marker.to_string()
         }
     }
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn get_members_proxy() -> String {
-     let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
-    match tokioCommand::new(&cli_path)
-        .arg("-o")
-        .arg("json")
-        .arg("proxy")
-        .creation_flags(0x08000000)
-        .output()
-        .await
-    {
-        Ok(output) => {
-            if output.status.success() {
-                let output_str = String::from_utf8_lossy(&output.stdout);
-                return output_str.trim().to_string();
-            } else {
-                let output_str = String::from_utf8_lossy(&output.stderr);
-                log::error!("{}", output_str.trim().to_string());
-                return "_EasytierGameCliFailedToGetProxy_".to_string();
-            }
-        }
-        Err(_e) => {
-            log::error!("get member list error");
-            return "".to_string();
-        }
-    }
+async fn get_members_by_cli(rpc_portal: u16) -> String {
+    run_cli_json(rpc_portal, &[], &["peer", "list"], CLI_FAILED_TO_CONNECT, "获取成员列表").await
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn get_members_connections_cli() -> String {
-    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
-    match tokioCommand::new(&cli_path)
-        .arg("-v")
-        .arg("-o")
-        .arg("json")
-        .arg("peer")
-        .creation_flags(0x08000000)
-        .output()
-        .await
-    {
-        Ok(output) => {
-            if output.status.success() {
-                let output_str = String::from_utf8_lossy(&output.stdout);
-                return output_str.trim().to_string();
-            } else {
-                let output_str = String::from_utf8_lossy(&output.stderr);
-                log::error!("{}", output_str.trim().to_string());
-                return "_EasytierGameCliFailedToGetConnections_".to_string();
-            }
-        }
-        Err(_e) => {
-            log::error!("get member list error");
-            return "".to_string();
-        }
-    }
+async fn get_members_proxy(rpc_portal: u16) -> String {
+    run_cli_json(rpc_portal, &[], &["proxy"], CLI_FAILED_TO_GET_PROXY, "获取代理列表").await
 }
 
 #[tauri::command(rename_all = "snake_case")]
-async fn get_route_by_cli() -> String {
-    let cli_path = get_tool_exe_path("\\easytier\\easytier-cli.exe");
-    match tokioCommand::new(&cli_path)
-        .arg("-o")
-        .arg("json")
-        .arg("route")
-        .creation_flags(0x08000000)
-        .output()
-        .await
-    {
-        Ok(output) => {
-            if output.status.success() {
-                let output_str = String::from_utf8_lossy(&output.stdout);
-                return output_str.trim().to_string();
-            } else {
-                let output_str = String::from_utf8_lossy(&output.stderr);
-                log::error!("{}", output_str.trim().to_string());
-                return "_EasytierGameCliFailedToConnect_".to_string();
-            }
-        }
-        Err(_e) => {
-            log::error!("get route list error");
-            return "".to_string();
-        }
-    }
+async fn get_members_connections_cli(rpc_portal: u16) -> String {
+    run_cli_json(
+        rpc_portal,
+        &["-v"],
+        &["peer"],
+        CLI_FAILED_TO_GET_CONNECTIONS,
+        "获取成员连接",
+    )
+    .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+async fn get_route_by_cli(rpc_portal: u16) -> String {
+    run_cli_json(rpc_portal, &[], &["route"], CLI_FAILED_TO_CONNECT, "获取路由列表").await
 }
 
 #[tauri::command(rename_all = "snake_case")]
@@ -503,89 +467,262 @@ fn unzip(fname: &path::Path) {
     }
 }
 
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct ClientCommandEvent {
+    instance_id: String,
+    run_id: String,
+    event_type: String,
+    child_id: Option<u32>,
+    output: Option<String>,
+    exit_code: Option<i32>,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct RunningClientInstance {
+    child_id: u32,
+    run_id: String,
+}
+
+fn emit_client_command_event(
+    app_handle: &tauri::AppHandle,
+    instance_id: &str,
+    run_id: &str,
+    event_type: &str,
+    child_id: Option<u32>,
+    output: Option<String>,
+    exit_code: Option<i32>,
+) {
+    if let Err(error) = app_handle.emit(
+        "client-command-event",
+        ClientCommandEvent {
+            instance_id: instance_id.to_string(),
+            run_id: run_id.to_string(),
+            event_type: event_type.to_string(),
+            child_id,
+            output,
+            exit_code,
+        },
+    ) {
+        log::error!(
+            "发送 EasyTier 客户端事件失败，实例: {}，运行标识: {}，事件: {}，错误: {}",
+            instance_id,
+            run_id,
+            event_type,
+            error
+        );
+    }
+}
+
+fn sanitize_command_args(args: &[String]) -> String {
+    let mut sanitized_args = Vec::with_capacity(args.len());
+    let mut redact_next = false;
+    for arg in args {
+        if redact_next {
+            sanitized_args.push("***".to_string());
+            redact_next = false;
+            continue;
+        }
+        sanitized_args.push(arg.clone());
+        if arg == "--network-secret" {
+            redact_next = true;
+        }
+    }
+    sanitized_args.join(" ")
+}
+
+#[tauri::command(rename_all = "snake_case")]
+fn get_running_instances() -> HashMap<String, RunningClientInstance> {
+    match running_client_instances().lock() {
+        Ok(instances) => instances.clone(),
+        Err(error) => {
+            log::error!("读取 EasyTier 运行实例失败: {}", error);
+            HashMap::new()
+        }
+    }
+}
+
+fn stream_command_output<R: Read + Send + 'static>(
+    stream: R,
+    sender: mpsc::SyncSender<String>,
+) -> thread::JoinHandle<()> {
+    thread::spawn(move || {
+        let reader = BufReader::new(stream);
+        for line in reader.lines() {
+            match line {
+                Ok(line) => {
+                    if let Err(error) = sender.send(line) {
+                        log::error!("发送 EasyTier 输出失败: {}", error);
+                        break;
+                    }
+                }
+                Err(error) => {
+                    log::error!("读取 EasyTier 输出失败: {}", error);
+                    break;
+                }
+            }
+        }
+    })
+}
+
 #[tauri::command(rename_all = "snake_case")]
-fn run_command(app_handle: tauri::AppHandle, args: Vec<String>, is_server: Option<bool>) {
+fn run_command(
+    app_handle: tauri::AppHandle,
+    args: Vec<String>,
+    is_server: Option<bool>,
+    instance_id: Option<String>,
+    run_id: Option<String>,
+) {
     let is_server = is_server.unwrap_or(false);
-    let (tx, rx) = mpsc::channel();
+    let instance_id = instance_id.unwrap_or_default();
+    let run_id = run_id.unwrap_or_default();
+    // 有界队列避免内核日志突发时无限占用内存。
+    let (tx, rx) = mpsc::sync_channel::<String>(256);
 
     let app_handle1 = app_handle.clone();
     let app_handle2 = app_handle.clone();
 
-    let args2 = args.clone();
-    let mut thread_id_str = "thread-id";
-    if is_server {
-        thread_id_str = "server-thread-id";
-    }
-    let mut command_output_str = "command-output";
-    if is_server {
-        command_output_str = "server-command-output";
-    }
+    let args2 = sanitize_command_args(&args);
+    let process_instance_id = instance_id.clone();
+    let output_instance_id = instance_id.clone();
+    let process_run_id = run_id.clone();
+    let output_run_id = run_id;
     thread::spawn(move || {
         let core_path = get_tool_exe_path("\\easytier\\easytier-core.exe");
         // trace, debug, info, warn, error, off
-        let mut child = Command::new(&core_path)
+        let child_result = Command::new(&core_path)
             .args(args)
             .creation_flags(0x08000000)
             .stdout(Stdio::piped())
-            .spawn()
-            .expect("failed to execute process");
+            .stderr(Stdio::piped())
+            .spawn();
+
+        let mut child = match child_result {
+            Ok(child) => child,
+            Err(error) => {
+                log::error!("启动 EasyTier 实例失败: {}", error);
+                if !is_server {
+                    emit_client_command_event(
+                        &app_handle1,
+                        &process_instance_id,
+                        &process_run_id,
+                        "error",
+                        None,
+                        Some(error.to_string()),
+                        None,
+                    );
+                }
+                return;
+            }
+        };
 
         println!("child id: {}", child.id());
-        app_handle1
-            .emit(thread_id_str, child.id())
-            .expect("failed to emit id event");
-        app_handle1
-            .emit(command_output_str, args2.join(" "))
-            .expect("error output args");
-        let stdout = child.stdout.take().expect("failed to capture stdout");
-        let reader = BufReader::new(stdout);
-
-        for line in reader.lines() {
-            match line {
-                Ok(line) => match tx.send(line) {
-                    Ok(_) => {}
-                    Err(e) => {
-                        log::error!("error sending line: {}", e);
-                        break;
-                    }
-                },
-                Err(e) => {
-                    log::error!("error reading line: {}", e);
-                    break;
+        let child_id = child.id();
+        if is_server {
+            let _ = app_handle1.emit("server-thread-id", child_id);
+            let _ = app_handle1.emit("server-command-output", args2.clone());
+        } else {
+            if let Ok(mut instances) = running_client_instances().lock() {
+                instances.insert(
+                    process_instance_id.clone(),
+                    RunningClientInstance {
+                        child_id,
+                        run_id: process_run_id.clone(),
+                    },
+                );
+            }
+            emit_client_command_event(
+                &app_handle1,
+                &process_instance_id,
+                &process_run_id,
+                "started",
+                Some(child_id),
+                Some(args2),
+                None,
+            );
+        }
+        let mut output_threads = Vec::new();
+        if let Some(stdout) = child.stdout.take() {
+            output_threads.push(stream_command_output(stdout, tx.clone()));
+        }
+        if let Some(stderr) = child.stderr.take() {
+            output_threads.push(stream_command_output(stderr, tx.clone()));
+        }
+        drop(tx);
+        let exit_code = child.wait().ok().and_then(|status| status.code());
+        for output_thread in output_threads {
+            let _ = output_thread.join();
+        }
+        if !is_server {
+            if let Ok(mut instances) = running_client_instances().lock() {
+                if instances
+                    .get(&process_instance_id)
+                    .map_or(false, |instance| instance.run_id == process_run_id)
+                {
+                    instances.remove(&process_instance_id);
                 }
             }
+            emit_client_command_event(
+                &app_handle1,
+                &process_instance_id,
+                &process_run_id,
+                "exited",
+                Some(child_id),
+                None,
+                exit_code,
+            );
         }
         println!("end");
     });
 
     thread::spawn(move || {
         while let Ok(line) = rx.recv() {
-            app_handle2
-                .emit(command_output_str, line)
-                .expect("failed to emit event");
+            if is_server {
+                let _ = app_handle2.emit("server-command-output", line);
+            } else {
+                emit_client_command_event(
+                    &app_handle2,
+                    &output_instance_id,
+                    &output_run_id,
+                    "output",
+                    None,
+                    Some(line),
+                    None,
+                );
+            }
         }
     });
 }
 
 #[tauri::command(rename_all = "snake_case")]
-fn stop_command(child_id: u32) {
+fn stop_command(child_id: u32) -> bool {
     if child_id != 0 {
         let output = Command::new("taskkill")
             .arg("/F")
             .arg("/PID") // 使用 -9 信号强制终止进程
             .arg(child_id.to_string())
             .creation_flags(0x08000000)
-            .output()
-            .expect("Failed to execute command");
+            .output();
 
-        // 检查命令执行的结果
-        if output.status.success() {
-            println!("Process {} terminated successfully.", child_id);
-        } else {
-            eprintln!("Failed to terminate process {}.", child_id);
+        match output {
+            Ok(output) if output.status.success() => {
+                println!("Process {} terminated successfully.", child_id);
+                true
+            }
+            Ok(output) => {
+                let error = String::from_utf8_lossy(&output.stderr);
+                log::error!("停止进程 {} 失败: {}", child_id, error.trim());
+                false
+            }
+            Err(error) => {
+                log::error!("执行进程停止命令失败: {}", error);
+                false
+            }
         }
     } else {
         println!("child id is 0");
+        true
     }
 }
 
@@ -881,7 +1018,7 @@ fn autostart(enabled: bool) -> std::result::Result<(), Box<dyn std::error::Error
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     // 获取命令行参数
-    let _args: Vec<String> = std::env::args().collect();
+    let args: Vec<String> = std::env::args().collect();
 
     let context = tauri::generate_context!();
     tauri::Builder::default()
@@ -940,17 +1077,18 @@ pub fn run() {
                 .build(app)?;
 
             // 开机自启隐藏到托盘或者显示主窗口
-            // if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
-            //     let main_window = app.get_webview_window("main").unwrap();
-            //     main_window.show().expect("failed to show window");
-            //     main_window.set_focus().expect("failed to set focus");
-            // }
+            if !args.contains(&String::from(TASKAUTOSTART_ARG)) {
+                let main_window = app.get_webview_window("main").unwrap();
+                main_window.show().expect("failed to show window");
+                main_window.set_focus().expect("failed to set focus");
+            }
 
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![
             run_command,
             stop_command,
+            get_running_instances,
             get_core_version,
             fetch_easytier_list,
             fetch_game_releases,
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 71b9559..191eef7 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -16,9 +16,9 @@
 				"label": "main",
 				"minWidth": 340,
 				"width": 340,
-				"height": 305,
-				"minHeight": 305,
-				"maxHeight": 405,
+				"height": 350,
+				"minHeight": 350,
+				"maxHeight": 450,
 				"maxWidth": 460,
 				"resizable": true,
 				"fullscreen": false,
diff --git a/stores/index.ts b/stores/index.ts
index 90f63f6..e5945ce 100644
--- a/stores/index.ts
+++ b/stores/index.ts
@@ -1,66 +1,110 @@
 import { acceptHMRUpdate, defineStore } from "pinia";
 
+export const createDefaultRoomConfig = () => ({
+	protocol: ["tcp"], // 网络协议
+	serverUrl: ["public.easytier.top:11010"],
+	networkName: "",
+	networkPassword: "",
+	hostname: "",
+	ipv4: "",
+	ipv6: "",
+	tcpWhitelistEnable: false, // tcp端口白名单
+	udpWhitelistEnable: false, // udp端口白名单
+	tcpWhitelist: "", // tcp端口白名单
+	udpWhitelist: "", // udp端口白名单
+	proxyNetworks: "", // 子网代理
+	autoStart: false, // 是否自动启动
+	connectAfterStart: false, //软件打开后，是否自动连接
+	disableIpv6: false, // 是否禁用IPv6
+	port: "0", // 监听端口号
+	enableCustomListener: true, // 是否自定义监听
+	customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010", // 自定义监听地址
+	disbleListenner: false, // 是否禁用监听
+	disableEncryption: false, // 是否禁用加密
+	multiThread: false, //使用多线程
+	enablExitNode: false, // 是否启用退出节点
+	noTun: false, // 是否使用TUN
+	latencyfirst: false, // 是否优先延迟
+	useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
+	disableUdpHolePunching: false, // 是否禁用UDP打洞
+	relayAllPeerrpc: true, // 是否启用所有对等RPC
+	disbleP2p: false, // 是否使用P2P
+	dhcp: true, // 是否使用DHCP
+	saveErrorLog: true, // 是否保存错误日志
+	logLevel: "error", //日志等级
+	devName: true, //自定义网卡名
+	devNameValue: "etgame", //自定义网卡名
+	enableCustomProtocol: true, //自定义默认协议
+	customProtocol: "tcp", //自定义默认协议
+	enableNetCardMetric: true, //启用网卡自定义跃点
+	netCardMetricValue: 1, //自定义网卡跃点值
+	enablePreventSleep: false, //组织系统休眠
+	enableUdpBroadcastRelay: true, //Windows UDP广播中继
+	enableUpnp: true, //UPnP端口映射
+	ipv6PublicAddrProvider: false, //公网IPv6地址前缀提供
+	ipv6PublicAddrAuto: false, //公网IPv6地址自动获取
+	disableRelayData: false, //禁用Relay数据转发
+	compression: "none", //加密算法
+	enableKcpProxy: true, //启用kcp代理  默认开启
+	disableKcpInput: false, //禁用kcp输入
+	enableQuicProxy: false, //启用quic代理  默认开启
+	disableQuicInput: false, //禁用quic输入
+	bindDeviceEnable: false, //是否绑定设备
+	acceptDNS: false, //魔法dns
+	privateMode: false, //是否启用私有模式
+	enablePortForward: false, //是否启用端口转发
+	portForwardData: "" //端口转发数据
+});
+
+export type RoomConfig = ReturnType<typeof createDefaultRoomConfig>;
+
+export type RoomProfile = {
+	id: string;
+	name: string;
+	rpcPortal: number;
+	config: RoomConfig;
+	cidrEnable: boolean;
+	proxyForwardBySystem: boolean;
+	configStartEnable: boolean;
+	configPath: string;
+	updatedAt: number;
+};
+
+const cloneRoomConfig = (config: RoomConfig): RoomConfig => JSON.parse(JSON.stringify(config));
+
+const createRoomId = () => {
+	if (globalThis.crypto?.randomUUID) {
+		return globalThis.crypto.randomUUID();
+	}
+	return `room-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+};
 
+const DEFAULT_RPC_PORTAL = 15888;
+
+const allocateRpcPortal = (usedRpcPortals: Set<number>, preferredPort = DEFAULT_RPC_PORTAL) => {
+	let rpcPortal = Number.isInteger(preferredPort) && preferredPort > 0 && preferredPort <= 65535 ? preferredPort : DEFAULT_RPC_PORTAL;
+	while (rpcPortal <= 65535 && usedRpcPortals.has(rpcPortal)) {
+		rpcPortal += 1;
+	}
+	if (rpcPortal > 65535) {
+		rpcPortal = 1;
+		while (rpcPortal <= 65535 && usedRpcPortals.has(rpcPortal)) {
+			rpcPortal += 1;
+		}
+	}
+	if (rpcPortal > 65535) {
+		throw new Error("没有可用的 EasyTier RPC 端口");
+	}
+	usedRpcPortals.add(rpcPortal);
+	return rpcPortal;
+};
 
 const store = defineStore("main", {
 	state() {
 		return {
-			config: {
-				protocol: ["tcp"], // 网络协议
-				serverUrl: ["public.easytier.top:11010"],
-				networkName: "",
-				networkPassword: "",
-				hostname: "",
-				ipv4: "",
-				ipv6:"",
-				tcpWhitelistEnable: false, // tcp端口白名单
-				udpWhitelistEnable: false, // udp端口白名单
-				tcpWhitelist: "", // tcp端口白名单
-				udpWhitelist: "", // udp端口白名单
-				proxyNetworks: "", // 子网代理
-				autoStart: false, // 是否自动启动
-				connectAfterStart: false, //软件打开后，是否自动连接
-				disableIpv6: false, // 是否禁用IPv6
-				port: "0", // 监听端口号
-				enableCustomListener: true, // 是否自定义监听
-				customListenerData: "tcp://0.0.0.0:11010\nudp://0.0.0.0:11010", // 自定义监听地址
-				disbleListenner: false, // 是否禁用监听
-				disableEncryption: false, // 是否禁用加密
-				multiThread: false, //使用多线程
-				enablExitNode: false, // 是否启用退出节点
-				noTun: false, // 是否使用TUN
-				latencyfirst: false, // 是否优先延迟
-				useSmoltcp: false, // 是否为子网代理启用smoltcp堆栈
-				disableUdpHolePunching: false, // 是否禁用UDP打洞
-				relayAllPeerrpc: true, // 是否启用所有对等RPC
-				disbleP2p: false, // 是否使用P2P
-				dhcp: true, // 是否使用DHCP
-				saveErrorLog: true, // 是否保存错误日志
-				logLevel: "error", //日志等级
-				devName: true, //自定义网卡名
-				devNameValue: "etgame", //自定义网卡名
-				enableCustomProtocol: true, //自定义默认协议
-				customProtocol: "tcp", //自定义默认协议
-				enableNetCardMetric: true, //启用网卡自定义跃点
-				netCardMetricValue: 1, //自定义网卡跃点值
-				enablePreventSleep: false, //组织系统休眠
-				enableUdpBroadcastRelay: true, //Windows UDP广播中继
-				enableUpnp: true, //UPnP端口映射
-				ipv6PublicAddrProvider: false, //公网IPv6地址前缀提供
-				ipv6PublicAddrAuto: false, //公网IPv6地址自动获取
-				disableRelayData: false, //禁用Relay数据转发
-				compression: "none", //加密算法
-				enableKcpProxy: true, //启用kcp代理  默认开启
-				disableKcpInput: false, //禁用kcp输入
-				enableQuicProxy: false, //启用quic代理  默认开启
-				disableQuicInput: false, //禁用quic输入
-				bindDeviceEnable: false, //是否绑定设备
-				acceptDNS: false, //魔法dns
-				privateMode: false, //是否启用私有模式
-
-				enablePortForward: false, //是否启用端口转发
-				portForwardData: "", //端口转发数据
-			},
+			config: createDefaultRoomConfig(),
+			roomProfiles: [] as RoomProfile[],
+			activeRoomId: "",
 			serverConfig: {
 				enableWhiteList: true, // 是否启用白名单
 				relayAllPeerrpc: false, // 是否启用所有对等RPC
@@ -97,6 +141,161 @@ const store = defineStore("main", {
 			gameList: [] as Array<{ name: string; exePath: string; id: string; coverImg?: string; showImg: string }> // 游戏列表
 		};
 	},
+	getters: {
+		activeRoomProfile(state): RoomProfile | undefined {
+			return state.roomProfiles.find(room => room.id === state.activeRoomId);
+		}
+	},
+	actions: {
+		initializeRoomProfiles() {
+			if (this.roomProfiles.length <= 0) {
+				const id = createRoomId();
+				this.roomProfiles = [
+					{
+						id,
+						name: this.config.networkName?.trim() || "默认房间",
+						rpcPortal: DEFAULT_RPC_PORTAL,
+						config: cloneRoomConfig(this.config),
+						cidrEnable: this.cidrEnable,
+						proxyForwardBySystem: this.proxyForwardBySystem,
+						configStartEnable: this.configStartEnable,
+						configPath: this.configPath,
+						updatedAt: Date.now()
+					}
+				];
+				this.activeRoomId = id;
+				return;
+			}
+
+			const usedRpcPortals = new Set<number>();
+			this.roomProfiles = this.roomProfiles.map((room, index) => {
+				const savedRpcPortal = Number(room.rpcPortal);
+				const preferredRpcPortal =
+					Number.isInteger(savedRpcPortal) && savedRpcPortal > 0 && savedRpcPortal <= 65535 && !usedRpcPortals.has(savedRpcPortal)
+						? savedRpcPortal
+						: DEFAULT_RPC_PORTAL + index;
+				const rpcPortal = allocateRpcPortal(usedRpcPortals, preferredRpcPortal);
+				return {
+					...room,
+					name: room.name?.trim() || `房间 ${index + 1}`,
+					rpcPortal,
+					config: {
+						...createDefaultRoomConfig(),
+						...cloneRoomConfig(room.config || this.config)
+					},
+					cidrEnable: room.cidrEnable ?? false,
+					proxyForwardBySystem: room.proxyForwardBySystem ?? false,
+					configStartEnable: room.configStartEnable ?? false,
+					configPath: room.configPath || "",
+					updatedAt: room.updatedAt || Date.now()
+				};
+			});
+
+			if (!this.roomProfiles.some(room => room.id === this.activeRoomId)) {
+				this.activeRoomId = this.roomProfiles[0].id;
+			}
+			this.applyRoomProfile(this.activeRoomId);
+		},
+		applyRoomProfile(roomId: string) {
+			const room = this.roomProfiles.find(item => item.id === roomId);
+			if (!room) return false;
+			this.activeRoomId = room.id;
+			this.config = cloneRoomConfig(room.config);
+			this.cidrEnable = room.cidrEnable;
+			this.proxyForwardBySystem = room.proxyForwardBySystem;
+			this.configStartEnable = room.configStartEnable;
+			this.configPath = room.configPath;
+			return true;
+		},
+		saveActiveRoomProfile() {
+			const room = this.roomProfiles.find(item => item.id === this.activeRoomId);
+			if (!room) return false;
+			const serializedConfig = JSON.stringify(this.config);
+			if (
+				JSON.stringify(room.config) === serializedConfig &&
+				room.cidrEnable === this.cidrEnable &&
+				room.proxyForwardBySystem === this.proxyForwardBySystem &&
+				room.configStartEnable === this.configStartEnable &&
+				room.configPath === this.configPath
+			) {
+				return true;
+			}
+			room.config = JSON.parse(serializedConfig);
+			room.cidrEnable = this.cidrEnable;
+			room.proxyForwardBySystem = this.proxyForwardBySystem;
+			room.configStartEnable = this.configStartEnable;
+			room.configPath = this.configPath;
+			room.updatedAt = Date.now();
+			return true;
+		},
+		switchRoomProfile(roomId: string) {
+			if (roomId === this.activeRoomId) return true;
+			this.saveActiveRoomProfile();
+			return this.applyRoomProfile(roomId);
+		},
+		addRoomProfile(name: string) {
+			this.saveActiveRoomProfile();
+			const sourceRoom = this.activeRoomProfile;
+			const sourceRpcPortal = sourceRoom?.rpcPortal || DEFAULT_RPC_PORTAL;
+			const usedRpcPortals = new Set(this.roomProfiles.map(room => room.rpcPortal));
+			const rpcPortal = allocateRpcPortal(usedRpcPortals);
+
+			const config = cloneRoomConfig(sourceRoom?.config || this.config);
+			const portOffset = (rpcPortal - sourceRpcPortal) * 10;
+			if (!config.disbleListenner && config.enableCustomListener && portOffset !== 0) {
+				config.customListenerData = config.customListenerData.replace(/:(\d+)(?=\/?$)/gm, (_, port: string) => {
+					const nextPort = Number(port) + portOffset;
+					return `:${nextPort > 0 && nextPort <= 65535 ? nextPort : port}`;
+				});
+			}
+			if (!config.disbleListenner && !config.enableCustomListener && config.port !== "0" && portOffset !== 0) {
+				const nextPort = Number(config.port) + portOffset;
+				if (nextPort > 0 && nextPort <= 65535) {
+					config.port = `${nextPort}`;
+				}
+			}
+			if (config.devName && config.devNameValue) {
+				const devNameBase = config.devNameValue.replace(/-\d+$/, "");
+				config.devNameValue = `${devNameBase}-${rpcPortal - DEFAULT_RPC_PORTAL + 1}`;
+			}
+			config.ipv4 = "";
+
+			const room: RoomProfile = {
+				id: createRoomId(),
+				name: name.trim(),
+				rpcPortal,
+				config,
+				cidrEnable: sourceRoom?.cidrEnable ?? this.cidrEnable,
+				proxyForwardBySystem: sourceRoom?.proxyForwardBySystem ?? this.proxyForwardBySystem,
+				// 外部配置文件中的监听器和网卡名无法安全改写，新房间改用已复制的界面配置。
+				configStartEnable: false,
+				configPath: "",
+				updatedAt: Date.now()
+			};
+			this.roomProfiles.push(room);
+			this.applyRoomProfile(room.id);
+			return room;
+		},
+		renameRoomProfile(roomId: string, name: string) {
+			const room = this.roomProfiles.find(item => item.id === roomId);
+			if (!room || !name.trim()) return false;
+			room.name = name.trim();
+			room.updatedAt = Date.now();
+			return true;
+		},
+		deleteRoomProfile(roomId: string) {
+			if (this.roomProfiles.length <= 1) return false;
+			const roomIndex = this.roomProfiles.findIndex(item => item.id === roomId);
+			if (roomIndex < 0) return false;
+			const wasActive = roomId === this.activeRoomId;
+			this.roomProfiles.splice(roomIndex, 1);
+			if (wasActive) {
+				const nextRoom = this.roomProfiles[Math.min(roomIndex, this.roomProfiles.length - 1)];
+				this.applyRoomProfile(nextRoom.id);
+			}
+			return true;
+		}
+	},
 	persist: {
 		// 防止持久化保存 用户使用config.json输入的无用的字段
 		pick: [
@@ -190,7 +389,9 @@ const store = defineStore("main", {
 			"forceBindInput",
 			"forceBindFile",
 			"latestTagName",
-			
+			"roomProfiles",
+			"activeRoomId",
+
 			"gameList"
 		]
 		// // 除了这些，其他都要存下来

From 72643626f34c762c7a5ea9c426cf32d228fb6867 Mon Sep 17 00:00:00 2001
From: Android <Android@qq.com>
Date: Sat, 22 Aug 2026 19:26:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?#Fix=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?guiConfig=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=BE=97=E6=95=B0=E6=8D=AE=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E6=96=87=E4=BB=B6=E5=A4=B9=E8=B5=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/guiConfig.ts | 132 +++++++++++++++++++++++++++++++
 env/.env.dev             |   1 +
 env/.env.prod            |   1 +
 pages/index.vue          | 163 +++++++++++++++++++++++++++++++++++----
 stores/index.ts          |   9 +++
 typings/index.d.ts       |   1 +
 6 files changed, 293 insertions(+), 14 deletions(-)
 create mode 100644 composables/guiConfig.ts

diff --git a/composables/guiConfig.ts b/composables/guiConfig.ts
new file mode 100644
index 0000000..6399492
--- /dev/null
+++ b/composables/guiConfig.ts
@@ -0,0 +1,132 @@
+import { BaseDirectory, exists, mkdir, readDir, readTextFile, remove, writeTextFile } from "@tauri-apps/plugin-fs";
+import type { RoomProfile } from "@/stores/index";
+
+const GUI_CONFIG_VERSION = 1;
+
+type RoomGuiConfigFile = {
+	version: number;
+	savedAt: string;
+	roomOrder?: number;
+	room: RoomProfile;
+};
+
+const isRecord = (value: unknown): value is Record<string, unknown> => typeof value === "object" && value !== null;
+
+const isRoomGuiConfigFile = (value: unknown): value is RoomGuiConfigFile => {
+	if (!isRecord(value) || value.version !== GUI_CONFIG_VERSION || !isRecord(value.room)) {
+		return false;
+	}
+	const room = value.room;
+	return (
+		typeof value.savedAt === "string" &&
+		Number.isFinite(Date.parse(value.savedAt)) &&
+		(value.roomOrder === undefined || (typeof value.roomOrder === "number" && Number.isInteger(value.roomOrder))) &&
+		typeof room.id === "string" &&
+		Boolean(room.id) &&
+		typeof room.name === "string" &&
+		typeof room.rpcPortal === "number" &&
+		isRecord(room.config)
+	);
+};
+
+const ensureGuiConfigDirectory = async () => {
+	const directoryPath = import.meta.env.VITE_GUI_CONFIG_PATH;
+	if (!(await exists(directoryPath, { baseDir: BaseDirectory.Resource }))) {
+		await mkdir(directoryPath, { baseDir: BaseDirectory.Resource, recursive: true });
+	}
+	return directoryPath;
+};
+
+const writeRoomGuiConfig = async (directoryPath: string, room: RoomProfile, roomOrder: number) => {
+	const filePath = `${directoryPath}${room.id}.json`;
+	const content = JSON.stringify(
+		{
+			version: GUI_CONFIG_VERSION,
+			savedAt: new Date().toISOString(),
+			roomOrder,
+			room
+		},
+		null,
+		4
+	);
+	await writeTextFile(filePath, content, { baseDir: BaseDirectory.Resource });
+	return filePath;
+};
+
+export const saveRoomGuiConfig = async (room: RoomProfile, roomOrder: number) => {
+	const directoryPath = await ensureGuiConfigDirectory();
+	return writeRoomGuiConfig(directoryPath, room, roomOrder);
+};
+
+export const saveRoomGuiConfigs = async (rooms: RoomProfile[]) => {
+	const directoryPath = await ensureGuiConfigDirectory();
+	const writtenFilePaths: string[] = [];
+	try {
+		for (const [index, room] of rooms.entries()) {
+			const filePath = `${directoryPath}${room.id}.json`;
+			try {
+				writtenFilePaths.push(await writeRoomGuiConfig(directoryPath, room, index));
+			} catch (error) {
+				writtenFilePaths.push(filePath);
+				throw error;
+			}
+		}
+		return writtenFilePaths;
+	} catch (error) {
+		// 首次迁移必须全量成功，避免下次启动把不完整目录误判为完整的多房间数据源。
+		await Promise.allSettled(
+			writtenFilePaths.map(filePath => remove(filePath, { baseDir: BaseDirectory.Resource }))
+		);
+		throw error;
+	}
+};
+
+export const loadRoomGuiConfigs = async () => {
+	const directoryPath = import.meta.env.VITE_GUI_CONFIG_PATH;
+	if (!(await exists(directoryPath, { baseDir: BaseDirectory.Resource }))) {
+		return [] as RoomProfile[];
+	}
+
+	const entries = await readDir(directoryPath, { baseDir: BaseDirectory.Resource });
+	const configs = await Promise.all(
+		entries
+			.filter(entry => entry.isFile && entry.name.toLowerCase().endsWith(".json"))
+			.map(async entry => {
+				const filePath = `${directoryPath}${entry.name}`;
+				try {
+					const parsedConfig: unknown = JSON.parse(await readTextFile(filePath, { baseDir: BaseDirectory.Resource }));
+					if (!isRoomGuiConfigFile(parsedConfig)) {
+						throw new Error("文件结构或版本不受支持");
+					}
+					return parsedConfig;
+				} catch (error) {
+					console.error(`读取 GUI 房间配置“${entry.name}”失败`, error);
+					return null;
+				}
+			})
+	);
+
+	const roomConfigById = new Map<string, RoomGuiConfigFile>();
+	for (const config of configs) {
+		if (!config) continue;
+		const savedConfig = roomConfigById.get(config.room.id);
+		if (!savedConfig || Date.parse(config.savedAt) >= Date.parse(savedConfig.savedAt)) {
+			roomConfigById.set(config.room.id, config);
+		}
+	}
+
+	return [...roomConfigById.values()]
+		.sort(
+			(a, b) =>
+				(a.roomOrder ?? Number.MAX_SAFE_INTEGER) - (b.roomOrder ?? Number.MAX_SAFE_INTEGER) ||
+				a.room.name.localeCompare(b.room.name, "zh-CN")
+		)
+		.map(config => config.room);
+};
+
+export const removeRoomGuiConfig = async (roomId: string) => {
+	const filePath = `${import.meta.env.VITE_GUI_CONFIG_PATH}${roomId}.json`;
+	if (await exists(filePath, { baseDir: BaseDirectory.Resource })) {
+		await remove(filePath, { baseDir: BaseDirectory.Resource });
+	}
+};
diff --git a/env/.env.dev b/env/.env.dev
index 74122f0..94df9e7 100644
--- a/env/.env.dev
+++ b/env/.env.dev
@@ -1,6 +1,7 @@
 VITE_CONFIG_PATH=easytier/config/
 VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
 VITE_CONFIG_FILE_NAME=easytier/config.json
+VITE_GUI_CONFIG_PATH=easytier/gui_config/
 VITE_LOG_PATH=easytier/logs/
 VITE_CACHE_PATH=easytier/cache/
 VITE_GAME_LIST_PATH=easytier/gameList/
diff --git a/env/.env.prod b/env/.env.prod
index 74122f0..94df9e7 100644
--- a/env/.env.prod
+++ b/env/.env.prod
@@ -1,6 +1,7 @@
 VITE_CONFIG_PATH=easytier/config/
 VITE_CONFIG_ADMIN_PATH=easytier/config/.admin/
 VITE_CONFIG_FILE_NAME=easytier/config.json
+VITE_GUI_CONFIG_PATH=easytier/gui_config/
 VITE_LOG_PATH=easytier/logs/
 VITE_CACHE_PATH=easytier/cache/
 VITE_GAME_LIST_PATH=easytier/gameList/
diff --git a/pages/index.vue b/pages/index.vue
index 218f6e6..6bfd614 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -873,6 +873,12 @@
 	import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path";
 	import { readDir, exists, mkdir, BaseDirectory, readFile, writeFile, remove as removeFile } from "@tauri-apps/plugin-fs";
 	import { updateConfigJson, updateConfigJsonBounce } from "~/composables/configJson";
+	import {
+		loadRoomGuiConfigs,
+		removeRoomGuiConfig,
+		saveRoomGuiConfig,
+		saveRoomGuiConfigs
+	} from "~/composables/guiConfig";
 	import { writeText } from "@tauri-apps/plugin-clipboard-manager";
 	import { uniq } from "lodash-es";
 	import { addQQGroup, supportProtocols, preventSleep, stopPreventSleep, ATJ, copyText, isValidWindowsFileName, mixedArray } from "~/utils";
@@ -1093,21 +1099,56 @@
 		await updateConfigJsonBounce(data.configJsonSeverUrl);
 	};
 
+	const saveRoomProfileFile = async (room: (typeof mainStore.roomProfiles)[number]) => {
+		const roomOrder = mainStore.roomProfiles.findIndex(item => item.id === room.id);
+		return saveRoomGuiConfig(room, roomOrder);
+	};
+
 	const handleSaveRoom = async () => {
 		mainStore.saveActiveRoomProfile();
-		if (mainStore.createConfigInEasytier) {
-			await updateConfigJson(data.configJsonSeverUrl);
+		const room = mainStore.activeRoomProfile;
+		if (!room) {
+			ElMessage.error("当前房间不存在，无法保存配置");
+			return;
+		}
+		try {
+			await saveRoomProfileFile(room);
+			if (mainStore.createConfigInEasytier) {
+				await updateConfigJson(data.configJsonSeverUrl);
+			}
+			ElMessage.success(`房间“${room.name}”配置已保存到 gui_config 文件夹`);
+		} catch (error) {
+			console.error(`保存房间“${room.name}”GUI 配置失败`, error);
+			ElMessage.error(`房间“${room.name}”配置写入 gui_config 文件夹失败`);
 		}
-		ElMessage.success(`房间“${mainStore.activeRoomProfile?.name || ""}”配置已保存`);
 	};
 
 	const handleAddRoom = async () => {
 		const name = await requestRoomName("新增房间配置");
 		if (!name) return;
-		const room = mainStore.addRoomProfile(name);
-		getRoomRuntime(room.id);
-		await closeRoomDetailWindows();
-		ElMessage.success(`已创建房间“${room.name}”`);
+		mainStore.saveActiveRoomProfile();
+		const sourceRoom = mainStore.activeRoomProfile;
+		try {
+			if (sourceRoom) {
+				await saveRoomProfileFile(sourceRoom);
+			}
+			const room = mainStore.addRoomProfile(name);
+			try {
+				await saveRoomProfileFile(room);
+			} catch (error) {
+				mainStore.deleteRoomProfile(room.id);
+				if (sourceRoom) {
+					mainStore.applyRoomProfile(sourceRoom.id);
+				}
+				throw error;
+			}
+			getRoomRuntime(room.id);
+			await closeRoomDetailWindows();
+			ElMessage.success(`已创建并保存房间“${room.name}”`);
+		} catch (error) {
+			console.error(`新建房间“${name}”时保存 GUI 配置失败`, error);
+			ElMessage.error(`新建房间失败，无法写入 gui_config 文件夹`);
+		}
 	};
 
 	const handleRoomManageCommand = async (command: string | number | object) => {
@@ -1115,12 +1156,28 @@
 		if (!room) return;
 		if (command === "rename") {
 			const name = await requestRoomName("重命名房间配置", room.name, room.id);
-			if (name && mainStore.renameRoomProfile(room.id, name)) {
-				ElMessage.success("房间配置已重命名");
+			if (name) {
+				const previousName = room.name;
+				const previousUpdatedAt = room.updatedAt;
+				if (mainStore.renameRoomProfile(room.id, name)) {
+					try {
+						await saveRoomProfileFile(room);
+						ElMessage.success("房间配置已重命名");
+					} catch (error) {
+						room.name = previousName;
+						room.updatedAt = previousUpdatedAt;
+						console.error(`重命名房间“${previousName}”时保存 GUI 配置失败`, error);
+						ElMessage.error("重命名失败，无法写入 gui_config 文件夹");
+					}
+				}
 			}
 		}
 		if (command === "delete") {
 			const runtime = getRoomRuntime(room.id);
+			if (mainStore.roomProfiles.length <= 1) {
+				ElMessage.warning("至少需要保留一个房间配置");
+				return;
+			}
 			if (runtime.isStart) {
 				ElMessage.warning("请先停止当前房间");
 				return;
@@ -1131,10 +1188,16 @@
 				action: "删除"
 			});
 			if (error) return;
-			if (mainStore.deleteRoomProfile(room.id)) {
-				delete roomRuntimes[room.id];
-				await closeRoomDetailWindows();
-				ElMessage.success("房间配置已删除");
+			try {
+				await removeRoomGuiConfig(room.id);
+				if (mainStore.deleteRoomProfile(room.id)) {
+					delete roomRuntimes[room.id];
+					await closeRoomDetailWindows();
+					ElMessage.success("房间配置已删除");
+				}
+			} catch (error) {
+				console.error(`删除房间“${room.name}”GUI 配置失败`, error);
+				ElMessage.error("删除失败，无法更新 gui_config 文件夹");
 			}
 		}
 	};
@@ -1783,6 +1846,28 @@
 		mainStore.applyRoomProfile(mainStore.activeRoomId);
 	};
 
+	const initRoomGuiConfigs = async () => {
+		try {
+			const roomProfiles = await loadRoomGuiConfigs();
+			if (roomProfiles.length <= 0) return false;
+			const preferredActiveRoomId = mainStore.activeRoomId;
+			mainStore.replaceRoomProfiles(roomProfiles, preferredActiveRoomId);
+			const roomIds = new Set(mainStore.roomProfiles.map(room => room.id));
+			for (const roomId of Object.keys(roomRuntimes)) {
+				if (!roomIds.has(roomId)) {
+					delete roomRuntimes[roomId];
+				}
+			}
+			mainStore.roomProfiles.forEach(room => getRoomRuntime(room.id));
+			console.log(`已从 gui_config 文件夹加载 ${roomProfiles.length} 个房间配置`);
+			return true;
+		} catch (error) {
+			console.error("读取 gui_config 文件夹失败，回退到旧配置", error);
+			ElMessage.error("读取 gui_config 文件夹失败，已回退到旧配置");
+			return false;
+		}
+	};
+
 	const initGuiJson = async () => {
 		const path = import.meta.env.VITE_CONFIG_FILE_NAME;
 		const isExists = await exists(path, { baseDir: BaseDirectory.Resource });
@@ -1911,9 +1996,20 @@
 	let cidrTimer: number | null = null;
 
 	onMounted(async () => {
+		const loadedFromGuiConfig = await initRoomGuiConfigs();
 		await compatibleInitServerUrl();
-		await initGuiJson();
+		if (!loadedFromGuiConfig) {
+			await initGuiJson();
+		}
 		mainStore.saveActiveRoomProfile();
+		if (!loadedFromGuiConfig) {
+			try {
+				await saveRoomGuiConfigs(mainStore.roomProfiles);
+			} catch (error) {
+				console.error("迁移旧配置到 gui_config 文件夹失败", error);
+				ElMessage.error("迁移旧配置到 gui_config 文件夹失败");
+			}
+		}
 		await compatibleInitAutoStart();
 		// await initAutoStart();
 		// await initStartWinIpBroadcast();  // 对于三层tun而言，winipbroadcast没有作用，先禁用
@@ -2190,6 +2286,16 @@
 		await stopRoom(roomId);
 	};
 
+	const updateRoomConnectAfterStart = (room: (typeof mainStore.roomProfiles)[number], enabled: boolean) => {
+		room.config.connectAfterStart = enabled;
+		if (room.id === mainStore.activeRoomId) {
+			mainStore.config.connectAfterStart = enabled;
+			mainStore.saveActiveRoomProfile();
+		} else {
+			room.updatedAt = Date.now();
+		}
+	};
+
 	const handleConnection = async (roomId: string = mainStore.activeRoomId) => {
 		clearReconnectTimer(roomId);
 		if (roomId === mainStore.activeRoomId) {
@@ -2203,6 +2309,17 @@
 			return;
 		}
 		if (runtime.isStart) {
+			const previousConnectAfterStart = room.config.connectAfterStart;
+			updateRoomConnectAfterStart(room, false);
+			try {
+				// 先持久化停止意图，写入失败时不停止进程，避免下次启动仍被旧文件自动拉起。
+				await saveRoomProfileFile(room);
+			} catch (error) {
+				updateRoomConnectAfterStart(room, previousConnectAfterStart);
+				console.error(`停止房间“${room.name}”前保存自动启动状态失败`, error);
+				ElMessage.error(`房间“${room.name}”配置保存失败，已取消停止`);
+				return;
+			}
 			await reset(roomId);
 		} else {
 			runtime.error = "";
@@ -2211,6 +2328,17 @@
 				await reset(roomId);
 				return;
 			}
+			const previousConnectAfterStart = room.config.connectAfterStart;
+			updateRoomConnectAfterStart(room, true);
+			try {
+				// 手动启动即代表下次仍需启动，必须在拉起进程前写入，防止软件立即重启时丢失意图。
+				await saveRoomProfileFile(room);
+			} catch (error) {
+				updateRoomConnectAfterStart(room, previousConnectAfterStart);
+				console.error(`启动房间“${room.name}”前保存自动启动状态失败`, error);
+				ElMessage.error(`房间“${room.name}”配置保存失败，已取消启动`);
+				return;
+			}
 			if (args[0] === "-c") {
 				ElMessage.warning({
 					message: `房间“${room.name}”使用外部配置文件启动`,
@@ -2233,6 +2361,13 @@
 				runtime.startLoading = false;
 				runtime.error = "请求启动 EasyTier 内核失败";
 				appendRoomLog(room.id, `${runtime.error}: ${err}`);
+				updateRoomConnectAfterStart(room, previousConnectAfterStart);
+				try {
+					await saveRoomProfileFile(room);
+				} catch (saveError) {
+					console.error(`房间“${room.name}”启动失败后恢复自动启动状态失败`, saveError);
+					ElMessage.error(`房间“${room.name}”自动启动状态恢复失败`);
+				}
 				await updateTrayRoomStatus();
 				ElMessage.error(`房间“${room.name}”启动失败`);
 			}
diff --git a/stores/index.ts b/stores/index.ts
index e5945ce..3690044 100644
--- a/stores/index.ts
+++ b/stores/index.ts
@@ -196,6 +196,15 @@ const store = defineStore("main", {
 			}
 			this.applyRoomProfile(this.activeRoomId);
 		},
+		replaceRoomProfiles(roomProfiles: RoomProfile[], preferredActiveRoomId = "") {
+			if (roomProfiles.length <= 0) return false;
+			this.roomProfiles = JSON.parse(JSON.stringify(roomProfiles));
+			this.activeRoomId = this.roomProfiles.some(room => room.id === preferredActiveRoomId)
+				? preferredActiveRoomId
+				: this.roomProfiles[0].id;
+			this.initializeRoomProfiles();
+			return true;
+		},
 		applyRoomProfile(roomId: string) {
 			const room = this.roomProfiles.find(item => item.id === roomId);
 			if (!room) return false;
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 8d1a0d9..6804f7a 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1,6 +1,7 @@
 interface ImportMetaEnv {
 	readonly VITE_CONFIG_PATH: string;
 	readonly VITE_CONFIG_FILE_NAME: string;
+	readonly VITE_GUI_CONFIG_PATH: string;
 	readonly VITE_LOG_PATH: string;
 	readonly VITE_CACHE_PATH: string;
 	readonly VITE_AUTO_START_SERVICE_NAME: string;