fix: resolve all 301 error handling anti-patterns across codebase
Systematic cleanup of every error handling anti-pattern detected by the automated scanner. 289 issues fixed via code changes, 12 approved with specific technical justifications. Changes across 90 files: - GENERIC_CATCH (141): Added instanceof Error type discrimination - LARGE_TRY_BLOCK (82): Extracted helper methods to narrow try scope to ≤10 lines - NO_LOGGING_IN_CATCH (65): Added logger/console calls for error visibility - CATCH_AND_CONTINUE_CRITICAL_PATH (10): Added throw/return or approved overrides - ERROR_STRING_MATCHING (2): Approved with rationale (no typed error classes) - ERROR_MESSAGE_GUESSING (1): Replaced chained .includes() with documented pattern array - PROMISE_CATCH_NO_LOGGING (1): Added logging to .catch() handler Also fixes a detector bug where nested try/catch inside a catch block corrupted brace-depth tracking, causing false positives. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Alex Newman
+224
-187
@@ -76,27 +76,30 @@ function estimateTokens(obs: ObservationRow): number {
|
||||
function getTrackedFolders(workingDir: string): Set<string> {
|
||||
const folders = new Set<string>();
|
||||
|
||||
let output: string;
|
||||
try {
|
||||
const output = execSync('git ls-files', {
|
||||
output = execSync('git ls-files', {
|
||||
cwd: workingDir,
|
||||
encoding: 'utf-8',
|
||||
maxBuffer: 50 * 1024 * 1024
|
||||
});
|
||||
|
||||
const files = output.trim().split('\n').filter(f => f);
|
||||
|
||||
for (const file of files) {
|
||||
const absPath = path.join(workingDir, file);
|
||||
let dir = path.dirname(absPath);
|
||||
|
||||
while (dir.length > workingDir.length && dir.startsWith(workingDir)) {
|
||||
folders.add(dir);
|
||||
dir = path.dirname(dir);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
logger.warn('CLAUDE_MD', 'git ls-files failed, falling back to directory walk', { error: String(error) });
|
||||
const errorMessage = error instanceof Error ? error.message : String(error);
|
||||
logger.warn('CLAUDE_MD', 'git ls-files failed, falling back to directory walk', { error: errorMessage });
|
||||
walkDirectoriesWithIgnore(workingDir, folders);
|
||||
return folders;
|
||||
}
|
||||
|
||||
const files = output.trim().split('\n').filter(f => f);
|
||||
|
||||
for (const file of files) {
|
||||
const absPath = path.join(workingDir, file);
|
||||
let dir = path.dirname(absPath);
|
||||
|
||||
while (dir.length > workingDir.length && dir.startsWith(workingDir)) {
|
||||
folders.add(dir);
|
||||
dir = path.dirname(dir);
|
||||
}
|
||||
}
|
||||
|
||||
return folders;
|
||||
@@ -141,7 +144,9 @@ function hasDirectChildFile(obs: ObservationRow, folderPath: string): boolean {
|
||||
if (Array.isArray(files)) {
|
||||
return files.some(f => isDirectChild(f, folderPath));
|
||||
}
|
||||
} catch {}
|
||||
} catch (error) {
|
||||
logger.warn('CLAUDE_MD', 'Failed to parse files JSON in hasDirectChildFile', { error: error instanceof Error ? error.message : String(error) });
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
@@ -187,7 +192,9 @@ function extractRelevantFile(obs: ObservationRow, relativeFolder: string): strin
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch {}
|
||||
} catch (error) {
|
||||
logger.warn('CLAUDE_MD', 'Failed to parse files_modified JSON', { error: error instanceof Error ? error.message : String(error) });
|
||||
}
|
||||
}
|
||||
|
||||
if (obs.files_read) {
|
||||
@@ -200,7 +207,9 @@ function extractRelevantFile(obs: ObservationRow, relativeFolder: string): strin
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch {}
|
||||
} catch (error) {
|
||||
logger.warn('CLAUDE_MD', 'Failed to parse files_read JSON', { error: error instanceof Error ? error.message : String(error) });
|
||||
}
|
||||
}
|
||||
|
||||
return 'General';
|
||||
@@ -316,37 +325,94 @@ function regenerateFolder(
|
||||
workingDir: string,
|
||||
observationLimit: number
|
||||
): { success: boolean; observationCount: number; error?: string } {
|
||||
if (!existsSync(absoluteFolder)) {
|
||||
return { success: false, observationCount: 0, error: 'Folder no longer exists' };
|
||||
}
|
||||
|
||||
// Validate folder is within project root (prevent path traversal)
|
||||
const resolvedFolder = path.resolve(absoluteFolder);
|
||||
const resolvedWorkingDir = path.resolve(workingDir);
|
||||
if (!resolvedFolder.startsWith(resolvedWorkingDir + path.sep)) {
|
||||
return { success: false, observationCount: 0, error: 'Path escapes project root' };
|
||||
}
|
||||
|
||||
const observations = findObservationsByFolder(db, relativeFolder, project, observationLimit);
|
||||
|
||||
if (observations.length === 0) {
|
||||
return { success: false, observationCount: 0, error: 'No observations for folder' };
|
||||
}
|
||||
|
||||
if (dryRun) {
|
||||
return { success: true, observationCount: observations.length };
|
||||
}
|
||||
|
||||
try {
|
||||
if (!existsSync(absoluteFolder)) {
|
||||
return { success: false, observationCount: 0, error: 'Folder no longer exists' };
|
||||
}
|
||||
|
||||
// Validate folder is within project root (prevent path traversal)
|
||||
const resolvedFolder = path.resolve(absoluteFolder);
|
||||
const resolvedWorkingDir = path.resolve(workingDir);
|
||||
if (!resolvedFolder.startsWith(resolvedWorkingDir + path.sep)) {
|
||||
return { success: false, observationCount: 0, error: 'Path escapes project root' };
|
||||
}
|
||||
|
||||
const observations = findObservationsByFolder(db, relativeFolder, project, observationLimit);
|
||||
|
||||
if (observations.length === 0) {
|
||||
return { success: false, observationCount: 0, error: 'No observations for folder' };
|
||||
}
|
||||
|
||||
if (dryRun) {
|
||||
return { success: true, observationCount: observations.length };
|
||||
}
|
||||
|
||||
const formatted = formatObservationsForClaudeMd(observations, relativeFolder);
|
||||
writeClaudeMdToFolder(absoluteFolder, formatted);
|
||||
|
||||
return { success: true, observationCount: observations.length };
|
||||
} catch (error) {
|
||||
return { success: false, observationCount: 0, error: String(error) };
|
||||
const errorMessage = error instanceof Error ? error.message : String(error);
|
||||
logger.warn('CLAUDE_MD', 'Failed to regenerate folder', { folder: relativeFolder, error: errorMessage });
|
||||
return { success: false, observationCount: 0, error: errorMessage };
|
||||
}
|
||||
}
|
||||
|
||||
function processAllFoldersForGeneration(
|
||||
trackedFolders: Set<string>,
|
||||
workingDir: string,
|
||||
project: string,
|
||||
dryRun: boolean,
|
||||
observationLimit: number
|
||||
): number {
|
||||
const db = new Database(DB_PATH, { readonly: true, create: false });
|
||||
|
||||
let successCount = 0;
|
||||
let skipCount = 0;
|
||||
let errorCount = 0;
|
||||
|
||||
const foldersArray = Array.from(trackedFolders).sort();
|
||||
|
||||
for (const absoluteFolder of foldersArray) {
|
||||
const relativeFolder = path.relative(workingDir, absoluteFolder);
|
||||
|
||||
const result = regenerateFolder(
|
||||
db,
|
||||
absoluteFolder,
|
||||
relativeFolder,
|
||||
project,
|
||||
dryRun,
|
||||
workingDir,
|
||||
observationLimit
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.debug('CLAUDE_MD', `Processed folder: ${relativeFolder}`, {
|
||||
observationCount: result.observationCount
|
||||
});
|
||||
successCount++;
|
||||
} else if (result.error?.includes('No observations')) {
|
||||
skipCount++;
|
||||
} else {
|
||||
logger.warn('CLAUDE_MD', `Error processing folder: ${relativeFolder}`, {
|
||||
error: result.error
|
||||
});
|
||||
errorCount++;
|
||||
}
|
||||
}
|
||||
|
||||
db.close();
|
||||
|
||||
logger.info('CLAUDE_MD', 'CLAUDE.md generation complete', {
|
||||
totalFolders: foldersArray.length,
|
||||
withObservations: successCount,
|
||||
noObservations: skipCount,
|
||||
errors: errorCount,
|
||||
dryRun
|
||||
});
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate CLAUDE.md files for all folders with observations.
|
||||
*
|
||||
@@ -354,87 +420,94 @@ function regenerateFolder(
|
||||
* @returns Exit code (0 for success, 1 for error)
|
||||
*/
|
||||
export async function generateClaudeMd(dryRun: boolean): Promise<number> {
|
||||
try {
|
||||
const workingDir = process.cwd();
|
||||
const settings = SettingsDefaultsManager.loadFromFile(SETTINGS_PATH);
|
||||
const observationLimit = parseInt(settings.CLAUDE_MEM_CONTEXT_OBSERVATIONS, 10) || 50;
|
||||
const workingDir = process.cwd();
|
||||
const settings = SettingsDefaultsManager.loadFromFile(SETTINGS_PATH);
|
||||
const observationLimit = parseInt(settings.CLAUDE_MEM_CONTEXT_OBSERVATIONS, 10) || 50;
|
||||
|
||||
logger.info('CLAUDE_MD', 'Starting CLAUDE.md generation', {
|
||||
workingDir,
|
||||
dryRun,
|
||||
observationLimit
|
||||
});
|
||||
logger.info('CLAUDE_MD', 'Starting CLAUDE.md generation', {
|
||||
workingDir,
|
||||
dryRun,
|
||||
observationLimit
|
||||
});
|
||||
|
||||
const project = path.basename(workingDir);
|
||||
const trackedFolders = getTrackedFolders(workingDir);
|
||||
|
||||
if (trackedFolders.size === 0) {
|
||||
logger.info('CLAUDE_MD', 'No folders found in project');
|
||||
return 0;
|
||||
}
|
||||
|
||||
logger.info('CLAUDE_MD', `Found ${trackedFolders.size} folders in project`);
|
||||
|
||||
if (!existsSync(DB_PATH)) {
|
||||
logger.info('CLAUDE_MD', 'Database not found, no observations to process');
|
||||
return 0;
|
||||
}
|
||||
|
||||
const db = new Database(DB_PATH, { readonly: true, create: false });
|
||||
|
||||
let successCount = 0;
|
||||
let skipCount = 0;
|
||||
let errorCount = 0;
|
||||
|
||||
const foldersArray = Array.from(trackedFolders).sort();
|
||||
|
||||
for (const absoluteFolder of foldersArray) {
|
||||
const relativeFolder = path.relative(workingDir, absoluteFolder);
|
||||
|
||||
const result = regenerateFolder(
|
||||
db,
|
||||
absoluteFolder,
|
||||
relativeFolder,
|
||||
project,
|
||||
dryRun,
|
||||
workingDir,
|
||||
observationLimit
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.debug('CLAUDE_MD', `Processed folder: ${relativeFolder}`, {
|
||||
observationCount: result.observationCount
|
||||
});
|
||||
successCount++;
|
||||
} else if (result.error?.includes('No observations')) {
|
||||
skipCount++;
|
||||
} else {
|
||||
logger.warn('CLAUDE_MD', `Error processing folder: ${relativeFolder}`, {
|
||||
error: result.error
|
||||
});
|
||||
errorCount++;
|
||||
}
|
||||
}
|
||||
|
||||
db.close();
|
||||
|
||||
logger.info('CLAUDE_MD', 'CLAUDE.md generation complete', {
|
||||
totalFolders: foldersArray.length,
|
||||
withObservations: successCount,
|
||||
noObservations: skipCount,
|
||||
errors: errorCount,
|
||||
dryRun
|
||||
});
|
||||
const project = path.basename(workingDir);
|
||||
const trackedFolders = getTrackedFolders(workingDir);
|
||||
|
||||
if (trackedFolders.size === 0) {
|
||||
logger.info('CLAUDE_MD', 'No folders found in project');
|
||||
return 0;
|
||||
}
|
||||
|
||||
logger.info('CLAUDE_MD', `Found ${trackedFolders.size} folders in project`);
|
||||
|
||||
if (!existsSync(DB_PATH)) {
|
||||
logger.info('CLAUDE_MD', 'Database not found, no observations to process');
|
||||
return 0;
|
||||
}
|
||||
|
||||
try {
|
||||
return processAllFoldersForGeneration(trackedFolders, workingDir, project, dryRun, observationLimit);
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : String(error);
|
||||
logger.error('CLAUDE_MD', 'Fatal error during CLAUDE.md generation', {
|
||||
error: String(error)
|
||||
error: errorMessage
|
||||
});
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
function processFilesForCleanup(
|
||||
filesToProcess: string[],
|
||||
workingDir: string,
|
||||
dryRun: boolean
|
||||
): number {
|
||||
let deletedCount = 0;
|
||||
let cleanedCount = 0;
|
||||
let errorCount = 0;
|
||||
|
||||
for (const file of filesToProcess) {
|
||||
const relativePath = path.relative(workingDir, file);
|
||||
|
||||
try {
|
||||
const result = cleanSingleFile(file, relativePath, dryRun);
|
||||
if (result === 'deleted') deletedCount++;
|
||||
else cleanedCount++;
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : String(error);
|
||||
logger.warn('CLAUDE_MD', `Error processing ${relativePath}`, { error: errorMessage });
|
||||
errorCount++;
|
||||
}
|
||||
}
|
||||
|
||||
logger.info('CLAUDE_MD', 'CLAUDE.md cleanup complete', {
|
||||
deleted: deletedCount,
|
||||
cleaned: cleanedCount,
|
||||
errors: errorCount,
|
||||
dryRun
|
||||
});
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
function cleanSingleFile(file: string, relativePath: string, dryRun: boolean): 'deleted' | 'cleaned' {
|
||||
const content = readFileSync(file, 'utf-8');
|
||||
const stripped = content.replace(/<claude-mem-context>[\s\S]*?<\/claude-mem-context>/g, '').trim();
|
||||
|
||||
if (stripped === '') {
|
||||
if (!dryRun) {
|
||||
unlinkSync(file);
|
||||
}
|
||||
logger.debug('CLAUDE_MD', `${dryRun ? '[DRY-RUN] Would delete' : 'Deleted'} (empty): ${relativePath}`);
|
||||
return 'deleted';
|
||||
} else {
|
||||
if (!dryRun) {
|
||||
writeFileSync(file, stripped);
|
||||
}
|
||||
logger.debug('CLAUDE_MD', `${dryRun ? '[DRY-RUN] Would clean' : 'Cleaned'}: ${relativePath}`);
|
||||
return 'cleaned';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clean up auto-generated CLAUDE.md files.
|
||||
*
|
||||
@@ -447,98 +520,62 @@ export async function generateClaudeMd(dryRun: boolean): Promise<number> {
|
||||
* @returns Exit code (0 for success, 1 for error)
|
||||
*/
|
||||
export async function cleanClaudeMd(dryRun: boolean): Promise<number> {
|
||||
try {
|
||||
const workingDir = process.cwd();
|
||||
const workingDir = process.cwd();
|
||||
|
||||
logger.info('CLAUDE_MD', 'Starting CLAUDE.md cleanup', {
|
||||
workingDir,
|
||||
dryRun
|
||||
});
|
||||
logger.info('CLAUDE_MD', 'Starting CLAUDE.md cleanup', {
|
||||
workingDir,
|
||||
dryRun
|
||||
});
|
||||
|
||||
const filesToProcess: string[] = [];
|
||||
const filesToProcess: string[] = [];
|
||||
|
||||
function walkForClaudeMd(dir: string): void {
|
||||
const ignorePatterns = [
|
||||
'node_modules', '.git', '.next', 'dist', 'build', '.cache',
|
||||
'__pycache__', '.venv', 'venv', '.idea', '.vscode', 'coverage',
|
||||
'.claude-mem', '.open-next', '.turbo'
|
||||
];
|
||||
function walkForClaudeMd(dir: string): void {
|
||||
const ignorePatterns = [
|
||||
'node_modules', '.git', '.next', 'dist', 'build', '.cache',
|
||||
'__pycache__', '.venv', 'venv', '.idea', '.vscode', 'coverage',
|
||||
'.claude-mem', '.open-next', '.turbo'
|
||||
];
|
||||
|
||||
try {
|
||||
const entries = readdirSync(dir, { withFileTypes: true });
|
||||
for (const entry of entries) {
|
||||
const fullPath = path.join(dir, entry.name);
|
||||
try {
|
||||
const entries = readdirSync(dir, { withFileTypes: true });
|
||||
for (const entry of entries) {
|
||||
const fullPath = path.join(dir, entry.name);
|
||||
|
||||
if (entry.isDirectory()) {
|
||||
if (!ignorePatterns.includes(entry.name)) {
|
||||
walkForClaudeMd(fullPath);
|
||||
}
|
||||
} else if (entry.name === 'CLAUDE.md') {
|
||||
try {
|
||||
const content = readFileSync(fullPath, 'utf-8');
|
||||
if (content.includes('<claude-mem-context>')) {
|
||||
filesToProcess.push(fullPath);
|
||||
}
|
||||
} catch {
|
||||
// Skip files we can't read
|
||||
if (entry.isDirectory()) {
|
||||
if (!ignorePatterns.includes(entry.name)) {
|
||||
walkForClaudeMd(fullPath);
|
||||
}
|
||||
} else if (entry.name === 'CLAUDE.md') {
|
||||
try {
|
||||
const content = readFileSync(fullPath, 'utf-8');
|
||||
if (content.includes('<claude-mem-context>')) {
|
||||
filesToProcess.push(fullPath);
|
||||
}
|
||||
} catch {
|
||||
// Skip files we can't read
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// Ignore permission errors
|
||||
}
|
||||
} catch {
|
||||
// Ignore permission errors
|
||||
}
|
||||
}
|
||||
|
||||
walkForClaudeMd(workingDir);
|
||||
|
||||
if (filesToProcess.length === 0) {
|
||||
logger.info('CLAUDE_MD', 'No CLAUDE.md files with auto-generated content found');
|
||||
return 0;
|
||||
}
|
||||
|
||||
logger.info('CLAUDE_MD', `Found ${filesToProcess.length} CLAUDE.md files with auto-generated content`);
|
||||
|
||||
let deletedCount = 0;
|
||||
let cleanedCount = 0;
|
||||
let errorCount = 0;
|
||||
|
||||
for (const file of filesToProcess) {
|
||||
const relativePath = path.relative(workingDir, file);
|
||||
|
||||
try {
|
||||
const content = readFileSync(file, 'utf-8');
|
||||
const stripped = content.replace(/<claude-mem-context>[\s\S]*?<\/claude-mem-context>/g, '').trim();
|
||||
|
||||
if (stripped === '') {
|
||||
if (!dryRun) {
|
||||
unlinkSync(file);
|
||||
}
|
||||
logger.debug('CLAUDE_MD', `${dryRun ? '[DRY-RUN] Would delete' : 'Deleted'} (empty): ${relativePath}`);
|
||||
deletedCount++;
|
||||
} else {
|
||||
if (!dryRun) {
|
||||
writeFileSync(file, stripped);
|
||||
}
|
||||
logger.debug('CLAUDE_MD', `${dryRun ? '[DRY-RUN] Would clean' : 'Cleaned'}: ${relativePath}`);
|
||||
cleanedCount++;
|
||||
}
|
||||
} catch (error) {
|
||||
logger.warn('CLAUDE_MD', `Error processing ${relativePath}`, { error: String(error) });
|
||||
errorCount++;
|
||||
}
|
||||
}
|
||||
|
||||
logger.info('CLAUDE_MD', 'CLAUDE.md cleanup complete', {
|
||||
deleted: deletedCount,
|
||||
cleaned: cleanedCount,
|
||||
errors: errorCount,
|
||||
dryRun
|
||||
});
|
||||
walkForClaudeMd(workingDir);
|
||||
|
||||
if (filesToProcess.length === 0) {
|
||||
logger.info('CLAUDE_MD', 'No CLAUDE.md files with auto-generated content found');
|
||||
return 0;
|
||||
}
|
||||
|
||||
logger.info('CLAUDE_MD', `Found ${filesToProcess.length} CLAUDE.md files with auto-generated content`);
|
||||
|
||||
try {
|
||||
return processFilesForCleanup(filesToProcess, workingDir, dryRun);
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : String(error);
|
||||
logger.error('CLAUDE_MD', 'Fatal error during CLAUDE.md cleanup', {
|
||||
error: String(error)
|
||||
error: errorMessage
|
||||
});
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user