@overlordai/server 1.0.40 → 1.0.42
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/database/repositories/task.repository.d.ts +1 -0
- package/dist/database/repositories/task.repository.d.ts.map +1 -1
- package/dist/database/repositories/task.repository.js +5 -2
- package/dist/database/repositories/task.repository.js.map +1 -1
- package/dist/dispatcher/dispatcher.service.d.ts +5 -3
- package/dist/dispatcher/dispatcher.service.d.ts.map +1 -1
- package/dist/dispatcher/dispatcher.service.js +41 -0
- package/dist/dispatcher/dispatcher.service.js.map +1 -1
- package/dist/web/dashboard.service.d.ts +1 -0
- package/dist/web/dashboard.service.d.ts.map +1 -1
- package/dist/web/dashboard.service.js +21 -6
- package/dist/web/dashboard.service.js.map +1 -1
- package/dist/web/task.controller.d.ts +1 -1
- package/dist/web/worker-channel.gateway.d.ts +3 -1
- package/dist/web/worker-channel.gateway.d.ts.map +1 -1
- package/dist/web/worker-channel.gateway.js +8 -5
- package/dist/web/worker-channel.gateway.js.map +1 -1
- package/package.json +2 -2
- package/public/assets/AccessTokensPage-bSuzjk3Y.js +1 -0
- package/public/assets/{AdminPage-B8Yq8GnM.js → AdminPage-CWuaOv13.js} +1 -1
- package/public/assets/{ApiReferencePage-DZDCJQI4.js → ApiReferencePage-DzvO8t7S.js} +1 -1
- package/public/assets/{AuditLogPage-MoCRMzqP.js → AuditLogPage-DN8yUTwT.js} +1 -1
- package/public/assets/{BotManage-CVWwoYy3.js → BotManage-FsGWv-Cs.js} +1 -1
- package/public/assets/{CliReferencePage-DVB7E2Jv.js → CliReferencePage-Dr4YTU9I.js} +1 -1
- package/public/assets/{DeveloperManage-BtO-lkvD.js → DeveloperManage-NVw4KyvZ.js} +1 -1
- package/public/assets/{EditProjectPage-Bl2LyAeT.js → EditProjectPage-Ypprcu5c.js} +1 -1
- package/public/assets/{EmptyState-Bvs1SJo_.js → EmptyState-D_O928BP.js} +1 -1
- package/public/assets/HomePage-B2OxK5xj.js +1 -0
- package/public/assets/{LandingPage-COmKh2PR.js → LandingPage-BKxZn7u-.js} +1 -1
- package/public/assets/{LoginPage-DFIy5_AG.js → LoginPage-D1iYDj3x.js} +1 -1
- package/public/assets/MachineDetailPage-B8kl4br1.js +1 -0
- package/public/assets/MachineListPage-Cdhs5E6Q.js +6 -0
- package/public/assets/{NotFoundPage-BqLQpkaf.js → NotFoundPage-8NSuGh0w.js} +1 -1
- package/public/assets/{PipelineEditorPage-CyOhoLwR.js → PipelineEditorPage-Dvw7waws.js} +1 -1
- package/public/assets/{ProfilePage-D8UfMNDf.js → ProfilePage-fbqb6M9W.js} +1 -1
- package/public/assets/{ProjectDetailPage-8DxQkhBt.js → ProjectDetailPage-C8_CaJ4q.js} +1 -1
- package/public/assets/{ProjectListPage-Dwcp60o1.js → ProjectListPage-Bo9irGl7.js} +2 -2
- package/public/assets/{QuickAuth-CWpVD-8o.js → QuickAuth-BVu5F4-Z.js} +1 -1
- package/public/assets/{RemoveMemberConfirmDialog-DQ3dXuC6.js → RemoveMemberConfirmDialog-VXTWA_wn.js} +1 -1
- package/public/assets/{Select-GhXJ5uKF.js → Select-D1rjtzkM.js} +1 -1
- package/public/assets/{SettingsPage-DDsctH7X.js → SettingsPage-BYx5zcQ4.js} +1 -1
- package/public/assets/{Skeleton-CSAb9g25.js → Skeleton-JjetbQBe.js} +1 -1
- package/public/assets/{SkillPage-CtZTtfF8.js → SkillPage-W3D0XriB.js} +1 -1
- package/public/assets/{TaskDetailPage-CgT_txYn.js → TaskDetailPage-Cj8c16k5.js} +7 -7
- package/public/assets/TaskListPage-zOvt0-cZ.js +1 -0
- package/public/assets/{TaskStatusBadge-yxoaV45g.js → TaskStatusBadge-4uLJX_Vd.js} +1 -1
- package/public/assets/{TokenManage-DWk-4hAE.js → TokenManage-B8Ib-gxA.js} +1 -1
- package/public/assets/{TotpSetupPage-C3IixO0t.js → TotpSetupPage-DFyQKciF.js} +1 -1
- package/public/assets/{WorkerSetupGuidePage-CuXz1Cp5.js → WorkerSetupGuidePage-LUifUcBd.js} +1 -1
- package/public/assets/{arrow-left-tpTJv4kJ.js → arrow-left-CR5jvFjP.js} +1 -1
- package/public/assets/{arrow-right-DpePBWE7.js → arrow-right-Bo1TJaJG.js} +1 -1
- package/public/assets/{bot-BChGjdPm.js → bot-DxFLx72V.js} +1 -1
- package/public/assets/{chevron-right-B-JssgBf.js → chevron-right-VfZqXu3w.js} +1 -1
- package/public/assets/{copy-MDuQXvvx.js → copy-xV3w7rMd.js} +1 -1
- package/public/assets/{external-link-ExQuyXwZ.js → external-link-YMd0b2Hu.js} +1 -1
- package/public/assets/{index-CtAu_XZ5.js → index-_asV5ZlD.js} +3 -3
- package/public/assets/{key-Cix4k6UI.js → key-Bq5CCd4F.js} +1 -1
- package/public/assets/{loader-circle-COcLl-bl.js → loader-circle-B9QqvZqZ.js} +1 -1
- package/public/assets/{pencil-KZjOYmxG.js → pencil-DbvawD2W.js} +1 -1
- package/public/assets/{plus-B1SMCBOe.js → plus-DHhiUFNm.js} +1 -1
- package/public/assets/{rotate-ccw-DpBJ4jZw.js → rotate-ccw-Chvhmlkh.js} +1 -1
- package/public/assets/{scroll-text-CrlR_VG0.js → scroll-text-C6gAM7YD.js} +1 -1
- package/public/assets/{settings-H-4c0_mh.js → settings-B50SrjPV.js} +1 -1
- package/public/assets/{task.store-ATNoa4p7.js → task.store-DyE-1EPm.js} +1 -1
- package/public/assets/{trash-2-BzT2LBkf.js → trash-2-DFZZLvex.js} +1 -1
- package/public/assets/{users-BsLS_-Dg.js → users-CP0hBaq4.js} +1 -1
- package/public/index.html +1 -1
- package/public/assets/AccessTokensPage-DuICKFJy.js +0 -1
- package/public/assets/HomePage-BSubk1iR.js +0 -1
- package/public/assets/MachineDetailPage-BLOhWYiw.js +0 -1
- package/public/assets/MachineListPage-CIqrEM7O.js +0 -6
- package/public/assets/TaskListPage-D_tZ75c7.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.repository.d.ts","sourceRoot":"","sources":["../../../src/database/repositories/task.repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACJ,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG;IAChC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"task.repository.d.ts","sourceRoot":"","sources":["../../../src/database/repositories/task.repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACJ,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG;IAChC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAyDF,qBACa,cAAc;IACb,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,eAAe;IAEvC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAQjC,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAQnD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAazD,MAAM,CAAC,IAAI,EAAE;QACX,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI;IA+BR,YAAY,CACV,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO;IAuCV,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE;IAW5C,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE;IAqBnE,aAAa,CAAC,KAAK,EAAE;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,UAAU,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,eAAe,CAAC,YAAY,CAAC;IAuDjC,WAAW,CACT,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,UAAU,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GACA,eAAe,CAAC,YAAY,CAAC;IAuDhC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAW/C,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAQrC,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAWnD,WAAW,IAAI,MAAM;CAUtB"}
|
|
@@ -61,6 +61,7 @@ function mapEnrichedRow(row) {
|
|
|
61
61
|
...mapRow(row),
|
|
62
62
|
creatorName: row.creator_name ?? null,
|
|
63
63
|
machineName: row.machine_name ?? null,
|
|
64
|
+
developerName: row.developer_name ?? null,
|
|
64
65
|
};
|
|
65
66
|
}
|
|
66
67
|
let TaskRepository = class TaskRepository {
|
|
@@ -202,9 +203,10 @@ let TaskRepository = class TaskRepository {
|
|
|
202
203
|
const where = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
|
|
203
204
|
const rows = this.db
|
|
204
205
|
.getDb()
|
|
205
|
-
.prepare(`SELECT t.*, d.name AS creator_name, m.name AS machine_name
|
|
206
|
+
.prepare(`SELECT t.*, d.name AS creator_name, m.name AS machine_name, assignee.name AS developer_name
|
|
206
207
|
FROM tasks t
|
|
207
208
|
LEFT JOIN developers d ON t.created_by = d.id
|
|
209
|
+
LEFT JOIN developers assignee ON t.developer_id = assignee.id
|
|
208
210
|
LEFT JOIN machines m ON t.machine_id = m.id
|
|
209
211
|
${where} ORDER BY t.id DESC LIMIT ?`)
|
|
210
212
|
.all(...params, limit + 1);
|
|
@@ -240,9 +242,10 @@ let TaskRepository = class TaskRepository {
|
|
|
240
242
|
const where = `WHERE ${conditions.join(' AND ')}`;
|
|
241
243
|
const rows = this.db
|
|
242
244
|
.getDb()
|
|
243
|
-
.prepare(`SELECT t.*, d.name AS creator_name, m.name AS machine_name
|
|
245
|
+
.prepare(`SELECT t.*, d.name AS creator_name, m.name AS machine_name, assignee.name AS developer_name
|
|
244
246
|
FROM tasks t
|
|
245
247
|
LEFT JOIN developers d ON t.created_by = d.id
|
|
248
|
+
LEFT JOIN developers assignee ON t.developer_id = assignee.id
|
|
246
249
|
LEFT JOIN machines m ON t.machine_id = m.id
|
|
247
250
|
${where} ORDER BY t.id DESC LIMIT ?`)
|
|
248
251
|
.all(...params, limit + 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.repository.js","sourceRoot":"","sources":["../../../src/database/repositories/task.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAK5C,mDAAkD;AAClD,0DAAsD;
|
|
1
|
+
{"version":3,"file":"task.repository.js","sourceRoot":"","sources":["../../../src/database/repositories/task.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Command, Task, PaginatedResult, CreateTaskRequest, WorkerRegisterRequest, WorkerRegisterResponse, WorkerRefreshRequest, WorkerRefreshResponse, WorkerRecoveryRequest, WorkerRecoveryResponse, TaskListQuery } from '@overlordai/protocol';
|
|
2
|
-
import {
|
|
2
|
+
import { TaskStatus } from '@overlordai/protocol';
|
|
3
|
+
import { TaskRepository, type EnrichedTask } from '../database/repositories/task.repository';
|
|
3
4
|
import { MachineRepository } from '../database/repositories/machine.repository';
|
|
4
5
|
import { ProjectRepository } from '../database/repositories/project.repository';
|
|
5
6
|
import { ProjectMemberRepository } from '../database/repositories/project-member.repository';
|
|
@@ -59,12 +60,13 @@ export declare class DispatcherService {
|
|
|
59
60
|
createTask(request: CreateTaskRequest, createdBy: number, source?: TaskSource): Promise<Task>;
|
|
60
61
|
private createTaskInternal;
|
|
61
62
|
cancelTask(taskId: number, cancelledBy: number): Promise<void>;
|
|
63
|
+
markTaskTerminalFromWorker(taskId: number, targetStatus: TaskStatus.FAILED | TaskStatus.CANCELLED, errorMessage?: string): boolean;
|
|
62
64
|
retryTask(taskId: number, retriedBy: number): Promise<Task>;
|
|
63
65
|
private executeRetry;
|
|
64
66
|
confirmStage(taskId: number, stageIndex: number, result: string): Promise<void>;
|
|
65
67
|
getTask(taskId: number): Task | null;
|
|
66
|
-
listTasks(query: TaskListQuery): PaginatedResult<
|
|
67
|
-
listVisibleTasks(developerId: number, query: TaskListQuery): PaginatedResult<
|
|
68
|
+
listTasks(query: TaskListQuery): PaginatedResult<EnrichedTask>;
|
|
69
|
+
listVisibleTasks(developerId: number, query: TaskListQuery): PaginatedResult<EnrichedTask>;
|
|
68
70
|
registerWorker(request: WorkerRegisterRequest): Promise<WorkerRegisterResponse>;
|
|
69
71
|
refreshWorkerToken(request: WorkerRefreshRequest, currentJwt: {
|
|
70
72
|
sub: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.service.d.ts","sourceRoot":"","sources":["../../src/dispatcher/dispatcher.service.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,OAAO,EACP,IAAI,EAEJ,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,aAAa,EAEd,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatcher.service.d.ts","sourceRoot":"","sources":["../../src/dispatcher/dispatcher.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -467,6 +467,47 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
467
467
|
this.logger.log(`Task #${taskId} cancelled by developer #${cancelledBy}`);
|
|
468
468
|
}
|
|
469
469
|
// ---------------------------------------------------------------------------
|
|
470
|
+
// markTaskTerminalFromWorker — called by gateway when worker reports failure/cancel
|
|
471
|
+
// ---------------------------------------------------------------------------
|
|
472
|
+
markTaskTerminalFromWorker(taskId, targetStatus, errorMessage) {
|
|
473
|
+
const task = this.taskRepo.findById(taskId);
|
|
474
|
+
if (!task)
|
|
475
|
+
return false;
|
|
476
|
+
// Already in target or other terminal status — nothing to do
|
|
477
|
+
if (state_machine_1.TaskStateMachine.isTerminal(task.status))
|
|
478
|
+
return false;
|
|
479
|
+
// Validate transition is legal
|
|
480
|
+
if (!state_machine_1.TaskStateMachine.canTransition(task.status, targetStatus)) {
|
|
481
|
+
this.logger.warn(`Cannot transition task #${taskId} from ${task.status} to ${targetStatus} via worker progress`);
|
|
482
|
+
return false;
|
|
483
|
+
}
|
|
484
|
+
const extra = {
|
|
485
|
+
completedAt: new Date().toISOString(),
|
|
486
|
+
};
|
|
487
|
+
if (errorMessage)
|
|
488
|
+
extra.errorMessage = errorMessage;
|
|
489
|
+
const updated = this.updateTaskStatusWithRetry(taskId, targetStatus, task.revision, extra);
|
|
490
|
+
if (updated) {
|
|
491
|
+
// Schedule workspace cleanup
|
|
492
|
+
if (task.machineId) {
|
|
493
|
+
const workspace = this.workspaceRepo.findByTaskId(taskId);
|
|
494
|
+
if (workspace) {
|
|
495
|
+
this.cleanupService
|
|
496
|
+
.scheduleCleanup(taskId, task.machineId, workspace.path)
|
|
497
|
+
.catch((err) => {
|
|
498
|
+
this.logger.error(`Failed to schedule cleanup for task #${taskId}: ${err instanceof Error ? err.message : String(err)}`);
|
|
499
|
+
});
|
|
500
|
+
}
|
|
501
|
+
}
|
|
502
|
+
this.auditLogRepo.create({
|
|
503
|
+
action: `task_${targetStatus.toLowerCase()}_from_worker`,
|
|
504
|
+
resource: `task:${taskId}`,
|
|
505
|
+
detail: `Task marked ${targetStatus} via worker progress frame`,
|
|
506
|
+
});
|
|
507
|
+
}
|
|
508
|
+
return updated;
|
|
509
|
+
}
|
|
510
|
+
// ---------------------------------------------------------------------------
|
|
470
511
|
// retryTask
|
|
471
512
|
// ---------------------------------------------------------------------------
|
|
472
513
|
async retryTask(taskId, retriedBy) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.service.js","sourceRoot":"","sources":["../../src/dispatcher/dispatcher.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dispatcher.service.js","sourceRoot":"","sources":["../../src/dispatcher/dispatcher.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { DatabaseService } from '../database/database.service';
|
|
|
4
4
|
export interface EnrichedRecentTask extends Task {
|
|
5
5
|
creatorName: string | null;
|
|
6
6
|
machineName: string | null;
|
|
7
|
+
developerName: string | null;
|
|
7
8
|
}
|
|
8
9
|
export interface DashboardStats {
|
|
9
10
|
active_tasks: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.service.d.ts","sourceRoot":"","sources":["../../src/web/dashboard.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,eAAe,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,WAAW,kBAAmB,SAAQ,IAAI;IAC9C,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"dashboard.service.d.ts","sourceRoot":"","sources":["../../src/web/dashboard.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,eAAe,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,WAAW,kBAAmB,SAAQ,IAAI;IAC9C,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,WAAW,EAAE,KAAK,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;CACJ;AAsCD,qBACa,gBAAiB,YAAW,YAAY,EAAE,eAAe;IAMxD,OAAO,CAAC,QAAQ,CAAC,EAAE;IAL/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,YAAY,CAAkB;gBAET,EAAE,EAAE,eAAe;IAEhD,YAAY,IAAI,IAAI;IAYpB,eAAe,IAAI,IAAI;IAIvB,QAAQ,IAAI,cAAc;IAI1B,cAAc,CAAC,KAAK,SAAK,GAAG,kBAAkB,EAAE;IAIhD,qBAAqB,CACnB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAAE,GAC9B,kBAAkB,EAAE;IA0BvB,iBAAiB,CAAC,KAAK,SAAK,GAAG,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IA6BxF,YAAY,IAAI,IAAI;IAwKpB,OAAO,CAAC,YAAY;CAcrB"}
|
|
@@ -46,6 +46,7 @@ function mapEnrichedTaskRow(row) {
|
|
|
46
46
|
updatedAt: row.updated_at,
|
|
47
47
|
creatorName: row.creator_name ?? null,
|
|
48
48
|
machineName: row.machine_name ?? null,
|
|
49
|
+
developerName: row.developer_name ?? null,
|
|
49
50
|
};
|
|
50
51
|
}
|
|
51
52
|
let DashboardService = DashboardService_1 = class DashboardService {
|
|
@@ -76,11 +77,24 @@ let DashboardService = DashboardService_1 = class DashboardService {
|
|
|
76
77
|
return this.recentTasks.slice(0, limit);
|
|
77
78
|
}
|
|
78
79
|
getRecentTasksForUser(limit, developerId, maintainerProjectKeys) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
t.
|
|
82
|
-
|
|
83
|
-
|
|
80
|
+
const database = this.db.getDb();
|
|
81
|
+
const conditions = [
|
|
82
|
+
`(t.created_by = ? OR t.developer_id = ?${maintainerProjectKeys.length > 0
|
|
83
|
+
? ` OR t.project_key IN (${maintainerProjectKeys.map(() => '?').join(',')})`
|
|
84
|
+
: ''})`,
|
|
85
|
+
];
|
|
86
|
+
const params = [developerId, developerId, ...maintainerProjectKeys];
|
|
87
|
+
const where = `WHERE ${conditions.join(' AND ')}`;
|
|
88
|
+
const rows = database
|
|
89
|
+
.prepare(`SELECT t.*, d.name AS creator_name, m.name AS machine_name, assignee.name AS developer_name
|
|
90
|
+
FROM tasks t
|
|
91
|
+
LEFT JOIN developers d ON t.created_by = d.id
|
|
92
|
+
LEFT JOIN developers assignee ON t.developer_id = assignee.id
|
|
93
|
+
LEFT JOIN machines m ON t.machine_id = m.id
|
|
94
|
+
${where}
|
|
95
|
+
ORDER BY t.updated_at DESC LIMIT ?`)
|
|
96
|
+
.all(...params, limit);
|
|
97
|
+
return rows.map(mapEnrichedTaskRow);
|
|
84
98
|
}
|
|
85
99
|
getRecentActivity(limit = 20) {
|
|
86
100
|
try {
|
|
@@ -198,9 +212,10 @@ let DashboardService = DashboardService_1 = class DashboardService {
|
|
|
198
212
|
}));
|
|
199
213
|
// Recent tasks (enriched with creator and machine names)
|
|
200
214
|
const recentRows = database
|
|
201
|
-
.prepare(`SELECT t.*, d.name AS creator_name, m.name AS machine_name
|
|
215
|
+
.prepare(`SELECT t.*, d.name AS creator_name, m.name AS machine_name, assignee.name AS developer_name
|
|
202
216
|
FROM tasks t
|
|
203
217
|
LEFT JOIN developers d ON t.created_by = d.id
|
|
218
|
+
LEFT JOIN developers assignee ON t.developer_id = assignee.id
|
|
204
219
|
LEFT JOIN machines m ON t.machine_id = m.id
|
|
205
220
|
ORDER BY t.updated_at DESC LIMIT 10`)
|
|
206
221
|
.all();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.service.js","sourceRoot":"","sources":["../../src/web/dashboard.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAKwB;AAExB,mDAAkD;AAClD,mEAA+D;
|
|
1
|
+
{"version":3,"file":"dashboard.service.js","sourceRoot":"","sources":["../../src/web/dashboard.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export declare class TaskController {
|
|
|
26
26
|
* - user is a maintainer of the task's project
|
|
27
27
|
*/
|
|
28
28
|
private assertTaskAccess;
|
|
29
|
-
listTasks(req: AuthenticatedRequest, limit?: string, cursor?: string, status?: string, projectKey?: string): import("@overlordai/protocol").PaginatedResult<
|
|
29
|
+
listTasks(req: AuthenticatedRequest, limit?: string, cursor?: string, status?: string, projectKey?: string): import("@overlordai/protocol").PaginatedResult<import("../database/repositories/task.repository").EnrichedTask>;
|
|
30
30
|
getTaskEvents(req: AuthenticatedRequest, id: number, limit?: string, offset?: string, type?: string, search?: string): {
|
|
31
31
|
events: Array<{
|
|
32
32
|
id: number;
|
|
@@ -5,6 +5,7 @@ import { AuthService } from '../auth/auth.service';
|
|
|
5
5
|
import { WorkerConnectionManager } from '../dispatcher/worker-connection.manager';
|
|
6
6
|
import { HeartbeatService } from '../dispatcher/heartbeat.service';
|
|
7
7
|
import { Reconciler } from '../dispatcher/reconciler';
|
|
8
|
+
import { DispatcherService } from '../dispatcher/dispatcher.service';
|
|
8
9
|
import { TaskLogBatcher } from '../dispatcher/task-log-batcher';
|
|
9
10
|
import { DedupService } from '../dispatcher/dedup.service';
|
|
10
11
|
import { MachineRepository } from '../database/repositories/machine.repository';
|
|
@@ -16,6 +17,7 @@ export declare class WorkerChannelGateway implements OnGatewayConnection, OnGate
|
|
|
16
17
|
private readonly workerConnectionManager;
|
|
17
18
|
private readonly heartbeatService;
|
|
18
19
|
private readonly reconciler;
|
|
20
|
+
private readonly dispatcher;
|
|
19
21
|
private readonly taskLogBatcher;
|
|
20
22
|
private readonly dedupService;
|
|
21
23
|
private readonly machineRepo;
|
|
@@ -25,7 +27,7 @@ export declare class WorkerChannelGateway implements OnGatewayConnection, OnGate
|
|
|
25
27
|
private readonly logger;
|
|
26
28
|
private readonly authedSockets;
|
|
27
29
|
private readonly AUTH_TIMEOUT_MS;
|
|
28
|
-
constructor(authService: AuthService, workerConnectionManager: WorkerConnectionManager, heartbeatService: HeartbeatService, reconciler: Reconciler, taskLogBatcher: TaskLogBatcher, dedupService: DedupService, machineRepo: MachineRepository, taskRepo: TaskRepository, workerTokenRepo: WorkerTokenRepository, notifierService: NotifierService);
|
|
30
|
+
constructor(authService: AuthService, workerConnectionManager: WorkerConnectionManager, heartbeatService: HeartbeatService, reconciler: Reconciler, dispatcher: DispatcherService, taskLogBatcher: TaskLogBatcher, dedupService: DedupService, machineRepo: MachineRepository, taskRepo: TaskRepository, workerTokenRepo: WorkerTokenRepository, notifierService: NotifierService);
|
|
29
31
|
handleConnection(client: WebSocket, _req: IncomingMessage): void;
|
|
30
32
|
handleDisconnect(client: WebSocket): void;
|
|
31
33
|
private handleAuth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-channel.gateway.d.ts","sourceRoot":"","sources":["../../src/web/worker-channel.gateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAqB/B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAW/D,qBACa,oBACX,YAAW,mBAAmB,EAAE,mBAAmB;IAOjD,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;
|
|
1
|
+
{"version":3,"file":"worker-channel.gateway.d.ts","sourceRoot":"","sources":["../../src/web/worker-channel.gateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAqB/B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAW/D,qBACa,oBACX,YAAW,mBAAmB,EAAE,mBAAmB;IAOjD,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAflC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6C;IAC3E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAGvB,WAAW,EAAE,WAAW,EACxB,uBAAuB,EAAE,uBAAuB,EAChD,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,iBAAiB,EAC9B,QAAQ,EAAE,cAAc,EACxB,eAAe,EAAE,qBAAqB,EACtC,eAAe,EAAE,eAAe;IAGnD,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI;IAsEhE,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAUzC,OAAO,CAAC,UAAU;IAuElB,OAAO,CAAC,eAAe;IA8BvB,OAAO,CAAC,SAAS;YAIH,eAAe;IAe7B,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,uBAAuB;YASjB,yBAAyB;IAmCvC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;CA6C5B"}
|
|
@@ -19,6 +19,7 @@ const auth_service_1 = require("../auth/auth.service");
|
|
|
19
19
|
const worker_connection_manager_1 = require("../dispatcher/worker-connection.manager");
|
|
20
20
|
const heartbeat_service_1 = require("../dispatcher/heartbeat.service");
|
|
21
21
|
const reconciler_1 = require("../dispatcher/reconciler");
|
|
22
|
+
const dispatcher_service_1 = require("../dispatcher/dispatcher.service");
|
|
22
23
|
const task_log_batcher_1 = require("../dispatcher/task-log-batcher");
|
|
23
24
|
const dedup_service_1 = require("../dispatcher/dedup.service");
|
|
24
25
|
const machine_repository_1 = require("../database/repositories/machine.repository");
|
|
@@ -31,6 +32,7 @@ let WorkerChannelGateway = WorkerChannelGateway_1 = class WorkerChannelGateway {
|
|
|
31
32
|
workerConnectionManager;
|
|
32
33
|
heartbeatService;
|
|
33
34
|
reconciler;
|
|
35
|
+
dispatcher;
|
|
34
36
|
taskLogBatcher;
|
|
35
37
|
dedupService;
|
|
36
38
|
machineRepo;
|
|
@@ -40,11 +42,12 @@ let WorkerChannelGateway = WorkerChannelGateway_1 = class WorkerChannelGateway {
|
|
|
40
42
|
logger = new common_1.Logger(WorkerChannelGateway_1.name);
|
|
41
43
|
authedSockets = new Map();
|
|
42
44
|
AUTH_TIMEOUT_MS = 10_000;
|
|
43
|
-
constructor(authService, workerConnectionManager, heartbeatService, reconciler, taskLogBatcher, dedupService, machineRepo, taskRepo, workerTokenRepo, notifierService) {
|
|
45
|
+
constructor(authService, workerConnectionManager, heartbeatService, reconciler, dispatcher, taskLogBatcher, dedupService, machineRepo, taskRepo, workerTokenRepo, notifierService) {
|
|
44
46
|
this.authService = authService;
|
|
45
47
|
this.workerConnectionManager = workerConnectionManager;
|
|
46
48
|
this.heartbeatService = heartbeatService;
|
|
47
49
|
this.reconciler = reconciler;
|
|
50
|
+
this.dispatcher = dispatcher;
|
|
48
51
|
this.taskLogBatcher = taskLogBatcher;
|
|
49
52
|
this.dedupService = dedupService;
|
|
50
53
|
this.machineRepo = machineRepo;
|
|
@@ -205,10 +208,9 @@ let WorkerChannelGateway = WorkerChannelGateway_1 = class WorkerChannelGateway {
|
|
|
205
208
|
this.taskLogBatcher.add(frame.taskId, protocol_2.TaskLogType.STAGE_CHANGE, `Stage: ${frame.stage} - ${frame.status}${frame.message ? `: ${frame.message}` : ''}`);
|
|
206
209
|
// Transition task status when worker reports terminal states
|
|
207
210
|
if (frame.status === 'failed' || frame.status === 'cancelled') {
|
|
208
|
-
const
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
this.taskRepo.updateStatus(frame.taskId, targetStatus, task.revision);
|
|
211
|
+
const targetStatus = frame.status === 'failed' ? protocol_1.TaskStatus.FAILED : protocol_1.TaskStatus.CANCELLED;
|
|
212
|
+
const updated = this.dispatcher.markTaskTerminalFromWorker(frame.taskId, targetStatus, frame.message);
|
|
213
|
+
if (updated) {
|
|
212
214
|
this.logger.log(`Task #${frame.taskId} marked ${frame.status} via progress frame`);
|
|
213
215
|
}
|
|
214
216
|
}
|
|
@@ -282,6 +284,7 @@ exports.WorkerChannelGateway = WorkerChannelGateway = WorkerChannelGateway_1 = _
|
|
|
282
284
|
worker_connection_manager_1.WorkerConnectionManager,
|
|
283
285
|
heartbeat_service_1.HeartbeatService,
|
|
284
286
|
reconciler_1.Reconciler,
|
|
287
|
+
dispatcher_service_1.DispatcherService,
|
|
285
288
|
task_log_batcher_1.TaskLogBatcher,
|
|
286
289
|
dedup_service_1.DedupService,
|
|
287
290
|
machine_repository_1.MachineRepository,
|