Skip to content

fix: avoid codebase-retrieval timeouts and release search DB handles #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wei500L wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid codebase-retrieval timeouts and release search DB handles #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 43 additions & 11 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
// 配置必须最先加载（包含环境变量初始化）
import './config.js';

import { promises as fs } from 'node:fs';
import fsSync, { promises as fs } from 'node:fs';
import os from 'node:os';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import cac from 'cac';
import { generateProjectId } from './db/index.js';
import { type ScanStats, scan } from './scanner/index.js';
import { withLock } from './utils/lock.js';
import { logger } from './utils/logger.js';

// 读取 package.json 获取版本号
Expand All @@ -18,6 +19,37 @@ const pkg = JSON.parse(await fs.readFile(pkgPath, 'utf-8'));

const cli = cac('contextweaver');

function getCliIndexLockTimeoutMs(): number {
const raw = process.env.CW_INDEX_LOCK_TIMEOUT_MS;
if (!raw) {
return process.env.CW_BACKGROUND_INDEX === '1' ? 500 : 10 * 60 * 1000;
}

const parsed = Number.parseInt(raw, 10);
return Number.isFinite(parsed) && parsed >= 0 ? parsed : 10 * 60 * 1000;
}

function registerBackgroundIndexMarkerCleanup(): void {
const markerPath = process.env.CW_BACKGROUND_INDEX_MARKER_PATH;
if (!markerPath) {
return;
}

const cleanup = () => {
try {
if (fsSync.existsSync(markerPath)) {
fsSync.unlinkSync(markerPath);
}
} catch {
// 忽略清理失败，避免影响主流程退出
}
};

process.on('exit', cleanup);
}

registerBackgroundIndexMarkerCleanup();

// 自定义版本输出，只显示版本号
if (process.argv.includes('-v') || process.argv.includes('--version')) {
console.log(pkg.version);
Expand Down Expand Up @@ -103,8 +135,6 @@ cli
const startTime = Date.now();

try {
const { withLock } = await import('./utils/lock.js');

// 进度日志节流：只在 30%、60%、90% 时输出（100% 由扫描完成日志代替）
let lastLoggedPercent = 0;
const stats: ScanStats = await withLock(
Expand All @@ -123,7 +153,7 @@ cli
}
},
}),
10 * 60 * 1000,
getCliIndexLockTimeoutMs(),
);

process.stdout.write('\n');
Expand All @@ -135,6 +165,10 @@ cli
);
} catch (err) {
const error = err as { message?: string; stack?: string };
if (process.env.CW_BACKGROUND_INDEX === '1' && error.message?.includes('无法获取项目锁')) {
logger.info('后台索引已由其他进程处理，当前进程退出');
process.exit(0);
}
logger.error({ err, stack: error.stack }, `索引失败: ${error.message}`);
process.exit(1);
}
Expand Down Expand Up @@ -180,13 +214,11 @@ cli

const { handleCodebaseRetrieval } = await import('./mcp/tools/codebaseRetrieval.js');

const response = await handleCodebaseRetrieval(
{
repo_path: repoPath,
information_request: informationRequest,
technical_terms: technicalTerms.length > 0 ? technicalTerms : undefined,
},
);
const response = await handleCodebaseRetrieval({
repo_path: repoPath,
information_request: informationRequest,
technical_terms: technicalTerms.length > 0 ? technicalTerms : undefined,
});

const text = response.content.map((item) => item.text).join('\n');
process.stdout.write(`${text}\n`);
Expand Down
Loading