ai-dev-requirements 0.4.0 → 0.5.1

package/dist/index.cjs

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -211,7 +211,7 @@ function loadConfig(startDir) {
 }
 //#endregion
 //#region package.json
-var version = "0.4.0";
+var version = "0.5.1";
 //#endregion
 //#region ../../src/utils/ones-issue-kind.ts
 /**
@@ -291,18 +291,34 @@ var BaseAdapter = class {
 	async updateWikiPage(_params) {
 		throw new Error(`${this.sourceType}: Wiki update endpoint is not verified`);
 	}
+	/** Production Wiki deletes stay disabled until the exact provider endpoint is verified. */
+	async deleteWikiPage(_params) {
+		throw new Error(`${this.sourceType}: Wiki delete endpoint is not verified`);
+	}
 };
 //#endregion
 //#region ../../src/adapters/ones/api-client.ts
 function base64Url(buffer) {
 	return buffer.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
-function getSetCookies(response) {
+function getSetCookies$1(response) {
+	if (!response.headers) return [];
 	const headers = response.headers;
 	if (headers.getSetCookie) return headers.getSetCookie();
 	const raw = response.headers.get("set-cookie");
 	return raw ? [raw] : [];
 }
+function mergeResponseCookies(cookieJar, response) {
+	for (const cookie of getSetCookies$1(response)) {
+		const pair = cookie.split(";")[0];
+		const separator = pair.indexOf("=");
+		if (separator <= 0) continue;
+		cookieJar.set(pair.slice(0, separator), pair.slice(separator + 1));
+	}
+}
+function serializeCookies(cookieJar) {
+	return [...cookieJar].map(([name, value]) => `${name}=${value}`).join("; ");
+}
 function parseRedirectValue(location, names) {
 	try {
 		const parsed = new URL(location);
@@ -330,6 +346,7 @@ var OnesApiClient = class {
 		const email = this.resolvedAuth.email;
 		const password = this.resolvedAuth.password;
 		if (!email || !password) throw new Error("ONES auth requires email and password (ones-pkce auth type)");
+		const cookieJar = /* @__PURE__ */ new Map();
 		const certRes = await fetch(`${baseUrl}/identity/api/encryption_cert`, {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
@@ -350,11 +367,15 @@ var OnesApiClient = class {
 			})
 		});
 		if (!loginRes.ok) throw new Error(`ONES: Login failed with status ${loginRes.status}`);
-		const cookies = getSetCookies(loginRes).map((cookie) => cookie.split(";")[0]).join("; ");
+		mergeResponseCookies(cookieJar, loginRes);
 		const loginData = await loginRes.json();
 		const configuredOrgUuid = this.config.options?.orgUuid;
 		const orgUser = configuredOrgUuid ? loginData.org_users.find((user) => user.org_uuid === configuredOrgUuid) ?? loginData.org_users[0] : loginData.org_users[0];
 		if (!orgUser) throw new Error("ONES: No organizations found for this user");
+		cookieJar.set("ones-region-uuid", orgUser.region_uuid);
+		cookieJar.set("ones-org-uuid", orgUser.org_uuid);
+		const timezone = cookieJar.get("ones-tz");
+		if (timezone) cookieJar.set("timezone", timezone);
 		const codeVerifier = base64Url(node_crypto.default.randomBytes(32));
 		const codeChallenge = base64Url(node_crypto.default.createHash("sha256").update(codeVerifier).digest());
 		const authorizeParams = new URLSearchParams({
@@ -366,15 +387,17 @@ var OnesApiClient = class {
 			redirect_uri: `${baseUrl}/auth/authorize/callback`,
 			state: `org_uuid=${orgUser.org_uuid}`
 		});
-		const authorizeLocation = (await fetch(`${baseUrl}/identity/authorize`, {
+		const authorizeRes = await fetch(`${baseUrl}/identity/authorize`, {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/x-www-form-urlencoded",
-				"Cookie": cookies
+				"Cookie": serializeCookies(cookieJar)
 			},
 			body: authorizeParams.toString(),
 			redirect: "manual"
-		})).headers.get("location");
+		});
+		mergeResponseCookies(cookieJar, authorizeRes);
+		const authorizeLocation = authorizeRes.headers.get("location");
 		if (!authorizeLocation) throw new Error("ONES: Authorize response missing location header");
 		let code = parseRedirectValue(authorizeLocation, ["code"]);
 		if (!code) {
@@ -384,7 +407,7 @@ var OnesApiClient = class {
 				method: "POST",
 				headers: {
 					"Content-Type": "application/json;charset=UTF-8",
-					"Cookie": cookies
+					"Cookie": serializeCookies(cookieJar)
 				},
 				body: JSON.stringify({
 					auth_request_id: authRequestId,
@@ -393,12 +416,15 @@ var OnesApiClient = class {
 					org_user_uuid: orgUser.org_user.org_user_uuid
 				})
 			});
+			mergeResponseCookies(cookieJar, finalizeRes);
 			if (!finalizeRes.ok) throw new Error(`ONES: Finalize failed with status ${finalizeRes.status}`);
-			const callbackLocation = (await fetch(`${baseUrl}/identity/authorize/callback?id=${authRequestId}&lang=zh`, {
+			const callbackRes = await fetch(`${baseUrl}/identity/authorize/callback?id=${authRequestId}&lang=zh`, {
 				method: "GET",
-				headers: { Cookie: cookies },
+				headers: { Cookie: serializeCookies(cookieJar) },
 				redirect: "manual"
-			})).headers.get("location");
+			});
+			mergeResponseCookies(cookieJar, callbackRes);
+			const callbackLocation = callbackRes.headers.get("location");
 			if (!callbackLocation) throw new Error("ONES: Callback response missing location header");
 			code = parseRedirectValue(callbackLocation, ["code"]);
 		}
@@ -407,7 +433,7 @@ var OnesApiClient = class {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/x-www-form-urlencoded",
-				"Cookie": cookies
+				"Cookie": serializeCookies(cookieJar)
 			},
 			body: new URLSearchParams({
 				grant_type: "authorization_code",
@@ -417,16 +443,20 @@ var OnesApiClient = class {
 				redirect_uri: `${baseUrl}/auth/authorize/callback`
 			}).toString()
 		});
+		mergeResponseCookies(cookieJar, tokenRes);
 		if (!tokenRes.ok) throw new Error(`ONES: Token exchange failed with status ${tokenRes.status}`);
 		const token = await tokenRes.json();
+		cookieJar.set("ones-lt", token.access_token);
 		const teamsRes = await fetch(`${baseUrl}/project/api/project/organization/${orgUser.org_uuid}/stamps/data?t=org_my_team`, {
 			method: "POST",
 			headers: {
 				"Authorization": `Bearer ${token.access_token}`,
-				"Content-Type": "application/json;charset=UTF-8"
+				"Content-Type": "application/json;charset=UTF-8",
+				"Cookie": serializeCookies(cookieJar)
 			},
 			body: JSON.stringify({ org_my_team: 0 })
 		});
+		mergeResponseCookies(cookieJar, teamsRes);
 		if (!teamsRes.ok) throw new Error(`ONES: Failed to fetch teams: ${teamsRes.status}`);
 		const teams = (await teamsRes.json()).org_my_team?.teams ?? [];
 		const configuredTeamUuid = this.config.options?.teamUuid;
@@ -438,6 +468,9 @@ var OnesApiClient = class {
 			orgUuid: orgUser.org_uuid,
 			userUuid: orgUser.org_user.org_user_uuid,
 			userName: orgUser.org_user.name,
+			cookieHeader: serializeCookies(cookieJar),
+			legacyAuthToken: loginData.sid,
+			legacyUserId: loginData.auth_user_uuid,
 			expiresAt: Date.now() + (token.expires_in - 60) * 1e3
 		};
 		return this.session;
@@ -670,10 +703,11 @@ function mapOnesTypeFromTask(task) {
 	return mapOnesType(task.subIssueType?.name ?? task.issueType?.name ?? "");
 }
 function toRequirement(task, description = "", attachments = []) {
+	const displayId = taskDisplayId({}, task, task.project?.identifier?.toUpperCase() ?? null);
 	return {
 		id: task.uuid,
 		source: "ones",
-		title: `#${task.number} ${task.name}`,
+		title: `${displayId} ${task.name}`,
 		description,
 		status: mapOnesStatus(task.status?.category ?? "to_do"),
 		priority: mapOnesPriority(task.priority?.value ?? "normal"),
@@ -814,7 +848,8 @@ function removeControlCharacters(value) {
 	return output;
 }
 function sanitizeExternalText(value) {
-	return removeControlCharacters(removeUrlCredentials((0, entities.decodeHTML)(value.slice(0, MAX_EXTERNAL_TEXT_CHARS).replace(/<(?:script|style|iframe|object|embed)\b[^>]*>[\s\S]*?<\/(?:script|style|iframe|object|embed)>/gi, "").replace(/<img\b[^>]*>/gi, "[Image omitted]").replace(/<br\s*\/?>/gi, "\n").replace(/<\/p\s*>/gi, "\n").replace(/<\/(?:td|th)\s*>/gi, " | ").replace(/<\/tr\s*>/gi, "\n").replace(/<[^>]+>/g, "")))).replace(/[ \t]+\n/g, "\n").replace(/\n[ \t]+/g, "\n").replace(/\n{3,}/g, "\n\n").trim();
+	const withoutActiveContent = value.slice(0, MAX_EXTERNAL_TEXT_CHARS).replace(/<(?:script|style|iframe|object|embed)\b[^>]*>[\s\S]*?<\/(?:script|style|iframe|object|embed)>/gi, "").replace(/<img\b[^>]*>/gi, "[Image omitted]").replace(/<br\s*\/?>/gi, "\n").replace(/<\/p\s*>/gi, "\n").replace(/<\/(?:td|th)\s*>/gi, " | ").replace(/<\/tr\s*>/gi, "\n").replace(/<[^>]+>/g, "");
+	return removeControlCharacters(removeUrlCredentials((0, entities.decodeHTML)(withoutActiveContent))).replace(/[ \t]+\n/g, "\n").replace(/\n[ \t]+/g, "\n").replace(/\n{3,}/g, "\n\n").trim();
 }
 function sanitizeExternalInline(value) {
 	return sanitizeExternalText(value).replace(/\s+/g, " ").slice(0, MAX_EXTERNAL_INLINE_CHARS);
@@ -1192,17 +1227,43 @@ function renderWikiContent(content, context = { imageSources: [] }) {
 	return asWikiBlocks(document.blocks).map((block) => renderWikiBlock(block, document, context)).filter(Boolean).join("\n\n").replace(/[ \t]+\n/g, "\n").replace(/\n{3,}/g, "\n\n").trim();
 }
 function newWikiBlockId() {
-	return (0, node_crypto.randomBytes)(8).toString("base64url").slice(0, 10);
+	for (;;) {
+		const id = (0, node_crypto.randomBytes)(9).toString("base64url").replace(/[^a-z0-9]/gi, "").slice(0, 9);
+		if (/^[a-z][a-z0-9]{8}$/i.test(id)) return id;
+	}
+}
+function markdownTextRuns(text) {
+	if (!text) return [];
+	const runs = [];
+	const inlinePattern = /\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)|`([^`]+)`/g;
+	let cursor = 0;
+	for (const match of text.matchAll(inlinePattern)) {
+		const index = match.index ?? 0;
+		if (index > cursor) runs.push({ insert: text.slice(cursor, index) });
+		if (match[1] && match[2]) runs.push({
+			insert: match[1],
+			attributes: { link: match[2] }
+		});
+		else if (match[3]) runs.push({
+			insert: match[3],
+			attributes: { "style-code": true }
+		});
+		cursor = index + match[0].length;
+	}
+	if (cursor < text.length) runs.push({ insert: text.slice(cursor) });
+	return runs.length ? runs : [{ insert: text }];
 }
 function wikiTextBlock(text, options = {}) {
 	return {
 		id: newWikiBlockId(),
 		type: options.list ? "list" : "text",
-		text: text ? [{ insert: text }] : [],
+		text: markdownTextRuns(text),
 		...options.heading ? { heading: options.heading } : {},
 		...options.list ? {
 			ordered: options.ordered ?? false,
-			level: 1
+			level: options.level ?? 1,
+			...options.start === void 0 ? {} : { start: options.start },
+			...options.groupId ? { groupId: options.groupId } : {}
 		} : {}
 	};
 }
@@ -1213,6 +1274,9 @@ function isMarkdownSeparatorRow(line) {
 	const cells = parseMarkdownRow(line);
 	return cells.length > 0 && cells.every((cell) => /^:?-{3,}:?$/.test(cell));
 }
+function estimateWikiTableCellWidth(value) {
+	return [...value].reduce((width, character) => width + (character.codePointAt(0) > 127 ? 14 : 7), 24);
+}
 function markdownToWikiDocument(markdown) {
 	const document = {
 		blocks: [],
@@ -1221,9 +1285,15 @@ function markdownToWikiDocument(markdown) {
 	};
 	const blocks = document.blocks;
 	const lines = markdown.replace(/\r\n/g, "\n").split("\n");
+	let activeList = null;
 	for (let index = 0; index < lines.length; index += 1) {
 		const line = lines[index];
+		if (!line.trim()) {
+			activeList = null;
+			continue;
+		}
 		if (line.includes("|") && lines[index + 1] && isMarkdownSeparatorRow(lines[index + 1])) {
+			activeList = null;
 			const rows = [parseMarkdownRow(line)];
 			index += 2;
 			while (index < lines.length && lines[index].includes("|")) {
@@ -1241,34 +1311,120 @@ function markdownToWikiDocument(markdown) {
 			blocks.push({
 				id: newWikiBlockId(),
 				type: "table",
-				rows: rows.length,
 				cols: columnCount,
+				rows: rows.length,
+				colsWidth: Array.from({ length: columnCount }, (_, column) => Math.max(100, ...rows.map((row) => estimateWikiTableCellWidth(row[column] ?? "")))),
 				children
 			});
 			continue;
 		}
 		const heading = line.match(/^(#{1,6})[ \t]/);
 		if (heading?.[1]) {
+			activeList = null;
 			blocks.push(wikiTextBlock(line.slice(heading[0].length).trim(), { heading: heading[1].length }));
 			continue;
 		}
 		const unordered = line.match(/^[ \t]*[-*+][ \t]/);
 		if (unordered) {
-			blocks.push(wikiTextBlock(line.slice(unordered[0].length).trim(), { list: true }));
+			const groupId = activeList && !activeList.ordered ? activeList.groupId : newWikiBlockId();
+			const start = activeList && !activeList.ordered ? activeList.nextStart : 1;
+			activeList = {
+				ordered: false,
+				groupId,
+				nextStart: start + 1
+			};
+			blocks.push(wikiTextBlock(line.slice(unordered[0].length).trim(), {
+				list: true,
+				groupId,
+				start
+			}));
 			continue;
 		}
-		const ordered = line.match(/^[ \t]*\d+[.)][ \t]/);
-		if (ordered) {
+		const ordered = line.match(/^[ \t]*(\d+)[.)][ \t]/);
+		if (ordered?.[1]) {
+			const groupId = activeList?.ordered ? activeList.groupId : newWikiBlockId();
+			const start = Number.parseInt(ordered[1], 10);
+			activeList = {
+				ordered: true,
+				groupId,
+				nextStart: start + 1
+			};
 			blocks.push(wikiTextBlock(line.slice(ordered[0].length).trim(), {
 				list: true,
-				ordered: true
+				ordered: true,
+				start,
+				groupId
 			}));
 			continue;
 		}
+		activeList = null;
 		blocks.push(wikiTextBlock(line));
 	}
 	return document;
 }
+function markdownToWikiHtml(markdown) {
+	const renderInline = (text) => markdownTextRuns(text).map((run) => {
+		const escaped = escapeWikiHtml(run.insert);
+		const content = run.attributes?.["style-code"] ? `<code>${escaped}</code>` : escaped;
+		return run.attributes?.link ? `<a href="${escapeWikiHtml(run.attributes.link)}" target="_blank" rel="noopener noreferrer">${content}</a>` : content;
+	}).join("");
+	const lines = markdown.replace(/\r\n/g, "\n").split("\n");
+	const html = [];
+	for (let index = 0; index < lines.length; index += 1) {
+		const line = lines[index];
+		if (!line.trim()) continue;
+		if (line.includes("|") && lines[index + 1] && isMarkdownSeparatorRow(lines[index + 1])) {
+			const rows = [parseMarkdownRow(line)];
+			index += 2;
+			while (index < lines.length && lines[index].includes("|")) {
+				rows.push(parseMarkdownRow(lines[index]));
+				index += 1;
+			}
+			index -= 1;
+			const columnCount = Math.max(...rows.map((row) => row.length));
+			const width = Math.floor(100 / columnCount);
+			const header = Array.from({ length: columnCount }).map((_, column) => `<th style="width:${width}%">${renderInline(rows[0][column] ?? "")}</th>`).join("");
+			const body = rows.slice(1).map((row) => `<tr>${Array.from({ length: columnCount }).map((_, column) => `<td>${renderInline(row[column] ?? "")}</td>`).join("")}</tr>`).join("");
+			html.push(`<table style="width:100%"><thead><tr>${header}</tr></thead><tbody>${body}</tbody></table>`);
+			continue;
+		}
+		const heading = line.match(/^(#{1,6})[ \t]/);
+		if (heading?.[1]) {
+			const level = heading[1].length;
+			html.push(`<h${level}>${renderInline(line.slice(heading[0].length).trim())}</h${level}>`);
+			continue;
+		}
+		if (line.match(/^[ \t]*(\d+)[.)][ \t]/)?.[1]) {
+			const items = [];
+			while (index < lines.length) {
+				const item = lines[index].match(/^[ \t]*(\d+)[.)][ \t]/);
+				if (!item?.[1]) break;
+				items.push({
+					value: Number.parseInt(item[1], 10),
+					text: lines[index].slice(item[0].length).trim()
+				});
+				index += 1;
+			}
+			index -= 1;
+			html.push(`<ol start="${items[0].value}">${items.map((item) => `<li>${renderInline(item.text)}</li>`).join("")}</ol>`);
+			continue;
+		}
+		if (line.match(/^[ \t]*[-*+][ \t]/)) {
+			const items = [];
+			while (index < lines.length) {
+				const item = lines[index].match(/^[ \t]*[-*+][ \t]/);
+				if (!item) break;
+				items.push(lines[index].slice(item[0].length).trim());
+				index += 1;
+			}
+			index -= 1;
+			html.push(`<ul>${items.map((item) => `<li>${renderInline(item)}</li>`).join("")}</ul>`);
+			continue;
+		}
+		html.push(`<p>${renderInline(line.trim())}</p>`);
+	}
+	return html.join("\n");
+}
 function parseWikiDocument(content) {
 	const document = parseJsonRecord(content);
 	if (!document || !Array.isArray(document.blocks)) throw new Error("ONES: Wiki content is not a supported collaborative document");
@@ -1325,6 +1481,17 @@ function appendWikiTableRow(document, operation) {
 	table.rows = (typeof table.rows === "number" ? table.rows : layout.rows.length) + 1;
 }
 function applyWikiUpdateOperation(content, operation) {
+	if (operation.type === "replace_document") {
+		const current = parseWikiDocument(content);
+		const replacement = markdownToWikiDocument(operation.markdown);
+		for (const key of [
+			"comments",
+			"meta",
+			"authors",
+			"commentators"
+		]) if (Object.hasOwn(current, key)) replacement[key] = current[key];
+		return JSON.stringify(replacement);
+	}
 	const document = parseWikiDocument(content);
 	if (operation.type === "append_blocks") appendWikiDocument(document, markdownToWikiDocument(operation.markdown));
 	else if (operation.type === "replace_text") replaceWikiText(document, operation.find, operation.replace);
@@ -1363,6 +1530,30 @@ var WikiPathResolutionError = class extends Error {
 };
 //#endregion
 //#region ../../src/adapters/ones/wiki-reader.ts
+function isWikiAttachmentPath(source) {
+	if (/^[a-z][a-z\d+.-]*:/i.test(source)) return false;
+	return source.split("/").every((part) => Boolean(part) && part !== "." && part !== ".." && !part.includes("\\"));
+}
+const CURRENT_USER_PATH_ALIASES = {
+	"i": true,
+	"me": true,
+	"mine": true,
+	"my": true,
+	"myself": true,
+	"current user": true,
+	"current-user": true,
+	"current_user": true,
+	"我": true,
+	"我的": true,
+	"本人": true,
+	"当前用户": true,
+	"当前账号": true,
+	"自己": true
+};
+function currentUserPathAlias(segment) {
+	const trimmed = segment.trim();
+	return CURRENT_USER_PATH_ALIASES[trimmed.toLocaleLowerCase()] ? trimmed : null;
+}
 var OnesWikiOpenApiError = class extends Error {
 	status;
 	reason;
@@ -1457,12 +1648,29 @@ function segmentSimilarity(left, right) {
 var OnesWikiReader = class {
 	options;
 	treeCache = /* @__PURE__ */ new Map();
+	currentUserNameRequest = null;
 	constructor(options) {
 		this.options = options;
 	}
 	invalidateTree(teamId, spaceId) {
 		this.treeCache.delete(`${teamId}:${spaceId}`);
 	}
+	async fetchCurrentUserName() {
+		const session = await this.options.getSession();
+		const response = await fetch(new URL("/wiki/api/project/auth/token_info", this.options.apiBase).toString(), { headers: { Authorization: `Bearer ${session.accessToken}` } });
+		if (!response.ok) throw new Error(`ONES Wiki token info error: ${response.status}`);
+		const payload = await response.json();
+		const name = firstNonEmptyString$1(payload.user?.name, payload.data?.user?.name, payload.data?.name, payload.name, payload.user_name, payload.userName);
+		if (!name) throw new Error("ONES Wiki token info did not include a resolvable current account");
+		return name;
+	}
+	currentUserName() {
+		if (!this.currentUserNameRequest) this.currentUserNameRequest = this.fetchCurrentUserName().catch((error) => {
+			this.currentUserNameRequest = null;
+			throw error;
+		});
+		return this.currentUserNameRequest;
+	}
 	async openApi(apiPath) {
 		if (!apiPath.startsWith("/wiki/")) throw new Error("ONES: Invalid Wiki Open API path");
 		if (!this.options.openApiToken) throw new OnesWikiOpenApiError(null, "ONES Wiki Open API credential is not configured. Set source.openApiAuth.tokenEnv to a Personal API Key with read scopes.", "missing_credential");
@@ -1488,9 +1696,8 @@ var OnesWikiReader = class {
 	}
 	buildImageUrl(session, refUuid, source, token, teamUuid) {
 		const encodedRefUuid = encodeIdentifier$1(refUuid, "wiki reference UUID");
-		const sourceParts = source.split("/");
-		if (sourceParts.some((part) => !part || part === "." || part === ".." || part.includes("\\"))) throw new Error("ONES: Invalid wiki attachment path");
-		const encodedSource = sourceParts.map((part) => encodeURIComponent(part)).join("/");
+		if (!isWikiAttachmentPath(source)) throw new Error("ONES: Invalid wiki attachment path");
+		const encodedSource = source.split("/").map((part) => encodeURIComponent(part)).join("/");
 		const encodedTeamUuid = encodeIdentifier$1(teamUuid ?? session.teamUuid, "team UUID");
 		return `${this.options.apiBase}/wiki/api/wiki/editor/${encodedTeamUuid}/${encodedRefUuid}/resources/${encodedSource}?token=${encodeURIComponent(token)}`;
 	}
@@ -1508,7 +1715,8 @@ var OnesWikiReader = class {
 		const context = { imageSources: [] };
 		const content = renderWikiContent(typeof data.content === "string" ? data.content : "", context);
 		const token = typeof data.token === "string" ? data.token : "";
-		if (!context.imageSources.length || !token) return {
+		const attachmentSources = context.imageSources.filter(isWikiAttachmentPath);
+		if (!attachmentSources.length || !token) return {
 			content,
 			attachments: []
 		};
@@ -1520,7 +1728,7 @@ var OnesWikiReader = class {
 		};
 		return {
 			content,
-			attachments: context.imageSources.map((source, index) => ({
+			attachments: attachmentSources.map((source, index) => ({
 				id: `${wikiUuid}-image-${index + 1}`,
 				name: attachmentNameFromPath(source),
 				url: this.buildImageUrl(session, refUuid, source, token, wikiTeamUuid),
@@ -1722,8 +1930,19 @@ var OnesWikiReader = class {
 		return score >= MIN_PATH_MATCH_SIMILARITY ? score : null;
 	}
 	async resolvePath(params) {
-		const path = params.path.map((segment) => segment.trim()).filter(Boolean);
-		if (!path.length) throw new Error("ONES: Wiki path is empty");
+		const requestedPath = params.path.map((segment) => segment.trim()).filter(Boolean);
+		if (!requestedPath.length) throw new Error("ONES: Wiki path is empty");
+		const currentUserAlias = requestedPath.map(currentUserPathAlias).find((alias) => alias !== null) ?? null;
+		const currentUserName = currentUserAlias ? await this.currentUserName() : null;
+		const path = currentUserName ? requestedPath.map((segment) => currentUserPathAlias(segment) ? currentUserName : segment) : requestedPath;
+		const redactCurrentUser = (page) => {
+			if (!currentUserName || !currentUserAlias) return page;
+			return {
+				...page,
+				title: page.title === currentUserName ? currentUserAlias : page.title,
+				breadcrumb: page.breadcrumb.map((segment) => segment === currentUserName ? currentUserAlias : segment)
+			};
+		};
 		const candidates = await this.search({
 			query: path.at(-1),
 			teamId: params.teamId,
@@ -1770,26 +1989,32 @@ var OnesWikiReader = class {
 				});
 			}
 		}
-		if (matches.length > 1) throw new WikiPathResolutionError("ambiguous", path, matches);
+		if (matches.length > 1) throw new WikiPathResolutionError("ambiguous", requestedPath, matches.map(redactCurrentUser));
 		let match = matches[0];
 		if (!match && fuzzy.length) {
 			fuzzy.sort((left, right) => right.score - left.score);
 			const competing = fuzzy.filter((candidate) => fuzzy[0].score - candidate.score < PATH_MATCH_MARGIN);
-			if (competing.length > 1) throw new WikiPathResolutionError("ambiguous", path, competing.map((candidate) => candidate.page));
+			if (competing.length > 1) throw new WikiPathResolutionError("ambiguous", requestedPath, competing.map((candidate) => redactCurrentUser(candidate.page)));
 			match = fuzzy[0].page;
 		}
 		if (!match) {
 			const inspectedIds = new Set(inspected.map((page) => page.pageId));
-			throw new WikiPathResolutionError("not_found", path, [...inspected, ...candidates.filter((page) => !inspectedIds.has(page.pageId))]);
+			throw new WikiPathResolutionError("not_found", requestedPath, [...inspected, ...candidates.filter((page) => !inspectedIds.has(page.pageId))].map(redactCurrentUser));
 		}
 		if (!match.spaceId) throw new Error("ONES: Wiki space ID could not be verified");
-		return {
+		const publicMatch = redactCurrentUser(match);
+		const resolution = {
 			teamId: match.teamId,
 			spaceId: match.spaceId,
 			pageId: match.pageId,
-			title: match.title,
-			breadcrumb: match.breadcrumb
+			title: publicMatch.title,
+			breadcrumb: publicMatch.breadcrumb
 		};
+		if (currentUserName && currentUserAlias) Object.defineProperty(resolution, "redactPrivateValues", {
+			enumerable: false,
+			value: (value) => value.split(currentUserName).join(currentUserAlias)
+		});
+		return resolution;
 	}
 };
 //#endregion
@@ -1991,8 +2216,9 @@ var OnesTaskContent = class {
 				attachments: rendered.attachments
 			};
 		})), containsInlineTaskImages(task) ? this.getTaskImageAttachments(task) : Promise.resolve([])]);
+		const projectIdentifier = task.project?.identifier?.toUpperCase() ?? null;
 		const parts = [
-			`# #${task.number} ${task.name}`,
+			`# ${taskDisplayId({}, task, projectIdentifier)} ${task.name}`,
 			"",
 			`- **Type**: ${task.issueType?.name ?? "Unknown"}`,
 			"- **Work Item Kind**: requirement",
@@ -2004,7 +2230,7 @@ var OnesTaskContent = class {
 		parts.push(`- **UUID**: ${task.uuid}`);
 		if (task.relatedTasks?.length) {
 			parts.push("", "## Related Tasks");
-			for (const related of task.relatedTasks) parts.push(`- #${related.number} ${related.name} [${related.issueType?.name}] (${related.status?.name}) — ${related.assign?.name ?? "Unassigned"}`);
+			for (const related of task.relatedTasks) parts.push(`- ${taskDisplayId({}, related, related.project?.identifier?.toUpperCase() ?? projectIdentifier)} ${related.name} [${related.issueType?.name}] (${related.status?.name}) — ${related.assign?.name ?? "Unassigned"}`);
 		}
 		if (relatedActivities.length) {
 			parts.push("", "## Related Work Items");
@@ -2019,7 +2245,7 @@ var OnesTaskContent = class {
 		}
 		if (task.parent?.uuid) {
 			parts.push("", "## Parent Task", `- UUID: ${task.parent.uuid}`);
-			if (task.parent.number) parts.push(`- Number: #${task.parent.number}`);
+			if (task.parent.number) parts.push(`- Number: ${projectIdentifier ? `${projectIdentifier}-${task.parent.number}` : `#${task.parent.number}`}`);
 		}
 		if (wikiContents.length > 0) {
 			parts.push("", "---", "", "## Requirement Documents");
@@ -2042,8 +2268,9 @@ var OnesTaskContent = class {
 	}
 	buildWorkItemSummary(task, kind) {
 		const nextTool = kind === "defect" ? "get_issue_detail" : "get_related_issues / get_testcases";
+		const projectIdentifier = task.project?.identifier?.toUpperCase() ?? null;
 		const parts = [
-			`# #${task.number} ${task.name}`,
+			`# ${taskDisplayId({}, task, projectIdentifier)} ${task.name}`,
 			"",
 			`- **Type**: ${task.subIssueType?.name ?? task.issueType?.name ?? "Unknown"}`,
 			`- **Work Item Kind**: ${kind}`,
@@ -2055,14 +2282,14 @@ var OnesTaskContent = class {
 		parts.push(`- **UUID**: ${task.uuid}`);
 		if (task.parent?.uuid) {
 			parts.push("", "## Parent Task", `- UUID: ${task.parent.uuid}`);
-			if (task.parent.number) parts.push(`- Number: #${task.parent.number}`);
+			if (task.parent.number) parts.push(`- Number: ${projectIdentifier ? `${projectIdentifier}-${task.parent.number}` : `#${task.parent.number}`}`);
 		}
 		const detailText = getTaskDetailText(task);
 		if (detailText) parts.push("", "---", "", kind === "defect" ? "## Defect Detail" : "## Task Detail", "", detailText);
 		parts.push("", "## Next Tool", "", `This ID is a ${workItemKindLabel(kind)}, not a requirement document.`, `Do not treat wiki/requirement docs as the source of truth. Use \`${nextTool}\` for the next lookup.`);
 		if (task.relatedTasks?.length) {
 			parts.push("", "## Related Tasks");
-			for (const related of task.relatedTasks) parts.push(`- #${related.number} ${related.name} [${related.issueType?.name}] (${related.status?.name}) — ${related.assign?.name ?? "Unassigned"}`);
+			for (const related of task.relatedTasks) parts.push(`- ${taskDisplayId({}, related, related.project?.identifier?.toUpperCase() ?? projectIdentifier)} ${related.name} [${related.issueType?.name}] (${related.status?.name}) — ${related.assign?.name ?? "Unassigned"}`);
 		}
 		const requirement = toRequirement(task, parts.join("\n"));
 		requirement.raw = {
@@ -2124,7 +2351,7 @@ const TASK_DETAIL_QUERY = `
       priority { value }
       assign { uuid name }
       owner { uuid name }
-      project { uuid name }
+      project { uuid name identifier }
       parent { uuid number issueType { uuid name } }
       relatedTasks {
         key uuid number name
@@ -2135,6 +2362,7 @@ const TASK_DETAIL_QUERY = `
         subIssueType { uuid name detailType }
         status { uuid name category }
         assign { uuid name }
+        project { uuid name identifier }
       }
       relatedWikiPages {
         uuid title referenceType subReferenceType errorMessage
@@ -2271,7 +2499,9 @@ var OnesTaskPlanning = class {
 		if (!Number.isInteger(raw.number)) throw new TypeError("ONES: Standalone wiki pages cannot be decomposed into requirement tasks");
 		const parsedDisplayId = parseDisplayId(params.requirementId);
 		const requirementInfo = await this.options.fetchTaskInfo(workItem.id);
-		const projectIdentifier = parsedDisplayId?.identifier.toUpperCase() ?? firstString(requirementInfo, ["projectIdentifier", "project_identifier"]);
+		let projectIdentifier = parsedDisplayId?.identifier ?? firstString(requirementInfo, ["projectIdentifier", "project_identifier"]) ?? raw.project?.identifier ?? null;
+		if (!projectIdentifier && raw.project?.uuid) projectIdentifier = await this.options.resolveProjectIdentifier(raw.project.uuid);
+		projectIdentifier = projectIdentifier?.toUpperCase() ?? null;
 		const displayId = firstString(requirementInfo, ["displayId", "display_id"]) ?? (projectIdentifier ? `${projectIdentifier}-${raw.number}` : `#${raw.number}`);
 		const relatedTasks = (raw.relatedTasks ?? []).filter((task) => classifyOnesWorkItem(task.issueType, task.subIssueType) === "task");
 		const relatedInfos = await Promise.all(relatedTasks.map((task) => this.options.fetchTaskInfo(task.uuid)));
@@ -2600,6 +2830,12 @@ var OnesTestcaseReader = class {
 const JSON0_URI = "http://sharejs.org/types/JSONv0";
 const JSON1_URI = "http://sharejs.org/types/JSONv1";
 const DEFAULT_TIMEOUT_MS$1 = 15e3;
+function getSetCookies(response) {
+	const headers = response.headers;
+	if (headers.getSetCookie) return headers.getSetCookie();
+	const raw = headers.get("set-cookie");
+	return raw ? [raw] : [];
+}
 function isRecord(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -2612,28 +2848,44 @@ function asDoc(value) {
 }
 function createTopLevelJson1Operation(current, next) {
 	let operation = null;
+	const appendComponent = (component) => {
+		operation = operation === null ? component : ot_json1.type.compose(operation, component);
+	};
 	const keys = [.../* @__PURE__ */ new Set([...Object.keys(current), ...Object.keys(next)])].sort();
 	for (const key of keys) {
+		if (key === "blocks") continue;
 		const hasCurrent = Object.hasOwn(current, key);
 		const hasNext = Object.hasOwn(next, key);
-		let component;
-		if (!hasCurrent) component = (0, ot_json1.insertOp)([key], asDoc(next[key]));
-		else if (!hasNext) component = (0, ot_json1.removeOp)([key]);
-		else if (!(0, node_util.isDeepStrictEqual)(current[key], next[key])) component = (0, ot_json1.replaceOp)([key], asDoc(current[key]), asDoc(next[key]));
-		else continue;
-		operation = operation === null ? component : ot_json1.type.compose(operation, component);
-	}
+		if (!hasCurrent && hasNext) appendComponent((0, ot_json1.insertOp)([key], asDoc(next[key])));
+		else if (hasCurrent && !hasNext) appendComponent((0, ot_json1.removeOp)([key]));
+		else if (hasCurrent && hasNext && !(0, node_util.isDeepStrictEqual)(current[key], next[key])) appendComponent((0, ot_json1.replaceOp)([key], asDoc(current[key]), asDoc(next[key])));
+	}
+	const currentBlocks = Array.isArray(current.blocks) ? current.blocks : [];
+	const nextBlocks = Array.isArray(next.blocks) ? next.blocks : [];
+	const sharedBlockCount = Math.min(currentBlocks.length, nextBlocks.length);
+	for (let index = 0; index < sharedBlockCount; index += 1) if (!(0, node_util.isDeepStrictEqual)(currentBlocks[index], nextBlocks[index])) {
+		appendComponent((0, ot_json1.removeOp)(["blocks", index]));
+		appendComponent((0, ot_json1.insertOp)(["blocks", index], asDoc(nextBlocks[index])));
+	}
+	for (let index = currentBlocks.length - 1; index >= nextBlocks.length; index -= 1) appendComponent((0, ot_json1.removeOp)(["blocks", index]));
+	for (let index = currentBlocks.length; index < nextBlocks.length; index += 1) appendComponent((0, ot_json1.insertOp)(["blocks", index], asDoc(nextBlocks[index])));
 	if (operation !== null) ot_json1.type.checkValidOp(operation);
 	return operation;
 }
+function createTopLevelJson1Operations(current, next) {
+	const operation = createTopLevelJson1Operation(current, next);
+	return operation === null ? [] : [operation];
+}
 function wikiEditorUrls(baseUrl, teamId, documentId) {
 	const url = new URL(baseUrl);
 	if (url.protocol !== "https:" && url.protocol !== "http:") throw new Error("ONES Wiki collaboration requires an HTTP(S) source URL");
 	const path = `/wiki/api/wiki/editor/${encodeURIComponent(teamId)}/${encodeURIComponent(documentId)}`;
-	const socketUrl = new URL(path, url);
+	const editorBaseUrl = new URL(path, url);
+	const socketUrl = new URL(editorBaseUrl);
 	socketUrl.protocol = url.protocol === "https:" ? "wss:" : "ws:";
 	return {
-		authUrl: new URL(`${path}/auth`, url).toString(),
+		authUrl: `${editorBaseUrl.toString()}/auth`,
+		editorBaseUrl: editorBaseUrl.toString(),
 		socketUrl: socketUrl.toString()
 	};
 }
@@ -2650,39 +2902,52 @@ function closeSocket(socket) {
 }
 async function replaceOnesWikiDocument(options, update, dependencies = {
 	fetch,
-	openWebSocket: (url) => new ws.default(url)
+	openWebSocket: (url, headers) => new ws.default(url, { headers })
 }) {
-	const { authUrl, socketUrl } = wikiEditorUrls(options.baseUrl, options.teamId, options.documentId);
+	const { authUrl, editorBaseUrl, socketUrl } = wikiEditorUrls(options.baseUrl, options.teamId, options.documentId);
 	const authResponse = await dependencies.fetch(authUrl, {
 		method: "GET",
 		headers: {
 			"Authorization": `Bearer ${options.accessToken}`,
 			"x-live-editor-token": options.editorToken,
-			"x-live-editor-base-url": Buffer.from(socketUrl).toString("base64url")
+			"x-live-editor-base-url": Buffer.from(editorBaseUrl).toString("base64url"),
+			...options.cookieHeader ? { Cookie: options.cookieHeader } : {}
 		}
 	});
 	if (!authResponse.ok) throw new Error(`ONES Wiki collaboration auth failed with status ${authResponse.status}`);
 	const editorAuth = await authResponse.json();
 	if (typeof editorAuth.read !== "string" || !editorAuth.read) throw new Error("ONES Wiki collaboration auth response did not include a read token");
+	const cookies = [options.cookieHeader, ...getSetCookies(authResponse).map((cookie) => cookie.split(";")[0])].filter((cookie) => Boolean(cookie)).join("; ");
+	const socketHeaders = {
+		"Accept-Language": "zh-CN,zh;q=0.9",
+		"Cache-Control": "no-cache",
+		"Pragma": "no-cache",
+		"User-Agent": "Mozilla/5.0 AppleWebKit/537.36 Chrome/128.0.0.0 Safari/537.36",
+		"Origin": new URL(options.baseUrl).origin,
+		...cookies ? { Cookie: cookies } : {}
+	};
 	return new Promise((resolve, reject) => {
-		const socket = dependencies.openWebSocket(socketUrl);
-		const sequence = 1;
-		let clientId = "";
+		const socket = dependencies.openWebSocket(socketUrl, socketHeaders);
+		let sequence = 1;
 		let state = "init";
 		let settled = false;
 		let snapshotVersion = 0;
+		let currentVersion = 0;
+		let pendingOperations = [];
+		const presenceChannel = `${options.teamId}:${options.documentId}`;
+		const presenceId = (0, node_crypto.randomBytes)(7).toString("base64url").slice(0, 9);
 		let timeout;
 		const finish = (result) => {
 			if (settled) return;
 			settled = true;
-			if (timeout) clearTimeout(timeout);
+			clearTimeout(timeout);
 			resolve(result);
 			closeSocket(socket);
 		};
 		const fail = (error) => {
 			if (settled) return;
 			settled = true;
-			if (timeout) clearTimeout(timeout);
+			clearTimeout(timeout);
 			reject(error);
 			closeSocket(socket);
 		};
@@ -2691,9 +2956,38 @@ async function replaceOnesWikiDocument(options, update, dependencies = {
 				if (error) fail(/* @__PURE__ */ new Error(`ONES Wiki collaboration send failed: ${error.message}`));
 			});
 		};
+		const sendHandshake = () => {
+			send({
+				a: "hs",
+				id: null,
+				auth: {
+					appId: options.teamId,
+					docId: options.documentId,
+					userId: options.userId,
+					permission: "w",
+					token: options.editorToken,
+					displayName: options.displayName ?? "",
+					avatarUrl: options.avatarUrl ?? ""
+				}
+			});
+		};
+		const sendNextOperation = () => {
+			const operation = pendingOperations[0];
+			if (operation === void 0) return;
+			send({
+				a: "op",
+				c: options.teamId,
+				d: options.documentId,
+				v: currentVersion,
+				seq: sequence,
+				x: {},
+				op: operation
+			});
+		};
 		timeout = setTimeout(() => {
 			fail(/* @__PURE__ */ new Error(`ONES Wiki collaboration timed out while waiting for ${state}`));
 		}, options.timeoutMs ?? DEFAULT_TIMEOUT_MS$1);
+		socket.on("open", sendHandshake);
 		socket.on("error", () => fail(/* @__PURE__ */ new Error("ONES Wiki collaboration WebSocket failed")));
 		socket.on("close", (code) => {
 			if (!settled) fail(/* @__PURE__ */ new Error(`ONES Wiki collaboration WebSocket closed before ${state} (code ${code})`));
@@ -2720,58 +3014,64 @@ async function replaceOnesWikiDocument(options, update, dependencies = {
 					fail(/* @__PURE__ */ new Error("ONES Wiki collaboration returned an unsupported init frame"));
 					return;
 				}
-				clientId = message.id;
 				state = "handshake";
-				send({
-					a: "hs",
-					id: clientId,
-					auth: {
-						appId: options.teamId,
-						docId: options.documentId,
-						userId: options.userId,
-						permission: "w",
-						token: editorAuth.read,
-						displayName: options.displayName ?? "",
-						avatarUrl: options.avatarUrl ?? ""
-					},
-					options: { ping: {
-						interval: 5e4,
-						timeout: 15e4
-					} }
-				});
+				sendHandshake();
 				return;
 			}
 			if (state === "handshake") {
-				if (message.a !== "hs" || message.id !== clientId || message.protocol !== 1 || message.protocolMinor !== 1 || message.type !== JSON0_URI) {
+				if (message.a !== "hs" || typeof message.id !== "string" || message.protocol !== 1 || message.protocolMinor !== 1 || message.type !== JSON0_URI) {
 					fail(/* @__PURE__ */ new Error("ONES Wiki collaboration returned an unsupported handshake frame"));
 					return;
 				}
-				state = "snapshot";
+				state = "fetch";
 				send({
-					a: "s",
+					a: "f",
 					c: options.teamId,
 					d: options.documentId
 				});
 				return;
 			}
-			if (state === "snapshot") {
+			if (state === "fetch") {
 				const snapshot = message.data;
-				if (message.a !== "s" || message.c !== options.teamId || message.d !== options.documentId || typeof snapshot?.v !== "number" || snapshot.type !== JSON1_URI) {
-					fail(/* @__PURE__ */ new Error("ONES Wiki collaboration returned an unsupported snapshot frame"));
-					return;
-				}
+				if (message.a !== "f" || message.c !== options.teamId || message.d !== options.documentId || typeof snapshot?.v !== "number" || snapshot.type !== JSON1_URI) return;
 				const current = asWikiSnapshot(snapshot.data);
-				let next;
-				let operation;
 				try {
-					next = asJsonDocument(update(structuredClone(current)), "update");
-					operation = createTopLevelJson1Operation(current, next);
+					pendingOperations = createTopLevelJson1Operations(current, asJsonDocument(update(structuredClone(current)), "update"));
 				} catch (error) {
 					fail(error instanceof Error ? error : /* @__PURE__ */ new Error("ONES Wiki collaboration update failed"));
 					return;
 				}
 				snapshotVersion = snapshot.v;
-				if (operation === null) {
+				currentVersion = snapshotVersion;
+				state = "presence";
+				send({
+					a: "p",
+					ch: presenceChannel,
+					id: presenceId,
+					p: null,
+					pv: 2
+				});
+				send({
+					a: "ps",
+					ch: presenceChannel,
+					seq: 1
+				});
+				return;
+			}
+			if (state === "presence") {
+				if (message.a !== "ps" || message.ch !== presenceChannel || message.seq !== 1) return;
+				state = "subscribe";
+				send({
+					a: "s",
+					c: options.teamId,
+					d: options.documentId,
+					v: snapshotVersion
+				});
+				return;
+			}
+			if (state === "subscribe") {
+				if (message.a !== "s" || message.c !== options.teamId || message.d !== options.documentId) return;
+				if (!pendingOperations.length) {
 					finish({
 						snapshotVersion,
 						version: snapshotVersion,
@@ -2780,21 +3080,23 @@ async function replaceOnesWikiDocument(options, update, dependencies = {
 					return;
 				}
 				state = "ack";
-				send({
-					a: "op",
-					c: options.teamId,
-					d: options.documentId,
-					v: snapshotVersion,
-					seq: sequence,
-					op: operation
-				});
+				sendNextOperation();
 				return;
 			}
-			if (state === "ack" && message.a === "op" && message.c === options.teamId && message.d === options.documentId && message.seq === sequence) finish({
-				snapshotVersion,
-				version: typeof message.v === "number" ? message.v : snapshotVersion + 1,
-				changed: true
-			});
+			if (state === "ack" && message.a === "op" && message.c === options.teamId && message.d === options.documentId && message.seq === sequence) {
+				currentVersion = typeof message.v === "number" ? message.v : currentVersion + 1;
+				pendingOperations.shift();
+				if (!pendingOperations.length) {
+					finish({
+						snapshotVersion,
+						version: currentVersion,
+						changed: true
+					});
+					return;
+				}
+				sequence += 1;
+				sendNextOperation();
+			}
 		});
 	});
 }
@@ -2832,6 +3134,10 @@ var OnesWikiProductWriter = class {
 		const encodedTeamId = encodeIdentifier(teamId, "team UUID");
 		const headers = new Headers(init.headers);
 		headers.set("Authorization", `Bearer ${session.accessToken}`);
+		headers.set("Ones-Auth-Token", session.legacyAuthToken);
+		headers.set("Ones-User-Id", session.legacyUserId);
+		headers.set("Referer", this.options.apiBase);
+		if (session.cookieHeader) headers.set("Cookie", session.cookieHeader);
 		if (typeof init.body === "string" && !headers.has("Content-Type")) headers.set("Content-Type", "application/json;charset=UTF-8");
 		const response = await fetch(`${this.options.apiBase}/wiki/api/wiki/team/${encodedTeamId}${apiPath}`, {
 			...init,
@@ -2854,9 +3160,9 @@ var OnesWikiProductWriter = class {
 		}
 		throw new Error("ONES Wiki editor token endpoint was not found");
 	}
-	async replaceDocument(teamId, resourceId, documentId, update, preferDraft = false) {
+	async replaceDocument(teamId, resourceId, documentId, update, preferDraft = false, editorTokenOverride) {
 		const session = await this.options.getSession();
-		const editorToken = await this.fetchEditorToken(teamId, resourceId, preferDraft);
+		const editorToken = editorTokenOverride ?? await this.fetchEditorToken(teamId, resourceId, preferDraft);
 		return { version: (await replaceOnesWikiDocument({
 			baseUrl: this.options.apiBase,
 			teamId,
@@ -2864,6 +3170,7 @@ var OnesWikiProductWriter = class {
 			accessToken: session.accessToken,
 			editorToken,
 			userId: session.userUuid,
+			cookieHeader: session.cookieHeader,
 			displayName: session.userName
 		}, update)).version };
 	}
@@ -2917,20 +3224,120 @@ var OnesWikiProductWriter = class {
 		};
 	}
 	async update(params) {
-		const detail = await this.options.fetchPageDetail(params.pageId, params.teamId);
-		const documentId = firstNonEmptyString(detail.ref_uuid);
-		if (!documentId) throw new Error("ONES Wiki page detail did not include a collaborative document ID");
-		const write = await this.replaceDocument(params.teamId, params.pageId, documentId, (snapshot) => {
+		const encodedPageId = encodeIdentifier(params.pageId, "Wiki page UUID");
+		const encodedSpaceId = params.spaceId ? encodeIdentifier(params.spaceId, "Wiki space UUID") : null;
+		let detail = await this.request(params.teamId, `/page/${encodedPageId}?action=edit`);
+		const title = firstNonEmptyString(detail.title, detail.name, detail.page_title) ?? `Wiki ${params.pageId}`;
+		if (detail.ref_type === 6 && detail.ref_uuid) {
+			const editorToken = await this.fetchEditorToken(params.teamId, params.pageId);
+			const write = await this.replaceDocument(params.teamId, params.pageId, detail.ref_uuid, (snapshot) => {
+				return parseWikiDocument(applyWikiUpdateOperation(JSON.stringify(snapshot), params.operation));
+			}, false, editorToken);
+			const published = await this.request(params.teamId, `/online_page/${encodedPageId}/publish`, {
+				method: "POST",
+				body: JSON.stringify({ title })
+			});
+			if (params.spaceId) this.options.invalidateTree(params.teamId, params.spaceId);
+			return {
+				pageId: params.pageId,
+				title,
+				version: String(published.version ?? published.updated_time ?? write.version),
+				url: params.spaceId ? `${this.options.apiBase}/wiki/#/team/${encodeURIComponent(params.teamId)}/space/${encodeURIComponent(params.spaceId)}/page/${encodeURIComponent(params.pageId)}` : null
+			};
+		}
+		let draftId = firstNonEmptyString(detail.online_draft_uuid, detail.onlineDraftUuid, detail.online_draft?.uuid, detail.draft_uuid, detail.draftUuid, detail.draft?.uuid);
+		let documentId = firstNonEmptyString(detail.online_draft_ref_uuid, detail.onlineDraftRefUuid, detail.online_draft?.ref_uuid, detail.draft_ref_uuid, detail.draftRefUuid, detail.draft?.ref_uuid, detail.ref_uuid);
+		if (!draftId) {
+			if (!encodedSpaceId) throw new Error("ONES Wiki page space is required to create an edit draft");
+			try {
+				const createdDraft = await this.request(params.teamId, `/space/${encodedSpaceId}/drafts/add`, {
+					method: "POST",
+					body: JSON.stringify({
+						page_uuid: params.pageId,
+						status: 2,
+						title
+					})
+				});
+				draftId = firstNonEmptyString(createdDraft.draft_uuid, createdDraft.draftUuid, createdDraft.uuid, createdDraft.id);
+				documentId = firstNonEmptyString(createdDraft.ref_uuid, createdDraft.refUuid, documentId);
+			} catch (error) {
+				const refreshedDetail = await this.request(params.teamId, `/space/${encodedSpaceId}/page/${encodedPageId}`);
+				draftId = firstNonEmptyString(refreshedDetail.draft_uuid, refreshedDetail.draftUuid);
+				if (!draftId) throw error;
+				detail = refreshedDetail;
+				documentId = firstNonEmptyString(refreshedDetail.draft_ref_uuid, refreshedDetail.draftRefUuid, refreshedDetail.ref_uuid, documentId);
+			}
+		}
+		if (!draftId || !encodedSpaceId) throw new Error("ONES Wiki edit draft did not include the required resource and space IDs");
+		const encodedDraftId = encodeIdentifier(draftId, "Wiki draft UUID");
+		const draftDetail = await this.request(params.teamId, `/space/${encodedSpaceId}/draft/${encodedDraftId}`);
+		documentId = firstNonEmptyString(draftDetail.ref_uuid, draftDetail.refUuid, documentId);
+		if (!documentId) throw new Error("ONES Wiki edit draft did not include a collaborative document ID");
+		if (typeof draftDetail.content === "string") {
+			let content;
+			if (params.operation.type === "replace_document") content = markdownToWikiHtml(params.operation.markdown);
+			else if (params.operation.type === "append_blocks") content = `${draftDetail.content}\n${markdownToWikiHtml(params.operation.markdown)}`;
+			else if (params.operation.type === "replace_text") {
+				const occurrences = draftDetail.content.split(params.operation.find).length - 1;
+				if (occurrences !== 1) throw new Error(`ONES Wiki draft replace_text requires exactly one match; found ${occurrences}`);
+				content = draftDetail.content.replace(params.operation.find, params.operation.replace);
+			} else throw new Error("ONES Wiki append_table_row is not supported for legacy page drafts");
+			const published = await this.request(params.teamId, `/space/${encodedSpaceId}/draft/${encodedDraftId}/update`, {
+				method: "POST",
+				body: JSON.stringify({
+					...draftDetail,
+					content,
+					title,
+					page_uuid: params.pageId,
+					space_uuid: params.spaceId,
+					from_version: detail.version ?? draftDetail.from_version,
+					is_published: true,
+					is_forced: true
+				})
+			});
+			this.options.invalidateTree(params.teamId, params.spaceId);
+			const publishedVersion = published.version ?? published.updated_time ?? draftDetail.version ?? draftDetail.updated_time;
+			return {
+				pageId: params.pageId,
+				title,
+				version: publishedVersion === void 0 ? null : String(publishedVersion),
+				url: `${this.options.apiBase}/wiki/#/team/${encodeURIComponent(params.teamId)}/space/${encodeURIComponent(params.spaceId)}/page/${encodeURIComponent(params.pageId)}`
+			};
+		}
+		const write = await this.replaceDocument(params.teamId, draftId, documentId, (snapshot) => {
 			return parseWikiDocument(applyWikiUpdateOperation(JSON.stringify(snapshot), params.operation));
+		}, true);
+		const refreshedDraft = await this.request(params.teamId, `/space/${encodedSpaceId}/draft/${encodedDraftId}`);
+		await this.request(params.teamId, `/space/${encodedSpaceId}/draft/${encodedDraftId}/update`, {
+			method: "POST",
+			body: JSON.stringify({
+				...refreshedDraft,
+				title,
+				page_uuid: params.pageId,
+				space_uuid: params.spaceId,
+				from_version: detail.version ?? refreshedDraft.from_version,
+				is_published: true,
+				is_forced: true
+			})
 		});
 		if (params.spaceId) this.options.invalidateTree(params.teamId, params.spaceId);
 		return {
 			pageId: params.pageId,
-			title: firstNonEmptyString(detail.title, detail.name, detail.page_title) ?? `Wiki ${params.pageId}`,
+			title,
 			version: String(write.version),
 			url: params.spaceId ? `${this.options.apiBase}/wiki/#/team/${encodeURIComponent(params.teamId)}/space/${encodeURIComponent(params.spaceId)}/page/${encodeURIComponent(params.pageId)}` : null
 		};
 	}
+	async delete(params) {
+		const encodedSpaceId = encodeIdentifier(params.spaceId, "Wiki space UUID");
+		const encodedPageId = encodeIdentifier(params.pageId, "Wiki page UUID");
+		await this.request(params.teamId, `/space/${encodedSpaceId}/page/${encodedPageId}/delete`, { method: "POST" });
+		this.options.invalidateTree(params.teamId, params.spaceId);
+		return {
+			pageId: params.pageId,
+			deleted: true
+		};
+	}
 };
 //#endregion
 //#region ../../src/adapters/ones/task-query.ts
@@ -3017,7 +3424,6 @@ var OnesTaskAdapter = class extends BaseAdapter {
 		this.wikiProductWriter = new OnesWikiProductWriter({
 			apiBase: config.apiBase,
 			getSession: () => this.login(),
-			fetchPageDetail: (pageId, teamId) => this.wikiReader.fetchPageDetail(pageId, teamId, true),
 			invalidateTree: (teamId, spaceId) => this.wikiReader.invalidateTree(teamId, spaceId)
 		});
 		this.content = new OnesTaskContent({
@@ -3033,7 +3439,10 @@ var OnesTaskAdapter = class extends BaseAdapter {
 		this.planning = new OnesTaskPlanning({
 			api: this.api,
 			getRequirement: (id) => this.getRequirement({ id }),
-			fetchTaskInfo: (taskUuid) => this.fetchTaskInfo(taskUuid)
+			fetchTaskInfo: (taskUuid) => this.fetchTaskInfo(taskUuid),
+			resolveProjectIdentifier: async (projectUuid) => {
+				return (await this.fetchProjects()).find((candidate) => candidate.uuid === projectUuid)?.identifier?.toUpperCase() ?? null;
+			}
 		});
 		this.issueReader = new OnesIssueReader({
 			api: this.api,
@@ -3251,6 +3660,9 @@ var OnesTaskAdapter = class extends BaseAdapter {
 	async updateWikiPage(params) {
 		return this.wikiProductWriter.update(params);
 	}
+	async deleteWikiPage(params) {
+		return this.wikiProductWriter.delete(params);
+	}
 	/**
 	* Fetch a work item by UUID, number, display id, or wiki URL.
 	* Routes by issueType.detailType: requirements (1 and 5) load wiki docs;
@@ -3645,7 +4057,7 @@ async function handleGetGrillingBrief(input, adapters, defaultSource) {
 }
 //#endregion
 //#region ../../src/utils/safe-image.ts
-const DEFAULT_MAX_BYTES = 8 * 1024 * 1024;
+const DEFAULT_MAX_BYTES = 8388608;
 const DEFAULT_MAX_REDIRECTS = 3;
 const DEFAULT_TIMEOUT_MS = 1e4;
 const MAX_IMAGES = 8;
@@ -3993,7 +4405,7 @@ function formatWorkItem(req) {
 //#endregion
 //#region ../../src/tools/list-pending-work-items.ts
 const ListPendingWorkItemsSchema = zod_v4.z.object({ source: zod_v4.z.string().optional().describe("Source to read. If omitted, uses the default source.") });
-function resolveAdapter$3(source, adapters, defaultSource) {
+function resolveAdapter$4(source, adapters, defaultSource) {
 	const sourceType = source ?? defaultSource;
 	if (!sourceType) throw new Error("No source specified and no default source configured");
 	const adapter = adapters.get(sourceType);
@@ -4037,7 +4449,7 @@ function formatResult(result) {
 	return lines.join("\n");
 }
 async function handleListPendingWorkItems(input, adapters, defaultSource) {
-	const result = await resolveAdapter$3(input.source, adapters, defaultSource).listPendingWorkItems();
+	const result = await resolveAdapter$4(input.source, adapters, defaultSource).listPendingWorkItems();
 	const safeResult = {
 		...result,
 		items: result.items.map(sanitizeItem)
@@ -4075,7 +4487,7 @@ async function handleListSources(adapters, config) {
 }
 //#endregion
 //#region ../../src/tools/requirement-decomposition.ts
-const APPROVAL_TTL_MS$1 = 1800 * 1e3;
+const APPROVAL_TTL_MS$1 = 18e5;
 const MAX_CREATE_OPERATIONS = 10;
 function isValidDate(value) {
 	if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) return false;
@@ -4151,7 +4563,7 @@ var RequirementDecompositionApprovalStore = class {
 		return record;
 	}
 };
-function resolveAdapter$2(source, adapters, defaultSource) {
+function resolveAdapter$3(source, adapters, defaultSource) {
 	const sourceType = source ?? defaultSource;
 	if (!sourceType) throw new Error("No source specified and no default source configured");
 	const adapter = adapters.get(sourceType);
@@ -4254,7 +4666,7 @@ function buildOperations(displayId, tasks) {
 	});
 }
 async function handleInspectRequirementDecomposition(input, adapters, defaultSource) {
-	const { adapter } = resolveAdapter$2(input.source, adapters, defaultSource);
+	const { adapter } = resolveAdapter$3(input.source, adapters, defaultSource);
 	const context = sanitizedContext(await adapter.getRequirementDecompositionContext({ requirementId: input.requirementId }));
 	return {
 		content: [{
@@ -4265,7 +4677,7 @@ async function handleInspectRequirementDecomposition(input, adapters, defaultSou
 	};
 }
 async function handlePrepareRequirementDecomposition(input, adapters, approvals, defaultSource) {
-	const { sourceType, adapter } = resolveAdapter$2(input.source, adapters, defaultSource);
+	const { sourceType, adapter } = resolveAdapter$3(input.source, adapters, defaultSource);
 	const context = await adapter.getRequirementDecompositionContext({ requirementId: input.requirementId });
 	if (context.requirement.workItemKind !== "requirement") throw new Error("Only requirements can be decomposed");
 	if (!context.decompositionRelation.verified || !context.decompositionRelation.uuid) throw new Error("The \"requirement decomposition task\" relationship could not be verified from the read response. No plan or write was prepared.");
@@ -4315,7 +4727,7 @@ async function handleApplyRequirementDecomposition(input, adapters, approvals, o
 	if (!record) throw new Error("Approval token is invalid, expired, or already used. Prepare the decomposition again.");
 	if ((input.source ?? options.defaultSource) !== record.source) throw new Error("Approval token source does not match the requested source");
 	if (input.planHash !== record.planHash) throw new Error("Plan hash does not match the approved decomposition");
-	const { adapter } = resolveAdapter$2(record.source, adapters, options.defaultSource);
+	const { adapter } = resolveAdapter$3(record.source, adapters, options.defaultSource);
 	const current = await adapter.getRequirementDecompositionContext({ requirementId: record.requirementId });
 	if (current.requirement.uuid !== record.requirementUuid || !isSameRequirementBaseline(current.baseline, record.baseline)) throw new Error("Requirement or related tasks changed after preparation. Prepare and confirm a new decomposition.");
 	if (!current.decompositionRelation.verified || current.decompositionRelation.uuid !== record.decompositionRelation.uuid) throw new Error("The requirement decomposition relationship changed or is no longer verified. Prepare and confirm again.");
@@ -4421,12 +4833,82 @@ function formatUpdateTaskPlanDatesResult(result) {
 	return lines.join("\n");
 }
 //#endregion
+//#region ../../src/tools/wiki-delete.ts
+const SourceSchema$1 = zod_v4.z.string().trim().min(1).optional();
+const DeleteEmptyWikiDuplicatesSchema = zod_v4.z.object({
+	keepPageId: zod_v4.z.string().trim().min(1),
+	duplicatePageIds: zod_v4.z.array(zod_v4.z.string().trim().min(1)).min(1).max(20),
+	expectedTitle: zod_v4.z.string().trim().min(1),
+	confirmed: zod_v4.z.literal(true).describe("Set true only after the user confirms the exact keep and delete page IDs immediately before submission."),
+	source: SourceSchema$1
+});
+const DeleteEmptyWikiDuplicatesOutputSchema = zod_v4.z.object({
+	keptPageId: zod_v4.z.string(),
+	deletedPageIds: zod_v4.z.array(zod_v4.z.string())
+});
+function resolveAdapter$2(source, adapters, defaultSource) {
+	const sourceType = source ?? defaultSource;
+	if (!sourceType) throw new Error("No source specified and no default source configured");
+	const adapter = adapters.get(sourceType);
+	if (!adapter) throw new Error(`Source "${sourceType}" is not configured`);
+	return {
+		sourceType,
+		adapter
+	};
+}
+function assertCleanupTarget(keep, duplicates, expectedTitle) {
+	if (keep.title !== expectedTitle) throw new Error("The retained Wiki page title no longer matches the confirmed title");
+	if (keep.content.trim() === `# ${keep.title}`) throw new Error("The retained Wiki page does not contain a body");
+	for (const duplicate of duplicates) {
+		if (duplicate.title !== expectedTitle) throw new Error(`Wiki duplicate ${duplicate.pageId} title no longer matches the confirmed title`);
+		if (duplicate.teamId !== keep.teamId || duplicate.spaceId !== keep.spaceId || duplicate.parentPageId !== keep.parentPageId) throw new Error(`Wiki duplicate ${duplicate.pageId} is not a sibling of the retained page`);
+		if (duplicate.content.trim() !== `# ${duplicate.title}`) throw new Error(`Wiki duplicate ${duplicate.pageId} is not empty and will not be deleted`);
+	}
+}
+async function handleDeleteEmptyWikiDuplicates(input, adapters, options) {
+	if (!options.writesEnabled) throw new Error("Wiki writes are disabled. Enable both ONES_WIKI_ENABLE_WRITES=true and source option wikiWrites=true.");
+	const uniqueDuplicateIds = [...new Set(input.duplicatePageIds)];
+	if (uniqueDuplicateIds.length !== input.duplicatePageIds.length) throw new Error("duplicatePageIds contains repeated page IDs");
+	if (uniqueDuplicateIds.includes(input.keepPageId)) throw new Error("The retained Wiki page cannot also be deleted");
+	const { adapter } = resolveAdapter$2(input.source, adapters, options.defaultSource);
+	const [keep, ...duplicates] = await Promise.all([adapter.getWikiPage({ pageId: input.keepPageId }), ...uniqueDuplicateIds.map((pageId) => adapter.getWikiPage({ pageId }))]);
+	assertCleanupTarget(keep, duplicates, input.expectedTitle);
+	const spaceId = keep.spaceId;
+	if (!spaceId) throw new Error("The retained Wiki page space could not be verified");
+	const operationHash = node_crypto.default.createHash("sha256").update(JSON.stringify({
+		keepPageId: input.keepPageId,
+		duplicatePageIds: uniqueDuplicateIds,
+		expectedTitle: input.expectedTitle,
+		baselines: [keep, ...duplicates].map((page) => ({
+			pageId: page.pageId,
+			version: page.version,
+			contentHash: page.contentHash
+		}))
+	})).digest("hex");
+	for (const duplicate of duplicates) await adapter.deleteWikiPage({
+		teamId: duplicate.teamId,
+		spaceId,
+		pageId: duplicate.pageId
+	});
+	const result = {
+		keptPageId: keep.pageId,
+		deletedPageIds: duplicates.map((page) => page.pageId)
+	};
+	return {
+		content: [{
+			type: "text",
+			text: `Kept Wiki page ${result.keptPageId} and deleted empty duplicates: ${result.deletedPageIds.join(", ")}.\noperationHash: ${operationHash}`
+		}],
+		structuredContent: result
+	};
+}
+//#endregion
 //#region ../../src/tools/wiki-read.ts
 const WikiSourceSchema = zod_v4.z.string().trim().min(1).optional();
 const GetOnesWikiPageSchema = zod_v4.z.object({
 	pageId: zod_v4.z.string().trim().min(1).optional(),
 	url: zod_v4.z.string().url().optional(),
-	path: zod_v4.z.union([zod_v4.z.string().trim().min(1), zod_v4.z.array(zod_v4.z.string().trim().min(1)).min(1)]).optional().describe("Wiki path such as \"Department/Annual Plans/2026\". Resolves a unique exact, title-prefix, or confidently close match; otherwise returns candidate pages for confirmation."),
+	path: zod_v4.z.union([zod_v4.z.string().trim().min(1), zod_v4.z.array(zod_v4.z.string().trim().min(1)).min(1)]).optional().describe("Wiki path such as \"Department/Annual Plans/2026\". Exact self-reference segments such as \"我的\", \"我\", \"me\", or \"my\" resolve the authenticated user through ONES token info without exposing the display name. Resolves a unique exact, title-prefix, or confidently close match; otherwise returns candidate pages for confirmation."),
 	teamId: zod_v4.z.string().trim().min(1).optional(),
 	spaceId: zod_v4.z.string().trim().min(1).optional(),
 	revealSensitiveSecrets: zod_v4.z.boolean().default(false).describe("Default false. Set true only when the user explicitly asks to reveal secrets."),
@@ -4528,6 +5010,19 @@ async function handleGetOnesWikiPage(input, adapters, defaultSource) {
 		teamId: resolved?.teamId ?? input.teamId,
 		spaceId: resolved?.spaceId ?? input.spaceId
 	}), input.revealSensitiveSecrets);
+	if (resolved) {
+		page.title = resolved.title;
+		page.breadcrumb = resolved.breadcrumb;
+		const redactPrivateValues = resolved.redactPrivateValues;
+		if (redactPrivateValues) {
+			page.content = redactPrivateValues(page.content);
+			page.attachments = page.attachments.map((attachment) => ({
+				...attachment,
+				name: redactPrivateValues(attachment.name),
+				url: redactPrivateValues(attachment.url)
+			}));
+		}
+	}
 	return {
 		content: [{
 			type: "text",
@@ -4673,9 +5168,9 @@ async function handleLookupEnvironmentAccess(input, adapters, defaultSource) {
 }
 //#endregion
 //#region ../../src/tools/wiki-write.ts
-const APPROVAL_TTL_MS = 1800 * 1e3;
+const APPROVAL_TTL_MS = 18e5;
 const SourceSchema = zod_v4.z.string().trim().min(1).optional();
-const PathSchema = zod_v4.z.union([zod_v4.z.string().trim().min(1), zod_v4.z.array(zod_v4.z.string().trim().min(1)).min(1)]);
+const PathSchema = zod_v4.z.union([zod_v4.z.string().trim().min(1), zod_v4.z.array(zod_v4.z.string().trim().min(1)).min(1)]).describe("Wiki path. Exact self-reference segments such as \"我的\", \"我\", \"me\", or \"my\" resolve the authenticated user through ONES token info without exposing the display name.");
 const PrepareWikiCreateSchema = zod_v4.z.object({
 	parentPageId: zod_v4.z.string().trim().min(1).optional(),
 	parentPath: PathSchema.optional(),
@@ -4699,6 +5194,10 @@ const ReplaceTextSchema = zod_v4.z.object({
 	find: zod_v4.z.string().min(1),
 	replace: zod_v4.z.string()
 });
+const ReplaceDocumentSchema = zod_v4.z.object({
+	type: zod_v4.z.literal("replace_document"),
+	markdown: zod_v4.z.string().trim().min(1)
+});
 const PrepareWikiUpdateSchema = zod_v4.z.object({
 	pageId: zod_v4.z.string().trim().min(1).optional(),
 	url: zod_v4.z.string().url().optional(),
@@ -4708,7 +5207,8 @@ const PrepareWikiUpdateSchema = zod_v4.z.object({
 	operation: zod_v4.z.discriminatedUnion("type", [
 		AppendBlocksSchema,
 		AppendTableRowSchema,
-		ReplaceTextSchema
+		ReplaceTextSchema,
+		ReplaceDocumentSchema
 	]),
 	source: SourceSchema
 }).refine((value) => [
@@ -4749,6 +5249,10 @@ const WikiUpdateOperationSchema = zod_v4.z.discriminatedUnion("type", [
 		type: zod_v4.z.literal("replace_text"),
 		find: zod_v4.z.string(),
 		replace: zod_v4.z.string()
+	}),
+	zod_v4.z.object({
+		type: zod_v4.z.literal("replace_document"),
+		markdown: zod_v4.z.string()
 	})
 ]);
 const WikiUpdateRequestSchema = zod_v4.z.object({
@@ -4878,11 +5382,24 @@ async function handlePrepareWikiCreate(input, adapters, approvals, defaultSource
 	const teamId = resolved?.teamId ?? parent.teamId;
 	const spaceId = resolved?.spaceId ?? parent.spaceId;
 	if (!spaceId) throw new Error("The target space could not be verified");
+	const title = input.title.trim();
+	const titleCandidates = await adapter.searchWikiPages({
+		query: title,
+		teamId,
+		spaceId,
+		limit: 50
+	});
+	const siblingConflicts = (await Promise.all(titleCandidates.filter((candidate) => candidate.title === title).map((candidate) => adapter.getWikiPage({
+		pageId: candidate.pageId,
+		teamId: candidate.teamId,
+		spaceId: candidate.spaceId ?? spaceId
+	})))).filter((page) => page.parentPageId === parent.pageId);
+	if (siblingConflicts.length) throw new Error(`Wiki title already exists under the selected parent (${siblingConflicts.map((page) => page.pageId).join(", ")}). Ask the user to choose one action: edit the existing page, delete it and recreate, or create with a new title.`);
 	const requestWithoutKey = {
 		teamId,
 		spaceId,
 		parentPageId: parent.pageId,
-		title: input.title.trim(),
+		title,
 		markdown: input.markdown
 	};
 	const operationHash = hashOperation({
@@ -4904,7 +5421,7 @@ async function handlePrepareWikiCreate(input, adapters, approvals, defaultSource
 	});
 	const plan = {
 		kind: "create",
-		targetBreadcrumb: [...parent.breadcrumb, input.title.trim()],
+		targetBreadcrumb: [...resolved?.breadcrumb ?? parent.breadcrumb, input.title.trim()],
 		request,
 		parentBaseline: baseline(parent),
 		operationHash,
@@ -4961,7 +5478,7 @@ async function handlePrepareWikiUpdate(input, adapters, approvals, defaultSource
 	});
 	const plan = {
 		kind: "update",
-		targetBreadcrumb: page.breadcrumb,
+		targetBreadcrumb: resolved?.breadcrumb ?? page.breadcrumb,
 		request,
 		operationHash,
 		approvalToken: approval.token,
@@ -4971,7 +5488,7 @@ async function handlePrepareWikiUpdate(input, adapters, approvals, defaultSource
 		content: [{
 			type: "text",
 			text: [
-				`Prepared Wiki update for ${page.breadcrumb.join(" / ") || page.title}.`,
+				`Prepared Wiki update for ${plan.targetBreadcrumb.join(" / ") || page.title}.`,
 				"No write was performed. Ask the user to confirm this exact operation immediately before apply.",
 				`operationHash: ${plan.operationHash}`,
 				`approvalToken: ${plan.approvalToken}`,
@@ -5084,7 +5601,7 @@ function createRequirementsServer(config, adapterOverrides) {
 	});
 	server.registerTool("get_ones_wiki_page", {
 		title: "Get ONES Wiki Page",
-		description: "Read one ONES Wiki page as Markdown by page ID, URL, or hierarchical path. Prefer path for requests like \"Department/Annual Plans/2026\". Unique confidently close paths are corrected automatically; unresolved or ambiguous paths return candidate pages for confirmation. Sensitive values are redacted by default; revealing them requires an explicit argument based on an explicit user request.",
+		description: "Read one ONES Wiki page as Markdown by page ID, URL, or hierarchical path. Prefer path for requests like \"Department/Annual Plans/2026\". Exact self-reference path segments such as \"我的\", \"我\", \"me\", or \"my\" resolve the authenticated user through ONES token info; never infer or expose the display name from local Git or machine configuration. Unique confidently close paths are corrected automatically; unresolved or ambiguous paths return candidate pages for confirmation. Sensitive values are redacted by default; revealing them requires an explicit argument based on an explicit user request.",
 		inputSchema: GetOnesWikiPageSchema,
 		annotations: {
 			readOnlyHint: true,
@@ -5146,7 +5663,7 @@ function createRequirementsServer(config, adapterOverrides) {
 	});
 	server.registerTool("prepare_wiki_create", {
 		title: "Prepare ONES Wiki Create",
-		description: "Resolve an exact parent page and prepare one exact Wiki create operation. Never writes. Returns a one-time 30-minute approval token.",
+		description: "Resolve an exact parent page and prepare one exact Wiki create operation. If a sibling page already has the requested title, fail closed and require the user to choose: edit the existing page, delete it and recreate, or use a new title. Exact self-reference path segments such as \"我的\", \"我\", \"me\", or \"my\" resolve the authenticated user through ONES token info; never infer or expose the display name from local Git or machine configuration. Never writes. Returns a one-time 30-minute approval token.",
 		inputSchema: PrepareWikiCreateSchema,
 		outputSchema: PrepareWikiCreateOutputSchema,
 		annotations: {
@@ -5185,7 +5702,7 @@ function createRequirementsServer(config, adapterOverrides) {
 	});
 	server.registerTool("prepare_wiki_update", {
 		title: "Prepare ONES Wiki Update",
-		description: "Prepare an exact minimal Wiki update, including exact table-row targeting. Never writes. Ambiguous pages, tables, or text matches fail closed.",
+		description: "Prepare an exact minimal Wiki update, including exact table-row targeting. Exact self-reference path segments such as \"我的\", \"我\", \"me\", or \"my\" resolve the authenticated user through ONES token info; never infer or expose the display name from local Git or machine configuration. Never writes. Ambiguous pages, tables, or text matches fail closed.",
 		inputSchema: PrepareWikiUpdateSchema,
 		outputSchema: PrepareWikiUpdateOutputSchema,
 		annotations: {
@@ -5222,6 +5739,28 @@ function createRequirementsServer(config, adapterOverrides) {
 			return toolError(err);
 		}
 	});
+	server.registerTool("delete_empty_wiki_duplicates", {
+		title: "Delete Empty ONES Wiki Duplicates",
+		description: "Delete only explicitly confirmed, title-only duplicate sibling pages while retaining one verified page with a body. Revalidates every page immediately before deletion and fails closed if any duplicate contains additional content.",
+		inputSchema: DeleteEmptyWikiDuplicatesSchema,
+		outputSchema: DeleteEmptyWikiDuplicatesOutputSchema,
+		annotations: {
+			readOnlyHint: false,
+			destructiveHint: true,
+			idempotentHint: false,
+			openWorldHint: true
+		}
+	}, async (params) => {
+		try {
+			const sourceType = params.source ?? defaultSource;
+			return await handleDeleteEmptyWikiDuplicates(params, adapters, {
+				defaultSource,
+				writesEnabled: wikiWritesEnabled(sourceType)
+			});
+		} catch (err) {
+			return toolError(err);
+		}
+	});
 	server.registerTool("list_sources", {
 		title: "List Sources",
 		description: "List all configured requirement sources and their status",