@pmelab/gtd 65.0.0 → 66.0.0

package/dist/chunks/{steering-DEh_MS40.mjs → steering-CMrePUiY.mjs}

@@ -15461,6 +15461,7 @@ const buildHunkFile = (content, item, paragraph, token, sourceLine) => {
 		...parsed.line !== void 0 ? { line: parsed.line } : {},
 		...parsed.rangeEnd !== void 0 ? { rangeEnd: parsed.rangeEnd } : {},
 		checked: item.checked === true,
+		...item.checked === null ? { plain: true } : {},
 		sourceLine,
 		endLine: hunkOwnEndLine(item, sourceLine),
 		...note.length > 0 ? {
@@ -15567,6 +15568,35 @@ const answerListOf = (content, body) => {
 		})
 	};
 };
+const COMMENT_LABEL_RE = /^(Impact|Fix):[ \t]*/;
+/** Splits a drafted comment at its `Impact:` / `Fix:` lines (outside fences) into labelled block sections; no labels is one What. */
+const commentSections = (comment) => {
+	const parts = [{
+		label: "What",
+		lines: []
+	}];
+	let fence;
+	for (const line of comment.split("\n")) {
+		const marker = /^\s*(`{3,}|~{3,})/.exec(line)?.[1];
+		if (marker !== void 0) {
+			if (fence === void 0) fence = marker;
+			else if (marker.startsWith(fence)) fence = void 0;
+		}
+		const label = fence === void 0 && marker === void 0 ? COMMENT_LABEL_RE.exec(line) : null;
+		if (label) parts.push({
+			label: label[1],
+			lines: [line.slice(label[0].length)]
+		});
+		else parts.at(-1).lines.push(line);
+	}
+	return parts.map(({ label, lines }) => ({
+		label,
+		text: lines.join("\n").trim()
+	})).filter(({ text }) => text.length > 0).map(({ label, text }) => ({
+		label,
+		body: blockNodesOfRun(text, parseMarkdown(text).children)
+	}));
+};
 /** A leading severity line is the chunk's tier, never its prose. */
 const splitSeverity = (content, run) => {
 	const first = run[0];
@@ -15580,28 +15610,52 @@ const splitSeverity = (content, run) => {
 		leadingRun: run.slice(1)
 	};
 };
+/** Every `listItem` under `node`, task or plain, at any depth. */
+const allListItems = (node) => {
+	const items = [];
+	const walk = (n) => {
+		if (n.type === "listItem") items.push(n);
+		n.children?.forEach((c) => walk(c));
+	};
+	walk(node);
+	return items;
+};
 /** Splits one chunk's body nodes into its file pointers (hunk pointers are task items, collected recursively at ANY nesting depth via `taskItems` — a nested hunk is the same kind of hunk as a top-level one) and description prose. The description is the chunk's own leading run and never a node that contains a hunk pointer: it stops at the first node whose `taskItems` include a real pointer (at any depth — a blockquote wrapping a pointer list stops it just as a top-level list would). Every node kind in what's left before that point contributes — a `footnoteDefinition` is the one exception, excluded by `blockNodesOfRun` itself (it's a note, never document content). */
-const parseChunkBody = (content, lines, title, body, answerable) => {
+const parseChunkBody = (content, lines, title, body, answerable, finding) => {
 	const answer = answerable ? answerListOf(content, body) : void 0;
 	const isAnswer = (n) => answer !== void 0 && (n === answer.list || n === body[answer.lead]);
-	const firstPointerIndex = body.findIndex((n) => !isAnswer(n) && taskItems(n).some((item) => hasPointerToken(content, item)));
+	const pointerItems = (n) => finding ? allListItems(n) : taskItems(n);
+	const firstPointerIndex = body.findIndex((n) => !isAnswer(n) && pointerItems(n).some((item) => hasPointerToken(content, item)));
 	const run = (firstPointerIndex === -1 ? body : body.slice(0, firstPointerIndex)).filter((n) => !isAnswer(n));
-	const { severity, leadingRun } = splitSeverity(content, run);
+	const draftIndex = answer !== void 0 ? body.findIndex((n, i) => !isAnswer(n) && n.type === "blockquote" && body[i - 1]?.type === "paragraph" && /^draft pr comment:?$/i.test(sourceText(content, body[i - 1]).trim())) : -1;
+	const comment = draftIndex === -1 ? void 0 : content.slice(body[draftIndex].position.start.offset, body[draftIndex].position.end.offset).split("\n").map((l) => l.replace(/^\s*> ?/, "")).join("\n").trim();
+	const draftNodes = new Set(draftIndex === -1 ? [] : [body[draftIndex], body[draftIndex - 1]]);
+	const { severity, leadingRun: fullRun } = splitSeverity(content, run);
+	const leadingRun = fullRun.filter((n) => !draftNodes.has(n));
 	const descriptionNodes = blockNodesOfRun(content, leadingRun);
 	const descriptionInline = collapseImages(blockRunInline(content, leadingRun));
-	const description = leadingRun.filter((n) => n.type !== "footnoteDefinition").map((n) => sourceText(content, n)).join(" ").trim();
+	const textOf = (nodes) => nodes.filter((n) => n.type !== "footnoteDefinition").map((n) => sourceText(content, n)).join(" ").trim();
+	const description = textOf(fullRun);
+	const detail = textOf(leadingRun);
 	const files = [];
 	const errors = [];
-	for (const item of body.filter((n) => !isAnswer(n)).flatMap((n) => taskItems(n))) {
+	for (const item of body.filter((n) => !isAnswer(n)).flatMap((n) => pointerItems(n))) {
 		const parsed = parseHunk(content, lines, title, item);
 		if (!parsed) continue;
+		if (finding && item.checked !== null) errors.push({
+			message: `Chunk "${title}" finding location ${pointerDisplay(parsed.file)} must be a plain list item — drop the checkbox`,
+			line: parsed.file.sourceLine,
+			range: lineRange(lines, parsed.file.sourceLine)
+		});
 		files.push(parsed.file);
 		errors.push(...parsed.errors);
 	}
 	return {
 		description,
+		detail,
 		descriptionNodes,
 		descriptionInline,
+		...comment === void 0 ? {} : { comment },
 		files,
 		errors,
 		...answer === void 0 ? {} : {
@@ -15675,7 +15729,7 @@ const parseChangesets = (tree, content, lines) => {
 	const errors = [];
 	for (const { heading, headingLine, body, section } of splitChunks(tree, content).chunks) {
 		const title = headingText$1(content, heading);
-		const { description, descriptionNodes, descriptionInline, files, answers, answerLine, severity, boxed, errors: bodyErrors } = parseChunkBody(content, lines, title, body, section !== "walkthrough");
+		const { description, detail, descriptionNodes, descriptionInline, comment, files, answers, answerLine, severity, boxed, errors: bodyErrors } = parseChunkBody(content, lines, title, body, section !== "walkthrough", section === "findings");
 		errors.push(...bodyErrors);
 		if (files.length === 0 && boxed) errors.push({
 			message: `Chunk "${title}" has no file pointers`,
@@ -15685,8 +15739,10 @@ const parseChangesets = (tree, content, lines) => {
 		changesets.push({
 			title,
 			description,
+			detail,
 			descriptionNodes,
 			descriptionInline,
+			...comment === void 0 ? {} : { comment },
 			files,
 			headingLine,
 			...answers === void 0 ? {} : {
@@ -15832,7 +15888,7 @@ const decisionNodes = (lines, chunk, end) => {
 		selectionRange: lineRange(lines, chunk.answerLine)
 	}];
 };
-const isOpenChunk = (chunk, markers) => chunk.files.some((file) => !file.checked) || markers > 0 || chunk.answers !== void 0 && decisionOf(chunk) === void 0;
+const isOpenChunk = (chunk, markers) => chunk.files.some((file) => !file.plain && !file.checked) || markers > 0 || chunk.answers !== void 0 && decisionOf(chunk) === void 0;
 /**
 * Document outline for `.gtd/REVIEW.md`: the chunks still left to review — an
 * unchecked hunk, a footnote (so a human's comment never vanishes with the
@@ -15863,7 +15919,7 @@ const reviewOutline = (content) => {
 		];
 		if (!(sections.length > 0 && chunk.section === void 0) && !isOpenChunk(chunk, chunkMarkers.length)) return [];
 		const node = {
-			name: chunk.files.length === 0 ? chunk.title : `${chunk.title} (${checkedCount}/${chunk.files.length})`,
+			name: chunk.files.length === 0 || chunk.section === "findings" ? chunk.title : `${chunk.title} (${checkedCount}/${chunk.files.length})`,
 			range: spanRange(lines, start, end),
 			selectionRange: lineRange(lines, start),
 			...children.length > 0 ? { children } : {}
@@ -15926,6 +15982,43 @@ const footnoteBlockEnd = (content, tree, cursorLine) => {
 	const block = blockNodeAt(tree, cursorLine);
 	return block?.position ? toLspPosition(block.position.end).line : cursorLine;
 };
+const FINDING_ACTIONS = [
+	{
+		title: "gtd: accept finding",
+		index: 0
+	},
+	{
+		title: "gtd: reject finding",
+		index: 1
+	},
+	{
+		title: "gtd: answer finding",
+		index: 2
+	}
+];
+/** Accept / reject / answer for one finding chunk; the one matching its single current tick is left out. */
+const findingActions = (content, chunk, chunkIndex) => {
+	if (chunk.answers?.length !== 3) return [];
+	const ticked = chunk.answers.flatMap((o, i) => o.checked ? [i] : []);
+	const current = ticked.length === 1 ? ticked[0] : void 0;
+	const items = answerItemsOf(content, chunkIndex);
+	return FINDING_ACTIONS.filter((a) => a.index !== current).flatMap((a) => {
+		const result = decisionEdits(content, chunkIndex, a.index, {});
+		if (!result.ok) return [];
+		const slot = items[2];
+		const from = slot ? firstParagraphContentOffset(slot) : void 0;
+		const to = slot?.children.find((c) => c.type === "paragraph")?.position?.end.offset;
+		const select = a.index === 2 && from !== void 0 && to !== void 0 ? {
+			start: toLspPositionFromOffset(content, from),
+			end: toLspPositionFromOffset(content, to)
+		} : void 0;
+		return [{
+			title: a.title,
+			edits: result.edits,
+			...select ? { select } : {}
+		}];
+	});
+};
 /**
 * Actions for `.gtd/REVIEW.md`: "check/uncheck this hunk" when `range` sits
 * on a hunk line, "check/uncheck all hunks" when `range` sits anywhere in a
@@ -15943,7 +16036,7 @@ const reviewActions = (content, range) => {
 	const actions = [...threadReplyActions(content, range.start)];
 	changesets.forEach((chunk, i) => {
 		const hunk = chunk.files.find((file) => cursorLine >= file.sourceLine && cursorLine <= file.endLine);
-		if (hunk) {
+		if (hunk && !hunk.plain) {
 			const edit = toggleFilePointer(content, hunk.sourceLine);
 			if (edit) actions.push({
 				title: hunk.checked ? "gtd: uncheck this hunk" : "gtd: check this hunk",
@@ -15951,7 +16044,8 @@ const reviewActions = (content, range) => {
 			});
 		}
 		const chunkEnd = chunk.section === void 0 ? Math.max(chunk.headingLine, (changesets[i + 1]?.headingLine ?? lines.length) - 1) : endLines.get(chunk.headingLine) ?? chunk.headingLine;
-		if (chunk.files.length > 0 && cursorLine >= chunk.headingLine && cursorLine <= chunkEnd) {
+		if (chunk.section === "findings" && cursorLine >= chunk.headingLine && cursorLine <= chunkEnd) actions.push(...findingActions(content, chunk, i));
+		if (chunk.section !== "findings" && chunk.files.length > 0 && cursorLine >= chunk.headingLine && cursorLine <= chunkEnd) {
 			const edits = toggleChunkEdits(content, chunk.headingLine);
 			if (edits.length > 0) {
 				const checkedCount = chunk.files.filter((file) => file.checked).length;
@@ -16018,9 +16112,12 @@ const hunkLinkFor = (content, item) => {
 const reviewDocumentLinks = (content) => {
 	const tree = parseMarkdown(content);
 	const links = [];
-	for (const block of splitChunks(tree, content).chunks) for (const item of block.body.flatMap((n) => taskItems(n))) {
-		const link = hunkLinkFor(content, item);
-		if (link) links.push(link);
+	for (const block of splitChunks(tree, content).chunks) {
+		const items = block.body.flatMap((n) => block.section === "findings" ? allListItems(n) : taskItems(n));
+		for (const item of items) {
+			const link = hunkLinkFor(content, item);
+			if (link) links.push(link);
+		}
 	}
 	return links;
 };
@@ -16032,9 +16129,10 @@ const reviewView = (content) => {
 		...shortHash ? { header: shortHash } : {},
 		nodes: changesets.map((chunk, chunkIndex) => ({
 			title: chunk.title,
-			detail: chunk.description,
+			detail: chunk.detail,
 			detailInline: chunk.descriptionInline,
 			body: chunk.descriptionNodes,
+			...chunk.comment === void 0 ? {} : { comment: commentSections(chunk.comment) },
 			...chunk.severity === void 0 ? {} : { status: chunk.severity.label },
 			anchor: {
 				kind: "chunk",
@@ -16059,7 +16157,7 @@ const reviewView = (content) => {
 				path: file.path,
 				...file.line !== void 0 ? { line: file.line } : {},
 				...file.rangeEnd !== void 0 ? { endLine: file.rangeEnd } : {},
-				checked: file.checked,
+				...file.plain ? {} : { checked: file.checked },
 				...file.note !== void 0 ? {
 					detail: file.note,
 					detailInline: file.noteInline ?? []
@@ -16214,7 +16312,7 @@ const reviewApply = (content, anchor, opts) => {
 	const checked = opts.checked ?? true;
 	if (anchor.kind === "hunk") {
 		const file = changesets[anchor.chunkIndex]?.files[anchor.index];
-		if (!file) return {
+		if (!file || file.plain) return {
 			ok: false,
 			reason: "anchor-not-found"
 		};
@@ -16225,7 +16323,7 @@ const reviewApply = (content, anchor, opts) => {
 	}
 	if (anchor.kind === "chunk") {
 		const chunk = changesets[anchor.index];
-		if (!chunk) return {
+		if (!chunk || chunk.section === "findings") return {
 			ok: false,
 			reason: "anchor-not-found"
 		};