@jojonax/codex-copilot 1.0.2 → 1.1.0

package/src/utils/git.js

@@ -1,5 +1,5 @@
 /**
- * Git 操作工具模块
+ * Git operations utility module
  */
 
 import { execSync } from 'child_process';
@@ -17,17 +17,17 @@ function execSafe(cmd, cwd) {
   }
 }
 
-// 校验分支名，防止 shell 注入
+// Validate branch name to prevent shell injection
 function validateBranch(name) {
-  if (!name || typeof name !== 'string') throw new Error('分支名不能为空');
-  if (/[;&|`$(){}\[\]!\\<>"'\s]/.test(name)) {
-    throw new Error(`分支名包含不安全字符: ${name}`);
+  if (!name || typeof name !== 'string') throw new Error('Branch name cannot be empty');
+  if (/[;&|`$(){}[\]!\\<>"'\s]/.test(name)) {
+    throw new Error(`Branch name contains unsafe characters: ${name}`);
   }
   return name;
 }
 
 /**
- * 检查 git 仓库是否干净
+ * Check if the git working tree is clean
  */
 export function isClean(cwd) {
   const result = exec('git status --porcelain', cwd);
@@ -35,25 +35,25 @@ export function isClean(cwd) {
 }
 
 /**
- * 获取当前分支名
+ * Get current branch name
  */
 export function currentBranch(cwd) {
   return exec('git branch --show-current', cwd);
 }
 
 /**
- * 获取 remote 的 owner/repo
+ * Get remote owner/repo info
  */
 export function getRepoInfo(cwd) {
   const url = exec('git remote get-url origin', cwd);
-  // 支持 https://github.com/owner/repo.git 和 git@github.com:owner/repo.git
+  // Supports https://github.com/owner/repo.git and git@github.com:owner/repo.git
   const match = url.match(/github\.com[:/](.+?)\/(.+?)(?:\.git)?$/);
-  if (!match) throw new Error(`无法解析 GitHub 仓库地址: ${url}`);
+  if (!match) throw new Error(`Cannot parse GitHub repository URL: ${url}`);
   return { owner: match[1], repo: match[2] };
 }
 
 /**
- * 切换到目标分支（如不存在则创建）
+ * Switch to target branch (create if not exists)
  */
 export function checkoutBranch(cwd, branch, baseBranch = 'main') {
   validateBranch(branch);
@@ -61,11 +61,11 @@ export function checkoutBranch(cwd, branch, baseBranch = 'main') {
   const current = currentBranch(cwd);
   if (current === branch) return;
 
-  // 先切到 base 并拉取最新
+  // Switch to base and pull latest
   execSafe(`git checkout ${baseBranch}`, cwd);
   execSafe(`git pull origin ${baseBranch}`, cwd);
 
-  // 尝试切换，不存在则创建
+  // Try to switch, create if not exists
   const result = execSafe(`git checkout ${branch}`, cwd);
   if (!result.ok) {
     exec(`git checkout -b ${branch}`, cwd);
@@ -73,13 +73,13 @@ export function checkoutBranch(cwd, branch, baseBranch = 'main') {
 }
 
 /**
- * 提交所有变更
+ * Commit all changes
  */
 export function commitAll(cwd, message) {
   exec('git add -A', cwd);
   const result = execSafe(`git diff --cached --quiet`, cwd);
   if (result.ok) {
-    log.dim('没有变更需要提交');
+    log.dim('No changes to commit');
     return false;
   }
   exec(`git commit -m ${shellEscape(message)}`, cwd);
@@ -91,15 +91,19 @@ function shellEscape(str) {
 }
 
 /**
- * 推送分支
+ * Push branch to remote (handles new branches without upstream)
  */
 export function pushBranch(cwd, branch) {
   validateBranch(branch);
-  exec(`git push origin ${branch} --force-with-lease`, cwd);
+  const result = execSafe(`git push origin ${branch} --force-with-lease`, cwd);
+  if (!result.ok) {
+    // Force-with-lease fails on new branches — fall back to regular push with upstream
+    exec(`git push -u origin ${branch}`, cwd);
+  }
 }
 
 /**
- * 切回主分支
+ * Switch back to main branch
  */
 export function checkoutMain(cwd, baseBranch = 'main') {
   validateBranch(baseBranch);

package/src/utils/github.js

@@ -1,5 +1,5 @@
 /**
- * GitHub 操作模块 - 通过 gh CLI 操作 PR 和 Review
+ * GitHub operations module - PR and Review management via gh CLI
  */
 
 import { execSync } from 'child_process';
@@ -9,6 +9,14 @@ function gh(cmd, cwd) {
   return execSync(`gh ${cmd}`, { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
 }
 
+function ghSafe(cmd, cwd) {
+  try {
+    return { ok: true, output: gh(cmd, cwd) };
+  } catch (err) {
+    return { ok: false, output: err.stderr || err.message };
+  }
+}
+
 function ghJSON(cmd, cwd) {
   const output = gh(cmd, cwd);
   if (!output) return null;
@@ -19,12 +27,20 @@ function ghJSON(cmd, cwd) {
   }
 }
 
+function ghJSONSafe(cmd, cwd) {
+  try {
+    return ghJSON(cmd, cwd);
+  } catch {
+    return null;
+  }
+}
+
 function shellEscape(str) {
   return `'${str.replace(/'/g, "'\\''")}'`
 }
 
 /**
- * 检查 gh CLI 是否登录
+ * Check if gh CLI is authenticated
  */
 export function checkGhAuth() {
   try {
@@ -36,28 +52,146 @@ export function checkGhAuth() {
 }
 
 /**
- * 创建 PR
+ * Ensure the base branch exists on remote.
+ * If not, push it first.
+ */
+export function ensureRemoteBranch(cwd, branch) {
+  try {
+    const result = execSync(
+      `git ls-remote --heads origin ${branch}`,
+      { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
+    ).trim();
+    if (!result) {
+      // Branch doesn't exist on remote, push it
+      log.info(`Base branch '${branch}' not found on remote, pushing...`);
+      execSync(`git push origin ${branch}`, {
+        cwd,
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+      });
+      log.info(`Base branch '${branch}' pushed to remote`);
+    }
+    return true;
+  } catch (err) {
+    log.warn(`Failed to verify remote branch '${branch}': ${err.message}`);
+    return false;
+  }
+}
+
+/**
+ * Check if there are commits between base and head branches
+ */
+export function hasCommitsBetween(cwd, base, head) {
+  try {
+    const result = execSync(
+      `git log ${base}..${head} --oneline`,
+      { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
+    ).trim();
+    return result.length > 0;
+  } catch {
+    // If comparison fails (e.g., branches diverged), assume there are commits
+    return true;
+  }
+}
+
+/**
+ * Find an existing PR for a given head branch
+ * @returns {{ number: number, url: string } | null}
+ */
+export function findExistingPR(cwd, head) {
+  try {
+    const prs = ghJSON(
+      `pr list --head ${shellEscape(head)} --json number,url --limit 1`,
+      cwd
+    );
+    if (prs && prs.length > 0) {
+      return { number: prs[0].number, url: prs[0].url || '' };
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Create a pull request with pre-checks and auto-recovery
  */
 export function createPR(cwd, { title, body, base = 'main', head }) {
+  // Pre-check: ensure base branch exists on remote
+  ensureRemoteBranch(cwd, base);
+
   const output = gh(
-    `pr create --title ${shellEscape(title)} --body ${shellEscape(body)} --base ${base} --head ${head}`,
+    `pr create --title ${shellEscape(title)} --body ${shellEscape(body)} --base ${shellEscape(base)} --head ${shellEscape(head)}`,
     cwd
   );
-  // 从输出中提取 PR URL 和编号
+  // Extract PR URL and number from output
   const urlMatch = output.match(/https:\/\/github\.com\/.+\/pull\/(\d+)/);
   if (urlMatch) {
     return { url: urlMatch[0], number: parseInt(urlMatch[1]) };
   }
-  // 如果已存在
+  // May already exist
   const existingMatch = output.match(/already exists.+\/pull\/(\d+)/);
   if (existingMatch) {
     return { url: output, number: parseInt(existingMatch[1]) };
   }
-  throw new Error(`创建 PR 失败: ${output}`);
+  throw new Error(`Failed to create PR: ${output}`);
+}
+
+/**
+ * Create PR with full auto-recovery: pre-checks → create → fallback to find existing
+ * @returns {{ number: number, url: string }}
+ */
+export function createPRWithRecovery(cwd, { title, body, base = 'main', head }) {
+  // Step 1: Try to create the PR
+  try {
+    return createPR(cwd, { title, body, base, head });
+  } catch (err) {
+    log.warn(`PR creation failed: ${err.message}`);
+  }
+
+  // Step 2: Auto-find existing PR for this branch
+  log.info('Searching for existing PR...');
+  const existing = findExistingPR(cwd, head);
+  if (existing) {
+    log.info(`Found existing PR #${existing.number}`);
+    return existing;
+  }
+
+  // Step 3: Check if there are actually commits to create a PR for
+  if (!hasCommitsBetween(cwd, base, head)) {
+    log.warn('No commits between base and head branch');
+    log.info('This may be a new repo or empty branch. Attempting to push base branch and retry...');
+
+    // Ensure both branches are pushed
+    ensureRemoteBranch(cwd, base);
+    ensureRemoteBranch(cwd, head);
+
+    // Retry PR creation
+    try {
+      return createPR(cwd, { title, body, base, head });
+    } catch (retryErr) {
+      log.warn(`PR retry also failed: ${retryErr.message}`);
+    }
+
+    // Last resort: try to find PR again
+    const retryExisting = findExistingPR(cwd, head);
+    if (retryExisting) {
+      log.info(`Found existing PR #${retryExisting.number}`);
+      return retryExisting;
+    }
+  }
+
+  // Step 4: If all else fails, throw with actionable message
+  throw new Error(
+    `Cannot create or find PR for branch '${head}'. ` +
+    `Possible causes: base branch '${base}' may not exist on remote, ` +
+    `or there are no commits between '${base}' and '${head}'. ` +
+    `Try: git push origin ${base} && git push origin ${head}`
+  );
 }
 
 /**
- * 获取 PR 的 Review 列表
+ * Get PR review list
  */
 export function getReviews(cwd, prNumber) {
   try {
@@ -69,7 +203,7 @@ export function getReviews(cwd, prNumber) {
 }
 
 /**
- * 获取 PR 的 Review 评论
+ * Get PR review comments
  */
 export function getReviewComments(cwd, prNumber) {
   try {
@@ -81,7 +215,7 @@ export function getReviewComments(cwd, prNumber) {
 }
 
 /**
- * 获取 PR 的 issue 评论（包含 bot 评论）
+ * Get PR issue comments (including bot comments)
  */
 export function getIssueComments(cwd, prNumber) {
   try {
@@ -93,14 +227,14 @@ export function getIssueComments(cwd, prNumber) {
 }
 
 /**
- * 检查最新 Review 状态
+ * Check the latest review state
  * @returns {'APPROVED' | 'CHANGES_REQUESTED' | 'COMMENTED' | 'PENDING' | null}
  */
 export function getLatestReviewState(cwd, prNumber) {
   const reviews = getReviews(cwd, prNumber);
   if (!reviews || reviews.length === 0) return null;
 
-  // 过滤掉 PENDING 和 DISMISSED
+  // Filter out PENDING and DISMISSED
   const active = reviews.filter(r => r.state !== 'PENDING' && r.state !== 'DISMISSED');
   if (active.length === 0) return null;
 
@@ -108,25 +242,25 @@ export function getLatestReviewState(cwd, prNumber) {
 }
 
 /**
- * 合并 PR
+ * Merge a pull request
  */
 export function mergePR(cwd, prNumber, method = 'squash') {
   const num = validatePRNumber(prNumber);
   const validMethods = ['squash', 'merge', 'rebase'];
   if (!validMethods.includes(method)) {
-    throw new Error(`无效的合并方式: ${method}`);
+    throw new Error(`Invalid merge method: ${method}`);
   }
   gh(`pr merge ${num} --${method} --delete-branch`, cwd);
 }
 
 function validatePRNumber(prNumber) {
   const num = parseInt(prNumber, 10);
-  if (isNaN(num) || num <= 0) throw new Error(`无效的 PR 编号: ${prNumber}`);
+  if (isNaN(num) || num <= 0) throw new Error(`Invalid PR number: ${prNumber}`);
   return num;
 }
 
 /**
- * 收集所有 Review 意见为结构化文本
+ * Collect all review feedback as structured text
  */
 export function collectReviewFeedback(cwd, prNumber) {
   const reviews = getReviews(cwd, prNumber);
@@ -135,19 +269,19 @@ export function collectReviewFeedback(cwd, prNumber) {
 
   let feedback = '';
 
-  // Review 总评
+  // Review summary
   for (const r of reviews) {
     if (r.body && r.body.trim()) {
       feedback += `### Review (${r.state})\n${r.body}\n\n`;
     }
   }
 
-  // 行内评论
+  // Inline comments
   for (const c of comments) {
     feedback += `### ${c.path}:L${c.line || c.original_line}\n${c.body}\n\n`;
   }
 
-  // Bot 评论（Gemini Code Assist 等）
+  // Bot comments (Gemini Code Assist, etc.)
   for (const c of issueComments) {
     if (c.user?.type === 'Bot' || c.user?.login?.includes('bot')) {
       feedback += `### Bot Review (${c.user.login})\n${c.body}\n\n`;
@@ -158,6 +292,8 @@ export function collectReviewFeedback(cwd, prNumber) {
 }
 
 export const github = {
-  checkGhAuth, createPR, getReviews, getReviewComments,
-  getIssueComments, getLatestReviewState, mergePR, collectReviewFeedback,
+  checkGhAuth, createPR, createPRWithRecovery, findExistingPR,
+  ensureRemoteBranch, hasCommitsBetween,
+  getReviews, getReviewComments, getIssueComments,
+  getLatestReviewState, mergePR, collectReviewFeedback,
 };

package/src/utils/logger.js

@@ -1,30 +1,29 @@
 /**
- * Logger utility - 统一终端输出样式
+ * Logger utility - Unified terminal output styles
  */
 
 const COLORS = {
-  reset: '\x1b[0m',
   green: '\x1b[32m',
   yellow: '\x1b[33m',
   red: '\x1b[31m',
-  blue: '\x1b[34m',
   cyan: '\x1b[36m',
   dim: '\x1b[2m',
   bold: '\x1b[1m',
+  reset: '\x1b[0m',
 };
 
 export const log = {
-  info:  (msg) => console.log(`  ${COLORS.green}✔${COLORS.reset}  ${msg}`),
-  warn:  (msg) => console.log(`  ${COLORS.yellow}⚠${COLORS.reset}  ${msg}`),
-  error: (msg) => console.log(`  ${COLORS.red}✖${COLORS.reset}  ${msg}`),
-  step:  (msg) => console.log(`  ${COLORS.blue}▶${COLORS.reset}  ${msg}`),
-  dim:   (msg) => console.log(`  ${COLORS.dim}${msg}${COLORS.reset}`),
-  title: (msg) => console.log(`  ${COLORS.bold}${COLORS.cyan}${msg}${COLORS.reset}`),
-  blank: ()    => console.log(''),
+  info: (msg) => console.log(`  ${COLORS.green}✔${COLORS.reset}  ${msg}`),
+  warn: (msg) => console.log(`  ${COLORS.yellow}⚠${COLORS.reset}  ${msg}`),
+  error: (msg) => console.log(`  ${COLORS.red}✗${COLORS.reset}  ${msg}`),
+  step: (msg) => console.log(`  ${COLORS.cyan}▶${COLORS.reset}  ${msg}`),
+  dim: (msg) => console.log(`  ${COLORS.dim}${msg}${COLORS.reset}`),
+  title: (msg) => console.log(`  ${COLORS.bold}${msg}${COLORS.reset}`),
+  blank: () => console.log(''),
 };
 
 /**
- * 进度条显示
+ * Display a progress bar
  */
 export function progressBar(current, total, label = '') {
   const width = 30;
@@ -33,8 +32,10 @@ export function progressBar(current, total, label = '') {
     console.log(`  ${COLORS.cyan}[${bar}]${COLORS.reset} 0% ${label}`);
     return;
   }
-  const filled = Math.round((current / total) * width);
+  const rawRatio = current / total;
+  const ratio = Number.isNaN(rawRatio) ? 0 : Math.max(0, Math.min(1, rawRatio));
+  const filled = Math.round(ratio * width);
   const bar = '█'.repeat(filled) + '░'.repeat(width - filled);
-  const pct = Math.round((current / total) * 100);
+  const pct = Math.round(ratio * 100);
   console.log(`  ${COLORS.cyan}[${bar}]${COLORS.reset} ${pct}% ${label}`);
 }

package/src/utils/prompt.js

@@ -1,5 +1,5 @@
 /**
- * 交互式终端工具
+ * Interactive terminal utilities
  */
 
 import { createInterface } from 'readline';
@@ -7,7 +7,7 @@ import { createInterface } from 'readline';
 const rl = createInterface({ input: process.stdin, output: process.stdout });
 
 /**
- * 提问并等待用户输入
+ * Ask a question and wait for user input
  */
 export function ask(question) {
   return new Promise((resolve) => {
@@ -18,7 +18,7 @@ export function ask(question) {
 }
 
 /**
- * 是/否确认
+ * Yes/No confirmation
  */
 export async function confirm(question, defaultYes = true) {
   const hint = defaultYes ? '(Y/n)' : '(y/N)';
@@ -28,21 +28,21 @@ export async function confirm(question, defaultYes = true) {
 }
 
 /**
- * 从列表中选择
+ * Select from a list
  */
 export async function select(question, choices) {
   console.log(`  ${question}`);
   for (let i = 0; i < choices.length; i++) {
     console.log(`    ${i + 1}. ${choices[i].label}`);
   }
-  const answer = await ask('请输入编号:');
+  const answer = await ask('Enter number:');
   const idx = parseInt(answer) - 1;
   if (idx >= 0 && idx < choices.length) return choices[idx];
-  return choices[0]; // 默认第一个
+  return choices[0]; // Default to first
 }
 
 /**
- * 关闭 readline
+ * Close readline interface
  */
 export function closePrompt() {
   rl.close();