Skip to content

Commit 8b73df9

Browse files
committed
refactor(agent-manager): restructure interactive runtimes
1 parent 033c4ef commit 8b73df9

22 files changed

Lines changed: 758 additions & 651 deletions
Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
1-
import { createInteractiveRuntime, isHerdrRegistryEntry } from '../../runtime/AgentRuntime.js';
1+
import { createInteractiveRuntime } from '../../runtime/RuntimeFactory.js';
22

33
describe('AgentRuntime', () => {
4-
it('creates a Herdr runtime only for the Herdr provider', () => {
4+
it('creates a runtime for each supported interactive provider', () => {
55
expect(createInteractiveRuntime('herdr')).toMatchObject({ provider: 'herdr' });
6-
expect(createInteractiveRuntime('tmux')).toBeNull();
7-
});
8-
9-
it('identifies Herdr-backed registry entries', () => {
10-
expect(isHerdrRegistryEntry({
11-
name: 'reviewer',
12-
type: 'codex',
13-
pid: 123,
14-
runtime: 'herdr',
15-
runtimeRef: { session: 'default', paneId: 'w1:p2' },
16-
})).toBe(true);
17-
18-
expect(isHerdrRegistryEntry({
19-
name: 'reviewer',
20-
type: 'codex',
21-
pid: 123,
22-
runtime: 'tmux',
23-
runtimeRef: { session: 'reviewer' },
24-
})).toBe(false);
6+
expect(createInteractiveRuntime('tmux')).toMatchObject({ provider: 'tmux' });
257
});
268
});

‎packages/agent-manager/src/__tests__/runtime/HerdrAgentRuntime.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import { HerdrAgentRuntime, HerdrRuntimeError, type HerdrCommandRunner } from '../../runtime/HerdrAgentRuntime.js';
1+
import { HerdrAgentRuntime } from '../../runtime/herdr/HerdrAgentRuntime.js';
2+
import { HerdrRuntimeError } from '../../runtime/herdr/HerdrErrors.js';
3+
import type { HerdrCommandRunner } from '../../runtime/herdr/HerdrCliClient.js';
24

35
function createRunner(responses: Array<{ stdout?: string; stderr?: string; reject?: Error }> = []): HerdrCommandRunner {
46
const runner = vi.fn(async () => {

‎packages/agent-manager/src/__tests__/runtime/ManagedAgentRuntime.test.ts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
import type { AgentInfo } from '../../adapters/AgentAdapter.js';
1414
import type { AgentRegistry, RegistryEntry } from '../../utils/AgentRegistry.js';
1515
import type { TmuxManager } from '../../terminal/TmuxManager.js';
16-
import type { HerdrInteractiveRuntime } from '../../runtime/AgentRuntime.js';
16+
import type { InteractiveAgentRuntime } from '../../runtime/types.js';
1717

1818
function makeAgent(overrides: Partial<AgentInfo> = {}): AgentInfo {
1919
return {
@@ -53,7 +53,7 @@ function makeRegistry(over: Partial<AgentRegistry> = {}): AgentRegistry {
5353
} as unknown as AgentRegistry;
5454
}
5555

56-
function makeRuntime(over: Partial<HerdrInteractiveRuntime> = {}): HerdrInteractiveRuntime {
56+
function makeRuntime(over: Partial<InteractiveAgentRuntime> = {}): InteractiveAgentRuntime {
5757
return {
5858
provider: 'herdr',
5959
isAvailable: vi.fn().mockResolvedValue({ ok: true, insideRuntime: false }),
@@ -67,7 +67,7 @@ function makeRuntime(over: Partial<HerdrInteractiveRuntime> = {}): HerdrInteract
6767
focus: vi.fn().mockResolvedValue(true),
6868
stop: vi.fn().mockResolvedValue(undefined),
6969
...over,
70-
} as unknown as HerdrInteractiveRuntime;
70+
} as unknown as InteractiveAgentRuntime;
7171
}
7272

7373
const startOpts: StartAgentOptions = {
@@ -157,7 +157,9 @@ describe('stopAgent', () => {
157157
killProcess,
158158
});
159159

160-
expect(runtime.stop).toHaveBeenCalledWith({ runtimeRef: { session: 'default', paneId: 'w1:p2' } });
160+
expect(runtime.stop).toHaveBeenCalledWith(expect.objectContaining({
161+
runtimeRef: { session: 'default', paneId: 'w1:p2' },
162+
}));
161163
expect(killProcess).not.toHaveBeenCalled();
162164
expect(result.runtime).toBe('herdr');
163165
});
@@ -227,7 +229,7 @@ describe('focusAgent', () => {
227229

228230
const result = await focusAgent(makeAgent(), { registry, runtime, focusManager });
229231

230-
expect(runtime.focus).toHaveBeenCalledWith({ runtimeRef });
232+
expect(runtime.focus).toHaveBeenCalledWith(expect.objectContaining({ runtimeRef }));
231233
expect(focusManager.findTerminal).not.toHaveBeenCalled();
232234
expect(result).toEqual({ focused: true });
233235
});
@@ -290,7 +292,10 @@ describe('sendAgentPrompt', () => {
290292
focusManager,
291293
});
292294

293-
expect(runtime.send).toHaveBeenCalledWith({ runtimeRef, prompt: 'hello' });
295+
expect(runtime.send).toHaveBeenCalledWith(
296+
expect.objectContaining({ runtimeRef, prompt: 'hello' }),
297+
expect.objectContaining({ focusManager }),
298+
);
294299
expect(focusManager.findTerminal).not.toHaveBeenCalled();
295300
});
296301

‎packages/agent-manager/src/index.ts‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ export type { ListAgentsOptions } from './AgentManager.js';
5252
export { AgentRegistry, RenameNotFoundError, RenameConflictError, AGENT_RUNTIME_PROVIDERS, parseTmuxRuntimeRef } from './utils/AgentRegistry.js';
5353
export type { AgentRegistryOptions, RegistryEntry, AgentRuntimeProvider, TmuxRuntimeRef } from './utils/AgentRegistry.js';
5454
export { TmuxManager } from './terminal/TmuxManager.js';
55-
export { createHerdrRuntime, createInteractiveRuntime, isHerdrRegistryEntry } from './runtime/AgentRuntime.js';
56-
export type { AgentRuntimeAvailability, HerdrStartRuntime, HerdrInteractiveRuntime } from './runtime/AgentRuntime.js';
55+
export type { AgentRuntimeAvailability, InteractiveAgentRuntime } from './runtime/types.js';
5756
export {
5857
startAgent,
5958
stopAgent,
@@ -76,16 +75,6 @@ export type {
7675
FocusAgentResult,
7776
SendAgentPromptDeps,
7877
} from './runtime/ManagedAgentRuntime.js';
79-
export { HerdrAgentRuntime, HerdrRuntimeError, parseHerdrRuntimeRef } from './runtime/HerdrAgentRuntime.js';
80-
export type {
81-
HerdrCommandResult,
82-
HerdrCommandRunner,
83-
HerdrRuntimeAvailability,
84-
HerdrRuntimeOptions,
85-
HerdrRuntimeRef,
86-
HerdrStartInput,
87-
HerdrStartResult,
88-
} from './runtime/HerdrAgentRuntime.js';
8978
export { AGENTS } from './utils/agents.js';
9079
export type { AgentConfig, StartableAgentType } from './utils/agents.js';
9180

‎packages/agent-manager/src/runtime/AgentRuntime.ts‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)