fix: refactor commitAndPush function to improve clarity and maintainability

Dockerfile

@@ -1,8 +1,9 @@
-FROM node:20-slim
+FROM alpine
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    git \
-    && rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache bash nodejs npm git \
+    && node --version \
+    && npm --version \
+    && git --version
 
 WORKDIR /action
 

TODO.md

@@ -27,7 +27,7 @@
 
 ---
 
+
 每個階段都會加上明確的 log，並確保即使部分功能未完成也能降級執行、不會中斷 pipeline。
 
 每次執行後請貼 log，我會協助 debug。
-

app/git.js

@@ -1,23 +1,55 @@
-import fs from 'fs';
+import { spawnSync } from 'child_process';
 import path from 'path';
-import { commitFile } from './gitea.js';
-import { FINDINGS_PATH } from './config.js';
+import { GITEA_SERVER_URL, GITEA_REPOSITORY, GITEA_TOKEN, PR_HEAD_BRANCH, FINDINGS_PATH } from './config.js';
 
-/**
- * 透過 Gitea API 將 findings.json push 到來源分支（不需要 git binary）
- */
-export async function commitAndPush(workspace) {
-  try {
-    const fullPath = path.join(workspace, FINDINGS_PATH);
-    const content = fs.readFileSync(fullPath, 'utf8');
-    const result = await commitFile(
-      FINDINGS_PATH,
-      content,
-      'chore: update ai-review findings [skip ci]'
-    );
-    const commitHash = result.commit?.sha?.slice(0, 7) || 'unknown';
-    console.log(`  ✅ persisted findings  commit=${commitHash}  push=${process.env.PR_HEAD_BRANCH}`);
-  } catch (e) {
-    console.log(`  ⚠️  Runner failed: commit/push 失敗: ${e.message}`);
-  }
+function git(args, cwd) {
+  const result = spawnSync('git', args, { cwd, encoding: 'utf8' });
+  if (result.error) throw result.error;
+  if (result.status !== 0) throw new Error((result.stderr || result.stdout || '').trim());
+  return (result.stdout || '').trim();
+}
+
+export async function commitAndPush(workspace) {
+  const repoDir = path.join(workspace, GITEA_REPOSITORY);
+  const remoteUrl = GITEA_SERVER_URL.replace(/\/$/, '')
+    .replace('https://', `https://${GITEA_TOKEN}@`)
+    .replace('http://', `http://${GITEA_TOKEN}@`) + `/${GITEA_REPOSITORY}.git`;
+
+  // try {
+  //   git(['config', 'user.email', 'ai-review[bot]@gitea'], repoDir);
+  //   git(['config', 'user.name', 'AI Review Bot'], repoDir);
+  //   git(['fetch', 'origin', PR_HEAD_BRANCH], repoDir);
+  //   git(['checkout', PR_HEAD_BRANCH], repoDir);
+  //   git(['add', FINDINGS_PATH], repoDir);
+
+  //   const status = git(['status', '--porcelain'], repoDir);
+  //   if (!status) {
+  //     console.log('  findings.json 無變更，跳過 commit');
+  //     return;
+  //   }
+
+  //   const out = git(['commit', '-m', 'chore: update ai-review findings [skip ci]'], repoDir);
+  //   const commitHash = out.match(/\[.+ ([a-f0-9]+)\]/)?.[1] || 'unknown';
+  //   git(['push', remoteUrl, PR_HEAD_BRANCH], repoDir);
+  //   console.log(`  ✅ persisted findings  commit=${commitHash}  push=${PR_HEAD_BRANCH}`);
+  // } catch (e) {
+  //   console.log(`  ⚠️  Runner failed: commit/push 失敗: ${e.message}`);
+  // }
+
+  git(['config', 'user.email', 'ai-review[bot]@gitea'], repoDir);
+  git(['config', 'user.name', 'AI Review Bot'], repoDir);
+  git(['fetch', 'origin', PR_HEAD_BRANCH], repoDir);
+  git(['checkout', PR_HEAD_BRANCH], repoDir);
+  git(['add', FINDINGS_PATH], repoDir);
+
+  const status = git(['status', '--porcelain'], repoDir);
+  if (!status) {
+    console.log('  findings.json 無變更，跳過 commit');
+    return;
+  }
+
+  const out = git(['commit', '-m', 'chore: update ai-review findings [skip ci]'], repoDir);
+  const commitHash = out.match(/\[.+ ([a-f0-9]+)\]/)?.[1] || 'unknown';
+  git(['push', remoteUrl, PR_HEAD_BRANCH], repoDir);
+  console.log(`  ✅ persisted findings  commit=${commitHash}  push=${PR_HEAD_BRANCH}`);
 }

app/gitea.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import https from 'https';
-import { GITEA_TOKEN, GITEA_SERVER_URL, GITEA_REPOSITORY, PR_NUMBER, PR_HEAD_BRANCH } from './config.js';
+import { GITEA_TOKEN, GITEA_SERVER_URL, GITEA_REPOSITORY, PR_NUMBER } from './config.js';
 
 const httpsAgent = new https.Agent({ rejectUnauthorized: false });
 const headers = () => ({ Authorization: `token ${GITEA_TOKEN}`, 'Content-Type': 'application/json' });
@@ -15,37 +15,3 @@ export async function postComment(body) {
   const resp = await axios.post(api(`/repos/${GITEA_REPOSITORY}/issues/${PR_NUMBER}/comments`), { body }, { headers: headers(), timeout: 30000, httpsAgent });
   return resp.data;
 }
-
-/**
- * 透過 Gitea API 建立或更新檔案（不需要 git binary）
- */
-export async function commitFile(filePath, content, message) {
-  const encoded = Buffer.from(content).toString('base64');
-  const url = api(`/repos/${GITEA_REPOSITORY}/contents/${filePath}`);
-
-  // 先嘗試取得現有檔案的 SHA
-  let sha;
-  try {
-    const existing = await axios.get(`${url}?ref=${PR_HEAD_BRANCH}`, { headers: headers(), httpsAgent, timeout: 15000 });
-    sha = existing.data.sha;
-  } catch {
-    sha = undefined;
-  }
-
-  const payload = {
-    message,
-    content: encoded,
-    branch: PR_HEAD_BRANCH,
-    ...(sha ? { sha } : {}),
-  };
-
-  const resp = await axios.request({
-    method: sha ? 'put' : 'post',
-    url,
-    headers: headers(),
-    httpsAgent,
-    timeout: 30000,
-    data: payload,
-  });
-  return resp.data;
-}

app/main.js

@@ -91,7 +91,7 @@ async function main() {
 
   // Step5: commit/push findings.json 到來源分支
   console.log('\n💾 Step5: 記憶區 Commit/Push');
-  commitAndPush(WORKSPACE);
+  await commitAndPush(WORKSPACE);
 
   // Step6: 有 critical 問題則 exit 1
   console.log('\n🚦 Step6: 嚴重問題檢查');