@rexvane/piweb 0.3.25 → 0.3.26

package/src/components/RemoteSection.tsx

@@ -233,7 +233,8 @@ export function RemoteSection() {
 					aria-checked={pluginOn}
 					aria-label={t.remotePluginToggle}
 					title={t.remotePluginHint}
-					disabled={busy || !status}
+					// 被拦住（没开认证 / 开发模式）时入口一律开不出来，开关拨了也没有意义
+					disabled={busy || !status || blocked !== null}
 					onClick={() => void togglePlugin()}
 				>
 					<span className="absolute top-0.5 h-4 w-4 rounded-full bg-white transition-all" style={{ left: pluginOn ? 18 : 2 }} />

package/src/components/SessionSidebar.tsx

@@ -221,11 +221,17 @@ function SessionSidebarImpl({
 		}
 	};
 
-	const currentCwd = sessions.find((s) => s.path === currentPath)?.cwd;
+	// 路径一律按 normPath 比：注册表里的工作区经过 path.resolve，会话头里的 cwd 是原样记下的，
+	// Windows 上盘符大小写、分隔符、尾斜杠都可能不同
+	const currentKey = currentPath ? normPath(currentPath) : "";
+	const currentCwd = currentKey ? sessions.find((s) => normPath(s.path) === currentKey)?.cwd : undefined;
 
 	useEffect(() => {
 		if (!viewMenu && !rowMenu && !sessionMenu) return;
 		const h = (e: MouseEvent) => {
+			// 按在行菜单的「…」按钮上：交给按钮的 onClick 切换（它也会关掉另一种菜单）。
+			// 这里先关的话，紧跟着的 click 又把菜单打开，再点一下「…」永远关不掉
+			if ((e.target as Element | null)?.closest?.("[data-menu-trigger]")) return;
 			if (menuRef.current && !menuRef.current.contains(e.target as Node)) {
 				setViewMenu(false);
 				setRowMenu(null);
@@ -325,7 +331,7 @@ function SessionSidebarImpl({
 		} catch {
 			/* ignore */
 		}
-		const s = sessions.find((item) => item.path === currentPath);
+		const s = sessions.find((item) => normPath(item.path) === normPath(currentPath));
 		if (!s) return; // 会话列表尚未加载，等轮询后重试
 		lastExpandedFor.current = currentPath;
 		const matchedGroup = workspaceGroups.find((g) => normPath(g.cwd) === normPath(s.cwd));
@@ -400,7 +406,7 @@ function SessionSidebarImpl({
 	}
 
 	const sessionRow = (s: SessionListItem, indented: boolean, archived = false) => {
-		const selected = s.path === currentPath;
+		const selected = !!currentKey && normPath(s.path) === currentKey;
 		// dsh 合同：被归档的当前会话仍显示在主列表，菜单按真实归档态切换
 		const reallyArchived = archived || archivedPaths.some((p) => normPath(p) === normPath(s.path));
 		return (
@@ -444,6 +450,7 @@ function SessionSidebarImpl({
 						style={{ width: 22, height: 22 }}
 						title="..."
 						aria-label="session-actions"
+						data-menu-trigger="session"
 						onClick={(e) => {
 							e.stopPropagation();
 							setSessionMenu(sessionMenu === s.path ? null : s.path);
@@ -489,6 +496,7 @@ function SessionSidebarImpl({
 						<MenuItem
 							icon={<IconArchiveOutline20 size={14} />}
 							label={reallyArchived ? t.unarchiveSession : t.archiveSession}
+							title={reallyArchived ? undefined : t.archiveRetentionHint}
 							onClick={(e) => {
 								e.stopPropagation();
 								setSessionMenu(null);
@@ -505,7 +513,7 @@ function SessionSidebarImpl({
 	const workspaceRow = (g: WorkspaceGroup) => {
 		const isUngrouped = g.cwd === "__ungrouped__";
 		const open = openSet.has(g.cwd);
-		const isCurrent = !isUngrouped && g.cwd === currentCwd;
+		const isCurrent = !isUngrouped && !!currentCwd && normPath(g.cwd) === normPath(currentCwd);
 		// 草稿新会话属于哪个分组：路径匹配的工作区，否则归未分组
 		const draftInThisGroup = draftCwd
 			? (isUngrouped
@@ -561,6 +569,7 @@ function SessionSidebarImpl({
 								style={{ width: 22, height: 22 }}
 								title="..."
 								aria-label="workspace-actions"
+								data-menu-trigger="workspace"
 								onClick={() => {
 									setRowMenu(rowMenu === g.cwd ? null : g.cwd);
 									setSessionMenu(null);
@@ -828,6 +837,7 @@ function SessionSidebarImpl({
 							type="button"
 							className="isx-menu-item flex w-full items-center gap-2 rounded-xl px-2.5 py-2 text-left"
 							aria-expanded={archiveOpen}
+							title={t.archiveRetentionDetail}
 							onClick={() => setArchiveOpen((open) => !open)}
 						>
 							<span
@@ -847,6 +857,11 @@ function SessionSidebarImpl({
 							<span className="isx-menu-shift min-w-0 flex-1 truncate" style={{ fontSize: 13 }}>{t.archivedSessions}</span>
 							<span className="isx-menu-sub pr-2" style={{ fontSize: 11, color: "var(--dsw-label-caption)" }}>{archivedSessions.length}</span>
 						</button>
+						{archiveOpen && (
+							<div className="px-2.5 pb-1" style={{ fontSize: 11, color: "var(--dsw-label-caption)" }} title={t.archiveRetentionDetail}>
+								{t.archiveRetentionHint}
+							</div>
+						)}
 						{archiveOpen && archivedSessions.map((session) => sessionRow(session, true, true))}
 					</div>
 				)}
@@ -1022,16 +1037,19 @@ export const SessionSidebar = memo(SessionSidebarImpl);
 function MenuItem({
 	icon,
 	label,
+	title,
 	danger,
 	onClick,
 }: {
 	icon: React.ReactNode;
 	label: string;
+	title?: string;
 	danger?: boolean;
 	onClick: (e: React.MouseEvent) => void;
 }) {
 	return (
 		<button
+			title={title}
 			data-danger={danger ? "true" : undefined}
 			className="isx-menu-item mx-1 flex w-[calc(100%-8px)] items-center gap-2.5 rounded-lg px-3 py-2 text-left"
 			style={{ fontSize: 13, color: danger ? "var(--dsw-danger)" : "var(--dsw-label-primary)" }}