@ateriss_/aiv-cli 0.1.0 → 1.0.1

package/src/cli/selector.ts

@@ -43,6 +43,7 @@ export async function selectPR(prs: PullRequest[], message: string): Promise<Pul
 }
 
 export type PostReviewAction = 'approve' | 'request_changes' | 'skip';
+export type MergeStrategy = 'merge' | 'squash' | 'rebase';
 
 export async function selectPostReviewAction(message: string): Promise<PostReviewAction> {
   const inquirer = await getInquirer();
@@ -64,6 +65,34 @@ export async function selectPostReviewAction(message: string): Promise<PostRevie
   return answers['action'] as PostReviewAction;
 }
 
+export async function confirmMerge(message: string): Promise<boolean> {
+  const inquirer = await getInquirer();
+  const answers = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'ok',
+    message,
+    default: false,
+  }]);
+  return Boolean(answers['ok']);
+}
+
+export async function selectMergeStrategy(message: string): Promise<MergeStrategy> {
+  const inquirer = await getInquirer();
+  const answers = await inquirer.prompt([{
+    type: 'list',
+    name: 'strategy',
+    message,
+    choices: [
+      { name: chalk.cyan('Squash and merge'),  value: 'squash', short: 'Squash' },
+      { name: 'Merge commit',                  value: 'merge',  short: 'Merge' },
+      { name: chalk.dim('Rebase and merge'),   value: 'rebase', short: 'Rebase' },
+    ],
+    pageSize: 3,
+    loop: false,
+  }]);
+  return answers['strategy'] as MergeStrategy;
+}
+
 export async function confirmReview(pr: PullRequest, label: string): Promise<boolean> {
   const inquirer = await getInquirer();
 

package/src/git/github.ts

@@ -59,6 +59,22 @@ export class GithubClient {
     return { pr, files, rawDiff };
   }
 
+  async mergePR(
+    owner: string,
+    repo: string,
+    prNumber: number,
+    mergeMethod: 'merge' | 'squash' | 'rebase' = 'squash',
+  ): Promise<void> {
+    const url = `${GITHUB_API}/repos/${owner}/${repo}/pulls/${prNumber}/merge`;
+    const { default: fetch } = await import('node-fetch');
+    const res = await fetch(url, {
+      method: 'PUT',
+      headers: { ...this.headers, 'Content-Type': 'application/json' },
+      body: JSON.stringify({ merge_method: mergeMethod }),
+    }) as unknown as Response;
+    if (!res.ok) await this.throwError(res, `merge PR #${prNumber}`);
+  }
+
   async submitReview(
     owner: string,
     repo: string,

package/src/i18n/en.ts

@@ -175,6 +175,14 @@ export const en = {
   postReviewFailed: (msg: string) => `Failed to submit review: ${msg}`,
   postReviewRefreshing: 'Refreshing project context...',
   postReviewRefreshed: 'Context updated.',
+  postReviewMergeConfirm: 'Merge this PR now?',
+  postReviewSelectMerge: 'Select merge strategy:',
+  postReviewMerging: (n: number) => `Merging PR #${n}...`,
+  postReviewMerged: (n: number) => `  PR #${n} merged.`,
+  postReviewMergeFailed: (msg: string) => `Failed to merge: ${msg}`,
+  postReviewMergeStrategyMerge: 'Merge commit',
+  postReviewMergeStrategySquash: 'Squash and merge',
+  postReviewMergeStrategyRebase: 'Rebase and merge',
 
   // ── context generate ───────────────────────────────────────────────────────
   contextGenerateTitle: '\n  Generating context and rules with AI...\n',

package/src/i18n/es.ts

@@ -177,6 +177,14 @@ export const es: TranslationKeys = {
   postReviewFailed: (msg: string) => `Error al enviar la revisión: ${msg}`,
   postReviewRefreshing: 'Actualizando contexto del proyecto...',
   postReviewRefreshed: 'Contexto actualizado.',
+  postReviewMergeConfirm: '¿Hacer merge de este PR ahora?',
+  postReviewSelectMerge: 'Selecciona la estrategia de merge:',
+  postReviewMerging: (n: number) => `Haciendo merge del PR #${n}...`,
+  postReviewMerged: (n: number) => `  PR #${n} mergeado.`,
+  postReviewMergeFailed: (msg: string) => `Error al hacer merge: ${msg}`,
+  postReviewMergeStrategyMerge: 'Merge commit',
+  postReviewMergeStrategySquash: 'Squash and merge',
+  postReviewMergeStrategyRebase: 'Rebase and merge',
 
   // ── context generate ───────────────────────────────────────────────────────
   contextGenerateTitle: '\n  Generando contexto y reglas con IA...\n',