shennian 0.1.12 → 0.1.13
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__/pi-context.test.d.ts +2 -0
- package/dist/src/__tests__/pi-context.test.d.ts.map +1 -0
- package/dist/src/__tests__/pi-context.test.js +163 -0
- package/dist/src/__tests__/pi-context.test.js.map +1 -0
- package/dist/src/__tests__/session-manager.test.js +186 -0
- package/dist/src/__tests__/session-manager.test.js.map +1 -1
- package/dist/src/agents/adapter.d.ts +2 -1
- package/dist/src/agents/adapter.d.ts.map +1 -1
- package/dist/src/agents/adapter.js.map +1 -1
- package/dist/src/agents/claude.d.ts +1 -1
- package/dist/src/agents/claude.d.ts.map +1 -1
- package/dist/src/agents/claude.js +4 -1
- package/dist/src/agents/claude.js.map +1 -1
- package/dist/src/agents/codex.d.ts +4 -3
- package/dist/src/agents/codex.d.ts.map +1 -1
- package/dist/src/agents/codex.js +21 -8
- package/dist/src/agents/codex.js.map +1 -1
- package/dist/src/agents/cursor.d.ts +1 -1
- package/dist/src/agents/cursor.d.ts.map +1 -1
- package/dist/src/agents/cursor.js +6 -3
- package/dist/src/agents/cursor.js.map +1 -1
- package/dist/src/agents/custom.d.ts +2 -1
- package/dist/src/agents/custom.d.ts.map +1 -1
- package/dist/src/agents/custom.js +9 -2
- package/dist/src/agents/custom.js.map +1 -1
- package/dist/src/agents/gemini.d.ts +1 -1
- package/dist/src/agents/gemini.d.ts.map +1 -1
- package/dist/src/agents/gemini.js +4 -1
- package/dist/src/agents/gemini.js.map +1 -1
- package/dist/src/agents/openclaw.d.ts +1 -1
- package/dist/src/agents/openclaw.d.ts.map +1 -1
- package/dist/src/agents/openclaw.js +4 -2
- package/dist/src/agents/openclaw.js.map +1 -1
- package/dist/src/agents/pi.d.ts +23 -2
- package/dist/src/agents/pi.d.ts.map +1 -1
- package/dist/src/agents/pi.js +209 -51
- package/dist/src/agents/pi.js.map +1 -1
- package/dist/src/session/manager.d.ts +1 -0
- package/dist/src/session/manager.d.ts.map +1 -1
- package/dist/src/session/manager.js +37 -3
- package/dist/src/session/manager.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pi-context.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/pi-context.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
// @covers src/agents/pi.ts — context compression and summary persistence
|
|
2
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
3
|
+
import fs from 'node:fs';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import os from 'node:os';
|
|
6
|
+
const { MockAgent } = vi.hoisted(() => {
|
|
7
|
+
class MockAgent {
|
|
8
|
+
_state;
|
|
9
|
+
listeners = [];
|
|
10
|
+
_transformContext;
|
|
11
|
+
constructor(opts) {
|
|
12
|
+
this._state = {
|
|
13
|
+
messages: [],
|
|
14
|
+
systemPrompt: opts?.initialState?.systemPrompt ?? '',
|
|
15
|
+
model: opts?.initialState?.model ?? {},
|
|
16
|
+
tools: opts?.initialState?.tools ?? [],
|
|
17
|
+
isStreaming: false,
|
|
18
|
+
streamMessage: null,
|
|
19
|
+
pendingToolCalls: new Set(),
|
|
20
|
+
thinkingLevel: 'off',
|
|
21
|
+
};
|
|
22
|
+
this._transformContext = opts?.transformContext;
|
|
23
|
+
}
|
|
24
|
+
get state() { return this._state; }
|
|
25
|
+
subscribe(fn) {
|
|
26
|
+
this.listeners.push(fn);
|
|
27
|
+
return () => { this.listeners = this.listeners.filter((l) => l !== fn); };
|
|
28
|
+
}
|
|
29
|
+
appendMessage(m) { this._state.messages.push(m); }
|
|
30
|
+
replaceMessages(ms) { this._state.messages = ms; }
|
|
31
|
+
async prompt(text) {
|
|
32
|
+
this._state.messages.push({ role: 'user', content: [{ type: 'text', text }], timestamp: Date.now() });
|
|
33
|
+
if (this._transformContext)
|
|
34
|
+
await this._transformContext(this._state.messages);
|
|
35
|
+
this.listeners.forEach((fn) => fn({ type: 'agent_start' }));
|
|
36
|
+
this.listeners.forEach((fn) => fn({
|
|
37
|
+
type: 'message_update',
|
|
38
|
+
message: { role: 'assistant', content: [{ type: 'text', text: 'response' }] },
|
|
39
|
+
assistantMessageEvent: {},
|
|
40
|
+
}));
|
|
41
|
+
this._state.messages.push({
|
|
42
|
+
role: 'assistant', content: [{ type: 'text', text: 'response' }],
|
|
43
|
+
timestamp: Date.now(), usage: { input: 10, output: 20 },
|
|
44
|
+
});
|
|
45
|
+
this.listeners.forEach((fn) => fn({ type: 'agent_end', messages: this._state.messages }));
|
|
46
|
+
}
|
|
47
|
+
abort() { }
|
|
48
|
+
}
|
|
49
|
+
return { MockAgent };
|
|
50
|
+
});
|
|
51
|
+
vi.mock('@mariozechner/pi-agent-core', () => ({
|
|
52
|
+
Agent: MockAgent,
|
|
53
|
+
streamProxy: vi.fn(),
|
|
54
|
+
}));
|
|
55
|
+
vi.mock('../config/index.js', () => ({
|
|
56
|
+
loadConfig: vi.fn(() => ({
|
|
57
|
+
machineToken: 'test-token',
|
|
58
|
+
serverUrl: 'https://test.example.com',
|
|
59
|
+
})),
|
|
60
|
+
}));
|
|
61
|
+
vi.mock('../region.js', () => ({
|
|
62
|
+
SERVERS: { global: { url: 'https://test.example.com' } },
|
|
63
|
+
}));
|
|
64
|
+
import { PiAdapter } from '../agents/pi.js';
|
|
65
|
+
import { loadConfig } from '../config/index.js';
|
|
66
|
+
describe('PiAdapter — context management', () => {
|
|
67
|
+
const tmpDir = path.join(os.tmpdir(), `pi-test-${Date.now()}`);
|
|
68
|
+
const sessionId = `test-session-${Date.now()}`;
|
|
69
|
+
beforeEach(() => {
|
|
70
|
+
vi.clearAllMocks();
|
|
71
|
+
fs.mkdirSync(tmpDir, { recursive: true });
|
|
72
|
+
});
|
|
73
|
+
afterEach(() => {
|
|
74
|
+
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
75
|
+
});
|
|
76
|
+
it('reuses Agent instance across multiple send() calls', async () => {
|
|
77
|
+
const adapter = new PiAdapter();
|
|
78
|
+
await adapter.start(sessionId, tmpDir);
|
|
79
|
+
const events = [];
|
|
80
|
+
adapter.on('agentEvent', (e) => events.push(e));
|
|
81
|
+
await adapter.send('hello');
|
|
82
|
+
await adapter.send('world');
|
|
83
|
+
await adapter.stop();
|
|
84
|
+
const finals = events.filter((e) => e.state === 'final');
|
|
85
|
+
expect(finals).toHaveLength(2);
|
|
86
|
+
expect(finals[0].runId).not.toBe(finals[1].runId);
|
|
87
|
+
});
|
|
88
|
+
it('emits init/start/final events on each send', async () => {
|
|
89
|
+
const adapter = new PiAdapter();
|
|
90
|
+
await adapter.start(sessionId, tmpDir);
|
|
91
|
+
const events = [];
|
|
92
|
+
adapter.on('agentEvent', (e) => events.push(e));
|
|
93
|
+
await adapter.send('hi');
|
|
94
|
+
await adapter.stop();
|
|
95
|
+
const states = events.map((e) => e.state);
|
|
96
|
+
expect(states).toContain('init');
|
|
97
|
+
expect(states).toContain('start');
|
|
98
|
+
expect(states).toContain('final');
|
|
99
|
+
});
|
|
100
|
+
it('emits error when not paired', async () => {
|
|
101
|
+
vi.mocked(loadConfig).mockReturnValueOnce({});
|
|
102
|
+
const adapter = new PiAdapter();
|
|
103
|
+
await adapter.start(sessionId, tmpDir);
|
|
104
|
+
const events = [];
|
|
105
|
+
adapter.on('agentEvent', (e) => events.push(e));
|
|
106
|
+
await adapter.send('test');
|
|
107
|
+
await adapter.stop();
|
|
108
|
+
const error = events.find((e) => e.state === 'error');
|
|
109
|
+
expect(error).toBeDefined();
|
|
110
|
+
expect(error.message).toContain('未配对');
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
describe('PiAdapter — summary persistence', () => {
|
|
114
|
+
const sessionId = `summary-test-${Date.now()}`;
|
|
115
|
+
const summaryDir = path.join(os.homedir(), '.shennian', 'sessions', sessionId);
|
|
116
|
+
const summaryPath = path.join(summaryDir, 'pi-context.json');
|
|
117
|
+
afterEach(() => {
|
|
118
|
+
try {
|
|
119
|
+
fs.unlinkSync(summaryPath);
|
|
120
|
+
}
|
|
121
|
+
catch { }
|
|
122
|
+
try {
|
|
123
|
+
fs.rmdirSync(summaryDir);
|
|
124
|
+
}
|
|
125
|
+
catch { }
|
|
126
|
+
});
|
|
127
|
+
it('loads summary from existing file on start()', async () => {
|
|
128
|
+
fs.mkdirSync(summaryDir, { recursive: true });
|
|
129
|
+
fs.writeFileSync(summaryPath, JSON.stringify({
|
|
130
|
+
summary: '之前讨论了文件读写功能',
|
|
131
|
+
summarizedCount: 5,
|
|
132
|
+
updatedAt: Date.now(),
|
|
133
|
+
}));
|
|
134
|
+
const adapter = new PiAdapter();
|
|
135
|
+
await adapter.start(sessionId, '/tmp');
|
|
136
|
+
const events = [];
|
|
137
|
+
adapter.on('agentEvent', (e) => events.push(e));
|
|
138
|
+
await adapter.send('继续');
|
|
139
|
+
await adapter.stop();
|
|
140
|
+
expect(events.some((e) => e.state === 'final')).toBe(true);
|
|
141
|
+
});
|
|
142
|
+
it('handles missing summary file gracefully', async () => {
|
|
143
|
+
const adapter = new PiAdapter();
|
|
144
|
+
await adapter.start(sessionId, '/tmp');
|
|
145
|
+
const events = [];
|
|
146
|
+
adapter.on('agentEvent', (e) => events.push(e));
|
|
147
|
+
await adapter.send('hi');
|
|
148
|
+
await adapter.stop();
|
|
149
|
+
expect(events.some((e) => e.state === 'final')).toBe(true);
|
|
150
|
+
});
|
|
151
|
+
it('handles corrupt summary file gracefully', async () => {
|
|
152
|
+
fs.mkdirSync(summaryDir, { recursive: true });
|
|
153
|
+
fs.writeFileSync(summaryPath, 'not json at all');
|
|
154
|
+
const adapter = new PiAdapter();
|
|
155
|
+
await adapter.start(sessionId, '/tmp');
|
|
156
|
+
const events = [];
|
|
157
|
+
adapter.on('agentEvent', (e) => events.push(e));
|
|
158
|
+
await adapter.send('hi');
|
|
159
|
+
await adapter.stop();
|
|
160
|
+
expect(events.some((e) => e.state === 'final')).toBe(true);
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
//# sourceMappingURL=pi-context.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pi-context.test.js","sourceRoot":"","sources":["../../../src/__tests__/pi-context.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -157,6 +157,146 @@ describe('SessionManager', () => {
|
|
|
157
157
|
expect(sentText).toBe('帮我看看');
|
|
158
158
|
});
|
|
159
159
|
});
|
|
160
|
+
describe('agentSessionId persistence', () => {
|
|
161
|
+
it('passes agentSessionId from chat.send params to adapter.start', async () => {
|
|
162
|
+
const adapter = mockAdapter();
|
|
163
|
+
mockCreateAgent.mockReturnValue(adapter);
|
|
164
|
+
await manager.handleReq({
|
|
165
|
+
type: 'req', id: 'r1', method: 'chat.send',
|
|
166
|
+
params: {
|
|
167
|
+
sessionId: 'sess-resume',
|
|
168
|
+
text: 'hello',
|
|
169
|
+
agentType: 'claude',
|
|
170
|
+
workDir: '/tmp',
|
|
171
|
+
agentSessionId: 'claude-sid-123',
|
|
172
|
+
},
|
|
173
|
+
});
|
|
174
|
+
expect(adapter.start).toHaveBeenCalledWith('sess-resume', expect.any(String), 'claude-sid-123');
|
|
175
|
+
});
|
|
176
|
+
it('emits session.update when agent reports agentSessionId on final', async () => {
|
|
177
|
+
const adapter = mockAdapter();
|
|
178
|
+
mockCreateAgent.mockReturnValue(adapter);
|
|
179
|
+
await manager.handleReq({
|
|
180
|
+
type: 'req', id: 'r1', method: 'chat.send',
|
|
181
|
+
params: { sessionId: 'sess-new', text: 'hi', agentType: 'claude', workDir: '/tmp' },
|
|
182
|
+
});
|
|
183
|
+
const finalEvent = {
|
|
184
|
+
state: 'final',
|
|
185
|
+
runId: 'run1',
|
|
186
|
+
seq: 1,
|
|
187
|
+
agentSessionId: 'claude-sid-456',
|
|
188
|
+
};
|
|
189
|
+
adapter.emit('agentEvent', finalEvent);
|
|
190
|
+
const sessionUpdateCall = client.sendEvent.mock.calls.find((c) => c[0].event === 'session.update');
|
|
191
|
+
expect(sessionUpdateCall).toBeDefined();
|
|
192
|
+
expect(sessionUpdateCall[0]).toEqual(expect.objectContaining({
|
|
193
|
+
type: 'event',
|
|
194
|
+
event: 'session.update',
|
|
195
|
+
payload: {
|
|
196
|
+
session: {
|
|
197
|
+
id: 'sess-new',
|
|
198
|
+
agentType: 'claude',
|
|
199
|
+
agentSessionId: 'claude-sid-456',
|
|
200
|
+
},
|
|
201
|
+
},
|
|
202
|
+
}));
|
|
203
|
+
});
|
|
204
|
+
it('does not emit session.update when final has no agentSessionId', async () => {
|
|
205
|
+
const adapter = mockAdapter();
|
|
206
|
+
mockCreateAgent.mockReturnValue(adapter);
|
|
207
|
+
await manager.handleReq({
|
|
208
|
+
type: 'req', id: 'r1', method: 'chat.send',
|
|
209
|
+
params: { sessionId: 'sess-no-sid', text: 'hi', agentType: 'codex', workDir: '/tmp' },
|
|
210
|
+
});
|
|
211
|
+
adapter.emit('agentEvent', { state: 'final', runId: 'run1', seq: 1 });
|
|
212
|
+
const sessionUpdateCall = client.sendEvent.mock.calls.find((c) => c[0].event === 'session.update');
|
|
213
|
+
expect(sessionUpdateCall).toBeUndefined();
|
|
214
|
+
});
|
|
215
|
+
it('reuses existing adapter (with agentSessionId) for same session', async () => {
|
|
216
|
+
const adapter = mockAdapter();
|
|
217
|
+
mockCreateAgent.mockReturnValue(adapter);
|
|
218
|
+
await manager.handleReq({
|
|
219
|
+
type: 'req', id: 'r1', method: 'chat.send',
|
|
220
|
+
params: { sessionId: 'sess-reuse', text: 'first', agentType: 'claude', workDir: '/tmp' },
|
|
221
|
+
});
|
|
222
|
+
await manager.handleReq({
|
|
223
|
+
type: 'req', id: 'r2', method: 'chat.send',
|
|
224
|
+
params: { sessionId: 'sess-reuse', text: 'second', agentType: 'claude', workDir: '/tmp' },
|
|
225
|
+
});
|
|
226
|
+
expect(mockCreateAgent).toHaveBeenCalledTimes(1);
|
|
227
|
+
expect(adapter.send).toHaveBeenCalledTimes(2);
|
|
228
|
+
expect(adapter.send).toHaveBeenNthCalledWith(1, 'first');
|
|
229
|
+
expect(adapter.send).toHaveBeenNthCalledWith(2, 'second');
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
describe('codex resume flow', () => {
|
|
233
|
+
it('passes agentSessionId to codex adapter via start()', async () => {
|
|
234
|
+
const adapter = mockAdapter();
|
|
235
|
+
adapter.type = 'codex';
|
|
236
|
+
mockCreateAgent.mockReturnValue(adapter);
|
|
237
|
+
await manager.handleReq({
|
|
238
|
+
type: 'req', id: 'r1', method: 'chat.send',
|
|
239
|
+
params: {
|
|
240
|
+
sessionId: 'sess-codex',
|
|
241
|
+
text: 'fix bug',
|
|
242
|
+
agentType: 'codex',
|
|
243
|
+
workDir: '/tmp',
|
|
244
|
+
agentSessionId: 'thread-abc-123',
|
|
245
|
+
},
|
|
246
|
+
});
|
|
247
|
+
expect(adapter.start).toHaveBeenCalledWith('sess-codex', expect.any(String), 'thread-abc-123');
|
|
248
|
+
});
|
|
249
|
+
it('persists codex agentSessionId from final event', async () => {
|
|
250
|
+
const adapter = mockAdapter();
|
|
251
|
+
adapter.type = 'codex';
|
|
252
|
+
mockCreateAgent.mockReturnValue(adapter);
|
|
253
|
+
await manager.handleReq({
|
|
254
|
+
type: 'req', id: 'r1', method: 'chat.send',
|
|
255
|
+
params: { sessionId: 'sess-codex-new', text: 'hello', agentType: 'codex', workDir: '/tmp' },
|
|
256
|
+
});
|
|
257
|
+
adapter.emit('agentEvent', {
|
|
258
|
+
state: 'final', runId: 'run1', seq: 1,
|
|
259
|
+
agentSessionId: 'thread-xyz-789',
|
|
260
|
+
});
|
|
261
|
+
const updateCall = client.sendEvent.mock.calls.find((c) => c[0].event === 'session.update');
|
|
262
|
+
expect(updateCall).toBeDefined();
|
|
263
|
+
expect(updateCall[0]).toEqual(expect.objectContaining({
|
|
264
|
+
payload: {
|
|
265
|
+
session: {
|
|
266
|
+
id: 'sess-codex-new',
|
|
267
|
+
agentType: 'codex',
|
|
268
|
+
agentSessionId: 'thread-xyz-789',
|
|
269
|
+
},
|
|
270
|
+
},
|
|
271
|
+
}));
|
|
272
|
+
});
|
|
273
|
+
});
|
|
274
|
+
describe('custom agent agentSessionId', () => {
|
|
275
|
+
it('persists custom agent session ID from final event', async () => {
|
|
276
|
+
const adapter = mockAdapter();
|
|
277
|
+
adapter.type = 'custom:my-agent';
|
|
278
|
+
mockCreateAgent.mockReturnValue(adapter);
|
|
279
|
+
await manager.handleReq({
|
|
280
|
+
type: 'req', id: 'r1', method: 'chat.send',
|
|
281
|
+
params: { sessionId: 'sess-custom', text: 'hello', agentType: 'custom:my-agent', workDir: '/tmp' },
|
|
282
|
+
});
|
|
283
|
+
adapter.emit('agentEvent', {
|
|
284
|
+
state: 'final', runId: 'run1', seq: 1,
|
|
285
|
+
agentSessionId: 'custom-session-456',
|
|
286
|
+
});
|
|
287
|
+
const updateCall = client.sendEvent.mock.calls.find((c) => c[0].event === 'session.update');
|
|
288
|
+
expect(updateCall).toBeDefined();
|
|
289
|
+
expect(updateCall[0]).toEqual(expect.objectContaining({
|
|
290
|
+
payload: {
|
|
291
|
+
session: {
|
|
292
|
+
id: 'sess-custom',
|
|
293
|
+
agentType: 'custom:my-agent',
|
|
294
|
+
agentSessionId: 'custom-session-456',
|
|
295
|
+
},
|
|
296
|
+
},
|
|
297
|
+
}));
|
|
298
|
+
});
|
|
299
|
+
});
|
|
160
300
|
describe('error handling', () => {
|
|
161
301
|
it('sends error with sessionId when agent not found', async () => {
|
|
162
302
|
mockCreateAgent.mockReturnValue(null);
|
|
@@ -204,5 +344,51 @@ describe('SessionManager', () => {
|
|
|
204
344
|
}));
|
|
205
345
|
});
|
|
206
346
|
});
|
|
347
|
+
describe('session eviction', () => {
|
|
348
|
+
it('evicts oldest idle session when exceeding MAX_SESSIONS', async () => {
|
|
349
|
+
const adapters = [];
|
|
350
|
+
mockCreateAgent.mockImplementation(() => {
|
|
351
|
+
const a = mockAdapter();
|
|
352
|
+
adapters.push(a);
|
|
353
|
+
return a;
|
|
354
|
+
});
|
|
355
|
+
for (let i = 0; i < 50; i++) {
|
|
356
|
+
await manager.handleReq({
|
|
357
|
+
type: 'req', id: `r-${i}`, method: 'chat.send',
|
|
358
|
+
params: { sessionId: `sess-${i}`, text: 'hi', agentType: 'claude', workDir: '/tmp' },
|
|
359
|
+
});
|
|
360
|
+
}
|
|
361
|
+
expect(adapters).toHaveLength(50);
|
|
362
|
+
expect(adapters[0].stop).not.toHaveBeenCalled();
|
|
363
|
+
await manager.handleReq({
|
|
364
|
+
type: 'req', id: 'r-51', method: 'chat.send',
|
|
365
|
+
params: { sessionId: 'sess-new', text: 'hi', agentType: 'claude', workDir: '/tmp' },
|
|
366
|
+
});
|
|
367
|
+
expect(adapters[0].stop).toHaveBeenCalled();
|
|
368
|
+
expect(adapters).toHaveLength(51);
|
|
369
|
+
});
|
|
370
|
+
it('does not evict when reusing existing session', async () => {
|
|
371
|
+
const adapters = [];
|
|
372
|
+
mockCreateAgent.mockImplementation(() => {
|
|
373
|
+
const a = mockAdapter();
|
|
374
|
+
adapters.push(a);
|
|
375
|
+
return a;
|
|
376
|
+
});
|
|
377
|
+
for (let i = 0; i < 50; i++) {
|
|
378
|
+
await manager.handleReq({
|
|
379
|
+
type: 'req', id: `r-${i}`, method: 'chat.send',
|
|
380
|
+
params: { sessionId: `sess-${i}`, text: 'hi', agentType: 'claude', workDir: '/tmp' },
|
|
381
|
+
});
|
|
382
|
+
}
|
|
383
|
+
await manager.handleReq({
|
|
384
|
+
type: 'req', id: 'r-reuse', method: 'chat.send',
|
|
385
|
+
params: { sessionId: 'sess-0', text: 'second msg', agentType: 'claude', workDir: '/tmp' },
|
|
386
|
+
});
|
|
387
|
+
expect(adapters).toHaveLength(50);
|
|
388
|
+
for (const a of adapters) {
|
|
389
|
+
expect(a.stop).not.toHaveBeenCalled();
|
|
390
|
+
}
|
|
391
|
+
});
|
|
392
|
+
});
|
|
207
393
|
});
|
|
208
394
|
//# sourceMappingURL=session-manager.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.test.js","sourceRoot":"","sources":["../../../src/__tests__/session-manager.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-manager.test.js","sourceRoot":"","sources":["../../../src/__tests__/session-manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export type AgentEvent = {
|
|
|
16
16
|
};
|
|
17
17
|
title?: string;
|
|
18
18
|
source?: string;
|
|
19
|
+
agentSessionId?: string;
|
|
19
20
|
};
|
|
20
21
|
export interface AgentAdapterEvents {
|
|
21
22
|
agentEvent: [event: AgentEvent];
|
|
@@ -23,7 +24,7 @@ export interface AgentAdapterEvents {
|
|
|
23
24
|
}
|
|
24
25
|
export declare abstract class AgentAdapter extends EventEmitter<AgentAdapterEvents> {
|
|
25
26
|
abstract readonly type: AgentType;
|
|
26
|
-
abstract start(sessionId: string, workDir: string): Promise<void>;
|
|
27
|
+
abstract start(sessionId: string, workDir: string, agentSessionId?: string | null): Promise<void>;
|
|
27
28
|
abstract send(text: string): Promise<void>;
|
|
28
29
|
abstract resume(agentSessionId: string): Promise<void>;
|
|
29
30
|
abstract stop(): Promise<void>;
|
|
@@ -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;
|
|
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,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1C,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 +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;
|
|
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"}
|
|
@@ -8,7 +8,7 @@ export declare class ClaudeAdapter extends AgentAdapter {
|
|
|
8
8
|
private seq;
|
|
9
9
|
private runId;
|
|
10
10
|
private hasEmittedText;
|
|
11
|
-
start(sessionId: string, workDir: string): Promise<void>;
|
|
11
|
+
start(sessionId: string, workDir: string, agentSessionId?: string | null): Promise<void>;
|
|
12
12
|
send(text: string): Promise<void>;
|
|
13
13
|
resume(agentSessionId: string): Promise<void>;
|
|
14
14
|
stop(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../src/agents/claude.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAkC,MAAM,cAAc,CAAA;AAkC3E,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,CAAC,IAAI,EAAG,QAAQ,CAAS;IACjC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,GAAG,CAAI;IACf,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,cAAc,CAAQ;IAExB,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../src/agents/claude.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAkC,MAAM,cAAc,CAAA;AAkC3E,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,CAAC,IAAI,EAAG,QAAQ,CAAS;IACjC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,GAAG,CAAI;IACf,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,cAAc,CAAQ;IAExB,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxF,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBjC,MAAM,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,iBAAiB;IA8DzB,OAAO,CAAC,SAAS;YASH,WAAW;CAa1B"}
|
|
@@ -11,10 +11,12 @@ export class ClaudeAdapter extends AgentAdapter {
|
|
|
11
11
|
seq = 0;
|
|
12
12
|
runId = '';
|
|
13
13
|
hasEmittedText = false;
|
|
14
|
-
async start(sessionId, workDir) {
|
|
14
|
+
async start(sessionId, workDir, agentSessionId) {
|
|
15
15
|
this.sessionId = sessionId;
|
|
16
16
|
this.workDir = workDir;
|
|
17
17
|
this.seq = 0;
|
|
18
|
+
if (agentSessionId)
|
|
19
|
+
this.agentSessionId = agentSessionId;
|
|
18
20
|
}
|
|
19
21
|
async send(text) {
|
|
20
22
|
await this.killProcess();
|
|
@@ -156,6 +158,7 @@ export class ClaudeAdapter extends AgentAdapter {
|
|
|
156
158
|
const usage = obj.usage ?? obj.message?.usage;
|
|
157
159
|
this.emitEvent({
|
|
158
160
|
state: 'final',
|
|
161
|
+
agentSessionId: this.agentSessionId ?? undefined,
|
|
159
162
|
usage: usage
|
|
160
163
|
? { inputTokens: usage.input_tokens, outputTokens: usage.output_tokens }
|
|
161
164
|
: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/agents/claude.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAmB,MAAM,cAAc,CAAA;AAkC3E,MAAM,OAAO,aAAc,SAAQ,YAAY;IACpC,IAAI,GAAG,QAAiB,CAAA;IACzB,OAAO,GAAwB,IAAI,CAAA;IACnC,cAAc,GAAkB,IAAI,CAAA;IACpC,SAAS,GAAkB,IAAI,CAAA;IAC/B,OAAO,GAAkB,IAAI,CAAA;IAC7B,GAAG,GAAG,CAAC,CAAA;IACP,KAAK,GAAG,EAAE,CAAA;IACV,cAAc,GAAG,KAAK,CAAA;IAE9B,KAAK,CAAC,KAAK,CAAC,SAAiB,EAAE,OAAe;
|
|
1
|
+
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/agents/claude.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,12 @@ export declare class CodexAdapter extends AgentAdapter {
|
|
|
6
6
|
private seq;
|
|
7
7
|
private runId;
|
|
8
8
|
private pendingUsage;
|
|
9
|
-
|
|
9
|
+
private agentSessionId;
|
|
10
|
+
start(_sessionId: string, workDir: string, agentSessionId?: string | null): Promise<void>;
|
|
10
11
|
send(text: string): Promise<void>;
|
|
11
|
-
resume(
|
|
12
|
+
resume(agentSessionId: string): Promise<void>;
|
|
12
13
|
stop(): Promise<void>;
|
|
13
|
-
private
|
|
14
|
+
private spawnCodex;
|
|
14
15
|
private handleCodexItemLine;
|
|
15
16
|
private handleStreamEvent;
|
|
16
17
|
private emitEvent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agents/codex.ts"],"names":[],"mappings":"AAGA,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;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agents/codex.ts"],"names":[],"mappings":"AAGA,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;IAEtC,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,GAAG,OAAO,CAAC,IAAI,CAAC;IAajC,MAAM,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,OAAO,CAAC,UAAU;IA+ClB,OAAO,CAAC,mBAAmB;IAqF3B,OAAO,CAAC,iBAAiB;IAqGzB,OAAO,CAAC,SAAS;YASH,WAAW;CAa1B"}
|