pi-onedev-toolkit 0.1.1 → 0.2.0

package/src/tools/issue.ts

@@ -2,8 +2,8 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { Type, type Static } from "typebox";
 import {
-	confirmGate,
 	FIELDS_DESCRIPTION,
+	confirmMutation,
 	pushRepeated,
 	QUERY_DESCRIPTION,
 	REF_DESCRIPTION,
@@ -13,6 +13,7 @@ import {
 	withFooter,
 	type ToolDeps,
 } from "./common.js";
+import type { MutationOperation } from "../mutation-approvals.js";
 
 const ISSUE_ACTIONS = [
 	"list",
@@ -33,6 +34,17 @@ const ISSUE_ACTIONS = [
 ] as const;
 export type IssueAction = (typeof ISSUE_ACTIONS)[number];
 
+const ISSUE_MUTATIONS: Partial<Record<IssueAction, MutationOperation>> = {
+	create: "issue.create",
+	edit: "issue.edit",
+	change_state: "issue.change_state",
+	add_comment: "issue.add_comment",
+	link: "issue.link",
+	log_work: "issue.log_work",
+	create_branch: "issue.create_branch",
+	checkout: "issue.checkout",
+};
+
 export interface IssueParams {
 	action?: IssueAction;
 	ref?: string;
@@ -41,14 +53,14 @@ export interface IssueParams {
 	state?: string;
 	comment?: string;
 	content?: string;
-	linkName?: string;
-	targetRef?: string;
+	link_name?: string;
+	target_ref?: string;
 	hours?: number;
 	fields?: string[];
 	iterations?: string[];
-	ownEstimatedTime?: number;
+	own_estimated_time?: number;
 	confidential?: boolean;
-	forWrite?: boolean;
+	for_write?: boolean;
 	project?: string;
 	query?: string;
 	count?: number;
@@ -79,9 +91,10 @@ export function buildIssueArgs(params: IssueParams): string[] {
 			if (params.project !== undefined) args.push("--project", params.project);
 			pushRepeated(args, "--field", params.fields);
 			pushRepeated(args, "--iteration", params.iterations);
-			if (params.ownEstimatedTime !== undefined)
-				args.push("--own-estimated-time", String(params.ownEstimatedTime));
-			if (params.confidential === true) args.push("--confidential");
+			if (params.own_estimated_time !== undefined)
+				args.push("--own-estimated-time", String(params.own_estimated_time));
+			if (params.confidential !== undefined)
+				args.push(`--confidential=${params.confidential}`);
 			return args;
 		case "edit":
 			args.push("edit", ref());
@@ -90,10 +103,10 @@ export function buildIssueArgs(params: IssueParams): string[] {
 				args.push("--description", params.description);
 			pushRepeated(args, "--field", params.fields);
 			pushRepeated(args, "--iteration", params.iterations);
-			if (params.ownEstimatedTime !== undefined)
-				args.push("--own-estimated-time", String(params.ownEstimatedTime));
+			if (params.own_estimated_time !== undefined)
+				args.push("--own-estimated-time", String(params.own_estimated_time));
 			if (params.confidential !== undefined)
-				args.push("--confidential", String(params.confidential));
+				args.push(`--confidential=${params.confidential}`);
 			return args;
 		case "change_state":
 			args.push(
@@ -116,8 +129,8 @@ export function buildIssueArgs(params: IssueParams): string[] {
 				...args,
 				"link",
 				ref(),
-				requireParam(params.linkName, action, "link_name"),
-				requireParam(params.targetRef, action, "target_ref"),
+				requireParam(params.link_name, action, "link_name"),
+				requireParam(params.target_ref, action, "target_ref"),
 			];
 		case "log_work":
 			args.push(
@@ -131,7 +144,7 @@ export function buildIssueArgs(params: IssueParams): string[] {
 			return [...args, "create-branch", ref()];
 		case "checkout":
 			args.push("checkout", ref());
-			if (params.forWrite === true) args.push("--for-write");
+			if (params.for_write === true) args.push("--for-write");
 			return args;
 		case "current_reference":
 			return [...args, "current-reference"];
@@ -141,6 +154,8 @@ export function buildIssueArgs(params: IssueParams): string[] {
 			return [...args, "get-valid-links"];
 		case "query_description":
 			return [...args, "get-query-description"];
+		default:
+			throw new Error(`unsupported issue action: ${String(action)}`);
 	}
 }
 
@@ -163,10 +178,10 @@ export function registerIssueTool(pi: ExtensionAPI, deps: ToolDeps): void {
 			Type.String({ description: "Markdown note attached to the action" }),
 		),
 		content: Type.Optional(Type.String({ description: "Markdown comment text" })),
-		linkName: Type.Optional(
+		link_name: Type.Optional(
 			Type.String({ description: "Issue link name; discover via valid_links" }),
 		),
-		targetRef: Type.Optional(
+		target_ref: Type.Optional(
 			Type.String({ description: "Target issue reference for the link action" }),
 		),
 		hours: Type.Optional(
@@ -176,11 +191,11 @@ export function registerIssueTool(pi: ExtensionAPI, deps: ToolDeps): void {
 			Type.Array(Type.String(), { description: FIELDS_DESCRIPTION }),
 		),
 		iterations: Type.Optional(Type.Array(Type.String())),
-		ownEstimatedTime: Type.Optional(
-			Type.Integer({ minimum: 0, description: "Estimated hours" }),
+		own_estimated_time: Type.Optional(
+			Type.Number({ minimum: 0, description: "Estimated hours" }),
 		),
 		confidential: Type.Optional(Type.Boolean()),
-		forWrite: Type.Optional(
+		for_write: Type.Optional(
 			Type.Boolean({ description: "checkout: set up the branch for pushing" }),
 		),
 		project: Type.Optional(
@@ -198,7 +213,7 @@ export function registerIssueTool(pi: ExtensionAPI, deps: ToolDeps): void {
 			}),
 		),
 		offset: Type.Optional(Type.Integer({ minimum: 0 })),
-	});
+	}, { additionalProperties: false });
 	type Params = Static<typeof parameters>;
 
 	pi.registerTool({
@@ -206,13 +221,22 @@ export function registerIssueTool(pi: ExtensionAPI, deps: ToolDeps): void {
 		label: "OneDev Issues",
 		description:
 			"Read and edit OneDev issues: query, inspect, comment, change fields/labels/state, log work, manage issue branches. Runs in the current repository's project; plain numbers resolve against it.",
-		promptGuidelines: [
-			"Use onedev_issue valid_fields before setting fields or state you have not seen this session.",
-			"Post comments and field changes only after presenting the intent to the user.",
-		],
 		parameters,
-		async execute(_toolCallId, params: Params, signal) {
-			const output = await runInContext(deps, buildIssueArgs(params), { signal });
+		async execute(_toolCallId, params: Params, signal, _onUpdate, ctx) {
+			const args = buildIssueArgs(params);
+			const operation = ISSUE_MUTATIONS[params.action];
+			if (operation) {
+				await confirmMutation(deps, ctx, {
+					operation,
+					title: `Approve OneDev issue action: ${params.action}`,
+					details: [
+						params.ref ? `Issue: ${params.ref}` : undefined,
+						params.title ? `Title: ${params.title}` : undefined,
+					].filter(Boolean).join("\n") || "This action changes issue or local branch state.",
+					signal,
+				});
+			}
+			const output = await runInContext(deps, args, { signal });
 			return toolResult(
 				withFooter(output.text, deps.context(), output.truncated),
 				{

package/src/tools/pull.ts

@@ -2,7 +2,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { Type, type Static } from "typebox";
 import {
-	confirmGate,
+	confirmMutation,
 	pushRepeated,
 	QUERY_DESCRIPTION,
 	REF_DESCRIPTION,
@@ -12,6 +12,7 @@ import {
 	withFooter,
 	type ToolDeps,
 } from "./common.js";
+import type { MutationOperation } from "../mutation-approvals.js";
 
 const PULL_ACTIONS = [
 	"list",
@@ -24,6 +25,9 @@ const PULL_ACTIONS = [
 	"edit",
 	"add_comment",
 	"add_code_comment",
+	"reply_code_comment",
+	"resolve_code_comment",
+	"unresolve_code_comment",
 	"approve",
 	"request_changes",
 	"merge",
@@ -37,6 +41,21 @@ const PULL_ACTIONS = [
 ] as const;
 export type PullAction = (typeof PULL_ACTIONS)[number];
 
+const PULL_MUTATIONS: Partial<Record<PullAction, MutationOperation>> = {
+	create: "pull.create",
+	edit: "pull.edit",
+	add_comment: "pull.add_comment",
+	add_code_comment: "pull.add_code_comment",
+	reply_code_comment: "pull.reply_code_comment",
+	resolve_code_comment: "pull.resolve_code_comment",
+	unresolve_code_comment: "pull.unresolve_code_comment",
+	approve: "pull.approve",
+	request_changes: "pull.request_changes",
+	merge: "pull.merge",
+	discard: "pull.discard",
+	checkout: "pull.checkout",
+};
+
 export interface PullParams {
 	action?: PullAction;
 	ref?: string;
@@ -44,29 +63,29 @@ export interface PullParams {
 	description?: string;
 	content?: string;
 	summary?: string;
-	commitMessage?: string;
+	commit_message?: string;
 	comment?: string;
 	file?: string;
-	fromLine?: number;
-	toLine?: number;
-	sourceBranch?: string;
-	targetBranch?: string;
-	sourceProject?: string;
-	targetProject?: string;
+	from_line?: number;
+	to_line?: number;
+	comment_id?: number;
+	source_branch?: string;
+	target_branch?: string;
+	source_project?: string;
+	target_project?: string;
 	assignees?: string[];
 	reviewers?: string[];
-	removeReviewers?: string[];
+	remove_reviewers?: string[];
 	labels?: string[];
-	mergeStrategy?: string;
-	autoMerge?: boolean;
-	autoMergeCommitMessage?: string;
-	forCodeReview?: boolean;
-	forWrite?: boolean;
+	merge_strategy?: string;
+	auto_merge?: boolean;
+	auto_merge_commit_message?: string;
+	for_code_review?: boolean;
+	for_write?: boolean;
 	project?: string;
 	query?: string;
 	count?: number;
 	offset?: number;
-	confirm?: boolean;
 }
 
 export function buildPullArgs(params: PullParams): string[] {
@@ -74,14 +93,14 @@ export function buildPullArgs(params: PullParams): string[] {
 	const action = requireParam(params.action, "pr", "action");
 	const ref = (): string => requireParam(params.ref, action, "ref");
 	const branchScope = (): void => {
-		if (params.sourceBranch !== undefined)
-			args.push("--source-branch", params.sourceBranch);
-		if (params.targetBranch !== undefined)
-			args.push("--target-branch", params.targetBranch);
-		if (params.sourceProject !== undefined)
-			args.push("--source-project", params.sourceProject);
-		if (params.targetProject !== undefined)
-			args.push("--target-project", params.targetProject);
+		if (params.source_branch !== undefined)
+			args.push("--source-branch", params.source_branch);
+		if (params.target_branch !== undefined)
+			args.push("--target-branch", params.target_branch);
+		if (params.source_project !== undefined)
+			args.push("--source-project", params.source_project);
+		if (params.target_project !== undefined)
+			args.push("--target-project", params.target_project);
 	};
 	switch (action) {
 		case "list":
@@ -102,7 +121,7 @@ export function buildPullArgs(params: PullParams): string[] {
 			return [...args, "get-builds", ref()];
 		case "get_patch":
 			args.push("get-patch", ref());
-			if (params.forCodeReview === true) args.push("--for-code-review");
+			if (params.for_code_review === true) args.push("--for-code-review");
 			return args;
 		case "create":
 			args.push("create", requireParam(params.title, action, "title"));
@@ -112,8 +131,8 @@ export function buildPullArgs(params: PullParams): string[] {
 			pushRepeated(args, "--assignee", params.assignees);
 			pushRepeated(args, "--reviewer", params.reviewers);
 			pushRepeated(args, "--label", params.labels);
-			if (params.mergeStrategy !== undefined)
-				args.push("--merge-strategy", params.mergeStrategy);
+			if (params.merge_strategy !== undefined)
+				args.push("--merge-strategy", params.merge_strategy);
 			return args;
 		case "edit":
 			args.push("edit", ref());
@@ -122,15 +141,15 @@ export function buildPullArgs(params: PullParams): string[] {
 				args.push("--description", params.description);
 			pushRepeated(args, "--assignee", params.assignees);
 			pushRepeated(args, "--add-reviewer", params.reviewers);
-			pushRepeated(args, "--remove-reviewer", params.removeReviewers);
+			pushRepeated(args, "--remove-reviewer", params.remove_reviewers);
 			pushRepeated(args, "--label", params.labels);
-			if (params.mergeStrategy !== undefined)
-				args.push("--merge-strategy", params.mergeStrategy);
-			if (params.autoMerge === true) {
-				args.push("--auto-merge");
-				if (params.autoMergeCommitMessage !== undefined)
-					args.push("--auto-merge-commit-message", params.autoMergeCommitMessage);
+			if (params.merge_strategy !== undefined)
+				args.push("--merge-strategy", params.merge_strategy);
+			if (params.auto_merge !== undefined) {
+				args.push(`--auto-merge=${params.auto_merge}`);
 			}
+			if (params.auto_merge_commit_message !== undefined)
+				args.push("--auto-merge-commit-message", params.auto_merge_commit_message);
 			return args;
 		case "add_comment":
 			return [
@@ -148,10 +167,29 @@ export function buildPullArgs(params: PullParams): string[] {
 			args.push("--file", requireParam(params.file, action, "file"));
 			args.push(
 				"--from-line",
-				String(requireParam(params.fromLine, action, "from_line")),
+				String(requireParam(params.from_line, action, "from_line")),
 			);
-			args.push("--to-line", String(params.toLine ?? params.fromLine));
+			args.push("--to-line", String(params.to_line ?? params.from_line));
 			return args;
+		case "reply_code_comment":
+			return [
+				"code-comment",
+				"add-reply",
+				String(requireParam(params.comment_id, action, "comment_id")),
+				requireParam(params.content, action, "content"),
+			];
+		case "resolve_code_comment":
+			return [
+				"code-comment",
+				"resolve",
+				String(requireParam(params.comment_id, action, "comment_id")),
+			];
+		case "unresolve_code_comment":
+			return [
+				"code-comment",
+				"unresolve",
+				String(requireParam(params.comment_id, action, "comment_id")),
+			];
 		case "approve":
 			args.push("approve", ref());
 			if (params.summary !== undefined) args.push("--summary", params.summary);
@@ -161,19 +199,17 @@ export function buildPullArgs(params: PullParams): string[] {
 			if (params.summary !== undefined) args.push("--summary", params.summary);
 			return args;
 		case "merge":
-			confirmGate(action, params.confirm);
 			args.push("merge", ref());
-			if (params.commitMessage !== undefined)
-				args.push("--commit-message", params.commitMessage);
+			if (params.commit_message !== undefined)
+				args.push("--commit-message", params.commit_message);
 			return args;
 		case "discard":
-			confirmGate(action, params.confirm);
 			args.push("discard", ref());
 			if (params.comment !== undefined) args.push("--comment", params.comment);
 			return args;
 		case "checkout":
 			args.push("checkout", ref());
-			if (params.forWrite === true) args.push("--for-write");
+			if (params.for_write === true) args.push("--for-write");
 			return args;
 		case "current_reference":
 			return [...args, "current-reference"];
@@ -189,6 +225,8 @@ export function buildPullArgs(params: PullParams): string[] {
 			args.push("get-commit-message-requirement");
 			branchScope();
 			return args;
+		default:
+			throw new Error(`unsupported pull action: ${String(action)}`);
 	}
 }
 
@@ -196,7 +234,7 @@ export function registerPullTool(pi: ExtensionAPI, deps: ToolDeps): void {
 	const parameters = Type.Object({
 		action: StringEnum(PULL_ACTIONS, {
 			description:
-				"list, get, get_comments, get_code_comments, get_builds, get_patch (diff; for_code_review scopes it), create, edit, add_comment, add_code_comment (line-anchored), approve, request_changes, merge (confirm), discard (confirm), checkout, current_reference, valid_labels, query_description, title_description_requirement, commit_message_requirement",
+				"list, get, get_comments, get_code_comments, get_builds, get_patch, create, edit, add_comment, add_code_comment, reply_code_comment, resolve_code_comment, unresolve_code_comment, approve, request_changes, merge, discard, checkout, current_reference, valid_labels, query_description, title_description_requirement, commit_message_requirement",
 		}),
 		ref: Type.Optional(Type.String({ description: REF_DESCRIPTION })),
 		title: Type.Optional(Type.String()),
@@ -210,7 +248,7 @@ export function registerPullTool(pi: ExtensionAPI, deps: ToolDeps): void {
 		comment: Type.Optional(
 			Type.String({ description: "Markdown note for discard" }),
 		),
-		commitMessage: Type.Optional(
+		commit_message: Type.Optional(
 			Type.String({
 				description: "Commit message for merge (required by squash merges)",
 			}),
@@ -218,29 +256,36 @@ export function registerPullTool(pi: ExtensionAPI, deps: ToolDeps): void {
 		file: Type.Optional(
 			Type.String({ description: "add_code_comment: file path in the PR patch" }),
 		),
-		fromLine: Type.Optional(
+		from_line: Type.Optional(
 			Type.Integer({
 				minimum: 1,
 				description: "add_code_comment: 1-based start line (right side of patch)",
 			}),
 		),
-		toLine: Type.Optional(
+		to_line: Type.Optional(
 			Type.Integer({
 				minimum: 1,
 				description: "add_code_comment: 1-based end line; defaults to from_line",
 			}),
 		),
-		sourceBranch: Type.Optional(Type.String()),
-		targetBranch: Type.Optional(Type.String()),
-		sourceProject: Type.Optional(Type.String()),
-		targetProject: Type.Optional(Type.String()),
+		comment_id: Type.Optional(
+			Type.Integer({
+				minimum: 1,
+				description:
+					"Code comment id for reply_code_comment, resolve_code_comment, or unresolve_code_comment",
+			}),
+		),
+		source_branch: Type.Optional(Type.String()),
+		target_branch: Type.Optional(Type.String()),
+		source_project: Type.Optional(Type.String()),
+		target_project: Type.Optional(Type.String()),
 		assignees: Type.Optional(
 			Type.Array(Type.String(), { description: "User logins, repeatable" }),
 		),
 		reviewers: Type.Optional(
 			Type.Array(Type.String(), { description: "User logins, repeatable" }),
 		),
-		removeReviewers: Type.Optional(
+		remove_reviewers: Type.Optional(
 			Type.Array(Type.String(), { description: "edit: user logins to remove" }),
 		),
 		labels: Type.Optional(
@@ -248,13 +293,13 @@ export function registerPullTool(pi: ExtensionAPI, deps: ToolDeps): void {
 				description: "Label names; discover via valid_labels",
 			}),
 		),
-		mergeStrategy: Type.Optional(Type.String()),
-		autoMerge: Type.Optional(Type.Boolean()),
-		autoMergeCommitMessage: Type.Optional(Type.String()),
-		forCodeReview: Type.Optional(
+		merge_strategy: Type.Optional(Type.String()),
+		auto_merge: Type.Optional(Type.Boolean()),
+		auto_merge_commit_message: Type.Optional(Type.String()),
+		for_code_review: Type.Optional(
 			Type.Boolean({ description: "get_patch: review-scoped patch" }),
 		),
-		forWrite: Type.Optional(
+		for_write: Type.Optional(
 			Type.Boolean({ description: "checkout: set up the branch for pushing" }),
 		),
 		project: Type.Optional(
@@ -265,13 +310,7 @@ export function registerPullTool(pi: ExtensionAPI, deps: ToolDeps): void {
 		query: Type.Optional(Type.String({ description: QUERY_DESCRIPTION })),
 		count: Type.Optional(Type.Integer({ minimum: 1, maximum: 100 })),
 		offset: Type.Optional(Type.Integer({ minimum: 0 })),
-		confirm: Type.Optional(
-			Type.Boolean({
-				description:
-					"Required true for merge/discard: re-run with confirm after the user approves the destructive action",
-			}),
-		),
-	});
+	}, { additionalProperties: false });
 	type Params = Static<typeof parameters>;
 
 	pi.registerTool({
@@ -279,13 +318,23 @@ export function registerPullTool(pi: ExtensionAPI, deps: ToolDeps): void {
 		label: "OneDev Pull Requests",
 		description:
 			"Read and edit OneDev pull requests: metadata, labels, comments, line-anchored code comments, builds, patch, review outcomes, and guarded merge/discard. Runs in the current repository's project.",
-		promptGuidelines: [
-			"Use onedev_pull get_patch with for_code_review for review-scoped diffs.",
-			"merge and discard require confirm: true after explicit user approval.",
-		],
 		parameters,
-		async execute(_toolCallId, params: Params, signal) {
-			const output = await runInContext(deps, buildPullArgs(params), { signal });
+		async execute(_toolCallId, params: Params, signal, _onUpdate, ctx) {
+			const args = buildPullArgs(params);
+			const operation = PULL_MUTATIONS[params.action];
+			if (operation) {
+				await confirmMutation(deps, ctx, {
+					operation,
+					title: `Approve OneDev pull request action: ${params.action}`,
+					details: [
+						params.ref ? `Pull request: ${params.ref}` : undefined,
+						params.comment_id ? `Code comment: ${params.comment_id}` : undefined,
+						params.title ? `Title: ${params.title}` : undefined,
+					].filter(Boolean).join("\n") || "This action changes pull request or local branch state.",
+					signal,
+				});
+			}
+			const output = await runInContext(deps, args, { signal });
 			return toolResult(
 				withFooter(output.text, deps.context(), output.truncated),
 				{

package/src/tools/watch.ts

@@ -0,0 +1,70 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { StringEnum } from "@earendil-works/pi-ai";
+import { Type } from "typebox";
+import type { OneDevSourceWatchManager } from "../source-watch.js";
+import { toolResult } from "./common.js";
+
+export function registerWatchTool(
+	pi: ExtensionAPI,
+	watches: OneDevSourceWatchManager,
+): void {
+	pi.registerTool({
+		name: "onedev_watch",
+		label: "OneDev Watch",
+		description:
+			"Create session-scoped one-shot watches for a build result or pull-request attention, or list/stop active watches. Notifications contain bounded metadata; use read tools for details.",
+		parameters: Type.Object(
+			{
+				action: StringEnum([
+					"watch_build",
+					"watch_pull_attention",
+					"list",
+					"stop",
+				]),
+				ref: Type.Optional(
+					Type.String({ description: "Build or pull request reference to watch" }),
+				),
+				watch_id: Type.Optional(
+					Type.String({ description: "Watch id required by stop" }),
+				),
+				interval_seconds: Type.Optional(
+					Type.Integer({ minimum: 15, maximum: 300, default: 30 }),
+				),
+				ttl_minutes: Type.Optional(
+					Type.Integer({ minimum: 1, maximum: 1440, default: 60 }),
+				),
+			},
+			{ additionalProperties: false },
+		),
+		async execute(_toolCallId, params, signal) {
+			if (params.action === "list") {
+				const active = watches.list();
+				return toolResult(
+					active.length > 0
+						? JSON.stringify(active, null, 2)
+						: "No active OneDev watches.",
+					{ watches: active },
+				);
+			}
+			if (params.action === "stop") {
+				if (!params.watch_id) throw new Error("stop requires watch_id");
+				const stopped = watches.stop(params.watch_id);
+				return toolResult(
+					stopped
+						? `Stopped OneDev watch ${params.watch_id}.`
+						: `OneDev watch ${params.watch_id} was not active.`,
+					{ watch_id: params.watch_id, stopped },
+				);
+			}
+			if (!params.ref) throw new Error(`${params.action} requires ref`);
+			const result = await watches.add({
+				kind: params.action === "watch_build" ? "build" : "pull_attention",
+				ref: params.ref,
+				intervalSeconds: params.interval_seconds,
+				ttlMinutes: params.ttl_minutes,
+				signal,
+			});
+			return toolResult(result.message, result.watch ?? { active: false });
+		},
+	});
+}