@jagadeesh52423/atlassian-mcp-server 1.3.1 → 1.4.0
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/README.md +3 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/formatters/annotations.d.ts +82 -0
- package/dist/formatters/annotations.d.ts.map +1 -0
- package/dist/formatters/annotations.js +441 -0
- package/dist/formatters/annotations.js.map +1 -0
- package/dist/formatters/index.d.ts +3 -0
- package/dist/formatters/index.d.ts.map +1 -1
- package/dist/formatters/index.js +2 -0
- package/dist/formatters/index.js.map +1 -1
- package/dist/formatters/markdown-to-adf.d.ts.map +1 -1
- package/dist/formatters/markdown-to-adf.js +79 -1
- package/dist/formatters/markdown-to-adf.js.map +1 -1
- package/dist/formatters/wiki-guard.d.ts +18 -0
- package/dist/formatters/wiki-guard.d.ts.map +1 -0
- package/dist/formatters/wiki-guard.js +66 -0
- package/dist/formatters/wiki-guard.js.map +1 -0
- package/dist/handlers/bitbucket-handlers.d.ts +2 -0
- package/dist/handlers/bitbucket-handlers.d.ts.map +1 -1
- package/dist/handlers/bitbucket-handlers.js +8 -6
- package/dist/handlers/bitbucket-handlers.js.map +1 -1
- package/dist/handlers/confluence-handlers.d.ts +4 -0
- package/dist/handlers/confluence-handlers.d.ts.map +1 -1
- package/dist/handlers/confluence-handlers.js +42 -1
- package/dist/handlers/confluence-handlers.js.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/services/bitbucket.d.ts +2 -1
- package/dist/services/bitbucket.d.ts.map +1 -1
- package/dist/services/bitbucket.js +13 -1
- package/dist/services/bitbucket.js.map +1 -1
- package/dist/services/confluence.d.ts +50 -2
- package/dist/services/confluence.d.ts.map +1 -1
- package/dist/services/confluence.js +190 -4
- package/dist/services/confluence.js.map +1 -1
- package/dist/tools/bitbucket-tools.d.ts.map +1 -1
- package/dist/tools/bitbucket-tools.js +9 -1
- package/dist/tools/bitbucket-tools.js.map +1 -1
- package/dist/tools/confluence-tools.d.ts.map +1 -1
- package/dist/tools/confluence-tools.js +27 -2
- package/dist/tools/confluence-tools.js.map +1 -1
- package/dist/types.d.ts +27 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
2
|
import { bitbucketConfig, getBitbucketAuth } from '../config.js';
|
|
3
|
+
import { assertMarkdown } from '../formatters/index.js';
|
|
3
4
|
export class BitbucketService {
|
|
4
5
|
client;
|
|
5
6
|
workspace;
|
|
@@ -114,7 +115,8 @@ export class BitbucketService {
|
|
|
114
115
|
}
|
|
115
116
|
return pullRequest;
|
|
116
117
|
}
|
|
117
|
-
async createPullRequest(repoName, title, sourceBranch, destinationBranch = 'main', description = '') {
|
|
118
|
+
async createPullRequest(repoName, title, sourceBranch, destinationBranch = 'main', description = '', draft) {
|
|
119
|
+
assertMarkdown(description, 'description');
|
|
118
120
|
const data = {
|
|
119
121
|
title,
|
|
120
122
|
description,
|
|
@@ -125,6 +127,9 @@ export class BitbucketService {
|
|
|
125
127
|
branch: { name: destinationBranch }
|
|
126
128
|
}
|
|
127
129
|
};
|
|
130
|
+
if (draft !== undefined) {
|
|
131
|
+
data.draft = draft;
|
|
132
|
+
}
|
|
128
133
|
const response = await this.client.post(`/repositories/${this.workspace}/${repoName}/pullrequests`, data);
|
|
129
134
|
return response.data;
|
|
130
135
|
}
|
|
@@ -134,11 +139,15 @@ export class BitbucketService {
|
|
|
134
139
|
data.title = updates.title;
|
|
135
140
|
}
|
|
136
141
|
if (updates.description !== undefined) {
|
|
142
|
+
assertMarkdown(updates.description, 'description');
|
|
137
143
|
data.description = updates.description;
|
|
138
144
|
}
|
|
139
145
|
if (updates.destinationBranch !== undefined) {
|
|
140
146
|
data.destination = { branch: { name: updates.destinationBranch } };
|
|
141
147
|
}
|
|
148
|
+
if (updates.draft !== undefined) {
|
|
149
|
+
data.draft = updates.draft;
|
|
150
|
+
}
|
|
142
151
|
const response = await this.client.put(`/repositories/${this.workspace}/${repoName}/pullrequests/${prId}`, data);
|
|
143
152
|
return response.data;
|
|
144
153
|
}
|
|
@@ -176,6 +185,7 @@ export class BitbucketService {
|
|
|
176
185
|
return response.data.values;
|
|
177
186
|
}
|
|
178
187
|
async createIssue(repoName, title, content = '', kind = 'bug') {
|
|
188
|
+
assertMarkdown(content, 'content');
|
|
179
189
|
const data = {
|
|
180
190
|
title,
|
|
181
191
|
content: { raw: content },
|
|
@@ -190,6 +200,7 @@ export class BitbucketService {
|
|
|
190
200
|
return response.data.values.map(BitbucketService.mapComment);
|
|
191
201
|
}
|
|
192
202
|
async addPRComment(repoName, prId, content, inline, parentId) {
|
|
203
|
+
assertMarkdown(content, 'content');
|
|
193
204
|
const data = { content: { raw: content } };
|
|
194
205
|
if (inline) {
|
|
195
206
|
data.inline = inline;
|
|
@@ -201,6 +212,7 @@ export class BitbucketService {
|
|
|
201
212
|
return BitbucketService.mapComment(response.data);
|
|
202
213
|
}
|
|
203
214
|
async updatePRComment(repoName, prId, commentId, content) {
|
|
215
|
+
assertMarkdown(content, 'content');
|
|
204
216
|
const response = await this.client.put(`/repositories/${this.workspace}/${repoName}/pullrequests/${prId}/comments/${commentId}`, { content: { raw: content } });
|
|
205
217
|
return BitbucketService.mapComment(response.data);
|
|
206
218
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitbucket.js","sourceRoot":"","sources":["../../src/services/bitbucket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"bitbucket.js","sourceRoot":"","sources":["../../src/services/bitbucket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfluencePage, ConfluenceAttachment, ConfluenceImage, ConfluenceComment, ConfluenceCommentFilter, SearchOptions } from '../types.js';
|
|
1
|
+
import { ConfluencePage, ConfluenceAttachment, ConfluenceImage, ConfluenceComment, ConfluenceCommentFilter, InlineCommentRepair, SearchOptions } from '../types.js';
|
|
2
2
|
/**
|
|
3
3
|
* Confluence service.
|
|
4
4
|
*
|
|
@@ -55,8 +55,56 @@ export declare class ConfluenceService {
|
|
|
55
55
|
searchPages(options?: SearchOptions): Promise<ConfluencePage[]>;
|
|
56
56
|
getPage(pageId: string): Promise<ConfluencePage>;
|
|
57
57
|
createPage(spaceKey: string, title: string, content: string, parentId?: string): Promise<ConfluencePage>;
|
|
58
|
-
|
|
58
|
+
/**
|
|
59
|
+
* Replace a page body, carrying inline-comment anchors over to the new text.
|
|
60
|
+
*
|
|
61
|
+
* Inline comments are `annotation` marks inside the body, so a body rebuilt
|
|
62
|
+
* from markdown would drop every one of them. We read the live body first and
|
|
63
|
+
* re-anchor each marker onto text that survived the edit; `inlineComments`
|
|
64
|
+
* reports what could and could not be re-anchored.
|
|
65
|
+
*
|
|
66
|
+
* ponytail: costs one extra GET per update — there is no way to know whether
|
|
67
|
+
* a page carries markers without reading it.
|
|
68
|
+
*/
|
|
69
|
+
updatePage(pageId: string, title: string, content: string, version: number): Promise<ConfluencePage & {
|
|
70
|
+
inlineComments?: {
|
|
71
|
+
preserved: number;
|
|
72
|
+
dropped: string[];
|
|
73
|
+
ambiguous: string[];
|
|
74
|
+
};
|
|
75
|
+
}>;
|
|
59
76
|
deletePage(pageId: string): Promise<void>;
|
|
77
|
+
/**
|
|
78
|
+
* Body ADF of a superseded page version. v2 has no historical-body endpoint.
|
|
79
|
+
* Returns null when that version cannot be read — Confluence trims and purges
|
|
80
|
+
* old versions, and one unreadable version must not abort a whole repair.
|
|
81
|
+
*/
|
|
82
|
+
private getHistoricalBody;
|
|
83
|
+
/**
|
|
84
|
+
* ponytail: cap the history walk. One unlocatable comment on a long-lived
|
|
85
|
+
* page would otherwise mean hundreds of sequential full-body fetches. Raise
|
|
86
|
+
* it, or fetch versions concurrently, if a real page needs deeper history.
|
|
87
|
+
*/
|
|
88
|
+
private static readonly MAX_HISTORY_LOOKBACK;
|
|
89
|
+
/** Explicit comment page size; the v2 default of 25 truncates silently. */
|
|
90
|
+
private static readonly COMMENT_PAGE_SIZE;
|
|
91
|
+
/** Whether the last fetch of `pageId:kind` had a further page. */
|
|
92
|
+
private truncatedComments;
|
|
93
|
+
/**
|
|
94
|
+
* Re-attach inline comments detached by an earlier page update.
|
|
95
|
+
*
|
|
96
|
+
* An inline comment anchors via an `annotation` mark in the page body, so any
|
|
97
|
+
* update that rebuilt the body from markdown stripped every marker and left
|
|
98
|
+
* the comments floating. This walks back through page history to find where
|
|
99
|
+
* each orphan was anchored, then re-marks that text in the current body.
|
|
100
|
+
*
|
|
101
|
+
* Only unambiguous matches are written. An anchor that now matches several
|
|
102
|
+
* places, or none, is reported untouched — silently re-attaching a reviewer's
|
|
103
|
+
* question to the wrong sentence is worse than leaving it detached.
|
|
104
|
+
*
|
|
105
|
+
* Text is never modified; this adds marks only.
|
|
106
|
+
*/
|
|
107
|
+
reattachInlineComments(pageId: string, dryRunArg?: boolean): Promise<InlineCommentRepair>;
|
|
60
108
|
getSpaces(limit?: number): Promise<any[]>;
|
|
61
109
|
getPagesBySpace(spaceKey: string, limit?: number): Promise<ConfluencePage[]>;
|
|
62
110
|
getPageChildren(pageId: string, limit?: number): Promise<ConfluencePage[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confluence.d.ts","sourceRoot":"","sources":["../../src/services/confluence.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAE,iBAAiB,EAAyB,uBAAuB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"confluence.d.ts","sourceRoot":"","sources":["../../src/services/confluence.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ConfluenceClient } from '../clients/confluence-client.js';
|
|
2
|
-
import { markdownToADF } from '../formatters/index.js';
|
|
2
|
+
import { markdownToADF, collectAnnotations, reapplyAnnotations, locateAnnotation, applyLocator, } from '../formatters/index.js';
|
|
3
3
|
import * as fs from 'fs';
|
|
4
4
|
import * as path from 'path';
|
|
5
5
|
/**
|
|
@@ -156,20 +156,202 @@ export class ConfluenceService {
|
|
|
156
156
|
const page = await this.client.post(`${ConfluenceService.V2}/pages?${ConfluenceService.BODY_FORMAT_QS}`, data);
|
|
157
157
|
return this.mapV2Page(page, spaceKey);
|
|
158
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Replace a page body, carrying inline-comment anchors over to the new text.
|
|
161
|
+
*
|
|
162
|
+
* Inline comments are `annotation` marks inside the body, so a body rebuilt
|
|
163
|
+
* from markdown would drop every one of them. We read the live body first and
|
|
164
|
+
* re-anchor each marker onto text that survived the edit; `inlineComments`
|
|
165
|
+
* reports what could and could not be re-anchored.
|
|
166
|
+
*
|
|
167
|
+
* ponytail: costs one extra GET per update — there is no way to know whether
|
|
168
|
+
* a page carries markers without reading it.
|
|
169
|
+
*/
|
|
159
170
|
async updatePage(pageId, title, content, version) {
|
|
171
|
+
const current = await this.client.get(`${ConfluenceService.V2}/pages/${pageId}?${ConfluenceService.BODY_FORMAT_QS}`);
|
|
172
|
+
const priorBody = this.parseAdfBody(current?.body);
|
|
173
|
+
const annotations = collectAnnotations(priorBody);
|
|
174
|
+
// Structural locator first — it knows which table row or block the comment
|
|
175
|
+
// sat in, so it resolves anchors whose text repeats elsewhere on the page.
|
|
176
|
+
// Unambiguous text search is the fallback for text that moved between
|
|
177
|
+
// blocks. Neither guesses: an anchor matching several places is reported.
|
|
178
|
+
let doc = markdownToADF(content);
|
|
179
|
+
const preserved = [];
|
|
180
|
+
const ambiguous = [];
|
|
181
|
+
const dropped = [];
|
|
182
|
+
for (const annotation of annotations) {
|
|
183
|
+
const locator = locateAnnotation(priorBody, annotation.id);
|
|
184
|
+
if (locator) {
|
|
185
|
+
const applied = applyLocator(doc, locator, annotation.id);
|
|
186
|
+
if (applied.status === 'exact') {
|
|
187
|
+
doc = applied.doc;
|
|
188
|
+
preserved.push(annotation.text);
|
|
189
|
+
continue;
|
|
190
|
+
}
|
|
191
|
+
if (applied.status === 'ambiguous') {
|
|
192
|
+
ambiguous.push(annotation.text);
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
const fallback = reapplyAnnotations(doc, [annotation]);
|
|
197
|
+
doc = fallback.doc;
|
|
198
|
+
if (fallback.preserved.length)
|
|
199
|
+
preserved.push(annotation.text);
|
|
200
|
+
else if (fallback.ambiguous.length)
|
|
201
|
+
ambiguous.push(annotation.text);
|
|
202
|
+
else
|
|
203
|
+
dropped.push(annotation.text);
|
|
204
|
+
}
|
|
160
205
|
const data = {
|
|
161
206
|
id: pageId,
|
|
162
207
|
status: 'current',
|
|
163
208
|
title,
|
|
164
|
-
body:
|
|
209
|
+
body: { representation: ConfluenceService.REPRESENTATION, value: JSON.stringify(doc) },
|
|
165
210
|
version: { number: version + 1, message: '' },
|
|
166
211
|
};
|
|
167
212
|
const page = await this.client.put(`${ConfluenceService.V2}/pages/${pageId}?${ConfluenceService.BODY_FORMAT_QS}`, data);
|
|
168
|
-
|
|
213
|
+
const mapped = this.mapV2Page(page);
|
|
214
|
+
return annotations.length
|
|
215
|
+
? { ...mapped, inlineComments: { preserved: preserved.length, dropped, ambiguous } }
|
|
216
|
+
: mapped;
|
|
169
217
|
}
|
|
170
218
|
async deletePage(pageId) {
|
|
171
219
|
await this.client.delete(`${ConfluenceService.V2}/pages/${pageId}`);
|
|
172
220
|
}
|
|
221
|
+
/**
|
|
222
|
+
* Body ADF of a superseded page version. v2 has no historical-body endpoint.
|
|
223
|
+
* Returns null when that version cannot be read — Confluence trims and purges
|
|
224
|
+
* old versions, and one unreadable version must not abort a whole repair.
|
|
225
|
+
*/
|
|
226
|
+
async getHistoricalBody(pageId, version) {
|
|
227
|
+
try {
|
|
228
|
+
const page = await this.client.get(`${ConfluenceService.V1}/content/${pageId}`, {
|
|
229
|
+
status: 'historical',
|
|
230
|
+
version,
|
|
231
|
+
expand: `body.${ConfluenceService.REPRESENTATION}`,
|
|
232
|
+
});
|
|
233
|
+
return this.parseAdfBody(page?.body);
|
|
234
|
+
}
|
|
235
|
+
catch {
|
|
236
|
+
return null;
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
/**
|
|
240
|
+
* ponytail: cap the history walk. One unlocatable comment on a long-lived
|
|
241
|
+
* page would otherwise mean hundreds of sequential full-body fetches. Raise
|
|
242
|
+
* it, or fetch versions concurrently, if a real page needs deeper history.
|
|
243
|
+
*/
|
|
244
|
+
static MAX_HISTORY_LOOKBACK = 50;
|
|
245
|
+
/** Explicit comment page size; the v2 default of 25 truncates silently. */
|
|
246
|
+
static COMMENT_PAGE_SIZE = 250;
|
|
247
|
+
/** Whether the last fetch of `pageId:kind` had a further page. */
|
|
248
|
+
truncatedComments = new Map();
|
|
249
|
+
/**
|
|
250
|
+
* Re-attach inline comments detached by an earlier page update.
|
|
251
|
+
*
|
|
252
|
+
* An inline comment anchors via an `annotation` mark in the page body, so any
|
|
253
|
+
* update that rebuilt the body from markdown stripped every marker and left
|
|
254
|
+
* the comments floating. This walks back through page history to find where
|
|
255
|
+
* each orphan was anchored, then re-marks that text in the current body.
|
|
256
|
+
*
|
|
257
|
+
* Only unambiguous matches are written. An anchor that now matches several
|
|
258
|
+
* places, or none, is reported untouched — silently re-attaching a reviewer's
|
|
259
|
+
* question to the wrong sentence is worse than leaving it detached.
|
|
260
|
+
*
|
|
261
|
+
* Text is never modified; this adds marks only.
|
|
262
|
+
*/
|
|
263
|
+
async reattachInlineComments(pageId, dryRunArg) {
|
|
264
|
+
// Only a literal false writes. A client sending null/0/"" for an unset
|
|
265
|
+
// optional boolean must not trigger a live page write.
|
|
266
|
+
const dryRun = dryRunArg !== false;
|
|
267
|
+
const page = await this.client.get(`${ConfluenceService.V2}/pages/${pageId}?${ConfluenceService.BODY_FORMAT_QS}`);
|
|
268
|
+
const currentBody = this.parseAdfBody(page?.body);
|
|
269
|
+
if (!currentBody)
|
|
270
|
+
throw new Error(`Page ${pageId} returned no ADF body — cannot re-attach comments.`);
|
|
271
|
+
const version = page?.version?.number ?? 1;
|
|
272
|
+
const allInline = await this.getComments(pageId, 'inline');
|
|
273
|
+
// Repairing from a truncated list would under-report and under-repair while
|
|
274
|
+
// the totals below looked authoritative — refuse rather than mislead.
|
|
275
|
+
if (this.truncatedComments.get(`${pageId}:inline`)) {
|
|
276
|
+
throw new Error(`Page ${pageId} has more than ${ConfluenceService.COMMENT_PAGE_SIZE} inline comments. ` +
|
|
277
|
+
`This server does not follow comment pagination, so a repair would silently skip some. ` +
|
|
278
|
+
`Re-attach is refused; reading comments still works.`);
|
|
279
|
+
}
|
|
280
|
+
const inline = allInline.filter((c) => c.markerRef);
|
|
281
|
+
const anchored = new Set(collectAnnotations(currentBody).map((a) => a.id));
|
|
282
|
+
const orphans = inline.filter((c) => !anchored.has(c.markerRef));
|
|
283
|
+
const oldest = Math.max(1, version - ConfluenceService.MAX_HISTORY_LOOKBACK);
|
|
284
|
+
const outcome = {
|
|
285
|
+
pageId,
|
|
286
|
+
version,
|
|
287
|
+
dryRun,
|
|
288
|
+
inlineComments: inline.length,
|
|
289
|
+
stillAnchored: inline.length - orphans.length,
|
|
290
|
+
reattached: [],
|
|
291
|
+
ambiguous: [],
|
|
292
|
+
lost: [],
|
|
293
|
+
};
|
|
294
|
+
if (orphans.length === 0)
|
|
295
|
+
return outcome;
|
|
296
|
+
// Cache history lookups — several orphans usually detached in the same edit.
|
|
297
|
+
const history = new Map();
|
|
298
|
+
const unreadable = new Set();
|
|
299
|
+
const bodyAt = async (n) => {
|
|
300
|
+
if (!history.has(n))
|
|
301
|
+
history.set(n, await this.getHistoricalBody(pageId, n));
|
|
302
|
+
return history.get(n);
|
|
303
|
+
};
|
|
304
|
+
let doc = currentBody;
|
|
305
|
+
for (const comment of orphans) {
|
|
306
|
+
const markerRef = comment.markerRef;
|
|
307
|
+
const entry = { commentId: comment.id, markerRef, anchorText: comment.anchoredText ?? '' };
|
|
308
|
+
let locator = null;
|
|
309
|
+
for (let n = version - 1; n >= oldest && !locator; n--) {
|
|
310
|
+
const body = await bodyAt(n);
|
|
311
|
+
if (!body) {
|
|
312
|
+
unreadable.add(n);
|
|
313
|
+
continue;
|
|
314
|
+
}
|
|
315
|
+
locator = locateAnnotation(body, markerRef);
|
|
316
|
+
if (locator)
|
|
317
|
+
entry.anchorText = locator.text;
|
|
318
|
+
}
|
|
319
|
+
if (!locator) {
|
|
320
|
+
outcome.lost.push({
|
|
321
|
+
...entry,
|
|
322
|
+
reason: `no readable page version back to v${oldest} contains this marker` +
|
|
323
|
+
(unreadable.size ? ` (could not read v${[...unreadable].join(', v')})` : ''),
|
|
324
|
+
});
|
|
325
|
+
continue;
|
|
326
|
+
}
|
|
327
|
+
const applied = applyLocator(doc, locator, markerRef);
|
|
328
|
+
doc = applied.doc;
|
|
329
|
+
if (applied.status === 'exact')
|
|
330
|
+
outcome.reattached.push(entry);
|
|
331
|
+
else if (applied.status === 'ambiguous')
|
|
332
|
+
outcome.ambiguous.push({ ...entry, reason: 'anchor text matches more than one place in the current page' });
|
|
333
|
+
else if (applied.status === 'unmatchable')
|
|
334
|
+
outcome.ambiguous.push({
|
|
335
|
+
...entry,
|
|
336
|
+
reason: 'the anchored text still exists but is broken up by other formatting, so it cannot be matched as one unbroken run',
|
|
337
|
+
});
|
|
338
|
+
else
|
|
339
|
+
outcome.lost.push({ ...entry, reason: 'the text this comment was anchored to no longer exists' });
|
|
340
|
+
}
|
|
341
|
+
if (unreadable.size)
|
|
342
|
+
outcome.unreadableVersions = [...unreadable].sort((a, b) => b - a);
|
|
343
|
+
if (dryRun || outcome.reattached.length === 0)
|
|
344
|
+
return outcome;
|
|
345
|
+
const updated = await this.client.put(`${ConfluenceService.V2}/pages/${pageId}?${ConfluenceService.BODY_FORMAT_QS}`, {
|
|
346
|
+
id: pageId,
|
|
347
|
+
status: 'current',
|
|
348
|
+
title: page.title,
|
|
349
|
+
body: { representation: ConfluenceService.REPRESENTATION, value: JSON.stringify(doc) },
|
|
350
|
+
version: { number: version + 1, message: 'Re-attach inline comments orphaned by an earlier update' },
|
|
351
|
+
});
|
|
352
|
+
outcome.newVersion = updated?.version?.number;
|
|
353
|
+
return outcome;
|
|
354
|
+
}
|
|
173
355
|
// ---------- Spaces ----------
|
|
174
356
|
async getSpaces(limit = 25) {
|
|
175
357
|
const response = await this.client.get(`${ConfluenceService.V2}/spaces`, { limit });
|
|
@@ -314,7 +496,11 @@ export class ConfluenceService {
|
|
|
314
496
|
/** Fetch and shape a single comment kind for a page. */
|
|
315
497
|
async fetchComments(pageId, kind) {
|
|
316
498
|
const source = ConfluenceService.COMMENT_SOURCES[kind];
|
|
317
|
-
const response = await this.client.get(`${ConfluenceService.V2}/pages/${pageId}/${source.path}`, { 'body-format': ConfluenceService.REPRESENTATION });
|
|
499
|
+
const response = await this.client.get(`${ConfluenceService.V2}/pages/${pageId}/${source.path}`, { 'body-format': ConfluenceService.REPRESENTATION, limit: ConfluenceService.COMMENT_PAGE_SIZE });
|
|
500
|
+
// ponytail: single page. v2 defaults to 25, so the explicit limit covers any
|
|
501
|
+
// realistic page; follow `_links.next` if one ever exceeds it. Reads stay
|
|
502
|
+
// best-effort — only reattachInlineComments treats completeness as required.
|
|
503
|
+
this.truncatedComments.set(`${pageId}:${kind}`, Boolean(response?._links?.next));
|
|
318
504
|
const map = this[source.map].bind(this);
|
|
319
505
|
return (response?.results ?? []).map((comment) => map(comment));
|
|
320
506
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confluence.js","sourceRoot":"","sources":["../../src/services/confluence.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"confluence.js","sourceRoot":"","sources":["../../src/services/confluence.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitbucket-tools.d.ts","sourceRoot":"","sources":["../../src/tools/bitbucket-tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"bitbucket-tools.d.ts","sourceRoot":"","sources":["../../src/tools/bitbucket-tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,cAAc,EAka1C,CAAC"}
|
|
@@ -136,13 +136,17 @@ export const bitbucketTools = [
|
|
|
136
136
|
type: 'string',
|
|
137
137
|
description: 'Pull request description',
|
|
138
138
|
},
|
|
139
|
+
draft: {
|
|
140
|
+
type: 'boolean',
|
|
141
|
+
description: 'Create the PR as a draft (default: false)',
|
|
142
|
+
},
|
|
139
143
|
},
|
|
140
144
|
required: ['repoName', 'title', 'sourceBranch'],
|
|
141
145
|
},
|
|
142
146
|
},
|
|
143
147
|
{
|
|
144
148
|
name: 'bitbucket_update_pull_request',
|
|
145
|
-
description: 'Update an existing pull request (title, description, or
|
|
149
|
+
description: 'Update an existing pull request (title, description, destination branch, or draft state). At least one of title, description, destinationBranch, or draft must be provided.',
|
|
146
150
|
inputSchema: {
|
|
147
151
|
type: 'object',
|
|
148
152
|
properties: {
|
|
@@ -166,6 +170,10 @@ export const bitbucketTools = [
|
|
|
166
170
|
type: 'string',
|
|
167
171
|
description: 'New destination branch name',
|
|
168
172
|
},
|
|
173
|
+
draft: {
|
|
174
|
+
type: 'boolean',
|
|
175
|
+
description: 'Set draft state; false marks a draft PR ready for review',
|
|
176
|
+
},
|
|
169
177
|
},
|
|
170
178
|
required: ['repoName', 'prId'],
|
|
171
179
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitbucket-tools.js","sourceRoot":"","sources":["../../src/tools/bitbucket-tools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bitbucket-tools.js","sourceRoot":"","sources":["../../src/tools/bitbucket-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confluence-tools.d.ts","sourceRoot":"","sources":["../../src/tools/confluence-tools.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"confluence-tools.d.ts","sourceRoot":"","sources":["../../src/tools/confluence-tools.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,cAAc,EAod3C,CAAC"}
|
|
@@ -102,7 +102,10 @@ export const confluenceTools = [
|
|
|
102
102
|
},
|
|
103
103
|
{
|
|
104
104
|
name: 'confluence_update_page',
|
|
105
|
-
description: 'Update an existing Confluence page. The `content` field accepts Markdown — the server converts it to ADF and submits it via the v2 API. The returned `content` is the ADF JSON document.'
|
|
105
|
+
description: 'Update an existing Confluence page. The `content` field accepts Markdown — the server converts it to ADF and submits it via the v2 API. The returned `content` is the ADF JSON document. ' +
|
|
106
|
+
'IMPORTANT — inline comments: they anchor to specific page text, so rewriting a passage detaches any comment on it. This server re-anchors them for you, locating each comment by the table row or block it sat in and falling back to matching its text, but a comment whose text you reword or delete cannot be re-anchored and will end up floating. ' +
|
|
107
|
+
'The response carries `inlineComments: { preserved, dropped, ambiguous }` whenever the page had any. `dropped` = the anchored text no longer exists. `ambiguous` = the text now appears in more than one place, so the server refused to guess which one the comment belonged to. Both mean the comment is left detached, and you MUST surface both lists to the user rather than reporting the update as clean. ' +
|
|
108
|
+
'To minimise breakage, keep commented sentences intact where you can. If comments do come loose, `confluence_reattach_inline_comments` can repair them from page history.',
|
|
106
109
|
inputSchema: {
|
|
107
110
|
type: 'object',
|
|
108
111
|
properties: {
|
|
@@ -126,6 +129,27 @@ export const confluenceTools = [
|
|
|
126
129
|
required: ['pageId', 'title', 'content', 'version'],
|
|
127
130
|
},
|
|
128
131
|
},
|
|
132
|
+
{
|
|
133
|
+
name: 'confluence_reattach_inline_comments',
|
|
134
|
+
description: 'Repair inline comments that were detached from a Confluence page by an earlier update. Inline comments anchor via markers inside the page body, so an update that rebuilt the body (e.g. from Markdown) strips them and the comments end up floating. This walks back through page history to find where each orphaned comment was anchored, then re-marks that text in the current body. Page text is never modified; this adds anchor markers only. Defaults to a dry run: call with dryRun=false to actually write. ' +
|
|
135
|
+
'Only unambiguous anchors are restored. Results are split into `reattached`, `ambiguous` (the anchor text now appears in more than one place, or still exists but is broken up by formatting so it cannot be matched as one unbroken run) and `lost` (the anchored text is gone). Anything not in `reattached` is left exactly as it was — the tool reports rather than guesses, because a wrong guess silently moves a reviewer question onto unrelated text. ' +
|
|
136
|
+
'History is searched back at most 50 versions; a comment orphaned earlier than that reports as `lost`. Versions Confluence has purged are skipped and listed in `unreadableVersions`.',
|
|
137
|
+
inputSchema: {
|
|
138
|
+
type: 'object',
|
|
139
|
+
properties: {
|
|
140
|
+
pageId: {
|
|
141
|
+
type: 'string',
|
|
142
|
+
description: 'The page ID whose inline comments should be re-attached',
|
|
143
|
+
},
|
|
144
|
+
dryRun: {
|
|
145
|
+
type: 'boolean',
|
|
146
|
+
description: 'When true (the default) report what would be re-attached without writing. Set false to publish a new page version with the markers restored.',
|
|
147
|
+
default: true,
|
|
148
|
+
},
|
|
149
|
+
},
|
|
150
|
+
required: ['pageId'],
|
|
151
|
+
},
|
|
152
|
+
},
|
|
129
153
|
{
|
|
130
154
|
name: 'confluence_get_spaces',
|
|
131
155
|
description: 'Get list of Confluence spaces',
|
|
@@ -267,7 +291,8 @@ export const confluenceTools = [
|
|
|
267
291
|
},
|
|
268
292
|
{
|
|
269
293
|
name: 'confluence_get_comments',
|
|
270
|
-
description: 'Get comments for a Confluence page. Returns both footer (page-level) and inline (text-anchored) comments by default. Each comment carries a `type` field ("footer" or "inline"); the `body` field is an ADF JSON document. Inline comments also include `anchoredText` (the highlighted page text the comment is attached to), `resolutionStatus` (e.g. "open", "resolved"), and `markerRef`.'
|
|
294
|
+
description: 'Get comments for a Confluence page. Returns both footer (page-level) and inline (text-anchored) comments by default. Each comment carries a `type` field ("footer" or "inline"); the `body` field is an ADF JSON document. Inline comments also include `anchoredText` (the highlighted page text the comment is attached to), `resolutionStatus` (e.g. "open", "resolved"), and `markerRef`. ' +
|
|
295
|
+
'Note `anchoredText` is truncated by Confluence at roughly 250 characters, so do not rely on it for exact text matching — `confluence_reattach_inline_comments` recovers the full anchor from page history instead.',
|
|
271
296
|
inputSchema: {
|
|
272
297
|
type: 'object',
|
|
273
298
|
properties: {
|