mirror of
https://github.com/Kaelio/ktx.git
synced 2026-07-13 11:22:11 +02:00
fix(cli): guide setup away from foreign repos at the project dir
ktx owns the git repo rooted at the project dir and refuses to adopt one it did not create (the Finding 3 isolation invariant). But setup steered users straight into that failure: the interactive menu offers "Current directory" first, and `--no-input --yes --project-dir <repo-root>` created directly in place — both then threw a generic "Failed to initialize git repository:" wrapper from deep in GitService.initialize(). Extract the ownership rule into a shared `classifyKtxRepoOwnership(dir)` used by both GitService.initialize() (the invariant) and the setup wizard (pre-flight guidance), so the decision derives from one rule. Setup now detects a foreign repo before constructing GitService and: interactively re-prompts (the user picks the existing `ktx-project` subfolder), or non-interactively returns a clean missing-input with the actionable message. The typed foreign-repo error is also surfaced verbatim instead of being buried under the generic wrapper. Empty/non-repo current directories still work — only foreign repos are blocked.
This commit is contained in:
parent
133b879ed3
commit
4578b2d3a9
5 changed files with 183 additions and 32 deletions
|
|
@ -5,7 +5,7 @@ import { join } from 'node:path';
|
|||
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||
|
||||
import type { KtxCoreConfig } from '../../../src/context/core/config.js';
|
||||
import { GitService } from '../../../src/context/core/git.service.js';
|
||||
import { classifyKtxRepoOwnership, GitService } from '../../../src/context/core/git.service.js';
|
||||
|
||||
function coreConfig(configDir: string): KtxCoreConfig {
|
||||
return {
|
||||
|
|
@ -106,3 +106,49 @@ describe('GitService repository ownership', () => {
|
|||
expect(git(projectDir, ['config', '--local', '--get', 'ktx.managed'])).toBe('true');
|
||||
});
|
||||
});
|
||||
|
||||
describe('classifyKtxRepoOwnership', () => {
|
||||
let tempDir: string;
|
||||
|
||||
beforeEach(async () => {
|
||||
tempDir = await mkdtemp(join(tmpdir(), 'git-ownership-'));
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await rm(tempDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it('reports unowned when no .git exists at the directory', async () => {
|
||||
const dir = join(tempDir, 'fresh');
|
||||
await mkdir(dir, { recursive: true });
|
||||
expect(await classifyKtxRepoOwnership(dir)).toBe('unowned');
|
||||
});
|
||||
|
||||
it('reports unowned for a fresh directory nested inside an enclosing repo', async () => {
|
||||
const parentDir = join(tempDir, 'parent');
|
||||
const nestedDir = join(parentDir, 'nested');
|
||||
await mkdir(nestedDir, { recursive: true });
|
||||
git(parentDir, ['init']);
|
||||
expect(await classifyKtxRepoOwnership(nestedDir)).toBe('unowned');
|
||||
});
|
||||
|
||||
it('reports ktx-managed for a repo ktx initialized', async () => {
|
||||
const dir = join(tempDir, 'owned');
|
||||
await new GitService(coreConfig(dir)).onModuleInit();
|
||||
expect(await classifyKtxRepoOwnership(dir)).toBe('ktx-managed');
|
||||
});
|
||||
|
||||
it('reports foreign for a repo ktx did not create', async () => {
|
||||
const dir = join(tempDir, 'foreign');
|
||||
await mkdir(dir, { recursive: true });
|
||||
git(dir, ['init']);
|
||||
expect(await classifyKtxRepoOwnership(dir)).toBe('foreign');
|
||||
});
|
||||
|
||||
it('reports foreign for a .git file (linked worktree)', async () => {
|
||||
const dir = join(tempDir, 'linked');
|
||||
await mkdir(dir, { recursive: true });
|
||||
await writeFile(join(dir, '.git'), 'gitdir: ../actual.git\n', 'utf-8');
|
||||
expect(await classifyKtxRepoOwnership(dir)).toBe('foreign');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue