@overlordai/server 1.0.115 → 1.0.117
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/006-task-source.sql +5 -0
- package/dist/adapters/command-parser.utils.d.ts +5 -0
- package/dist/adapters/command-parser.utils.d.ts.map +1 -1
- package/dist/adapters/command-parser.utils.js +15 -0
- 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 +1 -0
- package/dist/adapters/help-text.js.map +1 -1
- package/dist/adapters/lark/lark-card.builder.d.ts +4 -1
- package/dist/adapters/lark/lark-card.builder.d.ts.map +1 -1
- package/dist/adapters/lark/lark-card.builder.js +4 -1
- package/dist/adapters/lark/lark-card.builder.js.map +1 -1
- package/dist/adapters/lark/lark-message.parser.d.ts.map +1 -1
- package/dist/adapters/lark/lark-message.parser.js +2 -0
- package/dist/adapters/lark/lark-message.parser.js.map +1 -1
- package/dist/adapters/lark/lark.adapter.d.ts +1 -1
- package/dist/adapters/lark/lark.adapter.d.ts.map +1 -1
- package/dist/adapters/lark/lark.adapter.js +3 -20
- package/dist/adapters/lark/lark.adapter.js.map +1 -1
- package/dist/adapters/lark/lark.controller.d.ts.map +1 -1
- package/dist/adapters/lark/lark.controller.js +2 -1
- package/dist/adapters/lark/lark.controller.js.map +1 -1
- package/dist/adapters/slack/slack-block.builder.d.ts +4 -1
- package/dist/adapters/slack/slack-block.builder.d.ts.map +1 -1
- package/dist/adapters/slack/slack-block.builder.js +4 -1
- package/dist/adapters/slack/slack-block.builder.js.map +1 -1
- package/dist/adapters/slack/slack-message.parser.d.ts.map +1 -1
- package/dist/adapters/slack/slack-message.parser.js +2 -0
- package/dist/adapters/slack/slack-message.parser.js.map +1 -1
- package/dist/adapters/slack/slack.controller.d.ts.map +1 -1
- package/dist/adapters/slack/slack.controller.js +4 -2
- package/dist/adapters/slack/slack.controller.js.map +1 -1
- package/dist/common/config.d.ts +3 -1
- package/dist/common/config.d.ts.map +1 -1
- package/dist/common/config.js +3 -1
- package/dist/common/config.js.map +1 -1
- package/dist/common/string-utils.d.ts +1 -1
- package/dist/common/string-utils.d.ts.map +1 -1
- package/dist/common/string-utils.js.map +1 -1
- package/dist/database/repositories/task.repository.d.ts +13 -0
- package/dist/database/repositories/task.repository.d.ts.map +1 -1
- package/dist/database/repositories/task.repository.js +27 -2
- package/dist/database/repositories/task.repository.js.map +1 -1
- package/dist/dispatcher/dispatcher.service.d.ts +18 -0
- package/dist/dispatcher/dispatcher.service.d.ts.map +1 -1
- package/dist/dispatcher/dispatcher.service.js +60 -10
- package/dist/dispatcher/dispatcher.service.js.map +1 -1
- package/dist/dispatcher/scheduler.service.d.ts.map +1 -1
- package/dist/dispatcher/scheduler.service.js +1 -0
- package/dist/dispatcher/scheduler.service.js.map +1 -1
- package/dist/dispatcher/task-creation.service.d.ts +4 -1
- package/dist/dispatcher/task-creation.service.d.ts.map +1 -1
- package/dist/dispatcher/task-creation.service.js +87 -14
- package/dist/dispatcher/task-creation.service.js.map +1 -1
- package/dist/dispatcher/task-lifecycle.service.d.ts +5 -0
- package/dist/dispatcher/task-lifecycle.service.d.ts.map +1 -1
- package/dist/dispatcher/task-lifecycle.service.js +21 -32
- package/dist/dispatcher/task-lifecycle.service.js.map +1 -1
- package/dist/dispatcher/task-name.service.d.ts +7 -1
- package/dist/dispatcher/task-name.service.d.ts.map +1 -1
- package/dist/dispatcher/task-name.service.js +57 -28
- package/dist/dispatcher/task-name.service.js.map +1 -1
- package/dist/notifier/notification-consumer.d.ts.map +1 -1
- package/dist/notifier/notification-consumer.js +5 -0
- package/dist/notifier/notification-consumer.js.map +1 -1
- package/dist/notifier/template.service.d.ts +14 -10
- package/dist/notifier/template.service.d.ts.map +1 -1
- package/dist/notifier/template.service.js +6 -0
- package/dist/notifier/template.service.js.map +1 -1
- package/dist/web/dashboard.controller.d.ts +18 -1
- package/dist/web/dashboard.controller.d.ts.map +1 -1
- package/dist/web/dashboard.controller.js +8 -8
- package/dist/web/dashboard.controller.js.map +1 -1
- package/dist/web/dashboard.service.d.ts +4 -0
- package/dist/web/dashboard.service.d.ts.map +1 -1
- package/dist/web/dashboard.service.js +44 -8
- package/dist/web/dashboard.service.js.map +1 -1
- package/dist/web/frame-handlers/stage-choice.handler.d.ts.map +1 -1
- package/dist/web/frame-handlers/stage-choice.handler.js +2 -15
- package/dist/web/frame-handlers/stage-choice.handler.js.map +1 -1
- package/dist/web/frame-handlers/stage-input.handler.d.ts.map +1 -1
- package/dist/web/frame-handlers/stage-input.handler.js +2 -15
- package/dist/web/frame-handlers/stage-input.handler.js.map +1 -1
- package/dist/web/frame-handlers/stage-request.shared.d.ts +15 -0
- package/dist/web/frame-handlers/stage-request.shared.d.ts.map +1 -0
- package/dist/web/frame-handlers/stage-request.shared.js +23 -0
- package/dist/web/frame-handlers/stage-request.shared.js.map +1 -0
- package/dist/web/task.controller.d.ts +9 -2
- package/dist/web/task.controller.d.ts.map +1 -1
- package/dist/web/task.controller.js +50 -12
- package/dist/web/task.controller.js.map +1 -1
- package/package.json +4 -4
- package/public/assets/{AccessTokensPage-Yp8IfrfF.js → AccessTokensPage-DpvKfLEO.js} +1 -1
- package/public/assets/{AdminPage-CS2HrhOC.js → AdminPage-BM9QiFb5.js} +1 -1
- package/public/assets/ApiReferencePage-BTaNVfsP.js +1 -0
- package/public/assets/{ArchitecturePage-BpA3PUuf.js → ArchitecturePage-DhIMPhqX.js} +1 -1
- package/public/assets/{AuditLogPage-B_Qopq3a.js → AuditLogPage-Cx-14vA4.js} +2 -2
- package/public/assets/{BindPlatformPage-BkV-IfaR.js → BindPlatformPage-DdRIv8zm.js} +1 -1
- package/public/assets/{BotIntegrationPage-DLuRDIam.js → BotIntegrationPage-CHdtc4La.js} +1 -1
- package/public/assets/{BotManage-XKHjrA-7.js → BotManage-CdjnH5-8.js} +1 -1
- package/public/assets/{BotSetupPage-Cn40afR9.js → BotSetupPage-DFysj153.js} +1 -1
- package/public/assets/{ChangelogPage-ChiapPDH.js → ChangelogPage-U_k6xoeH.js} +1 -1
- package/public/assets/CliReferencePage-SvjVHTjw.js +14 -0
- package/public/assets/{DeploymentPage-CvT9Pcow.js → DeploymentPage-C6nmLX7c.js} +1 -1
- package/public/assets/{DevWorkflowPage-BLEIbUu1.js → DevWorkflowPage-Ck2EnEDE.js} +1 -1
- package/public/assets/DeveloperManage-BJFJHZAi.js +16 -0
- package/public/assets/{DeveloperSetupPage-BhE83ouS.js → DeveloperSetupPage-BNQC5o4m.js} +1 -1
- package/public/assets/{DocsIndexPage-BE_tyO2Q.js → DocsIndexPage-GPTDK9-m.js} +1 -1
- package/public/assets/{DocsLayout-D1S4KUeB.js → DocsLayout-unC2wvei.js} +1 -1
- package/public/assets/{DocsPrimitives-BQXfZXxZ.js → DocsPrimitives-SXtvWKEQ.js} +1 -1
- package/public/assets/{EditProjectPage-BjgRi6kG.js → EditProjectPage-DeJRQ3l-.js} +2 -2
- package/public/assets/{EmptyState-Dlt6FhVC.js → EmptyState-BpCme67a.js} +1 -1
- package/public/assets/{EnvVariablesPage-CvcP4GZM.js → EnvVariablesPage-CXcyEjlG.js} +3 -3
- package/public/assets/HomePage-DfXoY-d2.js +1 -0
- package/public/assets/{InfoRow-Db2nisGq.js → InfoRow-DR8zeDt9.js} +1 -1
- package/public/assets/{InstallationPage-kt-du5Rr.js → InstallationPage-DOM3hgNb.js} +1 -1
- package/public/assets/{LandingPage-2irRMduO.js → LandingPage-BmiwIUr7.js} +1 -1
- package/public/assets/{LocalDevelopmentPage-7JvSDwD1.js → LocalDevelopmentPage-DXeX5sW8.js} +1 -1
- package/public/assets/{LoginPage-DDk_X1sv.js → LoginPage-BPAqDDL3.js} +1 -1
- package/public/assets/{MetricBar-BhjbfPOa.js → MetricBar-Br-BtKS6.js} +1 -1
- package/public/assets/{NotFoundPage-ByRykDvA.js → NotFoundPage-CO0Mhnxl.js} +1 -1
- package/public/assets/{OnboardingGuide-CinJRqx5.js → OnboardingGuide-fsXNNeyc.js} +1 -1
- package/public/assets/{PermissionsPage-C5RXlztC.js → PermissionsPage-CQhtzB50.js} +1 -1
- package/public/assets/{PipelineConfigPage-BSkSRngC.js → PipelineConfigPage-k4rmH6tS.js} +1 -1
- package/public/assets/{PipelineEditorPage-BoZ_MVNO.js → PipelineEditorPage-0uqd9nvg.js} +2 -2
- package/public/assets/{ProfilePage-CePUfQDH.js → ProfilePage-W4x8dgJg.js} +1 -1
- package/public/assets/{ProjectDetailPage-_DswTp8-.js → ProjectDetailPage-BRyBlc9x.js} +3 -3
- package/public/assets/{ProjectListPage-fVbDom8_.js → ProjectListPage-BJRW6VTI.js} +1 -1
- package/public/assets/{PtyTerminal-Dpk4L7LN.js → PtyTerminal-STL0fWy1.js} +1 -1
- package/public/assets/{QuickAuth-BAmZCI4O.js → QuickAuth-Dr0S8t84.js} +1 -1
- package/public/assets/{RemoveMemberConfirmDialog-DYi6BAz2.js → RemoveMemberConfirmDialog-DZyOU7_I.js} +2 -2
- package/public/assets/{Select-DnIOEVCT.js → Select-dRGuOO0Z.js} +1 -1
- package/public/assets/{SettingsPage-CwV-t8vo.js → SettingsPage-YkoKOcpP.js} +1 -1
- package/public/assets/{Skeleton--qglldqs.js → Skeleton-BsoB5rXa.js} +1 -1
- package/public/assets/{SkillPage-CsXXruJZ.js → SkillPage-C1-Wu-pY.js} +1 -1
- package/public/assets/TaskDetailPage-I-O8mnki.js +26 -0
- package/public/assets/TaskListPage-CaVaqETS.js +1 -0
- package/public/assets/{TaskStatusBadge-CCh-nmLz.js → TaskStatusBadge-BNAk5uA3.js} +1 -1
- package/public/assets/{TerminalHomePage-DXFg88Q9.js → TerminalHomePage-D4gbvESl.js} +2 -2
- package/public/assets/TokenManage-BBpUFelx.js +1 -0
- package/public/assets/Tooltip-CqnA1UXc.js +1 -0
- package/public/assets/{TotpSetupPage-D5GUedMd.js → TotpSetupPage-DUWr_2xl.js} +1 -1
- package/public/assets/WorkerDetailPage-6QCplfgK.js +1 -0
- package/public/assets/{WorkerListPage-C90v6nLx.js → WorkerListPage-DX5x8krm.js} +2 -2
- package/public/assets/{WorkerOperationsPage-OxH0Ky0Y.js → WorkerOperationsPage-D3YukHAP.js} +1 -1
- package/public/assets/{WorkerSetupGuidePage-DGlgYS82.js → WorkerSetupGuidePage-Cd-tThsa.js} +1 -1
- package/public/assets/{WorkerSetupPage-DJ359PwT.js → WorkerSetupPage-BadJoX_G.js} +1 -1
- package/public/assets/{arrow-left-BPgCxdEG.js → arrow-left-BK1dZF33.js} +1 -1
- package/public/assets/{arrow-right-Z-hFp5rr.js → arrow-right-MUJy2eo5.js} +1 -1
- package/public/assets/{bot-B7Bl9J0r.js → bot-DpUzhQD0.js} +1 -1
- package/public/assets/{chevron-right-D_hyYdgn.js → chevron-right-D2h36HaM.js} +1 -1
- package/public/assets/{copy-SJf3OFPQ.js → copy-DGg1Qnmo.js} +1 -1
- package/public/assets/{download-D7rCJJks.js → download-B9Z1GUkp.js} +1 -1
- package/public/assets/{external-link-BrXLoqUZ.js → external-link-CqAZtiZg.js} +1 -1
- package/public/assets/git-fork-B3d1aXDP.js +6 -0
- package/public/assets/{index-BiItJ2NI.css → index-D4RS0YML.css} +1 -1
- package/public/assets/{index-DPCzKHL-.js → index-DL0taPcR.js} +6 -6
- package/public/assets/{key-CCF8A0TZ.js → key-BRfGo7IX.js} +1 -1
- package/public/assets/{loader-circle-BO0HYeDT.js → loader-circle-Cj_Du6KL.js} +1 -1
- package/public/assets/{pencil-BhxWbYup.js → pencil-CZ3YSD7G.js} +1 -1
- package/public/assets/{plus-BnJSQWb4.js → plus-PIkNjGpa.js} +1 -1
- package/public/assets/{rotate-ccw-CioNXT1z.js → rotate-ccw-BknOT5fw.js} +1 -1
- package/public/assets/{scroll-text-DpFjChL8.js → scroll-text-Cr4CCE2m.js} +1 -1
- package/public/assets/{settings-Bklbsj12.js → settings-Dk7uYjd0.js} +1 -1
- package/public/assets/{status-colors-BkxgT8vX.js → status-colors-WHGEK13k.js} +1 -1
- package/public/assets/task-constants-Cf7mKdBA.js +1 -0
- package/public/assets/{trash-2-_3SD7t1j.js → trash-2-BvQjSTjE.js} +1 -1
- package/public/assets/{useFetch-D8w38eG7.js → useFetch-C5DNPA-p.js} +1 -1
- package/public/assets/{users-BBjD2TJy.js → users-D_cbGgzX.js} +1 -1
- package/public/assets/{wifi-KyET3jRD.js → wifi-D93amIa3.js} +1 -1
- package/public/assets/{workflow-EN1ACj2x.js → workflow-54aMeI49.js} +1 -1
- package/public/index.html +2 -2
- package/public/sw.js +1 -1
- package/public/assets/ApiReferencePage-DTinm3RG.js +0 -1
- package/public/assets/CliReferencePage-3eHb6kRq.js +0 -14
- package/public/assets/DeveloperManage-DAJBvmdv.js +0 -16
- package/public/assets/HomePage-uEE3mJNM.js +0 -1
- package/public/assets/TaskDetailPage-gOUWMfkb.js +0 -21
- package/public/assets/TaskListPage-vF17zpt2.js +0 -1
- package/public/assets/TokenManage-P98_TYIe.js +0 -1
- package/public/assets/Tooltip-DGoJgM_K.js +0 -1
- package/public/assets/WorkerDetailPage-CkI1feoH.js +0 -1
- package/public/assets/task-constants-Ctac6aky.js +0 -1
- package/public/assets/task-display-J_FNKBLK.js +0 -1
|
@@ -93,11 +93,22 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
93
93
|
async createTask(request, createdBy, source) {
|
|
94
94
|
return this.createTaskInternal(request, createdBy, source, false);
|
|
95
95
|
}
|
|
96
|
-
async createTaskInternal(request, createdBy, source, skipDedup = false) {
|
|
96
|
+
async createTaskInternal(request, createdBy, source, skipDedup = false, prefetchedSourceTask) {
|
|
97
|
+
// 0. If sourceTaskId is provided, resolve source task and inherit fields.
|
|
98
|
+
// Accept a prefetched source task to avoid redundant DB lookups.
|
|
99
|
+
let sourceTask = prefetchedSourceTask ?? null;
|
|
100
|
+
if (!sourceTask && request.sourceTaskId) {
|
|
101
|
+
sourceTask = this.taskRepo.findById(request.sourceTaskId);
|
|
102
|
+
if (!sourceTask) {
|
|
103
|
+
throw new common_1.NotFoundException(`Source task #${request.sourceTaskId} not found`);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
// Effective projectKey: request > source task > empty (will resolve to default)
|
|
107
|
+
const effectiveProjectKey = request.projectKey || sourceTask?.projectKey || '';
|
|
97
108
|
// 1. Find project by key or alias
|
|
98
|
-
const project = this.resolveProject(
|
|
109
|
+
const project = this.resolveProject(effectiveProjectKey);
|
|
99
110
|
if (!project) {
|
|
100
|
-
if (!
|
|
111
|
+
if (!effectiveProjectKey) {
|
|
101
112
|
// No project specified and no default project configured — give a helpful hint
|
|
102
113
|
const memberships = this.projectMemberRepo.findByDeveloper(createdBy);
|
|
103
114
|
const projectKeys = memberships.map((m) => m.projectKey);
|
|
@@ -113,7 +124,7 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
113
124
|
}
|
|
114
125
|
throw new common_1.NotFoundException(lines.join('\n'));
|
|
115
126
|
}
|
|
116
|
-
throw new common_1.NotFoundException(`Project '${
|
|
127
|
+
throw new common_1.NotFoundException(`Project '${effectiveProjectKey}' not found`);
|
|
117
128
|
}
|
|
118
129
|
// 2. Authorization: check developer is a project member (or admin bypass)
|
|
119
130
|
const developer = this.developerRepo.findById(createdBy);
|
|
@@ -128,10 +139,24 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
128
139
|
}
|
|
129
140
|
// 3. Compute fingerprint and check dedup
|
|
130
141
|
const fingerprint = this.dedupService.computeFingerprint(project.key, request.description);
|
|
131
|
-
// 4. Validate and resolve agentType (request override > project default)
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
142
|
+
// 4. Validate and resolve agentType (request override > source task > project default)
|
|
143
|
+
let resolvedAgentType = project.agentType;
|
|
144
|
+
if (request.agentType && VALID_AGENT_TYPES.has(request.agentType)) {
|
|
145
|
+
resolvedAgentType = request.agentType;
|
|
146
|
+
}
|
|
147
|
+
else if (sourceTask?.configSnapshot) {
|
|
148
|
+
try {
|
|
149
|
+
const srcConfig = JSON.parse(sourceTask.configSnapshot);
|
|
150
|
+
if (srcConfig.agentType && VALID_AGENT_TYPES.has(srcConfig.agentType)) {
|
|
151
|
+
resolvedAgentType = srcConfig.agentType;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
// ignore malformed snapshot
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
// Resolve taskType: request > source task > default
|
|
159
|
+
const resolvedTaskType = request.taskType ?? sourceTask?.taskType ?? protocol_1.TaskType.FEAT;
|
|
135
160
|
// 5. Snapshot config (14 fields from project, agentType may be overridden)
|
|
136
161
|
const configSnapshot = {
|
|
137
162
|
repoUrl: project.repoUrl,
|
|
@@ -150,6 +175,12 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
150
175
|
ptyOutputFilter: project.ptyOutputFilter,
|
|
151
176
|
defaultReviewers: project.defaultReviewers ?? [],
|
|
152
177
|
};
|
|
178
|
+
// Resolve branch: request.branch > source task's branch (if forking)
|
|
179
|
+
const resolvedBranch = request.branch || (sourceTask?.branch ?? undefined);
|
|
180
|
+
// Resolve branchSlug: request > source task (if forking)
|
|
181
|
+
const resolvedBranchSlug = request.branchSlug || (sourceTask?.branchSlug ?? undefined);
|
|
182
|
+
// When forking from a source task, skip dedup since it's intentional
|
|
183
|
+
const shouldSkipDedup = skipDedup || !!sourceTask;
|
|
153
184
|
// 5. Dedup check + insert wrapped in a SQLite transaction to prevent race condition.
|
|
154
185
|
// Without this, two concurrent createTask calls with the same fingerprint could both
|
|
155
186
|
// pass the findActiveByFingerprint check before either inserts.
|
|
@@ -157,7 +188,7 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
157
188
|
let task;
|
|
158
189
|
let dedupConflict = null;
|
|
159
190
|
const runCreateTransaction = db.transaction(() => {
|
|
160
|
-
if (!
|
|
191
|
+
if (!shouldSkipDedup) {
|
|
161
192
|
const existingTask = this.taskRepo.findActiveByFingerprint(fingerprint);
|
|
162
193
|
if (existingTask) {
|
|
163
194
|
dedupConflict = { existingTask };
|
|
@@ -176,9 +207,11 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
176
207
|
sourceMsgId: source?.msgId,
|
|
177
208
|
sourceChatId: source?.chatId,
|
|
178
209
|
sourceAppId: source?.appId,
|
|
210
|
+
sourceTaskId: sourceTask?.id,
|
|
179
211
|
createdBy,
|
|
180
|
-
taskType:
|
|
181
|
-
branchSlug:
|
|
212
|
+
taskType: resolvedTaskType,
|
|
213
|
+
branchSlug: resolvedBranchSlug,
|
|
214
|
+
branch: resolvedBranch,
|
|
182
215
|
});
|
|
183
216
|
}
|
|
184
217
|
catch (err) {
|
|
@@ -218,9 +251,10 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
218
251
|
}
|
|
219
252
|
task = result;
|
|
220
253
|
// Generate AI task name + branch slug (awaited inline; returns null on timeout or failure)
|
|
221
|
-
const meta = await this.taskNameService.generateMeta(request.description, project.key,
|
|
254
|
+
const meta = await this.taskNameService.generateMeta(request.description, project.key, resolvedTaskType);
|
|
222
255
|
if (meta) {
|
|
223
|
-
|
|
256
|
+
// Skip branchSlug generation if explicitly provided or inherited from source task
|
|
257
|
+
const branchSlug = (request.branchSlug || resolvedBranchSlug) ? undefined : (meta.branchSlug || undefined);
|
|
224
258
|
this.taskRepo.updateNameAndBranchSlug(task.id, meta.name, branchSlug);
|
|
225
259
|
task = { ...task, name: meta.name, branchSlug: branchSlug ?? task.branchSlug };
|
|
226
260
|
}
|
|
@@ -234,15 +268,54 @@ let TaskCreationService = TaskCreationService_1 = class TaskCreationService {
|
|
|
234
268
|
description: task.description,
|
|
235
269
|
});
|
|
236
270
|
this.logger.log(`Task #${task.id} created for project '${project.key}' by developer #${createdBy}`);
|
|
271
|
+
const auditDetail = sourceTask
|
|
272
|
+
? `Created task from #${sourceTask.id} for project '${project.key}': ${request.description.slice(0, 100)}`
|
|
273
|
+
: `Created task for project '${project.key}': ${request.description.slice(0, 100)}`;
|
|
237
274
|
this.auditLogRepo.create({
|
|
238
275
|
userId: createdBy,
|
|
239
276
|
action: 'task_create',
|
|
240
277
|
resource: `task:${task.id}`,
|
|
241
|
-
detail:
|
|
278
|
+
detail: auditDetail,
|
|
242
279
|
});
|
|
243
280
|
return task;
|
|
244
281
|
}
|
|
245
282
|
// ---------------------------------------------------------------------------
|
|
283
|
+
// forkTask
|
|
284
|
+
// ---------------------------------------------------------------------------
|
|
285
|
+
async forkTask(sourceTaskId, userId, overrides, source, prefetchedSourceTask) {
|
|
286
|
+
const sourceTask = prefetchedSourceTask ?? this.taskRepo.findById(sourceTaskId);
|
|
287
|
+
if (!sourceTask) {
|
|
288
|
+
throw new common_1.NotFoundException(`Task #${sourceTaskId} not found`);
|
|
289
|
+
}
|
|
290
|
+
if (sourceTask.status !== protocol_1.TaskStatus.COMPLETED && sourceTask.status !== protocol_1.TaskStatus.FAILED) {
|
|
291
|
+
throw new common_1.BadRequestException(`Cannot fork task #${sourceTaskId}: status is ${sourceTask.status}, only COMPLETED or FAILED tasks can be forked`);
|
|
292
|
+
}
|
|
293
|
+
// Parse config snapshot once to extract agentType (also used by createTaskInternal,
|
|
294
|
+
// but passing it via request.agentType avoids a redundant parse there).
|
|
295
|
+
let sourceAgentType;
|
|
296
|
+
if (sourceTask.configSnapshot) {
|
|
297
|
+
try {
|
|
298
|
+
const config = JSON.parse(sourceTask.configSnapshot);
|
|
299
|
+
if (config.agentType && VALID_AGENT_TYPES.has(config.agentType)) {
|
|
300
|
+
sourceAgentType = config.agentType;
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
catch {
|
|
304
|
+
// ignore malformed snapshot
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
const request = {
|
|
308
|
+
description: overrides?.description || sourceTask.description,
|
|
309
|
+
projectKey: sourceTask.projectKey,
|
|
310
|
+
sourceTaskId,
|
|
311
|
+
taskType: sourceTask.taskType,
|
|
312
|
+
agentType: sourceAgentType,
|
|
313
|
+
branchSlug: sourceTask.branchSlug ?? undefined,
|
|
314
|
+
branch: sourceTask.branch ?? undefined,
|
|
315
|
+
};
|
|
316
|
+
return this.createTaskInternal(request, userId, source, true /* skipDedup */, sourceTask);
|
|
317
|
+
}
|
|
318
|
+
// ---------------------------------------------------------------------------
|
|
246
319
|
// Helpers
|
|
247
320
|
// ---------------------------------------------------------------------------
|
|
248
321
|
resolveProject(keyOrAlias) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-creation.service.js","sourceRoot":"","sources":["../../src/dispatcher/task-creation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mDAAgI;AAChI,
|
|
1
|
+
{"version":3,"file":"task-creation.service.js","sourceRoot":"","sources":["../../src/dispatcher/task-creation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,11 @@ export declare class TaskLifecycleService {
|
|
|
34
34
|
resolvePendingConfirm(taskId: number, userId: number, _msgId?: string): Promise<PendingConfirmData | null>;
|
|
35
35
|
submitChoice(taskId: number, stageName: string, selectedValue: string): Promise<void>;
|
|
36
36
|
submitInput(taskId: number, stageName: string, inputValue: string): Promise<void>;
|
|
37
|
+
/**
|
|
38
|
+
* Shared logic for submitChoice and submitInput: validate task, send frame
|
|
39
|
+
* to the Worker via WebSocket, and expire the Redis stage key.
|
|
40
|
+
*/
|
|
41
|
+
private sendStageResponse;
|
|
37
42
|
/**
|
|
38
43
|
* Update task status with CAS retry (up to CAS_MAX_RETRIES).
|
|
39
44
|
* Returns true if successful, throws ConflictException on exhaustion.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-lifecycle.service.d.ts","sourceRoot":"","sources":["../../src/dispatcher/task-lifecycle.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-lifecycle.service.d.ts","sourceRoot":"","sources":["../../src/dispatcher/task-lifecycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -427,67 +427,56 @@ let TaskLifecycleService = TaskLifecycleService_1 = class TaskLifecycleService {
|
|
|
427
427
|
// submitChoice — forward interactive stage choice result to Worker
|
|
428
428
|
// ---------------------------------------------------------------------------
|
|
429
429
|
async submitChoice(taskId, stageName, selectedValue) {
|
|
430
|
-
const task = this.taskRepo.findById(taskId);
|
|
431
|
-
if (!task) {
|
|
432
|
-
throw new common_1.NotFoundException(`Task #${taskId} not found`);
|
|
433
|
-
}
|
|
434
|
-
if (task.status !== protocol_1.TaskStatus.RUNNING &&
|
|
435
|
-
task.status !== protocol_1.TaskStatus.SUSPENDED) {
|
|
436
|
-
throw new common_1.BadRequestException(`Task #${taskId} is ${task.status}, cannot submit choice`);
|
|
437
|
-
}
|
|
438
|
-
if (!task.workerId) {
|
|
439
|
-
throw new common_1.BadRequestException(`Task #${taskId} has no worker`);
|
|
440
|
-
}
|
|
441
430
|
const frame = {
|
|
442
431
|
type: 'stage_choice_response',
|
|
443
432
|
taskId,
|
|
444
433
|
stageName,
|
|
445
434
|
selectedValue,
|
|
446
435
|
};
|
|
447
|
-
|
|
448
|
-
if (!ws || ws.readyState !== 1 /* WebSocket.OPEN */) {
|
|
449
|
-
throw new common_1.BadRequestException(`Worker for task #${taskId} is not connected`);
|
|
450
|
-
}
|
|
451
|
-
ws.send(JSON.stringify(frame));
|
|
452
|
-
// Set a short TTL instead of deleting immediately — gives a 60-second
|
|
453
|
-
// retry window if the worker doesn't process the message.
|
|
454
|
-
const stageKey = `confirm:stage:${taskId}:${stageName}`;
|
|
455
|
-
await this.redis.expire(stageKey, 60);
|
|
456
|
-
this.logger.log(`Stage choice forwarded to Worker for task #${taskId}, stage ${stageName}`);
|
|
436
|
+
await this.sendStageResponse(taskId, stageName, frame, 'choice');
|
|
457
437
|
}
|
|
458
438
|
// ---------------------------------------------------------------------------
|
|
459
439
|
// submitInput — forward interactive stage input result to Worker
|
|
460
440
|
// ---------------------------------------------------------------------------
|
|
461
441
|
async submitInput(taskId, stageName, inputValue) {
|
|
442
|
+
const frame = {
|
|
443
|
+
type: 'stage_input_response',
|
|
444
|
+
taskId,
|
|
445
|
+
stageName,
|
|
446
|
+
inputValue,
|
|
447
|
+
};
|
|
448
|
+
await this.sendStageResponse(taskId, stageName, frame, 'input');
|
|
449
|
+
}
|
|
450
|
+
// ---------------------------------------------------------------------------
|
|
451
|
+
// Internal helpers
|
|
452
|
+
// ---------------------------------------------------------------------------
|
|
453
|
+
/**
|
|
454
|
+
* Shared logic for submitChoice and submitInput: validate task, send frame
|
|
455
|
+
* to the Worker via WebSocket, and expire the Redis stage key.
|
|
456
|
+
*/
|
|
457
|
+
async sendStageResponse(taskId, stageName, frame, label) {
|
|
462
458
|
const task = this.taskRepo.findById(taskId);
|
|
463
459
|
if (!task) {
|
|
464
460
|
throw new common_1.NotFoundException(`Task #${taskId} not found`);
|
|
465
461
|
}
|
|
466
462
|
if (task.status !== protocol_1.TaskStatus.RUNNING &&
|
|
467
463
|
task.status !== protocol_1.TaskStatus.SUSPENDED) {
|
|
468
|
-
throw new common_1.BadRequestException(`Task #${taskId} is ${task.status}, cannot submit
|
|
464
|
+
throw new common_1.BadRequestException(`Task #${taskId} is ${task.status}, cannot submit ${label}`);
|
|
469
465
|
}
|
|
470
466
|
if (!task.workerId) {
|
|
471
467
|
throw new common_1.BadRequestException(`Task #${taskId} has no worker`);
|
|
472
468
|
}
|
|
473
|
-
const frame = {
|
|
474
|
-
type: 'stage_input_response',
|
|
475
|
-
taskId,
|
|
476
|
-
stageName,
|
|
477
|
-
inputValue,
|
|
478
|
-
};
|
|
479
469
|
const ws = this.workerConnectionManager.getConnection(task.workerId);
|
|
480
470
|
if (!ws || ws.readyState !== 1 /* WebSocket.OPEN */) {
|
|
481
471
|
throw new common_1.BadRequestException(`Worker for task #${taskId} is not connected`);
|
|
482
472
|
}
|
|
483
473
|
ws.send(JSON.stringify(frame));
|
|
474
|
+
// Set a short TTL instead of deleting immediately — gives a 60-second
|
|
475
|
+
// retry window if the worker doesn't process the message.
|
|
484
476
|
const stageKey = `confirm:stage:${taskId}:${stageName}`;
|
|
485
477
|
await this.redis.expire(stageKey, 60);
|
|
486
|
-
this.logger.log(`Stage
|
|
478
|
+
this.logger.log(`Stage ${label} forwarded to Worker for task #${taskId}, stage ${stageName}`);
|
|
487
479
|
}
|
|
488
|
-
// ---------------------------------------------------------------------------
|
|
489
|
-
// Internal helpers
|
|
490
|
-
// ---------------------------------------------------------------------------
|
|
491
480
|
/**
|
|
492
481
|
* Update task status with CAS retry (up to CAS_MAX_RETRIES).
|
|
493
482
|
* Returns true if successful, throws ConflictException on exhaustion.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-lifecycle.service.js","sourceRoot":"","sources":["../../src/dispatcher/task-lifecycle.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-lifecycle.service.js","sourceRoot":"","sources":["../../src/dispatcher/task-lifecycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,15 @@ export interface GeneratedTaskMeta {
|
|
|
6
6
|
export declare class TaskNameService {
|
|
7
7
|
private readonly logger;
|
|
8
8
|
/**
|
|
9
|
-
* Generate a concise task name and branch slug
|
|
9
|
+
* Generate a concise task name and branch slug via LLM API.
|
|
10
|
+
* Auto-detects Anthropic Messages API vs OpenAI-compatible format
|
|
11
|
+
* based on whether LLM_BASE_URL contains "anthropic".
|
|
10
12
|
* Returns null if LLM is not configured or generation fails.
|
|
11
13
|
*/
|
|
12
14
|
generateMeta(description: string, projectKey: string, taskType: string): Promise<GeneratedTaskMeta | null>;
|
|
15
|
+
/** Call Anthropic Messages API (native Claude format). */
|
|
16
|
+
private callAnthropic;
|
|
17
|
+
/** Call OpenAI-compatible chat completions API. */
|
|
18
|
+
private callOpenAI;
|
|
13
19
|
}
|
|
14
20
|
//# sourceMappingURL=task-name.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-name.service.d.ts","sourceRoot":"","sources":["../../src/dispatcher/task-name.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-name.service.d.ts","sourceRoot":"","sources":["../../src/dispatcher/task-name.service.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,UAAU,EAAE,MAAM,CAAC;CACpB;AASD,qBACa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAE3D;;;;;OAKG;IACG,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAqChH,0DAA0D;YAC5C,aAAa;IAwB3B,mDAAmD;YACrC,UAAU;CAwBzB"}
|
|
@@ -10,10 +10,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.TaskNameService = void 0;
|
|
11
11
|
const common_1 = require("@nestjs/common");
|
|
12
12
|
const config_1 = require("../common/config");
|
|
13
|
+
/** Lazy-cached ky instance to avoid dynamic import on every LLM call. */
|
|
14
|
+
let _ky;
|
|
15
|
+
async function getKy() {
|
|
16
|
+
if (!_ky)
|
|
17
|
+
_ky = (await import('ky')).default;
|
|
18
|
+
return _ky;
|
|
19
|
+
}
|
|
20
|
+
const SYSTEM_PROMPT = `You are a task naming assistant. Generate a JSON object with:
|
|
21
|
+
1. "name": A concise task title in the same language as the description (max 20 chars for Chinese, max 50 chars for English)
|
|
22
|
+
2. "branchSlug": An English kebab-case slug for git branch naming (max 5 words, max 40 chars, lowercase, only alphanumeric and hyphens)
|
|
23
|
+
|
|
24
|
+
Respond with ONLY a JSON object, no markdown, no explanation:
|
|
25
|
+
{"name": "...", "branchSlug": "..."}`;
|
|
13
26
|
let TaskNameService = TaskNameService_1 = class TaskNameService {
|
|
14
27
|
logger = new common_1.Logger(TaskNameService_1.name);
|
|
15
28
|
/**
|
|
16
|
-
* Generate a concise task name and branch slug
|
|
29
|
+
* Generate a concise task name and branch slug via LLM API.
|
|
30
|
+
* Auto-detects Anthropic Messages API vs OpenAI-compatible format
|
|
31
|
+
* based on whether LLM_BASE_URL contains "anthropic".
|
|
17
32
|
* Returns null if LLM is not configured or generation fails.
|
|
18
33
|
*/
|
|
19
34
|
async generateMeta(description, projectKey, taskType) {
|
|
@@ -22,35 +37,12 @@ let TaskNameService = TaskNameService_1 = class TaskNameService {
|
|
|
22
37
|
if (!baseUrl || !apiKey)
|
|
23
38
|
return null;
|
|
24
39
|
try {
|
|
25
|
-
const ky = (await import('ky')).default;
|
|
26
40
|
const model = (0, config_1.getLlmModel)();
|
|
27
41
|
const desc = description.slice(0, (0, config_1.getLlmMaxDescriptionLength)());
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
messages: [
|
|
33
|
-
{
|
|
34
|
-
role: 'system',
|
|
35
|
-
content: `You are a task naming assistant. Generate a JSON object with:
|
|
36
|
-
1. "name": A concise task title in the same language as the description (max 20 chars for Chinese, max 50 chars for English)
|
|
37
|
-
2. "branchSlug": An English kebab-case slug for git branch naming (max 5 words, max 40 chars, lowercase, only alphanumeric and hyphens)
|
|
38
|
-
|
|
39
|
-
Respond with ONLY a JSON object, no markdown, no explanation:
|
|
40
|
-
{"name": "...", "branchSlug": "..."}`,
|
|
41
|
-
},
|
|
42
|
-
{
|
|
43
|
-
role: 'user',
|
|
44
|
-
content: `Task type: ${taskType}\nProject: ${projectKey}\nDescription: ${desc}`,
|
|
45
|
-
},
|
|
46
|
-
],
|
|
47
|
-
},
|
|
48
|
-
headers: {
|
|
49
|
-
Authorization: `Bearer ${apiKey}`,
|
|
50
|
-
},
|
|
51
|
-
timeout: 10_000,
|
|
52
|
-
}).json();
|
|
53
|
-
const raw = response.choices?.[0]?.message?.content?.trim()?.replace(/^```(?:json)?\n?|\n?```$/g, '') ?? '';
|
|
42
|
+
const userContent = `Task type: ${taskType}\nProject: ${projectKey}\nDescription: ${desc}`;
|
|
43
|
+
const raw = baseUrl.includes('anthropic')
|
|
44
|
+
? await this.callAnthropic(baseUrl, apiKey, model, userContent)
|
|
45
|
+
: await this.callOpenAI(baseUrl, apiKey, model, userContent);
|
|
54
46
|
const parsed = JSON.parse(raw);
|
|
55
47
|
if (typeof parsed.name === 'string' && parsed.name.length > 0) {
|
|
56
48
|
const name = parsed.name.slice(0, 100);
|
|
@@ -72,6 +64,43 @@ Respond with ONLY a JSON object, no markdown, no explanation:
|
|
|
72
64
|
}
|
|
73
65
|
return null;
|
|
74
66
|
}
|
|
67
|
+
/** Call Anthropic Messages API (native Claude format). */
|
|
68
|
+
async callAnthropic(baseUrl, apiKey, model, userContent) {
|
|
69
|
+
const ky = await getKy();
|
|
70
|
+
const response = await ky.post(`${baseUrl}/v1/messages`, {
|
|
71
|
+
json: {
|
|
72
|
+
model,
|
|
73
|
+
max_tokens: 200,
|
|
74
|
+
system: SYSTEM_PROMPT,
|
|
75
|
+
messages: [{ role: 'user', content: userContent }],
|
|
76
|
+
},
|
|
77
|
+
headers: {
|
|
78
|
+
'x-api-key': apiKey,
|
|
79
|
+
'anthropic-version': '2023-06-01',
|
|
80
|
+
},
|
|
81
|
+
timeout: 10_000,
|
|
82
|
+
}).json();
|
|
83
|
+
return response.content?.[0]?.text?.trim()?.replace(/^```(?:json)?\n?|\n?```$/g, '') ?? '';
|
|
84
|
+
}
|
|
85
|
+
/** Call OpenAI-compatible chat completions API. */
|
|
86
|
+
async callOpenAI(baseUrl, apiKey, model, userContent) {
|
|
87
|
+
const ky = await getKy();
|
|
88
|
+
const response = await ky.post(`${baseUrl}/chat/completions`, {
|
|
89
|
+
json: {
|
|
90
|
+
model,
|
|
91
|
+
max_tokens: 200,
|
|
92
|
+
messages: [
|
|
93
|
+
{ role: 'system', content: SYSTEM_PROMPT },
|
|
94
|
+
{ role: 'user', content: userContent },
|
|
95
|
+
],
|
|
96
|
+
},
|
|
97
|
+
headers: {
|
|
98
|
+
Authorization: `Bearer ${apiKey}`,
|
|
99
|
+
},
|
|
100
|
+
timeout: 10_000,
|
|
101
|
+
}).json();
|
|
102
|
+
return response.choices?.[0]?.message?.content?.trim()?.replace(/^```(?:json)?\n?|\n?```$/g, '') ?? '';
|
|
103
|
+
}
|
|
75
104
|
};
|
|
76
105
|
exports.TaskNameService = TaskNameService;
|
|
77
106
|
exports.TaskNameService = TaskNameService = TaskNameService_1 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-name.service.js","sourceRoot":"","sources":["../../src/dispatcher/task-name.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAoD;AACpD,6CAAwG;
|
|
1
|
+
{"version":3,"file":"task-name.service.js","sourceRoot":"","sources":["../../src/dispatcher/task-name.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":"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
|
|
1
|
+
{"version":3,"file":"notification-consumer.d.ts","sourceRoot":"","sources":["../../src/notifier/notification-consumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -366,6 +366,9 @@ let NotificationConsumer = NotificationConsumer_1 = class NotificationConsumer {
|
|
|
366
366
|
if (eventType === 'admin_alert') {
|
|
367
367
|
return this.templateService.buildAdminAlert(extra.message ?? '', extra.resourceType, extra.resourceId);
|
|
368
368
|
}
|
|
369
|
+
const queueInfo = task.status === protocol_1.TaskStatus.QUEUED
|
|
370
|
+
? this.taskRepo.getQueuePosition(task.id, task.createdAt)
|
|
371
|
+
: undefined;
|
|
369
372
|
return this.templateService.buildTaskNotification(task, eventType, {
|
|
370
373
|
stage: extra.stage,
|
|
371
374
|
fromStage: extra.fromStage,
|
|
@@ -375,6 +378,8 @@ let NotificationConsumer = NotificationConsumer_1 = class NotificationConsumer {
|
|
|
375
378
|
stageChanges: extra.stageChanges,
|
|
376
379
|
projectName: extra.projectName,
|
|
377
380
|
projectRepoUrl: extra.projectRepoUrl,
|
|
381
|
+
queuePosition: queueInfo?.position,
|
|
382
|
+
queueTotal: queueInfo?.total,
|
|
378
383
|
});
|
|
379
384
|
}
|
|
380
385
|
/**
|