@selesai/code 0.13.4 → 0.13.5

package/examples/extensions/git-merge-and-resolve.ts

@@ -1,115 +1,115 @@
-/**
- * Merge and Resolve
- *
- * Keeps the working branch up to date with its upstream tracking ref.
- * After each agent turn, fetches and merges. Clean merges complete
- * silently. When conflicts arise, the working tree is left dirty and
- * the agent receives a follow-up message listing each conflict block
- * with file, line range, and ours/theirs sections so it can resolve them.
- * Also re-sends unresolved conflicts from a previous incomplete merge.
- *
- * Start pi with this extension:
- *   pi -e ./examples/extensions/git-merge-and-resolve.ts
- */
-import { createReadStream } from "node:fs";
-import { join } from "node:path";
-import { createInterface } from "node:readline";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-interface ConflictBlock {
-	file: string;
-	startLine: number;
-	separatorLine: number;
-	endLine: number;
-}
-
-/** Parse conflict markers from working tree files with unmerged paths. */
-async function findConflicts(pi: ExtensionAPI, cwd: string): Promise<ConflictBlock[]> {
-	const { stdout, code } = await pi.exec("git", ["diff", "--name-only", "--diff-filter=U"]);
-	if (code !== 0 || !stdout.trim()) return [];
-
-	const blocks: ConflictBlock[] = [];
-	for (const file of stdout.trim().split("\n")) {
-		try {
-			const rl = createInterface({ input: createReadStream(join(cwd, file), "utf-8") });
-			let lineNo = 0;
-			let blockStart: number | undefined;
-			let separatorLine: number | undefined;
-			for await (const line of rl) {
-				lineNo++;
-				if (line.startsWith("<<<<<<<")) {
-					blockStart = lineNo;
-					separatorLine = undefined;
-				} else if (line.startsWith("=======") && blockStart !== undefined) {
-					separatorLine = lineNo;
-				} else if (line.startsWith(">>>>>>>") && blockStart !== undefined && separatorLine !== undefined) {
-					blocks.push({ file, startLine: blockStart, separatorLine, endLine: lineNo });
-					blockStart = undefined;
-					separatorLine = undefined;
-				}
-			}
-		} catch {}
-	}
-	return blocks;
-}
-
-function formatRange(start: number, end: number): string {
-	if (start > end) return "empty";
-	if (start === end) return `${start}`;
-	return `${start}-${end}`;
-}
-
-function formatConflicts(ref: string, blocks: ConflictBlock[]): string {
-	const lines = [`Merged ${ref} with conflicts:`, ""];
-	for (const b of blocks) {
-		const ours = formatRange(b.startLine + 1, b.separatorLine - 1);
-		const theirs = formatRange(b.separatorLine + 1, b.endLine - 1);
-		lines.push(`  ${b.file}:${b.startLine}-${b.endLine} (ours ${ours}, theirs ${theirs})`);
-	}
-	lines.push("", "Resolve these conflicts.");
-	return lines.join("\n");
-}
-
-export default function (pi: ExtensionAPI) {
-	pi.on("agent_end", async (_event, ctx) => {
-		const { code: revParseCode } = await pi.exec("git", ["rev-parse", "--git-dir"]);
-		if (revParseCode !== 0) return;
-
-		let ref = "MERGE_HEAD";
-
-		// If not already in a merge, attempt one
-		const { code: mergeHeadCode } = await pi.exec("git", ["rev-parse", "MERGE_HEAD"]);
-		if (mergeHeadCode !== 0) {
-			// Only attempt a new merge if the working tree is clean
-			const { stdout: status } = await pi.exec("git", ["status", "--porcelain"]);
-			if (status.trim()) return;
-
-			const { stdout: upstream, code: upstreamCode } = await pi.exec("git", [
-				"rev-parse",
-				"--abbrev-ref",
-				"--symbolic-full-name",
-				"@{u}",
-			]);
-			if (upstreamCode !== 0) return;
-
-			ref = upstream.trim();
-			const remote = ref.split("/")[0];
-			ctx.ui.notify(`git-merge-and-resolve: fetching ${remote}, merging ${ref}`, "info");
-
-			const { code: fetchCode, stderr: fetchErr } = await pi.exec("git", ["fetch", remote]);
-			if (fetchCode !== 0) {
-				ctx.ui.notify(`git-merge-and-resolve: fetch failed: ${fetchErr.trim()}`, "warning");
-				return;
-			}
-
-			const { code: mergeCode } = await pi.exec("git", ["merge", "--no-ff", ref]);
-			if (mergeCode === 0) return;
-		}
-
-		// Either we just merged with conflicts, or we were already in an unfinished merge
-		const conflicts = await findConflicts(pi, ctx.cwd);
-		if (conflicts.length === 0) return;
-
-		pi.sendUserMessage(formatConflicts(ref, conflicts), { deliverAs: "followUp" });
-	});
-}
+/**
+ * Merge and Resolve
+ *
+ * Keeps the working branch up to date with its upstream tracking ref.
+ * After each agent turn, fetches and merges. Clean merges complete
+ * silently. When conflicts arise, the working tree is left dirty and
+ * the agent receives a follow-up message listing each conflict block
+ * with file, line range, and ours/theirs sections so it can resolve them.
+ * Also re-sends unresolved conflicts from a previous incomplete merge.
+ *
+ * Start pi with this extension:
+ *   pi -e ./examples/extensions/git-merge-and-resolve.ts
+ */
+import { createReadStream } from "node:fs";
+import { join } from "node:path";
+import { createInterface } from "node:readline";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+interface ConflictBlock {
+	file: string;
+	startLine: number;
+	separatorLine: number;
+	endLine: number;
+}
+
+/** Parse conflict markers from working tree files with unmerged paths. */
+async function findConflicts(pi: ExtensionAPI, cwd: string): Promise<ConflictBlock[]> {
+	const { stdout, code } = await pi.exec("git", ["diff", "--name-only", "--diff-filter=U"]);
+	if (code !== 0 || !stdout.trim()) return [];
+
+	const blocks: ConflictBlock[] = [];
+	for (const file of stdout.trim().split("\n")) {
+		try {
+			const rl = createInterface({ input: createReadStream(join(cwd, file), "utf-8") });
+			let lineNo = 0;
+			let blockStart: number | undefined;
+			let separatorLine: number | undefined;
+			for await (const line of rl) {
+				lineNo++;
+				if (line.startsWith("<<<<<<<")) {
+					blockStart = lineNo;
+					separatorLine = undefined;
+				} else if (line.startsWith("=======") && blockStart !== undefined) {
+					separatorLine = lineNo;
+				} else if (line.startsWith(">>>>>>>") && blockStart !== undefined && separatorLine !== undefined) {
+					blocks.push({ file, startLine: blockStart, separatorLine, endLine: lineNo });
+					blockStart = undefined;
+					separatorLine = undefined;
+				}
+			}
+		} catch {}
+	}
+	return blocks;
+}
+
+function formatRange(start: number, end: number): string {
+	if (start > end) return "empty";
+	if (start === end) return `${start}`;
+	return `${start}-${end}`;
+}
+
+function formatConflicts(ref: string, blocks: ConflictBlock[]): string {
+	const lines = [`Merged ${ref} with conflicts:`, ""];
+	for (const b of blocks) {
+		const ours = formatRange(b.startLine + 1, b.separatorLine - 1);
+		const theirs = formatRange(b.separatorLine + 1, b.endLine - 1);
+		lines.push(`  ${b.file}:${b.startLine}-${b.endLine} (ours ${ours}, theirs ${theirs})`);
+	}
+	lines.push("", "Resolve these conflicts.");
+	return lines.join("\n");
+}
+
+export default function (pi: ExtensionAPI) {
+	pi.on("agent_end", async (_event, ctx) => {
+		const { code: revParseCode } = await pi.exec("git", ["rev-parse", "--git-dir"]);
+		if (revParseCode !== 0) return;
+
+		let ref = "MERGE_HEAD";
+
+		// If not already in a merge, attempt one
+		const { code: mergeHeadCode } = await pi.exec("git", ["rev-parse", "MERGE_HEAD"]);
+		if (mergeHeadCode !== 0) {
+			// Only attempt a new merge if the working tree is clean
+			const { stdout: status } = await pi.exec("git", ["status", "--porcelain"]);
+			if (status.trim()) return;
+
+			const { stdout: upstream, code: upstreamCode } = await pi.exec("git", [
+				"rev-parse",
+				"--abbrev-ref",
+				"--symbolic-full-name",
+				"@{u}",
+			]);
+			if (upstreamCode !== 0) return;
+
+			ref = upstream.trim();
+			const remote = ref.split("/")[0];
+			ctx.ui.notify(`git-merge-and-resolve: fetching ${remote}, merging ${ref}`, "info");
+
+			const { code: fetchCode, stderr: fetchErr } = await pi.exec("git", ["fetch", remote]);
+			if (fetchCode !== 0) {
+				ctx.ui.notify(`git-merge-and-resolve: fetch failed: ${fetchErr.trim()}`, "warning");
+				return;
+			}
+
+			const { code: mergeCode } = await pi.exec("git", ["merge", "--no-ff", ref]);
+			if (mergeCode === 0) return;
+		}
+
+		// Either we just merged with conflicts, or we were already in an unfinished merge
+		const conflicts = await findConflicts(pi, ctx.cwd);
+		if (conflicts.length === 0) return;
+
+		pi.sendUserMessage(formatConflicts(ref, conflicts), { deliverAs: "followUp" });
+	});
+}

