mirror of
https://github.com/abhigyanpatwari/GitNexus.git
synced 2026-10-09 03:17:54 +00:00
* feat(storage): add configurable index storage and content retention tiers Rebase #3060 onto current origin/main. Keep GITNEXUS_STORAGE_PATH, GITNEXUS_STORAGE_ROOT, and GITNEXUS_CONTENT_RETENTION, and fold in main's FTS skip, embed-session, and help-text updates. Co-authored-by: Cursor <cursoragent@cursor.com> * Address PR review feedback (#3060) Keep legacy registry rows on the local storage fallback, resolve symlinks before the destructive-path guard, and align hook lookup with CLI branch slugs, branch-slot metadata, and longest-path match. Co-authored-by: Cursor <cursoragent@cursor.com> * Address PR review feedback (#3060) Only list swept upload directories after a successful removal so callers cannot treat a permission or transient rm failure as gone. Co-authored-by: Cursor <cursoragent@cursor.com> * Address PR review feedback (#3060) Document that getStoragePath may consult registered storage while this module still does not mutate the global registry. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(storage): close review findings for external indexes and retention Re-inspect ownership under the analyze lock, fail-closed when the registry file is missing, and keep skip-git hook discovery plus retention fields on HTTP/MCP list surfaces. /api/file stays 410 unless contentRetention is full. Co-authored-by: Cursor <cursoragent@cursor.com> * chore(autofix): apply prettier + eslint fixes via /autofix command * Address PR review feedback (#3060) Treat lock-only index dirs as empty, honor HTTP --force storage policy, and prefer registered plus branch-aware slots in hooks and augment. Co-authored-by: Cursor <cursoragent@cursor.com> * Address PR review feedback (#3060) Keep hook fallbacks inside the current worktree, compare foreign-local slots canonically, and make storage fixtures survive ownership validation. Co-authored-by: Cursor <cursoragent@cursor.com> * Fix macOS hook test expecting realpath'd registry paths. resolveHookRepo returns the written registry path, not a filesystem realpath, so the assertion must match that. * Address gitnexus-check warnings on hook install docs and slot tests. The Cursor troubleshooting list omitted registry-query.cjs, and the writable-slot test only checked that isDirectory exists instead of that the path is a directory. * Align the HTTP catalog source-scan with skippable resolveRepo validation. resolveRepo lists fresh repos with validate: options.validateStorage !== false so DELETE can skip prune; the test still required a literal validate: true. * Harden storage path sinks so CodeQL path-injection and ReDoS alerts clear. Contain every filesystem probe inside the resolved storage slot with the inline path.relative idiom, reject filesystem-root slots, and trim slot basenames in linear time. * Settle bridge stamps before writing so CI size/mtime matches stay stable. LadybugDB can still flush into bridge.lbug after close+rename; persist whole-millisecond mtimes and wait for consecutive stats to agree so a freshly written pair matches. * Type the settled bridge stat as fs.Stats so tsc does not see bigint. Awaited<ReturnType<typeof fsp.stat>> collapsed the bigint overload and broke prepare/typecheck on CI. * Keep the bridge mtime stamp exact so same-size swaps still fail the pair check. Co-authored-by: Cursor <cursoragent@cursor.com> * Wrap the bridge stamp predicate so prettier --check stays green. Co-authored-by: Cursor <cursoragent@cursor.com> * Require a quiet interval before stamping a settled bridge file. Co-authored-by: Cursor <cursoragent@cursor.com> * Reuse shared storage and settle helpers instead of local copies. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Gergo Magyar <gergomagyar0@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
89 lines
3.7 KiB
TypeScript
89 lines
3.7 KiB
TypeScript
/**
|
|
* End-of-run adopt is best-effort (#2364 review F5): a completed, registered
|
|
* analyze must not exit non-zero because the post-registration branch-label
|
|
* sync failed (e.g. registry write ENOSPC). Integration-level because the
|
|
* full pipeline opens a real LadybugDB (multi-branch-analyze.test.ts
|
|
* precedent); the delegating vi.mock makes adoptFlatBranchLabel fail on
|
|
* demand (vi.spyOn cannot intercept ESM namespace exports).
|
|
*
|
|
* Once-mock starvation hazard: the delegating mock intercepts every
|
|
* repo-manager call in the process — arm mockRejectedValueOnce only
|
|
* immediately before the call under test.
|
|
*/
|
|
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
import { execSync } from 'child_process';
|
|
import fs from 'fs/promises';
|
|
import path from 'path';
|
|
|
|
type RepoManagerModule = typeof import('../../src/storage/repo-manager.js');
|
|
|
|
const rmCtx = vi.hoisted(() => ({
|
|
adoptMock: vi.fn(),
|
|
realAdopt: null as RepoManagerModule['adoptFlatBranchLabel'] | null,
|
|
}));
|
|
|
|
vi.mock('../../src/storage/repo-manager.js', async (importOriginal) => {
|
|
const actual = await importOriginal<RepoManagerModule>();
|
|
rmCtx.realAdopt = actual.adoptFlatBranchLabel;
|
|
rmCtx.adoptMock.mockImplementation(actual.adoptFlatBranchLabel);
|
|
return {
|
|
...actual,
|
|
adoptFlatBranchLabel: rmCtx.adoptMock,
|
|
};
|
|
});
|
|
|
|
import { listRegisteredRepos } from '../../src/storage/repo-manager.js';
|
|
import { runFullAnalysis } from '../../src/core/run-analyze.js';
|
|
import { createTempDir } from '../helpers/test-db.js';
|
|
|
|
describe('end-of-run adopt is best-effort (#2364 F5)', () => {
|
|
let tmpHome: Awaited<ReturnType<typeof createTempDir>>;
|
|
let savedGitnexusHome: string | undefined;
|
|
|
|
beforeEach(async () => {
|
|
tmpHome = await createTempDir('gitnexus-adopt-besteffort-home-');
|
|
savedGitnexusHome = process.env.GITNEXUS_HOME;
|
|
process.env.GITNEXUS_HOME = tmpHome.dbPath;
|
|
rmCtx.adoptMock.mockReset();
|
|
rmCtx.adoptMock.mockImplementation(
|
|
(...args: Parameters<RepoManagerModule['adoptFlatBranchLabel']>) => rmCtx.realAdopt!(...args),
|
|
);
|
|
});
|
|
|
|
afterEach(async () => {
|
|
if (savedGitnexusHome === undefined) delete process.env.GITNEXUS_HOME;
|
|
else process.env.GITNEXUS_HOME = savedGitnexusHome;
|
|
await tmpHome.cleanup();
|
|
});
|
|
|
|
it('a failed label sync warns and the run still succeeds, already registered', async () => {
|
|
const tmp = await createTempDir('gitnexus-adopt-besteffort-');
|
|
const repo = tmp.dbPath;
|
|
try {
|
|
execSync('git init', { cwd: repo, stdio: 'pipe' });
|
|
await fs.writeFile(path.join(repo, 'a.ts'), 'export const a = 1;\n');
|
|
execSync('git add -A', { cwd: repo, stdio: 'pipe' });
|
|
execSync('git -c user.name=t -c user.email=t@t commit -m a', { cwd: repo, stdio: 'pipe' });
|
|
execSync('git branch -M main', { cwd: repo, stdio: 'pipe' });
|
|
|
|
const logs: string[] = [];
|
|
rmCtx.adoptMock.mockRejectedValueOnce(new Error('mock registry write failure'));
|
|
const result = await runFullAnalysis(
|
|
repo,
|
|
{},
|
|
{ onProgress: () => {}, onLog: (m) => logs.push(m) },
|
|
);
|
|
|
|
// The run resolved (no throw), the adopt was attempted and its failure
|
|
// surfaced as a warning…
|
|
expect(result.alreadyUpToDate).toBeFalsy();
|
|
expect(rmCtx.adoptMock).toHaveBeenCalledWith(repo, 'main', path.join(repo, '.gitnexus'));
|
|
expect(logs.some((m) => m.includes('could not sync the workspace branch label'))).toBe(true);
|
|
// …and registration had already completed before the label sync.
|
|
const entries = await listRegisteredRepos();
|
|
expect(entries.some((e) => path.resolve(e.path) === path.resolve(repo))).toBe(true);
|
|
} finally {
|
|
await tmp.cleanup();
|
|
}
|
|
}, 180_000);
|
|
});
|