mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-11 17:00:22 +00:00
* fix(tray): 托盘面板会话条目新增关闭按钮 托盘面板(TrayPanel)里的每个会话条目此前只支持点击跳转到主窗口, 没有直接关闭会话的入口。对于AI静默会话(隐藏在标签栏之外)尤其 不便:用户在托盘"偷看一眼"后想关闭它,只能先跳转把它变成可见标签, 再去主窗口关闭,这与静默会话"不打扰用户"的设计初衷相悖。 给workspace分组内和独立(solo)会话条目均新增一个悬停可见的关闭 按钮,复用主窗口/MCP session.close同款的两段式关闭流程(先通知 主进程断开连接,再从React状态中移除),点击时阻止事件冒泡以免 触发跳转。 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix(tray): 关闭会话请求转发到主窗口的App状态 TrayPanel运行在独立的BrowserWindow里,之前"关闭"按钮调用的 closeSession来自TrayPanel自己的useSessionState实例——这份session 状态与主窗口App真正持有的sessions是两棵完全独立的状态树(前者通常 是空的)。之前的实现只做对了一半:netcattyBridge.closeSession确实 杀掉了后端PTY连接,但紧接着的React状态移除操作作用在了错误的 状态树上,导致主窗口仍会把这个"已关闭"的会话继续推送回托盘菜单, 对没有标签页可关闭的隐藏AI会话尤其明显。 新增netcatty:trayPanel:closeSession这条IPC转发链路(照抄 jumpToSession/connectToHost的既有转发模式):TrayPanel调用 closeSessionFromTrayPanel → 主进程收到后转发给主窗口 → 主窗口 监听onTrayPanelCloseSession,调用自己拥有的closeSessionForVaultAgent (与MCP session_close同一个函数)。 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * fix(tray): keep session close silent and refreshed * fix(tray): avoid recreating main window on close --------- Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> Co-authored-by: bincxz <16399091+binaricat@users.noreply.github.com>
80 lines
2.4 KiB
TypeScript
80 lines
2.4 KiB
TypeScript
import { useCallback } from "react";
|
|
import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
|
|
|
|
export const useTrayPanelBackend = () => {
|
|
const hideTrayPanel = useCallback(async () => {
|
|
const bridge = netcattyBridge.get();
|
|
await bridge?.hideTrayPanel?.();
|
|
}, []);
|
|
|
|
const openMainWindow = useCallback(async () => {
|
|
const bridge = netcattyBridge.get();
|
|
await bridge?.openMainWindow?.();
|
|
}, []);
|
|
|
|
const quitApp = useCallback(async () => {
|
|
const bridge = netcattyBridge.get();
|
|
await bridge?.quitApp?.();
|
|
}, []);
|
|
|
|
const jumpToSession = useCallback(async (sessionId: string) => {
|
|
const bridge = netcattyBridge.get();
|
|
await bridge?.jumpToSessionFromTrayPanel?.(sessionId);
|
|
}, []);
|
|
|
|
const closeSessionFromTrayPanel = useCallback(async (sessionId: string) => {
|
|
const bridge = netcattyBridge.get();
|
|
await bridge?.closeSessionFromTrayPanel?.(sessionId);
|
|
}, []);
|
|
|
|
const connectToHostFromTrayPanel = useCallback(async (hostId: string) => {
|
|
const bridge = netcattyBridge.get();
|
|
await bridge?.connectToHostFromTrayPanel?.(hostId);
|
|
}, []);
|
|
|
|
const onTrayPanelCloseRequest = useCallback((callback: () => void) => {
|
|
const bridge = netcattyBridge.get();
|
|
return bridge?.onTrayPanelCloseRequest?.(callback);
|
|
}, []);
|
|
|
|
const onTrayPanelRefresh = useCallback((callback: () => void) => {
|
|
const bridge = netcattyBridge.get();
|
|
return bridge?.onTrayPanelRefresh?.(callback);
|
|
}, []);
|
|
|
|
const onTrayPanelMenuData = useCallback(
|
|
(
|
|
callback: (data: {
|
|
sessions?: Array<{ id: string; label: string; hostLabel: string; status: "connecting" | "connected" | "disconnected"; workspaceId?: string; workspaceTitle?: string }>;
|
|
portForwardRules?: Array<{
|
|
id: string;
|
|
label: string;
|
|
type: "local" | "remote" | "dynamic";
|
|
localPort: number;
|
|
remoteHost?: string;
|
|
remotePort?: number;
|
|
status: "inactive" | "connecting" | "active" | "error";
|
|
hostId?: string;
|
|
canStop?: boolean;
|
|
}>;
|
|
}) => void,
|
|
) => {
|
|
const bridge = netcattyBridge.get();
|
|
return bridge?.onTrayPanelMenuData?.(callback);
|
|
},
|
|
[],
|
|
);
|
|
|
|
return {
|
|
hideTrayPanel,
|
|
openMainWindow,
|
|
quitApp,
|
|
jumpToSession,
|
|
closeSessionFromTrayPanel,
|
|
connectToHostFromTrayPanel,
|
|
onTrayPanelCloseRequest,
|
|
onTrayPanelRefresh,
|
|
onTrayPanelMenuData,
|
|
};
|
|
};
|