2026-05-18 13:38:06 +02:00
|
|
|
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';
|
chore(workspace): gate dead-code with knip production mode (#196)
* refactor(workspace): relocate @ktx/llm source into packages/cli/src/llm
* refactor(workspace): rewrite @ktx/llm imports to relative paths
* refactor(workspace): fold internal packages into cli
* chore(workspace): gate dead-code with knip production mode
Turn on production-mode knip plus an autofix run in pre-commit and the
`pnpm dead-code` script, document the `/** @internal */` convention for
test-only exports in AGENTS.md, annotate test-only exports across the
CLI with that JSDoc, and drop dead exports/wrappers the new gate
surfaced (e.g. `cli-project.ts`, `lookerRuntimeSourceToFileAdapterSource`,
`createLocalScanEnrichmentProvidersFromConfig`,
`PGLITE_OWNER_PROCESS_BACKEND_CAPABILITIES`, stale type re-exports).
Replace the loose `ignoreIssues` allowlist in `knip.json` with explicit
production entries so cross-package barrel leaks are caught.
* refactor(cli): delete internal barrel index.ts files
The 34 `index.ts` re-export barrels inside `packages/cli/src/` were
holdovers from the pre-fold multi-workspace structure. Post-fold-in they
served no production purpose: external consumers go through the single
package main entry, and in-repo callers mostly imported through them
only because the path was short. Internally, knip flagged most barrel
re-exports as production-dead (only reached via tests).
This change:
- Deletes every internal barrel except `packages/cli/src/index.ts`
(the published package entry).
- Rewrites ~270 source/test files to import each name directly from
the file that defines it.
- Moves `tools/warehouse-verification/index.ts` to
`create-warehouse-verification-tools.ts` (the function it defined
locally) and updates its single consumer.
- Renames `search/backend-conformance.ts` → `.test-utils.ts` to match
the existing test-helper file convention.
- Deletes 13 dead test-only chains (dbt-descriptions/*,
live-database/extracted-schema, live-database/structural-sync,
relationship-* feedback/review chain) plus their tests and a
cascading orphan integration test.
- Updates test mocks that pointed at deleted barrel paths
(notion-client, connector barrels in scan/local-scan-connectors
tests) to mock the source files instead.
- Points the maintainer benchmark script
(`scripts/relationship-benchmark-report.mjs`) at source files
instead of `dist/context/scan/index.js`.
- Drops the barrel `!` entries from `knip.json`; adds explicit
production entries only for the benchmark code reached via dist by
the maintainer script.
Net: 413 files changed, ~1.2k insertions, ~9.4k deletions.
`pnpm run dead-code` (Biome + knip default + knip production) and
`pnpm run type-check` are clean; 2277 tests pass.
* refactor(workspace): rename @ktx/cli to @kaelio/ktx and pack it directly
Promote the CLI workspace package to the public name `@kaelio/ktx` and
drop the separate `scripts/build-public-npm-package.mjs` wrapper. The
CLI package is now publishable in place (`publishConfig.access: public`,
`provenance: true`), so artifact packing uses `pnpm pack` against
`packages/cli/` instead of assembling a parallel package tree.
Updates all workspace filter invocations, docs, tests, and release
readiness checks to reference the new package name, and folds the
tarball-name helper into `scripts/public-npm-release-metadata.mjs`.
* docs: align "agent clients" and "data agents" terminology
Replace "client agents" with "agent clients" and "database agents" with
"data agents" across AGENTS.md, README.md, the docs-site copy, and the
matching setup-agents test description, matching the canonical
vocabulary in docs/terminology.md.
Also moves packages/cli/tsconfig.json's tsBuildInfoFile from
node_modules/.cache/ to dist/.tsbuildinfo so incremental builds survive
node_modules reinstalls.
* refactor(release): single source of truth for package version
Make packages/cli/package.json the single source of truth for the
@kaelio/ktx version. publicNpmPackageVersion() now reads it directly,
so artifact filenames, release-readiness checks, and the Python wheel
version all derive from one field. The duplicate
release-policy.json.publicNpmPackageVersion is removed.
Previously the two fields could drift: tarballs were named
kaelio-ktx-0.4.1.tgz while internally containing
@kaelio/ktx@0.0.0-private.
- update-public-release-version.mjs rewrites both Python pyproject.toml
files (ktx-daemon, ktx-sl) alongside the npm package.jsons,
normalizing the version for PEP 440 (e.g. 0.1.0-rc.2 -> 0.1.0rc2).
- semantic-release-config.cjs adds the two pyproject.toml files to
@semantic-release/git assets so the release commit back to main
carries every version source in lockstep.
- The six "?? '0.0.0-private'" fallback literals across the CLI are
replaced with "?? getKtxCliPackageInfo().version", and
createDefaultKtxMcpServer makes its version arg required.
- docs/release.md describes the actual commit-back model: the dev tree
always reflects the most recent release; no sentinel pin to
maintain.
Verified: pnpm run artifacts:build now produces
kaelio-ktx-0.4.1.tgz and kaelio_ktx-0.4.1-py3-none-any.whl with
@kaelio/ktx@0.4.1 inside. Full type-check, dead-code, and
2287 vitests + 173 script tests pass.
* refactor(cli): inject embedding provider resolution and detect sentence-transformers runtime
Make resolveProjectEmbeddingProvider and runtimeIo injectable in ingest and
scan command entrypoints so tests can stub them, and teach
resolvePublicIngestRuntimeRequirements to flag the local-embeddings runtime
feature when ktx.yaml selects sentence-transformers.
* chore(cli): mark buildLocalStatsStatus and LocalStatsStatus as @internal
Both symbols are consumed only by status-project.test.ts. Annotating with
/** @internal */ keeps knip's production-mode check clean without changing
runtime behavior.
* fix(cli): use real package metadata in print-command-tree
The stubbed package name embedded a forbidden product identifier that
tripped the boundary check in CI. Read the metadata from package.json
instead — keeps the rendered tree unchanged and removes a duplicate
source of truth.
* feat(cli): show embedding coverage in `ktx status`, drop duplicate disk counts
Inline `(N embedded)` next to the Wiki scope counts and Semantic-layer
source counts, computed with `SUM(embedding_json IS NOT NULL)` over
`knowledge_pages` and `local_sl_sources`. Rename the "Knowledge" label to
"Wiki" (canonical per `docs/terminology.md`) and rename the matching
`localStats.knowledgePages` field to `localStats.wikiPages`.
Drop `wiki=N md` and `semantic-layer=N yaml` from the Disk row — those
duplicated the per-surface rows above. Disk now reports only actual byte
usage (db, cache, raw-sources). The unused `wikiGlobalMarkdownCount` /
`semanticLayerYamlCount` fields, the `isMarkdownEntry` / `isYamlEntry`
helpers, and the `filter` arg on `summarizeDir` are removed.
2026-05-21 15:28:58 +02:00
|
|
|
import { GitService } from '../../../context/core/git.service.js';
|
2026-05-18 13:38:06 +02:00
|
|
|
import { FileIngestTraceWriter } from '../ingest-trace.js';
|
|
|
|
|
import { integrateWorkUnitPatch } from './patch-integrator.js';
|
|
|
|
|
|
|
|
|
|
async function makeRepo() {
|
|
|
|
|
const homeDir = await mkdtemp(join(tmpdir(), 'ktx-integrate-'));
|
|
|
|
|
const configDir = join(homeDir, 'config');
|
|
|
|
|
const git = new GitService({
|
|
|
|
|
storage: { configDir, homeDir },
|
|
|
|
|
git: {
|
|
|
|
|
userName: 'System User',
|
|
|
|
|
userEmail: 'system@example.com',
|
|
|
|
|
bootstrapMessage: 'init',
|
|
|
|
|
bootstrapAuthor: 'system',
|
|
|
|
|
bootstrapAuthorEmail: 'system@example.com',
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
await git.onModuleInit();
|
|
|
|
|
await mkdir(join(configDir, 'wiki/global'), { recursive: true });
|
|
|
|
|
await writeFile(join(configDir, 'wiki/global/a.md'), 'old\n');
|
|
|
|
|
await git.commitFiles(['wiki/global/a.md'], 'base', 'System User', 'system@example.com');
|
|
|
|
|
return { homeDir, configDir, git, baseSha: await git.revParseHead() };
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
describe('integrateWorkUnitPatch', () => {
|
|
|
|
|
it('applies a clean patch, runs semantic gates, and commits accepted changes', async () => {
|
|
|
|
|
const { homeDir, configDir, git, baseSha } = await makeRepo();
|
|
|
|
|
const childDir = join(homeDir, 'child');
|
|
|
|
|
await git.addWorktree(childDir, 'child', baseSha);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await writeFile(join(childDir, 'wiki/global/a.md'), 'new\n');
|
|
|
|
|
await childGit.commitFiles(['wiki/global/a.md'], 'edit', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'patches/wu.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(baseSha, 'HEAD', patchPath);
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-1/trace.jsonl'),
|
|
|
|
|
jobId: 'job-1',
|
|
|
|
|
connectionId: 'c1',
|
|
|
|
|
sourceKey: 'fake',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'wu-1',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'KTX Test', email: 'system@ktx.local' },
|
|
|
|
|
validateAppliedTree: vi.fn().mockResolvedValue(undefined),
|
|
|
|
|
slDisallowed: false,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['c1']),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result.status).toBe('accepted');
|
|
|
|
|
await expect(readFile(join(configDir, 'wiki/global/a.md'), 'utf-8')).resolves.toBe('new\n');
|
|
|
|
|
await expect(readFile(trace.tracePath, 'utf-8')).resolves.toContain('patch_apply_finished');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('rolls back and classifies semantic conflicts', async () => {
|
|
|
|
|
const { homeDir, configDir, git, baseSha } = await makeRepo();
|
|
|
|
|
const childDir = join(homeDir, 'child-semantic');
|
|
|
|
|
await git.addWorktree(childDir, 'child-semantic', baseSha);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await writeFile(join(childDir, 'wiki/global/a.md'), 'bad\n');
|
|
|
|
|
await childGit.commitFiles(['wiki/global/a.md'], 'bad edit', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'patches/bad.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(baseSha, 'HEAD', patchPath);
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-2/trace.jsonl'),
|
|
|
|
|
jobId: 'job-2',
|
|
|
|
|
connectionId: 'c1',
|
|
|
|
|
sourceKey: 'fake',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'wu-bad',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'KTX Test', email: 'system@ktx.local' },
|
|
|
|
|
validateAppliedTree: vi.fn().mockRejectedValue(new Error('final artifact gates failed')),
|
|
|
|
|
slDisallowed: false,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['c1']),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result.status).toBe('semantic_conflict');
|
|
|
|
|
await expect(readFile(join(configDir, 'wiki/global/a.md'), 'utf-8')).resolves.toBe('old\n');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('classifies slDisallowed patch policy failures as traced textual conflicts', async () => {
|
|
|
|
|
const { homeDir, configDir, git, baseSha } = await makeRepo();
|
|
|
|
|
await mkdir(join(configDir, 'semantic-layer/c1'), { recursive: true });
|
|
|
|
|
await git.commitFiles(['semantic-layer/c1'], 'empty sl dir', 'System User', 'system@example.com');
|
|
|
|
|
const childDir = join(homeDir, 'child-policy');
|
|
|
|
|
await git.addWorktree(childDir, 'child-policy', baseSha);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await mkdir(join(childDir, 'semantic-layer/c1'), { recursive: true });
|
|
|
|
|
await writeFile(join(childDir, 'semantic-layer/c1/orders.yaml'), 'name: orders\ncolumns: []\njoins: []\nmeasures: []\n');
|
|
|
|
|
await childGit.commitFiles(['semantic-layer/c1/orders.yaml'], 'forbidden sl', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'patches/forbidden.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(baseSha, 'HEAD', patchPath);
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-policy/trace.jsonl'),
|
|
|
|
|
jobId: 'job-policy',
|
|
|
|
|
connectionId: 'c1',
|
|
|
|
|
sourceKey: 'fake',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'lookml-mismatch',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'KTX Test', email: 'system@ktx.local' },
|
|
|
|
|
validateAppliedTree: vi.fn().mockResolvedValue(undefined),
|
|
|
|
|
slDisallowed: true,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['c1']),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result).toMatchObject({
|
|
|
|
|
status: 'textual_conflict',
|
|
|
|
|
touchedPaths: ['semantic-layer/c1/orders.yaml'],
|
|
|
|
|
});
|
|
|
|
|
const rawTrace = await readFile(trace.tracePath, 'utf-8');
|
|
|
|
|
expect(rawTrace).toContain('patch_policy_rejected');
|
|
|
|
|
expect(rawTrace).toContain('slDisallowed WorkUnit lookml-mismatch touched semantic-layer/c1/orders.yaml');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('classifies unauthorized semantic-layer targets as traced textual conflicts', async () => {
|
|
|
|
|
const { homeDir, git, baseSha } = await makeRepo();
|
|
|
|
|
const childDir = join(homeDir, 'child-target-policy');
|
|
|
|
|
await git.addWorktree(childDir, 'child-target-policy', baseSha);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await mkdir(join(childDir, 'semantic-layer/finance'), { recursive: true });
|
|
|
|
|
await writeFile(
|
|
|
|
|
join(childDir, 'semantic-layer/finance/orders.yaml'),
|
|
|
|
|
'name: orders\ncolumns: []\njoins: []\nmeasures: []\n',
|
|
|
|
|
);
|
|
|
|
|
await childGit.commitFiles(['semantic-layer/finance/orders.yaml'], 'unauthorized sl', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'patches/unauthorized.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(baseSha, 'HEAD', patchPath);
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-target-policy/trace.jsonl'),
|
|
|
|
|
jobId: 'job-target-policy',
|
|
|
|
|
connectionId: 'c1',
|
|
|
|
|
sourceKey: 'fake',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'wu-finance',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'KTX Test', email: 'system@ktx.local' },
|
|
|
|
|
validateAppliedTree: vi.fn().mockResolvedValue(undefined),
|
|
|
|
|
slDisallowed: false,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['warehouse']),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result).toMatchObject({
|
|
|
|
|
status: 'textual_conflict',
|
|
|
|
|
touchedPaths: ['semantic-layer/finance/orders.yaml'],
|
|
|
|
|
});
|
|
|
|
|
const rawTrace = await readFile(trace.tracePath, 'utf-8');
|
|
|
|
|
expect(rawTrace).toContain('patch_policy_rejected');
|
|
|
|
|
expect(rawTrace).toContain('semantic-layer target connection not allowed');
|
|
|
|
|
expect(rawTrace).toContain('allowedTargetConnectionIds');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('repairs a textual conflict through the bounded resolver and commits repaired files', async () => {
|
|
|
|
|
const { homeDir, configDir, git, baseSha } = await makeRepo();
|
|
|
|
|
await mkdir(join(configDir, 'wiki/global'), { recursive: true });
|
|
|
|
|
await writeFile(join(configDir, 'wiki/global/a.md'), 'base\n', 'utf-8');
|
|
|
|
|
await git.commitFiles(['wiki/global/a.md'], 'base page', 'System User', 'system@example.com');
|
|
|
|
|
const conflictBase = await git.revParseHead();
|
|
|
|
|
|
|
|
|
|
await writeFile(join(configDir, 'wiki/global/a.md'), 'accepted\n', 'utf-8');
|
|
|
|
|
await git.commitFiles(['wiki/global/a.md'], 'accepted edit', 'System User', 'system@example.com');
|
|
|
|
|
|
|
|
|
|
const childDir = join(homeDir, 'child-conflict');
|
|
|
|
|
await git.addWorktree(childDir, 'child-conflict', conflictBase);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await writeFile(join(childDir, 'wiki/global/a.md'), 'proposal\n', 'utf-8');
|
|
|
|
|
await childGit.commitFiles(['wiki/global/a.md'], 'proposal edit', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'proposal.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(conflictBase, 'HEAD', patchPath);
|
|
|
|
|
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-resolver/trace.jsonl'),
|
|
|
|
|
jobId: 'job-resolver',
|
|
|
|
|
connectionId: 'warehouse',
|
|
|
|
|
sourceKey: 'metabase',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const validateAppliedTree = vi.fn(async (paths: string[]) => {
|
|
|
|
|
expect(paths).toEqual(['wiki/global/a.md']);
|
|
|
|
|
await expect(readFile(join(configDir, 'wiki/global/a.md'), 'utf-8')).resolves.toBe('accepted\nproposal\n');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'wu-conflict',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'System User', email: 'system@example.com' },
|
|
|
|
|
slDisallowed: false,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['warehouse']),
|
|
|
|
|
validateAppliedTree,
|
|
|
|
|
resolveTextualConflict: vi.fn(async (context) => {
|
|
|
|
|
expect(context).toMatchObject({
|
|
|
|
|
unitKey: 'wu-conflict',
|
|
|
|
|
patchPath,
|
|
|
|
|
touchedPaths: ['wiki/global/a.md'],
|
|
|
|
|
});
|
|
|
|
|
await writeFile(join(configDir, 'wiki/global/a.md'), 'accepted\nproposal\n', 'utf-8');
|
|
|
|
|
return {
|
|
|
|
|
status: 'repaired' as const,
|
|
|
|
|
attempts: 1,
|
|
|
|
|
changedPaths: ['wiki/global/a.md'],
|
|
|
|
|
};
|
|
|
|
|
}),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result).toMatchObject({
|
|
|
|
|
status: 'accepted',
|
|
|
|
|
touchedPaths: ['wiki/global/a.md'],
|
|
|
|
|
textualResolution: {
|
|
|
|
|
status: 'repaired',
|
|
|
|
|
attempts: 1,
|
|
|
|
|
changedPaths: ['wiki/global/a.md'],
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
expect(validateAppliedTree).toHaveBeenCalledOnce();
|
|
|
|
|
await expect(readFile(join(configDir, 'wiki/global/a.md'), 'utf-8')).resolves.toBe('accepted\nproposal\n');
|
|
|
|
|
await expect(readFile(trace.tracePath, 'utf-8')).resolves.toContain('patch_accepted_after_textual_resolution');
|
|
|
|
|
expect(await git.revParseHead()).not.toBe(baseSha);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('keeps the pre-apply integration tree when the resolver cannot repair a textual conflict', async () => {
|
|
|
|
|
const { homeDir, configDir, git } = await makeRepo();
|
|
|
|
|
await mkdir(join(configDir, 'wiki/global'), { recursive: true });
|
|
|
|
|
await writeFile(join(configDir, 'wiki/global/a.md'), 'base\n', 'utf-8');
|
|
|
|
|
await git.commitFiles(['wiki/global/a.md'], 'base page', 'System User', 'system@example.com');
|
|
|
|
|
const conflictBase = await git.revParseHead();
|
|
|
|
|
|
|
|
|
|
await writeFile(join(configDir, 'wiki/global/a.md'), 'accepted\n', 'utf-8');
|
|
|
|
|
await git.commitFiles(['wiki/global/a.md'], 'accepted edit', 'System User', 'system@example.com');
|
|
|
|
|
const acceptedHead = await git.revParseHead();
|
|
|
|
|
|
|
|
|
|
const childDir = join(homeDir, 'child-conflict-fails');
|
|
|
|
|
await git.addWorktree(childDir, 'child-conflict-fails', conflictBase);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await writeFile(join(childDir, 'wiki/global/a.md'), 'proposal\n', 'utf-8');
|
|
|
|
|
await childGit.commitFiles(['wiki/global/a.md'], 'proposal edit', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'proposal-fails.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(conflictBase, 'HEAD', patchPath);
|
|
|
|
|
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-resolver-fails/trace.jsonl'),
|
|
|
|
|
jobId: 'job-resolver-fails',
|
|
|
|
|
connectionId: 'warehouse',
|
|
|
|
|
sourceKey: 'metabase',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'wu-conflict',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'System User', email: 'system@example.com' },
|
|
|
|
|
slDisallowed: false,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['warehouse']),
|
|
|
|
|
validateAppliedTree: vi.fn(async () => {}),
|
|
|
|
|
resolveTextualConflict: vi.fn(async () => ({
|
|
|
|
|
status: 'failed' as const,
|
|
|
|
|
attempts: 1,
|
|
|
|
|
reason: 'resolver completed without editing an allowed path',
|
|
|
|
|
})),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result).toMatchObject({
|
|
|
|
|
status: 'textual_conflict',
|
|
|
|
|
textualResolution: {
|
|
|
|
|
status: 'failed',
|
|
|
|
|
attempts: 1,
|
|
|
|
|
reason: 'resolver completed without editing an allowed path',
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
expect(await git.revParseHead()).toBe(acceptedHead);
|
|
|
|
|
await expect(readFile(join(configDir, 'wiki/global/a.md'), 'utf-8')).resolves.toBe('accepted\n');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('repairs semantic gate failures after a patch applies cleanly', async () => {
|
|
|
|
|
const { homeDir, configDir, git, baseSha } = await makeRepo();
|
|
|
|
|
const childDir = join(homeDir, 'child-semantic-repair');
|
|
|
|
|
await git.addWorktree(childDir, 'child-semantic-repair', baseSha);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await writeFile(join(childDir, 'wiki/global/a.md'), 'bad semantic ref\n');
|
|
|
|
|
await childGit.commitFiles(['wiki/global/a.md'], 'bad semantic edit', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'patches/semantic-repair.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(baseSha, 'HEAD', patchPath);
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-semantic-repair/trace.jsonl'),
|
|
|
|
|
jobId: 'job-semantic-repair',
|
|
|
|
|
connectionId: 'c1',
|
|
|
|
|
sourceKey: 'fake',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
const validateAppliedTree = vi
|
|
|
|
|
.fn()
|
|
|
|
|
.mockRejectedValueOnce(new Error('final artifact gates failed:\na: unknown semantic-layer entity'))
|
|
|
|
|
.mockResolvedValueOnce(undefined);
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'wu-repairable',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'KTX Test', email: 'system@ktx.local' },
|
|
|
|
|
validateAppliedTree,
|
|
|
|
|
slDisallowed: false,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['c1']),
|
|
|
|
|
repairGateFailure: vi.fn(async (context) => {
|
|
|
|
|
expect(context).toMatchObject({
|
|
|
|
|
unitKey: 'wu-repairable',
|
|
|
|
|
patchPath,
|
|
|
|
|
touchedPaths: ['wiki/global/a.md'],
|
|
|
|
|
});
|
|
|
|
|
await writeFile(join(configDir, 'wiki/global/a.md'), 'repaired semantic ref\n', 'utf-8');
|
|
|
|
|
return {
|
|
|
|
|
status: 'repaired' as const,
|
|
|
|
|
attempts: 1,
|
|
|
|
|
changedPaths: ['wiki/global/a.md'],
|
|
|
|
|
};
|
|
|
|
|
}),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result).toMatchObject({
|
|
|
|
|
status: 'accepted',
|
|
|
|
|
touchedPaths: ['wiki/global/a.md'],
|
|
|
|
|
gateRepair: {
|
|
|
|
|
status: 'repaired',
|
|
|
|
|
attempts: 1,
|
|
|
|
|
changedPaths: ['wiki/global/a.md'],
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
expect(validateAppliedTree).toHaveBeenCalledTimes(2);
|
|
|
|
|
await expect(readFile(join(configDir, 'wiki/global/a.md'), 'utf-8')).resolves.toBe('repaired semantic ref\n');
|
|
|
|
|
await expect(readFile(trace.tracePath, 'utf-8')).resolves.toContain('patch_accepted_after_gate_repair');
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('keeps the pre-apply tree when semantic gate repair fails', async () => {
|
|
|
|
|
const { homeDir, configDir, git, baseSha } = await makeRepo();
|
|
|
|
|
const childDir = join(homeDir, 'child-semantic-repair-fails');
|
|
|
|
|
await git.addWorktree(childDir, 'child-semantic-repair-fails', baseSha);
|
|
|
|
|
const childGit = git.forWorktree(childDir);
|
|
|
|
|
await writeFile(join(childDir, 'wiki/global/a.md'), 'bad semantic ref\n');
|
|
|
|
|
await childGit.commitFiles(['wiki/global/a.md'], 'bad semantic edit', 'System User', 'system@example.com');
|
|
|
|
|
const patchPath = join(homeDir, 'patches/semantic-repair-fails.patch');
|
|
|
|
|
await childGit.writeBinaryNoRenamePatch(baseSha, 'HEAD', patchPath);
|
|
|
|
|
const trace = new FileIngestTraceWriter({
|
|
|
|
|
tracePath: join(homeDir, '.ktx/ingest-traces/job-semantic-repair-fails/trace.jsonl'),
|
|
|
|
|
jobId: 'job-semantic-repair-fails',
|
|
|
|
|
connectionId: 'c1',
|
|
|
|
|
sourceKey: 'fake',
|
|
|
|
|
level: 'trace',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await integrateWorkUnitPatch({
|
|
|
|
|
unitKey: 'wu-not-repaired',
|
|
|
|
|
patchPath,
|
|
|
|
|
integrationGit: git,
|
|
|
|
|
trace,
|
|
|
|
|
author: { name: 'KTX Test', email: 'system@ktx.local' },
|
|
|
|
|
validateAppliedTree: vi.fn().mockRejectedValue(new Error('final artifact gates failed')),
|
|
|
|
|
slDisallowed: false,
|
|
|
|
|
allowedTargetConnectionIds: new Set(['c1']),
|
|
|
|
|
repairGateFailure: vi.fn(async () => ({
|
|
|
|
|
status: 'failed' as const,
|
|
|
|
|
attempts: 1,
|
|
|
|
|
reason: 'gate repair completed without editing an allowed path',
|
|
|
|
|
})),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
expect(result).toMatchObject({
|
|
|
|
|
status: 'semantic_conflict',
|
|
|
|
|
gateRepair: {
|
|
|
|
|
status: 'failed',
|
|
|
|
|
attempts: 1,
|
|
|
|
|
reason: 'gate repair completed without editing an allowed path',
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
await expect(readFile(join(configDir, 'wiki/global/a.md'), 'utf-8')).resolves.toBe('old\n');
|
|
|
|
|
});
|
|
|
|
|
});
|