agent-relay 3.1.0 → 3.1.1
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/bin/agent-relay-broker-linux-x64 +0 -0
- package/package.json +9 -9
- package/packages/acp-bridge/package.json +2 -2
- package/packages/config/package.json +1 -1
- package/packages/hooks/package.json +4 -4
- package/packages/memory/package.json +2 -2
- package/packages/openclaw/README.md +78 -0
- package/packages/openclaw/bin/relay-openclaw.mjs +2 -0
- package/packages/openclaw/bridge/bridge.mjs +305 -0
- package/packages/openclaw/dist/__tests__/gateway-threads.test.d.ts +2 -0
- package/packages/openclaw/dist/__tests__/gateway-threads.test.d.ts.map +1 -0
- package/packages/openclaw/dist/__tests__/gateway-threads.test.js +320 -0
- package/packages/openclaw/dist/__tests__/gateway-threads.test.js.map +1 -0
- package/packages/openclaw/dist/__tests__/naming.test.d.ts +2 -0
- package/packages/openclaw/dist/__tests__/naming.test.d.ts.map +1 -0
- package/packages/openclaw/dist/__tests__/naming.test.js +21 -0
- package/packages/openclaw/dist/__tests__/naming.test.js.map +1 -0
- package/packages/openclaw/dist/__tests__/spawn-manager.test.d.ts +2 -0
- package/packages/openclaw/dist/__tests__/spawn-manager.test.d.ts.map +1 -0
- package/packages/openclaw/dist/__tests__/spawn-manager.test.js +126 -0
- package/packages/openclaw/dist/__tests__/spawn-manager.test.js.map +1 -0
- package/packages/openclaw/dist/auth/converter.d.ts +28 -0
- package/packages/openclaw/dist/auth/converter.d.ts.map +1 -0
- package/packages/openclaw/dist/auth/converter.js +64 -0
- package/packages/openclaw/dist/auth/converter.js.map +1 -0
- package/packages/openclaw/dist/cli.d.ts +2 -0
- package/packages/openclaw/dist/cli.d.ts.map +1 -0
- package/packages/openclaw/dist/cli.js +230 -0
- package/packages/openclaw/dist/cli.js.map +1 -0
- package/packages/openclaw/dist/config.d.ts +27 -0
- package/packages/openclaw/dist/config.d.ts.map +1 -0
- package/packages/openclaw/dist/config.js +97 -0
- package/packages/openclaw/dist/config.js.map +1 -0
- package/packages/openclaw/dist/control.d.ts +22 -0
- package/packages/openclaw/dist/control.d.ts.map +1 -0
- package/packages/openclaw/dist/control.js +58 -0
- package/packages/openclaw/dist/control.js.map +1 -0
- package/packages/openclaw/dist/gateway.d.ts +71 -0
- package/packages/openclaw/dist/gateway.d.ts.map +1 -0
- package/packages/openclaw/dist/gateway.js +785 -0
- package/packages/openclaw/dist/gateway.js.map +1 -0
- package/packages/openclaw/dist/identity/contract.d.ts +11 -0
- package/packages/openclaw/dist/identity/contract.d.ts.map +1 -0
- package/packages/openclaw/dist/identity/contract.js +40 -0
- package/packages/openclaw/dist/identity/contract.js.map +1 -0
- package/packages/openclaw/dist/identity/files.d.ts +33 -0
- package/packages/openclaw/dist/identity/files.d.ts.map +1 -0
- package/packages/openclaw/dist/identity/files.js +145 -0
- package/packages/openclaw/dist/identity/files.js.map +1 -0
- package/packages/openclaw/dist/identity/model.d.ts +11 -0
- package/packages/openclaw/dist/identity/model.d.ts.map +1 -0
- package/packages/openclaw/dist/identity/model.js +28 -0
- package/packages/openclaw/dist/identity/model.js.map +1 -0
- package/packages/openclaw/dist/identity/naming.d.ts +5 -0
- package/packages/openclaw/dist/identity/naming.d.ts.map +1 -0
- package/packages/openclaw/dist/identity/naming.js +7 -0
- package/packages/openclaw/dist/identity/naming.js.map +1 -0
- package/packages/openclaw/dist/index.d.ts +20 -0
- package/packages/openclaw/dist/index.d.ts.map +1 -0
- package/packages/openclaw/dist/index.js +27 -0
- package/packages/openclaw/dist/index.js.map +1 -0
- package/packages/openclaw/dist/inject.d.ts +14 -0
- package/packages/openclaw/dist/inject.d.ts.map +1 -0
- package/packages/openclaw/dist/inject.js +66 -0
- package/packages/openclaw/dist/inject.js.map +1 -0
- package/packages/openclaw/dist/mcp/server.d.ts +8 -0
- package/packages/openclaw/dist/mcp/server.d.ts.map +1 -0
- package/packages/openclaw/dist/mcp/server.js +105 -0
- package/packages/openclaw/dist/mcp/server.js.map +1 -0
- package/packages/openclaw/dist/mcp/tools.d.ts +17 -0
- package/packages/openclaw/dist/mcp/tools.d.ts.map +1 -0
- package/packages/openclaw/dist/mcp/tools.js +145 -0
- package/packages/openclaw/dist/mcp/tools.js.map +1 -0
- package/packages/openclaw/dist/runtime/openclaw-config.d.ts +20 -0
- package/packages/openclaw/dist/runtime/openclaw-config.d.ts.map +1 -0
- package/packages/openclaw/dist/runtime/openclaw-config.js +50 -0
- package/packages/openclaw/dist/runtime/openclaw-config.js.map +1 -0
- package/packages/openclaw/dist/runtime/patch.d.ts +24 -0
- package/packages/openclaw/dist/runtime/patch.d.ts.map +1 -0
- package/packages/openclaw/dist/runtime/patch.js +92 -0
- package/packages/openclaw/dist/runtime/patch.js.map +1 -0
- package/packages/openclaw/dist/runtime/setup.d.ts +26 -0
- package/packages/openclaw/dist/runtime/setup.d.ts.map +1 -0
- package/packages/openclaw/dist/runtime/setup.js +58 -0
- package/packages/openclaw/dist/runtime/setup.js.map +1 -0
- package/packages/openclaw/dist/setup.d.ts +29 -0
- package/packages/openclaw/dist/setup.d.ts.map +1 -0
- package/packages/openclaw/dist/setup.js +300 -0
- package/packages/openclaw/dist/setup.js.map +1 -0
- package/packages/openclaw/dist/spawn/docker.d.ts +58 -0
- package/packages/openclaw/dist/spawn/docker.d.ts.map +1 -0
- package/packages/openclaw/dist/spawn/docker.js +222 -0
- package/packages/openclaw/dist/spawn/docker.js.map +1 -0
- package/packages/openclaw/dist/spawn/manager.d.ts +45 -0
- package/packages/openclaw/dist/spawn/manager.d.ts.map +1 -0
- package/packages/openclaw/dist/spawn/manager.js +140 -0
- package/packages/openclaw/dist/spawn/manager.js.map +1 -0
- package/packages/openclaw/dist/spawn/process.d.ts +16 -0
- package/packages/openclaw/dist/spawn/process.d.ts.map +1 -0
- package/packages/openclaw/dist/spawn/process.js +241 -0
- package/packages/openclaw/dist/spawn/process.js.map +1 -0
- package/packages/openclaw/dist/spawn/types.d.ts +42 -0
- package/packages/openclaw/dist/spawn/types.d.ts.map +1 -0
- package/packages/openclaw/dist/spawn/types.js +2 -0
- package/packages/openclaw/dist/spawn/types.js.map +1 -0
- package/packages/openclaw/dist/types.d.ts +37 -0
- package/packages/openclaw/dist/types.d.ts.map +1 -0
- package/packages/openclaw/dist/types.js +2 -0
- package/packages/openclaw/dist/types.js.map +1 -0
- package/packages/openclaw/package.json +63 -0
- package/packages/openclaw/skill/SKILL.md +194 -0
- package/packages/openclaw/src/__tests__/gateway-threads.test.ts +384 -0
- package/packages/openclaw/src/__tests__/naming.test.ts +24 -0
- package/packages/openclaw/src/__tests__/spawn-manager.test.ts +152 -0
- package/packages/openclaw/src/auth/converter.ts +90 -0
- package/packages/openclaw/src/cli.ts +269 -0
- package/packages/openclaw/src/config.ts +124 -0
- package/packages/openclaw/src/control.ts +100 -0
- package/packages/openclaw/src/gateway.ts +941 -0
- package/packages/openclaw/src/identity/contract.ts +44 -0
- package/packages/openclaw/src/identity/files.ts +198 -0
- package/packages/openclaw/src/identity/model.ts +27 -0
- package/packages/openclaw/src/identity/naming.ts +6 -0
- package/packages/openclaw/src/index.ts +59 -0
- package/packages/openclaw/src/inject.ts +77 -0
- package/packages/openclaw/src/mcp/server.ts +121 -0
- package/packages/openclaw/src/mcp/tools.ts +174 -0
- package/packages/openclaw/src/runtime/openclaw-config.ts +64 -0
- package/packages/openclaw/src/runtime/patch.ts +103 -0
- package/packages/openclaw/src/runtime/setup.ts +89 -0
- package/packages/openclaw/src/setup.ts +336 -0
- package/packages/openclaw/src/spawn/docker.ts +261 -0
- package/packages/openclaw/src/spawn/manager.ts +181 -0
- package/packages/openclaw/src/spawn/process.ts +272 -0
- package/packages/openclaw/src/spawn/types.ts +43 -0
- package/packages/openclaw/src/types.ts +38 -0
- package/packages/openclaw/templates/SOUL.md.template +34 -0
- package/packages/openclaw/tsconfig.json +12 -0
- package/packages/policy/package.json +2 -2
- package/packages/sdk/package.json +2 -2
- package/packages/sdk-py/pyproject.toml +1 -1
- package/packages/telemetry/package.json +1 -1
- package/packages/trajectory/package.json +2 -2
- package/packages/user-directory/package.json +2 -2
- package/packages/utils/package.json +2 -2
- package/bin/agent-relay-broker-darwin-arm64 +0 -0
- package/bin/agent-relay-broker-darwin-x64 +0 -0
- package/bin/agent-relay-broker-linux-arm64 +0 -0
|
@@ -0,0 +1,320 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
// ---------------------------------------------------------------------------
|
|
3
|
+
// Mocks — declared before importing the module under test
|
|
4
|
+
// ---------------------------------------------------------------------------
|
|
5
|
+
// Store registered event handlers so tests can fire them
|
|
6
|
+
const eventHandlers = {};
|
|
7
|
+
function registerHandler(event) {
|
|
8
|
+
return (handler) => {
|
|
9
|
+
if (!eventHandlers[event])
|
|
10
|
+
eventHandlers[event] = [];
|
|
11
|
+
eventHandlers[event].push(handler);
|
|
12
|
+
return () => {
|
|
13
|
+
eventHandlers[event] = eventHandlers[event].filter((h) => h !== handler);
|
|
14
|
+
};
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
function fireEvent(event, ...args) {
|
|
18
|
+
for (const handler of eventHandlers[event] ?? []) {
|
|
19
|
+
handler(...args);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
const mockAgentClient = {
|
|
23
|
+
connect: vi.fn(),
|
|
24
|
+
disconnect: vi.fn().mockResolvedValue(undefined),
|
|
25
|
+
subscribe: vi.fn(),
|
|
26
|
+
unsubscribe: vi.fn(),
|
|
27
|
+
presence: {
|
|
28
|
+
markOnline: vi.fn().mockResolvedValue(undefined),
|
|
29
|
+
heartbeat: vi.fn().mockResolvedValue(undefined),
|
|
30
|
+
markOffline: vi.fn().mockResolvedValue(undefined),
|
|
31
|
+
},
|
|
32
|
+
channels: {
|
|
33
|
+
join: vi.fn().mockResolvedValue({ ok: true }),
|
|
34
|
+
create: vi.fn().mockResolvedValue({ name: 'general' }),
|
|
35
|
+
},
|
|
36
|
+
on: {
|
|
37
|
+
connected: registerHandler('connected'),
|
|
38
|
+
messageCreated: registerHandler('messageCreated'),
|
|
39
|
+
threadReply: registerHandler('threadReply'),
|
|
40
|
+
reconnecting: registerHandler('reconnecting'),
|
|
41
|
+
disconnected: registerHandler('disconnected'),
|
|
42
|
+
error: registerHandler('error'),
|
|
43
|
+
any: registerHandler('any'),
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
vi.mock('@relaycast/sdk', () => ({
|
|
47
|
+
RelayCast: vi.fn().mockImplementation(() => ({
|
|
48
|
+
agents: {
|
|
49
|
+
registerOrGet: vi.fn().mockResolvedValue({ name: 'viewer-test-claw', token: 'tok_test' }),
|
|
50
|
+
},
|
|
51
|
+
channels: { join: vi.fn().mockResolvedValue({ ok: true }) },
|
|
52
|
+
messages: { list: vi.fn().mockResolvedValue([]) },
|
|
53
|
+
as: vi.fn().mockReturnValue(mockAgentClient),
|
|
54
|
+
})),
|
|
55
|
+
}));
|
|
56
|
+
vi.mock('../spawn/manager.js', () => ({
|
|
57
|
+
SpawnManager: vi.fn().mockImplementation(() => ({
|
|
58
|
+
size: 0,
|
|
59
|
+
spawn: vi.fn(),
|
|
60
|
+
release: vi.fn(),
|
|
61
|
+
releaseByName: vi.fn(),
|
|
62
|
+
releaseAll: vi.fn().mockResolvedValue(undefined),
|
|
63
|
+
list: vi.fn().mockReturnValue([]),
|
|
64
|
+
get: vi.fn(),
|
|
65
|
+
})),
|
|
66
|
+
}));
|
|
67
|
+
vi.mock('node:fs/promises', () => ({
|
|
68
|
+
readFile: vi.fn().mockResolvedValue('{"spawns":[]}'),
|
|
69
|
+
writeFile: vi.fn().mockResolvedValue(undefined),
|
|
70
|
+
mkdir: vi.fn().mockResolvedValue(undefined),
|
|
71
|
+
}));
|
|
72
|
+
vi.mock('node:fs', () => ({
|
|
73
|
+
existsSync: vi.fn().mockReturnValue(false),
|
|
74
|
+
}));
|
|
75
|
+
// Mock createServer to avoid binding real ports
|
|
76
|
+
vi.mock('node:http', async (importOriginal) => {
|
|
77
|
+
const actual = await importOriginal();
|
|
78
|
+
return {
|
|
79
|
+
...actual,
|
|
80
|
+
createServer: vi.fn().mockReturnValue({
|
|
81
|
+
listen: vi.fn((_port, _host, cb) => cb()),
|
|
82
|
+
close: vi.fn((cb) => cb?.()),
|
|
83
|
+
address: vi.fn().mockReturnValue({ port: 18790 }),
|
|
84
|
+
}),
|
|
85
|
+
};
|
|
86
|
+
});
|
|
87
|
+
// ---------------------------------------------------------------------------
|
|
88
|
+
// Import after mocks
|
|
89
|
+
// ---------------------------------------------------------------------------
|
|
90
|
+
import { InboundGateway } from '../gateway.js';
|
|
91
|
+
// ---------------------------------------------------------------------------
|
|
92
|
+
// Helpers
|
|
93
|
+
// ---------------------------------------------------------------------------
|
|
94
|
+
function createGateway(overrides) {
|
|
95
|
+
const sendMessage = vi.fn().mockResolvedValue({ event_id: 'evt_1' });
|
|
96
|
+
const gateway = new InboundGateway({
|
|
97
|
+
config: {
|
|
98
|
+
apiKey: 'rk_live_test',
|
|
99
|
+
clawName: overrides?.clawName ?? 'test-claw',
|
|
100
|
+
baseUrl: 'https://api.relaycast.dev',
|
|
101
|
+
channels: overrides?.channels ?? ['general'],
|
|
102
|
+
},
|
|
103
|
+
relaySender: { sendMessage },
|
|
104
|
+
});
|
|
105
|
+
return { gateway, sendMessage };
|
|
106
|
+
}
|
|
107
|
+
// ---------------------------------------------------------------------------
|
|
108
|
+
// Tests
|
|
109
|
+
// ---------------------------------------------------------------------------
|
|
110
|
+
describe('InboundGateway — thread reply injection', () => {
|
|
111
|
+
beforeEach(() => {
|
|
112
|
+
vi.clearAllMocks();
|
|
113
|
+
for (const key of Object.keys(eventHandlers)) {
|
|
114
|
+
eventHandlers[key] = [];
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
afterEach(async () => {
|
|
118
|
+
vi.useRealTimers();
|
|
119
|
+
});
|
|
120
|
+
describe('message formatting', () => {
|
|
121
|
+
it('should format regular channel messages without thread prefix', async () => {
|
|
122
|
+
const { gateway, sendMessage } = createGateway();
|
|
123
|
+
await gateway.start();
|
|
124
|
+
fireEvent('messageCreated', {
|
|
125
|
+
type: 'message.created',
|
|
126
|
+
channel: 'general',
|
|
127
|
+
message: {
|
|
128
|
+
id: 'msg_1',
|
|
129
|
+
agentName: 'alice',
|
|
130
|
+
text: 'hello world',
|
|
131
|
+
attachments: [],
|
|
132
|
+
},
|
|
133
|
+
});
|
|
134
|
+
await vi.waitFor(() => {
|
|
135
|
+
expect(sendMessage).toHaveBeenCalled();
|
|
136
|
+
});
|
|
137
|
+
const call = sendMessage.mock.calls[0][0];
|
|
138
|
+
expect(call.text).toBe('[relaycast:general] @alice: hello world');
|
|
139
|
+
expect(call.text).not.toContain('[thread]');
|
|
140
|
+
await gateway.stop();
|
|
141
|
+
});
|
|
142
|
+
it('should format thread replies with [thread] prefix', async () => {
|
|
143
|
+
const { gateway, sendMessage } = createGateway();
|
|
144
|
+
await gateway.start();
|
|
145
|
+
fireEvent('threadReply', {
|
|
146
|
+
type: 'thread.reply',
|
|
147
|
+
channel: 'general',
|
|
148
|
+
parentId: 'msg_parent_1',
|
|
149
|
+
message: {
|
|
150
|
+
id: 'msg_reply_1',
|
|
151
|
+
agentName: 'bob',
|
|
152
|
+
text: 'replying in thread',
|
|
153
|
+
},
|
|
154
|
+
});
|
|
155
|
+
await vi.waitFor(() => {
|
|
156
|
+
expect(sendMessage).toHaveBeenCalled();
|
|
157
|
+
});
|
|
158
|
+
const call = sendMessage.mock.calls[0][0];
|
|
159
|
+
expect(call.text).toBe('[thread] [relaycast:general] @bob: replying in thread');
|
|
160
|
+
await gateway.stop();
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
describe('thread reply event handling', () => {
|
|
164
|
+
it('should deliver thread replies from subscribed channels', async () => {
|
|
165
|
+
const { gateway, sendMessage } = createGateway({ channels: ['general', 'dev'] });
|
|
166
|
+
await gateway.start();
|
|
167
|
+
fireEvent('threadReply', {
|
|
168
|
+
type: 'thread.reply',
|
|
169
|
+
channel: 'dev',
|
|
170
|
+
parentId: 'msg_100',
|
|
171
|
+
message: {
|
|
172
|
+
id: 'msg_101',
|
|
173
|
+
agentName: 'carol',
|
|
174
|
+
text: 'thread in dev channel',
|
|
175
|
+
},
|
|
176
|
+
});
|
|
177
|
+
await vi.waitFor(() => {
|
|
178
|
+
expect(sendMessage).toHaveBeenCalled();
|
|
179
|
+
});
|
|
180
|
+
const call = sendMessage.mock.calls[0][0];
|
|
181
|
+
expect(call.text).toContain('[thread]');
|
|
182
|
+
expect(call.text).toContain('[relaycast:dev]');
|
|
183
|
+
expect(call.text).toContain('@carol');
|
|
184
|
+
await gateway.stop();
|
|
185
|
+
});
|
|
186
|
+
it('should ignore thread replies from unsubscribed channels', async () => {
|
|
187
|
+
const { gateway, sendMessage } = createGateway({ channels: ['general'] });
|
|
188
|
+
await gateway.start();
|
|
189
|
+
fireEvent('threadReply', {
|
|
190
|
+
type: 'thread.reply',
|
|
191
|
+
channel: 'random',
|
|
192
|
+
parentId: 'msg_200',
|
|
193
|
+
message: {
|
|
194
|
+
id: 'msg_201',
|
|
195
|
+
agentName: 'dave',
|
|
196
|
+
text: 'thread in random',
|
|
197
|
+
},
|
|
198
|
+
});
|
|
199
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
200
|
+
expect(sendMessage).not.toHaveBeenCalled();
|
|
201
|
+
await gateway.stop();
|
|
202
|
+
});
|
|
203
|
+
it('should skip thread replies from the claw itself (echo prevention)', async () => {
|
|
204
|
+
const { gateway, sendMessage } = createGateway({ clawName: 'my-claw' });
|
|
205
|
+
await gateway.start();
|
|
206
|
+
fireEvent('threadReply', {
|
|
207
|
+
type: 'thread.reply',
|
|
208
|
+
channel: 'general',
|
|
209
|
+
parentId: 'msg_300',
|
|
210
|
+
message: {
|
|
211
|
+
id: 'msg_301',
|
|
212
|
+
agentName: 'my-claw',
|
|
213
|
+
text: 'my own reply',
|
|
214
|
+
},
|
|
215
|
+
});
|
|
216
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
217
|
+
expect(sendMessage).not.toHaveBeenCalled();
|
|
218
|
+
await gateway.stop();
|
|
219
|
+
});
|
|
220
|
+
it('should skip thread replies from the viewer identity', async () => {
|
|
221
|
+
const { gateway, sendMessage } = createGateway({ clawName: 'my-claw' });
|
|
222
|
+
await gateway.start();
|
|
223
|
+
fireEvent('threadReply', {
|
|
224
|
+
type: 'thread.reply',
|
|
225
|
+
channel: 'general',
|
|
226
|
+
parentId: 'msg_400',
|
|
227
|
+
message: {
|
|
228
|
+
id: 'msg_401',
|
|
229
|
+
agentName: 'viewer-my-claw',
|
|
230
|
+
text: 'viewer echo',
|
|
231
|
+
},
|
|
232
|
+
});
|
|
233
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
234
|
+
expect(sendMessage).not.toHaveBeenCalled();
|
|
235
|
+
await gateway.stop();
|
|
236
|
+
});
|
|
237
|
+
it('should deduplicate thread replies with the same message ID', async () => {
|
|
238
|
+
const { gateway, sendMessage } = createGateway();
|
|
239
|
+
await gateway.start();
|
|
240
|
+
const event = {
|
|
241
|
+
type: 'thread.reply',
|
|
242
|
+
channel: 'general',
|
|
243
|
+
parentId: 'msg_500',
|
|
244
|
+
message: {
|
|
245
|
+
id: 'msg_501',
|
|
246
|
+
agentName: 'eve',
|
|
247
|
+
text: 'duplicate test',
|
|
248
|
+
},
|
|
249
|
+
};
|
|
250
|
+
fireEvent('threadReply', event);
|
|
251
|
+
fireEvent('threadReply', event);
|
|
252
|
+
await vi.waitFor(() => {
|
|
253
|
+
expect(sendMessage).toHaveBeenCalled();
|
|
254
|
+
});
|
|
255
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
256
|
+
expect(sendMessage).toHaveBeenCalledTimes(1);
|
|
257
|
+
await gateway.stop();
|
|
258
|
+
});
|
|
259
|
+
});
|
|
260
|
+
describe('mixed message and thread delivery', () => {
|
|
261
|
+
it('should deliver both channel messages and thread replies', async () => {
|
|
262
|
+
const { gateway, sendMessage } = createGateway();
|
|
263
|
+
await gateway.start();
|
|
264
|
+
fireEvent('messageCreated', {
|
|
265
|
+
type: 'message.created',
|
|
266
|
+
channel: 'general',
|
|
267
|
+
message: {
|
|
268
|
+
id: 'msg_600',
|
|
269
|
+
agentName: 'frank',
|
|
270
|
+
text: 'original message',
|
|
271
|
+
attachments: [],
|
|
272
|
+
},
|
|
273
|
+
});
|
|
274
|
+
await vi.waitFor(() => {
|
|
275
|
+
expect(sendMessage).toHaveBeenCalledTimes(1);
|
|
276
|
+
});
|
|
277
|
+
fireEvent('threadReply', {
|
|
278
|
+
type: 'thread.reply',
|
|
279
|
+
channel: 'general',
|
|
280
|
+
parentId: 'msg_600',
|
|
281
|
+
message: {
|
|
282
|
+
id: 'msg_601',
|
|
283
|
+
agentName: 'grace',
|
|
284
|
+
text: 'reply to frank',
|
|
285
|
+
},
|
|
286
|
+
});
|
|
287
|
+
await vi.waitFor(() => {
|
|
288
|
+
expect(sendMessage).toHaveBeenCalledTimes(2);
|
|
289
|
+
});
|
|
290
|
+
const firstCall = sendMessage.mock.calls[0][0];
|
|
291
|
+
expect(firstCall.text).toBe('[relaycast:general] @frank: original message');
|
|
292
|
+
const secondCall = sendMessage.mock.calls[1][0];
|
|
293
|
+
expect(secondCall.text).toBe('[thread] [relaycast:general] @grace: reply to frank');
|
|
294
|
+
await gateway.stop();
|
|
295
|
+
});
|
|
296
|
+
it('should include source metadata in relay sender data', async () => {
|
|
297
|
+
const { gateway, sendMessage } = createGateway();
|
|
298
|
+
await gateway.start();
|
|
299
|
+
fireEvent('threadReply', {
|
|
300
|
+
type: 'thread.reply',
|
|
301
|
+
channel: 'general',
|
|
302
|
+
parentId: 'msg_parent_700',
|
|
303
|
+
message: {
|
|
304
|
+
id: 'msg_700',
|
|
305
|
+
agentName: 'heidi',
|
|
306
|
+
text: 'metadata check',
|
|
307
|
+
},
|
|
308
|
+
});
|
|
309
|
+
await vi.waitFor(() => {
|
|
310
|
+
expect(sendMessage).toHaveBeenCalled();
|
|
311
|
+
});
|
|
312
|
+
const call = sendMessage.mock.calls[0][0];
|
|
313
|
+
expect(call.data.source).toBe('relaycast');
|
|
314
|
+
expect(call.data.channel).toBe('general');
|
|
315
|
+
expect(call.data.messageId).toBe('msg_700');
|
|
316
|
+
await gateway.stop();
|
|
317
|
+
});
|
|
318
|
+
});
|
|
319
|
+
});
|
|
320
|
+
//# sourceMappingURL=gateway-threads.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gateway-threads.test.js","sourceRoot":"","sources":["../../src/__tests__/gateway-threads.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"naming.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/naming.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { buildAgentName } from '../identity/naming.js';
|
|
3
|
+
describe('buildAgentName', () => {
|
|
4
|
+
it('should build agent name from workspace and claw name', () => {
|
|
5
|
+
const result = buildAgentName('ws123', 'researcher');
|
|
6
|
+
expect(result).toBe('claw-ws123-researcher');
|
|
7
|
+
});
|
|
8
|
+
it('should handle hyphens in workspace id', () => {
|
|
9
|
+
const result = buildAgentName('ws-abc-123', 'coder');
|
|
10
|
+
expect(result).toBe('claw-ws-abc-123-coder');
|
|
11
|
+
});
|
|
12
|
+
it('should handle hyphens in claw name', () => {
|
|
13
|
+
const result = buildAgentName('workspace', 'code-reviewer');
|
|
14
|
+
expect(result).toBe('claw-workspace-code-reviewer');
|
|
15
|
+
});
|
|
16
|
+
it('should handle empty strings', () => {
|
|
17
|
+
const result = buildAgentName('', '');
|
|
18
|
+
expect(result).toBe('claw--');
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
|
+
//# sourceMappingURL=naming.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"naming.test.js","sourceRoot":"","sources":["../../src/__tests__/naming.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC5D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spawn-manager.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/spawn-manager.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
import { SpawnManager } from '../spawn/manager.js';
|
|
3
|
+
// Mock the spawn providers
|
|
4
|
+
vi.mock('../spawn/docker.js', () => ({
|
|
5
|
+
DockerSpawnProvider: vi.fn().mockImplementation(() => ({
|
|
6
|
+
spawn: vi.fn().mockResolvedValue({
|
|
7
|
+
id: 'test-id-1',
|
|
8
|
+
displayName: 'test-claw',
|
|
9
|
+
agentName: 'claw-ws123-test-claw',
|
|
10
|
+
gatewayPort: 18789,
|
|
11
|
+
destroy: vi.fn().mockResolvedValue(undefined),
|
|
12
|
+
}),
|
|
13
|
+
destroy: vi.fn().mockResolvedValue(undefined),
|
|
14
|
+
list: vi.fn().mockResolvedValue([]),
|
|
15
|
+
})),
|
|
16
|
+
}));
|
|
17
|
+
vi.mock('../spawn/process.js', () => ({
|
|
18
|
+
ProcessSpawnProvider: vi.fn().mockImplementation(() => {
|
|
19
|
+
let callCount = 0;
|
|
20
|
+
return {
|
|
21
|
+
spawn: vi.fn().mockImplementation((options) => {
|
|
22
|
+
callCount++;
|
|
23
|
+
return Promise.resolve({
|
|
24
|
+
id: `test-id-${callCount}`,
|
|
25
|
+
displayName: options.name,
|
|
26
|
+
agentName: `claw-ws123-${options.name}`,
|
|
27
|
+
gatewayPort: 18790,
|
|
28
|
+
destroy: vi.fn().mockResolvedValue(undefined),
|
|
29
|
+
});
|
|
30
|
+
}),
|
|
31
|
+
destroy: vi.fn().mockResolvedValue(undefined),
|
|
32
|
+
list: vi.fn().mockResolvedValue([]),
|
|
33
|
+
};
|
|
34
|
+
}),
|
|
35
|
+
}));
|
|
36
|
+
// Mock fs operations
|
|
37
|
+
vi.mock('node:fs/promises', () => ({
|
|
38
|
+
readFile: vi.fn().mockResolvedValue('{"spawns":[]}'),
|
|
39
|
+
writeFile: vi.fn().mockResolvedValue(undefined),
|
|
40
|
+
mkdir: vi.fn().mockResolvedValue(undefined),
|
|
41
|
+
}));
|
|
42
|
+
vi.mock('node:fs', () => ({
|
|
43
|
+
existsSync: vi.fn().mockReturnValue(false),
|
|
44
|
+
}));
|
|
45
|
+
describe('SpawnManager', () => {
|
|
46
|
+
beforeEach(() => {
|
|
47
|
+
vi.clearAllMocks();
|
|
48
|
+
});
|
|
49
|
+
it('should initialize with default values', () => {
|
|
50
|
+
const manager = new SpawnManager({ mode: 'process' });
|
|
51
|
+
expect(manager.size).toBe(0);
|
|
52
|
+
});
|
|
53
|
+
it('should enforce maxSpawns limit', async () => {
|
|
54
|
+
const manager = new SpawnManager({ mode: 'process', maxSpawns: 1 });
|
|
55
|
+
// First spawn should succeed
|
|
56
|
+
await manager.spawn({
|
|
57
|
+
name: 'claw-1',
|
|
58
|
+
relayApiKey: 'rk_live_test',
|
|
59
|
+
});
|
|
60
|
+
expect(manager.size).toBe(1);
|
|
61
|
+
// Second spawn should fail due to limit
|
|
62
|
+
await expect(manager.spawn({
|
|
63
|
+
name: 'claw-2',
|
|
64
|
+
relayApiKey: 'rk_live_test',
|
|
65
|
+
})).rejects.toThrow(/Maximum concurrent spawns reached/);
|
|
66
|
+
});
|
|
67
|
+
it('should enforce maxDepth limit', async () => {
|
|
68
|
+
const manager = new SpawnManager({
|
|
69
|
+
mode: 'process',
|
|
70
|
+
maxDepth: 2,
|
|
71
|
+
spawnDepth: 2, // Already at max depth
|
|
72
|
+
});
|
|
73
|
+
await expect(manager.spawn({
|
|
74
|
+
name: 'claw-1',
|
|
75
|
+
relayApiKey: 'rk_live_test',
|
|
76
|
+
})).rejects.toThrow(/Spawn depth limit reached/);
|
|
77
|
+
});
|
|
78
|
+
it('should prevent duplicate spawns by name', async () => {
|
|
79
|
+
const manager = new SpawnManager({ mode: 'process' });
|
|
80
|
+
await manager.spawn({
|
|
81
|
+
name: 'researcher',
|
|
82
|
+
relayApiKey: 'rk_live_test',
|
|
83
|
+
});
|
|
84
|
+
await expect(manager.spawn({
|
|
85
|
+
name: 'researcher',
|
|
86
|
+
relayApiKey: 'rk_live_test',
|
|
87
|
+
})).rejects.toThrow(/already running/);
|
|
88
|
+
});
|
|
89
|
+
it('should list spawned handles', async () => {
|
|
90
|
+
const manager = new SpawnManager({ mode: 'process' });
|
|
91
|
+
await manager.spawn({
|
|
92
|
+
name: 'worker-1',
|
|
93
|
+
relayApiKey: 'rk_live_test',
|
|
94
|
+
});
|
|
95
|
+
const list = manager.list();
|
|
96
|
+
expect(list).toHaveLength(1);
|
|
97
|
+
expect(list[0].displayName).toBe('worker-1');
|
|
98
|
+
});
|
|
99
|
+
it('should release by id', async () => {
|
|
100
|
+
const manager = new SpawnManager({ mode: 'process' });
|
|
101
|
+
const handle = await manager.spawn({
|
|
102
|
+
name: 'worker-1',
|
|
103
|
+
relayApiKey: 'rk_live_test',
|
|
104
|
+
});
|
|
105
|
+
expect(manager.size).toBe(1);
|
|
106
|
+
const released = await manager.release(handle.id);
|
|
107
|
+
expect(released).toBe(true);
|
|
108
|
+
expect(manager.size).toBe(0);
|
|
109
|
+
});
|
|
110
|
+
it('should release by name', async () => {
|
|
111
|
+
const manager = new SpawnManager({ mode: 'process' });
|
|
112
|
+
await manager.spawn({
|
|
113
|
+
name: 'worker-1',
|
|
114
|
+
relayApiKey: 'rk_live_test',
|
|
115
|
+
});
|
|
116
|
+
const released = await manager.releaseByName('worker-1');
|
|
117
|
+
expect(released).toBe(true);
|
|
118
|
+
expect(manager.size).toBe(0);
|
|
119
|
+
});
|
|
120
|
+
it('should return false when releasing non-existent spawn', async () => {
|
|
121
|
+
const manager = new SpawnManager({ mode: 'process' });
|
|
122
|
+
const released = await manager.release('non-existent-id');
|
|
123
|
+
expect(released).toBe(false);
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
//# sourceMappingURL=spawn-manager.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spawn-manager.test.js","sourceRoot":"","sources":["../../src/__tests__/spawn-manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export interface CodexOAuthTokens {
|
|
2
|
+
access_token: string;
|
|
3
|
+
refresh_token?: string;
|
|
4
|
+
}
|
|
5
|
+
export interface CodexAuth {
|
|
6
|
+
tokens?: CodexOAuthTokens;
|
|
7
|
+
OPENAI_API_KEY?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface ConvertResult {
|
|
10
|
+
/** Whether auth was written. */
|
|
11
|
+
ok: boolean;
|
|
12
|
+
/** Provider hint derived from auth source (e.g. 'openai-codex' for OAuth). */
|
|
13
|
+
preferredProvider: string;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Convert Codex CLI auth.json into OpenClaw's legacy auth format.
|
|
17
|
+
*
|
|
18
|
+
* Reads ~/.codex/auth.json (or codexAuthPath) and writes the converted
|
|
19
|
+
* auth to ~/.openclaw/agents/main/agent/auth.json (or openclawAuthDir).
|
|
20
|
+
*
|
|
21
|
+
* Falls back to OPENAI_API_KEY env var if no codex auth file exists.
|
|
22
|
+
*/
|
|
23
|
+
export declare function convertCodexAuth(options?: {
|
|
24
|
+
codexAuthPath?: string;
|
|
25
|
+
openclawAuthDir?: string;
|
|
26
|
+
openaiApiKey?: string;
|
|
27
|
+
}): Promise<ConvertResult>;
|
|
28
|
+
//# sourceMappingURL=converter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/auth/converter.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,gCAAgC;IAChC,EAAE,EAAE,OAAO,CAAC;IACZ,8EAA8E;IAC9E,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,CAAC,EAAE;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,aAAa,CAAC,CAwDzB"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { readFile, writeFile, mkdir } from 'node:fs/promises';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { existsSync } from 'node:fs';
|
|
4
|
+
/**
|
|
5
|
+
* Convert Codex CLI auth.json into OpenClaw's legacy auth format.
|
|
6
|
+
*
|
|
7
|
+
* Reads ~/.codex/auth.json (or codexAuthPath) and writes the converted
|
|
8
|
+
* auth to ~/.openclaw/agents/main/agent/auth.json (or openclawAuthDir).
|
|
9
|
+
*
|
|
10
|
+
* Falls back to OPENAI_API_KEY env var if no codex auth file exists.
|
|
11
|
+
*/
|
|
12
|
+
export async function convertCodexAuth(options) {
|
|
13
|
+
const home = process.env.HOME ?? '/home/node';
|
|
14
|
+
const codexPath = options?.codexAuthPath ?? join(home, '.codex', 'auth.json');
|
|
15
|
+
const openclawAgentDir = options?.openclawAuthDir ?? join(home, '.openclaw', 'agents', 'main', 'agent');
|
|
16
|
+
const openclawAuthPath = join(openclawAgentDir, 'auth.json');
|
|
17
|
+
let preferredProvider = 'openai';
|
|
18
|
+
if (existsSync(codexPath)) {
|
|
19
|
+
const codex = JSON.parse(await readFile(codexPath, 'utf8'));
|
|
20
|
+
await mkdir(openclawAgentDir, { recursive: true });
|
|
21
|
+
if (codex.tokens?.access_token) {
|
|
22
|
+
// OAuth tokens from codex subscription
|
|
23
|
+
const auth = {
|
|
24
|
+
'openai-codex': {
|
|
25
|
+
type: 'oauth',
|
|
26
|
+
provider: 'openai-codex',
|
|
27
|
+
access: codex.tokens.access_token,
|
|
28
|
+
refresh: codex.tokens.refresh_token ?? '',
|
|
29
|
+
expires: Date.now() + 3600000,
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
await writeFile(openclawAuthPath, JSON.stringify(auth, null, 2), 'utf8');
|
|
33
|
+
preferredProvider = 'openai-codex';
|
|
34
|
+
return { ok: true, preferredProvider };
|
|
35
|
+
}
|
|
36
|
+
if (codex.OPENAI_API_KEY && typeof codex.OPENAI_API_KEY === 'string') {
|
|
37
|
+
const auth = {
|
|
38
|
+
openai: {
|
|
39
|
+
type: 'api_key',
|
|
40
|
+
provider: 'openai',
|
|
41
|
+
key: codex.OPENAI_API_KEY,
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
await writeFile(openclawAuthPath, JSON.stringify(auth, null, 2), 'utf8');
|
|
45
|
+
return { ok: true, preferredProvider };
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
// Fallback: use OPENAI_API_KEY from env
|
|
49
|
+
const envKey = options?.openaiApiKey ?? process.env.OPENAI_API_KEY;
|
|
50
|
+
if (envKey) {
|
|
51
|
+
await mkdir(openclawAgentDir, { recursive: true });
|
|
52
|
+
const auth = {
|
|
53
|
+
openai: {
|
|
54
|
+
type: 'api_key',
|
|
55
|
+
provider: 'openai',
|
|
56
|
+
key: envKey,
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
await writeFile(openclawAuthPath, JSON.stringify(auth, null, 2), 'utf8');
|
|
60
|
+
return { ok: true, preferredProvider };
|
|
61
|
+
}
|
|
62
|
+
return { ok: false, preferredProvider };
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=converter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/auth/converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":""}
|