@joyjit/vikunja-mcp 0.3.1 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +39 -0
- package/README.md +107 -55
- package/dist/services/TaskCreationService.d.ts.map +1 -1
- package/dist/services/TaskCreationService.js +12 -8
- package/dist/services/TaskCreationService.js.map +1 -1
- package/dist/tools/task-crud.d.ts.map +1 -1
- package/dist/tools/task-crud.js +2 -0
- package/dist/tools/task-crud.js.map +1 -1
- package/dist/tools/tasks/assignees/AssigneeOperationsService.d.ts +35 -1
- package/dist/tools/tasks/assignees/AssigneeOperationsService.d.ts.map +1 -1
- package/dist/tools/tasks/assignees/AssigneeOperationsService.js +63 -10
- package/dist/tools/tasks/assignees/AssigneeOperationsService.js.map +1 -1
- package/dist/tools/tasks/assignees/index.d.ts +2 -0
- package/dist/tools/tasks/assignees/index.d.ts.map +1 -1
- package/dist/tools/tasks/assignees/index.js +12 -3
- package/dist/tools/tasks/assignees/index.js.map +1 -1
- package/dist/tools/tasks/bulk/BulkOperationValidator.d.ts +1 -0
- package/dist/tools/tasks/bulk/BulkOperationValidator.d.ts.map +1 -1
- package/dist/tools/tasks/bulk/BulkOperationValidator.js +6 -0
- package/dist/tools/tasks/bulk/BulkOperationValidator.js.map +1 -1
- package/dist/tools/tasks/bulk-operations-simplified.d.ts +6 -0
- package/dist/tools/tasks/bulk-operations-simplified.d.ts.map +1 -1
- package/dist/tools/tasks/bulk-operations-simplified.js +84 -18
- package/dist/tools/tasks/bulk-operations-simplified.js.map +1 -1
- package/dist/tools/tasks/bulk-operations.d.ts +1 -1
- package/dist/tools/tasks/bulk-operations.d.ts.map +1 -1
- package/dist/tools/tasks/bulk-operations.js +2 -1
- package/dist/tools/tasks/bulk-operations.js.map +1 -1
- package/dist/tools/tasks/crud/TaskCreationService.d.ts +2 -0
- package/dist/tools/tasks/crud/TaskCreationService.d.ts.map +1 -1
- package/dist/tools/tasks/crud/TaskCreationService.js +22 -21
- package/dist/tools/tasks/crud/TaskCreationService.js.map +1 -1
- package/dist/tools/tasks/crud/TaskUpdateService.d.ts +2 -0
- package/dist/tools/tasks/crud/TaskUpdateService.d.ts.map +1 -1
- package/dist/tools/tasks/crud/TaskUpdateService.js +39 -10
- package/dist/tools/tasks/crud/TaskUpdateService.js.map +1 -1
- package/dist/tools/tasks/filtering/FilterValidator.d.ts.map +1 -1
- package/dist/tools/tasks/filtering/FilterValidator.js +42 -6
- package/dist/tools/tasks/filtering/FilterValidator.js.map +1 -1
- package/dist/tools/tasks/index.d.ts.map +1 -1
- package/dist/tools/tasks/index.js +3 -0
- package/dist/tools/tasks/index.js.map +1 -1
- package/dist/tools/tasks/labels.d.ts +42 -0
- package/dist/tools/tasks/labels.d.ts.map +1 -1
- package/dist/tools/tasks/labels.js +74 -17
- package/dist/tools/tasks/labels.js.map +1 -1
- package/dist/tools/tasks/validation.d.ts +4 -0
- package/dist/tools/tasks/validation.d.ts.map +1 -1
- package/dist/tools/tasks/validation.js +13 -0
- package/dist/tools/tasks/validation.js.map +1 -1
- package/dist/tools/templates.d.ts.map +1 -1
- package/dist/tools/templates.js +9 -3
- package/dist/tools/templates.js.map +1 -1
- package/dist/utils/filtering/ClientSideFilteringStrategy.d.ts.map +1 -1
- package/dist/utils/filtering/ClientSideFilteringStrategy.js +3 -1
- package/dist/utils/filtering/ClientSideFilteringStrategy.js.map +1 -1
- package/dist/utils/filtering/FilteringContext.d.ts +14 -8
- package/dist/utils/filtering/FilteringContext.d.ts.map +1 -1
- package/dist/utils/filtering/FilteringContext.js +15 -11
- package/dist/utils/filtering/FilteringContext.js.map +1 -1
- package/dist/utils/retry.d.ts +13 -1
- package/dist/utils/retry.d.ts.map +1 -1
- package/dist/utils/retry.js +45 -3
- package/dist/utils/retry.js.map +1 -1
- package/package.json +7 -4
|
@@ -12,6 +12,8 @@ const auth_error_handler_1 = require("../../../utils/auth-error-handler");
|
|
|
12
12
|
const retry_1 = require("../../../utils/retry");
|
|
13
13
|
const error_handler_1 = require("../../../utils/error-handler");
|
|
14
14
|
const validation_1 = require("../../../utils/validation");
|
|
15
|
+
const labels_1 = require("../labels");
|
|
16
|
+
const assignees_1 = require("../assignees");
|
|
15
17
|
const constants_1 = require("../constants");
|
|
16
18
|
const validation_2 = require("../validation");
|
|
17
19
|
const TaskResponseFormatter_1 = require("./TaskResponseFormatter");
|
|
@@ -37,6 +39,9 @@ async function createTask(args) {
|
|
|
37
39
|
if (args.dueDate) {
|
|
38
40
|
(0, validation_2.validateDateString)(args.dueDate, 'dueDate');
|
|
39
41
|
}
|
|
42
|
+
if (args.percentDone !== undefined) {
|
|
43
|
+
(0, validation_2.validatePercentDone)(args.percentDone);
|
|
44
|
+
}
|
|
40
45
|
// Validate assignee IDs upfront
|
|
41
46
|
if (args.assignees && args.assignees.length > 0) {
|
|
42
47
|
args.assignees.forEach((id) => (0, validation_2.validateId)(id, 'assignee ID'));
|
|
@@ -58,6 +63,8 @@ async function createTask(args) {
|
|
|
58
63
|
newTask.due_date = args.dueDate;
|
|
59
64
|
if (args.priority !== undefined)
|
|
60
65
|
newTask.priority = args.priority;
|
|
66
|
+
if (args.percentDone !== undefined)
|
|
67
|
+
newTask.percent_done = args.percentDone;
|
|
61
68
|
// Handle repeat configuration
|
|
62
69
|
if (args.repeatAfter !== undefined || args.repeatMode !== undefined) {
|
|
63
70
|
const repeatConfig = (0, validation_2.convertRepeatConfiguration)(args.repeatAfter, args.repeatMode);
|
|
@@ -111,6 +118,13 @@ async function createTask(args) {
|
|
|
111
118
|
await rollbackTaskCreation(client, creationState, new Error(`Labels were requested but not attached after create (missing label ids: ${missing.join(', ')})`));
|
|
112
119
|
}
|
|
113
120
|
}
|
|
121
|
+
// Verify assignees stuck — same silent no-op class as labels (upstream #15)
|
|
122
|
+
if (args.assignees && args.assignees.length > 0) {
|
|
123
|
+
const missingAssignees = (0, assignees_1.findMissingAssigneeIds)(completeTask.assignees, args.assignees);
|
|
124
|
+
if (missingAssignees.length > 0) {
|
|
125
|
+
await rollbackTaskCreation(client, creationState, new Error(`Assignees were requested but not attached after create (missing user ids: ${missingAssignees.join(', ')})`));
|
|
126
|
+
}
|
|
127
|
+
}
|
|
114
128
|
const response = (0, TaskResponseFormatter_1.createTaskResponse)('create-task', 'Task created successfully', { task: completeTask }, {
|
|
115
129
|
timestamp: new Date().toISOString(),
|
|
116
130
|
projectId: args.projectId,
|
|
@@ -150,22 +164,14 @@ async function createTask(args) {
|
|
|
150
164
|
}
|
|
151
165
|
}
|
|
152
166
|
/**
|
|
153
|
-
* Adds labels to a task.
|
|
154
|
-
*
|
|
155
|
-
* no-op on some Vikunja versions (GitHub #37).
|
|
156
|
-
*
|
|
157
|
-
* Intentionally does not use withRetry: that helper shares an "anonymous"
|
|
158
|
-
* circuit breaker across calls, so a later create would re-fire the first
|
|
159
|
-
* call's label set against the wrong task.
|
|
167
|
+
* Adds labels to a task via addLabelsToTaskAdditive (individual endpoint).
|
|
168
|
+
* Avoids updateTaskLabels / {label_ids} which silently clears labels (upstream #92).
|
|
160
169
|
*/
|
|
161
170
|
async function addLabelsToTask(client, taskId, labelIds) {
|
|
162
171
|
try {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
label_id: labelId,
|
|
167
|
-
});
|
|
168
|
-
}
|
|
172
|
+
// Shared helper: individual PUT /tasks/{id}/labels. currentLabelIds: [] skips read
|
|
173
|
+
// after create. withRetry is safe on this fork (breaker.fire(operation)).
|
|
174
|
+
await (0, labels_1.addLabelsToTaskAdditive)(client, taskId, labelIds, { currentLabelIds: [] });
|
|
169
175
|
}
|
|
170
176
|
catch (labelError) {
|
|
171
177
|
// Check if it's an auth error
|
|
@@ -176,19 +182,14 @@ async function addLabelsToTask(client, taskId, labelIds) {
|
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
184
|
/**
|
|
179
|
-
* Adds assignees
|
|
185
|
+
* Adds assignees via the individual PUT endpoint (bulk {user_ids} is a silent no-op).
|
|
180
186
|
*/
|
|
181
187
|
async function addAssigneesToTask(client, taskId, assigneeIds) {
|
|
182
188
|
try {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
}), {
|
|
186
|
-
...retry_1.RETRY_CONFIG.AUTH_ERRORS,
|
|
187
|
-
shouldRetry: (error) => (0, auth_error_handler_1.isAuthenticationError)(error)
|
|
188
|
-
});
|
|
189
|
+
// Newly created task has no assignees yet — skip the extra read.
|
|
190
|
+
await (0, assignees_1.addAssigneesToTaskAdditive)(client, taskId, assigneeIds, { currentAssigneeIds: [] });
|
|
189
191
|
}
|
|
190
192
|
catch (assigneeError) {
|
|
191
|
-
// Check if it's an auth error after retries
|
|
192
193
|
if ((0, auth_error_handler_1.isAuthenticationError)(assigneeError)) {
|
|
193
194
|
throw new types_1.MCPError(types_1.ErrorCode.API_ERROR, `${constants_1.AUTH_ERROR_MESSAGES.ASSIGNEE_CREATE} (Retried ${retry_1.RETRY_CONFIG.AUTH_ERRORS.maxRetries} times). Task ID: ${taskId}`);
|
|
194
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskCreationService.js","sourceRoot":"","sources":["../../../../src/tools/tasks/crud/TaskCreationService.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"TaskCreationService.js","sourceRoot":"","sources":["../../../../src/tools/tasks/crud/TaskCreationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ export interface UpdateTaskArgs {
|
|
|
9
9
|
dueDate?: string;
|
|
10
10
|
priority?: number;
|
|
11
11
|
done?: boolean;
|
|
12
|
+
/** Completion percentage (0–100), mapped to Vikunja `percent_done`. */
|
|
13
|
+
percentDone?: number;
|
|
12
14
|
/** Move the task to another project (merged into full-model update). */
|
|
13
15
|
projectId?: number;
|
|
14
16
|
labels?: number[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskUpdateService.d.ts","sourceRoot":"","sources":["../../../../src/tools/tasks/crud/TaskUpdateService.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"TaskUpdateService.d.ts","sourceRoot":"","sources":["../../../../src/tools/tasks/crud/TaskUpdateService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAE/C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAWD;;GAEG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CA8GlH"}
|
|
@@ -10,6 +10,8 @@ const client_1 = require("../../../client");
|
|
|
10
10
|
const validation_1 = require("../validation");
|
|
11
11
|
const auth_error_handler_1 = require("../../../utils/auth-error-handler");
|
|
12
12
|
const retry_1 = require("../../../utils/retry");
|
|
13
|
+
const labels_1 = require("../labels");
|
|
14
|
+
const assignees_1 = require("../assignees");
|
|
13
15
|
const error_handler_1 = require("../../../utils/error-handler");
|
|
14
16
|
const constants_1 = require("../constants");
|
|
15
17
|
const TaskResponseFormatter_1 = require("./TaskResponseFormatter");
|
|
@@ -31,15 +33,21 @@ async function updateTask(args) {
|
|
|
31
33
|
if (args.projectId !== undefined) {
|
|
32
34
|
(0, validation_1.validateId)(args.projectId, 'projectId');
|
|
33
35
|
}
|
|
36
|
+
if (args.percentDone !== undefined) {
|
|
37
|
+
(0, validation_1.validatePercentDone)(args.percentDone);
|
|
38
|
+
}
|
|
34
39
|
const client = await (0, client_1.getClientFromContext)();
|
|
35
40
|
// Analyze current state and track changes
|
|
36
41
|
const updateState = await analyzeUpdateState(client, args.id, args);
|
|
37
42
|
// Build and apply the update (full-model merge — Vikunja replaces the whole task)
|
|
38
43
|
const updateData = buildUpdateData(updateState.currentTask, args);
|
|
39
44
|
await client.tasks.updateTask(args.id, updateData);
|
|
40
|
-
// Update labels if provided
|
|
45
|
+
// Update labels if provided.
|
|
46
|
+
// The semantics are ADDITIVE. What was added and what was kept are reported back, so
|
|
47
|
+
// nobody reads `labels: [3]` in their own request and assumes the task now has only 3.
|
|
48
|
+
let labelOutcome;
|
|
41
49
|
if (args.labels !== undefined) {
|
|
42
|
-
await updateTaskLabels(client, args.id, args.labels);
|
|
50
|
+
labelOutcome = await updateTaskLabels(client, args.id, args.labels);
|
|
43
51
|
}
|
|
44
52
|
// Update assignees if provided
|
|
45
53
|
if (args.assignees !== undefined) {
|
|
@@ -59,6 +67,12 @@ async function updateTask(args) {
|
|
|
59
67
|
affectedFields: updateState.affectedFields,
|
|
60
68
|
previousState: updateState.previousState,
|
|
61
69
|
taskId: args.id,
|
|
70
|
+
...(labelOutcome && {
|
|
71
|
+
// labelsAdded already exists on TaskResponseMetadata as a boolean.
|
|
72
|
+
labelsAppliedIds: labelOutcome.added,
|
|
73
|
+
labelsKeptIds: labelOutcome.kept,
|
|
74
|
+
labelSemantics: 'additive: the labels sent are ADDED to the existing ones; use remove-label to remove any',
|
|
75
|
+
}),
|
|
62
76
|
}, undefined, // verbosity (ignored - using standard AORP)
|
|
63
77
|
undefined, // useOptimizedFormat (ignored - using standard AORP)
|
|
64
78
|
undefined, // useAorp (ignored - always using AORP)
|
|
@@ -108,6 +122,8 @@ async function analyzeUpdateState(client, taskId, args) {
|
|
|
108
122
|
previousState.priority = currentTask.priority;
|
|
109
123
|
if (currentTask.done !== undefined)
|
|
110
124
|
previousState.done = currentTask.done;
|
|
125
|
+
if (currentTask.percent_done !== undefined)
|
|
126
|
+
previousState.percent_done = currentTask.percent_done;
|
|
111
127
|
if (currentTask.project_id !== undefined)
|
|
112
128
|
previousState.project_id = currentTask.project_id;
|
|
113
129
|
if (currentTask.repeat_after !== undefined)
|
|
@@ -126,6 +142,9 @@ async function analyzeUpdateState(client, taskId, args) {
|
|
|
126
142
|
affectedFields.push('priority');
|
|
127
143
|
if (args.done !== undefined && args.done !== currentTask.done)
|
|
128
144
|
affectedFields.push('done');
|
|
145
|
+
if (args.percentDone !== undefined && args.percentDone !== currentTask.percent_done) {
|
|
146
|
+
affectedFields.push('percentDone');
|
|
147
|
+
}
|
|
129
148
|
if (args.projectId !== undefined && args.projectId !== currentTask.project_id)
|
|
130
149
|
affectedFields.push('projectId');
|
|
131
150
|
if (args.repeatAfter !== undefined && args.repeatAfter !== currentTask.repeat_after)
|
|
@@ -155,6 +174,7 @@ function buildUpdateData(currentTask, args) {
|
|
|
155
174
|
...(args.dueDate !== undefined && { due_date: args.dueDate }),
|
|
156
175
|
...(args.priority !== undefined && { priority: args.priority }),
|
|
157
176
|
...(args.done !== undefined && { done: args.done }),
|
|
177
|
+
...(args.percentDone !== undefined && { percent_done: args.percentDone }),
|
|
158
178
|
// Move between projects — must be part of the full-model payload or Vikunja ignores it
|
|
159
179
|
...(args.projectId !== undefined && { project_id: args.projectId }),
|
|
160
180
|
// Handle repeat configuration for updates
|
|
@@ -173,13 +193,20 @@ function buildUpdateData(currentTask, args) {
|
|
|
173
193
|
return updateData;
|
|
174
194
|
}
|
|
175
195
|
/**
|
|
176
|
-
*
|
|
196
|
+
* Adds labels to a task (ADDITIVE) with authentication error handling.
|
|
197
|
+
*
|
|
198
|
+
* This function used to REPLACE the label set through the bulk endpoint. Against a live
|
|
199
|
+
* server that left tasks with NO labels at all: it removed the ones already there and did
|
|
200
|
+
* not apply the requested ones either, because Vikunja expects `{labels: [...]}` on that
|
|
201
|
+
* route and `node-vikunja` sends `{label_ids: [...]}`.
|
|
202
|
+
*
|
|
203
|
+
* It now delegates to `addLabelsToTaskAdditive`, which applies only what is missing, one
|
|
204
|
+
* individual call per label — the same non-destructive shape `updateTaskAssignees` right
|
|
205
|
+
* below already uses.
|
|
177
206
|
*/
|
|
178
207
|
async function updateTaskLabels(client, taskId, labelIds) {
|
|
179
208
|
try {
|
|
180
|
-
await
|
|
181
|
-
label_ids: labelIds,
|
|
182
|
-
});
|
|
209
|
+
return await (0, labels_1.addLabelsToTaskAdditive)(client, taskId, labelIds);
|
|
183
210
|
}
|
|
184
211
|
catch (labelError) {
|
|
185
212
|
// Check if it's an auth error
|
|
@@ -196,14 +223,16 @@ async function updateTaskAssignees(client, taskId, newAssigneeIds) {
|
|
|
196
223
|
try {
|
|
197
224
|
// Get current assignees to calculate diff
|
|
198
225
|
const currentTask = await client.tasks.getTask(taskId);
|
|
199
|
-
const currentAssigneeIds = currentTask.assignees
|
|
226
|
+
const currentAssigneeIds = (currentTask.assignees ?? [])
|
|
227
|
+
.map((a) => a.id)
|
|
228
|
+
.filter((id) => typeof id === 'number');
|
|
200
229
|
// Calculate which assignees to add and remove
|
|
201
230
|
const toAdd = newAssigneeIds.filter((id) => !currentAssigneeIds.includes(id));
|
|
202
231
|
const toRemove = currentAssigneeIds.filter((id) => !newAssigneeIds.includes(id));
|
|
203
|
-
// Add new assignees first
|
|
232
|
+
// Add new assignees first (individual PUT — bulk {user_ids} is a silent no-op)
|
|
204
233
|
if (toAdd.length > 0) {
|
|
205
|
-
await
|
|
206
|
-
|
|
234
|
+
await (0, assignees_1.addAssigneesToTaskAdditive)(client, taskId, toAdd, {
|
|
235
|
+
currentAssigneeIds,
|
|
207
236
|
});
|
|
208
237
|
}
|
|
209
238
|
// Remove old assignees only after new ones are successfully added
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskUpdateService.js","sourceRoot":"","sources":["../../../../src/tools/tasks/crud/TaskUpdateService.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"TaskUpdateService.js","sourceRoot":"","sources":["../../../../src/tools/tasks/crud/TaskUpdateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterValidator.d.ts","sourceRoot":"","sources":["../../../../src/tools/tasks/filtering/FilterValidator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"FilterValidator.d.ts","sourceRoot":"","sources":["../../../../src/tools/tasks/filtering/FilterValidator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,KAAK,EAAE,eAAe,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAMvG;;GAEG;AACH,eAAO,MAAM,eAAe;IAC1B;;OAEG;iCAEK,eAAe,WACZ,iBAAiB,GACzB,OAAO,CAAC;QACT,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,kBAAkB,EAAE,MAAM,EAAE,CAAC;KAC9B,CAAC;IAsFF;;OAEG;oCAEK,eAAe,qBACF,MAAM,GACxB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB;IA6CD;;OAEG;yCACkC,MAAM,eAAe,IAAI,GAAG;QAC/D,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,WAAW,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;QACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;IA4CD;;OAEG;kCAC2B,eAAe,GAAG,MAAM,EAAE;IAyCxD;;OAEG;gCAEK,eAAe,WACZ,iBAAiB,YACjB,0BAA0B,GAClC,OAAO,CAAC;QACT,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,kBAAkB,EAAE,MAAM,EAAE,CAAC;QAC7B,gBAAgB,EAAE;YAChB,OAAO,EAAE,OAAO,CAAC;YACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;YACnB,UAAU,CAAC,EAAE,MAAM,CAAC;SACrB,CAAC;KACH,CAAC;CA4BH,CAAC"}
|
|
@@ -21,24 +21,60 @@ exports.FilterValidator = {
|
|
|
21
21
|
let filterString;
|
|
22
22
|
const validationWarnings = [];
|
|
23
23
|
try {
|
|
24
|
-
//
|
|
24
|
+
// Resolve the user-supplied filter - either a direct filter string or a
|
|
25
|
+
// saved filter referenced by id.
|
|
26
|
+
let userFilter;
|
|
25
27
|
if (args.filterId) {
|
|
26
28
|
const savedFilter = await storage.get(args.filterId);
|
|
27
29
|
if (!savedFilter) {
|
|
28
30
|
throw new types_1.MCPError(types_1.ErrorCode.VALIDATION_ERROR, `Filter with id ${args.filterId} not found`);
|
|
29
31
|
}
|
|
30
|
-
|
|
32
|
+
userFilter = savedFilter.filter;
|
|
31
33
|
}
|
|
32
34
|
else if (args.filter !== undefined) {
|
|
33
|
-
|
|
35
|
+
userFilter = args.filter;
|
|
34
36
|
}
|
|
35
|
-
// Parse the filter
|
|
36
|
-
if (
|
|
37
|
-
const parseResult = (0, filters_1.parseFilterString)(
|
|
37
|
+
// Parse the user-supplied filter into an expression.
|
|
38
|
+
if (userFilter) {
|
|
39
|
+
const parseResult = (0, filters_1.parseFilterString)(userFilter);
|
|
38
40
|
if (parseResult.error) {
|
|
39
41
|
throw new types_1.MCPError(types_1.ErrorCode.VALIDATION_ERROR, `Invalid filter syntax: ${parseResult.error.message}${parseResult.error.context ? `\n${parseResult.error.context}` : ''}`);
|
|
40
42
|
}
|
|
41
43
|
filterExpression = parseResult.expression;
|
|
44
|
+
}
|
|
45
|
+
// Fold the `done` flag into the filter expression so it is applied
|
|
46
|
+
// server-side (before pagination) rather than trimming an already
|
|
47
|
+
// paginated page. Without this, `done=false` scattered open tasks
|
|
48
|
+
// unpredictably across raw pages.
|
|
49
|
+
if (args.done !== undefined) {
|
|
50
|
+
const doneGroup = {
|
|
51
|
+
conditions: [{ field: 'done', operator: '=', value: args.done }],
|
|
52
|
+
operator: '&&',
|
|
53
|
+
};
|
|
54
|
+
if (!filterExpression) {
|
|
55
|
+
filterExpression = { groups: [doneGroup] };
|
|
56
|
+
}
|
|
57
|
+
else if (filterExpression.groups.length === 1) {
|
|
58
|
+
// Single user group: AND `done` on as a second group. The user's
|
|
59
|
+
// group is parenthesised when serialised, so its own &&/|| operator
|
|
60
|
+
// is preserved.
|
|
61
|
+
filterExpression = {
|
|
62
|
+
groups: [...filterExpression.groups, doneGroup],
|
|
63
|
+
operator: '&&',
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
// Multi-group user filter: left untouched - appending a group here
|
|
67
|
+
// could change group-join semantics. `done` is still enforced by
|
|
68
|
+
// FilterExecutor.applyPostProcessingFilters in that case.
|
|
69
|
+
}
|
|
70
|
+
// Serialise the final expression for Vikunja's server-side `filter`
|
|
71
|
+
// query param. When `done` was not folded in, keep the user's original
|
|
72
|
+
// string verbatim.
|
|
73
|
+
if (filterExpression) {
|
|
74
|
+
filterString =
|
|
75
|
+
args.done === undefined ? userFilter : (0, filters_1.expressionToString)(filterExpression);
|
|
76
|
+
}
|
|
77
|
+
if (filterString) {
|
|
42
78
|
// Log that we're preparing to attempt hybrid filtering
|
|
43
79
|
logger_1.logger.info('Preparing hybrid filtering (server-side attempt + client-side fallback)', {
|
|
44
80
|
filter: filterString,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterValidator.js","sourceRoot":"","sources":["../../../../src/tools/tasks/filtering/FilterValidator.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAKH,0CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"FilterValidator.js","sourceRoot":"","sources":["../../../../src/tools/tasks/filtering/FilterValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/tasks/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AA4G9E,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,WAAW,EACxB,aAAa,CAAC,EAAE,oBAAoB,GACnC,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/tasks/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AA4G9E,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,WAAW,EACxB,aAAa,CAAC,EAAE,oBAAoB,GACnC,IAAI,CA6LN"}
|
|
@@ -122,6 +122,8 @@ function registerTasksTool(server, authManager, clientFactory) {
|
|
|
122
122
|
projectId: zod_1.z.number().optional(),
|
|
123
123
|
dueDate: zod_1.z.string().optional(),
|
|
124
124
|
priority: zod_1.z.number().min(0).max(5).optional(),
|
|
125
|
+
/** Completion percentage 0–100 (Vikunja percent_done) */
|
|
126
|
+
percentDone: zod_1.z.number().min(0).max(100).optional(),
|
|
125
127
|
labels: zod_1.z.array(zod_1.z.number()).optional(),
|
|
126
128
|
assignees: zod_1.z.array(zod_1.z.number()).optional(),
|
|
127
129
|
// Recurring task fields
|
|
@@ -151,6 +153,7 @@ function registerTasksTool(server, authManager, clientFactory) {
|
|
|
151
153
|
description: zod_1.z.string().optional(),
|
|
152
154
|
dueDate: zod_1.z.string().optional(),
|
|
153
155
|
priority: zod_1.z.number().min(0).max(5).optional(),
|
|
156
|
+
percentDone: zod_1.z.number().min(0).max(100).optional(),
|
|
154
157
|
labels: zod_1.z.array(zod_1.z.number()).optional(),
|
|
155
158
|
assignees: zod_1.z.array(zod_1.z.number()).optional(),
|
|
156
159
|
repeatAfter: zod_1.z.number().min(0).optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/tasks/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAiHH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/tasks/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,50 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Label operations for tasks
|
|
3
3
|
*/
|
|
4
|
+
import type { VikunjaClient } from 'node-vikunja';
|
|
5
|
+
/**
|
|
6
|
+
* Applies labels to a task WITHOUT destroying the ones it already has.
|
|
7
|
+
*
|
|
8
|
+
* Two chained bugs made the previous path lose data. Both verified against a live
|
|
9
|
+
* Vikunja v2.4.0 instance:
|
|
10
|
+
*
|
|
11
|
+
* 1) UNUSABLE PAYLOAD. `node-vikunja`'s `updateTaskLabels` posts `{label_ids: [...]}`
|
|
12
|
+
* to `/tasks/{id}/labels/bulk`, but the model Vikunja declares for that endpoint is
|
|
13
|
+
* `{labels: [...]}` (see `LabelTaskBulk` in the server's OpenAPI). The unknown field
|
|
14
|
+
* is discarded, the server reads an EMPTY label list, and dutifully applies it: it
|
|
15
|
+
* removes every label and adds none — while answering `201`.
|
|
16
|
+
*
|
|
17
|
+
* 2) REPLACE SEMANTICS. Even with a working payload, the bulk endpoint replaces the
|
|
18
|
+
* whole set, so any label not repeated in the call is dropped. A caller that only
|
|
19
|
+
* wants to add one label has no way to know what else is on the task.
|
|
20
|
+
*
|
|
21
|
+
* Reproduction: a task carrying labels 2 and 4, updated with `labels: [3]`, ended up
|
|
22
|
+
* with NONE — the two it had were gone and the requested one was never applied, and the
|
|
23
|
+
* operation reported success.
|
|
24
|
+
*
|
|
25
|
+
* The fix drops the bulk endpoint for the INDIVIDUAL one (`PUT /tasks/{id}/labels`, which
|
|
26
|
+
* returns 201 and actually applies), one call per label, over the UNION with what the task
|
|
27
|
+
* already had. There is precedent in this codebase: assignees moved to one-by-one calls
|
|
28
|
+
* for the same kind of reason (see AssigneeOperationsService).
|
|
29
|
+
*
|
|
30
|
+
* Resulting semantics: labels are ADDED, never removed. `remove-label` removes them.
|
|
31
|
+
* One deliberate consequence: `labels: []` no longer empties a task — it is a no-op. That
|
|
32
|
+
* used to be the way to clear all labels, but it was also the way to lose them by accident.
|
|
33
|
+
*
|
|
34
|
+
* @param currentLabelIds labels the task already carries. Read from the server if omitted.
|
|
35
|
+
* Callers that have just CREATED the task pass `[]` and skip the read.
|
|
36
|
+
* @returns what was added and what was kept, so the caller can report it without guessing.
|
|
37
|
+
*/
|
|
38
|
+
export declare function addLabelsToTaskAdditive(client: VikunjaClient, taskId: number, labelIds: number[], options?: {
|
|
39
|
+
currentLabelIds?: number[];
|
|
40
|
+
}): Promise<{
|
|
41
|
+
added: number[];
|
|
42
|
+
kept: number[];
|
|
43
|
+
}>;
|
|
4
44
|
/**
|
|
5
45
|
* Add labels to a task
|
|
46
|
+
*
|
|
47
|
+
* Semantics: ADD. Labels the task already had are preserved.
|
|
6
48
|
*/
|
|
7
49
|
export declare function applyLabels(args: {
|
|
8
50
|
id?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../../src/tools/tasks/labels.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../../src/tools/tasks/labels.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAMlD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GAC3C,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA6B9C;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CAkE9D;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CAgE9D;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CA8C9D"}
|