* fix(db): eliminate concurrent-read "database is locked"; add node:sqlite backend (#238) WAL + busy_timeout were already enabled, so the issue's suggested fix was a no-op. The real causes, addressed here: - busy_timeout is now set first (before journal_mode) and lowered 120s -> 5s, so open-time pragmas wait out a lock instead of hanging for two minutes. - getCodeGraph no longer opens a second connection to the default project when a tool passes its own projectPath (the in-process lock amplifier). - The wasm fallback (no WAL) gets a bounded read-retry on SQLITE_BUSY. - New: node:sqlite backend, preferred over wasm, so installs whose native better-sqlite3 build fails land on a real-WAL backend instead of no-WAL wasm. - codegraph status / codegraph_status now report the effective journal mode, so a lock report is triageable (wal vs delete). - CLI hard-blocks Node < 20 to actually enforce the engines floor. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(db)!: node:sqlite is the sole backend; drop better-sqlite3 + wasm Now that distribution will bundle a Node 24 runtime, node:sqlite (real SQLite with WAL + FTS5) is always available. Collapse the three-backend adapter to node:sqlite only and remove the machinery the other two needed: - Remove better-sqlite3 (optionalDependency) and node-sqlite3-wasm (dependency). - Remove WasmDatabaseAdapter, the named->positional param translation, the SQLITE_BUSY read-retry, the wasm fallback banner, the backend env override, and the native/node-sqlite/wasm selection chain. - createDatabase now opens node:sqlite directly, with a clear error pointing at the bundled release / Node 22.5+ when the module is absent. - NodeSqliteAdapter.close() is idempotent and pragma() supports { simple }, to match the better-sqlite3 behavior callers relied on. - status (CLI + MCP) reports the single node:sqlite backend; journal-mode diagnostics and the getCodeGraph single-connection fix are retained. - Tests repointed off better-sqlite3 onto node:sqlite. Net -1044 lines. Running from source now requires Node 22.5+. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(dist): self-contained bundle prototype (vendored Node + install channels) Phase 3 of the node:sqlite migration: ship a vendored Node runtime so CodeGraph runs with no system Node and no native build (node:sqlite is built in). - scripts/build-bundle.sh: build a per-platform archive (official Node + dist + prod deps + launcher). Same recipe per platform; pins Node v24.16.0. - install.sh: curl|sh installer (no Node required) — detects os/arch, pulls the archive from Releases, symlinks onto PATH; re-run to upgrade, --uninstall to remove. The VPS/SSH path. - scripts/npm-shim.js: thin launcher for the npm channel — resolves the per-platform optionalDependency bundle and execs it, so `npm i -g` keeps working and the real work runs on the bundled Node regardless of the user's. - BUNDLING.md: distribution design + release-pipeline TODO (CI matrix, platform packages, code signing, brew, retiring the Node-version gate). Validated end-to-end: darwin-arm64 and linux-x64 bundles both run init + index + status (Backend: node:sqlite, Journal: wal) + FTS query with NO system Node — linux-x64 verified in a clean ubuntu:24.04 amd64 container. Release archives are gitignored; CI will produce and upload them. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(dist): add Windows PowerShell installer (install.ps1) The `irm … | iex` one-liner for Windows, mirroring install.sh: detect arch, pull the matching bundle from Releases, extract to %LOCALAPPDATA%\codegraph, add it to user PATH. Re-run to upgrade. (Windows bundle production in build-bundle.sh is still TODO.) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(dist): release workflow + npm packaging; README/CHANGELOG for bundled distro - .github/workflows/release.yml: manually-triggered (workflow_dispatch) release matrix. Builds a self-contained bundle per platform on its own runner (darwin-arm64/x64, linux-x64/arm64), publishes a GitHub Release with all archives, and publishes the npm thin-installer (shim + per-platform packages). Windows targets are TODO (build-bundle.sh is unix-only). - scripts/pack-npm.sh: assemble the npm packages from built bundles — per-platform packages tagged os/cpu + the main shim package with them as optionalDependencies (esbuild pattern). Proven locally: npm-install the tarballs, run via the shim, resolves the bundle and runs on the bundled Node 24 (node:sqlite / WAL). - README: install section now leads with the no-Node one-liners (curl|sh, irm|iex) then npm/npx; "bundled · none required" badge. - CHANGELOG: standout headline for the self-contained release, plus Added/Changed/ Removed for the install channels, node:sqlite backend, and dropped deps. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(dist): Windows bundles + single-trigger release workflow - build-bundle.sh: add win32-x64 / win32-arm64 targets — download Node's Windows zip, bundle node.exe + a .cmd launcher, output a .zip. Verified structurally (PE32+ node.exe, CRLF .cmd, portable node_modules). Since there are no native addons, any target builds on any OS, so the whole matrix builds on one runner. - pack-npm.sh: handle .zip bundles and win32 packages (os: win32, node.exe). - release.yml: simplified to your spec — manual trigger reads the version from package.json, builds all platform bundles, creates the GitHub Release with notes pulled from CHANGELOG.md, and publishes the npm shim + platform packages. - BUNDLING.md: Windows + build-anywhere notes; release pipeline documented. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
195 lines
6.9 KiB
TypeScript
195 lines
6.9 KiB
TypeScript
/**
|
|
* Module-qualified symbol lookup (`stage_apply::run`, `Session.request`,
|
|
* `configurator/stage_apply`).
|
|
*
|
|
* Pinned because the lookup vocabulary is what makes codegraph useful
|
|
* in workspaces with same-named symbols across modules — Rust
|
|
* sub-pipelines, Python `__init__.py` packages, Java packages, etc.
|
|
* See #173 for the original report: a `run` function in
|
|
* `src/configurator/stage_apply.rs` was indexed but `stage_apply::run`
|
|
* returned "not found" because (a) FTS strips colons to nothing,
|
|
* leaving a useless query, and (b) `matchesSymbol` only understood
|
|
* `.`-style qualifiers.
|
|
*/
|
|
|
|
import { describe, it, expect, beforeAll, beforeEach, afterEach } from 'vitest';
|
|
import * as fs from 'fs';
|
|
import * as path from 'path';
|
|
import * as os from 'os';
|
|
import { initGrammars, loadAllGrammars } from '../src/extraction/grammars';
|
|
|
|
beforeAll(async () => {
|
|
await initGrammars();
|
|
await loadAllGrammars();
|
|
});
|
|
|
|
function hasSqliteBindings(): boolean {
|
|
try {
|
|
const { DatabaseSync } = require('node:sqlite');
|
|
const db = new DatabaseSync(':memory:');
|
|
db.close();
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
const HAS_SQLITE = hasSqliteBindings();
|
|
|
|
function tmpRoot(): string {
|
|
return fs.mkdtempSync(path.join(os.tmpdir(), 'codegraph-symbol-lookup-'));
|
|
}
|
|
|
|
function rmTree(dir: string): void {
|
|
if (fs.existsSync(dir)) fs.rmSync(dir, { recursive: true, force: true });
|
|
}
|
|
|
|
async function buildRustWorkspace(): Promise<string> {
|
|
const root = tmpRoot();
|
|
const cfgDir = path.join(root, 'src', 'configurator');
|
|
fs.mkdirSync(cfgDir, { recursive: true });
|
|
fs.writeFileSync(
|
|
path.join(root, 'Cargo.toml'),
|
|
`[package]\nname = "fixture"\nversion = "0.1.0"\nedition = "2021"\n[lib]\npath = "src/lib.rs"\n`
|
|
);
|
|
fs.writeFileSync(path.join(root, 'src', 'lib.rs'), `pub mod configurator;\npub mod scheduler;\n`);
|
|
fs.writeFileSync(
|
|
path.join(cfgDir, 'mod.rs'),
|
|
`pub mod stage_apply;\npub mod stage_detect;\n`
|
|
);
|
|
fs.writeFileSync(
|
|
path.join(cfgDir, 'stage_apply.rs'),
|
|
`pub async fn run() -> Result<(), ()> {\n render_and_write();\n Ok(())\n}\n\nfn render_and_write() {}\n`
|
|
);
|
|
fs.writeFileSync(
|
|
path.join(cfgDir, 'stage_detect.rs'),
|
|
`pub async fn run() -> Result<(), ()> { Ok(()) }\n`
|
|
);
|
|
fs.writeFileSync(
|
|
path.join(root, 'src', 'scheduler.rs'),
|
|
`pub fn run_due_tasks() -> Result<(), ()> { Ok(()) }\n`
|
|
);
|
|
return root;
|
|
}
|
|
|
|
describe.skipIf(!HAS_SQLITE)('matchesSymbol — module-qualified lookups (#173)', () => {
|
|
let projectRoot: string;
|
|
let cg: any;
|
|
let handler: any;
|
|
let findSymbol: (cg: any, s: string) => { node: any; note: string } | null;
|
|
let findAllSymbols: (cg: any, s: string) => { nodes: any[]; note: string };
|
|
|
|
beforeEach(async () => {
|
|
projectRoot = await buildRustWorkspace();
|
|
const CodeGraph = (await import('../src/index')).default;
|
|
const { ToolHandler } = await import('../src/mcp/tools');
|
|
cg = CodeGraph.initSync(projectRoot, {
|
|
config: { include: ['**/*.rs'], exclude: [] },
|
|
});
|
|
await cg.indexAll();
|
|
handler = new ToolHandler(cg);
|
|
findSymbol = (handler as any).findSymbol.bind(handler);
|
|
findAllSymbols = (handler as any).findAllSymbols.bind(handler);
|
|
});
|
|
|
|
afterEach(() => {
|
|
handler?.closeAll();
|
|
cg?.destroy();
|
|
rmTree(projectRoot);
|
|
});
|
|
|
|
it('resolves `stage_apply::run` to the run in stage_apply.rs (not stage_detect.rs)', () => {
|
|
const match = findSymbol(cg, 'stage_apply::run');
|
|
expect(match).not.toBeNull();
|
|
expect(match!.node.name).toBe('run');
|
|
expect(match!.node.filePath).toMatch(/configurator\/stage_apply\.rs$/);
|
|
});
|
|
|
|
it('rejects `stage_apply::run` for the same-named function in a different module', () => {
|
|
const all = findAllSymbols(cg, 'stage_apply::run');
|
|
// All returned nodes must be in stage_apply.rs — never in stage_detect.rs
|
|
for (const node of all.nodes) {
|
|
expect(node.filePath).toMatch(/stage_apply\.rs$/);
|
|
}
|
|
expect(all.nodes.length).toBeGreaterThan(0);
|
|
});
|
|
|
|
it('resolves `configurator::stage_apply::run` (multi-level qualifier)', () => {
|
|
const match = findSymbol(cg, 'configurator::stage_apply::run');
|
|
expect(match).not.toBeNull();
|
|
expect(match!.node.name).toBe('run');
|
|
expect(match!.node.filePath).toMatch(/configurator\/stage_apply\.rs$/);
|
|
});
|
|
|
|
it('resolves `crate::configurator::stage_apply::run` (Rust path prefix stripped)', () => {
|
|
const match = findSymbol(cg, 'crate::configurator::stage_apply::run');
|
|
expect(match).not.toBeNull();
|
|
expect(match!.node.filePath).toMatch(/configurator\/stage_apply\.rs$/);
|
|
});
|
|
|
|
it('resolves `configurator/stage_apply` (slash qualifier)', () => {
|
|
const match = findSymbol(cg, 'configurator/stage_apply/run');
|
|
expect(match).not.toBeNull();
|
|
expect(match!.node.filePath).toMatch(/configurator\/stage_apply\.rs$/);
|
|
});
|
|
|
|
it('does not silently collide bare `run` with `run_due_tasks`', () => {
|
|
const match = findSymbol(cg, 'run');
|
|
expect(match).not.toBeNull();
|
|
// Whatever it picks, it must be an exact-name match, not a partial.
|
|
expect(match!.node.name).toBe('run');
|
|
});
|
|
|
|
it('aggregates all bare-name `run` matches across modules', () => {
|
|
const all = findAllSymbols(cg, 'run');
|
|
const names = all.nodes.map((n: any) => n.name);
|
|
expect(names.every((n: string) => n === 'run')).toBe(true);
|
|
expect(all.nodes.length).toBeGreaterThanOrEqual(2); // stage_apply + stage_detect
|
|
// The note should call out the ambiguity.
|
|
expect(all.note).toMatch(/Aggregated|symbols named "run"/);
|
|
});
|
|
|
|
it('still returns null for genuinely unknown qualified lookups', () => {
|
|
const match = findSymbol(cg, 'stage_apply::nonexistent_fn');
|
|
expect(match).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe.skipIf(!HAS_SQLITE)('matchesSymbol — dotted lookups (regression for #173 fix)', () => {
|
|
let projectRoot: string;
|
|
let cg: any;
|
|
let handler: any;
|
|
let findSymbol: (cg: any, s: string) => { node: any; note: string } | null;
|
|
|
|
beforeEach(async () => {
|
|
projectRoot = tmpRoot();
|
|
const src = path.join(projectRoot, 'src');
|
|
fs.mkdirSync(src, { recursive: true });
|
|
fs.writeFileSync(
|
|
path.join(src, 'session.ts'),
|
|
`export class Session {\n request(): void {}\n}\nexport function request(): void {}\n`
|
|
);
|
|
|
|
const CodeGraph = (await import('../src/index')).default;
|
|
const { ToolHandler } = await import('../src/mcp/tools');
|
|
cg = CodeGraph.initSync(projectRoot, {
|
|
config: { include: ['src/**/*.ts'], exclude: [] },
|
|
});
|
|
await cg.indexAll();
|
|
handler = new ToolHandler(cg);
|
|
findSymbol = (handler as any).findSymbol.bind(handler);
|
|
});
|
|
|
|
afterEach(() => {
|
|
handler?.closeAll();
|
|
cg?.destroy();
|
|
rmTree(projectRoot);
|
|
});
|
|
|
|
it('`Session.request` resolves to the method, not the bare function', () => {
|
|
const match = findSymbol(cg, 'Session.request');
|
|
expect(match).not.toBeNull();
|
|
expect(match!.node.kind).toBe('method');
|
|
expect(match!.node.qualifiedName).toContain('Session::request');
|
|
});
|
|
});
|