macro-agent 0.1.7 → 0.1.8
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/CLAUDE.md +14 -6
- package/dist/agent/agent-manager-v2.d.ts.map +1 -1
- package/dist/agent/agent-manager-v2.js +0 -28
- package/dist/agent/agent-manager-v2.js.map +1 -1
- package/dist/boot-v2.d.ts.map +1 -1
- package/dist/boot-v2.js +18 -36
- package/dist/boot-v2.js.map +1 -1
- package/dist/map/lifecycle-bridge.d.ts +0 -7
- package/dist/map/lifecycle-bridge.d.ts.map +1 -1
- package/dist/map/lifecycle-bridge.js +28 -9
- package/dist/map/lifecycle-bridge.js.map +1 -1
- package/dist/map/sidecar.d.ts.map +1 -1
- package/dist/map/sidecar.js +0 -2
- package/dist/map/sidecar.js.map +1 -1
- package/package.json +1 -1
- package/src/agent/__tests__/agent-manager-v2.test.ts +5 -11
- package/src/agent/agent-manager-v2.ts +0 -29
- package/src/boot-v2.ts +19 -35
- package/src/cognitive/__tests__/macro-agent-backend.test.ts +47 -5
- package/src/map/__tests__/lifecycle-bridge.test.ts +84 -17
- package/src/map/lifecycle-bridge.ts +31 -16
- package/src/map/sidecar.ts +0 -2
package/CLAUDE.md
CHANGED
|
@@ -58,7 +58,6 @@ macro-agent enables coordinated work across multiple AI agents with:
|
|
|
58
58
|
│ - Spawns agents via acp-factory (AgentFactory) │
|
|
59
59
|
│ - Manages lifecycle (spawn, prompt, stop, continue, fork) │
|
|
60
60
|
│ - Registers agents in agent-inbox on spawn │
|
|
61
|
-
│ - Creates tasks in opentasks on spawn │
|
|
62
61
|
│ - Workspace allocation via WorkspaceManager │
|
|
63
62
|
│ - Cascade termination with change consolidation │
|
|
64
63
|
│ - Spawn interceptor hook (set by TeamManager) │
|
|
@@ -303,7 +302,7 @@ src/
|
|
|
303
302
|
macro-agent delegates two major concerns to external subsystems:
|
|
304
303
|
|
|
305
304
|
- **agent-inbox**: All messaging (send/receive, threading, conversations, federation). Embedded in-process for zero-latency events, with IPC server for agent MCP subprocesses.
|
|
306
|
-
- **opentasks**:
|
|
305
|
+
- **opentasks**: Task management for pull-mode workflows (claiming, dependencies, state transitions). Connected via IPC to opentasks daemon (auto-started if needed). Note: AgentManagerV2 does **not** create opentasks nodes on spawn or transition them on terminate — that was removed to avoid polluting the task graph with per-session noise. Opentasks is used only for explicit task operations (pull-mode claim/unclaim/list, team task coordination).
|
|
307
306
|
|
|
308
307
|
macro-agent owns: agent lifecycle, workspace isolation, team topology, role system, trigger/wake, control socket.
|
|
309
308
|
|
|
@@ -441,15 +440,24 @@ The `acp/` module bridges the Agent Client Protocol (ACP) to macro-agent's V2 se
|
|
|
441
440
|
|
|
442
441
|
### MAP Capabilities
|
|
443
442
|
|
|
444
|
-
|
|
443
|
+
Capabilities are declared at two levels:
|
|
444
|
+
|
|
445
|
+
**Connection-level** (sidecar, `src/map/sidecar.ts`): Declared when the sidecar connects to the OpenHive MAP hub. These describe the swarm's general capabilities:
|
|
445
446
|
|
|
446
447
|
- `messaging: { canSend: true, canReceive: true }` — can exchange MAP scope messages
|
|
447
448
|
- `mail: { canCreate: true, canJoin: true, canViewHistory: true }` — supports agent-inbox conversations (enables Mail chat mode in OpenHive)
|
|
448
|
-
- `protocols: ['acp']` — advertises ACP protocol support (enables ACP streaming chat in OpenHive)
|
|
449
|
-
- `acp: { version: '2024-10-07' }` — ACP version details
|
|
450
449
|
- `trajectory: { canReport: true, canServeContent: false }` — reports checkpoints (does not serve content on demand)
|
|
451
450
|
- `tasks: { canCreate, canAssign, canUpdate, canList }` — task management
|
|
452
451
|
|
|
452
|
+
**Per-agent** (lifecycle bridge, `src/map/lifecycle-bridge.ts`): Declared when agents register on the hub via `map/agents/register`. ACP is per-agent because you connect to a specific agent, not to the swarm:
|
|
453
|
+
|
|
454
|
+
- **Coordinators** (head managers): `protocols: ['acp']`, `acp: { version: '2024-10-07' }`, `messaging: { canReceive: true }` — enables ACP streaming chat in OpenHive
|
|
455
|
+
- **Workers**: `messaging: { canReceive: true }` — no ACP
|
|
456
|
+
|
|
457
|
+
The hub aggregates per-agent capabilities into the swarm record (union semantics). OpenHive resolves the ACP target by finding the first registered agent with `protocols: ['acp']` on the live connection.
|
|
458
|
+
|
|
459
|
+
The lifecycle bridge uses `map/agents/register` (not `map/agents/spawn`) to register agents on the hub, because `spawn` drops the `capabilities` field. The bridge tracks MAP-assigned ULIDs (`mapId`) for correct unregistration.
|
|
460
|
+
|
|
453
461
|
Message delivery is **push-based**: `InboxAdapter.onDelivery()` fires immediately on message receipt, the trigger system maps importance → wake action, and `WakeManager` injects into the active session via inject/interrupt/prompt fallback chain.
|
|
454
462
|
|
|
455
463
|
### REST API Server
|
|
@@ -512,7 +520,7 @@ All filtering is adapter-side — agent-inbox is a dumb pipe, macro-agent enforc
|
|
|
512
520
|
1. Agent calls `done()` MCP tool with status + summary
|
|
513
521
|
2. MCPServerV2 dispatches to `createDoneHandlerV2()` which builds a handler using `HandlerDepsV2` (InboxAdapter, TasksAdapter, AgentManager)
|
|
514
522
|
3. Role-specific handler runs:
|
|
515
|
-
- **Worker**: Commits changes, emits `work:done` signal to parent via InboxAdapter
|
|
523
|
+
- **Worker**: Commits changes, emits `work:done` signal to parent via InboxAdapter
|
|
516
524
|
- **Coordinator**: Emits completion signal, cascade-terminates children if needed
|
|
517
525
|
- **Monitor**: Emits health report
|
|
518
526
|
4. If `shouldTerminate`, AgentManagerV2 handles termination including workspace cleanup and change consolidation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-manager-v2.d.ts","sourceRoot":"","sources":["../../src/agent/agent-manager-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EAGX,MAAM,kBAAkB,CAAC;AA0B1B,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,mBAAmB,CAAC;AAIlE,OAAO,KAAK,EAAE,gBAAgB,EAAa,MAAM,uBAAuB,CAAC;AAMzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AAkCzE,oEAAoE;AACpE,UAAU,kBAAkB;IAC1B,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,qBAAqB,CAAC,EAAE,cAAc,CAAC;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAMD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAC1B,MAAM,GAAE,oBAAyB,GAChC,YAAY,
|
|
1
|
+
{"version":3,"file":"agent-manager-v2.d.ts","sourceRoot":"","sources":["../../src/agent/agent-manager-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EAGX,MAAM,kBAAkB,CAAC;AA0B1B,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,mBAAmB,CAAC;AAIlE,OAAO,KAAK,EAAE,gBAAgB,EAAa,MAAM,uBAAuB,CAAC;AAMzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AAkCzE,oEAAoE;AACpE,UAAU,kBAAkB;IAC1B,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,qBAAqB,CAAC,EAAE,cAAc,CAAC;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAMD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAC1B,MAAM,GAAE,oBAAyB,GAChC,YAAY,CAqyCd"}
|
|
@@ -414,20 +414,6 @@ export function createAgentManagerV2(agentStore, inboxAdapter, tasksAdapter, con
|
|
|
414
414
|
role: role ?? "worker",
|
|
415
415
|
scope: team_instance ?? "default",
|
|
416
416
|
});
|
|
417
|
-
// Create task in opentasks
|
|
418
|
-
if (tasksAdapter.connected) {
|
|
419
|
-
try {
|
|
420
|
-
const otTaskId = await tasksAdapter.createTask({
|
|
421
|
-
title: task ?? `Task for ${agentId}`,
|
|
422
|
-
assignee: agentId,
|
|
423
|
-
tags: role ? [role] : [],
|
|
424
|
-
});
|
|
425
|
-
agentStore.updateAgent(agentId, { task_id: otTaskId });
|
|
426
|
-
}
|
|
427
|
-
catch {
|
|
428
|
-
// Non-fatal — opentasks may not be available
|
|
429
|
-
}
|
|
430
|
-
}
|
|
431
417
|
// Track active session
|
|
432
418
|
const activeSession = {
|
|
433
419
|
agentId,
|
|
@@ -528,20 +514,6 @@ export function createAgentManagerV2(agentStore, inboxAdapter, tasksAdapter, con
|
|
|
528
514
|
if (agentTokenManager) {
|
|
529
515
|
agentTokenManager.revokeToken(agentId);
|
|
530
516
|
}
|
|
531
|
-
// Transition task in opentasks
|
|
532
|
-
if (record.task_id && tasksAdapter.connected) {
|
|
533
|
-
try {
|
|
534
|
-
const action = reason === "completed"
|
|
535
|
-
? "complete"
|
|
536
|
-
: reason === "failed"
|
|
537
|
-
? "fail"
|
|
538
|
-
: "block";
|
|
539
|
-
await tasksAdapter.transitionTask(record.task_id, action);
|
|
540
|
-
}
|
|
541
|
-
catch {
|
|
542
|
-
// Non-fatal task transition failure
|
|
543
|
-
}
|
|
544
|
-
}
|
|
545
517
|
// Notify parent via inbox
|
|
546
518
|
if (record.parent_id) {
|
|
547
519
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-manager-v2.js","sourceRoot":"","sources":["../../src/agent/agent-manager-v2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-manager-v2.js","sourceRoot":"","sources":["../../src/agent/agent-manager-v2.ts"],"names":[],"mappings":"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"}
|
package/dist/boot-v2.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boot-v2.d.ts","sourceRoot":"","sources":["../src/boot-v2.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"boot-v2.d.ts","sourceRoot":"","sources":["../src/boot-v2.ts"],"names":[],"mappings":"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"}
|
package/dist/boot-v2.js
CHANGED
|
@@ -145,23 +145,24 @@ export async function bootV2(config = {}) {
|
|
|
145
145
|
}
|
|
146
146
|
}, HEALTH_CHECK_INTERVAL_MS);
|
|
147
147
|
healthCheckTimer.unref(); // Don't prevent process exit
|
|
148
|
+
// Shared mutable system reference — passed to ACP server, MAP server, API server.
|
|
149
|
+
// Components created before the sidecar (steps 9-11) receive this object.
|
|
150
|
+
// When the sidecar is created (step 13), it's attached here so all components
|
|
151
|
+
// see it via the same reference (e.g., ACP handler accessing system.mapSidecar).
|
|
152
|
+
const systemRef = {
|
|
153
|
+
agentManager,
|
|
154
|
+
agentStore,
|
|
155
|
+
inboxAdapter,
|
|
156
|
+
tasksAdapter,
|
|
157
|
+
triggerSystem,
|
|
158
|
+
controlServer,
|
|
159
|
+
roleRegistry,
|
|
160
|
+
controlSocketPath,
|
|
161
|
+
};
|
|
148
162
|
// 9. REST API server (optional)
|
|
149
163
|
let apiServer = null;
|
|
150
164
|
if (config.api?.enabled) {
|
|
151
165
|
const { createApiServer } = await import("./api/server.js");
|
|
152
|
-
// Build a partial system reference for the API server.
|
|
153
|
-
// The full system object is returned below; we create the API server
|
|
154
|
-
// first so it can be included in the return value and shut down cleanly.
|
|
155
|
-
const systemRef = {
|
|
156
|
-
agentManager,
|
|
157
|
-
agentStore,
|
|
158
|
-
inboxAdapter,
|
|
159
|
-
tasksAdapter,
|
|
160
|
-
triggerSystem,
|
|
161
|
-
controlServer,
|
|
162
|
-
roleRegistry,
|
|
163
|
-
controlSocketPath,
|
|
164
|
-
};
|
|
165
166
|
apiServer = createApiServer(systemRef, {
|
|
166
167
|
port: config.api.port,
|
|
167
168
|
host: config.api.host,
|
|
@@ -172,18 +173,7 @@ export async function bootV2(config = {}) {
|
|
|
172
173
|
let acpServer = null;
|
|
173
174
|
if (config.acp?.enabled) {
|
|
174
175
|
const { createWebSocketACPServer } = await import("./acp/websocket-server.js");
|
|
175
|
-
acpServer = createWebSocketACPServer(
|
|
176
|
-
// Pass a partial system ref (the full object is built below)
|
|
177
|
-
{
|
|
178
|
-
agentManager,
|
|
179
|
-
agentStore,
|
|
180
|
-
inboxAdapter,
|
|
181
|
-
tasksAdapter,
|
|
182
|
-
triggerSystem,
|
|
183
|
-
controlServer,
|
|
184
|
-
roleRegistry,
|
|
185
|
-
controlSocketPath,
|
|
186
|
-
}, {
|
|
176
|
+
acpServer = createWebSocketACPServer(systemRef, {
|
|
187
177
|
port: config.acp.port,
|
|
188
178
|
host: config.acp.host,
|
|
189
179
|
path: config.acp.path,
|
|
@@ -200,17 +190,7 @@ export async function bootV2(config = {}) {
|
|
|
200
190
|
agentStore,
|
|
201
191
|
inboxAdapter,
|
|
202
192
|
tasksAdapter,
|
|
203
|
-
|
|
204
|
-
system: {
|
|
205
|
-
agentManager,
|
|
206
|
-
agentStore,
|
|
207
|
-
inboxAdapter,
|
|
208
|
-
tasksAdapter,
|
|
209
|
-
triggerSystem,
|
|
210
|
-
controlServer,
|
|
211
|
-
roleRegistry,
|
|
212
|
-
controlSocketPath,
|
|
213
|
-
},
|
|
193
|
+
system: systemRef,
|
|
214
194
|
}, {
|
|
215
195
|
port: config.mapServer.port,
|
|
216
196
|
host: config.mapServer.host,
|
|
@@ -271,6 +251,8 @@ export async function bootV2(config = {}) {
|
|
|
271
251
|
await mapSidecar.start();
|
|
272
252
|
// Wire sidecar into agent manager for session-end checkpoints
|
|
273
253
|
agentManager.setSidecar(mapSidecar);
|
|
254
|
+
// Attach to shared system ref so ACP/MAP handlers can access it
|
|
255
|
+
systemRef.mapSidecar = mapSidecar;
|
|
274
256
|
}
|
|
275
257
|
catch (err) {
|
|
276
258
|
// Non-fatal — MAP hub connectivity is optional
|
package/dist/boot-v2.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boot-v2.js","sourceRoot":"","sources":["../src/boot-v2.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"boot-v2.js","sourceRoot":"","sources":["../src/boot-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,6 @@ import type { AgentStore } from "../agent/agent-store.js";
|
|
|
11
11
|
import type { TaskBridge } from "./types.js";
|
|
12
12
|
/** Minimal interface for the MAP connection methods we need */
|
|
13
13
|
export interface LifecycleBridgeConnection {
|
|
14
|
-
spawn(options: {
|
|
15
|
-
agentId?: string | undefined;
|
|
16
|
-
name?: string | undefined;
|
|
17
|
-
role?: string | undefined;
|
|
18
|
-
scopes?: string[];
|
|
19
|
-
metadata?: Record<string, unknown>;
|
|
20
|
-
}): Promise<unknown>;
|
|
21
14
|
callExtension(method: string, params?: unknown): Promise<unknown>;
|
|
22
15
|
get isConnected(): boolean;
|
|
23
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-bridge.d.ts","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,+DAA+D;AAC/D,MAAM,WAAW,yBAAyB;IACxC,
|
|
1
|
+
{"version":3,"file":"lifecycle-bridge.d.ts","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,+DAA+D;AAC/D,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE,IAAI,WAAW,IAAI,OAAO,CAAC;CAC5B;AAUD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,yBAAyB,EACrC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,UAAU,GACtB;IAAE,QAAQ,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAoHpE"}
|
|
@@ -24,18 +24,35 @@ export function createLifecycleBridge(connection, agentStore, scope, taskBridge)
|
|
|
24
24
|
const role = agent.role ?? "worker";
|
|
25
25
|
const entry = { id: agent.id, name, role };
|
|
26
26
|
registered.set(agent.id, entry);
|
|
27
|
-
//
|
|
27
|
+
// Build per-agent capabilities.
|
|
28
|
+
// Coordinators (head managers) support ACP for interactive chat.
|
|
29
|
+
const capabilities = {
|
|
30
|
+
messaging: { canReceive: true },
|
|
31
|
+
};
|
|
32
|
+
if (role === "coordinator") {
|
|
33
|
+
capabilities.protocols = ["acp"];
|
|
34
|
+
capabilities.acp = { version: "2024-10-07" };
|
|
35
|
+
}
|
|
36
|
+
// Register agent with MAP hub (use map/agents/register to preserve
|
|
37
|
+
// per-agent capabilities; map/agents/spawn drops them)
|
|
28
38
|
connection
|
|
29
|
-
.
|
|
30
|
-
agentId: agent.id,
|
|
39
|
+
.callExtension("map/agents/register", {
|
|
31
40
|
name,
|
|
32
41
|
role,
|
|
33
|
-
|
|
42
|
+
capabilities,
|
|
34
43
|
metadata: {
|
|
44
|
+
localAgentId: agent.id,
|
|
35
45
|
parent: agent.parent_id ?? undefined,
|
|
36
46
|
team: agent.team ?? undefined,
|
|
37
47
|
cwd: agent.cwd ?? undefined,
|
|
38
48
|
},
|
|
49
|
+
})
|
|
50
|
+
.then((result) => {
|
|
51
|
+
// Track the MAP-assigned agent ID for unregistration
|
|
52
|
+
const mapId = result?.agent?.id ?? result?.id;
|
|
53
|
+
if (mapId) {
|
|
54
|
+
entry.mapId = mapId;
|
|
55
|
+
}
|
|
39
56
|
})
|
|
40
57
|
.catch(() => {
|
|
41
58
|
// Silent — MAP hub may be temporarily unavailable
|
|
@@ -55,11 +72,13 @@ export function createLifecycleBridge(connection, agentStore, scope, taskBridge)
|
|
|
55
72
|
}
|
|
56
73
|
case "stopped": {
|
|
57
74
|
const agent = event.agent;
|
|
75
|
+
const entry = registered.get(agent.id);
|
|
58
76
|
registered.delete(agent.id);
|
|
59
|
-
// Unregister agent from MAP hub
|
|
77
|
+
// Unregister agent from MAP hub (use MAP-assigned ID if available)
|
|
78
|
+
const unregId = entry?.mapId ?? agent.id;
|
|
60
79
|
connection
|
|
61
80
|
.callExtension("map/agents/unregister", {
|
|
62
|
-
agentId:
|
|
81
|
+
agentId: unregId,
|
|
63
82
|
reason: event.reason ?? "stopped",
|
|
64
83
|
})
|
|
65
84
|
.catch(() => {
|
|
@@ -81,10 +100,10 @@ export function createLifecycleBridge(connection, agentStore, scope, taskBridge)
|
|
|
81
100
|
registered.clear();
|
|
82
101
|
return;
|
|
83
102
|
}
|
|
84
|
-
// Unregister all tracked agents
|
|
85
|
-
const promises = Array.from(registered.
|
|
103
|
+
// Unregister all tracked agents (use MAP-assigned IDs)
|
|
104
|
+
const promises = Array.from(registered.values()).map((entry) => connection
|
|
86
105
|
.callExtension("map/agents/unregister", {
|
|
87
|
-
agentId,
|
|
106
|
+
agentId: entry.mapId ?? entry.id,
|
|
88
107
|
reason: "sidecar_shutdown",
|
|
89
108
|
})
|
|
90
109
|
.catch(() => { }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-bridge.js","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"lifecycle-bridge.js","sourceRoot":"","sources":["../../src/map/lifecycle-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EAKf,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,UAAU,
|
|
1
|
+
{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EAKf,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,UAAU,CA2RZ"}
|
package/dist/map/sidecar.js
CHANGED
|
@@ -92,8 +92,6 @@ export function createMAPSidecar(deps, config) {
|
|
|
92
92
|
capabilities: {
|
|
93
93
|
messaging: { canSend: true, canReceive: true },
|
|
94
94
|
mail: { canCreate: true, canJoin: true, canViewHistory: true },
|
|
95
|
-
protocols: ['acp'],
|
|
96
|
-
acp: { version: '2024-10-07' },
|
|
97
95
|
trajectory: { canReport: true, canServeContent: false },
|
|
98
96
|
tasks: {
|
|
99
97
|
canCreate: true,
|
package/dist/map/sidecar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -135,19 +135,13 @@ describe("AgentManagerV2", () => {
|
|
|
135
135
|
);
|
|
136
136
|
});
|
|
137
137
|
|
|
138
|
-
it("should create task in opentasks", async () => {
|
|
139
|
-
|
|
138
|
+
it("should not create task in opentasks on spawn", async () => {
|
|
139
|
+
await manager.spawn({
|
|
140
140
|
task: "Implement feature",
|
|
141
141
|
role: "worker",
|
|
142
142
|
});
|
|
143
143
|
|
|
144
|
-
expect(tasksAdapter.createTask).
|
|
145
|
-
expect.objectContaining({
|
|
146
|
-
title: "Implement feature",
|
|
147
|
-
assignee: result.id,
|
|
148
|
-
tags: ["worker"],
|
|
149
|
-
})
|
|
150
|
-
);
|
|
144
|
+
expect(tasksAdapter.createTask).not.toHaveBeenCalled();
|
|
151
145
|
});
|
|
152
146
|
|
|
153
147
|
it("should validate parent exists", async () => {
|
|
@@ -269,7 +263,7 @@ describe("AgentManagerV2", () => {
|
|
|
269
263
|
expect(inboxAdapter.deregisterAgent).toHaveBeenCalledWith(spawned.id);
|
|
270
264
|
});
|
|
271
265
|
|
|
272
|
-
it("should transition task in opentasks", async () => {
|
|
266
|
+
it("should not transition task in opentasks on terminate", async () => {
|
|
273
267
|
const spawned = await manager.spawn({
|
|
274
268
|
task: "Test",
|
|
275
269
|
role: "worker",
|
|
@@ -277,7 +271,7 @@ describe("AgentManagerV2", () => {
|
|
|
277
271
|
|
|
278
272
|
await manager.terminate(spawned.id, "completed");
|
|
279
273
|
|
|
280
|
-
expect(tasksAdapter.transitionTask).toHaveBeenCalled();
|
|
274
|
+
expect(tasksAdapter.transitionTask).not.toHaveBeenCalled();
|
|
281
275
|
});
|
|
282
276
|
|
|
283
277
|
it("should notify parent via inbox", async () => {
|
|
@@ -600,20 +600,6 @@ export function createAgentManagerV2(
|
|
|
600
600
|
scope: team_instance ?? "default",
|
|
601
601
|
});
|
|
602
602
|
|
|
603
|
-
// Create task in opentasks
|
|
604
|
-
if (tasksAdapter.connected) {
|
|
605
|
-
try {
|
|
606
|
-
const otTaskId = await tasksAdapter.createTask({
|
|
607
|
-
title: task ?? `Task for ${agentId}`,
|
|
608
|
-
assignee: agentId,
|
|
609
|
-
tags: role ? [role] : [],
|
|
610
|
-
});
|
|
611
|
-
agentStore.updateAgent(agentId, { task_id: otTaskId });
|
|
612
|
-
} catch {
|
|
613
|
-
// Non-fatal — opentasks may not be available
|
|
614
|
-
}
|
|
615
|
-
}
|
|
616
|
-
|
|
617
603
|
// Track active session
|
|
618
604
|
const activeSession: ActiveSession = {
|
|
619
605
|
agentId,
|
|
@@ -728,21 +714,6 @@ export function createAgentManagerV2(
|
|
|
728
714
|
agentTokenManager.revokeToken(agentId);
|
|
729
715
|
}
|
|
730
716
|
|
|
731
|
-
// Transition task in opentasks
|
|
732
|
-
if (record.task_id && tasksAdapter.connected) {
|
|
733
|
-
try {
|
|
734
|
-
const action =
|
|
735
|
-
reason === "completed"
|
|
736
|
-
? "complete"
|
|
737
|
-
: reason === "failed"
|
|
738
|
-
? "fail"
|
|
739
|
-
: "block";
|
|
740
|
-
await tasksAdapter.transitionTask(record.task_id, action as any);
|
|
741
|
-
} catch {
|
|
742
|
-
// Non-fatal task transition failure
|
|
743
|
-
}
|
|
744
|
-
}
|
|
745
|
-
|
|
746
717
|
// Notify parent via inbox
|
|
747
718
|
if (record.parent_id) {
|
|
748
719
|
try {
|
package/src/boot-v2.ts
CHANGED
|
@@ -344,23 +344,25 @@ export async function bootV2(
|
|
|
344
344
|
}, HEALTH_CHECK_INTERVAL_MS);
|
|
345
345
|
healthCheckTimer.unref(); // Don't prevent process exit
|
|
346
346
|
|
|
347
|
+
// Shared mutable system reference — passed to ACP server, MAP server, API server.
|
|
348
|
+
// Components created before the sidecar (steps 9-11) receive this object.
|
|
349
|
+
// When the sidecar is created (step 13), it's attached here so all components
|
|
350
|
+
// see it via the same reference (e.g., ACP handler accessing system.mapSidecar).
|
|
351
|
+
const systemRef = {
|
|
352
|
+
agentManager,
|
|
353
|
+
agentStore,
|
|
354
|
+
inboxAdapter,
|
|
355
|
+
tasksAdapter,
|
|
356
|
+
triggerSystem,
|
|
357
|
+
controlServer,
|
|
358
|
+
roleRegistry,
|
|
359
|
+
controlSocketPath,
|
|
360
|
+
} as any;
|
|
361
|
+
|
|
347
362
|
// 9. REST API server (optional)
|
|
348
363
|
let apiServer: ApiServer | null = null;
|
|
349
364
|
if (config.api?.enabled) {
|
|
350
365
|
const { createApiServer } = await import("./api/server.js");
|
|
351
|
-
// Build a partial system reference for the API server.
|
|
352
|
-
// The full system object is returned below; we create the API server
|
|
353
|
-
// first so it can be included in the return value and shut down cleanly.
|
|
354
|
-
const systemRef = {
|
|
355
|
-
agentManager,
|
|
356
|
-
agentStore,
|
|
357
|
-
inboxAdapter,
|
|
358
|
-
tasksAdapter,
|
|
359
|
-
triggerSystem,
|
|
360
|
-
controlServer,
|
|
361
|
-
roleRegistry,
|
|
362
|
-
controlSocketPath,
|
|
363
|
-
} as any;
|
|
364
366
|
apiServer = createApiServer(systemRef, {
|
|
365
367
|
port: config.api.port,
|
|
366
368
|
host: config.api.host,
|
|
@@ -373,17 +375,7 @@ export async function bootV2(
|
|
|
373
375
|
if (config.acp?.enabled) {
|
|
374
376
|
const { createWebSocketACPServer } = await import("./acp/websocket-server.js");
|
|
375
377
|
acpServer = createWebSocketACPServer(
|
|
376
|
-
|
|
377
|
-
{
|
|
378
|
-
agentManager,
|
|
379
|
-
agentStore,
|
|
380
|
-
inboxAdapter,
|
|
381
|
-
tasksAdapter,
|
|
382
|
-
triggerSystem,
|
|
383
|
-
controlServer,
|
|
384
|
-
roleRegistry,
|
|
385
|
-
controlSocketPath,
|
|
386
|
-
} as any,
|
|
378
|
+
systemRef,
|
|
387
379
|
{
|
|
388
380
|
port: config.acp.port,
|
|
389
381
|
host: config.acp.host,
|
|
@@ -404,17 +396,7 @@ export async function bootV2(
|
|
|
404
396
|
agentStore,
|
|
405
397
|
inboxAdapter,
|
|
406
398
|
tasksAdapter,
|
|
407
|
-
|
|
408
|
-
system: {
|
|
409
|
-
agentManager,
|
|
410
|
-
agentStore,
|
|
411
|
-
inboxAdapter,
|
|
412
|
-
tasksAdapter,
|
|
413
|
-
triggerSystem,
|
|
414
|
-
controlServer,
|
|
415
|
-
roleRegistry,
|
|
416
|
-
controlSocketPath,
|
|
417
|
-
} as any,
|
|
399
|
+
system: systemRef,
|
|
418
400
|
},
|
|
419
401
|
{
|
|
420
402
|
port: config.mapServer.port,
|
|
@@ -487,6 +469,8 @@ export async function bootV2(
|
|
|
487
469
|
await mapSidecar.start();
|
|
488
470
|
// Wire sidecar into agent manager for session-end checkpoints
|
|
489
471
|
agentManager.setSidecar(mapSidecar);
|
|
472
|
+
// Attach to shared system ref so ACP/MAP handlers can access it
|
|
473
|
+
systemRef.mapSidecar = mapSidecar;
|
|
490
474
|
} catch (err) {
|
|
491
475
|
// Non-fatal — MAP hub connectivity is optional
|
|
492
476
|
console.warn(
|
|
@@ -126,13 +126,31 @@ describe("MacroAgentBackend", () => {
|
|
|
126
126
|
|
|
127
127
|
describe("spawn", () => {
|
|
128
128
|
it("spawns analyst via agentManager", async () => {
|
|
129
|
-
|
|
129
|
+
// Use a deferred promise so promptUntilDone hangs, keeping session in "running"
|
|
130
|
+
let resolvePrompt!: () => void;
|
|
131
|
+
const hangingPrompt = new Promise<void>((r) => { resolvePrompt = r; });
|
|
132
|
+
|
|
133
|
+
const am = createMockAgentManager({
|
|
134
|
+
promptUntilDone: vi.fn().mockImplementation(async () => {
|
|
135
|
+
await hangingPrompt;
|
|
136
|
+
return {
|
|
137
|
+
doneCalled: true,
|
|
138
|
+
doneStatus: "completed",
|
|
139
|
+
exceededMax: false,
|
|
140
|
+
followUpCount: 0,
|
|
141
|
+
updates: [],
|
|
142
|
+
};
|
|
143
|
+
}),
|
|
144
|
+
});
|
|
145
|
+
const b = new MacroAgentBackend(am);
|
|
146
|
+
|
|
147
|
+
const session = await b.spawn({
|
|
130
148
|
agentType: "claude-code",
|
|
131
149
|
task: { description: "Analyze trajectory" },
|
|
132
150
|
cwd: "/workspace",
|
|
133
151
|
});
|
|
134
152
|
|
|
135
|
-
expect(
|
|
153
|
+
expect(am.spawn).toHaveBeenCalledWith(
|
|
136
154
|
expect.objectContaining({
|
|
137
155
|
task: "Analyze trajectory",
|
|
138
156
|
role: "analyst",
|
|
@@ -143,6 +161,9 @@ describe("MacroAgentBackend", () => {
|
|
|
143
161
|
expect(session.state).toBe("running");
|
|
144
162
|
expect(session.agentType).toBe("claude-code");
|
|
145
163
|
expect(session.task.description).toBe("Analyze trajectory");
|
|
164
|
+
|
|
165
|
+
// Let the hanging prompt resolve to avoid dangling promises
|
|
166
|
+
resolvePrompt();
|
|
146
167
|
});
|
|
147
168
|
|
|
148
169
|
it("returns session with unique ID", async () => {
|
|
@@ -382,17 +403,38 @@ describe("MacroAgentBackend", () => {
|
|
|
382
403
|
|
|
383
404
|
describe("terminate", () => {
|
|
384
405
|
it("terminates the macro-agent process", async () => {
|
|
385
|
-
|
|
406
|
+
// Use a deferred promise so promptUntilDone hangs until after terminate
|
|
407
|
+
let resolvePrompt!: () => void;
|
|
408
|
+
const hangingPrompt = new Promise<void>((r) => { resolvePrompt = r; });
|
|
409
|
+
|
|
410
|
+
const am = createMockAgentManager({
|
|
411
|
+
promptUntilDone: vi.fn().mockImplementation(async () => {
|
|
412
|
+
await hangingPrompt;
|
|
413
|
+
return {
|
|
414
|
+
doneCalled: true,
|
|
415
|
+
doneStatus: "completed",
|
|
416
|
+
exceededMax: false,
|
|
417
|
+
followUpCount: 0,
|
|
418
|
+
updates: [],
|
|
419
|
+
};
|
|
420
|
+
}),
|
|
421
|
+
});
|
|
422
|
+
const b = new MacroAgentBackend(am);
|
|
423
|
+
|
|
424
|
+
const session = await b.spawn({
|
|
386
425
|
agentType: "claude-code",
|
|
387
426
|
task: { description: "test" },
|
|
388
427
|
});
|
|
389
428
|
|
|
390
|
-
await
|
|
429
|
+
await b.terminate(session.id);
|
|
391
430
|
|
|
392
|
-
expect(
|
|
431
|
+
expect(am.terminate).toHaveBeenCalledWith(
|
|
393
432
|
"agent_test123",
|
|
394
433
|
"cancelled",
|
|
395
434
|
);
|
|
435
|
+
|
|
436
|
+
// Let the hanging prompt resolve to avoid dangling promises
|
|
437
|
+
resolvePrompt();
|
|
396
438
|
});
|
|
397
439
|
|
|
398
440
|
it("sets session to failed", async () => {
|
|
@@ -12,11 +12,9 @@ import type { TaskBridge } from "../types.js";
|
|
|
12
12
|
import type { Agent } from "../../store/types/index.js";
|
|
13
13
|
|
|
14
14
|
function mockConnection(): LifecycleBridgeConnection & {
|
|
15
|
-
spawn: ReturnType<typeof vi.fn>;
|
|
16
15
|
callExtension: ReturnType<typeof vi.fn>;
|
|
17
16
|
} {
|
|
18
17
|
return {
|
|
19
|
-
spawn: vi.fn().mockResolvedValue({}),
|
|
20
18
|
callExtension: vi.fn().mockResolvedValue({}),
|
|
21
19
|
get isConnected() {
|
|
22
20
|
return true;
|
|
@@ -70,16 +68,61 @@ describe("LifecycleBridge", () => {
|
|
|
70
68
|
agent: mockAgent({ id: "agent-1", name: "worker-1", role: "worker" }),
|
|
71
69
|
});
|
|
72
70
|
|
|
73
|
-
expect(conn.
|
|
71
|
+
expect(conn.callExtension).toHaveBeenCalledWith(
|
|
72
|
+
"map/agents/register",
|
|
74
73
|
expect.objectContaining({
|
|
75
|
-
agentId: "agent-1",
|
|
76
74
|
name: "worker-1",
|
|
77
75
|
role: "worker",
|
|
78
|
-
scopes: [scope],
|
|
79
76
|
}),
|
|
80
77
|
);
|
|
81
78
|
});
|
|
82
79
|
|
|
80
|
+
it("includes per-agent ACP capabilities for coordinators", () => {
|
|
81
|
+
const { callback } = createLifecycleBridge(
|
|
82
|
+
conn,
|
|
83
|
+
{} as AgentStore,
|
|
84
|
+
scope,
|
|
85
|
+
);
|
|
86
|
+
|
|
87
|
+
callback({
|
|
88
|
+
type: "spawned",
|
|
89
|
+
agent: mockAgent({ id: "coord-1", name: "coordinator-1", role: "coordinator" }),
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
expect(conn.callExtension).toHaveBeenCalledWith(
|
|
93
|
+
"map/agents/register",
|
|
94
|
+
expect.objectContaining({
|
|
95
|
+
name: "coordinator-1",
|
|
96
|
+
role: "coordinator",
|
|
97
|
+
capabilities: expect.objectContaining({
|
|
98
|
+
protocols: ["acp"],
|
|
99
|
+
acp: { version: "2024-10-07" },
|
|
100
|
+
messaging: { canReceive: true },
|
|
101
|
+
}),
|
|
102
|
+
}),
|
|
103
|
+
);
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
it("does not include ACP capabilities for workers", () => {
|
|
107
|
+
const { callback } = createLifecycleBridge(
|
|
108
|
+
conn,
|
|
109
|
+
{} as AgentStore,
|
|
110
|
+
scope,
|
|
111
|
+
);
|
|
112
|
+
|
|
113
|
+
callback({
|
|
114
|
+
type: "spawned",
|
|
115
|
+
agent: mockAgent({ id: "worker-1", name: "worker-1", role: "worker" }),
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
const call = conn.callExtension.mock.calls[0];
|
|
119
|
+
const params = call[1] as Record<string, unknown>;
|
|
120
|
+
const caps = params.capabilities as Record<string, unknown>;
|
|
121
|
+
expect(caps.protocols).toBeUndefined();
|
|
122
|
+
expect(caps.acp).toBeUndefined();
|
|
123
|
+
expect(caps.messaging).toEqual({ canReceive: true });
|
|
124
|
+
});
|
|
125
|
+
|
|
83
126
|
it("unregisters agent from MAP hub on stop event", () => {
|
|
84
127
|
const { callback } = createLifecycleBridge(
|
|
85
128
|
conn,
|
|
@@ -98,12 +141,39 @@ describe("LifecycleBridge", () => {
|
|
|
98
141
|
expect(conn.callExtension).toHaveBeenCalledWith(
|
|
99
142
|
"map/agents/unregister",
|
|
100
143
|
expect.objectContaining({
|
|
101
|
-
agentId: "agent-1",
|
|
102
144
|
reason: "completed",
|
|
103
145
|
}),
|
|
104
146
|
);
|
|
105
147
|
});
|
|
106
148
|
|
|
149
|
+
it("uses MAP-assigned ID for unregistration when available", async () => {
|
|
150
|
+
conn.callExtension.mockResolvedValueOnce({ agent: { id: "map-ulid-1" } });
|
|
151
|
+
|
|
152
|
+
const { callback } = createLifecycleBridge(
|
|
153
|
+
conn,
|
|
154
|
+
{} as AgentStore,
|
|
155
|
+
scope,
|
|
156
|
+
);
|
|
157
|
+
|
|
158
|
+
callback({ type: "spawned", agent: mockAgent({ id: "agent-1" }) });
|
|
159
|
+
|
|
160
|
+
// Wait for the .then() that stores mapId
|
|
161
|
+
await new Promise(r => setTimeout(r, 10));
|
|
162
|
+
|
|
163
|
+
callback({
|
|
164
|
+
type: "stopped",
|
|
165
|
+
agent: mockAgent({ id: "agent-1" }),
|
|
166
|
+
reason: "completed",
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
expect(conn.callExtension).toHaveBeenLastCalledWith(
|
|
170
|
+
"map/agents/unregister",
|
|
171
|
+
expect.objectContaining({
|
|
172
|
+
agentId: "map-ulid-1",
|
|
173
|
+
}),
|
|
174
|
+
);
|
|
175
|
+
});
|
|
176
|
+
|
|
107
177
|
it("does nothing when disconnected", () => {
|
|
108
178
|
const disconnected = {
|
|
109
179
|
...conn,
|
|
@@ -119,7 +189,7 @@ describe("LifecycleBridge", () => {
|
|
|
119
189
|
|
|
120
190
|
callback({ type: "spawned", agent: mockAgent() });
|
|
121
191
|
|
|
122
|
-
expect(conn.
|
|
192
|
+
expect(conn.callExtension).not.toHaveBeenCalled();
|
|
123
193
|
});
|
|
124
194
|
|
|
125
195
|
it("bridges task creation on spawn when agent has task_id", () => {
|
|
@@ -178,19 +248,15 @@ describe("LifecycleBridge", () => {
|
|
|
178
248
|
|
|
179
249
|
await cleanup();
|
|
180
250
|
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
"map/agents/unregister",
|
|
184
|
-
expect.objectContaining({ agentId: "a1" }),
|
|
185
|
-
);
|
|
186
|
-
expect(conn.callExtension).toHaveBeenCalledWith(
|
|
187
|
-
"map/agents/unregister",
|
|
188
|
-
expect.objectContaining({ agentId: "a2" }),
|
|
251
|
+
// 2 register calls + 2 unregister calls
|
|
252
|
+
const unregisterCalls = conn.callExtension.mock.calls.filter(
|
|
253
|
+
(c: any[]) => c[0] === "map/agents/unregister",
|
|
189
254
|
);
|
|
255
|
+
expect(unregisterCalls).toHaveLength(2);
|
|
190
256
|
});
|
|
191
257
|
|
|
192
258
|
it("silently handles MAP call failures", () => {
|
|
193
|
-
conn.
|
|
259
|
+
conn.callExtension.mockRejectedValue(new Error("network error"));
|
|
194
260
|
|
|
195
261
|
const { callback } = createLifecycleBridge(
|
|
196
262
|
conn,
|
|
@@ -216,7 +282,8 @@ describe("LifecycleBridge", () => {
|
|
|
216
282
|
agent: mockAgent({ id: "agent-99", name: undefined }),
|
|
217
283
|
});
|
|
218
284
|
|
|
219
|
-
expect(conn.
|
|
285
|
+
expect(conn.callExtension).toHaveBeenCalledWith(
|
|
286
|
+
"map/agents/register",
|
|
220
287
|
expect.objectContaining({ name: "agent-99" }),
|
|
221
288
|
);
|
|
222
289
|
});
|
|
@@ -13,13 +13,6 @@ import type { TaskBridge } from "./types.js";
|
|
|
13
13
|
|
|
14
14
|
/** Minimal interface for the MAP connection methods we need */
|
|
15
15
|
export interface LifecycleBridgeConnection {
|
|
16
|
-
spawn(options: {
|
|
17
|
-
agentId?: string | undefined;
|
|
18
|
-
name?: string | undefined;
|
|
19
|
-
role?: string | undefined;
|
|
20
|
-
scopes?: string[];
|
|
21
|
-
metadata?: Record<string, unknown>;
|
|
22
|
-
}): Promise<unknown>;
|
|
23
16
|
callExtension(method: string, params?: unknown): Promise<unknown>;
|
|
24
17
|
get isConnected(): boolean;
|
|
25
18
|
}
|
|
@@ -28,6 +21,8 @@ interface RegisteredAgent {
|
|
|
28
21
|
id: string;
|
|
29
22
|
name: string;
|
|
30
23
|
role: string;
|
|
24
|
+
/** MAP-assigned agent ID (ULID) from the hub, used for unregistration */
|
|
25
|
+
mapId?: string;
|
|
31
26
|
}
|
|
32
27
|
|
|
33
28
|
/**
|
|
@@ -55,19 +50,37 @@ export function createLifecycleBridge(
|
|
|
55
50
|
const entry: RegisteredAgent = { id: agent.id, name, role };
|
|
56
51
|
registered.set(agent.id, entry);
|
|
57
52
|
|
|
58
|
-
//
|
|
53
|
+
// Build per-agent capabilities.
|
|
54
|
+
// Coordinators (head managers) support ACP for interactive chat.
|
|
55
|
+
const capabilities: Record<string, unknown> = {
|
|
56
|
+
messaging: { canReceive: true },
|
|
57
|
+
};
|
|
58
|
+
if (role === "coordinator") {
|
|
59
|
+
capabilities.protocols = ["acp"];
|
|
60
|
+
capabilities.acp = { version: "2024-10-07" };
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
// Register agent with MAP hub (use map/agents/register to preserve
|
|
64
|
+
// per-agent capabilities; map/agents/spawn drops them)
|
|
59
65
|
connection
|
|
60
|
-
.
|
|
61
|
-
agentId: agent.id,
|
|
66
|
+
.callExtension("map/agents/register", {
|
|
62
67
|
name,
|
|
63
68
|
role,
|
|
64
|
-
|
|
69
|
+
capabilities,
|
|
65
70
|
metadata: {
|
|
71
|
+
localAgentId: agent.id,
|
|
66
72
|
parent: (agent as any).parent_id ?? undefined,
|
|
67
73
|
team: (agent as any).team ?? undefined,
|
|
68
74
|
cwd: (agent as any).cwd ?? undefined,
|
|
69
75
|
},
|
|
70
76
|
})
|
|
77
|
+
.then((result: any) => {
|
|
78
|
+
// Track the MAP-assigned agent ID for unregistration
|
|
79
|
+
const mapId = result?.agent?.id ?? result?.id;
|
|
80
|
+
if (mapId) {
|
|
81
|
+
entry.mapId = mapId;
|
|
82
|
+
}
|
|
83
|
+
})
|
|
71
84
|
.catch(() => {
|
|
72
85
|
// Silent — MAP hub may be temporarily unavailable
|
|
73
86
|
});
|
|
@@ -88,12 +101,14 @@ export function createLifecycleBridge(
|
|
|
88
101
|
|
|
89
102
|
case "stopped": {
|
|
90
103
|
const agent = event.agent;
|
|
104
|
+
const entry = registered.get(agent.id);
|
|
91
105
|
registered.delete(agent.id);
|
|
92
106
|
|
|
93
|
-
// Unregister agent from MAP hub
|
|
107
|
+
// Unregister agent from MAP hub (use MAP-assigned ID if available)
|
|
108
|
+
const unregId = entry?.mapId ?? agent.id;
|
|
94
109
|
connection
|
|
95
110
|
.callExtension("map/agents/unregister", {
|
|
96
|
-
agentId:
|
|
111
|
+
agentId: unregId,
|
|
97
112
|
reason: event.reason ?? "stopped",
|
|
98
113
|
})
|
|
99
114
|
.catch(() => {
|
|
@@ -123,11 +138,11 @@ export function createLifecycleBridge(
|
|
|
123
138
|
registered.clear();
|
|
124
139
|
return;
|
|
125
140
|
}
|
|
126
|
-
// Unregister all tracked agents
|
|
127
|
-
const promises = Array.from(registered.
|
|
141
|
+
// Unregister all tracked agents (use MAP-assigned IDs)
|
|
142
|
+
const promises = Array.from(registered.values()).map((entry) =>
|
|
128
143
|
connection
|
|
129
144
|
.callExtension("map/agents/unregister", {
|
|
130
|
-
agentId,
|
|
145
|
+
agentId: entry.mapId ?? entry.id,
|
|
131
146
|
reason: "sidecar_shutdown",
|
|
132
147
|
})
|
|
133
148
|
.catch(() => {}),
|
package/src/map/sidecar.ts
CHANGED
|
@@ -115,8 +115,6 @@ export function createMAPSidecar(
|
|
|
115
115
|
capabilities: {
|
|
116
116
|
messaging: { canSend: true, canReceive: true },
|
|
117
117
|
mail: { canCreate: true, canJoin: true, canViewHistory: true },
|
|
118
|
-
protocols: ['acp'],
|
|
119
|
-
acp: { version: '2024-10-07' },
|
|
120
118
|
trajectory: { canReport: true, canServeContent: false },
|
|
121
119
|
tasks: {
|
|
122
120
|
canCreate: true,
|