@taico/taico 0.2.16 → 0.2.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agents/agent-template.catalog.js +20 -2
- package/dist/agents/agent-template.catalog.js.map +1 -1
- package/dist/app-init/agent/code-reviewer.agent.js +1 -1
- package/dist/app-init/agent/code-reviewer.agent.js.map +1 -1
- package/dist/app-init/agent/codex-dev.agent.js +2 -2
- package/dist/app-init/agent/codex-dev.agent.js.map +1 -1
- package/dist/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/auth-journeys/auth-journeys.controller.js +3 -3
- package/dist/auth-journeys/auth-journeys.controller.js.map +1 -1
- package/dist/auth-journeys/auth-journeys.service.d.ts +5 -2
- package/dist/auth-journeys/auth-journeys.service.js +48 -1
- package/dist/auth-journeys/auth-journeys.service.js.map +1 -1
- package/dist/auth-journeys/dto/service/auth-journeys.service.types.d.ts +44 -0
- package/dist/authorization-server/client-registration.controller.js.map +1 -1
- package/dist/authorization-server/client-registration.service.d.ts +5 -3
- package/dist/authorization-server/client-registration.service.js +16 -4
- package/dist/authorization-server/client-registration.service.js.map +1 -1
- package/dist/authorization-server/dto/account-setup-status-request.dto.d.ts +3 -0
- package/dist/authorization-server/dto/account-setup-status-request.dto.js +24 -0
- package/dist/authorization-server/dto/account-setup-status-request.dto.js.map +1 -0
- package/dist/authorization-server/dto/account-setup-status-response.dto.d.ts +4 -0
- package/dist/authorization-server/dto/account-setup-status-response.dto.js +27 -0
- package/dist/authorization-server/dto/account-setup-status-response.dto.js.map +1 -0
- package/dist/authorization-server/dto/create-managed-user-request.dto.d.ts +5 -0
- package/dist/authorization-server/dto/create-managed-user-request.dto.js +31 -0
- package/dist/authorization-server/dto/create-managed-user-request.dto.js.map +1 -0
- package/dist/authorization-server/dto/managed-user-response.dto.d.ts +13 -0
- package/dist/authorization-server/dto/managed-user-response.dto.js +68 -0
- package/dist/authorization-server/dto/managed-user-response.dto.js.map +1 -0
- package/dist/authorization-server/dto/service/client-registration.service.types.d.ts +10 -0
- package/dist/authorization-server/dto/service/client-registration.service.types.js +3 -0
- package/dist/authorization-server/dto/service/client-registration.service.types.js.map +1 -0
- package/dist/authorization-server/dto/setup-managed-user-request.dto.d.ts +6 -0
- package/dist/authorization-server/dto/setup-managed-user-request.dto.js +45 -0
- package/dist/authorization-server/dto/setup-managed-user-request.dto.js.map +1 -0
- package/dist/authorization-server/web-auth.controller.d.ts +14 -0
- package/dist/authorization-server/web-auth.controller.js +165 -50
- package/dist/authorization-server/web-auth.controller.js.map +1 -1
- package/dist/authorization-server/web-auth.service.js +3 -2
- package/dist/authorization-server/web-auth.service.js.map +1 -1
- package/dist/executions/active/active-task-execution.controller.js +3 -2
- package/dist/executions/active/active-task-execution.controller.js.map +1 -1
- package/dist/executions/active/active-task-execution.service.d.ts +8 -9
- package/dist/executions/active/active-task-execution.service.js +62 -3
- package/dist/executions/active/active-task-execution.service.js.map +1 -1
- package/dist/executions/active/dto/http/active-task-execution-response.dto.d.ts +3 -3
- package/dist/executions/active/dto/http/active-task-execution-response.dto.js +15 -15
- package/dist/executions/active/dto/http/active-task-execution-response.dto.js.map +1 -1
- package/dist/executions/active/dto/http/update-execution-stats.dto.d.ts +1 -0
- package/dist/executions/active/dto/http/update-execution-stats.dto.js +15 -0
- package/dist/executions/active/dto/http/update-execution-stats.dto.js.map +1 -1
- package/dist/executions/dto/http/execution-stats-response.dto.d.ts +3 -2
- package/dist/executions/dto/http/execution-stats-response.dto.js +18 -7
- package/dist/executions/dto/http/execution-stats-response.dto.js.map +1 -1
- package/dist/executions/dto/service/execution-results.service.types.d.ts +71 -0
- package/dist/executions/dto/service/execution-results.service.types.js +3 -0
- package/dist/executions/dto/service/execution-results.service.types.js.map +1 -0
- package/dist/executions/executions-worker.gateway.d.ts +3 -2
- package/dist/executions/executions-worker.gateway.js +15 -7
- package/dist/executions/executions-worker.gateway.js.map +1 -1
- package/dist/executions/history/dto/http/task-execution-history-response.dto.d.ts +2 -2
- package/dist/executions/history/dto/http/task-execution-history-response.dto.js +15 -15
- package/dist/executions/history/dto/http/task-execution-history-response.dto.js.map +1 -1
- package/dist/executions/history/task-execution-history.controller.js +1 -1
- package/dist/executions/history/task-execution-history.service.d.ts +4 -6
- package/dist/executions/history/task-execution-history.service.js +35 -1
- package/dist/executions/history/task-execution-history.service.js.map +1 -1
- package/dist/executions/queue/dto/http/task-execution-queue-entry-response.dto.d.ts +0 -2
- package/dist/executions/queue/dto/http/task-execution-queue-entry-response.dto.js +0 -7
- package/dist/executions/queue/dto/http/task-execution-queue-entry-response.dto.js.map +1 -1
- package/dist/executions/queue/task-execution-queue.controller.d.ts +1 -0
- package/dist/executions/queue/task-execution-queue.controller.js +9 -3
- package/dist/executions/queue/task-execution-queue.controller.js.map +1 -1
- package/dist/executions/queue/task-execution-queue.service.d.ts +3 -6
- package/dist/executions/queue/task-execution-queue.service.js +14 -2
- package/dist/executions/queue/task-execution-queue.service.js.map +1 -1
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.d.ts +3 -1
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.js +20 -6
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.js.map +1 -1
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.spec.d.ts +1 -0
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.spec.js +80 -0
- package/dist/executions/staleness/stale-active-task-execution-pruner.service.spec.js.map +1 -0
- package/dist/executions/stats/execution-stats.entity.d.ts +1 -0
- package/dist/executions/stats/execution-stats.entity.js +5 -0
- package/dist/executions/stats/execution-stats.entity.js.map +1 -1
- package/dist/identity-provider/dto/service/identity-provider.service.types.d.ts +10 -0
- package/dist/identity-provider/identity-provider.service.d.ts +14 -1
- package/dist/identity-provider/identity-provider.service.js +119 -0
- package/dist/identity-provider/identity-provider.service.js.map +1 -1
- package/dist/meta/dto/service/meta.service.types.d.ts +4 -0
- package/dist/meta/dto/version-response.dto.d.ts +4 -0
- package/dist/meta/dto/version-response.dto.js +33 -0
- package/dist/meta/dto/version-response.dto.js.map +1 -0
- package/dist/meta/meta.controller.d.ts +3 -0
- package/dist/meta/meta.controller.js +22 -0
- package/dist/meta/meta.controller.js.map +1 -1
- package/dist/meta/meta.service.d.ts +2 -1
- package/dist/meta/meta.service.js +36 -0
- package/dist/meta/meta.service.js.map +1 -1
- package/dist/meta/projects.service.js +5 -1
- package/dist/meta/projects.service.js.map +1 -1
- package/dist/migrations/1742700000000-AddWorkerVersionFields.d.ts +5 -0
- package/dist/migrations/1742700000000-AddWorkerVersionFields.js +27 -0
- package/dist/migrations/1742700000000-AddWorkerVersionFields.js.map +1 -0
- package/dist/public/assets/index-BeTge0cu.css +1 -0
- package/dist/public/assets/index-bd9bD2Gb.js +73 -0
- package/dist/public/beta/assets/{index-Bnn4h6Il.js → index-C4IlvkgW.js} +1 -1
- package/dist/public/beta/index.html +1 -1
- package/dist/public/index.html +2 -2
- package/dist/public/package.json +40 -0
- package/dist/tasks/dto/service/tasks.service.types.d.ts +1 -0
- package/dist/tasks/dto/task-list-response.dto.js +2 -2
- package/dist/tasks/dto/task-list-response.dto.js.map +1 -1
- package/dist/tasks/tasks.controller.js +1 -1
- package/dist/tasks/tasks.controller.js.map +1 -1
- package/dist/tasks/tasks.service.create-task-in-thread.spec.js +4 -2
- package/dist/tasks/tasks.service.create-task-in-thread.spec.js.map +1 -1
- package/dist/tasks/tasks.service.d.ts +1 -0
- package/dist/tasks/tasks.service.js +56 -63
- package/dist/tasks/tasks.service.js.map +1 -1
- package/dist/threads/thread-task-assignment-projector.service.d.ts +7 -0
- package/dist/threads/thread-task-assignment-projector.service.js +48 -0
- package/dist/threads/thread-task-assignment-projector.service.js.map +1 -0
- package/dist/threads/thread-task-assignment-projector.service.spec.d.ts +1 -0
- package/dist/threads/thread-task-assignment-projector.service.spec.js +70 -0
- package/dist/threads/thread-task-assignment-projector.service.spec.js.map +1 -0
- package/dist/threads/threads.module.js +2 -0
- package/dist/threads/threads.module.js.map +1 -1
- package/dist/threads/threads.service.d.ts +2 -0
- package/dist/threads/threads.service.js +57 -3
- package/dist/threads/threads.service.js.map +1 -1
- package/dist/threads/threads.service.spec.js +135 -0
- package/dist/threads/threads.service.spec.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/workers/dto/http/worker-response.dto.d.ts +1 -2
- package/dist/workers/dto/http/worker-response.dto.js +5 -10
- package/dist/workers/dto/http/worker-response.dto.js.map +1 -1
- package/dist/workers/dto/service/workers.service.types.d.ts +10 -0
- package/dist/workers/worker.entity.d.ts +1 -0
- package/dist/workers/worker.entity.js +5 -0
- package/dist/workers/worker.entity.js.map +1 -1
- package/dist/workers/workers.controller.d.ts +1 -0
- package/dist/workers/workers.controller.js +12 -1
- package/dist/workers/workers.controller.js.map +1 -1
- package/dist/workers/workers.gateway.js +9 -2
- package/dist/workers/workers.gateway.js.map +1 -1
- package/dist/workers/workers.service.d.ts +3 -2
- package/dist/workers/workers.service.js +21 -1
- package/dist/workers/workers.service.js.map +1 -1
- package/package.json +6 -6
- package/dist/public/assets/index-Bqsni13H.css +0 -1
- package/dist/public/assets/index-CboWmVjp.js +0 -73
|
@@ -30,22 +30,22 @@ class TaskExecutionHistoryResponseDto {
|
|
|
30
30
|
errorCode;
|
|
31
31
|
errorMessage;
|
|
32
32
|
stats;
|
|
33
|
-
static
|
|
33
|
+
static fromResult(result) {
|
|
34
34
|
return {
|
|
35
|
-
id:
|
|
36
|
-
taskId:
|
|
37
|
-
taskName:
|
|
38
|
-
taskStatus:
|
|
39
|
-
claimedAt:
|
|
40
|
-
transitionedAt:
|
|
41
|
-
agentActorId:
|
|
42
|
-
workerClientId:
|
|
43
|
-
runnerSessionId:
|
|
44
|
-
toolCallCount:
|
|
45
|
-
status:
|
|
46
|
-
errorCode:
|
|
47
|
-
errorMessage:
|
|
48
|
-
stats:
|
|
35
|
+
id: result.id,
|
|
36
|
+
taskId: result.taskId,
|
|
37
|
+
taskName: result.taskName,
|
|
38
|
+
taskStatus: result.taskStatus,
|
|
39
|
+
claimedAt: result.claimedAt.toISOString(),
|
|
40
|
+
transitionedAt: result.transitionedAt.toISOString(),
|
|
41
|
+
agentActorId: result.agentActorId,
|
|
42
|
+
workerClientId: result.workerClientId,
|
|
43
|
+
runnerSessionId: result.runnerSessionId,
|
|
44
|
+
toolCallCount: result.toolCallCount,
|
|
45
|
+
status: result.status,
|
|
46
|
+
errorCode: result.errorCode,
|
|
47
|
+
errorMessage: result.errorMessage,
|
|
48
|
+
stats: result.stats ? execution_stats_response_dto_1.ExecutionStatsResponseDto.fromResult(result.stats) : null,
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-execution-history-response.dto.js","sourceRoot":"","sources":["../../../../../src/executions/history/dto/http/task-execution-history-response.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,mDAAqD;
|
|
1
|
+
{"version":3,"file":"task-execution-history-response.dto.js","sourceRoot":"","sources":["../../../../../src/executions/history/dto/http/task-execution-history-response.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ let TaskExecutionHistoryController = class TaskExecutionHistoryController {
|
|
|
35
35
|
taskId: query.taskId,
|
|
36
36
|
});
|
|
37
37
|
return {
|
|
38
|
-
items: result.items.map((item) => task_execution_history_response_dto_1.TaskExecutionHistoryResponseDto.
|
|
38
|
+
items: result.items.map((item) => task_execution_history_response_dto_1.TaskExecutionHistoryResponseDto.fromResult(item)),
|
|
39
39
|
total: result.total,
|
|
40
40
|
page: result.page,
|
|
41
41
|
limit: result.limit,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Repository } from 'typeorm';
|
|
2
2
|
import { TaskExecutionHistoryEntity } from './task-execution-history.entity';
|
|
3
|
+
import { TaskExecutionHistoryListResult } from '../dto/service/execution-results.service.types';
|
|
3
4
|
export declare class TaskExecutionHistoryService {
|
|
4
5
|
private readonly taskExecutionHistoryRepository;
|
|
5
6
|
constructor(taskExecutionHistoryRepository: Repository<TaskExecutionHistoryEntity>);
|
|
@@ -7,12 +8,9 @@ export declare class TaskExecutionHistoryService {
|
|
|
7
8
|
page?: number;
|
|
8
9
|
limit?: number;
|
|
9
10
|
taskId?: string;
|
|
10
|
-
}): Promise<
|
|
11
|
-
items: TaskExecutionHistoryEntity[];
|
|
12
|
-
total: number;
|
|
13
|
-
page: number;
|
|
14
|
-
limit: number;
|
|
15
|
-
}>;
|
|
11
|
+
}): Promise<TaskExecutionHistoryListResult>;
|
|
16
12
|
getLatestHistoryForTask(taskId: string): Promise<TaskExecutionHistoryEntity | null>;
|
|
17
13
|
countConsecutiveQuotaErrors(taskId: string): Promise<number>;
|
|
14
|
+
private mapHistoryEntryToResult;
|
|
15
|
+
private mapStatsToResult;
|
|
18
16
|
}
|
|
@@ -34,7 +34,12 @@ let TaskExecutionHistoryService = class TaskExecutionHistoryService {
|
|
|
34
34
|
skip,
|
|
35
35
|
take: limit,
|
|
36
36
|
});
|
|
37
|
-
return {
|
|
37
|
+
return {
|
|
38
|
+
items: items.map((item) => this.mapHistoryEntryToResult(item)),
|
|
39
|
+
total,
|
|
40
|
+
page,
|
|
41
|
+
limit,
|
|
42
|
+
};
|
|
38
43
|
}
|
|
39
44
|
async getLatestHistoryForTask(taskId) {
|
|
40
45
|
return this.taskExecutionHistoryRepository.findOne({
|
|
@@ -60,6 +65,35 @@ let TaskExecutionHistoryService = class TaskExecutionHistoryService {
|
|
|
60
65
|
}
|
|
61
66
|
return count;
|
|
62
67
|
}
|
|
68
|
+
mapHistoryEntryToResult(historyEntry) {
|
|
69
|
+
return {
|
|
70
|
+
id: historyEntry.id,
|
|
71
|
+
taskId: historyEntry.taskId,
|
|
72
|
+
taskName: historyEntry.task?.name ?? null,
|
|
73
|
+
taskStatus: historyEntry.task?.status ?? null,
|
|
74
|
+
claimedAt: historyEntry.claimedAt,
|
|
75
|
+
transitionedAt: historyEntry.transitionedAt,
|
|
76
|
+
agentActorId: historyEntry.agentActorId,
|
|
77
|
+
workerClientId: historyEntry.workerClientId,
|
|
78
|
+
runnerSessionId: historyEntry.runnerSessionId,
|
|
79
|
+
toolCallCount: historyEntry.toolCallCount,
|
|
80
|
+
status: historyEntry.status,
|
|
81
|
+
errorCode: historyEntry.errorCode,
|
|
82
|
+
errorMessage: historyEntry.errorMessage,
|
|
83
|
+
stats: historyEntry.stats ? this.mapStatsToResult(historyEntry.stats) : null,
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
mapStatsToResult(stats) {
|
|
87
|
+
return {
|
|
88
|
+
harness: stats.harness,
|
|
89
|
+
providerId: stats.providerId,
|
|
90
|
+
modelId: stats.modelId,
|
|
91
|
+
workerVersion: stats.workerVersion,
|
|
92
|
+
inputTokens: stats.inputTokens,
|
|
93
|
+
outputTokens: stats.outputTokens,
|
|
94
|
+
totalTokens: stats.totalTokens,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
63
97
|
};
|
|
64
98
|
exports.TaskExecutionHistoryService = TaskExecutionHistoryService;
|
|
65
99
|
exports.TaskExecutionHistoryService = TaskExecutionHistoryService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-execution-history.service.js","sourceRoot":"","sources":["../../../src/executions/history/task-execution-history.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,mFAA6E;
|
|
1
|
+
{"version":3,"file":"task-execution-history.service.js","sourceRoot":"","sources":["../../../src/executions/history/task-execution-history.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { TaskStatus } from '../../../../tasks/enums';
|
|
2
|
-
import { TaskExecutionQueueEntity } from '../../task-execution-queue.entity';
|
|
3
2
|
export declare class TaskExecutionQueueEntryResponseDto {
|
|
4
3
|
taskId: string;
|
|
5
4
|
taskName: string | null;
|
|
6
5
|
taskStatus: TaskStatus | null;
|
|
7
|
-
static fromEntity(entity: TaskExecutionQueueEntity): TaskExecutionQueueEntryResponseDto;
|
|
8
6
|
}
|
|
@@ -16,13 +16,6 @@ class TaskExecutionQueueEntryResponseDto {
|
|
|
16
16
|
taskId;
|
|
17
17
|
taskName;
|
|
18
18
|
taskStatus;
|
|
19
|
-
static fromEntity(entity) {
|
|
20
|
-
return {
|
|
21
|
-
taskId: entity.taskId,
|
|
22
|
-
taskName: entity.task?.name ?? null,
|
|
23
|
-
taskStatus: entity.task?.status ?? null,
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
19
|
}
|
|
27
20
|
exports.TaskExecutionQueueEntryResponseDto = TaskExecutionQueueEntryResponseDto;
|
|
28
21
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-execution-queue-entry-response.dto.js","sourceRoot":"","sources":["../../../../../src/executions/queue/dto/http/task-execution-queue-entry-response.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,mDAAqD;
|
|
1
|
+
{"version":3,"file":"task-execution-queue-entry-response.dto.js","sourceRoot":"","sources":["../../../../../src/executions/queue/dto/http/task-execution-queue-entry-response.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,mDAAqD;AAErD,MAAa,kCAAkC;IAK7C,MAAM,CAAU;IAQhB,QAAQ,CAAiB;IAOzB,UAAU,CAAqB;CAChC;AArBD,gFAqBC;AAhBC;IAJC,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,wCAAwC;QACrD,OAAO,EAAE,sCAAsC;KAChD,CAAC;;kEACc;AAQhB;IANC,IAAA,qBAAW,EAAC;QACX,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,oCAAoC;QACjD,OAAO,EAAE,8BAA8B;QACvC,QAAQ,EAAE,IAAI;KACf,CAAC;;oEACuB;AAOzB;IALC,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,qBAAqB;QAClC,IAAI,EAAE,kBAAU;QAChB,QAAQ,EAAE,IAAI;KACf,CAAC;;sEAC6B"}
|
|
@@ -10,4 +10,5 @@ export declare class TaskExecutionQueueController {
|
|
|
10
10
|
constructor(taskExecutionQueueService: TaskExecutionQueueService, activeTaskExecutionService: ActiveTaskExecutionService);
|
|
11
11
|
listQueue(query: ListQueueQueryDto): Promise<TaskExecutionQueueListResponseDto>;
|
|
12
12
|
claimTask(taskId: string, auth: AuthContext): Promise<ActiveTaskExecutionResponseDto>;
|
|
13
|
+
private mapQueueEntryToResponse;
|
|
13
14
|
}
|
|
@@ -26,7 +26,6 @@ const active_task_execution_response_dto_1 = require("../active/dto/http/active-
|
|
|
26
26
|
const active_task_execution_service_1 = require("../active/active-task-execution.service");
|
|
27
27
|
const executions_errors_1 = require("../errors/executions.errors");
|
|
28
28
|
const task_execution_queue_service_1 = require("./task-execution-queue.service");
|
|
29
|
-
const task_execution_queue_entry_response_dto_1 = require("./dto/http/task-execution-queue-entry-response.dto");
|
|
30
29
|
const task_execution_queue_list_response_dto_1 = require("./dto/http/task-execution-queue-list-response.dto");
|
|
31
30
|
const list_queue_query_dto_1 = require("./dto/http/list-queue-query.dto");
|
|
32
31
|
let TaskExecutionQueueController = class TaskExecutionQueueController {
|
|
@@ -42,7 +41,7 @@ let TaskExecutionQueueController = class TaskExecutionQueueController {
|
|
|
42
41
|
limit: query.limit ?? 50,
|
|
43
42
|
});
|
|
44
43
|
return {
|
|
45
|
-
items: result.items.map((item) =>
|
|
44
|
+
items: result.items.map((item) => this.mapQueueEntryToResponse(item)),
|
|
46
45
|
total: result.total,
|
|
47
46
|
page: result.page,
|
|
48
47
|
limit: result.limit,
|
|
@@ -55,7 +54,7 @@ let TaskExecutionQueueController = class TaskExecutionQueueController {
|
|
|
55
54
|
taskId,
|
|
56
55
|
workerClientId: auth.claims.client_id,
|
|
57
56
|
});
|
|
58
|
-
return active_task_execution_response_dto_1.ActiveTaskExecutionResponseDto.
|
|
57
|
+
return active_task_execution_response_dto_1.ActiveTaskExecutionResponseDto.fromResult(execution);
|
|
59
58
|
}
|
|
60
59
|
catch (error) {
|
|
61
60
|
if (error instanceof tasks_errors_1.TaskNotFoundError) {
|
|
@@ -70,6 +69,13 @@ let TaskExecutionQueueController = class TaskExecutionQueueController {
|
|
|
70
69
|
throw error;
|
|
71
70
|
}
|
|
72
71
|
}
|
|
72
|
+
mapQueueEntryToResponse(entry) {
|
|
73
|
+
return {
|
|
74
|
+
taskId: entry.taskId,
|
|
75
|
+
taskName: entry.taskName,
|
|
76
|
+
taskStatus: entry.taskStatus,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
73
79
|
};
|
|
74
80
|
exports.TaskExecutionQueueController = TaskExecutionQueueController;
|
|
75
81
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-execution-queue.controller.js","sourceRoot":"","sources":["../../../src/executions/queue/task-execution-queue.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,6CAOyB;AACzB,gGAAkF;AAClF,oFAA+E;AAC/E,wEAAoE;AACpE,oGAAsF;AAEtF,2DAAuD;AACvD,kEAAoE;AACpE,sDAAkD;AAClD,8GAAuG;AACvG,2FAAqF;AACrF,mEAGqC;AACrC,iFAA2E;
|
|
1
|
+
{"version":3,"file":"task-execution-queue.controller.js","sourceRoot":"","sources":["../../../src/executions/queue/task-execution-queue.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import { Repository } from 'typeorm';
|
|
2
2
|
import { TaskExecutionQueueEntity } from './task-execution-queue.entity';
|
|
3
|
+
import { TaskExecutionQueueListResult } from '../dto/service/execution-results.service.types';
|
|
3
4
|
export declare class TaskExecutionQueueService {
|
|
4
5
|
private readonly taskExecutionQueueRepository;
|
|
5
6
|
constructor(taskExecutionQueueRepository: Repository<TaskExecutionQueueEntity>);
|
|
6
7
|
listQueue(options?: {
|
|
7
8
|
page?: number;
|
|
8
9
|
limit?: number;
|
|
9
|
-
}): Promise<
|
|
10
|
-
|
|
11
|
-
total: number;
|
|
12
|
-
page: number;
|
|
13
|
-
limit: number;
|
|
14
|
-
}>;
|
|
10
|
+
}): Promise<TaskExecutionQueueListResult>;
|
|
11
|
+
private mapQueueEntryToResult;
|
|
15
12
|
}
|
|
@@ -28,11 +28,23 @@ let TaskExecutionQueueService = class TaskExecutionQueueService {
|
|
|
28
28
|
const skip = (page - 1) * limit;
|
|
29
29
|
const [items, total] = await this.taskExecutionQueueRepository.findAndCount({
|
|
30
30
|
relations: ['task'],
|
|
31
|
-
order: {
|
|
31
|
+
order: { createdAt: 'ASC' },
|
|
32
32
|
skip,
|
|
33
33
|
take: limit,
|
|
34
34
|
});
|
|
35
|
-
return {
|
|
35
|
+
return {
|
|
36
|
+
items: items.map((item) => this.mapQueueEntryToResult(item)),
|
|
37
|
+
total,
|
|
38
|
+
page,
|
|
39
|
+
limit,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
mapQueueEntryToResult(entry) {
|
|
43
|
+
return {
|
|
44
|
+
taskId: entry.taskId,
|
|
45
|
+
taskName: entry.task?.name ?? null,
|
|
46
|
+
taskStatus: entry.task?.status ?? null,
|
|
47
|
+
};
|
|
36
48
|
}
|
|
37
49
|
};
|
|
38
50
|
exports.TaskExecutionQueueService = TaskExecutionQueueService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-execution-queue.service.js","sourceRoot":"","sources":["../../../src/executions/queue/task-execution-queue.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,+EAAyE;
|
|
1
|
+
{"version":3,"file":"task-execution-queue.service.js","sourceRoot":"","sources":["../../../src/executions/queue/task-execution-queue.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,+EAAyE;AAOlE,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAGjB;IAFnB,YAEmB,4BAAkE;QAAlE,iCAA4B,GAA5B,4BAA4B,CAAsC;IAClF,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,OAGf;QACC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAEhC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,YAAY,CAAC;YAC1E,SAAS,EAAE,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;YAC3B,IAAI;YACJ,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5D,KAAK;YACL,IAAI;YACJ,KAAK;SACN,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAC3B,KAA+B;QAE/B,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI;YAClC,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,IAAI;SACvC,CAAC;IACJ,CAAC;CACF,CAAA;AAtCY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sDAAwB,CAAC,CAAA;qCACI,oBAAU;GAHhD,yBAAyB,CAsCrC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { EventEmitter2 } from '@nestjs/event-emitter';
|
|
1
2
|
import { DataSource } from 'typeorm';
|
|
2
3
|
import { ActiveTaskExecutionEntity } from '../active/active-task-execution.entity';
|
|
3
4
|
export declare class StaleActiveTaskExecutionPrunerService {
|
|
4
5
|
private readonly dataSource;
|
|
5
|
-
|
|
6
|
+
private readonly eventEmitter;
|
|
7
|
+
constructor(dataSource: DataSource, eventEmitter: EventEmitter2);
|
|
6
8
|
pruneExecutions(executions: ActiveTaskExecutionEntity[]): Promise<number>;
|
|
7
9
|
pruneExecutionById(executionId: string): Promise<boolean>;
|
|
8
10
|
private resolveSnapshotTags;
|
|
@@ -11,16 +11,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.StaleActiveTaskExecutionPrunerService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
+
const event_emitter_1 = require("@nestjs/event-emitter");
|
|
14
15
|
const typeorm_1 = require("typeorm");
|
|
15
16
|
const active_task_execution_entity_1 = require("../active/active-task-execution.entity");
|
|
16
17
|
const tag_entity_1 = require("../../meta/tag.entity");
|
|
17
18
|
const task_entity_1 = require("../../tasks/task.entity");
|
|
18
19
|
const task_execution_history_entity_1 = require("../history/task-execution-history.entity");
|
|
19
20
|
const task_execution_history_status_enum_1 = require("../history/task-execution-history-status.enum");
|
|
21
|
+
const execution_interrupt_event_1 = require("../events/execution-interrupt.event");
|
|
22
|
+
const STALE_EXECUTION_INTERRUPT_ACTOR_ID = 'system';
|
|
20
23
|
let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPrunerService {
|
|
21
24
|
dataSource;
|
|
22
|
-
|
|
25
|
+
eventEmitter;
|
|
26
|
+
constructor(dataSource, eventEmitter) {
|
|
23
27
|
this.dataSource = dataSource;
|
|
28
|
+
this.eventEmitter = eventEmitter;
|
|
24
29
|
}
|
|
25
30
|
async pruneExecutions(executions) {
|
|
26
31
|
let prunedCount = 0;
|
|
@@ -33,12 +38,12 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
33
38
|
return prunedCount;
|
|
34
39
|
}
|
|
35
40
|
async pruneExecutionById(executionId) {
|
|
36
|
-
|
|
41
|
+
const prunedExecution = await this.dataSource.transaction(async (manager) => {
|
|
37
42
|
const activeExecution = await manager.findOne(active_task_execution_entity_1.ActiveTaskExecutionEntity, {
|
|
38
43
|
where: { id: executionId },
|
|
39
44
|
});
|
|
40
45
|
if (!activeExecution) {
|
|
41
|
-
return
|
|
46
|
+
return null;
|
|
42
47
|
}
|
|
43
48
|
const task = await manager.findOne(task_entity_1.TaskEntity, {
|
|
44
49
|
where: { id: activeExecution.taskId },
|
|
@@ -46,7 +51,7 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
46
51
|
});
|
|
47
52
|
if (!task) {
|
|
48
53
|
await manager.delete(active_task_execution_entity_1.ActiveTaskExecutionEntity, { id: activeExecution.id });
|
|
49
|
-
return
|
|
54
|
+
return activeExecution;
|
|
50
55
|
}
|
|
51
56
|
task.status = activeExecution.taskStatusBeforeClaim;
|
|
52
57
|
task.assigneeActorId = activeExecution.taskAssigneeActorIdBeforeClaim;
|
|
@@ -62,8 +67,16 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
62
67
|
status: task_execution_history_status_enum_1.TaskExecutionHistoryStatus.STALE,
|
|
63
68
|
errorCode: null,
|
|
64
69
|
}));
|
|
65
|
-
return
|
|
70
|
+
return activeExecution;
|
|
66
71
|
});
|
|
72
|
+
if (!prunedExecution) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
this.eventEmitter.emit(execution_interrupt_event_1.ExecutionInterruptEvent.INTERNAL, new execution_interrupt_event_1.ExecutionInterruptEvent({ id: STALE_EXECUTION_INTERRUPT_ACTOR_ID }, {
|
|
76
|
+
executionId: prunedExecution.id,
|
|
77
|
+
workerClientId: prunedExecution.workerClientId,
|
|
78
|
+
}));
|
|
79
|
+
return true;
|
|
67
80
|
}
|
|
68
81
|
async resolveSnapshotTags(manager, snapshotTags) {
|
|
69
82
|
if (snapshotTags.length === 0) {
|
|
@@ -111,6 +124,7 @@ let StaleActiveTaskExecutionPrunerService = class StaleActiveTaskExecutionPruner
|
|
|
111
124
|
exports.StaleActiveTaskExecutionPrunerService = StaleActiveTaskExecutionPrunerService;
|
|
112
125
|
exports.StaleActiveTaskExecutionPrunerService = StaleActiveTaskExecutionPrunerService = __decorate([
|
|
113
126
|
(0, common_1.Injectable)(),
|
|
114
|
-
__metadata("design:paramtypes", [typeorm_1.DataSource
|
|
127
|
+
__metadata("design:paramtypes", [typeorm_1.DataSource,
|
|
128
|
+
event_emitter_1.EventEmitter2])
|
|
115
129
|
], StaleActiveTaskExecutionPrunerService);
|
|
116
130
|
//# sourceMappingURL=stale-active-task-execution-pruner.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stale-active-task-execution-pruner.service.js","sourceRoot":"","sources":["../../../src/executions/staleness/stale-active-task-execution-pruner.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAwD;AACxD,yFAGgD;AAChD,sDAAkD;AAClD,yDAAqD;AACrD,4FAAsF;AACtF,sGAA2F;
|
|
1
|
+
{"version":3,"file":"stale-active-task-execution-pruner.service.js","sourceRoot":"","sources":["../../../src/executions/staleness/stale-active-task-execution-pruner.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const active_task_execution_entity_1 = require("../active/active-task-execution.entity");
|
|
4
|
+
const execution_interrupt_event_1 = require("../events/execution-interrupt.event");
|
|
5
|
+
const task_execution_history_status_enum_1 = require("../history/task-execution-history-status.enum");
|
|
6
|
+
const enums_1 = require("../../tasks/enums");
|
|
7
|
+
const stale_active_task_execution_pruner_service_1 = require("./stale-active-task-execution-pruner.service");
|
|
8
|
+
describe('StaleActiveTaskExecutionPrunerService', () => {
|
|
9
|
+
let dataSource;
|
|
10
|
+
let eventEmitter;
|
|
11
|
+
let emit;
|
|
12
|
+
let service;
|
|
13
|
+
beforeEach(() => {
|
|
14
|
+
dataSource = {
|
|
15
|
+
transaction: jest.fn(),
|
|
16
|
+
};
|
|
17
|
+
emit = jest.fn();
|
|
18
|
+
eventEmitter = {
|
|
19
|
+
emit,
|
|
20
|
+
};
|
|
21
|
+
service = new stale_active_task_execution_pruner_service_1.StaleActiveTaskExecutionPrunerService(dataSource, eventEmitter);
|
|
22
|
+
});
|
|
23
|
+
it('emits an interrupt request after pruning a stale execution', async () => {
|
|
24
|
+
const execution = {
|
|
25
|
+
id: 'execution-1',
|
|
26
|
+
taskId: 'task-1',
|
|
27
|
+
claimedAt: new Date('2026-04-30T10:00:00.000Z'),
|
|
28
|
+
taskStatusBeforeClaim: enums_1.TaskStatus.IN_PROGRESS,
|
|
29
|
+
taskTagsBeforeClaim: [],
|
|
30
|
+
taskAssigneeActorIdBeforeClaim: 'actor-1',
|
|
31
|
+
agentActorId: 'agent-1',
|
|
32
|
+
workerClientId: 'worker-1',
|
|
33
|
+
lastHeartbeatAt: null,
|
|
34
|
+
runnerSessionId: null,
|
|
35
|
+
toolCallCount: 0,
|
|
36
|
+
stats: null,
|
|
37
|
+
rowVersion: 1,
|
|
38
|
+
createdAt: new Date('2026-04-30T10:00:00.000Z'),
|
|
39
|
+
updatedAt: new Date('2026-04-30T10:00:00.000Z'),
|
|
40
|
+
deletedAt: null,
|
|
41
|
+
};
|
|
42
|
+
const task = {
|
|
43
|
+
id: 'task-1',
|
|
44
|
+
tags: [],
|
|
45
|
+
};
|
|
46
|
+
const manager = {
|
|
47
|
+
findOne: jest.fn()
|
|
48
|
+
.mockResolvedValueOnce(execution)
|
|
49
|
+
.mockResolvedValueOnce(task),
|
|
50
|
+
save: jest.fn(),
|
|
51
|
+
delete: jest.fn(),
|
|
52
|
+
create: jest.fn((_, value) => value),
|
|
53
|
+
};
|
|
54
|
+
dataSource.transaction.mockImplementation(async (callback) => callback(manager));
|
|
55
|
+
await expect(service.pruneExecutionById(execution.id)).resolves.toBe(true);
|
|
56
|
+
expect(manager.delete).toHaveBeenCalledWith(active_task_execution_entity_1.ActiveTaskExecutionEntity, {
|
|
57
|
+
id: execution.id,
|
|
58
|
+
});
|
|
59
|
+
expect(manager.save).toHaveBeenCalledWith(expect.any(Function), expect.objectContaining({
|
|
60
|
+
taskId: execution.taskId,
|
|
61
|
+
status: task_execution_history_status_enum_1.TaskExecutionHistoryStatus.STALE,
|
|
62
|
+
}));
|
|
63
|
+
expect(emit).toHaveBeenCalledWith(execution_interrupt_event_1.ExecutionInterruptEvent.INTERNAL, expect.objectContaining({
|
|
64
|
+
actor: { id: 'system' },
|
|
65
|
+
payload: {
|
|
66
|
+
executionId: execution.id,
|
|
67
|
+
workerClientId: execution.workerClientId,
|
|
68
|
+
},
|
|
69
|
+
}));
|
|
70
|
+
});
|
|
71
|
+
it('does not emit an interrupt request when no execution is pruned', async () => {
|
|
72
|
+
const manager = {
|
|
73
|
+
findOne: jest.fn().mockResolvedValue(null),
|
|
74
|
+
};
|
|
75
|
+
dataSource.transaction.mockImplementation(async (callback) => callback(manager));
|
|
76
|
+
await expect(service.pruneExecutionById('missing-execution')).resolves.toBe(false);
|
|
77
|
+
expect(emit).not.toHaveBeenCalled();
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
//# sourceMappingURL=stale-active-task-execution-pruner.service.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stale-active-task-execution-pruner.service.spec.js","sourceRoot":"","sources":["../../../src/executions/staleness/stale-active-task-execution-pruner.service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ let ExecutionStatsEntity = class ExecutionStatsEntity {
|
|
|
16
16
|
harness;
|
|
17
17
|
providerId;
|
|
18
18
|
modelId;
|
|
19
|
+
workerVersion;
|
|
19
20
|
inputTokens;
|
|
20
21
|
outputTokens;
|
|
21
22
|
totalTokens;
|
|
@@ -40,6 +41,10 @@ __decorate([
|
|
|
40
41
|
(0, typeorm_1.Column)({ type: 'text', name: 'model_id', nullable: true }),
|
|
41
42
|
__metadata("design:type", Object)
|
|
42
43
|
], ExecutionStatsEntity.prototype, "modelId", void 0);
|
|
44
|
+
__decorate([
|
|
45
|
+
(0, typeorm_1.Column)({ type: 'text', name: 'worker_version', nullable: true }),
|
|
46
|
+
__metadata("design:type", Object)
|
|
47
|
+
], ExecutionStatsEntity.prototype, "workerVersion", void 0);
|
|
43
48
|
__decorate([
|
|
44
49
|
(0, typeorm_1.Column)({ type: 'integer', name: 'input_tokens', nullable: true }),
|
|
45
50
|
__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-stats.entity.js","sourceRoot":"","sources":["../../../src/executions/stats/execution-stats.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAOiB;AAGV,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAE/B,WAAW,CAAU;IAGrB,OAAO,CAAiB;IAGxB,UAAU,CAAiB;IAG3B,OAAO,CAAiB;IAGxB,WAAW,CAAiB;IAG5B,YAAY,CAAiB;IAG7B,WAAW,CAAiB;IAG5B,UAAU,CAAU;IAGpB,SAAS,CAAQ;IAGjB,SAAS,CAAQ;CAClB,CAAA;
|
|
1
|
+
{"version":3,"file":"execution-stats.entity.js","sourceRoot":"","sources":["../../../src/executions/stats/execution-stats.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAOiB;AAGV,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAE/B,WAAW,CAAU;IAGrB,OAAO,CAAiB;IAGxB,UAAU,CAAiB;IAG3B,OAAO,CAAiB;IAGxB,aAAa,CAAiB;IAG9B,WAAW,CAAiB;IAG5B,YAAY,CAAiB;IAG7B,WAAW,CAAiB;IAG5B,UAAU,CAAU;IAGpB,SAAS,CAAQ;IAGjB,SAAS,CAAQ;CAClB,CAAA;AAjCY,oDAAoB;AAE/B;IADC,IAAA,uBAAa,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;;yDACjC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACjB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACnC;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACnC;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACnC;AAG9B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACtC;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACtC;AAG7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACtC;AAG5B;IADC,IAAA,uBAAa,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;;wDACnB;AAGpB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;8BAC/C,IAAI;uDAAC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;8BAC/C,IAAI;uDAAC;+BAhCN,oBAAoB;IADhC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;GACvB,oBAAoB,CAiChC"}
|
|
@@ -6,6 +6,16 @@ export type CreateUserInput = {
|
|
|
6
6
|
password: string;
|
|
7
7
|
introduction?: string;
|
|
8
8
|
};
|
|
9
|
+
export type CreateManagedUserInput = {
|
|
10
|
+
email: string;
|
|
11
|
+
role: UserRole;
|
|
12
|
+
};
|
|
13
|
+
export type SetupManagedUserInput = {
|
|
14
|
+
email: string;
|
|
15
|
+
displayName: string;
|
|
16
|
+
slug: string;
|
|
17
|
+
password: string;
|
|
18
|
+
};
|
|
9
19
|
export type UpdateUserRoleInput = {
|
|
10
20
|
role: UserRole;
|
|
11
21
|
};
|
|
@@ -1,17 +1,28 @@
|
|
|
1
1
|
import { Repository } from 'typeorm';
|
|
2
2
|
import { User } from './user.entity';
|
|
3
|
-
import { CreateUserInput, UpdateUserRoleInput } from './dto/service/identity-provider.service.types';
|
|
3
|
+
import { CreateUserInput, CreateManagedUserInput, SetupManagedUserInput, UpdateUserRoleInput } from './dto/service/identity-provider.service.types';
|
|
4
4
|
import { ActorService } from './actor.service';
|
|
5
5
|
import { ActorEntity } from './actor.entity';
|
|
6
6
|
export declare class IdentityProviderService {
|
|
7
7
|
private readonly userRepository;
|
|
8
8
|
private readonly actorService;
|
|
9
9
|
private logger;
|
|
10
|
+
private readonly pendingPasswordPrefix;
|
|
10
11
|
constructor(userRepository: Repository<User>, actorService: ActorService);
|
|
11
12
|
validateUser(email: string, password: string): Promise<{
|
|
12
13
|
user: User;
|
|
13
14
|
actor: ActorEntity;
|
|
14
15
|
}>;
|
|
16
|
+
isPasswordSetupPending(user: User): boolean;
|
|
17
|
+
listManagedUsers(): Promise<User[]>;
|
|
18
|
+
createManagedUser(input: CreateManagedUserInput): Promise<User>;
|
|
19
|
+
getManagedAccountSetupStatus(email: string): Promise<{
|
|
20
|
+
email: string;
|
|
21
|
+
canSetup: boolean;
|
|
22
|
+
}>;
|
|
23
|
+
setupManagedUser(input: SetupManagedUserInput): Promise<User>;
|
|
24
|
+
resetManagedUserPassword(userId: string): Promise<User>;
|
|
25
|
+
deactivateManagedUser(userId: string): Promise<User>;
|
|
15
26
|
getUserById(id: string): Promise<User | null>;
|
|
16
27
|
getUserByEmail(email: string): Promise<User | null>;
|
|
17
28
|
getUserByActorId(actorId: string): Promise<User | null>;
|
|
@@ -22,4 +33,6 @@ export declare class IdentityProviderService {
|
|
|
22
33
|
createFirstAdminUserIfNeeded(createUserInput: CreateUserInput): Promise<User | null>;
|
|
23
34
|
markWalkthroughSeen(userId: string): Promise<void>;
|
|
24
35
|
private hashPassword;
|
|
36
|
+
private createPendingPasswordHash;
|
|
37
|
+
private createAvailableSlug;
|
|
25
38
|
}
|