macro-agent 0.1.6 → 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/acp/macro-agent.d.ts.map +1 -1
- package/dist/acp/macro-agent.js +1 -3
- package/dist/acp/macro-agent.js.map +1 -1
- 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 +1 -0
- package/dist/boot-v2.d.ts.map +1 -1
- package/dist/boot-v2.js +19 -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/server.d.ts.map +1 -1
- package/dist/map/server.js +13 -3
- package/dist/map/server.js.map +1 -1
- package/dist/map/sidecar.d.ts.map +1 -1
- package/dist/map/sidecar.js +6 -2
- package/dist/map/sidecar.js.map +1 -1
- package/dist/map/types.d.ts +2 -0
- package/dist/map/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/acp/macro-agent.ts +1 -4
- 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 +21 -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/server.ts +14 -2
- package/src/map/sidecar.ts +6 -2
- package/src/map/types.ts +3 -0
- package/dist/boot-v2-DMTHPQ4i.d.ts +0 -2672
|
@@ -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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"}
|
package/dist/map/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/map/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAMD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,aAAa,EACnB,MAAM,GAAE,eAAoB,GAC3B,iBAAiB,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/map/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAMD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,aAAa,EACnB,MAAM,GAAE,eAAoB,GAC3B,iBAAiB,CAqenB"}
|
package/dist/map/server.js
CHANGED
|
@@ -237,15 +237,25 @@ export function createMAPServerInstance(deps, config = {}) {
|
|
|
237
237
|
const message = data?.message;
|
|
238
238
|
if (!message)
|
|
239
239
|
return;
|
|
240
|
+
// Check if this is an ACP envelope — these should always be handled
|
|
241
|
+
// by the bridge, even if the target agent can't be resolved to a
|
|
242
|
+
// specific local agent (the bridge creates a head manager on demand).
|
|
243
|
+
const payload = message?.payload;
|
|
244
|
+
const isAcp = payload && typeof payload === 'object' &&
|
|
245
|
+
'acp' in payload && 'acpContext' in payload;
|
|
240
246
|
const toField = message.to;
|
|
241
247
|
const mapTargetId = data?.agentId ??
|
|
242
248
|
(typeof toField === "string" ? toField : toField?.agent ?? toField?.id);
|
|
243
249
|
if (!mapTargetId)
|
|
244
250
|
return;
|
|
245
251
|
const localAgentId = mapIdToLocalId.get(mapTargetId) ?? mapTargetId;
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
252
|
+
// For ACP envelopes, always forward to bridge (it creates sessions on demand).
|
|
253
|
+
// For non-ACP messages, require a local agent to exist.
|
|
254
|
+
if (!isAcp) {
|
|
255
|
+
const localAgent = deps.agentManager.get(localAgentId);
|
|
256
|
+
if (!localAgent)
|
|
257
|
+
return;
|
|
258
|
+
}
|
|
249
259
|
// Defer ACP processing to next tick so map/send response goes out first
|
|
250
260
|
setImmediate(() => {
|
|
251
261
|
acpBridge.handleDelivery(localAgentId, message);
|
package/dist/map/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/map/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/map/server.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
|
@@ -46,6 +46,12 @@ export function createMAPSidecar(deps, config) {
|
|
|
46
46
|
if (config.token) {
|
|
47
47
|
parsed.searchParams.set("token", config.token);
|
|
48
48
|
}
|
|
49
|
+
// Include swarm_id for stable identity across reconnections.
|
|
50
|
+
// When set, the hub reuses the pre-registered swarm record instead
|
|
51
|
+
// of auto-generating a new one on each connection.
|
|
52
|
+
if (config.swarmId) {
|
|
53
|
+
parsed.searchParams.set("swarm_id", config.swarmId);
|
|
54
|
+
}
|
|
49
55
|
return parsed.toString();
|
|
50
56
|
}
|
|
51
57
|
/**
|
|
@@ -86,8 +92,6 @@ export function createMAPSidecar(deps, config) {
|
|
|
86
92
|
capabilities: {
|
|
87
93
|
messaging: { canSend: true, canReceive: true },
|
|
88
94
|
mail: { canCreate: true, canJoin: true, canViewHistory: true },
|
|
89
|
-
protocols: ['acp'],
|
|
90
|
-
acp: { version: '2024-10-07' },
|
|
91
95
|
trajectory: { canReport: true, canServeContent: false },
|
|
92
96
|
tasks: {
|
|
93
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":"AAAA;;;;;;;;;;;;;GAaG;AAaH;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAoB,EACpB,MAAwB;IAExB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IACtE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,mBAAmB,CAAC;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,qBAAqB,CAAC;IAE5D,mBAAmB;IACnB,IAAI,UAAU,GAAQ,IAAI,CAAC,CAAC,gDAAgD;IAC5E,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,mBAAmB;IACnB,IAAI,iBAAiB,GAAkC,IAAI,CAAC;IAC5D,IAAI,oBAAoB,GAAwB,IAAI,CAAC;IACrD,IAAI,gBAAgB,GAAiC,IAAI,CAAC;IAC1D,IAAI,kBAAkB,GAA8B,IAAI,CAAC;IACzD,IAAI,UAAU,GAAsB,IAAI,CAAC;IACzC,IAAI,mBAAmB,GAAwB,IAAI,CAAC;IACpD,IAAI,cAAc,GAAyC,IAAI,CAAC;IAEhE;;OAEG;IACH,SAAS,QAAQ;QACf,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtC,gDAAgD;QAChD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9E,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,iBAAiB;QAC9B,IAAI,mBAAmB,EAAE,CAAC;YACxB,mBAAmB,EAAE,CAAC;YACtB,mBAAmB,GAAG,IAAI,CAAC;QAC7B,CAAC;QACD,IAAI,kBAAkB,EAAE,CAAC;YACvB,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAC1B,kBAAkB,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,gBAAgB,EAAE,CAAC;YACzB,gBAAgB,GAAG,IAAI,CAAC;QAC1B,CAAC;QACD,IAAI,oBAAoB,EAAE,CAAC;YACzB,oBAAoB,EAAE,CAAC;YACvB,oBAAoB,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,iBAAiB,GAAG,IAAI,CAAC;QACzB,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,KAAK,UAAU,OAAO;QACpB,IAAI,CAAC;YACH,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CACtC,2BAA2B,CAC5B,CAAC;YAEF,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAC;YACvB,MAAM,WAAW,GAA4B;gBAC3C,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,CAAC,KAAK,CAAC;gBACf,YAAY,EAAE;oBACZ,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;oBAC9C,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE;oBAC9D,
|
|
1
|
+
{"version":3,"file":"sidecar.js","sourceRoot":"","sources":["../../src/map/sidecar.ts"],"names":[],"mappings":"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"}
|
package/dist/map/types.d.ts
CHANGED
|
@@ -23,6 +23,8 @@ export interface MAPSidecarConfig {
|
|
|
23
23
|
credential?: string;
|
|
24
24
|
/** Agent name for MAP registration (default: "macro-agent-sidecar") */
|
|
25
25
|
agentName?: string;
|
|
26
|
+
/** Swarm ID for stable identity across reconnections */
|
|
27
|
+
swarmId?: string;
|
|
26
28
|
/** Trajectory sync level */
|
|
27
29
|
trajectorySyncLevel?: "off" | "lifecycle" | "metrics" | "full";
|
|
28
30
|
/** Mesh transport (agentic-mesh P2P) */
|
package/dist/map/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/map/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAMvE,MAAM,WAAW,gBAAgB;IAC/B,sFAAsF;IACtF,MAAM,EAAE,MAAM,CAAC;IAEf,6DAA6D;IAC7D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,4BAA4B;IAC5B,mBAAmB,CAAC,EAAE,KAAK,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC;IAE/D,wCAAwC;IACxC,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF,wCAAwC;IACxC,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF,+EAA+E;IAC/E,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B;AAMD,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,iDAAiD;IACjD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,kDAAkD;IAClD,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,8CAA8C;IAC9C,gBAAgB,CACd,UAAU,EAAE,2BAA2B,GACtC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAC;CAC/C;AAMD;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,yBAAyB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,+CAA+C;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B;IAC5B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8CAA8C;IAC9C,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,wCAAwC;IACxC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yDAAyD;IACzD,WAAW,CAAC,EAAE;QACZ,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,0BAA0B;IAC1B,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;CACH;AAED,yDAAyD;AACzD,MAAM,WAAW,0BAA0B;IACzC,EAAE,EAAE,OAAO,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,2CAA2C;AAC3C,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB;AAMD,uCAAuC;AACvC,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,0CAA0C;AAC1C,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qCAAqC;AACrC,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,+BAA+B;AAC/B,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAMD,4DAA4D;AAC5D,MAAM,WAAW,UAAU;IACzB,WAAW,CAAC,IAAI,EAAE;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED,oCAAoC;AACpC,MAAM,WAAW,kBAAkB;IACjC,gBAAgB,CACd,UAAU,EAAE,2BAA2B,GACtC,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAC;IAC9C,IAAI,IAAI,IAAI,CAAC;CACd;AAMD,wEAAwE;AACxE,MAAM,WAAW,eAAe;IAC9B,oDAAoD;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,uBAAuB;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,sBAAsB;IACtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,4BAA4B;IAC5B,MAAM,IAAI,MAAM,CAAC;IACjB,uCAAuC;IACvC,kBAAkB,IAAI,MAAM,CAAC;CAC9B"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/map/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "macro-agent",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.8",
|
|
4
4
|
"description": "Interact with multiple agents as if they were a single agent.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
51
|
"@modelcontextprotocol/sdk": "^1.25.1",
|
|
52
|
-
"@multi-agent-protocol/sdk": "^0.1.
|
|
52
|
+
"@multi-agent-protocol/sdk": "^0.1.11",
|
|
53
53
|
"@sudocode-ai/claude-code-acp": "^0.13.9",
|
|
54
54
|
"acp-factory": "^0.1.12",
|
|
55
55
|
"agent-inbox": "^0.1.8",
|
package/src/acp/macro-agent.ts
CHANGED
|
@@ -414,11 +414,8 @@ export function createMacroAgent(
|
|
|
414
414
|
params: NewSessionRequest,
|
|
415
415
|
): Promise<NewSessionResponse> {
|
|
416
416
|
const cwd = params.cwd ?? defaultCwd;
|
|
417
|
-
|
|
418
417
|
// Get or create a head manager for this workspace
|
|
419
|
-
const headManager = await agentManager.getOrCreateHeadManager({
|
|
420
|
-
cwd,
|
|
421
|
-
});
|
|
418
|
+
const headManager = await agentManager.getOrCreateHeadManager({ cwd });
|
|
422
419
|
|
|
423
420
|
// Create session mapping
|
|
424
421
|
const mapping = sessionMapper.createMapping(
|
|
@@ -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
|
@@ -110,6 +110,7 @@ export interface BootV2Config {
|
|
|
110
110
|
systemId?: string;
|
|
111
111
|
credential?: string;
|
|
112
112
|
agentName?: string;
|
|
113
|
+
swarmId?: string;
|
|
113
114
|
trajectorySyncLevel?: "off" | "lifecycle" | "metrics" | "full";
|
|
114
115
|
reconnectIntervalMs?: number;
|
|
115
116
|
reconnection?: {
|
|
@@ -343,23 +344,25 @@ export async function bootV2(
|
|
|
343
344
|
}, HEALTH_CHECK_INTERVAL_MS);
|
|
344
345
|
healthCheckTimer.unref(); // Don't prevent process exit
|
|
345
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
|
+
|
|
346
362
|
// 9. REST API server (optional)
|
|
347
363
|
let apiServer: ApiServer | null = null;
|
|
348
364
|
if (config.api?.enabled) {
|
|
349
365
|
const { createApiServer } = await import("./api/server.js");
|
|
350
|
-
// Build a partial system reference for the API server.
|
|
351
|
-
// The full system object is returned below; we create the API server
|
|
352
|
-
// first so it can be included in the return value and shut down cleanly.
|
|
353
|
-
const systemRef = {
|
|
354
|
-
agentManager,
|
|
355
|
-
agentStore,
|
|
356
|
-
inboxAdapter,
|
|
357
|
-
tasksAdapter,
|
|
358
|
-
triggerSystem,
|
|
359
|
-
controlServer,
|
|
360
|
-
roleRegistry,
|
|
361
|
-
controlSocketPath,
|
|
362
|
-
} as any;
|
|
363
366
|
apiServer = createApiServer(systemRef, {
|
|
364
367
|
port: config.api.port,
|
|
365
368
|
host: config.api.host,
|
|
@@ -372,17 +375,7 @@ export async function bootV2(
|
|
|
372
375
|
if (config.acp?.enabled) {
|
|
373
376
|
const { createWebSocketACPServer } = await import("./acp/websocket-server.js");
|
|
374
377
|
acpServer = createWebSocketACPServer(
|
|
375
|
-
|
|
376
|
-
{
|
|
377
|
-
agentManager,
|
|
378
|
-
agentStore,
|
|
379
|
-
inboxAdapter,
|
|
380
|
-
tasksAdapter,
|
|
381
|
-
triggerSystem,
|
|
382
|
-
controlServer,
|
|
383
|
-
roleRegistry,
|
|
384
|
-
controlSocketPath,
|
|
385
|
-
} as any,
|
|
378
|
+
systemRef,
|
|
386
379
|
{
|
|
387
380
|
port: config.acp.port,
|
|
388
381
|
host: config.acp.host,
|
|
@@ -403,17 +396,7 @@ export async function bootV2(
|
|
|
403
396
|
agentStore,
|
|
404
397
|
inboxAdapter,
|
|
405
398
|
tasksAdapter,
|
|
406
|
-
|
|
407
|
-
system: {
|
|
408
|
-
agentManager,
|
|
409
|
-
agentStore,
|
|
410
|
-
inboxAdapter,
|
|
411
|
-
tasksAdapter,
|
|
412
|
-
triggerSystem,
|
|
413
|
-
controlServer,
|
|
414
|
-
roleRegistry,
|
|
415
|
-
controlSocketPath,
|
|
416
|
-
} as any,
|
|
399
|
+
system: systemRef,
|
|
417
400
|
},
|
|
418
401
|
{
|
|
419
402
|
port: config.mapServer.port,
|
|
@@ -476,6 +459,7 @@ export async function bootV2(
|
|
|
476
459
|
systemId: config.map.systemId,
|
|
477
460
|
credential: config.map.credential,
|
|
478
461
|
agentName: config.map.agentName,
|
|
462
|
+
swarmId: config.map.swarmId,
|
|
479
463
|
trajectorySyncLevel: config.map.trajectorySyncLevel,
|
|
480
464
|
reconnectIntervalMs: config.map.reconnectIntervalMs,
|
|
481
465
|
reconnection: config.map.reconnection,
|
|
@@ -485,6 +469,8 @@ export async function bootV2(
|
|
|
485
469
|
await mapSidecar.start();
|
|
486
470
|
// Wire sidecar into agent manager for session-end checkpoints
|
|
487
471
|
agentManager.setSidecar(mapSidecar);
|
|
472
|
+
// Attach to shared system ref so ACP/MAP handlers can access it
|
|
473
|
+
systemRef.mapSidecar = mapSidecar;
|
|
488
474
|
} catch (err) {
|
|
489
475
|
// Non-fatal — MAP hub connectivity is optional
|
|
490
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 () => {
|