shennian 0.1.15 → 0.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/__tests__/codex-adapter.test.d.ts +2 -0
- package/dist/src/__tests__/codex-adapter.test.d.ts.map +1 -0
- package/dist/src/__tests__/codex-adapter.test.js +123 -0
- package/dist/src/__tests__/codex-adapter.test.js.map +1 -0
- package/dist/src/__tests__/cursor-adapter.test.d.ts +2 -0
- package/dist/src/__tests__/cursor-adapter.test.d.ts.map +1 -0
- package/dist/src/__tests__/cursor-adapter.test.js +69 -0
- package/dist/src/__tests__/cursor-adapter.test.js.map +1 -0
- package/dist/src/__tests__/model-switching.test.js +81 -0
- package/dist/src/__tests__/model-switching.test.js.map +1 -1
- package/dist/src/agents/adapter.d.ts +1 -0
- package/dist/src/agents/adapter.d.ts.map +1 -1
- package/dist/src/agents/adapter.js +3 -0
- package/dist/src/agents/adapter.js.map +1 -1
- package/dist/src/agents/codex.d.ts +9 -0
- package/dist/src/agents/codex.d.ts.map +1 -1
- package/dist/src/agents/codex.js +82 -27
- package/dist/src/agents/codex.js.map +1 -1
- package/dist/src/agents/command-spec.d.ts +1 -0
- package/dist/src/agents/command-spec.d.ts.map +1 -1
- package/dist/src/agents/command-spec.js +4 -0
- package/dist/src/agents/command-spec.js.map +1 -1
- package/dist/src/agents/cursor.d.ts +5 -0
- package/dist/src/agents/cursor.d.ts.map +1 -1
- package/dist/src/agents/cursor.js +40 -4
- package/dist/src/agents/cursor.js.map +1 -1
- package/dist/src/agents/model-registry/cache.d.ts +5 -0
- package/dist/src/agents/model-registry/cache.d.ts.map +1 -0
- package/dist/src/agents/model-registry/cache.js +38 -0
- package/dist/src/agents/model-registry/cache.js.map +1 -0
- package/dist/src/agents/model-registry/discovery.d.ts +5 -0
- package/dist/src/agents/model-registry/discovery.d.ts.map +1 -0
- package/dist/src/agents/model-registry/discovery.js +104 -0
- package/dist/src/agents/model-registry/discovery.js.map +1 -0
- package/dist/src/agents/model-registry/parsers.d.ts +8 -0
- package/dist/src/agents/model-registry/parsers.d.ts.map +1 -0
- package/dist/src/agents/model-registry/parsers.js +182 -0
- package/dist/src/agents/model-registry/parsers.js.map +1 -0
- package/dist/src/agents/model-registry/runner.d.ts +11 -0
- package/dist/src/agents/model-registry/runner.d.ts.map +1 -0
- package/dist/src/agents/model-registry/runner.js +150 -0
- package/dist/src/agents/model-registry/runner.js.map +1 -0
- package/dist/src/agents/model-registry/service.d.ts +7 -0
- package/dist/src/agents/model-registry/service.d.ts.map +1 -0
- package/dist/src/agents/model-registry/service.js +69 -0
- package/dist/src/agents/model-registry/service.js.map +1 -0
- package/dist/src/agents/model-registry/types.d.ts +29 -0
- package/dist/src/agents/model-registry/types.d.ts.map +1 -0
- package/dist/src/agents/model-registry/types.js +9 -0
- package/dist/src/agents/model-registry/types.js.map +1 -0
- package/dist/src/agents/model-registry.d.ts +2 -18
- package/dist/src/agents/model-registry.d.ts.map +1 -1
- package/dist/src/agents/model-registry.js +4 -519
- package/dist/src/agents/model-registry.js.map +1 -1
- package/dist/src/commands/agent.js +2 -2
- package/dist/src/commands/agent.js.map +1 -1
- package/dist/src/session/handlers/agents.d.ts +5 -0
- package/dist/src/session/handlers/agents.d.ts.map +1 -0
- package/dist/src/session/handlers/agents.js +56 -0
- package/dist/src/session/handlers/agents.js.map +1 -0
- package/dist/src/session/handlers/chat.d.ts +5 -0
- package/dist/src/session/handlers/chat.d.ts.map +1 -0
- package/dist/src/session/handlers/chat.js +139 -0
- package/dist/src/session/handlers/chat.js.map +1 -0
- package/dist/src/session/handlers/control.d.ts +6 -0
- package/dist/src/session/handlers/control.d.ts.map +1 -0
- package/dist/src/session/handlers/control.js +58 -0
- package/dist/src/session/handlers/control.js.map +1 -0
- package/dist/src/session/handlers/fs.d.ts +11 -0
- package/dist/src/session/handlers/fs.d.ts.map +1 -0
- package/dist/src/session/handlers/fs.js +222 -0
- package/dist/src/session/handlers/fs.js.map +1 -0
- package/dist/src/session/manager.d.ts +2 -14
- package/dist/src/session/manager.d.ts.map +1 -1
- package/dist/src/session/manager.js +45 -420
- package/dist/src/session/manager.js.map +1 -1
- package/dist/src/session/types.d.ts +25 -0
- package/dist/src/session/types.d.ts.map +1 -0
- package/dist/src/session/types.js +5 -0
- package/dist/src/session/types.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-adapter.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/codex-adapter.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
// @arch docs/architecture/cli/agent-adapters.md
|
|
2
|
+
// @covers src/agents/codex.ts
|
|
3
|
+
import { describe, expect, it } from 'vitest';
|
|
4
|
+
import { CodexAdapter } from '../agents/codex.js';
|
|
5
|
+
function createHarness() {
|
|
6
|
+
const adapter = new CodexAdapter();
|
|
7
|
+
const internal = adapter;
|
|
8
|
+
internal.runId = 'run-codex-test';
|
|
9
|
+
internal.seq = 0;
|
|
10
|
+
const events = [];
|
|
11
|
+
adapter.on('agentEvent', (event) => events.push(event));
|
|
12
|
+
return { internal, events };
|
|
13
|
+
}
|
|
14
|
+
describe('CodexAdapter', () => {
|
|
15
|
+
it('preserves paragraph breaks between completed agent_message blocks', () => {
|
|
16
|
+
const { internal, events } = createHarness();
|
|
17
|
+
internal.handleStreamEvent({
|
|
18
|
+
type: 'item.completed',
|
|
19
|
+
item: { type: 'agent_message', text: '第一段。' },
|
|
20
|
+
});
|
|
21
|
+
internal.handleStreamEvent({
|
|
22
|
+
type: 'item.completed',
|
|
23
|
+
item: { type: 'agent_message', text: '第二段。' },
|
|
24
|
+
});
|
|
25
|
+
expect(events.filter((event) => event.state === 'delta')).toEqual([
|
|
26
|
+
expect.objectContaining({ state: 'delta', text: '第一段。' }),
|
|
27
|
+
expect.objectContaining({ state: 'delta', text: '\n\n第二段。' }),
|
|
28
|
+
]);
|
|
29
|
+
});
|
|
30
|
+
it('avoids adding an extra blank line when the previous block already ended with a newline', () => {
|
|
31
|
+
const { internal, events } = createHarness();
|
|
32
|
+
internal.handleStreamEvent({
|
|
33
|
+
type: 'item.completed',
|
|
34
|
+
item: { type: 'agent_message', text: '第一段。\n' },
|
|
35
|
+
});
|
|
36
|
+
internal.handleStreamEvent({
|
|
37
|
+
type: 'item.completed',
|
|
38
|
+
item: { type: 'agent_message', text: '第二段。' },
|
|
39
|
+
});
|
|
40
|
+
expect(events.filter((event) => event.state === 'delta')).toEqual([
|
|
41
|
+
expect.objectContaining({ state: 'delta', text: '第一段。\n' }),
|
|
42
|
+
expect.objectContaining({ state: 'delta', text: '\n第二段。' }),
|
|
43
|
+
]);
|
|
44
|
+
});
|
|
45
|
+
it('emits final on turn.completed with usage and agent session id', () => {
|
|
46
|
+
const { internal, events } = createHarness();
|
|
47
|
+
internal.agentSessionId = 'thread-123';
|
|
48
|
+
internal.handleStreamEvent({
|
|
49
|
+
type: 'turn.completed',
|
|
50
|
+
usage: { input_tokens: 12, output_tokens: 34 },
|
|
51
|
+
});
|
|
52
|
+
expect(events).toContainEqual(expect.objectContaining({
|
|
53
|
+
state: 'final',
|
|
54
|
+
agentSessionId: 'thread-123',
|
|
55
|
+
usage: { inputTokens: 12, outputTokens: 34 },
|
|
56
|
+
}));
|
|
57
|
+
});
|
|
58
|
+
it('emits final only once when multiple completion events arrive', () => {
|
|
59
|
+
const { internal, events } = createHarness();
|
|
60
|
+
internal.handleStreamEvent({
|
|
61
|
+
type: 'turn.completed',
|
|
62
|
+
usage: { prompt_tokens: 12, completion_tokens: 34 },
|
|
63
|
+
});
|
|
64
|
+
internal.handleStreamEvent({
|
|
65
|
+
type: 'completed',
|
|
66
|
+
usage: { prompt_tokens: 99, completion_tokens: 88 },
|
|
67
|
+
});
|
|
68
|
+
expect(events.filter((event) => event.state === 'final')).toEqual([
|
|
69
|
+
expect.objectContaining({
|
|
70
|
+
state: 'final',
|
|
71
|
+
usage: { inputTokens: 12, outputTokens: 34 },
|
|
72
|
+
}),
|
|
73
|
+
]);
|
|
74
|
+
});
|
|
75
|
+
it('keeps close as a final fallback when protocol completion is missing', () => {
|
|
76
|
+
const { internal, events } = createHarness();
|
|
77
|
+
internal.agentSessionId = 'thread-456';
|
|
78
|
+
internal.handleProcessClose(0, '');
|
|
79
|
+
expect(events).toEqual([
|
|
80
|
+
expect.objectContaining({
|
|
81
|
+
state: 'final',
|
|
82
|
+
agentSessionId: 'thread-456',
|
|
83
|
+
}),
|
|
84
|
+
]);
|
|
85
|
+
});
|
|
86
|
+
it('treats stderr on zero exit as an error when no terminal protocol event arrived', () => {
|
|
87
|
+
const { internal, events } = createHarness();
|
|
88
|
+
internal.handleProcessClose(0, 'unexpected status 401 Unauthorized');
|
|
89
|
+
expect(events).toEqual([
|
|
90
|
+
expect.objectContaining({
|
|
91
|
+
state: 'error',
|
|
92
|
+
message: 'unexpected status 401 Unauthorized',
|
|
93
|
+
}),
|
|
94
|
+
]);
|
|
95
|
+
});
|
|
96
|
+
it('suppresses close fallback after a terminal error has already been emitted', () => {
|
|
97
|
+
const { internal, events } = createHarness();
|
|
98
|
+
internal.handleStreamEvent({
|
|
99
|
+
type: 'turn.failed',
|
|
100
|
+
error: 'boom',
|
|
101
|
+
});
|
|
102
|
+
internal.handleProcessClose(1, 'codex exited with code 1');
|
|
103
|
+
expect(events.filter((event) => event.state === 'error')).toEqual([
|
|
104
|
+
expect.objectContaining({ state: 'error', message: 'boom' }),
|
|
105
|
+
]);
|
|
106
|
+
});
|
|
107
|
+
it('does not turn a completed turn into an error just because stderr arrived before close', () => {
|
|
108
|
+
const { internal, events } = createHarness();
|
|
109
|
+
internal.handleStreamEvent({
|
|
110
|
+
type: 'turn.completed',
|
|
111
|
+
usage: { input_tokens: 1, output_tokens: 2 },
|
|
112
|
+
});
|
|
113
|
+
internal.handleProcessClose(0, 'warning text');
|
|
114
|
+
expect(events.filter((event) => event.state === 'final')).toEqual([
|
|
115
|
+
expect.objectContaining({
|
|
116
|
+
state: 'final',
|
|
117
|
+
usage: { inputTokens: 1, outputTokens: 2 },
|
|
118
|
+
}),
|
|
119
|
+
]);
|
|
120
|
+
expect(events.filter((event) => event.state === 'error')).toHaveLength(0);
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
//# sourceMappingURL=codex-adapter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-adapter.test.js","sourceRoot":"","sources":["../../../src/__tests__/codex-adapter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cursor-adapter.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/cursor-adapter.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
// @arch docs/architecture/cli/agent-adapters.md
|
|
2
|
+
// @covers src/agents/cursor.ts
|
|
3
|
+
import { describe, expect, it } from 'vitest';
|
|
4
|
+
import { CursorAdapter } from '../agents/cursor.js';
|
|
5
|
+
function createHarness() {
|
|
6
|
+
const adapter = new CursorAdapter();
|
|
7
|
+
const internal = adapter;
|
|
8
|
+
internal.runId = 'run-cursor-test';
|
|
9
|
+
internal.seq = 0;
|
|
10
|
+
const events = [];
|
|
11
|
+
adapter.on('agentEvent', (event) => events.push(event));
|
|
12
|
+
return { internal, events };
|
|
13
|
+
}
|
|
14
|
+
describe('CursorAdapter', () => {
|
|
15
|
+
it('ignores buffered assistant flushes and emits final once', () => {
|
|
16
|
+
const { internal, events } = createHarness();
|
|
17
|
+
internal.handleStreamEvent({
|
|
18
|
+
type: 'assistant',
|
|
19
|
+
timestamp_ms: 1,
|
|
20
|
+
message: {
|
|
21
|
+
content: [{ type: 'text', text: '你好,我是你的编程助手。' }],
|
|
22
|
+
},
|
|
23
|
+
});
|
|
24
|
+
internal.handleStreamEvent({
|
|
25
|
+
type: 'assistant',
|
|
26
|
+
timestamp_ms: 2,
|
|
27
|
+
model_call_id: 'call-1',
|
|
28
|
+
message: {
|
|
29
|
+
content: [{ type: 'text', text: '你好,我是你的编程助手。' }],
|
|
30
|
+
},
|
|
31
|
+
});
|
|
32
|
+
internal.handleStreamEvent({
|
|
33
|
+
type: 'assistant',
|
|
34
|
+
message: {
|
|
35
|
+
content: [{ type: 'text', text: '你好,我是你的编程助手。' }],
|
|
36
|
+
},
|
|
37
|
+
});
|
|
38
|
+
internal.handleStreamEvent({
|
|
39
|
+
type: 'result',
|
|
40
|
+
subtype: 'success',
|
|
41
|
+
result: '你好,我是你的编程助手。',
|
|
42
|
+
});
|
|
43
|
+
expect(events.filter((event) => event.state === 'delta')).toEqual([
|
|
44
|
+
expect.objectContaining({ state: 'delta', text: '你好,我是你的编程助手。' }),
|
|
45
|
+
]);
|
|
46
|
+
expect(events.at(-1)).toEqual(expect.objectContaining({ state: 'final' }));
|
|
47
|
+
});
|
|
48
|
+
it('falls back to result.result when buffered flushes were skipped', () => {
|
|
49
|
+
const { internal, events } = createHarness();
|
|
50
|
+
internal.handleStreamEvent({
|
|
51
|
+
type: 'assistant',
|
|
52
|
+
timestamp_ms: 10,
|
|
53
|
+
model_call_id: 'call-2',
|
|
54
|
+
message: {
|
|
55
|
+
content: [{ type: 'text', text: '最终答案' }],
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
internal.handleStreamEvent({
|
|
59
|
+
type: 'result',
|
|
60
|
+
subtype: 'success',
|
|
61
|
+
result: '最终答案',
|
|
62
|
+
});
|
|
63
|
+
expect(events).toEqual([
|
|
64
|
+
expect.objectContaining({ state: 'delta', text: '最终答案' }),
|
|
65
|
+
expect.objectContaining({ state: 'final' }),
|
|
66
|
+
]);
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
//# sourceMappingURL=cursor-adapter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cursor-adapter.test.js","sourceRoot":"","sources":["../../../src/__tests__/cursor-adapter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,9 +81,35 @@ const mockDetectAgents = vi.hoisted(() => vi.fn());
|
|
|
81
81
|
const mockRefreshAgentInfos = vi.hoisted(() => vi.fn(async () => [
|
|
82
82
|
{ type: 'claude', models: [{ id: 'opus', name: 'Opus', isDefault: true }] },
|
|
83
83
|
]));
|
|
84
|
+
const mockResetCommandSpecCache = vi.hoisted(() => vi.fn());
|
|
85
|
+
const mockGetRegisteredAgents = vi.hoisted(() => vi.fn(() => []));
|
|
86
|
+
const mockUnregisterAgent = vi.hoisted(() => vi.fn());
|
|
87
|
+
const mockRegisterCustomAgent = vi.hoisted(() => vi.fn());
|
|
88
|
+
const mockLoadConfig = vi.hoisted(() => vi.fn(() => ({})));
|
|
84
89
|
vi.mock('../agents/detect.js', () => ({
|
|
85
90
|
detectAgents: mockDetectAgents,
|
|
86
91
|
}));
|
|
92
|
+
vi.mock('../agents/command-spec.js', () => ({
|
|
93
|
+
resetCommandSpecCache: mockResetCommandSpecCache,
|
|
94
|
+
}));
|
|
95
|
+
vi.mock('../agents/adapter.js', async (importOriginal) => {
|
|
96
|
+
const orig = await importOriginal();
|
|
97
|
+
return {
|
|
98
|
+
...orig,
|
|
99
|
+
getRegisteredAgents: mockGetRegisteredAgents,
|
|
100
|
+
unregisterAgent: mockUnregisterAgent,
|
|
101
|
+
};
|
|
102
|
+
});
|
|
103
|
+
vi.mock('../agents/custom.js', () => ({
|
|
104
|
+
registerCustomAgent: mockRegisterCustomAgent,
|
|
105
|
+
}));
|
|
106
|
+
vi.mock('../config/index.js', async (importOriginal) => {
|
|
107
|
+
const orig = await importOriginal();
|
|
108
|
+
return {
|
|
109
|
+
...orig,
|
|
110
|
+
loadConfig: mockLoadConfig,
|
|
111
|
+
};
|
|
112
|
+
});
|
|
87
113
|
vi.mock('../agents/model-registry.js', async (importOriginal) => {
|
|
88
114
|
const orig = await importOriginal();
|
|
89
115
|
return {
|
|
@@ -95,6 +121,8 @@ import { SessionManager } from '../session/manager.js';
|
|
|
95
121
|
describe('SessionManager models.refresh (CLI → relay event chain)', () => {
|
|
96
122
|
beforeEach(() => {
|
|
97
123
|
vi.clearAllMocks();
|
|
124
|
+
mockLoadConfig.mockReturnValue({});
|
|
125
|
+
mockGetRegisteredAgents.mockReturnValue([]);
|
|
98
126
|
mockDetectAgents.mockReturnValue([{ type: 'claude', version: '2.0', command: 'claude', models: [] }]);
|
|
99
127
|
mockRefreshAgentInfos.mockResolvedValue([
|
|
100
128
|
{ type: 'claude', models: [{ id: 'opus', name: 'Opus', isDefault: true }] },
|
|
@@ -149,4 +177,57 @@ describe('SessionManager models.refresh (CLI → relay event chain)', () => {
|
|
|
149
177
|
expect(client.sendEvent).not.toHaveBeenCalled();
|
|
150
178
|
});
|
|
151
179
|
});
|
|
180
|
+
describe('SessionManager agents.refresh (runtime re-detect + custom reload)', () => {
|
|
181
|
+
beforeEach(() => {
|
|
182
|
+
vi.clearAllMocks();
|
|
183
|
+
mockLoadConfig.mockReturnValue({});
|
|
184
|
+
mockGetRegisteredAgents.mockReturnValue([]);
|
|
185
|
+
mockDetectAgents.mockReturnValue([{ type: 'claude', version: '2.0', command: 'claude', models: [] }]);
|
|
186
|
+
mockRefreshAgentInfos.mockResolvedValue([
|
|
187
|
+
{ type: 'claude', models: [{ id: 'opus', name: 'Opus', isDefault: true }] },
|
|
188
|
+
]);
|
|
189
|
+
});
|
|
190
|
+
it('clears command caches, reloads custom agents, and emits refreshed machine.agents', async () => {
|
|
191
|
+
const customEntry = {
|
|
192
|
+
command: 'node /tmp/custom-agent.mjs',
|
|
193
|
+
caps: {
|
|
194
|
+
name: 'My Agent',
|
|
195
|
+
models: ['my-agent-v1'],
|
|
196
|
+
defaultModel: 'my-agent-v1',
|
|
197
|
+
mode: 'spawn',
|
|
198
|
+
},
|
|
199
|
+
};
|
|
200
|
+
mockLoadConfig.mockReturnValue({
|
|
201
|
+
customAgents: {
|
|
202
|
+
'my-agent': customEntry,
|
|
203
|
+
},
|
|
204
|
+
});
|
|
205
|
+
mockGetRegisteredAgents.mockReturnValue(['claude', 'custom:stale-agent']);
|
|
206
|
+
const client = { sendRes: vi.fn(), sendEvent: vi.fn() };
|
|
207
|
+
const manager = new SessionManager(client);
|
|
208
|
+
await manager.handleReq({
|
|
209
|
+
type: 'req',
|
|
210
|
+
id: 'ar-1',
|
|
211
|
+
method: 'agents.refresh',
|
|
212
|
+
params: {},
|
|
213
|
+
});
|
|
214
|
+
expect(mockResetCommandSpecCache).toHaveBeenCalledTimes(1);
|
|
215
|
+
expect(mockUnregisterAgent).toHaveBeenCalledWith('custom:stale-agent');
|
|
216
|
+
expect(mockRegisterCustomAgent).toHaveBeenCalledWith('my-agent', customEntry);
|
|
217
|
+
expect(mockDetectAgents).toHaveBeenCalled();
|
|
218
|
+
expect(mockRefreshAgentInfos).toHaveBeenCalled();
|
|
219
|
+
expect(client.sendRes).toHaveBeenCalledWith(expect.objectContaining({
|
|
220
|
+
type: 'res',
|
|
221
|
+
id: 'ar-1',
|
|
222
|
+
ok: true,
|
|
223
|
+
payload: expect.objectContaining({
|
|
224
|
+
agentList: ['claude'],
|
|
225
|
+
}),
|
|
226
|
+
}));
|
|
227
|
+
expect(client.sendEvent).toHaveBeenCalledWith(expect.objectContaining({
|
|
228
|
+
type: 'event',
|
|
229
|
+
event: 'machine.agents',
|
|
230
|
+
}));
|
|
231
|
+
});
|
|
232
|
+
});
|
|
152
233
|
//# sourceMappingURL=model-switching.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-switching.test.js","sourceRoot":"","sources":["../../../src/__tests__/model-switching.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"model-switching.test.js","sourceRoot":"","sources":["../../../src/__tests__/model-switching.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAE7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAEvE,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,GACtG,yBAAyB,CAAA;AAE3B,8FAA8F;AAC9F,MAAM,uBAAuB,GAAG;;;;;CAK/B,CAAA;AAED,MAAM,oBAAoB,GAAG;;;;;;;;CAQ5B,CAAA;AAED,MAAM,kBAAkB,GAAG;;;;CAI1B,CAAA;AAED,QAAQ,CAAC,8CAA8C,EAAE,GAAG,EAAE;IAC5D,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,MAAM,GAAG,iBAAiB,CAAC,uBAAuB,CAAC,CAAA;QACzD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC3D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAA;QACpD,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACnC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,MAAM,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YAClB,mBAAmB;YACnB,oBAAoB;YACpB,SAAS;YACT,eAAe;YACf,eAAe;YACf,SAAS;SACV,CAAC,CAAA;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,eAAe,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,MAAM,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,CAAA;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACjD,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;QAC5D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,iBAAiB,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC;YACzB,MAAM,EAAE;gBACN,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE;gBAC3C,EAAE,GAAG,EAAE,wBAAwB,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE;aAC7F;SACF,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,GAAG,GAAG,8CAA8C,CAAA;QAC1D,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QACnC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;QACvC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAClD,MAAM,qBAAqB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAC5C,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;IAChB,EAAE,IAAI,EAAE,QAAiB,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE;CACrF,CAAC,CACH,CAAA;AACD,MAAM,yBAAyB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AAC3D,MAAM,uBAAuB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAiB,CAAC,CAAC,CAAA;AAChF,MAAM,mBAAmB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AACrD,MAAM,uBAAuB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;AACzD,MAAM,cAAc,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAE1D,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,YAAY,EAAE,gBAAgB;CAC/B,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1C,qBAAqB,EAAE,yBAAyB;CACjD,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACvD,MAAM,IAAI,GAAG,MAAM,cAAc,EAAyC,CAAA;IAC1E,OAAO;QACL,GAAG,IAAI;QACP,mBAAmB,EAAE,uBAAuB;QAC5C,eAAe,EAAE,mBAAmB;KACrC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,mBAAmB,EAAE,uBAAuB;CAC7C,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACrD,MAAM,IAAI,GAAG,MAAM,cAAc,EAAuC,CAAA;IACxE,OAAO;QACL,GAAG,IAAI;QACP,UAAU,EAAE,cAAc;KAC3B,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC9D,MAAM,IAAI,GAAG,MAAM,cAAc,EAAgD,CAAA;IACjF,OAAO;QACL,GAAG,IAAI;QACP,iBAAiB,EAAE,qBAAqB;KACzC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,QAAQ,CAAC,yDAAyD,EAAE,GAAG,EAAE;IACvE,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAA;QAClB,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAClC,uBAAuB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAC3C,gBAAgB,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACrG,qBAAqB,CAAC,iBAAiB,CAAC;YACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE;SAC5E,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAA;QACvD,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,MAAe,CAAC,CAAA;QAEnD,MAAM,OAAO,CAAC,SAAS,CAAC;YACtB,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,MAAM;YACV,MAAM,EAAE,gBAAgB;YACxB,MAAM,EAAE,EAAE;SACX,CAAC,CAAA;QAEF,MAAM,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAC3C,MAAM,CAAC,qBAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAChD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CACzC,MAAM,CAAC,gBAAgB,CAAC;YACtB,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,MAAM;YACV,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAC/B,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;oBAC7B,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;iBACvE,CAAC;aACH,CAAC;SACH,CAAC,CACH,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAC3C,MAAM,CAAC,gBAAgB,CAAC;YACtB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,gBAAgB;YACvB,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAC/B,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;aAC9E,CAAC;SACH,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,gBAAgB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QACpC,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAA;QACvD,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,MAAe,CAAC,CAAA;QAEnD,MAAM,OAAO,CAAC,SAAS,CAAC;YACtB,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,MAAM;YACV,MAAM,EAAE,gBAAgB;YACxB,MAAM,EAAE,EAAE;SACX,CAAC,CAAA;QAEF,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA;QACpD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CACzC,MAAM,CAAC,gBAAgB,CAAC;YACtB,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACvC,CAAC,CACH,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA;IACjD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,mEAAmE,EAAE,GAAG,EAAE;IACjF,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAA;QAClB,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAClC,uBAAuB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAC3C,gBAAgB,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACrG,qBAAqB,CAAC,iBAAiB,CAAC;YACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE;SAC5E,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;QAChG,MAAM,WAAW,GAAG;YAClB,OAAO,EAAE,4BAA4B;YACrC,IAAI,EAAE;gBACJ,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,CAAC,aAAa,CAAC;gBACvB,YAAY,EAAE,aAAa;gBAC3B,IAAI,EAAE,OAAgB;aACvB;SACF,CAAA;QACD,cAAc,CAAC,eAAe,CAAC;YAC7B,YAAY,EAAE;gBACZ,UAAU,EAAE,WAAW;aACxB;SACF,CAAC,CAAA;QACF,uBAAuB,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,oBAAoB,CAAgB,CAAC,CAAA;QAExF,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAA;QACvD,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,MAAe,CAAC,CAAA;QAEnD,MAAM,OAAO,CAAC,SAAS,CAAC;YACtB,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,MAAM;YACV,MAAM,EAAE,gBAAgB;YACxB,MAAM,EAAE,EAAE;SACX,CAAC,CAAA;QAEF,MAAM,CAAC,yBAAyB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAC1D,MAAM,CAAC,mBAAmB,CAAC,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAA;QACtE,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QAC7E,MAAM,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAC3C,MAAM,CAAC,qBAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAChD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CACzC,MAAM,CAAC,gBAAgB,CAAC;YACtB,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,MAAM;YACV,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAC/B,SAAS,EAAE,CAAC,QAAQ,CAAC;aACtB,CAAC;SACH,CAAC,CACH,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAC3C,MAAM,CAAC,gBAAgB,CAAC;YACtB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,gBAAgB;SACxB,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -30,6 +30,7 @@ export declare abstract class AgentAdapter extends EventEmitter<AgentAdapterEven
|
|
|
30
30
|
abstract stop(): Promise<void>;
|
|
31
31
|
}
|
|
32
32
|
export declare function registerAgent(type: AgentType, factory: () => AgentAdapter): void;
|
|
33
|
+
export declare function unregisterAgent(type: AgentType): void;
|
|
33
34
|
export declare function createAgent(type: AgentType): AgentAdapter | null;
|
|
34
35
|
export declare function getRegisteredAgents(): AgentType[];
|
|
35
36
|
//# sourceMappingURL=adapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/agents/adapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAA;IACrD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;IAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;CACtB;AAED,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;IAEjC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IACjG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAC5D,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACtD,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B;AAID,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,GAAG,IAAI,CAEhF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,IAAI,CAGhE;AAED,wBAAgB,mBAAmB,IAAI,SAAS,EAAE,CAEjD"}
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/agents/adapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAA;IACrD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;IAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;CACtB;AAED,8BAAsB,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IACzE,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;IAEjC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IACjG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAC5D,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACtD,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B;AAID,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,GAAG,IAAI,CAEhF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAErD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,IAAI,CAGhE;AAED,wBAAgB,mBAAmB,IAAI,SAAS,EAAE,CAEjD"}
|
|
@@ -7,6 +7,9 @@ const registry = new Map();
|
|
|
7
7
|
export function registerAgent(type, factory) {
|
|
8
8
|
registry.set(type, factory);
|
|
9
9
|
}
|
|
10
|
+
export function unregisterAgent(type) {
|
|
11
|
+
registry.delete(type);
|
|
12
|
+
}
|
|
10
13
|
export function createAgent(type) {
|
|
11
14
|
const factory = registry.get(type);
|
|
12
15
|
return factory ? factory() : null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/agents/adapter.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,oCAAoC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAwB1C,MAAM,OAAgB,YAAa,SAAQ,YAAgC;CAO1E;AAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAiC,CAAA;AAEzD,MAAM,UAAU,aAAa,CAAC,IAAe,EAAE,OAA2B;IACxE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAe;IACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAClC,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;AAC7B,CAAC"}
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/agents/adapter.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,oCAAoC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAwB1C,MAAM,OAAgB,YAAa,SAAQ,YAAgC;CAO1E;AAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAiC,CAAA;AAEzD,MAAM,UAAU,aAAa,CAAC,IAAe,EAAE,OAA2B;IACxE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAe;IAC7C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAe;IACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAClC,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;AAC7B,CAAC"}
|
|
@@ -7,6 +7,9 @@ export declare class CodexAdapter extends AgentAdapter {
|
|
|
7
7
|
private runId;
|
|
8
8
|
private pendingUsage;
|
|
9
9
|
private agentSessionId;
|
|
10
|
+
private hasEmittedText;
|
|
11
|
+
private textTail;
|
|
12
|
+
private terminalState;
|
|
10
13
|
start(_sessionId: string, workDir: string, agentSessionId?: string | null): Promise<void>;
|
|
11
14
|
send(text: string, modelId?: string): Promise<void>;
|
|
12
15
|
resume(agentSessionId: string): Promise<void>;
|
|
@@ -16,5 +19,11 @@ export declare class CodexAdapter extends AgentAdapter {
|
|
|
16
19
|
private handleStreamEvent;
|
|
17
20
|
private emitEvent;
|
|
18
21
|
private killProcess;
|
|
22
|
+
private handleProcessClose;
|
|
23
|
+
private emitFinalIfOpen;
|
|
24
|
+
private emitErrorIfOpen;
|
|
25
|
+
private resetRunState;
|
|
26
|
+
private resetTextState;
|
|
27
|
+
private emitText;
|
|
19
28
|
}
|
|
20
29
|
//# sourceMappingURL=codex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agents/codex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agents/codex.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAkC,MAAM,cAAc,CAAA;AA6C3E,qBAAa,YAAa,SAAQ,YAAY;IAC5C,QAAQ,CAAC,IAAI,EAAG,OAAO,CAAS;IAChC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,GAAG,CAAI;IACf,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,YAAY,CAAiC;IACrD,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,aAAa,CAAqC;IAEpD,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzF,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnD,MAAM,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,OAAO,CAAC,UAAU;IAyClB,OAAO,CAAC,mBAAmB;IAqF3B,OAAO,CAAC,iBAAiB;IAiGzB,OAAO,CAAC,SAAS;YASH,WAAW;IAczB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,QAAQ;CAkBjB"}
|
package/dist/src/agents/codex.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
// @arch docs/architecture/cli/agent-adapters.md
|
|
2
|
+
// @test src/__tests__/codex-adapter.test.ts
|
|
1
3
|
import { spawn } from 'node:child_process';
|
|
2
4
|
import { createInterface } from 'node:readline';
|
|
3
5
|
import { randomUUID } from 'node:crypto';
|
|
@@ -10,6 +12,9 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
10
12
|
runId = '';
|
|
11
13
|
pendingUsage;
|
|
12
14
|
agentSessionId = null;
|
|
15
|
+
hasEmittedText = false;
|
|
16
|
+
textTail = '';
|
|
17
|
+
terminalState = 'open';
|
|
13
18
|
async start(_sessionId, workDir, agentSessionId) {
|
|
14
19
|
this.workDir = workDir;
|
|
15
20
|
this.seq = 0;
|
|
@@ -20,17 +25,18 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
20
25
|
await this.killProcess();
|
|
21
26
|
this.runId = randomUUID();
|
|
22
27
|
this.seq = 0;
|
|
23
|
-
this.
|
|
28
|
+
this.resetRunState();
|
|
24
29
|
const modelArgs = modelId ? ['-m', modelId] : [];
|
|
25
30
|
if (this.agentSessionId) {
|
|
26
|
-
this.spawnCodex([...modelArgs, '-
|
|
31
|
+
this.spawnCodex([...modelArgs, '--dangerously-bypass-approvals-and-sandbox', 'exec', 'resume', this.agentSessionId, '--json', '--skip-git-repo-check', text]);
|
|
27
32
|
}
|
|
28
33
|
else {
|
|
29
|
-
this.spawnCodex([...modelArgs, '-
|
|
34
|
+
this.spawnCodex([...modelArgs, '--dangerously-bypass-approvals-and-sandbox', 'exec', '--json', '--skip-git-repo-check', text]);
|
|
30
35
|
}
|
|
31
36
|
}
|
|
32
37
|
async resume(agentSessionId) {
|
|
33
38
|
this.agentSessionId = agentSessionId;
|
|
39
|
+
this.resetTextState();
|
|
34
40
|
}
|
|
35
41
|
async stop() {
|
|
36
42
|
await this.killProcess();
|
|
@@ -62,14 +68,7 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
62
68
|
if (this.process !== proc)
|
|
63
69
|
return;
|
|
64
70
|
this.process = null;
|
|
65
|
-
|
|
66
|
-
const msg = stderrBuf.trim() || `codex exited with code ${code}`;
|
|
67
|
-
this.emitEvent({ state: 'error', message: msg });
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
70
|
-
this.emitEvent({ state: 'final', usage: this.pendingUsage, agentSessionId: this.agentSessionId ?? undefined });
|
|
71
|
-
}
|
|
72
|
-
this.pendingUsage = undefined;
|
|
71
|
+
this.handleProcessClose(code, stderrBuf);
|
|
73
72
|
});
|
|
74
73
|
proc.on('error', (err) => {
|
|
75
74
|
if (this.process !== proc)
|
|
@@ -91,7 +90,7 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
91
90
|
case 'agent_message':
|
|
92
91
|
case 'reasoning': {
|
|
93
92
|
if (obj.type === 'item.completed' && item.text) {
|
|
94
|
-
this.
|
|
93
|
+
this.emitText(item.text, 'block');
|
|
95
94
|
}
|
|
96
95
|
break;
|
|
97
96
|
}
|
|
@@ -185,6 +184,7 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
185
184
|
};
|
|
186
185
|
}
|
|
187
186
|
}
|
|
187
|
+
this.emitFinalIfOpen();
|
|
188
188
|
return;
|
|
189
189
|
}
|
|
190
190
|
case 'turn.failed': {
|
|
@@ -193,17 +193,14 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
193
193
|
: typeof obj.error === 'string'
|
|
194
194
|
? obj.error
|
|
195
195
|
: 'turn failed';
|
|
196
|
-
this.
|
|
196
|
+
this.emitErrorIfOpen(msg);
|
|
197
197
|
return;
|
|
198
198
|
}
|
|
199
199
|
case 'error': {
|
|
200
200
|
const m = typeof obj.message === 'string' ? obj.message : '';
|
|
201
201
|
if (m.includes('Reconnecting'))
|
|
202
202
|
return;
|
|
203
|
-
this.
|
|
204
|
-
state: 'error',
|
|
205
|
-
message: m || (typeof obj.error === 'string' ? obj.error : 'stream error'),
|
|
206
|
-
});
|
|
203
|
+
this.emitErrorIfOpen(m || (typeof obj.error === 'string' ? obj.error : 'stream error'));
|
|
207
204
|
return;
|
|
208
205
|
}
|
|
209
206
|
case 'thread.started': {
|
|
@@ -224,7 +221,7 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
224
221
|
case 'content': {
|
|
225
222
|
const text = obj.content ?? obj.text;
|
|
226
223
|
if (text) {
|
|
227
|
-
this.
|
|
224
|
+
this.emitText(text);
|
|
228
225
|
}
|
|
229
226
|
break;
|
|
230
227
|
}
|
|
@@ -251,15 +248,13 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
251
248
|
}
|
|
252
249
|
case 'done':
|
|
253
250
|
case 'completed': {
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
: undefined,
|
|
262
|
-
});
|
|
251
|
+
if (obj.usage) {
|
|
252
|
+
this.pendingUsage = {
|
|
253
|
+
inputTokens: obj.usage.prompt_tokens ?? obj.usage.input_tokens ?? 0,
|
|
254
|
+
outputTokens: obj.usage.completion_tokens ?? obj.usage.output_tokens ?? 0,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
this.emitFinalIfOpen();
|
|
263
258
|
break;
|
|
264
259
|
}
|
|
265
260
|
}
|
|
@@ -286,6 +281,66 @@ export class CodexAdapter extends AgentAdapter {
|
|
|
286
281
|
}, 3000);
|
|
287
282
|
});
|
|
288
283
|
}
|
|
284
|
+
handleProcessClose(code, stderrBuf) {
|
|
285
|
+
const stderr = stderrBuf.trim();
|
|
286
|
+
if (code !== 0 && code !== null) {
|
|
287
|
+
const msg = stderr || `codex exited with code ${code}`;
|
|
288
|
+
this.emitErrorIfOpen(msg);
|
|
289
|
+
}
|
|
290
|
+
else if (stderr) {
|
|
291
|
+
// Codex sometimes surfaces fatal API/auth errors on stderr without
|
|
292
|
+
// emitting a protocol-level `turn.failed`, and may still exit 0.
|
|
293
|
+
this.emitErrorIfOpen(stderr);
|
|
294
|
+
}
|
|
295
|
+
else {
|
|
296
|
+
this.emitFinalIfOpen();
|
|
297
|
+
}
|
|
298
|
+
this.pendingUsage = undefined;
|
|
299
|
+
}
|
|
300
|
+
emitFinalIfOpen() {
|
|
301
|
+
if (this.terminalState !== 'open')
|
|
302
|
+
return;
|
|
303
|
+
this.terminalState = 'final';
|
|
304
|
+
this.emitEvent({
|
|
305
|
+
state: 'final',
|
|
306
|
+
usage: this.pendingUsage,
|
|
307
|
+
agentSessionId: this.agentSessionId ?? undefined,
|
|
308
|
+
});
|
|
309
|
+
}
|
|
310
|
+
emitErrorIfOpen(message) {
|
|
311
|
+
if (this.terminalState !== 'open')
|
|
312
|
+
return;
|
|
313
|
+
this.terminalState = 'error';
|
|
314
|
+
this.emitEvent({ state: 'error', message });
|
|
315
|
+
}
|
|
316
|
+
resetRunState() {
|
|
317
|
+
this.pendingUsage = undefined;
|
|
318
|
+
this.terminalState = 'open';
|
|
319
|
+
this.resetTextState();
|
|
320
|
+
}
|
|
321
|
+
resetTextState() {
|
|
322
|
+
this.hasEmittedText = false;
|
|
323
|
+
this.textTail = '';
|
|
324
|
+
}
|
|
325
|
+
emitText(text, mode = 'delta') {
|
|
326
|
+
if (!text)
|
|
327
|
+
return;
|
|
328
|
+
let next = text;
|
|
329
|
+
if (mode === 'block' && this.hasEmittedText && !text.startsWith('\n')) {
|
|
330
|
+
if (this.textTail.endsWith('\n\n')) {
|
|
331
|
+
next = text;
|
|
332
|
+
}
|
|
333
|
+
else if (this.textTail.endsWith('\n')) {
|
|
334
|
+
next = `\n${text}`;
|
|
335
|
+
}
|
|
336
|
+
else {
|
|
337
|
+
next = `\n\n${text}`;
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
this.hasEmittedText = true;
|
|
341
|
+
this.textTail = (this.textTail + next).slice(-4);
|
|
342
|
+
this.emitEvent({ state: 'delta', text: next });
|
|
343
|
+
}
|
|
289
344
|
}
|
|
290
345
|
function safeStringify(value) {
|
|
291
346
|
if (value == null)
|