fix(cli): own a dedicated git repo at the project dir when nested in an enclosing repo (#282)
GitService.initialize() used checkIsRepo(), which is true whenever the project
dir sits anywhere inside a git working tree. So when a ktx project lived in a
subdirectory of an enclosing repo, ktx skipped `git init` and silently adopted
the enclosing repo as its store.
Every ktx relative path assumes the project dir IS the working-tree root. During
ingest, wiki/SL pages are written through a session worktree (whose root is the
worktree dir, so the page is recorded at repo-relative `wiki/global/<key>.md`)
and then squash-merged into the main worktree. With an adopted enclosing repo,
the main worktree's root is the enclosing git root, so the merge wrote the page
to `<gitRoot>/wiki/global/` — outside the project dir. reindex scans
`<projectDir>/wiki/global/`, found nothing, and wiki_search silently returned
empty (knowledge_pages = 0) even though ingest reported success.
Detect the project dir's own root with checkIsRepo(IS_REPO_ROOT) and initialize
a dedicated repo there unless the project dir is already a repo root. This keeps
adopting a user-created repo when the project dir IS that repo's root, fixes the
silent wiki/SL/memory divergence at its source for every writer, and stops ktx
from committing its scaffold into the user's enclosing repo.
Regression tests cover both layers: a project nested in an enclosing repo gets
its own .git (and the enclosing repo stays untouched), and a wiki page written
through a session worktree + squash-merge lands in the project dir and is
discovered by reindex.
2026-06-09 23:37:24 +02:00
|
|
|
import { execFileSync } from 'node:child_process';
|
2026-06-11 22:10:47 +02:00
|
|
|
import { mkdir, mkdtemp, readFile, realpath, rm, stat, writeFile } from 'node:fs/promises';
|
2026-05-10 23:12:26 +02:00
|
|
|
import { tmpdir } from 'node:os';
|
|
|
|
|
import { join } from 'node:path';
|
|
|
|
|
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
test: split cli tests from source tree (#216)
* feat(cli): define full warehouse dialect contract
* test(cli): keep dialect edge tests focused
* fix(cli): stabilize dialect contract foundation
* refactor(connectors): own read-only query preparation
* refactor(connectors): resolve dialects through registry
* refactor(connectors): keep concrete dialect classes internal
* chore(workspace): enforce dialect import boundary
* refactor(cli): resolve relationship dialect at scan boundary
* refactor(cli): use dialect display parsing for entity details
* refactor(cli): use dialect display parsing for warehouse catalog
* refactor(cli): use dialect SQL in relationship workflows
* test(cli): verify solid dialect scan workflow closure
* test: split cli tests from source tree
* refactor(cli): standardize BigQuery scope listing
* feat(sqlite): implement connector scope listing
* test(connectors): cover required table listing
* feat(cli): add warehouse driver registry
* refactor(setup): route scope discovery through driver registry
* refactor(cli): route local query execution through driver registry
* refactor(historic-sql): route dialect support through driver registry
* refactor(cli): test warehouse connections through driver registry
* fix(cli): close driver registry type export gaps
* Improve setup daemon diagnostics
* refactor(setup): centralize rail-prefixed diagnostics + query-history fallback
Extract errorMessage, writePrefixedLines, and flushPrefixedBufferedCommandOutput
into clack.ts so the setup wizard, managed daemons, and embedding/agent steps
share one rail-formatted writer. setup-databases.ts also adds a
"disable query history and retry" option when the schema-context build fails
and query history is the likely culprit, surfaced via a new
failed-query-history-unavailable status.
* fix(cli): carry catalog through the picker so BigQuery/Snowflake/SQL Server scope filters match
The setup picker's KtxTableListEntry was a 2-level { schema, name }, so
qualifiedTableId always wrote db.name into enabled_tables. When BigQuery,
Snowflake, or SQL Server later ran fast ingest, their introspect step filtered
the scope set with scopedTableNames(scope, { catalog: projectId|database, db })
— catalog was non-null on the introspect side but null in the scope refs, so
every entry was rejected, the live-database adapter staged zero table files,
and detect() failed with 'Adapter "live-database" did not recognize fetched
source output'.
Align the picker boundary with the canonical 3-level KtxTableRef:
- Add catalog: string | null to KtxTableListEntry.
- BigQuery/Snowflake/SQL Server listTables populate catalog from the
resolved projectId / database; Postgres/MySQL/ClickHouse/SQLite set null.
- qualifiedTableId emits catalog.schema.name when catalog is non-null
(resolveEnabledTables already accepts the 3-part shape) and
schemasFromEnabledTables now goes through parseDottedTableEntry so it
recovers the schema correctly from both 2-part and 3-part entries.
- Export parseDottedTableEntry from enabled-tables.ts (@internal) for picker
reuse.
Update listTables expectations in all seven connector tests and the setup /
picker test fixtures. Add a picker regression test that covers the
catalog-bearing round-trip (save + refine).
* fix(cli): allow debug telemetry under opt-out env
2026-05-26 08:49:05 +02:00
|
|
|
import { initKtxProject, loadKtxProject } from '../../../src/context/project/project.js';
|
2026-05-10 23:12:26 +02:00
|
|
|
|
2026-06-11 13:49:45 +02:00
|
|
|
describe('ktx local project runtime', () => {
|
2026-05-10 23:12:26 +02:00
|
|
|
let tempDir: string;
|
|
|
|
|
|
|
|
|
|
beforeEach(async () => {
|
2026-05-10 23:51:24 +02:00
|
|
|
tempDir = await mkdtemp(join(tmpdir(), 'ktx-project-runtime-'));
|
2026-05-10 23:12:26 +02:00
|
|
|
});
|
|
|
|
|
|
|
|
|
|
afterEach(async () => {
|
|
|
|
|
await rm(tempDir, { recursive: true, force: true });
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('initializes the standalone project layout and commits it', async () => {
|
|
|
|
|
const projectDir = join(tempDir, 'warehouse');
|
|
|
|
|
|
2026-05-10 23:51:24 +02:00
|
|
|
const result = await initKtxProject({
|
2026-05-10 23:12:26 +02:00
|
|
|
projectDir,
|
|
|
|
|
authorName: 'Agent',
|
|
|
|
|
authorEmail: 'agent@example.com',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result.projectDir).toBe(projectDir);
|
|
|
|
|
expect(result.commitHash).toMatch(/^[0-9a-f]{40}$/);
|
2026-05-14 17:39:31 +02:00
|
|
|
await expect(readFile(join(projectDir, 'ktx.yaml'), 'utf-8')).resolves.not.toContain('project:');
|
2026-05-10 23:51:24 +02:00
|
|
|
const gitignore = await readFile(join(projectDir, '.ktx/.gitignore'), 'utf-8');
|
2026-05-10 23:12:26 +02:00
|
|
|
expect(gitignore).toContain('cache/');
|
|
|
|
|
expect(gitignore).toContain('db.sqlite');
|
2026-05-11 00:31:15 -07:00
|
|
|
expect(gitignore).toContain('db.sqlite-*');
|
|
|
|
|
expect(gitignore).toContain('ingest-transcripts/');
|
2026-05-10 23:12:26 +02:00
|
|
|
expect(gitignore).toContain('secrets/');
|
|
|
|
|
expect(gitignore).toContain('setup/');
|
|
|
|
|
expect(gitignore).toContain('agents/');
|
2026-05-13 16:05:58 +02:00
|
|
|
await expect(stat(join(projectDir, 'wiki/global/.gitkeep'))).resolves.toBeDefined();
|
2026-05-10 23:12:26 +02:00
|
|
|
await expect(stat(join(projectDir, 'semantic-layer/.gitkeep'))).resolves.toBeDefined();
|
|
|
|
|
await expect(stat(join(projectDir, '_schema/.gitkeep'))).rejects.toMatchObject({ code: 'ENOENT' });
|
|
|
|
|
await expect(stat(join(projectDir, 'raw-sources/.gitkeep'))).resolves.toBeDefined();
|
|
|
|
|
await expect(stat(join(projectDir, '.git'))).resolves.toBeDefined();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('loads an initialized project with a working file store', async () => {
|
|
|
|
|
const projectDir = join(tempDir, 'warehouse');
|
2026-05-14 17:39:31 +02:00
|
|
|
await initKtxProject({ projectDir });
|
2026-05-10 23:12:26 +02:00
|
|
|
|
2026-05-10 23:51:24 +02:00
|
|
|
const loaded = await loadKtxProject({ projectDir });
|
2026-05-10 23:12:26 +02:00
|
|
|
await loaded.fileStore.writeFile(
|
2026-05-13 16:05:58 +02:00
|
|
|
'wiki/global/revenue.md',
|
2026-05-10 23:12:26 +02:00
|
|
|
'# Revenue\n',
|
|
|
|
|
'Agent',
|
|
|
|
|
'agent@example.com',
|
|
|
|
|
'Add revenue page',
|
|
|
|
|
);
|
|
|
|
|
|
2026-05-13 16:05:58 +02:00
|
|
|
await expect(loaded.fileStore.readFile('wiki/global/revenue.md')).resolves.toMatchObject({
|
2026-05-10 23:12:26 +02:00
|
|
|
content: '# Revenue\n',
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
2026-06-11 22:10:47 +02:00
|
|
|
it('loads a ktx.yaml carrying fields removed in a newer ktx without mutating it on disk', async () => {
|
|
|
|
|
const projectDir = join(tempDir, 'warehouse');
|
|
|
|
|
await initKtxProject({ projectDir });
|
|
|
|
|
|
|
|
|
|
// Simulate a project written by a different ktx: inject unknown fields into
|
|
|
|
|
// the existing storage.git block and as a top-level memory block.
|
|
|
|
|
const configPath = join(projectDir, 'ktx.yaml');
|
|
|
|
|
const original = await readFile(configPath, 'utf-8');
|
|
|
|
|
const withStaleKeys = `${original.replace(
|
|
|
|
|
'author: ktx <ktx@example.com>',
|
|
|
|
|
'auto_commit: true\n author: ktx <ktx@example.com>',
|
|
|
|
|
)}memory:\n auto_commit: true\n`;
|
|
|
|
|
await writeFile(configPath, withStaleKeys, 'utf-8');
|
|
|
|
|
|
|
|
|
|
const loaded = await loadKtxProject({ projectDir });
|
|
|
|
|
|
|
|
|
|
// Loading tolerates the unknown fields instead of throwing: they are stripped
|
|
|
|
|
// from the in-memory config so every command still runs.
|
|
|
|
|
expect(loaded.config).not.toHaveProperty('memory');
|
|
|
|
|
expect(loaded.config.storage.git).toEqual({ author: 'ktx <ktx@example.com>' });
|
|
|
|
|
|
|
|
|
|
// The file on disk stays exactly as the user wrote it.
|
|
|
|
|
await expect(readFile(configPath, 'utf-8')).resolves.toBe(withStaleKeys);
|
|
|
|
|
});
|
|
|
|
|
|
fix(cli): own a dedicated git repo at the project dir when nested in an enclosing repo (#282)
GitService.initialize() used checkIsRepo(), which is true whenever the project
dir sits anywhere inside a git working tree. So when a ktx project lived in a
subdirectory of an enclosing repo, ktx skipped `git init` and silently adopted
the enclosing repo as its store.
Every ktx relative path assumes the project dir IS the working-tree root. During
ingest, wiki/SL pages are written through a session worktree (whose root is the
worktree dir, so the page is recorded at repo-relative `wiki/global/<key>.md`)
and then squash-merged into the main worktree. With an adopted enclosing repo,
the main worktree's root is the enclosing git root, so the merge wrote the page
to `<gitRoot>/wiki/global/` — outside the project dir. reindex scans
`<projectDir>/wiki/global/`, found nothing, and wiki_search silently returned
empty (knowledge_pages = 0) even though ingest reported success.
Detect the project dir's own root with checkIsRepo(IS_REPO_ROOT) and initialize
a dedicated repo there unless the project dir is already a repo root. This keeps
adopting a user-created repo when the project dir IS that repo's root, fixes the
silent wiki/SL/memory divergence at its source for every writer, and stops ktx
from committing its scaffold into the user's enclosing repo.
Regression tests cover both layers: a project nested in an enclosing repo gets
its own .git (and the enclosing repo stays untouched), and a wiki page written
through a session worktree + squash-merge lands in the project dir and is
discovered by reindex.
2026-06-09 23:37:24 +02:00
|
|
|
it('initializes a dedicated git repo at the project dir even when nested inside an enclosing repo', async () => {
|
|
|
|
|
// A ktx project dir living below an existing git working tree (e.g. an analytics
|
|
|
|
|
// subfolder of an app repo). ktx must own its own repo rooted at the project dir,
|
|
|
|
|
// not silently adopt the enclosing repo — otherwise worktree writes resolve against
|
|
|
|
|
// the enclosing root and land outside the project dir.
|
|
|
|
|
const enclosing = join(tempDir, 'enclosing');
|
|
|
|
|
await mkdir(enclosing, { recursive: true });
|
|
|
|
|
execFileSync('git', ['init', '-q'], { cwd: enclosing });
|
|
|
|
|
|
|
|
|
|
const projectDir = join(enclosing, 'analytics');
|
|
|
|
|
await initKtxProject({ projectDir, authorName: 'Agent', authorEmail: 'agent@example.com' });
|
|
|
|
|
|
|
|
|
|
await expect(stat(join(projectDir, '.git'))).resolves.toBeDefined();
|
|
|
|
|
const toplevel = execFileSync('git', ['rev-parse', '--show-toplevel'], {
|
|
|
|
|
cwd: projectDir,
|
|
|
|
|
encoding: 'utf-8',
|
|
|
|
|
}).trim();
|
|
|
|
|
expect(await realpath(toplevel)).toBe(await realpath(projectDir));
|
|
|
|
|
|
|
|
|
|
// ktx must not write its scaffold commits into the user's enclosing repo.
|
|
|
|
|
const enclosingTracked = execFileSync('git', ['ls-files'], { cwd: enclosing, encoding: 'utf-8' });
|
|
|
|
|
expect(enclosingTracked).not.toContain('ktx.yaml');
|
|
|
|
|
});
|
|
|
|
|
|
2026-05-10 23:12:26 +02:00
|
|
|
it('rejects reinitializing an existing project unless force is set', async () => {
|
|
|
|
|
const projectDir = join(tempDir, 'warehouse');
|
2026-05-14 17:39:31 +02:00
|
|
|
await initKtxProject({ projectDir });
|
2026-05-10 23:12:26 +02:00
|
|
|
|
2026-05-14 17:39:31 +02:00
|
|
|
await expect(initKtxProject({ projectDir })).rejects.toThrow('Project already contains ktx.yaml');
|
2026-05-10 23:12:26 +02:00
|
|
|
|
2026-05-14 17:39:31 +02:00
|
|
|
await expect(initKtxProject({ projectDir, force: true })).resolves.toMatchObject({
|
|
|
|
|
configPath: join(projectDir, 'ktx.yaml'),
|
2026-05-10 23:12:26 +02:00
|
|
|
});
|
|
|
|
|
});
|
2026-06-11 22:10:47 +02:00
|
|
|
|
|
|
|
|
it('refuses to initialize inside a foreign git repo and writes nothing into it', async () => {
|
|
|
|
|
// A user's own repo: has history, no root ktx.yaml. The guard must reject
|
|
|
|
|
// before writing ktx.yaml — that file would make the repo classify as ktx's.
|
|
|
|
|
const projectDir = join(tempDir, 'app-repo');
|
|
|
|
|
await mkdir(projectDir, { recursive: true });
|
|
|
|
|
execFileSync('git', ['init', '-q'], { cwd: projectDir });
|
|
|
|
|
await writeFile(join(projectDir, 'README.md'), '# App\n', 'utf-8');
|
|
|
|
|
execFileSync('git', ['add', 'README.md'], { cwd: projectDir });
|
|
|
|
|
execFileSync(
|
|
|
|
|
'git',
|
|
|
|
|
['-c', 'user.name=App', '-c', 'user.email=app@example.com', 'commit', '-q', '-m', 'baseline'],
|
|
|
|
|
{ cwd: projectDir },
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
await expect(initKtxProject({ projectDir })).rejects.toThrow(
|
|
|
|
|
/already a git repository that ktx did not create/,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
await expect(stat(join(projectDir, 'ktx.yaml'))).rejects.toMatchObject({ code: 'ENOENT' });
|
|
|
|
|
const tracked = execFileSync('git', ['ls-files'], { cwd: projectDir, encoding: 'utf-8' });
|
|
|
|
|
expect(tracked).not.toContain('ktx.yaml');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('recovers an init interrupted after ktx.yaml was written but before git finished', async () => {
|
|
|
|
|
// ktx.yaml is written before git init, so the only crash residue is a valid
|
|
|
|
|
// ktx.yaml with no `.git` — the next load must re-init, not reject as foreign.
|
|
|
|
|
const projectDir = join(tempDir, 'half-init');
|
|
|
|
|
await initKtxProject({ projectDir });
|
|
|
|
|
await rm(join(projectDir, '.git'), { recursive: true, force: true });
|
|
|
|
|
|
|
|
|
|
const loaded = await loadKtxProject({ projectDir });
|
|
|
|
|
|
|
|
|
|
await expect(stat(join(projectDir, '.git'))).resolves.toBeDefined();
|
|
|
|
|
expect(await loaded.git.revParseHead()).toMatch(/^[0-9a-f]{40}$/);
|
|
|
|
|
});
|
2026-05-10 23:12:26 +02:00
|
|
|
});
|