feat(host-service): terminalAgents tracker + pane wiring

apps/desktop/src/lib/trpc/routers/settings/index.ts

@@ -36,6 +36,7 @@ import { TRPCError } from "@trpc/server";
 import { app } from "electron";
 import { env } from "main/env.main";
 import { exitImmediately } from "main/index";
+import { setupSingleAgent } from "main/lib/agent-setup";
 import { hasCustomRingtone } from "main/lib/custom-ringtones";
 import { getHostServiceCoordinator } from "main/lib/host-service-coordinator";
 import { localDb } from "main/lib/local-db";
@@ -1008,6 +1009,17 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
+		/**
+		 * Re-runs wrapper/settings/hook setup for one agent. Safety net for
+		 * the settings-UI Add flow; returns `{ ran: false }` for unknown ids.
+		 */
+		setupAgent: publicProcedure
+			.input(z.object({ agentId: z.string().min(1) }))
+			.mutation(({ input }) => {
+				const ran = setupSingleAgent(input.agentId);
+				return { ran };
+			}),
+
 		// TODO: remove telemetry procedures once telemetry_enabled column is dropped
 		getTelemetryEnabled: publicProcedure.query(() => {
 			return true;

apps/desktop/src/main/lib/agent-setup/desktop-agent-capabilities.ts

@@ -1,6 +1,6 @@
 import type { AgentType } from "@superset/shared/agent-command";
 
-export type SupersetManagedBinary = AgentType | "droid";
+export type SupersetManagedBinary = AgentType;
 
 export const DESKTOP_AGENT_SETUP_ACTIONS = [
 	"notify-script",
@@ -32,7 +32,7 @@ export type DesktopAgentSetupAction =
 	(typeof DESKTOP_AGENT_SETUP_ACTIONS)[number];
 
 interface DesktopAgentSetupTarget {
-	id: AgentType | "droid";
+	id: AgentType;
 	setupActions: readonly DesktopAgentSetupAction[];
 	managedBinary?: boolean;
 }

apps/desktop/src/main/lib/agent-setup/desktop-agent-setup.ts

@@ -67,3 +67,20 @@ export function setupDesktopAgentCapabilities(): void {
 		}
 	}
 }
+
+/**
+ * Re-run setupActions for one agent. Bootstrap actions run first because
+ * per-agent hooks reference the shared notify script — without them the
+ * per-agent setup isn't self-sufficient. Returns `false` for unknown ids.
+ */
+export function setupSingleAgent(agentId: string): boolean {
+	const target = DESKTOP_AGENT_SETUP_TARGETS.find((t) => t.id === agentId);
+	if (!target) return false;
+	for (const action of DESKTOP_AGENT_SETUP_BOOTSTRAP_ACTIONS) {
+		DESKTOP_AGENT_SETUP_RUNNERS[action]();
+	}
+	for (const action of target.setupActions) {
+		DESKTOP_AGENT_SETUP_RUNNERS[action]();
+	}
+	return true;
+}

apps/desktop/src/main/lib/agent-setup/index.ts

@@ -1,5 +1,8 @@
 import fs from "node:fs";
-import { setupDesktopAgentCapabilities } from "./desktop-agent-setup";
+import {
+	setupDesktopAgentCapabilities,
+	setupSingleAgent,
+} from "./desktop-agent-setup";
 import {
 	BASH_DIR,
 	BIN_DIR,
@@ -36,4 +39,6 @@ export function getSupersetBinDir(): string {
 	return BIN_DIR;
 }
 
+export { setupSingleAgent };
+
 export { getCommandShellArgs, getShellArgs, getShellEnv };

apps/desktop/src/renderer/hooks/host-service/useTerminalAgentBindings/index.ts

@@ -0,0 +1,5 @@
+export {
+	type TerminalAgentBinding,
+	useTerminalAgentBinding,
+	useTerminalAgentBindings,
+} from "./useTerminalAgentBindings";

apps/desktop/src/renderer/hooks/host-service/useTerminalAgentBindings/useTerminalAgentBindings.ts

@@ -0,0 +1,66 @@
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useCallback, useMemo } from "react";
+import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
+import { useWorkspaceEvent } from "../useWorkspaceEvent";
+import { useWorkspaceHostUrl } from "../useWorkspaceHostUrl";
+
+type ListByWorkspaceClient = ReturnType<
+	typeof getHostServiceClientByUrl
+>["terminalAgents"]["listByWorkspace"];
+type TerminalAgentBindings = Awaited<
+	ReturnType<ListByWorkspaceClient["query"]>
+>;
+export type TerminalAgentBinding = TerminalAgentBindings[number];
+
+/**
+ * Map of `terminalId → agent binding` for a workspace, read from the host
+ * store and invalidated on `agent:lifecycle` / `terminal:lifecycle` events.
+ */
+export function useTerminalAgentBindings(
+	workspaceId: string,
+): Map<string, TerminalAgentBinding> {
+	const hostUrl = useWorkspaceHostUrl(workspaceId);
+	const queryClient = useQueryClient();
+	const queryKey = useMemo(
+		() => ["terminal-agent-bindings", hostUrl, workspaceId] as const,
+		[hostUrl, workspaceId],
+	);
+
+	const enabled = Boolean(workspaceId) && Boolean(hostUrl);
+
+	const { data } = useQuery({
+		queryKey,
+		enabled,
+		queryFn: () => {
+			if (!hostUrl) return [] as TerminalAgentBindings;
+			return getHostServiceClientByUrl(
+				hostUrl,
+			).terminalAgents.listByWorkspace.query({ workspaceId });
+		},
+		refetchOnWindowFocus: false,
+		staleTime: Number.POSITIVE_INFINITY,
+	});
+
+	const invalidate = useCallback(() => {
+		void queryClient.invalidateQueries({ queryKey });
+	}, [queryClient, queryKey]);
+
+	useWorkspaceEvent("agent:lifecycle", workspaceId, invalidate, enabled);
+	useWorkspaceEvent("terminal:lifecycle", workspaceId, invalidate, enabled);
+
+	return useMemo(() => {
+		const map = new Map<string, TerminalAgentBinding>();
+		for (const binding of data ?? []) {
+			map.set(binding.terminalId, binding);
+		}
+		return map;
+	}, [data]);
+}
+
+export function useTerminalAgentBinding(
+	workspaceId: string,
+	terminalId: string,
+): TerminalAgentBinding | undefined {
+	const bindings = useTerminalAgentBindings(workspaceId);
+	return bindings.get(terminalId);
+}

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/components/TerminalPaneIcon/TerminalPaneIcon.tsx

@@ -1,23 +1,25 @@
 import { BUILTIN_AGENT_LABELS } from "@superset/shared/agent-catalog";
 import { TerminalSquare } from "lucide-react";
 import { usePresetIcon } from "renderer/assets/app-icons/preset-icons";
-import {
-	selectV2AgentBinding,
-	useV2AgentBindingStore,
-} from "renderer/stores/v2-agent-bindings";
+import { useTerminalAgentBinding } from "renderer/hooks/host-service/useTerminalAgentBindings";
 
 interface TerminalPaneIconProps {
+	workspaceId: string;
 	terminalId: string;
 }
 
 /**
- * Pane icon that swaps in the running agent's logo when the v2 lifecycle hook
- * has detected one in this terminal. Falls back to the generic terminal glyph
- * when no agent is bound or the agent id has no preset icon.
+ * Pane icon that swaps in the running agent's logo when the host-service
+ * `terminalAgents` tracker has detected one in this terminal. Falls back
+ * to the generic terminal glyph when no agent is bound or the agent id
+ * has no preset icon.
  */
-export function TerminalPaneIcon({ terminalId }: TerminalPaneIconProps) {
-	const binding = useV2AgentBindingStore(selectV2AgentBinding(terminalId));
-	const agentId = binding?.identity.agentId;
+export function TerminalPaneIcon({
+	workspaceId,
+	terminalId,
+}: TerminalPaneIconProps) {
+	const binding = useTerminalAgentBinding(workspaceId, terminalId);
+	const agentId = binding?.agentId;
 	const iconSrc = usePresetIcon(agentId ?? "");
 
 	if (agentId && iconSrc) {

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/components/TerminalSessionDropdown/TerminalSessionDropdown.tsx

@@ -290,7 +290,7 @@ export function TerminalSessionDropdown({
 					onMouseDown={(event) => event.stopPropagation()}
 					onClick={(event) => event.stopPropagation()}
 				>
-					<TerminalPaneIcon terminalId={terminalId} />
+					<TerminalPaneIcon workspaceId={workspaceId} terminalId={terminalId} />
 					{workspaceRunState && (
 						<span
 							className={