package/examples/extensions/github-issue-autocomplete.ts

@@ -1,185 +1,185 @@
-// Requires GitHub CLI (`gh`) and a GitHub repository checkout.
-// Preloads the latest open issues once per session, then filters them locally for fast `#...` completion.
-
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import {
-	type AutocompleteItem,
-	type AutocompleteProvider,
-	type AutocompleteSuggestions,
-	fuzzyFilter,
-} from "@earendil-works/pi-tui";
-
-type GitHubIssue = {
-	number: number;
-	title: string;
-	state: string;
-};
-
-type RepoResolution = { ok: true; repo: string } | { ok: false; error: string };
-
-const MAX_ISSUES = 100;
-const MAX_SUGGESTIONS = 20;
-
-function extractIssueToken(textBeforeCursor: string): string | undefined {
-	const match = textBeforeCursor.match(/(?:^|[ \t])#([^\s#]*)$/);
-	return match?.[1];
-}
-
-function parseGitHubRepo(remoteUrl: string): string | undefined {
-	const sshMatch = remoteUrl.match(/^git@github\.com:([^/]+\/[^/]+?)(?:\.git)?$/);
-	if (sshMatch) {
-		return sshMatch[1];
-	}
-
-	const httpsMatch = remoteUrl.match(/^https?:\/\/github\.com\/([^/]+\/[^/]+?)(?:\.git)?$/);
-	if (httpsMatch) {
-		return httpsMatch[1];
-	}
-
-	return undefined;
-}
-
-async function resolveGitHubRepo(pi: ExtensionAPI, cwd: string): Promise<RepoResolution> {
-	const result = await pi.exec("git", ["remote", "-v"], { cwd, timeout: 5_000 });
-	if (result.code !== 0) {
-		return { ok: false, error: "github-issue-autocomplete: cwd is not a git repository" };
-	}
-
-	for (const line of result.stdout.split("\n")) {
-		const columns = line.trim().split(/\s+/);
-		const remoteUrl = columns[1];
-		if (!remoteUrl) {
-			continue;
-		}
-		const repo = parseGitHubRepo(remoteUrl);
-		if (repo) {
-			return { ok: true, repo };
-		}
-	}
-
-	return { ok: false, error: "github-issue-autocomplete: cwd is not a GitHub repository" };
-}
-
-function formatIssueItem(issue: GitHubIssue): AutocompleteItem {
-	return {
-		value: `#${issue.number}`,
-		label: `#${issue.number}`,
-		description: `[${issue.state.toLowerCase()}] ${issue.title}`,
-	};
-}
-
-function filterIssues(issues: GitHubIssue[], query: string): AutocompleteItem[] {
-	if (!query.trim()) {
-		return issues.slice(0, MAX_SUGGESTIONS).map(formatIssueItem);
-	}
-
-	if (/^\d+$/.test(query)) {
-		const numericMatches = issues
-			.filter((issue) => String(issue.number).startsWith(query))
-			.slice(0, MAX_SUGGESTIONS)
-			.map(formatIssueItem);
-		if (numericMatches.length > 0) {
-			return numericMatches;
-		}
-	}
-
-	return fuzzyFilter(issues, query, (issue) => `${issue.number} ${issue.title}`)
-		.slice(0, MAX_SUGGESTIONS)
-		.map(formatIssueItem);
-}
-
-function createIssueAutocompleteProvider(
-	current: AutocompleteProvider,
-	getIssues: () => Promise<GitHubIssue[] | undefined>,
-): AutocompleteProvider {
-	return {
-		async getSuggestions(lines, cursorLine, cursorCol, options): Promise<AutocompleteSuggestions | null> {
-			const currentLine = lines[cursorLine] ?? "";
-			const textBeforeCursor = currentLine.slice(0, cursorCol);
-			const token = extractIssueToken(textBeforeCursor);
-			if (token === undefined) {
-				return current.getSuggestions(lines, cursorLine, cursorCol, options);
-			}
-
-			const issues = await getIssues();
-			if (options.signal.aborted || !issues || issues.length === 0) {
-				return current.getSuggestions(lines, cursorLine, cursorCol, options);
-			}
-
-			const suggestions = filterIssues(issues, token);
-			if (suggestions.length === 0) {
-				return current.getSuggestions(lines, cursorLine, cursorCol, options);
-			}
-
-			return {
-				items: suggestions,
-				prefix: `#${token}`,
-			};
-		},
-
-		applyCompletion(lines, cursorLine, cursorCol, item, prefix) {
-			return current.applyCompletion(lines, cursorLine, cursorCol, item, prefix);
-		},
-
-		shouldTriggerFileCompletion(lines, cursorLine, cursorCol) {
-			return current.shouldTriggerFileCompletion?.(lines, cursorLine, cursorCol) ?? true;
-		},
-	};
-}
-
-export default function (pi: ExtensionAPI): void {
-	pi.on("session_start", async (_event, ctx) => {
-		const resolvedRepo = await resolveGitHubRepo(pi, ctx.cwd);
-		if (!resolvedRepo.ok) {
-			ctx.ui.notify(resolvedRepo.error, "error");
-			return;
-		}
-
-		const repo = resolvedRepo.repo;
-		let issuesPromise: Promise<GitHubIssue[] | undefined> | undefined;
-		let loadErrorShown = false;
-
-		const getIssues = async (): Promise<GitHubIssue[] | undefined> => {
-			issuesPromise ||= (async () => {
-				const result = await pi.exec(
-					"gh",
-					[
-						"issue",
-						"list",
-						"--repo",
-						repo,
-						"--state",
-						"open",
-						"--limit",
-						String(MAX_ISSUES),
-						"--json",
-						"number,title,state",
-					],
-					{ cwd: ctx.cwd, timeout: 5_000 },
-				);
-				if (result.code !== 0) {
-					if (!loadErrorShown) {
-						loadErrorShown = true;
-						const details = result.stderr.trim() || `exit code ${result.code}`;
-						ctx.ui.notify(`github-issue-autocomplete: failed to load issues: ${details}`, "error");
-					}
-					return undefined;
-				}
-
-				try {
-					return JSON.parse(result.stdout) as GitHubIssue[];
-				} catch {
-					if (!loadErrorShown) {
-						loadErrorShown = true;
-						ctx.ui.notify("github-issue-autocomplete: failed to parse gh issue list output", "error");
-					}
-					return undefined;
-				}
-			})();
-			return issuesPromise;
-		};
-
-		void getIssues();
-		ctx.ui.addAutocompleteProvider((current) => createIssueAutocompleteProvider(current, getIssues));
-	});
-}
+// Requires GitHub CLI (`gh`) and a GitHub repository checkout.
+// Preloads the latest open issues once per session, then filters them locally for fast `#...` completion.
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import {
+	type AutocompleteItem,
+	type AutocompleteProvider,
+	type AutocompleteSuggestions,
+	fuzzyFilter,
+} from "@earendil-works/pi-tui";
+
+type GitHubIssue = {
+	number: number;
+	title: string;
+	state: string;
+};
+
+type RepoResolution = { ok: true; repo: string } | { ok: false; error: string };
+
+const MAX_ISSUES = 100;
+const MAX_SUGGESTIONS = 20;
+
+function extractIssueToken(textBeforeCursor: string): string | undefined {
+	const match = textBeforeCursor.match(/(?:^|[ \t])#([^\s#]*)$/);
+	return match?.[1];
+}
+
+function parseGitHubRepo(remoteUrl: string): string | undefined {
+	const sshMatch = remoteUrl.match(/^git@github\.com:([^/]+\/[^/]+?)(?:\.git)?$/);
+	if (sshMatch) {
+		return sshMatch[1];
+	}
+
+	const httpsMatch = remoteUrl.match(/^https?:\/\/github\.com\/([^/]+\/[^/]+?)(?:\.git)?$/);
+	if (httpsMatch) {
+		return httpsMatch[1];
+	}
+
+	return undefined;
+}
+
+async function resolveGitHubRepo(pi: ExtensionAPI, cwd: string): Promise<RepoResolution> {
+	const result = await pi.exec("git", ["remote", "-v"], { cwd, timeout: 5_000 });
+	if (result.code !== 0) {
+		return { ok: false, error: "github-issue-autocomplete: cwd is not a git repository" };
+	}
+
+	for (const line of result.stdout.split("\n")) {
+		const columns = line.trim().split(/\s+/);
+		const remoteUrl = columns[1];
+		if (!remoteUrl) {
+			continue;
+		}
+		const repo = parseGitHubRepo(remoteUrl);
+		if (repo) {
+			return { ok: true, repo };
+		}
+	}
+
+	return { ok: false, error: "github-issue-autocomplete: cwd is not a GitHub repository" };
+}
+
+function formatIssueItem(issue: GitHubIssue): AutocompleteItem {
+	return {
+		value: `#${issue.number}`,
+		label: `#${issue.number}`,
+		description: `[${issue.state.toLowerCase()}] ${issue.title}`,
+	};
+}
+
+function filterIssues(issues: GitHubIssue[], query: string): AutocompleteItem[] {
+	if (!query.trim()) {
+		return issues.slice(0, MAX_SUGGESTIONS).map(formatIssueItem);
+	}
+
+	if (/^\d+$/.test(query)) {
+		const numericMatches = issues
+			.filter((issue) => String(issue.number).startsWith(query))
+			.slice(0, MAX_SUGGESTIONS)
+			.map(formatIssueItem);
+		if (numericMatches.length > 0) {
+			return numericMatches;
+		}
+	}
+
+	return fuzzyFilter(issues, query, (issue) => `${issue.number} ${issue.title}`)
+		.slice(0, MAX_SUGGESTIONS)
+		.map(formatIssueItem);
+}
+
+function createIssueAutocompleteProvider(
+	current: AutocompleteProvider,
+	getIssues: () => Promise<GitHubIssue[] | undefined>,
+): AutocompleteProvider {
+	return {
+		async getSuggestions(lines, cursorLine, cursorCol, options): Promise<AutocompleteSuggestions | null> {
+			const currentLine = lines[cursorLine] ?? "";
+			const textBeforeCursor = currentLine.slice(0, cursorCol);
+			const token = extractIssueToken(textBeforeCursor);
+			if (token === undefined) {
+				return current.getSuggestions(lines, cursorLine, cursorCol, options);
+			}
+
+			const issues = await getIssues();
+			if (options.signal.aborted || !issues || issues.length === 0) {
+				return current.getSuggestions(lines, cursorLine, cursorCol, options);
+			}
+
+			const suggestions = filterIssues(issues, token);
+			if (suggestions.length === 0) {
+				return current.getSuggestions(lines, cursorLine, cursorCol, options);
+			}
+
+			return {
+				items: suggestions,
+				prefix: `#${token}`,
+			};
+		},
+
+		applyCompletion(lines, cursorLine, cursorCol, item, prefix) {
+			return current.applyCompletion(lines, cursorLine, cursorCol, item, prefix);
+		},
+
+		shouldTriggerFileCompletion(lines, cursorLine, cursorCol) {
+			return current.shouldTriggerFileCompletion?.(lines, cursorLine, cursorCol) ?? true;
+		},
+	};
+}
+
+export default function (pi: ExtensionAPI): void {
+	pi.on("session_start", async (_event, ctx) => {
+		const resolvedRepo = await resolveGitHubRepo(pi, ctx.cwd);
+		if (!resolvedRepo.ok) {
+			ctx.ui.notify(resolvedRepo.error, "error");
+			return;
+		}
+
+		const repo = resolvedRepo.repo;
+		let issuesPromise: Promise<GitHubIssue[] | undefined> | undefined;
+		let loadErrorShown = false;
+
+		const getIssues = async (): Promise<GitHubIssue[] | undefined> => {
+			issuesPromise ||= (async () => {
+				const result = await pi.exec(
+					"gh",
+					[
+						"issue",
+						"list",
+						"--repo",
+						repo,
+						"--state",
+						"open",
+						"--limit",
+						String(MAX_ISSUES),
+						"--json",
+						"number,title,state",
+					],
+					{ cwd: ctx.cwd, timeout: 5_000 },
+				);
+				if (result.code !== 0) {
+					if (!loadErrorShown) {
+						loadErrorShown = true;
+						const details = result.stderr.trim() || `exit code ${result.code}`;
+						ctx.ui.notify(`github-issue-autocomplete: failed to load issues: ${details}`, "error");
+					}
+					return undefined;
+				}
+
+				try {
+					return JSON.parse(result.stdout) as GitHubIssue[];
+				} catch {
+					if (!loadErrorShown) {
+						loadErrorShown = true;
+						ctx.ui.notify("github-issue-autocomplete: failed to parse gh issue list output", "error");
+					}
+					return undefined;
+				}
+			})();
+			return issuesPromise;
+		};
+
+		void getIssues();
+		ctx.ui.addAutocompleteProvider((current) => createIssueAutocompleteProvider(current, getIssues));
+	});
+}