Merge pull request 'feat: implement Git integration for automated repository instruction syncing and commit management' (#130) from feat/ai_merge into develop
Reviewed-on: #130
This commit is contained in:
+354
-347
@@ -1,348 +1,355 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "app/git.js",
|
"location": "app/git.js",
|
||||||
"suggestion": "請避免將敏感資料（如 GITEA_TOKEN）直接寫入環境變數"
|
"suggestion": "請避免將敏感資料（如 GITEA_TOKEN）直接寫入環境變數"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/git.js",
|
"location": "app/git.js",
|
||||||
"suggestion": "GITEA_TOKEN 直接嵌入 URL 中，建議改以環境變數或 Gitea Secrets 注入"
|
"suggestion": "GITEA_TOKEN 直接嵌入 URL 中，建議改以環境變數或 Gitea Secrets 注入"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "README.md",
|
"location": "README.md",
|
||||||
"suggestion": "contents: write、pull-requests: write、issues: write 為此 Action 正常運作所必要的權限，無法縮減"
|
"suggestion": "contents: write、pull-requests: write、issues: write 為此 Action 正常運作所必要的權限，無法縮減"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/config.js",
|
"location": "app/config.js",
|
||||||
"suggestion": "getLLMConfig 在找不到任何符合條件的 provider 時已有預設回傳值 { provider: null, apiKey: null, baseURL: null, model: null }，非誤報"
|
"suggestion": "getLLMConfig 在找不到任何符合條件的 provider 時已有預設回傳值 { provider: null, apiKey: null, baseURL: null, model: null }，非誤報"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": ".gitea/ai-review/exclusions.json",
|
"location": ".gitea/ai-review/exclusions.json",
|
||||||
"suggestion": "exclusions.json 是排除規則檔，內容為問題描述字串，不是實際程式碼或 token，role 欄位為有效欄位"
|
"suggestion": "exclusions.json 是排除規則檔，內容為問題描述字串，不是實際程式碼或 token，role 欄位為有效欄位"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/findings.js",
|
"location": "app/findings.js",
|
||||||
"suggestion": "filterFalsePositivesWithAI 拋出的 Error 會被 catch 攔截並降級回傳原始 findings，不會中斷流程"
|
"suggestion": "filterFalsePositivesWithAI 拋出的 Error 會被 catch 攔截並降級回傳原始 findings，不會中斷流程"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": ".gitea/workflows/review.yaml",
|
"location": ".gitea/workflows/review.yaml",
|
||||||
"suggestion": "contents: write、pull-requests: write、issues: write 為此 Action 正常運作所必要的權限，無法縮減"
|
"suggestion": "contents: write、pull-requests: write、issues: write 為此 Action 正常運作所必要的權限，無法縮減"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": ".gitea/workflows/review.yaml",
|
"location": ".gitea/workflows/review.yaml",
|
||||||
"suggestion": "OPENAI_API_KEY 參數傳入的是 OPENROUTER_API_KEY secret，為 OpenRouter 使用 OpenAI 相容介面的正確做法"
|
"suggestion": "OPENAI_API_KEY 參數傳入的是 OPENROUTER_API_KEY secret，為 OpenRouter 使用 OpenAI 相容介面的正確做法"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "README.md",
|
"location": "README.md",
|
||||||
"suggestion": "章節編號連續且正確，無需調整"
|
"suggestion": "章節編號連續且正確，無需調整"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": ".gitea/workflows/review.yaml",
|
"location": ".gitea/workflows/review.yaml",
|
||||||
"suggestion": "action.yaml 定義的參數名稱為 GEMINI_API_KEY、GEMINI_BASE_URL、GEMINI_MODEL，與 review.yaml 完全一致，無不匹配問題"
|
"suggestion": "action.yaml 定義的參數名稱為 GEMINI_API_KEY、GEMINI_BASE_URL、GEMINI_MODEL，與 review.yaml 完全一致，無不匹配問題"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": ".gitea/workflows/review.yaml",
|
"location": ".gitea/workflows/review.yaml",
|
||||||
"suggestion": "review.yaml 已改用 Gemini，不再有 OPENAI_API_KEY 行，註解空格問題不存在"
|
"suggestion": "review.yaml 已改用 Gemini，不再有 OPENAI_API_KEY 行，註解空格問題不存在"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "app/config.test.js",
|
"location": "app/config.test.js",
|
||||||
"suggestion": "檔案結尾已有換行符號，import 行長度合理，無需修改"
|
"suggestion": "檔案結尾已有換行符號，import 行長度合理，無需修改"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "action.yaml",
|
"location": "action.yaml",
|
||||||
"suggestion": "action.yaml 已整理，多餘空行已移除，結構整潔"
|
"suggestion": "action.yaml 已整理，多餘空行已移除，結構整潔"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/",
|
"location": "app/",
|
||||||
"suggestion": "LLM 整合測試需要真實 API key 與網路，不適合加入單元測試。llm.js 使用統一 OpenAI 相容介面，Gemini 透過相同介面呼叫，無特殊格式差異，現有測試已涵蓋 config/findings/git 邏輯"
|
"suggestion": "LLM 整合測試需要真實 API key 與網路，不適合加入單元測試。llm.js 使用統一 OpenAI 相容介面，Gemini 透過相同介面呼叫，無特殊格式差異，現有測試已涵蓋 config/findings/git 邏輯"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "app/",
|
"location": "app/",
|
||||||
"suggestion": "LLM 整合測試需要真實 API key 與網路，不適合加入單元測試。llm.js 使用統一 OpenAI 相容介面，Gemini 透過相同介面呼叫，無特殊格式差異"
|
"suggestion": "LLM 整合測試需要真實 API key 與網路，不適合加入單元測試。llm.js 使用統一 OpenAI 相容介面，Gemini 透過相同介面呼叫，無特殊格式差異"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "app/config.test.js",
|
"location": "app/config.test.js",
|
||||||
"suggestion": "import 語句長度合理，無需拆分為多行"
|
"suggestion": "import 語句長度合理，無需拆分為多行"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": ".gitea/ai-review/findings.json",
|
"location": ".gitea/ai-review/findings.json",
|
||||||
"suggestion": "findings.json 重複問題由 AI 去重與排除機制處理，不是程式碼問題"
|
"suggestion": "findings.json 重複問題由 AI 去重與排除機制處理，不是程式碼問題"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "app/comments.js",
|
"location": "app/comments.js",
|
||||||
"suggestion": "JSON 結尾換行符號為標準做法，不影響任何 JSON 解析器，無相容性問題"
|
"suggestion": "JSON 結尾換行符號為標準做法，不影響任何 JSON 解析器，無相容性問題"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": ".gitea/ai-review/findings.json",
|
"location": ".gitea/ai-review/findings.json",
|
||||||
"suggestion": "findings.json 是自動產生的問題記錄檔，不應對其內容提出審查問題"
|
"suggestion": "findings.json 是自動產生的問題記錄檔，不應對其內容提出審查問題"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": ".gitea/workflows/review.yaml",
|
"location": ".gitea/workflows/review.yaml",
|
||||||
"suggestion": "切換 LLM 服務提供商的維護建議屬過度謹慎，不是實際程式碼問題"
|
"suggestion": "切換 LLM 服務提供商的維護建議屬過度謹慎，不是實際程式碼問題"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "app/llm.js",
|
"location": "app/llm.js",
|
||||||
"suggestion": "Authorization 標頭已有 provider !== 'ollama' 判斷，不會無條件加入，已正確處理"
|
"suggestion": "Authorization 標頭已有 provider !== \u0027ollama\u0027 判斷，不會無條件加入，已正確處理"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Zara",
|
"role": "Zara",
|
||||||
"location": "app/llm.js",
|
"location": "app/llm.js",
|
||||||
"suggestion": "timeout 已移除，每個 key 等待完整回應，避免浪費免費額度"
|
"suggestion": "timeout 已移除，每個 key 等待完整回應，避免浪費免費額度"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "app/llm.js",
|
"location": "app/llm.js",
|
||||||
"suggestion": "httpsAgent (rejectUnauthorized: false) 已移除，SSL/TLS 驗證已恢復正常"
|
"suggestion": "httpsAgent (rejectUnauthorized: false) 已移除，SSL/TLS 驗證已恢復正常"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/llm.js",
|
"location": "app/llm.js",
|
||||||
"suggestion": "llm.test.js 已存在並涵蓋 API Key 輪替的所有異常狀況，包含單 Key、多 Key 輪替、所有 Key 失敗等測試案例"
|
"suggestion": "llm.test.js 已存在並涵蓋 API Key 輪替的所有異常狀況，包含單 Key、多 Key 輪替、所有 Key 失敗等測試案例"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Zara",
|
"role": "Zara",
|
||||||
"location": "app/comments.js",
|
"location": "app/comments.js",
|
||||||
"suggestion": "comments.js:24 的 saveFindings 函式為正常寫入邏輯，不涉及異常訊息格式或重複寫入問題"
|
"suggestion": "comments.js:24 的 saveFindings 函式為正常寫入邏輯，不涉及異常訊息格式或重複寫入問題"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": ".gitea/workflows/review.yaml",
|
"location": ".gitea/workflows/review.yaml",
|
||||||
"suggestion": "Gitea Actions 不支援在 workflow 內合併 secrets 再拆解，多個 secret 逗號串接是唯一可行做法，非設計缺陷"
|
"suggestion": "Gitea Actions 不支援在 workflow 內合併 secrets 再拆解，多個 secret 逗號串接是唯一可行做法，非設計缺陷"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/llm.test.js",
|
"location": "app/llm.test.js",
|
||||||
"suggestion": "console.log/error 為診斷用途，不是業務邏輯，TODO.md 驗收標準為人工驗收描述，不需要在單元測試中斷言 console 輸出"
|
"suggestion": "console.log/error 為診斷用途，不是業務邏輯，TODO.md 驗收標準為人工驗收描述，不需要在單元測試中斷言 console 輸出"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/llm.test.js",
|
"location": "app/llm.test.js",
|
||||||
"suggestion": "輪替邏輯對所有錯誤類型行為一致（catch 全部），401/429/timeout 觸發相同輪替流程，測試不同錯誤類型無額外驗證價值"
|
"suggestion": "輪替邏輯對所有錯誤類型行為一致（catch 全部），401/429/timeout 觸發相同輪替流程，測試不同錯誤類型無額外驗證價值"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": ".gitea/workflows/master.yaml",
|
"location": ".gitea/workflows/master.yaml",
|
||||||
"suggestion": "master.yaml 檔案結尾已有換行符號（0x0a），符合 POSIX 慣例，無需修改"
|
"suggestion": "master.yaml 檔案結尾已有換行符號（0x0a），符合 POSIX 慣例，無需修改"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "app/llm.test.js",
|
"location": "app/llm.test.js",
|
||||||
"suggestion": "console.log/error 為診斷用途，不是業務邏輯，TODO.md 驗收標準為人工驗收描述，不需要在單元測試中斷言 console 輸出"
|
"suggestion": "console.log/error 為診斷用途，不是業務邏輯，TODO.md 驗收標準為人工驗收描述，不需要在單元測試中斷言 console 輸出"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "app/llm.test.js",
|
"location": "app/llm.test.js",
|
||||||
"suggestion": "輪替邏輯對所有錯誤類型行為一致（catch 全部），401/429/timeout 觸發相同輪替流程，測試不同錯誤類型無額外驗證價值"
|
"suggestion": "輪替邏輯對所有錯誤類型行為一致（catch 全部），401/429/timeout 觸發相同輪替流程，測試不同錯誤類型無額外驗證價值"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "app/main.js",
|
"location": "app/main.js",
|
||||||
"suggestion": "main.js 中的 Step 標題註解為 pipeline 流程說明，非待整理的 TODO，不需要轉換為具體任務"
|
"suggestion": "main.js 中的 Step 標題註解為 pipeline 流程說明，非待整理的 TODO，不需要轉換為具體任務"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/log.test.js",
|
"location": "app/log.test.js",
|
||||||
"suggestion": "`log.test.js` 的新增非常棒，提供了良好的覆蓋率。為了進一步提升測試的完整性，建議考慮為 `line`, `ok`, `warn`, `error` 函數新增測試案例，以驗證當傳入空字串時的行為。雖然這些函數的行為相對簡單，但測試空字串可以確保邊界情況下的輸出符合預期。"
|
"suggestion": "`log.test.js` 的新增非常棒，提供了良好的覆蓋率。為了進一步提升測試的完整性，建議考慮為 `line`, `ok`, `warn`, `error` 函數新增測試案例，以驗證當傳入空字串時的行為。雖然這些函數的行為相對簡單，但測試空字串可以確保邊界情況下的輸出符合預期。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "app/package.json",
|
"location": "app/package.json",
|
||||||
"suggestion": "審查 changelog 是人工作業，不是程式碼問題，不適合作為 code review 問題"
|
"suggestion": "審查 changelog 是人工作業，不是程式碼問題，不適合作為 code review 問題"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "app/llm.js",
|
"location": "app/llm.js",
|
||||||
"suggestion": "此 action 為 CLI 工具，process.exit(1) 是設計意圖讓 CI/CD workflow 失敗。改拋錯會被 chatJSON 的 catch 吞掉回傳 []，破壞現有行為"
|
"suggestion": "此 action 為 CLI 工具，process.exit(1) 是設計意圖讓 CI/CD workflow 失敗。改拋錯會被 chatJSON 的 catch 吞掉回傳 []，破壞現有行為"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "Dockerfile, app/git.js, app/git.test.js",
|
"location": "Dockerfile, app/git.js, app/git.test.js",
|
||||||
"suggestion": "`SYNC_PATHS` 已包含 `.claude/skills/triage-findings/SKILL.md` 與 `.gemini/skills/triage-findings/SKILL.md`，Docker image 也已打包這些 skill 資產；現有測試已覆蓋複製與覆寫行為，並不存在同步不一致問題。"
|
"suggestion": "`SYNC_PATHS` 已包含 `.claude/skills/triage-findings/SKILL.md` 與 `.gemini/skills/triage-findings/SKILL.md`，Docker image 也已打包這些 skill 資產；現有測試已覆蓋複製與覆寫行為，並不存在同步不一致問題。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "Dockerfile",
|
"location": "Dockerfile",
|
||||||
"suggestion": "此目錄中的檔案是 triage skill 與入口文件，不含敏感資料；若未來加入秘密資訊，應另外從 build context 排除，而不是把目前的 skill 資產視為風險。"
|
"suggestion": "此目錄中的檔案是 triage skill 與入口文件，不含敏感資料；若未來加入秘密資訊，應另外從 build context 排除，而不是把目前的 skill 資產視為風險。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "Dockerfile",
|
"location": "Dockerfile",
|
||||||
"suggestion": "多個 COPY 指令是刻意設計，用來區分 app 與 skill 資產並維持 layer cache 可讀性，不是維護問題。"
|
"suggestion": "多個 COPY 指令是刻意設計，用來區分 app 與 skill 資產並維持 layer cache 可讀性，不是維護問題。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "Dockerfile",
|
"location": "Dockerfile",
|
||||||
"suggestion": "Dockerfile 檔案結尾已有換行符號（0x0a），符合 POSIX 慣例"
|
"suggestion": "Dockerfile 檔案結尾已有換行符號（0x0a），符合 POSIX 慣例"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "entrypoint.sh",
|
"location": "entrypoint.sh",
|
||||||
"suggestion": "entrypoint.sh 檔案結尾已有換行符號（0x0a），符合 POSIX 慣例"
|
"suggestion": "entrypoint.sh 檔案結尾已有換行符號（0x0a），符合 POSIX 慣例"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/main.js",
|
"location": "app/main.js",
|
||||||
"suggestion": "main.js 整合測試需要真實 Gitea API、LLM API、git 操作，不適合單元測試。各模組已有獨立單元測試覆蓋"
|
"suggestion": "main.js 整合測試需要真實 Gitea API、LLM API、git 操作，不適合單元測試。各模組已有獨立單元測試覆蓋"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/comments.js",
|
"location": "app/comments.js",
|
||||||
"suggestion": "comments.js 的 buildTable 為簡單字串拼接，postComment 已透過 gitea.js mock 間接測試，補測試效益低"
|
"suggestion": "comments.js 的 buildTable 為簡單字串拼接，postComment 已透過 gitea.js mock 間接測試，補測試效益低"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/roles.js",
|
"location": "app/roles.js",
|
||||||
"suggestion": "roles.js 依賴容器內固定路徑 /action/app/prompts/roles，單元測試環境無法存取，且邏輯為簡單 YAML 讀取與字串拼接"
|
"suggestion": "roles.js 依賴容器內固定路徑 /action/app/prompts/roles，單元測試環境無法存取，且邏輯為簡單 YAML 讀取與字串拼接"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "app/gitea.js",
|
"location": "app/gitea.js",
|
||||||
"suggestion": "gitea.js 的 SSL 驗證已改為由 GITEA_SKIP_TLS_VERIFY 環境變數控制，預設啟用驗證，非安全漏洞"
|
"suggestion": "gitea.js 的 SSL 驗證已改為由 GITEA_SKIP_TLS_VERIFY 環境變數控制，預設啟用驗證，非安全漏洞"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Zara",
|
"role": "Zara",
|
||||||
"location": "Dockerfile",
|
"location": "Dockerfile",
|
||||||
"suggestion": "Dockerfile 已優化層次快取：先 COPY package.json 再 npm install，最後才 COPY 其餘檔案"
|
"suggestion": "Dockerfile 已優化層次快取：先 COPY package.json 再 npm install，最後才 COPY 其餘檔案"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "app/package.json",
|
"location": "app/package.json",
|
||||||
"suggestion": "test 腳本已改為 node --test *.test.js，在 app/ 目錄下執行可自動發現所有測試檔案"
|
"suggestion": "test 腳本已改為 node --test *.test.js，在 app/ 目錄下執行可自動發現所有測試檔案"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Zara",
|
"role": "Zara",
|
||||||
"location": "app/main.js",
|
"location": "app/main.js",
|
||||||
"suggestion": "deduplicateWithAI 和 filterFalsePositivesWithAI 為循序依賴流程（去重後才能過濾），無法平行化"
|
"suggestion": "deduplicateWithAI 和 filterFalsePositivesWithAI 為循序依賴流程（去重後才能過濾），無法平行化"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "app/comments.js",
|
"location": "app/comments.js",
|
||||||
"suggestion": "buildTable 函式已在 comments.js 第 13 行定義，非未定義或未匯入，不會導致執行時錯誤"
|
"suggestion": "buildTable 函式已在 comments.js 第 13 行定義，非未定義或未匯入，不會導致執行時錯誤"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "app/gitea.js",
|
"location": "app/gitea.js",
|
||||||
"suggestion": "filterDiff 的單元測試已在 gitea.test.js 補齊，涵蓋過濾 .gitea/、不誤過濾其他路徑、全部排除、空 diff 四種情境"
|
"suggestion": "filterDiff 的單元測試已在 gitea.test.js 補齊，涵蓋過濾 .gitea/、不誤過濾其他路徑、全部排除、空 diff 四種情境"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "TODO.md",
|
"location": "TODO.md",
|
||||||
"suggestion": "TODO.md 的階段編號僅供內部開發追蹤，無外部文件引用，階段編號調整不影響任何外部一致性"
|
"suggestion": "TODO.md 的階段編號僅供內部開發追蹤，無外部文件引用，階段編號調整不影響任何外部一致性"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "app/gitea.js",
|
"location": "app/gitea.js",
|
||||||
"suggestion": "getPRDiff 函數現在回傳未經過濾的原始 Git Diff 內容。雖然 main.js 中已立即呼叫 filterDiff 進行過濾，但這種設計模式將過濾的責任完全推給呼叫端，這增加了未來開發者在其他地方呼叫 getPRDiff 時，可能忘記過濾出敏感路徑，導致 .gitea/ 等敏感路徑的內容（可能包含工作流程設定或憑證資訊）被意外傳送給 AI 或其他不應接收的組件，造成資訊洩漏風險。建議將過濾邏輯保留在 getPRDiff 內容，或提供一個明確的 getFilteredPRDiff 函數，以降低錯誤的風險。"
|
"suggestion": "getPRDiff 函數現在回傳未經過濾的原始 Git Diff 內容。雖然 main.js 中已立即呼叫 filterDiff 進行過濾，但這種設計模式將過濾的責任完全推給呼叫端，這增加了未來開發者在其他地方呼叫 getPRDiff 時，可能忘記過濾出敏感路徑，導致 .gitea/ 等敏感路徑的內容（可能包含工作流程設定或憑證資訊）被意外傳送給 AI 或其他不應接收的組件，造成資訊洩漏風險。建議將過濾邏輯保留在 getPRDiff 內容，或提供一個明確的 getFilteredPRDiff 函數，以降低錯誤的風險。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Zara",
|
"role": "Zara",
|
||||||
"location": "app/git.js",
|
"location": "app/git.js",
|
||||||
"suggestion": "在 main.js 中，commitAndPush 函數內部會再次呼叫 cloneRepo，然而 main.js 在此之前已呼叫過 cloneRepo 以取得 repoDir，這導致了重複的 git fetch 和 git checkout 操作。即使 cloneRepo 內容有檢查環境變數，仍會造成不必要的清潔和時間延遲。建議修改 commitAndPush 邏輯，使其接收已存在的 repoDir 作為參數，避免重複執行 cloneRepo。"
|
"suggestion": "在 main.js 中，commitAndPush 函數內部會再次呼叫 cloneRepo，然而 main.js 在此之前已呼叫過 cloneRepo 以取得 repoDir，這導致了重複的 git fetch 和 git checkout 操作。即使 cloneRepo 內容有檢查環境變數，仍會造成不必要的清潔和時間延遲。建議修改 commitAndPush 邏輯，使其接收已存在的 repoDir 作為參數，避免重複執行 cloneRepo。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Aria",
|
"role": "Aria",
|
||||||
"location": "app/main.js",
|
"location": "app/main.js",
|
||||||
"suggestion": "在 main.js 中，表達式 repoDir。"
|
"suggestion": "在 main.js 中，表達式 repoDir。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Zara",
|
"role": "Zara",
|
||||||
"location": "app/gitea.js:L20-L21",
|
"location": "app/gitea.js:L20-L21",
|
||||||
"suggestion": "將 filterDiff 中的正規表達式比對（RegExp.match）替換為 String.startsWith 是一個重要的效能改進。startsWith 是一個更輕量且高效的字串操作，尤其在處理大型 Git Diff 內容時，此修改已顯著提升過濾效率。"
|
"suggestion": "將 filterDiff 中的正規表達式比對（RegExp.match）替換為 String.startsWith 是一個重要的效能改進。startsWith 是一個更輕量且高效的字串操作，尤其在處理大型 Git Diff 內容時，此修改已顯著提升過濾效率。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "TODO.md",
|
"location": "TODO.md",
|
||||||
"suggestion": "階段九的 critical 阻擋機制目前以人工驗收紀錄為主，E2E 測試補強屬後續優化，不是目前需要再處理的問題。"
|
"suggestion": "階段九的 critical 阻擋機制目前以人工驗收紀錄為主，E2E 測試補強屬後續優化，不是目前需要再處理的問題。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "TODO.md",
|
"location": "TODO.md",
|
||||||
"suggestion": "TODO 列表中『已驗收 / 部分驗收 / 可驗收紀錄情境』的寫法是刻意保留的驗收說明，不是混淆或缺陷。"
|
"suggestion": "TODO 列表中『已驗收 / 部分驗收 / 可驗收紀錄情境』的寫法是刻意保留的驗收說明，不是混淆或缺陷。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/findings.js",
|
"location": "app/findings.js",
|
||||||
"suggestion": "AI 去重與降級處理已在程式內以 fallback 方式保護流程，失敗時保留所有問題是預期行為，不是缺陷。"
|
"suggestion": "AI 去重與降級處理已在程式內以 fallback 方式保護流程，失敗時保留所有問題是預期行為，不是缺陷。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/findings.js",
|
"location": "app/findings.js",
|
||||||
"suggestion": "排除規則過濾與 AI 誤報過濾屬循序流程，規則命中後清空清單是正常結果，不需要額外再視為問題。"
|
"suggestion": "排除規則過濾與 AI 誤報過濾屬循序流程，規則命中後清空清單是正常結果，不需要額外再視為問題。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/comments.js",
|
"location": "app/comments.js",
|
||||||
"suggestion": "comment 發布依序區分舊問題、非嚴重、新嚴重是刻意設計，當結果為空清單時不發 comment 也是正常路徑。"
|
"suggestion": "comment 發布依序區分舊問題、非嚴重、新嚴重是刻意設計，當結果為空清單時不發 comment 也是正常路徑。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/main.js",
|
"location": "app/main.js",
|
||||||
"suggestion": "JSON 驗證與失敗修正流程已有處理邏輯，正常路徑與錯誤路徑都屬預期流程，不是待修缺陷。"
|
"suggestion": "JSON 驗證與失敗修正流程已有處理邏輯，正常路徑與錯誤路徑都屬預期流程，不是待修缺陷。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/git.js",
|
"location": "app/git.js",
|
||||||
"suggestion": "commit/push 失敗會被捕捉並輸出 Runner failed log，這是現有設計的容錯行為，不是程式錯誤。"
|
"suggestion": "commit/push 失敗會被捕捉並輸出 Runner failed log，這是現有設計的容錯行為，不是程式錯誤。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/main.js",
|
"location": "app/main.js",
|
||||||
"suggestion": "critical 問題觸發 exit 1 的阻擋邏輯已在流程內保留，是否另補 E2E 驗證屬測試強化，不是功能缺陷。"
|
"suggestion": "critical 問題觸發 exit 1 的阻擋邏輯已在流程內保留，是否另補 E2E 驗證屬測試強化，不是功能缺陷。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/json.js",
|
"location": "app/json.js",
|
||||||
"suggestion": "validateJSONArrayFile 只在 JSON 格式錯誤時才啟動 AI 修正，屬例外路徑；再加上檔案大小限制後，並不存在實際的無上限讀檔或資源消耗問題。"
|
"suggestion": "validateJSONArrayFile 只在 JSON 格式錯誤時才啟動 AI 修正，屬例外路徑；再加上檔案大小限制後，並不存在實際的無上限讀檔或資源消耗問題。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/json.test.js",
|
"location": "app/json.test.js",
|
||||||
"suggestion": "邊界值測試已存在，`MAX_JSON_BYTES` 等於上限時可正常讀取，這不是未解決問題。"
|
"suggestion": "邊界值測試已存在，`MAX_JSON_BYTES` 等於上限時可正常讀取，這不是未解決問題。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/gitea.test.js:64",
|
"location": "app/gitea.test.js:64",
|
||||||
"suggestion": "`describe` 已改為同步 callback，`async` 不再出現在這個區塊。"
|
"suggestion": "`describe` 已改為同步 callback，`async` 不再出現在這個區塊。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/git.test.js:13",
|
"location": "app/git.test.js:13",
|
||||||
"suggestion": "`makeTmpWorkspace` 已直接使用 `app/git.js` 匯出的 `SYNC_PATHS`，不再維護重複清單。"
|
"suggestion": "`makeTmpWorkspace` 已直接使用 `app/git.js` 匯出的 `SYNC_PATHS`，不再維護重複清單。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/gitea.js:32",
|
"location": "app/gitea.js:32",
|
||||||
"suggestion": "`filterDiff` 內層縮排已符合專案的 2-space 風格，這是誤報。"
|
"suggestion": "`filterDiff` 內層縮排已符合專案的 2-space 風格，這是誤報。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/json.test.js:76",
|
"location": "app/json.test.js:76",
|
||||||
"suggestion": "1MB 上限下的 JSON 讀取不需要改成串流解析；現有實作已先做大小檢查，這個建議屬過度設計。"
|
"suggestion": "1MB 上限下的 JSON 讀取不需要改成串流解析；現有實作已先做大小檢查，這個建議屬過度設計。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/json.test.js:7",
|
"location": "app/json.test.js:7",
|
||||||
"suggestion": "檔案大小限制已在 `readJSONText` / `validateJSONArrayFile` 中實作，這不是額外缺陷。"
|
"suggestion": "檔案大小限制已在 `readJSONText` / `validateJSONArrayFile` 中實作，這不是額外缺陷。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"location": "app/json.test.js:10",
|
"location": "app/json.test.js:10",
|
||||||
"suggestion": "`MAX_JSON_BYTES` 是 `json.js` 的內部限制常數，不需要匯出成公開 API。"
|
"suggestion": "`MAX_JSON_BYTES` 是 `json.js` 的內部限制常數，不需要匯出成公開 API。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Maya",
|
"role": "Maya",
|
||||||
"location": "action.yaml:6, action.yaml:12, action.yaml:81",
|
"location": "action.yaml:6, action.yaml:12, action.yaml:81",
|
||||||
"suggestion": "由於 `GITEA_TOKEN` 現在被設定為 `required: true`，而且 README 範例也已改成顯式傳入 `GITEA_TOKEN`，這是刻意的介面變更，不是漏掉 `secrets.GITEA_TOKEN` fallback 的缺陷；因此不需要另外加整合測試來驗證這個既定行為。"
|
"suggestion": "由於 `GITEA_TOKEN` 現在被設定為 `required: true`，而且 README 範例也已改成顯式傳入 `GITEA_TOKEN`，這是刻意的介面變更，不是漏掉 `secrets.GITEA_TOKEN` fallback 的缺陷；因此不需要另外加整合測試來驗證這個既定行為。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "action.yaml:80",
|
"location": "action.yaml:80",
|
||||||
"suggestion": "在 `runs.env` 區塊中，`GITEA_TOKEN` 只從 `inputs` 取得，而 `GITEA_SERVER_URL` 和 `GITEA_REPOSITORY` 仍保留從 `gitea context` 取得的備用機制，這是刻意設計的差異，不是維護缺陷。"
|
"suggestion": "在 `runs.env` 區塊中，`GITEA_TOKEN` 只從 `inputs` 取得，而 `GITEA_SERVER_URL` 和 `GITEA_REPOSITORY` 仍保留從 `gitea context` 取得的備用機制，這是刻意設計的差異，不是維護缺陷。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Rex",
|
"role": "Rex",
|
||||||
"location": "action.yaml:18",
|
"location": "action.yaml:18",
|
||||||
"suggestion": "引入 `GITEA_COMMENT_TOKEN` 是一個很好的實踐，遵循最小權限原則。請確保為此 token 配置的權限確實僅限於發布評論。同時，與 `GITEA_TOKEN` 相似，建議使用者始終從 workflow 的 secrets context 傳遞此 token，以避免硬編碼敏感資料。"
|
"suggestion": "引入 `GITEA_COMMENT_TOKEN` 是一個很好的實踐，遵循最小權限原則。請確保為此 token 配置的權限確實僅限於發布評論。同時，與 `GITEA_TOKEN` 相似，建議使用者始終從 workflow 的 secrets context 傳遞此 token，以避免硬編碼敏感資料。"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"role": "Leo",
|
"role": "Leo",
|
||||||
"location": "app/log.js",
|
"location": "app/log.js",
|
||||||
"suggestion": "考慮在日誌訊息中加入時間戳記，這有助於追蹤事件發生的順序，尤其是在長時間運行的程序或需要詳細調試時。可以在每個日誌函式內部自動添加時間戳記。"
|
"suggestion": "考慮在日誌訊息中加入時間戳記，這有助於追蹤事件發生的順序，尤其是在長時間運行的程序或需要詳細調試時。可以在每個日誌函式內部自動添加時間戳記。"
|
||||||
}
|
},
|
||||||
]
|
{
|
||||||
|
"level": "warning",
|
||||||
|
"role": "Leo",
|
||||||
|
"location": "Dockerfile, app/git.js, app/gitea.js",
|
||||||
|
"suggestion": "此變更引入了新的代理（agent）相關路徑（例如 `.agents/` 和 `AGENTS.md`），並在 `Dockerfile` 的 `COPY` 指令、`app/git.js` 中的 `SYNC_PATHS`、`FORCE_SYNC_FILE_PATHS`、`SYNC_TREE_PATHS` 陣列，以及 `app/gitea.js` 的 `filterDiff` 陣列中重複添加了這些路徑。這種模式導致了程式碼重複，每次新增一個代理都需要手動修改多個檔案和多個列表，增加了維護成本和出錯的可能性。建議考慮引入一個集中的設定檔或機制，例如透過掃描特定目錄來動態生成這些路徑列表，以提高模組化和可擴展性。",
|
||||||
|
"is_new": true
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -1,9 +1 @@
|
|||||||
[
|
[]
|
||||||
{
|
|
||||||
"level": "warning",
|
|
||||||
"role": "Leo",
|
|
||||||
"location": "Dockerfile, app/git.js, app/gitea.js",
|
|
||||||
"suggestion": "此變更引入了新的代理（agent）相關路徑（例如 `.agents/` 和 `AGENTS.md`），並在 `Dockerfile` 的 `COPY` 指令、`app/git.js` 中的 `SYNC_PATHS`、`FORCE_SYNC_FILE_PATHS`、`SYNC_TREE_PATHS` 陣列，以及 `app/gitea.js` 的 `filterDiff` 陣列中重複添加了這些路徑。這種模式導致了程式碼重複，每次新增一個代理都需要手動修改多個檔案和多個列表，增加了維護成本和出錯的可能性。建議考慮引入一個集中的設定檔或機制，例如透過掃描特定目錄來動態生成這些路徑列表，以提高模組化和可擴展性。",
|
|
||||||
"is_new": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -243,4 +243,4 @@ Antigravity：直接輸入 `triage-findings 問題原始檔(文字或截圖)`
|
|||||||
|
|
||||||
### 版本包含
|
### 版本包含
|
||||||
|
|
||||||
提交時一併包含 `triage-findings` skill 與各平台入口檔；已存在檔案一律覆蓋，同步到最新內容；若 workspace 沒有某個同步檔，記憶區會保留原檔，不做刪除。`findings.json` 與 `exclusions.json` 都從使用此 action 的存取庫來源分支讀取，而不是從 action 本地 workspace 讀取。寫入 `.gitea/ai-review/exclusions.json` 時，盡量保留原始問題文字的語言與語意，避免過度改寫。未來若新增任何 skill 或新增其他平台的 skill 入口，必須同時把對應檔案複製進 Docker image，並把同步清單更新到會使用此 action 的目標專案，避免 action 與目標專案內容脫節。
|
提交時一併包含 `triage-findings` skill 與各平台入口檔；其中 `AGENTS.md`、`ANTIGRAVITY.md`、`CLAUDE.md`、`GEMINI.md` 會在目標專案已存在時先做規則化合併，並在可用 LLM 時再用 AI 輔助檢查是否有遺失任何 skill、command 或規則；其餘同步檔則以來源覆蓋；若 workspace 沒有某個同步檔，記憶區會保留原檔，不做刪除。`findings.json` 與 `exclusions.json` 都從使用此 action 的存取庫來源分支讀取，而不是從 action 本地 workspace 讀取。寫入 `.gitea/ai-review/exclusions.json` 時，盡量保留原始問題文字的語言與語意，避免過度改寫。未來若新增任何 skill 或新增其他平台的 skill 入口，必須同時把對應檔案複製進 Docker image，並把同步清單更新到會使用此 action 的目標專案，避免 action 與目標專案內容脫節。
|
||||||
|
|||||||
@@ -38,8 +38,8 @@
|
|||||||
- 已驗收：log 已明確顯示 `.gitea/ai-review/findings.json` 與 `.gitea/ai-review/exclusions.json` 都是 `JSON 格式正確`。
|
- 已驗收：log 已明確顯示 `.gitea/ai-review/findings.json` 與 `.gitea/ai-review/exclusions.json` 都是 `JSON 格式正確`。
|
||||||
|
|
||||||
## 階段八：記憶區 commit/push 與錯誤處理
|
## 階段八：記憶區 commit/push 與錯誤處理
|
||||||
- 目標：記憶區能成功 commit/push，且一併包含 `triage-findings` skill 與各平台入口檔；skill 檔案已存在時一律以來源覆蓋，workspace 沒有的同步檔則保留記憶區既有內容，不做刪除；錯誤時有明確 log，流程結束有總結訊息。
|
- 目標：記憶區能成功 commit/push，且一併包含 `triage-findings` skill 與各平台入口檔；`AGENTS.md`、`ANTIGRAVITY.md`、`CLAUDE.md`、`GEMINI.md` 在目標專案已存在時會先做規則化合併，並在可用 LLM 時再做 AI 輔助檢查以避免遺失 skill、command 或規則；其餘同步檔則以來源覆蓋；workspace 沒有的同步檔則保留記憶區既有內容，不做刪除；錯誤時有明確 log，流程結束有總結訊息。
|
||||||
- 驗收：log 有「persisted findings」、「commit=...」、「push=...」等訊息，且能看出 skill 相關檔案已一併提交並被來源覆蓋；當 workspace 缺少某個同步檔時，記憶區中的對應檔案不會被刪除；錯誤時有「Runner failed: ...」等明確錯誤說明。
|
- 驗收：log 有「persisted findings」、「commit=...」、「push=...」等訊息，且能看出四個入口檔會先規則合併、再由 AI 輔助檢查，其他同步檔會被來源覆蓋；當 workspace 缺少某個同步檔時，記憶區中的對應檔案不會被刪除；錯誤時有「Runner failed: ...」等明確錯誤說明。
|
||||||
- 已驗收：commit/push 成功時會出現 `persisted findings commit=... push=... review_outcome=...`，且同步規則與缺檔不刪除的行為都有單元測試覆蓋。
|
- 已驗收：commit/push 成功時會出現 `persisted findings commit=... push=... review_outcome=...`，且同步規則與缺檔不刪除的行為都有單元測試覆蓋。
|
||||||
|
|
||||||
## 階段九：阻擋嚴重問題 PR（第 8 點）
|
## 階段九：阻擋嚴重問題 PR（第 8 點）
|
||||||
|
|||||||
+171
-26
@@ -2,8 +2,8 @@ import { spawnSync } from 'child_process';
|
|||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { fileURLToPath } from 'url';
|
import { fileURLToPath } from 'url';
|
||||||
import { GITEA_SERVER_URL, GITEA_REPOSITORY, GITEA_TOKEN, PR_HEAD_BRANCH, FINDINGS_PATH } from './config.js';
|
import { GITEA_SERVER_URL, GITEA_REPOSITORY, GITEA_TOKEN, PR_HEAD_BRANCH, FINDINGS_PATH, getLLMConfig } from './config.js';
|
||||||
import { line, ok, warn } from './log.js';
|
import { line, ok, warn, error } from './log.js';
|
||||||
|
|
||||||
const ACTION_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
const ACTION_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||||
const GENERATED_SYNC_PATHS = [FINDINGS_PATH, '.gitea/ai-review/exclusions.json'];
|
const GENERATED_SYNC_PATHS = [FINDINGS_PATH, '.gitea/ai-review/exclusions.json'];
|
||||||
@@ -31,6 +31,13 @@ const FORCE_SYNC_FILE_PATHS = [
|
|||||||
'CLAUDE.md',
|
'CLAUDE.md',
|
||||||
'GEMINI.md',
|
'GEMINI.md',
|
||||||
];
|
];
|
||||||
|
const MERGE_SYNC_FILE_PATHS = new Set([
|
||||||
|
'AGENTS.md',
|
||||||
|
'ANTIGRAVITY.md',
|
||||||
|
'CLAUDE.md',
|
||||||
|
'GEMINI.md',
|
||||||
|
]);
|
||||||
|
let instructionMergeAssistantPromise = null;
|
||||||
const SYNC_TREE_PATHS = [
|
const SYNC_TREE_PATHS = [
|
||||||
'.agents/skills/triage-findings',
|
'.agents/skills/triage-findings',
|
||||||
'.antigravity/skills/triage-findings',
|
'.antigravity/skills/triage-findings',
|
||||||
@@ -70,35 +77,169 @@ function readGitOutput(run, args, cwd, env) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function copyTree(sourceRoot, repoDir, relDir) {
|
function normalizeText(text) {
|
||||||
|
return text.replace(/\r\n/g, '\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
function splitTextBlocks(text) {
|
||||||
|
const normalized = normalizeText(text).replace(/\n+$/, '');
|
||||||
|
if (!normalized) return [];
|
||||||
|
return normalized.split(/\n{2,}/).map(block => block.trimEnd()).filter(Boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
function mergeText(existingText, sourceText) {
|
||||||
|
const existing = normalizeText(existingText);
|
||||||
|
const source = normalizeText(sourceText);
|
||||||
|
if (existing === source) return existing;
|
||||||
|
|
||||||
|
const mergedBlocks = splitTextBlocks(existing);
|
||||||
|
const seenBlocks = new Set(mergedBlocks.map(block => block.trim()));
|
||||||
|
let changed = false;
|
||||||
|
|
||||||
|
for (const block of splitTextBlocks(source)) {
|
||||||
|
const key = block.trim();
|
||||||
|
if (seenBlocks.has(key)) continue;
|
||||||
|
seenBlocks.add(key);
|
||||||
|
mergedBlocks.push(block);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!changed) return existing;
|
||||||
|
return `${mergedBlocks.join('\n\n')}\n`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function uniqueBlocksFromTexts(...texts) {
|
||||||
|
const seen = new Set();
|
||||||
|
const blocks = [];
|
||||||
|
for (const text of texts) {
|
||||||
|
for (const block of splitTextBlocks(text)) {
|
||||||
|
const key = block.trim();
|
||||||
|
if (!key || seen.has(key)) continue;
|
||||||
|
seen.add(key);
|
||||||
|
blocks.push(block);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return blocks;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateMergedInstructionText(mergedText, requiredBlocks) {
|
||||||
|
const candidate = normalizeText(mergedText);
|
||||||
|
return requiredBlocks.every(block => candidate.includes(normalizeText(block).trim()));
|
||||||
|
}
|
||||||
|
|
||||||
|
class InstructionMergeError extends Error {
|
||||||
|
constructor(message, options) {
|
||||||
|
super(message, options);
|
||||||
|
this.name = 'InstructionMergeError';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function abortInstructionMerge(message) {
|
||||||
|
error(message);
|
||||||
|
process.exit(1);
|
||||||
|
throw new InstructionMergeError(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncFileOverwrite(sourceRoot, repoDir, relPath) {
|
||||||
|
const src = path.join(sourceRoot, relPath);
|
||||||
|
if (!fs.existsSync(src)) return null;
|
||||||
|
|
||||||
|
const dest = path.join(repoDir, relPath);
|
||||||
|
fs.mkdirSync(path.dirname(dest), { recursive: true });
|
||||||
|
fs.copyFileSync(src, dest);
|
||||||
|
return relPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getInstructionMergeAssistant() {
|
||||||
|
const { provider } = getLLMConfig();
|
||||||
|
if (!provider) return null;
|
||||||
|
if (instructionMergeAssistantPromise) return instructionMergeAssistantPromise;
|
||||||
|
|
||||||
|
instructionMergeAssistantPromise = (async () => {
|
||||||
|
try {
|
||||||
|
const { chatJSON } = await import('./llm.js');
|
||||||
|
return async ({ relPath, existingText, sourceText, deterministicText }) => {
|
||||||
|
const systemPrompt = [
|
||||||
|
'You merge repository instruction files without losing any skill, command, or rule.',
|
||||||
|
'Never delete unique content from either input.',
|
||||||
|
'You may only remove exact duplicates or improve ordering/formatting.',
|
||||||
|
'Return JSON with a single field: merged_text.',
|
||||||
|
].join(' ');
|
||||||
|
const userContent = JSON.stringify({
|
||||||
|
path: relPath,
|
||||||
|
existing_text: existingText,
|
||||||
|
source_text: sourceText,
|
||||||
|
deterministic_candidate: deterministicText,
|
||||||
|
});
|
||||||
|
const result = await chatJSON(systemPrompt, userContent);
|
||||||
|
if (typeof result === 'string') return result;
|
||||||
|
if (result && typeof result.merged_text === 'string') return result.merged_text;
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
} catch (e) {
|
||||||
|
warn(`[merge] AI instruction merge unavailable: ${e.message}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
|
return instructionMergeAssistantPromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function mergeInstructionText(existingText, sourceText, relPath, aiMergeAssistant = null) {
|
||||||
|
const deterministic = mergeText(existingText, sourceText);
|
||||||
|
const requiredBlocks = uniqueBlocksFromTexts(existingText, sourceText);
|
||||||
|
if (!aiMergeAssistant || requiredBlocks.length === 0) return deterministic;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const aiMerged = await aiMergeAssistant({ relPath, existingText, sourceText, deterministicText: deterministic, requiredBlocks });
|
||||||
|
if (typeof aiMerged === 'string' && validateMergedInstructionText(aiMerged, requiredBlocks)) {
|
||||||
|
return normalizeText(aiMerged) === normalizeText(existingText) ? existingText : aiMerged;
|
||||||
|
}
|
||||||
|
abortInstructionMerge(`[merge] ${relPath} AI result rejected; refusing fallback`);
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof InstructionMergeError) throw e;
|
||||||
|
abortInstructionMerge(`[merge] ${relPath} AI merge failed: ${e.message}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function syncInstructionFile(sourceRoot, repoDir, relPath, aiMergeAssistant = null) {
|
||||||
|
const src = path.join(sourceRoot, relPath);
|
||||||
|
if (!fs.existsSync(src)) return null;
|
||||||
|
|
||||||
|
const dest = path.join(repoDir, relPath);
|
||||||
|
fs.mkdirSync(path.dirname(dest), { recursive: true });
|
||||||
|
|
||||||
|
if (!fs.existsSync(dest)) {
|
||||||
|
fs.copyFileSync(src, dest);
|
||||||
|
return relPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingText = fs.readFileSync(dest, 'utf8');
|
||||||
|
const sourceText = fs.readFileSync(src, 'utf8');
|
||||||
|
const merged = await mergeInstructionText(existingText, sourceText, relPath, aiMergeAssistant);
|
||||||
|
if (merged !== existingText) {
|
||||||
|
fs.writeFileSync(dest, merged, 'utf8');
|
||||||
|
}
|
||||||
|
return relPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncTree(sourceRoot, repoDir, relDir) {
|
||||||
const srcDir = path.join(sourceRoot, relDir);
|
const srcDir = path.join(sourceRoot, relDir);
|
||||||
if (!fs.existsSync(srcDir)) return [];
|
if (!fs.existsSync(srcDir)) return [];
|
||||||
|
|
||||||
const copied = [];
|
const copied = [];
|
||||||
for (const entry of fs.readdirSync(srcDir, { withFileTypes: true })) {
|
for (const entry of fs.readdirSync(srcDir, { withFileTypes: true })) {
|
||||||
const relPath = path.join(relDir, entry.name);
|
const relPath = path.join(relDir, entry.name);
|
||||||
const src = path.join(sourceRoot, relPath);
|
|
||||||
const dest = path.join(repoDir, relPath);
|
|
||||||
if (entry.isDirectory()) {
|
if (entry.isDirectory()) {
|
||||||
copied.push(...copyTree(sourceRoot, repoDir, relPath));
|
copied.push(...syncTree(sourceRoot, repoDir, relPath));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
fs.mkdirSync(path.dirname(dest), { recursive: true });
|
const synced = syncFileOverwrite(sourceRoot, repoDir, relPath);
|
||||||
fs.copyFileSync(src, dest);
|
if (synced) copied.push(synced);
|
||||||
copied.push(relPath);
|
|
||||||
}
|
}
|
||||||
return copied;
|
return copied;
|
||||||
}
|
}
|
||||||
|
|
||||||
function copyFileOverwrite(sourceRoot, repoDir, relPath) {
|
|
||||||
const src = path.join(sourceRoot, relPath);
|
|
||||||
if (!fs.existsSync(src)) return null;
|
|
||||||
const dest = path.join(repoDir, relPath);
|
|
||||||
fs.mkdirSync(path.dirname(dest), { recursive: true });
|
|
||||||
fs.copyFileSync(src, dest);
|
|
||||||
return relPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getRepoState(repoDir, _spawnSync = spawnSync) {
|
export function getRepoState(repoDir, _spawnSync = spawnSync) {
|
||||||
const run = makeRunner(_spawnSync);
|
const run = makeRunner(_spawnSync);
|
||||||
const headSha = readGitOutput(run, ['rev-parse', 'HEAD'], repoDir);
|
const headSha = readGitOutput(run, ['rev-parse', 'HEAD'], repoDir);
|
||||||
@@ -150,26 +291,30 @@ export async function commitAndPush(workspace, repoDir, _spawnSync = spawnSync,
|
|||||||
}
|
}
|
||||||
|
|
||||||
const existingSyncPaths = new Set();
|
const existingSyncPaths = new Set();
|
||||||
|
const aiMergeAssistant = await getInstructionMergeAssistant();
|
||||||
|
|
||||||
// Copy action skill trees into the target repo. Existing files are overwritten;
|
// Copy action skill trees into the target repo. Existing files are merged with
|
||||||
// missing source files are ignored so we do not delete target repo content.
|
// the action source; missing source files are ignored so we do not delete
|
||||||
|
// target repo content.
|
||||||
for (const relDir of SYNC_TREE_PATHS) {
|
for (const relDir of SYNC_TREE_PATHS) {
|
||||||
for (const relPath of copyTree(sourceRoot, repoDir, relDir)) {
|
for (const relPath of syncTree(sourceRoot, repoDir, relDir)) {
|
||||||
existingSyncPaths.add(relPath);
|
existingSyncPaths.add(relPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Force overwrite the direct instruction files first so the target repo always
|
// Merge only the direct instruction files that must preserve repository-specific
|
||||||
// receives the action-owned versions even if the repo has drifted.
|
// skills, commands, and rules. Everything else keeps the source copy.
|
||||||
for (const relPath of FORCE_SYNC_FILE_PATHS) {
|
for (const relPath of FORCE_SYNC_FILE_PATHS) {
|
||||||
const copied = copyFileOverwrite(sourceRoot, repoDir, relPath);
|
const copied = MERGE_SYNC_FILE_PATHS.has(relPath)
|
||||||
|
? await syncInstructionFile(sourceRoot, repoDir, relPath, aiMergeAssistant)
|
||||||
|
: syncFileOverwrite(sourceRoot, repoDir, relPath);
|
||||||
if (copied) existingSyncPaths.add(copied);
|
if (copied) existingSyncPaths.add(copied);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy standalone action files into the target repo. Existing files are overwritten.
|
// Merge standalone action files into the target repo.
|
||||||
for (const relPath of SYNC_PATHS) {
|
for (const relPath of SYNC_PATHS) {
|
||||||
if (FORCE_SYNC_FILE_PATHS.includes(relPath)) continue;
|
if (FORCE_SYNC_FILE_PATHS.includes(relPath)) continue;
|
||||||
const copied = copyFileOverwrite(sourceRoot, repoDir, relPath);
|
const copied = syncFileOverwrite(sourceRoot, repoDir, relPath);
|
||||||
if (copied) existingSyncPaths.add(copied);
|
if (copied) existingSyncPaths.add(copied);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+62
-23
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
|
|||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import os from 'os';
|
import os from 'os';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { commitAndPush, cloneRepo, SYNC_PATHS, BOT_COMMIT_MARKER, getHeadCommitMessage, isBotAutoCommit } from './git.js';
|
import { commitAndPush, cloneRepo, SYNC_PATHS, BOT_COMMIT_MARKER, getHeadCommitMessage, isBotAutoCommit, mergeInstructionText } from './git.js';
|
||||||
|
|
||||||
// --- helpers ---
|
// --- helpers ---
|
||||||
function makeTmpWorkspace() {
|
function makeTmpWorkspace() {
|
||||||
@@ -159,40 +159,79 @@ describe('commitAndPush', () => {
|
|||||||
assert.equal(fs.readFileSync(repoPath, 'utf8'), 'stale');
|
assert.equal(fs.readFileSync(repoPath, 'utf8'), 'stale');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('overwrites existing repo copies with workspace files', async () => {
|
it('merges existing repo copies with workspace files', async () => {
|
||||||
const repoDir = path.join(workspace, 'repo');
|
const repoDir = path.join(workspace, 'repo');
|
||||||
fs.writeFileSync(path.join(repoDir, '.agents/skills/triage-findings/SKILL.md'), 'stale');
|
fs.writeFileSync(path.join(repoDir, 'AGENTS.md'), 'repo agents doc');
|
||||||
fs.writeFileSync(path.join(repoDir, '.github/skills/triage-findings/SKILL.md'), 'stale');
|
fs.writeFileSync(path.join(repoDir, 'ANTIGRAVITY.md'), 'repo antigravity doc');
|
||||||
fs.writeFileSync(path.join(repoDir, 'AGENTS.md'), 'stale');
|
fs.writeFileSync(path.join(repoDir, 'CLAUDE.md'), 'repo claude doc');
|
||||||
fs.writeFileSync(path.join(repoDir, 'ANTIGRAVITY.md'), 'stale');
|
fs.writeFileSync(path.join(repoDir, 'GEMINI.md'), 'repo gemini doc');
|
||||||
fs.writeFileSync(path.join(repoDir, 'CLAUDE.md'), 'stale');
|
|
||||||
fs.writeFileSync(path.join(repoDir, 'GEMINI.md'), 'stale');
|
|
||||||
fs.writeFileSync(path.join(repoDir, '.github/copilot-instructions.md'), 'stale');
|
|
||||||
|
|
||||||
await commitAndPush(workspace, repoDir, makeSpawn(), sourceRoot);
|
await commitAndPush(workspace, repoDir, makeSpawn(), sourceRoot);
|
||||||
|
|
||||||
assert.equal(fs.readFileSync(path.join(repoDir, '.github/skills/triage-findings/SKILL.md'), 'utf8'), '.github/skills/triage-findings/SKILL.md');
|
const agentsDoc = fs.readFileSync(path.join(repoDir, 'AGENTS.md'), 'utf8');
|
||||||
assert.equal(fs.readFileSync(path.join(repoDir, '.agents/skills/triage-findings/SKILL.md'), 'utf8'), '.agents/skills/triage-findings/SKILL.md');
|
const antigravityDoc = fs.readFileSync(path.join(repoDir, 'ANTIGRAVITY.md'), 'utf8');
|
||||||
assert.equal(fs.readFileSync(path.join(repoDir, 'AGENTS.md'), 'utf8'), 'AGENTS.md');
|
const claudeDoc = fs.readFileSync(path.join(repoDir, 'CLAUDE.md'), 'utf8');
|
||||||
assert.equal(fs.readFileSync(path.join(repoDir, 'ANTIGRAVITY.md'), 'utf8'), 'ANTIGRAVITY.md');
|
const geminiDoc = fs.readFileSync(path.join(repoDir, 'GEMINI.md'), 'utf8');
|
||||||
assert.equal(fs.readFileSync(path.join(repoDir, 'CLAUDE.md'), 'utf8'), 'CLAUDE.md');
|
|
||||||
assert.equal(fs.readFileSync(path.join(repoDir, 'GEMINI.md'), 'utf8'), 'GEMINI.md');
|
assert.ok(agentsDoc.includes('repo agents doc'));
|
||||||
assert.equal(fs.readFileSync(path.join(repoDir, '.github/copilot-instructions.md'), 'utf8'), '.github/copilot-instructions.md');
|
assert.ok(agentsDoc.includes('AGENTS.md'));
|
||||||
|
assert.ok(antigravityDoc.includes('repo antigravity doc'));
|
||||||
|
assert.ok(antigravityDoc.includes('ANTIGRAVITY.md'));
|
||||||
|
assert.ok(claudeDoc.includes('repo claude doc'));
|
||||||
|
assert.ok(claudeDoc.includes('CLAUDE.md'));
|
||||||
|
assert.ok(geminiDoc.includes('repo gemini doc'));
|
||||||
|
assert.ok(geminiDoc.includes('GEMINI.md'));
|
||||||
|
assert.ok(agentsDoc.includes('repo agents doc'));
|
||||||
});
|
});
|
||||||
|
|
||||||
it('recursively overwrites skill tree files from the action source', async () => {
|
it('accepts AI merged instruction text when all unique blocks are preserved', async () => {
|
||||||
|
const calls = [];
|
||||||
|
const aiMergeAssistant = async payload => {
|
||||||
|
calls.push(payload);
|
||||||
|
return ['repo block', 'source block', 'extra block'].join('\n\n');
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await mergeInstructionText('repo block', 'source block', 'AGENTS.md', aiMergeAssistant);
|
||||||
|
|
||||||
|
assert.equal(calls.length, 1);
|
||||||
|
assert.ok(result.includes('repo block'));
|
||||||
|
assert.ok(result.includes('source block'));
|
||||||
|
assert.ok(result.includes('extra block'));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('exits when AI output drops a block', async () => {
|
||||||
|
const originalExit = process.exit;
|
||||||
|
let exitCode = null;
|
||||||
|
process.exit = code => { exitCode = code; };
|
||||||
|
try {
|
||||||
|
const aiMergeAssistant = async () => 'source block only';
|
||||||
|
await assert.rejects(() => mergeInstructionText('repo block', 'source block', 'AGENTS.md', aiMergeAssistant));
|
||||||
|
assert.equal(exitCode, 1);
|
||||||
|
} finally {
|
||||||
|
process.exit = originalExit;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('overwrites non-merge sync files with workspace files', async () => {
|
||||||
const repoDir = path.join(workspace, 'repo');
|
const repoDir = path.join(workspace, 'repo');
|
||||||
const nestedRelPath = '.codex/skills/triage-findings/assets/example.txt';
|
const sourceSkillPath = path.join(sourceRoot, '.github/skills/triage-findings/SKILL.md');
|
||||||
const sourceNestedPath = path.join(sourceRoot, nestedRelPath);
|
const repoSkillPath = path.join(repoDir, '.github/skills/triage-findings/SKILL.md');
|
||||||
const repoNestedPath = path.join(repoDir, nestedRelPath);
|
const sourceNestedPath = path.join(sourceRoot, '.codex/skills/triage-findings/assets/example.txt');
|
||||||
|
const repoNestedPath = path.join(repoDir, '.codex/skills/triage-findings/assets/example.txt');
|
||||||
|
|
||||||
|
fs.writeFileSync(sourceSkillPath, 'fresh github skill');
|
||||||
|
fs.writeFileSync(repoSkillPath, 'stale github skill');
|
||||||
fs.mkdirSync(path.dirname(sourceNestedPath), { recursive: true });
|
fs.mkdirSync(path.dirname(sourceNestedPath), { recursive: true });
|
||||||
fs.writeFileSync(sourceNestedPath, 'fresh');
|
fs.writeFileSync(sourceNestedPath, 'fresh nested');
|
||||||
fs.mkdirSync(path.dirname(repoNestedPath), { recursive: true });
|
fs.mkdirSync(path.dirname(repoNestedPath), { recursive: true });
|
||||||
fs.writeFileSync(repoNestedPath, 'stale');
|
fs.writeFileSync(repoNestedPath, 'stale nested');
|
||||||
|
fs.writeFileSync(path.join(repoDir, '.github/copilot-instructions.md'), 'stale copilot');
|
||||||
|
|
||||||
await commitAndPush(workspace, repoDir, makeSpawn(), sourceRoot);
|
await commitAndPush(workspace, repoDir, makeSpawn(), sourceRoot);
|
||||||
|
|
||||||
assert.equal(fs.readFileSync(repoNestedPath, 'utf8'), 'fresh');
|
assert.equal(fs.readFileSync(repoSkillPath, 'utf8'), 'fresh github skill');
|
||||||
|
assert.equal(fs.readFileSync(repoNestedPath, 'utf8'), 'fresh nested');
|
||||||
|
assert.equal(fs.readFileSync(path.join(repoDir, '.github/copilot-instructions.md'), 'utf8'), '.github/copilot-instructions.md');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does not throw when git command fails', async () => {
|
it('does not throw when git command fails', async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user