chore: unify log formatting
This commit is contained in:
+22
-21
@@ -2,6 +2,7 @@ import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { chatJSON } from './llm.js';
|
||||
import { FINDINGS_PATH, EXCLUSIONS_PATH } from './config.js';
|
||||
import { line, ok, warn } from './log.js';
|
||||
|
||||
const LEVELS = ['critical', 'warning', 'info'];
|
||||
|
||||
@@ -9,11 +10,11 @@ const LEVELS = ['critical', 'warning', 'info'];
|
||||
* 用單一角色分析 diff,回傳 findings 陣列
|
||||
*/
|
||||
export async function analyzeWithRole(role, diff) {
|
||||
console.log(` [${role.name}] 開始分析...`);
|
||||
line(`[${role.name}] 開始分析`);
|
||||
const findings = await chatJSON(role.system_prompt, `以下是 Git Diff 內容:\n\n${diff}`);
|
||||
const valid = findings.filter(f => f.level && f.role && f.location && f.suggestion)
|
||||
.map(f => ({ ...f, is_new: true }));
|
||||
console.log(` [${role.name}] 找到 ${valid.length} 個問題`);
|
||||
ok(`[${role.name}] 找到 ${valid.length} 個問題`);
|
||||
return valid;
|
||||
}
|
||||
|
||||
@@ -22,14 +23,14 @@ export async function analyzeWithRole(role, diff) {
|
||||
*/
|
||||
function readJSONArray(fullPath, label) {
|
||||
if (!fs.existsSync(fullPath)) {
|
||||
console.log(` ${label}檔案不存在,視為空`);
|
||||
warn(`${label}檔案不存在,視為空`);
|
||||
return [];
|
||||
}
|
||||
try {
|
||||
const data = JSON.parse(fs.readFileSync(fullPath, 'utf8'));
|
||||
return Array.isArray(data) ? data : [];
|
||||
} catch (e) {
|
||||
console.log(` ⚠️ 讀取${label}失敗: ${e.message},視為空`);
|
||||
warn(`讀取${label}失敗: ${e.message},視為空`);
|
||||
return [];
|
||||
}
|
||||
}
|
||||
@@ -53,12 +54,12 @@ export function loadOldFindings(workspace) {
|
||||
const old = readJSONArray(fullPath, '舊 findings ').map(f => ({ ...f, is_new: false }));
|
||||
if (fs.existsSync(fullPath)) {
|
||||
const stat = fs.statSync(fullPath);
|
||||
console.log(` 讀取舊 findings 檔案: ${fullPath}`);
|
||||
console.log(` 舊 findings 檔案資訊: bytes=${stat.size} mtime=${formatFileTime(stat.mtimeMs)} path=${path.relative(workspace, fullPath) || fullPath}`);
|
||||
line(`讀取舊 findings 檔案: ${fullPath}`);
|
||||
line(`舊 findings 檔案資訊: bytes=${stat.size} mtime=${formatFileTime(stat.mtimeMs)} path=${path.relative(workspace, fullPath) || fullPath}`);
|
||||
} else {
|
||||
console.log(` 舊 findings 檔案不存在: ${fullPath}`);
|
||||
warn(`舊 findings 檔案不存在: ${fullPath}`);
|
||||
}
|
||||
console.log(` 讀取舊 findings: ${old.length} 筆`);
|
||||
ok(`讀取舊 findings: ${old.length} 筆`);
|
||||
return old;
|
||||
}
|
||||
|
||||
@@ -74,7 +75,7 @@ export function mergeFindings(oldFindings, newFindings) {
|
||||
return true;
|
||||
});
|
||||
const merged = [...oldFindings, ...deduped];
|
||||
console.log(` 合併結果: 舊=${oldFindings.length} 新(去重後)=${deduped.length} 總計=${merged.length}`);
|
||||
ok(`合併結果: 舊=${oldFindings.length} 新(去重後)=${deduped.length} 總計=${merged.length}`);
|
||||
return merged;
|
||||
}
|
||||
|
||||
@@ -91,7 +92,7 @@ export function sortByLevel(findings) {
|
||||
function fallback(label, findings, e) {
|
||||
const status = e.response?.status;
|
||||
const reason = (status === 402 || status === 429) ? `${status} 額度/限流` : e.message;
|
||||
console.log(` ⚠️ ${label}失敗(${reason}),降級:保留所有問題`);
|
||||
warn(`${label}失敗(${reason}),降級:保留所有問題`);
|
||||
return findings;
|
||||
}
|
||||
|
||||
@@ -111,7 +112,7 @@ export async function deduplicateWithAI(findings) {
|
||||
try {
|
||||
const result = await chatJSON(systemPrompt, JSON.stringify(toAIPayload(findings)));
|
||||
if (Array.isArray(result) && result.length > 0) {
|
||||
console.log(` AI 去重: ${findings.length} -> ${result.length} 筆`);
|
||||
ok(`AI 去重: ${findings.length} -> ${result.length} 筆`);
|
||||
// 以 location+suggestion 為 key,將原始 findings 的完整欄位(含 is_new)補回
|
||||
const origMap = new Map(findings.map(f => [`${f.location}|${String(f.suggestion).slice(0, 50)}`, f]));
|
||||
return result.map(r => origMap.get(`${r.location}|${String(r.suggestion).slice(0, 50)}`) ?? r);
|
||||
@@ -128,13 +129,13 @@ export async function deduplicateWithAI(findings) {
|
||||
export function loadExclusions(workspace, repoState = null) {
|
||||
const fullPath = path.join(workspace, EXCLUSIONS_PATH);
|
||||
if (!fs.existsSync(fullPath)) {
|
||||
console.log(` 排除問題檔案不存在,視為空: ${fullPath}`);
|
||||
warn(`排除問題檔案不存在,視為空: ${fullPath}`);
|
||||
if (repoState) {
|
||||
const branch = repoState.branch || 'detached';
|
||||
const shortSha = repoState.shortSha || repoState.headSha || 'unknown';
|
||||
console.log(` 來源分支狀態: branch=${branch} commit=${shortSha} commit_time=${repoState.commitTime || 'unknown'}`);
|
||||
line(`來源分支狀態: branch=${branch} commit=${shortSha} commit_time=${repoState.commitTime || 'unknown'}`);
|
||||
}
|
||||
console.log(' 讀取排除問題: raw=0 normalized=0 筆');
|
||||
ok('讀取排除問題: raw=0 normalized=0 筆');
|
||||
return [];
|
||||
}
|
||||
|
||||
@@ -148,14 +149,14 @@ export function loadExclusions(workspace, repoState = null) {
|
||||
const branch = repoState?.branch || 'detached';
|
||||
const shortSha = repoState?.shortSha || repoState?.headSha || 'unknown';
|
||||
const commitTime = repoState?.commitTime || 'unknown';
|
||||
console.log(` 讀取排除問題檔案: ${fullPath}`);
|
||||
console.log(` 來源分支狀態: branch=${branch} commit=${shortSha} commit_time=${commitTime}`);
|
||||
console.log(` 檔案資訊: bytes=${stat.size} mtime=${formatFileTime(stat.mtimeMs)} raw=${rawCount} normalized=${exclusions.length} path=${path.relative(workspace, fullPath) || fullPath}`);
|
||||
line(`讀取排除問題檔案: ${fullPath}`);
|
||||
line(`來源分支狀態: branch=${branch} commit=${shortSha} commit_time=${commitTime}`);
|
||||
line(`檔案資訊: bytes=${stat.size} mtime=${formatFileTime(stat.mtimeMs)} raw=${rawCount} normalized=${exclusions.length} path=${path.relative(workspace, fullPath) || fullPath}`);
|
||||
} catch (e) {
|
||||
console.log(` ⚠️ 讀取排除問題失敗: ${e.message},視為空: ${fullPath}`);
|
||||
warn(`讀取排除問題失敗: ${e.message},視為空: ${fullPath}`);
|
||||
exclusions = [];
|
||||
}
|
||||
console.log(` 讀取排除問題: raw=${rawCount} normalized=${exclusions.length} 筆`);
|
||||
ok(`讀取排除問題: raw=${rawCount} normalized=${exclusions.length} 筆`);
|
||||
return exclusions;
|
||||
}
|
||||
|
||||
@@ -171,7 +172,7 @@ export function applyExclusions(findings, exclusions) {
|
||||
const exPath = ex.location ? String(ex.location).split(':')[0] : null;
|
||||
return (!exPath || fPath === exPath) && (!ex.role || ex.role === f.role);
|
||||
}));
|
||||
console.log(` 排除過濾: ${before} -> ${filtered.length} 筆(排除 ${before - filtered.length} 筆)`);
|
||||
ok(`排除過濾: ${before} -> ${filtered.length} 筆(排除 ${before - filtered.length} 筆)`);
|
||||
return filtered;
|
||||
}
|
||||
|
||||
@@ -190,7 +191,7 @@ export async function filterFalsePositivesWithAI(findings, exclusions = []) {
|
||||
try {
|
||||
const result = await chatJSON(systemPrompt, JSON.stringify(toAIPayload(findings)));
|
||||
if (Array.isArray(result) && result.length > 0) {
|
||||
console.log(` AI 誤報過濾: ${findings.length} -> ${result.length} 筆`);
|
||||
ok(`AI 誤報過濾: ${findings.length} -> ${result.length} 筆`);
|
||||
const origMap = new Map(findings.map(f => [`${f.location}|${String(f.suggestion).slice(0, 50)}`, f]));
|
||||
return result.map(r => origMap.get(`${r.location}|${String(r.suggestion).slice(0, 50)}`) ?? r);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user