feat(coding-agent): added focused subagent session mode for main-agent hub navigation

- Added a SessionFocusController to switch transcript and input context between main and subagent sessions. - Added agent-hub Enter activation and double-left return behavior for focused local agents. - Added view-session-based event and render logic to avoid stale focus-session state. - Added status-line focused agent display with ghost icon and focused-mode border dimming.
2026-06-12 15:37:56 +02:00
parent b3bcdf3c7c
commit c938fe4d27
34 changed files with 1449 additions and 539 deletions
@@ -0,0 +1,172 @@
+/**
+ * Hub Enter contract: activating a non-remote agent row delegates to the
+ * `focusAgent` dep (session focus proxy) and closes the hub on success; a
+ * focus failure keeps the hub open and surfaces the error as a notice.
+ */
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "bun:test";
+import { resetSettingsForTest, Settings } from "@oh-my-pi/pi-coding-agent/config/settings";
+import { IrcBus } from "@oh-my-pi/pi-coding-agent/irc/bus";
+import { AgentHubOverlayComponent } from "@oh-my-pi/pi-coding-agent/modes/components/agent-hub";
+import { SelectorController } from "@oh-my-pi/pi-coding-agent/modes/controllers/selector-controller";
+import { SessionObserverRegistry } from "@oh-my-pi/pi-coding-agent/modes/session-observer-registry";
+import { initTheme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
+import { AgentRegistry } from "@oh-my-pi/pi-coding-agent/registry/agent-registry";
+import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import { TempDir } from "@oh-my-pi/pi-utils";
+
+const AGENT_ID = "Worker";
+
+function makeHub(focusAgent: (id: string) => Promise<void>) {
+	const agents = new AgentRegistry();
+	agents.register({
+		id: AGENT_ID,
+		displayName: AGENT_ID,
+		kind: "sub",
+		parentId: "Main",
+		session: { subscribe: () => () => {} } as unknown as AgentSession,
+		sessionFile: null,
+		status: "running",
+	});
+	let doneCalls = 0;
+	const done = Promise.withResolvers<void>();
+	const renderRequested = Promise.withResolvers<void>();
+	const hub = new AgentHubOverlayComponent({
+		observers: new SessionObserverRegistry(),
+		hubKeys: [],
+		onDone: () => {
+			doneCalls++;
+			done.resolve();
+		},
+		requestRender: () => renderRequested.resolve(),
+		registry: agents,
+		irc: new IrcBus(agents),
+		focusAgent,
+	});
+	return { hub, doneCalls: () => doneCalls, done: done.promise, renderRequested: renderRequested.promise };
+}
+
+describe("Agent hub Enter activation", () => {
+	beforeAll(() => {
+		initTheme();
+	});
+
+	beforeEach(async () => {
+		resetSettingsForTest();
+		await Settings.init({ inMemory: true });
+	});
+
+	afterEach(() => {
+		resetSettingsForTest();
+	});
+
+	it("Enter focuses the selected agent and closes the hub", async () => {
+		const focusedIds: string[] = [];
+		const { hub, doneCalls, done } = makeHub(async id => {
+			focusedIds.push(id);
+		});
+
+		hub.handleInput("\r");
+		await done; // activation is fire-and-forget async; onDone signals completion
+
+		expect(focusedIds).toEqual([AGENT_ID]);
+		expect(doneCalls()).toBe(1);
+		hub.dispose();
+	});
+
+	it("a focus failure keeps the hub open and shows the error as a notice", async () => {
+		const message = 'Agent "X" is aborted and cannot be revived';
+		const { hub, doneCalls, renderRequested } = makeHub(() => Promise.reject(new Error(message)));
+
+		hub.handleInput("\r");
+		await renderRequested; // the rejection path requests a render after setting the notice
+
+		expect(doneCalls()).toBe(0);
+		const rendered = Bun.stripANSI(hub.render(120).join("\n"));
+		expect(rendered).toContain(message);
+		hub.dispose();
+	});
+
+	it("lists persisted subagent session files after restart", async () => {
+		using tempDir = TempDir.createSync("@omp-agent-hub-persisted-");
+		const sessionFile = `${tempDir.path()}/main.jsonl`;
+		await Bun.write(sessionFile, "");
+		await Bun.write(`${tempDir.path()}/main/Worker.jsonl`, "");
+		const agents = new AgentRegistry();
+		const hub = new AgentHubOverlayComponent({
+			observers: new SessionObserverRegistry(),
+			hubKeys: [],
+			onDone: () => {},
+			requestRender: () => {},
+			registry: agents,
+			irc: new IrcBus(agents),
+			focusAgent: async () => {},
+			sessionFile,
+		});
+
+		const rendered = Bun.stripANSI(hub.render(120).join("\n"));
+		expect(rendered).toContain("Worker");
+		expect(rendered).toContain("parked");
+		expect(agents.get("Worker")?.sessionFile).toBe(`${tempDir.path()}/main/Worker.jsonl`);
+		hub.dispose();
+	});
+
+	it("selector controller restores focus to the editor after Enter focuses an agent", async () => {
+		const agents = new AgentRegistry();
+		agents.register({
+			id: AGENT_ID,
+			displayName: AGENT_ID,
+			kind: "sub",
+			parentId: "Main",
+			session: { subscribe: () => () => {} } as unknown as AgentSession,
+			sessionFile: null,
+			status: "running",
+		});
+
+		const editor = {};
+		let capturedHub: AgentHubOverlayComponent | undefined;
+		let hideCalls = 0;
+		const focusedIds: string[] = [];
+		const focusResolved = Promise.withResolvers<void>();
+		const editorFocused = Promise.withResolvers<void>();
+		const focusTargets: unknown[] = [];
+		const ctx = {
+			keybindings: { getKeys: () => [] },
+			ui: {
+				showOverlay: (component: AgentHubOverlayComponent) => {
+					capturedHub = component;
+					return { hide: () => hideCalls++ };
+				},
+				setFocus: (target: unknown) => {
+					focusTargets.push(target);
+					if (target === editor) editorFocused.resolve();
+				},
+				requestRender: () => {},
+			},
+			editor,
+			collabGuest: { agentRegistry: agents, hubRemote: undefined },
+			focusAgentSession: async (id: string) => {
+				focusedIds.push(id);
+				focusResolved.resolve();
+			},
+			session: { getToolByName: () => undefined, extensionRunner: undefined },
+			sessionManager: { getCwd: () => "/tmp", getSessionFile: () => null },
+			hideThinkingBlock: false,
+		};
+		const controller = new SelectorController(ctx as unknown as InteractiveModeContext);
+
+		controller.showAgentHub(new SessionObserverRegistry());
+
+		expect(capturedHub).toBeDefined();
+		expect(focusTargets[0]).toBe(capturedHub);
+
+		capturedHub!.handleInput("\r");
+		await focusResolved.promise;
+		await editorFocused.promise;
+
+		expect(focusedIds).toEqual([AGENT_ID]);
+		expect(hideCalls).toBe(1);
+		expect(focusTargets.at(-1)).toBe(editor);
+		capturedHub!.dispose();
+	});
+});