mirror of
https://github.com/Kaelio/ktx.git
synced 2026-06-13 08:15:14 +02:00
* 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
120 lines
4 KiB
TypeScript
120 lines
4 KiB
TypeScript
import { mkdir, mkdtemp, readFile, writeFile } from 'node:fs/promises';
|
|
import { tmpdir } from 'node:os';
|
|
import { join } from 'node:path';
|
|
import { describe, expect, it, vi } from 'vitest';
|
|
import { FileIngestTraceWriter } from '../../../../src/context/ingest/ingest-trace.js';
|
|
import { resolveTextualConflict } from '../../../../src/context/ingest/isolated-diff/textual-conflict-resolver.js';
|
|
|
|
async function makeHarness() {
|
|
const root = await mkdtemp(join(tmpdir(), 'ktx-textual-resolver-'));
|
|
const workdir = join(root, 'workdir');
|
|
const patchPath = join(root, 'failed.patch');
|
|
const trace = new FileIngestTraceWriter({
|
|
tracePath: join(root, 'trace.jsonl'),
|
|
jobId: 'job-1',
|
|
connectionId: 'warehouse',
|
|
sourceKey: 'metabase',
|
|
runId: 'run-1',
|
|
syncId: 'sync-1',
|
|
level: 'trace',
|
|
});
|
|
await mkdir(join(workdir, 'wiki/global'), { recursive: true });
|
|
await writeFile(join(workdir, 'wiki/global/account.md'), 'accepted line\n', 'utf-8');
|
|
await writeFile(
|
|
patchPath,
|
|
[
|
|
'diff --git a/wiki/global/account.md b/wiki/global/account.md',
|
|
'index 8877391..6f63f4d 100644',
|
|
'--- a/wiki/global/account.md',
|
|
'+++ b/wiki/global/account.md',
|
|
'@@ -1 +1 @@',
|
|
'-base line',
|
|
'+proposal line',
|
|
'',
|
|
].join('\n'),
|
|
'utf-8',
|
|
);
|
|
return { root, workdir, patchPath, trace };
|
|
}
|
|
|
|
describe('resolveTextualConflict', () => {
|
|
it('lets the repair agent read the failed patch and write only touched paths', async () => {
|
|
const { workdir, patchPath, trace } = await makeHarness();
|
|
const agentRunner = {
|
|
runLoop: vi.fn(async (params: any) => {
|
|
const current = await params.toolSet.read_integration_file.execute({ path: 'wiki/global/account.md' });
|
|
expect(current.structured).toEqual({ path: 'wiki/global/account.md', exists: true });
|
|
expect(current.markdown).toContain('accepted line');
|
|
|
|
const patch = await params.toolSet.read_failed_patch.execute({});
|
|
expect(patch.markdown).toContain('proposal line');
|
|
|
|
await expect(
|
|
params.toolSet.write_integration_file.execute({
|
|
path: 'wiki/global/not-allowed.md',
|
|
content: 'bad\n',
|
|
}),
|
|
).rejects.toThrow(/resolver path not allowed/);
|
|
|
|
await params.toolSet.write_integration_file.execute({
|
|
path: 'wiki/global/account.md',
|
|
content: 'accepted line\nproposal line\n',
|
|
});
|
|
return { stopReason: 'natural' as const };
|
|
}),
|
|
};
|
|
|
|
const result = await resolveTextualConflict({
|
|
agentRunner,
|
|
workdir,
|
|
unitKey: 'wu-a',
|
|
patchPath,
|
|
touchedPaths: ['wiki/global/account.md'],
|
|
trace,
|
|
reason: 'patch failed: wiki/global/account.md',
|
|
maxAttempts: 1,
|
|
stepBudget: 8,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
status: 'repaired',
|
|
attempts: 1,
|
|
changedPaths: ['wiki/global/account.md'],
|
|
});
|
|
await expect(readFile(join(workdir, 'wiki/global/account.md'), 'utf-8')).resolves.toBe(
|
|
'accepted line\nproposal line\n',
|
|
);
|
|
expect(agentRunner.runLoop).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
modelRole: 'repair',
|
|
stepBudget: 8,
|
|
telemetryTags: expect.objectContaining({
|
|
operationName: 'ingest-isolated-diff-textual-resolver',
|
|
jobId: 'job-1',
|
|
unitKey: 'wu-a',
|
|
}),
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('fails when the repair agent completes without editing any touched path', async () => {
|
|
const { workdir, patchPath, trace } = await makeHarness();
|
|
const result = await resolveTextualConflict({
|
|
agentRunner: { runLoop: vi.fn(async () => ({ stopReason: 'natural' as const })) },
|
|
workdir,
|
|
unitKey: 'wu-a',
|
|
patchPath,
|
|
touchedPaths: ['wiki/global/account.md'],
|
|
trace,
|
|
reason: 'patch failed: wiki/global/account.md',
|
|
maxAttempts: 1,
|
|
stepBudget: 8,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
status: 'failed',
|
|
attempts: 1,
|
|
reason: 'resolver completed without editing an allowed path',
|
|
});
|
|
});
|
|
});
|