@bpinhosilva/agent-orchestrator 1.0.0-alpha.18 → 1.0.0-alpha.19
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/CHANGELOG.md +7 -0
- package/dist/projects/projects.service.js +28 -21
- package/dist/projects/projects.service.js.map +1 -1
- package/dist/tasks/comments.controller.d.ts +1 -1
- package/dist/tasks/comments.controller.js +1 -1
- package/dist/tasks/comments.service.d.ts +1 -1
- package/dist/tasks/comments.service.js +85 -57
- package/dist/tasks/comments.service.js.map +1 -1
- package/dist/tasks/recurrent-tasks.service.js +50 -44
- package/dist/tasks/recurrent-tasks.service.js.map +1 -1
- package/dist/tasks/task-scheduler.service.js +37 -18
- package/dist/tasks/task-scheduler.service.js.map +1 -1
- package/dist/tasks/tasks.service.js +53 -27
- package/dist/tasks/tasks.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [1.0.0-alpha.19](https://github.com/bpinhosilva/agent-orchestrator/compare/v1.0.0-alpha.18...v1.0.0-alpha.19) (2026-03-30)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* implement transaction management in services and tests for improved data integrity ([7b213da](https://github.com/bpinhosilva/agent-orchestrator/commit/7b213da8e9ee46da2e40f3e51e3d61c8a50ac850))
|
|
7
|
+
|
|
1
8
|
# [1.0.0-alpha.18](https://github.com/bpinhosilva/agent-orchestrator/compare/v1.0.0-alpha.17...v1.0.0-alpha.18) (2026-03-29)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -23,15 +23,17 @@ let ProjectsService = class ProjectsService {
|
|
|
23
23
|
this.projectsRepository = projectsRepository;
|
|
24
24
|
}
|
|
25
25
|
async create(createProjectDto) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
26
|
+
return this.projectsRepository.manager.transaction(async (manager) => {
|
|
27
|
+
const project = manager.create(project_entity_1.Project, {
|
|
28
|
+
title: createProjectDto.title,
|
|
29
|
+
description: createProjectDto.description,
|
|
30
|
+
status: createProjectDto.status ?? project_entity_1.ProjectStatus.PLANNING,
|
|
31
|
+
ownerAgent: createProjectDto.ownerAgentId
|
|
32
|
+
? { id: createProjectDto.ownerAgentId }
|
|
33
|
+
: null,
|
|
34
|
+
});
|
|
35
|
+
return manager.save(project);
|
|
33
36
|
});
|
|
34
|
-
return this.projectsRepository.save(project);
|
|
35
37
|
}
|
|
36
38
|
async findAll() {
|
|
37
39
|
return this.projectsRepository.find();
|
|
@@ -44,19 +46,24 @@ let ProjectsService = class ProjectsService {
|
|
|
44
46
|
return project;
|
|
45
47
|
}
|
|
46
48
|
async update(id, updateProjectDto) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
project
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
49
|
+
return this.projectsRepository.manager.transaction(async (manager) => {
|
|
50
|
+
const project = await manager.findOne(project_entity_1.Project, { where: { id } });
|
|
51
|
+
if (!project) {
|
|
52
|
+
throw new common_1.NotFoundException(`Project with ID ${id} not found`);
|
|
53
|
+
}
|
|
54
|
+
if (updateProjectDto.title !== undefined)
|
|
55
|
+
project.title = updateProjectDto.title;
|
|
56
|
+
if (updateProjectDto.description !== undefined)
|
|
57
|
+
project.description = updateProjectDto.description;
|
|
58
|
+
if (updateProjectDto.status !== undefined)
|
|
59
|
+
project.status = updateProjectDto.status;
|
|
60
|
+
if (updateProjectDto.ownerAgentId !== undefined) {
|
|
61
|
+
project.ownerAgent = updateProjectDto.ownerAgentId
|
|
62
|
+
? { id: updateProjectDto.ownerAgentId }
|
|
63
|
+
: null;
|
|
64
|
+
}
|
|
65
|
+
return manager.save(project);
|
|
66
|
+
});
|
|
60
67
|
}
|
|
61
68
|
async remove(id) {
|
|
62
69
|
const project = await this.findOne(id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projects.service.js","sourceRoot":"","sources":["../../src/projects/projects.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA+D;AAE/D,6CAAmD;AACnD,qCAAqC;AAGrC,8DAAmE;AAG5D,IAAM,eAAe,GAArB,MAAM,eAAe;IAGP;IAFnB,YAEmB,kBAAuC;QAAvC,uBAAkB,GAAlB,kBAAkB,CAAqB;IACvD,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,gBAAkC;QAC7C,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"projects.service.js","sourceRoot":"","sources":["../../src/projects/projects.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { UpdateCommentDto } from './dto/update-comment.dto';
|
|
|
4
4
|
export declare class CommentsController {
|
|
5
5
|
private readonly commentsService;
|
|
6
6
|
constructor(commentsService: CommentsService);
|
|
7
|
-
create(taskId: string, createCommentDto: CreateCommentDto): Promise<import("./entities/comment.entity").TaskComment>;
|
|
7
|
+
create(taskId: string, createCommentDto: CreateCommentDto): Promise<import("./entities/comment.entity").TaskComment | null>;
|
|
8
8
|
findAll(taskId: string): Promise<import("./entities/comment.entity").TaskComment[]>;
|
|
9
9
|
findOne(taskId: string, id: string): Promise<import("./entities/comment.entity").TaskComment>;
|
|
10
10
|
remove(taskId: string, id: string): Promise<void>;
|
|
@@ -42,7 +42,7 @@ let CommentsController = class CommentsController {
|
|
|
42
42
|
exports.CommentsController = CommentsController;
|
|
43
43
|
__decorate([
|
|
44
44
|
(0, common_1.Post)(),
|
|
45
|
-
openapi.ApiResponse({ status: 201, type:
|
|
45
|
+
openapi.ApiResponse({ status: 201, type: Object }),
|
|
46
46
|
__param(0, (0, common_1.Param)('taskId')),
|
|
47
47
|
__param(1, (0, common_1.Body)()),
|
|
48
48
|
__metadata("design:type", Function),
|
|
@@ -13,7 +13,7 @@ export declare class CommentsService {
|
|
|
13
13
|
private readonly usersRepository;
|
|
14
14
|
private readonly storageService;
|
|
15
15
|
constructor(commentsRepository: Repository<TaskComment>, tasksRepository: Repository<Task>, agentsRepository: Repository<AgentEntity>, usersRepository: Repository<User>, storageService: StorageService);
|
|
16
|
-
create(taskId: string, createCommentDto: CreateCommentDto): Promise<TaskComment>;
|
|
16
|
+
create(taskId: string, createCommentDto: CreateCommentDto): Promise<TaskComment | null>;
|
|
17
17
|
findAllByTask(taskId: string): Promise<TaskComment[]>;
|
|
18
18
|
findOne(id: string, taskId?: string): Promise<TaskComment>;
|
|
19
19
|
remove(id: string, taskId?: string): Promise<void>;
|
|
@@ -69,50 +69,55 @@ let CommentsService = class CommentsService {
|
|
|
69
69
|
this.storageService = storageService;
|
|
70
70
|
}
|
|
71
71
|
async create(taskId, createCommentDto) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
if (!createCommentDto.authorUserId && !createCommentDto.authorAgentId) {
|
|
77
|
-
throw new common_1.BadRequestException('Either authorUserId or authorAgentId must be provided');
|
|
78
|
-
}
|
|
79
|
-
const authorType = createCommentDto.authorType ||
|
|
80
|
-
(createCommentDto.authorUserId
|
|
81
|
-
? comment_entity_1.CommentAuthorType.USER
|
|
82
|
-
: comment_entity_1.CommentAuthorType.AGENT);
|
|
83
|
-
let authorUser = null;
|
|
84
|
-
let authorAgent = null;
|
|
85
|
-
if (authorType === comment_entity_1.CommentAuthorType.USER &&
|
|
86
|
-
createCommentDto.authorUserId) {
|
|
87
|
-
authorUser = await this.usersRepository.findOne({
|
|
88
|
-
where: { id: createCommentDto.authorUserId },
|
|
89
|
-
});
|
|
90
|
-
if (!authorUser) {
|
|
91
|
-
throw new common_1.NotFoundException(`User with ID ${createCommentDto.authorUserId} not found`);
|
|
72
|
+
return this.commentsRepository.manager.transaction(async (manager) => {
|
|
73
|
+
const task = await manager.findOne(task_entity_1.Task, { where: { id: taskId } });
|
|
74
|
+
if (!task) {
|
|
75
|
+
throw new common_1.NotFoundException(`Task with ID ${taskId} not found`);
|
|
92
76
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
createCommentDto.authorAgentId) {
|
|
96
|
-
authorAgent = await this.agentsRepository.findOne({
|
|
97
|
-
where: { id: createCommentDto.authorAgentId },
|
|
98
|
-
});
|
|
99
|
-
if (!authorAgent) {
|
|
100
|
-
throw new common_1.NotFoundException(`Agent with ID ${createCommentDto.authorAgentId} not found`);
|
|
77
|
+
if (!createCommentDto.authorUserId && !createCommentDto.authorAgentId) {
|
|
78
|
+
throw new common_1.BadRequestException('Either authorUserId or authorAgentId must be provided');
|
|
101
79
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
80
|
+
const authorType = createCommentDto.authorType ||
|
|
81
|
+
(createCommentDto.authorUserId
|
|
82
|
+
? comment_entity_1.CommentAuthorType.USER
|
|
83
|
+
: comment_entity_1.CommentAuthorType.AGENT);
|
|
84
|
+
let authorUser = null;
|
|
85
|
+
let authorAgent = null;
|
|
86
|
+
if (authorType === comment_entity_1.CommentAuthorType.USER &&
|
|
87
|
+
createCommentDto.authorUserId) {
|
|
88
|
+
authorUser = await manager.findOne(user_entity_1.User, {
|
|
89
|
+
where: { id: createCommentDto.authorUserId },
|
|
90
|
+
});
|
|
91
|
+
if (!authorUser) {
|
|
92
|
+
throw new common_1.NotFoundException(`User with ID ${createCommentDto.authorUserId} not found`);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
else if (authorType === comment_entity_1.CommentAuthorType.AGENT &&
|
|
96
|
+
createCommentDto.authorAgentId) {
|
|
97
|
+
authorAgent = await manager.findOne(agent_entity_1.AgentEntity, {
|
|
98
|
+
where: { id: createCommentDto.authorAgentId },
|
|
99
|
+
});
|
|
100
|
+
if (!authorAgent) {
|
|
101
|
+
throw new common_1.NotFoundException(`Agent with ID ${createCommentDto.authorAgentId} not found`);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
const comment = manager.create(comment_entity_1.TaskComment, {
|
|
105
|
+
content: createCommentDto.content,
|
|
106
|
+
task,
|
|
107
|
+
authorType,
|
|
108
|
+
authorUser,
|
|
109
|
+
authorAgent,
|
|
110
|
+
artifacts: createCommentDto.artifacts?.map((artifact) => ({
|
|
111
|
+
id: artifact.id || crypto.randomUUID(),
|
|
112
|
+
...artifact,
|
|
113
|
+
})) || null,
|
|
114
|
+
});
|
|
115
|
+
const savedComment = await manager.save(comment);
|
|
116
|
+
return manager.findOne(comment_entity_1.TaskComment, {
|
|
117
|
+
where: { id: savedComment.id },
|
|
118
|
+
relations: ['authorUser', 'authorAgent'],
|
|
119
|
+
});
|
|
113
120
|
});
|
|
114
|
-
const savedComment = await this.commentsRepository.save(comment);
|
|
115
|
-
return this.findOne(savedComment.id);
|
|
116
121
|
}
|
|
117
122
|
async findAllByTask(taskId) {
|
|
118
123
|
return this.commentsRepository.find({
|
|
@@ -136,9 +141,21 @@ let CommentsService = class CommentsService {
|
|
|
136
141
|
return comment;
|
|
137
142
|
}
|
|
138
143
|
async remove(id, taskId) {
|
|
139
|
-
const
|
|
140
|
-
|
|
141
|
-
|
|
144
|
+
const artifactsToDelete = await this.commentsRepository.manager.transaction(async (manager) => {
|
|
145
|
+
const where = { id };
|
|
146
|
+
if (taskId) {
|
|
147
|
+
where.task = { id: taskId };
|
|
148
|
+
}
|
|
149
|
+
const comment = await manager.findOne(comment_entity_1.TaskComment, { where });
|
|
150
|
+
if (!comment) {
|
|
151
|
+
throw new common_1.NotFoundException(`Comment with ID ${id} not found`);
|
|
152
|
+
}
|
|
153
|
+
const artifacts = comment.artifacts || [];
|
|
154
|
+
await manager.remove(comment);
|
|
155
|
+
return artifacts;
|
|
156
|
+
});
|
|
157
|
+
if (artifactsToDelete.length > 0) {
|
|
158
|
+
for (const artifact of artifactsToDelete) {
|
|
142
159
|
try {
|
|
143
160
|
await this.storageService.delete(artifact.filePath);
|
|
144
161
|
}
|
|
@@ -147,21 +164,32 @@ let CommentsService = class CommentsService {
|
|
|
147
164
|
}
|
|
148
165
|
}
|
|
149
166
|
}
|
|
150
|
-
await this.commentsRepository.remove(comment);
|
|
151
167
|
}
|
|
152
168
|
async update(id, updateCommentDto, taskId) {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
comment.
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
169
|
+
return this.commentsRepository.manager.transaction(async (manager) => {
|
|
170
|
+
const where = { id };
|
|
171
|
+
if (taskId) {
|
|
172
|
+
where.task = { id: taskId };
|
|
173
|
+
}
|
|
174
|
+
const comment = await manager.findOne(comment_entity_1.TaskComment, {
|
|
175
|
+
where,
|
|
176
|
+
relations: ['authorUser', 'authorAgent'],
|
|
177
|
+
});
|
|
178
|
+
if (!comment) {
|
|
179
|
+
throw new common_1.NotFoundException(`Comment with ID ${id} not found`);
|
|
180
|
+
}
|
|
181
|
+
if (updateCommentDto.content !== undefined) {
|
|
182
|
+
comment.content = updateCommentDto.content;
|
|
183
|
+
}
|
|
184
|
+
if (updateCommentDto.artifacts !== undefined) {
|
|
185
|
+
comment.artifacts =
|
|
186
|
+
updateCommentDto.artifacts?.map((artifact) => ({
|
|
187
|
+
id: artifact.id || crypto.randomUUID(),
|
|
188
|
+
...artifact,
|
|
189
|
+
})) || null;
|
|
190
|
+
}
|
|
191
|
+
return manager.save(comment);
|
|
192
|
+
});
|
|
165
193
|
}
|
|
166
194
|
};
|
|
167
195
|
exports.CommentsService = CommentsService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comments.service.js","sourceRoot":"","sources":["../../src/tasks/comments.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAIwB;AACxB,+CAAiC;AACjC,6CAAmD;AACnD,qCAAuD;AACvD,8DAA2E;AAG3E,wDAA8C;AAC9C,kEAA8D;AAC9D,+DAAqD;AACrD,+DAA2D;AAGpD,IAAM,eAAe,GAArB,MAAM,eAAe;IAGP;IAEA;IAEA;IAEA;IACA;IATnB,YAEmB,kBAA2C,EAE3C,eAAiC,EAEjC,gBAAyC,EAEzC,eAAiC,EACjC,cAA8B;QAP9B,uBAAkB,GAAlB,kBAAkB,CAAyB;QAE3C,oBAAe,GAAf,eAAe,CAAkB;QAEjC,qBAAgB,GAAhB,gBAAgB,CAAyB;QAEzC,oBAAe,GAAf,eAAe,CAAkB;QACjC,mBAAc,GAAd,cAAc,CAAgB;IAC9C,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,gBAAkC;QAC7D,
|
|
1
|
+
{"version":3,"file":"comments.service.js","sourceRoot":"","sources":["../../src/tasks/comments.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,18 +27,20 @@ let RecurrentTasksService = class RecurrentTasksService {
|
|
|
27
27
|
this.schedulerService = schedulerService;
|
|
28
28
|
}
|
|
29
29
|
async create(dto) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
30
|
+
return this.repository.manager.transaction(async (manager) => {
|
|
31
|
+
const activeCount = await manager.count(recurrent_task_entity_1.RecurrentTask, {
|
|
32
|
+
where: { status: recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE },
|
|
33
|
+
});
|
|
34
|
+
if (dto.status !== recurrent_task_entity_1.RecurrentTaskStatus.PAUSED && activeCount >= 5) {
|
|
35
|
+
throw new common_1.BadRequestException('Maximum amount of active recurrent tasks (5) reached.');
|
|
36
|
+
}
|
|
37
|
+
const task = manager.create(recurrent_task_entity_1.RecurrentTask, {
|
|
38
|
+
...dto,
|
|
39
|
+
status: dto.status ?? recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE,
|
|
40
|
+
assignee: { id: dto.assigneeId },
|
|
41
|
+
});
|
|
42
|
+
return manager.save(task);
|
|
40
43
|
});
|
|
41
|
-
return this.repository.save(task);
|
|
42
44
|
}
|
|
43
45
|
async findAll() {
|
|
44
46
|
const tasks = await this.repository
|
|
@@ -68,36 +70,38 @@ let RecurrentTasksService = class RecurrentTasksService {
|
|
|
68
70
|
};
|
|
69
71
|
}
|
|
70
72
|
async update(id, dto) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
if (!task) {
|
|
76
|
-
throw new common_1.NotFoundException(`Recurrent task ${id} not found`);
|
|
77
|
-
}
|
|
78
|
-
if (dto.status === recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE &&
|
|
79
|
-
task.status !== recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE) {
|
|
80
|
-
const activeCount = await this.repository.count({
|
|
81
|
-
where: { status: recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE },
|
|
73
|
+
await this.repository.manager.transaction(async (manager) => {
|
|
74
|
+
const task = await manager.findOne(recurrent_task_entity_1.RecurrentTask, {
|
|
75
|
+
where: { id },
|
|
76
|
+
relations: ['assignee'],
|
|
82
77
|
});
|
|
83
|
-
if (
|
|
84
|
-
throw new common_1.
|
|
78
|
+
if (!task) {
|
|
79
|
+
throw new common_1.NotFoundException(`Recurrent task ${id} not found`);
|
|
85
80
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
81
|
+
if (dto.status === recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE &&
|
|
82
|
+
task.status !== recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE) {
|
|
83
|
+
const activeCount = await manager.count(recurrent_task_entity_1.RecurrentTask, {
|
|
84
|
+
where: { status: recurrent_task_entity_1.RecurrentTaskStatus.ACTIVE },
|
|
85
|
+
});
|
|
86
|
+
if (activeCount >= 5) {
|
|
87
|
+
throw new common_1.BadRequestException('Maximum amount of active recurrent tasks (5) reached.');
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
if (dto.assigneeId) {
|
|
91
|
+
task.assignee = { id: dto.assigneeId };
|
|
92
|
+
}
|
|
93
|
+
if (dto.title !== undefined)
|
|
94
|
+
task.title = dto.title;
|
|
95
|
+
if (dto.description !== undefined)
|
|
96
|
+
task.description = dto.description;
|
|
97
|
+
if (dto.status !== undefined)
|
|
98
|
+
task.status = dto.status;
|
|
99
|
+
if (dto.priority !== undefined)
|
|
100
|
+
task.priority = dto.priority;
|
|
101
|
+
if (dto.cronExpression !== undefined)
|
|
102
|
+
task.cronExpression = dto.cronExpression;
|
|
103
|
+
await manager.save(task);
|
|
104
|
+
});
|
|
101
105
|
if (dto.status === recurrent_task_entity_1.RecurrentTaskStatus.PAUSED) {
|
|
102
106
|
try {
|
|
103
107
|
this.schedulerService.unregisterTasks(id);
|
|
@@ -110,12 +114,14 @@ let RecurrentTasksService = class RecurrentTasksService {
|
|
|
110
114
|
return this.findOne(id);
|
|
111
115
|
}
|
|
112
116
|
async remove(id) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
+
await this.repository.manager.transaction(async (manager) => {
|
|
118
|
+
const task = await manager.findOne(recurrent_task_entity_1.RecurrentTask, { where: { id } });
|
|
119
|
+
if (!task) {
|
|
120
|
+
throw new common_1.NotFoundException(`Recurrent task ${id} not found`);
|
|
121
|
+
}
|
|
122
|
+
await manager.remove(task);
|
|
123
|
+
});
|
|
117
124
|
this.schedulerService.unregisterTasks(id);
|
|
118
|
-
await this.repository.remove(task);
|
|
119
125
|
}
|
|
120
126
|
};
|
|
121
127
|
exports.RecurrentTasksService = RecurrentTasksService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recurrent-tasks.service.js","sourceRoot":"","sources":["../../src/tasks/recurrent-tasks.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAIwB;AACxB,6CAAmD;AACnD,qCAAqC;AACrC,4EAG0C;AAK1C,yFAAmF;AACnF,2CAAoD;AAG7C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGb;IAEA;IAJnB,YAEmB,UAAqC,EAErC,gBAA+C;QAF/C,eAAU,GAAV,UAAU,CAA2B;QAErC,qBAAgB,GAAhB,gBAAgB,CAA+B;IAC/D,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,GAA2B;QACtC,MAAM,WAAW,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"recurrent-tasks.service.js","sourceRoot":"","sources":["../../src/tasks/recurrent-tasks.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -147,9 +147,14 @@ If no agent is suitable, return your own ID: "${ownerAgent.id}".
|
|
|
147
147
|
this.logger.warn(`Owner agent for project ${project.id} returned response that could not be parsed as JSON: ${response.content}. Falling back to owner. Error: ${error instanceof Error ? error.message : String(error)}`);
|
|
148
148
|
}
|
|
149
149
|
const assignedAgent = allAgents.find((a) => a.id === selectedAgentId) || ownerAgent;
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
150
|
+
const updatedTask = await this.taskRepository.manager.transaction(async (manager) => {
|
|
151
|
+
const t = await manager.findOne(task_entity_1.Task, { where: { id: task.id } });
|
|
152
|
+
if (!t)
|
|
153
|
+
throw new Error(`Task ${task.id} not found for assignment`);
|
|
154
|
+
t.assignee = assignedAgent;
|
|
155
|
+
return manager.save(t);
|
|
156
|
+
});
|
|
157
|
+
this.tasksService.emitTaskEvent({ ...updatedTask, project }, 'updated');
|
|
153
158
|
this.logger.debug(`Task ${task.id} assigned to agent: ${assignedAgent.name}`);
|
|
154
159
|
}
|
|
155
160
|
catch (error) {
|
|
@@ -160,9 +165,14 @@ If no agent is suitable, return your own ID: "${ownerAgent.id}".
|
|
|
160
165
|
async performTask(task, project) {
|
|
161
166
|
if (!task.assignee)
|
|
162
167
|
return;
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
168
|
+
const inProgressTask = await this.taskRepository.manager.transaction(async (manager) => {
|
|
169
|
+
const t = await manager.findOne(task_entity_1.Task, { where: { id: task.id } });
|
|
170
|
+
if (!t)
|
|
171
|
+
throw new Error(`Task ${task.id} not found for execution`);
|
|
172
|
+
t.status = task_entity_1.TaskStatus.IN_PROGRESS;
|
|
173
|
+
return manager.save(t);
|
|
174
|
+
});
|
|
175
|
+
this.tasksService.emitTaskEvent({ ...inProgressTask, project }, 'updated');
|
|
166
176
|
this.logger.debug(`Agent ${task.assignee.name} performing task ${task.title}`);
|
|
167
177
|
const startTime = Date.now();
|
|
168
178
|
try {
|
|
@@ -180,11 +190,6 @@ If no agent is suitable, return your own ID: "${ownerAgent.id}".
|
|
|
180
190
|
else {
|
|
181
191
|
iterationCost = ((response.content.length / 4) * 0.25) / 1000000;
|
|
182
192
|
}
|
|
183
|
-
task.status = task_entity_1.TaskStatus.REVIEW;
|
|
184
|
-
task.llm_latency = latency;
|
|
185
|
-
task.cost_estimate = (task.cost_estimate || 0) + iterationCost;
|
|
186
|
-
await this.taskRepository.save(task);
|
|
187
|
-
this.tasksService.emitTaskEvent({ ...task, project }, 'updated');
|
|
188
193
|
const artifacts = [];
|
|
189
194
|
if (response.image) {
|
|
190
195
|
try {
|
|
@@ -202,14 +207,28 @@ If no agent is suitable, return your own ID: "${ownerAgent.id}".
|
|
|
202
207
|
this.logger.error(`Failed to save artifact for task ${task.id}: ${error instanceof Error ? error.message : String(error)}`);
|
|
203
208
|
}
|
|
204
209
|
}
|
|
205
|
-
const
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
210
|
+
const finalTask = await this.taskRepository.manager.transaction(async (manager) => {
|
|
211
|
+
const t = await manager.findOne(task_entity_1.Task, {
|
|
212
|
+
where: { id: task.id },
|
|
213
|
+
relations: ['assignee'],
|
|
214
|
+
});
|
|
215
|
+
if (!t)
|
|
216
|
+
throw new Error(`Task ${task.id} not found for final update`);
|
|
217
|
+
t.status = task_entity_1.TaskStatus.REVIEW;
|
|
218
|
+
t.llm_latency = latency;
|
|
219
|
+
t.cost_estimate = (t.cost_estimate || 0) + iterationCost;
|
|
220
|
+
const savedTask = await manager.save(t);
|
|
221
|
+
const comment = manager.create(comment_entity_1.TaskComment, {
|
|
222
|
+
content: response.content,
|
|
223
|
+
task: savedTask,
|
|
224
|
+
authorAgent: savedTask.assignee,
|
|
225
|
+
authorType: comment_entity_1.CommentAuthorType.AGENT,
|
|
226
|
+
artifacts: artifacts.length > 0 ? artifacts : null,
|
|
227
|
+
});
|
|
228
|
+
await manager.save(comment);
|
|
229
|
+
return savedTask;
|
|
211
230
|
});
|
|
212
|
-
|
|
231
|
+
this.tasksService.emitTaskEvent({ ...finalTask, project }, 'updated');
|
|
213
232
|
this.logger.debug(`Task ${task.id} completed by agent ${task.assignee.name}. Latency: ${latency}ms, Cost+: $${iterationCost.toFixed(6)}`);
|
|
214
233
|
}
|
|
215
234
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-scheduler.service.js","sourceRoot":"","sources":["../../src/tasks/task-scheduler.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-scheduler.service.js","sourceRoot":"","sources":["../../src/tasks/task-scheduler.service.ts"],"names":[],"mappings":"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"}
|