@overlordai/server 1.0.142 → 1.0.143
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/database/migrations/012-schema-index-fixes.sql +1 -0
- package/database/migrations/013-review-status.sql +8 -0
- package/dist/adapters/command-parser.utils.d.ts +26 -1
- package/dist/adapters/command-parser.utils.d.ts.map +1 -1
- package/dist/adapters/command-parser.utils.js +112 -26
- package/dist/adapters/command-parser.utils.js.map +1 -1
- package/dist/adapters/help-text.d.ts.map +1 -1
- package/dist/adapters/help-text.js +5 -1
- package/dist/adapters/help-text.js.map +1 -1
- package/dist/adapters/lark/lark-message.parser.d.ts.map +1 -1
- package/dist/adapters/lark/lark-message.parser.js +3 -1
- package/dist/adapters/lark/lark-message.parser.js.map +1 -1
- package/dist/adapters/lark/lark.adapter.d.ts.map +1 -1
- package/dist/adapters/lark/lark.adapter.js +46 -9
- package/dist/adapters/lark/lark.adapter.js.map +1 -1
- package/dist/adapters/nlu-fallback.utils.d.ts +27 -0
- package/dist/adapters/nlu-fallback.utils.d.ts.map +1 -0
- package/dist/adapters/nlu-fallback.utils.js +57 -0
- package/dist/adapters/nlu-fallback.utils.js.map +1 -0
- package/dist/adapters/nlu.service.d.ts.map +1 -1
- package/dist/adapters/nlu.service.js +22 -6
- package/dist/adapters/nlu.service.js.map +1 -1
- package/dist/adapters/slack/slack-message.parser.d.ts.map +1 -1
- package/dist/adapters/slack/slack-message.parser.js +3 -1
- package/dist/adapters/slack/slack-message.parser.js.map +1 -1
- package/dist/adapters/slack/slack.adapter.d.ts.map +1 -1
- package/dist/adapters/slack/slack.adapter.js +31 -6
- package/dist/adapters/slack/slack.adapter.js.map +1 -1
- package/dist/database/repositories/project-member.repository.js +4 -4
- package/dist/database/repositories/project-member.repository.js.map +1 -1
- package/dist/database/repositories/project.repository.d.ts.map +1 -1
- package/dist/database/repositories/project.repository.js +9 -7
- package/dist/database/repositories/project.repository.js.map +1 -1
- package/dist/database/repositories/task.repository.d.ts +18 -0
- package/dist/database/repositories/task.repository.d.ts.map +1 -1
- package/dist/database/repositories/task.repository.js +104 -58
- package/dist/database/repositories/task.repository.js.map +1 -1
- package/dist/dispatcher/dispatcher.service.d.ts +24 -1
- package/dist/dispatcher/dispatcher.service.d.ts.map +1 -1
- package/dist/dispatcher/dispatcher.service.js +124 -113
- package/dist/dispatcher/dispatcher.service.js.map +1 -1
- package/dist/notifier/notification-consumer.d.ts.map +1 -1
- package/dist/notifier/notification-consumer.js +14 -9
- package/dist/notifier/notification-consumer.js.map +1 -1
- package/dist/web/frame-handlers/review-report.handler.d.ts.map +1 -1
- package/dist/web/frame-handlers/review-report.handler.js +15 -0
- package/dist/web/frame-handlers/review-report.handler.js.map +1 -1
- package/dist/web/task.controller.d.ts +11 -1
- package/dist/web/task.controller.d.ts.map +1 -1
- package/dist/web/task.controller.js +51 -6
- package/dist/web/task.controller.js.map +1 -1
- package/package.json +4 -4
- package/public/assets/{AccessTokensPage-DsNgVUdv.js → AccessTokensPage-BSxprw7x.js} +1 -1
- package/public/assets/{AdminPage-NZC6yOHW.js → AdminPage-CxHMuTgJ.js} +1 -1
- package/public/assets/{AgentCliPage-Bp8tQiWl.js → AgentCliPage-DxZUrhjz.js} +1 -1
- package/public/assets/{ApiReferencePage-DXNSPdww.js → ApiReferencePage-Cc_-lPFn.js} +1 -1
- package/public/assets/{ArchitecturePage-DFUNHKTN.js → ArchitecturePage-CpXl4jb3.js} +1 -1
- package/public/assets/{AuditLogPage-Wtpr8CDi.js → AuditLogPage-CvG7Kmpn.js} +1 -1
- package/public/assets/{BindPlatformPage-Bp_NG22g.js → BindPlatformPage-DQEP-N9z.js} +1 -1
- package/public/assets/{BotIntegrationPage-DuH_f_mp.js → BotIntegrationPage-DP1ipK65.js} +1 -1
- package/public/assets/{BotManage-CJ5GZ0HR.js → BotManage-B1lkaWlW.js} +1 -1
- package/public/assets/{BotSetupPage-Ct_gjzJt.js → BotSetupPage-kJHd4z6w.js} +1 -1
- package/public/assets/{ChangelogPage-DrpgpyjK.js → ChangelogPage-QheUxtEJ.js} +1 -1
- package/public/assets/{CliReferencePage-BiUl0LtI.js → CliReferencePage-Dy78S9h1.js} +1 -1
- package/public/assets/{ConfirmStageDialog-BsoAtSes.js → ConfirmStageDialog-rt45LR8Q.js} +4 -4
- package/public/assets/{DeploymentPage-DtlH8d7p.js → DeploymentPage-CaIslw2W.js} +1 -1
- package/public/assets/{DevWorkflowPage-BoZm03L7.js → DevWorkflowPage-DjmFkvCo.js} +1 -1
- package/public/assets/{DeveloperManage-hoNX7J5P.js → DeveloperManage-Ab6SdQEz.js} +1 -1
- package/public/assets/{DeveloperSetupPage-D3FDp-R7.js → DeveloperSetupPage-D3RvWqx0.js} +1 -1
- package/public/assets/{DocsIndexPage-ZBDBTreg.js → DocsIndexPage-BHnvOEn8.js} +1 -1
- package/public/assets/{DocsLayout-CX3AKUlL.js → DocsLayout-BdWlFJ_G.js} +1 -1
- package/public/assets/{DocsPrimitives-B3qhkVFu.js → DocsPrimitives-BRoBpWHe.js} +1 -1
- package/public/assets/{EditProjectPage-DKaSpnod.js → EditProjectPage-CepF7mnT.js} +2 -2
- package/public/assets/{EmptyState-BKUHLcAb.js → EmptyState-BIXXLer_.js} +1 -1
- package/public/assets/{EnvVariablesPage-C2nu-wxe.js → EnvVariablesPage-DxRT4ql6.js} +1 -1
- package/public/assets/HomePage-CkiXfp2H.js +1 -0
- package/public/assets/{InfoRow-CBKDMEtd.js → InfoRow-DXCzjoGj.js} +1 -1
- package/public/assets/{InstallationPage-0TO7IQzJ.js → InstallationPage-CF8j4Y-C.js} +1 -1
- package/public/assets/{LandingPage-YcgE-OTL.js → LandingPage-CaYr_-RD.js} +1 -1
- package/public/assets/{LocalDevelopmentPage-BDpTHWAo.js → LocalDevelopmentPage-HIFhYvHJ.js} +1 -1
- package/public/assets/{LoginPage-F34Kt4ot.js → LoginPage-D17Mq8Qe.js} +1 -1
- package/public/assets/{MetricBar-xV1juDz6.js → MetricBar-DDJWywkw.js} +1 -1
- package/public/assets/{NotFoundPage-DPZDwk1M.js → NotFoundPage-BTlUFX7F.js} +1 -1
- package/public/assets/{OnboardingGuide-C8QTC3cZ.js → OnboardingGuide-CTJYul4_.js} +1 -1
- package/public/assets/{PermissionsPage-DsNmsUoe.js → PermissionsPage-Dj27JR_m.js} +1 -1
- package/public/assets/PipelineConfigPage-BTy8cOFI.js +22 -0
- package/public/assets/{PipelineEditorPage-18u7wxjE.js → PipelineEditorPage-CuSW0B-0.js} +2 -2
- package/public/assets/PlanPage-CMQs2Hiz.js +1 -0
- package/public/assets/{ProfilePage-D3YRdW9C.js → ProfilePage-BRxrQCQd.js} +1 -1
- package/public/assets/ProjectDetailPage-CRHNrgPt.js +7 -0
- package/public/assets/{ProjectListPage-D62NmkBp.js → ProjectListPage-QM4505IY.js} +2 -2
- package/public/assets/{PtyTerminal-B3lRN-u1.js → PtyTerminal-BxD1WFmu.js} +1 -1
- package/public/assets/{QuickAuth-DzYrNwL-.js → QuickAuth-Dx-LoUjm.js} +1 -1
- package/public/assets/{RemoveMemberConfirmDialog-svHE4uU4.js → RemoveMemberConfirmDialog-pg5SnIU8.js} +1 -1
- package/public/assets/{ReviewAggregatePage-Dq3hl9db.js → ReviewAggregatePage-DHUyVVeT.js} +2 -2
- package/public/assets/ReviewPage-DzNkeQXP.js +1 -0
- package/public/assets/{Select-BMBYwPr-.js → Select-DYnPuPlP.js} +1 -1
- package/public/assets/{SettingsPage-Ml3L-j5R.js → SettingsPage-YpqaOT8x.js} +1 -1
- package/public/assets/{Skeleton-9LGrFcdv.js → Skeleton-tFvClhRo.js} +1 -1
- package/public/assets/{SkillPage-BGYJMqPr.js → SkillPage-BQto2TJm.js} +1 -1
- package/public/assets/TaskDetailPage-BAnCb9zv.js +21 -0
- package/public/assets/{TaskGuidePage-CKnugDRu.js → TaskGuidePage-Bs-Unzck.js} +1 -1
- package/public/assets/TaskListPage-CL98Ev5l.js +1 -0
- package/public/assets/{TaskStatusBadge-B_S_xjEI.js → TaskStatusBadge-BUczBM5S.js} +1 -1
- package/public/assets/TerminalHomePage-CgZYHN7Y.js +6 -0
- package/public/assets/{TokenManage-BqOEJDHV.js → TokenManage-BU8KbNvZ.js} +1 -1
- package/public/assets/{Tooltip-BFj-n88a.js → Tooltip-BTMAbLUj.js} +1 -1
- package/public/assets/{TotpSetupPage-CI411-Y7.js → TotpSetupPage-B9IghCSA.js} +1 -1
- package/public/assets/WorkerDetailPage-D0Vz2Z_J.js +1 -0
- package/public/assets/{WorkerListPage-nPKvREXn.js → WorkerListPage-B4aOYXSX.js} +2 -2
- package/public/assets/{WorkerOperationsPage-qgdLSK1X.js → WorkerOperationsPage-Du5dUuwe.js} +1 -1
- package/public/assets/{WorkerSetupGuidePage-DHbju_7j.js → WorkerSetupGuidePage-Chgd3lOw.js} +1 -1
- package/public/assets/{WorkerSetupPage-D0Cob5nl.js → WorkerSetupPage-DOy5dzpL.js} +1 -1
- package/public/assets/{agent-type-options-CdJpMswW.js → agent-type-options-DYVQzNPE.js} +1 -1
- package/public/assets/{arrow-left-BOJ_pZwC.js → arrow-left-BmJhqQxJ.js} +1 -1
- package/public/assets/{arrow-right-GWPYDcKr.js → arrow-right-za11FMwb.js} +1 -1
- package/public/assets/{bot-DZ_48uoa.js → bot-BREu_dZH.js} +1 -1
- package/public/assets/{chevron-down-DiFQzkq3.js → chevron-down-pInOI1Sz.js} +1 -1
- package/public/assets/{chevron-left-PB0m_3-R.js → chevron-left-9sE-mZhp.js} +1 -1
- package/public/assets/{chevron-right-Bsbm1nYp.js → chevron-right-BTVDsZF2.js} +1 -1
- package/public/assets/{chevron-up-CvYNL872.js → chevron-up-7pQBLB6e.js} +1 -1
- package/public/assets/{copy-DR5cQtVj.js → copy-Ciibu4ij.js} +1 -1
- package/public/assets/{download-FpaVrNQK.js → download-C5M-xVQE.js} +1 -1
- package/public/assets/{external-link-CiQhHCsl.js → external-link-DXCE8f-2.js} +1 -1
- package/public/assets/{file-text-Gk2VyRBd.js → file-text-FxjQforC.js} +1 -1
- package/public/assets/{git-fork-CLaKXs0Y.js → git-fork-BnUjRz81.js} +1 -1
- package/public/assets/{index-CfvO5R0v.js → index-CTVNJXL0.js} +5 -5
- package/public/assets/{key-b2-JaSCL.js → key-DORG2Bvk.js} +1 -1
- package/public/assets/{loader-circle-_Xw40aLD.js → loader-circle-Ce741dwH.js} +1 -1
- package/public/assets/{pencil-z5Zqj0qg.js → pencil-C4ejRMe1.js} +1 -1
- package/public/assets/{play-D2z1wzeo.js → play-w6NUT3Ge.js} +1 -1
- package/public/assets/{plus-DDEIETPT.js → plus-CgnoWo2P.js} +1 -1
- package/public/assets/{rotate-ccw-DryDtPrl.js → rotate-ccw-DE82XdM1.js} +1 -1
- package/public/assets/{scroll-text-DdAPH940.js → scroll-text-DAbRTvTk.js} +1 -1
- package/public/assets/{settings-DLSb7OkM.js → settings-B6CvfGJs.js} +1 -1
- package/public/assets/{skip-forward-Dshgkb5J.js → skip-forward-kX5fzSWO.js} +1 -1
- package/public/assets/{status-colors-w6Ie5LWO.js → status-colors-DTc6Ynln.js} +1 -1
- package/public/assets/{task-constants-DpDhF7YW.js → task-constants-DFxPkPUs.js} +1 -1
- package/public/assets/{task.store-QLdgw-z_.js → task.store-VJg4-Qif.js} +1 -1
- package/public/assets/{trash-2-DN1oshyp.js → trash-2-BTUlSSX7.js} +1 -1
- package/public/assets/{useFetch-DpOLDSFc.js → useFetch-DLQT-fqN.js} +1 -1
- package/public/assets/{users-DrLwCx8Z.js → users-B6ZPxGEF.js} +1 -1
- package/public/assets/{wifi-B4XgJ6JW.js → wifi-RZmzDeRm.js} +1 -1
- package/public/assets/{workflow-Cd6zqDgi.js → workflow-C1oJzdp3.js} +1 -1
- package/public/index.html +1 -1
- package/public/sw.js +1 -1
- package/public/assets/HomePage-CQ0Upd0D.js +0 -1
- package/public/assets/PipelineConfigPage-D5gx3bIv.js +0 -22
- package/public/assets/PlanPage-Dds_7koM.js +0 -1
- package/public/assets/ProjectDetailPage-1mftEUqP.js +0 -7
- package/public/assets/ReviewPage-CNeCz2eT.js +0 -1
- package/public/assets/TaskDetailPage-Beto_Zqp.js +0 -21
- package/public/assets/TaskListPage-CFri9wCk.js +0 -1
- package/public/assets/TerminalHomePage-CDr4Mq6o.js +0 -6
- package/public/assets/WorkerDetailPage-DcMycoTh.js +0 -1
|
@@ -24,8 +24,10 @@ const search_service_1 = require("../web/search.service");
|
|
|
24
24
|
const dedup_service_1 = require("./dedup.service");
|
|
25
25
|
const task_creation_service_1 = require("./task-creation.service");
|
|
26
26
|
const task_lifecycle_service_1 = require("./task-lifecycle.service");
|
|
27
|
+
const command_parser_utils_1 = require("../adapters/command-parser.utils");
|
|
28
|
+
const redis_service_1 = require("../redis/redis.service");
|
|
27
29
|
let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
28
|
-
constructor(taskRepo, workerRepo, auditLogRepo, developerRepo, projectRepo, projectMemberRepo, searchService, dedupService, taskCreationService, taskLifecycleService) {
|
|
30
|
+
constructor(taskRepo, workerRepo, auditLogRepo, developerRepo, projectRepo, projectMemberRepo, searchService, dedupService, taskCreationService, taskLifecycleService, redis) {
|
|
29
31
|
this.taskRepo = taskRepo;
|
|
30
32
|
this.workerRepo = workerRepo;
|
|
31
33
|
this.auditLogRepo = auditLogRepo;
|
|
@@ -36,6 +38,7 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
36
38
|
this.dedupService = dedupService;
|
|
37
39
|
this.taskCreationService = taskCreationService;
|
|
38
40
|
this.taskLifecycleService = taskLifecycleService;
|
|
41
|
+
this.redis = redis;
|
|
39
42
|
this.logger = new common_1.Logger(DispatcherService_1.name);
|
|
40
43
|
}
|
|
41
44
|
// ---------------------------------------------------------------------------
|
|
@@ -49,6 +52,27 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
49
52
|
this.logger.debug(`Duplicate event ${command.eventId}, discarding`);
|
|
50
53
|
return { success: false, message: 'Duplicate event' };
|
|
51
54
|
}
|
|
55
|
+
// Resolve "last task" sentinel to actual task ID
|
|
56
|
+
if (command.args.taskId === command_parser_utils_1.LATEST_TASK_SENTINEL) {
|
|
57
|
+
const stored = await this.redis.get(`latest_task:${command.user.id}`);
|
|
58
|
+
if (!stored) {
|
|
59
|
+
return { success: false, message: 'No recent task found. Please specify a task ID.' };
|
|
60
|
+
}
|
|
61
|
+
command.args.taskId = parseInt(stored, 10);
|
|
62
|
+
}
|
|
63
|
+
// Capture the resolved taskId before dispatch (sentinel is already resolved above)
|
|
64
|
+
const resolvedTaskId = command.args.taskId;
|
|
65
|
+
const result = await this.dispatchCommand(command);
|
|
66
|
+
// Record latest task interaction on success (7-day TTL, best-effort)
|
|
67
|
+
if (result.success) {
|
|
68
|
+
const cacheId = result.task?.id ?? resolvedTaskId;
|
|
69
|
+
if (cacheId) {
|
|
70
|
+
this.redis.setex(`latest_task:${command.user.id}`, 7 * 86400, String(cacheId)).catch(() => { });
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return result;
|
|
74
|
+
}
|
|
75
|
+
async dispatchCommand(command) {
|
|
52
76
|
switch (command.type) {
|
|
53
77
|
case protocol_1.CommandType.DEVELOP:
|
|
54
78
|
return this.handleDevelopCommand(command);
|
|
@@ -81,7 +105,7 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
81
105
|
}
|
|
82
106
|
}
|
|
83
107
|
// ---------------------------------------------------------------------------
|
|
84
|
-
//
|
|
108
|
+
// Shared helpers
|
|
85
109
|
// ---------------------------------------------------------------------------
|
|
86
110
|
/**
|
|
87
111
|
* Convert known HTTP exceptions to a failed CommandResult.
|
|
@@ -95,22 +119,54 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
95
119
|
}
|
|
96
120
|
return null;
|
|
97
121
|
}
|
|
122
|
+
/**
|
|
123
|
+
* Build the final task description from quotedContent and description.
|
|
124
|
+
* Returns the merged string, or undefined if both are missing.
|
|
125
|
+
*/
|
|
126
|
+
buildDescription(args) {
|
|
127
|
+
const { quotedContent, description } = args;
|
|
128
|
+
if (quotedContent && description)
|
|
129
|
+
return `${quotedContent}\n${description}`;
|
|
130
|
+
return quotedContent ?? description;
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* Extract a confirmRequired result from a ConflictException, if present.
|
|
134
|
+
* Returns null if the exception does not carry a confirmRequired payload.
|
|
135
|
+
*/
|
|
136
|
+
extractConfirmRequired(err) {
|
|
137
|
+
const body = err.getResponse();
|
|
138
|
+
if (body && typeof body === 'object' && body['confirmRequired']) {
|
|
139
|
+
return {
|
|
140
|
+
success: false,
|
|
141
|
+
confirmRequired: body['confirmRequired'],
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
return null;
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* Handle errors from task creation/retry.
|
|
148
|
+
* Checks ConflictException for confirmRequired, then known HTTP exceptions.
|
|
149
|
+
* Returns a CommandResult on match, or rethrows.
|
|
150
|
+
*/
|
|
151
|
+
handleTaskError(err) {
|
|
152
|
+
if (err instanceof common_1.ConflictException) {
|
|
153
|
+
const confirm = this.extractConfirmRequired(err);
|
|
154
|
+
if (confirm)
|
|
155
|
+
return confirm;
|
|
156
|
+
}
|
|
157
|
+
const result = this.httpErrorToResult(err);
|
|
158
|
+
if (result)
|
|
159
|
+
return result;
|
|
160
|
+
throw err;
|
|
161
|
+
}
|
|
98
162
|
// ---------------------------------------------------------------------------
|
|
99
163
|
// Command handlers — thin wrappers that delegate to focused services
|
|
100
164
|
// ---------------------------------------------------------------------------
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
finalDescription = `${quotedContent}\n${description}`;
|
|
107
|
-
}
|
|
108
|
-
else if (quotedContent) {
|
|
109
|
-
finalDescription = quotedContent;
|
|
110
|
-
}
|
|
111
|
-
else {
|
|
112
|
-
finalDescription = description;
|
|
113
|
-
}
|
|
165
|
+
/**
|
|
166
|
+
* Shared handler for develop and plan commands — they differ only by taskMode.
|
|
167
|
+
*/
|
|
168
|
+
async handleCreateTaskCommand(command, taskMode) {
|
|
169
|
+
const finalDescription = this.buildDescription(command.args);
|
|
114
170
|
if (!finalDescription) {
|
|
115
171
|
return { success: false, message: 'Description is required' };
|
|
116
172
|
}
|
|
@@ -119,12 +175,13 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
119
175
|
}
|
|
120
176
|
const request = {
|
|
121
177
|
description: finalDescription,
|
|
122
|
-
projectKey:
|
|
178
|
+
projectKey: command.args.project ?? '',
|
|
123
179
|
workerId: command.args.worker,
|
|
124
180
|
developerId: command.args.developer ?? command.user.id,
|
|
125
181
|
taskType: command.args.taskType,
|
|
126
182
|
agentType: command.args.agentType,
|
|
127
183
|
branchSlug: command.args.branchSlug,
|
|
184
|
+
...(taskMode ? { taskMode } : {}),
|
|
128
185
|
};
|
|
129
186
|
try {
|
|
130
187
|
const task = await this.taskCreationService.createTask(request, command.user.id, {
|
|
@@ -136,22 +193,12 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
136
193
|
return { success: true, task };
|
|
137
194
|
}
|
|
138
195
|
catch (err) {
|
|
139
|
-
|
|
140
|
-
// Fingerprint dedup — check if there is a pending confirm
|
|
141
|
-
const body = err.getResponse();
|
|
142
|
-
if (body && typeof body === 'object' && body['confirmRequired']) {
|
|
143
|
-
return {
|
|
144
|
-
success: false,
|
|
145
|
-
confirmRequired: body['confirmRequired'],
|
|
146
|
-
};
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
const result = this.httpErrorToResult(err);
|
|
150
|
-
if (result)
|
|
151
|
-
return result;
|
|
152
|
-
throw err;
|
|
196
|
+
return this.handleTaskError(err);
|
|
153
197
|
}
|
|
154
198
|
}
|
|
199
|
+
async handleDevelopCommand(command) {
|
|
200
|
+
return this.handleCreateTaskCommand(command);
|
|
201
|
+
}
|
|
155
202
|
async handleCancelCommand(command) {
|
|
156
203
|
const taskId = command.args.taskId;
|
|
157
204
|
if (!taskId) {
|
|
@@ -163,10 +210,7 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
163
210
|
return { success: true, task, message: `Task #${taskId} cancelled` };
|
|
164
211
|
}
|
|
165
212
|
catch (err) {
|
|
166
|
-
|
|
167
|
-
if (result)
|
|
168
|
-
return result;
|
|
169
|
-
throw err;
|
|
213
|
+
return this.handleTaskError(err);
|
|
170
214
|
}
|
|
171
215
|
}
|
|
172
216
|
async handleRetryCommand(command) {
|
|
@@ -179,25 +223,48 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
179
223
|
return { success: true, task, message: `Task #${taskId} retried` };
|
|
180
224
|
}
|
|
181
225
|
catch (err) {
|
|
182
|
-
|
|
183
|
-
const body = err.getResponse();
|
|
184
|
-
if (body && typeof body === 'object' && body['confirmRequired']) {
|
|
185
|
-
return {
|
|
186
|
-
success: false,
|
|
187
|
-
confirmRequired: body['confirmRequired'],
|
|
188
|
-
};
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
const result = this.httpErrorToResult(err);
|
|
192
|
-
if (result)
|
|
193
|
-
return result;
|
|
194
|
-
throw err;
|
|
226
|
+
return this.handleTaskError(err);
|
|
195
227
|
}
|
|
196
228
|
}
|
|
197
229
|
async handleConfirmCommand(command) {
|
|
198
230
|
const taskId = command.args.taskId;
|
|
199
231
|
if (!taskId) {
|
|
200
|
-
return { success: false, message: 'taskId is required' };
|
|
232
|
+
return { success: false, message: 'taskId is required. Usage: confirm <taskId> or reject <taskId>' };
|
|
233
|
+
}
|
|
234
|
+
// approved defaults to true for backward-compat (old "confirm #id" without flag)
|
|
235
|
+
const approved = command.args.approved !== false;
|
|
236
|
+
// Check if the task is awaiting a stage confirmation (SUSPENDED or RUNNING with currentStage).
|
|
237
|
+
// If so, handle it as a stage confirm/reject directly — no Redis dedup lookup needed.
|
|
238
|
+
const task = this.taskRepo.findById(taskId);
|
|
239
|
+
if (task &&
|
|
240
|
+
(task.status === protocol_1.TaskStatus.RUNNING || task.status === protocol_1.TaskStatus.SUSPENDED) &&
|
|
241
|
+
task.currentStage) {
|
|
242
|
+
// Check authorization: must be task owner (developer or creator) or admin
|
|
243
|
+
const isOwner = task.developerId === command.user.id || task.createdBy === command.user.id;
|
|
244
|
+
if (!isOwner) {
|
|
245
|
+
const developer = this.developerRepo.findById(command.user.id);
|
|
246
|
+
if (!developer || developer.role !== 'admin') {
|
|
247
|
+
return { success: false, message: `Not authorized to ${approved ? 'confirm' : 'reject'} task #${taskId}` };
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
try {
|
|
251
|
+
await this.taskLifecycleService.confirmStage(taskId, task.currentStage, approved);
|
|
252
|
+
return {
|
|
253
|
+
success: true,
|
|
254
|
+
task: this.taskRepo.findById(taskId) ?? task,
|
|
255
|
+
message: approved
|
|
256
|
+
? `Stage "${task.currentStage}" confirmed for task #${taskId}`
|
|
257
|
+
: `Stage "${task.currentStage}" rejected for task #${taskId}`,
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
catch (err) {
|
|
261
|
+
return this.handleTaskError(err);
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
// No active stage confirm — fall back to dedup pending confirm (task creation / retry override).
|
|
265
|
+
// reject (#approved=false) has no meaning in the dedup flow, so treat it as a cancel.
|
|
266
|
+
if (!approved) {
|
|
267
|
+
return { success: false, message: `Task #${taskId} is not awaiting a stage confirmation` };
|
|
201
268
|
}
|
|
202
269
|
// Resolve pending confirm from Redis.
|
|
203
270
|
// Priority: reply-to msgId association, fallback to #taskId lookup.
|
|
@@ -207,13 +274,13 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
207
274
|
}
|
|
208
275
|
if (pendingData.action === 'create_task' && pendingData.request) {
|
|
209
276
|
// Confirmed dedup override — create the task anyway
|
|
210
|
-
const
|
|
211
|
-
return { success: true, task, message: 'Task created (dedup override)' };
|
|
277
|
+
const createdTask = await this.taskCreationService.createTaskInternal(pendingData.request, pendingData.createdBy, pendingData.source, true);
|
|
278
|
+
return { success: true, task: createdTask, message: 'Task created (dedup override)' };
|
|
212
279
|
}
|
|
213
280
|
if (pendingData.action === 'retry' && pendingData.taskId) {
|
|
214
281
|
// Confirmed retry with existing MR
|
|
215
|
-
const
|
|
216
|
-
return { success: true, task, message: `Task #${pendingData.taskId} retried (MR override)` };
|
|
282
|
+
const retriedTask = await this.taskLifecycleService.executeRetry(pendingData.taskId, pendingData.createdBy, pendingData.reuseWorkspace);
|
|
283
|
+
return { success: true, task: retriedTask, message: `Task #${pendingData.taskId} retried (MR override)` };
|
|
217
284
|
}
|
|
218
285
|
return { success: false, message: 'Unknown confirm action' };
|
|
219
286
|
}
|
|
@@ -348,65 +415,11 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
348
415
|
return { success: true, task, message: `Task #${task.id} forked from #${taskId}` };
|
|
349
416
|
}
|
|
350
417
|
catch (err) {
|
|
351
|
-
|
|
352
|
-
if (result)
|
|
353
|
-
return result;
|
|
354
|
-
throw err;
|
|
418
|
+
return this.handleTaskError(err);
|
|
355
419
|
}
|
|
356
420
|
}
|
|
357
421
|
async handlePlanCommand(command) {
|
|
358
|
-
|
|
359
|
-
// Build final description: quotedContent + description
|
|
360
|
-
let finalDescription;
|
|
361
|
-
if (quotedContent && description) {
|
|
362
|
-
finalDescription = `${quotedContent}\n${description}`;
|
|
363
|
-
}
|
|
364
|
-
else if (quotedContent) {
|
|
365
|
-
finalDescription = quotedContent;
|
|
366
|
-
}
|
|
367
|
-
else {
|
|
368
|
-
finalDescription = description;
|
|
369
|
-
}
|
|
370
|
-
if (!finalDescription) {
|
|
371
|
-
return { success: false, message: 'Description is required' };
|
|
372
|
-
}
|
|
373
|
-
if (finalDescription.length < 20) {
|
|
374
|
-
return { success: false, message: 'Description is too short (minimum 20 characters). Please provide more detail.' };
|
|
375
|
-
}
|
|
376
|
-
const request = {
|
|
377
|
-
description: finalDescription,
|
|
378
|
-
projectKey: projectKeyOrAlias ?? '',
|
|
379
|
-
workerId: command.args.worker,
|
|
380
|
-
developerId: command.args.developer ?? command.user.id,
|
|
381
|
-
taskType: command.args.taskType,
|
|
382
|
-
agentType: command.args.agentType,
|
|
383
|
-
branchSlug: command.args.branchSlug,
|
|
384
|
-
taskMode: 'plan',
|
|
385
|
-
};
|
|
386
|
-
try {
|
|
387
|
-
const task = await this.taskCreationService.createTask(request, command.user.id, {
|
|
388
|
-
platform: command.platform,
|
|
389
|
-
msgId: command.source.msgId,
|
|
390
|
-
chatId: command.source.chatId,
|
|
391
|
-
appId: command.source.appId,
|
|
392
|
-
});
|
|
393
|
-
return { success: true, task };
|
|
394
|
-
}
|
|
395
|
-
catch (err) {
|
|
396
|
-
if (err instanceof common_1.ConflictException) {
|
|
397
|
-
const body = err.getResponse();
|
|
398
|
-
if (body && typeof body === 'object' && body['confirmRequired']) {
|
|
399
|
-
return {
|
|
400
|
-
success: false,
|
|
401
|
-
confirmRequired: body['confirmRequired'],
|
|
402
|
-
};
|
|
403
|
-
}
|
|
404
|
-
}
|
|
405
|
-
const result = this.httpErrorToResult(err);
|
|
406
|
-
if (result)
|
|
407
|
-
return result;
|
|
408
|
-
throw err;
|
|
409
|
-
}
|
|
422
|
+
return this.handleCreateTaskCommand(command, 'plan');
|
|
410
423
|
}
|
|
411
424
|
async handleReviewCommand(command) {
|
|
412
425
|
const taskId = command.args.taskId;
|
|
@@ -423,10 +436,7 @@ let DispatcherService = DispatcherService_1 = class DispatcherService {
|
|
|
423
436
|
return { success: true, message: `Created ${tasks.length} review task(s) for #${taskId}` };
|
|
424
437
|
}
|
|
425
438
|
catch (err) {
|
|
426
|
-
|
|
427
|
-
if (result)
|
|
428
|
-
return result;
|
|
429
|
-
throw err;
|
|
439
|
+
return this.handleTaskError(err);
|
|
430
440
|
}
|
|
431
441
|
}
|
|
432
442
|
// ---------------------------------------------------------------------------
|
|
@@ -469,6 +479,7 @@ exports.DispatcherService = DispatcherService = DispatcherService_1 = __decorate
|
|
|
469
479
|
search_service_1.SearchService,
|
|
470
480
|
dedup_service_1.DedupService,
|
|
471
481
|
task_creation_service_1.TaskCreationService,
|
|
472
|
-
task_lifecycle_service_1.TaskLifecycleService
|
|
482
|
+
task_lifecycle_service_1.TaskLifecycleService,
|
|
483
|
+
redis_service_1.RedisService])
|
|
473
484
|
], DispatcherService);
|
|
474
485
|
//# sourceMappingURL=dispatcher.service.js.map
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification-consumer.d.ts","sourceRoot":"","sources":["../../src/notifier/notification-consumer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAsB,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"notification-consumer.d.ts","sourceRoot":"","sources":["../../src/notifier/notification-consumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ const NEW_MESSAGE_EVENTS = new Set([
|
|
|
37
37
|
const CREATOR_NOTIFY_EVENTS = new Set([
|
|
38
38
|
'task_completed',
|
|
39
39
|
'task_failed',
|
|
40
|
+
'review_round_complete',
|
|
40
41
|
]);
|
|
41
42
|
/** Events that should also fan out to project-bound chats. */
|
|
42
43
|
const PROJECT_CHAT_EVENTS = new Set([
|
|
@@ -139,6 +140,9 @@ let NotificationConsumer = NotificationConsumer_1 = class NotificationConsumer {
|
|
|
139
140
|
// Web-only source — write to notifications table + try DM via any linked platform
|
|
140
141
|
if (platform === protocol_1.Platform.WEB || !this.adapterRegistry) {
|
|
141
142
|
await this.handleWebNotification(task, eventType, content.text);
|
|
143
|
+
if (!creatorIsExecutor && CREATOR_NOTIFY_EVENTS.has(eventType)) {
|
|
144
|
+
await this.handleWebNotification(task, eventType, content.text, task.createdBy);
|
|
145
|
+
}
|
|
142
146
|
// Try to deliver DM to the developer via any linked platform
|
|
143
147
|
if (this.adapterRegistry && task.developerId) {
|
|
144
148
|
const developer = this.developerRepo.findById(task.developerId);
|
|
@@ -181,7 +185,7 @@ let NotificationConsumer = NotificationConsumer_1 = class NotificationConsumer {
|
|
|
181
185
|
await this.deliverToExecutorDM(task, taskId, platform, eventType, content, isNewMessage);
|
|
182
186
|
// Creator gets important events to source chat
|
|
183
187
|
if (CREATOR_NOTIFY_EVENTS.has(eventType)) {
|
|
184
|
-
await this.sendNewMessage(task, taskId, platform, sourceChatId, sourceAppId, eventType, content);
|
|
188
|
+
await this.sendNewMessage(task, taskId, platform, sourceChatId, sourceAppId, eventType, content, task.createdBy);
|
|
185
189
|
}
|
|
186
190
|
}
|
|
187
191
|
// Important terminal events can also fan out to project-bound chats.
|
|
@@ -237,14 +241,14 @@ let NotificationConsumer = NotificationConsumer_1 = class NotificationConsumer {
|
|
|
237
241
|
/**
|
|
238
242
|
* Send a new message to a chat (no update of existing card).
|
|
239
243
|
*/
|
|
240
|
-
async sendNewMessage(task, taskId, platform, chatId, sourceAppId, eventType, content) {
|
|
244
|
+
async sendNewMessage(task, taskId, platform, chatId, sourceAppId, eventType, content, fallbackDeveloperId) {
|
|
241
245
|
if (!chatId) {
|
|
242
|
-
await this.handleWebNotification(task, eventType, content.text);
|
|
246
|
+
await this.handleWebNotification(task, eventType, content.text, fallbackDeveloperId);
|
|
243
247
|
return;
|
|
244
248
|
}
|
|
245
249
|
const adapter = this.adapterRegistry.getAdapter(platform);
|
|
246
250
|
if (!adapter) {
|
|
247
|
-
await this.handleWebNotification(task, eventType, content.text);
|
|
251
|
+
await this.handleWebNotification(task, eventType, content.text, fallbackDeveloperId);
|
|
248
252
|
return;
|
|
249
253
|
}
|
|
250
254
|
try {
|
|
@@ -375,20 +379,21 @@ let NotificationConsumer = NotificationConsumer_1 = class NotificationConsumer {
|
|
|
375
379
|
/**
|
|
376
380
|
* Write an in-app (web) notification to the notifications table.
|
|
377
381
|
*/
|
|
378
|
-
async handleWebNotification(task, eventType, text) {
|
|
379
|
-
|
|
380
|
-
|
|
382
|
+
async handleWebNotification(task, eventType, text, developerIdOverride) {
|
|
383
|
+
const developerId = developerIdOverride ?? task.developerId;
|
|
384
|
+
if (developerId == null) {
|
|
385
|
+
this.logger.debug(`Task ${task.id} has no target developerId, skipping web notification`);
|
|
381
386
|
return;
|
|
382
387
|
}
|
|
383
388
|
this.notificationRepo.create({
|
|
384
|
-
developerId
|
|
389
|
+
developerId,
|
|
385
390
|
type: eventType,
|
|
386
391
|
title: `Task #${task.id} — ${eventType.replace(/_/g, ' ')}`,
|
|
387
392
|
body: text,
|
|
388
393
|
resourceType: 'task',
|
|
389
394
|
resourceId: String(task.id),
|
|
390
395
|
});
|
|
391
|
-
this.logger.debug(`Wrote web notification for task ${task.id} developer ${
|
|
396
|
+
this.logger.debug(`Wrote web notification for task ${task.id} developer ${developerId}`);
|
|
392
397
|
}
|
|
393
398
|
/**
|
|
394
399
|
* Build the notification content from template service.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification-consumer.js","sourceRoot":"","sources":["../../src/notifier/notification-consumer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"notification-consumer.js","sourceRoot":"","sources":["../../src/notifier/notification-consumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-report.handler.d.ts","sourceRoot":"","sources":["../../../src/web/frame-handlers/review-report.handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAO9D,qBAAa,mBAAoB,YAAW,YAAY;IAKpD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,QAAQ,CAAC,UAAU,WAAqB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAG5C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,YAAY,EACnB,YAAY,EAAE,aAAa;IAGxC,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"review-report.handler.d.ts","sourceRoot":"","sources":["../../../src/web/frame-handlers/review-report.handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAO9D,qBAAa,mBAAoB,YAAW,YAAY;IAKpD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,QAAQ,CAAC,UAAU,WAAqB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAG5C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,YAAY,EACnB,YAAY,EAAE,aAAa;IAGxC,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CAiK7E"}
|
|
@@ -103,6 +103,16 @@ class ReviewReportHandler {
|
|
|
103
103
|
if (totalCount > 0 && reportedCount >= totalCount) {
|
|
104
104
|
// All review tasks in this round have submitted reports
|
|
105
105
|
this.logger.log(`Review round #${currentRound} complete for source task #${sourceTaskId} — emitting event`);
|
|
106
|
+
// Re-read round data to get the final task list (may have grown since initial read)
|
|
107
|
+
const roundKey = `review_round:${sourceTaskId}:${currentRound}`;
|
|
108
|
+
const freshRoundRaw = await this.redis.get(roundKey);
|
|
109
|
+
if (freshRoundRaw) {
|
|
110
|
+
try {
|
|
111
|
+
const freshData = JSON.parse(freshRoundRaw);
|
|
112
|
+
currentRoundTaskIds = freshData.taskIds;
|
|
113
|
+
}
|
|
114
|
+
catch { /* keep existing */ }
|
|
115
|
+
}
|
|
106
116
|
// Aggregate issue counts from all reports in this round for the notification
|
|
107
117
|
let criticalCount = 0;
|
|
108
118
|
let warningCount = 0;
|
|
@@ -133,6 +143,11 @@ class ReviewReportHandler {
|
|
|
133
143
|
warningCount,
|
|
134
144
|
suggestionCount,
|
|
135
145
|
});
|
|
146
|
+
// Only auto-mark as reviewed if not explicitly dismissed by user
|
|
147
|
+
const sourceTask = this.taskRepo.findById(sourceTaskId);
|
|
148
|
+
if (sourceTask && sourceTask.reviewStatus !== 'dismissed') {
|
|
149
|
+
this.taskRepo.updateReviewStatus(sourceTaskId, 'reviewed');
|
|
150
|
+
}
|
|
136
151
|
}
|
|
137
152
|
}
|
|
138
153
|
}
|